fix: #677

毕竟我已经脱离一线开发挺久了（

manifest.json

@@ -4,16 +4,12 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.2.46",
+  "version": "4.2.62",
   "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.46",
+  "version": "4.2.62",
   "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,49 +1,145 @@
 import https from 'node:https';
 import { napCatVersion } from './version';
-
-export class umamiTrace {
-    static napcatVersion = napCatVersion;
-    static qqversion = '1.0.0';
-
-    static init(qqversion: string) {
+import os from 'node:os';
+export class UmamiTraceCore {
+    napcatVersion = napCatVersion;
+    qqversion = '1.0.0';
+    guid = 'default-user';
+    heartbeatInterval: NodeJS.Timeout | null = null;
+    website: string = '596cbbb2-1740-4373-a807-cf3d0637bfa7';
+    referrer: string = 'https://trace.napneko.icu/';
+    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;
-        setInterval(() => {
-            this.trackEvent('heartbeat');
-        }, 5 * 60 * 1000);
-    }
-
-    static trackEvent(eventName: string, info?: string) {
-        const StatesData = {
-            type: 'event',
-            payload: {
-                'website': '596cbbb2-1740-4373-a807-cf3d0637bfa7',
-                'hostname': 'trace.napneko.icu',
-                'title': 'NapCat ' + umamiTrace.napcatVersion,
-                'url': '/' + umamiTrace.qqversion + '/' + umamiTrace.napcatVersion + '/' + eventName + (info ? '' : '/' + info),
-                'referrer': 'https://napcat.onebot.napneko.icu/',
-            }
+        this.workname = workname;
+        let UaList = {
+            'linux': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/124.0.0.0 Safari/537.36 PTST/240508.140043',
+            'win32': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.2128.93 Safari/537.36',
+            'darwin': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.102 Safari/537.36',
         };
 
-        let request = https.request({
-            hostname: '104.19.42.72',// 固定 IP
+        try {
+            if (process.platform === 'win32') {
+                const ntVersion = os.release();
+                UaList.win32 = `Mozilla/5.0 (Windows NT ${ntVersion}; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.2128.93 Safari/537.36`;
+            } else if (process.platform === 'darwin') {
+                const macVersion = os.release();
+                UaList.darwin = `Mozilla/5.0 (Macintosh; Intel Mac OS X ${macVersion}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.102 Safari/537.36`;
+            }
+        } catch (error) {
+            this.ua = UaList.win32;
+        }
+
+        this.ua = UaList[process.platform as keyof typeof UaList] || UaList.win32;
+
+        this.identifyUser(guid);
+        this.startHeartbeat();
+    }
+
+    identifyUser(guid: string) {
+        this.guid = guid;
+        const data = {
+            napcat_version: this.napcatVersion,
+            qq_version: this.qqversion,
+            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.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 | object, data?: object, type = 'event') {
+        const env = process.env;
+        const language = env.LANG || env.LANGUAGE || env.LC_ALL || env.LC_MESSAGES;
+        const payload = {
+            ...(typeof event === 'string' ? { event } : event),
+            hostname: this.hostname,
+            referrer: this.referrer,
+            website: this.website,
+            language: language || 'en-US',
+            screen: '1920x1080',
+            data: {
+                ...data
+            }
+        };
+        this.sendRequest(payload, type);
+    }
+
+    sendTrace(eventName: string, data: string = '') {
+        const payload = {
+            website: this.website,
+            hostname: this.hostname,
+            title: 'NapCat ' + this.napcatVersion,
+            url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/${eventName}` + (!!data ? `/${data}` : ''),
+            referrer: this.referrer,
+        };
+        this.sendRequest(payload);
+    }
+
+    sendRequest(payload: object, type = 'event') {
+        const options = {
+            hostname: '104.19.42.72', // 固定 IP 或者从 hostUrl 获取
             port: 443,
             path: '/api/send',
             method: 'POST',
             headers: {
                 "Host": "umami.napneko.icu",
                 "Content-Type": "application/json",
-                "User-Agent": `Mozilla/5.0 Umami/${process.version}`
+                "User-Agent": this.ua,
+                ...(this.cache ? { 'x-umami-cache': this.cache } : {})
             }
-        }, (res) => {
+        };
+
+        const request = https.request(options, (res) => {
             res.on('error', (error) => {
 
             });
             res.on('data', (data) => {
-
+                if (!this.cache) {
+                    this.cache = data.toString();
+                }
             });
-        });
+        }).on('error', () => { });
 
-        request.write(JSON.stringify(StatesData));
+        request.write(JSON.stringify({ type, payload }));
         request.end();
     }
-}
+
+    startHeartbeat() {
+        if (this.heartbeatInterval) {
+            clearInterval(this.heartbeatInterval);
+        }
+        this.heartbeatInterval = setInterval(() => {
+            this.sendEvent({
+                name: 'heartbeat',
+                title: 'NapCat ' + this.napcatVersion,
+                url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/heartbeat`,
+            });
+        }, 5 * 60 * 1000);
+    }
+
+    stopHeartbeat() {
+        if (this.heartbeatInterval) {
+            clearInterval(this.heartbeatInterval);
+            this.heartbeatInterval = null;
+        }
+    }
+}
+export const UmamiTrace = new UmamiTraceCore();

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.46';
+export const napCatVersion = '4.2.62';

src/core/index.ts

@@ -30,7 +30,7 @@ import os from 'node:os';
 import { NodeIKernelMsgListener, NodeIKernelProfileListener } from '@/core/listeners';
 import { proxiedListenerOf } from '@/common/proxy-handler';
 import { NTQQPacketApi } from './apis/packet';
-import { umamiTrace } from '@/common/umami';
+import { UmamiTrace } from '@/common/umami';
 export * from './wrapper';
 export * from './types';
 export * from './services';
@@ -156,9 +156,9 @@ export class NapCatCore {
 
         msgListener.onKickedOffLine = (Info: KickedOffLineInfo) => {
             if (this.context.workingEnv === NapCatCoreWorkingEnv.Framework) {
-                umamiTrace.trackEvent('framework/kickoff');
+                UmamiTrace.sendTrace('event/kickoff');
             } else {
-                umamiTrace.trackEvent('shell/kickoff');
+                UmamiTrace.sendTrace('event/kickoff');
             }
             // 下线通知
             this.context.logger.logError('[KickedOffLine] [' + Info.tipsTitle + '] ' + Info.tipsDesc);

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/framework/napcat.ts

@@ -9,7 +9,7 @@ import { NodeIKernelLoginService } from '@/core/services';
 import { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
 import { InitWebUi, WebUiConfig } from '@/webui';
 import { NapCatOneBot11Adapter } from '@/onebot';
-import { umamiTrace } from '@/common/umami';
+import { UmamiTrace } from '@/common/umami';
 
 //Framework ES入口文件
 export async function getWebUiUrl() {
@@ -26,24 +26,22 @@ export async function NCoreInitFramework(
     console.log('NapCat Framework App Loading...');
 
     process.on('uncaughtException', (err) => {
-        umamiTrace.trackEvent('framework/error', err.message);
+        UmamiTrace.sendTrace('uncaught/error', err.message);
         console.log('[NapCat] [Error] Unhandled Exception:', err.message);
     });
-    
+
     process.on('unhandledRejection', (reason, promise) => {
         console.log('[NapCat] [Error] unhandledRejection:', reason);
     });
 
-    process.on('exit', (code: number) => {
-        umamiTrace.trackEvent('framework/exit', code.toString());
-    });
-
     const pathWrapper = new NapCatPathWrapper();
     const logger = new LogWrapper(pathWrapper.logsPath);
     const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
     const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
-    umamiTrace.init(basicInfoWrapper.getFullQQVesion());
-    umamiTrace.trackEvent('framework/login');
+    let guid = loginService.getMachineGuid();
+    UmamiTrace.init(basicInfoWrapper.getFullQQVesion(), guid,'framework');
+    UmamiTrace.sendTrace('boot/init');
+    UmamiTrace.sendTrace('login/success');
     //直到登录成功后，执行下一步
     const selfInfo = await new Promise<SelfInfo>((resolveSelfInfo) => {
         const loginListener = new NodeIKernelLoginListener();

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

@@ -29,11 +29,11 @@ import { InitWebUi } from '@/webui';
 import { WebUiDataRuntime } from '@/webui/src/helper/Data';
 import { napCatVersion } from '@/common/version';
 import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener';
-import { umamiTrace } from '@/common/umami';
+import { UmamiTrace } from '@/common/umami';
 // NapCat Shell App ES 入口文件
 async function handleUncaughtExceptions(logger: LogWrapper) {
     process.on('uncaughtException', (err) => {
-        umamiTrace.trackEvent('framework/error', err.message);
+        UmamiTrace.sendTrace('uncaught/error', err.message);
         logger.logError('[NapCat] [Error] Unhandled Exception:', err.message);
     });
     process.on('unhandledRejection', (reason, promise) => {
@@ -153,9 +153,9 @@ async function handleLogin(
         };
 
         loginListener.onQRCodeSessionFailed = (errType: number, errCode: number, errMsg: string) => {
-            umamiTrace.trackEvent('shell/login/error/' + errType.toString() + '-' + errCode.toString(), errMsg);
+            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) => {
-            umamiTrace.trackEvent('shell/login/error/' + args.toString(), args.toString());
-            logger.logError('[Core] [Login] Login Error , ErrInfo: ', args.toString());
+        loginListener.onLoginFailed = (...args) => {
+            UmamiTrace.sendTrace('login/error', args.toString());
+            logger.logError('[Core] [Login] Login Error , ErrInfo: ', JSON.stringify(args));
         };
 
         loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));
@@ -270,13 +270,9 @@ export async function NCoreInitShell() {
     const pathWrapper = new NapCatPathWrapper();
     const logger = new LogWrapper(pathWrapper.logsPath);
     handleUncaughtExceptions(logger);
-    process.on('exit', (code: number) => {
-        umamiTrace.trackEvent('shell/exit', code.toString());
-    });
     const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
     const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
-    umamiTrace.init(basicInfoWrapper.getFullQQVesion());
-    umamiTrace.trackEvent('shell/boot');
+
     const o3Service = wrapper.NodeIO3MiscService.get();
     o3Service.addO3MiscListener(new NodeIO3MiscListener());
 
@@ -302,9 +298,10 @@ export async function NCoreInitShell() {
 
     const dataTimestape = new Date().getTime().toString();
     o3Service.reportAmgomWeather('login', 'a1', [dataTimestape, '0', '0']);
-
+    UmamiTrace.init(basicInfoWrapper.getFullQQVesion(), loginService.getMachineGuid(), 'shell');
+    UmamiTrace.sendTrace('boot/init');
     const selfInfo = await handleLogin(loginService, logger, pathWrapper, quickLoginUin, historyLoginList);
-    umamiTrace.trackEvent('shell/login');
+    UmamiTrace.sendTrace('login/success');
     const amgomDataPiece = 'eb1fd6ac257461580dc7438eb099f23aae04ca679f4d88f53072dc56e3bb1129';
     o3Service.setAmgomDataPiece(basicInfoWrapper.QQVersionAppid, new Uint8Array(Buffer.from(amgomDataPiece, 'hex')));
 

tsconfig.json

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