@a2hmarket/a2hmarket 0.6.5 → 0.6.6

package/openclaw.plugin.json

@@ -6,20 +6,7 @@
   "skills": ["./skills"],
   "configSchema": {
     "type": "object",
-    "properties": {
-      "agentId": { "type": "string", "description": "A2H Market agent ID" },
-      "agentKey": { "type": "string", "description": "A2H Market agent key (HMAC signing)" },
-      "apiUrl": { "type": "string", "description": "A2H Market API base URL" },
-      "mqttUrl": { "type": "string", "description": "MQTT broker URL for A2A messaging" },
-      "tempoPrivateKey": { "type": "string", "description": "Solana private key for Tempo payments" },
-      "notify": {
-        "type": "object",
-        "properties": {
-          "channel": { "type": "string", "description": "Notification channel (feishu, discord, etc.)" },
-          "target": { "type": "string", "description": "Target ID for notifications" }
-        }
-      }
-    },
+    "properties": {},
     "additionalProperties": false
   }
 }

package/package.json

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

package/scripts/install.mjs

@@ -311,24 +311,12 @@ async function runUpdate() {
   // 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)`);
+    if (existsSync(CREDS_FILE)) {
+      savedCreds = JSON.parse(readFileSync(CREDS_FILE, "utf-8"));
+      log(`    ${CHECK} 凭证已备份`);
     }
   } 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} 未找到凭证备份，更新后可能需要重新安装`);
   }
@@ -344,9 +332,8 @@ async function runUpdate() {
     process.exit(1);
   }
 
-  // Restore credentials to both locations
+  // Restore credentials file
   if (savedCreds) {
-    // Restore credentials file
     mkdirSync(DATA_DIR, { recursive: true });
     const fileData = {
       agent_id: savedCreds.agentId ?? savedCreds.agent_id,
@@ -356,23 +343,6 @@ async function runUpdate() {
     };
     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} 凭证已恢复`);
   }
 
@@ -766,36 +736,15 @@ async function main() {
     log(`    ${DIM}未检测到可用渠道，跳过通知配置${RESET}`);
   }
 
-  // Save credentials file (fallback for dev mode)
+  // Save credentials to ~/.openclaw/a2hmarket/credentials.json
   writeFileSync(CREDS_FILE, JSON.stringify(credsData, null, 2) + "\n");
-  log(`    ${CHECK} 凭证文件已保存`);
+  log(`    ${CHECK} 凭证已保存`);
 
-  // Write credentials into openclaw.json → plugins.entries.a2hmarket
-  // This is the primary config path — api.pluginConfig reads from here
-  log(`    写入 openclaw.json...`);
+  // Ensure a2h tools in alsoAllow (if whitelist mode is active)
   try {
     const configPath = join(OPENCLAW_DIR, "openclaw.json");
     const cfg = JSON.parse(readFileSync(configPath, "utf-8"));
-
-    // Ensure plugins.entries.a2hmarket exists
-    if (!cfg.plugins) cfg.plugins = {};
-    if (!cfg.plugins.entries) cfg.plugins.entries = {};
-    const entry = cfg.plugins.entries.a2hmarket ?? {};
-
-    // Write credentials into plugin entry
-    entry.enabled = true;
-    entry.agentId = agentId;
-    entry.agentKey = agentKey;
-    entry.apiUrl = apiUrl;
-    entry.mqttUrl = mqttUrl;
-    if (credsData.notify) {
-      entry.notify = credsData.notify;
-    }
-    cfg.plugins.entries.a2hmarket = entry;
-
-    // Ensure a2h tools in alsoAllow (if whitelist mode is active)
-    if (!cfg.tools) cfg.tools = {};
-    if (Array.isArray(cfg.tools.alsoAllow)) {
+    if (Array.isArray(cfg?.tools?.alsoAllow)) {
       const a2hTools = [
         "a2h_status", "a2h_profile_get", "a2h_profile_upload_qrcode",
         "a2h_profile_delete_qrcode", "a2h_file_upload",
@@ -814,15 +763,24 @@ async function main() {
           added++;
         }
       }
-      if (added > 0) log(`    ${CHECK} ${added} 个工具已添加到白名单`);
+      if (added > 0) {
+        writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n");
+        log(`    ${CHECK} ${added} 个工具已添加到白名单`);
+      }
     }
+  } catch {}
 
-    writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n");
-    log(`    ${CHECK} openclaw.json 已更新`);
-  } catch (err) {
-    log(`    ${WARN} openclaw.json 写入失败: ${err.message}`);
-    log(`    ${DIM}插件将使用凭证文件作为回退${RESET}`);
-  }
+  // Clean any stale credentials from plugins.entries (OpenClaw doesn't allow custom keys there)
+  try {
+    const configPath = join(OPENCLAW_DIR, "openclaw.json");
+    const cfg = JSON.parse(readFileSync(configPath, "utf-8"));
+    const entry = cfg?.plugins?.entries?.a2hmarket;
+    if (entry && (entry.agentId || entry.agentKey)) {
+      cfg.plugins.entries.a2hmarket = { enabled: true };
+      writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n");
+      log(`    ${CHECK} 清理 openclaw.json 中的旧凭证`);
+    }
+  } catch {}
 
   // ── Step 5: Restart gateway ────────────────────────────────────
   logStep(5, "启动服务");