@tencent-connect/openclaw-qqbot 1.5.6 → 1.5.7

package/scripts/upgrade-via-npm.sh

@@ -0,0 +1,204 @@
+#!/bin/bash
+
+# qqbot 通过 npm 包升级
+#
+# 用法:
+#   upgrade-via-npm.sh                                    # 升级到 latest（默认）
+#   upgrade-via-npm.sh --version <version>                # 升级到指定版本
+#   upgrade-via-npm.sh --self-version                     # 升级到当前仓库 package.json 版本
+
+set -eo pipefail
+
+PKG_NAME="@tencent-connect/openclaw-qqbot"
+INSTALL_SRC=""
+APPID=""
+SECRET=""
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+
+LOCAL_VERSION="$(node -e "
+  try {
+    const fs = require('fs');
+    const path = require('path');
+    const p = path.join('$PROJECT_DIR', 'package.json');
+    const v = JSON.parse(fs.readFileSync(p, 'utf8')).version;
+    if (v) process.stdout.write(String(v));
+  } catch {}
+" 2>/dev/null || true)"
+
+print_usage() {
+    echo "用法:"
+    echo "  upgrade-via-npm.sh                              # 升级到 latest（默认）"
+    echo "  upgrade-via-npm.sh --version <版本号>            # 升级到指定版本"
+    echo "  upgrade-via-npm.sh --appid <appid> --secret <secret>  # 配置通道并启动"
+    if [ -n "$LOCAL_VERSION" ]; then
+        echo "  upgrade-via-npm.sh --self-version               # 升级到当前仓库版本（$LOCAL_VERSION）"
+    else
+        echo "  upgrade-via-npm.sh --self-version               # 升级到当前仓库版本"
+    fi
+    echo ""
+    echo "也可以通过环境变量设置:"
+    echo "  QQBOT_APPID           QQ机器人 appid"
+    echo "  QQBOT_SECRET          QQ机器人 secret"
+}
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --tag)
+            [ -z "$2" ] && echo "❌ --tag 需要参数" && exit 1
+            INSTALL_SRC="${PKG_NAME}@$2"
+            shift 2
+            ;;
+        --version)
+            [ -z "$2" ] && echo "❌ --version 需要参数" && exit 1
+            INSTALL_SRC="${PKG_NAME}@$2"
+            shift 2
+            ;;
+        --self-version)
+            [ -z "$LOCAL_VERSION" ] && echo "❌ 无法从 package.json 读取版本" && exit 1
+            INSTALL_SRC="${PKG_NAME}@${LOCAL_VERSION}"
+            shift 1
+            ;;
+        --appid)
+            [ -z "$2" ] && echo "❌ --appid 需要参数" && exit 1
+            APPID="$2"
+            shift 2
+            ;;
+        --secret)
+            [ -z "$2" ] && echo "❌ --secret 需要参数" && exit 1
+            SECRET="$2"
+            shift 2
+            ;;
+        -h|--help)
+            print_usage
+            exit 0
+            ;;
+        *) echo "未知选项: $1"; print_usage; exit 1 ;;
+    esac
+done
+INSTALL_SRC="${INSTALL_SRC:-${PKG_NAME}@latest}"
+
+# 使用命令行参数或环境变量
+APPID="${APPID:-$QQBOT_APPID}"
+SECRET="${SECRET:-$QQBOT_SECRET}"
+
+# 检测 CLI
+CMD=""
+for name in openclaw clawdbot moltbot; do
+    command -v "$name" &>/dev/null && CMD="$name" && break
+done
+[ -z "$CMD" ] && echo "❌ 未找到 openclaw / clawdbot / moltbot" && exit 1
+
+APP_CONFIG="$HOME/.$CMD/$CMD.json"
+EXTENSIONS_DIR="$HOME/.$CMD/extensions"
+
+echo "==========================================="
+echo "  qqbot npm 升级: $INSTALL_SRC"
+echo "==========================================="
+echo ""
+
+# [1/4] 备份并临时移除通道配置（避免 plugins install 因 unknown channel 拒绝执行）
+echo "[1/4] 备份通道配置..."
+if [ -f "$APP_CONFIG" ]; then
+    node -e "
+        const fs = require('fs');
+        const cfg = JSON.parse(fs.readFileSync('$APP_CONFIG', 'utf8'));
+        const keys = ['qqbot', 'openclaw-qqbot', 'openclaw-qq'];
+        let saved = null;
+        for (const key of keys) {
+            const ch = cfg.channels && cfg.channels[key];
+            if (ch) { saved = ch; delete cfg.channels[key]; break; }
+        }
+        // 清理 plugins.entries 中的旧记录（避免 stale config entry 告警）
+        if (cfg.plugins && cfg.plugins.entries) {
+            delete cfg.plugins.entries['openclaw-qqbot'];
+        }
+        if (saved) {
+            fs.writeFileSync('$APP_CONFIG.qqbot-backup.json', JSON.stringify(saved, null, 2));
+            fs.writeFileSync('$APP_CONFIG', JSON.stringify(cfg, null, 4) + '\n');
+            console.log('  ✅ 已备份并临时移除 channels.qqbot');
+        } else {
+            console.log('  ℹ️  无已有通道配置');
+        }
+    " 2>/dev/null || echo "  ⚠️  备份失败"
+else
+    echo "  ℹ️  无配置文件"
+fi
+
+# [2/4] 清理旧插件目录
+echo ""
+echo "[2/4] 清理旧插件..."
+for old_plugin in openclaw-qqbot qqbot openclaw-qq @sliverp/qqbot @tencent-connect/qqbot @tencent-connect/openclaw-qq @tencent-connect/openclaw-qqbot; do
+    $CMD plugins uninstall "$old_plugin" 2>/dev/null && echo "  已卸载: $old_plugin" || true
+done
+for dir_name in openclaw-qqbot qqbot openclaw-qq; do
+    if [ -d "$EXTENSIONS_DIR/$dir_name" ]; then
+        rm -rf "$EXTENSIONS_DIR/$dir_name"
+        echo "  已清理残留目录: $dir_name"
+    fi
+done
+
+# [3/4] 安装新版本
+echo ""
+echo "[3/4] 安装新版本..."
+$CMD plugins install "$INSTALL_SRC" 2>&1
+
+# 恢复通道配置
+BACKUP_FILE="$APP_CONFIG.qqbot-backup.json"
+if [ -f "$BACKUP_FILE" ] && [ -f "$APP_CONFIG" ]; then
+    node -e "
+        const fs = require('fs');
+        const cfg = JSON.parse(fs.readFileSync('$APP_CONFIG', 'utf8'));
+        const saved = JSON.parse(fs.readFileSync('$BACKUP_FILE', 'utf8'));
+        cfg.channels = cfg.channels || {};
+        cfg.channels.qqbot = saved;
+        fs.writeFileSync('$APP_CONFIG', JSON.stringify(cfg, null, 4) + '\n');
+        fs.unlinkSync('$BACKUP_FILE');
+        console.log('  ✅ 通道配置已恢复');
+    " 2>/dev/null || echo "  ⚠️  通道配置恢复失败，请手动检查: $APP_CONFIG"
+fi
+
+# 配置通道（如果提供了 appid 和 secret）
+if [ -n "$APPID" ] && [ -n "$SECRET" ]; then
+    echo ""
+    echo "配置机器人通道..."
+    DESIRED_TOKEN="${APPID}:${SECRET}"
+
+    # 读取当前配置中的 token
+    CURRENT_TOKEN=""
+    if [ -f "$APP_CONFIG" ]; then
+        CURRENT_TOKEN=$(node -e "
+            const cfg = JSON.parse(require('fs').readFileSync('$APP_CONFIG', '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)
+    fi
+
+    if [ "$CURRENT_TOKEN" = "$DESIRED_TOKEN" ]; then
+        echo "  ✅ 当前配置已是目标值，跳过写入"
+    elif $CMD channels add --channel qqbot --token "$DESIRED_TOKEN" 2>&1; then
+        echo "  ✅ 机器人通道配置成功"
+    else
+        echo "  ⚠️  通道配置失败，请手动执行: $CMD channels add --channel qqbot --token \"$DESIRED_TOKEN\""
+    fi
+fi
+
+# [4/4] 重启网关
+echo ""
+echo "[4/4] 重启网关..."
+$CMD gateway restart 2>&1 || true
+
+echo ""
+echo "==========================================="
+echo "  ✅ 升级完成"
+echo "==========================================="
+echo ""
+echo "常用命令:"
+echo "  $CMD logs --follow        # 跟踪日志"
+echo "  $CMD gateway restart      # 重启服务"
+echo "  $CMD plugins list         # 查看插件列表"

package/scripts/{upgrade-and-run.sh → upgrade-via-source.sh}

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# QQBot 一键更新并启动脚本
+# qqbot 一键更新并启动脚本
 # 版本: 2.0 (增强错误处理版)
 #
 # 主要改进:
@@ -44,20 +44,20 @@ while [[ $# -gt 0 ]]; do
             echo "用法: $0 [选项]"
             echo ""
             echo "选项:"
-            echo "  --appid <appid>       QQ机器人 AppID"
-            echo "  --secret <secret>     QQ机器人 Secret"
-            echo "  --markdown <yes|no>   是否启用 Markdown 消息格式（默认: no）"
+            echo "  --appid <appid>       QQ机器人 appid"
+            echo "  --secret <secret>     QQ机器人 secret"
+            echo "  --markdown <yes|no>   是否启用 markdown 消息格式（默认: no）"
             echo "  -h, --help            显示帮助信息"
             echo ""
             echo "也可以通过环境变量设置:"
-            echo "  QQBOT_APPID           QQ机器人 AppID"
-            echo "  QQBOT_SECRET          QQ机器人 Secret"
-            echo "  QQBOT_TOKEN           QQ机器人 Token (AppID:Secret)"
-            echo "  QQBOT_MARKDOWN        是否启用 Markdown（yes/no）"
+            echo "  QQBOT_APPID           QQ机器人 appid"
+            echo "  QQBOT_SECRET          QQ机器人 secret"
+            echo "  QQBOT_TOKEN           QQ机器人 token (appid:secret)"
+            echo "  QQBOT_MARKDOWN        是否启用 markdown（yes/no）"
             echo ""
             echo "不带参数时，将使用已有配置直接启动。"
             echo ""
-            echo "⚠️  注意: 启用 Markdown 需要在 QQ 开放平台申请 Markdown 消息权限"
+            echo "⚠️  注意: 启用 markdown 需要在 QQ 开放平台申请 markdown 消息权限"
             exit 0
             ;;
         *)
@@ -74,7 +74,7 @@ SECRET="${SECRET:-$QQBOT_SECRET}"
 MARKDOWN="${MARKDOWN:-$QQBOT_MARKDOWN}"
 
 echo "========================================="
-echo "  QQBot 一键更新启动脚本"
+echo "  qqbot 一键更新启动脚本"
 echo "========================================="
 
 # 1. 备份已有 qqbot 通道配置，防止升级过程丢失
@@ -134,19 +134,34 @@ fi
 # 2. 移除老版本
 echo ""
 echo "[2/6] 移除老版本..."
-if [ -f "$PROJ_DIR/scripts/upgrade.sh" ]; then
-    bash "$PROJ_DIR/scripts/upgrade.sh"
+if [ -f "$PROJ_DIR/scripts/cleanup-legacy-plugins.sh" ]; then
+    bash "$PROJ_DIR/scripts/cleanup-legacy-plugins.sh"
 else
-    echo "警告: upgrade.sh 不存在，跳过移除步骤"
+    echo "警告: cleanup-legacy-plugins.sh 不存在，跳过移除步骤"
 fi
 
 # 3. 安装当前版本
 echo ""
-echo "[3/6] 安装当前版本..."
+echo "[3/6] 安装当前版本（源码安装）..."
 
 echo "检查当前目录: $(pwd)"
 echo "检查openclaw版本: $(openclaw --version 2>/dev/null || echo 'openclaw not found')"
 
+LOCAL_PACKAGE_VERSION=$(node -e "
+  try {
+    const fs = require('fs');
+    const path = require('path');
+    const p = path.join('$PROJ_DIR', 'package.json');
+    const v = JSON.parse(fs.readFileSync(p, 'utf8')).version;
+    if (v) process.stdout.write(String(v));
+  } catch {}
+" 2>/dev/null || true)
+if [ -n "$LOCAL_PACKAGE_VERSION" ]; then
+    echo "即将安装本地源码版本: $LOCAL_PACKAGE_VERSION"
+else
+    echo "即将安装本地源码版本: unknown（未读取到 package.json version）"
+fi
+
 # 记录更新前的 qqbot 插件版本
 OLD_QQBOT_VERSION=$(node -e '
     try {
@@ -165,6 +180,7 @@ OLD_QQBOT_VERSION=$(node -e '
 ' 2>/dev/null || echo "not_installed")
 
 echo "开始安装插件..."
+echo "安装来源: 当前仓库源码（openclaw plugins install .）"
 INSTALL_LOG="/tmp/openclaw-install-$(date +%s).log"
 
 echo "安装日志文件: $INSTALL_LOG"
@@ -281,13 +297,13 @@ done
 DESIRED_QQBOT_TOKEN=""
 if [ -n "$APPID" ] && [ -n "$SECRET" ]; then
     DESIRED_QQBOT_TOKEN="${APPID}:${SECRET}"
-    echo "使用提供的 AppID 和 Secret 配置..."
+    echo "使用提供的 appid 和 secret 配置..."
 elif [ -n "$QQBOT_TOKEN" ]; then
     DESIRED_QQBOT_TOKEN="$QQBOT_TOKEN"
     echo "使用环境变量 QQBOT_TOKEN 配置..."
 elif [ -n "$SAVED_QQBOT_TOKEN" ]; then
     DESIRED_QQBOT_TOKEN="$SAVED_QQBOT_TOKEN"
-    echo "未提供 AppID/Secret，使用备份 token 恢复配置..."
+    echo "未提供 appid/secret，使用备份 token 恢复配置..."
 fi
 
 if [ -n "$DESIRED_QQBOT_TOKEN" ]; then
@@ -318,33 +334,33 @@ else
         echo ""
         echo "❌ 未检测到 qqbot 通道配置！"
         echo ""
-        echo "首次运行请提供 AppID 和 AppSecret："
+        echo "首次运行请提供 appid 和 appsecret："
         echo ""
-        echo "  bash $0 --appid <你的AppID> --secret <你的AppSecret>"
+        echo "  bash $0 --appid <你的appid> --secret <你的appsecret>"
         echo ""
         echo "也可以通过环境变量："
         echo ""
-        echo "  QQBOT_APPID=<AppID> QQBOT_SECRET=<AppSecret> bash $0"
+        echo "  QQBOT_APPID=<appid> QQBOT_SECRET=<appsecret> bash $0"
         echo ""
-        echo "AppID 和 AppSecret 可在 QQ 开放平台 (https://q.qq.com) 获取。"
+        echo "appid 和 appsecret 可在 QQ 开放平台 (https://q.qq.com) 获取。"
         exit 1
     else
         echo "使用已有配置"
     fi
 fi
 
-# 5. 配置 Markdown 选项（仅在明确指定时才配置）
+# 5. 配置 markdown 选项（仅在明确指定时才配置）
 echo ""
-echo "[5/6] 配置 Markdown 选项..."
+echo "[5/6] 配置 markdown 选项..."
 
 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 消息格式（使用纯文本）..."
+        echo "禁用 markdown 消息格式（使用纯文本）..."
     fi
 
     CURRENT_MARKDOWN_VALUE=$(node -e "
@@ -367,9 +383,9 @@ if [ -n "$MARKDOWN" ]; then
     " 2>/dev/null || true)
 
     if [ "$CURRENT_MARKDOWN_VALUE" = "$MARKDOWN_VALUE" ]; then
-        echo "✅ Markdown 配置已是目标值，跳过写入（避免配置覆盖提示）"
+        echo "✅ markdown 配置已是目标值，跳过写入（避免配置覆盖提示）"
     elif openclaw config set channels.qqbot.markdownSupport "$MARKDOWN_VALUE" 2>&1; then
-        echo "✅ Markdown配置成功"
+        echo "✅ markdown配置成功"
         _config_changed=1
     else
         echo "⚠️  openclaw config set 失败，尝试直接编辑配置文件..."
@@ -384,14 +400,14 @@ if [ -n "$MARKDOWN" ]; then
           cfg.channels.qqbot.markdownSupport = target;
           fs.writeFileSync('$OPENCLAW_CONFIG', JSON.stringify(cfg, null, 4) + '\n');
         " 2>&1; then
-            echo "✅ Markdown配置成功（直接编辑配置文件）"
+            echo "✅ markdown配置成功（直接编辑配置文件）"
             _config_changed=1
         else
-            echo "⚠️  Markdown配置设置失败，不影响后续运行"
+            echo "⚠️  markdown配置设置失败，不影响后续运行"
         fi
     fi
 else
-    echo "未指定 Markdown 选项，使用已有配置"
+    echo "未指定 markdown 选项，使用已有配置"
 fi
 
 # 6. 启动 openclaw
@@ -404,26 +420,26 @@ if ! command -v openclaw &> /dev/null; then
     echo "❌ 错误: openclaw 命令未找到！"
     echo ""
     echo "可能的原因:"
-    echo "1. OpenClaw未安装或安装失败"
+    echo "1. openclaw未安装或安装失败"
     echo "2. PATH环境变量未包含openclaw路径"
     echo "3. 需要重新登录或重启终端"
     echo ""
     exit 1
 fi
 
-echo "OpenClaw版本: $(openclaw --version 2>/dev/null || echo '未知')"
+echo "openclaw版本: $(openclaw --version 2>/dev/null || echo '未知')"
 
 # 显示 qqbot 插件更新信息
 NEW_QQBOT_VERSION="${NEW_QQBOT_VERSION:-unknown}"
 if [ "$OLD_QQBOT_VERSION" = "$NEW_QQBOT_VERSION" ]; then
-    echo "QQBot 插件版本: $NEW_QQBOT_VERSION (未变化)"
+    echo "qqbot 插件版本: $NEW_QQBOT_VERSION (未变化)"
 elif [ "$OLD_QQBOT_VERSION" = "not_installed" ]; then
-    echo "QQBot 插件版本: $NEW_QQBOT_VERSION (新安装)"
+    echo "qqbot 插件版本: $NEW_QQBOT_VERSION (新安装)"
 else
-    echo "QQBot 插件版本: $OLD_QQBOT_VERSION -> $NEW_QQBOT_VERSION"
+    echo "qqbot 插件版本: $OLD_QQBOT_VERSION -> $NEW_QQBOT_VERSION"
 fi
 echo ""
-read -t 120 -p "是否后台重启 OpenClaw 网关服务？[Y/n] " start_choice || start_choice="y"
+read -t 120 -p "是否后台重启 openclaw 网关服务？[Y/n] " start_choice || start_choice="y"
 start_choice="${start_choice:-y}"
 start_choice=$(printf '%s' "$start_choice" | tr '[:upper:]' '[:lower:]')
 
@@ -432,14 +448,14 @@ case "$start_choice" in
         echo ""
         # 不论配置是否变更，都显式 restart 一次，确保插件正确加载
         # （plugins install 触发的自动重启链已在第 3 步等待完成）
-        echo "正在后台重启 OpenClaw 网关服务..."
+        echo "正在后台重启 openclaw 网关服务..."
         if ! openclaw gateway restart 2>&1; then
             echo ""
             echo "⚠️  后台重启失败，可能服务未安装"
             echo "尝试: openclaw gateway install && openclaw gateway start"
         fi
         echo ""
-        echo "✅ OpenClaw 网关已在后台重启"
+        echo "✅ openclaw 网关已在后台重启"
         echo ""
         # 等待 gateway 端口就绪（插件安装+自动重启可能需要 30-60 秒）
         echo "等待 gateway 就绪（插件安装中，可能需要 30-60 秒）..."
@@ -462,8 +478,8 @@ case "$start_choice" in
         else
             echo "✅ Gateway 端口已就绪"
             echo ""
-            # 检查 QQBot WS 是否连接成功（最多等 30 秒）
-            echo "检查 QQBot 插件连接状态..."
+            # 检查 qqbot WS 是否连接成功（最多等 30 秒）
+            echo "检查 qqbot 插件连接状态..."
             _LOG_FILE="/tmp/openclaw/openclaw-$(date +%Y-%m-%d).log"
             _qqbot_ready=0
             for _j in $(seq 1 15); do
@@ -473,17 +489,17 @@ case "$start_choice" in
                     _qqbot_ready=1
                     break
                 fi
-                printf "\r  等待 QQBot WS 连接... (%d/15)" "$_j"
+                printf "\r  等待 qqbot WS 连接... (%d/15)" "$_j"
                 sleep 2
             done
             echo ""
 
             if [ "$_qqbot_ready" -eq 0 ]; then
-                echo "⚠️  QQBot 插件可能未正确加载，尝试再次重启..."
+                echo "⚠️  qqbot 插件可能未正确加载，尝试再次重启..."
                 openclaw gateway restart 2>&1 || true
                 sleep 10
             else
-                echo "✅ QQBot 插件已连接"
+                echo "✅ qqbot 插件已连接"
             fi
             echo ""
             echo "正在跟踪日志输出（按 Ctrl+C 停止查看，不影响后台服务）..."
@@ -513,12 +529,12 @@ case "$start_choice" in
     *)
         echo "无效选择，按默认值 y 执行后台重启"
         echo ""
-        echo "正在后台重启 OpenClaw 网关服务..."
+        echo "正在后台重启 openclaw 网关服务..."
         if ! openclaw gateway restart 2>&1; then
             echo "⚠️  后台重启失败，可能服务未安装"
             echo "尝试: openclaw gateway install && openclaw gateway start"
         fi
-        echo "✅ OpenClaw 网关已在后台重启"
+        echo "✅ openclaw 网关已在后台重启"
         ;;
 esac