@tencent-connect/openclaw-qqbot 1.6.5-alpha.7 → 1.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencent-connect/openclaw-qqbot",
-  "version": "1.6.5-alpha.7",
+  "version": "1.6.5",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scripts/upgrade-via-npm.sh

@@ -117,8 +117,12 @@ done
 
 EXTENSIONS_DIR="$HOME/.$CMD/extensions"
 
+# 检测 openclaw 版本
+OPENCLAW_VERSION="$($CMD --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+(\.[0-9]+)?' | head -1 || true)"
+
 echo "==========================================="
 echo "  qqbot 升级: $INSTALL_SRC"
+echo "  openclaw 版本: ${OPENCLAW_VERSION:-unknown}"
 echo "==========================================="
 echo ""
 

package/scripts/upgrade-via-source.sh

@@ -483,40 +483,33 @@ else
     ' 2>/dev/null || echo "unknown")
 fi
 
-# ── 恢复 channels.qqbot 配置 ──
-# 安装完成（无论成功或失败），把之前暂存的 channels.qqbot 写回 openclaw.json
-if [ -n "$_QQBOT_CHANNEL_STASH" ] && [ -n "$_STASH_CFG" ] && [ -f "$_STASH_CFG" ]; then
-    node -e "
-        const fs = require('fs');
-        const cfg = JSON.parse(fs.readFileSync('$_STASH_CFG', 'utf8'));
-        if (!cfg.channels) cfg.channels = {};
-        cfg.channels.qqbot = $_QQBOT_CHANNEL_STASH;
-        fs.writeFileSync('$_STASH_CFG', JSON.stringify(cfg, null, 4) + '\n');
-    " 2>/dev/null && echo "  已恢复 channels.qqbot 配置" || echo "  ⚠️  恢复 channels.qqbot 配置失败"
-fi
+# ── 暂不恢复 channels.qqbot 配置 ──
+# openclaw 3.23+ 启动时在插件加载前就校验 channels，
+# 如果此时恢复 channels.qqbot，gateway 会因 "unknown channel id: qqbot" 拒绝启动。
+# 延迟到 gateway 启动、插件加载完成后再恢复（见 Step 6）。
+echo "  [兼容] channels.qqbot 将在 gateway 启动后恢复（避免启动校验失败）"
+
+# ── Step 4/5：不在此时写入 channels.qqbot 配置 ──
+# openclaw 3.23+ 在插件加载前校验 channels，此时写入 channels.qqbot 会导致
+# "unknown channel id: qqbot" 错误。所有 channels.qqbot 相关配置延迟到
+# gateway 启动、插件加载完成后统一写入（见 Step 6 末尾）。
+#
+# 这里只计算出 DESIRED_QQBOT_TOKEN 和 MARKDOWN_VALUE，不实际写入。
 
-# 4. 配置机器人通道（仅在需要变更时写入配置，避免无意义覆盖）
+# 4. 确定机器人通道配置
 echo ""
-echo "[4/6] 配置机器人通道..."
+echo "[4/6] 准备机器人通道配置..."
 
-# 读取当前 qqbot token（兼容多 key）
+# 读取当前 qqbot token（从暂存或配置文件）
+# 注意：channels.qqbot 已被暂存移除，所以从 _QQBOT_CHANNEL_STASH 读取
 CURRENT_QQBOT_TOKEN=""
-for _app in openclaw clawdbot moltbot; do
-    _cfg="$HOME/.$_app/$_app.json"
-    if [ -f "$_cfg" ]; then
-        CURRENT_QQBOT_TOKEN=$(node -e "
-            const cfg = JSON.parse(require('fs').readFileSync('$_cfg', 'utf8'));
-            const keys = ['qqbot', 'openclaw-qqbot', 'openclaw-qq'];
-            for (const key of keys) {
-              const ch = cfg.channels && cfg.channels[key];
-              if (!ch) continue;
-              if (ch.token) { process.stdout.write(ch.token); process.exit(0); }
-              if (ch.appId && ch.clientSecret) { process.stdout.write(ch.appId + ':' + ch.clientSecret); process.exit(0); }
-            }
-        " 2>/dev/null || true)
-        [ -n "$CURRENT_QQBOT_TOKEN" ] && break
-    fi
-done
+if [ -n "$_QQBOT_CHANNEL_STASH" ]; then
+    CURRENT_QQBOT_TOKEN=$(node -e "
+        const ch = $_QQBOT_CHANNEL_STASH;
+        if (ch.token) { process.stdout.write(ch.token); }
+        else if (ch.appId && ch.clientSecret) { process.stdout.write(ch.appId + ':' + ch.clientSecret); }
+    " 2>/dev/null || true)
+fi
 
 DESIRED_QQBOT_TOKEN=""
 if [ -n "$APPID" ] && [ -n "$SECRET" ]; then
@@ -531,104 +524,40 @@ elif [ -n "$SAVED_QQBOT_TOKEN" ]; then
 fi
 
 if [ -n "$DESIRED_QQBOT_TOKEN" ]; then
-    echo "配置机器人通道: qqbot"
-    echo "目标Token: ${DESIRED_QQBOT_TOKEN:0:10}..."
-    if [ "$CURRENT_QQBOT_TOKEN" = "$DESIRED_QQBOT_TOKEN" ]; then
-        echo "✅ 当前配置已是目标值，跳过写入（避免配置覆盖提示）"
-        _config_changed=0
-    elif ! openclaw channels add --channel qqbot --token "$DESIRED_QQBOT_TOKEN" 2>&1; then
-        echo "⚠️  警告: 机器人通道配置失败，继续使用已有配置"
-        _config_changed=0
-    else
-        echo "✅ 机器人通道配置成功"
-        _config_changed=1
-        # channels 配置变更在 reload plan 中匹配为 hot reload（非 restart），
-        # 由 channel 插件热重载处理，通常 <1 秒完成，无需长时间等待。
-        sleep 1
-    fi
+    echo "目标 Token: ${DESIRED_QQBOT_TOKEN:0:10}..."
+    echo "  [兼容] 将在 gateway 启动后写入 channels.qqbot"
+elif [ -z "$CURRENT_QQBOT_TOKEN" ] && [ -z "$_QQBOT_CHANNEL_STASH" ]; then
+    echo ""
+    echo "❌ 未检测到 qqbot 通道配置！"
+    echo ""
+    echo "首次运行请提供 appid 和 appsecret："
+    echo ""
+    echo "  bash $0 --appid <你的appid> --secret <你的appsecret>"
+    echo ""
+    echo "也可以通过环境变量："
+    echo ""
+    echo "  QQBOT_APPID=<appid> QQBOT_SECRET=<appsecret> bash $0"
+    echo ""
+    echo "appid 和 appsecret 可在 QQ 开放平台 (https://q.qq.com) 获取。"
+    exit 1
 else
-    # 未提供任何可用 token 时，检查是否已有可用配置
-    _has_channel=0
-    if [ -n "$CURRENT_QQBOT_TOKEN" ]; then
-        _has_channel=1
-    fi
-
-    if [ "$_has_channel" -eq 0 ]; then
-        echo ""
-        echo "❌ 未检测到 qqbot 通道配置！"
-        echo ""
-        echo "首次运行请提供 appid 和 appsecret："
-        echo ""
-        echo "  bash $0 --appid <你的appid> --secret <你的appsecret>"
-        echo ""
-        echo "也可以通过环境变量："
-        echo ""
-        echo "  QQBOT_APPID=<appid> QQBOT_SECRET=<appsecret> bash $0"
-        echo ""
-        echo "appid 和 appsecret 可在 QQ 开放平台 (https://q.qq.com) 获取。"
-        exit 1
-    else
-        echo "使用已有配置"
-    fi
+    echo "使用已有配置（暂存中）"
 fi
 
-# 5. 配置 markdown 选项（仅在明确指定时才配置）
+# 5. 确定 markdown 选项
 echo ""
-echo "[5/6] 配置 markdown 选项..."
+echo "[5/6] 准备 markdown 配置..."
 
+MARKDOWN_VALUE=""
 if [ -n "$MARKDOWN" ]; then
-    # 设置 markdown 配置
     if [ "$MARKDOWN" = "yes" ] || [ "$MARKDOWN" = "y" ] || [ "$MARKDOWN" = "true" ]; then
         MARKDOWN_VALUE="true"
-        echo "启用 markdown 消息格式..."
+        echo "将启用 markdown 消息格式"
     else
         MARKDOWN_VALUE="false"
-        echo "禁用 markdown 消息格式（使用纯文本）..."
-    fi
-
-    CURRENT_MARKDOWN_VALUE=$(node -e "
-      const fs = require('fs');
-      const path = require('path');
-      const home = process.env.HOME;
-      for (const app of ['openclaw', 'clawdbot', 'moltbot']) {
-        const f = path.join(home, '.' + app, app + '.json');
-        if (!fs.existsSync(f)) continue;
-        try {
-          const cfg = JSON.parse(fs.readFileSync(f, 'utf8'));
-          const keys = ['qqbot', 'openclaw-qqbot', 'openclaw-qq'];
-          for (const key of keys) {
-            const ch = cfg.channels && cfg.channels[key];
-            if (!ch) continue;
-            if (typeof ch.markdownSupport === 'boolean') { process.stdout.write(String(ch.markdownSupport)); process.exit(0); }
-          }
-        } catch {}
-      }
-    " 2>/dev/null || true)
-
-    if [ "$CURRENT_MARKDOWN_VALUE" = "$MARKDOWN_VALUE" ]; then
-        echo "✅ markdown 配置已是目标值，跳过写入（避免配置覆盖提示）"
-    elif openclaw config set channels.qqbot.markdownSupport "$MARKDOWN_VALUE" 2>&1; then
-        echo "✅ markdown配置成功"
-        _config_changed=1
-    else
-        echo "⚠️  openclaw config set 失败，尝试直接编辑配置文件..."
-        OPENCLAW_CONFIG="$HOME/.openclaw/openclaw.json"
-        if [ -f "$OPENCLAW_CONFIG" ] && node -e "
-          const fs = require('fs');
-          const cfg = JSON.parse(fs.readFileSync('$OPENCLAW_CONFIG', 'utf-8'));
-          if (!cfg.channels) cfg.channels = {};
-          if (!cfg.channels.qqbot) cfg.channels.qqbot = {};
-          const target = $MARKDOWN_VALUE;
-          if (cfg.channels.qqbot.markdownSupport === target) process.exit(0);
-          cfg.channels.qqbot.markdownSupport = target;
-          fs.writeFileSync('$OPENCLAW_CONFIG', JSON.stringify(cfg, null, 4) + '\n');
-        " 2>&1; then
-            echo "✅ markdown配置成功（直接编辑配置文件）"
-            _config_changed=1
-        else
-            echo "⚠️  markdown配置设置失败，不影响后续运行"
-        fi
+        echo "将禁用 markdown 消息格式（使用纯文本）"
     fi
+    echo "  [兼容] 将在 gateway 启动后写入配置"
 else
     echo "未指定 markdown 选项，使用已有配置"
 fi
@@ -727,10 +656,70 @@ case "$start_choice" in
             fi
         fi
 
-        # 端口就绪后：检查 qqbot 连接 + 跟踪日志
+        # 端口就绪后：恢复 channels.qqbot 配置 + 检查连接 + 跟踪日志
         if [ "$_port_ready" -eq 1 ]; then
-            echo "✅ Gateway 端口已就绪"
+            echo "✅ Gateway 端口已就绪（插件已加载）"
             echo ""
+
+            # ── 恢复 channels.qqbot 配置 ──
+            # gateway 已启动、插件已注册 qqbot channel，现在可以安全写回配置
+            _need_reload=0
+            _target_cfg=""
+            for _app in openclaw clawdbot moltbot; do
+                _cfg="$HOME/.$_app/$_app.json"
+                if [ -f "$_cfg" ]; then
+                    _target_cfg="$_cfg"
+                    break
+                fi
+            done
+
+            if [ -n "$_target_cfg" ]; then
+                # 构建完整的 channels.qqbot 对象（合并暂存配置 + 新 token + markdown）
+                node -e "
+                    const fs = require('fs');
+                    const cfg = JSON.parse(fs.readFileSync('$_target_cfg', 'utf8'));
+                    if (!cfg.channels) cfg.channels = {};
+
+                    // 从暂存恢复基础配置
+                    const stash = '$_QQBOT_CHANNEL_STASH';
+                    if (stash) {
+                        try { cfg.channels.qqbot = JSON.parse(stash); } catch {}
+                    }
+                    if (!cfg.channels.qqbot) cfg.channels.qqbot = {};
+
+                    // 覆盖 token（如果有新值）
+                    const desired = '$DESIRED_QQBOT_TOKEN';
+                    if (desired && desired.includes(':')) {
+                        const [appId, ...rest] = desired.split(':');
+                        cfg.channels.qqbot.appId = appId;
+                        cfg.channels.qqbot.clientSecret = rest.join(':');
+                        delete cfg.channels.qqbot.token;
+                    }
+
+                    // 覆盖 markdown（如果有指定）
+                    const md = '$MARKDOWN_VALUE';
+                    if (md === 'true') cfg.channels.qqbot.markdownSupport = true;
+                    else if (md === 'false') cfg.channels.qqbot.markdownSupport = false;
+
+                    fs.writeFileSync('$_target_cfg', JSON.stringify(cfg, null, 4) + '\n');
+                " 2>/dev/null || true
+                echo "  ✅ 已恢复 channels.qqbot 配置（含 token/markdown）"
+                _need_reload=1
+            fi
+
+            # 配置写回后 reload gateway 使其生效
+            if [ "$_need_reload" -eq 1 ]; then
+                echo "  重载配置..."
+                sleep 1
+                openclaw gateway restart 2>/dev/null || true
+                # 等待重启后端口重新就绪
+                for _k in $(seq 1 15); do
+                    if lsof -i :18789 -sTCP:LISTEN >/dev/null 2>&1; then
+                        break
+                    fi
+                    sleep 2
+                done
+            fi
             # 检查 qqbot WS 是否连接成功（最多等 20 秒）
             echo "检查 qqbot 插件连接状态..."
             _LOG_FILE="/tmp/openclaw/openclaw-$(date +%Y-%m-%d).log"
@@ -775,10 +764,27 @@ case "$start_choice" in
     n|no)
         echo ""
         echo "✅ 插件更新完毕，未启动服务"
+        # 不启动时也需要恢复 channels.qqbot，否则配置丢失
+        # 注意：下次 gateway 启动可能因 "unknown channel id" 失败，
+        # 需要用户手动 stop → 移除 channels.qqbot → start → 恢复
+        if [ -n "$_QQBOT_CHANNEL_STASH" ] && [ -n "$_STASH_CFG" ] && [ -f "$_STASH_CFG" ]; then
+            node -e "
+                const fs = require('fs');
+                const cfg = JSON.parse(fs.readFileSync('$_STASH_CFG', 'utf8'));
+                if (!cfg.channels) cfg.channels = {};
+                cfg.channels.qqbot = $_QQBOT_CHANNEL_STASH;
+                fs.writeFileSync('$_STASH_CFG', JSON.stringify(cfg, null, 4) + '\n');
+            " 2>/dev/null || true
+            echo "  已恢复 channels.qqbot 配置"
+        fi
         echo ""
-        echo "后续可手动启动:"
-        echo "  openclaw gateway restart    # 重启后台服务"
-        echo "  openclaw logs --follow      # 跟踪日志"
+        echo "后续启动方法（兼容 openclaw 3.23+）："
+        echo "  1. 先临时移除 channels.qqbot 再启动："
+        echo "     openclaw gateway restart"
+        echo "  2. 或使用本脚本自动处理："
+        echo "     bash $0"
+        echo "  3. 跟踪日志："
+        echo "     openclaw logs --follow"
         ;;
     *)
         echo "无效选择，按默认值 y 执行后台重启"