@pisell/core 1.0.33 → 1.0.35

package/lib/locales/index.js

@@ -39,15 +39,101 @@ var import_zh_CN = __toESM(require("./zh-CN"));
 var import_zh_HK = __toESM(require("./zh-HK"));
 var import_original = __toESM(require("./original"));
 var Locales = class {
-  app;
-  // 当前语言 本地语言 > 英文语言包
-  locale = import_en.default.locale;
-  //  语言包
-  library = [import_original.default, import_en.default, import_zh_CN.default, import_zh_HK.default].reduce((pre, cur) => {
-    pre[cur.locale] = cur;
-    return pre;
-  }, {});
   constructor(app, options) {
+    // 当前语言 本地语言 > 英文语言包
+    this.locale = import_en.default.locale;
+    //  语言包
+    this.library = [import_original.default, import_en.default, import_zh_CN.default, import_zh_HK.default].reduce((pre, cur) => {
+      pre[cur.locale] = cur;
+      return pre;
+    }, {});
+    this.getLocale = () => {
+      return this.locale;
+    };
+    this.getCurrentTexts = (locale) => {
+      return this.library[locale || this.locale].translations;
+    };
+    this.setLocale = (locale, reload = false) => {
+      this.locale = locale;
+      if (reload) {
+        window.location.reload();
+        return;
+      }
+    };
+    this.getText = (id, locale) => {
+      var _a;
+      return ((_a = this.getCurrentTexts(locale)) == null ? void 0 : _a[id]) || id;
+    };
+    this.isCN = () => {
+      let locale = this.getLocale();
+      return locale === "zh-CN" || locale === "zh-HK";
+    };
+    this.loadLibraryByUrl = async (urls) => {
+      try {
+        let fetchList = urls.map((item) => {
+          if (typeof item === "string") {
+            return fetch(item);
+          }
+          if (typeof item === "function") {
+            return item();
+          }
+          if (typeof item === "object" && item !== null && "locale" in item) {
+            return Promise.resolve(item);
+          }
+          return item;
+        });
+        let res = await Promise.all(fetchList);
+        let library = { ...this.library };
+        for (const item of res) {
+          const _item = item instanceof Response ? await item.json() : item;
+          library = {
+            ...library,
+            [_item.locale]: import_lodash.default.mergeWith(library[_item.locale] || {}, _item)
+          };
+        }
+        this.library = library;
+        return library;
+      } catch (err) {
+        console.log(err);
+        throw err;
+      }
+    };
+    this.loadLibrary = (urls) => {
+      return this.loadLibraryByUrl(urls);
+    };
+    this.translation = (text, locale) => {
+      if (!text) {
+        return "";
+      }
+      if ((0, import_utils.isString)(text) || (0, import_utils.isNumber)(text)) {
+        return text;
+      }
+      let primary = locale || this.getLocale();
+      if (typeof text === "string") {
+        return text;
+      }
+      return text[primary] || text["original"] || text["en"] || text["zh-CN"] || text["zh-HK"];
+    };
+    this.getLibraryByData = (data) => {
+      return data.reduce((pre, next) => {
+        return {
+          ...pre,
+          [next.locale]: next
+        };
+      }, {});
+    };
+    this.createTextsByLibrary = (id, library) => {
+      const _library = library || this.library;
+      return Object.keys(_library).reduce((pre, next) => {
+        var _a;
+        let _pre = { ...pre };
+        let cur = (_a = _library[next].translations) == null ? void 0 : _a[id];
+        if (cur) {
+          _pre[_library[next].locale] = cur;
+        }
+        return _pre;
+      }, {});
+    };
     this.app = app;
     this.locale = (options == null ? void 0 : options.locale) || this.app.storage.getStorage("locale") || import_en.default.locale;
     this.library = (options == null ? void 0 : options.library) || [import_original.default, import_en.default, import_zh_CN.default, import_zh_HK.default].reduce((pre, cur) => {
@@ -55,57 +141,6 @@ var Locales = class {
       return pre;
     }, {});
   }
-  getLocale = () => {
-    return this.locale;
-  };
-  getCurrentTexts = (locale) => {
-    return this.library[locale || this.locale].translations;
-  };
-  setLocale = (locale, reload = false) => {
-    this.locale = locale;
-    if (reload) {
-      window.location.reload();
-      return;
-    }
-  };
-  getText = (id, locale) => {
-    var _a;
-    return ((_a = this.getCurrentTexts(locale)) == null ? void 0 : _a[id]) || id;
-  };
-  isCN = () => {
-    let locale = this.getLocale();
-    return locale === "zh-CN" || locale === "zh-HK";
-  };
-  loadLibraryByUrl = async (urls) => {
-    try {
-      let fetchList = urls.map((item) => {
-        if (typeof item === "string") {
-          return fetch(item);
-        }
-        if (typeof item === "function") {
-          return item();
-        }
-        if (typeof item === "object" && item !== null && "locale" in item) {
-          return Promise.resolve(item);
-        }
-        return item;
-      });
-      let res = await Promise.all(fetchList);
-      let library = { ...this.library };
-      for (const item of res) {
-        const _item = item instanceof Response ? await item.json() : item;
-        library = {
-          ...library,
-          [_item.locale]: import_lodash.default.mergeWith(library[_item.locale] || {}, _item)
-        };
-      }
-      this.library = library;
-      return library;
-    } catch (err) {
-      console.log(err);
-      throw err;
-    }
-  };
   loadLibraryByItems(libraryList) {
     let library = { ...this.library };
     libraryList.forEach((item) => {
@@ -116,42 +151,6 @@ var Locales = class {
     });
     this.library = library;
   }
-  loadLibrary = (urls) => {
-    return this.loadLibraryByUrl(urls);
-  };
-  translation = (text, locale) => {
-    if (!text) {
-      return "";
-    }
-    if ((0, import_utils.isString)(text) || (0, import_utils.isNumber)(text)) {
-      return text;
-    }
-    let primary = locale || this.getLocale();
-    if (typeof text === "string") {
-      return text;
-    }
-    return text[primary] || text["original"] || text["en"] || text["zh-CN"] || text["zh-HK"];
-  };
-  getLibraryByData = (data) => {
-    return data.reduce((pre, next) => {
-      return {
-        ...pre,
-        [next.locale]: next
-      };
-    }, {});
-  };
-  createTextsByLibrary = (id, library) => {
-    const _library = library || this.library;
-    return Object.keys(_library).reduce((pre, next) => {
-      var _a;
-      let _pre = { ...pre };
-      let cur = (_a = _library[next].translations) == null ? void 0 : _a[id];
-      if (cur) {
-        _pre[_library[next].locale] = cur;
-      }
-      return _pre;
-    }, {});
-  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/locales/type.d.ts

@@ -1,5 +1,5 @@
-export declare type Locale = 'original' | 'en' | 'zh-CN' | 'zh-HK' | string;
-export declare type MultiLanguage = {
+export type Locale = 'original' | 'en' | 'zh-CN' | 'zh-HK' | string;
+export type MultiLanguage = {
     [key in Locale]: string;
 };
 export interface LibraryItem {
@@ -16,4 +16,4 @@ export interface LocaleConfig {
         [key in Locale]: LibraryItem;
     };
 }
-export declare type LoadLibraryByUrlParams = (string | Promise<LibraryItem> | (() => Promise<LibraryItem>) | LibraryItem)[];
+export type LoadLibraryByUrlParams = (string | Promise<LibraryItem> | (() => Promise<LibraryItem>) | LibraryItem)[];

package/lib/logger/index.d.ts

@@ -1,5 +1,5 @@
 import App from "../app";
-export declare type LogConsoleType = "info" | "warning" | "error" | "debug";
+export type LogConsoleType = "info" | "warning" | "error" | "debug";
 /**
  * 日志项接口
  */

package/lib/logger/index.js

@@ -35,24 +35,6 @@ module.exports = __toCommonJS(logger_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_feishu = require("./feishu");
 var LoggerManager = class {
-  // 私有属性
-  logBuffer = [];
-  // 日志缓冲区
-  timer = null;
-  // 定时器
-  checkInterval;
-  // 检查间隔时间（毫秒）
-  prefix = "app";
-  // 日志文件前缀
-  metadata;
-  db = null;
-  // IndexDB 实例
-  app;
-  feishuConfig;
-  retentionDays;
-  // 日志保留天数
-  metadataFunction;
-  status = "running";
   // 日志管理器状态
   /**
    * 构造函数
@@ -60,6 +42,14 @@ var LoggerManager = class {
    * @param checkInterval 检查间隔时间，默认5分钟
    */
   constructor(app, options) {
+    // 私有属性
+    this.logBuffer = [];
+    // 日志缓冲区
+    this.timer = null;
+    // 检查间隔时间（毫秒）
+    this.prefix = "app";
+    this.db = null;
+    this.status = "running";
     this.prefix = (options == null ? void 0 : options.prefix) || "app";
     this.checkInterval = (options == null ? void 0 : options.checkInterval) || 5 * 60 * 1e3;
     this.app = app;

package/lib/menuManager/index.js

@@ -24,12 +24,11 @@ __export(menuManager_exports, {
 module.exports = __toCommonJS(menuManager_exports);
 var import_hooks = require("./hooks");
 var MenuManager = class {
-  menuItems = [];
-  menuMaps = {};
-  app;
-  useMenu = import_hooks.useMenu;
-  MenuProvider = import_hooks.MenuProvider;
   constructor(items, app) {
+    this.menuItems = [];
+    this.menuMaps = {};
+    this.useMenu = import_hooks.useMenu;
+    this.MenuProvider = import_hooks.MenuProvider;
     this.app = app;
     this.set(items);
   }
@@ -86,7 +85,8 @@ var MenuManager = class {
       }
       if (item.children) {
         const found = this.findMenuItemByPath(item.children, path);
-        if (found) return found;
+        if (found)
+          return found;
       }
     }
     return null;
@@ -94,10 +94,12 @@ var MenuManager = class {
   // 查找给定key的父级菜单key
   findParent(items, key, parent = null) {
     for (const item of items) {
-      if (item.key === key) return parent;
+      if (item.key === key)
+        return parent;
       if (item.children) {
         const found = this.findParent(item.children, key, item);
-        if (found) return found;
+        if (found)
+          return found;
       }
     }
     return null;
@@ -113,7 +115,8 @@ var MenuManager = class {
       }
       if (item.children) {
         const found = this.findMenuItemByKey(item.children, key);
-        if (found) return found;
+        if (found)
+          return found;
       }
     }
     return null;

package/lib/models/index.d.ts

@@ -1,7 +1,7 @@
 import hooks from '../hooks';
 import { Provider as StoreProvider } from "react-redux";
 declare const models: import("./global").GlobalModal[];
-declare type ModalsType = (typeof models[number]);
+type ModalsType = (typeof models[number]);
 export interface Store {
     getDataByModel: typeof getDataByModel;
     useStore: typeof hooks.useStore;
@@ -10,8 +10,8 @@ export interface Store {
     dispatch: any;
     getState: any;
 }
-export declare type ModelsNames = ModalsType['namespace'];
-export declare type ModelsState = {
+export type ModelsNames = ModalsType['namespace'];
+export type ModelsState = {
     [K in (ModalsType['namespace'])]: Extract<ModalsType, {
         namespace: K;
     }>['state'];
@@ -25,7 +25,7 @@ export declare type ModelsState = {
  * @Author: zhiwei.Wang
  * @Date: 2024-09-03 11:07
  */
-declare const getDataByModel: <T extends "global", D extends keyof ModelsState[T]>(model: string, key?: D | undefined) => D extends undefined ? ModelsState[T] : ModelsState[T][D];
+declare const getDataByModel: <T extends "global", D extends keyof ModelsState[T]>(model: string, key?: D) => D extends undefined ? ModelsState[T] : ModelsState[T][D];
 /**
  * @title: 设置数据到store
  * @description:

package/lib/pubsub/index.d.ts

@@ -2,7 +2,7 @@
  * 发布订阅模块
  * 用于组件/服务间的事件通信
  */
-declare type EventCallback = (...args: any[]) => void;
+type EventCallback = (...args: any[]) => void;
 interface EventSubscription {
     unsubscribe: () => void;
 }

package/lib/pubsub/index.js

@@ -24,7 +24,9 @@ __export(pubsub_exports, {
 });
 module.exports = __toCommonJS(pubsub_exports);
 var PubSub = class {
-  events = /* @__PURE__ */ new Map();
+  constructor() {
+    this.events = /* @__PURE__ */ new Map();
+  }
   /**
    * 订阅事件
    * @param event 事件名称

package/lib/request/cache.d.ts

@@ -1,5 +1,5 @@
 import { CacheProps } from './type';
-export declare type CacheType = 'memory' | 'storage' | 'indexDB';
+export type CacheType = 'memory' | 'storage' | 'indexDB';
 /**
  * @title: 设置缓存
  * @description:

package/lib/request/pisell2Request.d.ts

@@ -1,4 +1,4 @@
-declare type RequestMethod = any;
+type RequestMethod = any;
 declare const pisell2Get: RequestMethod;
 declare const pisell2Post: RequestMethod;
 declare const pisell2Put: RequestMethod;

package/lib/request/type.d.ts

@@ -26,7 +26,7 @@ export declare enum RequestModeENUM {
     REMOTE_LOCAL = "remote_local",
     OS_SERVER = "os_server"
 }
-export declare type RequestModeType = RequestModeENUM.LOCAL | RequestModeENUM.REMOTE | RequestModeENUM.LOCAL_REMOTE | RequestModeENUM.REMOTE_LOCAL | RequestModeENUM.OS_SERVER;
+export type RequestModeType = RequestModeENUM.LOCAL | RequestModeENUM.REMOTE | RequestModeENUM.LOCAL_REMOTE | RequestModeENUM.REMOTE_LOCAL | RequestModeENUM.OS_SERVER;
 export interface CacheProps {
     key?: string;
     type?: CacheType;

package/lib/routes/index.d.ts

@@ -20,9 +20,9 @@ export declare class RouterManager {
     get(name: string): RouteType;
     has(name: string): boolean;
     remove(name: string): void;
-    renderComponent(item: RouteType, children?: React.ReactNode): string | number | boolean | React.ReactFragment | JSX.Element | null | undefined;
+    renderComponent(item: RouteType, children?: React.ReactNode): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
     getPageByRoute(route: string): ApplicationInterface | undefined;
     getRouterComponent({ fallback }: {
         fallback?: React.ReactNode;
-    }): JSX.Element[];
+    }): React.JSX.Element[];
 }

package/lib/routes/index.js

@@ -35,10 +35,8 @@ module.exports = __toCommonJS(routes_exports);
 var import_react = __toESM(require("react"));
 var import_react_router_dom = require("react-router-dom");
 var RouterManager = class {
-  routes = {};
-  options;
-  app;
   constructor(options = {}, app) {
+    this.routes = {};
     this.options = options;
     this.app = app;
     this.routes = options.routes || {};

package/lib/socket/components/SocketMonitorPage.js

@@ -36,12 +36,14 @@ var import_react = __toESM(require("react"));
 var import__ = __toESM(require("../index"));
 var import__2 = require("../index");
 var formatTime = (timestamp) => {
-  if (timestamp === null) return "无";
+  if (timestamp === null)
+    return "无";
   const date = new Date(timestamp);
   return date.toLocaleString();
 };
 var formatDuration = (ms) => {
-  if (ms === null) return "无";
+  if (ms === null)
+    return "无";
   const seconds = Math.floor(ms / 1e3);
   const minutes = Math.floor(seconds / 60);
   const hours = Math.floor(minutes / 60);
@@ -50,7 +52,8 @@ var formatDuration = (ms) => {
   return `${hours}小时 ${remainingMinutes}分钟 ${remainingSeconds}秒`;
 };
 var formatBytes = (bytes) => {
-  if (bytes === 0) return "0 B";
+  if (bytes === 0)
+    return "0 B";
   const units = ["B", "KB", "MB", "GB", "TB"];
   const i = Math.floor(Math.log(bytes) / Math.log(1024));
   return `${(bytes / Math.pow(1024, i)).toFixed(2)} ${units[i]}`;
@@ -90,12 +93,15 @@ var SocketMonitorPage = () => {
     }
   }, [selectedKey]);
   const loadSocketData = (0, import_react.useCallback)(() => {
-    if (!selectedKey) return;
+    if (!selectedKey)
+      return;
     const socketInstance = import__.default.get(selectedKey);
-    if (!socketInstance) return;
+    if (!socketInstance)
+      return;
     setCurrentSocket(socketInstance);
     const monitor = socketInstance.getMonitor() || socketInstance.enableMonitoring();
-    if (!monitor) return;
+    if (!monitor)
+      return;
     setStats(monitor.getStats());
     const direction = messageFilter === "all" ? void 0 : messageFilter === "in" ? "in" : "out";
     setMessageHistory(monitor.getMessageHistory(50, direction));

package/lib/socket/heartbeat.js

@@ -24,16 +24,6 @@ __export(heartbeat_exports, {
 module.exports = __toCommonJS(heartbeat_exports);
 var import_constants = require("./constants");
 var HeartbeatManager = class {
-  options;
-  intervalTimer = null;
-  timeoutTimer = null;
-  lastHeartbeatTime = 0;
-  lastHeartbeatResponse = 0;
-  active = false;
-  // 心跳回调函数
-  sendHeartbeat;
-  onTimeout;
-  onResponse;
   /**
    * 创建心跳管理器
    * @param options 心跳配置选项
@@ -41,6 +31,11 @@ var HeartbeatManager = class {
    * @param callbacks 回调函数集合
    */
   constructor(options, sendHeartbeat, callbacks = {}) {
+    this.intervalTimer = null;
+    this.timeoutTimer = null;
+    this.lastHeartbeatTime = 0;
+    this.lastHeartbeatResponse = 0;
+    this.active = false;
     this.options = {
       ...options,
       interval: Math.max(options.interval, import_constants.MIN_HEARTBEAT_INTERVAL),

package/lib/socket/index.js

@@ -46,7 +46,9 @@ function createSocket(url, options = {}) {
   return new import_socket.Socket({ url, ...options });
 }
 var SocketFactory = class {
-  sockets = /* @__PURE__ */ new Map();
+  constructor() {
+    this.sockets = /* @__PURE__ */ new Map();
+  }
   /**
    * 创建新的Socket实例
    * @param url WebSocket连接URL

package/lib/socket/monitor.js

@@ -25,38 +25,36 @@ module.exports = __toCommonJS(monitor_exports);
 var import_events = require("./events");
 var import_types = require("./types");
 var SocketMonitor = class {
-  socket;
-  options;
-  isMonitoring = false;
-  // 历史记录存储
-  messageHistory = [];
-  statusHistory = [];
-  // 统计数据
-  stats = {
-    totalSent: 0,
-    totalReceived: 0,
-    bytesSent: 0,
-    bytesReceived: 0,
-    connectionCount: 0,
-    reconnectionCount: 0,
-    errorCount: 0,
-    heartbeatCount: 0,
-    heartbeatTimeoutCount: 0,
-    firstConnectTime: null,
-    lastConnectTime: null,
-    currentConnectionDuration: null,
-    averageMessageSize: 0
-  };
-  // 用于计算连接持续时间
-  connectStartTime = null;
-  // 事件句柄映射
-  eventHandlers = /* @__PURE__ */ new Map();
   /**
    * 创建Socket监控器
    * @param socket 要监控的Socket实例
    * @param options 监控配置选项
    */
   constructor(socket, options = {}) {
+    this.isMonitoring = false;
+    // 历史记录存储
+    this.messageHistory = [];
+    this.statusHistory = [];
+    // 统计数据
+    this.stats = {
+      totalSent: 0,
+      totalReceived: 0,
+      bytesSent: 0,
+      bytesReceived: 0,
+      connectionCount: 0,
+      reconnectionCount: 0,
+      errorCount: 0,
+      heartbeatCount: 0,
+      heartbeatTimeoutCount: 0,
+      firstConnectTime: null,
+      lastConnectTime: null,
+      currentConnectionDuration: null,
+      averageMessageSize: 0
+    };
+    // 用于计算连接持续时间
+    this.connectStartTime = null;
+    // 事件句柄映射
+    this.eventHandlers = /* @__PURE__ */ new Map();
     this.socket = socket;
     this.options = {
       maxHistoryItems: 100,
@@ -263,6 +261,7 @@ var SocketMonitor = class {
       id: message.id || `out_${Date.now()}`,
       timestamp: Date.now(),
       direction: "out",
+      //@ts-ignore
       message: this.options.recordMessageContent ? message : { event: message.event },
       size
     });
@@ -284,6 +283,7 @@ var SocketMonitor = class {
       id: message.id || `in_${Date.now()}`,
       timestamp: Date.now(),
       direction: "in",
+      //@ts-ignore
       message: this.options.recordMessageContent ? message : { event: message.event },
       size
     });

package/lib/socket/reconnect.js

@@ -24,16 +24,6 @@ __export(reconnect_exports, {
 module.exports = __toCommonJS(reconnect_exports);
 var import_constants = require("./constants");
 var ReconnectManager = class {
-  options;
-  attempts = 0;
-  timer = null;
-  isReconnecting = false;
-  // 重连回调函数
-  reconnectCallback;
-  onAttempt;
-  onSuccess;
-  onFail;
-  onMaxAttemptsExceeded;
   /**
    * 创建重连管理器实例
    * @param options 重连配置
@@ -41,6 +31,9 @@ var ReconnectManager = class {
    * @param callbacks 回调函数集合
    */
   constructor(options, reconnectCallback, callbacks = {}) {
+    this.attempts = 0;
+    this.timer = null;
+    this.isReconnecting = false;
     this.options = {
       ...options,
       delay: Math.max(options.delay, import_constants.MIN_RECONNECTION_DELAY)

package/lib/socket/socket.js

@@ -30,23 +30,21 @@ var import_reconnect = require("./reconnect");
 var import_monitor = require("./monitor");
 var import_app = require("../app");
 var Socket = class {
-  ws = null;
-  url;
-  options;
-  status = import_types.SocketStatus.CLOSED;
-  eventHandlers = {};
-  // 心跳和重连管理器
-  heartbeatManager = null;
-  reconnectManager = null;
-  // 监控器
-  monitor = null;
-  // 消息ID计数器
-  messageIdCounter = 0;
   /**
    * 创建Socket实例
    * @param options Socket配置选项
    */
   constructor(options) {
+    this.ws = null;
+    this.status = import_types.SocketStatus.CLOSED;
+    this.eventHandlers = {};
+    // 心跳和重连管理器
+    this.heartbeatManager = null;
+    this.reconnectManager = null;
+    // 监控器
+    this.monitor = null;
+    // 消息ID计数器
+    this.messageIdCounter = 0;
     this.url = options.url;
     this.options = {
       ...import_constants.DEFAULT_SOCKET_OPTIONS,

package/lib/socket/types.d.ts

@@ -38,13 +38,14 @@ export declare enum SocketStatus {
 /**
  * Socket消息格式
  */
-export interface SocketMessage<T = any> {
+export interface SocketMessage {
     /** 事件类型 */
     type: string;
     /** 消息数据 */
-    data?: T;
+    data?: any;
     /** 消息ID */
     id?: string;
+    event?: any;
 }
 /**
  * 心跳配置选项
@@ -75,7 +76,7 @@ export interface ReconnectOptions {
 /**
  * 事件处理函数类型
  */
-export declare type EventHandler = (...args: any[]) => void;
+export type EventHandler = (...args: any[]) => void;
 /**
  * 事件处理函数映射
  */