@a2hmarket/a2hmarket 0.5.3 → 0.5.5

package/package.json

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

package/src/feishu-notify.ts

@@ -144,10 +144,11 @@ export function buildA2HNotifyCard(params: {
     );
   }
 
+  const peerLabel = params.type === "reply" ? "回复给" : "来自";
   const elements: FeishuCardElement[] = [
     {
       tag: "markdown",
-      content: `**来自**: \`${params.peerId}\``,
+      content: `**${peerLabel}**: \`${params.peerId}\``,
     },
     {
       tag: "markdown",

package/src/mqtt-transport.ts

@@ -116,6 +116,13 @@ export class MqttTransport {
   }
 
   close(): void {
+    this.closed = true;
+    this.client?.end(false); // graceful close — flush pending packets
+    this.client = null;
+  }
+
+  /** Force-close immediately (for reconnect cleanup). */
+  forceClose(): void {
     this.closed = true;
     this.client?.end(true);
     this.client = null;
@@ -137,7 +144,7 @@ export class MqttTransport {
         try {
           const cred = await this.tokenClient.getToken(this.clientId, true);
 
-          this.client?.end(true);
+          this.client?.end(true); // force-close old connection for reconnect
           this.client = mqtt.connect(this.brokerUrl, {
             clientId: this.clientId,
             username: cred.username,

package/src/tools/send.ts

@@ -4,6 +4,8 @@ import { MqttTokenClient } from "../mqtt-token.js";
 import { createSendTransport } from "../mqtt-transport.js";
 import { buildEnvelope, signEnvelope } from "../protocol.js";
 
+const log = (m: string) => process.stderr.write(`[a2h_send] ${m}\n`);
+
 export function registerSendTool(api: OpenClawPluginApi, creds: A2HCredentials) {
   api.registerTool({
     name: "a2h_send",
@@ -66,27 +68,33 @@ export function registerSendTool(api: OpenClawPluginApi, creds: A2HCredentials)
       const signed = signEnvelope(creds.agentKey, envelope);
 
       // Send via short-lived MQTT connection
+      log(`sending to ${targetAgentId} (broker: ${creds.mqttUrl})`);
       const tokenClient = new MqttTokenClient(creds.apiUrl, creds.agentId, creds.agentKey);
       const transport = createSendTransport(creds.mqttUrl, tokenClient, creds.agentId);
 
       try {
         await transport.connect();
+        log("mqtt connected");
+
         // Retry up to 3 times
         let lastErr: unknown;
         for (let attempt = 0; attempt < 3; attempt++) {
           try {
             await transport.publish(targetAgentId, signed);
+            log(`publish ok (attempt ${attempt + 1})`);
             lastErr = null;
             break;
           } catch (err) {
             lastErr = err;
+            log(`publish attempt ${attempt + 1} failed: ${err instanceof Error ? err.message : String(err)}`);
             if (attempt < 2) await sleep(1000 * (1 << attempt));
           }
         }
         if (lastErr) throw lastErr;
 
-        // Brief pause for flush
-        await sleep(300);
+        // Wait for broker to fully process (graceful close needs time to flush)
+        await sleep(500);
+        log("flush wait done, closing");
 
         return {
           result: JSON.stringify(
@@ -99,6 +107,9 @@ export function registerSendTool(api: OpenClawPluginApi, creds: A2HCredentials)
             2
           ),
         };
+      } catch (err) {
+        log(`send failed: ${err instanceof Error ? err.message : String(err)}`);
+        throw err;
       } finally {
         transport.close();
       }