@ai-matrx/messaging 0.1.0 → 0.1.2

package/dist/react.cjs

@@ -1062,6 +1062,29 @@ function createMessagingStore() {
       });
       emit();
     },
+    applyLastMessage(message, args = {}) {
+      const existing = conversations.find(
+        (item) => item.conversation.id === message.conversationId
+      );
+      if (existing === void 0) return;
+      if (message.deliveryState === "sending" || message.deletedAt !== null) return;
+      if (existing.lastMessageAt !== null && message.createdAt < existing.lastMessageAt) return;
+      const isActive = activeConversationId === message.conversationId;
+      const shouldCount = args.incrementUnread === true && !isActive;
+      conversations = normalizeConversations(
+        conversations.map(
+          (item) => item.conversation.id === message.conversationId ? {
+            ...item,
+            lastMessageContent: message.content,
+            lastMessageSenderId: message.senderId,
+            lastMessageAt: message.createdAt,
+            sortAt: message.createdAt,
+            unreadCount: shouldCount ? item.unreadCount + 1 : item.unreadCount
+          } : item
+        )
+      );
+      emit();
+    },
     markConversationRead(id) {
       conversations = conversations.map(
         (item) => item.conversation.id === id ? { ...item, unreadCount: 0 } : item
@@ -1132,7 +1155,7 @@ function createMessagingEngine(options) {
     onSent: (entry, message) => {
       store.ingest(message);
       broadcastMessage(message);
-      void refreshConversationRow(message.conversationId);
+      store.applyLastMessage(message);
       void entry;
     },
     onChange: (entries) => {
@@ -1158,15 +1181,6 @@ function createMessagingEngine(options) {
   function broadcastMessage(message) {
     openChannels.get(message.conversationId)?.send(MESSAGING_EVENTS.message, message);
   }
-  async function refreshConversationRow(id) {
-    try {
-      const page = await repository.listConversations({ limit: conversationPageSize });
-      const row = page.items.find((item) => item.conversation.id === id);
-      if (row !== void 0) store.upsertConversation(row);
-    } catch (error) {
-      reportError(error, "refreshConversationRow");
-    }
-  }
   async function reloadInbox() {
     const page = await repository.listConversations({ limit: conversationPageSize });
     conversationCursor = page.nextCursor;
@@ -1217,10 +1231,9 @@ function createMessagingEngine(options) {
                 return;
               }
               store.ingest(message);
-              if (message.senderId !== identity.userId) {
-                options.onIncoming?.(message);
-              }
-              void refreshConversationRow(message.conversationId);
+              const isMine = message.senderId === identity.userId;
+              store.applyLastMessage(message, { incrementUnread: !isMine });
+              if (!isMine) options.onIncoming?.(message);
             }
           },
           {
@@ -2112,7 +2125,12 @@ function useTypists(conversationId, participants) {
   const typing = (0, import_react4.useTyping)(
     {
       topic: conversationId === null ? "" : conversationTopic(conversationId),
-      identity: { userId: host?.identity.userId ?? "" }
+      identity: { userId: host?.identity.userId ?? "" },
+      // READ-ONLY. This label and `useComposer` sit on the SAME topic, which is
+      // one channel carrying ONE presence entry per key — so exactly one of
+      // them publishes, and it is the composer that actually knows whether this
+      // user is typing. Publishing here would overwrite that on every heartbeat.
+      publish: false
     },
     { enabled: conversationId !== null && host !== null }
   );
@@ -2139,7 +2157,10 @@ function useOnlineUserIds(conversationId) {
   const presence = (0, import_react4.usePresence)(
     {
       topic: conversationId === null ? "" : conversationTopic(conversationId),
-      presence: { state: { userId: host?.identity.userId ?? "" } }
+      // READ-ONLY, for the same reason: `useComposer`'s typing presence already
+      // puts this user in the roster under this key with their `userId`, and a
+      // second publisher on one entry just fights it.
+      presence: { publish: false, state: { userId: host?.identity.userId ?? "" } }
     },
     { enabled: conversationId !== null && host !== null }
   );
@@ -2220,7 +2241,7 @@ function useMessagingAi(conversationId) {
 }
 function useMessageAction(message) {
   const host = useRequiredMessagingHost();
-  const action = message.action;
+  const action = message.action ?? null;
   const [receipt, setReceipt] = (0, import_react3.useState)(
     () => action === null ? null : host.actions.receiptFor(action.kind, message.id, host.identity.userId)
   );
@@ -2752,7 +2773,7 @@ function ConversationView(props) {
       /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(TypingDots, {}),
       typists.label
     ] }) : null }),
-    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Composer, { conversationId })
+    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(ComposerView, { composer, disabled: false })
   ] });
 }
 function MessageGroupView(props) {
@@ -2885,6 +2906,10 @@ function MessageActionChips(props) {
 }
 function Composer(props) {
   const composer = useComposer(props.conversationId);
+  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(ComposerView, { composer, disabled: props.conversationId === null });
+}
+function ComposerView(props) {
+  const composer = props.composer;
   const textareaRef = (0, import_react5.useRef)(null);
   (0, import_react5.useEffect)(() => {
     const node = textareaRef.current;
@@ -2918,7 +2943,7 @@ function Composer(props) {
           value: composer.value,
           placeholder: "Message",
           "aria-label": "Message",
-          disabled: props.conversationId === null,
+          disabled: props.disabled,
           onChange: (event) => {
             composer.setValue(event.target.value);
             composer.onKeystroke();