@ives_xxz/framework 2.0.5 → 2.0.7

package/FrameworkBase.ts

@@ -1,4 +1,4 @@
-import { injectable } from 'inversify';
+import { injectable } from "inversify";
 
 @injectable()
 export abstract class FrameworkBase {
@@ -18,7 +18,11 @@ export abstract class FrameworkBase {
 
   constructor() {
     this.initialize?.();
-    // this.entry.evtMgr.register(FW.EventDefine.SystemEvent.SYSTEM_RESTART, this.onRestart, this);
+    this.entry.evtMgr.register(
+      FW.EventDefine.SystemEvent.SYSTEM_RESTART,
+      this.onRestart,
+      this
+    );
   }
 
   protected get moduleName(): string {
@@ -58,36 +62,39 @@ export abstract class FrameworkBase {
 
     if (tag !== FW.SystemDefine.FWBindTag.LOGIC) {
       this.logic = FW.Framework.getComponent<FW.Logic>(
-        `${bundleName}${FW.SystemDefine.FWBindTag.LOGIC}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.LOGIC}`
       );
     }
 
     if (tag !== FW.SystemDefine.FWBindTag.DATA) {
       this.data = FW.Framework.getComponent<FW.Data>(
-        `${bundleName}${FW.SystemDefine.FWBindTag.DATA}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.DATA}`
       );
     }
 
     if (tag !== FW.SystemDefine.FWBindTag.CONFIG) {
       this.config = FW.Framework.getComponent<FW.AssetConfig>(
-        `${bundleName}${FW.SystemDefine.FWBindTag.CONFIG}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.CONFIG}`
       );
     }
 
     if (tag !== FW.SystemDefine.FWBindTag.SENDER) {
       this.sender = FW.Framework.getComponent<FW.Sender>(
-        `${bundleName}${FW.SystemDefine.FWBindTag.SENDER}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.SENDER}`
       );
     }
 
     if (tag !== FW.SystemDefine.FWBindTag.HANDLE) {
       this.handle = FW.Framework.getComponent<FW.Handle>(
-        `${bundleName}${FW.SystemDefine.FWBindTag.HANDLE}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.HANDLE}`
       );
     }
   }
 
-  protected async invoke<T>(operation: Promise<T>, operationName: string = 'unknown'): Promise<T> {
+  protected async invoke<T>(
+    operation: Promise<T>,
+    operationName: string = "unknown"
+  ): Promise<T> {
     const startTime = this.getCurrentTime();
 
     try {
@@ -101,16 +108,25 @@ export abstract class FrameworkBase {
     }
   }
 
-  private recordPerformanceMetric(operationName: string, duration: number): void {
+  private recordPerformanceMetric(
+    operationName: string,
+    duration: number
+  ): void {
     if (FW.Entry.performanceMgr) {
-      FW.Entry.performanceMgr.recordOperationMetric(this.moduleName, operationName, duration);
+      FW.Entry.performanceMgr.recordOperationMetric(
+        this.moduleName,
+        operationName,
+        duration
+      );
     }
 
     const shouldWarn = duration > 1000;
 
     if (FW.Entry.engineMgr.debug || shouldWarn) {
       const log = shouldWarn ? FW.Log.warn : FW.Log.debug;
-      log(`[${this.moduleName?.toUpperCase()}] Operation ${operationName} took ${duration}ms`);
+      log(
+        `[${this.moduleName?.toUpperCase()}] Operation ${operationName} took ${duration}ms`
+      );
     }
   }
 
@@ -143,7 +159,10 @@ export abstract class FrameworkBase {
     return undefined;
   }
 
-  private doesClassNameContainBundleName(className: string, bundleName: string): boolean {
+  private doesClassNameContainBundleName(
+    className: string,
+    bundleName: string
+  ): boolean {
     const bundleNameLower = bundleName.toLowerCase();
     const classNameLower = className.toLowerCase();
     return classNameLower.includes(bundleNameLower);
@@ -151,13 +170,13 @@ export abstract class FrameworkBase {
 
   private getClassTag(): FW.SystemDefine.FWBindTag {
     const className = this.moduleName;
-    if (className.endsWith('Logic')) return FW.SystemDefine.FWBindTag.LOGIC;
-    if (className.endsWith('Data')) return FW.SystemDefine.FWBindTag.DATA;
-    if (className.endsWith('Config') || className.endsWith('AssetConfig'))
+    if (className.endsWith("Logic")) return FW.SystemDefine.FWBindTag.LOGIC;
+    if (className.endsWith("Data")) return FW.SystemDefine.FWBindTag.DATA;
+    if (className.endsWith("Config") || className.endsWith("AssetConfig"))
       return FW.SystemDefine.FWBindTag.CONFIG;
-    if (className.endsWith('Sender') || className.endsWith('SocketSender'))
+    if (className.endsWith("Sender") || className.endsWith("SocketSender"))
       return FW.SystemDefine.FWBindTag.SENDER;
-    if (className.endsWith('Handle') || className.endsWith('SocketHandle'))
+    if (className.endsWith("Handle") || className.endsWith("SocketHandle"))
       return FW.SystemDefine.FWBindTag.HANDLE;
     return;
   }

package/manager/FWAssetManager.ts

@@ -1,5 +1,5 @@
-import { FWSystemConfig } from '../config/FWSystemConfig';
-import { FWManager } from './FWManager';
+import { FWSystemConfig } from "../config/FWSystemConfig";
+import { FWManager } from "./FWManager";
 
 /**
  * 资源数据
@@ -47,7 +47,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           const img = data.img;
           const ske = data.ske;
           const atlas = data.atlas;
-          const type = bin ? '.bin' : '.txt';
+          const type = bin ? ".bin" : ".txt";
           cc.assetManager.loadAny(
             [
               { url: atlas, ext: type },
@@ -59,34 +59,38 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
               asset.skeletonJson = assets[1];
               asset.atlasText = assets[0];
               asset.textures.push(texture);
-              asset['textureNames'] = [`${img}.png`];
-              asset['_uuid'] = ske;
+              asset["textureNames"] = [`${img}.png`];
+              asset["_uuid"] = ske;
               resolve(asset);
-            },
+            }
           );
-        }, FWSystemConfig.PromiseConfig.loadAsset).promise,
+        }, FWSystemConfig.PromiseConfig.loadAsset).promise
       );
     } catch (e) {
-      FW.Log.error('从远程加载spine动画资源失败!');
+      FW.Log.error("从远程加载spine动画资源失败!");
     }
   }
 
   /** 加载远程资源 */
   async loadRemote<T extends cc.Asset = cc.Asset>(
     url?: string,
-    cb?: (asset: cc.Asset) => void,
+    cb?: (asset: cc.Asset) => void
   ): Promise<T> {
     return await this.invoke(
       FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
-        cc.assetManager.loadRemote(url, { cacheEnabled: true, maxRetryCount: 3 }, (err, asset) => {
-          if (err || !asset) {
-            reject(err);
+        cc.assetManager.loadRemote(
+          url,
+          { cacheEnabled: true, maxRetryCount: 3 },
+          (err, asset) => {
+            if (err || !asset) {
+              reject(err);
+            }
+            cb?.(asset as T);
+            resolve(asset as T);
           }
-          cb?.(asset as T);
-          resolve(asset as T);
-        });
+        );
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${url}`,
+      `loadAssets -> ${url}`
     );
   }
 
@@ -96,7 +100,9 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
       return undefined;
     }
 
-    const propertys = Array.isArray(assetProperty) ? assetProperty : [assetProperty];
+    const propertys = Array.isArray(assetProperty)
+      ? assetProperty
+      : [assetProperty];
 
     await Promise.all(
       propertys.map(async (property) => {
@@ -105,17 +111,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         const path = property.path;
         const progress = property.progress;
 
-        if (!bundleName || bundleName === '') {
+        if (!bundleName || bundleName === "") {
           FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
           return undefined;
         }
 
-        if (!path || path === '') {
+        if (!path || path === "") {
           FW.Log.error(`找不到资源路径${path},请检查!`);
           return undefined;
         }
 
-        let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
+        let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
+          bundleName
+        );
 
         if (!bundle) {
           FW.Log.error(`加载bundle失败,请检查!`);
@@ -127,20 +135,24 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             bundle.preload(
               path,
               type,
-              (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
+              (
+                finish: number,
+                total: number,
+                item: cc.AssetManager.RequestItem
+              ) => {
                 progress?.(finish, total, item);
               },
               (err: Error, item: cc.AssetManager.RequestItem[]) => {
                 if (err || !item || item?.length == 0) {
-                  reject(err || 'preload failed!');
+                  reject(err || "preload failed!");
                 }
                 resolve(item);
-              },
+              }
             );
           }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-          `preLoadAssets -> ${property.path}`,
+          `preLoadAssets -> ${property.path}`
         );
-      }),
+      })
     );
   }
 
@@ -161,17 +173,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const progress = assetProperty.progress;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
-    let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
+    let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
+      bundleName
+    );
 
     if (!bundle) {
       FW.Log.error(`加载bundle失败,请检查!`);
@@ -195,7 +209,11 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         bundle.load(
           path,
           type,
-          (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
+          (
+            finish: number,
+            total: number,
+            item: cc.AssetManager.RequestItem
+          ) => {
             progress?.(finish, total, item);
           },
           (err: Error, asset: cc.Asset) => {
@@ -205,7 +223,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             }
             assetData.loaded = true;
             assetData.dependentBundle = bundleName;
-            assetData.uuid = asset['_uuid'];
+            assetData.uuid = asset["_uuid"];
             assetData.autoRelease = autoRelease;
             assetData.asset = asset;
             assetData.user = assetProperty.user;
@@ -216,10 +234,10 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
             cb?.(assetData);
             resolve(assetData);
-          },
+          }
         );
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${assetProperty.path}`,
+      `loadAssets -> ${assetProperty.path}`
     );
   }
   /**
@@ -238,17 +256,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const cb = assetProperty.cb;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
-    const bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
+    const bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
+      bundleName
+    );
 
     if (!bundle) {
       FW.Log.error(`加载bundle失败,请检查!`);
@@ -258,7 +278,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     return new Promise(
       (
         resolve: (value: FW.AssetData[] | PromiseLike<FW.AssetData[]>) => void,
-        reject: (reason?: any) => void,
+        reject: (reason?: any) => void
       ) => {
         bundle.loadDir(path, type, (err: Error, assets: cc.Asset[]) => {
           if (err || assets.length === 0) {
@@ -272,7 +292,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             const assetData = new FWAssetData();
             assetData.loaded = true;
             assetData.dependentBundle = bundleName;
-            assetData.uuid = asset['_uuid'];
+            assetData.uuid = asset["_uuid"];
             assetData.autoRelease = autoRelease;
             assetData.asset = asset;
             assetData.type = type;
@@ -281,7 +301,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             const key = `${this.createAssetMapKey({
               bundle: bundleName,
               path: path,
-            })}/${asset.name}${type ? `_${type?.name}` : ''}`;
+            })}/${asset.name}${type ? `_${type?.name}` : ""}`;
 
             this.assetsMap.set(key, assetData);
 
@@ -291,7 +311,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           cb?.(assetDataList);
           resolve(assetDataList);
         });
-      },
+      }
     );
   }
 
@@ -308,18 +328,18 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const bundleName = assetProperty.bundle || FW.Entry.bundleName;
     const path = assetProperty.path;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
     if (!this.has(assetProperty)) {
-      FW.Log.error('获取资源失败,请先加载!');
+      FW.Log.error("获取资源失败,请先加载!");
       return undefined;
     }
 
@@ -343,12 +363,12 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const path = assetProperty.path;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
@@ -361,8 +381,8 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     assetData.refCount--;
 
     if (assetData.refCount <= 0) {
+      this.resMgr.getBundle(bundleName)?.release(path);
       this.assetsMap.delete(key);
-      autoRelease && this.resMgr.getBundle(bundleName)?.release(path);
     }
   }
 

package/manager/FWBundleManager.ts

@@ -1,5 +1,5 @@
-import { FWManager } from './FWManager';
-import { FWSystemConfig } from '../config/FWSystemConfig';
+import { FWManager } from "./FWManager";
+import { FWSystemConfig } from "../config/FWSystemConfig";
 
 export class FWBundleManager extends FWManager implements FW.BundleManager {
   bundleMap: Map<string, cc.AssetManager.Bundle>;
@@ -33,12 +33,12 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
     return await this.invoke(
       FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
         const remote = this.remoteBundleConfigMap.get(bundleName);
-        const url = remote ? remote.url : '';
+        const url = remote ? remote.url : "";
         const path = `${url}${bundleName}`;
         cc.assetManager.loadBundle(
           path,
           {
-            version: this.remoteBundleConfigMap.get(bundleName)?.version || '',
+            version: this.remoteBundleConfigMap.get(bundleName)?.version || "",
           },
           async (err: Error, bundle: cc.AssetManager.Bundle) => {
             if (err || !bundle) {
@@ -51,10 +51,10 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
             this.bundleMap.set(bundleName, bundle);
 
             resolve(bundle);
-          },
+          }
         );
       }, FWSystemConfig.PromiseConfig.loadBundle).promise,
-      `loadBundle -> ${bundleName}`,
+      `loadBundle -> ${bundleName}`
     );
   }
 
@@ -65,7 +65,7 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
    */
   get(bundleName: string): cc.AssetManager.Bundle {
     if (!this.has(bundleName)) {
-      FW.Log.error('获取bundle失败,请先加载!');
+      FW.Log.error("获取bundle失败,请先加载!");
       return undefined;
     }
     return this.bundleMap.get(bundleName);

package/manager/FWResManager.ts

@@ -1,9 +1,8 @@
-import FWAssetConfig from '../config/FWAssetConfig';
-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;
@@ -31,8 +30,8 @@ export class FWResManager extends FWManager implements FW.ResManager {
 
               await this.loadBundle(depend);
 
-              const config = FW.Entry.getComponent<FWAssetConfig>(
-                `${depend}${FW.SystemDefine.FWBindTag.CONFIG}`,
+              const config = FW.Entry.getComponent<FW.AssetConfig>(
+                `${depend}${FW.SystemDefine.FWBindTag.CONFIG}`
               );
               if (!config) continue;
               const preLoad = config.preLoad;
@@ -68,7 +67,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
           reject(e);
         }
       }, FWSystemConfig.PromiseConfig.loadBundle).promise,
-      `loadBundle -> ${bundleName}`,
+      `loadBundle -> ${bundleName}`
     );
   }
   /**
@@ -85,7 +84,10 @@ export class FWResManager extends FWManager implements FW.ResManager {
     return await this.assetMgr.loadSpineDataFromRemote(data);
   }
 
-  async loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb: (asset: any) => T): Promise<T> {
+  async loadRemote<T extends cc.Asset = cc.Asset>(
+    url: string,
+    cb: (asset: any) => T
+  ): Promise<T> {
     const asset = await this.assetMgr.loadRemote(url);
     if (asset instanceof cc.Texture2D) {
       return new cc.SpriteFrame(asset) as unknown as T;
@@ -132,7 +134,9 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param assetProperty
    * @returns
    */
-  async loadAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty): Promise<T> {
+  async loadAsset<T extends cc.Asset>(
+    assetProperty: FW.AssetProperty
+  ): Promise<T> {
     const res = await this.assetMgr.load(assetProperty);
     return this.process<T>(res).asset as T;
   }

package/package.json

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