ipanel-rnapp-ajb-base 1.0.39 → 1.0.40

package/app/base.js

@@ -60,8 +60,9 @@ global.base.messageManager = {
      * }
      */
   },
-  addrMsgDataTimer: null,
-  wsRef: null,
+  addrMsgDataUpdateTimer: null,
+  ws: null,
+  connectStatus: undefined,
   sessionId: "",
 
   getAddrMsgList: function (addrId) {
@@ -72,6 +73,10 @@ global.base.messageManager = {
 
   // 用户读取的最新一条消息
   readLatestMsg: function (msg) {
+    if (msg.FromUserId !== "cloud") {
+      // 只针对云端消息设置已读
+      return;
+    }
     if (global.base.messageManager.addrMsgData[msg.FromAddrId]) {
       if (
         global.base.messageManager.addrMsgData[msg.FromAddrId]
@@ -83,10 +88,10 @@ global.base.messageManager = {
         msg.MsgId;
 
       // 更新本地存储
-      clearTimeout(global.base.messageManager.addrMsgDataTimer);
-      global.base.messageManager.addrMsgDataTimer = setTimeout(() => {
+      clearTimeout(global.base.messageManager.addrMsgDataUpdateTimer);
+      global.base.messageManager.addrMsgDataUpdateTimer = setTimeout(() => {
         storage.set("addrMsgData", global.base.messageManager.addrMsgData);
-      }, 500);
+      }, 300);
 
       eventBus.emit(EVENTS.MESSAGE.UNREAD_COUNT_UPDATE);
     }
@@ -114,7 +119,7 @@ global.base.messageManager = {
   },
 
   isConnected: function () {
-    return !!global.base.messageManager.wsRef.current;
+    return !!global.base.messageManager.ws;
   },
 
   setSessionId: function (sid) {
@@ -123,8 +128,8 @@ global.base.messageManager = {
 
   sendMessage: async function (message) {
     console.log("ws.send", message);
-    global.base.messageManager.wsRef.current &&
-      global.base.messageManager.wsRef.current.send(JSON.stringify(message));
+    global.base.messageManager.ws &&
+      global.base.messageManager.ws.send(JSON.stringify(message));
     eventBus.emit(EVENTS.MESSAGE.ADD, message);
   },
 
@@ -147,6 +152,24 @@ global.base.messageManager = {
     await storage.set("addrMsgData", global.base.messageManager.addrMsgData);
   },
 
+  removeMsg(msgId) {
+    const addrMsgData = global.base.messageManager.addrMsgData;
+
+    for (let addrId in addrMsgData) {
+      const msgData = addrMsgData[addrId];
+      const msgIdx = msgData.messages.findIndex((msg) => msg.MsgId === msgId);
+      if (msgIdx !== -1) {
+        msgData.messages.splice(msgIdx, 1);
+        // 更新本地存储
+        clearTimeout(global.base.messageManager.addrMsgDataUpdateTimer);
+        global.base.messageManager.addrMsgDataUpdateTimer = setTimeout(() => {
+          storage.set("addrMsgData", addrMsgData);
+        }, 300);
+        break;
+      }
+    }
+  },
+
   genMsg,
   MSG_TYPES,
   MSG_EVENT_TYPES,

package/app/hooks/useMessageManager.js

@@ -1,17 +1,15 @@
 import React, { useState, useEffect, useCallback, useRef } from "react";
-import { PermissionsAndroid, Platform } from "react-native";
-
-import { format } from "date-fns";
-
 import storage from "../storage";
 import eventBus, { EVENTS } from "../eventBus";
 import config from "../utils/config";
-import { MSG_TYPES, genMsg } from "../utils/common";
+import { MSG_TYPES, genMsg, CONNECT_STATUS } from "../utils/common";
 import applyPermissions from "../utils/applyPermissions";
 
-let connectStatus = -1; // -1 连接中  0 连接成功  1连接失败
+let wsInstance = null;
 
 let tryConnectTimes = 0;
+let isReConnecting = false;
+const MAX_CONNECT_TIMES = 7;
 
 /**
  * 智能客服中心JS
@@ -82,26 +80,48 @@ let aiModel = "CUSTOMER_SERVICE";
 
 let storageTimer;
 
+// 缓存正在发送中的消息，MsgId->Msg，当消息发送成功或发送失败时，需要将其从缓存中删除
+const pendingMsgMap = {};
+
 const UseMessageManager = () => {
-  const ws = useRef(null);
   const connectedAddressId = useRef(null);
 
   const sendMessage = useCallback((msg) => {
-    if (ws.current) {
+    // 给用户发送的消息追加Status字段，此时消息是“未发送态”，如果未连接且重连失败，则将状态改为“发送失败态”
+    // 然后先直接把正在发送的消息显示出来，待消息发送成功或失败时再更新消息状态
+    msg.Status = "pending";
+    eventBus.emit(EVENTS.MESSAGE.ADD, msg);
+
+    if (wsInstance) {
       console.log("ws.send");
-      ws.current.send(JSON.stringify(msg));
-      eventBus.emit(EVENTS.MESSAGE.ADD, msg);
+      wsInstance.send(JSON.stringify(msg));
     } else {
       // 未连接，触发重连
       reConnect(() => {
         console.log("ws.send");
-        ws.current.send(JSON.stringify(msg));
-        eventBus.emit(EVENTS.MESSAGE.ADD, msg);
+        wsInstance.send(JSON.stringify(msg));
       });
     }
   }, []);
 
   const connectMsgServer = async (connectSuccessCallback) => {
+    if (
+      global.base.messageManager.connectStatus === CONNECT_STATUS.CONNECTING ||
+      (global.base.messageManager.connectStatus === CONNECT_STATUS.CONNECTED &&
+        wsInstance &&
+        wsInstance.readyState < 2)
+    ) {
+      console.log(
+        `useMessageManager connectMsgServer skipped, connectStatus=${global.base.messageManager.connectStatus}, ws.readyState=${wsInstance?.readyState}`
+      );
+      return;
+    }
+    global.base.messageManager.connectStatus = CONNECT_STATUS.CONNECTING;
+    eventBus.emit(
+      EVENTS.MESSAGE.CONNECT_STATUS_CHANGE,
+      global.base.messageManager.connectStatus
+    );
+
     console.log("connectMsgServer start");
     const token = await storage.get("accessToken");
     const accountData = await storage.get("accountData");
@@ -135,35 +155,71 @@ const UseMessageManager = () => {
     }
 
     // 缓存全局智能客服websocket连接
-    global.base.messageManager.wsRef = ws;
     global.base.messageManager.connectMsgServer = connectMsgServer;
 
     const url = `${wsUrl}?${connectParams.join("&")}`;
     console.log("useMessageManager ws url:", url);
 
-    ws.current = new WebSocket(url);
-    ws.current.onopen = () => {
+    wsInstance = new WebSocket(url);
+    global.base.messageManager.ws = wsInstance;
+    wsInstance.onopen = () => {
       console.log("useMessageManager ws open");
-      connectStatus = 0;
+      global.base.messageManager.connectStatus = CONNECT_STATUS.CONNECTED;
       tryConnectTimes = 0;
-      eventBus.emit(EVENTS.MESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
+      isReConnecting = false;
+      eventBus.emit(
+        EVENTS.MESSAGE.CONNECT_STATUS_CHANGE,
+        global.base.messageManager.connectStatus
+      );
       eventBus.emit(EVENTS.MESSAGE.UNREAD_COUNT_UPDATE);
 
       connectSuccessCallback && connectSuccessCallback();
     };
-    ws.current.onmessage = ({ data }) => {
+    wsInstance.onmessage = ({ data }) => {
+      // 处理来自云端的消息
       try {
         const msg = JSON.parse(data);
-        if (msg.MsgType === "chat" && msg.Chat.type === "tool_call_begin") {
-          const toolCallId = msg.Chat.payload.tool_calls[0].id;
-          const messages = global.base.messageManager.getAddrMsgList(
-            activeAddr.address_id
-          );
 
+        const messages = global.base.messageManager.getAddrMsgList(
+          activeAddr.address_id
+        );
+
+        // 用户每发送一条消息到云端，云端都会响应一条确认事件消息，用于更新该消息的本地MsgId为服务器生成的ID
+        if (
+          msg.MsgType === MSG_TYPES.EVENT &&
+          msg.Event.Type === "user_msg_received"
+        ) {
+          const targetMsg = messages.find(
+            (item) => item.MsgId === msg.Event.Data.MsgId // 本地产生的ID
+          );
+          if (targetMsg) {
+            targetMsg.MsgId = msg.MsgId; // 服务器产生的ID
+            targetMsg.CreateTime = msg.CreateTime;
+            // 将消息从“未发送态”修改为“已发送态”(即删除Status字段)
+            delete targetMsg.Status;
+            delete pendingMsgMap[msg.Event.Data.MsgId];
+
+            // 避免频繁写入本地存储，在ios可能会导致闪退
+            clearTimeout(storageTimer);
+            storageTimer = setTimeout(() => {
+              storage.set(
+                "addrMsgData",
+                global.base.messageManager.addrMsgData
+              );
+            }, 300);
+          }
+          return;
+        }
+        // AI大模型工具消息合并处理
+        if (
+          msg.MsgType === MSG_TYPES.CHAT &&
+          msg.Chat.type === "tool_call_begin"
+        ) {
+          const toolCallId = msg.Chat.payload.tool_calls[0].id;
           if (
             messages.find(
               (msg) =>
-                msg.MsgType === "chat" &&
+                msg.MsgType === MSG_TYPES.CHAT &&
                 msg.Chat.type === "end" &&
                 msg.Chat.payload.message.tool_calls &&
                 msg.Chat.payload.message.tool_calls[0].id === toolCallId
@@ -178,20 +234,28 @@ const UseMessageManager = () => {
         console.log("msg不合法", e);
       }
     };
-    ws.current.onerror = (err) => {
+    wsInstance.onerror = (err) => {
       console.log("useMessageManager ws onerror", err);
-      connectStatus = 1;
-      eventBus.emit(EVENTS.MESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
+      global.base.messageManager.connectStatus = CONNECT_STATUS.DISCONNECTED;
+      eventBus.emit(
+        EVENTS.MESSAGE.CONNECT_STATUS_CHANGE,
+        global.base.messageManager.connectStatus
+      );
     };
-    ws.current.onclose = (event) => {
+    wsInstance.onclose = (event) => {
       console.log("useMessageManager ws onclose", event);
 
-      global.base.messageManager.wsRef.current = null;
-      connectStatus = 1;
-      eventBus.emit(EVENTS.MESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
+      wsInstance = null;
+      global.base.messageManager.ws = null;
+      global.base.messageManager.connectStatus = CONNECT_STATUS.DISCONNECTED;
+      eventBus.emit(
+        EVENTS.MESSAGE.CONNECT_STATUS_CHANGE,
+        global.base.messageManager.connectStatus
+      );
 
       // 触发重连
       setTimeout(() => {
+        isReConnecting = false;
         reConnect(connectSuccessCallback);
       }, 1000);
     };
@@ -202,22 +266,38 @@ const UseMessageManager = () => {
 
     // 正常主动关闭连接，重置重连次数
     tryConnectTimes = 0;
+    isReConnecting = false;
 
-    global.base.messageManager.wsRef.current &&
-      global.base.messageManager.wsRef.current.close();
+    if (wsInstance) {
+      wsInstance.close();
+    }
   };
 
   const reConnect = async (connectSuccessCallback) => {
+    if (isReConnecting) {
+      return;
+    }
+    isReConnecting = true;
     console.log("useMessageManager reConnect", tryConnectTimes);
-    if (tryConnectTimes < 7) {
+    if (tryConnectTimes < MAX_CONNECT_TIMES) {
       // 重连ws
       tryConnectTimes++;
       connectMsgServer(connectSuccessCallback);
     } else {
       // 重连N次ws失败，不再重试。等用户自己进入智能客服页面或者发送消息时触发重连
       tryConnectTimes = 0;
-      connectStatus = 1;
-      eventBus.emit(EVENTS.MESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
+      global.base.messageManager.connectStatus = CONNECT_STATUS.DISCONNECTED;
+      isReConnecting = false;
+      eventBus.emit(
+        EVENTS.MESSAGE.CONNECT_STATUS_CHANGE,
+        global.base.messageManager.connectStatus
+      );
+
+      // 所有正在发送的消息全部失败，然后清空pendingMsgMap缓存
+      Object.keys(pendingMsgMap).forEach((MsgId) => {
+        pendingMsgMap[MsgId].Status = "fail";
+        delete pendingMsgMap[MsgId];
+      });
     }
   };
 
@@ -295,6 +375,11 @@ const UseMessageManager = () => {
   useEffect(() => {
     // 新增并显示一条消息
     const onMessageAdd = (msg) => {
+      if (msg.MsgType === MSG_TYPES.EVENT) {
+        // 事件消息不持久化保存，也不渲染
+        return;
+      }
+
       if (!global.base.messageManager.addrMsgData[msg.FromAddrId]) {
         global.base.messageManager.addrMsgData[msg.FromAddrId] = {
           messages: [],
@@ -341,8 +426,6 @@ const UseMessageManager = () => {
       }
     };
 
-    connectStatus = -1;
-    eventBus.emit(EVENTS.MESSAGE.CONNECT_STATUS_CHANGE, connectStatus);
     // requestCameraPermission();
     connectMsgServer();
 
@@ -470,8 +553,9 @@ const UseMessageManager = () => {
     aiModel = model;
 
     // 触发重新连接
-    global.base.messageManager.wsRef.current &&
-      global.base.messageManager.wsRef.current.close();
+    if (wsInstance) {
+      wsInstance.close();
+    }
   };
 
   return {

package/app/screens/CommonScreens/BossScreen/index.js

@@ -15,11 +15,15 @@ export default ({ navigation, route }) => {
   }, []);
   const init = async () => {
     const accountData = await storage.get("accountData");
+    console.log("init", accountData, "accountData");
     const binding = 1; // 1：绑定，0：解绑.
     const redirect_uri =
       "https://ipanelcloud2.ipanel.cn:50443/iapp/ajbstatic/bind_boss_account/"; // 绑定后跳转地址
     const state2 = generateRandomString(8);
     setState(state2);
+    console.log(
+      `https://boss.ipanel.cn/ipanelTask/api/cas_open/isport/Isport_cloud_mall_c/binding?agentid=133&oauth2_id=72d2453f689fc99548187dca4b922a5b&redirect_uri=${redirect_uri}&open_id=${accountData.user?.user_id}&binding=${binding}&scope=snsapi_privateinfo&response_type=code&state=${state2}`
+    );
     setUri(
       `https://boss.ipanel.cn/ipanelTask/api/cas_open/isport/Isport_cloud_mall_c/binding?agentid=133&oauth2_id=72d2453f689fc99548187dca4b922a5b&redirect_uri=${redirect_uri}&open_id=${accountData.user?.user_id}&binding=${binding}&scope=snsapi_privateinfo&response_type=code&state=${state2}`
     );
@@ -38,7 +42,7 @@ export default ({ navigation, route }) => {
       global.loading.hideLoading("正在绑定...");
       if (res.code === 0) {
         global.toast.showToast("绑定成功");
-        get_user_info();
+        await get_user_info();
         // navigation.goBack();
       } else {
         navigation.goBack();
@@ -49,28 +53,33 @@ export default ({ navigation, route }) => {
   };
 
   const get_user_info = async () => {
-    const res = await getUserInfo();
-    console.log(res, "getUserInfo");
-    if (
-      res?.code === 0 &&
-      res.result?.user_list &&
-      res.result?.user_list.length
-    ) {
-      // const accountData = await storage.get('accountData');
-      // accountData.user.bind_list = res.result?.user_list[0].bind_list;
-      // await storage.set('accountData', accountData);
-      // const bossData = accountData.user.bind_list
-      const bossData = res.result?.user_list[0].bind_list.filter(item => {
-        return item.third_type === "boss";
-      });
-      console.log(bossData[0]);
-      if (bossData[0]) {
-        await storage.set("bossData", bossData[0]);
+    try {
+      const res = await getUserInfo();
+      console.log(res, "getUserInfo");
+      if (
+        res?.code === 0 &&
+        res.result?.user_list &&
+        res.result?.user_list.length
+      ) {
+        // const accountData = await storage.get('accountData');
+        // accountData.user.bind_list = res.result?.user_list[0].bind_list;
+        // await storage.set('accountData', accountData);
+        // const bossData = accountData.user.bind_list
+        const bossData = res.result?.user_list[0].bind_list.filter(item => {
+          return item.third_type === "boss";
+        });
+        console.log(bossData[0]);
+        if (bossData[0]) {
+          await storage.set("bossData", bossData[0]);
+        }
       }
-    }
-    if (module === "shop") {
-      get_assets();
-    } else {
+      if (module === "shop") {
+        await get_assets();
+      } else {
+        navigation.goBack();
+      }
+    } catch (error) {
+      console.error("get_user_info error:", error);
       navigation.goBack();
     }
   };
@@ -86,7 +95,8 @@ export default ({ navigation, route }) => {
     if (appID) {
       params.appid = appID;
     }
-    getAssets(params).then(res => {
+    try {
+      const res = await getAssets(params);
       if (res?.code === 0) {
         if (
           res?.result &&
@@ -97,12 +107,15 @@ export default ({ navigation, route }) => {
             return item.currency === 20000;
           });
           if (current.length) {
-            storage.set("isportData", current[0]);
+            await storage.set("isportData", current[0]);
           }
         }
       }
+    } catch (error) {
+      console.error("get_assets error:", error);
+    } finally {
       navigation.goBack();
-    });
+    }
   };
 
   const generateRandomString = length => {
@@ -120,20 +133,32 @@ export default ({ navigation, route }) => {
     <View style={{ flex: 1 }}>
       <ScreenBackHeader title="BOSS登录" />
       <View style={{ flex: 1 }}>
-        <WebView
-          bounces={false}
-          // domStorageEnabled={false}
-          javaScriptEnabled
-          useWebKit
-          source={{
-            uri: uri,
-            headers: { "Cache-Control": "no-store" },
-          }}
-          incognito={true}
-          onMessage={onMessage}
-          onLoadEnd={() => global.loading.hideLoading()}
-          onError={() => global.loading.hideLoading()}
-        />
+        {!!uri && (
+          <WebView
+            bounces={false}
+            javaScriptEnabled={true}
+            useWebKit={true}
+            source={{
+              uri: uri,
+              headers: { "Cache-Control": "no-store" },
+            }}
+            incognito={true}
+            onMessage={onMessage}
+            onLoadStart={() => global.loading.showLoading()}
+            onLoadEnd={() => global.loading.hideLoading()}
+            onError={e => {
+              console.log("加载错误:", e.nativeEvent.description);
+              global.loading.hideLoading();
+            }}
+            // iOS 特定修复
+            // onShouldStartLoadWithRequest={request => {
+            //   if (request.url.startsWith('file://')) {
+            //     return true; // 允许加载本地文件
+            //   }
+            //   return true;
+            // }}
+          />
+        )}
       </View>
     </View>
   );

package/app/utils/common.js

@@ -263,6 +263,7 @@ const MSG_TYPES = {
   VIDEO: "video",
   EVENT: "event",
   TEMPLATE: "template",
+  CHAT: "chat",
 };
 
 const MSG_EVENT_TYPES = {
@@ -452,6 +453,12 @@ const checkToken = async () => {
   });
 };
 
+const CONNECT_STATUS = {
+  CONNECTING: -1,
+  CONNECTED: 0,
+  DISCONNECTED: 1,
+};
+
 export {
   updateHomedToken,
   initOperatorHomedTouristAccount,
@@ -465,4 +472,5 @@ export {
   appReport,
   checkToken,
   updateApartmentToken,
+  CONNECT_STATUS,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.39",
-  "ipanelVersion": "1.0.521",
+  "version": "1.0.40",
+  "ipanelVersion": "1.0.529",
   "description": "",
   "main": "index.js",
   "keywords": [
@@ -13,4 +13,4 @@
   "scripts": {
     "postinstall": "node bin/local-dev.js"
   }
-}
+}