@ives_xxz/framework 1.2.7 → 1.2.9

package/manager/FWLayerManager.ts

@@ -34,6 +34,8 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * 当前已经打开的layer缓存容器
    */
   private layerMap: Map<string, FWLayerData>;
+
+  private layerProxyMap: Map<string, FW.LayerController>;
   /**
    * 当前所有打开Layer注册表
    */
@@ -46,6 +48,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   public initialize(): void {
     this.layerQueue = new FWQueue<FWLayerData>();
     this.layerMap = new Map<string, FWLayerData>();
+    this.layerProxyMap = new Map<string, FW.LayerController>();
     this.layerRegistry = new Set<new () => FW.LayerController>();
     this.layerStack = [];
   }
@@ -121,11 +124,14 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       return undefined;
     }
 
-    let ctr = new data.type();
+    const ctr = new data.type();
 
     /** 如果不是重复打开的Layer,不是需要添加进队列末尾的,并且已经存在于注册表中的 不进行重复打开 */
     if (this.layerRegistry.has(data.type) && !ctr.isRepeatOpen) {
-      return;
+      const targetController = this.findLayerProxy<Ctr>(ctr);
+      if (targetController) {
+        return targetController;
+      }
     }
 
     this.layerRegistry.add(data.type);
@@ -133,13 +139,16 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
       this.layerQueue.add(ctr.layerData);
       this.layerRegistry.delete(data.type);
-      return;
+      const targetController = this.findLayerProxy<Ctr>(ctr);
+      if (targetController) {
+        return targetController;
+      }
     }
 
     if (ctr.layerType != FWSystemDefine.FWLayerType.REPEAT && !ctr.isRepeatOpen) {
       for (const [key, value] of this.layerMap) {
         if (value.layerAssetProperty.path == ctr.layerAssetProperty.path) {
-          return this.layerMap.get(value.uuid).controller as Ctr;
+          return this.findLayerProxy<Ctr>(ctr);
         }
       }
     }
@@ -190,6 +199,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
         return target[prop];
       },
     });
+    this.layerProxyMap.set(ctr.uuid, proxy);
     return proxy;
   }
 
@@ -203,11 +213,15 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       FWLog.error(`open layer failed:${data},please check param!`);
       return undefined;
     }
-    let ctr = new data.type();
+
+    const ctr = new data.type();
 
     /** 如果不是重复打开的Layer,不是需要添加进队列末尾的,并且已经存在于注册表中的 不进行重复打开 */
     if (this.layerRegistry.has(data.type) && !ctr.isRepeatOpen) {
-      return;
+      const targetController = this.findLayerProxy<Ctr>(ctr);
+      if (targetController) {
+        return targetController;
+      }
     }
 
     this.layerRegistry.add(data.type);
@@ -215,13 +229,16 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
       this.layerQueue.add(ctr.layerData);
       this.layerRegistry.delete(data.type);
-      return;
+      const targetController = this.findLayerProxy<Ctr>(ctr);
+      if (targetController) {
+        return targetController;
+      }
     }
 
     if (ctr.layerType != FWSystemDefine.FWLayerType.REPEAT && !ctr.isRepeatOpen) {
       for (const [key, value] of this.layerMap) {
         if (value.layerAssetProperty.path == ctr.layerAssetProperty.path) {
-          return this.layerMap.get(value.uuid).controller as Ctr;
+          return this.findLayerProxy<Ctr>(ctr);
         }
       }
     }
@@ -265,7 +282,6 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     }
 
     this.layerRegistry.delete(data.type);
-
     const proxy = new Proxy(ctr, {
       get: (target, prop) => {
         if (prop === 'addExternalReference') {
@@ -276,6 +292,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
         return target[prop];
       },
     });
+    this.layerProxyMap.set(ctr.uuid, proxy);
     return proxy;
   }
 
@@ -361,6 +378,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
         this.notifyExternalRefUpdates(ctr.layerData);
       }
       this.layerMap.delete(layerData.uuid);
+      this.layerProxyMap.delete(layerData.uuid);
     }
   }
 
@@ -388,6 +406,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     }
 
     this.layerMap.delete(layerData.uuid);
+    this.layerProxyMap.delete(layerData.uuid);
     this.layerStack.pop();
 
     const index = this.layerStack.findIndex((v) => {
@@ -513,4 +532,12 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     this.layerMap = null;
     this.layerQueue = null;
   }
+
+  private findLayerProxy<Ctr extends FW.LayerController>(ctr: FW.LayerController): Ctr {
+    for (const [key, value] of this.layerMap) {
+      if (value.layerAssetProperty.path == ctr.layerAssetProperty.path) {
+        return this.layerProxyMap.get(value.uuid) as Ctr;
+      }
+    }
+  }
 }

package/package.json

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

package/service/socket/FWSocket.ts

@@ -35,8 +35,6 @@ export default class FWSocket implements FW.Socket {
   protected tag: string;
   /** 是否暂停消息处理 */
   protected isPausedMessageHandle: boolean = false;
-  /** 是否正在重连 */
-  private isReconnect: boolean = false;
   /** 代理 */
   private promiseProxy: FW.SocketPromiseProxy;
   /** 协议符号 */
@@ -70,46 +68,49 @@ export default class FWSocket implements FW.Socket {
     handle: FW.SocketHandle,
     config: FW.SocketConfig,
   ): FW.SocketPromiseProxy {
-    FW.Entry.timeMgr.unSchedule(this);
+    try {
+      FW.Entry.timeMgr.unSchedule(this);
 
-    this.tag = tag;
-    this.address = address;
+      this.tag = tag;
+      this.address = address;
 
-    this.messageEvents = {};
-    this.protocolContainer.clear();
-    this.protocolRegistry.clear();
-    this.isReconnect = true;
-    this.sendHeartTimestamp = 0;
-    this.receiveTimeStamp = new Date().getTime();
-    FWLog.debug('创建socket -> ', address);
-    this.socket = new WebSocket(address);
-    this.socket.onopen = this.onSocketOpen.bind(this);
-    this.socket.onclose = this.onSocketClose.bind(this);
-    this.socket.onerror = this.onSocketError.bind(this);
-    this.socket.onmessage = this.onSocketMessage.bind(this);
-
-    this.sender = sender;
-    this.handle = handle;
-
-    const defaultConfig = FWSystemConfig.SocketDefaultConfig;
-    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.promiseProxy = {
-      promise: undefined,
-      resolve: undefined,
-      socket: this,
-    };
-
-    this.promiseProxy.promise = new Promise<FW.Socket>((resolve) => {
-      this.promiseProxy.resolve = resolve;
-    });
+      this.messageEvents = {};
+      this.protocolContainer.clear();
+      this.protocolRegistry.clear();
+      this.sendHeartTimestamp = 0;
+      this.receiveTimeStamp = new Date().getTime();
 
-    return this.promiseProxy;
+      this.socket = new WebSocket(address);
+      this.socket.onopen = this.onSocketOpen.bind(this);
+      this.socket.onclose = this.onSocketClose.bind(this);
+      this.socket.onerror = this.onSocketError.bind(this);
+      this.socket.onmessage = this.onSocketMessage.bind(this);
+
+      this.sender = sender;
+      this.handle = handle;
+
+      const defaultConfig = FWSystemConfig.SocketDefaultConfig;
+      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.promiseProxy = {
+        promise: undefined,
+        resolve: undefined,
+        socket: this,
+      };
+
+      this.promiseProxy.promise = new Promise<FW.Socket>((resolve) => {
+        this.promiseProxy.resolve = resolve;
+      });
+
+      return this.promiseProxy;
+    } catch (e) {
+      FWLog.error('创建socket失败:', e);
+    }
   }
   /**
    * 注册消息事件
@@ -142,12 +143,13 @@ export default class FWSocket implements FW.Socket {
    * @returns
    */
   public getReadyState() {
-    return this.socket.readyState;
+    return this.socket?.readyState;
   }
   /**
    * 关闭连接
    */
   public close() {
+    this.protocolContainer.clear();
     FW.Entry.socketMgr.closeSocket(this);
   }
 
@@ -159,6 +161,10 @@ export default class FWSocket implements FW.Socket {
     this.isPausedMessageHandle = false;
   }
 
+  public get isReconnect() {
+    return this.getReadyState() === WebSocket.CONNECTING;
+  }
+
   reconnect(force?: boolean) {
     if (force) this.reconnectTimes = 0;
 
@@ -205,7 +211,6 @@ export default class FWSocket implements FW.Socket {
     this.reconnectTimes = 0;
     this.sendHeartTimestamp = 0;
     this.receiveTimeStamp = new Date().getTime();
-    this.isReconnect = false;
     this.handle?.onOpen?.();
     this.heartHandle();
     this.promiseProxy?.resolve(this);
@@ -256,9 +261,10 @@ export default class FWSocket implements FW.Socket {
     this.handle?.onClose?.();
     FW.Entry.timeMgr.scheduleOnce(
       () => {
-        if (!this.isReconnect) return;
-        FWLog.debug('on close!');
-        this.reconnect();
+        if (this.getReadyState() == WebSocket.CLOSING || this.getReadyState() == WebSocket.CLOSED) {
+          FWLog.debug('on close!');
+          this.reconnect();
+        }
       },
       this.reconnectInternal,
       this,