@ives_xxz/framework 2.3.6 → 2.3.8

package/manager/FWHotUpdateManager.ts

@@ -1,8 +1,11 @@
-import { FWManager } from './FWManager';
+import { FWManager } from "./FWManager";
 
-const TEMOTE_ASSET = 'remote-asset';
+const TEMOTE_ASSET = "remote-asset";
 
-export default class FWHotUpdateManager extends FWManager implements FW.HotUpdateManager {
+export default class FWHotUpdateManager
+  extends FWManager
+  implements FW.HotUpdateManager
+{
   private listener: FW.HotUpdateListener;
   private assetMgr: any;
   private storePath: string;
@@ -14,19 +17,29 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
 
   setListener(listener: FW.HotUpdateListener): FW.HotUpdateManager {
     this.listener = listener;
-    FW.Log.debug('热更新监听设置');
+    FW.Log.debug("热更新监听设置");
     return this;
   }
 
   public update(localManifest: cc.Asset) {
     if (!localManifest) {
-      FW.Log.error('没有找到本地Manifest文件!');
+      FW.Log.error("没有找到本地Manifest文件!");
       return;
     }
-    FW.Log.debug('开始热更新流程');
+
+    const loadManifest = jsb.fileUtils.getStringFromFile(
+      localManifest.nativeUrl,
+    );
+    const manifestObject = JSON.parse(loadManifest);
+
+    FW.Log.debug("开始热更新流程:", manifestObject?.packageUrl);
     this.localManifest = localManifest;
-    this.storePath = `${jsb.fileUtils ? jsb.fileUtils.getWritablePath() : '/'}${TEMOTE_ASSET}`;
-    this.assetMgr = new jsb.AssetsManager('', this.storePath, this.versionCompareHandle.bind(this));
+    this.storePath = `${jsb.fileUtils ? jsb.fileUtils.getWritablePath() : "/"}${TEMOTE_ASSET}`;
+    this.assetMgr = new jsb.AssetsManager(
+      "",
+      this.storePath,
+      this.versionCompareHandle.bind(this),
+    );
     this.assetMgr.setVerifyCallback(function (path: string, asset: any) {
       const compressed = asset.compressed;
       const expectedMD5 = asset.md5;
@@ -41,16 +54,19 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     this.checkHotUpdate();
   }
 
-  private versionCompareHandle(currentVersion: string, newVersion: string): number {
-    FW.Log.debug('版本比较', currentVersion, newVersion);
+  private versionCompareHandle(
+    currentVersion: string,
+    newVersion: string,
+  ): number {
+    FW.Log.debug("版本比较", currentVersion, newVersion);
     this.currentVersion = currentVersion;
     this.newVersion = newVersion;
     this.listener.versionCompareHandle(this.currentVersion, this.newVersion);
-    var vA = currentVersion.split('.');
-    var vB = newVersion.split('.');
+    var vA = currentVersion.split(".");
+    var vB = newVersion.split(".");
     for (var i = 0; i < vA.length; ++i) {
       var a = parseInt(vA[i]);
-      var b = parseInt(vB[i] || '0');
+      var b = parseInt(vB[i] || "0");
       if (a === b) {
         continue;
       } else {
@@ -73,7 +89,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
   }
 
   private checkHotUpdate() {
-    FW.Log.debug('checkHotUpdate1', this.isUpdate);
+    FW.Log.debug("checkHotUpdate1", this.isUpdate);
     if (this.isUpdate) {
       return;
     }
@@ -81,17 +97,26 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
       this.assetMgr.loadLocalManifest(this.localManifest.nativeUrl);
     }
 
-    FW.Log.debug('checkHotUpdate3', this.assetMgr.getLocalManifest());
+    FW.Log.debug("checkHotUpdate3", this.assetMgr.getLocalManifest());
 
-    FW.Log.debug('checkHotUpdate4', this.assetMgr.getLocalManifest().isLoaded());
+    FW.Log.debug(
+      "checkHotUpdate4",
+      this.assetMgr.getLocalManifest().isLoaded(),
+    );
 
-    if (!this.assetMgr.getLocalManifest() || !this.assetMgr.getLocalManifest().isLoaded()) {
-      FW.Log.debug('本地manifest未加载，尝试重新加载');
+    if (
+      !this.assetMgr.getLocalManifest() ||
+      !this.assetMgr.getLocalManifest().isLoaded()
+    ) {
+      FW.Log.debug("本地manifest未加载，尝试重新加载");
       this.reloadLocalManifest();
 
       // 如果仍然无法加载，则返回
-      if (!this.assetMgr.getLocalManifest() || !this.assetMgr.getLocalManifest().isLoaded()) {
-        FW.Log.error('无法加载本地manifest文件');
+      if (
+        !this.assetMgr.getLocalManifest() ||
+        !this.assetMgr.getLocalManifest().isLoaded()
+      ) {
+        FW.Log.error("无法加载本地manifest文件");
         return;
       }
     }
@@ -107,38 +132,41 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
       if (jsb.fileUtils.isFileExist(updatedManifestPath)) {
         this.assetMgr.loadLocalManifest(updatedManifestPath);
 
-        if (this.assetMgr.getLocalManifest() && this.assetMgr.getLocalManifest().isLoaded()) {
-          FW.Log.debug('本地manifest重新加载成功');
+        if (
+          this.assetMgr.getLocalManifest() &&
+          this.assetMgr.getLocalManifest().isLoaded()
+        ) {
+          FW.Log.debug("本地manifest重新加载成功");
           this.localManifest = this.assetMgr.getLocalManifest();
         } else {
-          FW.Log.error('本地manifest重新加载失败');
+          FW.Log.error("本地manifest重新加载失败");
         }
       } else {
-        FW.Log.error('更新后的manifest文件不存在:', updatedManifestPath);
+        FW.Log.error("更新后的manifest文件不存在:", updatedManifestPath);
       }
     } catch (error) {
-      FW.Log.error('重新加载本地manifest时出错:', error);
+      FW.Log.error("重新加载本地manifest时出错:", error);
     }
   }
 
   private checkEventHandle(event: any) {
     const code = event.getEventCode();
-    FW.Log.debug('checkEvent getEventCode -> ', code);
+    FW.Log.debug("checkEvent getEventCode -> ", code);
     switch (code) {
       case jsb.EventAssetsManager.ERROR_NO_LOCAL_MANIFEST:
-        FW.Log.debug('checkEvent getEventCode -> ', 'ERROR_NO_LOCAL_MANIFEST');
+        FW.Log.debug("checkEvent getEventCode -> ", "ERROR_NO_LOCAL_MANIFEST");
         break;
       case jsb.EventAssetsManager.ERROR_DOWNLOAD_MANIFEST:
-        FW.Log.debug('checkEvent getEventCode -> ', 'ERROR_DOWNLOAD_MANIFEST');
+        FW.Log.debug("checkEvent getEventCode -> ", "ERROR_DOWNLOAD_MANIFEST");
         break;
       case jsb.EventAssetsManager.ERROR_PARSE_MANIFEST:
-        FW.Log.debug('checkEvent getEventCode -> ', 'ERROR_PARSE_MANIFEST');
+        FW.Log.debug("checkEvent getEventCode -> ", "ERROR_PARSE_MANIFEST");
         break;
       case jsb.EventAssetsManager.ALREADY_UP_TO_DATE:
-        FW.Log.debug('checkEvent getEventCode -> ', 'ALREADY_UP_TO_DATE');
+        FW.Log.debug("checkEvent getEventCode -> ", "ALREADY_UP_TO_DATE");
         break;
       case jsb.EventAssetsManager.NEW_VERSION_FOUND:
-        FW.Log.debug('checkEvent getEventCode -> ', 'NEW_VERSION_FOUND');
+        FW.Log.debug("checkEvent getEventCode -> ", "NEW_VERSION_FOUND");
         break;
       default:
         return;
@@ -148,7 +176,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     this.assetMgr.setEventCallback(null!);
     this.isUpdate = false;
     FW.Log.debug(
-      'isFind New Version -> ',
+      "isFind New Version -> ",
       event.getEventCode() == jsb.EventAssetsManager.NEW_VERSION_FOUND,
     );
     if (event.getEventCode() == jsb.EventAssetsManager.NEW_VERSION_FOUND) {
@@ -157,11 +185,11 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
   }
 
   private hotUpdate() {
-    FW.Log.debug('start hotUpdate ->', this.assetMgr, this.isUpdate);
+    FW.Log.debug("start hotUpdate ->", this.assetMgr, this.isUpdate);
     if (this.assetMgr && !this.isUpdate) {
       this.assetMgr.setEventCallback(this.updateEventHandle.bind(this));
       FW.Log.debug(
-        'assetMgr state ->',
+        "assetMgr state ->",
         this.assetMgr.getState() === jsb.AssetsManager.State.UNINITED,
       );
       if (this.assetMgr.getState() === jsb.AssetsManager.State.UNINITED) {
@@ -180,20 +208,20 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     let totalFiles: number = 0;
     let downloadedBytes: number = 0;
     let totalBytes: number = 0;
-    let convertDownloadedBytes: string = '';
-    let convertTotalBytes: string = '';
+    let convertDownloadedBytes: string = "";
+    let convertTotalBytes: string = "";
     const code = event.getEventCode();
     const msg = event.getMessage();
-    FW.Log.debug('updateEvent getEventCode -> ', code);
-    let str = '';
+    FW.Log.debug("updateEvent getEventCode -> ", code);
+    let str = "";
     switch (code) {
       case jsb.EventAssetsManager.ERROR_NO_LOCAL_MANIFEST:
         failed = true;
-        str = 'ERROR_NO_LOCAL_MANIFEST';
+        str = "ERROR_NO_LOCAL_MANIFEST";
         break;
       case jsb.EventAssetsManager.UPDATE_PROGRESSION:
-        str = 'UPDATE_PROGRESSION';
-        FW.Log.debug('updateEvent percent -> ', event.getPercent());
+        str = "UPDATE_PROGRESSION";
+        FW.Log.debug("updateEvent percent -> ", event.getPercent());
         if (event.getPercent() > 0) {
           downloadedFiles = event.getDownloadedFiles();
           totalFiles = event.getTotalFiles();
@@ -203,27 +231,27 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
           convertTotalBytes = this.convertBytes(totalBytes);
           percent = event.getPercent();
           FW.Log.debug(
-            '正在更新中 -> ',
-            '下载文件数量:',
+            "正在更新中 -> ",
+            "下载文件数量:",
             downloadedFiles,
-            ',下载文件总数量:',
+            ",下载文件总数量:",
             totalFiles,
-            ',已下载大小:',
+            ",已下载大小:",
             convertDownloadedBytes,
-            ',下载总大小:',
+            ",下载总大小:",
             convertTotalBytes,
           );
         }
         break;
       case jsb.EventAssetsManager.ERROR_DOWNLOAD_MANIFEST:
-        str = 'ERROR_DOWNLOAD_MANIFEST';
+        str = "ERROR_DOWNLOAD_MANIFEST";
         break;
       case jsb.EventAssetsManager.ERROR_PARSE_MANIFEST:
-        str = 'ERROR_PARSE_MANIFEST';
+        str = "ERROR_PARSE_MANIFEST";
         failed = true;
         break;
       case jsb.EventAssetsManager.ALREADY_UP_TO_DATE:
-        str = 'ALREADY_UP_TO_DATE';
+        str = "ALREADY_UP_TO_DATE";
         failed = true;
         break;
       case jsb.EventAssetsManager.UPDATE_FINISHED:
@@ -236,37 +264,37 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
           convertTotalBytes = this.convertBytes(totalBytes);
           percent = event.getPercent();
           FW.Log.debug(
-            '正在更新完成 -> ',
-            '下载文件数量:',
+            "正在更新完成 -> ",
+            "下载文件数量:",
             downloadedFiles,
-            ',下载文件总数量:',
+            ",下载文件总数量:",
             totalFiles,
-            ',已下载大小:',
+            ",已下载大小:",
             convertDownloadedBytes,
-            ',下载总大小:',
+            ",下载总大小:",
             convertTotalBytes,
           );
         }
-        str = 'UPDATE_FINISHED';
+        str = "UPDATE_FINISHED";
         needRestart = true;
         break;
       case jsb.EventAssetsManager.UPDATE_FAILED:
-        str = 'UPDATE_FAILED';
+        str = "UPDATE_FAILED";
         this.isUpdate = false;
         this.isRetry = true;
         break;
       case jsb.EventAssetsManager.ERROR_UPDATING:
-        str = 'ERROR_UPDATING';
+        str = "ERROR_UPDATING";
         break;
       case jsb.EventAssetsManager.ERROR_DECOMPRESS:
-        str = 'ERROR_DECOMPRESS';
+        str = "ERROR_DECOMPRESS";
         break;
       default:
         break;
     }
 
-    FW.Log.debug('热更新中->', str);
-    FW.Log.debug('热更新msg ->', msg);
+    FW.Log.debug("热更新中->", str);
+    FW.Log.debug("热更新msg ->", msg);
     this.listener.hotUpdatingHandle?.(code, {
       percent: percent,
       downloadedFiles: downloadedFiles,
@@ -277,15 +305,15 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
       convertTotalBytes: convertTotalBytes,
     });
     if (failed) {
-      FW.Log.debug('热更新中结果 failed -> ', failed);
-      FW.Log.debug('下载失败');
+      FW.Log.debug("热更新中结果 failed -> ", failed);
+      FW.Log.debug("下载失败");
       this.assetMgr.setEventCallback(null!);
       this.isUpdate = false;
       this.retry();
     }
     if (needRestart) {
-      FW.Log.debug('热更新中结果 needRestart -> ', needRestart);
-      FW.Log.debug('下载完成');
+      FW.Log.debug("热更新中结果 needRestart -> ", needRestart);
+      FW.Log.debug("下载完成");
       const searchPaths = jsb.fileUtils.getSearchPaths();
       const newPaths = this.assetMgr.getLocalManifest().getSearchPaths();
       Array.prototype.unshift.apply(searchPaths, newPaths);
@@ -301,7 +329,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
   }
 
   private convertBytes(bytes: number) {
-    const units = ['B', 'KB', 'MB', 'GB'];
+    const units = ["B", "KB", "MB", "GB"];
     let size = bytes,
       unitIndex = 0;
     while (size >= 1024 && unitIndex < units.length - 1) {

package/manager/FWSocketManager.ts

@@ -1,13 +1,10 @@
-import FWSocket from "../service/socket/FWSocket";
-import { FWManager } from "./FWManager";
+import FWSocket from '../service/socket/FWSocket';
+import { FWManager } from './FWManager';
 
 /**
  * socket管理器
  */
-export default class FWSocketManager
-  extends FWManager
-  implements FW.SocketManager
-{
+export default class FWSocketManager extends FWManager implements FW.SocketManager {
   protected socketMap: Map<string, FW.Socket>;
 
   public initialize(): void {
@@ -71,7 +68,7 @@ export default class FWSocketManager
 
   closeAll(): void {
     for (const [key, socket] of this.socketMap) {
-      socket?.close();
+      this.closeSocket(socket);
     }
     this.socketMap.clear();
   }
@@ -88,11 +85,9 @@ export default class FWSocketManager
    * @param fs
    * @returns
    */
-  closeSocket(fs: FWSocket) {
-    FW.Log.debug("主动关闭socket!");
-    const tag = fs.getTag();
-    fs.socket.close();
-    fs.socket = null;
-    this.socketMap.delete(tag);
+  closeSocket(fs: FW.Socket) {
+    FW.Log.debug('主动关闭socket!');
+    fs.close();
+    this.socketMap.delete(fs.getTag());
   }
 }

package/package.json

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

package/service/socket/FWSocket.ts

@@ -1,4 +1,4 @@
-import { FWSystemConfig } from "../../config/FWSystemConfig";
+import { FWSystemConfig } from '../../config/FWSystemConfig';
 
 /**
  * TODO 犹豫socket没有改版暂时已老的cmd字符串映射方式做,后期优化
@@ -44,6 +44,8 @@ export default class FWSocket extends FW.Service implements FW.Socket {
   private protocolContainer: Map<Symbol, FW.ProtocolPolling>;
   /** 证书 */
   private certificate: cc.Asset;
+  /** 是否强制关闭 */
+  private forceClose: boolean;
 
   /**
    *  消息事件列表
@@ -70,7 +72,7 @@ export default class FWSocket extends FW.Service implements FW.Socket {
 
       this.tag = tag;
       this.address = address;
-
+      this.forceClose = false;
       this.clear();
 
       this.messageEvents = {};
@@ -109,14 +111,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,
@@ -130,7 +128,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);
     }
   }
   /**
@@ -172,8 +170,11 @@ export default class FWSocket extends FW.Service implements FW.Socket {
    */
   public close() {
     this.clear();
+    this.forceClose = true;
+    this.onSocketClose();
+    this.socket?.close();
+    this.socket = null;
     FW.Entry.timeMgr.unSchedule(this);
-    FW.Entry.socketMgr.closeSocket(this);
   }
 
   public pauseMessageHandle() {
@@ -208,22 +209,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) {
@@ -233,8 +228,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(
@@ -255,7 +249,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;
@@ -299,15 +293,19 @@ 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?.();
+    this.socket.onclose = null;
+    this.socket.onerror = null;
+    this.socket.onmessage = null;
+    this.socket.onopen = null;
     FW.Entry.timeMgr.scheduleOnce(
       () => {
         if (
-          this.getReadyState() == WebSocket.CLOSING ||
-          this.getReadyState() == WebSocket.CLOSED
+          !this.forceClose &&
+          (this.getReadyState() == WebSocket.CLOSING || this.getReadyState() == WebSocket.CLOSED)
         ) {
-          FW.Log.debug("on close!");
+          FW.Log.debug('on close!');
           this.reconnect();
         }
       },