@fmdeui/fmui 1.0.24 → 1.0.26

package/es/index.mjs

@@ -34,9 +34,9 @@ export { initBackEndControlRoutes, setDynamicViewsModules } from './packages/rou
 export { initFrontEndControlRoutes } from './packages/router/frontEnd.mjs';
 export { judgementIdCard, verifiyNumberInteger, verifyAccount, verifyAndSpace, verifyCarNum, verifyCnAndSpace, verifyEmail, verifyEnAndSpace, verifyFullName, verifyIPAddress, verifyIdCard, verifyNumberCnUppercase, verifyNumberComma, verifyNumberIntegerAndFloat, verifyNumberPercentage, verifyNumberPercentageFloat, verifyPassword, verifyPasswordPowerful, verifyPasswordStrength, verifyPhone, verifyPostalCode, verifyTelPhone, verifyTextColor, verifyUrl } from './packages/utils/toolsValidate.mjs';
 export { loadSysInfo, updateFavicon } from './packages/hooks/sysInfo.mjs';
+export { restartSignalR, signalR } from './packages/utils/signalR.mjs';
 export { router } from './packages/router/createRouter.mjs';
 export { saulVModel } from './packages/utils/saulVModel.mjs';
-export { signalR } from './packages/utils/signalR.mjs';
 export { signatureByKSort } from './packages/utils/data-signature.mjs';
 export { useApi, useBaseApi } from './packages/api/base/index.mjs';
 export { useChangeColor } from './packages/utils/theme.mjs';

package/es/packages/utils/index.mjs

@@ -18,4 +18,4 @@ export { saulVModel } from './saulVModel.mjs';
 export { Local, Session } from './storage.mjs';
 export { useChangeColor } from './theme.mjs';
 export { judgementIdCard, verifiyNumberInteger, verifyAccount, verifyAndSpace, verifyCarNum, verifyCnAndSpace, verifyEmail, verifyEnAndSpace, verifyFullName, verifyIPAddress, verifyIdCard, verifyNumberCnUppercase, verifyNumberComma, verifyNumberIntegerAndFloat, verifyNumberPercentage, verifyNumberPercentageFloat, verifyPassword, verifyPasswordPowerful, verifyPasswordStrength, verifyPhone, verifyPostalCode, verifyTelPhone, verifyTextColor, verifyUrl } from './toolsValidate.mjs';
-export { signalR } from './signalR.mjs';
+export { restartSignalR, signalR } from './signalR.mjs';

package/es/packages/utils/signalR.mjs

@@ -2,8 +2,13 @@ import * as SignalR from '@microsoft/signalr';
 import { ElNotification } from 'element-plus';
 import { getToken } from './request.mjs';
 
-if (!window.__SIGNALR_INSTANCE__) {
-  const connection = new SignalR.HubConnectionBuilder().configureLogging(SignalR.LogLevel.Warning).withUrl(`${window.__env__.VITE_API_URL}/hubs/onlineUser?token=${getToken()}`, { transport: SignalR.HttpTransportType.WebSockets, skipNegotiation: true }).withAutomaticReconnect({
+const initSignalR = () => {
+  const token = getToken();
+  if (!token) return null;
+  const connection = new SignalR.HubConnectionBuilder().configureLogging(SignalR.LogLevel.Warning).withUrl(`${window.__env__.VITE_API_URL}/hubs/onlineUser?token=${token}`, {
+    transport: SignalR.HttpTransportType.WebSockets,
+    skipNegotiation: true
+  }).withAutomaticReconnect({
     nextRetryDelayInMilliseconds: () => {
       return 5e3;
     }
@@ -11,6 +16,8 @@ if (!window.__SIGNALR_INSTANCE__) {
   connection.keepAliveIntervalInMilliseconds = 15 * 1e3;
   connection.serverTimeoutInMilliseconds = 30 * 1e3;
   connection.start().then(() => {
+  }).catch((err) => {
+    console.error("SignalR \u8FDE\u63A5\u5931\u8D25:", err);
   });
   connection.onclose(async () => {
   });
@@ -44,8 +51,65 @@ if (!window.__SIGNALR_INSTANCE__) {
       duration: 5e3
     });
   });
-  window.__SIGNALR_INSTANCE__ = connection;
+  return connection;
+};
+const getSignalR = () => {
+  return window.__SIGNALR_INSTANCE__;
+};
+if (!window.__SIGNALR_INSTANCE__) {
+  const instance = initSignalR();
+  if (instance) {
+    window.__SIGNALR_INSTANCE__ = instance;
+  }
+}
+if (!window.__SIGNALR_INSTANCE__) {
+  const instance = initSignalR();
+  if (instance) {
+    window.__SIGNALR_INSTANCE__ = instance;
+  } else {
+  }
 }
-const signalR = window.__SIGNALR_INSTANCE__;
+const signalR = {
+  on: (event, callback) => {
+    const instance = getSignalR();
+    if (instance) {
+      instance.on(event, callback);
+    } else {
+      console.warn(`SignalR \u672A\u8FDE\u63A5\uFF0C\u65E0\u6CD5\u76D1\u542C\u4E8B\u4EF6: ${event}`);
+    }
+  },
+  off: (event, callback) => {
+    const instance = getSignalR();
+    if (instance) {
+      instance.off(event, callback);
+    }
+  },
+  send: (method, ...args) => {
+    const instance = getSignalR();
+    if (instance) {
+      return instance.invoke(method, ...args);
+    } else {
+      console.warn("SignalR \u672A\u8FDE\u63A5\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F");
+      return Promise.reject("SignalR \u672A\u8FDE\u63A5");
+    }
+  },
+  stop: () => {
+    const instance = getSignalR();
+    if (instance) {
+      return instance.stop();
+    }
+    return Promise.resolve();
+  }
+};
+const restartSignalR = async () => {
+  const instance = getSignalR();
+  if (instance) {
+    await instance.stop();
+  }
+  const newInstance = initSignalR();
+  if (newInstance) {
+    window.__SIGNALR_INSTANCE__ = newInstance;
+  }
+};
 
-export { signalR };
+export { restartSignalR, signalR };

package/es/utils/signalR.d.ts

@@ -1,5 +1,12 @@
 import * as SignalR from '@microsoft/signalr';
-export declare const signalR: SignalR.HubConnection;
+declare const signalR: {
+    on: (event: any, callback: any) => void;
+    off: (event: any, callback: any) => void;
+    send: (method: any, ...args: any[]) => Promise<any>;
+    stop: () => Promise<void>;
+};
+declare const restartSignalR: () => Promise<void>;
+export { signalR, restartSignalR };
 declare global {
     interface Window {
         __SIGNALR_INSTANCE__: SignalR.HubConnection;

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.24 */
+/*! fmdeui-fmui v1.0.26 */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('pinia'), require('crypto-js'), require('xlsx-js-style'), require('element-plus'), require('vue'), require('@element-plus/icons-vue'), require('axios'), require('js-cookie'), require('@microsoft/signalr'), require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('vue-i18n'), require('exceljs'), require('lodash-es'), require('@vueuse/core'), require('mitt'), require('vue-router'), require('nprogress')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'pinia', 'crypto-js', 'xlsx-js-style', 'element-plus', 'vue', '@element-plus/icons-vue', 'axios', 'js-cookie', '@microsoft/signalr', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'vue-i18n', 'exceljs', 'lodash-es', '@vueuse/core', 'mitt', 'vue-router', 'nprogress'], factory) :
@@ -1690,8 +1690,13 @@
 	  return entity;
 	}
 
-	if (!window.__SIGNALR_INSTANCE__) {
-	  const connection = new SignalR__namespace.HubConnectionBuilder().configureLogging(SignalR__namespace.LogLevel.Warning).withUrl(`${window.__env__.VITE_API_URL}/hubs/onlineUser?token=${getToken()}`, { transport: SignalR__namespace.HttpTransportType.WebSockets, skipNegotiation: true }).withAutomaticReconnect({
+	const initSignalR = () => {
+	  const token = getToken();
+	  if (!token) return null;
+	  const connection = new SignalR__namespace.HubConnectionBuilder().configureLogging(SignalR__namespace.LogLevel.Warning).withUrl(`${window.__env__.VITE_API_URL}/hubs/onlineUser?token=${token}`, {
+	    transport: SignalR__namespace.HttpTransportType.WebSockets,
+	    skipNegotiation: true
+	  }).withAutomaticReconnect({
 	    nextRetryDelayInMilliseconds: () => {
 	      return 5e3;
 	    }
@@ -1699,6 +1704,8 @@
 	  connection.keepAliveIntervalInMilliseconds = 15 * 1e3;
 	  connection.serverTimeoutInMilliseconds = 30 * 1e3;
 	  connection.start().then(() => {
+	  }).catch((err) => {
+	    console.error("SignalR \u8FDE\u63A5\u5931\u8D25:", err);
 	  });
 	  connection.onclose(async () => {
 	  });
@@ -1732,9 +1739,65 @@
 	      duration: 5e3
 	    });
 	  });
-	  window.__SIGNALR_INSTANCE__ = connection;
+	  return connection;
+	};
+	const getSignalR = () => {
+	  return window.__SIGNALR_INSTANCE__;
+	};
+	if (!window.__SIGNALR_INSTANCE__) {
+	  const instance = initSignalR();
+	  if (instance) {
+	    window.__SIGNALR_INSTANCE__ = instance;
+	  }
 	}
-	const signalR = window.__SIGNALR_INSTANCE__;
+	if (!window.__SIGNALR_INSTANCE__) {
+	  const instance = initSignalR();
+	  if (instance) {
+	    window.__SIGNALR_INSTANCE__ = instance;
+	  }
+	}
+	const signalR = {
+	  on: (event, callback) => {
+	    const instance = getSignalR();
+	    if (instance) {
+	      instance.on(event, callback);
+	    } else {
+	      console.warn(`SignalR \u672A\u8FDE\u63A5\uFF0C\u65E0\u6CD5\u76D1\u542C\u4E8B\u4EF6: ${event}`);
+	    }
+	  },
+	  off: (event, callback) => {
+	    const instance = getSignalR();
+	    if (instance) {
+	      instance.off(event, callback);
+	    }
+	  },
+	  send: (method, ...args) => {
+	    const instance = getSignalR();
+	    if (instance) {
+	      return instance.invoke(method, ...args);
+	    } else {
+	      console.warn("SignalR \u672A\u8FDE\u63A5\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F");
+	      return Promise.reject("SignalR \u672A\u8FDE\u63A5");
+	    }
+	  },
+	  stop: () => {
+	    const instance = getSignalR();
+	    if (instance) {
+	      return instance.stop();
+	    }
+	    return Promise.resolve();
+	  }
+	};
+	const restartSignalR = async () => {
+	  const instance = getSignalR();
+	  if (instance) {
+	    await instance.stop();
+	  }
+	  const newInstance = initSignalR();
+	  if (newInstance) {
+	    window.__SIGNALR_INSTANCE__ = newInstance;
+	  }
+	};
 
 	const setWatermark = (str) => {
 	  const id = "1.23452384164.123412416";
@@ -23142,6 +23205,7 @@
 	exports.refreshAccessTokenKey = refreshAccessTokenKey;
 	exports.removeDuplicate = removeDuplicate;
 	exports.request2 = request2;
+	exports.restartSignalR = restartSignalR;
 	exports.roles = roles;
 	exports.router = router;
 	exports.saulVModel = saulVModel;