@ives_xxz/framework 1.0.4 → 1.0.5

package/package.json

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

package/service/socket/FWSocket.ts

@@ -1,7 +1,7 @@
-import { FWSystemConfig } from '../../config/FWSystemConfig';
-import FWLog from '../../log/FWLog';
-import FWSocketHandle from './FWSocketHandle';
-import FWSocketSender from './FWSocketSender';
+import { FWSystemConfig } from "../../config/FWSystemConfig";
+import FWLog from "../../log/FWLog";
+import FWSocketHandle from "./FWSocketHandle";
+import FWSocketSender from "./FWSocketSender";
 
 /**
  * TODO 犹豫socket没有改版暂时已老的cmd字符串映射方式做,后期优化
@@ -67,7 +67,7 @@ export default class FWSocket implements FW.Socket {
     tag: string,
     sender: FW.SocketSender,
     handle: FW.SocketHandle,
-    config: FW.SocketConfig,
+    config: FW.SocketConfig
   ): FW.SocketPromiseProxy {
     FW.Entry.timeMgr.unSchedule(this);
 
@@ -94,9 +94,12 @@ export default class FWSocket 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.maxReconnectTimes =
+      config?.maxReconnectTimes || defaultConfig.maxReconnectTimes;
+    this.reconnectInternal =
+      config?.reconnectInternal || defaultConfig.reconnectInternal;
+    this.protocolSymbol =
+      config?.protocolSymbol || defaultConfig.protocolSymbol;
 
     this.promiseProxy = {
       promise: undefined,
@@ -162,7 +165,7 @@ export default class FWSocket implements FW.Socket {
     }
 
     FWLog.debug(
-      `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`,
+      `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`
     );
     if (++this.reconnectTimes >= this.maxReconnectTimes) {
       this.handle?.onTimeout?.();
@@ -189,7 +192,8 @@ export default class FWSocket implements FW.Socket {
       const protocolKey = this.sender.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>();
         this.protocolRegistry.set(protocolKey, registry.add(symbol));
         this.protocolContainer.set(symbol, msg);
       }
@@ -199,7 +203,7 @@ export default class FWSocket implements FW.Socket {
 
   /** 连接打开 */
   private onSocketOpen() {
-    FWLog.debug('on open!');
+    FWLog.debug("on open!");
     FW.Entry.timeMgr.unSchedule(this);
     this.reconnectTimes = 0;
     this.sendHeartTimestamp = 0;
@@ -231,7 +235,7 @@ export default class FWSocket implements FW.Socket {
       },
       this.heartInternal / 1000,
       cc.macro.REPEAT_FOREVER,
-      this,
+      this
     );
   }
 
@@ -241,7 +245,11 @@ export default class FWSocket implements FW.Socket {
   }
 
   private sendMessage(msg: any) {
-    this.socket?.send(this.sender.onBeforeSendingMessage?.(msg) || msg);
+    try {
+      this.socket?.send(this.sender.onBeforeSendingMessage?.(msg) || msg);
+    } catch (e) {
+      this.socket?.send(msg);
+    }
   }
 
   /** socket关闭 */
@@ -250,11 +258,11 @@ export default class FWSocket implements FW.Socket {
     FW.Entry.timeMgr.scheduleOnce(
       () => {
         if (!this.isReconnect) return;
-        FWLog.debug('on close!');
+        FWLog.debug("on close!");
         this.reconnect();
       },
       this.reconnectInternal,
-      this,
+      this
     );
   }
   /** 消息处理 */
@@ -266,6 +274,19 @@ export default class FWSocket implements FW.Socket {
       return;
     }
 
+    this.remoteProtocol(msg);
+
+    if (this.isPausedMessageHandle) return;
+
+    this.handle?.onMessage?.(msg);
+  }
+  /** 错误处理 */
+  private async onSocketError(msg: any) {
+    await this.remoteProtocol(msg);
+    this.handle?.onError?.(msg);
+  }
+
+  private async remoteProtocol(msg: any) {
     const protocolKey = await this.handle.getProtocolKey?.(msg);
     if (protocolKey && this.protocolRegistry.has(protocolKey)) {
       const symbolSet = this.protocolRegistry.get(protocolKey);
@@ -282,12 +303,5 @@ export default class FWSocket implements FW.Socket {
         }
       }
     }
-
-    if (this.isPausedMessageHandle) return;
-    this.handle?.onMessage?.(msg);
-  }
-  /** 错误处理 */
-  private onSocketError(msg: any) {
-    this.handle?.onError?.(msg);
   }
 }