@droppii-org/chat-mobile 0.2.17 → 0.2.19

package/src/screens/chat-detail/hooks/useAttachmentSendHandler.ts

@@ -5,6 +5,7 @@ import VideoThumbnailUtil from '../../../utils/videoThumbnail';
 import { ImageUploadAPI } from '../../../services/imageUpload';
 import UIUtils from '../../../utils/ui';
 import type { DMessageItem } from '../../../types/chat';
+import type { FileWithUploadStatus } from '../../../hooks/useFileAttachment';
 
 interface AttachmentItem {
   image: any;
@@ -16,12 +17,14 @@ interface AttachmentItem {
 
 interface UseAttachmentSendHandlerProps {
   selectedImages: AttachmentItem[];
+  selectedFiles: FileWithUploadStatus[];
   sendAttachments: (
     items: any[],
     _: any,
     onMessageSent?: (message: DMessageItem) => void
   ) => Promise<boolean>;
   clearAllImages: () => void;
+  clearAllFiles?: () => void;
   onSend?: () => void;
   onMessageSent?: (message: DMessageItem) => void;
   textMessage?: string;
@@ -31,8 +34,10 @@ interface UseAttachmentSendHandlerProps {
 
 export const useAttachmentSendHandler = ({
   selectedImages,
+  selectedFiles,
   sendAttachments,
   clearAllImages,
+  clearAllFiles,
   onSend,
   onMessageSent,
   textMessage,
@@ -316,26 +321,60 @@ export const useAttachmentSendHandler = ({
       if (success) {
         clearAllImages();
         console.log('[ChatComposer] Images cleared after successful send');
+      }
+    }
 
-        // Send text message after attachments (follows attachment priority order)
-        // Note: urlMetadata is only passed if preview is still visible (not dismissed)
-        if (textMessage && onSendText) {
-          console.log('[ChatComposer] Sending text message after attachments', {
-            hasPreview: !!urlMetadata,
-            previewUrl: urlMetadata?.url,
-          });
-          onSendText(textMessage, urlMetadata);
-        }
+    // Send each file as its own individual message
+    const uploadedFiles = selectedFiles.filter(
+      (f) => f.uploadedUrl && !f.error
+    );
+    if (uploadedFiles.length > 0) {
+      console.log('[ChatComposer] Sending files individually:', {
+        count: uploadedFiles.length,
+      });
+      for (const file of uploadedFiles) {
+        await sendAttachments(
+          [
+            {
+              type: 'file' as const,
+              file: { path: file.uri, filename: file.name, size: file.size },
+              uploadProgress: 100,
+              error: null,
+              isUploading: false,
+              uploadedUrl: file.uploadedUrl,
+            },
+          ],
+          undefined,
+          onMessageSent
+        );
       }
+      clearAllFiles?.();
+    }
+
+    // Send text last
+    if (textMessage && onSendText) {
+      console.log('[ChatComposer] Sending text message after attachments', {
+        hasPreview: !!urlMetadata,
+        previewUrl: urlMetadata?.url,
+      });
+      onSendText(textMessage, urlMetadata);
       return;
     }
 
-    // Send text message only if no attachments
-    onSend?.();
+    const hasAnySent =
+      uploadedImages.length > 0 ||
+      allUploadedVideos.length > 0 ||
+      uploadedFiles.length > 0;
+    if (!hasAnySent) {
+      onSend?.();
+    }
+    return;
   }, [
     selectedImages,
+    selectedFiles,
     sendAttachments,
     clearAllImages,
+    clearAllFiles,
     onSend,
     onMessageSent,
     textMessage,

package/src/screens/chat-detail/types.ts

@@ -1,13 +1,9 @@
 import type { ReactNode } from 'react';
 
 import type { MediaItem } from '../../hooks/useMediaViewer';
-import type {
-  DChatApplicationType,
-  DConversationItem,
-  DMessageItem,
-} from '../../types/chat';
+import type { DMessageItem } from '../../types/chat';
 import type { IUrlMetadata } from '../../types/common';
-import type { PeerType } from '@droppii/openim-rn-client-sdk';
+import type { ConversationItem } from '@droppii/openim-rn-client-sdk';
 
 export type DChatActionIconProvider = 'MaterialCommunityIcons' | 'DroppiiNew';
 
@@ -29,14 +25,13 @@ export interface ChatDetailHeaderProps {
   subtitle?: string;
   avatarUri?: string | null;
   avatarFullName?: string;
-  peerType?: PeerType;
-  applicationType?: DConversationItem['applicationType'];
   showAddMember?: boolean;
   onBack?: () => void;
   onPressSearch?: () => void;
   onPressAddMember?: () => void;
   onPressMenu?: () => void;
   onPressAvatar?: () => void;
+  conversationId: string;
 }
 
 export interface ChatQuickActionsRenderParams {
@@ -103,9 +98,9 @@ export interface ChatDetailProps extends Omit<
   | 'subtitle'
   | 'avatarUri'
   | 'avatarFullName'
-  | 'peerType'
   | 'applicationType'
   | 'showAddMember'
+  | 'conversationId'
 > {
   conversationId: string;
   enabled?: boolean;
@@ -113,16 +108,14 @@ export interface ChatDetailProps extends Omit<
   subtitle?: string;
   avatarUri?: string | null;
   avatarFullName?: string;
-  peerType?: PeerType;
-  applicationType?: DChatApplicationType;
   showAddMember?: boolean;
-  getSubtitle?: (conversation: DConversationItem) => string | undefined;
+  getSubtitle?: (conversation: ConversationItem) => string | undefined;
   renderChat?: (item: DMessageItem) => ReactNode;
   showQuickActions?: boolean;
   showAttachmentActions?: boolean;
   quickActions?: DChatQuickAction[];
   getQuickActions?: (
-    conversation: DConversationItem
+    conversation: ConversationItem
   ) => DChatQuickAction[] | undefined;
   attachmentActions?: DChatAttachmentAction[];
   inputPlaceholder?: string;

package/src/screens/inbox/Inbox.tsx

@@ -3,6 +3,8 @@ import { StyleSheet } from 'react-native';
 import { TabView } from 'react-native-tab-view';
 import { KContainer, KImage, KLabel, KColors } from '@droppii/libs';
 import { MessagesTab } from './MessagesTab';
+import { useUserStore } from '../../store';
+import { LoginStatus } from '@droppii/openim-rn-client-sdk';
 
 interface InboxProps {
   onPressThread?: (item: string) => void;
@@ -15,6 +17,7 @@ type TabRoute = { key: string; title: string };
 
 const Inbox = memo(
   ({ onPressThread, onPressSearch, onPressEdit, onPressGroup }: InboxProps) => {
+    const connectStatus = useUserStore((state) => state.connectStatus);
     const [index, setIndex] = useState(0);
     const [routes] = useState<TabRoute[]>([
       { key: 'messages', title: 'Tin nhắn' },
@@ -22,12 +25,13 @@ const Inbox = memo(
 
     const renderScene = useCallback(
       ({ route }: { route: TabRoute }) => {
+        if (connectStatus !== LoginStatus.Logged) return null;
         if (route.key === 'messages') {
           return <MessagesTab onPressThread={onPressThread} />;
         }
         return null;
       },
-      [onPressThread]
+      [onPressThread, connectStatus]
     );
 
     const renderTabBar = useCallback(

package/src/services/apis.ts

@@ -1,11 +1,5 @@
 import { type AxiosInstance } from 'axios';
-import type {
-  DConversationItem,
-  DConversationQueryParams,
-} from '../types/chat';
 import OpenIMSDK, { LoginStatus } from '@droppii/openim-rn-client-sdk';
-import type { BaseResponse, GetOpenIMTokenResponse } from '../types/auth';
-import { Platform } from 'react-native';
 import { useConversationStore } from '../store';
 
 export let apiInstance: AxiosInstance | null = null;
@@ -19,25 +13,6 @@ export namespace ChatAPI {
     return (await OpenIMSDK.getLoginStatus(operationID)) === LoginStatus.Logged;
   };
 
-  export const login = async (
-    instance: AxiosInstance,
-    operationID?: string
-  ) => {
-    const isLoggedIn = await getLoginStatus(operationID);
-
-    if (isLoggedIn) return;
-
-    const response = await instance.post<BaseResponse<GetOpenIMTokenResponse>>(
-      `/chat-service/v1/auth/token?platform=${Platform.OS.toUpperCase()}`
-    );
-
-    const token = response?.data?.data;
-
-    if (token == null) return;
-
-    return OpenIMSDK.login({ userID: token.id, token: token.token });
-  };
-
   export const logout = async (operationID?: string) => {
     useConversationStore.getState().reset();
     return OpenIMSDK.logout(operationID);
@@ -46,17 +21,4 @@ export namespace ChatAPI {
   export const getUser = async (operationID?: string | undefined) => {
     return OpenIMSDK.getSelfUserInfo(operationID);
   };
-
-  export async function queryConversations(params: DConversationQueryParams) {
-    if (!apiInstance) {
-      throw new Error(
-        'apiInstance is not initialized. Call initApiInstance() first.'
-      );
-    }
-    const response = await apiInstance.post<BaseResponse<DConversationItem[]>>(
-      '/chat-service/v1/app/conversations/query',
-      params
-    );
-    return response.data;
-  }
 }

package/src/services/attachmentHandlers/fileAttachmentHandler.ts

@@ -6,12 +6,13 @@ interface FileElem {
   fileName: string;
   fileSize: number;
   fileType: string;
-  url: string;
+  sourceUrl: string;
 }
 
-export class FileAttachmentHandler implements IAttachmentHandler {
-  private static readonly MAX_FILE_SIZE = 200 * 1024 * 1024; // 200MB
+const MB = 1024 * 1024;
+export const MAX_FILE_SIZE = 50 * MB;
 
+export class FileAttachmentHandler implements IAttachmentHandler {
   validate(
     attachment: Attachment
   ): { valid: true } | { valid: false; reason: string } {
@@ -38,10 +39,10 @@ export class FileAttachmentHandler implements IAttachmentHandler {
       };
     }
 
-    if (sourceFile.size > FileAttachmentHandler.MAX_FILE_SIZE) {
+    if (sourceFile.size > MAX_FILE_SIZE) {
       return {
         valid: false,
-        reason: `File size exceeds maximum (${FileAttachmentHandler.MAX_FILE_SIZE / 1024 / 1024}MB)`,
+        reason: `File size exceeds maximum (${MAX_FILE_SIZE / 1024 / 1024}MB)`,
       };
     }
 
@@ -60,7 +61,7 @@ export class FileAttachmentHandler implements IAttachmentHandler {
       fileName: sourceFile.filename,
       fileSize: sourceFile.size,
       fileType: sourceFile.mimeType,
-      url: uploadedUrl,
+      sourceUrl: uploadedUrl,
     };
 
     console.warn('[FileAttachmentHandler] Built payload', {
@@ -68,7 +69,7 @@ export class FileAttachmentHandler implements IAttachmentHandler {
       fileName: fileElem.fileName,
       fileSize: fileElem.fileSize,
       fileType: fileElem.fileType,
-      url: uploadedUrl.substring(0, 50) + '...',
+      sourceUrl: uploadedUrl.substring(0, 50) + '...',
     });
 
     return fileElem;

package/src/services/attachmentHandlers/index.ts

@@ -7,4 +7,7 @@ export function initializeAttachmentHandlers(): void {
 
 export { ImageAttachmentHandler } from './imageAttachmentHandler';
 export { default as VideoAttachmentHandler } from './videoAttachmentHandler';
-export { default as FileAttachmentHandler } from './fileAttachmentHandler';
+export {
+  default as FileAttachmentHandler,
+  MAX_FILE_SIZE,
+} from './fileAttachmentHandler';

package/src/store/conversation.ts

@@ -1,32 +1,23 @@
 import { create } from 'zustand';
-import {
-  sortConversation,
-  mergeOpenIMIntoConversation,
-} from '../utils/conversation';
-import type { DConversationItem } from '../types/chat';
-import type {
-  ConversationItem,
-  MessageItem,
-} from '@droppii/openim-rn-client-sdk';
+import { sortConversation } from '../utils/conversation';
+import type { ConversationItem } from '@droppii/openim-rn-client-sdk';
 
 type ConversationID = string;
 
 export interface ConversationStore {
   currentConversationId?: ConversationID;
   setCurrentConversation(id: ConversationID): void;
-  getCurrentConversation(): DConversationItem | undefined;
+  getCurrentConversation(): ConversationItem | undefined;
   list: ConversationID[];
-  map: Record<ConversationID, DConversationItem>;
+  map: Record<ConversationID, ConversationItem>;
   /** Signal incremented when a truly new conversation arrives and a full refetch is needed. */
   newConversationSignal: number;
-  updateConversations(conversations: DConversationItem[]): void;
+  updateConversations(conversations: ConversationItem[]): void;
   /**
    * Patches existing conversations with real-time data from OpenIM events.
    * Returns true if any conversation was not found in the store (triggers refetch).
    */
-  mergeOpenIMConversations(conversations: ConversationItem[]): boolean;
   removeConversation(id: ConversationID): void;
-  updateLastMessage(id: ConversationID, message: MessageItem): void;
   reset(): void;
 }
 
@@ -56,35 +47,6 @@ export const useConversationStore = create<ConversationStore>()((set, get) => ({
       )
     );
   },
-  mergeOpenIMConversations(conversations) {
-    const currentMap = get().map;
-    let hasUnknown = false;
-    let changed = false;
-
-    const nextMap = { ...currentMap };
-    for (const openim of conversations) {
-      const existing = currentMap[openim.conversationID];
-      if (existing == null) {
-        hasUnknown = true;
-        continue;
-      }
-      nextMap[openim.conversationID] = mergeOpenIMIntoConversation(
-        existing,
-        openim
-      );
-      changed = true;
-    }
-
-    if (changed) {
-      set(sortConversation(nextMap));
-    }
-
-    if (hasUnknown) {
-      set((s) => ({ newConversationSignal: s.newConversationSignal + 1 }));
-    }
-
-    return hasUnknown;
-  },
   removeConversation(id) {
     const newMap = { ...get().map };
     delete newMap[id];
@@ -94,17 +56,6 @@ export const useConversationStore = create<ConversationStore>()((set, get) => ({
       list: get().list.filter((item) => item !== id),
     });
   },
-  updateLastMessage(id, message) {
-    const conversation = get().map[id];
-    if (conversation == null) return;
-
-    set(
-      sortConversation({
-        [id]: { ...conversation, lastMessage: message },
-        ...get().map,
-      })
-    );
-  },
   reset() {
     set({
       currentConversationId: undefined,
@@ -115,6 +66,6 @@ export const useConversationStore = create<ConversationStore>()((set, get) => ({
   },
 }));
 
-export const useConversation = (id: string): DConversationItem | undefined => {
+export const useConversation = (id: string): ConversationItem | undefined => {
   return useConversationStore((state) => state.map[id]);
 };

package/src/translation/resources/i18n.ts

@@ -1,6 +1,15 @@
 const i18nKey: Record<string, string> = {
   'thread_card_bot_crm_name': 'Droppii Hỗ Trợ',
   'thread_card_fallback_name': 'Người dùng',
+  'chat:file_too_large': 'Tệp quá lớn. Tối đa 10MB',
+  'chat:file_max_count': 'Chỉ có thể đính kèm tối đa 3 tệp',
+  'chat:file_pick_failed': 'Không thể chọn tệp',
+  'chat:file_upload_failed': 'Lỗi tải tệp lên',
+  'chat:file_preview_unsupported': 'Không thể xem trước tệp này',
+  'chat:file_downloading': 'Đang tải {{received}}/{{total}} MB',
+  'chat:file_downloaded_success': 'Đã tải thành công {{fileName}}',
+  'chat:file_download_failed': 'Tải tệp thất bại',
+  'chat:file_open_failed': 'Không thể mở tệp này',
   'chat:image_preview': 'Xem trước ảnh',
   'chat:image_too_large': 'Ảnh quá lớn. Tối đa 5MB',
   'chat:video_too_large': 'Video quá lớn. Tối đa 200MB',

package/src/types/attachment.ts

@@ -1,4 +1,4 @@
-export type AttachmentType = 'image' | 'video' | 'file' | 'audio';
+export type AttachmentType = 'image' | 'video' | 'file' | 'audio' | 'document';
 
 export interface BaseAttachment {
   id: string;
@@ -83,3 +83,25 @@ export interface AttachmentSendResult {
   mergedMessageId?: string;
   errors: Record<string, string>;
 }
+
+interface AttachmentMetadata {
+  id?: string;
+  path: string;
+  filename?: string;
+  size?: number;
+  duration?: number;
+  mimeType?: string;
+  width?: number;
+  height?: number;
+  uri?: string;
+}
+
+export interface AttachmentItem {
+  metadata: AttachmentMetadata;
+  uploadProgress: number;
+  error: string | null;
+  isUploading: boolean;
+  uploadedUrl?: string;
+  thumbnailUrl?: string;
+  type: AttachmentType;
+}

package/src/types/auth.ts

@@ -16,6 +16,7 @@ type Pageable = {
 export type GetOpenIMTokenResponse = {
   id: string;
   token: string;
+  expiresIn: number;
 };
 
 export enum SyncStatus {

package/src/types/chat.ts

@@ -1,8 +1,4 @@
-import {
-  type MessageItem,
-  type ConversationItem,
-  PeerType,
-} from '@droppii/openim-rn-client-sdk';
+import { type MessageItem } from '@droppii/openim-rn-client-sdk';
 import type { PropsWithChildren } from 'react';
 import type { IUrlMetadata } from './common';
 import type {
@@ -10,6 +6,7 @@ import type {
   IConversationFlowStep,
   IRunConversationFlowPayload,
 } from './flows';
+import type { GetOpenIMTokenResponse } from './auth';
 
 export const EventProvider = {
   ga: 'ga',
@@ -31,6 +28,7 @@ export interface ChatContextType {
 export type ChatProviderProps = PropsWithChildren<{
   logGA?: LogGA;
   applicationType: DChatApplicationType;
+  getChatToken: () => Promise<GetOpenIMTokenResponse | null>;
 }>;
 
 export enum DChatApplicationType {
@@ -66,20 +64,6 @@ export interface DConversationPeer {
   group: null; // to be defined when group is implemented
 }
 
-export interface DConversationItem extends ConversationItem {
-  // Droppii API fields
-  conversationId: string;
-  chatCategory: DChatCategory;
-  chatType: PeerType;
-  applicationType: DChatApplicationType;
-  memberRole: DMemberRole;
-  pinnedAt: string | null;
-  isMuted: boolean;
-  peer: DConversationPeerUser;
-  // Merged from OpenIM (available after getConversationListSplit merge)
-  lastMessage?: DMessageItem;
-}
-
 export interface DConversationQueryParams {
   applicationType: string;
   page: number;
@@ -146,7 +130,19 @@ export interface ChatDetailContextType {
   conversationFlow?: IConversationFlow;
   refetchConversationFlow: () => void;
   isBotConversation: boolean;
-  setConverationFlowStep: (step: IConversationFlowStep) => void;
+  setConverationFlowStep: (step?: IConversationFlowStep) => void;
 }
 
 export interface ChatDetailProviderProps extends PropsWithChildren {}
+
+export interface IConversationItemEx {
+  applicationType: DChatApplicationType;
+  sessionInfo?: {
+    type: 'SESSION_INFO';
+    data: {
+      ownerId: string;
+      botId: string;
+    };
+  };
+  chatCategory: DChatCategory;
+}

package/src/utils/conversation.ts

@@ -3,7 +3,6 @@ import {
   SessionType,
   type ConversationItem,
 } from '@droppii/openim-rn-client-sdk';
-import { type DConversationItem, type DMessageItem } from '../types/chat';
 import { trans } from '../translation';
 
 export const conversationCompare = (
@@ -24,43 +23,6 @@ export const conversationCompare = (
   return bCompare - aCompare;
 };
 
-export const dConversationCompare = (
-  a: DConversationItem,
-  b: DConversationItem
-) => {
-  if (a.isPinned !== b.isPinned) return a.isPinned ? -1 : 1;
-
-  const aTime =
-    a.draftTextTime > a.latestMsgSendTime
-      ? a.draftTextTime
-      : a.latestMsgSendTime;
-  const bTime =
-    b.draftTextTime > b.latestMsgSendTime
-      ? b.draftTextTime
-      : b.latestMsgSendTime;
-
-  return bTime - aTime;
-};
-
-export const mergeOpenIMIntoConversation = (
-  existing: DConversationItem,
-  openim: ConversationItem
-): DConversationItem => {
-  const { latestMsg, ...openimRest } = openim;
-
-  let lastMessage: DMessageItem | undefined = existing.lastMessage;
-  if (latestMsg) {
-    try {
-      lastMessage = JSON.parse(latestMsg) as DMessageItem;
-    } catch {
-      // keep existing lastMessage if parse fails
-    }
-  }
-
-  // Spread existing first so peerType (not in ConversationItem) is preserved
-  return { ...existing, ...openimRest, lastMessage };
-};
-
 export const getConversationID = (
   sessionType: SessionType,
   senderID?: string,
@@ -76,9 +38,9 @@ export const getConversationID = (
   return [prefix, senderID, receiverID].filter(Boolean).join('_');
 };
 
-export const sortConversation = (map: Record<string, DConversationItem>) => {
+export const sortConversation = (map: Record<string, ConversationItem>) => {
   const list = Object.keys(map).sort((a, b) =>
-    dConversationCompare(map[a]!, map[b]!)
+    conversationCompare(map[a]!, map[b]!)
   );
   return { map, list };
 };

package/src/utils/device.ts

@@ -1,4 +1,18 @@
 import ImagePicker from 'react-native-image-crop-picker';
+import {
+  pick as pickDocument,
+  types as documentTypes,
+  isErrorWithCode,
+  errorCodes,
+  keepLocalCopy,
+} from '@react-native-documents/picker';
+
+export interface PickedFile {
+  uri: string;
+  name: string;
+  size: number;
+  mimeType: string;
+}
 
 const DeviceUtils = {
   openImagePicker: async (multiple: boolean = false) => {
@@ -68,6 +82,50 @@ const DeviceUtils = {
       throw error;
     }
   },
+
+  openFilePicker: async (
+    multiple: boolean = false
+  ): Promise<PickedFile[] | null> => {
+    try {
+      const results = await pickDocument({
+        allowMultiSelection: multiple,
+        type: [documentTypes.allFiles],
+        mode: 'import',
+      });
+
+      // Copy picked files to app's document directory so uploads can access them
+      const copies = await keepLocalCopy({
+        files: results.map((r) => ({
+          uri: r.uri,
+          fileName: r.name ?? 'file',
+        })) as [
+          { uri: string; fileName: string },
+          ...{ uri: string; fileName: string }[],
+        ],
+        destination: 'documentDirectory',
+      });
+
+      const files = results.map((r, i) => ({
+        uri: decodeURIComponent(
+          copies[i]?.status === 'success' ? copies[i].localUri : r.uri
+        ),
+        name: r.name ?? 'file',
+        size: r.size ?? 0,
+        mimeType: r.type ?? 'application/octet-stream',
+      }));
+
+      return files;
+    } catch (error: any) {
+      if (
+        isErrorWithCode(error) &&
+        error.code === errorCodes.OPERATION_CANCELED
+      ) {
+        return null;
+      }
+      console.error('[File Picker] Error:', error);
+      throw error;
+    }
+  },
 };
 
 export default DeviceUtils;