fix: ua agent

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.63",
+  "version": "4.2.64",
   "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",

src/common/umami.ts

@@ -1,6 +1,7 @@
 import https from 'node:https';
 import { napCatVersion } from './version';
 import os from 'node:os';
+
 export class UmamiTraceCore {
     napcatVersion = napCatVersion;
     qqversion = '1.0.0';
@@ -13,20 +14,22 @@ export class UmamiTraceCore {
     workname: string = 'default';
     bootTime = Date.now();
     cache: string = '';
+    platform = process.platform;
+    
     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',
-            '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',
+        const UaList = {
+            linux: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.11 (KHTML, like Gecko) Ubuntu/11.10 Chromium/27.0.1453.93 Chrome/27.0.1453.93 Safari/537.36',
+            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',
         };
 
         try {
-            if (process.platform === 'win32') {
+            if (this.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') {
+            } else if (this.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`;
             }
@@ -34,7 +37,7 @@ export class UmamiTraceCore {
             this.ua = UaList.win32;
         }
 
-        this.ua = UaList[process.platform as keyof typeof UaList] || UaList.win32;
+        this.ua = UaList[this.platform as keyof typeof UaList] || UaList.win32;
 
         this.identifyUser(guid);
         this.startHeartbeat();
@@ -47,17 +50,17 @@ export class UmamiTraceCore {
             qq_version: this.qqversion,
             napcat_working: this.workname,
             device_guid: this.guid,
-            device_platform: os.platform(),
+            device_platform: this.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)
+            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,
+                title: 'NapCat ' + this.napcatVersion,
                 url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/identify`,
             },
             data,
@@ -76,8 +79,8 @@ export class UmamiTraceCore {
             language: language || 'en-US',
             screen: '1920x1080',
             data: {
-                ...data
-            }
+                ...data,
+            },
         };
         this.sendRequest(payload, type);
     }
@@ -87,7 +90,7 @@ export class UmamiTraceCore {
             website: this.website,
             hostname: this.hostname,
             title: 'NapCat ' + this.napcatVersion,
-            url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/${eventName}` + (!!data ? `/${data}` : ''),
+            url: `/${this.qqversion}/${this.napcatVersion}/${this.workname}/${eventName}` + (data ? `/${data}` : ''),
             referrer: this.referrer,
         };
         this.sendRequest(payload);
@@ -142,4 +145,5 @@ export class UmamiTraceCore {
         }
     }
 }
+
 export const UmamiTrace = new UmamiTraceCore();

src/common/version.ts

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