@tachybase/plugin-online-user 0.23.58 → 1.0.18

package/dist/client/index.js

@@ -1 +1 @@
-(function(n,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@tachybase/client"),require("@tachybase/schema"),require("react/jsx-runtime"),require("react"),require("antd"),require("lodash")):typeof define=="function"&&define.amd?define(["exports","@tachybase/client","@tachybase/schema","react/jsx-runtime","react","antd","lodash"],e):(n=typeof globalThis!="undefined"?globalThis:n||self,e(n["@tachybase/plugin-online-user"]={},n["@tachybase/client"],n["@tachybase/schema"],n.jsxRuntime,n.react,n.antd,n.lodash))})(this,function(n,e,t,o,r,d,h){"use strict";var q=Object.defineProperty;var T=Object.getOwnPropertySymbols;var w=Object.prototype.hasOwnProperty,A=Object.prototype.propertyIsEnumerable;var b=(n,e,t)=>e in n?q(n,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):n[e]=t,k=(n,e)=>{for(var t in e||(e={}))w.call(e,t)&&b(n,t,e[t]);if(T)for(var t of T(e))A.call(e,t)&&b(n,t,e[t]);return n};var l=(n,e,t)=>new Promise((o,r)=>{var d=s=>{try{a(t.next(s))}catch(u){r(u)}},h=s=>{try{a(t.throw(s))}catch(u){r(u)}},a=s=>s.done?o(s.value):Promise.resolve(s.value).then(d,h);a((t=t.apply(n,e)).next())});const a="online-user",s=()=>{const{i18n:i}=e.useApp();return{t:(f,y={})=>i.t(f,k({ns:a},y))}},u=()=>{const i=e.useApp(),[c,f]=r.useState([]),y=e.useAPIClient(),{token:S}=e.useToken(),{t:U}=s();return r.useEffect(()=>{i.ws.on("message",m=>{var O;const p=JSON.parse(m.data);if((p==null?void 0:p.type)==="plugin-online-user"){const j=(O=p.payload.users)==null?void 0:O.map(P=>{if(P)return{key:t.uid(),label:P.nickname}});f(j)}})},[i]),r.useEffect(()=>{const m={type:"plugin-online-user:client",payload:{token:y.auth.getToken()}};i.ws.send(JSON.stringify(m))},[]),o.jsx(d.Dropdown,{menu:{items:c},children:o.jsx(d.Button,{style:{width:"auto",color:S.colorTextHeaderMenu},type:"text",children:U("{{num}} people online",{num:h.size(c)})})})},x=i=>o.jsx(e.PinnedPluginListProvider,{items:{ou:{order:230,component:"OnlineUserManger",pin:!0,isPublic:!0,belongTo:"pinnedmenu"}},children:o.jsx(e.SchemaComponentOptions,{components:{OnlineUserManger:u},children:i.children})});class g extends e.Plugin{afterAdd(){return l(this,null,function*(){})}beforeLoad(){return l(this,null,function*(){})}load(){return l(this,null,function*(){this.app.use(x),t.autorun(()=>{if(this.app.ws.connected){const c={type:"plugin-online-user:client",payload:{token:this.app.apiClient.auth.getToken()}};this.app.ws.send(JSON.stringify(c))}})})}}n.PluginOnlineUserClient=g,n.default=g,Object.defineProperties(n,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+(function(n,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@tachybase/client"),require("@tachybase/schema"),require("react/jsx-runtime"),require("react"),require("antd"),require("lodash")):typeof define=="function"&&define.amd?define(["exports","@tachybase/client","@tachybase/schema","react/jsx-runtime","react","antd","lodash"],e):(n=typeof globalThis!="undefined"?globalThis:n||self,e(n["@tachybase/plugin-online-user"]={},n["@tachybase/client"],n["@tachybase/schema"],n.jsxRuntime,n.react,n.antd,n.lodash))})(this,function(n,e,t,r,u,p,f){"use strict";var w=Object.defineProperty;var T=Object.getOwnPropertySymbols;var A=Object.prototype.hasOwnProperty,C=Object.prototype.propertyIsEnumerable;var b=(n,e,t)=>e in n?w(n,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):n[e]=t,k=(n,e)=>{for(var t in e||(e={}))A.call(e,t)&&b(n,t,e[t]);if(T)for(var t of T(e))C.call(e,t)&&b(n,t,e[t]);return n};var h=(n,e,t)=>new Promise((r,u)=>{var p=s=>{try{a(t.next(s))}catch(c){u(c)}},f=s=>{try{a(t.throw(s))}catch(c){u(c)}},a=s=>s.done?r(s.value):Promise.resolve(s.value).then(p,f);a((t=t.apply(n,e)).next())});const a="online-user",s=()=>{const{i18n:i}=e.useApp();return{t:(y,m={})=>i.t(y,k({ns:a},m))}},c=()=>{const i=e.useApp(),[d,y]=u.useState([]),m=e.useAPIClient(),{token:U}=e.useToken(),{t:j}=s();return u.useEffect(()=>{i.ws.on("message",g=>{const l=JSON.parse(g.data);if((l==null?void 0:l.type)==="plugin-online-user"){const O=[];for(const o of l.payload.users){if(!o)continue;const x=O.find(q=>q.userId===o.id);if(x){x.count++;continue}O.push({userId:o.id,name:o.nickname||o.username,count:1})}y(O.map(o=>({key:t.uid(),label:`${o.name}:${o.count}`})))}})},[i]),u.useEffect(()=>{const g={type:"plugin-online-user:client",payload:{token:m.auth.getToken()}};i.ws.send(JSON.stringify(g))},[]),r.jsx(p.Dropdown,{menu:{items:d},children:r.jsx(p.Button,{style:{width:"auto",color:U.colorTextHeaderMenu},type:"text",children:j("{{num}} people online",{num:f.size(d)})})})},S=i=>r.jsx(e.PinnedPluginListProvider,{items:{ou:{order:230,component:"OnlineUserManger",pin:!0,isPublic:!0,belongTo:"pinnedmenu"}},children:r.jsx(e.SchemaComponentOptions,{components:{OnlineUserManger:c},children:i.children})});class P extends e.Plugin{afterAdd(){return h(this,null,function*(){})}beforeLoad(){return h(this,null,function*(){})}load(){return h(this,null,function*(){this.app.use(S),t.autorun(()=>{if(this.app.ws.connected){const d={type:"plugin-online-user:client",payload:{token:this.app.apiClient.auth.getToken()}};this.app.ws.send(JSON.stringify(d))}})})}}n.PluginOnlineUserClient=P,n.default=P,Object.defineProperties(n,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,10 +1,10 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "0.23.58",
-  "@tachybase/schema": "0.23.58",
+  "@tachybase/client": "1.0.18",
+  "@tachybase/schema": "1.0.18",
   "antd": "5.22.5",
   "lodash": "4.17.21",
-  "@tachybase/server": "0.23.58",
-  "@tachybase/utils": "0.23.58",
+  "@tachybase/server": "1.0.18",
+  "@tachybase/utils": "1.0.18",
   "jsonwebtoken": "8.5.1"
 };

package/dist/node_modules/redis/package.json

@@ -1 +1 @@
-{"name":"redis","description":"A modern, high performance Redis client","version":"4.7.0","license":"MIT","main":"./dist/index.js","types":"./dist/index.d.ts","files":["dist/"],"workspaces":["./packages/*"],"scripts":{"test":"npm run test -ws --if-present","build:client":"npm run build -w ./packages/client","build:test-utils":"npm run build -w ./packages/test-utils","build:tests-tools":"npm run build:client && npm run build:test-utils","build:modules":"find ./packages -mindepth 1 -maxdepth 1 -type d ! -name 'client' ! -name 'test-utils' -exec npm run build -w {} \\;","build":"tsc","build-all":"npm run build:client && npm run build:test-utils && npm run build:modules && npm run build","documentation":"npm run documentation -ws --if-present","gh-pages":"gh-pages -d ./documentation -e ./documentation -u 'documentation-bot <documentation@bot>'"},"dependencies":{"@redis/bloom":"1.2.0","@redis/client":"1.6.0","@redis/graph":"1.1.1","@redis/json":"1.0.7","@redis/search":"1.2.0","@redis/time-series":"1.1.0"},"devDependencies":{"@tsconfig/node14":"^14.1.0","gh-pages":"^6.0.0","release-it":"^16.1.5","typescript":"^5.2.2"},"repository":{"type":"git","url":"git://github.com/redis/node-redis.git"},"bugs":{"url":"https://github.com/redis/node-redis/issues"},"homepage":"https://github.com/redis/node-redis","keywords":["redis"],"_lastModified":"2025-03-06T10:02:38.276Z"}
+{"name":"redis","description":"A modern, high performance Redis client","version":"4.7.0","license":"MIT","main":"./dist/index.js","types":"./dist/index.d.ts","files":["dist/"],"workspaces":["./packages/*"],"scripts":{"test":"npm run test -ws --if-present","build:client":"npm run build -w ./packages/client","build:test-utils":"npm run build -w ./packages/test-utils","build:tests-tools":"npm run build:client && npm run build:test-utils","build:modules":"find ./packages -mindepth 1 -maxdepth 1 -type d ! -name 'client' ! -name 'test-utils' -exec npm run build -w {} \\;","build":"tsc","build-all":"npm run build:client && npm run build:test-utils && npm run build:modules && npm run build","documentation":"npm run documentation -ws --if-present","gh-pages":"gh-pages -d ./documentation -e ./documentation -u 'documentation-bot <documentation@bot>'"},"dependencies":{"@redis/bloom":"1.2.0","@redis/client":"1.6.0","@redis/graph":"1.1.1","@redis/json":"1.0.7","@redis/search":"1.2.0","@redis/time-series":"1.1.0"},"devDependencies":{"@tsconfig/node14":"^14.1.0","gh-pages":"^6.0.0","release-it":"^16.1.5","typescript":"^5.2.2"},"repository":{"type":"git","url":"git://github.com/redis/node-redis.git"},"bugs":{"url":"https://github.com/redis/node-redis/issues"},"homepage":"https://github.com/redis/node-redis","keywords":["redis"],"_lastModified":"2025-04-18T20:37:29.030Z"}

package/dist/node_modules/ws/package.json

@@ -1 +1 @@
-{"name":"ws","version":"8.18.0","description":"Simple to use, blazing fast and thoroughly tested websocket client and server for Node.js","keywords":["HyBi","Push","RFC-6455","WebSocket","WebSockets","real-time"],"homepage":"https://github.com/websockets/ws","bugs":"https://github.com/websockets/ws/issues","repository":{"type":"git","url":"git+https://github.com/websockets/ws.git"},"author":"Einar Otto Stangvik <einaros@gmail.com> (http://2x.io)","license":"MIT","main":"index.js","exports":{".":{"browser":"./browser.js","import":"./wrapper.mjs","require":"./index.js"},"./package.json":"./package.json"},"browser":"browser.js","engines":{"node":">=10.0.0"},"files":["browser.js","index.js","lib/*.js","wrapper.mjs"],"scripts":{"test":"nyc --reporter=lcov --reporter=text mocha --throw-deprecation test/*.test.js","integration":"mocha --throw-deprecation test/*.integration.js","lint":"eslint . && prettier --check --ignore-path .gitignore \"**/*.{json,md,yaml,yml}\""},"peerDependencies":{"bufferutil":"^4.0.1","utf-8-validate":">=5.0.2"},"peerDependenciesMeta":{"bufferutil":{"optional":true},"utf-8-validate":{"optional":true}},"devDependencies":{"benchmark":"^2.1.4","bufferutil":"^4.0.1","eslint":"^9.0.0","eslint-config-prettier":"^9.0.0","eslint-plugin-prettier":"^5.0.0","globals":"^15.0.0","mocha":"^8.4.0","nyc":"^15.0.0","prettier":"^3.0.0","utf-8-validate":"^6.0.0"},"_lastModified":"2025-03-06T10:02:38.519Z"}
+{"name":"ws","version":"8.18.0","description":"Simple to use, blazing fast and thoroughly tested websocket client and server for Node.js","keywords":["HyBi","Push","RFC-6455","WebSocket","WebSockets","real-time"],"homepage":"https://github.com/websockets/ws","bugs":"https://github.com/websockets/ws/issues","repository":{"type":"git","url":"git+https://github.com/websockets/ws.git"},"author":"Einar Otto Stangvik <einaros@gmail.com> (http://2x.io)","license":"MIT","main":"index.js","exports":{".":{"browser":"./browser.js","import":"./wrapper.mjs","require":"./index.js"},"./package.json":"./package.json"},"browser":"browser.js","engines":{"node":">=10.0.0"},"files":["browser.js","index.js","lib/*.js","wrapper.mjs"],"scripts":{"test":"nyc --reporter=lcov --reporter=text mocha --throw-deprecation test/*.test.js","integration":"mocha --throw-deprecation test/*.integration.js","lint":"eslint . && prettier --check --ignore-path .gitignore \"**/*.{json,md,yaml,yml}\""},"peerDependencies":{"bufferutil":"^4.0.1","utf-8-validate":">=5.0.2"},"peerDependenciesMeta":{"bufferutil":{"optional":true},"utf-8-validate":{"optional":true}},"devDependencies":{"benchmark":"^2.1.4","bufferutil":"^4.0.1","eslint":"^9.0.0","eslint-config-prettier":"^9.0.0","eslint-plugin-prettier":"^5.0.0","globals":"^15.0.0","mocha":"^8.4.0","nyc":"^15.0.0","prettier":"^3.0.0","utf-8-validate":"^6.0.0"},"_lastModified":"2025-04-18T20:37:29.290Z"}

package/dist/server/plugin.js

@@ -21,6 +21,7 @@ __export(plugin_exports, {
   default: () => plugin_default
 });
 module.exports = __toCommonJS(plugin_exports);
+var import_node_worker_threads = require("node:worker_threads");
 var import_server = require("@tachybase/server");
 var import_utils = require("@tachybase/utils");
 var import_connection_manager = require("./services/connection-manager");
@@ -30,6 +31,9 @@ class PluginOnlineUserServer extends import_server.Plugin {
   async beforeLoad() {
   }
   async load() {
+    if (!import_node_worker_threads.isMainThread) {
+      return;
+    }
     await import_utils.Container.get(import_connection_manager.ConnectionManager).load();
   }
   async install() {

package/dist/server/services/connection-manager.d.ts

@@ -1,6 +1,15 @@
 export declare class ConnectionManager {
     private app;
+    private registeredHandlers;
     unload(): Promise<void>;
     load(): Promise<void>;
+    /**
+     * 取消注册所有 WebSocket 事件处理函数
+     */
+    private unregisterWSEventHandlers;
+    /**
+     * 注册 WebSocket 事件处理函数，并保存引用以便后续清理
+     */
+    private registerWSEventHandler;
     loadWsServer(): Promise<void>;
 }

package/dist/server/services/connection-manager.js

@@ -2,7 +2,6 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
 var __typeError = (msg) => {
@@ -22,14 +21,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __decoratorStart = (base) => [, , , __create((base == null ? void 0 : base[__knownSymbol("metadata")]) ?? null)];
 var __decoratorStrings = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
@@ -76,7 +67,6 @@ __export(connection_manager_exports, {
 module.exports = __toCommonJS(connection_manager_exports);
 var import_server = require("@tachybase/server");
 var import_utils = require("@tachybase/utils");
-var import_jsonwebtoken = __toESM(require("jsonwebtoken"));
 var import_redis = require("redis");
 var _app_dec, _ConnectionManager_decorators, _init;
 const KEY_ONLINE_USERS = "online_users";
@@ -84,6 +74,8 @@ _ConnectionManager_decorators = [(0, import_utils.Service)()], _app_dec = [(0, i
 class ConnectionManager {
   constructor() {
     this.app = __runInitializers(_init, 8, this), __runInitializers(_init, 11, this);
+    // 存储注册的 WebSocket 事件处理函数，便于清理
+    this.registeredHandlers = /* @__PURE__ */ new Map();
   }
   async unload() {
     for (const client of [this.app.online.all, this.app.online.pub, this.app.online.sub]) {
@@ -107,6 +99,7 @@ class ConnectionManager {
     }
     this.app.on("afterStop", () => {
       this.unload();
+      this.unregisterWSEventHandlers();
     });
     if (this.app.online.all.isOpen) {
       return;
@@ -122,10 +115,33 @@ class ConnectionManager {
     }
     await this.loadWsServer();
   }
+  /**
+   * 取消注册所有 WebSocket 事件处理函数
+   */
+  unregisterWSEventHandlers() {
+    this.app.logger.info("Unregistering WebSocket event handlers for online-user plugin");
+    this.registeredHandlers.forEach((handler, eventType) => {
+      this.app.emit("ws:removeEventHandler", {
+        eventType,
+        handler
+      });
+    });
+    this.registeredHandlers.clear();
+  }
+  /**
+   * 注册 WebSocket 事件处理函数，并保存引用以便后续清理
+   */
+  registerWSEventHandler(eventType, handler) {
+    this.registeredHandlers.set(eventType, handler);
+    this.app.emit("ws:registerEventHandler", {
+      eventType,
+      handler
+    });
+  }
   async loadWsServer() {
     const appName = this.app.name;
     const gateway = import_server.Gateway.getInstance();
-    const ws = gateway["wsServer"];
+    const wss = gateway["wsServer"];
     await this.app.online.sub.SUBSCRIBE(KEY_ONLINE_USERS + appName, async (num) => {
       if (num !== (0, import_utils.currentProcessNum)()) {
         await notifyAllClients(false);
@@ -133,13 +149,13 @@ class ConnectionManager {
     });
     const notifyAllClients = async (broadcast = true) => {
       const users = (await this.app.online.all.HVALS(KEY_ONLINE_USERS + appName)).map((u) => JSON.parse(u));
-      ws.sendToConnectionsByTag("app", appName, {
+      wss.sendToConnectionsByTag("app", appName, {
         type: "plugin-online-user",
         payload: {
           users
         }
       });
-      if (broadcast) {
+      if (broadcast && this.app.online.pub.isOpen) {
         await this.app.online.pub.PUBLISH(KEY_ONLINE_USERS + appName, (0, import_utils.currentProcessNum)());
       }
     };
@@ -150,31 +166,50 @@ class ConnectionManager {
         }
       });
     };
-    ws == null ? void 0 : ws.wss.on("connection", (ws2) => {
-      ws2.on("error", async () => {
-        await notifyAllClients();
-      });
-      ws2.on("close", async () => {
-        await this.app.online.all.HDEL(KEY_ONLINE_USERS + appName, ws2.id);
-        await notifyAllClients();
-      });
-      ws2.on("message", async (data) => {
-        if (data.toString() !== "ping") {
-          const userMeg = JSON.parse(data.toString());
-          if (userMeg.type === "plugin-online-user:client") {
-            try {
-              const analysis = import_jsonwebtoken.default.verify(userMeg.payload.token, process.env.APP_KEY);
-              const userId = analysis.userId;
-              const user = await getUserById(userId);
-              await this.app.online.all.HSET(KEY_ONLINE_USERS + appName, ws2.id, JSON.stringify(user));
-              await notifyAllClients();
-            } catch (error) {
-              console.warn(error.message);
-            }
+    const closeHandler = async (ws) => {
+      var _a, _b, _c;
+      if (!((_c = (_b = (_a = this.app) == null ? void 0 : _a.online) == null ? void 0 : _b.all) == null ? void 0 : _c.isOpen)) {
+        return;
+      }
+      await this.app.online.all.HDEL(KEY_ONLINE_USERS + appName, ws.id);
+      await notifyAllClients();
+    };
+    const errorHandler = async () => {
+      await notifyAllClients();
+    };
+    const messageHandler = async (ws, data) => {
+      var _a, _b;
+      if (data.toString() !== "ping") {
+        const userMeg = JSON.parse(data.toString());
+        if (userMeg.type === "plugin-online-user:client") {
+          if (!userMeg.payload.token) {
+            return;
+          }
+          if (this.app.db.closed()) {
+            this.app.logger.warn("online user connect warn, db is closed");
+            return;
+          }
+          try {
+            const analysis = await ((_b = (_a = this.app.authManager) == null ? void 0 : _a.jwt) == null ? void 0 : _b.verifyToken(userMeg.payload.token));
+            const userId = analysis.userId;
+            const user = await getUserById(userId);
+            await this.app.online.all.HSET(KEY_ONLINE_USERS + appName, ws.id, JSON.stringify(user));
+            await notifyAllClients();
+          } catch (error) {
+            this.app.logger.warn("online user connect error", error);
           }
         }
-      });
-    });
+      }
+    };
+    this.registerWSEventHandler("message", messageHandler);
+    const connectionHandler = async (ws) => {
+      this.app.logger.debug(`New WebSocket connection established: ${ws.id}`);
+    };
+    this.unregisterWSEventHandlers();
+    this.registerWSEventHandler("close", closeHandler);
+    this.registerWSEventHandler("error", errorHandler);
+    this.registerWSEventHandler("message", messageHandler);
+    this.registerWSEventHandler("connection", connectionHandler);
   }
 }
 _init = __decoratorStart(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/plugin-online-user",
-  "version": "0.23.58",
+  "version": "1.0.18",
   "main": "dist/server/index.js",
   "dependencies": {},
   "devDependencies": {
@@ -12,11 +12,11 @@
     "ws": "^8.18.0"
   },
   "peerDependencies": {
-    "@tachybase/client": "0.23.58",
-    "@tachybase/test": "0.23.58",
-    "@tachybase/utils": "0.23.58",
-    "@tachybase/server": "0.23.58",
-    "@tachybase/schema": "0.23.58"
+    "@tachybase/client": "1.0.18",
+    "@tachybase/schema": "1.0.18",
+    "@tachybase/server": "1.0.18",
+    "@tachybase/test": "1.0.18",
+    "@tachybase/utils": "1.0.18"
   },
   "description.zh-CN": "在线用户管理（建设中）",
   "displayName.zh-CN": "在线用户管理（建设中）",