@a2hmarket/a2hmarket 1.3.2 → 1.3.4

package/index.ts

@@ -46,7 +46,7 @@ export default {
   description:
     "A2H Market — AI agent marketplace with self-managed A2A messaging and human notification.",
 
-  async register(api: OpenClawPluginApi) {
+  register(api: OpenClawPluginApi) {
     // ── Init runtime & credentials ───────────────────────────────
     setA2HRuntime(api.runtime);
     initCredentials(api.pluginConfig as Record<string, unknown> | undefined);
@@ -103,8 +103,9 @@ export default {
           } else {
             tools.alsoAllow = [PLUGIN_ID];
           }
-          await api.runtime.config.writeConfigFile(cfg as any);
-          api.logger.info(`a2hmarket: added plugin ID to tools allowlist for profile "${profile}"`);
+          api.runtime.config.writeConfigFile(cfg as any).then(() => {
+            api.logger.info(`a2hmarket: added plugin ID to tools allowlist for profile "${profile}"`);
+          }).catch(() => {});
         }
       }
     } catch {
@@ -202,40 +203,6 @@ export default {
       return { cancel: true };
     });
 
-    // ── Welcome message on first boot after install ────────────────
-    api.on("gateway_start", async () => {
-      try {
-        const { readPendingWelcome, deletePendingWelcome, sendWelcome } =
-          await import("./src/pending-welcome.js");
-        const pending = readPendingWelcome();
-        if (!pending) return;
-
-        const cfg = api.runtime.config.loadConfig() as Record<string, unknown>;
-        const channels = (cfg.channels ?? {}) as Record<string, Record<string, unknown>>;
-        const channelCfg = channels[pending.channel];
-        if (!channelCfg) {
-          api.logger.warn(
-            `a2hmarket: welcome skipped, no config for channel "${pending.channel}"`,
-          );
-          deletePendingWelcome();
-          return;
-        }
-
-        const sent = await sendWelcome(pending, channelCfg, {
-          info: (m) => api.logger.info(`a2hmarket: ${m}`),
-          warn: (m) => api.logger.warn(`a2hmarket: ${m}`),
-        });
-        deletePendingWelcome();
-        if (sent) {
-          api.logger.info("a2hmarket: welcome message sent");
-        }
-      } catch (err) {
-        api.logger.warn(
-          `a2hmarket: welcome failed: ${err instanceof Error ? err.message : String(err)}`,
-        );
-      }
-    });
-
     // ── Register agent service ───────────────────────────────────
     let serviceAbort: AbortController | null = null;
     api.registerService({
@@ -265,6 +232,30 @@ export default {
           warn: (m: string) => ctx.logger.warn(`[a2hmarket] ${m}`),
         };
 
+        // ── Welcome message on first boot after install ──────────
+        try {
+          const { readPendingWelcome, deletePendingWelcome, sendWelcome } =
+            await import("./src/pending-welcome.js");
+          const pending = readPendingWelcome();
+          if (pending) {
+            const cfg = ctx.config as Record<string, unknown>;
+            const channels = (cfg.channels ?? {}) as Record<string, Record<string, unknown>>;
+            const channelCfg = channels[pending.channel];
+            if (channelCfg) {
+              const sent = await sendWelcome(pending, channelCfg, {
+                info: (m) => serviceLog.info(m),
+                warn: (m) => serviceLog.warn(m),
+              });
+              if (sent) serviceLog.info("welcome message sent");
+            } else {
+              serviceLog.warn(`welcome skipped, no config for channel "${pending.channel}"`);
+            }
+            deletePendingWelcome();
+          }
+        } catch (err) {
+          serviceLog.warn(`welcome failed: ${err instanceof Error ? err.message : String(err)}`);
+        }
+
         serviceAbort = new AbortController();
         try {
           await startAgentService({

package/openclaw.plugin.json

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

package/package.json

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

package/src/pending-welcome.ts

@@ -49,32 +49,93 @@ export function deletePendingWelcome(): void {
 
 const WELCOME_TITLE = "🎉 A2H Market 插件已就绪";
 
-const WELCOME_FEISHU_ELEMENTS = [
-  {
-    tag: "markdown" as const,
-    content:
-      "我是你的 **A2H Market** AI 助手，可以帮你：\n" +
-      "📦 发布商品、浏览市场\n" +
-      "💬 自动与其他 Agent 谈判协商\n" +
-      "📋 管理订单、处理支付",
-  },
-  {
-    tag: "markdown" as const,
-    content: "---\n🔐 首次使用请发送 **\"登录 A2H Market\"** 完成授权",
-  },
-];
-
-const WELCOME_TEXT = [
-  `**${WELCOME_TITLE}**`,
-  "",
-  "我是你的 A2H Market AI 助手，可以帮你：",
-  "📦 发布商品、浏览市场",
-  "💬 自动与其他 Agent 谈判协商",
-  "📋 管理订单、处理支付",
-  "",
-  "---",
-  '🔐 首次使用请发送 "登录 A2H Market" 完成授权',
-].join("\n");
+const AUTH_API_URL = "https://web.a2hmarket.ai";
+const LOGIN_URL = "https://a2hmarket.ai";
+
+async function generateAuthUrl(): Promise<string | null> {
+  try {
+    const { networkInterfaces } = await import("node:os");
+    const { createHash, randomBytes } = await import("node:crypto");
+
+    let mac = "00:00:00:00:00:00";
+    const ifaces = networkInterfaces();
+    for (const name of Object.keys(ifaces)) {
+      for (const iface of ifaces[name] ?? []) {
+        if (!iface.internal && iface.mac && iface.mac !== "00:00:00:00:00:00") {
+          mac = iface.mac;
+          break;
+        }
+      }
+      if (mac !== "00:00:00:00:00:00") break;
+    }
+
+    const timestamp = String(Math.floor(Date.now() / 1000));
+    try {
+      const formData = new URLSearchParams({ timestamp, mac });
+      const resp = await fetch(`${AUTH_API_URL}/v1/auth/init-login`, {
+        method: "POST",
+        headers: { "Content-Type": "application/x-www-form-urlencoded" },
+        body: formData.toString(),
+      });
+      const data = (await resp.json()) as { code?: string; url?: string };
+      if (data.url) return data.url;
+    } catch {
+      // fallback to local generation
+    }
+
+    const randomHex = randomBytes(32).toString("hex");
+    const macClean = mac.replace(/:/g, "");
+    const raw = `${randomHex}_${timestamp}_${macClean}`;
+    const code = createHash("md5").update(raw).digest("hex");
+    return `${LOGIN_URL}/authcode?code=${code}`;
+  } catch {
+    return null;
+  }
+}
+
+function buildFeishuElements(authUrl: string | null) {
+  const elements = [
+    {
+      tag: "markdown" as const,
+      content:
+        "我是你的 **A2H Market** AI 助手，可以帮你：\n" +
+        "📦 发布商品、浏览市场\n" +
+        "💬 自动与其他 Agent 谈判协商\n" +
+        "📋 管理订单、处理支付",
+    },
+  ];
+  if (authUrl) {
+    elements.push({
+      tag: "markdown" as const,
+      content: `---\n🔐 **[点击这里完成授权登录](${authUrl})**`,
+    });
+  } else {
+    elements.push({
+      tag: "markdown" as const,
+      content: '---\n🔐 首次使用请发送 **"登录 A2H Market"** 完成授权',
+    });
+  }
+  return elements;
+}
+
+function buildWelcomeText(authUrl: string | null): string {
+  const lines = [
+    `**${WELCOME_TITLE}**`,
+    "",
+    "我是你的 A2H Market AI 助手，可以帮你：",
+    "📦 发布商品、浏览市场",
+    "💬 自动与其他 Agent 谈判协商",
+    "📋 管理订单、处理支付",
+    "",
+    "---",
+  ];
+  if (authUrl) {
+    lines.push(`🔐 点击完成授权登录: ${authUrl}`);
+  } else {
+    lines.push('🔐 首次使用请发送 "登录 A2H Market" 完成授权');
+  }
+  return lines.join("\n");
+}
 
 // ── Send Welcome ───────────────────────────────────────────────────────
 
@@ -92,6 +153,12 @@ export async function sendWelcome(
   channelCfg: Record<string, unknown>,
   log: WelcomeLog,
 ): Promise<boolean> {
+  // Generate auth URL (best-effort, falls back to text prompt)
+  const authUrl = await generateAuthUrl();
+  if (authUrl) {
+    log.info(`welcome: auth url generated`);
+  }
+
   if (pending.channel === "feishu") {
     if (!channelCfg.appId || !channelCfg.appSecret) {
       log.warn("welcome: feishu channel credentials not configured, skipped");
@@ -104,7 +171,7 @@ export async function sendWelcome(
       target: pending.target,
       title: WELCOME_TITLE,
       titleColor: "green",
-      elements: WELCOME_FEISHU_ELEMENTS,
+      elements: buildFeishuElements(authUrl),
     });
     return true;
   }
@@ -137,7 +204,7 @@ export async function sendWelcome(
     const resp = await fetch(`https://discord.com/api/v10/channels/${channelId}/messages`, {
       method: "POST",
       headers,
-      body: JSON.stringify({ content: WELCOME_TEXT }),
+      body: JSON.stringify({ content: buildWelcomeText(authUrl) }),
     });
     if (!resp.ok) {
       const data = (await resp.json()) as { message?: string };