Merge pull request #679 from wu-yafeng/main

fix #678

manifest.json

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

package.json

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

src/common/umami.ts

@@ -12,6 +12,7 @@ export class UmamiTraceCore {
     ua: string = '';
     workname: string = 'default';
     bootTime = Date.now();
+    cache: string = '';
     init(qqversion: string, guid: string, workname: string) {
         this.qqversion = qqversion;
         this.workname = workname;
@@ -101,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 } : {})
             }
         };
 
@@ -110,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();

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.59';
+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/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/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"
         ],