Merge branch 'main' of https://githubfast.com/123233513/NapCatQQ

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",
@@ -52,4 +52,4 @@
     "strtok3": "8.0.1",
     "ws": "^8.18.0"
   }
-}
+}

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.6.9';
+export const napCatVersion = '2.6.10';

src/core/services/NodeIKernelLoginService.ts

@@ -1,4 +1,5 @@
 import { NodeIKernelLoginListener } from '@/core/listeners/NodeIKernelLoginListener';
+import { GeneralCallResult } from './common';
 
 export interface LoginInitConfig {
     machineId: '';
@@ -59,6 +60,7 @@ export interface QuickLoginResult {
 }
 
 export interface NodeIKernelLoginService {
+    setLoginMiscData(arg0: string, value: string): unknown;
     getMachineGuid(): string;
 
     get(): NodeIKernelLoginService;
@@ -71,7 +73,7 @@ export interface NodeIKernelLoginService {
 
     initConfig(config: LoginInitConfig): void;
 
-    getLoginMiscData(cb: (r: unknown) => void): void;
+    getLoginMiscData(data: string): Promise<GeneralCallResult & { value: string }>;
 
     getLoginList(): Promise<{
         result: number,  // 0是ok

src/core/services/NodeIKernelNodeMiscService.ts

@@ -1,6 +1,7 @@
 import { GeneralCallResult } from './common';
 
 export interface NodeIKernelNodeMiscService {
+    writeVersionToRegistry: any;
     getMiniAppPath(): unknown;
 
     setMiniAppVersion(version: string): unknown;

src/core/services/NodeIKernelUnitedConfigService.ts

@@ -4,14 +4,14 @@ export interface NodeIKernelUnitedConfigService {
 
     removeKernelUnitedConfigListener(listenerId:number): void;
 
-    fetchUnitedCommendConfig(...args: any[]): unknown;// needs 1 arguments
-
     fetchUnitedSwitchConfig(...args: any[]): unknown;// needs 1 arguments
 
-    loadUnitedConfig(...args: any[]): unknown;// needs 1 arguments
-
     isUnitedConfigSwitchOn(...args: any[]): unknown;// needs 1 arguments
 
     registerUnitedConfigPushGroupList(...args: any[]): unknown;// needs 1 arguments
 
+    fetchUnitedCommendConfig(ids: `${string}`[]): void
+
+    loadUnitedConfig(id: string): Promise<unknown>
+
 }

src/shell/napcat.ts

@@ -186,7 +186,14 @@ export async function NCoreInitShell() {
             // 遍历 res.LocalLoginInfoList[x].isQuickLogin是否可以 res.LocalLoginInfoList[x].uin 转为string 加入string[] 最后遍历完成调用WebUiDataRuntime.setQQQuickLoginList
             WebUiDataRuntime.setQQQuickLoginList(res.LocalLoginInfoList.filter((item) => item.isQuickLogin).map((item) => item.uin.toString()));
         });
-
+        if (basicInfoWrapper.QQVersionConfig?.curVersion) {
+            loginService.getLoginMiscData('hotUpdateSign').then((res) => {
+                if (res.result === 0) {
+                    loginService.setLoginMiscData('hotUpdateSign', res.value);
+                }
+            });
+            session.getNodeMiscService().writeVersionToRegistry(basicInfoWrapper.QQVersionConfig?.curVersion);
+        }
         WebUiDataRuntime.setQuickLoginCall(async (uin: string) => {
             return await new Promise((resolve) => {
                 if (uin) {
@@ -244,6 +251,11 @@ export async function NCoreInitShell() {
     let guid = loginService.getMachineGuid();
     guid = guid.slice(0, 8) + '-' + guid.slice(8, 12) + '-' + guid.slice(12, 16) + '-' + guid.slice(16, 20) + '-' + guid.slice(20);
     //console.log('guid:', guid);
+    //NodeIO3MiscService/reportAmgomWeather  login a6 [ '1726748166943', '184', '329' ]
+    o3Service.reportAmgomWeather('login', 'a6', [dataTimestape, '184', '329']);
+    // if(session.getUnitedConfigService()){
+    //     session.getUnitedConfigService().fetchUnitedCommendConfig([]);
+    // }
     // from initSession
     await new Promise<void>(async (resolve, reject) => {
         const sessionConfig = await genSessionConfig(

src/webui/ui/NapCat.ts

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

static/assets/renderer.js

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