@droppii-org/chat-mobile 0.2.92 → 0.2.94

package/src/services/apis.ts

@@ -4,9 +4,26 @@ import { useConversationStore, useUserStore } from '../store';
 
 export let apiInstance: AxiosInstance | null = null;
 
+interface InitApiInstanceOptions {
+  /**
+   * Set true when the injected instance's response interceptor already
+   * strips the outer envelope (statusCode/message/pageable/data) down to
+   * just the payload (e.g. Mall's shared axios client). Defaults to false —
+   * the instance returns the raw `{ statusCode, message, pageable, data }`
+   * envelope untouched (e.g. Biz's axios client).
+   */
+  unwrapped?: boolean;
+}
+
+let responseUnwrapped = false;
+
 export namespace ChatAPI {
-  export function initApiInstance(api: AxiosInstance): void {
+  export function initApiInstance(
+    api: AxiosInstance,
+    options?: InitApiInstanceOptions
+  ): void {
     apiInstance = api;
+    responseUnwrapped = options?.unwrapped ?? false;
   }
 
   export const getLoginStatus = async (operationID?: string) => {
@@ -19,3 +36,16 @@ export namespace ChatAPI {
     return OpenIMSDK.logout(operationID);
   };
 }
+
+/**
+ * Reads the payload out of an apiInstance response, accounting for whichever
+ * envelope shape the injected instance produces (see `initApiInstance`'s
+ * `unwrapped` option). Consumers should use this instead of reading
+ * `res?.data?.data` / `res?.data` directly.
+ */
+export function unwrapEnvelope<T>(res?: { data?: unknown }): T | null {
+  const body = res?.data as { data?: T } | T | undefined;
+  if (body == null) return null;
+  return ((responseUnwrapped ? body : (body as { data?: T }).data) ??
+    null) as T | null;
+}

package/src/services/resourceCenter.ts

@@ -1,4 +1,4 @@
-import { apiInstance } from './apis';
+import { apiInstance, unwrapEnvelope } from './apis';
 import { getApiEndpoint } from '../config/api-endpoints';
 import { extractDomain } from '../utils/url';
 import type { BaseResponse } from '../types/auth';
@@ -186,12 +186,13 @@ export namespace ResourceCenterService {
     const res = await apiInstance?.post<
       BaseResponse<DThreadResourceListResponse>
     >(getApiEndpoint('messagesResources'), req);
-    const rows = res?.data?.data ?? [];
+    const rows = unwrapEnvelope<DThreadResourceListResponse>(res) ?? [];
     const items = rows.flatMap(parseThreadResourceItem);
     // `pageable.totalPages`/`totalElements` come back as `0` on this endpoint even
     // when rows are present (confirmed against staging) — unreliable, don't use it.
-    // Item-count-vs-pageSize is the only trustworthy `hasMore` signal available.
-    const hasMore = items.length >= req.pageSize;
+    // Row-count-vs-pageSize is the trustworthy `hasMore` signal — `items.length` can
+    // exceed `rows.length` when a row splits into multiple items (e.g. multi-url).
+    const hasMore = rows.length >= req.pageSize;
     return { items, page: req.page, hasMore };
   };
 }

package/src/store/message.ts

@@ -12,6 +12,7 @@ import type {
   MessageStore,
 } from '../types/chat';
 import { mergeMessages } from '../utils/message';
+import { isMessageRevoked } from '../utils/messageUtils';
 import { useConversationStore } from './conversation';
 
 // Smaller than a typical "load more" page size elsewhere in the app on
@@ -191,12 +192,20 @@ export const useMessageStore = create<MessageStore>()((set, get) => ({
           hasMoreNew: !searchNextRes.isEnd,
           initLoading: false,
         });
-        if (newMessages?.length > 0) {
-          await new Promise((resolve) => setTimeout(resolve, 300));
-          DeviceEventEmitter.emit(ChatEvent.ScrollToMessage, {
-            clientMessageId: startClientMsgId,
-          });
+
+        const targetMessage = currentMessages.find(
+          (msg) => msg.clientMsgID === startClientMsgId
+        );
+
+        if (!targetMessage || isMessageRevoked(targetMessage)) {
+          DeviceEventEmitter.emit(ChatEvent.TargetMessageUnavailable);
+          return;
         }
+
+        await new Promise((resolve) => setTimeout(resolve, 300));
+        DeviceEventEmitter.emit(ChatEvent.ScrollToMessage, {
+          clientMessageId: startClientMsgId,
+        });
       }
     } catch (error) {
       console.error('Failed to search messages', error);

package/src/types/events.ts

@@ -6,6 +6,7 @@ export enum ChatEvent {
   MessageRevoked = 'chat:message_revoked',
   GroupPermissionUpdated = 'chat:group_permission_updated',
   GroupRemoved = 'chat:group_removed',
+  TargetMessageUnavailable = 'chat:target_message_unavailable',
 }
 
 export interface ScrollToMessagePayload {