@ives_xxz/framework 2.1.40 → 2.3.0

package/Framework.ts

@@ -1,6 +1,7 @@
 import "reflect-metadata";
-import { Container, interfaces } from "inversify";
+import { Container, interfaces, injectable } from "inversify";
 
+@injectable()
 export class Framework implements FW.Framework {
   private container: Container;
   private registry: Map<string, new () => FW.Registry>;
@@ -58,24 +59,44 @@ export class Framework implements FW.Framework {
 
   /** 获取所有组件 */
   public getComponents<T>(serviceIdentifier: FW.ServiceIdentifier<T>): T[] {
-    const binder = (this.container as any)._bindingDictionary;
-    const map = binder._map;
-    const childBindings: interfaces.Binding<T>[] = [];
-    for (const [key, bindings] of map.entries()) {
-      for (const binding of bindings) {
-        if (this.isSubclassOf(binding.implementationType, serviceIdentifier)) {
-          childBindings.push(binding);
-        }
+    const instances: T[] = [];
+
+    if (typeof serviceIdentifier === "string") {
+      if (this.container.isBound(serviceIdentifier)) {
+        instances.push(this.container.get<T>(serviceIdentifier));
       }
+      return instances;
     }
 
-    const instances: T[] = [];
-    for (const binding of childBindings) {
-      try {
-        const instance = this.getComponent<T>(binding.serviceIdentifier as any);
-        instances.push(instance);
-      } catch (e) {
-        throw new Error(e);
+    if (typeof serviceIdentifier === "function") {
+      for (const registrations of this.registeredComponents.values()) {
+        for (const data of registrations) {
+          const classes = [
+            data.logic,
+            data.data,
+            data.config,
+            data.sender,
+            data.handle,
+          ];
+
+          for (const cls of classes) {
+            if (!cls) continue;
+
+            if (!this.isSubclassOf(cls, serviceIdentifier)) continue;
+
+            try {
+              const instance = this.getComponent<T>(cls as any);
+              if (instance && !instances.includes(instance)) {
+                instances.push(instance);
+              }
+            } catch (e) {
+              FW.Log.warn(
+                `Error getting component instance for ${cls.name}:`,
+                e,
+              );
+            }
+          }
+        }
       }
     }
 

package/FrameworkBase.ts

@@ -2,7 +2,7 @@ import { injectable } from "inversify";
 
 @injectable()
 export abstract class FrameworkBase {
-  public _logic?: FW.Logic;
+  public logic?: FW.Logic;
   public data?: FW.Data;
   public config?: FW.AssetConfig;
   public sender?: FW.Sender;
@@ -16,13 +16,6 @@ export abstract class FrameworkBase {
     return FW.Entry;
   }
 
-  get logic() {
-    return this._logic;
-  }
-
-  set logic(value: FW.Logic) {
-    this._logic = value;
-  }
 
   constructor() {
     this.initialize?.();
@@ -60,13 +53,29 @@ export abstract class FrameworkBase {
   public initializeDependencies(): void {
     if (this.dependenciesInjected || this.isInitialized) return;
 
-    this.dependenciesInjected = true;
-    this.isInitialized = true;
-
     const bundleName = this.findBundleNameByClassName();
-    if (!bundleName) return;
+    if (!bundleName) {
+      if (FW.Entry?.engineMgr?.debug) {
+        FW.Log.warn(
+          `[FrameworkBase] 未能根据类名 "${this.moduleName}" 推断出 bundleName，跳过依赖注入`,
+        );
+      }
+      return;
+    }
 
     const tag = this.getClassTag();
+    if (tag === undefined) {
+      if (FW.Entry?.engineMgr?.debug) {
+        FW.Log.warn(
+          `[FrameworkBase] 未能根据类名 "${this.moduleName}" 推断出绑定类型（Logic/Data/Config/Sender/Handle），跳过依赖注入`,
+        );
+      }
+      return;
+    }
+
+    // 只有在 bundleName / tag 均解析成功时，才标记为已初始化，避免无效的“锁死”状态
+    this.dependenciesInjected = true;
+    this.isInitialized = true;
 
     if (tag !== FW.SystemDefine.FWBindTag.LOGIC) {
       this.logic = FW.Entry.getComponent<FW.Logic>(

package/FrameworkInitialize.ts

@@ -1,23 +1,39 @@
+import { FW_TYPES } from "./define/FWTypes";
+import { Container } from "inversify";
+
 export function initializeFramework() {
   const WD = window as any;
-  const SD = require('./define/FWSystemDefine');
-  const ED = require('./define/FWEventDefine');
+  const SD = require("./define/FWSystemDefine");
+  const ED = require("./define/FWEventDefine");
+
+  // 防止重复初始化导致状态错乱(例如热重载或多次调用)
+  if (WD.FW && WD.FW.Framework && WD.FW.Entry) {
+    return;
+  }
+
   WD.FW = {};
 
-  globalThis.FWPropertyNode = require('./expand/FWDecorator').FWPropertyNode;
-  globalThis.searchChild = require('./expand/FWDecorator').searchChild;
-  globalThis.FWPropertyNode = require('./expand/FWDecorator').FWPropertyNode;
-  globalThis.FWPropertyNodes = require('./expand/FWDecorator').FWPropertyNodes;
-  globalThis.FWPropertyComponent = require('./expand/FWDecorator').FWPropertyComponent;
-  globalThis.FWPropertyComponents = require('./expand/FWDecorator').FWPropertyComponents;
-  globalThis.PerformanceMonitor = require('./expand/FWDecorator').PerformanceMonitor;
-  globalThis.FWDeprecated = require('./expand/FWDecorator').FWDeprecated;
-  globalThis.FWSocketAutoProcessPause = require('./expand/FWDecorator').FWSocketAutoProcessPause;
-  globalThis.FWSocketAutoProcessResume = require('./expand/FWDecorator').FWSocketAutoProcessResume;
-  globalThis.RegisterEvents = require('./expand/FWDecorator').RegisterEvents;
-  globalThis.AutoRegisterCCEvent = require('./expand/FWDecorator').AutoRegisterCCEvent;
-  globalThis.AutoRegisterFWEvent = require('./expand/FWDecorator').AutoRegisterFWEvent;
-  globalThis.launchScene = '';
+  globalThis.FWPropertyNode = require("./expand/FWDecorator").FWPropertyNode;
+  globalThis.searchChild = require("./expand/FWDecorator").searchChild;
+  globalThis.FWPropertyNode = require("./expand/FWDecorator").FWPropertyNode;
+  globalThis.FWPropertyNodes = require("./expand/FWDecorator").FWPropertyNodes;
+  globalThis.FWPropertyComponent =
+    require("./expand/FWDecorator").FWPropertyComponent;
+  globalThis.FWPropertyComponents =
+    require("./expand/FWDecorator").FWPropertyComponents;
+  globalThis.PerformanceMonitor =
+    require("./expand/FWDecorator").PerformanceMonitor;
+  globalThis.FWDeprecated = require("./expand/FWDecorator").FWDeprecated;
+  globalThis.FWSocketAutoProcessPause =
+    require("./expand/FWDecorator").FWSocketAutoProcessPause;
+  globalThis.FWSocketAutoProcessResume =
+    require("./expand/FWDecorator").FWSocketAutoProcessResume;
+  globalThis.RegisterEvents = require("./expand/FWDecorator").RegisterEvents;
+  globalThis.AutoRegisterCCEvent =
+    require("./expand/FWDecorator").AutoRegisterCCEvent;
+  globalThis.AutoRegisterFWEvent =
+    require("./expand/FWDecorator").AutoRegisterFWEvent;
+  globalThis.launchScene = "";
 
   (FW.SystemDefine as any) = {};
   (FW.EventDefine as any) = {};
@@ -42,23 +58,89 @@ export function initializeFramework() {
   FW.SystemDefine.FWPromiseStatus = new SD.FWPromiseStatus();
   FW.SystemDefine.FWLayerState = new SD.FWLayerState();
   FW.SystemDefine.FWAudioType = new SD.FWAudioType();
-  FW.Service = require('./service/FWService').FWService;
-  FW.Http = require('./service/http/FWHttp').FWHttp;
-  FW.Registry = require('./registry/FWRegistry').FWRegistry;
-  FW.Framework = new (require('./Framework').Framework)();
-  FW.FrameworkBase = require('./FrameworkBase').FrameworkBase;
-  FW.Object = require('./utils/FWObject').FWObject;
-  FW.Entry = new (require('./entry/FWEntry').FWEntry)();
-  FW.Scene = require('./scene/FWScene').FWScene;
-  FW.Logic = require('./logic/FWLogic').FWLogic;
-  FW.Data = require('./data/FWData').FWData;
-  FW.Sender = require('./service/socket/FWSocketSender').FWSocketSender;
-  FW.Handle = require('./service/socket/FWSocketHandle').FWSocketHandle;
-  FW.AssetConfig = require('./config/FWAssetConfig').FWAssetConfig;
-  FW.Log = new (require('./log/FWLog').FWLog)();
-  FW.Layer = require('./layer/FWLayer').FWLayer;
-  FW.LayerController = require('./controller/FWLayerController').FWLayerController;
-  FW.SocketMock = new (require('./service/socket/mock/FWSocketMock').FWSocketMock)();
+  FW.Service = require("./service/FWService").FWService;
+  FW.Http = require("./service/http/FWHttp").FWHttp;
+  FW.Registry = require("./registry/FWRegistry").FWRegistry;
+  FW.FrameworkBase = require("./FrameworkBase").FrameworkBase;
+  FW.Object = require("./utils/FWObject").FWObject;
+  FW.Scene = require("./scene/FWScene").FWScene;
+  FW.Logic = require("./logic/FWLogic").FWLogic;
+  FW.Data = require("./data/FWData").FWData;
+  FW.Sender = require("./service/socket/FWSocketSender").FWSocketSender;
+  FW.Handle = require("./service/socket/FWSocketHandle").FWSocketHandle;
+  FW.AssetConfig = require("./config/FWAssetConfig").FWAssetConfig;
+  FW.Layer = require("./layer/FWLayer").FWLayer;
+  FW.LayerController =
+    require("./controller/FWLayerController").FWLayerController;
+  FW.SocketMock =
+    new (require("./service/socket/mock/FWSocketMock").FWSocketMock)();
+
+  const container = initializeContainer();
+  
+  FW.Framework = container.get<FW.Framework>(FW_TYPES.Framework);
+  FW.Entry = container.get<FW.Entry>(FW_TYPES.Entry);
+  FW.Log = container.get<FW.Log>(FW_TYPES.Log);
+  
   FW.Framework.initialize();
   FW.Entry.initialize();
 }
+
+
+function initializeContainer(): Container {
+  const container = new Container({
+    defaultScope: "Singleton",
+    autoBindInjectable: true,
+  });
+
+  const { Framework } = require("./Framework");
+  const { FWEntry } = require("./entry/FWEntry");
+  const { FWLog } = require("./log/FWLog");
+  
+  container.bind<FW.Framework>(FW_TYPES.Framework).to(Framework).inSingletonScope();
+  container.bind<FW.Entry>(FW_TYPES.Entry).to(FWEntry).inSingletonScope();
+  container.bind<FW.Log>(FW_TYPES.Log).to(FWLog).inSingletonScope();
+
+  const FWTimeManager = require("./manager/FWTimeManager").default;
+  const { FWLayerManager } = require("./manager/FWLayerManager");
+  const { FWResManager } = require("./manager/FWResManager");
+  const { FWAssetManager } = require("./manager/FWAssetManager");
+  const FWBundleManager = require("./manager/FWBundleManager").default;
+  const FWEventManager = require("./manager/FWEventManager").default;
+  const FWAudioManager = require("./manager/FWAudioManager").default;
+  const FWSocketManager = require("./manager/FWSocketManager").default;
+  const FWAnimationManager = require("./manager/FWAnimationManager").default;
+  const { FWStateManager } = require("./manager/FWStateManager");
+  const FWObjectManager = require("./manager/FWObjectManager").default;
+  const FWUiManager = require("./manager/FWUiManager").default;
+  const FWTaskManager = require("./manager/FWTaskManager").default;
+  const FWComponentManager = require("./manager/FWComponentManager").default;
+  const FWLanguageManager = require("./manager/FWLanguageManager").default;
+  const FWEngineManager = require("./manager/FWEngineManager").default;
+  const FWHotUpdateManager = require("./manager/FWHotUpdateManager").default;
+  const FWPromiseManager = require("./manager/FWPromiseManager").default;
+  const { FWPerformanceManager } = require("./manager/FWPerformanceManager");
+  const FWUtils = require("./utils/FWUtils").default;
+
+  container.bind<FW.TimeManager>(FW_TYPES.TimeManager).to(FWTimeManager).inSingletonScope();
+  container.bind<FW.LayerManager>(FW_TYPES.LayerManager).to(FWLayerManager).inSingletonScope();
+  container.bind<FW.ResManager>(FW_TYPES.ResManager).to(FWResManager).inSingletonScope();
+  container.bind<FW.AssetManager>(FW_TYPES.AssetManager).to(FWAssetManager).inSingletonScope();
+  container.bind<FW.BundleManager>(FW_TYPES.BundleManager).to(FWBundleManager).inSingletonScope();
+  container.bind<FW.EventManager>(FW_TYPES.EventManager).to(FWEventManager).inSingletonScope();
+  container.bind<FW.AudioManager>(FW_TYPES.AudioManager).to(FWAudioManager).inSingletonScope();
+  container.bind<FW.SocketManager>(FW_TYPES.SocketManager).to(FWSocketManager).inSingletonScope();
+  container.bind<FW.AnimationManager>(FW_TYPES.AnimationManager).to(FWAnimationManager).inSingletonScope();
+  container.bind<FW.StateManager>(FW_TYPES.StateManager).to(FWStateManager).inSingletonScope();
+  container.bind<FW.ObjectManager>(FW_TYPES.ObjectManager).to(FWObjectManager).inSingletonScope();
+  container.bind<FW.UiManager>(FW_TYPES.UiManager).to(FWUiManager).inSingletonScope();
+  container.bind<FW.TaskManager>(FW_TYPES.TaskManager).to(FWTaskManager).inSingletonScope();
+  container.bind<FW.ComponentManager>(FW_TYPES.ComponentManager).to(FWComponentManager).inSingletonScope();
+  container.bind<FW.LanguageManager>(FW_TYPES.LanguageManager).to(FWLanguageManager).inSingletonScope();
+  container.bind<FW.EngineManager>(FW_TYPES.EngineManager).to(FWEngineManager).inSingletonScope();
+  container.bind<FW.HotUpdateManager>(FW_TYPES.HotUpdateManager).to(FWHotUpdateManager).inSingletonScope();
+  container.bind<FW.PromiseManager>(FW_TYPES.PromiseManager).to(FWPromiseManager).inSingletonScope();
+  container.bind<FW.PerformanceManager>(FW_TYPES.PerformanceManager).to(FWPerformanceManager).inSingletonScope();
+  container.bind<FW.Utils>(FW_TYPES.Utils).to(FWUtils).inSingletonScope();
+
+  return container;
+}

package/config/FWSystemConfig.ts

@@ -6,24 +6,24 @@ export namespace FWSystemConfig {
     maxReconnectTimes: 10,
     reconnectInternal: 3000,
     protocolSymbol: null,
-    protocolPollingTime: 10,
+    protocolPollingTime: 10000,
   };
 
   export const PromiseConfig = {
     loadAsset: {
       retryCount: 0,
       retryInterval: 0,
-      timeout: 10,
+      timeout: 10000,
     },
     loadBundle: {
       retryCount: 0,
       retryInterval: 0,
-      timeout: 10,
+      timeout: 10000,
     },
     http: {
       retryCount: 3,
       retryInterval: 5,
-      timeout: 10,
+      timeout: 10000,
     },
   };
 }

package/define/FWTypes.ts

@@ -0,0 +1,30 @@
+/**
+ * IoC 容器类型标识符
+ */
+export const FW_TYPES = {
+  Entry: Symbol.for("Entry"),
+  Framework: Symbol.for("Framework"),
+
+  TimeManager: Symbol.for("TimeManager"),
+  LayerManager: Symbol.for("LayerManager"),
+  ResManager: Symbol.for("ResManager"),
+  AssetManager: Symbol.for("AssetManager"),
+  BundleManager: Symbol.for("BundleManager"),
+  EventManager: Symbol.for("EventManager"),
+  AudioManager: Symbol.for("AudioManager"),
+  SocketManager: Symbol.for("SocketManager"),
+  AnimationManager: Symbol.for("AnimationManager"),
+  StateManager: Symbol.for("StateManager"),
+  ObjectManager: Symbol.for("ObjectManager"),
+  UiManager: Symbol.for("UiManager"),
+  TaskManager: Symbol.for("TaskManager"),
+  ComponentManager: Symbol.for("ComponentManager"),
+  LanguageManager: Symbol.for("LanguageManager"),
+  EngineManager: Symbol.for("EngineManager"),
+  HotUpdateManager: Symbol.for("HotUpdateManager"),
+  PromiseManager: Symbol.for("PromiseManager"),
+  PerformanceManager: Symbol.for("PerformanceManager"),
+
+  Utils: Symbol.for("Utils"),
+  Log: Symbol.for("Log"),
+};

package/define/FWTypes.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "fw-types-ioc-container-symbols",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

package/entry/FWEntry.ts

@@ -1,98 +1,16 @@
-import FWUiManager from '../manager/FWUiManager';
-import FWAnimationManager from '../manager/FWAnimationManager';
-import FWAudioManager from '../manager/FWAudioManager';
+import { injectable, inject } from 'inversify';
+import { FW_TYPES } from '../define/FWTypes';
 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 { 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 FWUtils from '../utils/FWUtils';
 
 /**
  * 入口脚本
+ * 使用依赖注入管理所有管理器实例
  */
+@injectable()
 export class FWEntry implements FW.Entry {
   map: Map<string, FW.RegisterBundle> = new Map<string, FW.RegisterBundle>();
-  /**
-   * 事件管理器
-   */
-  timeMgr: FW.TimeManager;
-  /**
-   * 层级管理器
-   */
-  layerMgr: FW.LayerManager;
-  /**
-   * 资源管理器
-   */
-  resMgr: FW.ResManager;
-  /**
-   * 动画管理器
-   */
-  animationMgr: FW.AnimationManager;
-  /**
-   * 状态管理器
-   */
-  stateMgr: FW.StateManager;
-  /**
-   * 音效管理器
-   */
-  audioMgr: FW.AudioManager;
-  /**
-   * socket管理器
-   */
-  socketMgr: FW.SocketManager;
-  /**
-   * 对象管理器
-   */
-  objectMgr: FW.ObjectManager;
-  /**
-   * 事件管理器
-   */
-  evtMgr: FW.EventManager;
-  /**
-   * UI管理器
-   */
-  uiMgr: FW.UiManager;
-  /**
-   * 任务管理器
-   */
-  taskMgr: FW.TaskManager;
-  /**
-   * 组件管理器
-   */
-  componentMgr: FWComponentManager;
-  /**
-   * 多语言管理器
-   */
-  languageMgr: FW.LanguageManager;
-  /**
-   * 引擎管理器
-   */
-  engineMgr: FW.EngineManager;
-  /**
-   * 热更新管理器
-   */
-  hotUpdateMgr: FW.HotUpdateManager;
-  /**
-   * promise管理器
-   */
-  promiseMgr: FW.PromiseManager;
-  /**
-   * 性能管理器
-   */
-  performanceMgr: FW.PerformanceManager;
-
-  utils: FW.Utils;
+  
   /**
    * 当前Scene
    */
@@ -101,28 +19,30 @@ export class FWEntry implements FW.Entry {
    * bundle名字
    */
   bundleName: string;
-  /**
-   * 初始化
-   * */
+
+  constructor(
+    @inject(FW_TYPES.TimeManager) public timeMgr: FW.TimeManager,
+    @inject(FW_TYPES.LayerManager) public layerMgr: FW.LayerManager,
+    @inject(FW_TYPES.ResManager) public resMgr: FW.ResManager,
+    @inject(FW_TYPES.AnimationManager) public animationMgr: FW.AnimationManager,
+    @inject(FW_TYPES.StateManager) public stateMgr: FW.StateManager,
+    @inject(FW_TYPES.AudioManager) public audioMgr: FW.AudioManager,
+    @inject(FW_TYPES.SocketManager) public socketMgr: FW.SocketManager,
+    @inject(FW_TYPES.ObjectManager) public objectMgr: FW.ObjectManager,
+    @inject(FW_TYPES.EventManager) public evtMgr: FW.EventManager,
+    @inject(FW_TYPES.UiManager) public uiMgr: FW.UiManager,
+    @inject(FW_TYPES.TaskManager) public taskMgr: FW.TaskManager,
+    @inject(FW_TYPES.ComponentManager) public componentMgr: FWComponentManager,
+    @inject(FW_TYPES.LanguageManager) public languageMgr: FW.LanguageManager,
+    @inject(FW_TYPES.EngineManager) public engineMgr: FW.EngineManager,
+    @inject(FW_TYPES.HotUpdateManager) public hotUpdateMgr: FW.HotUpdateManager,
+    @inject(FW_TYPES.PromiseManager) public promiseMgr: FW.PromiseManager,
+    @inject(FW_TYPES.PerformanceManager) public performanceMgr: FW.PerformanceManager,
+    @inject(FW_TYPES.Utils) public utils: FW.Utils,
+  ) {}
+  
+
   initialize() {
-    this.evtMgr = new FWEventManager();
-    this.timeMgr = new FWTimeManager();
-    this.engineMgr = new FWEngineManager();
-    this.taskMgr = new FWTaskManager();
-    this.resMgr = new FWResManager();
-    this.layerMgr = new FWLayerManager();
-    this.uiMgr = new FWUiManager();
-    this.animationMgr = new FWAnimationManager();
-    this.stateMgr = new FWStateManager();
-    this.audioMgr = new FWAudioManager();
-    this.objectMgr = new FWObjectManager();
-    this.socketMgr = new FWSocketManager();
-    this.componentMgr = new FWComponentManager();
-    this.languageMgr = new FWLanguageManager();
-    this.hotUpdateMgr = new FWHotUpdateManager();
-    this.promiseMgr = new FWPromiseManager();
-    this.performanceMgr = new FWPerformanceManager();
-    this.utils = new FWUtils();
   }
 
   /**

package/log/FWLog.ts

@@ -1,3 +1,6 @@
+import { injectable } from 'inversify';
+
+@injectable()
 export class FWLog {
   FWLogColorMap: Map<FW.SystemDefine.FWLogType, string> = new Map<
     FW.SystemDefine.FWLogType,
@@ -12,15 +15,8 @@ export class FWLog {
     [FW.SystemDefine.FWLogType.ERROR, '#DC3545'],
     [FW.SystemDefine.FWLogType.SYSTEM, '#9b1eeeff'],
   ]);
-  private static instance: FWLog;
-  public static getInstance() {
-    if (!this.instance) {
-      this.instance = new FWLog();
-    }
-    return this.instance;
-  }
 
-  private constructor() {}
+  constructor() {}
 
   public get debug() {
     if (cc.sys.isBrowser)

package/manager/FWAnimationManager.ts

@@ -1,8 +1,10 @@
+import { injectable } from 'inversify';
 import { FWSkeleton } from '../animation/FWSkeleton';
 import { FWTween } from '../animation/FWTween';
 import { FWManager } from './FWManager';
 import { FWAnimationMachine } from '../machine/FWAnimationMachine';
 
+@injectable()
 export default class FWAnimationManager extends FWManager {
   private animationMachineMap: Map<string, FWAnimationMachine>;
   public initialize(): void {