@ives_xxz/framework 1.6.4 → 1.6.5

package/FW.d.ts

@@ -2024,3 +2024,22 @@ declare namespace FW {
   declare function timeScale(scale: number);
   declare let Entry: Entry;
 }
+
+declare namespace FW {
+  export type Framework = {
+    initialize(): void;
+    addRegistry(bundleName: string, registry: new () => Registry): void;
+    getContainer(): any;
+    getComponent<T>(serviceIdentifier: ServiceIdentifier<T>): T;
+    getComponents<T>(serviceIdentifier: ServiceIdentifier<T>): T[];
+    hasRegistry(bundleName: string): boolean;
+    getRegistry(bundleName: string): Registry;
+    createRegistry(bundleName: string): Registry;
+    destroyRegistry(bundleName: string): void;
+    register(data: RegisterFramework): void;
+    unRegister(data: RegisterFramework): void;
+    restart(): void;
+    getRegisteredComponents(): Map<string, RegisterFramework[]>;
+  };
+  declare let Framework: Framework;
+}

package/Framework.ts

@@ -1,44 +1,35 @@
-import "reflect-metadata";
-import { Container, interfaces } from "inversify";
-import { FWSystemDefine } from "./define/FWSystemDefine";
-import FWLog from "./log/FWLog";
-import { FWEventDefine } from "./define/FWEventDefine";
-import { FrameworkBase } from "./FrameworkBase";
-
-class Framework {
+import 'reflect-metadata';
+import { Container, interfaces } from 'inversify';
+import { FWSystemDefine } from './define/FWSystemDefine';
+import FWLog from './log/FWLog';
+import { FWEventDefine } from './define/FWEventDefine';
+import { FrameworkBase } from './FrameworkBase';
+
+export class Framework implements FW.Framework {
   private container: Container;
   private registry: Map<string, new () => FW.Registry>;
   private registeredComponents: Map<string, FW.RegisterFramework[]> = new Map();
-  private static instance: Framework;
-  private constructor() {}
 
   initialize() {
     this.container = new Container({
-      defaultScope: "Singleton",
+      defaultScope: 'Singleton',
       autoBindInjectable: true,
     });
     this.registry = new Map<string, new () => FW.Registry>();
     this.registeredComponents.clear();
   }
 
-  public static getInstance() {
-    if (!this.instance) {
-      this.instance = new Framework();
-    }
-    return this.instance;
-  }
-
   public getContainer(): Container {
     return this.container;
   }
 
   /** 获取组件 */
   public getComponent<T>(serviceIdentifier: FW.ServiceIdentifier<T>): T {
-    if (typeof serviceIdentifier === "string") {
+    if (typeof serviceIdentifier === 'string') {
       if (this.container.isBound(serviceIdentifier)) {
         return this.container.get<T>(serviceIdentifier);
       }
-    } else if (typeof serviceIdentifier === "function") {
+    } else if (typeof serviceIdentifier === 'function') {
       const className = serviceIdentifier.name;
 
       if (this.container.isBound(serviceIdentifier)) {
@@ -53,9 +44,7 @@ class Framework {
         Handle: FWSystemDefine.FWBindTag.HANDLE,
       };
 
-      const [suffix] =
-        Object.entries(suffixMap).find(([key]) => className.endsWith(key)) ||
-        [];
+      const [suffix] = Object.entries(suffixMap).find(([key]) => className.endsWith(key)) || [];
 
       if (suffix) {
         const bundleName = FW.Entry.bundleName;
@@ -131,10 +120,7 @@ class Framework {
    */
   createRegistry(bundleName: string): FW.Registry {
     if (!this.registry.has(bundleName)) return;
-    this.container
-      .bind(this.registry.get(bundleName))
-      .toSelf()
-      .inSingletonScope();
+    this.container.bind(this.registry.get(bundleName)).toSelf().inSingletonScope();
     return this.getRegistry(bundleName);
   }
 
@@ -152,13 +138,7 @@ class Framework {
    * @param data
    */
   register(data: FW.RegisterFramework) {
-    const classes = [
-      data.logic,
-      data.data,
-      data.config,
-      data.sender,
-      data.handle,
-    ];
+    const classes = [data.logic, data.data, data.config, data.sender, data.handle];
     classes.forEach((cls, index) => {
       if (cls && !this.container.isBound(cls)) {
         this.container.bind(cls).toSelf().inSingletonScope();
@@ -186,21 +166,15 @@ class Framework {
    * @returns
    */
   unRegister(data: FW.RegisterFramework) {
-    const classes = [
-      data.logic,
-      data.data,
-      data.config,
-      data.sender,
-      data.handle,
-    ];
+    const classes = [data.logic, data.data, data.config, data.sender, data.handle];
     classes.forEach((cls, index) => {
       const key = this.getKey(data.bundleName, index);
       if (cls && this.container.isBound(cls)) {
-        this.container.get(key)?.["onDestroy"]?.();
+        this.container.get(key)?.['onDestroy']?.();
         this.container.unbind(cls);
       }
       if (this.container.isBound(key)) {
-        this.container.get(key)?.["onDestroy"]?.();
+        this.container.get(key)?.['onDestroy']?.();
         this.container.unbind(this.getKey(data.bundleName, index));
       }
     });
@@ -216,10 +190,7 @@ class Framework {
 
     const registrations = this.registeredComponents.get(bundleName)!;
     const exists = registrations.some(
-      (reg) =>
-        reg.logic === data.logic &&
-        reg.data === data.data &&
-        reg.config === data.config
+      (reg) => reg.logic === data.logic && reg.data === data.data && reg.config === data.config,
     );
 
     if (!exists) {
@@ -232,10 +203,7 @@ class Framework {
     if (this.registeredComponents.has(bundleName)) {
       const registrations = this.registeredComponents.get(bundleName)!;
       const index = registrations.findIndex(
-        (reg) =>
-          reg.logic === data.logic &&
-          reg.data === data.data &&
-          reg.config === data.config
+        (reg) => reg.logic === data.logic && reg.data === data.data && reg.config === data.config,
       );
 
       if (index !== -1) {
@@ -252,7 +220,7 @@ class Framework {
     this.destroyAllComponents();
     this.container.unbindAll();
     this.container = new Container({
-      defaultScope: "Singleton",
+      defaultScope: 'Singleton',
       autoBindInjectable: true,
     });
 
@@ -268,7 +236,7 @@ class Framework {
         try {
           if (this.container.isBound(binding.serviceIdentifier)) {
             const instance = this.container.get(binding.serviceIdentifier);
-            instance?.["onDestroy"]?.();
+            instance?.['onDestroy']?.();
           }
         } catch (e) {
           FWLog.warn(`Error destroying component ${key}:`, e);
@@ -278,18 +246,12 @@ class Framework {
   }
 
   private reregisterAllComponents(): void {
-    for (const [
-      bundleName,
-      registrations,
-    ] of this.registeredComponents.entries()) {
+    for (const [bundleName, registrations] of this.registeredComponents.entries()) {
       for (const data of registrations) {
         try {
           this.register(data);
         } catch (e) {
-          console.error(
-            `Error re-registering component for bundle ${bundleName}:`,
-            e
-          );
+          console.error(`Error re-registering component for bundle ${bundleName}:`, e);
         }
       }
     }
@@ -304,7 +266,7 @@ class Framework {
   }
 
   private isSubclassOf(child: any, parent: any): boolean {
-    if (typeof child !== "function" || typeof parent !== "function") {
+    if (typeof child !== 'function' || typeof parent !== 'function') {
       return false;
     }
     let current = child;
@@ -317,5 +279,3 @@ class Framework {
     return false;
   }
 }
-
-export default Framework.getInstance();

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/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/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);
   }
 
   /**

package/package.json

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

package/register/FWRegistry.ts

@@ -1,5 +1,4 @@
 import { injectable } from 'inversify';
-import Framework from '../Framework';
 
 @injectable()
 export default abstract class FWRegistry implements FW.Registry {
@@ -48,9 +47,9 @@ export default abstract class FWRegistry implements FW.Registry {
   }
 
   private bundleEnabled(enable?: boolean) {
-    const frameworkInvoke = enable ? Framework.register : Framework.unRegister;
+    const frameworkInvoke = enable ? FW.Framework.register : FW.Framework.unRegister;
     const entryInvoke = enable ? FW.Entry.register : FW.Entry.unRegister;
-    frameworkInvoke.bind(Framework)({
+    frameworkInvoke.bind(FW.Framework)({
       bundleName: this.bundleName,
       logic: this.logic,
       data: this.data,