@ives_xxz/framework 2.3.5 → 2.3.7

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/FWResManager.ts

@@ -1,8 +1,8 @@
-import { FWSystemConfig } from "../config/FWSystemConfig";
-import { FWLodash } from "../utils/FWLodash";
-import { FWAssetManager } from "./FWAssetManager";
-import { FWBundleManager } from "./FWBundleManager";
-import { FWManager } from "./FWManager";
+import { FWSystemConfig } from '../config/FWSystemConfig';
+import { FWLodash } from '../utils/FWLodash';
+import { FWAssetManager } from './FWAssetManager';
+import { FWBundleManager } from './FWBundleManager';
+import { FWManager } from './FWManager';
 
 export class FWResManager extends FWManager implements FW.ResManager {
   private bundleMgr: FW.BundleManager;
@@ -22,65 +22,60 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @returns
    */
   async loadBundle(bundleName: string): Promise<cc.AssetManager.Bundle> {
-    return await this.invoke<cc.AssetManager.Bundle>(
-      FW.Entry.promiseMgr.execute(async (resolve, reject, signal) => {
+    return new Promise(async (resolve, reject) => {
+      try {
         const depends = FWLodash.cloneDeep(FW.Entry.getDepend(bundleName));
-        try {
-          if (depends && depends.length > 0) {
-            for (const depend of depends) {
-              if (depend === undefined) continue;
+        if (depends && depends.length > 0) {
+          for (const depend of depends) {
+            if (depend === undefined) continue;
 
-              if (this.bundleMgr.has(depend)) continue;
+            if (this.bundleMgr.has(depend)) continue;
 
-              await this.loadBundle(depend);
+            await this.loadBundle(depend);
 
-              const config = FW.Entry.getComponent<FW.AssetConfig>(
-                `${depend}${FW.SystemDefine.FWBindTag.CONFIG}`,
-              );
-              if (!config) continue;
-              const preLoad = config.preLoad;
-              const keys = Object.keys(preLoad);
+            const config = FW.Entry.getComponent<FW.AssetConfig>(
+              `${depend}${FW.SystemDefine.FWBindTag.CONFIG}`,
+            );
+            if (!config) continue;
+            const preLoad = config.preLoad;
+            const keys = Object.keys(preLoad);
 
-              if (keys.length > 0) {
-                const preloadRecursive = async (
-                  obj: FW.LoadConfig | FW.AssetProperty,
-                ) => {
-                  for (const key of Object.keys(obj)) {
-                    const value: any = (obj as any)[key];
+            if (keys.length > 0) {
+              const preloadRecursive = async (obj: FW.LoadConfig | FW.AssetProperty) => {
+                for (const key of Object.keys(obj)) {
+                  const value: any = (obj as any)[key];
 
-                    if (value && typeof value.path === "string") {
-                      const path: string = value.path;
-                      const type: string = value.type;
-                      const d: string = value.bundle || depend;
-                      const priorityLoaded = value.priorityLoaded || false;
+                  if (value && typeof value.path === 'string') {
+                    const path: string = value.path;
+                    const type: string = value.type;
+                    const d: string = value.bundle || depend;
+                    const priorityLoaded = value.priorityLoaded || false;
 
-                      if (path && priorityLoaded) {
-                        await this.assetMgr.load({
-                          path,
-                          bundle: d,
-                          type,
-                        });
-                      }
-                    } else if (value && typeof value === "object") {
-                      await preloadRecursive(value);
+                    if (path && priorityLoaded) {
+                      await this.assetMgr.load({
+                        path,
+                        bundle: d,
+                        type,
+                      });
                     }
+                  } else if (value && typeof value === 'object') {
+                    await preloadRecursive(value);
                   }
-                };
-                await preloadRecursive(config.preLoad);
-              }
+                }
+              };
+              await preloadRecursive(config.preLoad);
             }
           }
+        }
 
-          const bundle = await this.bundleMgr.load(bundleName);
+        const bundle = await this.bundleMgr.load(bundleName);
 
-          resolve(bundle);
-        } catch (e) {
-          this.rejectHandlerListener?.loadBundleHandler?.(e, bundleName);
-          reject(e);
-        }
-      }, FWSystemConfig.PromiseConfig.loadBundle).promise,
-      `loadBundle -> ${bundleName}`,
-    );
+        resolve(bundle);
+      } catch (e) {
+        this.rejectHandlerListener?.loadBundleHandler?.(e, bundleName);
+        reject(e);
+      }
+    });
   }
   /**
    * 从远程加载spine动画
@@ -96,10 +91,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
     return await this.assetMgr.loadSpineDataFromRemote(data);
   }
 
-  async loadRemote<T extends cc.Asset = cc.Asset>(
-    url: string,
-    texture?: boolean,
-  ): Promise<T> {
+  async loadRemote<T extends cc.Asset = cc.Asset>(url: string, texture?: boolean): Promise<T> {
     try {
       const asset = await this.assetMgr.loadRemote(url);
       if (texture) {
@@ -191,10 +183,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param bundleName
    * @returns
    */
-  getAssetData<T extends cc.Asset>(
-    assetProperty: FW.AssetProperty,
-    texture?: boolean,
-  ) {
+  getAssetData<T extends cc.Asset>(assetProperty: FW.AssetProperty, texture?: boolean) {
     const res = this.assetMgr.get(assetProperty);
     if (texture) {
       return res;
@@ -206,10 +195,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param assetProperty
    * @returns
    */
-  getAsset<T extends cc.Asset>(
-    assetProperty: FW.AssetProperty,
-    texture?: boolean,
-  ): T {
+  getAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty, texture?: boolean): T {
     const res = this.assetMgr.get(assetProperty);
     if (texture) {
       return res.asset as T;

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.3.5",
+  "version": "2.3.7",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
-  "keywords": ["123456"],
+  "keywords": [
+    "123456"
+  ],
   "author": "ives",
   "license": "ISC"
 }