@anakin824/prdg-chat-ui 0.3.0 → 0.3.1

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,118 @@ function userInboxSubject(natsTenantId, userId) {
 function entityConversationSubject(natsTenantId, conversationId) {
   return `chat.${natsTenantId}.conversation.${conversationId}`;
 }
+function pushMessageToCache(queryClient, msg) {
+  let inserted = false;
+  queryClient.setQueryData(
+    chatKeys.messages(msg.conversation_id),
+    (prev) => {
+      if (!prev) return void 0;
+      if (prev.items.some((m) => m.id === msg.id)) return prev;
+      inserted = true;
+      return { ...prev, items: [msg, ...prev.items] };
+    }
+  );
+  return inserted;
+}
+function markDeletedInCache(queryClient, conversationId, messageId, deletedAt) {
+  queryClient.setQueryData(
+    chatKeys.messages(conversationId),
+    (prev) => {
+      if (!prev) return void 0;
+      const idx = prev.items.findIndex((m) => m.id === messageId);
+      if (idx === -1) return prev;
+      const updated = [...prev.items];
+      updated[idx] = { ...updated[idx], deleted_at: deletedAt };
+      return { ...prev, items: updated };
+    }
+  );
+}
+function applyEditInCache(queryClient, updated) {
+  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) return prev;
+      const items = [...prev.items];
+      items[idx] = { ...items[idx], ...updated };
+      return { ...prev, items };
+    }
+  );
+}
 function invalidateQueriesFromNatsPayload(payload, queryClient) {
   if (!payload || typeof payload !== "object") return;
   const p = payload;
-  if (p.type !== "chat.message.new") return;
+  const eventType = p.type;
+  if (typeof eventType !== "string") 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() });
+  const eventData = ed;
+  if (eventType === "chat.message.new") {
+    const convId = eventData.conversation_id;
+    if (typeof convId !== "string" || !convId.trim()) return;
+    const msgRaw = eventData.message;
+    if (msgRaw && typeof msgRaw === "object") {
+      const raw = msgRaw;
+      if (typeof raw.id === "string" && typeof raw.conversation_id === "string") {
+        const msg = {
+          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 : []
+        };
+        pushMessageToCache(queryClient, msg);
+      }
+    }
+    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;
+      if (typeof raw.id === "string" && typeof raw.conversation_id === "string") {
+        const updated = {
+          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 : []
+        };
+        applyEditInCache(queryClient, updated);
+        void queryClient.invalidateQueries({ queryKey: chatKeys.messages(updated.conversation_id) });
+      }
+    }
+    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") {
+        markDeletedInCache(queryClient, convId, msgId, deletedAt);
+        void queryClient.invalidateQueries({ queryKey: chatKeys.messages(convId) });
+      }
+    }
+  }
 }
 
 // src/chat/provider/ChatNatsBridge.tsx
 function ChatNatsBridge({ natsWsUrl, natsToken, onConnectedChange }) {
-  const { natsTenantId, userId } = useChat();
-  const queryClient = reactQuery.useQueryClient();
+  const { natsTenantId, userId, queryClient } = useChat();
   const { data: convData } = useConversations();
   const entityConversationIds = react.useMemo(() => {
     const items = convData?.items ?? [];
@@ -247,6 +390,7 @@ function ChatNatsBridge({ natsWsUrl, natsToken, onConnectedChange }) {
             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 +405,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)"}`,