@droppii-org/chat-sdk 0.5.1 → 0.5.2

package/dist/hooks/conversation/useResolveConversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useResolveConversation.d.ts","sourceRoot":"","sources":["../../../src/hooks/conversation/useResolveConversation.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,4BAA4B;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAqED,eAAO,MAAM,sBAAsB,GAAI,6CAKpC,4BAA4B;;;CA2E9B,CAAC"}
+{"version":3,"file":"useResolveConversation.d.ts","sourceRoot":"","sources":["../../../src/hooks/conversation/useResolveConversation.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,4BAA4B;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AA6ED,eAAO,MAAM,sBAAsB,GAAI,6CAKpC,4BAA4B;;;CA2H9B,CAAC"}

package/dist/hooks/conversation/useResolveConversation.js

@@ -1,5 +1,5 @@
 "use client";
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { SessionType } from "@droppii-org/wasm-client-sdk";
 import { DChatSDK } from "../../constants/sdk";
 import { apiInstance } from "../../services/api";
@@ -48,18 +48,54 @@ const matchesTarget = (conversation, { conversationId, userId, groupId, botId })
         (!!groupId && conversation.groupID === groupId) ||
         (!!botId && resolveConversationBotId(conversation) === botId));
 };
+const targetKey = ({ conversationId, userId, groupId, botId, }) => `${conversationId !== null && conversationId !== void 0 ? conversationId : ""}|${userId !== null && userId !== void 0 ? userId : ""}|${groupId !== null && groupId !== void 0 ? groupId : ""}|${botId !== null && botId !== void 0 ? botId : ""}`;
 export const useResolveConversation = ({ conversationId, userId, groupId, botId, }) => {
     const [isFetching, setIsFetching] = useState(false);
     const [error, setError] = useState(null);
+    // A target the store rejected (no access) clears conversationData back to
+    // null, which would otherwise re-satisfy shouldResolve and refetch forever.
+    const rejectedTargetRef = useRef(null);
+    // The conversationID + target key currently in flight through
+    // setConversationData — setConversationData sets conversationData to it
+    // optimistically before updateCurrentConversation's async group-membership
+    // check has a chance to reject it, so this can't be cleared just because
+    // conversationData looks truthy; only a rename to something else (a newer
+    // resolve superseding this one) or an explicit reject below clears it.
+    const pendingTargetRef = useRef(null);
     const { connectStatus, syncStatus } = useChatContext();
     const isSdkReady = connectStatus === ConnectStatus.Connected &&
         syncStatus !== SyncStatus.Loading;
     const conversationData = useConversationStore((state) => state.conversationData);
+    const removedFromGroupModalOpen = useConversationStore((state) => state.removedFromGroupModalOpen);
     const setConversationData = useConversationStore((state) => state.setConversationData);
     const setSelectedConversationId = useConversationStore((state) => state.setSelectedConversationId);
     const target = { conversationId, userId, groupId, botId };
     const hasTarget = !!(conversationId || userId || groupId || botId);
-    const shouldResolve = hasTarget && !matchesTarget(conversationData, target);
+    const currentTargetKey = targetKey(target);
+    const wasRejected = rejectedTargetRef.current === currentTargetKey;
+    const shouldResolve = hasTarget && !matchesTarget(conversationData, target) && !wasRejected;
+    // Catches updateCurrentConversation's async, silent rejection (blocked/no
+    // group access) of the target this hook just resolved and handed to
+    // setConversationData — that path clears conversationData back to null
+    // via clearSelectedConversation instead of throwing, which would otherwise
+    // re-satisfy shouldResolve above and refetch this target forever.
+    // showRemovedFromGroupModal is only ever called from that one rejection
+    // branch, immediately after clearSelectedConversation — react to it
+    // opening at all. pendingTargetRef is deliberately NOT cleared on a
+    // matching conversationData: setConversationData sets that optimistically,
+    // synchronously, before updateCurrentConversation's async membership check
+    // has a chance to reject it — clearing early on that transient match would
+    // just recreate the loop. It's overwritten by the next resolve() call
+    // instead, once a newer/different target supersedes this one.
+    useEffect(() => {
+        if (!removedFromGroupModalOpen)
+            return;
+        const pending = pendingTargetRef.current;
+        if (!pending)
+            return;
+        rejectedTargetRef.current = pending.key;
+        pendingTargetRef.current = null;
+    }, [removedFromGroupModalOpen]);
     useEffect(() => {
         if (!shouldResolve || !isSdkReady)
             return;
@@ -79,6 +115,14 @@ export const useResolveConversation = ({ conversationId, userId, groupId, botId,
                 if (!resolved)
                     throw new Error(CONVERSATION_NOT_FOUND_ERROR);
                 // Entry point for notifications/deep links — force a fresh check.
+                // The store's own group-membership rejection (blocked/no access)
+                // lands asynchronously after this call returns, via
+                // clearSelectedConversation + showRemovedFromGroupModal — a separate
+                // effect below watches removedFromGroupModalOpen to catch it.
+                pendingTargetRef.current = {
+                    key: currentTargetKey,
+                    conversationID: resolved.conversationID,
+                };
                 setConversationData(resolved, undefined, { forceRevalidate: true });
                 setSelectedConversationId(resolved.conversationID);
             }
@@ -106,6 +150,7 @@ export const useResolveConversation = ({ conversationId, userId, groupId, botId,
         isSdkReady,
         setConversationData,
         setSelectedConversationId,
+        currentTargetKey,
     ]);
     return {
         isResolving: shouldResolve && (isFetching || !isSdkReady),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@droppii-org/chat-sdk",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Droppii React Chat SDK",
   "repository": {
     "type": "git",