From b33c235b4d11dd66fbda130e2428df014ae658ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Mon, 29 Jul 2024 20:13:09 +0800 Subject: [PATCH] release: 1.7.1 --- package.json | 2 +- script/BootWay05-utf8.ps1 | 61 ++++++++++++++++++++++++++++++++++++++ script/BootWay05.ps1 | 61 ++++++++++++++++++++++++++++++++++++++ script/dbghelp.dll | Bin 0 -> 13824 bytes src/onebot11/version.ts | 2 +- src/webui/ui/NapCat.ts | 2 +- static/assets/renderer.js | 2 +- vite.config.ts | 2 +- 8 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 script/BootWay05-utf8.ps1 create mode 100644 script/BootWay05.ps1 create mode 100644 script/dbghelp.dll diff --git a/package.json b/package.json index 3d414aa5..8f12219d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "1.7.0", + "version": "1.7.1", "scripts": { "watch:dev": "vite --mode development", "watch:prod": "vite --mode production", diff --git a/script/BootWay05-utf8.ps1 b/script/BootWay05-utf8.ps1 new file mode 100644 index 00000000..a26103f5 --- /dev/null +++ b/script/BootWay05-utf8.ps1 @@ -0,0 +1,61 @@ +function Get-QQpath { + try { + $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" + $uninstallString = $key.UninstallString + return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe" + } + catch { + throw "get QQ path error: $_" + } +} +function Select-QQPath { + Add-Type -AssemblyName System.Windows.Forms + [System.Windows.Forms.Application]::EnableVisualStyles() + + $dialogTitle = "Select QQ.exe" + + $filePicker = New-Object System.Windows.Forms.OpenFileDialog + $filePicker.Title = $dialogTitle + $filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*" + $filePicker.FilterIndex = 1 + $null = $filePicker.ShowDialog() + if (-not ($filePicker.FileName)) { + throw "User did not select an .exe file." + } + return $filePicker.FileName +} + +# 获取当前目录路径 +$currentPath = Get-Location + +# 替换\为/ +$currentPath = $currentPath -replace '\\', '/' + +# 生成JavaScript代码 +$jsCode = @" +(async () => { + await import('file:///$currentPath/napcat.mjs'); +})(); +"@ + +# 将JavaScript代码保存到文件中 +$jsFilePath = Join-Path $currentPath "loadScript.js" +$jsCode | Out-File -FilePath $jsFilePath -Encoding UTF8 + +Write-Output "JavaScript code has been generated and saved to $jsFilePath" +# 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址 +$env:NAPCAT_PATH = $jsFilePath + +$params = $args -join " " +Try { + $QQpath = Get-QQpath +} +Catch { + $QQpath = Select-QQPath +} + if (!(Test-Path $QQpath)) { + throw "provided QQ path is invalid: $QQpath" +} + +$commandInfo = Get-Command $QQpath -ErrorAction Stop +Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$($commandInfo.Path)' --enable-logging $params}" \ No newline at end of file diff --git a/script/BootWay05.ps1 b/script/BootWay05.ps1 new file mode 100644 index 00000000..1b69d266 --- /dev/null +++ b/script/BootWay05.ps1 @@ -0,0 +1,61 @@ +function Get-QQpath { + try { + $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" + $uninstallString = $key.UninstallString + return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe" + } + catch { + throw "get QQ path error: $_" + } +} +function Select-QQPath { + Add-Type -AssemblyName System.Windows.Forms + [System.Windows.Forms.Application]::EnableVisualStyles() + + $dialogTitle = "Select QQ.exe" + + $filePicker = New-Object System.Windows.Forms.OpenFileDialog + $filePicker.Title = $dialogTitle + $filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*" + $filePicker.FilterIndex = 1 + $null = $filePicker.ShowDialog() + if (-not ($filePicker.FileName)) { + throw "User did not select an .exe file." + } + return $filePicker.FileName +} + +# 获取当前目录路径 +$currentPath = Get-Location + +# 替换\为/ +$currentPath = $currentPath -replace '\\', '/' + +# 生成JavaScript代码 +$jsCode = @" +(async () => { + await import('file:///$currentPath/napcat.mjs'); +})(); +"@ + +# 将JavaScript代码保存到文件中 +$jsFilePath = Join-Path $currentPath "loadScript.js" +$jsCode | Out-File -FilePath $jsFilePath -Encoding UTF8 + +Write-Output "JavaScript code has been generated and saved to $jsFilePath" +# 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址 +$env:NAPCAT_PATH = $jsFilePath + +$params = $args -join " " +Try { + $QQpath = Get-QQpath +} +Catch { + $QQpath = Select-QQPath +} + if (!(Test-Path $QQpath)) { + throw "provided QQ path is invalid: $QQpath" +} + +$commandInfo = Get-Command $QQpath -ErrorAction Stop +Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& '$($commandInfo.Path)' --enable-logging $params}" \ No newline at end of file diff --git a/script/dbghelp.dll b/script/dbghelp.dll new file mode 100644 index 0000000000000000000000000000000000000000..93c9f8b8c12ec953e9fd63d4d34aefa27499e773 GIT binary patch literal 13824 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 S-Cf;#yFab|8R!3Y1pWuR4kk(f literal 0 HcmV?d00001 diff --git a/src/onebot11/version.ts b/src/onebot11/version.ts index 61bffdb0..eff8d513 100644 --- a/src/onebot11/version.ts +++ b/src/onebot11/version.ts @@ -1 +1 @@ -export const version = '1.7.0'; +export const version = '1.7.1'; diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index ec901a5d..13d0308e 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -29,7 +29,7 @@ async function onSettingWindowCreated(view: Element) { SettingItem( 'Napcat', undefined, - SettingButton('V1.7.0', 'napcat-update-button', 'secondary') + SettingButton('V1.7.1', 'napcat-update-button', 'secondary') ), ]), SettingList([ diff --git a/static/assets/renderer.js b/static/assets/renderer.js index a67da123..8acbb2ba 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -163,7 +163,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V1.7.0", "napcat-update-button", "secondary") + SettingButton("V1.7.1", "napcat-update-button", "secondary") ) ]), SettingList([ diff --git a/vite.config.ts b/vite.config.ts index def187d9..7c1d81c0 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -26,7 +26,7 @@ if (process.env.NAPCAT_BUILDSYS == 'linux') { } else if (process.env.NAPCAT_BUILDSYS == 'win32') { if (process.env.NAPCAT_BUILDARCH == 'x64') { } - startScripts = ['./script/napcat.ps1', './script/napcat.bat', './script/napcat-utf8.bat', './script/napcat-utf8.ps1', './script/napcat-log.ps1', './script/NapCat.164.bat', './script/napcat-9912.ps1', './script/napcat-9912-utf8.ps1', './script/napcat-9912.bat', './script/napcat-9912-utf8.bat']; + startScripts = ['dbghelp.dll', './script/BootWay05-utf8.ps1', './script/BootWay05.ps1', './script/napcat-9912.ps1', './script/napcat-9912-utf8.ps1', './script/napcat-9912.bat', './script/napcat-9912-utf8.bat']; } else { startScripts = ['./script/napcat.sh', './script/napcat.ps1', './script/napcat.bat', './script/napcat-utf8.bat', './script/napcat-utf8.ps1', './script/napcat-log.ps1', './script/napcat-9912.ps1', './script/napcat-9912-utf8.ps1', './script/napcat-9912.bat', './script/napcat-9912-utf8.bat']; }