release: 1.8.6

Fix typo in eventType field name

LICENSE

@@ -1,373 +1,24 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
+BSD 2-Clause License
+
+Copyright (c) 2024, NapNeko
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

docs/changelogs/CHANGELOG.v1.7.9.md

@@ -1,21 +0,0 @@
-# v1.8.0
-
-QQ Version: Windows 9.9.15-26702 / Linux 3.2.12-26702
-
-## 启动的方式
-Way03/Way05
-
-## 新增与调整
-1. 消息ID映射到UINT32空间
-2. 回复ID验证与修复
-3. 新API /fetch_emoji_like
-
-```json5
-{
-    "message_id": 1557274996,//消息ID
-    "emojiType": "1",//可以从event事件获取 一般为1或者2
-    "emojiId": "76"//可以从event事件获取 一个表情对应一个ID
-}
-```
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/CHANGELOG.v1.8.3.md

@@ -0,0 +1,13 @@
+# v1.8.3
+
+QQ Version: Windows 9.9.15-26702 / Linux 3.2.12-26702
+
+## 启动的方式
+Way03/Way05
+
+## 新增与调整
+1. 输入状态变更事件加入
+2. Way05 支持Bat启动
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.8.0",
+  "version": "1.8.6",
   "scripts": {
     "watch:dev": "vite --mode development",
     "watch:prod": "vite --mode production",

script/BootWay05.bat

@@ -0,0 +1,90 @@
+@echo off
+REM 检查当前会话是否具有管理员权限
+openfiles >nul 2>&1
+if %errorlevel% neq 0 (
+    REM 如果不是管理员，则重新启动脚本以管理员模式运行
+    echo 请求管理员权限...
+    powershell -Command "Start-Process cmd -ArgumentList '/c %~f0 %*' -Verb RunAs"
+    exit /b
+)
+
+REM 设置当前工作目录
+cd /d %~dp0
+
+REM 获取当前目录路径
+set currentPath=%cd%
+set currentPath=%currentPath:\=/%
+
+REM 生成JavaScript代码
+set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
+
+REM 将JavaScript代码保存到文件中
+echo %jsCode% > loadScript.js
+echo JavaScript code has been generated and saved to loadScript.js
+
+REM 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址
+set NAPCAT_PATH=%cd%\loadScript.js
+
+REM 获取QQ路径
+
+
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in (%RetString%) do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+REM 拿不到QQ路径则退出
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+
+REM 收集dbghelp.dll路径和HASH信息
+set QQdir=%~dp0
+set oldDllPath=%QQdir%dbghelp.dll
+set newDllPath=%currentPath%\dbghelp.dll
+
+for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
+    if not defined oldDllHash set oldDllHash=%%A
+)
+for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
+    if not defined newDllHash set newDllHash=%%A
+)
+
+REM 如果文件一致则跳过
+if "%oldDllHash%" neq "%newDllHash%" (
+    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
+    if %errorlevel% equ 0 (
+        REM 文件占用则退出
+        echo dbghelp.dll is in use, cannot continue.
+    ) else (
+        REM 文件未占用则尝试覆盖
+        copy /y "%newDllPath%" "%oldDllPath%"
+        if %errorlevel% neq 0 (
+            echo Failed to copy dbghelp.dll
+            pause
+            exit /b
+        ) else (
+            echo dbghelp.dll has been copied to %QQdir%
+        )
+    )
+)
+
+REM 带参数启动QQ
+REM 判断wt是否存在，存在则通过wt启动，不存在则通过cmd启动
+REM %QQPath% --enable-logging  %*
+where wt >nul 2>nul
+if %errorlevel% equ 0 (
+    wt "cmd" /c "%QQPath%" --enable-logging  %* 
+) else (
+    "%QQPath%" --enable-logging  %*
+)

script/BootWay05.utf8.bat

@@ -0,0 +1,93 @@
+@echo off
+REM 检查当前会话是否具有管理员权限
+openfiles >nul 2>&1
+if %errorlevel% neq 0 (
+    REM 如果不是管理员，则重新启动脚本以管理员模式运行
+    echo 请求管理员权限...
+    where wt >nul 2>nul
+    if %errorlevel% equ 0 (
+        powershell -Command "Start-Process cmd -ArgumentList ' /c %~f0 %*' -Verb RunAs"
+    ) else (
+        powershell -Command "Start-Process wt -ArgumentList 'cmd /c %~f0 %*' -Verb RunAs"
+    )
+
+    REM wt "cmd" /c  "%~f0 %*"
+    exit /b
+)
+
+REM 设置当前工作目录
+cd /d %~dp0
+
+REM 获取当前目录路径
+set currentPath=%cd%
+set currentPath=%currentPath:\=/%
+
+REM 生成JavaScript代码
+set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
+
+REM 将JavaScript代码保存到文件中
+echo %jsCode% > loadScript.js
+echo JavaScript code has been generated and saved to loadScript.js
+
+REM 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址
+set NAPCAT_PATH=%cd%\loadScript.js
+
+REM 获取QQ路径
+
+
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in (%RetString%) do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+REM 拿不到QQ路径则退出
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+
+REM 收集dbghelp.dll路径和HASH信息
+set QQdir=%~dp0
+set oldDllPath=%QQdir%dbghelp.dll
+set newDllPath=%currentPath%\dbghelp.dll
+
+for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
+    if not defined oldDllHash set oldDllHash=%%A
+)
+for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
+    if not defined newDllHash set newDllHash=%%A
+)
+
+REM 如果文件一致则跳过
+if "%oldDllHash%" neq "%newDllHash%" (
+    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
+    if %errorlevel% equ 0 (
+        REM 文件占用则退出
+        echo dbghelp.dll is in use, cannot continue.
+    ) else (
+        REM 文件未占用则尝试覆盖
+        copy /y "%newDllPath%" "%oldDllPath%"
+        if %errorlevel% neq 0 (
+            echo Failed to copy dbghelp.dll
+            pause
+            exit /b
+        ) else (
+            echo dbghelp.dll has been copied to %QQdir%
+        )
+    )
+)
+
+REM 带参数启动QQ
+REM 判断wt是否存在，存在则通过wt启动，不存在则通过cmd启动
+REM %QQPath% --enable-logging  %*
+chcp 65001
+"%QQPath%" --enable-logging  %*

script/index.js

@@ -1,6 +1,6 @@
 // --------------------
 // 2024.7.3 9.9.12 BootWay.03 其余方法暂不公开（此方案为临时方案 Win平台已验证）
-// 缺陷 （已知）
+
 // 1.与非入侵式不同 现在破坏本体代码
 // 2.重启代码与正常启动代码失效 
 // 3.Win需要补丁

src/common/utils/QQBasicInfo.ts

@@ -6,15 +6,15 @@ import AppidTable from '@/core/external/appid.json';
 import { log } from './log';
 
 //基础目录获取
-export let QQMainPath = process.execPath;
-export let QQPackageInfoPath: string = path.join(path.dirname(QQMainPath), 'resources', 'app', 'package.json');
-export let QQVersionConfigPath: string | undefined = getQQVersionConfigPath(QQMainPath);
+export const QQMainPath = process.execPath;
+export const QQPackageInfoPath: string = path.join(path.dirname(QQMainPath), 'resources', 'app', 'package.json');
+export const QQVersionConfigPath: string | undefined = getQQVersionConfigPath(QQMainPath);
 
 //基础信息获取 无快更则启用默认模板填充
-export let isQuickUpdate: boolean = !!QQVersionConfigPath;
-export let QQVersionConfig: QQVersionConfigType = isQuickUpdate ? JSON.parse(fs.readFileSync(QQVersionConfigPath!).toString()) : getDefaultQQVersionConfigInfo();
-export let QQPackageInfo: QQPackageInfoType = JSON.parse(fs.readFileSync(QQPackageInfoPath).toString());
-export let { appid: QQVersionAppid, qua: QQVersionQua } = getAppidV2();
+export const isQuickUpdate: boolean = !!QQVersionConfigPath;
+export const QQVersionConfig: QQVersionConfigType = isQuickUpdate ? JSON.parse(fs.readFileSync(QQVersionConfigPath!).toString()) : getDefaultQQVersionConfigInfo();
+export const QQPackageInfo: QQPackageInfoType = JSON.parse(fs.readFileSync(QQPackageInfoPath).toString());
+export const { appid: QQVersionAppid, qua: QQVersionQua } = getAppidV2();
 
 //基础函数
 export function getQQBuildStr() {
@@ -31,17 +31,18 @@ export function getQUAInternal() {
   return systemPlatform === 'linux' ? `V1_LNX_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B` : `V1_WIN_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B`;
 }
 export function getAppidV2(): { appid: string, qua: string } {
-  let appidTbale = AppidTable as unknown as QQAppidTableType;
+  const appidTbale = AppidTable as unknown as QQAppidTableType;
   try {
-    let data = appidTbale[getFullQQVesion()];
+    const data = appidTbale[getFullQQVesion()];
     if (data) {
       return data;
     }
   }
   catch (e) {
-    log('[QQ版本兼容性检测] 版本兼容性不佳，可能会导致一些功能无法正常使用', e);
+    log('[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常');
   }
   // 以下是兜底措施
+  log(`[QQ版本兼容性检测] ${getFullQQVesion()} 版本兼容性不佳，可能会导致一些功能无法正常使用`);
   return { appid: systemPlatform === 'linux' ? '537237950' : '537237765', qua: getQUAInternal() };
 }
 // platform_type: 3,

src/common/utils/file.ts

@@ -181,7 +181,7 @@ type Uri2LocalRes = {
   isLocal: boolean
 }
 
-export async function uri2local(uri: string, fileName: string | null = null): Promise<Uri2LocalRes> {
+export async function uri2local(UriOrPath: string, fileName: string | null = null): Promise<Uri2LocalRes> {
   const res = {
     success: false,
     errMsg: '',
@@ -190,26 +190,29 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
     path: '',
     isLocal: false
   };
-  if (!fileName) {
-    fileName = randomUUID();
-  }
-  let filePath = path.join(getTempDir(), fileName);
+  if (!fileName) fileName = randomUUID();
+  let filePath = path.join(getTempDir(), fileName);//临时目录
   let url = null;
+  //区分path和uri
   try {
-    url = new URL(uri);
-  } catch (e: any) {
-    res.errMsg = `uri ${uri} 解析失败,` + e.toString() + ` 可能${uri}不存在`;
+    if (fs.existsSync(UriOrPath)) url = new URL('file://' + UriOrPath);
+  } catch (error: any) { }
+  try {
+    url = new URL(UriOrPath);
+  } catch (error: any) { }
+
+  //验证url
+  if (!url) {
+    res.errMsg = `UriOrPath ${UriOrPath} 解析失败,可能${UriOrPath}不存在`;
     return res;
   }
 
-  // log("uri protocol", url.protocol, uri);
   if (url.protocol == 'base64:') {
     // base64转成文件
-    const base64Data = uri.split('base64://')[1];
+    const base64Data = UriOrPath.split('base64://')[1];
     try {
       const buffer = Buffer.from(base64Data, 'base64');
       fs.writeFileSync(filePath, buffer);
-
     } catch (e: any) {
       res.errMsg = 'base64文件下载失败,' + e.toString();
       return res;
@@ -218,7 +221,7 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
     // 下载文件
     let buffer: Buffer | null = null;
     try {
-      buffer = await httpDownload(uri);
+      buffer = await httpDownload(UriOrPath);
     } catch (e: any) {
       res.errMsg = `${url}下载失败,` + e.toString();
       return res;
@@ -252,6 +255,7 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
       }
     }
     else {
+      // 26702执行forword file文件操作 不应该在这里乱来
       // const cache = await dbUtil.getFileCacheByName(uri);
       // if (cache) {
       //   filePath = cache.path;
@@ -259,7 +263,6 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
       //   filePath = uri;
       // }
     }
-
     res.isLocal = true;
   }
   // else{

src/common/utils/helper.ts

@@ -360,12 +360,12 @@ export async function promisePipeline(promises: Promise<any>[], callback: (resul
         callbackCalled = callback(result);
       }
     } catch (error) {
-      console.error("Error in promise pipeline:", error);
+      console.error('Error in promise pipeline:', error);
     }
   }
 }
 
-export function getQQVersionConfigPath(exePath: string = ""): string | undefined {
+export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
   let configVersionInfoPath;
   if (os.platform() !== 'linux') {
     configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');

src/core/src/apis/group.ts

@@ -220,7 +220,7 @@ export class NTQQGroupApi {
     const _Pskey = (await NTQQUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
     return napCatCore.session.getGroupService().uploadGroupBulletinPic(GroupCode, _Pskey, imageurl);
   }
-  static async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
+  static async handleGroupRequest(flag: string , operateType: GroupRequestOperateTypes, reason?: string) {
     let flagitem = flag.split('|');
     let groupCode = flagitem[0];
     let seq = flagitem[1];

src/core/src/apis/msg.ts

@@ -1,8 +1,8 @@
-import { GetFileListParam, Peer, RawMessage, SendMessageElement, SendMsgElementConstructor } from '@/core/entities';
-import { friends, groups, selfInfo } from '@/core/data';
+import { ChatType, ChatType2, GetFileListParam, Peer, RawMessage, SendMessageElement, SendMsgElementConstructor } from '@/core/entities';
+import { friends, getGroupMember, groups, selfInfo } from '@/core/data';
 import { log, logWarn } from '@/common/utils/log';
 import { sleep } from '@/common/utils/helper';
-import { napCatCore, NTQQUserApi } from '@/core';
+import { napCatCore, NTQQGroupApi, NTQQUserApi } from '@/core';
 import { onGroupFileInfoUpdateParamType } from '@/core/listeners';
 import { GeneralCallResult } from '@/core/services/common';
 import { MessageUnique } from '../../../common/utils/MessageUnique';
@@ -43,6 +43,7 @@ setTimeout(() => {
     await sleep(100);
     // NTQQMsgApi.CheckSendMode().then().catch();
     loadMessageUnique().then().catch();
+    //下面的代码还没摸清 不要使用
     //let data  = await napCatCore.session.getMsgService().sendSsoCmdReqByContend("LightAppSvc.mini_app_growguard.ReportExecute","1124343");
     //console.log(data);
   });
@@ -67,8 +68,35 @@ setTimeout(() => {
 // }, 25000)
 
 export class NTQQMsgApi {
+  static async FetchLongMsg(peer: Peer, msgId: string) {
+    return napCatCore.session.getMsgService().fetchLongMsg(peer, msgId);
+  }
+  static async getTempChatInfo(chatType: ChatType2, peerUid: string) {
+    return napCatCore.session.getMsgService().getTempChatInfo(chatType, peerUid);
+  }
+  static async PrepareTempChat(toUserUid: string, GroupCode: string, nickname: string) {
+    //By Jadx/Ida Mlikiowa
+    let TempGameSession = {
+      nickname: "",
+      gameAppId: "",
+      selfTinyId: "",
+      peerRoleId: "",
+      peerOpenId: "",
+    };
+    return napCatCore.session.getMsgService().prepareTempChat({
+      chatType: ChatType2.KCHATTYPETEMPC2CFROMGROUP,
+      peerUid: toUserUid,
+      peerNickname: nickname,
+      fromGroupCode: GroupCode,
+      sig: "",
+      selfPhone: "",
+      selfUid: selfInfo.uid,
+      gameSession: TempGameSession
+    });
+  }
   static async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number = 20) {
     //console.log(peer, msgSeq, emojiId, emojiType, count);
+    //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged M likiowa
     return napCatCore.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, "", false, 20)
   }
   // static napCatCore: NapCatCore | null = null;
@@ -91,20 +119,26 @@ export class NTQQMsgApi {
   } | undefined> {
     return napCatCore.session.getMsgService().getMultiMsg(peer, rootMsgId, parentMsgId);
   }
-  static async getLastestMsgByUids(peer: Peer, count: number = 20) {
+  static async ForwardMsg(peer: Peer, msgIds: string[]) {
+    return napCatCore.session.getMsgService().forwardMsg(msgIds, peer, [peer], []);
+  }
+  static async getLastestMsgByUids(peer: Peer, count: number = 20, isReverseOrder: boolean = false) {
     let ret = await napCatCore.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
       chatInfo: peer,
       filterMsgType: [],
       filterSendersUid: [],
       filterMsgToTime: '0',
       filterMsgFromTime: '0',
-      isReverseOrder: false,
+      isReverseOrder: isReverseOrder,//此参数有点离谱 注意不是本次查询的排序 而是全部消历史信息的排序 默认false 从新消息拉取到旧消息
       isIncludeCurrent: true,
-      pageLimit: 1,
+      pageLimit: count,
     });
     return ret;
   }
-  static async getMsgsByMsgId(peer: Peer, msgIds: string[]) {
+  static async getMsgsByMsgId(peer: Peer | undefined, msgIds: string[] | undefined) {
+    if (!peer) throw new Error('peer is not allowed');
+    if (!msgIds) throw new Error('msgIds is not allowed');
+    //Mlikiowa： 参数不合规会导致NC异常崩溃 原因是TX未对进入参数判断 对应Android标记@NotNull AndroidJADX分析可得
     return await napCatCore.session.getMsgService().getMsgsByMsgId(peer, msgIds);
   }
   static async getSingleMsg(peer: Peer, seq: string) {
@@ -115,7 +149,7 @@ export class NTQQMsgApi {
   }
   static async queryMsgsWithFilterExWithSeq(peer: Peer, msgSeq: string) {
     let ret = await napCatCore.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
-      chatInfo: peer,
+      chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
       filterMsgType: [],
       filterSendersUid: [],
       filterMsgToTime: '0',
@@ -126,6 +160,16 @@ export class NTQQMsgApi {
     });
     return ret;
   }
+  /**
+   * 
+   * @deprecated 从9.9.15-26702版本开始，该接口已经废弃，请使用getMsgsEx
+   * @param peer 
+   * @param seq 
+   * @param count 
+   * @param desc 
+   * @param z 
+   * @returns 
+   */
   static async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
     return await napCatCore.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z);
   }
@@ -142,6 +186,7 @@ export class NTQQMsgApi {
       1,
       5000,
       (groupFileListResult: onGroupFileInfoUpdateParamType) => {
+        //Developer Mlikiowa Todo: 此处有问题 无法判断是否成功
         return true;
       },
       GroupCode,
@@ -149,9 +194,9 @@ export class NTQQMsgApi {
     );
     return data[1].item;
   }
-  static async getMsgHistory(peer: Peer, msgId: string, count: number) {
+  static async getMsgHistory(peer: Peer, msgId: string, count: number, isReverseOrder: boolean = false) {
     // 消息时间从旧到新
-    return napCatCore.session.getMsgService().getMsgsIncludeSelf(peer, msgId, count, true);
+    return napCatCore.session.getMsgService().getMsgsIncludeSelf(peer, msgId, count, isReverseOrder);
   }
   static async recallMsg(peer: Peer, msgIds: string[]) {
     await napCatCore.session.getMsgService().recallMsg({
@@ -160,19 +205,29 @@ export class NTQQMsgApi {
     }, msgIds);
   }
   static async sendMsgV2(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-    // function generateMsgId() {
-    //   const timestamp = Math.floor(Date.now() / 1000);
-    //   const random = Math.floor(Math.random() * Math.pow(2, 32));
-    //   const buffer = Buffer.alloc(8);
-    //   buffer.writeUInt32BE(timestamp, 0);
-    //   buffer.writeUInt32BE(random, 4);
-    //   const msgId = BigInt("0x" + buffer.toString('hex')).toString();
-    //   return msgId;
-    // }
+    if (peer.chatType === ChatType.temp) {
+      //await NTQQMsgApi.PrepareTempChat().then().catch();
+    }
+    function generateMsgId() {
+      const timestamp = Math.floor(Date.now() / 1000);
+      const random = Math.floor(Math.random() * Math.pow(2, 32));
+      const buffer = Buffer.alloc(8);
+      buffer.writeUInt32BE(timestamp, 0);
+      buffer.writeUInt32BE(random, 4);
+      const msgId = BigInt("0x" + buffer.toString('hex')).toString();
+      return msgId;
+    }
     // 此处有采用Hack方法 利用数据返回正确得到对应消息
     // 与之前 Peer队列 MsgSeq队列 真正的MsgId并发不同
     // 谨慎采用 目前测试暂无问题  Developer.Mlikiowa
-    let msgId = await NTQQMsgApi.getMsgUnique(peer.chatType, await NTQQMsgApi.getServerTime());
+    let msgId: string;
+    try {
+      msgId = await NTQQMsgApi.getMsgUnique(peer.chatType, await NTQQMsgApi.getServerTime());
+    } catch (error) {
+      //if (!napCatCore.session.getMsgService()['generateMsgUniqueId'])
+      //兜底识别策略V2
+      msgId = generateMsgId().toString();
+    }
     let data = await NTEventDispatch.CallNormalEvent<
       (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
       (msgList: RawMessage[]) => void
@@ -206,7 +261,32 @@ export class NTQQMsgApi {
   }
   static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
     //唉？ ！我有个想法
-    let msgId = await NTQQMsgApi.getMsgUnique(peer.chatType, await NTQQMsgApi.getServerTime());
+    function generateMsgId() {
+      const timestamp = Math.floor(Date.now() / 1000);
+      const random = Math.floor(Math.random() * Math.pow(2, 32));
+      const buffer = Buffer.alloc(8);
+      buffer.writeUInt32BE(timestamp, 0);
+      buffer.writeUInt32BE(random, 4);
+      const msgId = BigInt("0x" + buffer.toString('hex')).toString();
+      return msgId;
+    }
+    // 此处有采用Hack方法 利用数据返回正确得到对应消息
+    // 与之前 Peer队列 MsgSeq队列 真正的MsgId并发不同
+    // 谨慎采用 目前测试暂无问题  Developer.Mlikiowa
+    let msgId: string;
+    try {
+      msgId = await NTQQMsgApi.getMsgUnique(peer.chatType, await NTQQMsgApi.getServerTime());
+    } catch (error) {
+      //if (!napCatCore.session.getMsgService()['generateMsgUniqueId'])
+      //兜底识别策略V2
+      msgId = generateMsgId();
+    }
+    if (peer.chatType === ChatType.temp && peer.guildId && peer.guildId !== '') {
+      let member = await getGroupMember(peer.guildId, peer.peerUid!);
+      if(member){
+        await NTQQMsgApi.PrepareTempChat(peer.peerUid,peer.guildId,member.nick);
+      }
+    }
     peer.guildId = msgId;
     let data = await NTEventDispatch.CallNormalEvent<
       (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
@@ -249,7 +329,7 @@ export class NTQQMsgApi {
     return NTEventDispatch.CallNoListenerEvent<() => string>('NodeIKernelMsgService/getServerTime', 5000);
   }
   static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-    return napCatCore.session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], new Map());
+    return napCatCore.session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], []);
   }
   static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage> {
     const msgInfos = msgIds.map(id => {

src/core/src/data.ts

@@ -80,9 +80,6 @@ export async function getGroupMember(groupQQ: string | number, memberUinOrUid: s
   }
   return member;
 }
-// 考虑优化 移入QQ缓存或使用Api直接获取
-export const tempGroupCodeMap: Record<string, string> = {};  // peerUid => 群号
-
 // 保留 需要频繁读写
 export const stat = {
   packet_received: 0,

src/core/src/entities/msg.ts

@@ -731,10 +731,12 @@ export interface MultiForwardMsgElement {
 }
 
 export interface RawMessage {
+  parentMsgPeer: Peer;
+  parentMsgIdList:string[];
+  id?: number;//扩展字段 用于处理OB11 ID
   guildId: string;
   msgRandom: string;
-  // int32, 自己维护的消息id
-  id?: number;
+
 
   msgId: string;
 

src/core/src/external/appid.json

@@ -11,6 +11,10 @@
         "appid": 537237950,
         "qua": "V1_LNX_NQ_3.2.12_26702_GW_B"
     },
+    "3.2.12-26740": {
+        "appid": 537237950,
+        "qua": "V1_WIN_NQ_9.9.15_26740_GW_B"
+    },
     "9.9.11-24815": {
         "appid": 537226656,
         "qua": "V1_WIN_NQ_9.9.11_24815_GW_B"
@@ -38,5 +42,9 @@
     "9.9.15-26702": {
         "appid": 537237765,
         "qua": "V1_WIN_NQ_9.9.15_26702_GW_B"
+    },
+    "9.9.15-26740": {
+        "appid": 537237765,
+        "qua": "V1_WIN_NQ_9.9.15_26702_GW_B"
     }
 }

src/core/src/services/NodeIKernelMsgService.ts

@@ -12,6 +12,21 @@ export interface QueryMsgsParams {
   isReverseOrder: boolean,
   isIncludeCurrent: boolean
 }
+export interface TmpChatInfoApi {
+  errMsg: string;
+  result: number;
+  tmpChatInfo?: TmpChatInfo;
+}
+
+export interface TmpChatInfo {
+  chatType: number;
+  fromNick: string;
+  groupCode: string;
+  peerUid: string;
+  sessionType: number;
+  sig: string;
+}
+
 export interface NodeIKernelMsgService {
 
   generateMsgUniqueId(chatType: number, time: string): string;
@@ -97,8 +112,8 @@ export interface NodeIKernelMsgService {
   recallMsg(...args: unknown[]): unknown;
 
   reeditRecallMsg(...args: unknown[]): unknown;
-
-  forwardMsg(...args: unknown[]): Promise<GeneralCallResult>;
+  //调用请检查除开commentElements其余参数不能为null
+  forwardMsg(msgIds: string[], srcContact: Peer, dstContacts: Peer[], commentElements: MessageElement[]): Promise<GeneralCallResult>;
 
   forwardMsgWithComment(...args: unknown[]): unknown;
 
@@ -156,6 +171,7 @@ export interface NodeIKernelMsgService {
 
   getAioFirstViewLatestMsgs(peer: Peer, num: number): unknown;
 
+  //deprecated 从9.9.15-26702版本开始，该接口已经废弃，请使用getMsgsEx
   getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>;
 
   getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
@@ -608,7 +624,7 @@ export interface NodeIKernelMsgService {
   sendSsoCmdReqByContend(cmd: string, param: string): Promise<unknown>;
 
   //chattype,uid->Promise<any>
-  getTempChatInfo(ChatType: number, Uid: string): unknown;
+  getTempChatInfo(ChatType: number, Uid: string): Promise<TmpChatInfoApi>;
 
   setContactLocalTop(...args: unknown[]): unknown;
 

src/core/src/sessionConfig.ts

@@ -77,7 +77,7 @@ export const sessionConfig: WrapperSessionInitConfig | any = {};
 export async function genSessionConfig(selfUin: string, selfUid: string, account_path: string): Promise<WrapperSessionInitConfig> {
   const downloadPath = path.join(account_path, 'NapCat', 'temp');
   fs.mkdirSync(downloadPath, { recursive: true });
-  let guid: string = await getMachineId();
+  let guid: string = await getMachineId();//26702 支持JS获取guid值 在LoginService中获取 TODO mlikiow a
   //console.log(guid);
   // guid =  '52afb776-82f6-4e59-9d38-44705b112d0a';
   //let guid: string = await getMachineId();

src/nwebui/Readme.md

@@ -0,0 +1,4 @@
+# NewWebui
+基于Vue3实现的现代化轻量化NapCat管理面板
+## 进度
+画饼

src/onebot11/action/extends/CreateCollection.ts

@@ -2,7 +2,6 @@
 import { NTQQCollectionApi } from '@/core/apis/collection';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/apis';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { selfInfo } from '@/core/data';
 

src/onebot11/action/extends/Debug.ts

@@ -1,16 +1,12 @@
 import BaseAction from '../BaseAction';
-// import * as ntqqApi from "../../../ntqqapi/api";
 import {
   NTQQMsgApi,
   NTQQFriendApi,
   NTQQGroupApi,
   NTQQUserApi,
   NTQQFileApi,
-  // NTQQFileCacheApi,
 } from '@/core';
 import { ActionName } from '../types';
-import { log, logDebug } from '@/common/utils/log';
-
 interface Payload {
   method: string,
   args: any[],
@@ -20,12 +16,8 @@ export default class Debug extends BaseAction<Payload, any> {
   actionName = ActionName.Debug;
 
   protected async _handle(payload: Payload): Promise<any> {
-    //logDebug('debug call ntqq api', payload);
-    const ntqqApi = [NTQQMsgApi, NTQQFriendApi, NTQQGroupApi, NTQQUserApi, NTQQFileApi,
-      // NTQQFileCacheApi,
-    ];
+    const ntqqApi = [NTQQMsgApi, NTQQFriendApi, NTQQGroupApi, NTQQUserApi, NTQQFileApi,];
     for (const ntqqApiClass of ntqqApi) {
-      // logDebug('ntqqApiClass', ntqqApiClass);
       const method = (<any>ntqqApiClass)[payload.method];
       if (method) {
         const result = method(...payload.args);
@@ -36,8 +28,5 @@ export default class Debug extends BaseAction<Payload, any> {
       }
     }
     throw `${payload.method}方法 不存在`;
-
-    // const info = await NTQQApi.getUserDetailInfo(friends[0].uid);
-    // return info
   }
 }

src/onebot11/action/extends/FetchCustomFace.ts

@@ -15,6 +15,7 @@ export class FetchCustomFace extends BaseAction<Payload, string[]> {
   actionName = ActionName.FetchCustomFace;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    //48 可能正好是QQ需要的一个页面的数量 Tagged Mlikiowa
     const ret = await NTQQMsgApi.fetchFavEmojiList(payload.count || 48);
     return ret.emojiInfoList.map(e => e.url);
   }

src/onebot11/action/extends/FetchEmojioLike.ts

@@ -5,28 +5,28 @@ import { ActionName } from '../types';
 import { NTQQMsgApi } from '@/core/apis';
 import { MessageUnique } from '@/common/utils/MessageUnique';
 const SchemaData = {
-    type: 'object',
-    properties: {
-        user_id: { type: 'string' },
-        group_id: { type: 'string' },
-        emojiId: { type: 'string' },
-        emojiType: { type: 'string' },
-        message_id: { type: ['string', 'number'] },
-        count: { type: 'number' }
-    },
-    required: ['emojiId', 'emojiType', 'message_id']
+  type: 'object',
+  properties: {
+    user_id: { type: 'string' },
+    group_id: { type: 'string' },
+    emojiId: { type: 'string' },
+    emojiType: { type: 'string' },
+    message_id: { type: ['string', 'number'] },
+    count: { type: 'number' }
+  },
+  required: ['emojiId', 'emojiType', 'message_id']
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
 
 export class FetchEmojioLike extends BaseAction<Payload, any> {
-    actionName = ActionName.FetchEmojioLike;
-    PayloadSchema = SchemaData;
-    protected async _handle(payload: Payload) {
-        let msgIdPeer = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
-        if(!msgIdPeer) throw new Error('消息不存在');
-        let msg = (await NTQQMsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0];
-        const ret = await NTQQMsgApi.getMsgEmojiLikesList(msgIdPeer.Peer,msg.msgSeq,payload.emojiId,payload.emojiType,payload.count);
-        return ret;
-    }
+  actionName = ActionName.FetchEmojioLike;
+  PayloadSchema = SchemaData;
+  protected async _handle(payload: Payload) {
+    const msgIdPeer = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
+    if (!msgIdPeer) throw new Error('消息不存在');
+    const msg = (await NTQQMsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0];
+    const ret = await NTQQMsgApi.getMsgEmojiLikesList(msgIdPeer.Peer, msg.msgSeq, payload.emojiId, payload.emojiType, payload.count);
+    return ret;
+  }
 }

src/onebot11/action/extends/GetCollectionList.ts

@@ -2,9 +2,7 @@
 import { NTQQCollectionApi } from '@/core/apis/collection';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/apis';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { selfInfo } from '@/core/data';
 
 const SchemaData = {
   type: 'object',

src/onebot11/action/extends/GetRobotUinRange.ts

@@ -5,7 +5,6 @@ export class GetRobotUinRange extends BaseAction<void, Array<any>> {
   actionName = ActionName.GetRobotUinRange;
 
   protected async _handle(payload: void) {
-    // console.log(await NTQQUserApi.getRobotUinRange());
     return await NTQQUserApi.getRobotUinRange();
   }
 }

src/onebot11/action/extends/OCRImage.ts

@@ -20,8 +20,8 @@ export class OCRImage extends BaseAction<Payload, any> {
   actionName = ActionName.OCRImage;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    const { path, isLocal, errMsg } = (await uri2local(payload.image));
-    if (errMsg) {
+    const { path, isLocal, errMsg, success } = (await uri2local(payload.image));
+    if (!success) {
       throw `OCR ${payload.image}失败,image字段可能格式不正确`;
     }
     if (path) {

src/onebot11/action/extends/SetGroupHeader.ts

@@ -1,10 +1,8 @@
 import BaseAction from '../BaseAction';
 import { ActionName, BaseCheckResult } from '../types';
 import * as fs from 'node:fs';
-import { NTQQUserApi } from '@/core/apis/user';
 import { checkFileReceived, uri2local } from '@/common/utils/file';
 import { NTQQGroupApi } from '@/core';
-// import { log } from "../../../common/utils";
 
 interface Payload {
   file: string,
@@ -26,8 +24,8 @@ export default class SetGroupHeader extends BaseAction<Payload, any> {
     };
   }
   protected async _handle(payload: Payload): Promise<any> {
-    const { path, isLocal, errMsg } = (await uri2local(payload.file));
-    if (errMsg) {
+    const { path, isLocal, errMsg,success } = (await uri2local(payload.file));
+    if (!success) {
       throw `头像${payload.file}设置失败,file字段可能格式不正确`;
     }
     if (path) {

src/onebot11/action/extends/SetLongNick.ts

@@ -1,4 +1,3 @@
-
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { NTQQUserApi } from '@/core/apis';

src/onebot11/action/extends/SetOnlineStatus.ts

@@ -1,5 +1,5 @@
 import BaseAction from '../BaseAction';
-import { ActionName, BaseCheckResult } from '../types';
+import { ActionName } from '../types';
 import { NTQQUserApi } from '@/core/apis';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 // 设置在线状态
@@ -20,12 +20,6 @@ export class SetOnlineStatus extends BaseAction<Payload, null> {
   actionName = ActionName.SetOnlineStatus;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    // 可设置状态
-    // { status: 10, extStatus: 1027, batteryStatus: 0 }
-    // { status: 30, extStatus: 0, batteryStatus: 0 }
-    // { status: 50, extStatus: 0, batteryStatus: 0 }
-    // { status: 60, extStatus: 0, batteryStatus: 0 }
-    // { status: 70, extStatus: 0, batteryStatus: 0 }
     const ret = await NTQQUserApi.setSelfOnlineStatus(payload.status, payload.extStatus, payload.batteryStatus);
     if (ret.result !== 0) {
       throw new Error('设置在线状态失败');

src/onebot11/action/extends/SetQQAvatar.ts

@@ -3,7 +3,6 @@ import { ActionName, BaseCheckResult } from '../types';
 import * as fs from 'node:fs';
 import { NTQQUserApi } from '@/core/apis/user';
 import { checkFileReceived, uri2local } from '@/common/utils/file';
-// import { log } from "../../../common/utils";
 
 interface Payload {
   file: string
@@ -24,8 +23,8 @@ export default class SetAvatar extends BaseAction<Payload, null> {
     };
   }
   protected async _handle(payload: Payload): Promise<null> {
-    const { path, isLocal, errMsg } = (await uri2local(payload.file));
-    if (errMsg) {
+    const { path, isLocal, errMsg, success } = (await uri2local(payload.file));
+    if (!success) {
       throw `头像${payload.file}设置失败,file字段可能格式不正确`;
     }
     if (path) {

src/onebot11/action/extends/TestApi01.ts

@@ -1,11 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName, BaseCheckResult } from '../types';
-import * as fs from 'node:fs';
-import { NTQQUserApi } from '@/core/apis/user';
-import { checkFileReceived, uri2local } from '@/common/utils/file';
 import { napCatCore, NTQQGroupApi } from '@/core';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-// import { log } from "../../../common/utils";
 
 const SchemaData = {
   type: 'object',
@@ -22,9 +18,7 @@ export default class TestApi01 extends BaseAction<Payload, any> {
   actionName = ActionName.TestApi01;
   // 用不着复杂检测
   protected async check(payload: Payload): Promise<BaseCheckResult> {
-    return {
-      valid: true,
-    };
+    return { valid: true };
   }
   protected async _handle(payload: Payload): Promise<any> {
     return await napCatCore.session.getMsgService().sendSsoCmdReqByContend(payload.cmd, payload.param);

src/onebot11/action/extends/TranslateEnWordToZn.ts

@@ -1,18 +1,14 @@
 import BaseAction from '../BaseAction';
-import { ActionName, BaseCheckResult } from '../types';
-import { NTQQSystemApi, NTQQUserApi } from '@/core/apis';
+import { ActionName } from '../types';
+import { NTQQSystemApi } from '@/core/apis';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import Ajv from 'ajv';
-// 设置在线状态
 
 const SchemaData = {
   type: 'object',
   properties: {
     words: {
       type: 'array',
-      items: {
-        type: 'string',
-      }
+      items: { type: 'string' }
     }
   },
   required: ['words'],

src/onebot11/action/file/DelGroupFile.ts

@@ -1,7 +1,7 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
+import { NTQQGroupApi } from '@/core/apis';
 
 const SchemaData = {
   type: 'object',

src/onebot11/action/file/GetFile.ts

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
 import fs from 'fs/promises';
 import { ob11Config } from '@/onebot11/config';
 import { UUIDConverter } from '@/common/utils/helper';
-import { ActionName, BaseCheckResult } from '../types';
+import { ActionName } from '../types';
 import { ChatType, ElementType, FileElement, Peer, RawMessage, VideoElement } from '@/core/entities';
 import { NTQQFileApi, NTQQFriendApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';

src/onebot11/action/go-cqhttp/GetForwardMsg.ts

@@ -24,12 +24,12 @@ export class GoCQHTTPGetForwardMsgAction extends BaseAction<Payload, any> {
   actionName = ActionName.GoCQHTTP_GetForwardMsg;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<any> {
-    const msgId = payload.message_id || payload.id;
-    if (!msgId) {
-      throw Error('message_id is required');
+    const msgIdMixOb11Id = payload.message_id || payload.id;
+    if (!msgIdMixOb11Id) {
+      throw Error('message_id or id is required');
     }
-    const rootMsgId = MessageUnique.getShortIdByMsgId(msgId);
-    const rootMsg = MessageUnique.getMsgIdAndPeerByShortId(rootMsgId || parseInt(msgId));
+    const rootMsgId = MessageUnique.getShortIdByMsgId(msgIdMixOb11Id);
+    const rootMsg = MessageUnique.getMsgIdAndPeerByShortId(rootMsgId || parseInt(msgIdMixOb11Id));
     if (!rootMsg) {
       throw Error('msg not found');
     }
@@ -40,7 +40,7 @@ export class GoCQHTTPGetForwardMsgAction extends BaseAction<Payload, any> {
     const msgList = data.msgList;
     const messages = await Promise.all(msgList.map(async msg => {
       const resMsg = await OB11Constructor.message(msg);
-      resMsg.message_id = await MessageUnique.createMsg({ guildId:'',chatType:msg.chatType,peerUid:msg.peerUid },msg.msgId)!;
+      resMsg.message_id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)!;
       return resMsg;
     }));
     messages.map(msg => {

src/onebot11/action/go-cqhttp/GetFriendMsgHistory.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { OB11Message, OB11User } from '../../types';
 import { ActionName } from '../types';
-import { ChatType } from '@/core/entities';
+import { ChatType, RawMessage } from '@/core/entities';
 import { NTQQMsgApi } from '@/core/apis/msg';
 import { OB11Constructor } from '../../constructor';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -17,9 +17,10 @@ const SchemaData = {
   properties: {
     user_id: { type: ['number', 'string'] },
     message_seq: { type: 'number' },
-    count: { type: 'number' }
+    count: { type: 'number' },
+    reverseOrder: { type: 'boolean' }
   },
-  required: ['user_id', 'message_seq', 'count']
+  required: ['user_id']
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
@@ -28,21 +29,29 @@ export default class GetFriendMsgHistory extends BaseAction<Payload, Response> {
   actionName = ActionName.GetFriendMsgHistory;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<Response> {
+    //处理参数
     const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
-    if (!uid) {
-      throw `记录${payload.user_id}不存在`;
-    }
-    const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(payload.message_seq))?.MsgId || '0';
+    const MsgCount = payload.count || 20;
+    const isReverseOrder = payload.reverseOrder || true;
+    if (!uid) throw `记录${payload.user_id}不存在`;
     const friend = await NTQQFriendApi.isBuddy(uid);
-    const historyResult = (await NTQQMsgApi.getMsgHistory({
-      chatType: friend ? ChatType.friend : ChatType.temp,
-      peerUid: uid
-    }, startMsgId, parseInt(payload.count?.toString()) || 20));
-    //logDebug(historyResult);
-    const msgList = historyResult.msgList;
+    const peer = { chatType: friend ? ChatType.friend : ChatType.temp, peerUid: uid };
+
+    //拉取消息
+    let msgList: RawMessage[];
+    if (!payload.message_seq || payload.message_seq == 0) {
+      msgList = (await NTQQMsgApi.getLastestMsgByUids(peer, MsgCount)).msgList;
+    } else {
+      const startMsgId = MessageUnique.getMsgIdAndPeerByShortId(payload.message_seq)?.MsgId;
+      if (!startMsgId) throw `消息${payload.message_seq}不存在`;
+      msgList = (await NTQQMsgApi.getMsgHistory(peer, startMsgId, MsgCount)).msgList;
+    }
+    if(isReverseOrder) msgList.reverse();
     await Promise.all(msgList.map(async msg => {
-      msg.id = await MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
+      msg.id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
     }));
+    
+    //转换消息
     const ob11MsgList = await Promise.all(msgList.map(msg => OB11Constructor.message(msg)));
     return { 'messages': ob11MsgList };
   }

src/onebot11/action/go-cqhttp/GetGroupHonorInfo.ts

@@ -6,7 +6,7 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
   type: 'object',
   properties: {
-    group_id: { type: [ 'number' , 'string' ] },
+    group_id: { type: ['number', 'string'] },
     type: { enum: [WebHonorType.ALL, WebHonorType.EMOTION, WebHonorType.LEGEND, WebHonorType.PERFROMER, WebHonorType.STORONGE_NEWBI, WebHonorType.TALKACTIVE] }
   },
   required: ['group_id']

src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
 import { OB11Message, OB11User } from '../../types';
 import { getGroup, groups } from '@/core/data';
 import { ActionName } from '../types';
-import { ChatType, RawMessage } from '@/core/entities';
+import { ChatType, Peer, RawMessage } from '@/core/entities';
 import { NTQQMsgApi } from '@/core/apis/msg';
 import { OB11Constructor } from '../../constructor';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -16,7 +16,8 @@ const SchemaData = {
   properties: {
     group_id: { type: ['number', 'string'] },
     message_seq: { type: 'number' },
-    count: { type: 'number' }
+    count: { type: 'number' },
+    reverseOrder: { type: 'boolean' }
   },
   required: ['group_id']
 } as const satisfies JSONSchema;
@@ -27,25 +28,28 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
   actionName = ActionName.GoCQHTTP_GetGroupMsgHistory;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<Response> {
+    //处理参数
     const group = await getGroup(payload.group_id.toString());
-    if (!group) {
-      throw `群${payload.group_id}不存在`;
-    }
-    let targetMsgShortId, count = parseInt(payload.count?.toString() ?? '20');
-    const peer = {
-      chatType: ChatType.group,
-      peerUid: group.groupCode
-    };
+    const isReverseOrder = payload.reverseOrder || true;
+    const MsgCount = payload.count || 20;
+    const peer: Peer = { chatType: ChatType.group, peerUid: payload.group_id.toString() };
+    if (!group) throw `群${payload.group_id}不存在`;
+
+    //拉取消息
     let msgList: RawMessage[];
-    if (!payload.message_seq) {
-      msgList = (await NTQQMsgApi.getLastestMsgByUids(peer, count)).msgList;
+    if (!payload.message_seq || payload.message_seq == 0) {
+      msgList = (await NTQQMsgApi.getLastestMsgByUids(peer, MsgCount)).msgList;
     } else {
-      const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(targetMsgShortId ?? (payload.message_seq ?? 0)))?.MsgId || '0';
-      msgList = (await NTQQMsgApi.getMsgHistory(peer, startMsgId, count)).msgList;
+      const startMsgId = MessageUnique.getMsgIdAndPeerByShortId(payload.message_seq)?.MsgId;
+      if (!startMsgId) throw `消息${payload.message_seq}不存在`;
+      msgList = (await NTQQMsgApi.getMsgHistory(peer, startMsgId, MsgCount)).msgList;
     }
+    if(isReverseOrder) msgList.reverse();
     await Promise.all(msgList.map(async msg => {
-      msg.id = await MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
+      msg.id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
     }));
+
+    //转换消息
     const ob11MsgList = await Promise.all(msgList.map(msg => OB11Constructor.message(msg)));
     return { 'messages': ob11MsgList };
   }

src/onebot11/action/go-cqhttp/GetStrangerInfo.ts

@@ -44,7 +44,6 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11Use
     } else {
       const user_id = payload.user_id.toString();
       const extendData = await NTQQUserApi.getUserDetailInfoByUinV2(user_id);
-      //console.log(extendData);
       const uid = (await NTQQUserApi.getUidByUin(user_id))!;
       if (!uid || uid.indexOf('*') != -1) {
         const ret = {

src/onebot11/action/go-cqhttp/SendGroupNotice.ts

@@ -7,7 +7,7 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
   type: 'object',
   properties: {
-    group_id: { type: [ 'number' , 'string' ] },
+    group_id: { type: ['number', 'string'] },
     content: { type: 'string' },
     image: { type: 'string' },
     pinned: { type: 'number' },
@@ -24,8 +24,8 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
     let UploadImage: { id: string, width: number, height: number } | undefined = undefined;
     if (payload.image) {
       //公告图逻辑
-      const { errMsg, path, isLocal } = (await uri2local(payload.image));
-      if (errMsg) {
+      const { errMsg, path, isLocal, success } = (await uri2local(payload.image));
+      if (!success) {
         throw `群公告${payload.image}设置失败,image字段可能格式不正确`;
       }
       if (!path) {
@@ -54,8 +54,6 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
     if (PublishGroupBulletinResult.result != 0) {
       throw `设置群公告失败,错误信息:${PublishGroupBulletinResult.errMsg}`;
     }
-    // 下面实现扬了
-    //await WebApi.setGroupNotice(payload.group_id, payload.content) ;
     return null;
   }
 }

src/onebot11/action/go-cqhttp/UploadGroupFile.ts

@@ -4,7 +4,7 @@ import { ActionName } from '../types';
 import { SendMsgElementConstructor } from '@/core/entities/constructor';
 import { ChatType, SendFileElement } from '@/core/entities';
 import fs from 'fs';
-import { SendMsg, sendMsg } from '@/onebot11/action/msg/SendMsg';
+import { sendMsg } from '@/onebot11/action/msg/SendMsg';
 import { uri2local } from '@/common/utils/file';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
@@ -34,7 +34,7 @@ export default class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
       file = `file://${file}`;
     }
     const downloadResult = await uri2local(file);
-    if (downloadResult.errMsg) {
+    if (!downloadResult.success) {
       throw new Error(downloadResult.errMsg);
     }
     const sendFileEle: SendFileElement = await SendMsgElementConstructor.file(downloadResult.path, payload.name, payload.folder_id);

src/onebot11/action/go-cqhttp/UploadPrivareFile.ts

@@ -1,10 +1,9 @@
 import BaseAction from '../BaseAction';
-import { getGroup } from '@/core/data';
 import { ActionName } from '../types';
 import { SendMsgElementConstructor } from '@/core/entities/constructor';
 import { ChatType, Peer, SendFileElement } from '@/core/entities';
 import fs from 'fs';
-import { SendMsg, sendMsg } from '@/onebot11/action/msg/SendMsg';
+import { sendMsg } from '@/onebot11/action/msg/SendMsg';
 import { uri2local } from '@/common/utils/file';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { NTQQFriendApi, NTQQUserApi } from '@/core';
@@ -41,7 +40,7 @@ export default class GoCQHTTPUploadPrivateFile extends BaseAction<Payload, null>
       file = `file://${file}`;
     }
     const downloadResult = await uri2local(file);
-    if (downloadResult.errMsg) {
+    if (!downloadResult.success) {
       throw new Error(downloadResult.errMsg);
     }
     const sendFileEle: SendFileElement = await SendMsgElementConstructor.file(downloadResult.path, payload.name);

src/onebot11/action/group/GetGroupEssence.ts

@@ -1,9 +1,5 @@
-import { getGroup } from '@/core/data';
-import { OB11Group } from '../../types';
-import { OB11Constructor } from '../../constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQMsgApi } from '@/core/apis/msg';
 import { GroupEssenceMsgRet, WebApi } from '@/core/apis/webapi';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 

src/onebot11/action/group/GetGroupList.ts

@@ -5,7 +5,6 @@ import { ActionName } from '../types';
 import { NTQQGroupApi } from '@/core/apis';
 import { Group } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-// no_cache get时传字符串
 const SchemaData = {
   type: 'object',
   properties: {
@@ -19,7 +18,7 @@ class GetGroupList extends BaseAction<Payload, OB11Group[]> {
   actionName = ActionName.GetGroupList;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    let groupList: Group[]  = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload.no_cache === 'true');
+    const groupList: Group[]  = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload.no_cache === 'true');
     return OB11Constructor.groups(groupList);
   }
 }

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -26,11 +26,11 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
     const isNocache = payload.no_cache == true || payload.no_cache === 'true';
-    let uid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
+    const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
     if (!uid) {
       throw (`Uin2Uid Error ${payload.user_id}不存在`);
     }
-    let member = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache);
+    const member = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache);
     if (!member) {
       throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
     }
@@ -44,7 +44,7 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
     const date = Math.round(Date.now() / 1000);
     const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
     if (!requireMinNTQQBuild('26702')) {
-      let SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), selfInfo.uid, isNocache);
+      const SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), selfInfo.uid, isNocache);
       let isPrivilege = false;
       if (SelfInfoInGroup) {
         isPrivilege = SelfInfoInGroup.role === 3 || SelfInfoInGroup.role === 4;

src/onebot11/action/group/GetGroupMemberInfoOld.ts

@@ -28,7 +28,7 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
     if (requireMinNTQQBuild('26702')) {
-      let V2Data = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), payload.user_id.toString(), payload.no_cache == true || payload.no_cache === 'true');
+      const V2Data = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), payload.user_id.toString(), payload.no_cache == true || payload.no_cache === 'true');
       if (V2Data) {
         return OB11Constructor.groupMember(payload.group_id.toString(), V2Data);
       } else {

src/onebot11/action/group/GetGroupMemberList.ts

@@ -30,7 +30,7 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
     if (!group) {
       throw (`群${payload.group_id}不存在`);
     }
-    let groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
+    const groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
     let _groupMembers = Array.from(groupMembers.values())
       .map(item => { return OB11Constructor.groupMember(group.groupCode, item); });
 

src/onebot11/action/group/SetEssenceMsg.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { NTQQGroupApi, NTQQMsgApi } from '@/core';
+import { NTQQGroupApi } from '@/core';
 import { MessageUnique } from '@/common/utils/MessageUnique';
 
 const SchemaData = {
@@ -18,7 +18,7 @@ export default class SetEssenceMsg extends BaseAction<Payload, any> {
   actionName = ActionName.SetEssenceMsg;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<any> {
-    const msg = await MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
+    const msg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
     if (!msg) {
       throw new Error('msg not found');
     }

src/onebot11/action/group/SetGroupAddRequest.ts

@@ -9,7 +9,7 @@ const SchemaData = {
   properties: {
     flag: { type: 'string' },
     approve: { type: ['string', 'boolean'] },
-    reason: { type: 'string', nullable: true, }
+    reason: { type: 'string', nullable: true }
   },
   required: ['flag'],
 } as const satisfies JSONSchema;
@@ -24,7 +24,7 @@ export default class SetGroupAddRequest extends BaseAction<Payload, null> {
     const approve = payload.approve?.toString() !== 'false';
     await NTQQGroupApi.handleGroupRequest(flag,
       approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
-      payload.reason
+      payload.reason || ''
     );
     return null;
   }

src/onebot11/action/group/SetGroupBan.ts

@@ -3,6 +3,7 @@ import { getGroupMember } from '@/core/data';
 import { ActionName } from '../types';
 import { NTQQGroupApi } from '@/core/apis/group';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { NTQQUserApi } from '@/core';
 
 const SchemaData = {
   type: 'object',
@@ -20,12 +21,8 @@ export default class SetGroupBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupBan;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await getGroupMember(payload.group_id, payload.user_id);
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`;
-    }
     await NTQQGroupApi.banMember(payload.group_id.toString(),
-      [{ uid: member.uid, timeStamp: parseInt(payload.duration.toString()) }]);
+      [{ uid: (await NTQQUserApi.getUidByUin(payload.user_id.toString()))!, timeStamp: parseInt(payload.duration.toString()) }]);
     return null;
   }
 }

src/onebot11/action/group/SetGroupKick.ts

@@ -3,6 +3,7 @@ import { getGroupMember } from '@/core/data';
 import { ActionName } from '../types';
 import { NTQQGroupApi } from '@/core/apis/group';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { NTQQUserApi } from '@/core';
 
 
 const SchemaData = {
@@ -21,12 +22,8 @@ export default class SetGroupKick extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupKick;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await getGroupMember(payload.group_id, payload.user_id);
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`;
-    }
     const rejectReq = payload.reject_add_request?.toString() == 'true';
-    await NTQQGroupApi.kickMember(payload.group_id.toString(), [member.uid], rejectReq);
+    await NTQQGroupApi.kickMember(payload.group_id.toString(), [(await NTQQUserApi.getUidByUin(payload.user_id.toString()))!], rejectReq);
     return null;
   }
 }

src/onebot11/action/index.ts

@@ -35,9 +35,7 @@ import SetGroupCard from './group/SetGroupCard';
 import GetImage from './file/GetImage';
 import GetRecord from './file/GetRecord';
 import { GoCQHTTPMarkMsgAsRead, MarkAllMsgAsRead, MarkGroupMsgAsRead, MarkPrivateMsgAsRead } from './msg/MarkMsgAsRead';
-import CleanCache from './system/CleanCache';
 import GoCQHTTPUploadGroupFile from './go-cqhttp/UploadGroupFile';
-import { GetConfigAction, SetConfigAction } from '@/onebot11/action/extends/Config';
 import GetGroupAddRequest from '@/onebot11/action/extends/GetGroupAddRequest';
 import SetQQAvatar from '@/onebot11/action/extends/SetQQAvatar';
 import GoCQHTTPDownloadFile from './go-cqhttp/DownloadFile';

src/onebot11/action/msg/DeleteMsg.ts

@@ -3,12 +3,15 @@ import { ActionName } from '../types';
 import BaseAction from '../BaseAction';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/utils/MessageUnique';
+import { sleep } from '@/common/utils/helper';
+import { NTEventDispatch } from '@/common/utils/EventTask';
+import { NodeIKernelMsgListener } from '@/core';
 
 const SchemaData = {
   type: 'object',
   properties: {
     message_id: {
-      oneOf:[
+      oneOf: [
         { type: 'number' },
         { type: 'string' }
       ]
@@ -23,9 +26,27 @@ class DeleteMsg extends BaseAction<Payload, void> {
   actionName = ActionName.DeleteMsg;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    const msg = await MessageUnique.getMsgIdAndPeerByShortId(Number(payload.message_id));
+    const msg = MessageUnique.getMsgIdAndPeerByShortId(Number(payload.message_id));
     if (msg) {
+      const ret = NTEventDispatch.RegisterListen<NodeIKernelMsgListener['onMsgInfoListUpdate']>
+      (
+        'NodeIKernelMsgListener/onMsgInfoListUpdate',
+        1,
+        5000,
+        (msgs) => {
+          if (msgs.find(m => m.msgId === msg.MsgId && m.recallTime !== '0')) {
+            return true;
+          }
+          return false;
+        }
+      ).catch(e => new Promise<undefined>((resolve, reject) => { resolve(undefined); }));
       await NTQQMsgApi.recallMsg(msg.Peer, [msg.MsgId]);
+      const data = await ret;
+      if (!data) {
+        throw new Error('Recall failed');
+      }
+      //await sleep(100);
+      //await NTQQMsgApi.getMsgsByMsgId(msg.Peer, [msg.MsgId]);
     }
   }
 }

src/onebot11/action/msg/ForwardSingleMsg.ts

@@ -30,7 +30,7 @@ class ForwardSingleMsg extends BaseAction<Payload, null> {
   }
 
   protected async _handle(payload: Payload): Promise<null> {
-    const msg = await MessageUnique.getMsgIdAndPeerByShortId(payload.message_id);
+    const msg = MessageUnique.getMsgIdAndPeerByShortId(payload.message_id);
     if (!msg) {
       throw new Error(`无法找到消息${payload.message_id}`);
     }

src/onebot11/action/msg/GetMsg.ts

@@ -27,8 +27,8 @@ class GetMsg extends BaseAction<Payload, OB11Message> {
     if (!payload.message_id) {
       throw Error('参数message_id不能为空');
     }
-    const MsgShortId = await MessageUnique.getShortIdByMsgId(payload.message_id.toString());
-    const msgIdWithPeer = await MessageUnique.getMsgIdAndPeerByShortId(MsgShortId || parseInt(payload.message_id.toString()));
+    const MsgShortId = MessageUnique.getShortIdByMsgId(payload.message_id.toString());
+    const msgIdWithPeer = MessageUnique.getMsgIdAndPeerByShortId(MsgShortId || parseInt(payload.message_id.toString()));
     if (!msgIdWithPeer) {
       throw ('消息不存在');
     }

src/onebot11/action/msg/SendMsg/create-send-elements.ts

@@ -6,6 +6,7 @@ import {
   IdMusicSignPostData,
   NTQQFileApi,
   NTQQMsgApi,
+  Peer,
   SendArkElement,
   SendMessageElement,
   SendMsgElementConstructor,
@@ -17,19 +18,19 @@ import { uri2local } from '@/common/utils/file';
 import { ob11Config } from '@/onebot11/config';
 import { RequestUtil } from '@/common/utils/request';
 import { MessageUnique } from '@/common/utils/MessageUnique';
-
+console.log(process.pid);
 export type MessageContext = {
-  group?: Group,
   deleteAfterSentFiles: string[],
+  peer:Peer
 }
 async function handleOb11FileLikeMessage(
   { data: inputdata }: OB11MessageFileBase,
   { deleteAfterSentFiles }: MessageContext
 ) {
-  //有的奇怪的框架将url作为参数 而不是file 此时优先url
-  const { path, isLocal, fileName, errMsg } = (await uri2local(inputdata?.url || inputdata.file));
+  //有的奇怪的框架将url作为参数 而不是file 此时优先url 同时注意可能传入的是非file://开头的目录 By Mlikiowa
+  const { path, isLocal, fileName, errMsg,success } = (await uri2local(inputdata?.url || inputdata.file));
 
-  if (errMsg) {
+  if (!success) {
     logError('文件下载失败', errMsg);
     throw Error('文件下载失败' + errMsg);
   }
@@ -52,12 +53,12 @@ const _handlers: {
   [OB11MessageDataType.text]: async ({ data: { text } }) => SendMsgElementConstructor.text(text),
 
   [OB11MessageDataType.at]: async ({ data: { qq: atQQ } }, context) => {
-    if (!context.group) return undefined;
+    if (!context.peer) return undefined;
 
     if (atQQ === 'all') return SendMsgElementConstructor.at(atQQ, atQQ, AtType.atAll, '全体成员');
 
     // then the qq is a group member
-    const atMember = await getGroupMember(context.group.groupCode, atQQ);
+    const atMember = await getGroupMember(context.peer.peerUid, atQQ);
     return atMember ?
       SendMsgElementConstructor.at(atQQ, atMember.uid, AtType.atUser, atMember.cardName || atMember.nick) :
       undefined;
@@ -206,7 +207,7 @@ const handlers = <{
 
 export default async function createSendElements(
   messageData: OB11MessageData[],
-  group?: Group,
+  peer: Peer,
   ignoreTypes: OB11MessageDataType[] = []
 ) {
   const deleteAfterSentFiles: string[] = [];
@@ -217,7 +218,7 @@ export default async function createSendElements(
     }
     const callResult = handlers[sendMsg.type](
       sendMsg,
-      { group, deleteAfterSentFiles }
+      { peer, deleteAfterSentFiles }
     )?.catch(undefined);
     callResultList.push(callResult);
   }
@@ -228,7 +229,7 @@ export default async function createSendElements(
 
 export async function createSendElementsParallel(
   messageData: OB11MessageData[],
-  group?: Group,
+  peer: Peer,
   ignoreTypes: OB11MessageDataType[] = []
 ) {
   const deleteAfterSentFiles: string[] = [];
@@ -236,7 +237,7 @@ export async function createSendElementsParallel(
     await Promise.all(
       messageData.map(async sendMsg => ignoreTypes.includes(sendMsg.type) ?
         undefined :
-        handlers[sendMsg.type](sendMsg, { group, deleteAfterSentFiles }))
+        handlers[sendMsg.type](sendMsg, { peer, deleteAfterSentFiles }))
     ).then(
       results => results.filter(
         element => element !== undefined

src/onebot11/action/msg/SendMsg/handle-forward-node.ts

@@ -1,5 +1,5 @@
 import { ChatType, ElementType, Group, NTQQMsgApi, Peer, RawMessage, SendMessageElement } from '@/core';
-import { OB11MessageNode } from '@/onebot11/types';
+import { OB11MessageDataType, OB11MessageNode } from '@/onebot11/types';
 import { selfInfo } from '@/core/data';
 import createSendElements from '@/onebot11/action/msg/SendMsg/create-send-elements';
 import { logDebug, logError } from '@/common/utils/log';
@@ -24,135 +24,92 @@ async function cloneMsg(msg: RawMessage): Promise<RawMessage | undefined> {
   if (sendElements.length === 0) {
     logDebug('需要clone的消息无法解析，将会忽略掉', msg);
   }
-
-  //logDebug('克隆消息', sendElements);
-
   try {
     const nodeMsg = await NTQQMsgApi.sendMsg(selfPeer, sendElements, true);
-    await sleep(500); // 防止风控
     return nodeMsg;
   } catch (e) {
     logError(e, '克隆转发消息失败,将忽略本条消息', msg);
   }
 }
 
-export async function handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[], group: Group | undefined): Promise<RawMessage | null> {
+export async function handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[]): Promise<RawMessage | null> {
   const selfPeer = {
     chatType: ChatType.friend,
     peerUid: selfInfo.uid
   };
   let nodeMsgIds: string[] = [];
-
-  // 先判断一遍是不是id和自定义混用
-  const needClone =
-    messageNodes.filter(node => node.data.id).length &&
-    messageNodes.filter(node => !node.data.id).length;
-
   for (const messageNode of messageNodes) {
-    // 一个node表示一个人的消息
     const nodeId = messageNode.data.id;
-    // 有nodeId表示一个子转发消息卡片
     if (nodeId) {
-      const nodeMsg = MessageUnique.getPeerByMsgId(nodeId);
-      if (!needClone) {
-        nodeMsgIds.push(nodeMsg!.MsgId);
-      } else {
-        if (nodeMsg!.Peer.peerUid !== selfInfo.uid) {
-          // need cloning
-          const rawClone = await NTQQMsgApi.getMsgsByMsgId(nodeMsg?.Peer!, [nodeMsg?.MsgId!]);
-          const clonedMsg = await cloneMsg(rawClone.msgList[0]);
-          if (clonedMsg) {
-            nodeMsgIds.push(clonedMsg.msgId);
-          }
-        }
+      //对Mgsid和OB11ID混用情况兜底
+      const nodeMsg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(nodeId)) || MessageUnique.getPeerByMsgId(nodeId);
+      if (!nodeMsg) {
+        logError('转发消息失败，未找到消息', nodeId);
+        continue;
       }
+      nodeMsgIds.push(nodeMsg.MsgId);
     } else {
       // 自定义的消息
-      // 提取消息段，发给自己生成消息id
       try {
-        const { sendElements } = await createSendElements(normalize(messageNode.data.content), group);
-        //logDebug('开始生成转发节点', sendElements);
-        const sendElementsSplit: SendMessageElement[][] = [];
-        let splitIndex = 0;
-        for (const sendElement of sendElements) {
-          if (!sendElementsSplit[splitIndex]) {
-            sendElementsSplit[splitIndex] = [];
-          }
-
-          if (sendElement.elementType === ElementType.FILE || sendElement.elementType === ElementType.VIDEO) {
-            if (sendElementsSplit[splitIndex].length > 0) {
-              splitIndex++;
-            }
-            sendElementsSplit[splitIndex] = [sendElement];
-            splitIndex++;
-          } else {
-            sendElementsSplit[splitIndex].push(sendElement);
-          }
-          //logDebug(sendElementsSplit);
+        const OB11Data = normalize(messageNode.data.content);
+        //筛选node消息
+        const isNodeMsg = OB11Data.filter(e => e.type === OB11MessageDataType.node).length;//找到子转发消息
+        if (isNodeMsg !== 0) {
+          if (isNodeMsg !== OB11Data.length) { logError('子消息中包含非node消息 跳过不合法部分'); continue; }
+          const nodeMsg = await handleForwardNode(selfPeer, OB11Data.filter(e => e.type === OB11MessageDataType.node));
+          if (nodeMsg) { nodeMsgIds.push(nodeMsg.msgId); MessageUnique.createMsg(selfPeer, nodeMsg.msgId); }
+          //完成子卡片生成跳过后续
+          continue;
         }
-        // log("分割后的转发节点", sendElementsSplit)
+        const { sendElements } = await createSendElements(OB11Data, destPeer);
+        //拆分消息
+        const MixElement = sendElements.filter(element => element.elementType !== ElementType.FILE && element.elementType !== ElementType.VIDEO);
+        const SingleElement = sendElements.filter(element => element.elementType === ElementType.FILE || element.elementType === ElementType.VIDEO).map(e => [e]);
+        const AllElement: SendMessageElement[][] = [MixElement, ...SingleElement].filter(e => e !== undefined && e.length !== 0);
         const MsgNodeList: Promise<RawMessage | undefined>[] = [];
-        for (const sendElementsSplitElement of sendElementsSplit) {
-          MsgNodeList.push(sendMsg(selfPeer, sendElementsSplitElement, [], true));
-          await sleep(Math.trunc(sendElementsSplit.length / 10) * 100);
-          //await sleep(10);
+        for (const sendElementsSplitElement of AllElement) {
+          MsgNodeList.push(sendMsg(selfPeer, sendElementsSplitElement, [], true).catch(e => new Promise((resolve, reject) => { resolve(undefined); })));
         }
-        for (const msgNode of MsgNodeList) {
-          const result = await msgNode;
-          if (result) {
-            nodeMsgIds.push(result.msgId);
+        (await Promise.allSettled(MsgNodeList)).map((result) => {
+          if (result.status === 'fulfilled' && result.value) {
+            nodeMsgIds.push(result.value.msgId);
+            MessageUnique.createMsg(selfPeer, result.value.msgId);
           }
-          //logDebug('转发节点生成成功', result.msgId);
-        }
+        });
       } catch (e) {
         logDebug('生成转发消息节点失败', e);
       }
     }
   }
-  // 检查srcPeer是否一致，不一致则需要克隆成自己的消息, 让所有srcPeer都变成自己的，使其保持一致才能够转发
   const nodeMsgArray: Array<RawMessage> = [];
-
   let srcPeer: Peer | undefined = undefined;
   let needSendSelf = false;
+  //检测是否处于同一个Peer 不在同一个peer则全部消息由自身发送
   for (const msgId of nodeMsgIds) {
-    const nodeMsgPeer = await MessageUnique.getPeerByMsgId(msgId);
-    const nodeMsg = (await NTQQMsgApi.getMsgsByMsgId(nodeMsgPeer?.Peer!, [msgId])).msgList[0];
-    if (nodeMsg) {
-      nodeMsgArray.push(nodeMsg);
-      if (!srcPeer) {
-        srcPeer = { chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid };
-      } else if (srcPeer.peerUid !== nodeMsg.peerUid) {
-        needSendSelf = true;
-        srcPeer = selfPeer;
-      }
+    const nodeMsgPeer = MessageUnique.getPeerByMsgId(msgId);
+    if (!nodeMsgPeer) {
+      logError('转发消息失败，未找到消息', msgId);
+      continue;
     }
+    const nodeMsg = (await NTQQMsgApi.getMsgsByMsgId(nodeMsgPeer.Peer, [msgId])).msgList[0];
+    srcPeer = srcPeer ?? { chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid };
+    if (srcPeer.peerUid !== nodeMsg.peerUid) {
+      needSendSelf = true;
+    }
+    nodeMsgArray.push(nodeMsg);
   }
-  // logDebug('nodeMsgArray', nodeMsgArray);
   nodeMsgIds = nodeMsgArray.map(msg => msg.msgId);
+  let retMsgIds: string[] = [];
   if (needSendSelf) {
-    //logDebug('需要克隆转发消息');
     for (const [index, msg] of nodeMsgArray.entries()) {
-      if (msg.peerUid !== selfInfo.uid) {
-        const clonedMsg = await cloneMsg(msg);
-        if (clonedMsg) {
-          nodeMsgIds[index] = clonedMsg.msgId;
-        }
-      }
+      if (msg.peerUid === selfInfo.uid) continue;
+      const ClonedMsg = await cloneMsg(msg);
+      if (ClonedMsg) retMsgIds.push(ClonedMsg.msgId);
     }
+  } else {
+    retMsgIds = nodeMsgIds;
   }
-  // elements之间用换行符分隔
-  // let _sendForwardElements: SendMessageElement[] = []
-  // for(let i = 0; i < sendForwardElements.length; i++){
-  //     _sendForwardElements.push(sendForwardElements[i])
-  //     _sendForwardElements.push(SendMsgElementConstructor.text("\n\n"))
-  // }
-  // const nodeMsg = await NTQQApi.sendMsg(selfPeer, _sendForwardElements, true);
-  // nodeIds.push(nodeMsg.msgId)
-  // await sleep(500);
-  // 开发转发
-  if (nodeMsgIds.length === 0) {
-    throw Error('转发消息失败，生成节点为空');
-  }
+  if (nodeMsgIds.length === 0) throw Error('转发消息失败，生成节点为空');
   try {
     logDebug('开发转发', srcPeer, destPeer, nodeMsgIds);
     return await NTQQMsgApi.multiForwardMsg(srcPeer!, destPeer, nodeMsgIds);

src/onebot11/action/msg/SendMsg/index.ts

@@ -67,7 +67,7 @@ export async function sendMsg(peer: Peer, sendElements: SendMessageElement[], de
   }
   const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, timeout);
   try {
-    returnMsg!.id = await MessageUnique.createMsg({ chatType: peer.chatType, guildId: '', peerUid: peer.peerUid }, returnMsg!.msgId);
+    returnMsg!.id = MessageUnique.createMsg({ chatType: peer.chatType, guildId: '', peerUid: peer.peerUid }, returnMsg!.msgId);
   } catch (e: any) {
     logDebug('发送消息id获取失败', e);
     returnMsg!.id = 0;
@@ -76,9 +76,7 @@ export async function sendMsg(peer: Peer, sendElements: SendMessageElement[], de
   return returnMsg;
 }
 
-async function createContext(payload: OB11PostSendMsg, contextMode: ContextMode): Promise<{
-  peer: Peer, group?: Group
-}> {
+async function createContext(payload: OB11PostSendMsg, contextMode: ContextMode): Promise<Peer> {
   // This function determines the type of message by the existence of user_id / group_id,
   // not message_type.
   // This redundant design of Ob11 here should be blamed.
@@ -86,11 +84,8 @@ async function createContext(payload: OB11PostSendMsg, contextMode: ContextMode)
   if ((contextMode === ContextMode.Group || contextMode === ContextMode.Normal) && payload.group_id) {
     const group = (await getGroup(payload.group_id))!; // checked before
     return {
-      peer: {
-        chatType: ChatType.group,
-        peerUid: group.groupCode
-      },
-      group: group,
+      chatType: ChatType.group,
+      peerUid: group.groupCode
     };
   }
   if ((contextMode === ContextMode.Private || contextMode === ContextMode.Normal) && payload.user_id) {
@@ -98,10 +93,9 @@ async function createContext(payload: OB11PostSendMsg, contextMode: ContextMode)
     const isBuddy = await NTQQFriendApi.isBuddy(Uid!);
     //console.log("[调试代码] UIN:", payload.user_id, " UID:", Uid, " IsBuddy:", isBuddy);
     return {
-      peer: {
-        chatType: isBuddy ? ChatType.friend : ChatType.temp,
-        peerUid: Uid!
-      },
+      chatType: isBuddy ? ChatType.friend : ChatType.temp,
+      peerUid: Uid!,
+      guildId: payload.group_id || ''//临时主动发起时需要传入群号
     };
   }
   throw '请指定 group_id 或 user_id';
@@ -139,7 +133,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
   }
 
   protected async _handle(payload: OB11PostSendMsg): Promise<{ message_id: number }> {
-    const { peer, group } = await createContext(payload, this.contextMode);
+    const peer = await createContext(payload, this.contextMode);
 
     const messages = normalize(
       payload.message,
@@ -147,9 +141,9 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     );
 
     if (getSpecialMsgNum(payload, OB11MessageDataType.node)) {
-      const returnMsg = await handleForwardNode(peer, messages as OB11MessageNode[], group);
+      const returnMsg = await handleForwardNode(peer, messages as OB11MessageNode[]);
       if (returnMsg) {
-        const msgShortId = await MessageUnique.createMsg({ guildId: '', peerUid: peer.peerUid, chatType: peer.chatType }, returnMsg!.msgId);
+        const msgShortId = MessageUnique.createMsg({ guildId: '', peerUid: peer.peerUid, chatType: peer.chatType }, returnMsg!.msgId);
         return { message_id: msgShortId! };
       } else {
         throw Error('发送转发消息失败');
@@ -163,7 +157,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     }
     // log("send msg:", peer, sendElements)
 
-    const { sendElements, deleteAfterSentFiles } = await createSendElements(messages, group);
+    const { sendElements, deleteAfterSentFiles } = await createSendElements(messages, peer);
     //console.log(peer, JSON.stringify(sendElements,null,2));
     const returnMsg = await sendMsg(peer, sendElements, deleteAfterSentFiles);
     return { message_id: returnMsg!.id! };

src/onebot11/action/msg/SendPrivateMsg.ts

@@ -11,5 +11,4 @@ class SendPrivateMsg extends SendMsg {
     return super.check(payload);
   }
 }
-
 export default SendPrivateMsg;

src/onebot11/action/msg/SetMsgEmojiLike.ts

@@ -14,7 +14,6 @@ const SchemaData = {
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
-
 export class SetMsgEmojiLike extends BaseAction<Payload, any> {
   actionName = ActionName.SetMsgEmojiLike;
   PayloadSchema = SchemaData;

src/onebot11/action/system/CanSendImage.ts

@@ -4,7 +4,6 @@ import CanSendRecord from './CanSendRecord';
 interface ReturnType {
   yes: boolean
 }
-
 export default class CanSendImage extends CanSendRecord {
   actionName = ActionName.CanSendImage;
 }

src/onebot11/action/system/GetLoginInfo.ts

@@ -3,8 +3,6 @@ import { OB11User } from '../../types';
 import { OB11Constructor } from '../../constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { napCatCore } from '@/core';
-
 
 class GetLoginInfo extends BaseAction<null, OB11User> {
   actionName = ActionName.GetLoginInfo;

src/onebot11/action/types.ts

@@ -15,8 +15,8 @@ export interface InvalidCheckResult {
 
 export enum ActionName {
     // 以下为扩展napcat扩展
-    SharePeer = 'ArkShareGroup',
-    ShareGroupEx = 'ArkSharePeer',
+    SharePeer = 'ArkSharePeer',
+    ShareGroupEx = 'ArkShareGroupEx',
     RebootNormal = 'reboot_normal',//无快速登录重新启动
     GetRobotUinRange = 'get_robot_uin_range',
     SetOnlineStatus = 'set_online_status',
@@ -103,5 +103,5 @@ export enum ActionName {
     FetchCustomFace = 'fetch_custom_face',
     GOCQHTTP_UploadPrivateFile = 'upload_private_file',
     TestApi01 = 'test_api_01',
-    FetchEmojioLike = "fetch_emoji_like"
+    FetchEmojioLike = 'fetch_emoji_like'
 }

src/onebot11/action/user/GetFriendList.ts

@@ -6,8 +6,6 @@ import { ActionName } from '../types';
 import { NTQQFriendApi } from '@/core';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
-
-
 // no_cache get时传字符串
 const SchemaData = {
   type: 'object',

src/onebot11/action/user/GetRecentContact.ts

@@ -18,12 +18,12 @@ export default class GetRecentContact extends BaseAction<Payload, any> {
   actionName = ActionName.GetRecentContact;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    let ret = await NTQQUserApi.getRecentContactListSnapShot(parseInt((payload.count || 10).toString()));
-    let data = await Promise.all(ret.info.changedList.map(async (t) => {
-      let FastMsg = await NTQQMsgApi.getMsgsByMsgId({ chatType: t.chatType, peerUid: t.peerUid }, [t.msgId]);
+    const ret = await NTQQUserApi.getRecentContactListSnapShot(parseInt((payload.count || 10).toString()));
+    const data = await Promise.all(ret.info.changedList.map(async (t) => {
+      const FastMsg = await NTQQMsgApi.getMsgsByMsgId({ chatType: t.chatType, peerUid: t.peerUid }, [t.msgId]);
       if (FastMsg.msgList.length > 0) {
         //扩展ret.info.changedList
-        let lastestMsg = await OB11Constructor.message(FastMsg.msgList[0]);
+        const lastestMsg = await OB11Constructor.message(FastMsg.msgList[0]);
         return {
           lastestMsg: lastestMsg,
           peerUin: t.peerUin,

src/onebot11/action/user/SendLike.ts

@@ -13,7 +13,6 @@ const SchemaData = {
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
-
 export default class SendLike extends BaseAction<Payload, null> {
   actionName = ActionName.SendLike;
   PayloadSchema = SchemaData;

src/onebot11/config.ts

@@ -1,10 +1,4 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { selfInfo } from '@/core/data';
-import { logDebug, logError } from '@/common/utils/log';
 import { ConfigBase } from '@/common/utils/ConfigBase';
-import { json } from 'stream/consumers';
-
 export interface OB11Config {
   http: {
     enable: boolean;
@@ -36,7 +30,7 @@ export interface OB11Config {
     Record: boolean,
     RecordList: Array<string>
   },
-  read(): OB11Config;
+  read(): OB11Config | null;
 
   save(config: OB11Config): void;
 }

src/onebot11/constructor.ts

@@ -12,6 +12,7 @@ import {
 import {
   AtType,
   ChatType,
+  ChatType2,
   FaceIndex,
   Friend,
   FriendV2,
@@ -42,7 +43,7 @@ import { OB11GroupTitleEvent } from './event/notice/OB11GroupTitleEvent';
 import { OB11GroupCardEvent } from './event/notice/OB11GroupCardEvent';
 import { OB11GroupDecreaseEvent } from './event/notice/OB11GroupDecreaseEvent';
 import { ob11Config } from '@/onebot11/config';
-import { deleteGroup, getGroupMember, groupMembers, selfInfo, tempGroupCodeMap } from '@/core/data';
+import { deleteGroup, getGroupMember, groupMembers, selfInfo } from '@/core/data';
 import { NTQQFileApi, NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
 import { OB11GroupMsgEmojiLikeEvent } from '@/onebot11/event/notice/OB11MsgEmojiLikeEvent';
 import { OB11FriendPokeEvent, OB11GroupPokeEvent } from './event/notice/OB11PokeEvent';
@@ -65,7 +66,7 @@ export class OB11Constructor {
       real_id: msg.id!,
       message_type: msg.chatType == ChatType.group ? 'group' : 'private',
       sender: {
-        user_id: parseInt(msg.senderUin!),
+        user_id: parseInt(msg.senderUin || '0'),
         nickname: msg.sendNickName,
         card: msg.sendMemberName || '',
       },
@@ -96,11 +97,15 @@ export class OB11Constructor {
       //const user = await NTQQUserApi.getUserDetailInfoByUin(msg.senderUin!);
       //resMsg.sender.nickname = user.info.nick;
     }
-    else if (msg.chatType == ChatType.temp) {
+    else if (msg.chatType as unknown as ChatType2 == ChatType2.KCHATTYPETEMPC2CFROMGROUP) {
       resMsg.sub_type = 'group';
-      const tempGroupCode = tempGroupCodeMap[msg.peerUin];
-      if (tempGroupCode) {
-        resMsg.group_id = parseInt(tempGroupCode);
+      let ret = await NTQQMsgApi.getTempChatInfo(ChatType2.KCHATTYPETEMPC2CFROMGROUP, msg.senderUid);
+      if (ret.result === 0) {
+        resMsg.group_id = parseInt(ret.tmpChatInfo!.groupCode);
+        resMsg.sender.nickname = ret.tmpChatInfo!.fromNick;
+      } else {
+        resMsg.group_id = 284840486;//兜底数据
+        resMsg.sender.nickname = "临时会话";
       }
     }
     for (const element of msg.elements) {
@@ -165,8 +170,10 @@ export class OB11Constructor {
           if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
             replyMsg = (await NTQQMsgApi.getSingleMsg(peer, element.replyElement.replayMsgSeq)).msgList[0];
           }
-
-          if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
+          if (msg.peerUin == '284840486') {
+            //合并消息内侧 消息具体定位不到
+          }
+          if ((!replyMsg || records.msgRandom !== replyMsg.msgRandom) && msg.peerUin !== '284840486') {
             throw new Error('回复消息消息验证失败');
           }
           message_data['data']['id'] = MessageUnique.createMsg({ peerUid: msg.peerUid, guildId: '', chatType: msg.chatType }, replyMsg.msgId)?.toString();
@@ -221,12 +228,18 @@ export class OB11Constructor {
         const videoElement: VideoElement = element.videoElement;
         //读取视频链接并兜底
         let videoUrl;//Array
+        let peer:Peer = {
+          chatType: msg.chatType,
+          peerUid: msg.peerUid,
+          guildId: '0'
+        };
+        if (msg.peerUin == '284840486') {
+          peer = msg.parentMsgPeer;
+          //合并消息内部 应该进行特殊处理 可能需要重写peer 待测试与研究 Mlikiowa Taged TODO
+        }
         try {
-          videoUrl = await NTQQFileApi.getVideoUrl({
-            chatType: msg.chatType,
-            peerUid: msg.peerUid,
-            guildId: '0'
-          }, msg.msgId, element.elementId);
+
+          videoUrl = await NTQQFileApi.getVideoUrl(peer, msg.msgId, element.elementId);
         } catch (error) {
           videoUrl = undefined;
         }
@@ -327,6 +340,27 @@ export class OB11Constructor {
       else if (element.multiForwardMsgElement) {
         message_data['type'] = OB11MessageDataType.forward;
         message_data['data']['id'] = msg.msgId;
+        const ParentMsgPeer = msg.parentMsgPeer ?? { chatType: msg.chatType, guildId: '', peerUid: msg.peerUid };
+        //判断是否在合并消息内
+        msg.parentMsgIdList = msg.parentMsgIdList ?? [];
+        //首次列表不存在则开始创建
+        msg.parentMsgIdList.push(msg.msgId);
+        //let parentMsgId = msg.parentMsgIdList[msg.parentMsgIdList.length - 2 < 0 ? 0 : msg.parentMsgIdList.length - 2];
+        //加入自身MsgId
+        const MultiMsgs = (await NTQQMsgApi.getMultiMsg(ParentMsgPeer, msg.parentMsgIdList[0], msg.msgId))?.msgList;
+        //拉取下级消息
+        if (!MultiMsgs) continue;
+        //拉取失败则跳过
+        message_data['data']['content'] = [];
+        for (const MultiMsg of MultiMsgs) {
+          //对每条拉取的消息传递ParentMsgPeer修正Peer
+          MultiMsg.parentMsgPeer = ParentMsgPeer;
+          MultiMsg.parentMsgIdList = msg.parentMsgIdList;
+          MultiMsg.id = MessageUnique.createMsg(ParentMsgPeer, MultiMsg.msgId);//该ID仅用查看 无法调用
+          const msgList = await OB11Constructor.message(MultiMsg);
+          message_data['data']['content'].push(msgList);
+          //console.log("合并消息", msgList);
+        }
       }
       if ((message_data.type as string) !== 'unknown' && message_data.data) {
         const cqCode = encodeCQCode(message_data);

src/onebot11/event/notice/OB11GroupAdminNoticeEvent.ts

@@ -2,5 +2,5 @@ import { OB11GroupNoticeEvent } from './OB11GroupNoticeEvent';
 
 export class OB11GroupAdminNoticeEvent extends OB11GroupNoticeEvent {
   notice_type = 'group_admin';
-  sub_type: 'set' | 'unset';  // "set" | "unset"
+  sub_type: 'set' | 'unset' = 'set';  // "set" | "unset"
 }

src/onebot11/event/notice/OB11InputStatusEvent.ts

@@ -0,0 +1,16 @@
+import { OB11BaseNoticeEvent } from './OB11BaseNoticeEvent';
+//输入状态事件 初步完成 Mlikio wa Todo 需要做一些过滤
+export class OB11InputStatusEvent extends OB11BaseNoticeEvent {
+  notice_type = 'notify';
+  sub_type = 'input_status';
+  status_text = '对方正在输入...';
+  event_type = 1;
+  user_id = 0;
+  constructor(user_id: number, eventType: number, status_text: string) {
+    super();
+    this.user_id = user_id;
+    this.event_type = eventType;
+    this.status_text = status_text;
+  }
+}
+

src/onebot11/event/notice/OB11MsgEmojiLikeEvent.ts

@@ -8,7 +8,6 @@ export interface MsgEmojiLike {
 export class OB11GroupMsgEmojiLikeEvent extends OB11GroupNoticeEvent {
   notice_type = 'group_msg_emoji_like';
   message_id: number;
-  sub_type: 'ban' | 'lift_ban';
   likes: MsgEmojiLike[];
 
   constructor(groupId: number, userId: number, messageId: number, likes: MsgEmojiLike[]) {

src/onebot11/event/notice/OB11PokeEvent.ts

@@ -1,6 +1,4 @@
 import { OB11BaseNoticeEvent } from './OB11BaseNoticeEvent';
-import { selfInfo } from '@/core/data';
-import { OB11BaseEvent } from '../OB11BaseEvent';
 
 class OB11PokeEvent extends OB11BaseNoticeEvent {
   notice_type = 'notify';

src/onebot11/log.ts

@@ -2,7 +2,7 @@ import { OB11Message } from '@/onebot11/types';
 import { log } from '@/common/utils/log';
 import { getGroup, getGroupMember, selfInfo } from '@/core/data';
 import exp from 'constants';
-import { Group } from '@/core';
+import { Group, NTQQMsgApi } from '@/core';
 import chalk from 'chalk';
 
 const spSegColor = chalk.blue;// for special segment
@@ -24,8 +24,13 @@ export async function logMessage(ob11Message: OB11Message) {
     }
   }
   if (ob11Message.message_type === 'group') {
-    group = await getGroup(ob11Message.group_id!);
-    prefix += `群[${group?.groupName}(${ob11Message.group_id})] `;
+    if (ob11Message.group_id == 284840486) {
+      group = await getGroup(ob11Message.group_id!);
+      prefix += '转发消息[外部来源] ';
+    } else {
+      group = await getGroup(ob11Message.group_id!);
+      prefix += `群[${group?.groupName}(${ob11Message.group_id})] `;
+    }
   }
   let msgChain = '';
   if (Array.isArray(ob11Message.message)) {
@@ -66,6 +71,13 @@ export async function logMessage(ob11Message: OB11Message) {
       else if (segment.type === 'video') {
         msgParts.push(spSegColor(`[视频|${segment.data.url}]`));
       }
+      else if (segment.type === 'forward') {
+        msgParts.push(spSegColor(`[转发|${segment.data.id}|消息开始]`));
+        segment.data.content.forEach((msg) => {
+          logMessage(msg);
+        });
+        msgParts.push(spSegColor(`[转发|${segment.data.id}|消息结束]`));
+      }
       else {
         msgParts.push(spSegColor(`[未实现|${JSON.stringify(segment)}]`));
       }

src/onebot11/main.ts

@@ -19,7 +19,7 @@ import { OB11Config, ob11Config } from '@/onebot11/config';
 import { httpHeart, ob11HTTPServer } from '@/onebot11/server/http';
 import { ob11WebsocketServer } from '@/onebot11/server/ws/WebsocketServer';
 import { ob11ReverseWebsockets } from '@/onebot11/server/ws/ReverseWebsocket';
-import { getGroup, getGroupMember, groupMembers, selfInfo, tempGroupCodeMap } from '@/core/data';
+import { getGroup, getGroupMember, groupMembers, selfInfo } from '@/core/data';
 import { BuddyListener, GroupListener, NodeIKernelBuddyListener } from '@/core/listeners';
 import { OB11FriendRequestEvent } from '@/onebot11/event/request/OB11FriendRequest';
 import { NTQQGroupApi, NTQQUserApi, WebApi } from '@/core/apis';
@@ -33,6 +33,7 @@ import { logMessage, logNotice, logRequest } from '@/onebot11/log';
 import { OB11Message } from '@/onebot11/types';
 import { isEqual } from '@/common/utils/helper';
 import { MessageUnique } from '@/common/utils/MessageUnique';
+import { OB11InputStatusEvent } from './event/notice/OB11InputStatusEvent';
 
 //下面几个其实应该移进Core-Data 缓存实现 但是现在在这里方便
 //
@@ -92,6 +93,21 @@ export class NapCatOnebot11 {
     }
     // Create MsgListener
     const msgListener = new MsgListener();
+    msgListener.onInputStatusPush = async (data: {
+      chatType: number;
+      eventType: number;
+      fromUin: string;
+      interval: string;
+      showTime: string;
+      statusText: string;
+      timestamp: string;
+      toUin: string;
+    }
+    ) => {
+      const uin = await NTQQUserApi.getUinByUid(data.fromUin);
+      logNotice(`[输入状态] ${uin} ${data.statusText}`);
+      postOB11Event(new OB11InputStatusEvent(parseInt(uin), data.eventType, data.statusText));
+    };
     msgListener.onRecvSysMsg = async (protobufData: number[]) => {
       // function buf2hex(buffer: Buffer) {
       //   return [...new Uint8Array(buffer)]
@@ -206,9 +222,9 @@ export class NapCatOnebot11 {
       selfInfo.online = false;
     };
     msgListener.onTempChatInfoUpdate = (tempChatInfo: TempOnRecvParams) => {
-      if (tempChatInfo.sessionType == 1 && tempChatInfo.chatType == ChatType.temp) {
-        tempGroupCodeMap[tempChatInfo.peerUid] = tempChatInfo.groupCode;
-      }
+      // if (tempChatInfo.sessionType == 1 && tempChatInfo.chatType == ChatType.temp) {
+      //   tempGroupCodeMap[tempChatInfo.peerUid] = tempChatInfo.groupCode;
+      // }
       // 临时会话更新 tempGroupCodeMap uid -> source/GroupCode
     };
     msgListener.onRecvMsg = async (msg) => {

src/onebot11/server/http.ts

@@ -11,7 +11,7 @@ class OB11HTTPServer extends HttpServerBase {
   name = 'OneBot V11 server';
 
   handleFailed(res: Response, payload: any, e: Error) {
-    res.send(OB11Response.error(e?.stack?.toString() || e.message || "Error Handle", 200));
+    res.send(OB11Response.error(e?.stack?.toString() || e.message || 'Error Handle', 200));
   }
 
   protected listen(port: number, host: string) {

src/onebot11/server/postOB11Event.ts

@@ -159,7 +159,7 @@ async function handleMsg(msg: OB11Message, quickAction: QuickAction) {
       }
     }
     replyMessage = replyMessage.concat(normalize(reply, quickAction.auto_escape));
-    const { sendElements, deleteAfterSentFiles } = await createSendElements(replyMessage, group);
+    const { sendElements, deleteAfterSentFiles } = await createSendElements(replyMessage, peer);
     sendMsg(peer, sendElements, deleteAfterSentFiles, false).then().catch(logError);
   }
 }

src/onebot11/types/message.ts

@@ -181,7 +181,8 @@ export interface OB11MessageMarkdown {
 export interface OB11MessageForward {
   type: OB11MessageDataType.forward
   data: {
-    id: string
+    id: string,
+    content: OB11Message[]
   }
 }
 

src/onebot11/version.ts

@@ -1 +1 @@
-export const version = '1.8.0';
+export const version = '1.8.6';

src/webui/ui/NapCat.ts

@@ -29,7 +29,7 @@ async function onSettingWindowCreated(view: Element) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           undefined,
-          SettingButton('V1.8.0', 'napcat-update-button', 'secondary')
+          SettingButton('V1.8.6', 'napcat-update-button', 'secondary')
         ),
       ]),
       SettingList([

static/assets/renderer.js

@@ -163,7 +163,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V1.8.0", "napcat-update-button", "secondary")
+          SettingButton("V1.8.6", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([

vite.config.ts

@@ -26,9 +26,9 @@ if (process.env.NAPCAT_BUILDSYS == 'linux') {
 } else if (process.env.NAPCAT_BUILDSYS == 'win32') {
   if (process.env.NAPCAT_BUILDARCH == 'x64') {
   }
-  startScripts = ['./script/dbghelp.dll', './script/BootWay05.ps1', './script/napcat-9912.ps1', './script/napcat-9912-utf8.ps1', './script/napcat-9912.bat', './script/napcat-9912-utf8.bat'];
+  startScripts = ['./script/BootWay05.bat', './script/BootWay05.utf8.bat', './script/dbghelp.dll', './script/BootWay05.ps1', './script/napcat-9912.ps1', './script/napcat-9912-utf8.ps1', './script/napcat-9912.bat', './script/napcat-9912-utf8.bat'];
 } else {
-  startScripts = ['./script/dbghelp.dll', './script/BootWay05.ps1', './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'];
+  startScripts = ['./script/BootWay05.bat', './script/BootWay05.utf8.bat', './script/dbghelp.dll', './script/BootWay05.ps1', './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'];
 }
 
 const baseConfigPlugin: PluginOption[] = [