@izhimu/qq 0.3.0 → 0.3.1

package/dist/src/channel.js

@@ -105,7 +105,6 @@ export const qqPlugin = {
         probeAccount: async () => {
             const status = await getStatus();
             setContextStatus({
-                running: true,
                 lastProbeAt: Date.now(),
             });
             return {
@@ -139,11 +138,11 @@ export const qqPlugin = {
             setContext(ctx);
             const { account } = ctx;
             log.info('gateway', `Starting gateway`);
-            // Update start time
-            setContextStatus({
-                running: true,
-                lastStartAt: Date.now(),
-            });
+            // 检查是否已存在连接
+            const existingConnection = getConnection();
+            if (existingConnection) {
+                await stopAccount();
+            }
             // Create new connection manager
             const connection = new ConnectionManager(account);
             connection.on("event", (event) => eventListener(event));
@@ -151,12 +150,14 @@ export const qqPlugin = {
                 log.info('gateway', `State: ${status.state}`);
                 if (status.state === "connected") {
                     setContextStatus({
+                        linked: true,
                         connected: true,
                         lastConnectedAt: Date.now(),
                     });
                 }
                 else if (status.state === "disconnected" || status.state === "failed") {
                     setContextStatus({
+                        linked: false,
                         connected: false,
                         lastError: status.error,
                     });
@@ -165,54 +166,52 @@ export const qqPlugin = {
             connection.on("reconnecting", (info) => {
                 log.info('gateway', `Reconnecting: ${info.reason}, attempt ${info.totalAttempts}`);
                 setContextStatus({
+                    linked: false,
                     connected: false,
                     lastError: `Reconnecting (${info.reason})`,
                     reconnectAttempts: info.totalAttempts,
                 });
             });
-            await connection.start();
-            setConnection(connection);
-            log.info('gateway', `Started gateway`);
-        },
-        stopAccount: async (_ctx) => {
-            const connection = getConnection();
-            if (connection) {
-                await connection.stop();
-                clearConnection();
-            }
-            setContextStatus({
-                running: false,
-                connected: false,
-                lastStopAt: Date.now(),
-            });
-            clearContext();
-        },
-    },
-    heartbeat: {
-        checkReady: async () => {
-            const status = await getStatus();
-            if (status.status === "ok" && status.data?.online && status.data?.good) {
+            try {
+                await connection.start();
+                setConnection(connection);
+                // Update start time
                 setContextStatus({
+                    running: true,
                     linked: true,
+                    connected: true,
+                    lastStartAt: Date.now(),
                 });
-                return {
-                    ok: true,
-                    reason: 'ok'
-                };
+                log.info('gateway', `Started gateway`);
             }
-            else {
-                log.warn('heartbeat', `Heartbeat failed, status: ${status.status}, data: ${status.data}`);
+            catch (error) {
+                log.error('gateway', `Failed to start gateway:`, error);
                 setContextStatus({
+                    running: false,
                     linked: false,
+                    connected: false,
+                    lastError: error instanceof Error ? error.message : 'Failed to start gateway',
                 });
-                return {
-                    ok: false,
-                    reason: status.msg
-                };
+                throw error;
             }
-        }
+        },
+        stopAccount,
     }
 };
+async function stopAccount() {
+    const connection = getConnection();
+    if (connection) {
+        await connection.stop();
+        clearConnection();
+    }
+    setContextStatus({
+        running: false,
+        linked: false,
+        connected: false,
+        lastStopAt: Date.now(),
+    });
+    clearContext();
+}
 async function outboundSend(ctx) {
     const { to, text, mediaUrl, accountId, replyToId } = ctx;
     log.debug("outbound", `send called - accountId: ${accountId}, to: ${to}, mediaUrl: ${mediaUrl ?? "null"}, replyToId: ${replyToId ?? "none"}`);

package/dist/src/core/connection.js

@@ -7,8 +7,8 @@ import EventEmitter from 'events';
 import { Logger as log, generateEchoId, calculateBackoff, getCloseCodeMessage, } from '../utils/index.js';
 const MAX_RECONNECT_ATTEMPTS = -1;
 const REQUEST_TIMEOUT = 30000; // 30 seconds
-const HEARTBEAT_TIMEOUT = 60000; // 60 seconds - time without heartbeat before reconnecting
-const HEARTBEAT_CHECK_INTERVAL = 30000; // 30 seconds - how often to check for heartbeat timeout
+const HEARTBEAT_TIMEOUT = 120000; // 120 seconds - time without heartbeat before reconnecting (increased for NapCat compatibility)
+const HEARTBEAT_CHECK_INTERVAL = 60000; // 60 seconds - how often to check for heartbeat timeout
 /**
  * Connection Manager for a single NapCat account
  */
@@ -67,6 +67,11 @@ export class ConnectionManager extends EventEmitter {
         if (this.ws?.readyState === WebSocket.OPEN) {
             return;
         }
+        // 防御性清理：确保旧连接和监听器被清理，避免潜在的内存泄漏
+        if (this.ws) {
+            this.ws.removeAllListeners();
+            this.ws = null;
+        }
         this.setState('connecting');
         try {
             // Build WebSocket URL with access_token query parameter (NapCat OneBot 11 standard)
@@ -148,6 +153,7 @@ export class ConnectionManager extends EventEmitter {
                 };
                 this.emit('heartbeat', this.healthStatus);
                 // Close connection and trigger immediate reconnect
+                this.setState('disconnected');
                 this.close('Heartbeat timeout').then(() => {
                     if (this.shouldReconnect) {
                         // Increment total reconnect attempts
@@ -254,6 +260,12 @@ export class ConnectionManager extends EventEmitter {
     handleClose(code, reason) {
         const reasonStr = reason.toString() || getCloseCodeMessage(code);
         log.warn('connection', `Connection closed: ${code} - ${reasonStr}`);
+        // 停止心跳检测
+        this.stopHeartbeatCheck();
+        // 如果 ws 已经为 null，说明是主动关闭（如心跳超时），不需要再处理
+        if (this.ws === null) {
+            return;
+        }
         if (this.shouldReconnect && !this.isNormalClosure(code)) {
             this.scheduleReconnect();
         }

package/dist/src/core/runtime.d.ts

@@ -3,7 +3,7 @@
  * Stores the PluginRuntime for access in gateway handlers
  */
 import type { ChannelAccountSnapshot, ChannelGatewayContext, PluginRuntime } from "openclaw/plugin-sdk";
-import type { QQConfig } from "../types/index.js";
+import type { QQConfig } from "../types";
 import { ConnectionManager } from "./connection.js";
 export declare function setRuntime(next: PluginRuntime): void;
 export declare function getRuntime(): PluginRuntime | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izhimu/qq",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A QQ channel plugin for OpenClaw using NapCat WebSocket",
   "type": "module",
   "main": "dist/index.js",