@ives_xxz/framework 1.6.3 → 1.6.5

package/FrameworkBase.ts

@@ -1,10 +1,9 @@
-import { injectable } from "inversify";
-import { FWEventDefine } from "./define/FWEventDefine";
-import FWLog from "./log/FWLog";
-import { FWSystemDefine } from "./define/FWSystemDefine";
-import Framework from "./Framework";
-import FWLogic from "./logic/FWLogic";
-import FWData from "./data/FWData";
+import { injectable } from 'inversify';
+import { FWEventDefine } from './define/FWEventDefine';
+import FWLog from './log/FWLog';
+import { FWSystemDefine } from './define/FWSystemDefine';
+import FWLogic from './logic/FWLogic';
+import FWData from './data/FWData';
 @injectable()
 export abstract class FrameworkBase {
   public readonly entry: FW.Entry = FW.Entry;
@@ -20,11 +19,7 @@ export abstract class FrameworkBase {
   protected onRestart?(): void;
   constructor() {
     this.initialize?.();
-    this.entry.evtMgr.register(
-      FWEventDefine.SystemEvent.SYSTEM_RESTART,
-      this.onRestart,
-      this
-    );
+    this.entry.evtMgr.register(FWEventDefine.SystemEvent.SYSTEM_RESTART, this.onRestart, this);
   }
 
   protected get moduleName(): string {
@@ -63,40 +58,37 @@ export abstract class FrameworkBase {
     const tag = this.getClassTag();
 
     if (tag !== FWSystemDefine.FWBindTag.LOGIC) {
-      this.logic = Framework.getComponent<FW.Logic>(
-        `${bundleName}${FWSystemDefine.FWBindTag.LOGIC}`
+      this.logic = FW.Framework.getComponent<FW.Logic>(
+        `${bundleName}${FWSystemDefine.FWBindTag.LOGIC}`,
       );
     }
 
     if (tag !== FWSystemDefine.FWBindTag.DATA) {
-      this.data = Framework.getComponent<FW.Data>(
-        `${bundleName}${FWSystemDefine.FWBindTag.DATA}`
+      this.data = FW.Framework.getComponent<FW.Data>(
+        `${bundleName}${FWSystemDefine.FWBindTag.DATA}`,
       );
     }
 
     if (tag !== FWSystemDefine.FWBindTag.CONFIG) {
-      this.config = Framework.getComponent<FW.Config>(
-        `${bundleName}${FWSystemDefine.FWBindTag.CONFIG}`
+      this.config = FW.Framework.getComponent<FW.Config>(
+        `${bundleName}${FWSystemDefine.FWBindTag.CONFIG}`,
       );
     }
 
     if (tag !== FWSystemDefine.FWBindTag.SENDER) {
-      this.sender = Framework.getComponent<FW.SocketSender>(
-        `${bundleName}${FWSystemDefine.FWBindTag.SENDER}`
+      this.sender = FW.Framework.getComponent<FW.SocketSender>(
+        `${bundleName}${FWSystemDefine.FWBindTag.SENDER}`,
       );
     }
 
     if (tag !== FWSystemDefine.FWBindTag.HANDLE) {
-      this.handle = Framework.getComponent<FW.SocketHandle>(
-        `${bundleName}${FWSystemDefine.FWBindTag.HANDLE}`
+      this.handle = FW.Framework.getComponent<FW.SocketHandle>(
+        `${bundleName}${FWSystemDefine.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 {
@@ -110,25 +102,16 @@ 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 ? FWLog.warn : FWLog.debug;
-      log(
-        `[${this.moduleName?.toUpperCase()}] Operation ${operationName} took ${duration}ms`
-      );
+      log(`[${this.moduleName?.toUpperCase()}] Operation ${operationName} took ${duration}ms`);
     }
   }
 
@@ -148,7 +131,7 @@ export abstract class FrameworkBase {
   }
 
   private findBundleNameByClassName(): string | undefined {
-    const registeredComponents = Framework.getRegisteredComponents();
+    const registeredComponents = FW.Framework.getRegisteredComponents();
 
     const bundleNames = Array.from(registeredComponents.keys());
 
@@ -161,10 +144,7 @@ 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);
@@ -172,13 +152,13 @@ export abstract class FrameworkBase {
 
   private getClassTag(): FWSystemDefine.FWBindTag {
     const className = this.moduleName;
-    if (className.endsWith("Logic")) return FWSystemDefine.FWBindTag.LOGIC;
-    if (className.endsWith("Data")) return FWSystemDefine.FWBindTag.DATA;
-    if (className.endsWith("Config") || className.endsWith("AssetConfig"))
+    if (className.endsWith('Logic')) return FWSystemDefine.FWBindTag.LOGIC;
+    if (className.endsWith('Data')) return FWSystemDefine.FWBindTag.DATA;
+    if (className.endsWith('Config') || className.endsWith('AssetConfig'))
       return FWSystemDefine.FWBindTag.CONFIG;
-    if (className.endsWith("Sender") || className.endsWith("SocketSender"))
+    if (className.endsWith('Sender') || className.endsWith('SocketSender'))
       return FWSystemDefine.FWBindTag.SENDER;
-    if (className.endsWith("Handle") || className.endsWith("SocketHandle"))
+    if (className.endsWith('Handle') || className.endsWith('SocketHandle'))
       return FWSystemDefine.FWBindTag.HANDLE;
     return;
   }

package/config/FWSystemConfig.ts

@@ -11,13 +11,13 @@ export namespace FWSystemConfig {
 
   export const PromiseConfig = {
     loadAsset: {
-      retryCount: 3,
-      retryInterval: 5,
+      retryCount: 0,
+      retryInterval: 0,
       timeout: 10,
     },
     loadBundle: {
-      retryCount: 3,
-      retryInterval: 5,
+      retryCount: 0,
+      retryInterval: 0,
       timeout: 10,
     },
     http: {

package/entry/FWEntry.ts

@@ -1,24 +1,23 @@
-import FWUiManager from "../manager/FWUiManager";
-import Framework from "../Framework";
-import FWLog from "../log/FWLog";
-import FWAnimationManager from "../manager/FWAnimationManager";
-import FWAudioManager from "../manager/FWAudioManager";
-import FWComponentManager from "../manager/FWComponentManager";
-import FWEventManager from "../manager/FWEventManager";
-import FWLanguageManager from "../manager/FWLanguageManager";
-import { FWLayerManager } from "../manager/FWLayerManager";
-import FWObjectManager from "../manager/FWObjectManager";
-import { FWResManager } from "../manager/FWResManager";
-import FWSocketManager from "../manager/FWSocketManager";
-import { FWStateManager } from "../manager/FWStateManager";
-import { FWTimeManager } from "../manager/FWTimeManager";
-import FWScene from "../scene/FWScene";
-import { FWSocketAutoProcessPause } from "../expand/FWDecorator";
-import FWTaskManager from "../manager/FWTaskManager";
-import FWEngineManager from "../manager/FWEngineManager";
-import FWHotUpdateManager from "../manager/FWHotUpdateManager";
-import FWPromiseManager from "../manager/FWPromiseManager";
-import { FWPerformanceManager } from "../manager/FWPerformanceManager";
+import FWUiManager from '../manager/FWUiManager';
+import FWLog from '../log/FWLog';
+import FWAnimationManager from '../manager/FWAnimationManager';
+import FWAudioManager from '../manager/FWAudioManager';
+import FWComponentManager from '../manager/FWComponentManager';
+import FWEventManager from '../manager/FWEventManager';
+import FWLanguageManager from '../manager/FWLanguageManager';
+import { FWLayerManager } from '../manager/FWLayerManager';
+import FWObjectManager from '../manager/FWObjectManager';
+import { FWResManager } from '../manager/FWResManager';
+import FWSocketManager from '../manager/FWSocketManager';
+import { FWStateManager } from '../manager/FWStateManager';
+import { FWTimeManager } from '../manager/FWTimeManager';
+import FWScene from '../scene/FWScene';
+import { FWSocketAutoProcessPause } from '../expand/FWDecorator';
+import FWTaskManager from '../manager/FWTaskManager';
+import FWEngineManager from '../manager/FWEngineManager';
+import FWHotUpdateManager from '../manager/FWHotUpdateManager';
+import FWPromiseManager from '../manager/FWPromiseManager';
+import { FWPerformanceManager } from '../manager/FWPerformanceManager';
 
 /**
  * 入口脚本
@@ -142,10 +141,10 @@ export default class FWEntry implements FW.Entry {
     if (!this.hasSceneName(name)) {
       try {
         cc.director.loadScene(name);
-        this.bundleName = "";
+        this.bundleName = '';
         return;
       } catch (e) {
-        FWLog.error("launchScene failed:", name);
+        FWLog.error('launchScene failed:', name);
       }
     }
 
@@ -204,13 +203,11 @@ export default class FWEntry implements FW.Entry {
     return this.map.get(this.bundleName)?.sceneName || undefined;
   }
 
-  getComponent: <T>(serviceIdentifier: FW.ServiceIdentifier<T>) => T = (
-    serviceIdentifier
-  ) => Framework.getComponent(serviceIdentifier);
+  getComponent: <T>(serviceIdentifier: FW.ServiceIdentifier<T>) => T = (serviceIdentifier) =>
+    FW.Framework.getComponent(serviceIdentifier);
 
-  getComponents: <T>(serviceIdentifier?: FW.ServiceIdentifier<T>) => T[] = (
-    serviceIdentifier
-  ) => Framework.getComponents(serviceIdentifier);
+  getComponents: <T>(serviceIdentifier?: FW.ServiceIdentifier<T>) => T[] = (serviceIdentifier) =>
+    FW.Framework.getComponents(serviceIdentifier);
 
   update(dt: number) {
     this.timeMgr?.onUpdate(dt);

package/manager/FWAssetManager.ts

@@ -1,6 +1,6 @@
-import { FWSystemConfig } from "../config/FWSystemConfig";
-import FWLog from "../log/FWLog";
-import { FWManager } from "./FWManager";
+import { FWSystemConfig } from '../config/FWSystemConfig';
+import FWLog from '../log/FWLog';
+import { FWManager } from './FWManager';
 
 /**
  * 资源数据
@@ -48,7 +48,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 },
@@ -60,38 +60,34 @@ 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) {
-      FWLog.error("从远程加载spine动画资源失败!");
+      FWLog.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);
-            }
-            cb?.(asset as T);
-            resolve(asset as T);
+        cc.assetManager.loadRemote(url, { cacheEnabled: true, maxRetryCount: 3 }, (err, asset) => {
+          if (err || !asset) {
+            reject(err);
           }
-        );
+          cb?.(asset as T);
+          resolve(asset as T);
+        });
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${url}`
+      `loadAssets -> ${url}`,
     );
   }
 
@@ -101,9 +97,7 @@ 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) => {
@@ -112,19 +106,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         const path = property.path;
         const progress = property.progress;
 
-        if (!bundleName || bundleName === "") {
+        if (!bundleName || bundleName === '') {
           FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
           return undefined;
         }
 
-        if (!path || path === "") {
+        if (!path || path === '') {
           FWLog.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) {
           FWLog.error(`加载bundle失败,请检查!`);
@@ -136,24 +128,20 @@ 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}`,
         );
-      })
+      }),
     );
   }
 
@@ -174,19 +162,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const progress = assetProperty.progress;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FWLog.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) {
       FWLog.error(`加载bundle失败,请检查!`);
@@ -204,18 +190,13 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
     assetData.loaded = false;
 
-    return await this.invoke(
+    return this.invoke(
       FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
         const self = this;
-
         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) => {
@@ -225,7 +206,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;
@@ -236,10 +217,10 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
             cb?.(assetData);
             resolve(assetData);
-          }
+          },
         );
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${assetProperty.path}`
+      `loadAssets -> ${assetProperty.path}`,
     );
   }
   /**
@@ -258,19 +239,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const cb = assetProperty.cb;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FWLog.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) {
       FWLog.error(`加载bundle失败,请检查!`);
@@ -280,7 +259,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) {
@@ -294,7 +273,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;
@@ -303,7 +282,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);
 
@@ -313,7 +292,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           cb?.(assetDataList);
           resolve(assetDataList);
         });
-      }
+      },
     );
   }
 
@@ -330,18 +309,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 === '') {
       FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FWLog.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
     if (!this.has(assetProperty)) {
-      FWLog.error("获取资源失败,请先加载!");
+      FWLog.error('获取资源失败,请先加载!');
       return undefined;
     }
 
@@ -365,12 +344,12 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const path = assetProperty.path;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FWLog.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }

package/manager/FWBundleManager.ts

@@ -1,8 +1,7 @@
-import { FWManager } from "./FWManager";
-import FWLog from "../log/FWLog";
-import Framework from "../Framework";
-import { FWSystemConfig } from "../config/FWSystemConfig";
-import { FWLodash } from "../utils/FWLodash";
+import { FWManager } from './FWManager';
+import FWLog from '../log/FWLog';
+import { FWSystemConfig } from '../config/FWSystemConfig';
+import { FWLodash } from '../utils/FWLodash';
 
 export class FWBundleManager extends FWManager implements FW.BundleManager {
   bundleMap: Map<string, cc.AssetManager.Bundle>;
@@ -36,12 +35,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) {
@@ -49,15 +48,15 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
               reject(err);
             }
 
-            Framework.createRegistry(bundleName)?.register();
+            FW.Framework.createRegistry(bundleName)?.register();
 
             this.bundleMap.set(bundleName, bundle);
 
             resolve(bundle);
-          }
+          },
         );
       }, FWSystemConfig.PromiseConfig.loadBundle).promise,
-      `loadBundle -> ${bundleName}`
+      `loadBundle -> ${bundleName}`,
     );
   }
 
@@ -68,7 +67,7 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
    */
   get(bundleName: string): cc.AssetManager.Bundle {
     if (!this.has(bundleName)) {
-      FWLog.error("获取bundle失败,请先加载!");
+      FWLog.error('获取bundle失败,请先加载!');
       return undefined;
     }
     return this.bundleMap.get(bundleName);
@@ -81,8 +80,8 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
     }
     cc.assetManager.removeBundle(this.bundleMap.get(bundleName));
     this.bundleMap.delete(bundleName);
-    Framework.getRegistry(bundleName)?.unRegister();
-    Framework.destroyRegistry(bundleName);
+    FW.Framework.getRegistry(bundleName)?.unRegister();
+    FW.Framework.destroyRegistry(bundleName);
   }
 
   /**