dlinkclaw-openclaw 2026.10.18 → 2026.10.19

package/dist/index.js

@@ -1 +1 @@
-import{emptyPluginConfigSchema as e}from"openclaw/plugin-sdk/core";import{channelMeta as n,dlChannel as t,LOG_TAG as r}from"./src/channel.js";import{setDLLogger as o,setDLRuntime as i,isRunStopped as s}from"./src/runtime.js";const l=n;n.isDebug&&(process.env.NODE_TLS_REJECT_UNAUTHORIZED="0",process.env.NODE_ENV="dev");const a={id:l.id,name:l.label,description:l.blurb,configSchema:e(),register(e){i(e.runtime),o(e.logger,r),e.registerChannel({plugin:t}),e.on("before_tool_call",(e,n)=>{const t=l.id;if(n.channelId===t)return e.runId&&s(e.runId)?{block:!0,blockReason:"用户已点击停止，任务终止执行"}:void 0}),e.on("before_prompt_build",(n,t)=>{const r=l.id;if(e.logger.warn(`ctx.channel=${t.channel}, ctx.channelId=${t.channelId}, channelId=${r}`),t.channel===r||t.channelId===r)return{prependSystemContext:["[AGENT CODE OF CONDUCT - ALWAYS FOLLOW]","1. ASK BEFORE GUESSING: If the task is incomplete or has multiple reasonable interpretations, send a one-line confirmation first. Never guess.",'2. STOP ON FAILURE: If the same problem fails 2-3 times in a row, stop and report: "I am stuck: <reason>. Please advise." Never retry endlessly.','3. ALWAYS REPORT COMPLETION: Every task must end with a completion signal. After sending media/files, always follow up with a short text confirmation (e.g. "✅ Sent 3 files: a.png / b.pdf / c.txt"). The client shows a spinner until it receives the final text reply.'].join("\n")}})}};export default a;
+import{emptyPluginConfigSchema as e}from"openclaw/plugin-sdk/core";import{channelMeta as n,dlChannel as t,LOG_TAG as r}from"./src/channel.js";import{setDLLogger as o,setDLRuntime as i,isRunStopped as s}from"./src/runtime.js";const l=n;l.isDebug&&(process.env.NODE_TLS_REJECT_UNAUTHORIZED="0",process.env.NODE_ENV="dev");const a={id:l.id,name:l.label,description:l.blurb,configSchema:e(),register(e){i(e.runtime),o(e.logger,r),e.registerChannel({plugin:t}),e.on("before_tool_call",(e,n)=>{const t=l.id;if(n.channelId===t)return e.runId&&s(e.runId)?{block:!0,blockReason:"用户已点击停止，任务终止执行"}:void 0}),e.on("before_prompt_build",(n,t)=>{const r=l.id;if(e.logger.warn(`ctx.channel=${t.channel}, ctx.channelId=${t.channelId}, channelId=${r}`),t.channel===r||t.channelId===r)return{prependSystemContext:["[AGENT CODE OF CONDUCT - ALWAYS FOLLOW]","1. ASK BEFORE GUESSING: If the task is incomplete or has multiple reasonable interpretations, send a one-line confirmation first. Never guess.",'2. STOP ON FAILURE: If the same problem fails 2-3 times in a row, stop and report: "I am stuck: <reason>. Please advise." Never retry endlessly.','3. ALWAYS REPORT COMPLETION: Every task must end with a completion signal. After sending media/files, always follow up with a short text confirmation (e.g. "✅ Sent 3 files: a.png / b.pdf / c.txt"). The client shows a spinner until it receives the final text reply.'].join("\n")}})}};export default a;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dlinkclaw-openclaw",
-    "version": "2026.10.18",
+    "version": "2026.10.19",
     "description": "DLinkClaw OpenClaw channel plugin — 朵联 OpenClaw 接入通道",
     "keywords": [
         "DLinkClaw",
@@ -76,7 +76,7 @@
             ],
             "order": 90,
             "quickstartAllowFrom": true,
-            "isDebug": true,
+            "isDebug": false,
             "preferSessionLookupForAnnounceTarget": true
         },
         "install": {

package/dist/src/client/dl-client.js

@@ -231,24 +231,40 @@ export class DLClient extends EventEmitter {
         await this.changeConnectStatus('start');
     }
     async stop() {
+        // 2026-10-19：关闭阶段必须有界。MQTT end 回调或 HTTP 上报只要有一个不返回，
+        // 网关的 drain 就会一直等（systemd TimeoutStopSec 默认 15 分钟），表现为重启卡死。
         if (this.mqttClient) {
-            // 2026-09-16 修复：原实现不等 end 回调（清理动作都在回调里），与紧随其后的 start()
-            // 形成竞态：isConnected() 仍为 true → 跳过 connect()，随后回调才把 mqttClient /
-            // cmdHandler / mqttConfig 清空 → 连接彻底废掉。这里等回调执行完再返回。
-            await new Promise((resolve) => {
-                this.mqttClient.end(false, () => {
+            await Promise.race([
+                new Promise((resolve) => {
+                    this.mqttClient.end(true, () => {
+                        this.mqttClient = null;
+                        this.logger.warn(`DLClient account[${this.ctx.account.accountId}] Disconnected`);
+                        if (this.cmdHandler) {
+                            this.cmdHandler.cleanup();
+                        }
+                        this.cmdHandler = null;
+                        this.mqttConfig = null;
+                        resolve();
+                    });
+                }),
+                new Promise((resolve) => setTimeout(() => {
+                    this.logger.warn(`DLClient account[${this.ctx.account.accountId}] mqtt end timeout(3s), force continue`);
                     this.mqttClient = null;
-                    this.logger.warn(`DLClient account[${this.ctx.account.accountId}] Disconnected`);
-                    if (this.cmdHandler) {
-                        this.cmdHandler.cleanup();
-                    }
                     this.cmdHandler = null;
                     this.mqttConfig = null;
                     resolve();
-                });
-            });
+                }, 1200)),
+            ]);
+        }
+        try {
+            await Promise.race([
+                this.changeConnectStatus('stop'),
+                new Promise((resolve) => setTimeout(resolve, 5000)),
+            ]);
+        }
+        catch (e) {
+            this.logger.warn(`DLClient changeConnectStatus(stop) failed: ${String(e)}`);
         }
-        await this.changeConnectStatus('stop');
     }
     /**
      * 2026-09-15 方案A（石头哥确认）：重新拉取 mqtt 配置（含 openUserTopics）。

package/dist/src/client/message.js

@@ -1094,7 +1094,7 @@ export async function routeAndDispatchMessage(ctx) {
                             streamId,
                             content,
                             status: 'read',
-                            kind: isTaskListContent(content) ? 'plan' : 'block',
+                            kind: isTaskListContent(content) ? 'plan' : 'commentary',
                         });
                     }
                 },
@@ -1181,7 +1181,7 @@ export async function routeAndDispatchMessage(ctx) {
                             streamId,
                             content: joined,
                             status: 'read',
-                            kind: isTaskListContent(joined) ? 'plan' : 'block'
+                            kind: isTaskListContent(joined) ? 'plan' : 'commentary'
                         });
                     }
                 },

package/dist/src/client/types.d.ts

@@ -96,7 +96,7 @@ export interface DLMixedBody extends DLBaseBody {
     msgList: Array<DLTextBody | DLImageBody | DLVoiceBody | DLVideoBody | DLFileBody>;
     quote?: DLQuoteBase;
 }
-export type DLKind = 'block' | 'in_process' | 'tool' | 'plan' | 'patch' | 'command' | 'reasoning' | 'end_reasoning';
+export type DLKind = 'block' | 'in_process' | 'tool' | 'plan' | 'patch' | 'command' | 'reasoning' | 'end_reasoning' | 'commentary';
 export type MessageStatus = 'read' | 'unRead' | undefined;
 export interface ChatUser {
     id: string;

package/dist/src/services/index.js

@@ -154,7 +154,7 @@ export class CmdHandler {
                             this.dlClient.publishProcessingState({
                                 streamId,
                                 content,
-                                kind: isTaskList ? 'plan' : 'block',
+                                kind: isTaskList ? 'plan' : 'commentary',
                                 status: 'read'
                             });
                         }

package/package.json

@@ -1,96 +1,96 @@
-{
-  "name": "dlinkclaw-openclaw",
-  "version": "2026.10.18",
-  "description": "DLinkClaw OpenClaw channel plugin — 朵联 OpenClaw 接入通道",
-  "keywords": [
-    "DLinkClaw",
-    "openclaw",
-    "朵联",
-    "钉钉",
-    "QQ",
-    "企业微信",
-    "飞书"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "build": "tsc && terser dist/index.js --output dist/index.js --compress --mangle --module",
-    "dev": "tsc --watch",
-    "prepublishOnly": "npm run build"
-  },
-  "license": "MIT",
-  "author": "rock.chen<szygnet@qq.com>",
-  "type": "module",
-  "types": "./dist/index.d.ts",
-  "main": "./index.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
-    }
-  },
-  "files": [
-    "dist",
-    "skills",
-    "ext_capabilities",
-    "openclaw.plugin.json",
-    "README.md",
-    "docs"
-  ],
-  "dependencies": {
-    "axios": "^1.15.2",
-    "file-type": "^21.3.1",
-    "form-data": "^4.0.5",
-    "mime-types": "^3.0.2",
-    "mqtt": "^5.10.0",
-    "qrcode-terminal": "^0.12.0",
-    "uuid": "^14.0.2",
-    "ws": "^8.20.0"
-  },
-  "devDependencies": {
-    "@types/mime-types": "^3.0.1",
-    "@types/ws": "^8.18.1",
-    "terser": "^5.46.1",
-    "typescript": "^5.3.3"
-  },
-  "peerDependencies": {
-    "openclaw": ">=2026.10.3"
-  },
-  "openclaw": {
-    "extensions": [
-      "./index.ts"
-    ],
-    "installDependencies": true,
-    "channel": {
-      "id": "dlink",
-      "label": "朵联 DLinkClaw",
-      "selectionLabel": "朵联(DLinkClaw)",
-      "docsPath": "/channels/dlinkclaw-openclaw",
-      "docsLabel": "dlinkclaw-openclaw",
-      "blurb": "朵联 DLinkClaw OpenClaw 接入通道, 本地或云端部署OpenClaw连接朵联客户端, 支持企业微信、QQ、钉钉、飞书, 无需公网IP.",
-      "aliases": [
-        "dlink",
-        "DLinkClaw",
-        "朵联"
-      ],
-      "order": 90,
-      "quickstartAllowFrom": true,
-      "isDebug": true,
-      "preferSessionLookupForAnnounceTarget": true
-    },
-    "install": {
-      "npmSpec": "dlinkclaw-openclaw",
-      "localPath": "extensions/dlinkclaw-openclaw",
-      "defaultChoice": "npm"
-    }
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/dlinkclaw/dlinkclaw-openclaw-channel.git"
-  },
-  "homepage": "https://github.com/dlinkclaw/dlinkclaw-openclaw-channel#readme",
-  "bugs": {
-    "url": "https://github.com/dlinkclaw/dlinkclaw-openclaw-channel/issues"
-  }
+{
+  "name": "dlinkclaw-openclaw",
+  "version": "2026.10.19",
+  "description": "DLinkClaw OpenClaw channel plugin — 朵联 OpenClaw 接入通道",
+  "keywords": [
+    "DLinkClaw",
+    "openclaw",
+    "朵联",
+    "钉钉",
+    "QQ",
+    "企业微信",
+    "飞书"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsc && terser dist/index.js --output dist/index.js --compress --mangle --module",
+    "dev": "tsc --watch",
+    "prepublishOnly": "npm run build"
+  },
+  "license": "MIT",
+  "author": "rock.chen<szygnet@qq.com>",
+  "type": "module",
+  "types": "./dist/index.d.ts",
+  "main": "./index.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist",
+    "skills",
+    "ext_capabilities",
+    "openclaw.plugin.json",
+    "README.md",
+    "docs"
+  ],
+  "dependencies": {
+    "axios": "^1.15.2",
+    "file-type": "^21.3.1",
+    "form-data": "^4.0.5",
+    "mime-types": "^3.0.2",
+    "mqtt": "^5.10.0",
+    "qrcode-terminal": "^0.12.0",
+    "uuid": "^14.0.2",
+    "ws": "^8.20.0"
+  },
+  "devDependencies": {
+    "@types/mime-types": "^3.0.1",
+    "@types/ws": "^8.18.1",
+    "terser": "^5.46.1",
+    "typescript": "^5.3.3"
+  },
+  "peerDependencies": {
+    "openclaw": ">=2026.10.3"
+  },
+  "openclaw": {
+    "extensions": [
+      "./index.ts"
+    ],
+    "installDependencies": true,
+    "channel": {
+      "id": "dlink",
+      "label": "朵联 DLinkClaw",
+      "selectionLabel": "朵联(DLinkClaw)",
+      "docsPath": "/channels/dlinkclaw-openclaw",
+      "docsLabel": "dlinkclaw-openclaw",
+      "blurb": "朵联 DLinkClaw OpenClaw 接入通道, 本地或云端部署OpenClaw连接朵联客户端, 支持企业微信、QQ、钉钉、飞书, 无需公网IP.",
+      "aliases": [
+        "dlink",
+        "DLinkClaw",
+        "朵联"
+      ],
+      "order": 90,
+      "quickstartAllowFrom": true,
+      "isDebug": false,
+      "preferSessionLookupForAnnounceTarget": true
+    },
+    "install": {
+      "npmSpec": "dlinkclaw-openclaw",
+      "localPath": "extensions/dlinkclaw-openclaw",
+      "defaultChoice": "npm"
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dlinkclaw/dlinkclaw-openclaw-channel.git"
+  },
+  "homepage": "https://github.com/dlinkclaw/dlinkclaw-openclaw-channel#readme",
+  "bugs": {
+    "url": "https://github.com/dlinkclaw/dlinkclaw-openclaw-channel/issues"
+  }
 }