@ives_xxz/framework 2.1.40 → 2.2.0

package/Framework.ts

@@ -58,24 +58,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

@@ -60,13 +60,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,36 @@
 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 +55,25 @@ 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.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.Framework.initialize();
   FW.Entry.initialize();
 }

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/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";
 
 /**
  * 资源数据
@@ -46,7 +46,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 },
@@ -63,15 +63,15 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
               asset.atlasText = assets[0];
               asset.skeletonJson = assets[1];
               asset.textures.push(texture);
-              asset['textureNames'] = [`${fileName}`];
-              asset['_uuid'] = ske;
+              asset["textureNames"] = [`${fileName}`];
+              asset["_uuid"] = ske;
               resolve(asset);
             },
           );
         }, FWSystemConfig.PromiseConfig.loadAsset).promise,
       );
     } catch (e) {
-      FW.Log.error('从远程加载spine动画资源失败!');
+      FW.Log.error("从远程加载spine动画资源失败!");
     }
   }
 
@@ -104,7 +104,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) => {
@@ -113,17 +115,18 @@ 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失败,请检查!`);
@@ -135,12 +138,16 @@ 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);
               },
@@ -169,17 +176,18 @@ 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失败,请检查!`);
@@ -189,7 +197,8 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
     if (this.assetsMap.has(key)) {
       const assetData = this.assetsMap.get(key);
-      if (!assetData.asset.loaded) {
+
+      if (!assetData.loaded || !cc.isValid(assetData.asset)) {
         this.assetsMap.delete(key);
       } else {
         return assetData;
@@ -206,7 +215,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) => {
@@ -216,7 +229,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;
@@ -248,17 +261,18 @@ 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失败,请检查!`);
@@ -282,7 +296,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;
@@ -291,7 +305,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);
 
@@ -318,18 +332,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('获取资源失败,请先加载!', assetProperty);
+      FW.Log.error("获取资源失败,请先加载!", assetProperty);
       return undefined;
     }
 
@@ -352,12 +366,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;
     }
@@ -369,7 +383,12 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const key = this.createAssetMapKey(assetProperty);
     const assetData = this.assetsMap.get(key);
 
-    if (assetData.asset?.refCount <= 0 && autoRelease) {
+    if (!assetData || !assetData.asset) {
+      this.assetsMap.delete(key);
+      return;
+    }
+
+    if (assetData.asset.refCount <= 0 && autoRelease) {
       this.resMgr.getBundle(bundleName)?.release(path);
       this.assetsMap.delete(key);
     }
@@ -403,10 +422,18 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const bundleName = assetProperty.bundle || FW.Entry.bundleName;
     const path = assetProperty.path;
     const type = assetProperty.type;
-    if (!type) {
+
+    let typeKey: string | undefined;
+    if (typeof type === "string") {
+      typeKey = type;
+    } else if (type) {
+      typeKey = (type as any).name;
+    }
+
+    if (!typeKey) {
       return `${bundleName}_${path}`;
     }
-    return `${bundleName}_${path}_${type}`;
+    return `${bundleName}_${path}_${typeKey}`;
   }
 
   public onDestroy(): void {

package/manager/FWLayerManager.ts

@@ -217,7 +217,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       this.dataManager.removeFromRegistry(ctr.layerData?.controllerConstructor);
 
       const index = this.stackManager.getStack().findIndex((v) => {
-        v.controller == ctr;
+        return v.controller == ctr;
       });
       if (index > -1) {
         this.stackManager.getStack().splice(index, 1);

package/manager/FWPromiseManager.ts

@@ -1,6 +1,9 @@
-import { FWManager } from './FWManager';
+import { FWManager } from "./FWManager";
 
-export default class FWPromiseManager extends FWManager implements FW.PromiseManager {
+export default class FWPromiseManager
+  extends FWManager
+  implements FW.PromiseManager
+{
   private promiseRegistry: Map<number, FW.PromiseProxy<any>>;
   private uniqueId: number = 0;
 
@@ -49,8 +52,11 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
             const signal = {
               aborted: isCancelled,
               onabort: null as ((this: any, ev: Event) => any) | null,
-              addEventListener: (type: string, listener: (this: any, ev: Event) => any) => {
-                if (type === 'abort') {
+              addEventListener: (
+                type: string,
+                listener: (this: any, ev: Event) => any,
+              ) => {
+                if (type === "abort") {
                   signal.onabort = listener;
                 }
               },
@@ -72,13 +78,13 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
 
             cancelPromiseResolve = () => {
               if (signal.onabort) {
-                signal.onabort.call(signal, { type: 'abort' } as Event);
+                signal.onabort.call(signal, { type: "abort" } as Event);
               }
               abortListeners.forEach((listener) => {
                 try {
-                  listener.call({ type: 'abort' }, { type: 'abort' } as Event);
+                  listener.call({ type: "abort" }, { type: "abort" } as Event);
                 } catch (error) {
-                  FW.Log.error('Error in abort listener:', error);
+                  FW.Log.error("Error in abort listener:", error);
                 }
               });
             };
@@ -91,14 +97,19 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         if (options.timeout && options.timeout > 0) {
           timeoutPromise = new Promise<T>((_, timeoutReject) => {
             timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
-              const timeoutError = new Error(`Promise ${id} timeout after ${options.timeout} s`);
+              const timeoutError = new Error(
+                `Promise ${id} timeout after ${options.timeout} ms`,
+              );
 
               if (
                 retryCount < maxRetryTimes &&
-                (!options.retryCondition || options.retryCondition(timeoutError, retryCount))
+                (!options.retryCondition ||
+                  options.retryCondition(timeoutError, retryCount))
               ) {
                 retryCount++;
-                FW.Log.debug(`Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`);
+                FW.Log.debug(
+                  `Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`,
+                );
 
                 if (retryInterval > 0) {
                   FW.Entry.timeMgr.scheduleOnce(() => {
@@ -110,7 +121,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
               } else {
                 timeoutReject(timeoutError);
               }
-            }, options.timeout);
+            }, options.timeout / 1000);
           });
         }
 
@@ -139,7 +150,8 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
 
             if (
               retryCount < maxRetryTimes &&
-              (!options.retryCondition || options.retryCondition(error, retryCount))
+              (!options.retryCondition ||
+                options.retryCondition(error, retryCount))
             ) {
               retryCount++;
               FW.Log.debug(
@@ -169,7 +181,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
       status: FW.SystemDefine.FWPromiseStatus.PENDING,
       abort: (reason?: any) => {
         if (promiseProxy.status === FW.SystemDefine.FWPromiseStatus.PENDING) {
-          FW.Log.debug(reason || 'promise cancelled');
+          FW.Log.debug(reason || "promise cancelled");
           cancelResolve?.();
           promiseProxy.status = FW.SystemDefine.FWPromiseStatus.CANCELLED;
         }
@@ -263,7 +275,10 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
                 value: value,
               });
             } catch (error) {
-              if (promiseProxy.status === FW.SystemDefine.FWPromiseStatus.CANCELLED) {
+              if (
+                promiseProxy.status ===
+                FW.SystemDefine.FWPromiseStatus.CANCELLED
+              ) {
                 result.cancelled.push(promiseProxy.id);
               } else {
                 result.failed.push({
@@ -282,42 +297,45 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         cancelPromiseResolve = () => {
           abortListeners.forEach((listener) => {
             try {
-              listener.call({ type: 'abort' }, { type: 'abort' } as Event);
+              listener.call({ type: "abort" }, { type: "abort" } as Event);
             } catch (error) {
-              FW.Log.error('Error in abort listener:', error);
+              FW.Log.error("Error in abort listener:", error);
             }
           });
         };
 
         let timeoutPromise: Promise<FW.PromiseAllResult<T>> | null = null;
         if (options.timeout && options.timeout > 0) {
-          timeoutPromise = new Promise<FW.PromiseAllResult<T>>((_, timeoutReject) => {
-            timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
-              const timeoutError = new Error(
-                `All Promise ${id} timeout after ${options.timeout} s`,
-              );
-
-              if (
-                retryCount < maxRetryTimes &&
-                (!options.retryCondition || options.retryCondition(timeoutError, retryCount))
-              ) {
-                retryCount++;
-                FW.Log.debug(
-                  `All Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`,
+          timeoutPromise = new Promise<FW.PromiseAllResult<T>>(
+            (_, timeoutReject) => {
+              timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
+                const timeoutError = new Error(
+                  `All Promise ${id} timeout after ${options.timeout} ms`,
                 );
 
-                if (retryInterval > 0) {
-                  FW.Entry.timeMgr.scheduleOnce(() => {
+                if (
+                  retryCount < maxRetryTimes &&
+                  (!options.retryCondition ||
+                    options.retryCondition(timeoutError, retryCount))
+                ) {
+                  retryCount++;
+                  FW.Log.debug(
+                    `All Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`,
+                  );
+
+                  if (retryInterval > 0) {
+                    FW.Entry.timeMgr.scheduleOnce(() => {
+                      createPromise().then(resolve, reject);
+                    }, retryInterval);
+                  } else {
                     createPromise().then(resolve, reject);
-                  }, retryInterval);
+                  }
                 } else {
-                  createPromise().then(resolve, reject);
+                  timeoutReject(timeoutError);
                 }
-              } else {
-                timeoutReject(timeoutError);
-              }
-            }, options.timeout);
-          });
+              }, options.timeout / 1000);
+            },
+          );
         }
 
         const racePromises: Promise<FW.PromiseAllResult<T>>[] = [mainPromise];
@@ -327,7 +345,9 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         }
 
         if (!isCancelled) {
-          const raceCancelPromise = cancelPromise as unknown as Promise<FW.PromiseAllResult<T>>;
+          const raceCancelPromise = cancelPromise as unknown as Promise<
+            FW.PromiseAllResult<T>
+          >;
           racePromises.push(raceCancelPromise);
         }
 
@@ -345,7 +365,8 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
 
             if (
               retryCount < maxRetryTimes &&
-              (!options.retryCondition || options.retryCondition(error, retryCount))
+              (!options.retryCondition ||
+                options.retryCondition(error, retryCount))
             ) {
               retryCount++;
               FW.Log.debug(
@@ -375,7 +396,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
       status: FW.SystemDefine.FWPromiseStatus.PENDING,
       abort: (reason?: any) => {
         if (promiseProxy.status === FW.SystemDefine.FWPromiseStatus.PENDING) {
-          FW.Log.debug(reason || 'all promise cancelled');
+          FW.Log.debug(reason || "all promise cancelled");
           cancelResolve?.();
           promiseProxy.status = FW.SystemDefine.FWPromiseStatus.CANCELLED;
         }
@@ -413,7 +434,10 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
 
   public cancel(id: number, reason?: any): boolean {
     const promiseProxy = this.promiseRegistry.get(id);
-    if (promiseProxy && promiseProxy.status === FW.SystemDefine.FWPromiseStatus.PENDING) {
+    if (
+      promiseProxy &&
+      promiseProxy.status === FW.SystemDefine.FWPromiseStatus.PENDING
+    ) {
       promiseProxy.abort(reason);
       return true;
     }

package/manager/FWResManager.ts

@@ -1,8 +1,8 @@
-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;
@@ -42,27 +42,31 @@ export class FWResManager extends FWManager implements FW.ResManager {
               const keys = Object.keys(preLoad);
 
               if (keys.length > 0) {
-                const find = (o) => {
-                  Object.keys(o).forEach(async (key) => {
-                    const value: FW.AssetProperty = o[key];
-                    const path: string = value.path;
-                    const type: string = value.type;
-                    const d: string = value.bundle || depend;
-                    const priorityLoaded = value.priorityLoaded || false;
-                    if (path) {
-                      if (priorityLoaded) {
+                const preloadRecursive = async (
+                  obj: FW.LoadConfig | FW.AssetProperty,
+                ) => {
+                  for (const key of Object.keys(obj)) {
+                    const value: any = (obj as any)[key];
+
+                    if (value && typeof value.path === "string") {
+                      const path: string = value.path;
+                      const type: string = value.type;
+                      const d: string = value.bundle || depend;
+                      const priorityLoaded = value.priorityLoaded || false;
+
+                      if (path && priorityLoaded) {
                         await this.assetMgr.load({
-                          path: path,
+                          path,
                           bundle: d,
-                          type: type,
+                          type,
                         });
                       }
-                    } else {
-                      find(value);
+                    } else if (value && typeof value === "object") {
+                      await preloadRecursive(value);
                     }
-                  });
+                  }
                 };
-                find(config.preLoad);
+                await preloadRecursive(config.preLoad);
               }
             }
           }
@@ -92,7 +96,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, texture?: boolean): Promise<T> {
+  async loadRemote<T extends cc.Asset = cc.Asset>(
+    url: string,
+    texture?: boolean,
+  ): Promise<T> {
     try {
       const asset = await this.assetMgr.loadRemote(url);
       if (texture) {
@@ -184,7 +191,10 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param bundleName
    * @returns
    */
-  getAssetData<T extends cc.Asset>(assetProperty: FW.AssetProperty, texture?: boolean) {
+  getAssetData<T extends cc.Asset>(
+    assetProperty: FW.AssetProperty,
+    texture?: boolean,
+  ) {
     const res = this.assetMgr.get(assetProperty);
     if (texture) {
       return res;
@@ -196,7 +206,10 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param assetProperty
    * @returns
    */
-  getAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty, texture?: boolean): T {
+  getAsset<T extends cc.Asset>(
+    assetProperty: FW.AssetProperty,
+    texture?: boolean,
+  ): T {
     const res = this.assetMgr.get(assetProperty);
     if (texture) {
       return res.asset as T;

package/manager/FWUiManager.ts

@@ -1,5 +1,5 @@
-import { searchChild } from '../expand/FWDecorator';
-import { FWManager } from './FWManager';
+import { searchChild } from "../expand/FWDecorator";
+import { FWManager } from "./FWManager";
 
 export default class FWUiManager extends FWManager implements FW.UiManager {
   private eventMap: Map<
@@ -22,7 +22,11 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
       target.pauseSystemEvents(true);
     }
 
-    this.eventMap.forEach((v) => FW.Entry.evtMgr?.targetPause(v));
+    this.eventMap.forEach((evt) => {
+      if (evt.target === target) {
+        FW.Entry.evtMgr?.targetPause(evt.target);
+      }
+    });
   }
 
   resumeEvent(target: FW.TargetType) {
@@ -32,7 +36,11 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
       target.resumeSystemEvents(true);
     }
 
-    this.eventMap.forEach((v) => FW.Entry.evtMgr?.targetResume(v));
+    this.eventMap.forEach((evt) => {
+      if (evt.target === target) {
+        FW.Entry.evtMgr?.targetResume(evt.target);
+      }
+    });
   }
 
   unRegisterEvent(args: FW.RegisterArgs) {
@@ -112,7 +120,7 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
 
   register(args: FW.RegisterArgs) {
     if (!args.target) {
-      FW.Log.error('注册事件失败,目标为空!');
+      FW.Log.error("注册事件失败,目标为空!");
       return;
     }
 
@@ -130,7 +138,10 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
 
               if (!evt.enable) return;
 
-              if (Date.now() - evt.lastResponseTimestamp < evt.responseInterval) {
+              if (
+                Date.now() - evt.lastResponseTimestamp <
+                evt.responseInterval
+              ) {
                 return;
               }
 
@@ -139,7 +150,10 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
 
               evt.lastResponseTimestamp = Date.now();
 
-              FW.Entry.evtMgr.dispatch(FW.EventDefine.SystemEvent.SYSTEM_EVENT_TIRGGER, evt.target);
+              FW.Entry.evtMgr.dispatch(
+                FW.EventDefine.SystemEvent.SYSTEM_EVENT_TIRGGER,
+                evt.target,
+              );
 
               evt.cb?.bind(args.target)?.(e, c, evt.data);
             },
@@ -169,7 +183,10 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
             args9?: FW.EventManagerArgs,
             args10?: FW.EventManagerArgs,
           ) => {
-            if (Date.now() - evt.lastResponseTimestamp < (evt.responseInterval || 0)) {
+            if (
+              Date.now() - evt.lastResponseTimestamp <
+              (evt.responseInterval || 0)
+            ) {
               return;
             }
             evt.lastResponseTimestamp = Date.now();

package/package.json

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

package/service/http/FWHttp.ts

@@ -1,4 +1,4 @@
-import { FWSystemConfig } from '../../config/FWSystemConfig';
+import { FWSystemConfig } from "../../config/FWSystemConfig";
 
 export class FWHttp extends FW.Service {
   public initialize() {}
@@ -11,7 +11,13 @@ export class FWHttp extends FW.Service {
     cb?: (response: string) => void,
     tag?: string,
   ): Promise<string> {
-    return this.process(url, params, cb, tag, FW.SystemDefine.FWHttpRequestType.GET);
+    return this.process(
+      url,
+      params,
+      cb,
+      tag,
+      FW.SystemDefine.FWHttpRequestType.GET,
+    );
   }
 
   protected async postMessage(
@@ -20,7 +26,13 @@ export class FWHttp extends FW.Service {
     cb?: (response: string) => void,
     tag?: string,
   ): Promise<string> {
-    return this.process(url, params, cb, tag, FW.SystemDefine.FWHttpRequestType.POST);
+    return this.process(
+      url,
+      params,
+      cb,
+      tag,
+      FW.SystemDefine.FWHttpRequestType.POST,
+    );
   }
 
   private async process(
@@ -32,44 +44,58 @@ export class FWHttp extends FW.Service {
   ): Promise<string> {
     let xhr: XMLHttpRequest;
 
-    const promiseProxy: FW.PromiseProxy<string> = FW.Entry.promiseMgr.execute<string>(
-      (resolve, reject, signal, reason) => {
-        xhr = new XMLHttpRequest();
+    const promiseProxy: FW.PromiseProxy<string> =
+      FW.Entry.promiseMgr.execute<string>(
+        (resolve, reject, signal, reason) => {
+          xhr = new XMLHttpRequest();
+
+          xhr.onreadystatechange = () => {
+            if (xhr.readyState !== 4) return;
+
+            if (xhr.status >= 200 && xhr.status < 300) {
+              cb?.(xhr.response);
+              resolve(xhr.response);
+              return;
+            }
 
-        xhr.onreadystatechange = () => {
-          if (xhr.readyState == 4 && xhr.status === 200) {
-            cb?.(xhr.response);
-            resolve(xhr.response);
-          }
-        };
+            const errMsg = `http request failed, status: ${xhr.status}, url: ${url}`;
+            FW.Log.warn(errMsg);
+            reject(errMsg);
+          };
 
-        xhr.onerror = (err: any) => {
-          FW.Log.error(err);
-          this.onError?.(err);
-          reject(`http request error:${err}`);
-        };
+          xhr.onerror = (err: any) => {
+            FW.Log.error("http request error:", err);
+            this.onError?.(err);
+            reject(`http request error:${err}`);
+          };
 
-        xhr.ontimeout = () => {
-          this.onTimeout?.();
-          reject(`http request timeout!`);
-        };
+          xhr.ontimeout = () => {
+            this.onTimeout?.();
+            reject(`http request timeout!`);
+          };
 
-        xhr.open(type as string, url, true);
-        xhr.send(params);
-      },
-      {
-        ...FWSystemConfig.PromiseConfig.http,
-        retryCondition(error, retryCount) {
-          return error || xhr.readyState != 4 || (xhr.status !== 200 && retryCount < 3);
+          xhr.open(type as string, url, true);
+          xhr.send(params);
         },
-      },
-    );
+        {
+          ...FWSystemConfig.PromiseConfig.http,
+          retryCondition(error, retryCount) {
+            return (
+              !!error &&
+              retryCount < (FWSystemConfig.PromiseConfig.http.retryCount || 0)
+            );
+          },
+        },
+      );
 
     promiseProxy.addAbortEventListener(() => {
       xhr.abort();
     });
 
-    return await this.invoke(promiseProxy.promise, tag ? `http request ->${tag}` : '');
+    return await this.invoke(
+      promiseProxy.promise,
+      tag ? `http request ->${tag}` : "",
+    );
   }
 
   onError?(err: any);

package/service/socket/FWSocket.ts

@@ -1,4 +1,4 @@
-import { FWSystemConfig } from '../../config/FWSystemConfig';
+import { FWSystemConfig } from "../../config/FWSystemConfig";
 
 /**
  * TODO 犹豫socket没有改版暂时已老的cmd字符串映射方式做,后期优化
@@ -106,10 +106,14 @@ export default class FWSocket extends FW.Service implements FW.Socket {
       this.heartInternal = config?.heartInternal || defaultConfig.heartInternal;
       this.heartTimeout = config?.heartTimeout || defaultConfig.heartTimeout;
       this.heartWeakTime = config?.heartWeakTime || defaultConfig.heartWeakTime;
-      this.maxReconnectTimes = config?.maxReconnectTimes || defaultConfig.maxReconnectTimes;
-      this.reconnectInternal = config?.reconnectInternal || defaultConfig.reconnectInternal;
-      this.protocolSymbol = config?.protocolSymbol || defaultConfig.protocolSymbol;
-      this.protocolPollingTime = config?.protocolPollingTime || defaultConfig.protocolPollingTime;
+      this.maxReconnectTimes =
+        config?.maxReconnectTimes || defaultConfig.maxReconnectTimes;
+      this.reconnectInternal =
+        config?.reconnectInternal || defaultConfig.reconnectInternal;
+      this.protocolSymbol =
+        config?.protocolSymbol || defaultConfig.protocolSymbol;
+      this.protocolPollingTime =
+        config?.protocolPollingTime || defaultConfig.protocolPollingTime;
 
       this.promiseProxy = {
         promise: undefined,
@@ -123,7 +127,7 @@ export default class FWSocket extends FW.Service implements FW.Socket {
 
       return this.promiseProxy;
     } catch (e) {
-      FW.Log.error('创建socket失败:', e);
+      FW.Log.error("创建socket失败:", e);
     }
   }
   /**
@@ -201,16 +205,22 @@ export default class FWSocket extends FW.Service implements FW.Socket {
     this.socket?.close();
     this.socket = null;
 
-    this.createSocket(this.address, this.tag, this.socketSender, this.socketHandle, {
-      heartInternal: this.heartInternal,
-      heartTimeout: this.heartTimeout,
-      heartWeakTime: this.heartWeakTime,
-      maxReconnectTimes: this.maxReconnectTimes,
-      reconnectInternal: this.reconnectInternal,
-      protocolSymbol: this.protocolSymbol,
-      protocolPollingTime: this.protocolPollingTime,
-      certificate: this.certificate,
-    });
+    this.createSocket(
+      this.address,
+      this.tag,
+      this.socketSender,
+      this.socketHandle,
+      {
+        heartInternal: this.heartInternal,
+        heartTimeout: this.heartTimeout,
+        heartWeakTime: this.heartWeakTime,
+        maxReconnectTimes: this.maxReconnectTimes,
+        reconnectInternal: this.reconnectInternal,
+        protocolSymbol: this.protocolSymbol,
+        protocolPollingTime: this.protocolPollingTime,
+        certificate: this.certificate,
+      },
+    );
   }
 
   async send(msg: string) {
@@ -220,14 +230,15 @@ export default class FWSocket extends FW.Service implements FW.Socket {
       const protocolKey = this.socketSender.getProtocolKey?.(msg);
       if (protocolKey) {
         const symbol = Symbol(protocolKey);
-        const registry = this.protocolRegistry.get(protocolKey) || new Set<Symbol>();
+        const registry =
+          this.protocolRegistry.get(protocolKey) || new Set<Symbol>();
         const protocolPolling: FW.ProtocolPolling = {
           msg: msg,
           schedule: FW.Entry.timeMgr.schedule(
             () => {
               this.sendMessage(msg);
             },
-            this.protocolPollingTime,
+            this.protocolPollingTime / 1000,
             cc.macro.REPEAT_FOREVER,
             this,
           ),
@@ -241,7 +252,7 @@ export default class FWSocket extends FW.Service implements FW.Socket {
 
   /** 连接打开 */
   private onSocketOpen() {
-    FW.Log.debug('on open!');
+    FW.Log.debug("on open!");
     FW.Entry.timeMgr.unSchedule(this);
     this.reconnectTimes = 0;
     this.sendHeartTimestamp = 0;
@@ -285,16 +296,19 @@ export default class FWSocket extends FW.Service implements FW.Socket {
 
   /** socket关闭 */
   private onSocketClose() {
-    FW.Log.debug('on close!');
+    FW.Log.debug("on close!");
     this.socketHandle?.onClose?.();
     FW.Entry.timeMgr.scheduleOnce(
       () => {
-        if (this.getReadyState() == WebSocket.CLOSING || this.getReadyState() == WebSocket.CLOSED) {
-          FW.Log.debug('on close!');
+        if (
+          this.getReadyState() == WebSocket.CLOSING ||
+          this.getReadyState() == WebSocket.CLOSED
+        ) {
+          FW.Log.debug("on close!");
           this.reconnect();
         }
       },
-      this.reconnectInternal,
+      this.reconnectInternal / 1000,
       this,
     );
   }

package/utils/FWResLoader.ts

@@ -0,0 +1,139 @@
+export default class FWResLoader {
+  /**
+   * 通过任务系统按帧加载资源
+   */
+  public static threadLoad(options: {
+    assets: FW.AssetProperty[];
+    cb?: (progress: number) => void;
+  }): void {
+    const totalAssetsCount = options.assets.length;
+    let loadedAssetsCount = 0;
+
+    const task = FW.Entry.taskMgr.createTask({
+      frameBudget: 1 / 20,
+      tasksFrameCount: 5,
+      log: true,
+    });
+
+    const loadTask = async function* (): FW.TaskGenerator {
+      yield {
+        type: FW.EventDefine.TaskEvent.START,
+        progress: 0,
+        message: "资源加载开始",
+      };
+
+      for (const asset of options.assets) {
+        try {
+          await FW.Entry.resMgr.loadAsset({
+            bundle: asset.bundle,
+            path: asset.path,
+            type: asset.type,
+          });
+
+          loadedAssetsCount++;
+
+          const currentProgress = loadedAssetsCount / totalAssetsCount;
+
+          options.cb?.(currentProgress);
+
+          yield {
+            type: FW.EventDefine.TaskEvent.PROGRESS,
+            progress: currentProgress,
+            message: `资源加载中-> 资源路径:${asset.path} ,资源数:${loadedAssetsCount}/${totalAssetsCount},进度百分比:${currentProgress}`,
+          };
+        } catch (error) {
+          FW.Log.error(`加载资源失败: ${asset.path}`, error);
+          loadedAssetsCount++;
+          yield {
+            type: FW.EventDefine.TaskEvent.PROGRESS,
+            progress: loadedAssetsCount / totalAssetsCount,
+            message: `资源加载失败->: ${asset.path}`,
+          };
+        }
+      }
+
+      yield {
+        type: FW.EventDefine.TaskEvent.COMPLETE,
+        progress: 1,
+        message: "资源加载完成",
+      };
+    };
+
+    task.start(loadTask);
+  }
+
+  /**
+   * 加载bundle并收集预加载资源
+   */
+  public static async loadBundlesAndCollectAssets(
+    bundles: string[],
+  ): Promise<{
+    priorityAssets: FW.AssetProperty[];
+    backStageAssets: FW.AssetProperty[];
+  }> {
+    const priorityAssets: FW.AssetProperty[] = [];
+    const backStageAssets: FW.AssetProperty[] = [];
+
+    for (const bundleName of bundles) {
+      await FW.Entry.resMgr.loadBundle(bundleName);
+      const assetsConfig = FW.Entry.getComponent<FW.AssetConfig>(
+        `${bundleName}${FW.SystemDefine.FWBindTag.CONFIG}`,
+      );
+
+      if (!assetsConfig) continue;
+
+      const find = (o: any) => {
+        if (!o) return;
+        Object.keys(o).forEach((key) => {
+          const value: FW.AssetProperty | any = o[key];
+          const path: string = (value as any)?.path;
+          const priorityLoaded: boolean = (value as any)?.priorityLoaded;
+          if (path) {
+            (priorityLoaded ? priorityAssets : backStageAssets).push({
+              bundle: bundleName,
+              path,
+            });
+          } else if (typeof value === "object") {
+            find(value);
+          }
+        });
+      };
+
+      find((assetsConfig as any).preLoad);
+    }
+
+    return {
+      priorityAssets,
+      backStageAssets,
+    };
+  }
+
+  /**
+   * 通过线程任务加载资源并返回完成Promise
+   */
+  public static async loadAssetsWithThread(options: {
+    assets: FW.AssetProperty[];
+    cb?: (progress: number) => void;
+  }): Promise<void> {
+    const { assets, cb } = options;
+    if (!assets || assets.length === 0) {
+      cb?.(1);
+      return;
+    }
+
+    return new Promise<void>((resolve) => {
+      let loadedCount = 0;
+
+      FWResLoader.threadLoad({
+        assets,
+        cb: (progress: number) => {
+          cb?.(progress);
+          if (++loadedCount >= assets.length) {
+            resolve();
+          }
+        },
+      });
+    });
+  }
+}
+

package/utils/FWResLoader.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "ca26ad6e-2aad-45c8-84b3-9a5052e47023",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}