Merge pull request #679 from wu-yafeng/main

fix #678

manifest.json

@@ -4,16 +4,12 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.2.56",
+  "version": "4.2.63",
   "icon": "./logo.png",
   "authors": [
     {
-      "name": "MliKiowa",
-      "link": "https://github.com/MliKiowa"
-    },
-    {
-      "name": "Young",
-      "link": "https://github.com/Wesley-Young"
+      "name": "NapNeko",
+      "link": "https://github.com/NapNeko"
     }
   ],
   "repository": {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.56",
+  "version": "4.2.63",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -37,7 +37,7 @@
     "@typescript-eslint/parser": "^8.3.0",
     "ajv": "^8.13.0",
     "async-mutex": "^0.5.0",
-    "commander": "^12.1.0",
+    "commander": "^13.0.0",
     "cors": "^2.8.5",
     "eslint": "^9.14.0",
     "eslint-import-resolver-typescript": "^3.6.1",

src/common/umami.ts

@@ -1,6 +1,6 @@
 import https from 'node:https';
 import { napCatVersion } from './version';
-import os from 'os';
+import os from 'node:os';
 export class UmamiTraceCore {
     napcatVersion = napCatVersion;
     qqversion = '1.0.0';
@@ -11,6 +11,8 @@ export class UmamiTraceCore {
     hostname: string = 'trace.napneko.icu';
     ua: string = '';
     workname: string = 'default';
+    bootTime = Date.now();
+    cache: string = '';
     init(qqversion: string, guid: string, workname: string) {
         this.qqversion = qqversion;
         this.workname = workname;
@@ -43,27 +45,41 @@ export class UmamiTraceCore {
         const data = {
             napcat_version: this.napcatVersion,
             qq_version: this.qqversion,
-            guid: guid,
-            workname: this.workname,
+            napcat_working: this.workname,
+            device_guid: this.guid,
+            device_platform: os.platform(),
+            device_arch: os.arch(),
+            boot_time: new Date(this.bootTime + 8 * 60 * 60 * 1000).toISOString().replace('T', ' ').substring(0, 19),
+            sys_time: new Date(Date.now() - os.uptime() * 1000 + 8 * 60 * 60 * 1000).toISOString().replace('T', ' ').substring(0, 19)
         };
-        this.sendRequest({ website: this.website, ...data }, 'identify');
+        this.sendEvent(
+            {
+                website: this.website,
+                hostname: this.hostname,
+                referrer: this.referrer,
+                tittle: 'NapCat ' + this.napcatVersion,
+                url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/identify`,
+            },
+            data,
+            'identify'
+        );
     }
 
-    sendEvent(event: string, data?: object) {
+    sendEvent(event: string | object, data?: object, type = 'event') {
         const env = process.env;
         const language = env.LANG || env.LANGUAGE || env.LC_ALL || env.LC_MESSAGES;
         const payload = {
-            name: event,
+            ...(typeof event === 'string' ? { event } : event),
             hostname: this.hostname,
             referrer: this.referrer,
             website: this.website,
             language: language || 'en-US',
-            napcat_version: this.napcatVersion,
-            qq_version: this.qqversion,
-            workname: this.workname,
-            ...data
+            screen: '1920x1080',
+            data: {
+                ...data
+            }
         };
-        this.sendRequest(payload);
+        this.sendRequest(payload, type);
     }
 
     sendTrace(eventName: string, data: string = '') {
@@ -86,7 +102,8 @@ export class UmamiTraceCore {
             headers: {
                 "Host": "umami.napneko.icu",
                 "Content-Type": "application/json",
-                "User-Agent": this.ua
+                "User-Agent": this.ua,
+                ...(this.cache ? { 'x-umami-cache': this.cache } : {})
             }
         };
 
@@ -95,9 +112,11 @@ export class UmamiTraceCore {
 
             });
             res.on('data', (data) => {
-
+                if (!this.cache) {
+                    this.cache = data.toString();
+                }
             });
-        });
+        }).on('error', () => { });
 
         request.write(JSON.stringify({ type, payload }));
         request.end();
@@ -108,13 +127,10 @@ export class UmamiTraceCore {
             clearInterval(this.heartbeatInterval);
         }
         this.heartbeatInterval = setInterval(() => {
-            this.sendEvent('heartbeat', {
+            this.sendEvent({
+                name: 'heartbeat',
                 title: 'NapCat ' + this.napcatVersion,
-                language: process.env.LANG || 'en-US',
                 url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/heartbeat`,
-                version: this.napcatVersion,
-                qq_version: this.qqversion,
-                user_id: this.guid
             });
         }, 5 * 60 * 1000);
     }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.56';
+export const napCatVersion = '4.2.63';

src/core/packet/context/operationContext.ts

@@ -21,7 +21,7 @@ export class PacketOperationContext {
     }
 
     async GroupPoke(groupUin: number, uin: number) {
-        const req = trans.SendPoke.build(groupUin, uin);
+        const req = trans.SendPoke.build(uin, groupUin);
         await this.context.client.sendOidbPacket(req);
     }
 

src/core/types/index.ts

@@ -9,4 +9,5 @@ export * from './sign';
 export * from './element';
 export * from './constant';
 export * from './graytip';
-export * from './emoji';
+export * from './emoji';
+export * from './service';

src/core/types/service.ts

@@ -0,0 +1,35 @@
+export enum LoginErrorCode {
+    KLOGINERRORACCOUNTNOTUIN = 140022018,
+    KLOGINERRORACCOUNTORPASSWORDERROR = 140022013,
+    KLOGINERRORBLACKACCOUNT = 150022021,
+    KLOGINERRORDEFAULT = 140022000,
+    KLOGINERROREXPIRETICKET = 140022014,
+    KLOGINERRORFROZEN = 140022005,
+    KLOGINERRORILLAGETICKET = 140022016,
+    KLOGINERRORINVAILDCOOKIE = 140022012,
+    KLOGINERRORINVALIDPARAMETER = 140022001,
+    KLOGINERRORKICKEDTICKET = 140022015,
+    KLOGINERRORMUTIPLEPASSWORDINCORRECT = 150022029,
+    KLOGINERRORNEEDUPDATE = 140022004,
+    KLOGINERRORNEEDVERIFYREALNAME = 140022019,
+    KLOGINERRORNEWDEVICE = 140022010,
+    KLOGINERRORNICEACCOUNTEXPIRED = 150022020,
+    KLOGINERRORNICEACCOUNTPARENTCHILDEXPIRED = 150022025,
+    KLOGINERRORPASSWORD = 2,
+    KLOGINERRORPROOFWATER = 140022008,
+    KLOGINERRORPROTECT = 140022006,
+    KLOGINERRORREFUSEPASSOWRDLOGIN = 140022009,
+    KLOGINERRORREMINDCANAELLATEDSTATUS = 150022028,
+    KLOGINERRORSCAN = 1,
+    KLOGINERRORSCCESS = 0,
+    KLOGINERRORSECBEAT = 140022017,
+    KLOGINERRORSMSINVALID = 150022026,
+    KLOGINERRORSTRICK = 140022007,
+    KLOGINERRORSYSTEMFAILED = 140022002,
+    KLOGINERRORTGTGTEXCHAGEA1FORBID = 150022027,
+    KLOGINERRORTIMEOUTRETRY = 140022003,
+    KLOGINERRORTOOMANYTIMESTODAY = 150022023,
+    KLOGINERRORTOOOFTEN = 150022022,
+    KLOGINERRORUNREGISTERED = 150022024,
+    KLOGINERRORUNUSUALDEVICE = 140022011,
+}

src/onebot/action/extends/SetGroupSign.ts

@@ -17,7 +17,7 @@ class SetGroupSignBase extends GetPacketStatusDepends<Payload, any> {
 }
 
 export class SetGroupSign extends SetGroupSignBase {
-    actionName = ActionName.SendGroupSign;
+    actionName = ActionName.SetGroupSign;
 }
 
 export class SendGroupSign extends SetGroupSignBase {

src/onebot/action/group/GroupPoke.ts

@@ -14,6 +14,6 @@ export class GroupPoke extends GetPacketStatusDepends<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.user_id, +payload.group_id);
+        await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
     }
 }

src/onebot/action/packet/SendPoke.ts

@@ -15,9 +15,9 @@ export class SendPoke extends GetPacketStatusDepends<Payload, any> {
 
     async _handle(payload: Payload) {
         if (payload.group_id) {
-            this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
+            await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
         } else {
-            this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
+            await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
         }
     }
-}
+}

src/shell/base.ts

@@ -155,7 +155,7 @@ async function handleLogin(
         loginListener.onQRCodeSessionFailed = (errType: number, errCode: number, errMsg: string) => {
             UmamiTrace.sendTrace('qrlogin/error', [errType, errCode, errMsg].toString());
             if (!isLogined) {
-                logger.logError('[Core] [Login] Login Error,ErrCode: ', errCode, ' ErrMsg:', errMsg);
+                logger.logError('[Core] [Login] Login Error,ErrType: ', errType, ' ErrCode:', errCode);
                 if (errType == 1 && errCode == 3) {
                     // 二维码过期刷新
                 }
@@ -163,9 +163,9 @@ async function handleLogin(
             }
         };
 
-        loginListener.onLoginFailed = (args) => {
+        loginListener.onLoginFailed = (...args) => {
             UmamiTrace.sendTrace('login/error', args.toString());
-            logger.logError('[Core] [Login] Login Error , ErrInfo: ', args.toString());
+            logger.logError('[Core] [Login] Login Error , ErrInfo: ', JSON.stringify(args));
         };
 
         loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));

src/webui/src/helper/config.ts

@@ -90,7 +90,7 @@ export class WebUiConfigWrapper {
         try {
             const configPath = resolve(webUiPathWrapper.configPath, './webui.json');
 
-            if (!await fs.access(configPath, constants.R_OK).then(() => true).catch(() => false)) {
+            if (!await fs.access(configPath, constants.F_OK).then(() => true).catch(() => false)) {
                 await fs.writeFile(configPath, JSON.stringify(defaultconfig, null, 4));
             }
 
@@ -101,7 +101,12 @@ export class WebUiConfigWrapper {
             if (!parsedConfig.prefix.startsWith('/')) parsedConfig.prefix = '/' + parsedConfig.prefix;
             if (parsedConfig.prefix.endsWith('/')) parsedConfig.prefix = parsedConfig.prefix.slice(0, -1);
             // 配置已经被操作过了，还是回写一下吧，不然新配置不会出现在配置文件里
-            await fs.writeFile(configPath, JSON.stringify(parsedConfig, null, 4));
+            if (await fs.access(configPath, constants.W_OK).then(() => true).catch(() => false)) {
+                await fs.writeFile(configPath, JSON.stringify(parsedConfig, null, 4));
+            }
+            else {
+                console.warn(`文件: ${configPath} 没有写入权限, 配置的更改部分可能会在重启后还原.`);
+            }
             // 不希望回写的配置放后面
 
             // 查询主机地址是否可用

tsconfig.json

@@ -1,10 +1,10 @@
 {
     "compilerOptions": {
-        "target": "ES2020",
+        "target": "ES2021",
         "useDefineForClassFields": true,
         "module": "ESNext",
         "lib": [
-            "ES2020",
+            "ES2021",
             "DOM",
             "DOM.Iterable"
         ],