@ives_xxz/framework 1.6.3 → 1.6.5

package/manager/FWPromiseManager.ts

@@ -1,11 +1,8 @@
-import { FWSystemDefine } from "../define/FWSystemDefine";
-import FWLog from "../log/FWLog";
-import { FWManager } from "./FWManager";
-
-export default class FWPromiseManager
-  extends FWManager
-  implements FW.PromiseManager
-{
+import { FWSystemDefine } from '../define/FWSystemDefine';
+import FWLog from '../log/FWLog';
+import { FWManager } from './FWManager';
+
+export default class FWPromiseManager extends FWManager implements FW.PromiseManager {
   private promiseRegistry: Map<number, FW.PromiseProxy>;
   private uniqueId: number = 0;
 
@@ -21,7 +18,7 @@ export default class FWPromiseManager
   /** 创建Promise执行器 */
   public execute<T = any>(
     executor: FW.PromiseExcutor<T>,
-    options: FW.PromiseExecuteOptions = {}
+    options: FW.PromiseExecuteOptions = {},
   ): FW.PromiseProxy<T> {
     const id = this.uniqueId++;
     const abortController = new AbortController();
@@ -34,18 +31,13 @@ export default class FWPromiseManager
       return new Promise<T>((resolve, reject) => {
         if (options.timeout && options.timeout > 0) {
           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} s`);
             if (
               retryCount < maxRetryTimes &&
-              (!options.retryCondition ||
-                options.retryCondition(timeoutError, retryCount))
+              (!options.retryCondition || options.retryCondition(timeoutError, retryCount))
             ) {
               retryCount++;
-              FWLog.debug(
-                `Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`
-              );
+              FWLog.debug(`Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`);
               if (retryInterval > 0) {
                 FW.Entry.timeMgr.scheduleOnce(() => {
                   createPromise().then(resolve, reject);
@@ -61,7 +53,7 @@ export default class FWPromiseManager
         }
 
         const onAbort = () => {
-          FWLog.debug("promise abort");
+          FWLog.debug('promise abort');
           timerSchedule?.unSchedule();
           if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
             promiseProxy.status = FWSystemDefine.FWPromiseStatus.CANCELLED;
@@ -74,11 +66,11 @@ export default class FWPromiseManager
           return;
         }
 
-        abortController.signal.addEventListener("abort", onAbort);
+        abortController.signal.addEventListener('abort', onAbort);
 
         const wrappedResolve = (value: T | PromiseLike<T>) => {
           promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
-          abortController.signal.removeEventListener("abort", onAbort);
+          abortController.signal.removeEventListener('abort', onAbort);
           this.removePromise(id);
           timerSchedule?.unSchedule();
           resolve(value);
@@ -88,14 +80,10 @@ export default class FWPromiseManager
           timerSchedule?.unSchedule();
           if (
             retryCount < maxRetryTimes &&
-            (!options.retryCondition ||
-              options.retryCondition(reason, retryCount))
+            (!options.retryCondition || options.retryCondition(reason, retryCount))
           ) {
             retryCount++;
-            FWLog.debug(
-              `Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`,
-              reason
-            );
+            FWLog.debug(`Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`, reason);
             if (retryInterval > 0) {
               FW.Entry.timeMgr.scheduleOnce(() => {
                 createPromise().then(resolve, reject);
@@ -104,29 +92,18 @@ export default class FWPromiseManager
               createPromise().then(resolve, reject);
             }
           } else {
-            if (
-              promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING
-            ) {
-              promiseProxy.status = FWSystemDefine.FWPromiseStatus.REJECTED;
-              abortController.signal.removeEventListener("abort", onAbort);
-              this.removePromise(id);
-              reject(reason);
-            }
+            abortController.signal.removeEventListener('abort', onAbort);
+            this.removePromise(id);
+            reject(reason);
           }
         };
         try {
-          executor(
-            wrappedResolve,
-            wrappedReject,
-            abortController.signal,
-            options.reason
-          );
+          executor(wrappedResolve, wrappedReject, abortController.signal, options.reason);
         } catch (error) {
           wrappedReject(error);
         }
       });
     };
-
     const promise = createPromise();
     const promiseProxy: FW.PromiseProxy<T> = {
       id,
@@ -135,19 +112,18 @@ export default class FWPromiseManager
       abortController,
       abort: (reason?: any) => {
         if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-          FWLog.debug(reason || "promise cancelled");
+          FWLog.debug(reason || 'promise cancelled');
           abortController.abort(reason);
         }
       },
 
       addAbortEventListener: (
         listener: (this: AbortSignal, ev: Event) => any,
-        options?: boolean | AddEventListenerOptions
+        options?: boolean | AddEventListenerOptions,
       ) => {
-        abortController.signal.addEventListener("abort", listener, options);
+        abortController.signal.addEventListener('abort', listener, options);
       },
     };
-
     this.promiseRegistry.set(id, promiseProxy);
     return promiseProxy;
   }
@@ -155,7 +131,7 @@ export default class FWPromiseManager
   /** 批量执行Promise并等待所有完成 */
   public all<T = any>(
     promises: FW.PromiseProxy<T>[],
-    options: FW.PromiseExecuteOptions = {}
+    options: FW.PromiseExecuteOptions = {},
   ): FW.PromiseProxy<FW.PromiseResult<T>> {
     const id = this.uniqueId++;
     const abortController = new AbortController();
@@ -169,18 +145,13 @@ export default class FWPromiseManager
         if (options.timeout && options.timeout > 0) {
           timerSchedule?.unSchedule();
           timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
-            const timeoutError = new Error(
-              `All Promise ${id} timeout after ${options.timeout} s`
-            );
+            const timeoutError = new Error(`All Promise ${id} timeout after ${options.timeout} s`);
             if (
               retryCount < maxRetryTimes &&
-              (!options.retryCondition ||
-                options.retryCondition(timeoutError, retryCount))
+              (!options.retryCondition || options.retryCondition(timeoutError, retryCount))
             ) {
               retryCount++;
-              FWLog.debug(
-                `All Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`
-              );
+              FWLog.debug(`All Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`);
               if (retryInterval > 0) {
                 FW.Entry.timeMgr.scheduleOnce(() => {
                   createPromise().then(resolve, reject);
@@ -208,7 +179,7 @@ export default class FWPromiseManager
           return;
         }
 
-        abortController.signal.addEventListener("abort", onAbort);
+        abortController.signal.addEventListener('abort', onAbort);
 
         const processAll = async () => {
           const result: FW.PromiseResult<T> = {
@@ -225,8 +196,8 @@ export default class FWPromiseManager
                   .filter(
                     (id) =>
                       !result.success.some((s) => s.id === id) &&
-                      !result.failed.some((f) => f.id === id)
-                  )
+                      !result.failed.some((f) => f.id === id),
+                  ),
               );
               break;
             }
@@ -235,9 +206,7 @@ export default class FWPromiseManager
               const value = await promiseProxy.promise;
               result.success.push(value);
             } catch (error) {
-              if (
-                promiseProxy.status === FWSystemDefine.FWPromiseStatus.CANCELLED
-              ) {
+              if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.CANCELLED) {
                 result.cancelled.push(promiseProxy.id);
               } else {
                 result.failed.push({
@@ -254,7 +223,7 @@ export default class FWPromiseManager
         processAll()
           .then((result) => {
             promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
-            abortController.signal.removeEventListener("abort", onAbort);
+            abortController.signal.removeEventListener('abort', onAbort);
             this.removePromise(id);
             timerSchedule?.unSchedule();
             resolve(result);
@@ -263,13 +232,12 @@ export default class FWPromiseManager
             timerSchedule?.unSchedule();
             if (
               retryCount < maxRetryTimes &&
-              (!options.retryCondition ||
-                options.retryCondition(error, retryCount))
+              (!options.retryCondition || options.retryCondition(error, retryCount))
             ) {
               retryCount++;
               FWLog.debug(
                 `All Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`,
-                error
+                error,
               );
               if (retryInterval > 0) {
                 FW.Entry.timeMgr.scheduleOnce(() => {
@@ -279,11 +247,9 @@ export default class FWPromiseManager
                 createPromise().then(resolve, reject);
               }
             } else {
-              if (
-                promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING
-              ) {
+              if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
                 promiseProxy.status = FWSystemDefine.FWPromiseStatus.REJECTED;
-                abortController.signal.removeEventListener("abort", onAbort);
+                abortController.signal.removeEventListener('abort', onAbort);
                 this.removePromise(id);
                 reject(error);
               }
@@ -300,15 +266,15 @@ export default class FWPromiseManager
       abortController,
       abort: (reason?: any) => {
         if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-          FWLog.debug(reason || "all promise cancelled");
+          FWLog.debug(reason || 'all promise cancelled');
           abortController.abort(reason);
         }
       },
       addAbortEventListener: (
         listener: (this: AbortSignal, ev: Event) => any,
-        options?: boolean | AddEventListenerOptions
+        options?: boolean | AddEventListenerOptions,
       ) => {
-        abortController.signal.addEventListener("abort", listener, options);
+        abortController.signal.addEventListener('abort', listener, options);
       },
     };
 
@@ -319,10 +285,7 @@ export default class FWPromiseManager
   /** 取消指定Promise */
   public cancel(id: number, reason?: any): boolean {
     const promiseProxy = this.promiseRegistry.get(id);
-    if (
-      promiseProxy &&
-      promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING
-    ) {
+    if (promiseProxy && promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
       promiseProxy.abort(reason);
       return true;
     }
@@ -373,7 +336,7 @@ export default class FWPromiseManager
   /** 获取正在执行的Promise数量 */
   public getActiveCount(): number {
     return Array.from(this.promiseRegistry.values()).filter(
-      (p) => p.status === FWSystemDefine.FWPromiseStatus.PENDING
+      (p) => p.status === FWSystemDefine.FWPromiseStatus.PENDING,
     ).length;
   }
 

package/manager/FWResManager.ts

@@ -1,21 +1,19 @@
-import FWAssetConfig from "../config/FWAssetConfig";
-import { FWSystemConfig } from "../config/FWSystemConfig";
-import { FWSystemDefine } from "../define/FWSystemDefine";
-import FWLog from "../log/FWLog";
-import { FWLodash } from "../utils/FWLodash";
-import { FWAssetManager } from "./FWAssetManager";
-import { FWBundleManager } from "./FWBundleManager";
-import { FWManager } from "./FWManager";
+import FWAssetConfig from '../config/FWAssetConfig';
+import { FWSystemConfig } from '../config/FWSystemConfig';
+import { FWSystemDefine } from '../define/FWSystemDefine';
+import FWLog from '../log/FWLog';
+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 {
-  bundleMgr: FW.BundleManager;
-  assetMgr: FW.AssetManager;
+  private bundleMgr: FW.BundleManager;
+  private assetMgr: FW.AssetManager;
 
   public initialize() {
     this.bundleMgr = new FWBundleManager(this);
     this.assetMgr = new FWAssetManager(this);
-    this.bundleMgr.initialize();
-    this.assetMgr.initialize();
   }
 
   /**
@@ -36,7 +34,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
               await this.loadBundle(depend);
 
               const config = FW.Entry.getComponent<FWAssetConfig>(
-                `${depend}${FWSystemDefine.FWBindTag.CONFIG}`
+                `${depend}${FWSystemDefine.FWBindTag.CONFIG}`,
               );
               if (!config) continue;
               const preLoad = config.preLoad;
@@ -72,7 +70,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
           reject(e);
         }
       }, FWSystemConfig.PromiseConfig.loadBundle).promise,
-      `loadBundleDepend -> ${bundleName}`
+      `loadBundle -> ${bundleName}`,
     );
   }
   /**
@@ -89,10 +87,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
     return await this.assetMgr.loadSpineDataFromRemote(data);
   }
 
-  async loadRemote<T extends cc.Asset = cc.Asset>(
-    url: string,
-    cb: (asset: any) => T
-  ): Promise<T> {
+  async loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb: (asset: any) => T): Promise<T> {
     const asset = await this.assetMgr.loadRemote(url);
     if (asset instanceof cc.Texture2D) {
       return new cc.SpriteFrame(asset) as unknown as T;
@@ -139,9 +134,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param assetProperty
    * @returns
    */
-  async loadAsset<T extends cc.Asset>(
-    assetProperty: FW.AssetProperty
-  ): Promise<T> {
+  async loadAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty): Promise<T> {
     const res = await this.assetMgr.load(assetProperty);
     return this.process<T>(res).asset as T;
   }

package/manager/FWUiManager.ts

@@ -1,6 +1,6 @@
-import { searchChild } from "../expand/FWDecorator";
-import FWLog from "../log/FWLog";
-import { FWManager } from "./FWManager";
+import { searchChild } from '../expand/FWDecorator';
+import FWLog from '../log/FWLog';
+import { FWManager } from './FWManager';
 
 export default class FWUiManager extends FWManager implements FW.UiManager {
   private eventMap: Map<
@@ -113,7 +113,7 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
 
   register(args: FW.RegisterArgs) {
     if (!args.target) {
-      FWLog.error("注册事件失败,目标为空!");
+      FWLog.error('注册事件失败,目标为空!');
       return;
     }
 
@@ -131,11 +131,7 @@ 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;
               }
 
@@ -143,9 +139,9 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
               if (button && !button.interactable) return;
 
               evt.lastResponseTimestamp = Date.now();
-              evt.cb?.bind(args.target)?.(e, c);
+              evt.cb?.bind(args.target)?.(e, c, evt.data);
             },
-            args.target
+            args.target,
           );
           this.eventMap.set(this.uniqueId, {
             uniqueId: this.uniqueId,
@@ -168,12 +164,9 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
             args7?: FW.EventManagerArgs,
             args8?: FW.EventManagerArgs,
             args9?: FW.EventManagerArgs,
-            args10?: 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();
@@ -187,10 +180,10 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
               args7,
               args8,
               args9,
-              args10
+              args10,
             );
           },
-          args.target
+          args.target,
         );
 
         this.eventMap.set(this.uniqueId, {

package/package.json

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

package/register/FWRegistry.ts

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

package/service/http/FWHttp.ts

@@ -1,7 +1,7 @@
-import { FWSystemConfig } from "../../config/FWSystemConfig";
-import { FWSystemDefine } from "../../define/FWSystemDefine";
-import FWLog from "../../log/FWLog";
-import FWService from "../FWService";
+import { FWSystemConfig } from '../../config/FWSystemConfig';
+import { FWSystemDefine } from '../../define/FWSystemDefine';
+import FWLog from '../../log/FWLog';
+import FWService from '../FWService';
 
 export default class FWHttp extends FWService {
   public initialize() {}
@@ -12,30 +12,18 @@ export default class FWHttp extends FWService {
     url: string,
     params?: string,
     cb?: (response: string) => void,
-    tag?: string
+    tag?: string,
   ): Promise<string> {
-    return this.process(
-      url,
-      params,
-      cb,
-      tag,
-      FWSystemDefine.FWHttpRequestType.GET
-    );
+    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.GET);
   }
 
   protected async postMessage(
     url: string,
     params?: string,
     cb?: (response: string) => void,
-    tag?: string
+    tag?: string,
   ): Promise<string> {
-    return this.process(
-      url,
-      params,
-      cb,
-      tag,
-      FWSystemDefine.FWHttpRequestType.POST
-    );
+    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.POST);
   }
 
   private async process(
@@ -43,56 +31,48 @@ export default class FWHttp extends FWService {
     params: string,
     cb: (response: any) => void,
     tag: string,
-    type: FWSystemDefine.FWHttpRequestType
+    type: FWSystemDefine.FWHttpRequestType,
   ): 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 && xhr.status === 200) {
-              cb?.(xhr.response);
-              resolve(xhr.response);
-            }
-          };
+        xhr.onreadystatechange = () => {
+          if (xhr.readyState == 4 && xhr.status === 200) {
+            cb?.(xhr.response);
+            resolve(xhr.response);
+          }
+        };
 
-          xhr.onerror = (err: any) => {
-            FWLog.error(err);
-            this.onError?.(err);
-            reject(`http request error:${err}`);
-          };
+        xhr.onerror = (err: any) => {
+          FWLog.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, url, true);
-          xhr.send(params);
+        xhr.open(type, url, true);
+        xhr.send(params);
+      },
+      {
+        ...FWSystemConfig.PromiseConfig.http,
+        retryCondition(error, retryCount) {
+          return error || xhr.readyState != 4 || (xhr.status !== 200 && retryCount < 3);
         },
-        {
-          ...FWSystemConfig.PromiseConfig.http,
-          retryCondition(error, retryCount) {
-            return (
-              error ||
-              xhr.readyState != 4 ||
-              (xhr.status !== 200 && retryCount < 3)
-            );
-          },
-        }
-      );
+      },
+    );
 
     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);