inl-app-manager 1.5.43 → 1.5.45

package/dist/elements/index.js

@@ -2940,6 +2940,9 @@ const props$c = {
   countDown: {
     type: Number,
     default: 10
+  },
+  getContainer: {
+    type: Function
   }
 };
 const AlarmVideo = defineComponent({
@@ -3087,7 +3090,7 @@ const AlarmVideo = defineComponent({
       "footer": null,
       "width": 900,
       "centered": true,
-      "getContainer": () => document.getElementById("alarmLinkage")
+      "getContainer": _props.getContainer || (() => document.getElementById("alarmLinkage") || document.body)
     }, {
       default: () => [createVNode("div", {
         "class": "body"
@@ -3172,7 +3175,7 @@ const AlarmVideo = defineComponent({
   }
 });
 
-const BROKERURL = "ws://" + location.host + "/mtip-app-center-websocket";
+const BROKERURL = (location.protocol === "https:" ? "wss://" : "ws://") + location.host + "/mtip-app-center-websocket";
 const SUBSCRINBURL = "/queue/alarm";
 const Props$1 = createCardProps({
   title: {
@@ -3234,65 +3237,149 @@ const AlarmLinkage = defineComponent({
     }
     const alarmList = ref([]);
     const clientId = ref("");
-    const init = async () => {
-      const {
-        data
-      } = await getInitialAlarmLinkage(props.appId, props.systemUuid);
-      alarmList.value = data.alarmFeed;
-      alarmList.value.filter(i => i.alarmList.length > 0).forEach(item => {
-        const firstAlarm = item.alarmList[0];
-        item.instanceUuid = firstAlarm.instanceUuid;
+    let client;
+    let hasConnected = false;
+    let isLoadingAlarmData = false;
+    const pendingAlarmMessages = [];
+    const loadAlarmData = async () => {
+      isLoadingAlarmData = true;
+      try {
+        const {
+          data
+        } = await getInitialAlarmLinkage(props.appId, props.systemUuid);
+        const alarmFeed = Array.isArray(data?.alarmFeed) ? data.alarmFeed : [];
+        alarmFeed.filter(item => Array.isArray(item.alarmList) && item.alarmList.length > 0).forEach(item => {
+          item.instanceUuid = item.alarmList[0].instanceUuid;
+        });
+        alarmList.value = alarmFeed;
+        if (data?.clientId && data.clientId !== clientId.value) {
+          const previousClientId = clientId.value;
+          clientId.value = data.clientId;
+          if (previousClientId) {
+            void closeAlarmLink(props.appId, props.systemUuid, previousClientId).catch(error => console.error("\u62A5\u8B66\u8054\u52A8\u65E7\u76D1\u542C\u5173\u95ED\u5931\u8D25", error));
+          }
+        }
+      } finally {
+        isLoadingAlarmData = false;
+        if (clientId.value && pendingAlarmMessages.length) {
+          const pendingMessages = pendingAlarmMessages.splice(0);
+          pendingMessages.forEach(({
+            message: message2,
+            receivedClientId
+          }) => processAlarmMessage(message2, receivedClientId));
+        }
+      }
+    };
+    const processAlarmMessage = (message2, receivedClientId = clientId.value) => {
+      let obj;
+      try {
+        obj = JSON.parse(message2.body);
+      } catch (error) {
+        console.error("\u62A5\u8B66\u8054\u52A8\u6D88\u606F\u89E3\u6790\u5931\u8D25", error);
+        return;
+      }
+      const targetClientIds = obj?.webSocketClientIdList;
+      const isTargetClient = [receivedClientId, clientId.value].some(id => id && targetClientIds?.includes?.(id));
+      if (!isTargetClient) {
+        return;
+      }
+      const alarms = Array.isArray(obj?.alarmList) ? obj.alarmList : [];
+      alarms.forEach(alarm => {
+        if (!alarm) return;
+        const instanceUuid = alarm.instanceUuid || obj.instanceUuid;
+        if (!instanceUuid) return;
+        const isClear = alarm.status === "CLEAR_ALARM";
+        const prevInstance = alarmList.value.find(item => item.instanceUuid === instanceUuid);
+        if (prevInstance) {
+          if (!Array.isArray(prevInstance.alarmList)) {
+            prevInstance.alarmList = [];
+          }
+          const idx = prevInstance.alarmList.findIndex(item => item.id === alarm.id);
+          if (idx > -1 && isClear) {
+            prevInstance.alarmList.splice(idx, 1);
+            if (!prevInstance.alarmList.length) {
+              const prevInstIdx = alarmList.value.findIndex(item => item === prevInstance);
+              if (prevInstIdx > -1) alarmList.value.splice(prevInstIdx, 1);
+            }
+          } else if (idx === -1 && !isClear) {
+            prevInstance.alarmList.push(alarm);
+            prevInstance.alarmList.sort((a, b) => a.level - b.level);
+          } else if (idx > -1 && !isClear) {
+            prevInstance.alarmList.splice(idx, 1, alarm);
+          }
+          prevInstance.highLevel = Math.max(prevInstance.highLevel || 0, alarm.level || 0);
+        } else if (!isClear) {
+          alarmList.value.push({
+            ...obj,
+            instanceUuid,
+            alarmList: [alarm]
+          });
+        }
       });
-      clientId.value = data.clientId;
-      client.activate();
     };
-    onMounted(() => {
-      if (isPreview.value) init();
+    const handleAlarmMessage = message2 => {
+      if (!clientId.value || isLoadingAlarmData) {
+        if (pendingAlarmMessages.length < 50) {
+          pendingAlarmMessages.push({
+            message: message2,
+            receivedClientId: clientId.value
+          });
+        }
+        return;
+      }
+      processAlarmMessage(message2);
+    };
+    const refreshTimer = useIntervalFn(() => {
+      if (!clientId.value) return;
+      void refreshAlarmLink(props.appId, props.systemUuid, clientId.value).catch(error => console.error("\u62A5\u8B66\u8054\u52A8\u76D1\u542C\u5237\u65B0\u5931\u8D25", error));
+    }, 1e3 * 60 * 10, {
+      immediate: false
     });
-    const client = new Client({
+    client = new Client({
       brokerURL: BROKERURL,
       onConnect: () => {
         console.log("\u62A5\u8B66\u8054\u52A8\u5DF2\u8FDE\u63A5");
-        useIntervalFn(() => {
-          refreshAlarmLink(props.appId, props.systemUuid, clientId.value);
-        }, 1e3 * 60 * 10);
-        client.subscribe(SUBSCRINBURL, message2 => {
-          var obj = JSON.parse(message2.body);
-          if (!obj.webSocketClientIdList.includes(clientId.value)) return;
-          const alarm = obj.alarmList?.[0];
-          if (!alarm) return;
-          obj.instanceUuid = alarm.instanceUuid;
-          const isClear = alarm.status === "CLEAR_ALARM";
-          const instanceUuid = alarm.instanceUuid;
-          const prevInstance = alarmList.value.find(item => {
-            return item.instanceUuid === instanceUuid;
-          });
-          if (prevInstance) {
-            const idx = prevInstance.alarmList.findIndex(i => i.id === alarm.id);
-            if (idx > -1 && isClear) {
-              prevInstance.alarmList.splice(idx, 1);
-              if (!prevInstance.alarmList.length) {
-                const prevInstIdx = alarmList.value.findIndex(item => item === prevInstance);
-                if (prevInstIdx > -1) alarmList.value.splice(prevInstIdx, 1);
-              }
-            } else if (idx === -1 && !isClear) {
-              prevInstance.alarmList.push(alarm);
-              prevInstance.alarmList.sort((a, b) => a.level - b.level);
-            } else if (idx > -1 && !isClear) {
-              prevInstance.alarmList.splice(idx, 1, alarm);
-            }
-            prevInstance.highLevel = Math.max(prevInstance.highLevel, alarm.level);
-          } else if (!isClear) {
-            alarmList.value.push(obj);
-          }
-        });
+        refreshTimer.resume();
+        client.subscribe(SUBSCRINBURL, handleAlarmMessage);
+        if (hasConnected) {
+          void loadAlarmData().catch(error => console.error("\u62A5\u8B66\u8054\u52A8\u91CD\u8FDE\u540E\u83B7\u53D6\u62A5\u8B66\u5931\u8D25", error));
+        }
+        hasConnected = true;
+      },
+      onWebSocketClose: () => {
+        refreshTimer.pause();
+        console.warn("\u62A5\u8B66\u8054\u52A8\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u7B49\u5F85\u81EA\u52A8\u91CD\u8FDE");
+      },
+      onWebSocketError: error => {
+        console.error("\u62A5\u8B66\u8054\u52A8 WebSocket \u5F02\u5E38", error);
+      },
+      onStompError: frame => {
+        console.error("\u62A5\u8B66\u8054\u52A8 STOMP \u5F02\u5E38", frame.headers?.message || frame);
       }
     });
+    const init = async () => {
+      try {
+        client.activate();
+        await loadAlarmData();
+      } catch (error) {
+        console.error("\u62A5\u8B66\u8054\u52A8\u521D\u59CB\u5316\u5931\u8D25", error);
+        void client.deactivate();
+      }
+    };
+    onMounted(() => {
+      if (isPreview.value) void init();
+    });
     const modalRef = ref();
+    const linkageContainer = ref();
     whenever(() => !modalRef.value?.visible, () => alarmList.value = []);
+    let cleaned = false;
     const clean = () => {
+      if (cleaned) return;
+      cleaned = true;
+      refreshTimer.pause();
+      void client.deactivate();
       if (clientId.value) {
-        closeAlarmLink(props.appId, props.systemUuid, clientId.value);
+        void closeAlarmLink(props.appId, props.systemUuid, clientId.value).catch(error => console.error("\u62A5\u8B66\u8054\u52A8\u5173\u95ED\u76D1\u542C\u5931\u8D25", error));
       }
     };
     onBeforeUnmount(clean);
@@ -3305,6 +3392,7 @@ const AlarmLinkage = defineComponent({
          */
         customCardBody: () => {
           return createVNode("div", {
+            "ref": linkageContainer,
             "class": "inl-card-alarm-linkage",
             "id": "alarmLinkage"
           }, [createVNode("div", null, ["\u62A5\u8B66\u6291\u5236"]), createVNode(AlarmVideo, {
@@ -3313,7 +3401,8 @@ const AlarmLinkage = defineComponent({
             "alarmData": alarmList.value,
             "countDown": props.rollTime,
             "keep": true,
-            "theme": props.darkTheme ? "dark" : "light"
+            "theme": props.darkTheme ? "dark" : "light",
+            "getContainer": () => linkageContainer.value || document.body
           }, null)]);
         }
       }),

package/dist/index.js

@@ -9930,6 +9930,9 @@ const props$4 = {
   countDown: {
     type: Number,
     default: 10
+  },
+  getContainer: {
+    type: Function
   }
 };
 const AlarmVideo = defineComponent({
@@ -10077,7 +10080,7 @@ const AlarmVideo = defineComponent({
       "footer": null,
       "width": 900,
       "centered": true,
-      "getContainer": () => document.getElementById("alarmLinkage")
+      "getContainer": _props.getContainer || (() => document.getElementById("alarmLinkage") || document.body)
     }, {
       default: () => [createVNode("div", {
         "class": "body"
@@ -10162,7 +10165,7 @@ const AlarmVideo = defineComponent({
   }
 });
 
-const BROKERURL = "ws://" + location.host + "/mtip-app-center-websocket";
+const BROKERURL = (location.protocol === "https:" ? "wss://" : "ws://") + location.host + "/mtip-app-center-websocket";
 const SUBSCRINBURL = "/queue/alarm";
 const Props$1 = createCardProps({
   title: {
@@ -10224,65 +10227,149 @@ const AlarmLinkage = defineComponent({
     }
     const alarmList = ref([]);
     const clientId = ref("");
-    const init = async () => {
-      const {
-        data
-      } = await getInitialAlarmLinkage(props.appId, props.systemUuid);
-      alarmList.value = data.alarmFeed;
-      alarmList.value.filter(i => i.alarmList.length > 0).forEach(item => {
-        const firstAlarm = item.alarmList[0];
-        item.instanceUuid = firstAlarm.instanceUuid;
+    let client;
+    let hasConnected = false;
+    let isLoadingAlarmData = false;
+    const pendingAlarmMessages = [];
+    const loadAlarmData = async () => {
+      isLoadingAlarmData = true;
+      try {
+        const {
+          data
+        } = await getInitialAlarmLinkage(props.appId, props.systemUuid);
+        const alarmFeed = Array.isArray(data?.alarmFeed) ? data.alarmFeed : [];
+        alarmFeed.filter(item => Array.isArray(item.alarmList) && item.alarmList.length > 0).forEach(item => {
+          item.instanceUuid = item.alarmList[0].instanceUuid;
+        });
+        alarmList.value = alarmFeed;
+        if (data?.clientId && data.clientId !== clientId.value) {
+          const previousClientId = clientId.value;
+          clientId.value = data.clientId;
+          if (previousClientId) {
+            void closeAlarmLink(props.appId, props.systemUuid, previousClientId).catch(error => console.error("\u62A5\u8B66\u8054\u52A8\u65E7\u76D1\u542C\u5173\u95ED\u5931\u8D25", error));
+          }
+        }
+      } finally {
+        isLoadingAlarmData = false;
+        if (clientId.value && pendingAlarmMessages.length) {
+          const pendingMessages = pendingAlarmMessages.splice(0);
+          pendingMessages.forEach(({
+            message: message2,
+            receivedClientId
+          }) => processAlarmMessage(message2, receivedClientId));
+        }
+      }
+    };
+    const processAlarmMessage = (message2, receivedClientId = clientId.value) => {
+      let obj;
+      try {
+        obj = JSON.parse(message2.body);
+      } catch (error) {
+        console.error("\u62A5\u8B66\u8054\u52A8\u6D88\u606F\u89E3\u6790\u5931\u8D25", error);
+        return;
+      }
+      const targetClientIds = obj?.webSocketClientIdList;
+      const isTargetClient = [receivedClientId, clientId.value].some(id => id && targetClientIds?.includes?.(id));
+      if (!isTargetClient) {
+        return;
+      }
+      const alarms = Array.isArray(obj?.alarmList) ? obj.alarmList : [];
+      alarms.forEach(alarm => {
+        if (!alarm) return;
+        const instanceUuid = alarm.instanceUuid || obj.instanceUuid;
+        if (!instanceUuid) return;
+        const isClear = alarm.status === "CLEAR_ALARM";
+        const prevInstance = alarmList.value.find(item => item.instanceUuid === instanceUuid);
+        if (prevInstance) {
+          if (!Array.isArray(prevInstance.alarmList)) {
+            prevInstance.alarmList = [];
+          }
+          const idx = prevInstance.alarmList.findIndex(item => item.id === alarm.id);
+          if (idx > -1 && isClear) {
+            prevInstance.alarmList.splice(idx, 1);
+            if (!prevInstance.alarmList.length) {
+              const prevInstIdx = alarmList.value.findIndex(item => item === prevInstance);
+              if (prevInstIdx > -1) alarmList.value.splice(prevInstIdx, 1);
+            }
+          } else if (idx === -1 && !isClear) {
+            prevInstance.alarmList.push(alarm);
+            prevInstance.alarmList.sort((a, b) => a.level - b.level);
+          } else if (idx > -1 && !isClear) {
+            prevInstance.alarmList.splice(idx, 1, alarm);
+          }
+          prevInstance.highLevel = Math.max(prevInstance.highLevel || 0, alarm.level || 0);
+        } else if (!isClear) {
+          alarmList.value.push({
+            ...obj,
+            instanceUuid,
+            alarmList: [alarm]
+          });
+        }
       });
-      clientId.value = data.clientId;
-      client.activate();
     };
-    onMounted(() => {
-      if (isPreview.value) init();
+    const handleAlarmMessage = message2 => {
+      if (!clientId.value || isLoadingAlarmData) {
+        if (pendingAlarmMessages.length < 50) {
+          pendingAlarmMessages.push({
+            message: message2,
+            receivedClientId: clientId.value
+          });
+        }
+        return;
+      }
+      processAlarmMessage(message2);
+    };
+    const refreshTimer = useIntervalFn(() => {
+      if (!clientId.value) return;
+      void refreshAlarmLink(props.appId, props.systemUuid, clientId.value).catch(error => console.error("\u62A5\u8B66\u8054\u52A8\u76D1\u542C\u5237\u65B0\u5931\u8D25", error));
+    }, 1e3 * 60 * 10, {
+      immediate: false
     });
-    const client = new Client({
+    client = new Client({
       brokerURL: BROKERURL,
       onConnect: () => {
         console.log("\u62A5\u8B66\u8054\u52A8\u5DF2\u8FDE\u63A5");
-        useIntervalFn(() => {
-          refreshAlarmLink(props.appId, props.systemUuid, clientId.value);
-        }, 1e3 * 60 * 10);
-        client.subscribe(SUBSCRINBURL, message2 => {
-          var obj = JSON.parse(message2.body);
-          if (!obj.webSocketClientIdList.includes(clientId.value)) return;
-          const alarm = obj.alarmList?.[0];
-          if (!alarm) return;
-          obj.instanceUuid = alarm.instanceUuid;
-          const isClear = alarm.status === "CLEAR_ALARM";
-          const instanceUuid = alarm.instanceUuid;
-          const prevInstance = alarmList.value.find(item => {
-            return item.instanceUuid === instanceUuid;
-          });
-          if (prevInstance) {
-            const idx = prevInstance.alarmList.findIndex(i => i.id === alarm.id);
-            if (idx > -1 && isClear) {
-              prevInstance.alarmList.splice(idx, 1);
-              if (!prevInstance.alarmList.length) {
-                const prevInstIdx = alarmList.value.findIndex(item => item === prevInstance);
-                if (prevInstIdx > -1) alarmList.value.splice(prevInstIdx, 1);
-              }
-            } else if (idx === -1 && !isClear) {
-              prevInstance.alarmList.push(alarm);
-              prevInstance.alarmList.sort((a, b) => a.level - b.level);
-            } else if (idx > -1 && !isClear) {
-              prevInstance.alarmList.splice(idx, 1, alarm);
-            }
-            prevInstance.highLevel = Math.max(prevInstance.highLevel, alarm.level);
-          } else if (!isClear) {
-            alarmList.value.push(obj);
-          }
-        });
+        refreshTimer.resume();
+        client.subscribe(SUBSCRINBURL, handleAlarmMessage);
+        if (hasConnected) {
+          void loadAlarmData().catch(error => console.error("\u62A5\u8B66\u8054\u52A8\u91CD\u8FDE\u540E\u83B7\u53D6\u62A5\u8B66\u5931\u8D25", error));
+        }
+        hasConnected = true;
+      },
+      onWebSocketClose: () => {
+        refreshTimer.pause();
+        console.warn("\u62A5\u8B66\u8054\u52A8\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u7B49\u5F85\u81EA\u52A8\u91CD\u8FDE");
+      },
+      onWebSocketError: error => {
+        console.error("\u62A5\u8B66\u8054\u52A8 WebSocket \u5F02\u5E38", error);
+      },
+      onStompError: frame => {
+        console.error("\u62A5\u8B66\u8054\u52A8 STOMP \u5F02\u5E38", frame.headers?.message || frame);
+      }
+    });
+    const init = async () => {
+      try {
+        client.activate();
+        await loadAlarmData();
+      } catch (error) {
+        console.error("\u62A5\u8B66\u8054\u52A8\u521D\u59CB\u5316\u5931\u8D25", error);
+        void client.deactivate();
       }
+    };
+    onMounted(() => {
+      if (isPreview.value) void init();
     });
     const modalRef = ref();
+    const linkageContainer = ref();
     whenever(() => !modalRef.value?.visible, () => alarmList.value = []);
+    let cleaned = false;
     const clean = () => {
+      if (cleaned) return;
+      cleaned = true;
+      refreshTimer.pause();
+      void client.deactivate();
       if (clientId.value) {
-        closeAlarmLink(props.appId, props.systemUuid, clientId.value);
+        void closeAlarmLink(props.appId, props.systemUuid, clientId.value).catch(error => console.error("\u62A5\u8B66\u8054\u52A8\u5173\u95ED\u76D1\u542C\u5931\u8D25", error));
       }
     };
     onBeforeUnmount(clean);
@@ -10295,6 +10382,7 @@ const AlarmLinkage = defineComponent({
          */
         customCardBody: () => {
           return createVNode("div", {
+            "ref": linkageContainer,
             "class": "inl-card-alarm-linkage",
             "id": "alarmLinkage"
           }, [createVNode("div", null, ["\u62A5\u8B66\u6291\u5236"]), createVNode(AlarmVideo, {
@@ -10303,7 +10391,8 @@ const AlarmLinkage = defineComponent({
             "alarmData": alarmList.value,
             "countDown": props.rollTime,
             "keep": true,
-            "theme": props.darkTheme ? "dark" : "light"
+            "theme": props.darkTheme ? "dark" : "light",
+            "getContainer": () => linkageContainer.value || document.body
           }, null)]);
         }
       }),

package/package.json

@@ -1,10 +1,10 @@
 {
   "type": "module",
-  "version": "1.5.43",
+  "version": "1.5.45",
   "name": "inl-app-manager",
   "scripts": {
-    "build": "cross-env NODE_ENV=production node --max_old_space_size=8192 node_modules/rollup/dist/bin/rollup --config rollup.config.js --bundleConfigAsCjs",
-    "dev": "cross-env NODE_ENV=development node --max_old_space_size=8192 node_modules/rollup/dist/bin/rollup --config rollup.config.js --bundleConfigAsCjs -w",
+    "build": "cross-env NODE_ENV=production node --max_old_space_size=8192 node_modules/rollup/dist/bin/rollup --config rollup.config.cjs --bundleConfigAsCjs",
+    "dev": "cross-env NODE_ENV=development node --max_old_space_size=8192 node_modules/rollup/dist/bin/rollup --config rollup.config.cjs --bundleConfigAsCjs -w",
     "site": "vite ./site",
     "test": "echo 123"
   },
@@ -21,6 +21,7 @@
     "@rollup/plugin-node-resolve": "^15.3.1",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/less": "^3.0.7",
+    "@types/lodash": "^4.17.14",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.17.12",
     "@types/vue": "^2.0.0",
@@ -89,4 +90,4 @@
       "cheerio": "1.0.0-rc.12"
     }
   }
-}
+}

package/rollup.config.cjs

@@ -0,0 +1,2 @@
+require("esbuild-register");
+module.exports = require("./rollup.config.ts");

package/rollup.config.ts

@@ -12,7 +12,7 @@ import alias from "@rollup/plugin-alias";
 import postcss from "rollup-plugin-postcss";
 import cssnano from "cssnano";
 import { defineConfig } from "rollup";
-import { entry } from "./entry";
+import { entry } from "./entry.cjs";
 
 const onwarn = (warning, rollupWarn) => {
   // 剔除无用警告

package/entry.js

@@ -1,14 +0,0 @@
-export const entry = [
-  {
-    type: "main",
-    root: "src/index.ts",
-  },
-  {
-    type: "elements",
-    root: "src/elements/index.ts",
-  },
-  {
-    type: "clientUtils",
-    root: "src/clientUtils/index.ts",
-  },
-];