@ives_xxz/framework 1.2.21 → 1.2.23

package/FW.d.ts

@@ -281,6 +281,7 @@ declare namespace FW {
     reconnectInternal: number;
     protocolSymbol: Symbol;
     protocolPollingTime: number;
+    certificate: cc.Asset;
   };
 
   /**
@@ -1490,7 +1491,7 @@ declare namespace FW {
     /**
      * 状态构造类
      */
-    stateConstructor: { new (): T };
+    stateConstructor: { new(): T };
   };
 
   type AudioManager = {

package/manager/FWLayerManager.ts

@@ -138,7 +138,6 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     layerData.controllerName = ctrName;
 
     this.layerMap.set(data.type, layerData);
-    FWLog.debug('打开Layer -> ', layerData?.controllerName, this.layerMap.has(data.type));
 
     if (this.layerRegistry.has(data.type)) {
       return this.layerMap.get(data.type).controllerProxy as Ctr;
@@ -302,8 +301,6 @@ 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(ctr.layerData.controllerConstructor)) {
       FWLog.warn(`display layer failed,layer name : ${layerData.layerName}`);
       return;
@@ -403,8 +400,6 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       this.notifyExternalRefUpdates(ctr.layerData);
     }
 
-    FWLog.debug('closeLayer', layerData.controllerConstructor);
-
     this.layerMap.delete(layerData.controllerConstructor);
     this.layerRegistry.delete(ctr.layerData.controllerConstructor);
 
@@ -523,7 +518,6 @@ 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>();
@@ -532,7 +526,6 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   }
 
   public onDestroy(): void {
-    FWLog.debug('调用onDestroy');
     this.layerMap.clear();
     this.layerMap = null;
     this.layerQueue = null;

package/manager/FWSocketManager.ts

@@ -36,6 +36,8 @@ export default class FWSocketManager extends FWManager implements FW.SocketManag
       maxReconnectTimes: config.maxReconnectTimes,
       reconnectInternal: config.reconnectInternal,
       protocolSymbol: config.protocolSymbol,
+      protocolPollingTime: config.protocolPollingTime,
+      certificate: config.certificate,
     });
     this.socketMap.set(tag, proxy.socket);
 

package/package.json

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

package/service/socket/FWSocket.ts

@@ -45,6 +45,8 @@ export default class FWSocket implements FW.Socket {
   private protocolRegistry: Map<string, Set<Symbol>>;
   /** 协议符号容器 */
   private protocolContainer: Map<Symbol, FW.ProtocolPolling>;
+  /** 证书 */
+  private certificate: cc.Asset;
 
   /**
    *  消息事件列表
@@ -82,7 +84,21 @@ export default class FWSocket implements FW.Socket {
       this.sendHeartTimestamp = 0;
       this.receiveTimeStamp = new Date().getTime();
 
-      this.socket = new WebSocket(address);
+      if (config.certificate) {
+        let url = config.certificate.nativeUrl;
+        if (cc.assetManager.cacheManager) {
+          url =
+            cc.assetManager.cacheManager.getCache(url) ||
+            cc.assetManager.cacheManager.getTemp(url) ||
+            url;
+        }
+        //@ts-ignore
+        this.socket = new WebSocket(address, [], url);
+      } else {
+        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);
@@ -196,6 +212,7 @@ export default class FWSocket implements FW.Socket {
       reconnectInternal: this.reconnectInternal,
       protocolSymbol: this.protocolSymbol,
       protocolPollingTime: this.protocolPollingTime,
+      certificate: this.certificate,
     });
   }