fix: 修复精确统计

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

manifest.json

@@ -4,16 +4,12 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.2.50",
+  "version": "4.2.58",
   "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.50",
+  "version": "4.2.58",
   "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,18 +1,19 @@
 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';
     guid = 'default-user';
     heartbeatInterval: NodeJS.Timeout | null = null;
-    website: string = '1fabb2b1-c3a3-4416-b1be-31e2cbdce978';
+    website: string = '596cbbb2-1740-4373-a807-cf3d0637bfa7';
     referrer: string = 'https://trace.napneko.icu/';
     hostname: string = 'trace.napneko.icu';
     ua: string = '';
-
-    init(qqversion: string, guid: string) {
+    workname: string = 'default';
+    init(qqversion: string, guid: string, workname: string) {
         this.qqversion = qqversion;
+        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',
@@ -42,32 +43,53 @@ export class UmamiTraceCore {
         const data = {
             napcat_version: this.napcatVersion,
             qq_version: this.qqversion,
-            guid: guid
+            guid: guid,
+            workname: this.workname,
         };
-        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 || 'es-US',
-            napcat_version: this.napcatVersion,
-            qq_version: this.qqversion,
+            language: language || 'en-US',
+            screen: '1920x1080',
+            data: {
+                ...data,
+                napcat_version: this.napcatVersion,
+                qq_version: this.qqversion,
+                workname: this.workname,
+                guid: this.guid,
+                platform: os.platform(),
+                arch: os.arch(),
+                cpus: os.cpus(),
+                uptime: os.uptime(),
+            }
         };
-        this.sendRequest(payload);
+        this.sendRequest(payload, type);
     }
 
-    sendTrace(eventName: string) {
+    sendTrace(eventName: string, data: string = '') {
         const payload = {
             website: this.website,
             hostname: this.hostname,
             title: 'NapCat ' + this.napcatVersion,
-            url: `/${this.qqversion}/${this.napcatVersion}/${eventName}`,
+            url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/${eventName}` + (!!data ? `/${data}` : ''),
             referrer: this.referrer,
         };
         this.sendRequest(payload);
@@ -104,13 +126,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}/heartbeat`,
-                version: this.napcatVersion,
-                qq_version: this.qqversion,
-                user_id: this.guid
+                url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/heartbeat`,
             });
         }, 5 * 60 * 1000);
     }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.50';
+export const napCatVersion = '4.2.58';

src/core/index.ts

@@ -156,9 +156,9 @@ export class NapCatCore {
 
         msgListener.onKickedOffLine = (Info: KickedOffLineInfo) => {
             if (this.context.workingEnv === NapCatCoreWorkingEnv.Framework) {
-                UmamiTrace.sendEvent('framework/kickoff');
+                UmamiTrace.sendTrace('event/kickoff');
             } else {
-                UmamiTrace.sendEvent('shell/kickoff');
+                UmamiTrace.sendTrace('event/kickoff');
             }
             // 下线通知
             this.context.logger.logError('[KickedOffLine] [' + Info.tipsTitle + '] ' + Info.tipsDesc);

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

@@ -26,7 +26,7 @@ export async function NCoreInitFramework(
     console.log('NapCat Framework App Loading...');
 
     process.on('uncaughtException', (err) => {
-        UmamiTrace.sendEvent('framework/error', { name: err.name });
+        UmamiTrace.sendTrace('uncaught/error', err.message);
         console.log('[NapCat] [Error] Unhandled Exception:', err.message);
     });
 
@@ -39,9 +39,9 @@ export async function NCoreInitFramework(
     const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
     const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
     let guid = loginService.getMachineGuid();
-    UmamiTrace.init(basicInfoWrapper.getFullQQVesion(), guid);
-    UmamiTrace.sendTrace('framework/boot');
-    UmamiTrace.sendEvent('framework/login');
+    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/shell/base.ts

@@ -33,7 +33,7 @@ import { UmamiTrace } from '@/common/umami';
 // NapCat Shell App ES 入口文件
 async function handleUncaughtExceptions(logger: LogWrapper) {
     process.on('uncaughtException', (err) => {
-        UmamiTrace.sendEvent('framework/error', { name: err.name, message: 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.sendEvent('shell/qrlogin/error', { errType, errCode, 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.sendEvent('shell/login/error', { args });
-            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));
@@ -298,10 +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());
-    UmamiTrace.sendTrace('shell/boot');
+    UmamiTrace.init(basicInfoWrapper.getFullQQVesion(), loginService.getMachineGuid(), 'shell');
+    UmamiTrace.sendTrace('boot/init');
     const selfInfo = await handleLogin(loginService, logger, pathWrapper, quickLoginUin, historyLoginList);
-    UmamiTrace.sendEvent('shell/login');
+    UmamiTrace.sendTrace('login/success');
     const amgomDataPiece = 'eb1fd6ac257461580dc7438eb099f23aae04ca679f4d88f53072dc56e3bb1129';
     o3Service.setAmgomDataPiece(basicInfoWrapper.QQVersionAppid, new Uint8Array(Buffer.from(amgomDataPiece, 'hex')));