@dd-code/uni-tools 1.0.8 → 1.0.9

package/dist/index.js

@@ -895,7 +895,18 @@ var WsServer = /** @class */ (function () {
         this.httpServer = createHttpServer();
         this.clientMap = new Map();
     }
+    WsServer.getInstance = function (handleMessage) {
+        if (!WsServer.instance) {
+            WsServer.instance = new WsServer(handleMessage);
+        }
+        else if (handleMessage) {
+            WsServer.instance.handleMessage = handleMessage;
+        }
+        return WsServer.instance;
+    };
     WsServer.prototype.createServer = function () {
+        if (this.wss)
+            return; // 避免重复创建
         this.wss = new WebSocket.WebSocketServer({
             server: this.httpServer, // 绑定到 Vite 的 HTTP 服务器
             path: WS_PATH, // WS 连接路径，前端连接时用 ws://localhost:5173/__mfe__ws__
@@ -939,6 +950,7 @@ var WsServer = /** @class */ (function () {
             // 拿到客户端传递的 appCode
             var url = new URL(request.url, "http://".concat(request.headers.host));
             var appCode = url.searchParams.get("appCode");
+            console.log("[uni-WS] \u5BA2\u6237\u7AEF\u8FDE\u63A5 WS \u670D\u52A1\uFF0CappCode: ".concat(appCode));
             if (!appCode)
                 return;
             _this.clientMap.set(appCode, ws);
@@ -959,8 +971,19 @@ var WsClientServer = /** @class */ (function () {
         this.ws = null;
         this.isConnected = false;
     }
+    WsClientServer.getInstance = function (handleMessage) {
+        if (!WsClientServer.instance) {
+            WsClientServer.instance = new WsClientServer(handleMessage);
+        }
+        else if (handleMessage) {
+            WsClientServer.instance.handleMessage = handleMessage;
+        }
+        return WsClientServer.instance;
+    };
     WsClientServer.prototype.connect = function (appCode) {
         var _this = this;
+        if (this.isConnected && this.ws)
+            return;
         this.ws = new WebSocket("ws://localhost:".concat(WS_PORT).concat(WS_PATH, "?appCode=").concat(appCode));
         this.ws.on("open", function () {
             // console.log("客户端已连接 WS 服务");
@@ -977,7 +1000,11 @@ var WsClientServer = /** @class */ (function () {
             _this.isConnected = false;
             _this.retryConnect(appCode);
         });
-        this.onMessage(this.handleMessage);
+        // 监听消息并使用当前的 handleMessage
+        this.ws.on("message", function (message) {
+            var _a;
+            (_a = _this.handleMessage) === null || _a === void 0 ? void 0 : _a.call(_this, JSON.parse(message.toString()));
+        });
     };
     WsClientServer.prototype.sendMessage = function (type, data) {
         if (this.isConnected) {
@@ -993,9 +1020,9 @@ var WsClientServer = /** @class */ (function () {
     //   // console.log("收到消息", message);
     // };
     WsClientServer.prototype.onMessage = function (callback) {
-        this.ws.on("message", function (message) {
-            callback === null || callback === void 0 ? void 0 : callback(JSON.parse(message.toString()));
-        });
+        if (callback) {
+            this.handleMessage = callback;
+        }
     };
     WsClientServer.prototype.retryConnect = function (appCode) {
         var _this = this;
@@ -1122,7 +1149,7 @@ var genreNewAppJson = function (outputPageJsonPath, mainAppJsonPath, manifestLis
  * 处理主应用服务端逻辑
  */
 var createMainAppServer = function (manifestJson) {
-    var mfeServer = new WsServer(function (opt) {
+    var mfeServer = WsServer.getInstance(function (opt) {
         var type = opt.type, data = opt.data;
         if (type === E_WS_TYPE.CHANGE) {
             var outputPageJsonPath = getMainAppJsonPath();
@@ -1145,7 +1172,7 @@ var createMainAppServer = function (manifestJson) {
  * 处理子应用客户端逻辑
  */
 var createMainAppClient = function (manifestJson, onInit) {
-    var client = new WsClientServer(function (opt) {
+    var client = WsClientServer.getInstance(function (opt) {
         if (opt.type === E_WS_TYPE.INIT) {
             onInit(opt.data);
         }

package/dist/index.mjs.js

@@ -893,7 +893,18 @@ var WsServer = /** @class */ (function () {
         this.httpServer = createHttpServer();
         this.clientMap = new Map();
     }
+    WsServer.getInstance = function (handleMessage) {
+        if (!WsServer.instance) {
+            WsServer.instance = new WsServer(handleMessage);
+        }
+        else if (handleMessage) {
+            WsServer.instance.handleMessage = handleMessage;
+        }
+        return WsServer.instance;
+    };
     WsServer.prototype.createServer = function () {
+        if (this.wss)
+            return; // 避免重复创建
         this.wss = new WebSocketServer({
             server: this.httpServer, // 绑定到 Vite 的 HTTP 服务器
             path: WS_PATH, // WS 连接路径，前端连接时用 ws://localhost:5173/__mfe__ws__
@@ -937,6 +948,7 @@ var WsServer = /** @class */ (function () {
             // 拿到客户端传递的 appCode
             var url = new URL(request.url, "http://".concat(request.headers.host));
             var appCode = url.searchParams.get("appCode");
+            console.log("[uni-WS] \u5BA2\u6237\u7AEF\u8FDE\u63A5 WS \u670D\u52A1\uFF0CappCode: ".concat(appCode));
             if (!appCode)
                 return;
             _this.clientMap.set(appCode, ws);
@@ -957,8 +969,19 @@ var WsClientServer = /** @class */ (function () {
         this.ws = null;
         this.isConnected = false;
     }
+    WsClientServer.getInstance = function (handleMessage) {
+        if (!WsClientServer.instance) {
+            WsClientServer.instance = new WsClientServer(handleMessage);
+        }
+        else if (handleMessage) {
+            WsClientServer.instance.handleMessage = handleMessage;
+        }
+        return WsClientServer.instance;
+    };
     WsClientServer.prototype.connect = function (appCode) {
         var _this = this;
+        if (this.isConnected && this.ws)
+            return;
         this.ws = new WebSocket("ws://localhost:".concat(WS_PORT).concat(WS_PATH, "?appCode=").concat(appCode));
         this.ws.on("open", function () {
             // console.log("客户端已连接 WS 服务");
@@ -975,7 +998,11 @@ var WsClientServer = /** @class */ (function () {
             _this.isConnected = false;
             _this.retryConnect(appCode);
         });
-        this.onMessage(this.handleMessage);
+        // 监听消息并使用当前的 handleMessage
+        this.ws.on("message", function (message) {
+            var _a;
+            (_a = _this.handleMessage) === null || _a === void 0 ? void 0 : _a.call(_this, JSON.parse(message.toString()));
+        });
     };
     WsClientServer.prototype.sendMessage = function (type, data) {
         if (this.isConnected) {
@@ -991,9 +1018,9 @@ var WsClientServer = /** @class */ (function () {
     //   // console.log("收到消息", message);
     // };
     WsClientServer.prototype.onMessage = function (callback) {
-        this.ws.on("message", function (message) {
-            callback === null || callback === void 0 ? void 0 : callback(JSON.parse(message.toString()));
-        });
+        if (callback) {
+            this.handleMessage = callback;
+        }
     };
     WsClientServer.prototype.retryConnect = function (appCode) {
         var _this = this;
@@ -1120,7 +1147,7 @@ var genreNewAppJson = function (outputPageJsonPath, mainAppJsonPath, manifestLis
  * 处理主应用服务端逻辑
  */
 var createMainAppServer = function (manifestJson) {
-    var mfeServer = new WsServer(function (opt) {
+    var mfeServer = WsServer.getInstance(function (opt) {
         var type = opt.type, data = opt.data;
         if (type === E_WS_TYPE.CHANGE) {
             var outputPageJsonPath = getMainAppJsonPath();
@@ -1143,7 +1170,7 @@ var createMainAppServer = function (manifestJson) {
  * 处理子应用客户端逻辑
  */
 var createMainAppClient = function (manifestJson, onInit) {
-    var client = new WsClientServer(function (opt) {
+    var client = WsClientServer.getInstance(function (opt) {
         if (opt.type === E_WS_TYPE.INIT) {
             onInit(opt.data);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dd-code/uni-tools",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Universal tools for code utilities",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",