@ives_xxz/framework 2.1.40 → 2.3.0

package/manager/FWResManager.ts

@@ -1,16 +1,23 @@
-import { FWSystemConfig } from '../config/FWSystemConfig';
-import { FWLodash } from '../utils/FWLodash';
-import { FWAssetManager } from './FWAssetManager';
-import { FWBundleManager } from './FWBundleManager';
-import { FWManager } from './FWManager';
+import { injectable, inject } from 'inversify';
+import { FW_TYPES } from '../define/FWTypes';
+import { FWSystemConfig } from "../config/FWSystemConfig";
+import { FWLodash } from "../utils/FWLodash";
+import { FWAssetManager } from "./FWAssetManager";
+import { FWBundleManager } from "./FWBundleManager";
+import { FWManager } from "./FWManager";
 
+@injectable()
 export class FWResManager extends FWManager implements FW.ResManager {
-  private bundleMgr: FW.BundleManager;
-  private assetMgr: FW.AssetManager;
   private rejectHandlerListener: FW.ResRejectHandlerListener;
+  
+  constructor(
+    @inject(FW_TYPES.BundleManager) private bundleMgr: FW.BundleManager,
+    @inject(FW_TYPES.AssetManager) private assetMgr: FW.AssetManager,
+  ) {
+    super();
+  }
+  
   public initialize() {
-    this.bundleMgr = new FWBundleManager(this);
-    this.assetMgr = new FWAssetManager(this);
   }
 
   registerRejectHandler(listener: FW.ResRejectHandlerListener): void {
@@ -42,27 +49,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 +103,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 +198,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 +213,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/FWSocketManager.ts

@@ -1,9 +1,11 @@
+import { injectable } from 'inversify';
 import FWSocket from "../service/socket/FWSocket";
 import { FWManager } from "./FWManager";
 
 /**
  * socket管理器
  */
+@injectable()
 export default class FWSocketManager
   extends FWManager
   implements FW.SocketManager

package/manager/FWStateManager.ts

@@ -1,6 +1,8 @@
-import { FWManager } from './FWManager';
+import { injectable } from 'inversify';
+import { FWManager } from "./FWManager";
 import FWStateMachine from '../machine/FWStateMachine';
 
+@injectable()
 export class FWStateManager extends FWManager implements FW.StateManager {
   private stateMap: Map<string, FWStateMachine>;
 

package/manager/FWTaskManager.ts

@@ -1,6 +1,8 @@
+import { injectable } from 'inversify';
 import FWTask from '../utils/FWTask';
 import { FWManager } from './FWManager';
 
+@injectable()
 export default class FWTaskManager extends FWManager implements FW.TaskManager {
   public initialize(): void {}
   public onDestroy(): void {

package/manager/FWTimeManager.ts

@@ -1,3 +1,4 @@
+import { injectable } from 'inversify';
 import { FWManager } from './FWManager';
 
 class FWTimer implements FW.Timer {
@@ -21,6 +22,7 @@ class FWTimer implements FW.Timer {
 /**
  * 时间管理器
  */
+@injectable()
 export class FWTimeManager extends FWManager implements FW.TimeManager {
   /**
    * 时间对象合集

package/manager/FWUiManager.ts

@@ -1,6 +1,8 @@
-import { searchChild } from '../expand/FWDecorator';
-import { FWManager } from './FWManager';
+import { injectable } from 'inversify';
+import { searchChild } from "../expand/FWDecorator";
+import { FWManager } from "./FWManager";
 
+@injectable()
 export default class FWUiManager extends FWManager implements FW.UiManager {
   private eventMap: Map<
     number,
@@ -22,7 +24,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 +38,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 +122,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 +140,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 +152,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 +185,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.3.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": {}
+}

package/utils/FWUtils.ts

@@ -1,3 +1,6 @@
+import { injectable } from 'inversify';
+
+@injectable()
 export default class FWUtils {
   /**
    * 从 URL 中获取完整文件名（含扩展名）