@emotion-machine/claw-messenger 0.1.8 → 0.1.10

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,34 @@ 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);
+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",
@@ -80,7 +104,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 +116,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 +150,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);

package/dist/outbound/send.js

@@ -1,4 +1,4 @@
-import { normalizeE164 } from "openclaw/plugin-sdk";
+import * as pluginSdk from "openclaw/plugin-sdk";
 function stripLegacyNamespacePrefix(target) {
     let normalized = target.trim();
     while (normalized.startsWith("claw-messenger:") || normalized.startsWith("linq:")) {
@@ -10,11 +10,33 @@ function stripLegacyNamespacePrefix(target) {
     }
     return normalized;
 }
+function fallbackNormalizeE164(input) {
+    if (!input)
+        return null;
+    const stripped = input.trim().replace(/[\s\-().]/g, "");
+    if (/^\+\d{10,15}$/.test(stripped))
+        return stripped;
+    if (/^\d{10,15}$/.test(stripped))
+        return `+${stripped}`;
+    return null;
+}
+function normalizeE164Compat(input) {
+    const sdkNormalize = typeof pluginSdk.normalizeE164 === "function" ? pluginSdk.normalizeE164 : null;
+    if (sdkNormalize) {
+        try {
+            return sdkNormalize(input);
+        }
+        catch {
+            // Older OpenClaw builds may not expose a callable normalizeE164 helper yet.
+        }
+    }
+    return fallbackNormalizeE164(input);
+}
 export function normalizeDirectTarget(target) {
     const stripped = stripLegacyNamespacePrefix(target);
     if (!stripped)
         return null;
-    return normalizeE164(stripped) ?? stripped;
+    return normalizeE164Compat(stripped) ?? stripped;
 }
 export async function sendText(ws, to, text, service) {
     return sendMessage(ws, to, [{ type: "text", value: text }], service);

package/package.json

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