@emotion-machine/claw-messenger 0.1.9 → 0.1.11

package/dist/channel.d.ts

@@ -1,4 +1,4 @@
-import { type ChannelPlugin } from "openclaw/plugin-sdk";
+import type { ChannelPlugin } from "openclaw/plugin-sdk";
 import { type ClawMessengerConfig } from "./config.js";
 import { WsClient } from "./ws/client.js";
 interface ResolvedAccount {

package/dist/channel.js

@@ -1,4 +1,4 @@
-import { buildChannelConfigSchema, DEFAULT_ACCOUNT_ID, formatPairingApproveHint, PAIRING_APPROVED_MESSAGE, } from "openclaw/plugin-sdk";
+import * as pluginSdk from "openclaw/plugin-sdk";
 import { ClawMessengerConfigSchema } from "./config.js";
 import { getRuntime } from "./runtime.js";
 import { WsClient } from "./ws/client.js";
@@ -14,10 +14,35 @@ const EMOJI_TO_REACTION = {
 function emojiToReaction(emoji) {
     return EMOJI_TO_REACTION[emoji];
 }
-function resolveAccount(cfg, _accountId) {
+// -- Account resolution --
+const FALLBACK_ACCOUNT_ID = "default";
+function hasAccountId(value) {
+    if (typeof value !== "string")
+        return false;
+    const trimmed = value.trim();
+    return Boolean(trimmed) && trimmed !== "undefined" && trimmed !== "null";
+}
+function normalizeAccountIdCompat(accountId) {
+    const fallback = hasAccountId(accountId) ? accountId.trim() : FALLBACK_ACCOUNT_ID;
+    const normalize = pluginSdk.normalizeAccountId;
+    if (typeof normalize === "function") {
+        try {
+            const normalized = normalize(fallback);
+            if (hasAccountId(normalized))
+                return normalized.trim();
+        }
+        catch {
+            // Older OpenClaw SDKs can expose helpers differently when plugins are globally installed.
+        }
+    }
+    return fallback;
+}
+const DEFAULT_ACCOUNT_ID = normalizeAccountIdCompat(pluginSdk.DEFAULT_ACCOUNT_ID);
+const MESSAGE_TOOL_ACTIONS = ["send", "react"];
+function resolveAccount(cfg, accountId) {
     const cloudConfig = (cfg.channels?.["claw-messenger"] ?? {});
     return {
-        accountId: DEFAULT_ACCOUNT_ID,
+        accountId: normalizeAccountIdCompat(accountId ?? DEFAULT_ACCOUNT_ID),
         enabled: cloudConfig.enabled !== false,
         apiKey: cloudConfig.apiKey ?? "",
         serverUrl: cloudConfig.serverUrl ?? "wss://claw-messenger.onrender.com",
@@ -57,6 +82,21 @@ export async function createGroup(to, text) {
     const result = await sendToNewGroup(ws, to, text, account.preferredService);
     return { ok: true, ...result };
 }
+function resolveConfig(input) {
+    if (input && "channels" in input)
+        return input;
+    return input?.cfg ?? getRuntime().config.loadConfig();
+}
+function describeClawMessageTool(input) {
+    const account = resolveAccount(resolveConfig(input));
+    const ws = wsClients.get(account.accountId);
+    const connected = Boolean(ws?.connected);
+    return {
+        actions: connected ? MESSAGE_TOOL_ACTIONS : [],
+        capabilities: [],
+        schema: null,
+    };
+}
 // -- Channel Plugin --
 const meta = {
     label: "Claw Messenger",
@@ -80,7 +120,7 @@ export const clawMessengerPlugin = {
             const ws = wsClients.get(account.accountId);
             if (!ws)
                 throw new Error("Not connected to claw-messenger");
-            await sendText(ws, id, PAIRING_APPROVED_MESSAGE, account.preferredService);
+            await sendText(ws, id, pluginSdk.PAIRING_APPROVED_MESSAGE, account.preferredService);
         },
     },
     capabilities: {
@@ -92,7 +132,7 @@ export const clawMessengerPlugin = {
         blockStreaming: true,
     },
     reload: { configPrefixes: ["channels.claw-messenger"] },
-    configSchema: buildChannelConfigSchema(ClawMessengerConfigSchema),
+    configSchema: pluginSdk.buildChannelConfigSchema(ClawMessengerConfigSchema),
     config: {
         listAccountIds: () => [DEFAULT_ACCOUNT_ID],
         resolveAccount: (cfg, accountId) => resolveAccount(cfg, accountId),
@@ -126,7 +166,7 @@ export const clawMessengerPlugin = {
             allowFrom: account.config.allowFrom ?? [],
             policyPath: "channels.claw-messenger.dmPolicy",
             allowFromPath: "channels.claw-messenger.",
-            approveHint: formatPairingApproveHint("claw-messenger"),
+            approveHint: pluginSdk.formatPairingApproveHint("claw-messenger"),
         }),
         collectWarnings: ({ cfg }) => {
             const account = resolveAccount(cfg);
@@ -158,7 +198,8 @@ export const clawMessengerPlugin = {
     },
     // Legacy API (OpenClaw <2026.3.22): kept for backward compatibility
     actions: {
-        listActions: () => ["send", "react"],
+        listActions: () => [...MESSAGE_TOOL_ACTIONS],
+        describeMessageTool: describeClawMessageTool,
         handleAction: async ({ action, params, cfg }) => {
             const account = resolveAccount(cfg);
             const ws = wsClients.get(account.accountId);
@@ -360,19 +401,25 @@ export const clawMessengerPlugin = {
             });
             ws.connect();
             wsClients.set(resolvedAccountId, ws);
-            // Handle abort
-            const stopHandler = () => {
-                ctx.log?.info(`[${resolvedAccountId}] Stopping Claw Messenger provider`);
-                ws.stop();
-                wsClients.delete(resolvedAccountId);
-            };
-            ctx.abortSignal?.addEventListener("abort", stopHandler);
-            return {
-                stop: () => {
-                    stopHandler();
+            return new Promise((resolve) => {
+                let stopped = false;
+                const stopHandler = () => {
+                    if (stopped)
+                        return;
+                    stopped = true;
+                    ctx.log?.info(`[${resolvedAccountId}] Stopping Claw Messenger provider`);
+                    ws.stop();
+                    wsClients.delete(resolvedAccountId);
                     ctx.abortSignal?.removeEventListener("abort", stopHandler);
-                },
-            };
+                    resolve();
+                };
+                if (ctx.abortSignal?.aborted) {
+                    stopHandler();
+                }
+                else {
+                    ctx.abortSignal?.addEventListener("abort", stopHandler);
+                }
+            });
         },
         logoutAccount: async ({ cfg }) => {
             const account = resolveAccount(cfg);
@@ -388,16 +435,7 @@ export const clawMessengerPlugin = {
 // OpenClaw 2026.3.22+ message-action-discovery API.
 // Added as a runtime property because the ChannelPlugin type from older SDK
 // versions doesn't include it. Newer OpenClaw calls this; older versions ignore it.
-clawMessengerPlugin.describeMessageTool = (cfg) => {
-    const account = resolveAccount(cfg);
-    const ws = wsClients.get(account.accountId);
-    const connected = Boolean(ws?.connected);
-    return {
-        actions: connected ? ["send", "react"] : [],
-        capabilities: [],
-        schema: null,
-    };
-};
+clawMessengerPlugin.describeMessageTool = describeClawMessageTool;
 // -- Inbound message handler --
 async function handleInboundMessage(data, accountId, account, ctx) {
     const from = data.from;

package/dist/index.js

@@ -99,7 +99,7 @@ const plugin = {
                 const ws = getWsClient(status.accountId);
                 const diagnostics = ws?.getDiagnostics() ?? { errors: [], connectionLog: [] };
                 const report = {
-                    plugin_version: "0.1.7",
+                    plugin_version: "0.1.11",
                     node_version: process.version,
                     connected: status.connected,
                     server_url: status.serverUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emotion-machine/claw-messenger",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "iMessage, RCS & SMS channel plugin for OpenClaw — no phone or Mac Mini required",
   "type": "module",
   "main": "dist/index.js",