@automagik/omni 2.260910.15 → 2.260910.17

package/dist/server/index.js

@@ -44884,30 +44884,42 @@ class BaseChannelPlugin {
       timings,
       ingestMode: isHistorySync ? "history-sync" : "realtime"
     };
-    if (this.ingressClaim) {
-      const idempotencyKey = `${this.id}:${instanceId}:${payload.externalId}:${payload.content.type}`;
-      const eventId = await this.ingressClaim.claim({
-        idempotencyKey,
+    return this.publishClaimed("message.received", payload, instanceId, {
+      idempotencyKey: `${this.id}:${instanceId}:${payload.externalId}:${payload.content.type}`,
+      externalId: payload.externalId,
+      options
+    });
+  }
+  async publishClaimed(type, payload, instanceId, params) {
+    const { idempotencyKey, externalId, options = {} } = params;
+    if (!this.ingressClaim) {
+      return this.publishEventInternal(type, payload, instanceId, options);
+    }
+    const eventId = await this.ingressClaim.claim({
+      idempotencyKey,
+      instanceId,
+      channelType: this.id,
+      externalId,
+      eventType: type
+    });
+    if (eventId === null) {
+      this.logger.info(`Skipping duplicate inbound ${type} (idempotency key already journaled)`, {
         instanceId,
-        channelType: this.id,
-        externalId: payload.externalId
+        idempotencyKey
       });
-      if (eventId === null) {
-        this.logger.info("Skipping duplicate inbound message (idempotency key already journaled)", {
-          instanceId,
-          idempotencyKey
-        });
-        return generateCorrelationId("evt");
-      }
-      options.publishEventId = eventId;
-      try {
-        return await this.publishEventInternal("message.received", payload, instanceId, options);
-      } catch (error) {
-        await this.ingressClaim.release(eventId).catch(() => {});
-        throw error;
-      }
+      return generateCorrelationId("evt");
     }
-    return this.publishEventInternal("message.received", payload, instanceId, options);
+    try {
+      return await this.publishEventInternal(type, payload, instanceId, { ...options, publishEventId: eventId });
+    } catch (error) {
+      await this.ingressClaim.release(eventId).catch(() => {});
+      throw error;
+    }
+  }
+  reactionClaimParams(kind, instanceId, payload) {
+    const raw = payload.rawPayload?.externalId;
+    const externalId = typeof raw === "string" && raw.length > 0 ? raw : `${payload.messageId}:${payload.from}`;
+    return { idempotencyKey: `${this.id}:${instanceId}:${externalId}:${kind}:${payload.emoji}`, externalId };
   }
   async emitMessageSent(params) {
     const { instanceId, ...payload } = params;
@@ -44928,11 +44940,11 @@ class BaseChannelPlugin {
   }
   async emitReactionReceived(params) {
     const { instanceId, ...payload } = params;
-    await this.publishEventInternal("reaction.received", payload, instanceId);
+    await this.publishClaimed("reaction.received", payload, instanceId, this.reactionClaimParams("reaction.received", instanceId, payload));
   }
   async emitReactionRemoved(params) {
     const { instanceId, ...payload } = params;
-    await this.publishEventInternal("reaction.removed", payload, instanceId);
+    await this.publishClaimed("reaction.removed", payload, instanceId, this.reactionClaimParams("reaction.removed", instanceId, payload));
   }
   async emitMessagePinned(params) {
     const { instanceId, ...payload } = params;
@@ -76973,7 +76985,7 @@ var require_ClientVoiceManager = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/@discordjs+ws@1.2.3/node_modules/@discordjs/ws/dist/index.js
 var require_dist9 = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@discordjs+ws@1.2.3/node_modules/@discordjs/ws/dist";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/@discordjs+ws@1.2.3/node_modules/@discordjs/ws/dist";
   var __create2 = Object.create;
   var __defProp2 = Object.defineProperty;
   var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -162253,7 +162265,7 @@ var require_indexes = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/thread-stream@3.1.0/node_modules/thread-stream/index.js
 var require_thread_stream = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/thread-stream@3.1.0/node_modules/thread-stream";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/thread-stream@3.1.0/node_modules/thread-stream";
   var { version } = require_package5();
   var { EventEmitter: EventEmitter3 } = __require("events");
   var { Worker } = __require("worker_threads");
@@ -162674,7 +162686,7 @@ var require_thread_stream = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/pino@9.14.0/node_modules/pino/lib/transport.js
 var require_transport2 = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/pino@9.14.0/node_modules/pino/lib";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/pino@9.14.0/node_modules/pino/lib";
   var { createRequire: createRequire2 } = __require("module");
   var getCallers = require_caller();
   var { join: join8, isAbsolute, sep: sep2 } = __require("path");
@@ -244419,7 +244431,7 @@ var require_client3 = __commonJS((exports) => {
 
 // ../../node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js
 var require_esmLoader = __commonJS((exports) => {
-  var __filename = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js";
+  var __filename = "/home/runner/work/omni/omni/node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js";
   Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
   var core3 = require_cjs6();
   var importInTheMiddle = require_import_in_the_middle();
@@ -251645,7 +251657,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260910.15",
+    version: "2.260910.17",
     private: true,
     type: "module",
     exports: {
@@ -278747,7 +278759,7 @@ var require_src45 = __commonJS((exports) => {
 
 // ../../node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src/channelz.js
 var require_channelz = __commonJS((exports) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.registerChannelzSocket = exports.registerChannelzServer = exports.registerChannelzSubchannel = exports.registerChannelzChannel = exports.ChannelzCallTrackerStub = exports.ChannelzCallTracker = exports.ChannelzChildrenTrackerStub = exports.ChannelzChildrenTracker = exports.ChannelzTrace = exports.ChannelzTraceStub = undefined;
   exports.unregisterChannelzRef = unregisterChannelzRef;
@@ -284150,7 +284162,7 @@ var require_duration = __commonJS((exports) => {
 
 // ../../node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src/orca.js
 var require_orca = __commonJS((exports) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.OrcaOobMetricsSubchannelWrapper = exports.GRPC_METRICS_HEADER = exports.ServerMetricRecorder = exports.PerRequestMetricRecorder = undefined;
   exports.createOrcaClient = createOrcaClient;
@@ -363161,7 +363173,7 @@ function createPluginDatabase(db2) {
 }
 function createIngressClaim(db2) {
   return {
-    async claim({ idempotencyKey, instanceId, channelType, externalId }) {
+    async claim({ idempotencyKey, instanceId, channelType, externalId, eventType = "message.received" }) {
       const id = randomUUID2();
       try {
         const claimed = await db2.insert(omniEvents).values({
@@ -363169,7 +363181,7 @@ function createIngressClaim(db2) {
           externalId,
           channel: channelTypes.includes(channelType) ? channelType : "discord",
           instanceId,
-          eventType: "message.received",
+          eventType,
           direction: "inbound",
           status: "received",
           idempotencyKey,
@@ -398350,8 +398362,7 @@ async function setupEventPersistence(eventBus, db2) {
             const sdb = scopedHandle(db2);
             const chatLink = await resolveChatLink(sdb, metadata.instanceId, payload.chatId);
             const personId = await resolvePersonId2(sdb, metadata.personId);
-            const newEvent = {
-              ...eventIdInsert(event.id),
+            const columns2 = {
               externalId: payload.messageId,
               channel: mapChannelType(metadata.channelType),
               instanceId: metadata.instanceId,
@@ -398369,7 +398380,7 @@ async function setupEventPersistence(eventBus, db2) {
               conversationId: null,
               ...chatLink
             };
-            await sdb.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
+            await sdb.insert(omniEvents).values({ ...eventIdInsert(event.id), ...columns2 }).onConflictDoUpdate({ target: omniEvents.id, set: columns2 });
           });
           log126.debug(`Persisted ${type}`, { messageId: payload.messageId, emoji: payload.emoji });
         } catch (error3) {
@@ -528518,63 +528529,6 @@ var contentExtractors = [
   {
     check: (m2) => !!m2.messageHistoryBundle,
     extract: () => null
-  },
-  {
-    check: (m2) => !!m2.deviceSentMessage,
-    extract: (m2) => {
-      const deviceMsg = m2.deviceSentMessage;
-      const innerMsg = deviceMsg?.message;
-      if (innerMsg) {
-        for (const { check, extract } of contentExtractors.slice(0, -3)) {
-          if (check(innerMsg)) {
-            return extract(innerMsg);
-          }
-        }
-      }
-      return null;
-    }
-  },
-  {
-    check: (m2) => !!m2.editedMessage,
-    extract: (m2) => {
-      const innerMsg = m2.editedMessage?.message;
-      if (innerMsg) {
-        for (const { check, extract } of contentExtractors.slice(0, -1)) {
-          if (check(innerMsg)) {
-            return extract(innerMsg);
-          }
-        }
-      }
-      return null;
-    }
-  },
-  {
-    check: (m2) => !!m2.ephemeralMessage,
-    extract: (m2) => {
-      const innerMsg = m2.ephemeralMessage?.message;
-      if (innerMsg) {
-        for (const { check, extract } of contentExtractors.slice(0, -1)) {
-          if (check(innerMsg)) {
-            return extract(innerMsg);
-          }
-        }
-      }
-      return null;
-    }
-  },
-  {
-    check: (m2) => !!m2.viewOnceMessage,
-    extract: (m2) => {
-      const innerMsg = m2.viewOnceMessage?.message;
-      if (innerMsg) {
-        for (const { check, extract } of contentExtractors.slice(0, -1)) {
-          if (check(innerMsg)) {
-            return extract(innerMsg);
-          }
-        }
-      }
-      return null;
-    }
   }
 ];
 var INTERNAL_MESSAGE_TYPES = new Set([
@@ -528598,10 +528552,33 @@ function extractUnknownContent(message2) {
   log52.debug("Unknown message type", { keys: messageKeys });
   return { type: "unknown" };
 }
+var ENVELOPE_KEYS = [
+  "deviceSentMessage",
+  "ephemeralMessage",
+  "viewOnceMessage",
+  "viewOnceMessageV2",
+  "viewOnceMessageV2Extension",
+  "editedMessage",
+  "documentWithCaptionMessage",
+  "associatedChildMessage",
+  "groupStatusMessage",
+  "groupStatusMessageV2"
+];
+function unwrapEnvelopes(message2) {
+  let current = message2;
+  for (let depth = 0;depth < 5; depth++) {
+    const record2 = current;
+    const key = ENVELOPE_KEYS.find((k2) => record2[k2]?.message);
+    if (!key)
+      break;
+    current = record2[key]?.message;
+  }
+  return current;
+}
 function extractContent3(msg) {
-  const message2 = msg.message;
-  if (!message2)
+  if (!msg.message)
     return null;
+  const message2 = unwrapEnvelopes(msg.message);
   for (const { check, extract } of contentExtractors) {
     if (check(message2)) {
       const result = extract(message2);
@@ -528715,8 +528692,11 @@ async function handleSpecialMessage(plugin10, instanceId, content, externalId, c
     await plugin10.handleReactionReceived(instanceId, externalId, chatId, senderId, content.emoji || "", content.targetMessageId || "", isFromMe(msg));
     return true;
   }
-  if (content.type === "edit" && content.targetMessageId) {
-    await plugin10.handleMessageEdited(instanceId, content.targetMessageId, chatId, content.editedText || content.text || "", isFromMe(msg));
+  if (content.type === "edit") {
+    log52.debug("Edit protocol message seen on upsert; awaiting messages.update", {
+      instanceId,
+      targetMessageId: content.targetMessageId
+    });
     return true;
   }
   if (content.type === "delete" && content.targetMessageId) {
@@ -528890,6 +528870,11 @@ function setupMessageHandlers4(sock, plugin10, instanceId, decryptTracker, dedup
       if (update.update.status !== undefined && update.update.status !== null) {
         await processStatusUpdate(plugin10, instanceId, update.key, update.update.status);
       }
+      const newText = extractEditedText(normalizeMessageContent(update.update.message));
+      if (newText) {
+        const { chatId } = resolveChatId(plugin10, instanceId, { key: update.key });
+        await plugin10.handleMessageEdited(instanceId, update.key.id || "", chatId, newText, update.key.fromMe || false);
+      }
     }
   });
   sock.ev.on("messages.delete", async (deletion) => {
@@ -531791,7 +531776,8 @@ class WhatsAppPlugin extends BaseChannelPlugin {
         messageId: targetMessageId,
         chatId,
         from,
-        emoji: ""
+        emoji: "",
+        rawPayload: { externalId, isFromMe: isFromMe2 }
       });
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260910.15",
+  "version": "2.260910.17",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/automagik-dev/omni.git",