@ives_xxz/framework 1.5.5 → 1.5.7

package/FW.d.ts

@@ -6,13 +6,18 @@ declare namespace FW {
     prototype: T;
   };
 
-  type ServiceIdentifierData<TInstance = unknown> = string | symbol | Newable<TInstance> | Function;
-
-  type CommonNewable<TInstance = unknown, TArgs extends unknown[] = any[]> = Newable<
-    TInstance,
-    TArgs
-  >;
-  type CommonServiceIdentifier<TInstance = unknown> = ServiceIdentifierData<TInstance>;
+  type ServiceIdentifierData<TInstance = unknown> =
+    | string
+    | symbol
+    | Newable<TInstance>
+    | Function;
+
+  type CommonNewable<
+    TInstance = unknown,
+    TArgs extends unknown[] = any[]
+  > = Newable<TInstance, TArgs>;
+  type CommonServiceIdentifier<TInstance = unknown> =
+    ServiceIdentifierData<TInstance>;
 
   type ServiceIdentifier<T = unknown> = CommonServiceIdentifier<T>;
   /**
@@ -58,13 +63,13 @@ declare namespace FW {
         resolve: (value: T | PromiseLike<T>) => void,
         reject: (reason?: any) => void,
         signal?: AbortSignal,
-        reason?: any,
+        reason?: any
       ) => void = PromiseExcutor,
-      options: PromiseExecuteOptions = {},
+      options: PromiseExecuteOptions = {}
     ): PromiseProxy<T>;
     all<T = any>(
       promises: FW.PromiseProxy<T>[],
-      options: FW.PromiseExecuteOptions = {},
+      options: FW.PromiseExecuteOptions = {}
     ): FW.PromiseProxy<FW.PromiseResult<T>>;
   };
 
@@ -79,18 +84,22 @@ declare namespace FW {
     registerLanguagePackageEnum(
       bundleName: string,
       language: any,
-      getter: (key: string, language?: string) => string,
+      getter: (key: string, language?: string) => string
     ): void;
     getSupportedLanguages(): string[];
     setSupportedLanguages(languages: string[]): void;
     getBundles(): string[];
     getLanguage(): string;
     getLanguageIndex(): number;
-    getLanguagePackageValue(bundleName: string, key: string, language?: string): string;
+    getLanguagePackageValue(
+      bundleName: string,
+      key: string,
+      language?: string
+    ): string;
     getLanguagePackageEnumKeys(bundleName: string): string[];
     getLanguagePackageEnumValues(bundleName: string): string[];
     getLanguagePackageEnum<K extends keyof ILanguageBundleAccessor>(
-      bundleName: K,
+      bundleName: K
     ): ILanguageBundleAccessor[K];
     initializeLanguage(language: string);
   };
@@ -119,6 +128,7 @@ declare namespace FW {
     onBeforeSendingMessage?(msg: any): Promise<FW.SocketMessage>;
     /** 是否是心跳消息 */
     onHeart?(msg: any): Promise<boolean>;
+    sendHeart(): void;
   };
   type SocketHandle = {
     readonly entry: FW.Entry;
@@ -149,32 +159,32 @@ declare namespace FW {
     createObjectPool<T extends FWObject = FWObject>(
       node: cc.Node,
       parent: cc.Node,
-      tag?: string,
+      tag?: string
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       prefab: cc.Prefab,
       parent: cc.Node,
-      tag?: string,
+      tag?: string
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       assetProperty: FW.AssetProperty,
       parent: cc.Node,
-      tag?: string,
+      tag?: string
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       node: cc.Node,
       parent: cc.Node,
-      type?: number,
+      type?: number
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       prefab: cc.Prefab,
       parent: cc.Node,
-      type?: number,
+      type?: number
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       assetProperty: FW.AssetProperty,
       parent: cc.Node,
-      type?: number,
+      type?: number
     ): Promise<ObjectPool<T>>;
     /** 获取已经创建的对象池 */
     getObjectPool(tag: string): ObjectPool;
@@ -207,7 +217,7 @@ declare namespace FW {
       address: string,
       sender: SocketSender,
       handle: SocketHandle,
-      config: SocketConfig,
+      config: SocketConfig
     ): Promise<Socket>;
     /**
      * 获取socket
@@ -303,7 +313,7 @@ declare namespace FW {
       tag: string,
       sender: SocketSender,
       handle: SocketHandle,
-      config: SocketConfig,
+      config: SocketConfig
     ): SocketPromiseProxy;
   };
 
@@ -338,7 +348,7 @@ declare namespace FW {
       args7?: FW.EventManagerArgs,
       args8?: FW.EventManagerArgs,
       args9?: FW.EventManagerArgs,
-      args10?: FW.EventManagerArgs,
+      args10?: FW.EventManagerArgs
     );
     /**
      * 比较目标
@@ -398,19 +408,35 @@ declare namespace FW {
     /**
      * 一次性调度器
      */
-    scheduleOnce(cb?: () => void, time?: number, tag?: string): FW.TimerSchedule;
+    scheduleOnce(
+      cb?: () => void,
+      time?: number,
+      tag?: string
+    ): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(time?: number, cb?: () => void, tag?: string): FW.TimerSchedule;
+    scheduleOnce(
+      time?: number,
+      cb?: () => void,
+      tag?: string
+    ): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(time?: number, cb?: () => void, target?: any): FW.TimerSchedule;
+    scheduleOnce(
+      time?: number,
+      cb?: () => void,
+      target?: any
+    ): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(cb?: () => void, time?: number, target?: any): FW.TimerSchedule;
+    scheduleOnce(
+      cb?: () => void,
+      time?: number,
+      target?: any
+    ): FW.TimerSchedule;
     /**
      * 自定义调度器
      * */
@@ -419,7 +445,7 @@ declare namespace FW {
       time?: number,
       repeat?: number,
       target?: TargetType,
-      tag?: string,
+      tag?: string
     ): TimerSchedule;
     /** 暂停调度器 */
     pauseSchedule(tag: string): void;
@@ -470,13 +496,13 @@ declare namespace FW {
         args7?: EventManagerArgs,
         args8?: EventManagerArgs,
         args9?: EventManagerArgs,
-        args10?: EventManagerArgs,
+        args10?: EventManagerArgs
       ) => void,
       target: TargetType,
       options?: {
         priority?: FWSystemDefine.FWPriorityOrder;
         intercept?: boolean;
-      },
+      }
     );
 
     registerOnce(
@@ -491,13 +517,13 @@ declare namespace FW {
         args7?: EventManagerArgs,
         args8?: EventManagerArgs,
         args9?: EventManagerArgs,
-        args10?: EventManagerArgs,
+        args10?: EventManagerArgs
       ) => void,
       target: TargetType,
       options?: {
         priority?: number;
         intercept?: boolean;
-      },
+      }
     ): void;
 
     /**
@@ -531,7 +557,7 @@ declare namespace FW {
       args7?: FW.EventManagerArgs,
       args8?: FW.EventManagerArgs,
       args9?: FW.EventManagerArgs,
-      args10?: FW.EventManagerArgs,
+      args10?: FW.EventManagerArgs
     ): void;
     /**
      * 注销事件
@@ -677,19 +703,23 @@ declare namespace FW {
      * @param data
      */
     openAsync<Ctr extends FWLayerController = FWLayerController>(
-      data: LayerOpenArgs<Ctr>,
+      data: LayerOpenArgs<Ctr>
     ): Promise<Ctr>;
 
     /**
      * 同步打开layer
      * @param data
      */
-    openSync<Ctr extends FWLayerController = FWLayerController>(data: LayerOpenArgs<Ctr>): Ctr;
+    openSync<Ctr extends FWLayerController = FWLayerController>(
+      data: LayerOpenArgs<Ctr>
+    ): Ctr;
     /**
      * 显示常驻layer
      * @param layer
      */
-    displayLayer<Ctr extends FWLayerController = FWLayerController>(ctr: Ctr): Ctr;
+    displayLayer<Ctr extends FWLayerController = FWLayerController>(
+      ctr: Ctr
+    ): Ctr;
     /**
      * 隐藏常驻layer
      * @param layer
@@ -699,7 +729,9 @@ declare namespace FW {
      * 关闭layer
      * @param layer
      */
-    close<Ctr extends FWLayerController = FWLayerController>(ctr: Ctr): FWLayerController;
+    close<Ctr extends FWLayerController = FWLayerController>(
+      ctr: Ctr
+    ): FWLayerController;
 
     /**
      * 从栈关闭
@@ -802,7 +834,10 @@ declare namespace FW {
      * @param url
      * @param cb
      */
-    loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb?: (asset: cc.Asset) => T): Promise<T>;
+    loadRemote<T extends cc.Asset = cc.Asset>(
+      url: string,
+      cb?: (asset: cc.Asset) => T
+    ): Promise<T>;
     /**
      * 从远程加载spine动画
      * @param data
@@ -818,13 +853,18 @@ declare namespace FW {
      * 加载资源返回数据
      * @param assetProperty
      */
-    loadAssetData<T extends cc.Asset>(assetProperty: AssetProperty): Promise<AssetData>;
+    loadAssetData<T extends cc.Asset>(
+      assetProperty: AssetProperty
+    ): Promise<AssetData>;
 
     /**
      * 加载资源
      * @param assetProperty
      */
-    loadAsset<T extends cc.Asset>(assetProperty: AssetProperty, cb?: () => void): Promise<T>;
+    loadAsset<T extends cc.Asset>(
+      assetProperty: AssetProperty,
+      cb?: () => void
+    ): Promise<T>;
 
     /**
      * 获取资源
@@ -972,7 +1012,10 @@ declare namespace FW {
      * @param url
      * @param cb
      */
-    loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb?: (asset: cc.Asset) => T): Promise<T>;
+    loadRemote<T extends cc.Asset = cc.Asset>(
+      url: string,
+      cb?: (asset: cc.Asset) => T
+    ): Promise<T>;
     /**
      * 从远程加载spine动画
      * @param data
@@ -1036,7 +1079,11 @@ declare namespace FW {
   };
   type LayerController = {
     readonly entry: FW.Entry;
-
+    logic?: Logic;
+    config?: Config;
+    data?: Data;
+    sender?: SocketSender;
+    handle?: SocketHandle;
     layerData: LayerData;
     /** uuid */
     uuid: string;
@@ -1084,7 +1131,7 @@ declare namespace FW {
       referenceNode: cc.Node,
       type?: {
         prototype: T;
-      },
+      }
     ): T;
     /** 指定注册CC事件 */
     registerCCEvent(eventName: string, event: FW.CCEvent | FW.CCEvent[]): void;
@@ -1248,7 +1295,7 @@ declare namespace FW {
      */
     register(
       state: FW.StateMachineRegisterArgs | FW.StateMachineRegisterArgs[],
-      stateMachineName?: string,
+      stateMachineName?: string
     );
     /**
      * 注销指定状态机的某个状态
@@ -1304,22 +1351,22 @@ declare namespace FW {
         progress: Function;
         easing: Function | String;
         onUpdate: Function;
-      }>,
+      }>
     >(
       duration: number,
       props: ConstructorType<T>,
-      opts?: OPTS,
+      opts?: OPTS
     ): FW.Tween;
     by<
       OPTS extends Partial<{
         progress: Function;
         easing: Function | String;
         onUpdate: Function;
-      }>,
+      }>
     >(
       duration: number,
       props: ConstructorType<T>,
-      opts?: OPTS,
+      opts?: OPTS
     ): FW.Tween;
     set(props: ConstructorType<T>): FW.Tween;
   };
@@ -1564,7 +1611,11 @@ declare namespace FW {
      * @param volume
      * @param loop
      */
-    playMusic(assetProperty: AssetProperty, volume?: number, loop?: boolean): void;
+    playMusic(
+      assetProperty: AssetProperty,
+      volume?: number,
+      loop?: boolean
+    ): void;
     /**
      * 停止背景音乐
      */
@@ -1593,21 +1644,36 @@ declare namespace FW {
      * @param volume
      * @param loop
      */
-    play(path: string, cb?: (id: number) => void, volume?: number, loop?: boolean);
+    play(
+      path: string,
+      cb?: (id: number) => void,
+      volume?: number,
+      loop?: boolean
+    );
     /**
      * 播放音效
      * @param audio
      * @param volume
      * @param loop
      */
-    play(audio: cc.AudioClip, cb?: (id: number) => void, volume?: number, loop?: boolean);
+    play(
+      audio: cc.AudioClip,
+      cb?: (id: number) => void,
+      volume?: number,
+      loop?: boolean
+    );
     /**
      * 播放音效
      * @param assetProperty
      * @param volume
      * @param loop
      */
-    play(assetProperty: AssetProperty, cb?: (id: number) => void, volume?: number, loop?: boolean);
+    play(
+      assetProperty: AssetProperty,
+      cb?: (id: number) => void,
+      volume?: number,
+      loop?: boolean
+    );
     /**
      * 暂停所有
      */
@@ -1628,7 +1694,11 @@ declare namespace FW {
   };
 
   type PerformanceManager = {
-    recordOperationMetric(manager: string, operation: string, duration: number): void;
+    recordOperationMetric(
+      manager: string,
+      operation: string,
+      duration: number
+    ): void;
     getModuleReport(manager: string): PerformanceReport;
     getAllReports(): Map<string, FW.PerformanceReport>;
   };
@@ -1927,7 +1997,7 @@ declare namespace FW {
     abort?: (reason?: any) => void;
     addAbortEventListener?: (
       listener: (this: AbortSignal, ev: Event) => any,
-      options?: boolean | AddEventListenerOptions,
+      options?: boolean | AddEventListenerOptions
     ) => void;
   };
 
@@ -1935,7 +2005,7 @@ declare namespace FW {
     resolve: (value: T | PromiseLike<T>) => void,
     reject: (reason?: any) => void,
     signal: AbortSignal,
-    reason?: any,
+    reason?: any
   ) => void;
 
   type PromiseExecuteOptions = {
@@ -1946,7 +2016,10 @@ declare namespace FW {
     retryCondition?: (error: any, retryCount: number) => boolean;
   };
 
-  type Promise = (resolve: (value: any) => void, reject: (reason?: any) => void) => void;
+  type Promise = (
+    resolve: (value: any) => void,
+    reject: (reason?: any) => void
+  ) => void;
 
   type PromiseResult<T = any> = {
     success: PromiseProxy<T>[];
@@ -1954,7 +2027,7 @@ declare namespace FW {
     cancelled: number[];
   };
 
-  type PromiseStatus = 'pending' | 'fulfilled' | 'rejected' | 'cancelled';
+  type PromiseStatus = "pending" | "fulfilled" | "rejected" | "cancelled";
 
   /**
    * 性能管理器配置

package/Framework.ts

@@ -1,7 +1,9 @@
-import 'reflect-metadata';
-import { Container, interfaces } from 'inversify';
-import { FWSystemDefine } from './define/FWSystemDefine';
-import FWLog from './log/FWLog';
+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 {
   private container: Container;
@@ -12,7 +14,7 @@ class Framework {
 
   initialize() {
     this.container = new Container({
-      defaultScope: 'Singleton',
+      defaultScope: "Singleton",
       autoBindInjectable: true,
     });
     this.registry = new Map<string, new () => FW.Registry>();
@@ -32,11 +34,11 @@ class Framework {
 
   /** 获取组件 */
   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)) {
@@ -51,7 +53,9 @@ 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;
@@ -83,10 +87,8 @@ class Framework {
     const instances: T[] = [];
     for (const binding of childBindings) {
       try {
-        if (binding.activated) {
-          const instance = this.getComponent<T>(binding.serviceIdentifier as any);
-          instances.push(instance);
-        }
+        const instance = this.getComponent<T>(binding.serviceIdentifier as any);
+        instances.push(instance);
       } catch (e) {
         throw new Error(e);
       }
@@ -129,7 +131,10 @@ 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);
   }
 
@@ -147,7 +152,13 @@ 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();
@@ -156,6 +167,17 @@ class Framework {
     });
 
     this.recordRegistration(data);
+
+    classes.forEach((cls) => {
+      if (cls && this.container.isBound(cls)) {
+        try {
+          const instance = this.container.get(cls) as FrameworkBase;
+          instance?.initializeDependencies?.();
+        } catch (error) {
+          FWLog.warn(`Error initializing dependencies for ${cls.name}:`, error);
+        }
+      }
+    });
   }
 
   /**
@@ -164,15 +186,21 @@ 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));
       }
     });
@@ -188,7 +216,10 @@ 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) {
@@ -201,7 +232,10 @@ 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) {
@@ -218,7 +252,7 @@ class Framework {
     this.destroyAllComponents();
     this.container.unbindAll();
     this.container = new Container({
-      defaultScope: 'Singleton',
+      defaultScope: "Singleton",
       autoBindInjectable: true,
     });
 
@@ -234,7 +268,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);
@@ -244,12 +278,18 @@ 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
+          );
         }
       }
     }
@@ -264,7 +304,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;