release: 3.0.5

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.0.4';
+export const napCatVersion = '3.0.5';

src/core/apis/packet.ts

@@ -13,6 +13,7 @@ import {SendLongMsgResp} from "@/core/packet/proto/message/action";
 import { PacketMsg } from "@/core/packet/msg/message";
 import { OidbSvcTrpcTcp0x6D6Response } from "@/core/packet/proto/oidb/Oidb.0x6D6";
 import { PacketMsgPicElement } from "@/core/packet/msg/element";
+import { c } from 'vite/dist/node/types.d-aGj9QkWt';
 
 interface OffsetType {
     [key: string]: {
@@ -59,8 +60,12 @@ export class NTQQPacketApi {
         if (!table) return false;
         const url = 'ws://' + this.serverUrl + '/ws';
         this.packetSession = new PacketSession(this.core.context.logger, new PacketClient(url, this.core));
-        await this.packetSession.client.connect();
+        const cb = () => {
-        await this.packetSession.client.init(process.pid, table.recv, table.send);
+            if (this.packetSession && this.packetSession.client) {
+                this.packetSession.client.init(process.pid, table.recv, table.send).then().catch(this.logger.logError.bind(this.logger));
+            }
+        }
+        await this.packetSession.client.connect(cb);
         return true;
     }
 

src/core/packet/client.ts

@@ -22,7 +22,7 @@ export class PacketClient {
     private websocket: WebSocket | undefined;
     private isConnected: boolean = false;
     private reconnectAttempts: number = 0;
-    private readonly maxReconnectAttempts: number = 5;//现在暂时不可配置
+    private readonly maxReconnectAttempts: number = 60;//现在暂时不可配置
     private readonly cb = new LRUCache<string, (json: RecvPacketData) => Promise<void>>(500); // trace_id-type callback
     private readonly clientUrl: string = '';
     readonly napCatCore: NapCatCore;
@@ -47,7 +47,7 @@ export class PacketClient {
         return text;
     }
 
-    connect(): Promise<void> {
+    connect(cb: any): Promise<void> {
         return new Promise((resolve, reject) => {
             //this.logger.log.bind(this.logger)(`[Core] [Packet Server] Attempting to connect to ${this.clientUrl}`);
             this.websocket = new WebSocket(this.clientUrl);
@@ -57,6 +57,7 @@ export class PacketClient {
                 this.isConnected = true;
                 this.reconnectAttempts = 0;
                 this.logger.log.bind(this.logger)(`[Core] [Packet Server] Connected to ${this.clientUrl}`);
+                cb();
                 resolve();
             };
 
@@ -74,17 +75,17 @@ export class PacketClient {
             this.websocket.onclose = () => {
                 this.isConnected = false;
                 //this.logger.logWarn.bind(this.logger)(`[Core] [Packet Server] Disconnected from ${this.clientUrl}`);
-                this.attemptReconnect();
+                this.attemptReconnect(cb);
             };
         });
     }
 
-    private attemptReconnect(): void {
+    private attemptReconnect(cb: any): void {
         try {
             if (this.reconnectAttempts < this.maxReconnectAttempts) {
                 this.reconnectAttempts++;
                 setTimeout(() => {
-                    this.connect().catch((error) => {
+                    this.connect(cb).catch((error) => {
                         this.logger.logError.bind(this.logger)(`[Core] [Packet Server] Reconnecting attempt failed,${error.message}`);
                     });
                 }, 5000 * this.reconnectAttempts);

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V3.0.4', 'napcat-update-button', 'secondary'),
+                    SettingButton('V3.0.5', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V3.0.4", "napcat-update-button", "secondary")
+          SettingButton("V3.0.5", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([