@ives_xxz/framework 1.2.18 → 1.2.20

package/FW.d.ts

@@ -219,6 +219,11 @@ declare namespace FW {
     socket: FW.Socket;
   };
 
+  type ProtocolPolling = {
+    msg: string;
+    schedule: TimerSchedule;
+  };
+
   type Socket = {
     public onDestroy(): void;
     /**
@@ -275,6 +280,7 @@ declare namespace FW {
     maxReconnectTimes: number;
     reconnectInternal: number;
     protocolSymbol: Symbol;
+    protocolPollingTime: number;
   };
 
   /**

package/config/FWSystemConfig.ts

@@ -6,5 +6,6 @@ export namespace FWSystemConfig {
     maxReconnectTimes: 10,
     reconnectInternal: 3000,
     protocolSymbol: null,
+    protocolPollingTime: 10,
   };
 }

package/manager/FWLayerManager.ts

@@ -138,6 +138,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     layerData.controllerName = ctrName;
 
     this.layerMap.set(ctrName, layerData);
+    FWLog.debug('打开Layer -> ', layerData?.controllerName, this.layerMap.has(ctrName));
 
     if (this.layerRegistry.has(data.type)) {
       return this.layerMap.get(ctrName).controllerProxy as Ctr;
@@ -300,6 +301,9 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    */
   displayLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
     const layerData = ctr.layerData;
+
+    FWLog.debug('关闭Layer -> ', layerData?.controllerName);
+
     if (!this.layerMap.has(layerData.controllerName)) {
       FWLog.warn(`display layer failed,layer name : ${layerData.layerName}`);
       return;
@@ -399,6 +403,8 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       this.notifyExternalRefUpdates(ctr.layerData);
     }
 
+    FWLog.debug('closeLayer', layerData.controllerName);
+
     this.layerMap.delete(layerData.controllerName);
     this.layerRegistry.delete(ctr.layerData.controllerConstructor);
 
@@ -517,6 +523,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   }
 
   public clear() {
+    FWLog.debug('调用clear');
     this.layerQueue = new FWQueue();
     this.layerStack = [];
     this.layerRegistry = new Set<new () => FW.LayerController>();
@@ -525,6 +532,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   }
 
   public onDestroy(): void {
+    FWLog.debug('调用onDestroy');
     this.layerMap.clear();
     this.layerMap = null;
     this.layerQueue = null;

package/package.json

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

package/service/socket/FWSocket.ts

@@ -39,10 +39,12 @@ export default class FWSocket implements FW.Socket {
   private promiseProxy: FW.SocketPromiseProxy;
   /** 协议符号 */
   private protocolSymbol: FW.Symbol;
+  /** 协议轮询时间 */
+  private protocolPollingTime: number;
   /** 协议注册表 */
   private protocolRegistry: Map<string, Set<Symbol>>;
   /** 协议符号容器 */
-  private protocolContainer: Map<Symbol, string>;
+  private protocolContainer: Map<Symbol, FW.ProtocolPolling>;
 
   /**
    *  消息事件列表
@@ -56,7 +58,7 @@ export default class FWSocket implements FW.Socket {
 
   public initialize(): void {
     this.messageEvents = cc.js.createMap();
-    this.protocolContainer = new Map<Symbol, string>();
+    this.protocolContainer = new Map<Symbol, FW.ProtocolPolling>();
     this.protocolRegistry = new Map<string, Set<Symbol>>();
     this.reconnectTimes = 0;
   }
@@ -96,6 +98,7 @@ export default class FWSocket implements FW.Socket {
       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,
@@ -192,10 +195,11 @@ export default class FWSocket implements FW.Socket {
       maxReconnectTimes: this.maxReconnectTimes,
       reconnectInternal: this.reconnectInternal,
       protocolSymbol: this.protocolSymbol,
+      protocolPollingTime: this.protocolPollingTime,
     });
   }
 
-  async send(msg: any) {
+  async send(msg: string) {
     if (this.getReadyState() != WebSocket.OPEN) return;
     if (this.isPausedMessageHandle) return;
     if (!(await this.sender.onHeart?.(msg))) {
@@ -203,8 +207,19 @@ export default class FWSocket implements FW.Socket {
       if (protocolKey) {
         const symbol = Symbol(protocolKey);
         const registry = this.protocolRegistry.get(protocolKey) || new Set<Symbol>();
+        const protocolPolling: FW.ProtocolPolling = {
+          msg: msg,
+          schedule: FW.Entry.timeMgr.schedule(
+            () => {
+              this.sendMessage(msg);
+            },
+            this.protocolPollingTime,
+            cc.macro.REPEAT_FOREVER,
+            this,
+          ),
+        };
         this.protocolRegistry.set(protocolKey, registry.add(symbol));
-        this.protocolContainer.set(symbol, msg);
+        this.protocolContainer.set(symbol, protocolPolling);
       }
     }
     this.sendMessage(msg);
@@ -234,13 +249,6 @@ export default class FWSocket implements FW.Socket {
           }
         }
         this.sendHeart();
-
-        if (this.protocolContainer.size > 0) {
-          this.protocolContainer?.forEach((msg) => {
-            FWLog.send('协议容器轮询消息 -> ', msg);
-            this.sendMessage(msg);
-          });
-        }
       },
       this.heartInternal / 1000,
       cc.macro.REPEAT_FOREVER,
@@ -305,9 +313,12 @@ export default class FWSocket implements FW.Socket {
 
       if (symbolSet && symbolSet.size > 0) {
         const [symbol] = symbolSet;
+        const protocolPolling = this.protocolContainer.get(symbol);
 
         symbolSet.delete(symbol);
 
+        protocolPolling.schedule.unSchedule();
+
         this.protocolContainer.delete(symbol);
 
         if (symbolSet.size === 0) {