@ives_xxz/framework 2.0.9 → 2.0.11

package/manager/FWPromiseManager.ts

@@ -53,10 +53,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         const onAbort = () => {
           FW.Log.debug('promise abort');
           timerSchedule?.unSchedule();
-          if (promiseProxy.status === FW.SystemDefine.FWPromiseStatus.PENDING) {
-            promiseProxy.status = FW.SystemDefine.FWPromiseStatus.CANCELLED;
-            this.removePromise(id);
-          }
+          this.removePromise(id);
         };
 
         if (abortController.signal.aborted) {
@@ -67,7 +64,6 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         abortController.signal.addEventListener('abort', onAbort);
 
         const wrappedResolve = (value: T | PromiseLike<T>) => {
-          promiseProxy.status = FW.SystemDefine.FWPromiseStatus.FULFILLED;
           abortController.signal.removeEventListener('abort', onAbort);
           this.removePromise(id);
           timerSchedule?.unSchedule();

package/package.json

@@ -1,11 +1,9 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
-  "keywords": [
-    "123456"
-  ],
+  "keywords": ["123456"],
   "author": "ives",
   "license": "ISC"
 }

package/types/FW.d.ts

@@ -8,18 +8,13 @@ declare namespace FW {
     prototype: T;
   };
 
-  type ServiceIdentifierData<TInstance = unknown> =
-    | string
-    | symbol
-    | Newable<TInstance>
-    | Function;
-
-  type CommonNewable<
-    TInstance = unknown,
-    TArgs extends unknown[] = any[]
-  > = Newable<TInstance, TArgs>;
-  type CommonServiceIdentifier<TInstance = unknown> =
-    ServiceIdentifierData<TInstance>;
+  type ServiceIdentifierData<TInstance = unknown> = string | symbol | Newable<TInstance> | Function;
+
+  type CommonNewable<TInstance = unknown, TArgs extends unknown[] = any[]> = Newable<
+    TInstance,
+    TArgs
+  >;
+  type CommonServiceIdentifier<TInstance = unknown> = ServiceIdentifierData<TInstance>;
 
   type ServiceIdentifier<T = unknown> = CommonServiceIdentifier<T>;
   /**
@@ -65,13 +60,13 @@ declare namespace FW {
         resolve: (value: T | PromiseLike<T>) => void,
         reject: (reason?: any) => void,
         signal?: AbortSignal,
-        reason?: any
+        reason?: any,
       ) => void = PromiseExcutor,
-      options: PromiseExecuteOptions = {}
+      options: PromiseExecuteOptions = {},
     ): PromiseProxy<T>;
     all<T = any>(
       promises: FW.PromiseProxy<T>[],
-      options: FW.PromiseExecuteOptions = {}
+      options: FW.PromiseExecuteOptions = {},
     ): FW.PromiseProxy<FW.PromiseResult<T>>;
   };
 
@@ -79,22 +74,18 @@ declare namespace FW {
     registerLanguagePackageEnum(
       bundleName: string,
       language: any,
-      getter: (key: string, language?: string) => string
+      getter: (key: string, language?: string) => string,
     ): void;
     getSupportedLanguages(): string[];
     setSupportedLanguages(languages: string[]): void;
     getBundles(): string[];
     getLanguage(): string;
     getLanguageIndex(): number;
-    getLanguagePackageValue(
-      bundleName: string,
-      key: string,
-      language?: string
-    ): string;
+    getLanguagePackageValue(bundleName: string, key: string, language?: string): string;
     getLanguagePackageEnumKeys(bundleName: string): string[];
     getLanguagePackageEnumValues(bundleName: string): string[];
     getLanguagePackageEnum<K extends keyof ILanguageBundleAccessor>(
-      bundleName: K
+      bundleName: K,
     ): ILanguageBundleAccessor[K];
     initializeLanguage(language: string);
   };
@@ -112,32 +103,32 @@ declare namespace FW {
     createObjectPool<T extends FWObject = FWObject>(
       node: cc.Node,
       parent: cc.Node,
-      tag?: string
+      tag?: string,
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       prefab: cc.Prefab,
       parent: cc.Node,
-      tag?: string
+      tag?: string,
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       assetProperty: FW.AssetProperty,
       parent: cc.Node,
-      tag?: string
+      tag?: string,
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       node: cc.Node,
       parent: cc.Node,
-      type?: number
+      type?: number,
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       prefab: cc.Prefab,
       parent: cc.Node,
-      type?: number
+      type?: number,
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       assetProperty: FW.AssetProperty,
       parent: cc.Node,
-      type?: number
+      type?: number,
     ): Promise<ObjectPool<T>>;
     /** 获取已经创建的对象池 */
     getObjectPool(tag: string): ObjectPool;
@@ -170,7 +161,7 @@ declare namespace FW {
       address: string,
       sender: Sender,
       handle: Handle,
-      config: SocketConfig
+      config: SocketConfig,
     ): Promise<Socket>;
     /**
      * 获取socket
@@ -266,7 +257,7 @@ declare namespace FW {
       tag: string,
       sender: Sender,
       handle: SocketHandle,
-      config: SocketConfig
+      config: SocketConfig,
     ): SocketPromiseProxy;
   };
 
@@ -301,7 +292,7 @@ declare namespace FW {
       args7?: FW.EventManagerArgs,
       args8?: FW.EventManagerArgs,
       args9?: FW.EventManagerArgs,
-      args10?: FW.EventManagerArgs
+      args10?: FW.EventManagerArgs,
     );
     /**
      * 比较目标
@@ -362,35 +353,19 @@ declare namespace FW {
     /**
      * 一次性调度器
      */
-    scheduleOnce(
-      cb?: () => void,
-      time?: number,
-      tag?: string
-    ): FW.TimerSchedule;
+    scheduleOnce(cb?: () => void, time?: number, tag?: string): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(
-      time?: number,
-      cb?: () => void,
-      tag?: string
-    ): FW.TimerSchedule;
+    scheduleOnce(time?: number, cb?: () => void, tag?: string): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(
-      time?: number,
-      cb?: () => void,
-      target?: any
-    ): FW.TimerSchedule;
+    scheduleOnce(time?: number, cb?: () => void, target?: any): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(
-      cb?: () => void,
-      time?: number,
-      target?: any
-    ): FW.TimerSchedule;
+    scheduleOnce(cb?: () => void, time?: number, target?: any): FW.TimerSchedule;
     /**
      * 自定义调度器
      * */
@@ -399,7 +374,7 @@ declare namespace FW {
       time?: number,
       repeat?: number,
       target?: TargetType,
-      tag?: string
+      tag?: string,
     ): TimerSchedule;
     /** 暂停调度器 */
     pauseSchedule(tag: string): void;
@@ -450,13 +425,13 @@ declare namespace FW {
         args7?: EventManagerArgs,
         args8?: EventManagerArgs,
         args9?: EventManagerArgs,
-        args10?: EventManagerArgs
+        args10?: EventManagerArgs,
       ) => void,
       target: TargetType,
       options?: {
         priority?: FW.SystemDefine.FWPriorityOrder;
         intercept?: boolean;
-      }
+      },
     );
 
     registerOnce(
@@ -471,13 +446,13 @@ declare namespace FW {
         args7?: EventManagerArgs,
         args8?: EventManagerArgs,
         args9?: EventManagerArgs,
-        args10?: EventManagerArgs
+        args10?: EventManagerArgs,
       ) => void,
       target: TargetType,
       options?: {
         priority?: number;
         intercept?: boolean;
-      }
+      },
     ): void;
 
     /**
@@ -511,7 +486,7 @@ declare namespace FW {
       args7?: FW.EventManagerArgs,
       args8?: FW.EventManagerArgs,
       args9?: FW.EventManagerArgs,
-      args10?: FW.EventManagerArgs
+      args10?: FW.EventManagerArgs,
     ): void;
     /**
      * 注销事件
@@ -657,37 +632,29 @@ declare namespace FW {
      * @param data
      */
     openAsync<Ctr extends FW.LayerController = FWLayerController>(
-      data: LayerOpenArgs<Ctr>
+      data: LayerOpenArgs<Ctr>,
     ): Promise<Ctr>;
 
     /**
      * 同步打开layer
      * @param data
      */
-    openSync<Ctr extends FW.LayerController = FWLayerController>(
-      data: LayerOpenArgs<Ctr>
-    ): Ctr;
+    openSync<Ctr extends FW.LayerController = FWLayerController>(data: LayerOpenArgs<Ctr>): Ctr;
     /**
      * 显示常驻layer
      * @param layer
      */
-    displayLayer<Ctr extends FW.LayerController = FWLayerController>(
-      ctr: Ctr
-    ): Ctr;
+    displayLayer<Ctr extends FW.LayerController = FWLayerController>(ctr: Ctr): Ctr;
     /**
      * 隐藏常驻layer
      * @param layer
      */
-    hideLayer<Ctr extends FW.LayerController = FWLayerController>(
-      ctr: Ctr
-    ): Ctr;
+    hideLayer<Ctr extends FW.LayerController = FWLayerController>(ctr: Ctr): Ctr;
     /**
      * 关闭layer
      * @param layer
      */
-    close<Ctr extends FW.LayerController = FWLayerController>(
-      ctr: Ctr
-    ): FWLayerController;
+    close<Ctr extends FW.LayerController = FWLayerController>(ctr: Ctr): FWLayerController;
 
     /**
      * 从栈关闭
@@ -793,10 +760,7 @@ declare namespace FW {
      * @param url
      * @param cb
      */
-    loadRemote<T extends cc.Asset = cc.Asset>(
-      url: string,
-      cb?: (asset: cc.Asset) => T
-    ): Promise<T>;
+    loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb?: (asset: cc.Asset) => T): Promise<T>;
     /**
      * 从远程加载spine动画
      * @param data
@@ -812,18 +776,13 @@ declare namespace FW {
      * 加载资源返回数据
      * @param assetProperty
      */
-    loadAssetData<T extends cc.Asset>(
-      assetProperty: AssetProperty
-    ): Promise<AssetData>;
+    loadAssetData<T extends cc.Asset>(assetProperty: AssetProperty): Promise<AssetData>;
 
     /**
      * 加载资源
      * @param assetProperty
      */
-    loadAsset<T extends cc.Asset>(
-      assetProperty: AssetProperty,
-      cb?: () => void
-    ): Promise<T>;
+    loadAsset<T extends cc.Asset>(assetProperty: AssetProperty, cb?: () => void): Promise<T>;
 
     /**
      * 获取资源
@@ -971,10 +930,7 @@ declare namespace FW {
      * @param url
      * @param cb
      */
-    loadRemote<T extends cc.Asset = cc.Asset>(
-      url: string,
-      cb?: (asset: cc.Asset) => T
-    ): Promise<T>;
+    loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb?: (asset: cc.Asset) => T): Promise<T>;
     /**
      * 从远程加载spine动画
      * @param data
@@ -1019,10 +975,10 @@ declare namespace FW {
   };
 
   type EngineManager = {
-    launchScene: string;
     debug: boolean;
     getMemory(): void;
     restart(): void;
+    launchScene: string;
   };
 
   type CCEvent = {
@@ -1178,7 +1134,7 @@ declare namespace FW {
      */
     register(
       state: FW.StateMachineRegisterArgs | FW.StateMachineRegisterArgs[],
-      stateMachineName?: string
+      stateMachineName?: string,
     );
     /**
      * 注销指定状态机的某个状态
@@ -1234,22 +1190,22 @@ declare namespace FW {
         progress: Function;
         easing: Function | String;
         onUpdate: Function;
-      }>
+      }>,
     >(
       duration: number,
       props: ConstructorType<T>,
-      opts?: OPTS
+      opts?: OPTS,
     ): FW.Tween;
     by<
       OPTS extends Partial<{
         progress: Function;
         easing: Function | String;
         onUpdate: Function;
-      }>
+      }>,
     >(
       duration: number,
       props: ConstructorType<T>,
-      opts?: OPTS
+      opts?: OPTS,
     ): FW.Tween;
     set(props: ConstructorType<T>): FW.Tween;
   };
@@ -1489,11 +1445,7 @@ declare namespace FW {
      * @param volume
      * @param loop
      */
-    playMusic(
-      assetProperty: AssetProperty,
-      volume?: number,
-      loop?: boolean
-    ): void;
+    playMusic(assetProperty: AssetProperty, volume?: number, loop?: boolean): void;
     /**
      * 停止背景音乐
      */
@@ -1522,12 +1474,7 @@ declare namespace FW {
      * @param volume
      * @param loop
      */
-    play(
-      path: string,
-      cb?: (id: number) => void,
-      volume?: number,
-      loop?: boolean
-    );
+    play(path: string, cb?: (id: number) => void, volume?: number, loop?: boolean): Promise<number>;
     /**
      * 播放音效
      * @param audio
@@ -1538,8 +1485,8 @@ declare namespace FW {
       audio: cc.AudioClip,
       cb?: (id: number) => void,
       volume?: number,
-      loop?: boolean
-    );
+      loop?: boolean,
+    ): Promise<number>;
     /**
      * 播放音效
      * @param assetProperty
@@ -1550,8 +1497,8 @@ declare namespace FW {
       assetProperty: AssetProperty,
       cb?: (id: number) => void,
       volume?: number,
-      loop?: boolean
-    );
+      loop?: boolean,
+    ): Promise<number>;
     /**
      * 暂停所有
      */
@@ -1572,11 +1519,7 @@ declare namespace FW {
   };
 
   type PerformanceManager = {
-    recordOperationMetric(
-      manager: string,
-      operation: string,
-      duration: number
-    ): void;
+    recordOperationMetric(manager: string, operation: string, duration: number): void;
     getModuleReport(manager: string): PerformanceReport;
     getAllReports(): Map<string, FW.PerformanceReport>;
   };
@@ -1875,7 +1818,7 @@ declare namespace FW {
     abort?: (reason?: any) => void;
     addAbortEventListener?: (
       listener: (this: AbortSignal, ev: Event) => any,
-      options?: boolean | AddEventListenerOptions
+      options?: boolean | AddEventListenerOptions,
     ) => void;
   };
 
@@ -1883,7 +1826,7 @@ declare namespace FW {
     resolve: (value: T | PromiseLike<T>) => void,
     reject: (reason?: any) => void,
     signal: AbortSignal,
-    reason?: any
+    reason?: any,
   ) => void;
 
   type PromiseExecuteOptions = {
@@ -1894,10 +1837,7 @@ declare namespace FW {
     retryCondition?: (error: any, retryCount: number) => boolean;
   };
 
-  type Promise = (
-    resolve: (value: any) => void,
-    reject: (reason?: any) => void
-  ) => void;
+  type Promise = (resolve: (value: any) => void, reject: (reason?: any) => void) => void;
 
   type PromiseResult<T = any> = {
     success: PromiseProxy<T>[];
@@ -1905,7 +1845,7 @@ declare namespace FW {
     cancelled: number[];
   };
 
-  type PromiseStatus = "pending" | "fulfilled" | "rejected" | "cancelled";
+  type PromiseStatus = 'pending' | 'fulfilled' | 'rejected' | 'cancelled';
 
   /**
    * 性能管理器配置
@@ -1953,7 +1893,7 @@ declare namespace FW {
   type PropertyDecorator = (
     $class: Record<string, any>,
     $propertyKey: string | symbol,
-    $descriptorOrInitializer?: any
+    $descriptorOrInitializer?: any,
   ) => void;
 
   declare function timeScale(scale: number);
@@ -2001,10 +1941,7 @@ declare namespace FW {
     public config?: FW.AssetConfig;
     public sender?: FW.Sender;
     public handle?: FW.Handle;
-    public invoke<T>(
-      operation: Promise<T>,
-      operationName: string = "unknown"
-    ): Promise<T>;
+    public invoke<T>(operation: Promise<T>, operationName: string = 'unknown'): Promise<T>;
     public getLogic<T extends FW.Logic = FWLogic>();
     public getData<T extends FW.Data = FWData>();
     public getSender<T extends FW.Sender>();
@@ -2062,10 +1999,10 @@ declare namespace FW {
     }
 
     export class FWTaskStatus {
-      static IDLE = "IDLE";
-      static RUNNING = "RUNNING";
-      static PAUSED = "PAUSED";
-      static COMPLETED = "COMPLETED";
+      static IDLE = 'IDLE';
+      static RUNNING = 'RUNNING';
+      static PAUSED = 'PAUSED';
+      static COMPLETED = 'COMPLETED';
     }
 
     export class FWPriorityOrder {
@@ -2109,17 +2046,17 @@ declare namespace FW {
      * HTTP请求类型
      */
     export class FWHttpRequestType {
-      static GET = "GET";
-      static POST = "POST";
+      static GET = 'GET';
+      static POST = 'POST';
     }
 
     /**
      * 动画机类型
      */
     export class FWAnimationMachineType {
-      static TWEEN = "TWEEN";
-      static SKELETON = "SKELETON";
-      static ANIMATION = "ANIMATION";
+      static TWEEN = 'TWEEN';
+      static SKELETON = 'SKELETON';
+      static ANIMATION = 'ANIMATION';
     }
 
     export class FWScrollViewTemplateType {
@@ -2140,23 +2077,23 @@ declare namespace FW {
     }
 
     export class FWLanguageAssetType {
-      static LABEL = "label";
-      static SPRITE = "sprite";
-      static SKELETON = "skeleton";
+      static LABEL = 'label';
+      static SPRITE = 'sprite';
+      static SKELETON = 'skeleton';
     }
 
     export class FWPromiseStatus {
-      static PENDING = "pending";
-      static FULFILLED = "fulfilled";
-      static REJECTED = "rejected";
-      static CANCELLED = "cancelled";
+      static PENDING = 'pending';
+      static FULFILLED = 'fulfilled';
+      static REJECTED = 'rejected';
+      static CANCELLED = 'cancelled';
     }
 
     export class FWLayerState {
-      static CLOSED = "closed";
-      static OPENING = "opening";
-      static OPENED = "opened";
-      static CLOSING = "closing";
+      static CLOSED = 'closed';
+      static OPENING = 'opening';
+      static OPENED = 'opened';
+      static CLOSING = 'closing';
     }
 
     export class FWAudioType {
@@ -2167,21 +2104,21 @@ declare namespace FW {
   namespace EventDefine {
     export class LanguageEvent {
       /** 语言变更 */
-      static LANGUAGE_CHANGE = "LANGUAGE_CHANGE";
+      static LANGUAGE_CHANGE = 'LANGUAGE_CHANGE';
     }
 
     export class TaskEvent {
-      static START = "START";
-      static PROGRESS = "PROGRESS";
-      static COMPLETE = "COMPLETE";
-      static YIELDED = "YIELDED";
-      static PAUSE = "PAUSE";
-      static RESUME = "RESUME";
-      static FRAME_START = "FRAME_START";
-      static FRAME_END = "FRAME_END";
-      static QUEUE = "QUEUE";
-      static ALL_COMPLETE = "ALL_COMPLETE";
-      static ERROR = "ERROR";
+      static START = 'START';
+      static PROGRESS = 'PROGRESS';
+      static COMPLETE = 'COMPLETE';
+      static YIELDED = 'YIELDED';
+      static PAUSE = 'PAUSE';
+      static RESUME = 'RESUME';
+      static FRAME_START = 'FRAME_START';
+      static FRAME_END = 'FRAME_END';
+      static QUEUE = 'QUEUE';
+      static ALL_COMPLETE = 'ALL_COMPLETE';
+      static ERROR = 'ERROR';
     }
 
     export class SystemEvent {
@@ -2189,8 +2126,8 @@ declare namespace FW {
     }
 
     export class CCEvent {
-      static ON_SHOW = "ON_SHOW";
-      static ON_HIDE = "ON_HIDE";
+      static ON_SHOW = 'ON_SHOW';
+      static ON_HIDE = 'ON_HIDE';
     }
   }
   export const SystemDefine: SystemDefine;
@@ -2244,19 +2181,6 @@ declare namespace FW {
     onDisable?();
     onDestroy?();
     onClose?();
-    cc(
-      target: cc.Node,
-      cb: (event: cc.Event) => void,
-      responseInterval?: number,
-      eventName?: string
-    ): this;
-
-    fw(
-      eventName: string,
-      cb: (event: cc.Event) => void,
-      target?: cc.Node,
-      responseInterval?: number
-    ): this;
 
     /**
      * 查找节点
@@ -2277,7 +2201,7 @@ declare namespace FW {
       referenceNode: cc.Node,
       type?: {
         prototype: T;
-      }
+      },
     ): T;
     registerEvent(args: RegisterArgs): void;
     unRegisterEvent(args: RegisterArgs);