@automagik/omni 2.260910.6 → 2.260910.7

package/dist/index.js

@@ -42456,9 +42456,8 @@ async function processRow2(row, now, deps, stats) {
       silentForSeconds,
       stalledAt: now.getTime()
     };
-    const eventId = await publishTransition(deps, "system.connector.stalled", { ...payload }, row);
+    await publishTransition(deps, "system.connector.stalled", { ...payload }, row);
     stats.stalled += 1;
-    await runHook(deps.logger, "onStalled", row, () => deps.onStalled?.(row, payload, eventId));
     return;
   }
   if (row.livenessStatus === "stalled") {
@@ -42475,7 +42474,6 @@ async function processRow2(row, now, deps, stats) {
     };
     await publishTransition(deps, "system.connector.recovered", { ...payload }, row);
     stats.recovered += 1;
-    await runHook(deps.logger, "onRecovered", row, () => deps.onRecovered?.(row, payload));
   }
 }
 async function publishTransition(deps, type, payload, row) {
@@ -42484,24 +42482,12 @@ async function publishTransition(deps, type, payload, row) {
       type,
       sourceName: row.name
     });
-    return null;
+    return;
   }
-  const result = await deps.eventBus.publishGeneric(type, payload, {
+  await deps.eventBus.publishGeneric(type, payload, {
     source: "connector-liveness",
     ...row.tenantId ? { tenantId: row.tenantId } : {}
   });
-  return result.id;
-}
-async function runHook(logger5, name, row, hook) {
-  try {
-    await hook();
-  } catch (err2) {
-    logger5.error(`connector liveness: ${name} hook failed`, {
-      sourceId: row.id,
-      sourceName: row.name,
-      error: err2 instanceof Error ? err2.message : String(err2)
-    });
-  }
 }
 
 // ../core/src/connectors/index.ts
@@ -137139,7 +137125,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260910.6",
+  version: "2.260910.7",
   repository: {
     type: "git",
     url: "git+https://github.com/automagik-dev/omni.git",

package/dist/server/index.js

@@ -39360,9 +39360,8 @@ async function processRow2(row, now, deps, stats) {
       silentForSeconds,
       stalledAt: now.getTime()
     };
-    const eventId = await publishTransition(deps, "system.connector.stalled", { ...payload }, row);
+    await publishTransition(deps, "system.connector.stalled", { ...payload }, row);
     stats.stalled += 1;
-    await runHook(deps.logger, "onStalled", row, () => deps.onStalled?.(row, payload, eventId));
     return;
   }
   if (row.livenessStatus === "stalled") {
@@ -39379,7 +39378,6 @@ async function processRow2(row, now, deps, stats) {
     };
     await publishTransition(deps, "system.connector.recovered", { ...payload }, row);
     stats.recovered += 1;
-    await runHook(deps.logger, "onRecovered", row, () => deps.onRecovered?.(row, payload));
   }
 }
 async function publishTransition(deps, type, payload, row) {
@@ -39388,24 +39386,12 @@ async function publishTransition(deps, type, payload, row) {
       type,
       sourceName: row.name
     });
-    return null;
+    return;
   }
-  const result = await deps.eventBus.publishGeneric(type, payload, {
+  await deps.eventBus.publishGeneric(type, payload, {
     source: "connector-liveness",
     ...row.tenantId ? { tenantId: row.tenantId } : {}
   });
-  return result.id;
-}
-async function runHook(logger5, name, row, hook) {
-  try {
-    await hook();
-  } catch (err2) {
-    logger5.error(`connector liveness: ${name} hook failed`, {
-      sourceId: row.id,
-      sourceName: row.name,
-      error: err2 instanceof Error ? err2.message : String(err2)
-    });
-  }
 }
 
 // ../core/src/connectors/index.ts
@@ -251595,7 +251581,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260910.6",
+    version: "2.260910.7",
     private: true,
     type: "module",
     exports: {
@@ -363727,14 +363713,27 @@ async function maybeFindOrCreateParticipant(services, chatId, from, rawPayload,
     platformIdentityId
   });
 }
-async function maybeRecordMessageEdit(services, created, rawPayload, messageId, newText, platformTimestamp, from) {
+async function maybeRecordMessageEdit(services, created, rawPayload, chatId, messageId, contentType, newText, platformTimestamp, from) {
+  const editedBy = truncate4(from, 255) ?? undefined;
+  if (contentType === "edit") {
+    const targetExternalId = rawPayload?.editedMessageId;
+    if (typeof targetExternalId !== "string")
+      return;
+    const target = await services.messages.getByExternalId(chatId, targetExternalId);
+    if (!target)
+      return;
+    const editedAtMs2 = rawPayload?.editedAt;
+    const editedAt2 = new Date(typeof editedAtMs2 === "number" ? editedAtMs2 : platformTimestamp.getTime());
+    await services.messages.recordEdit(target.id, newText ?? "", editedAt2, editedBy);
+    return;
+  }
   if (created)
     return;
   if (rawPayload?.isEdited !== true)
     return;
   const editedAtMs = rawPayload.editDate;
   const editedAt = new Date(typeof editedAtMs === "number" ? editedAtMs : platformTimestamp.getTime());
-  await services.messages.recordEdit(messageId, newText ?? "", editedAt, truncate4(from, 255) ?? undefined);
+  await services.messages.recordEdit(messageId, newText ?? "", editedAt, editedBy);
 }
 async function maybeRecordParticipantActivity(services, chatId, from) {
   if (!from)
@@ -363743,7 +363742,7 @@ async function maybeRecordParticipantActivity(services, chatId, from) {
   await services.chats.recordParticipantActivity(chatId, activityUserId);
 }
 function maybeUpdateRecency(services, instanceId, chatId, rawPayload, payload, platformTimestamp, trustedTenantId) {
-  if (rawPayload?.isEdited === true)
+  if (rawPayload?.isEdited === true || payload.content.type === "edit")
     return;
   const preview = sanitizeText(buildChatPreview(payload, rawPayload)) ?? "";
   const isFromMe2 = rawPayload?.isFromMe === true;
@@ -363869,7 +363868,7 @@ async function handleMessageReceived(services, payload, metadata, eventTimestamp
     isForwarded: !!(rawPayload?.isForwarded || rawPayload?.forwardingScore),
     rawPayload
   });
-  await maybeRecordMessageEdit(services, created, rawPayload, message2.id, sanitizeText(payload.content.text) ?? undefined, platformTimestamp ?? new Date(eventTimestamp), payload.from);
+  await maybeRecordMessageEdit(services, created, rawPayload, chat2.id, message2.id, payload.content.type, sanitizeText(payload.content.text) ?? undefined, platformTimestamp ?? new Date(eventTimestamp), payload.from);
   if (created) {
     log90.debug("Created message", { externalId: payload.externalId, chatId: chat2.id });
     await linkReplyTarget(services, chat2.id, message2.id, payload.replyToId);
@@ -375966,18 +375965,8 @@ class WebhookService {
       expectedIntervalSeconds: source.expectedIntervalSeconds
     };
   }
-  async sweepLiveness(options = {}) {
-    const { deadLetters } = options;
-    const hooks2 = deadLetters ? {
-      onStalled: (row, payload, publishedEventId) => fileStallDeadLetter(deadLetters, row, payload, publishedEventId),
-      onRecovered: (row) => resolveStallDeadLetters(deadLetters, row)
-    } : {};
-    return sweepConnectorLiveness({
-      repo: this.livenessRepo(),
-      eventBus: this.eventBus,
-      logger: log112,
-      ...hooks2
-    });
+  async sweepLiveness() {
+    return sweepConnectorLiveness({ repo: this.livenessRepo(), eventBus: this.eventBus, logger: log112 });
   }
   livenessRepo() {
     return {
@@ -376007,35 +375996,6 @@ class WebhookService {
     };
   }
 }
-async function fileStallDeadLetter(deadLetters, row, payload, publishedEventId) {
-  const event = {
-    id: publishedEventId ?? generateId(),
-    type: "system.connector.stalled",
-    payload: { ...payload },
-    metadata: {
-      correlationId: generateId(),
-      source: "connector-liveness",
-      ...row.tenantId ? { tenantId: row.tenantId } : {}
-    },
-    timestamp: payload.stalledAt
-  };
-  await deadLetters.create({
-    event,
-    subject: "system.connector.stalled.internal.global",
-    error: new Error(`Connector '${row.name}' declared >=1 event or heartbeat per ${row.expectedIntervalSeconds}s ` + `but has been silent for ${payload.silentForSeconds}s`),
-    retryCount: 0,
-    autoRetry: false
-  });
-}
-async function resolveStallDeadLetters(deadLetters, row) {
-  const { items } = await deadLetters.list({ status: ["pending"], eventType: ["system.connector.stalled"] });
-  for (const entry of items) {
-    const stored = entry.payload;
-    if (stored.payload?.sourceId === row.id) {
-      await deadLetters.resolve(entry.id, "connector-liveness: recovered");
-    }
-  }
-}
 var log112;
 var init_webhooks = __esm(() => {
   init_src();
@@ -398036,53 +397996,63 @@ async function setupEventPersistence(eventBus, db2) {
         }
       }, { ...CONSUMER_OPTIONS, durable: `event-persistence-${type.replace(".", "-")}` });
     }
-    await eventBus.subscribePattern("custom.>", async (event) => {
-      const metadata = event.metadata;
-      try {
-        await runConsumerInTenantContext(db2, event, async () => {
-          const sdb = scopedHandle(db2);
-          const payload = typeof event.payload === "object" && event.payload !== null ? event.payload : {};
-          const instanceId = metadata.instanceId && isValidUuid(metadata.instanceId) ? metadata.instanceId : null;
-          const payloadChatId = typeof payload.chatId === "string" ? payload.chatId : undefined;
-          const personId = await resolvePersonId2(sdb, metadata.personId) ?? await resolvePersonId2(sdb, payload.personId);
-          const chatUuid = await resolveChatUuidById(sdb, payload.chatUuid);
-          const chatLink = chatUuid ? { chatUuid, canonicalChatId: null } : await resolveChatLink(sdb, instanceId ?? undefined, payloadChatId);
-          const newEvent = {
-            ...eventIdInsert(event.id),
-            channel: "internal",
-            instanceId,
-            personId,
-            eventType: event.type.slice(0, 255),
-            direction: "internal",
-            status: "completed",
-            receivedAt: new Date(event.timestamp),
-            rawPayload: deepSanitize(payload),
-            metadata: {
-              correlationId: metadata.correlationId,
-              source: metadata.source,
-              fullEventType: event.type
-            },
-            causationId: metadata.causationId ?? null,
-            conversationId: null,
-            chatId: payloadChatId,
-            ...chatLink
-          };
-          await sdb.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
-        });
-      } catch (error3) {
-        log125.error("Failed to persist custom event", {
-          eventType: event.type,
-          eventId: event.id,
-          error: String(error3)
-        });
-      }
-    }, { ...CONSUMER_OPTIONS, durable: "event-persistence-custom", startFrom: "new" });
+    await eventBus.subscribePattern("custom.>", (event) => journalInternalEvent(db2, event), {
+      ...CONSUMER_OPTIONS,
+      durable: "event-persistence-custom",
+      startFrom: "new"
+    });
+    await eventBus.subscribePattern("system.connector.>", (event) => journalInternalEvent(db2, event), {
+      ...CONSUMER_OPTIONS,
+      durable: "event-persistence-connector",
+      startFrom: "new"
+    });
     log125.info("Event persistence initialized - listening for message events");
   } catch (error3) {
     log125.error("Failed to set up event persistence", { error: String(error3) });
     throw error3;
   }
 }
+async function journalInternalEvent(db2, event) {
+  const metadata = event.metadata;
+  try {
+    await runConsumerInTenantContext(db2, event, async () => {
+      const sdb = scopedHandle(db2);
+      const payload = typeof event.payload === "object" && event.payload !== null ? event.payload : {};
+      const instanceId = metadata.instanceId && isValidUuid(metadata.instanceId) ? metadata.instanceId : null;
+      const payloadChatId = typeof payload.chatId === "string" ? payload.chatId : undefined;
+      const personId = await resolvePersonId2(sdb, metadata.personId) ?? await resolvePersonId2(sdb, payload.personId);
+      const chatUuid = await resolveChatUuidById(sdb, payload.chatUuid);
+      const chatLink = chatUuid ? { chatUuid, canonicalChatId: null } : await resolveChatLink(sdb, instanceId ?? undefined, payloadChatId);
+      const newEvent = {
+        ...eventIdInsert(event.id),
+        channel: "internal",
+        instanceId,
+        personId,
+        eventType: event.type.slice(0, 255),
+        direction: "internal",
+        status: "completed",
+        receivedAt: new Date(event.timestamp),
+        rawPayload: deepSanitize(payload),
+        metadata: {
+          correlationId: metadata.correlationId,
+          source: metadata.source,
+          fullEventType: event.type
+        },
+        causationId: metadata.causationId ?? null,
+        conversationId: null,
+        chatId: payloadChatId,
+        ...chatLink
+      };
+      await sdb.insert(omniEvents).values(newEvent).onConflictDoNothing({ target: omniEvents.id });
+    });
+  } catch (error3) {
+    log125.error("Failed to persist custom event", {
+      eventType: event.type,
+      eventId: event.id,
+      error: String(error3)
+    });
+  }
+}
 var log125, NO_CHAT_LINK, CONSUMER_OPTIONS;
 var init_event_persistence = __esm(() => {
   init_src();
@@ -400459,7 +400429,7 @@ function setupScheduler(services, channelRegistry2) {
       await withCronMonitor("connector-liveness-sweeper", "*/30 * * * * *", 1, 1, async () => {
         const startTime3 = Date.now();
         try {
-          const stats = await services.webhooks.sweepLiveness({ deadLetters: services.deadLetters });
+          const stats = await services.webhooks.sweepLiveness();
           recordScheduledJob("connector-liveness-sweeper", "success", (Date.now() - startTime3) / 1000);
           if (stats.stalled > 0 || stats.recovered > 0) {
             log131.info("Connector liveness sweep tick", { ...stats });
@@ -527852,6 +527822,9 @@ function getMediaSize(msg) {
 var log52 = createLogger("whatsapp:messages");
 var fallbackDedupeCache3 = createInboundDedupeCache();
 var downloadGuard9 = createDownloadGuard({ maxSizeBytes: getWhatsAppMediaDownloadMaxBytes() });
+function extractEditedText(edited) {
+  return edited?.conversation || edited?.extendedTextMessage?.text || edited?.imageMessage?.caption || edited?.videoMessage?.caption || edited?.documentMessage?.caption || undefined;
+}
 function joinLines(...parts) {
   const text = parts.filter((p2) => typeof p2 === "string" && p2.trim().length > 0).join(`
 `);
@@ -528081,7 +528054,7 @@ var contentExtractors = [
         return {
           type: "edit",
           targetMessageId: proto3?.key?.id ?? undefined,
-          editedText: proto3?.editedMessage?.conversation || proto3?.editedMessage?.extendedTextMessage?.text || undefined
+          editedText: extractEditedText(proto3?.editedMessage)
         };
       }
       if (protoType === 0) {
@@ -528168,6 +528141,20 @@ var contentExtractors = [
       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) => {
@@ -528497,13 +528484,6 @@ 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);
       }
-      if (update.update.message) {
-        const editedContent = update.update.message;
-        const newText = editedContent.conversation || editedContent.extendedTextMessage?.text || editedContent.imageMessage?.caption || editedContent.videoMessage?.caption || null;
-        if (newText) {
-          await plugin10.handleMessageEdited(instanceId, update.key.id || "", update.key.remoteJid || "", newText, update.key.fromMe || false);
-        }
-      }
     }
   });
   sock.ev.on("messages.delete", async (deletion) => {

package/package.json

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