@ives_xxz/framework 2.3.7 → 2.3.9

package/manager/FWSocketManager.ts

@@ -1,13 +1,10 @@
-import FWSocket from "../service/socket/FWSocket";
-import { FWManager } from "./FWManager";
+import FWSocket from '../service/socket/FWSocket';
+import { FWManager } from './FWManager';
 
 /**
  * socket管理器
  */
-export default class FWSocketManager
-  extends FWManager
-  implements FW.SocketManager
-{
+export default class FWSocketManager extends FWManager implements FW.SocketManager {
   protected socketMap: Map<string, FW.Socket>;
 
   public initialize(): void {
@@ -71,7 +68,7 @@ export default class FWSocketManager
 
   closeAll(): void {
     for (const [key, socket] of this.socketMap) {
-      socket?.close();
+      this.closeSocket(socket);
     }
     this.socketMap.clear();
   }
@@ -88,11 +85,9 @@ export default class FWSocketManager
    * @param fs
    * @returns
    */
-  closeSocket(fs: FWSocket) {
-    FW.Log.debug("主动关闭socket!");
-    const tag = fs.getTag();
-    fs.socket.close();
-    fs.socket = null;
-    this.socketMap.delete(tag);
+  closeSocket(fs: FW.Socket) {
+    FW.Log.debug('主动关闭socket!');
+    fs.close();
+    this.socketMap.delete(fs.getTag());
   }
 }

package/package.json

@@ -1,11 +1,9 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.3.7",
+  "version": "2.3.9",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
-  "keywords": [
-    "123456"
-  ],
+  "keywords": ["123456"],
   "author": "ives",
   "license": "ISC"
 }

package/service/socket/FWSocket.ts

@@ -1,4 +1,4 @@
-import { FWSystemConfig } from "../../config/FWSystemConfig";
+import { FWSystemConfig } from '../../config/FWSystemConfig';
 
 /**
  * TODO 犹豫socket没有改版暂时已老的cmd字符串映射方式做,后期优化
@@ -44,6 +44,8 @@ export default class FWSocket extends FW.Service implements FW.Socket {
   private protocolContainer: Map<Symbol, FW.ProtocolPolling>;
   /** 证书 */
   private certificate: cc.Asset;
+  /** 是否强制关闭 */
+  private forceClose: boolean;
 
   /**
    *  消息事件列表
@@ -70,7 +72,7 @@ export default class FWSocket extends FW.Service implements FW.Socket {
 
       this.tag = tag;
       this.address = address;
-
+      this.forceClose = false;
       this.clear();
 
       this.messageEvents = {};
@@ -109,14 +111,10 @@ export default class FWSocket extends FW.Service 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,
@@ -130,7 +128,7 @@ export default class FWSocket extends FW.Service implements FW.Socket {
 
       return this.promiseProxy;
     } catch (e) {
-      FW.Log.error("创建socket失败:", e);
+      FW.Log.error('创建socket失败:', e);
     }
   }
   /**
@@ -144,8 +142,7 @@ export default class FWSocket extends FW.Service implements FW.Socket {
 
   public onDestroy(): void {
     this.messageEvents = cc.js.createMap();
-    this.socket?.close();
-    this.socket = null;
+    this.close();
   }
 
   public getTag() {
@@ -172,8 +169,11 @@ export default class FWSocket extends FW.Service implements FW.Socket {
    */
   public close() {
     this.clear();
+    this.forceClose = true;
+    this.onSocketClose();
+    this.socket?.close();
+    this.socket = null;
     FW.Entry.timeMgr.unSchedule(this);
-    FW.Entry.socketMgr.closeSocket(this);
   }
 
   public pauseMessageHandle() {
@@ -208,22 +208,16 @@ export default class FWSocket extends FW.Service 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) {
@@ -233,8 +227,7 @@ export default class FWSocket extends FW.Service 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(
@@ -255,7 +248,7 @@ export default class FWSocket extends FW.Service 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;
@@ -299,15 +292,19 @@ export default class FWSocket extends FW.Service implements FW.Socket {
 
   /** socket关闭 */
   private onSocketClose() {
-    FW.Log.debug("on close!");
+    FW.Log.debug('on close!');
     this.socketHandle?.onClose?.();
+    this.socket.onclose = null;
+    this.socket.onerror = null;
+    this.socket.onmessage = null;
+    this.socket.onopen = null;
     FW.Entry.timeMgr.scheduleOnce(
       () => {
         if (
-          this.getReadyState() == WebSocket.CLOSING ||
-          this.getReadyState() == WebSocket.CLOSED
+          !this.forceClose &&
+          (this.getReadyState() == WebSocket.CLOSING || this.getReadyState() == WebSocket.CLOSED)
         ) {
-          FW.Log.debug("on close!");
+          FW.Log.debug('on close!');
           this.reconnect();
         }
       },