@ai-matrx/messaging 0.15.82 → 0.16.0

package/dist/react.js

@@ -802,7 +802,8 @@ function projectBroadcastMessage(value) {
     action: projectMessageAction(record["action"]),
     attachments: projectAttachmentList(record["attachments"]),
     references: projectReferenceList(record["references"]),
-    metadata
+    metadata,
+    softExpiresAt: str(record, "softExpiresAt")
   };
 }
 function projectMessage(row, fallbackOrganizationId) {
@@ -832,7 +833,8 @@ function projectMessage(row, fallbackOrganizationId) {
     action,
     attachments: projectAttachments(metadata),
     references: projectReferences(metadata),
-    metadata
+    metadata,
+    softExpiresAt: str(row, "soft_expires_at")
   };
 }
 function projectParticipantRole(value) {
@@ -885,6 +887,18 @@ function projectConversationSummary(row, viewerId, fallbackOrganizationId) {
   };
 }
 
+// src/core/lapse.ts
+function softExpiryTime(message) {
+  if (message.softExpiresAt === null) return null;
+  const parsed = Date.parse(message.softExpiresAt);
+  return Number.isFinite(parsed) ? parsed : null;
+}
+function isLapsed(message, now = Date.now()) {
+  const at = softExpiryTime(message);
+  if (at === null) return false;
+  return at <= (typeof now === "number" ? now : now.getTime());
+}
+
 // src/core/types.ts
 var asConversationId = (value) => value;
 var asMessageId = (value) => value;
@@ -922,7 +936,8 @@ function insertOrdered(messages, message) {
   next.splice(index, 0, message);
   return next;
 }
-function createMessagingStore() {
+function createMessagingStore(options = {}) {
+  const now = options.now ?? Date.now;
   let conversations = [];
   let conversationSummaries = /* @__PURE__ */ new Map();
   let hasMoreConversations = false;
@@ -1159,7 +1174,7 @@ function createMessagingStore() {
       if (existing === void 0) return;
       if (message.deliveryState === "sending" || message.deletedAt !== null) return;
       if (existing.lastMessageAt !== null && message.createdAt < existing.lastMessageAt) return;
-      const shouldCount = args.incrementUnread === true;
+      const shouldCount = args.incrementUnread === true && !isLapsed(message, now());
       replaceOneSummary(message.conversationId, (item) => ({
         ...item,
         lastMessageContent: message.content,
@@ -1222,14 +1237,25 @@ function optimisticMessage(args) {
     action: args.action ?? null,
     attachments: args.attachments ?? [],
     references: args.references ?? [],
-    metadata: {}
+    metadata: {},
+    softExpiresAt: args.softExpiresAt ?? null
   };
 }
 
 // src/core/engine.ts
+var SOFT_EXPIRY_GRACE_MS = 2e3;
+var MAX_TIMER_DELAY_MS = 2147483647;
 function createMessagingEngine(options) {
   const { repository, manager, identity } = options;
-  const store = createMessagingStore();
+  const browserNow = options.now ?? Date.now;
+  let serverClockOffsetMs = 0;
+  const now = () => browserNow() + serverClockOffsetMs;
+  function learnServerClock(serverNow) {
+    if (serverNow === null) return;
+    const server = Date.parse(serverNow);
+    if (Number.isFinite(server)) serverClockOffsetMs = server - browserNow();
+  }
+  const store = createMessagingStore({ now });
   const conversationPageSize = options.conversationPageSize ?? 30;
   const messagePageSize = options.messagePageSize ?? 50;
   const openChannels = /* @__PURE__ */ new Map();
@@ -1243,6 +1269,8 @@ function createMessagingEngine(options) {
   let inboxChannel = null;
   let conversationCursor = null;
   let disposed = false;
+  const pendingExpiry = /* @__PURE__ */ new Map();
+  let expiryTimer = null;
   function report(event) {
     options.onDiagnostic?.(event);
   }
@@ -1285,6 +1313,72 @@ function createMessagingEngine(options) {
     }).catch(() => void 0);
     return current;
   }
+  function scheduleExpiryTimer() {
+    if (expiryTimer !== null) {
+      clearTimeout(expiryTimer);
+      expiryTimer = null;
+    }
+    if (disposed || pendingExpiry.size === 0) return;
+    const soonest = Math.min(...pendingExpiry.values());
+    const delay = Math.min(
+      MAX_TIMER_DELAY_MS,
+      Math.max(0, soonest + SOFT_EXPIRY_GRACE_MS - now())
+    );
+    expiryTimer = setTimeout(() => {
+      expiryTimer = null;
+      void fireSoftExpiry();
+    }, delay);
+  }
+  function noteSoftExpiry(id, at) {
+    if (at === null) return;
+    if (at <= now() && (store.snapshot().conversationSummaries.get(id)?.unreadCount ?? 0) === 0) {
+      return;
+    }
+    const held = pendingExpiry.get(id);
+    if (held !== void 0 && held <= at) return;
+    pendingExpiry.set(id, at);
+    scheduleExpiryTimer();
+  }
+  async function refreshPendingExpiries(ids) {
+    const summaries = store.snapshot().conversationSummaries;
+    const counted = ids.filter((id) => (summaries.get(id)?.unreadCount ?? 0) > 0);
+    ids.forEach((id) => pendingExpiry.delete(id));
+    if (counted.length > 0) {
+      const pending = await repository.pendingSoftExpiries(counted);
+      if (disposed) return;
+      learnServerClock(pending.serverNow);
+      pending.byConversation.forEach(
+        (at, id) => noteSoftExpiry(id, softExpiryTime({ softExpiresAt: at }))
+      );
+    }
+    scheduleExpiryTimer();
+  }
+  async function fireSoftExpiry() {
+    if (disposed) return;
+    const at = now();
+    const due = [...pendingExpiry.entries()].filter(([, expiry]) => expiry <= at).map(([id]) => id);
+    due.forEach((id) => pendingExpiry.delete(id));
+    await Promise.all(
+      due.map(async (id) => {
+        if ((store.snapshot().conversationSummaries.get(id)?.unreadCount ?? 0) === 0) return;
+        try {
+          const count = await repository.unreadCount(id);
+          if (!disposed) store.setUnreadCount(id, count);
+        } catch (error) {
+          reportError(error, "softExpiryUnread", { conversationId: id });
+        }
+      })
+    );
+    if (disposed) return;
+    await refreshPendingExpiries(due).catch(
+      (error) => reportError(error, "softExpiryRefresh")
+    );
+  }
+  function watchSoftExpiries(ids) {
+    void refreshPendingExpiries(ids).catch(
+      (error) => reportError(error, "softExpiryRefresh")
+    );
+  }
   const outbox = createOutbox({
     ...options.outboxStorage !== void 0 ? { storage: options.outboxStorage } : {},
     send: (draft, clientMessageId) => repository.insertMessage(draft, clientMessageId),
@@ -1311,7 +1405,8 @@ function createMessagingEngine(options) {
             ...entry.draft.replyToId !== void 0 ? { replyToId: entry.draft.replyToId } : {},
             ...entry.draft.action !== void 0 ? { action: entry.draft.action } : {},
             ...entry.draft.attachments !== void 0 ? { attachments: [...entry.draft.attachments] } : {},
-            ...entry.draft.references !== void 0 ? { references: [...entry.draft.references] } : {}
+            ...entry.draft.references !== void 0 ? { references: [...entry.draft.references] } : {},
+            ...entry.draft.softExpiresAt !== void 0 ? { softExpiresAt: entry.draft.softExpiresAt } : {}
           })
         );
       });
@@ -1340,6 +1435,7 @@ function createMessagingEngine(options) {
     if (disposed) return;
     conversationCursor = page.nextCursor;
     store.setConversations(page.items, page.hasMore);
+    watchSoftExpiries([...store.snapshot().conversationSummaries.keys()]);
   }
   async function reloadArchivedCount() {
     if (disposed) return;
@@ -1534,6 +1630,7 @@ function createMessagingEngine(options) {
               store.ingest(message);
               const isMine = message.senderId === identity.userId;
               store.applyLastMessage(message, { incrementUnread: !isMine });
+              if (!isMine) noteSoftExpiry(message.conversationId, softExpiryTime(message));
               if (!isMine && store.snapshot().activeConversationId === message.conversationId) {
                 void persistRead(message.conversationId).catch(() => void 0);
               }
@@ -1595,6 +1692,7 @@ function createMessagingEngine(options) {
         });
         conversationCursor = page.nextCursor;
         store.appendConversations(page.items, page.hasMore);
+        watchSoftExpiries(page.items.map((item) => item.conversation.id));
       } catch (error) {
         reportError(error, "loadMoreConversations");
       }
@@ -1614,7 +1712,10 @@ function createMessagingEngine(options) {
         const directSummary = missingSummary ? await repository.getConversationSummary(id) : null;
         if (!openIsLive(id, generation, ownedChannel)) return;
         store.setConversationReadFailure(id, null);
-        if (directSummary !== null) store.setConversationSummary(directSummary);
+        if (directSummary !== null) {
+          store.setConversationSummary(directSummary);
+          watchSoftExpiries([id]);
+        }
         await persistRead(
           id,
           () => openIsLive(id, generation, ownedChannel)
@@ -1709,6 +1810,9 @@ function createMessagingEngine(options) {
     },
     dispose() {
       disposed = true;
+      if (expiryTimer !== null) clearTimeout(expiryTimer);
+      expiryTimer = null;
+      pendingExpiry.clear();
       openChannels.forEach((_handle, id) => {
         initialReadGeneration.set(id, (initialReadGeneration.get(id) ?? 0) + 1);
       });
@@ -1927,10 +2031,13 @@ var RPCS = {
   /** Conversation list + participants + last message + unread, keyset paged. */
   conversationsWithDetails: "get_dm_conversations_with_details",
   unreadCount: "get_dm_unread_count",
+  /** The soonest future soft expiry per conversation, plus the server's clock. */
+  pendingSoftExpiries: "get_dm_pending_soft_expiries",
   userInfo: "get_dm_user_info",
   isParticipant: "is_dm_participant"
 };
-var MESSAGE_COLUMNS = "id,conversation_id,sender_id,organization_id,content,message_type,status,reply_to_id,client_message_id,action_data,media_url,media_thumbnail_url,media_metadata,created_at,edited_at,deleted_at,deleted_for_everyone,metadata";
+var MESSAGE_COLUMNS = "id,conversation_id,sender_id,organization_id,content,message_type,status,reply_to_id,client_message_id,action_data,media_url,media_thumbnail_url,media_metadata,created_at,edited_at,deleted_at,deleted_for_everyone,metadata,soft_expires_at";
+var PENDING_SOFT_EXPIRY_CHUNK = 200;
 var PARTICIPANT_COLUMNS = "conversation_id,user_id,role,joined_at,last_read_at,is_muted,is_archived";
 var CONVERSATION_COLUMNS = "id,type,group_name,group_image_url,created_by,organization_id,created_at,updated_at,metadata";
 function optionalOrg(organizationId) {
@@ -2351,6 +2458,9 @@ function createMessagingRepository(options) {
         // confirmed row instead of showing the message twice.
         client_message_id: clientMessageId,
         action_data: draft.action ?? null,
+        // SOFT EXPIRY: written only when the sender sets one. Lapsed is
+        // derived from it live (`isLapsed`), never stamped.
+        ...draft.softExpiresAt !== void 0 ? { soft_expires_at: draft.softExpiresAt } : {},
         metadata: {
           ...draft.metadata ?? {},
           ...draft.attachments !== void 0 && draft.attachments.length > 0 ? { attachments: draft.attachments } : {},
@@ -2403,6 +2513,56 @@ function createMessagingRepository(options) {
       }
       return Math.floor(unread);
     },
+    async unreadCount(conversationId) {
+      const operation = "unreadCount";
+      const me = await actingUser(operation);
+      const unread = await withSessionRetry(
+        operation,
+        () => rpc(
+          RPCS.unreadCount,
+          { p_conversation_id: conversationId, p_user_id: me },
+          operation
+        )
+      );
+      if (typeof unread !== "number" || !Number.isFinite(unread) || unread < 0) {
+        throw invalidResponse(operation, `${RPCS.unreadCount} returned ${JSON.stringify(unread)}`);
+      }
+      return Math.floor(unread);
+    },
+    async pendingSoftExpiries(conversationIds) {
+      const operation = "pendingSoftExpiries";
+      const unique = [...new Set(conversationIds)];
+      const byConversation = /* @__PURE__ */ new Map();
+      let serverNow = null;
+      for (let start = 0; start < unique.length; start += PENDING_SOFT_EXPIRY_CHUNK) {
+        const chunk = unique.slice(start, start + PENDING_SOFT_EXPIRY_CHUNK);
+        const answer = await withSessionRetry(
+          operation,
+          () => rpc(
+            RPCS.pendingSoftExpiries,
+            { p_conversation_ids: chunk },
+            operation
+          )
+        );
+        const now = answer?.["server_now"];
+        const pending = answer?.["pending"];
+        if (typeof now !== "string" || !Array.isArray(pending)) {
+          throw invalidResponse(
+            operation,
+            `${RPCS.pendingSoftExpiries} returned ${JSON.stringify(answer)}`
+          );
+        }
+        serverNow = now;
+        for (const row of pending) {
+          const id = row["conversation_id"];
+          const at = row["soft_expires_at"];
+          if (typeof id === "string" && typeof at === "string") {
+            byConversation.set(id, at);
+          }
+        }
+      }
+      return { byConversation, serverNow };
+    },
     async setConversationFlags(conversationId, flags) {
       const operation = "setConversationFlags";
       const me = await actingUser(operation);
@@ -3814,6 +3974,23 @@ function ConversationRow(props) {
     }
   );
 }
+function useLapseClock(messages) {
+  const [now, setNow] = useState2(() => Date.now());
+  let soonest = null;
+  for (const message of messages) {
+    const at = softExpiryTime(message);
+    if (at !== null && at > now && (soonest === null || at < soonest)) soonest = at;
+  }
+  useEffect3(() => {
+    if (soonest === null) return;
+    const timer = setTimeout(
+      () => setNow(Date.now()),
+      Math.min(2147483647, Math.max(0, soonest - Date.now()))
+    );
+    return () => clearTimeout(timer);
+  }, [soonest]);
+  return now;
+}
 function ConversationView(props) {
   const { conversationId } = props;
   const host = useMessagingHost();
@@ -3826,6 +4003,7 @@ function ConversationView(props) {
   const selfId = host?.identity.userId ?? "";
   const messages = conversation.messages;
   const lastId = messages.at(-1)?.id ?? null;
+  const lapseNow = useLapseClock(messages);
   useEffect3(() => {
     const node = scrollRef.current;
     if (node === null) return;
@@ -3957,6 +4135,7 @@ function ConversationView(props) {
             MessageGroupView,
             {
               allMessages: messages,
+              now: lapseNow,
               showAuthor: conversation.summary?.conversation.type !== "direct",
               messages: group.messages,
               actor,
@@ -4017,6 +4196,7 @@ function MessageGroupView(props) {
             replyTo: props.allMessages.find((parent) => parent.id === message.replyToId),
             isMine: props.isMine,
             isLast: index === props.messages.length - 1,
+            now: props.now,
             onRetry: props.onRetry,
             onReply: props.onReply,
             failedEntryId: message.clientMessageId !== null ? props.failedEntryIdByClientId.get(message.clientMessageId) ?? null : null
@@ -4036,12 +4216,15 @@ function MessageBubble(props) {
   if (message.deletedAt !== null) {
     return /* @__PURE__ */ jsx4("div", { className: "mx-msg__bubble mx-msg__bubble--deleted", children: "Message deleted" });
   }
+  const lapsed = isLapsed(message, props.now ?? Date.now());
   const classes = [
     "mx-msg__bubble",
     isMine ? "mx-msg__bubble--mine" : "",
     props.isLast ? "mx-msg__bubble--tail" : "",
     message.deliveryState === "sending" ? "mx-msg__bubble--pending" : "",
-    message.deliveryState === "failed" ? "mx-msg__bubble--failed" : ""
+    message.deliveryState === "failed" ? "mx-msg__bubble--failed" : "",
+    // SOFT EXPIRY: past, still fully readable and actionable — muted, never hidden.
+    lapsed ? "mx-msg__bubble--lapsed" : ""
   ].filter(Boolean).join(" ");
   const bubble = /* @__PURE__ */ jsxs2(Fragment, { children: [
     /* @__PURE__ */ jsxs2("div", { className: classes, title: formatMessageTime(message.createdAt), children: [
@@ -4091,6 +4274,17 @@ function MessageBubble(props) {
         children: [
           /* @__PURE__ */ jsx4("span", { className: "mx-msg__message-time", children: props.isLast ? formatMessageTime(message.createdAt) : null }),
           message.editedAt !== null ? " \xB7 edited" : null,
+          lapsed && message.softExpiresAt !== null ? /* @__PURE__ */ jsxs2(
+            "span",
+            {
+              className: "mx-msg__lapsed",
+              title: `Past ${formatMessageTime(message.softExpiresAt)}`,
+              children: [
+                /* @__PURE__ */ jsx4(ClockIcon, {}),
+                "Past"
+              ]
+            }
+          ) : null,
           isMine ? /* @__PURE__ */ jsx4(DeliveryTick, { state: message.deliveryState }) : null,
           message.deliveryState === "failed" && props.failedEntryId != null && props.onRetry !== void 0 ? /* @__PURE__ */ jsx4(
             "button",
@@ -4367,6 +4561,7 @@ export {
   groupMessages,
   inboxTopic,
   invalidResponse,
+  isLapsed,
   isSameDay,
   messagingClientId,
   normalizeMessagingError,
@@ -4378,6 +4573,7 @@ export {
   projectParticipantRole,
   projectUserSummary,
   resolveActor,
+  softExpiryTime,
   splitText,
   summarizeText,
   toMessagingArchiveFilter,