@ives_xxz/framework 1.1.4 → 1.1.6

package/FW.d.ts

@@ -214,7 +214,8 @@ declare namespace FW {
   };
 
   type SocketPromiseProxy = {
-    promise: Function;
+    promise: Promise<FW.Socket>;
+    resolve: Function;
     socket: FW.Socket;
   };
 

package/manager/FWHotUpdateManager.ts

@@ -221,14 +221,15 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
       FWLog.debug('热更新中结果 needRestart -> ', needRestart);
       FWLog.debug('下载完成');
       this.assetMgr.setEventCallback(null!);
-      this.assetMgr = null;
-      this.isRetry = false;
-      this.isUpdate = false;
       var searchPaths = jsb.fileUtils.getSearchPaths();
       var newPaths = this.assetMgr.getLocalManifest().getSearchPaths();
       Array.prototype.unshift.apply(searchPaths, newPaths);
       jsb.fileUtils.setSearchPaths(searchPaths);
+      this.isRetry = false;
+      this.isUpdate = false;
+      this.assetMgr = null;
       this.listener.completedHandle?.(this.newVersion);
+
     }
   }
 

package/manager/FWSocketManager.ts

@@ -13,7 +13,7 @@ export default class FWSocketManager extends FWManager implements FW.SocketManag
   public initialize(): void {
     this.socketMap = new Map<string, FW.Socket>();
   }
-  public onDestroy(): void {}
+  public onDestroy(): void { }
 
   /**
    * 创建一个socket
@@ -39,7 +39,7 @@ export default class FWSocketManager extends FWManager implements FW.SocketManag
     });
     this.socketMap.set(tag, proxy.socket);
 
-    await proxy.promise();
+    await proxy.promise;
 
     return proxy.socket;
   }

package/package.json

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

package/service/socket/FWSocket.ts

@@ -101,12 +101,14 @@ export default class FWSocket implements FW.Socket {
 
     this.promiseProxy = {
       promise: undefined,
+      resolve: undefined,
       socket: this,
     };
 
-    new Promise<FWSocket>((resolve) => {
-      this.promiseProxy.promise = resolve;
+    this.promiseProxy.promise = new Promise<FW.Socket>((resolve) => {
+      this.promiseProxy.resolve = resolve;
     });
+
     return this.promiseProxy;
   }
   /**
@@ -206,7 +208,7 @@ export default class FWSocket implements FW.Socket {
     this.isReconnect = false;
     this.handle?.onOpen?.();
     this.heartHandle();
-    this.promiseProxy?.promise(this);
+    this.promiseProxy?.resolve(this);
   }
 
   private heartHandle() {