@a2hmarket/a2hmarket 1.0.9 → 1.0.10

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "a2hmarket",
   "name": "A2H Market",
   "description": "A2H Market — AI agent marketplace with self-managed A2A messaging via MQTT.",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "hosts": [
     "openclaw"
   ],

package/package.json

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

package/scripts/install.mjs

@@ -9,12 +9,12 @@
  *   2. User opens URL in browser to authorize
  *   3. Poll GET /findu-user/api/v1/public/user/agent/auth?code=xxx
  *   4. Server returns agent_id + secret after user authorizes
- *   5. Save credentials to ~/.openclaw/a2hmarket/credentials.json
+ *   5. Save credentials to openclaw.json config + ~/.openclaw/credentials/a2h_credentials.json
  */
 
 import { execSync } from "node:child_process";
 import { createInterface } from "node:readline";
-import { existsSync, mkdirSync, writeFileSync, readFileSync } from "node:fs";
+import { existsSync, mkdirSync, writeFileSync, readFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
 import { createHash, createHmac, randomBytes } from "node:crypto";
@@ -23,7 +23,7 @@ import { networkInterfaces } from "node:os";
 const OPENCLAW_DIR = join(homedir(), ".openclaw");
 const OPENCLAW_CONFIG = join(OPENCLAW_DIR, "openclaw.json");
 const CREDS_DIR = join(OPENCLAW_DIR, "credentials");
-const CREDS_FILE = join(CREDS_DIR, "credentials.json");
+const CREDS_FILE = join(CREDS_DIR, "a2h_credentials.json");
 const A2H_STORE_DIR = join(homedir(), ".a2h_store");
 const A2H_CONFIG_DIR = join(A2H_STORE_DIR, "a2h_config");
 const A2H_DATA_DIR = join(A2H_STORE_DIR, "a2h_data");
@@ -512,14 +512,22 @@ async function runUninstall() {
   }
 
   // 2. Remove runtime data
-  for (const dir of [CREDS_DIR, A2H_STORE_DIR]) {
-    if (existsSync(dir)) {
-      try {
-        execSync(`rm -rf "${dir}"`, { stdio: "pipe" });
-        log(`    ${CHECK} Removed: ${dir}`);
-      } catch {
-        log(`    ${WARN} Failed to remove: ${dir}`);
-      }
+  // Only remove a2h_credentials.json from shared credentials dir (other plugins use this dir)
+  if (existsSync(CREDS_FILE)) {
+    try {
+      unlinkSync(CREDS_FILE);
+      log(`    ${CHECK} Removed: ${CREDS_FILE}`);
+    } catch {
+      log(`    ${WARN} Failed to remove: ${CREDS_FILE}`);
+    }
+  }
+  // Remove a2h_store dir entirely (a2hmarket-exclusive)
+  if (existsSync(A2H_STORE_DIR)) {
+    try {
+      execSync(`rm -rf "${A2H_STORE_DIR}"`, { stdio: "pipe" });
+      log(`    ${CHECK} Removed: ${A2H_STORE_DIR}`);
+    } catch {
+      log(`    ${WARN} Failed to remove: ${A2H_STORE_DIR}`);
     }
   }
 
@@ -876,7 +884,7 @@ async function main() {
     log(`    ${WARN} Could not write to openclaw.json: ${err.message}`);
   }
 
-  // Also save fallback file to ~/.openclaw/credentials/credentials.json
+  // Also save fallback file to ~/.openclaw/credentials/a2h_credentials.json
   writeFileSync(CREDS_FILE, JSON.stringify(credsData, null, 2) + "\n");
   log(`    ${CHECK} Fallback credentials saved to ${CREDS_DIR}`);
 

package/scripts/setup-tempo-key.mjs

@@ -22,7 +22,7 @@ import { createInterface } from 'readline';
 
 const KEYCHAIN_SERVICE = 'a2hmarket-tempo';
 // Try new path first, fallback to legacy
-const CREDS_NEW = join(homedir(), '.openclaw', 'credentials', 'credentials.json');
+const CREDS_NEW = join(homedir(), '.openclaw', 'credentials', 'a2h_credentials.json');
 const CREDS_LEGACY = join(homedir(), '.openclaw', 'a2hmarket', 'credentials.json');
 const CREDS_PATH = existsSync(CREDS_NEW) ? CREDS_NEW : CREDS_LEGACY;
 

package/src/credentials.ts

@@ -54,7 +54,8 @@ export function loadCredentialsFromConfig(
 const PLUGIN_DIR = join(dirname(fileURLToPath(import.meta.url)), "..");
 const OPENCLAW_CREDS_DIR = join(homedir(), ".openclaw", "credentials");
 const LEGACY_CREDS_DIR = join(homedir(), ".openclaw", "a2hmarket");
-const CREDENTIALS_FILE = "credentials.json";
+const A2H_CREDENTIALS_FILE = "a2h_credentials.json";
+const LEGACY_CREDENTIALS_FILE = "credentials.json";
 
 interface RawCredentials {
   agent_id?: string;
@@ -70,23 +71,24 @@ interface RawCredentials {
 }
 
 export function loadCredentialsFromFile(configDir?: string): A2HCredentials {
-  let dir: string;
+  let filePath: string;
   if (configDir) {
-    dir = configDir;
+    // configDir provided: try a2h_credentials.json first, fall back to credentials.json
+    const a2hPath = join(configDir, A2H_CREDENTIALS_FILE);
+    filePath = existsSync(a2hPath) ? a2hPath : join(configDir, LEGACY_CREDENTIALS_FILE);
   } else {
-    // Priority: ~/.openclaw/credentials/ > ~/.openclaw/a2hmarket/ (legacy) > plugin dir
-    const credsPath = join(OPENCLAW_CREDS_DIR, CREDENTIALS_FILE);
-    const legacyPath = join(LEGACY_CREDS_DIR, CREDENTIALS_FILE);
-    const pluginPath = join(PLUGIN_DIR, CREDENTIALS_FILE);
-    dir = existsSync(credsPath)
-      ? OPENCLAW_CREDS_DIR
+    // Priority: ~/.openclaw/credentials/a2h_credentials.json > ~/.openclaw/a2hmarket/credentials.json (legacy) > plugin dir credentials.json
+    const credsPath = join(OPENCLAW_CREDS_DIR, A2H_CREDENTIALS_FILE);
+    const legacyPath = join(LEGACY_CREDS_DIR, LEGACY_CREDENTIALS_FILE);
+    const pluginPath = join(PLUGIN_DIR, LEGACY_CREDENTIALS_FILE);
+    filePath = existsSync(credsPath)
+      ? credsPath
       : existsSync(legacyPath)
-        ? LEGACY_CREDS_DIR
+        ? legacyPath
         : existsSync(pluginPath)
-          ? PLUGIN_DIR
-          : OPENCLAW_CREDS_DIR;  // default to standard path
+          ? pluginPath
+          : credsPath;  // default: will throw with helpful error
   }
-  const filePath = join(dir, CREDENTIALS_FILE);
 
   let raw: RawCredentials;
   try {