@droppii-org/chat-sdk 0.6.33 → 0.6.34

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":"AAGA,OAAO,EAAE,gBAAgB,EAAe,MAAM,8BAA8B,CAAC;AAU7E,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;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA2BD,eAAO,MAAM,wBAAwB,GACnC,OAAO,MAAM,KACZ,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAWjC,CAAC;AAkDF,eAAO,MAAM,sBAAsB,GAAI,wDAMpC,4BAA4B;;;CAoJ9B,CAAC"}
+{"version":3,"file":"useResolveConversation.d.ts","sourceRoot":"","sources":["../../../src/hooks/conversation/useResolveConversation.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAIjB,MAAM,8BAA8B,CAAC;AAatC,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;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAsDD,eAAO,MAAM,wBAAwB,GACnC,OAAO,MAAM,KACZ,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAWjC,CAAC;AAmDF,eAAO,MAAM,sBAAsB,GAAI,wDAMpC,4BAA4B;;;CA8J9B,CAAC"}

package/dist/hooks/conversation/useResolveConversation.js

@@ -1,13 +1,13 @@
 "use client";
 import { useEffect, useRef, useState } from "react";
-import { SessionType } from "@droppii-org/wasm-client-sdk";
+import { GroupStatus, GroupVisibility, SessionType, } from "@droppii-org/wasm-client-sdk";
 import { DChatSDK } from "../../constants/sdk";
 import { apiInstance } from "../../services/api";
 import { ENDPOINTS } from "../../services/routes";
 import { ConnectStatus, SyncStatus } from "../../types/chat";
 import { useChatContext } from "../../context/ChatContext";
 import useConversationStore from "../../store/conversation";
-import { resolveConversationBotId } from "../../utils/conversation";
+import { getGroupIdFromConversationId, resolveConversationBotId, } from "../../utils/conversation";
 const MISSING_BOT_GROUP_ERROR = "Missing groupId from get-or-create bot conversation response";
 const CONVERSATION_NOT_FOUND_ERROR = "Conversation not found";
 const RESOLVE_FAILED_ERROR = "Failed to resolve conversation";
@@ -20,6 +20,35 @@ const fetchBySource = async (sourceID, sessionType) => {
     const { data } = await DChatSDK.getOneConversation({ sourceID, sessionType });
     return data !== null && data !== void 0 ? data : null;
 };
+/**
+ * A public group is viewable by non-members — the detail screen renders the
+ * join button off isViewOnlyMember — so an unresolvable public group must
+ * never get the "you don't have access" modal. Only assert no-access when the
+ * group info actually says so: a fetch failure returns false, because guessing
+ * wrong here claims a permission problem that may not exist.
+ *
+ * CAVEAT: getSpecifiedGroupsInfo reads the LOCAL db, which only holds groups
+ * the user belongs to — an empty response therefore means "not in local db",
+ * covering "never joined" as much as "disbanded". Until a BE lookup by groupId
+ * exists for non-members, the !group branch below blocks public groups the
+ * user has not joined.
+ */
+const shouldBlockGroupAccess = async (groupId) => {
+    try {
+        const { data } = await DChatSDK.getSpecifiedGroupsInfo([groupId]);
+        const group = data === null || data === void 0 ? void 0 : data[0];
+        // Empty response = group no longer exists, same as Dismissed.
+        if (!group)
+            return true;
+        if (group.status === GroupStatus.Dismissed)
+            return true;
+        return group.visibility !== GroupVisibility.Public;
+    }
+    catch (error) {
+        console.error("shouldBlockGroupAccess", error);
+        return false;
+    }
+};
 export const fetchConversationByBotId = async (botId) => {
     var _a;
     const { data: botConversationResponse } = await apiInstance.get(ENDPOINTS.chatService.getConversationByBotId(botId));
@@ -30,14 +59,15 @@ export const fetchConversationByBotId = async (botId) => {
     return fetchBySource(resolvedGroupId, SessionType.Group);
 };
 const fetchConversationByTarget = ({ conversationId, userId, groupId, botId, }) => {
-    if (conversationId)
-        return fetchByConversationId(conversationId);
+    const targetGroupId = groupId || getGroupIdFromConversationId(conversationId);
     // groupId before userId: a group-message notification link carries both
     // (the group, plus the sender's userId as secondary info) — resolving
     // userId first would wrongly open a 1:1 thread with the sender instead
     // of the group.
-    if (groupId)
-        return fetchBySource(groupId, SessionType.Group);
+    if (targetGroupId)
+        return fetchBySource(targetGroupId, SessionType.Group);
+    if (conversationId)
+        return fetchByConversationId(conversationId);
     if (botId)
         return fetchConversationByBotId(botId);
     if (userId)
@@ -131,14 +161,25 @@ export const useResolveConversation = ({ conversationId, userId, groupId, botId,
                 if (cancelled)
                     return;
                 // A conversationId/groupId deep link that resolves to nothing means
-                // the thread never synced to this device — for a private group the
-                // user has not joined, the BE simply never sent it. That is the same
-                // "you cannot see this thread" outcome as the membership rejection
-                // below, so surface the same modal instead of the generic
-                // resolve-failed empty state. Left on the error path deliberately:
-                // botId (get-or-create failed) and userId (1:1 peer) are genuine
-                // failures, not access denials, and the group wording would be wrong.
+                // the thread never synced to this device. Left on the error path
+                // deliberately: botId (get-or-create failed) and userId (1:1 peer) are
+                // genuine failures, not access denials.
                 if (!resolved && (conversationId || groupId)) {
+                    // Check the group before claiming no access: a public group the
+                    // user simply hasn't joined belongs in the detail screen (join
+                    // button), not behind this modal. A ?conversationId= target names
+                    // its group inside the id ("sg_<groupID>"), so that entry point
+                    // gets the same treatment as an explicit ?groupId=. A 1:1 id yields
+                    // "" and falls through to the block, which is correct — there is no
+                    // group whose visibility could excuse it.
+                    const targetGroupId = groupId || getGroupIdFromConversationId(conversationId);
+                    if (targetGroupId && !(await shouldBlockGroupAccess(targetGroupId))) {
+                        if (cancelled)
+                            return;
+                        throw new Error(CONVERSATION_NOT_FOUND_ERROR);
+                    }
+                    if (cancelled)
+                        return;
                     rejectedTargetRef.current = currentTargetKey;
                     pendingTargetRef.current = null;
                     clearSelectedConversation();

package/dist/store/conversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../src/store/conversation.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAY3C,eAAO,MAAM,kBAAkB,GAAI,SAAS,OAAO,SAElD,CAAC;AAUF,eAAO,MAAM,cAAc,GAAI,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,SAEhE,CAAC;AAEF,QAAA,MAAM,oBAAoB,gFAgcvB,CAAC;AAEJ,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../src/store/conversation.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAY3C,eAAO,MAAM,kBAAkB,GAAI,SAAS,OAAO,SAElD,CAAC;AAUF,eAAO,MAAM,cAAc,GAAI,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,SAEhE,CAAC;AAEF,QAAA,MAAM,oBAAoB,gFAmcvB,CAAC;AAEJ,eAAe,oBAAoB,CAAC"}

package/dist/store/conversation.js

@@ -174,7 +174,8 @@ const useConversationStore = create((set, get) => ({
                     return;
                 }
                 const notAMember = !get().currentMemberInGroup.has(groupID);
-                const isPublic = ((_a = get().currentGroupInfo.get(groupID)) === null || _a === void 0 ? void 0 : _a.visibility) === GroupVisibility.Public;
+                const isPublic = ((_a = get().currentGroupInfo.get(groupID)) === null || _a === void 0 ? void 0 : _a.visibility) ===
+                    GroupVisibility.Public;
                 if (notAMember && isPublic) {
                     set({ isViewOnlyMember: true });
                 }
@@ -197,9 +198,9 @@ const useConversationStore = create((set, get) => ({
         try {
             const { data } = await DChatSDK.getSpecifiedGroupsInfo([groupID]);
             // Disbanded group: empty array, not a thrown error — don't crash below.
-            // Record it so updateCurrentConversation's gate can reject the thread;
-            // returning silently here used to leave the gate with no group info at
-            // all, which it reads as "not public" rather than "gone".
+            // Recorded so updateCurrentConversation's gate can reject the thread.
+            // CAVEAT: this call reads the LOCAL db, so an empty response also covers
+            // "never joined" — see shouldBlockGroupAccess in useResolveConversation.
             if (!data[0]) {
                 set({ disbandedGroupID: groupID });
                 return;

package/dist/utils/conversation.d.ts

@@ -10,4 +10,15 @@ export declare const resolveConversationDisplayName: (item: ConversationItem, t:
 export declare const resolveConversationAvatarUrl: (item: ConversationItem) => string | null;
 export declare const resolvePeerBadgeLabel: (peerType: PeerType, t: (key: string) => string) => string;
 export declare const resolvePeerBadgeColor: (peerType: PeerType) => "" | "bg-[var(--dc-color-mall-badge)]" | "bg-[var(--dc-color-bot-badge)]";
+/**
+ * Group conversationIds are formatted as "sg_<groupID>" — derive the groupID
+ * straight from the id when a full ConversationItem isn't available yet (e.g.
+ * a non-member previewing a public group via deeplink has no synced
+ * conversation object to read groupID off of).
+ *
+ * Returns "" for anything else, including 1:1 ids ("si_<userA>_<userB>"):
+ * those have no group, so callers must treat "" as "not a group", never as
+ * "group unknown".
+ */
+export declare const getGroupIdFromConversationId: (conversationId?: string) => string;
 //# sourceMappingURL=conversation.d.ts.map

package/dist/utils/conversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../src/utils/conversation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,KAAK,iBAAiB,EACvB,MAAM,sBAAsB,CAAC;AAW9B,eAAO,MAAM,sBAAsB,GACjC,IAAI,MAAM,GAAG,SAAS,KACrB,iBAaF,CAAC;AAEF,eAAO,MAAM,+BAA+B,GAC1C,MAAM,gBAAgB,KACrB,YAA4D,CAAC;AAEhE,eAAO,MAAM,wBAAwB,GACnC,MAAM,gBAAgB,KACrB,MAOF,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,MAAM,gBAAgB,YAChB,CAAC;AAEjC,eAAO,MAAM,cAAc,GAAI,MAAM,gBAAgB,YAChB,CAAC;AAEtC,eAAO,MAAM,WAAW,GAAI,MAAM,gBAAgB,YAChB,CAAA;AAElC,eAAO,MAAM,8BAA8B,GACzC,MAAM,gBAAgB,EACtB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,KACzB,MAKF,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,MAAM,gBAAgB,KACrB,MAAM,GAAG,IAGX,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,UAAU,QAAQ,EAClB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,KACzB,MAIF,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,UAAU,QAAQ,8EAIvD,CAAC"}
+{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../src/utils/conversation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,KAAK,iBAAiB,EACvB,MAAM,sBAAsB,CAAC;AAW9B,eAAO,MAAM,sBAAsB,GACjC,IAAI,MAAM,GAAG,SAAS,KACrB,iBAcF,CAAC;AAEF,eAAO,MAAM,+BAA+B,GAC1C,MAAM,gBAAgB,KACrB,YAA4D,CAAC;AAEhE,eAAO,MAAM,wBAAwB,GAAI,MAAM,gBAAgB,KAAG,MAOjE,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,MAAM,gBAAgB,YAChB,CAAC;AAEjC,eAAO,MAAM,cAAc,GAAI,MAAM,gBAAgB,YAChB,CAAC;AAEtC,eAAO,MAAM,WAAW,GAAI,MAAM,gBAAgB,YAChB,CAAC;AAEnC,eAAO,MAAM,8BAA8B,GACzC,MAAM,gBAAgB,EACtB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,KACzB,MAKF,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,MAAM,gBAAgB,KACrB,MAAM,GAAG,IAGX,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,UAAU,QAAQ,EAClB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,KACzB,MAIF,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,UAAU,QAAQ,8EAIvD,CAAC;AAIF;;;;;;;;;GASG;AACH,eAAO,MAAM,4BAA4B,GAAI,iBAAiB,MAAM,WAG5D,CAAC"}

package/dist/utils/conversation.js

@@ -61,3 +61,17 @@ export const resolvePeerBadgeColor = (peerType) => {
         return "bg-[var(--dc-color-bot-badge)]";
     return "";
 };
+const GROUP_CONVERSATION_ID_PREFIX = "sg_";
+/**
+ * Group conversationIds are formatted as "sg_<groupID>" — derive the groupID
+ * straight from the id when a full ConversationItem isn't available yet (e.g.
+ * a non-member previewing a public group via deeplink has no synced
+ * conversation object to read groupID off of).
+ *
+ * Returns "" for anything else, including 1:1 ids ("si_<userA>_<userB>"):
+ * those have no group, so callers must treat "" as "not a group", never as
+ * "group unknown".
+ */
+export const getGroupIdFromConversationId = (conversationId) => (conversationId === null || conversationId === void 0 ? void 0 : conversationId.startsWith(GROUP_CONVERSATION_ID_PREFIX))
+    ? conversationId.slice(GROUP_CONVERSATION_ID_PREFIX.length)
+    : "";

package/package.json

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