@a2hmarket/a2hmarket 0.6.3 → 0.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a2hmarket/a2hmarket",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "type": "module",
   "files": [
     "index.ts",

package/scripts/install.mjs

@@ -308,8 +308,31 @@ async function runUpdate() {
     process.exit(0);
   }
 
-  // 3. Update plugin
+  // 3. Backup credentials before uninstall
   logStep(3, "更新插件");
+  let savedCreds = null;
+  // Try openclaw.json plugin config first
+  try {
+    const cfg = JSON.parse(readFileSync(join(OPENCLAW_DIR, "openclaw.json"), "utf-8"));
+    const entry = cfg?.plugins?.entries?.a2hmarket;
+    if (entry?.agentId && entry?.agentKey) {
+      savedCreds = entry;
+      log(`    ${CHECK} 凭证已备份 (openclaw.json)`);
+    }
+  } catch {}
+  // Fallback to credentials file
+  if (!savedCreds) {
+    try {
+      if (existsSync(CREDS_FILE)) {
+        savedCreds = JSON.parse(readFileSync(CREDS_FILE, "utf-8"));
+        log(`    ${CHECK} 凭证已备份 (credentials.json)`);
+      }
+    } catch {}
+  }
+  if (!savedCreds) {
+    log(`    ${WARN} 未找到凭证备份，更新后可能需要重新安装`);
+  }
+
   try {
     log(`    卸载旧版本...`);
     execSync('echo y | openclaw plugins uninstall a2hmarket 2>&1', { encoding: "utf-8", stdio: "pipe" });
@@ -321,6 +344,38 @@ async function runUpdate() {
     process.exit(1);
   }
 
+  // Restore credentials to both locations
+  if (savedCreds) {
+    // Restore credentials file
+    mkdirSync(DATA_DIR, { recursive: true });
+    const fileData = {
+      agent_id: savedCreds.agentId ?? savedCreds.agent_id,
+      agent_key: savedCreds.agentKey ?? savedCreds.agent_key,
+      api_url: savedCreds.apiUrl ?? savedCreds.api_url ?? "https://api.a2hmarket.ai",
+      mqtt_url: savedCreds.mqttUrl ?? savedCreds.mqtt_url ?? "mqtts://post-cn-e4k4o78q702.mqtt.aliyuncs.com:8883",
+    };
+    if (savedCreds.notify) fileData.notify = savedCreds.notify;
+    writeFileSync(CREDS_FILE, JSON.stringify(fileData, null, 2) + "\n");
+
+    // Restore openclaw.json plugin entry
+    try {
+      const configPath = join(OPENCLAW_DIR, "openclaw.json");
+      const cfg = JSON.parse(readFileSync(configPath, "utf-8"));
+      if (!cfg.plugins) cfg.plugins = {};
+      if (!cfg.plugins.entries) cfg.plugins.entries = {};
+      cfg.plugins.entries.a2hmarket = {
+        enabled: true,
+        agentId: fileData.agent_id,
+        agentKey: fileData.agent_key,
+        apiUrl: fileData.api_url,
+        mqttUrl: fileData.mqtt_url,
+        ...(fileData.notify ? { notify: fileData.notify } : {}),
+      };
+      writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n");
+    } catch {}
+    log(`    ${CHECK} 凭证已恢复`);
+  }
+
   // 4. Re-link openclaw module
   log(`    配置模块依赖...`);
   try {
@@ -468,32 +523,11 @@ async function main() {
     log(`\n${BOLD}A2H Market — OpenClaw Plugin${RESET}\n`);
     log(`  安装:    npx -y ${NPM_SPEC} install`);
     log(`  快速:    npx -y ${NPM_SPEC} install --agent ag_xxx:key`);
-    log(`  非交互:  npx -y ${NPM_SPEC} install --agent ag_xxx:key --notify feishu:ou_xxx`);
     log(`  更新:    npx -y ${NPM_SPEC} update`);
     log(`  卸载:    npx -y ${NPM_SPEC} uninstall\n`);
-    log(`  选项:`);
-    log(`    --agent <id:key>       跳过浏览器授权，直接使用凭证`);
-    log(`    --notify <channel:id>  指定通知渠道（如 feishu:ou_xxx, discord:123456）`);
-    log(`    --yes                  跳过所有确认提示\n`);
     process.exit(0);
   }
 
-  // Parse global flags
-  const autoYes = args.includes("--yes") || args.includes("-y");
-
-  const notifyFlag = args.find((a) => a.startsWith("--notify"));
-  const notifyValue = notifyFlag
-    ? args[args.indexOf(notifyFlag) + 1] ?? notifyFlag.split("=")[1]
-    : null;
-  let presetNotify = null;
-  if (notifyValue && notifyValue.includes(":")) {
-    const colonIdx = notifyValue.indexOf(":");
-    presetNotify = {
-      channel: notifyValue.slice(0, colonIdx),
-      target: notifyValue.slice(colonIdx + 1),
-    };
-  }
-
   log(`\n${BOLD}🏪 A2H Market — OpenClaw Plugin Installer${RESET}\n`);
 
   // ── Step 1: Check OpenClaw ─────────────────────────────────────
@@ -528,14 +562,9 @@ async function main() {
       const existingId = existing.agent_id ?? existing.agentId ?? "";
       if (existingId) {
         log(`    已有凭证: ${CYAN}${existingId}${RESET}`);
-        let reuse = "Y";
-        if (!autoYes) {
-          const prompt = createPrompt();
-          reuse = await prompt.ask("使用现有凭证? (Y/n)", "Y");
-          prompt.close();
-        } else {
-          log(`    ${DIM}--yes: 自动使用现有凭证${RESET}`);
-        }
+        const prompt = createPrompt();
+        const reuse = await prompt.ask("使用现有凭证? (Y/n)", "Y");
+        prompt.close();
         if (reuse.toLowerCase() !== "n") {
           agentId = existingId;
           agentKey = existing.agent_key ?? existing.agentKey ?? "";
@@ -689,59 +718,52 @@ async function main() {
     mqtt_url: mqttUrl,
   };
 
-  // Configure notification channel
-  if (presetNotify) {
-    // --notify flag: skip interactive selection
-    credsData.notify = presetNotify;
-    log(`    ${CHECK} 通知渠道已配置: ${presetNotify.channel} → ${presetNotify.target}`);
-  } else {
-    // Interactive channel selection
-    const channels = detectChannels();
-    if (channels.length > 0) {
-      log(`    检测到 ${channels.length} 个可用渠道:`);
-      channels.forEach((ch, i) => {
-        log(`      ${CYAN}${i + 1}${RESET}. ${ch.name}`);
-      });
+  // Detect available channels and let user choose
+  const channels = detectChannels();
+  if (channels.length > 0) {
+    log(`    检测到 ${channels.length} 个可用渠道:`);
+    channels.forEach((ch, i) => {
+      log(`      ${CYAN}${i + 1}${RESET}. ${ch.name}`);
+    });
 
-      const prompt2 = createPrompt();
-      const choice = await prompt2.ask(
-        `选择通知渠道 (1-${channels.length}，回车跳过)`,
-        "",
-      );
-
-      if (choice) {
-        const idx = parseInt(choice, 10) - 1;
-        if (idx >= 0 && idx < channels.length) {
-          const chosen = channels[idx];
-          let target = "";
-
-          if (chosen.name === "feishu") {
-            target = detectFeishuTarget() || "";
-            if (target) {
-              log(`    检测到飞书用户: ${CYAN}${target}${RESET}`);
-            } else {
-              target = await prompt2.ask("输入飞书 open_id (ou_xxx) 或 chat_id (oc_xxx)", "");
-            }
-          } else if (chosen.name === "discord") {
-            target = await prompt2.ask("输入 Discord 频道 ID", "");
-          } else {
-            target = await prompt2.ask(`输入 ${chosen.name} 目标 ID`, "");
-          }
+    const prompt2 = createPrompt();
+    const choice = await prompt2.ask(
+      `选择通知渠道 (1-${channels.length}，回车跳过)`,
+      "",
+    );
+
+    if (choice) {
+      const idx = parseInt(choice, 10) - 1;
+      if (idx >= 0 && idx < channels.length) {
+        const chosen = channels[idx];
+        let target = "";
 
+        if (chosen.name === "feishu") {
+          target = detectFeishuTarget() || "";
           if (target) {
-            credsData.notify = { channel: chosen.name, target };
-            log(`    ${CHECK} 通知渠道已配置: ${chosen.name} → ${target}`);
+            log(`    检测到飞书用户: ${CYAN}${target}${RESET}`);
           } else {
-            log(`    ${WARN} 未输入目标 ID，跳过通知配置`);
+            target = await prompt2.ask("输入飞书 open_id (ou_xxx) 或 chat_id (oc_xxx)", "");
           }
+        } else if (chosen.name === "discord") {
+          target = await prompt2.ask("输入 Discord 频道 ID", "");
+        } else {
+          target = await prompt2.ask(`输入 ${chosen.name} 目标 ID`, "");
+        }
+
+        if (target) {
+          credsData.notify = { channel: chosen.name, target };
+          log(`    ${CHECK} 通知渠道已配置: ${chosen.name} → ${target}`);
+        } else {
+          log(`    ${WARN} 未输入目标 ID，跳过通知配置`);
         }
-      } else {
-        log(`    ${DIM}跳过通知配置${RESET}`);
       }
-      prompt2.close();
     } else {
-      log(`    ${DIM}未检测到可用渠道，跳过通知配置${RESET}`);
+      log(`    ${DIM}跳过通知配置${RESET}`);
     }
+    prompt2.close();
+  } else {
+    log(`    ${DIM}未检测到可用渠道，跳过通知配置${RESET}`);
   }
 
   // Save credentials file (fallback for dev mode)