@invago/mixin 1.0.16 → 1.0.17

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "mixin",
   "name": "Mixin Messenger Channel",
   "description": "Mixin Messenger channel via Blaze WebSocket",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "channels": [
     "mixin"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invago/mixin",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "Mixin Messenger channel plugin for OpenClaw",
   "type": "module",
   "main": "index.ts",

package/src/inbound-handler.ts

@@ -29,8 +29,9 @@ export interface MixinInboundMessage {
   publicKey?: string;
 }
 
-const processedMessages = new Set<string>();
-const MAX_DEDUP_SIZE = 2000;
+const processedMessages = new Set<string>();
+const processingMessages = new Set<string>();
+const MAX_DEDUP_SIZE = 2000;
 const unauthNotifiedUsers = new Map<string, number>();
 const unauthNotifiedGroups = new Map<string, number>();
 const loggedAllowFromAccounts = new Set<string>();
@@ -161,19 +162,28 @@ function evaluateMixinSenderGroupAccess(params: {
   };
 }
 
-function isProcessed(messageId: string): boolean {
-  return processedMessages.has(messageId);
-}
-
-function markProcessed(messageId: string): void {
-  if (processedMessages.size >= MAX_DEDUP_SIZE) {
-    const first = processedMessages.values().next().value;
-    if (first) {
-      processedMessages.delete(first);
+function markProcessing(messageId: string): boolean {
+  if (processedMessages.has(messageId) || processingMessages.has(messageId)) {
+    return false;
+  }
+  processingMessages.add(messageId);
+  return true;
+}
+
+function markProcessed(messageId: string): void {
+  processingMessages.delete(messageId);
+  if (processedMessages.size >= MAX_DEDUP_SIZE) {
+    const first = processedMessages.values().next().value;
+    if (first) {
+      processedMessages.delete(first);
     }
   }
-  processedMessages.add(messageId);
-}
+  processedMessages.add(messageId);
+}
+
+function clearProcessing(messageId: string): void {
+  processingMessages.delete(messageId);
+}
 
 function pruneUnauthNotifiedUsers(now: number): void {
   for (const [userId, lastNotified] of unauthNotifiedUsers) {
@@ -980,76 +990,77 @@ function evaluateMixinGroupAccess(params: {
   };
 }
 
-export async function handleMixinMessage(params: {
+export async function handleMixinMessage(params: {
   cfg: OpenClawConfig;
   accountId: string;
   msg: MixinInboundMessage;
   isDirect: boolean;
   log: { info: (m: string) => void; warn: (m: string) => void; error: (m: string, e?: unknown) => void };
 }): Promise<void> {
-  const { cfg, accountId, msg, isDirect, log } = params;
-  const rt = getMixinRuntime();
-
-  if (isProcessed(msg.messageId)) {
-    return;
-  }
-
-  const config = getAccountConfig(cfg, accountId);
-
-  if (msg.category === "ENCRYPTED_TEXT" || msg.category === "ENCRYPTED_POST") {
-    log.info(`[mixin] decrypting encrypted message ${msg.messageId}, category=${msg.category}`);
-    try {
-      const decrypted = decryptMixinMessage(
-        msg.data,
-        config.sessionPrivateKey!,
-        config.sessionId!,
-      );
-      if (!decrypted) {
-        log.error(`[mixin] decryption failed for ${msg.messageId}`);
-        markProcessed(msg.messageId);
-        return;
-      }
-      log.info(`[mixin] decryption successful: messageId=${msg.messageId}, length=${decrypted.length}`);
-      msg.data = Buffer.from(decrypted).toString("base64");
-      msg.category = "PLAIN_TEXT";
-    } catch (err) {
-      log.error(`[mixin] decryption exception for ${msg.messageId}`, err);
-      markProcessed(msg.messageId);
-      return;
-    }
-  }
-
-  let isTextMessage = msg.category.startsWith("PLAIN_TEXT") || msg.category.startsWith("PLAIN_POST");
-  const isAttachmentMessage = msg.category === "PLAIN_DATA" || msg.category === "PLAIN_AUDIO";
+  const { cfg, accountId, msg, isDirect, log } = params;
+  const rt = getMixinRuntime();
 
-  if (!isTextMessage && !isAttachmentMessage) {
-    const fallbackText = tryDecodeFallbackText(msg.data);
-    if (fallbackText) {
-      log.warn(
-        `[mixin] treating unexpected category as text: messageId=${msg.messageId}, category=${msg.category}, fallbackLength=${fallbackText.length}`,
-      );
-      msg.category = "PLAIN_TEXT";
-      msg.data = Buffer.from(fallbackText).toString("base64");
-      isTextMessage = true;
-    }
-  }
-
-  if (!isTextMessage && !isAttachmentMessage) {
-    log.info(
-      `[mixin] skip non-text message: messageId=${msg.messageId}, category=${msg.category}, quoteMessageId=${msg.quoteMessageId ?? "none"}`,
-    );
+  if (!markProcessing(msg.messageId)) {
     return;
   }
 
-  const decodedBody = decodeContent(msg.category, msg.data);
-  let text = decodedBody.trim();
-  let mediaPayload: AgentMediaPayload | undefined;
-  if (isAttachmentMessage) {
-    const resolved = await resolveInboundAttachment({ rt, config, msg, log });
-    text = resolved.text.trim();
-    mediaPayload = resolved.mediaPayload;
-  }
-  log.info(`[mixin] decoded text: messageId=${msg.messageId}, category=${msg.category}, length=${text.length}`);
+  try {
+    const config = getAccountConfig(cfg, accountId);
+
+    if (msg.category === "ENCRYPTED_TEXT" || msg.category === "ENCRYPTED_POST") {
+      log.info(`[mixin] decrypting encrypted message ${msg.messageId}, category=${msg.category}`);
+      try {
+        const decrypted = decryptMixinMessage(
+          msg.data,
+          config.sessionPrivateKey!,
+          config.sessionId!,
+        );
+        if (!decrypted) {
+          log.error(`[mixin] decryption failed for ${msg.messageId}`);
+          markProcessed(msg.messageId);
+          return;
+        }
+        log.info(`[mixin] decryption successful: messageId=${msg.messageId}, length=${decrypted.length}`);
+        msg.data = Buffer.from(decrypted).toString("base64");
+        msg.category = "PLAIN_TEXT";
+      } catch (err) {
+        log.error(`[mixin] decryption exception for ${msg.messageId}`, err);
+        markProcessed(msg.messageId);
+        return;
+      }
+    }
+
+    let isTextMessage = msg.category.startsWith("PLAIN_TEXT") || msg.category.startsWith("PLAIN_POST");
+    const isAttachmentMessage = msg.category === "PLAIN_DATA" || msg.category === "PLAIN_AUDIO";
+
+    if (!isTextMessage && !isAttachmentMessage) {
+      const fallbackText = tryDecodeFallbackText(msg.data);
+      if (fallbackText) {
+        log.warn(
+          `[mixin] treating unexpected category as text: messageId=${msg.messageId}, category=${msg.category}, fallbackLength=${fallbackText.length}`,
+        );
+        msg.category = "PLAIN_TEXT";
+        msg.data = Buffer.from(fallbackText).toString("base64");
+        isTextMessage = true;
+      }
+    }
+
+    if (!isTextMessage && !isAttachmentMessage) {
+      log.info(
+        `[mixin] skip non-text message: messageId=${msg.messageId}, category=${msg.category}, quoteMessageId=${msg.quoteMessageId ?? "none"}`,
+      );
+      return;
+    }
+
+    const decodedBody = decodeContent(msg.category, msg.data);
+    let text = decodedBody.trim();
+    let mediaPayload: AgentMediaPayload | undefined;
+    if (isAttachmentMessage) {
+      const resolved = await resolveInboundAttachment({ rt, config, msg, log });
+      text = resolved.text.trim();
+      mediaPayload = resolved.mediaPayload;
+    }
+    log.info(`[mixin] decoded text: messageId=${msg.messageId}, category=${msg.category}, length=${text.length}`);
 
   const botIdentity = await resolveBotIdentity({
     accountId,
@@ -1397,26 +1408,31 @@ export async function handleMixinMessage(params: {
 
   log.info(`[mixin] dispatching ${msg.messageId} from ${msg.userId}`);
 
-  await rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
-    ctx,
-    cfg,
-    dispatcherOptions: {
-      deliver: async (payload) => {
-        const replyText = payload.text ?? "";
-        if (!replyText) {
-          return;
-        }
-        const recipientId = isDirect ? msg.userId : undefined;
-        await deliverMixinReply({
-          cfg,
-          accountId,
-          conversationId: msg.conversationId,
-          recipientId,
-          creatorId: msg.userId,
-          text: replyText,
-          log,
-        });
-      },
-    },
-  });
-}
+    await rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
+      ctx,
+      cfg,
+      dispatcherOptions: {
+        deliver: async (payload) => {
+          const replyText = payload.text ?? "";
+          if (!replyText) {
+            return;
+          }
+          const recipientId = isDirect ? msg.userId : undefined;
+          await deliverMixinReply({
+            cfg,
+            accountId,
+            conversationId: msg.conversationId,
+            recipientId,
+            creatorId: msg.userId,
+            text: replyText,
+            log,
+          });
+        },
+      },
+    });
+  } finally {
+    if (!processedMessages.has(msg.messageId)) {
+      clearProcessing(msg.messageId);
+    }
+  }
+}