Merge pull request #1144 from thomas-portkey/fix/im-user-id

fix: 🐛 im user id
Portkey-Wallet · Oct 21, 2023 · 3af1ed2 · 3af1ed2
2 parents 55e51da + 3e812fb
commit 3af1ed2
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 38 deletions.
diff --git a/packages/hooks/hooks-ca/im/channel.ts b/packages/hooks/hooks-ca/im/channel.ts
@@ -51,11 +51,11 @@ export const useIsStranger = (relationId: string) => {
 export const useSendChannelMessage = () => {
   const dispatch = useAppCommonDispatch();
   const { networkType } = useCurrentNetworkInfo();
-  const relationId = useRelationId();
+  const { relationId, getRelationId } = useRelationId();
   const { walletName } = useWallet();
 
   const sendMessageToPeople = useCallback(
-    ({
+    async ({
       toRelationId,
       channelId,
       type = 'TEXT',
@@ -69,19 +69,24 @@ export const useSendChannelMessage = () => {
       if (!(toRelationId || channelId)) {
         throw new Error('No ID');
       }
-      if (!relationId) {
-        throw new Error('No user info');
+      let _relationId = relationId;
+      if (!_relationId) {
+        try {
+          _relationId = await getRelationId();
+        } catch (error) {
+          throw new Error('No user info');
+        }
       }
       const uuid = randomId();
       return im.service.sendMessage({
         channelUuid: channelId,
         toRelationId,
         type,
         content,
-        sendUuid: `${relationId}-${toRelationId}-${Date.now()}-${uuid}`,
+        sendUuid: `${_relationId}-${toRelationId}-${Date.now()}-${uuid}`,
       });
     },
-    [relationId],
+    [getRelationId, relationId],
   );
 
   const sendMassMessage = useCallback(
@@ -125,20 +130,25 @@ export const useSendChannelMessage = () => {
 
   const sendChannelMessage = useCallback(
     async (channelId: string, content: string, type = 'TEXT' as MessageType) => {
-      if (!relationId) {
-        throw new Error('No user info');
+      let _relationId = relationId;
+      if (!_relationId) {
+        try {
+          _relationId = await getRelationId();
+        } catch (error) {
+          throw new Error('No user info');
+        }
       }
       const uuid = randomId();
       const msgParams = {
         channelUuid: channelId,
         type,
         content,
-        sendUuid: `${relationId}-${channelId}-${Date.now()}-${uuid}`,
+        sendUuid: `${_relationId}-${channelId}-${Date.now()}-${uuid}`,
       };
 
       const msgObj: Message = messageParser({
         ...msgParams,
-        from: relationId,
+        from: _relationId,
         fromAvatar: '',
         fromName: walletName,
         createAt: `${Date.now()}`,
@@ -179,7 +189,7 @@ export const useSendChannelMessage = () => {
         throw error;
       }
     },
-    [dispatch, networkType, relationId, walletName],
+    [dispatch, getRelationId, networkType, relationId, walletName],
   );
   const sendChannelImageByS3Result = useCallback(
     async (channelId: string, s3Result: UploadFileType & ImageMessageFileType) => {
@@ -391,7 +401,7 @@ export const useChannel = (channelId: string) => {
   const { networkType } = useCurrentNetworkInfo();
   const dispatch = useAppCommonDispatch();
 
-  const relationId = useRelationId();
+  const { relationId } = useRelationId();
 
   const muteChannel = useMuteChannel();
   const pinChannel = usePinChannel();

diff --git a/packages/hooks/hooks-ca/im/group.ts b/packages/hooks/hooks-ca/im/group.ts
@@ -197,7 +197,7 @@ export const useGroupChannelInfo = (channelId: string, isInit = false) => {
     [channelId, groupInfoMapNetMap, networkType],
   );
 
-  const relationId = useRelationId();
+  const { relationId } = useRelationId();
 
   const refresh = useCallback(async () => {
     const { data: groupInfo } = await im.service.getChannelInfo({

diff --git a/packages/hooks/hooks-ca/im/index.ts b/packages/hooks/hooks-ca/im/index.ts
@@ -17,6 +17,7 @@ import { useChannelList } from './channelList';
 import { fetchContactListAsync } from '@portkey-wallet/store/store-ca/contact/actions';
 import { request } from '@portkey-wallet/api/api-did';
 import useLockCallback from '../../useLockCallback';
+import { handleLoopFetch } from '@portkey-wallet/utils';
 
 export const useIMState = () => useAppCASelector(state => state.im);
 export const useIMHasNextNetMapState = () => useAppCASelector(state => state.im.hasNextNetMap);
@@ -43,9 +44,38 @@ export const useUnreadCount = () => {
   return unreadCount;
 };
 
+export const useRelationId = () => {
+  const dispatch = useAppCommonDispatch();
+  const { networkType } = useCurrentNetworkInfo();
+  const relationIdNetMap = useIMRelationIdNetMapNetMapState();
+
+  const relationId = useMemo(() => relationIdNetMap?.[networkType], [networkType, relationIdNetMap]);
+
+  const getRelationId = useCallback(async () => {
+    const { data: userInfo } = await im.service.getUserInfo();
+    if (userInfo?.relationId) {
+      dispatch(
+        setRelationId({
+          network: networkType,
+          relationId: userInfo.relationId,
+        }),
+      );
+
+      return userInfo.relationId;
+    }
+    throw new Error('can not get im info');
+  }, [dispatch, networkType]);
+
+  return {
+    relationId,
+    getRelationId,
+  };
+};
+
 export const useInitIM = () => {
   const { networkType } = useCurrentNetworkInfo();
   const dispatch = useAppCommonDispatch();
+  const { getRelationId } = useRelationId();
 
   const channelListNetMap = useIMChannelListNetMapState();
   const list = useMemo(() => channelListNetMap?.[networkType]?.list || [], [channelListNetMap, networkType]);
@@ -185,28 +215,16 @@ export const useInitIM = () => {
           filter: `caHash: ${caHash}`,
         },
       });
-      const { data: userInfo } = await im.service.getUserInfo();
-      if (userInfo?.relationId) {
-        dispatch(
-          setRelationId({
-            network: networkType,
-            relationId: userInfo.relationId,
-          }),
-        );
-      }
+
+      handleLoopFetch(getRelationId, 3).catch(error => {
+        console.log('initIm getRelationId error', error);
+      });
     },
     [dispatch, networkType, relationToken],
   );
   return initIm;
 };
 
-export const useRelationId = () => {
-  const { networkType } = useCurrentNetworkInfo();
-  const relationIdNetMap = useIMRelationIdNetMapNetMapState();
-
-  return useMemo(() => relationIdNetMap?.[networkType], [networkType, relationIdNetMap]);
-};
-
 export const useIsIMReady = () => {
   return [IMStatusEnum.AUTHORIZED, IMStatusEnum.CONNECTED].includes(im.status);
 };

diff --git a/packages/mobile-app-did/js/pages/Chat/GroupInfoPage/index.tsx b/packages/mobile-app-did/js/pages/Chat/GroupInfoPage/index.tsx
@@ -26,7 +26,7 @@ import { ShowShareWithOverlay } from '../components/ShareWithOverlay';
 import { copyText } from 'utils';
 
 const GroupInfoPage = () => {
-  const myRelationId = useRelationId();
+  const { relationId: myRelationId } = useRelationId();
 
   const currentChannelId = useCurrentChannelId();
   const { groupInfo, isAdmin, refresh } = useGroupChannelInfo(currentChannelId || '', false);

diff --git a/packages/mobile-app-did/js/pages/Chat/GroupMembersPage/index.tsx b/packages/mobile-app-did/js/pages/Chat/GroupMembersPage/index.tsx
@@ -16,7 +16,7 @@ import navigationService from 'utils/navigationService';
 import { strIncludes } from '@portkey-wallet/utils';
 
 const GroupMembersPage = () => {
-  const myRelationId = useRelationId();
+  const { relationId: myRelationId } = useRelationId();
   const currentChannelId = useCurrentChannelId();
   const { groupInfo } = useGroupChannelInfo(currentChannelId || '', false);
   const { members = [] } = groupInfo || {};

diff --git a/packages/mobile-app-did/js/pages/Chat/components/ChatsDetailContent/index.tsx b/packages/mobile-app-did/js/pages/Chat/components/ChatsDetailContent/index.tsx
@@ -55,7 +55,7 @@ export default function ChatsDetailContent() {
   const { list, init, next, hasNext } = useChannel(currentChannelId || '');
   const [initializing, setInitializing] = useState(true);
   const formattedList = useMemo(() => formatMessageList(list), [list]);
-  const relationId = useRelationId();
+  const { relationId } = useRelationId();
   const user = useMemo(() => ({ _id: relationId || '' }), [relationId]);
 
   const onLoadEarlier = useLockCallback(async () => {

diff --git a/packages/mobile-app-did/js/pages/Chat/components/ChatsGroup/index.tsx b/packages/mobile-app-did/js/pages/Chat/components/ChatsGroup/index.tsx
@@ -121,7 +121,7 @@ const ChatsUI = () => {
     };
   }, [onDismiss, onLoadEarlier]);
 
-  const relationId = useRelationId();
+  const { relationId } = useRelationId();
   const user = useMemo(() => ({ _id: relationId || '' }), [relationId]);
 
   useEffectOnce(() => {

diff --git a/packages/mobile-app-did/js/pages/Chat/components/ChatsGroupDetailContent/index.tsx b/packages/mobile-app-did/js/pages/Chat/components/ChatsGroupDetailContent/index.tsx
@@ -57,7 +57,7 @@ export default function ChatsGroupDetailContent() {
   const { list, init, hasNext, next } = useGroupChannel(currentChannelId || '');
   const [initializing, setInitializing] = useState(true);
   const formattedList = useMemo(() => formatMessageList(list), [list]);
-  const relationId = useRelationId();
+  const { relationId } = useRelationId();
   const user = useMemo(() => ({ _id: relationId || '' }), [relationId]);
 
   const onLoadEarlier = useLockCallback(async () => {

diff --git a/packages/utils/index.ts b/packages/utils/index.ts
@@ -244,3 +244,21 @@ export function handlePhoneNumber(str?: string) {
   }
   return str || '';
 }
+
+export const handleLoopFetch = async <T>(
+  fetch: () => Promise<T>,
+  times = 0,
+  interval = 0,
+  checkIsContinue?: () => boolean,
+): Promise<T> => {
+  try {
+    return await fetch();
+  } catch (error) {
+    const isContinue = checkIsContinue ? checkIsContinue() : true;
+    if (!isContinue) throw new Error('fetch invalid');
+    if (times === 1) throw error;
+    console.log('handleLoopFetch: error', times, error);
+  }
+  await sleep(interval);
+  return handleLoopFetch(fetch, times - 1, interval, checkIsContinue);
+};
diff --git a/packages/web-extension-did/app/web/pages/IMChat/ChatBox/ChatGroup/index.tsx b/packages/web-extension-did/app/web/pages/IMChat/ChatBox/ChatGroup/index.tsx
@@ -48,7 +48,7 @@ export default function ChatBox() {
     init();
   });
   const hideChannel = useHideChannel();
-  const relationId = useRelationId();
+  const { relationId } = useRelationId();
   const messageList: MessageType[] = useMemo(() => formatMessageList(list, relationId!, true), [list, relationId]);
   const leaveGroup = useLeaveChannel();
   const { handleDeleteMsg, handlePin, handleMute } = useHandle({ info, mute, pin, deleteMessage });

diff --git a/packages/web-extension-did/app/web/pages/IMChat/ChatBox/ChatP2P/index.tsx b/packages/web-extension-did/app/web/pages/IMChat/ChatBox/ChatP2P/index.tsx
@@ -39,7 +39,7 @@ export default function ChatBox() {
   useEffectOnce(() => {
     init();
   });
-  const relationId = useRelationId();
+  const { relationId } = useRelationId();
   const messageList: MessageType[] = useMemo(() => formatMessageList(list, relationId!), [list, relationId]);
   const handleDelete = useCallback(() => {
     CustomModalConfirm({

diff --git a/packages/web-extension-did/app/web/pages/IMChat/GroupInfo/index.tsx b/packages/web-extension-did/app/web/pages/IMChat/GroupInfo/index.tsx
@@ -23,7 +23,7 @@ import './index.less';
 const GroupInfo = () => {
   const { channelUuid } = useParams();
   const leaveGroup = useLeaveChannel();
-  const myRelationId = useRelationId();
+  const { relationId: myRelationId } = useRelationId();
   const [shareVisible, setShareVisible] = useState(false);
   const { groupInfo, isAdmin, refresh } = useGroupChannelInfo(`${channelUuid}`);
   const { sendMassMessage } = useSendChannelMessage();

diff --git a/packages/web-extension-did/app/web/pages/IMChat/MemberList/index.tsx b/packages/web-extension-did/app/web/pages/IMChat/MemberList/index.tsx
@@ -12,7 +12,7 @@ import './index.less';
 
 export default function MemberList() {
   const { channelUuid } = useParams();
-  const myRelationId = useRelationId();
+  const { relationId: myRelationId } = useRelationId();
   const { groupInfo, refresh } = useGroupChannelInfo(`${channelUuid}`);
   const { t } = useTranslation();
   const { state } = useLocation();