yxuse 3.0.102 → 3.0.104

package/lib/index.es2.js

@@ -61,68 +61,228 @@ const yxFecth = {
   put: (url, data, config) => baseRequest(url, "PUT", data, config),
   delete: (url, data, config) => baseRequest(url, "DELETE", data, config)
 };
-const clientOptions = {
+const getOrCreateClientId = () => {
+  return `mqttjs_${Date.now()}_${Math.random().toString(16).slice(2, 8)}`;
+};
+const defaultClientOptions = {
   mqttVersion: 5,
   clean: true,
   // true: 清除会话, false: 保留会话
   connectTimeout: 4e3,
-  // 超时时间
-  keepAlive: 60,
-  // 认证信息
-  clientId: "mqttjs_" + Date.now(),
+  // 超时时间（ms）
+  keepalive: 30,
+  // 心跳时间（s）：mqtt.js 会按此间隔自动发送 PINGREQ
+  reconnectPeriod: 6e4
   // username: "xxxx",
   // password: "xxxx",
-  qos: 1
 };
-const subscribeMap = /* @__PURE__ */ new Map();
+const defaultSubscribeOptions = { qos: 1 };
+const defaultPublishOptions = { qos: 1 };
 class MQ {
   constructor(url, options) {
-    __publicField(this, "client");
-    this.client = null;
-    this.subscribe = this.subscribe;
-    this.unsubscribe = this.unsubscribe;
-    this.publish = this.publish;
-    this.destroyed = this.destroyed;
-    this.createClient(url, { ...clientOptions, ...options });
+    __publicField(this, "client", null);
+    __publicField(this, "subscribeMap", /* @__PURE__ */ new Map());
+    __publicField(this, "onConnect");
+    __publicField(this, "onReconnect");
+    __publicField(this, "onError");
+    __publicField(this, "onMessage");
+    __publicField(this, "destroyed");
+    /**标记是否为手动关闭连接 */
+    __publicField(this, "isManualClose", false);
+    this.onConnect = (e) => {
+      this.resubscribeAll();
+    };
+    this.onReconnect = (error) => {
+    };
+    this.onError = (error) => {
+      const err = error instanceof Error ? error : new Error(String(error));
+      this.analyzeDisconnectReason(err);
+    };
+    this.onMessage = (topic, message) => {
+      var _a;
+      const callback = this.subscribeMap.get(topic);
+      if (!callback) return;
+      let payload = message;
+      try {
+        const text = (_a = message == null ? void 0 : message.toString) == null ? void 0 : _a.call(message);
+        if (text != null) payload = JSON.parse(text);
+      } catch (error) {
+      }
+      callback(payload, topic);
+    };
+    this.destroyed = () => {
+      var _a;
+      this.isManualClose = true;
+      (_a = this.client) == null ? void 0 : _a.end(true);
+    };
+    this.subscribe = this.subscribe.bind(this);
+    this.unsubscribe = this.unsubscribe.bind(this);
+    this.publish = this.publish.bind(this);
+    const merged = { ...defaultClientOptions, ...options };
+    merged.clientId || (merged.clientId = getOrCreateClientId());
+    this.createClient(url, merged);
   }
   createClient(url, options) {
     this.client = mqtt_minExports.connect(url, options);
-    this.client.on("connect", this.onConnect);
-    this.client.on("reconnect", this.onReconnect);
-    this.client.on("error", this.onError);
-    this.client.on("message", this.onMessage);
+    this.client.on("connect", (e) => this.onConnect(e));
+    this.client.on("reconnect", (error) => this.onReconnect(error));
+    this.client.on("error", (error) => this.onError(error));
+    this.client.on("message", (topic, message) => this.onMessage(topic, message));
+    this.client.on("offline", () => {
+      (/* @__PURE__ */ new Date()).toISOString();
+    });
+    this.client.on("close", (hadError, error) => {
+      (/* @__PURE__ */ new Date()).toISOString();
+      if (this.isManualClose) {
+        this.isManualClose = false;
+        return;
+      }
+      if (error) {
+        this.analyzeDisconnectReason(error);
+      }
+    });
+    this.client.on("online", () => {
+    });
   }
-  publish(topic, message) {
-    this.client.publish(topic, message, { qos: clientOptions.qos }, (e) => {
+  publish(topic, message, options = defaultPublishOptions) {
+    if (!this.client) return;
+    const payload = typeof message === "string" ? message : JSON.stringify(message);
+    this.client.publish(topic, payload, options, (e) => {
     });
   }
-  subscribe(topic, callback) {
-    this.client.subscribe(topic, (error) => {
+  subscribe(topic, callback, options = defaultSubscribeOptions) {
+    if (!this.client) return;
+    this.client.subscribe(topic, options, (error) => {
       if (!error) {
-        subscribeMap.set(topic, callback);
+        this.subscribeMap.set(topic, callback);
       } else {
-        throw new Error(error);
+        throw error instanceof Error ? error : new Error(String(error));
       }
     });
   }
   unsubscribe(topic) {
+    if (!this.client) return;
     this.client.unsubscribe(topic, {}, (error) => {
+      if (error) ;
+      else {
+        this.subscribeMap.delete(topic);
+      }
     });
   }
-  onConnect(e) {
+  resubscribeAll() {
+    if (!this.client) return;
+    this.subscribeMap.forEach((_callback, topic) => {
+      this.client.subscribe(topic, defaultSubscribeOptions, (error) => {
+      });
+    });
   }
-  onReconnect(error) {
+  /**
+   * @description 分析断开原因
+   * @param error 错误对象
+   * @returns 断开原因描述
+   */
+  analyzeDisconnectReason(error) {
+    var _a, _b, _c;
+    const errorCode = error.code || error.message;
+    if (errorCode === "ECONNREFUSED") {
+      return "服务器拒绝连接（服务器可能关闭或不可用）";
+    }
+    if (errorCode === "ETIMEDOUT") {
+      return "连接超时（网络延迟或服务器无响应）";
+    }
+    if (errorCode === "ENETUNREACH") {
+      return "网络不可达（网络中断）";
+    }
+    if (errorCode === "ECONNRESET") {
+      return "连接被重置（服务器主动断开连接）";
+    }
+    if (errorCode === "EPIPE" || errorCode === "ECONNABORTED") {
+      return "连接异常终止（网络中断或服务器关闭）";
+    }
+    if (((_a = error.message) == null ? void 0 : _a.includes("Not authorized")) || ((_b = error.message) == null ? void 0 : _b.includes("unauthorized"))) {
+      return "服务器主动断开 - 认证失败";
+    }
+    if ((_c = error.message) == null ? void 0 : _c.includes("Connection refused")) {
+      return "服务器主动断开 - 连接被拒绝";
+    }
+    return `其他错误: ${errorCode || error.message}`;
   }
-  onError(error) {
+}
+const pool = /* @__PURE__ */ new Map();
+const assertConnection = (url) => {
+  const conn = pool.get(url);
+  if (!conn) {
+    throw new Error(`[mqtt] MQ(${url}) 未初始化，请先调用 initMQSingleton(url, options)`);
   }
-  onMessage(topic, message) {
-    const data = message.toString();
-    subscribeMap.get(topic)(JSON.parse(data));
+  return conn;
+};
+const getMQSingletonUrls = () => Array.from(pool.keys());
+const initMQSingleton = (url, options, config = {}) => {
+  const existed = pool.get(url);
+  if (existed && !config.force) return existed.mq;
+  if (existed && config.force) destroyMQSingleton(url);
+  const mq = new MQ(url, options);
+  pool.set(url, {
+    url,
+    mq,
+    topicHandlers: /* @__PURE__ */ new Map(),
+    topicDispatcher: /* @__PURE__ */ new Map()
+  });
+  return mq;
+};
+const getMQSingleton = (url) => {
+  var _a;
+  return ((_a = pool.get(url)) == null ? void 0 : _a.mq) ?? null;
+};
+const publishMQ = (url, topic, message, options) => {
+  const { mq } = assertConnection(url);
+  mq.publish(topic, message, options);
+};
+const subscribeMQ = (url, topic, handler, options) => {
+  const conn = assertConnection(url);
+  const { mq, topicHandlers, topicDispatcher } = conn;
+  let set = topicHandlers.get(topic);
+  const isFirst = !set;
+  if (!set) {
+    set = /* @__PURE__ */ new Set();
+    topicHandlers.set(topic, set);
   }
-  destroyed() {
-    if (this.client.end) this.client.end();
+  set.add(handler);
+  if (isFirst) {
+    const dispatcher = (payload, t) => {
+      const handlers = topicHandlers.get(t);
+      if (!handlers || handlers.size === 0) return;
+      handlers.forEach((fn) => fn(payload, t));
+    };
+    topicDispatcher.set(topic, dispatcher);
+    mq.subscribe(topic, dispatcher, options);
   }
-}
+  return () => unsubscribeMQ(url, topic, handler);
+};
+const unsubscribeMQ = (url, topic, handler) => {
+  const conn = pool.get(url);
+  if (!conn) return;
+  const { mq, topicHandlers, topicDispatcher } = conn;
+  const set = topicHandlers.get(topic);
+  if (!set) return;
+  if (handler) set.delete(handler);
+  else set.clear();
+  if (set.size > 0) return;
+  topicHandlers.delete(topic);
+  topicDispatcher.delete(topic);
+  mq.unsubscribe(topic);
+};
+const destroyMQSingleton = (url) => {
+  const conn = pool.get(url);
+  if (!conn) return;
+  conn.mq.destroyed();
+  conn.topicHandlers.clear();
+  conn.topicDispatcher.clear();
+  pool.delete(url);
+};
+const destroyAllMQSingleton = () => {
+  Array.from(pool.keys()).forEach((url) => destroyMQSingleton(url));
+};
 class Ws {
   constructor(options, protocols) {
     __publicField(this, "url");
@@ -294,14 +454,22 @@ const utils2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
   areColorsSimilar,
   copyText,
   deepClone,
+  destroyAllMQSingleton,
+  destroyMQSingleton,
   enumToArray,
   getCownDownTime,
+  getMQSingleton,
+  getMQSingletonUrls,
   getSelectOptions,
   http,
+  initMQSingleton,
   isColorEqual,
   isDarkColor,
   notifyMessageToSystems,
+  publishMQ,
   receiveMessage,
+  subscribeMQ,
+  unsubscribeMQ,
   useConfirm,
   yxFecth,
   yxMessage,
@@ -310,6 +478,14 @@ const utils2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
 export {
   MQ as M,
   Ws as W,
+  getMQSingleton as a,
+  unsubscribeMQ as b,
+  destroyAllMQSingleton as c,
+  destroyMQSingleton as d,
+  getMQSingletonUrls as g,
+  initMQSingleton as i,
+  publishMQ as p,
+  subscribeMQ as s,
   utils2 as u,
   yxFecth as y
 };

package/lib/index.es5.js

@@ -43,7 +43,8 @@ const defaultConfig = {
   systemKey: "",
   isTranslateApi: false,
   whitelistTranslateApi: [],
-  autoGetSystemConfig: true
+  autoGetSystemConfig: true,
+  autoListenMissFileReload: true
 };
 const exportToExcel = ({ header, tableData, fileName }) => {
   const tHeader = header.map((col) => col.label);
@@ -1720,7 +1721,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const YxForm = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-f836a157"]]);
+const YxForm = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-8c52a48d"]]);
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
@@ -2579,7 +2580,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
     [vShow, $props.value > 0]
   ]);
 }
-const Badge = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-588a1297"]]);
+const Badge = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-181eafdb"]]);
 const _sfc_main$1 = {
   components: { theme, issue, Badge, lang },
   props: {
@@ -2705,7 +2706,7 @@ const _hoisted_3 = { class: "tool-icon relative flex justify-center items-center
 const _hoisted_4 = {
   class: "yx-icon",
   style: { "color": "var(--color-main-100)" },
-  color: "var(--color-main-100)                        \n                        ",
+  color: "var(--color-main-100)                        \r\n                        ",
   size: "24"
 };
 const _hoisted_5 = { class: "mt-10 text-center" };
@@ -2808,7 +2809,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const ToolbarContainer = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-adceffc6"]]);
+const ToolbarContainer = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-96edce95"]]);
 const _hoisted_1$1 = {
   xmlns: "http://www.w3.org/2000/svg",
   width: "50",
@@ -2919,8 +2920,8 @@ const __default__ = {
 };
 const __injectCSSVars__ = () => {
   useCssVars((_ctx) => ({
-    "0b6a2599": _ctx.panelWidthPX,
-    "7fe18f84": _ctx.panelHeightPX
+    "e957f242": _ctx.panelWidthPX,
+    "05985204": _ctx.panelHeightPX
   }));
 };
 const __setup__ = __default__.setup;
@@ -2963,7 +2964,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, null, 8, ["badgeValue", "showTool"])
   ]);
 }
-const ToolbarApp = /* @__PURE__ */ _export_sfc(__default__, [["render", _sfc_render], ["__scopeId", "data-v-1a4229ae"]]);
+const ToolbarApp = /* @__PURE__ */ _export_sfc(__default__, [["render", _sfc_render], ["__scopeId", "data-v-6db83be1"]]);
 const _Toolbar = class _Toolbar {
   constructor(config2) {
     /** 工具挂载domId */
@@ -3058,16 +3059,82 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
+const isFileMissingError = (error) => {
+  if (!error) return false;
+  const errorMessage = error.message || error.toString() || "";
+  const errorType = error.type || "";
+  if (errorMessage.includes("Failed to fetch dynamically imported module")) return true;
+  if (errorMessage.includes("Loading chunk") && errorMessage.includes("failed")) return true;
+  if (errorMessage.includes("ChunkLoadError")) return true;
+  if (errorMessage.includes("Failed to load resource") || errorMessage.includes("404")) return true;
+  if (errorMessage.includes("NetworkError") && (errorMessage.includes(".js") || errorMessage.includes(".css"))) return true;
+  if (errorType === "error" && error.target && (error.target.tagName === "SCRIPT" || error.target.tagName === "LINK")) return true;
+  return false;
+};
+const refreshPage = (originUrl2) => {
+  if (window.parent !== window) {
+    window.location.href = originUrl2;
+    window.location.reload();
+  } else {
+    window.location.reload();
+  }
+};
+const showRefreshDialog = (originUrl2) => {
+  return ElMessageBox.confirm("软件已更新，是否立即刷新页面?", "提示", {
+    showCancelButton: false,
+    showClose: false,
+    closeOnClickModal: false,
+    closeOnPressEscape: false,
+    type: "warning"
+  }).then(() => {
+    refreshPage(originUrl2);
+  }).catch(() => {
+  });
+};
+let originUrl = window.location.href;
+let hasRefreshed = false;
+let refreshTimer = null;
+const handleRefresh = () => {
+  if (hasRefreshed) return;
+  hasRefreshed = true;
+  if (refreshTimer) {
+    clearTimeout(refreshTimer);
+  }
+  refreshTimer = setTimeout(() => {
+    showRefreshDialog(originUrl);
+  }, 100);
+};
+const checkVersion = () => {
+  window.addEventListener("unhandledrejection", (event) => {
+    if (isFileMissingError(event.reason)) {
+      handleRefresh();
+    }
+  });
+  window.addEventListener("error", (event) => {
+    if (event.target && event.target.tagName) {
+      const target = event.target;
+      if ((target.tagName === "SCRIPT" || target.tagName === "LINK") && isFileMissingError(event)) {
+        handleRefresh();
+        return;
+      }
+    }
+    if (event.message && isFileMissingError({ message: event.message })) {
+      handleRefresh();
+    }
+  }, true);
+};
 const install = async (config2) => {
   var _a;
   config2 = { ...defaultConfig, ...config2 };
   let themeId = getCurTheme();
   try {
+    handleListenMissFile(config2);
     await handleSystemConfig(config2);
     const { data } = await http.get(config2 == null ? void 0 : config2.themeApiUrl, {}, { headers: { noLoading: true } });
     window["YX_THEME_LIST"] = data;
     if (config2.isRenderLang && config2.systemKey) {
       const lang2 = await getLang();
+      changeSystemConfig("lang", lang2);
       await initTranslate({ to: lang2 ? lang2 : config2.lang, systemKey: config2.systemKey });
     }
     if (config2.isRenderToolbar) {
@@ -3107,6 +3174,10 @@ const handleSystemConfig = async (options) => {
     }
   }
 };
+const handleListenMissFile = (options) => {
+  if (!options.autoListenMissFileReload) return;
+  checkVersion();
+};
 const initTtcFont = () => {
   const style = document.createElement("style");
   style.innerHTML = ttcFontFamily;

package/lib/index.es6.js

@@ -269,7 +269,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Update = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-ebf4f18f"]]);
+const Update = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-668773ee"]]);
 const _sfc_main$2 = {
   props: {
     color: {
@@ -290,7 +290,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     renderSlot(_ctx.$slots, "default", {}, void 0, true)
   ], 4);
 }
-const index = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$1], ["__scopeId", "data-v-a90cbe2e"]]);
+const index = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$1], ["__scopeId", "data-v-4f75e32e"]]);
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -451,7 +451,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, toDisplayString((_d = $data.customConfig) == null ? void 0 : _d.title), 5)) : createCommentVNode("", true)
   ], 2);
 }
-const LogoTitle = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-ca535457"]]);
+const LogoTitle = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-25281149"]]);
 class LogoTitleRender {
   constructor(props, domId = "system-logo-title") {
     this.render(props, domId);

package/lib/utils.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index.cjs11.js"),s=require("./index.cjs12.js"),o=require("./index.cjs2.js");exports.http=e.http,exports.yxSubscribe=e.yxSubscribe,exports.areColorsSimilar=s.areColorsSimilar,exports.copyText=s.copyText,exports.deepClone=s.deepClone,exports.enumToArray=s.enumToArray,exports.getCownDownTime=s.getCownDownTime,exports.getSelectOptions=s.getSelectOptions,exports.isColorEqual=s.isColorEqual,exports.isDarkColor=s.isDarkColor,exports.notifyMessageToSystems=s.notifyMessageToSystems,exports.receiveMessage=s.receiveMessage,exports.useConfirm=s.useConfirm,exports.yxMessage=s.yxMessage,exports.MQ=o.MQ,exports.WS=o.Ws,exports.yxFecth=o.yxFecth;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index.cjs11.js"),s=require("./index.cjs12.js"),o=require("./index.cjs2.js");exports.http=e.http,exports.yxSubscribe=e.yxSubscribe,exports.areColorsSimilar=s.areColorsSimilar,exports.copyText=s.copyText,exports.deepClone=s.deepClone,exports.enumToArray=s.enumToArray,exports.getCownDownTime=s.getCownDownTime,exports.getSelectOptions=s.getSelectOptions,exports.isColorEqual=s.isColorEqual,exports.isDarkColor=s.isDarkColor,exports.notifyMessageToSystems=s.notifyMessageToSystems,exports.receiveMessage=s.receiveMessage,exports.useConfirm=s.useConfirm,exports.yxMessage=s.yxMessage,exports.MQ=o.MQ,exports.WS=o.Ws,exports.destroyAllMQSingleton=o.destroyAllMQSingleton,exports.destroyMQSingleton=o.destroyMQSingleton,exports.getMQSingleton=o.getMQSingleton,exports.getMQSingletonUrls=o.getMQSingletonUrls,exports.initMQSingleton=o.initMQSingleton,exports.publishMQ=o.publishMQ,exports.subscribeMQ=o.subscribeMQ,exports.unsubscribeMQ=o.unsubscribeMQ,exports.yxFecth=o.yxFecth;

package/lib/utils.es.js

@@ -1,20 +1,28 @@
 import { a, y } from "./index.es11.js";
 import { a as a2, c, d, e, g, b, i, f, n, r, u, y as y2 } from "./index.es12.js";
-import { M, W, y as y3 } from "./index.es2.js";
+import { M, W, c as c2, d as d2, a as a3, g as g2, i as i2, p, s, b as b2, y as y3 } from "./index.es2.js";
 export {
   M as MQ,
   W as WS,
   a2 as areColorsSimilar,
   c as copyText,
   d as deepClone,
+  c2 as destroyAllMQSingleton,
+  d2 as destroyMQSingleton,
   e as enumToArray,
   g as getCownDownTime,
+  a3 as getMQSingleton,
+  g2 as getMQSingletonUrls,
   b as getSelectOptions,
   a as http,
+  i2 as initMQSingleton,
   i as isColorEqual,
   f as isDarkColor,
   n as notifyMessageToSystems,
+  p as publishMQ,
   r as receiveMessage,
+  s as subscribeMQ,
+  b2 as unsubscribeMQ,
   u as useConfirm,
   y3 as yxFecth,
   y2 as yxMessage,

package/lib/version.json

@@ -1,13 +1,13 @@
-{
-    "version": "1.0.4",
-    "isNotice": true,
-    "message": {
-        "title": "🚀🚀🚀系统更新通知🚀🚀🚀",
-        "description": "我们做了如下改动我们做了如下改动我们做了如下改动我们做了如下改动我们做了如下改动我们做了如下改动我们做了如下改动",
-        "content": {
-            "1": "修复了部分bug",
-            "2": "新增了xxx功能"
-        },
-        "time": "2023年12月7日"
-    }
+{
+    "version": "1.0.4",
+    "isNotice": true,
+    "message": {
+        "title": "🚀🚀🚀系统更新通知🚀🚀🚀",
+        "description": "我们做了如下改动我们做了如下改动我们做了如下改动我们做了如下改动我们做了如下改动我们做了如下改动我们做了如下改动",
+        "content": {
+            "1": "修复了部分bug",
+            "2": "新增了xxx功能"
+        },
+        "time": "2023年12月7日"
+    }
 }