@ives_xxz/framework 2.0.12 → 2.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": ["123456"],

package/service/socket/FWSocket.ts

@@ -1,10 +1,9 @@
-import { FWSystemConfig } from "../../config/FWSystemConfig";
-import FWService from "../FWService";
+import { FWSystemConfig } from '../../config/FWSystemConfig';
 
 /**
  * TODO 犹豫socket没有改版暂时已老的cmd字符串映射方式做,后期优化
  */
-export default class FWSocket extends FWService implements FW.Socket {
+export default class FWSocket extends FW.Service implements FW.Socket {
   /** 发送心跳时间抽 */
   private sendHeartTimestamp: number;
   /** 接收心跳时间戳 */
@@ -64,7 +63,7 @@ export default class FWSocket extends FWService implements FW.Socket {
     tag: string,
     socketSender: FW.Sender,
     socketHandle: FW.Handle,
-    config: FW.SocketConfig
+    config: FW.SocketConfig,
   ): FW.SocketPromiseProxy {
     try {
       FW.Entry.timeMgr.unSchedule(this);
@@ -108,14 +107,10 @@ export default class FWSocket extends FWService implements FW.Socket {
       this.heartInternal = config?.heartInternal || defaultConfig.heartInternal;
       this.heartTimeout = config?.heartTimeout || defaultConfig.heartTimeout;
       this.heartWeakTime = config?.heartWeakTime || defaultConfig.heartWeakTime;
-      this.maxReconnectTimes =
-        config?.maxReconnectTimes || defaultConfig.maxReconnectTimes;
-      this.reconnectInternal =
-        config?.reconnectInternal || defaultConfig.reconnectInternal;
-      this.protocolSymbol =
-        config?.protocolSymbol || defaultConfig.protocolSymbol;
-      this.protocolPollingTime =
-        config?.protocolPollingTime || defaultConfig.protocolPollingTime;
+      this.maxReconnectTimes = config?.maxReconnectTimes || defaultConfig.maxReconnectTimes;
+      this.reconnectInternal = config?.reconnectInternal || defaultConfig.reconnectInternal;
+      this.protocolSymbol = config?.protocolSymbol || defaultConfig.protocolSymbol;
+      this.protocolPollingTime = config?.protocolPollingTime || defaultConfig.protocolPollingTime;
 
       this.promiseProxy = {
         promise: undefined,
@@ -129,7 +124,7 @@ export default class FWSocket extends FWService implements FW.Socket {
 
       return this.promiseProxy;
     } catch (e) {
-      FW.Log.error("创建socket失败:", e);
+      FW.Log.error('创建socket失败:', e);
     }
   }
   /**
@@ -195,7 +190,7 @@ export default class FWSocket extends FWService implements FW.Socket {
     if (force) this.reconnectTimes = 0;
 
     FW.Log.debug(
-      `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`
+      `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`,
     );
     if (++this.reconnectTimes >= this.maxReconnectTimes) {
       this.socketHandle?.onTimeout?.();
@@ -206,22 +201,16 @@ export default class FWSocket extends FWService implements FW.Socket {
     this.socket?.close();
     this.socket = null;
 
-    this.createSocket(
-      this.address,
-      this.tag,
-      this.socketSender,
-      this.socketHandle,
-      {
-        heartInternal: this.heartInternal,
-        heartTimeout: this.heartTimeout,
-        heartWeakTime: this.heartWeakTime,
-        maxReconnectTimes: this.maxReconnectTimes,
-        reconnectInternal: this.reconnectInternal,
-        protocolSymbol: this.protocolSymbol,
-        protocolPollingTime: this.protocolPollingTime,
-        certificate: this.certificate,
-      }
-    );
+    this.createSocket(this.address, this.tag, this.socketSender, this.socketHandle, {
+      heartInternal: this.heartInternal,
+      heartTimeout: this.heartTimeout,
+      heartWeakTime: this.heartWeakTime,
+      maxReconnectTimes: this.maxReconnectTimes,
+      reconnectInternal: this.reconnectInternal,
+      protocolSymbol: this.protocolSymbol,
+      protocolPollingTime: this.protocolPollingTime,
+      certificate: this.certificate,
+    });
   }
 
   async send(msg: string) {
@@ -231,8 +220,7 @@ export default class FWSocket extends FWService implements FW.Socket {
       const protocolKey = this.socketSender.getProtocolKey?.(msg);
       if (protocolKey) {
         const symbol = Symbol(protocolKey);
-        const registry =
-          this.protocolRegistry.get(protocolKey) || new Set<Symbol>();
+        const registry = this.protocolRegistry.get(protocolKey) || new Set<Symbol>();
         const protocolPolling: FW.ProtocolPolling = {
           msg: msg,
           schedule: FW.Entry.timeMgr.schedule(
@@ -241,7 +229,7 @@ export default class FWSocket extends FWService implements FW.Socket {
             },
             this.protocolPollingTime,
             cc.macro.REPEAT_FOREVER,
-            this
+            this,
           ),
         };
         this.protocolRegistry.set(protocolKey, registry.add(symbol));
@@ -253,7 +241,7 @@ export default class FWSocket extends FWService implements FW.Socket {
 
   /** 连接打开 */
   private onSocketOpen() {
-    FW.Log.debug("on open!");
+    FW.Log.debug('on open!');
     FW.Entry.timeMgr.unSchedule(this);
     this.reconnectTimes = 0;
     this.sendHeartTimestamp = 0;
@@ -278,7 +266,7 @@ export default class FWSocket extends FWService implements FW.Socket {
       },
       this.heartInternal / 1000,
       cc.macro.REPEAT_FOREVER,
-      this
+      this,
     );
   }
 
@@ -297,20 +285,17 @@ export default class FWSocket extends FWService implements FW.Socket {
 
   /** socket关闭 */
   private onSocketClose() {
-    FW.Log.debug("on close!");
+    FW.Log.debug('on close!');
     this.socketHandle?.onClose?.();
     FW.Entry.timeMgr.scheduleOnce(
       () => {
-        if (
-          this.getReadyState() == WebSocket.CLOSING ||
-          this.getReadyState() == WebSocket.CLOSED
-        ) {
-          FW.Log.debug("on close!");
+        if (this.getReadyState() == WebSocket.CLOSING || this.getReadyState() == WebSocket.CLOSED) {
+          FW.Log.debug('on close!');
           this.reconnect();
         }
       },
       this.reconnectInternal,
-      this
+      this,
     );
   }