@ives_xxz/framework 2.1.33 → 2.1.35

package/define/FWSystemDefine.ts

@@ -44,10 +44,10 @@ export class FWLayerType {
 }
 
 export class FWTaskStatus {
-  IDLE = "IDLE";
-  RUNNING = "RUNNING";
-  PAUSED = "PAUSED";
-  COMPLETED = "COMPLETED";
+  IDLE = 'IDLE';
+  RUNNING = 'RUNNING';
+  PAUSED = 'PAUSED';
+  COMPLETED = 'COMPLETED';
 }
 
 export class FWPriorityOrder {
@@ -91,17 +91,17 @@ export class FWLogType {
  * HTTP请求类型
  */
 export class FWHttpRequestType {
-  GET = "GET";
-  POST = "POST";
+  GET = 'GET';
+  POST = 'POST';
 }
 
 /**
  * 动画机类型
  */
 export class FWAnimationMachineType {
-  TWEEN = "TWEEN";
-  SKELETON = "SKELETON";
-  ANIMATION = "ANIMATION";
+  TWEEN = 'TWEEN';
+  SKELETON = 'SKELETON';
+  ANIMATION = 'ANIMATION';
 }
 
 export class FWVirtualScrollViewDirection {
@@ -127,23 +127,25 @@ export class FWScrollViewSelectedType {
 }
 
 export class FWLanguageAssetType {
-  LABEL = "label";
-  SPRITE = "sprite";
-  SKELETON = "skeleton";
+  LABEL = 'label';
+  SPRITE = 'sprite';
+  SKELETON = 'skeleton';
 }
 
 export class FWPromiseStatus {
-  PENDING = "pending";
-  FULFILLED = "fulfilled";
-  REJECTED = "rejected";
-  CANCELLED = "cancelled";
+  PENDING = 'pending';
+  FULFILLED = 'fulfilled';
+  REJECTED = 'rejected';
+  CANCELLED = 'cancelled';
 }
 
 export class FWLayerState {
-  CLOSED = "closed";
-  OPENING = "opening";
-  OPENED = "opened";
-  CLOSING = "closing";
+  LOADING = 'loading';
+  LOADED = 'loaded';
+  OPENING = 'opening';
+  OPENED = 'opened';
+  CLOSED = 'closed';
+  CLOSING = 'closing';
 }
 
 export class FWAudioType {

package/manager/FWLayerManager.ts

@@ -13,24 +13,33 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   private stateManager: FWLayerStateManager;
   private queueManager: FWLayerQueueManager;
   private openManager: FWLayerOpenManager;
+  private debug: boolean;
 
   public initialize(): void {
+    this.debug = false;
     this.resourceManager = new FWLayerResourceManager();
     this.dataManager = new FWLayerDataManager();
     this.createManager = new FWLayerCreateManager();
     this.stackManager = new FWLayerStackManager();
-    this.stateManager = new FWLayerStateManager();
     this.queueManager = new FWLayerQueueManager();
-
+    this.stateManager = new FWLayerStateManager();
     this.openManager = new FWLayerOpenManager(
       this.dataManager,
       this.resourceManager,
       this.createManager,
       this.stackManager,
       this.queueManager,
+      this.stateManager,
     );
   }
 
+  openDebug() {
+    this.debug = true;
+  }
+
+  isDebug() {
+    return this.debug;
+  }
   /**
    * 异步打开Layer
    */
@@ -38,6 +47,9 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   async openAsync<Ctr extends FW.LayerController = FW.LayerController>(
     data: FW.LayerOpenArgs,
   ): Promise<Ctr> {
+    if (this.debug) {
+      FW.Log.error(`异步打开Layer ->`, cc.js.getClassName(data.type));
+    }
     return this.openManager.openLayerAsync(data) as Promise<Ctr>;
   }
 
@@ -47,6 +59,9 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   openSync<Ctr extends FW.LayerController = FW.LayerController>(
     data: FW.LayerOpenArgs,
   ): Ctr {
+    if (this.debug) {
+      FW.Log.error(`同步打开Layer ->`, cc.js.getClassName(data.type));
+    }
     return this.openManager.openLayerSync(data) as Ctr;
   }
 
@@ -172,14 +187,26 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       let layerData = ctr.layerData;
 
       if (cc.isValid(ctr.layer?.node)) {
+        this.stateManager.setState(
+          ctr.layerData.controllerConstructor,
+          FW.SystemDefine.FWLayerState.CLOSING,
+        );
+
         await ctr.onClose?.();
+
+        this.stateManager.setState(
+          ctr.layerData.controllerConstructor,
+          FW.SystemDefine.FWLayerState.CLOSED,
+        );
+
         ctr.destroy?.();
+
         if (ctr.autoRelease) {
           FW.Entry.resMgr.releaseAsset(ctr.layerData.layerAssetProperty);
         }
         this.dataManager.notifyExternalRefUpdates(ctr.layerData);
       }
-
+      this.stateManager.removeState(layerData?.controllerConstructor);
       this.dataManager.removeFromMap(layerData?.controllerConstructor);
       this.dataManager.removeFromRegistry(ctr.layerData?.controllerConstructor);
 
@@ -464,6 +491,7 @@ class FWLayerOpenManager {
     private createManager: FWLayerCreateManager,
     private stackManager: FWLayerStackManager,
     private queueManager: FWLayerQueueManager,
+    private stateManager: FWLayerStateManager,
   ) {}
 
   /**
@@ -561,12 +589,29 @@ class FWLayerOpenManager {
     Ctr extends FW.LayerController = FW.LayerController,
   >(layerData: FWLayerData, data: FW.LayerOpenArgs): Promise<Ctr> {
     try {
+      this.stateManager.setState(
+        layerData.controllerConstructor,
+        FW.SystemDefine.FWLayerState.LOADING,
+      );
       const res = await this.resourceManager.loadLayerAsync(layerData);
+
+      this.stateManager.setState(
+        layerData.controllerConstructor,
+        FW.SystemDefine.FWLayerState.OPENING,
+      );
       const ctr = this.createLayer(layerData, res, data) as Ctr;
+
       this.dataManager.removeFromRegistry(layerData.controllerConstructor);
+
+      this.stateManager.setState(
+        layerData.controllerConstructor,
+        FW.SystemDefine.FWLayerState.OPENED,
+      );
+
       return ctr;
     } catch (e) {
       FW.Log.error(`asyncGenerationLayer failed:`, e);
+      this.stateManager.removeState(layerData.controllerConstructor);
       this.dataManager.clearFailedLayer(layerData);
       throw e;
     }
@@ -579,12 +624,22 @@ class FWLayerOpenManager {
     Ctr extends FW.LayerController = FW.LayerController,
   >(layerData: FWLayerData, data: FW.LayerOpenArgs): Ctr {
     try {
+      this.stateManager.setState(
+        layerData.controllerConstructor,
+        FW.SystemDefine.FWLayerState.OPENING,
+      );
       const res = this.resourceManager.loadLayerSync(layerData);
       const ctr = this.createLayer(layerData, res, data) as Ctr;
-      this.dataManager.removeFromRegistry(layerData.controllerConstructor);
+
+      this.stateManager.setState(
+        layerData.controllerConstructor,
+        FW.SystemDefine.FWLayerState.OPENED,
+      );
+
       return ctr;
     } catch (e) {
       FW.Log.error(`syncGenerationLayer failed:`, e);
+      this.dataManager.removeFromRegistry(layerData.controllerConstructor);
       this.dataManager.clearFailedLayer(layerData);
       return undefined;
     }
@@ -698,11 +753,14 @@ class FWLayerStateManager {
     new () => FW.LayerController,
     FW.SystemDefine.FWLayerState
   >();
-
+  constructor() {}
   setState(
     ctrType: new () => FW.LayerController,
     state: FW.SystemDefine.FWLayerState,
   ): void {
+    if (FW.Entry.layerMgr.isDebug()) {
+      FW.Log.debug(`${cc.js.getClassName(ctrType)}->更新状态${state}`);
+    }
     this.layerStates.set(ctrType, state);
   }
 
@@ -725,6 +783,9 @@ class FWLayerStateManager {
   }
 
   removeState(ctrType: new () => FW.LayerController): void {
+    if (FW.Entry.layerMgr.isDebug()) {
+      FW.Log.debug(`${cc.js.getClassName(ctrType)}->移除状态`);
+    }
     this.layerStates.delete(ctrType);
   }
 

package/package.json

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

package/service/socket/FWSocket.ts

@@ -1,4 +1,4 @@
-import { FWSystemConfig } from "../../config/FWSystemConfig";
+import { FWSystemConfig } from '../../config/FWSystemConfig';
 
 /**
  * TODO 犹豫socket没有改版暂时已老的cmd字符串映射方式做,后期优化
@@ -106,14 +106,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,
@@ -127,7 +123,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);
     }
   }
   /**
@@ -205,22 +201,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) {
@@ -230,8 +220,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(
@@ -252,7 +241,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;
@@ -296,15 +285,12 @@ 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?.();
     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();
         }
       },

package/types/FW.d.ts

@@ -899,6 +899,10 @@ declare namespace FW {
 
     /** 清理方法 */
     clear(): void;
+    /** 开启调试 */
+    openDebug():void;
+    /** 是否开启调试 */
+    isDebug():boolean;
 
     /**
      * 异步打开layer
@@ -2644,6 +2648,8 @@ declare namespace FW {
      * 层状态
      */
     export class FWLayerState {
+      static LOADING = 'loading';
+      static LOADED = 'loaded';
       static CLOSED = 'closed';
       static OPENING = 'opening';
       static OPENED = 'opened';