@anakin824/prdg-chat-ui 0.3.0 → 0.3.2

package/dist/index.d.mts

@@ -249,15 +249,42 @@ declare class ChatAPI {
     }>;
     listConversations(cursor?: string, limit?: number): Promise<ListConversationsRes>;
     listMessages(conversationId: string, cursor?: string, limit?: number): Promise<ListMessagesRes>;
-    findOrCreateDirect(peerUserId: string): Promise<Conversation>;
-    createGroup(title: string, members: string[]): Promise<Conversation>;
+    findOrCreateDirect(peerUserId: string, opts?: {
+        peerKind?: "internal" | "external";
+    }): Promise<Conversation>;
+    createGroup(title: string, members: string[], externalMembers?: string[]): Promise<Conversation>;
     findOrCreateEntity(input: {
         title: string;
         entity_ref: string;
         entity_uuid: string;
+        /** prdg-chat user UUIDs */
         members?: string[];
+        /** Integration / HDS user ids (`ext_user_id`); resolved server-side */
+        external_members?: string[];
     }): Promise<Conversation>;
+    /**
+     * Fetch an existing entity-linked conversation by `entity_ref` + `entity_uuid` (path).
+     * 404 if none exists; 403 if the user is not a member.
+     */
+    getConversationByEntity(entity_ref: string, entity_uuid: string): Promise<Conversation>;
+    /** Add members to a group or entity conversation (admin only). */
+    addConversationMembers(conversationId: string, body: {
+        user_ids?: string[];
+        external_user_ids?: string[];
+        role?: "member" | "admin";
+    }): Promise<{
+        added_user_ids: string[];
+    }>;
     listConversationMembers(conversationId: string): Promise<AppUser[]>;
+    /**
+     * Remove a member by prdg-chat user id, or by integration `ext_user_id`
+     * (`DELETE .../members/external/:external_user_id`).
+     */
+    removeConversationMember(conversationId: string, by: {
+        userId: string;
+    } | {
+        externalUserId: string;
+    }): Promise<void>;
     listContacts(q?: string, limit?: number): Promise<AppUser[]>;
     sendMessage(conversationId: string, body: {
         body?: string | null;

package/dist/index.d.ts

@@ -249,15 +249,42 @@ declare class ChatAPI {
     }>;
     listConversations(cursor?: string, limit?: number): Promise<ListConversationsRes>;
     listMessages(conversationId: string, cursor?: string, limit?: number): Promise<ListMessagesRes>;
-    findOrCreateDirect(peerUserId: string): Promise<Conversation>;
-    createGroup(title: string, members: string[]): Promise<Conversation>;
+    findOrCreateDirect(peerUserId: string, opts?: {
+        peerKind?: "internal" | "external";
+    }): Promise<Conversation>;
+    createGroup(title: string, members: string[], externalMembers?: string[]): Promise<Conversation>;
     findOrCreateEntity(input: {
         title: string;
         entity_ref: string;
         entity_uuid: string;
+        /** prdg-chat user UUIDs */
         members?: string[];
+        /** Integration / HDS user ids (`ext_user_id`); resolved server-side */
+        external_members?: string[];
     }): Promise<Conversation>;
+    /**
+     * Fetch an existing entity-linked conversation by `entity_ref` + `entity_uuid` (path).
+     * 404 if none exists; 403 if the user is not a member.
+     */
+    getConversationByEntity(entity_ref: string, entity_uuid: string): Promise<Conversation>;
+    /** Add members to a group or entity conversation (admin only). */
+    addConversationMembers(conversationId: string, body: {
+        user_ids?: string[];
+        external_user_ids?: string[];
+        role?: "member" | "admin";
+    }): Promise<{
+        added_user_ids: string[];
+    }>;
     listConversationMembers(conversationId: string): Promise<AppUser[]>;
+    /**
+     * Remove a member by prdg-chat user id, or by integration `ext_user_id`
+     * (`DELETE .../members/external/:external_user_id`).
+     */
+    removeConversationMember(conversationId: string, by: {
+        userId: string;
+    } | {
+        externalUserId: string;
+    }): Promise<void>;
     listContacts(q?: string, limit?: number): Promise<AppUser[]>;
     sendMessage(conversationId: string, body: {
         body?: string | null;

package/dist/index.js

@@ -66,16 +66,18 @@ var ChatAPI = class {
     q.set("limit", String(limit));
     return this.json(`/conversations/${conversationId}/messages?${q}`);
   }
-  findOrCreateDirect(peerUserId) {
+  findOrCreateDirect(peerUserId, opts) {
+    const kind = opts?.peerKind ?? "internal";
+    const body = kind === "external" ? { external_user_uuid: peerUserId } : { peer_user_id: peerUserId };
     return this.json("/conversations/direct", {
       method: "POST",
-      body: JSON.stringify({ peer_user_id: peerUserId })
+      body: JSON.stringify(body)
     });
   }
-  createGroup(title, members) {
+  createGroup(title, members, externalMembers = []) {
     return this.json("/conversations/group", {
       method: "POST",
-      body: JSON.stringify({ title, members })
+      body: JSON.stringify({ title, members, external_members: externalMembers })
     });
   }
   findOrCreateEntity(input) {
@@ -85,13 +87,58 @@ var ChatAPI = class {
         title: input.title,
         entity_ref: input.entity_ref,
         entity_uuid: input.entity_uuid,
-        members: input.members ?? []
+        members: input.members ?? [],
+        external_members: input.external_members ?? []
+      })
+    });
+  }
+  /**
+   * Fetch an existing entity-linked conversation by `entity_ref` + `entity_uuid` (path).
+   * 404 if none exists; 403 if the user is not a member.
+   */
+  getConversationByEntity(entity_ref, entity_uuid) {
+    return this.json(
+      `/conversations/by-entity/ref/${encodeURIComponent(entity_ref)}/entity/${encodeURIComponent(entity_uuid)}`
+    );
+  }
+  /** Add members to a group or entity conversation (admin only). */
+  addConversationMembers(conversationId, body) {
+    return this.json(`/conversations/${conversationId}/members`, {
+      method: "POST",
+      body: JSON.stringify({
+        user_ids: body.user_ids ?? [],
+        external_user_ids: body.external_user_ids ?? [],
+        role: body.role
       })
     });
   }
   listConversationMembers(conversationId) {
     return this.json(`/conversations/${conversationId}/members`);
   }
+  /**
+   * Remove a member by prdg-chat user id, or by integration `ext_user_id`
+   * (`DELETE .../members/external/:external_user_id`).
+   */
+  async removeConversationMember(conversationId, by) {
+    const path = "externalUserId" in by ? `/conversations/${conversationId}/members/external/${encodeURIComponent(by.externalUserId)}` : `/conversations/${conversationId}/members/${by.userId}`;
+    let res = await fetch(`${this.baseUrl}${path}`, {
+      method: "DELETE",
+      headers: this.headers()
+    });
+    if (res.status === 401 && this.onAuthError) {
+      const newToken = await this.onAuthError();
+      if (newToken) {
+        res = await fetch(`${this.baseUrl}${path}`, {
+          method: "DELETE",
+          headers: this.headers(newToken)
+        });
+      }
+    }
+    if (!res.ok) {
+      const err = await res.text();
+      throw new Error(err || res.statusText);
+    }
+  }
   listContacts(q, limit = 50) {
     const params = new URLSearchParams();
     params.set("limit", String(limit));
@@ -180,22 +227,200 @@ function userInboxSubject(natsTenantId, userId) {
 function entityConversationSubject(natsTenantId, conversationId) {
   return `chat.${natsTenantId}.conversation.${conversationId}`;
 }
-function invalidateQueriesFromNatsPayload(payload, queryClient) {
-  if (!payload || typeof payload !== "object") return;
+function parseMessage(raw) {
+  if (typeof raw.id !== "string" || typeof raw.conversation_id !== "string") {
+    return null;
+  }
+  return {
+    id: raw.id,
+    conversation_id: raw.conversation_id,
+    sender_id: typeof raw.sender_id === "string" ? raw.sender_id : "",
+    body: typeof raw.body === "string" ? raw.body : null,
+    created_at: typeof raw.created_at === "string" ? raw.created_at : (/* @__PURE__ */ new Date()).toISOString(),
+    edited_at: typeof raw.edited_at === "string" ? raw.edited_at : null,
+    deleted_at: typeof raw.deleted_at === "string" ? raw.deleted_at : null,
+    attachments: Array.isArray(raw.attachments) ? raw.attachments : [],
+    mentioned_user_ids: Array.isArray(raw.mentioned_user_ids) ? raw.mentioned_user_ids : []
+  };
+}
+function getMessagePageSummary(queryClient, conversationId) {
+  const page = queryClient.getQueryData(chatKeys.messages(conversationId));
+  const lastItem = page && page.items.length > 0 ? page.items[page.items.length - 1] : null;
+  return {
+    count: page?.items.length ?? 0,
+    firstId: page?.items[0]?.id ?? null,
+    lastId: lastItem?.id ?? null
+  };
+}
+function pushMessageToCache(queryClient, msg) {
+  let result = "missing-cache";
+  queryClient.setQueryData(chatKeys.messages(msg.conversation_id), (prev) => {
+    if (!prev) return void 0;
+    if (prev.items.some((m) => m.id === msg.id)) {
+      result = "duplicate";
+      return prev;
+    }
+    result = "updated";
+    return { ...prev, items: [msg, ...prev.items] };
+  });
+  return result;
+}
+function markDeletedInCache(queryClient, conversationId, messageId, deletedAt) {
+  let result = "missing-cache";
+  queryClient.setQueryData(
+    chatKeys.messages(conversationId),
+    (prev) => {
+      if (!prev) return void 0;
+      const idx = prev.items.findIndex((m) => m.id === messageId);
+      if (idx === -1) {
+        result = "missing-message";
+        return prev;
+      }
+      const updated = [...prev.items];
+      updated[idx] = { ...updated[idx], deleted_at: deletedAt };
+      result = "updated";
+      return { ...prev, items: updated };
+    }
+  );
+  return result;
+}
+function applyEditInCache(queryClient, updated) {
+  let result = "missing-cache";
+  queryClient.setQueryData(
+    chatKeys.messages(updated.conversation_id),
+    (prev) => {
+      if (!prev) return void 0;
+      const idx = prev.items.findIndex((m) => m.id === updated.id);
+      if (idx === -1) {
+        result = "missing-message";
+        return prev;
+      }
+      const items = [...prev.items];
+      items[idx] = { ...items[idx], ...updated };
+      result = "updated";
+      return { ...prev, items };
+    }
+  );
+  return result;
+}
+function invalidateQueriesFromNatsPayload(payload, queryClient, debug = false) {
+  if (!payload || typeof payload !== "object") {
+    chatDebugWarn(debug, "NATS cache update ignored: payload was not an object", payload);
+    return;
+  }
   const p = payload;
-  if (p.type !== "chat.message.new") return;
+  const eventType = p.type;
+  if (typeof eventType !== "string") {
+    chatDebugWarn(debug, "NATS cache update ignored: payload.type missing", p);
+    return;
+  }
   const ed = p.event_data;
-  if (!ed || typeof ed !== "object") return;
-  const convId = ed.conversation_id;
-  if (typeof convId !== "string" || !convId.trim()) return;
-  void queryClient.invalidateQueries({ queryKey: chatKeys.messages(convId) });
-  void queryClient.invalidateQueries({ queryKey: chatKeys.conversations() });
+  if (!ed || typeof ed !== "object") {
+    chatDebugWarn(debug, "NATS cache update ignored: payload.event_data missing", {
+      eventType,
+      payload: p
+    });
+    return;
+  }
+  const eventData = ed;
+  const conversationId = typeof eventData.conversation_id === "string" ? eventData.conversation_id : null;
+  chatDebugLog(debug, "NATS cache update received", {
+    eventType,
+    conversationId,
+    hasMessage: !!eventData.message && typeof eventData.message === "object"
+  });
+  if (eventType === "chat.message.new") {
+    const convId = eventData.conversation_id;
+    if (typeof convId !== "string" || !convId.trim()) {
+      chatDebugWarn(debug, "NATS message.new ignored: missing conversation_id", eventData);
+      return;
+    }
+    const before = getMessagePageSummary(queryClient, convId);
+    const msgRaw = eventData.message;
+    if (msgRaw && typeof msgRaw === "object") {
+      const raw = msgRaw;
+      const msg = parseMessage(raw);
+      if (msg) {
+        const mutation = pushMessageToCache(queryClient, msg);
+        const after = getMessagePageSummary(queryClient, convId);
+        chatDebugLog(debug, "NATS message.new cache mutation", {
+          conversationId: convId,
+          messageId: msg.id,
+          mutation,
+          before,
+          after
+        });
+      } else {
+        chatDebugWarn(debug, "NATS message.new ignored: event_data.message missing required ids", {
+          conversationId: convId,
+          message: raw
+        });
+      }
+    } else {
+      chatDebugWarn(debug, "NATS message.new ignored: event_data.message missing or not an object", {
+        conversationId: convId,
+        eventData
+      });
+    }
+    chatDebugLog(debug, "NATS message.new invalidating queries", {
+      conversationId: convId,
+      messageQueryKey: chatKeys.messages(convId),
+      conversationsQueryKey: chatKeys.conversations()
+    });
+    void queryClient.invalidateQueries({ queryKey: chatKeys.messages(convId) });
+    void queryClient.invalidateQueries({ queryKey: chatKeys.conversations() });
+    return;
+  }
+  if (eventType === "chat.message.edited") {
+    const msgRaw = eventData.message;
+    if (msgRaw && typeof msgRaw === "object") {
+      const raw = msgRaw;
+      const updated = parseMessage(raw);
+      if (updated) {
+        const mutation = applyEditInCache(queryClient, updated);
+        chatDebugLog(debug, "NATS message.edited cache mutation", {
+          conversationId: updated.conversation_id,
+          messageId: updated.id,
+          mutation
+        });
+        void queryClient.invalidateQueries({ queryKey: chatKeys.messages(updated.conversation_id) });
+      } else {
+        chatDebugWarn(debug, "NATS message.edited ignored: event_data.message missing required ids", raw);
+      }
+    } else {
+      chatDebugWarn(debug, "NATS message.edited ignored: event_data.message missing or not an object", eventData);
+    }
+    return;
+  }
+  if (eventType === "chat.message.deleted") {
+    const msgRaw = eventData.message;
+    if (msgRaw && typeof msgRaw === "object") {
+      const raw = msgRaw;
+      const msgId = raw.id;
+      const convId = raw.conversation_id;
+      const deletedAt = typeof raw.deleted_at === "string" ? raw.deleted_at : (/* @__PURE__ */ new Date()).toISOString();
+      if (typeof msgId === "string" && typeof convId === "string") {
+        const mutation = markDeletedInCache(queryClient, convId, msgId, deletedAt);
+        chatDebugLog(debug, "NATS message.deleted cache mutation", {
+          conversationId: convId,
+          messageId: msgId,
+          mutation
+        });
+        void queryClient.invalidateQueries({ queryKey: chatKeys.messages(convId) });
+      } else {
+        chatDebugWarn(debug, "NATS message.deleted ignored: event_data.message missing required ids", raw);
+      }
+    } else {
+      chatDebugWarn(debug, "NATS message.deleted ignored: event_data.message missing or not an object", eventData);
+    }
+    return;
+  }
+  chatDebugLog(debug, "NATS payload ignored: unsupported event type", { eventType, eventData });
 }
 
 // src/chat/provider/ChatNatsBridge.tsx
 function ChatNatsBridge({ natsWsUrl, natsToken, onConnectedChange }) {
-  const { natsTenantId, userId } = useChat();
-  const queryClient = reactQuery.useQueryClient();
+  const { natsTenantId, userId, queryClient, debug } = useChat();
   const { data: convData } = useConversations();
   const entityConversationIds = react.useMemo(() => {
     const items = convData?.items ?? [];
@@ -208,6 +433,12 @@ function ChatNatsBridge({ natsWsUrl, natsToken, onConnectedChange }) {
   const connRef = react.useRef(null);
   react.useEffect(() => {
     if (servers.length === 0) return;
+    chatDebugLog(debug, "ChatNatsBridge: starting subscriptions", {
+      userId,
+      natsTenantId,
+      servers,
+      entityConversationIds
+    });
     let cancelled = false;
     void (async () => {
       try {
@@ -226,10 +457,21 @@ function ChatNatsBridge({ natsWsUrl, natsToken, onConnectedChange }) {
         }
         connRef.current = conn;
         onConnectedChangeRef.current(true);
+        chatDebugLog(debug, "ChatNatsBridge: NATS connected", {
+          userId,
+          natsTenantId,
+          servers
+        });
         const handleMsg = (data, subject) => {
+          const payloadText = new TextDecoder().decode(data);
           if (process.env.NODE_ENV === "development") {
             console.debug("[NATS] raw message received on subject:", subject, "bytes:", data.length);
           }
+          chatDebugLog(debug, "ChatNatsBridge: NATS payload received", {
+            subject,
+            bytes: data.length,
+            payloadText
+          });
           let payload;
           try {
             payload = jc.decode(data);
@@ -242,11 +484,12 @@ function ChatNatsBridge({ natsWsUrl, natsToken, onConnectedChange }) {
           if (process.env.NODE_ENV === "development") {
             console.debug("[NATS] decoded payload:", payload);
           }
-          invalidateQueriesFromNatsPayload(payload, queryClient);
+          invalidateQueriesFromNatsPayload(payload, queryClient, debug);
           if (process.env.NODE_ENV === "development") {
             if (payload && typeof payload === "object" && payload.type === "chat.message.new") {
               const p = payload;
               const ed = p.event_data;
+              const msgRaw = ed?.message;
               const rawTs = typeof ed?.timestamp_utc === "string" ? ed.timestamp_utc : null;
               const localTime = rawTs ? new Date(rawTs).toLocaleTimeString(void 0, {
                 hour: "numeric",
@@ -261,6 +504,8 @@ function ChatNatsBridge({ natsWsUrl, natsToken, onConnectedChange }) {
                 `
   conversation: ${typeof ed?.conversation_id === "string" ? ed.conversation_id : "?"}`,
                 `
+  message_id:   ${typeof msgRaw?.id === "string" ? msgRaw.id : "(no id \u2014 cache push skipped)"}`,
+                `
   sender:       ${typeof ed?.sender_id === "string" ? ed.sender_id : "?"}`,
                 `
   body:         ${typeof ed?.body === "string" ? ed.body.slice(0, 200) : "(no body)"}`,
@@ -277,6 +522,7 @@ function ChatNatsBridge({ natsWsUrl, natsToken, onConnectedChange }) {
           }
         };
         const inbox = userInboxSubject(natsTenantId, userId);
+        chatDebugLog(debug, "ChatNatsBridge: subscribing inbox", { inbox });
         const subInbox = conn.subscribe(inbox);
         void (async () => {
           for await (const m of subInbox) {
@@ -286,6 +532,10 @@ function ChatNatsBridge({ natsWsUrl, natsToken, onConnectedChange }) {
         })();
         for (const convId of entityConversationIds) {
           const subj = entityConversationSubject(natsTenantId, convId);
+          chatDebugLog(debug, "ChatNatsBridge: subscribing entity conversation", {
+            conversationId: convId,
+            subject: subj
+          });
           const sub = conn.subscribe(subj);
           void (async () => {
             for await (const m of sub) {
@@ -309,23 +559,26 @@ function ChatNatsBridge({ natsWsUrl, natsToken, onConnectedChange }) {
         }
         await conn.closed();
         connRef.current = null;
+        chatDebugWarn(debug, "ChatNatsBridge: NATS connection closed");
         if (!cancelled) onConnectedChangeRef.current(false);
       } catch (err) {
         connRef.current = null;
         if (process.env.NODE_ENV === "development") {
           console.error("[NATS] WebSocket connect failed \u2014 check ws:// URL, NATS websocket block, and CORS/mixed content:", err);
         }
+        chatDebugWarn(debug, "ChatNatsBridge: NATS connection failed", err);
         if (!cancelled) onConnectedChangeRef.current(false);
       }
     })();
     return () => {
       cancelled = true;
+      chatDebugLog(debug, "ChatNatsBridge: cleaning up subscriptions");
       onConnectedChangeRef.current(false);
       const c = connRef.current;
       connRef.current = null;
       void c?.drain();
     };
-  }, [servers, natsToken, natsTenantId, userId, entityKey, queryClient, entityConversationIds]);
+  }, [servers, natsToken, natsTenantId, userId, entityKey, queryClient, entityConversationIds, debug]);
   return null;
 }
 
@@ -701,16 +954,28 @@ function appendOlderMessages(current, older) {
 // src/chat/hooks/useMessages.ts
 var INITIAL_MESSAGE_PAGE_SIZE = 30;
 function useMessages(conversationId) {
-  const { api, wsConnected, config, queryClient } = useChat();
+  const { api, wsConnected, config, queryClient, debug } = useChat();
   const interval = config.pollIntervalMs ?? 3e4;
   const [isFetchingOlder, setIsFetchingOlder] = react.useState(false);
   const fetchingRef = react.useRef(false);
   const query = reactQuery.useQuery({
     queryKey: chatKeys.messages(conversationId),
     queryFn: async () => {
+      chatDebugLog(debug, "useMessages: queryFn start", {
+        conversationId,
+        wsConnected
+      });
       const res = await api.listMessages(conversationId, void 0, INITIAL_MESSAGE_PAGE_SIZE);
       const prev = queryClient.getQueryData(chatKeys.messages(conversationId));
-      return mergeMessagePages(res, prev);
+      const merged = mergeMessagePages(res, prev);
+      chatDebugLog(debug, "useMessages: queryFn success", {
+        conversationId,
+        serverCount: res.items.length,
+        previousCachedCount: prev?.items.length ?? 0,
+        mergedCount: merged.items.length,
+        firstMessageId: merged.items[0]?.id ?? null
+      });
+      return merged;
     },
     enabled: !!conversationId,
     refetchInterval: wsConnected ? false : interval
@@ -734,6 +999,29 @@ function useMessages(conversationId) {
   }, [conversationId, queryClient, api]);
   const cached = queryClient.getQueryData(chatKeys.messages(conversationId));
   const hasMoreMessages = !!cached?.next_cursor;
+  react.useEffect(() => {
+    if (!conversationId) return;
+    chatDebugLog(debug, "useMessages: hook snapshot", {
+      conversationId,
+      wsConnected,
+      status: query.status,
+      fetchStatus: query.fetchStatus,
+      dataCount: query.data?.items.length ?? 0,
+      cachedCount: cached?.items.length ?? 0,
+      firstDataMessageId: query.data?.items[0]?.id ?? null,
+      firstCachedMessageId: cached?.items[0]?.id ?? null
+    });
+  }, [
+    cached?.items.length,
+    cached?.items[0]?.id,
+    conversationId,
+    debug,
+    query.data?.items.length,
+    query.data?.items[0]?.id,
+    query.fetchStatus,
+    query.status,
+    wsConnected
+  ]);
   return {
     ...query,
     fetchOlderMessages,