@ives_xxz/framework 1.4.15 → 1.5.0

package/manager/FWPromiseManager.ts

@@ -5,16 +5,14 @@ import { FWManager } from './FWManager';
 export default class FWPromiseManager extends FWManager implements FW.PromiseManager {
   private promiseRegistry: Map<number, FW.PromiseProxy>;
   private uniqueId: number = 0;
-  private timerSchedule: FW.TimerSchedule;
 
   public initialize(): void {
     this.promiseRegistry = new Map<number, FW.PromiseProxy>();
   }
 
   public onDestroy(): void {
-    this.cancelAll('Manager destroyed');
+    this.cancelAll();
     this.promiseRegistry.clear();
-    this.promiseRegistry = null;
   }
 
   /** 创建Promise执行器 */
@@ -24,15 +22,14 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   ): FW.PromiseProxy<T> {
     const id = this.uniqueId++;
     const abortController = new AbortController();
-    let retryCount = 0;
     const maxRetryTimes = options.retryCount || 0;
     const retryInterval = options.retryInterval || 0;
-
+    let retryCount = 0;
+    let timerSchedule: FW.TimerSchedule;
     const createPromise = (): Promise<T> => {
       return new Promise<T>((resolve, reject) => {
         if (options.timeout && options.timeout > 0) {
-          this.timerSchedule?.unSchedule();
-          this.timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
+          timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
             const timeoutError = new Error(`Promise ${id} timeout after ${options.timeout} s`);
             if (
               retryCount < maxRetryTimes &&
@@ -49,13 +46,13 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
               }
             } else {
               abortController.abort(timeoutError.message);
-              this.timerSchedule?.unSchedule();
+              timerSchedule?.unSchedule();
             }
           }, options.timeout);
         }
 
         const onAbort = () => {
-          this.timerSchedule?.unSchedule();
+          timerSchedule?.unSchedule();
           if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
             promiseProxy.status = FWSystemDefine.FWPromiseStatus.CANCELLED;
             this.removePromise(id);
@@ -73,12 +70,12 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
           promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
           abortController.signal.removeEventListener('abort', onAbort);
           this.removePromise(id);
-          this.timerSchedule?.unSchedule();
+          timerSchedule?.unSchedule();
           resolve(value);
         };
 
         const wrappedReject = (reason?: any) => {
-          this.timerSchedule?.unSchedule();
+          timerSchedule?.unSchedule();
           if (
             retryCount < maxRetryTimes &&
             (!options.retryCondition || options.retryCondition(reason, retryCount))
@@ -102,7 +99,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
           }
         };
         try {
-          executor(wrappedResolve, wrappedReject, abortController.signal);
+          executor(wrappedResolve, wrappedReject, abortController.signal, options.reason);
         } catch (error) {
           wrappedReject(error);
         }
@@ -121,6 +118,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
           abortController.abort(reason);
         }
       },
+
       addAbortEventListener: (
         listener: (this: AbortSignal, ev: Event) => any,
         options?: boolean | AddEventListenerOptions,
@@ -140,15 +138,16 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   ): FW.PromiseProxy<FW.PromiseResult<T>> {
     const id = this.uniqueId++;
     const abortController = new AbortController();
-    let retryCount = 0;
     const maxRetryTimes = options.retryCount || 0;
     const retryInterval = options.retryInterval || 0;
+    let timerSchedule: FW.TimerSchedule;
+    let retryCount = 0;
 
     const createPromise = (): Promise<FW.PromiseResult<T>> => {
       return new Promise<FW.PromiseResult<T>>((resolve, reject) => {
         if (options.timeout && options.timeout > 0) {
-          this.timerSchedule?.unSchedule();
-          this.timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
+          timerSchedule?.unSchedule();
+          timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
             const timeoutError = new Error(`All Promise ${id} timeout after ${options.timeout} s`);
             if (
               retryCount < maxRetryTimes &&
@@ -165,13 +164,13 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
               }
             } else {
               abortController.abort(timeoutError.message);
-              this.timerSchedule?.unSchedule();
+              timerSchedule?.unSchedule();
             }
           }, options.timeout);
         }
 
         const onAbort = () => {
-          this.timerSchedule?.unSchedule();
+          timerSchedule?.unSchedule();
           if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
             promiseProxy.status = FWSystemDefine.FWPromiseStatus.CANCELLED;
             this.removePromise(id);
@@ -193,7 +192,6 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
           };
 
           for (const promiseProxy of promises) {
-            // 检查是否已取消
             if (abortController.signal.aborted) {
               result.cancelled.push(
                 ...promises
@@ -230,11 +228,11 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
             promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
             abortController.signal.removeEventListener('abort', onAbort);
             this.removePromise(id);
-            this.timerSchedule?.unSchedule();
+            timerSchedule?.unSchedule();
             resolve(result);
           })
           .catch((error) => {
-            this.timerSchedule?.unSchedule();
+            timerSchedule?.unSchedule();
             if (
               retryCount < maxRetryTimes &&
               (!options.retryCondition || options.retryCondition(error, retryCount))
@@ -312,11 +310,10 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   public cancelAll(reason?: any): number[] {
     const cancelled: number[] = [];
     this.promiseRegistry.forEach((promiseProxy, id) => {
-      if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-        promiseProxy.abort(reason);
-        cancelled.push(id);
-      }
+      promiseProxy.abort(reason);
+      cancelled.push(id);
     });
+    FWLog.error(cancelled);
     return cancelled;
   }
 

package/manager/FWResManager.ts

@@ -75,7 +75,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @returns
    */
   async loadAssetData<T extends cc.Asset>(assetProperty: FW.AssetProperty) {
-    return this.dataProcessing<T>(await this.assetMgr.load(assetProperty));
+    return this.process<T>(await this.assetMgr.load(assetProperty));
   }
   /**
    * 加载资源
@@ -84,7 +84,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    */
   async loadAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty): Promise<T> {
     const res = await this.assetMgr.load(assetProperty);
-    return this.dataProcessing<T>(res).asset as T;
+    return this.process<T>(res).asset as T;
   }
 
   /**
@@ -102,7 +102,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @returns
    */
   getAssetData<T extends cc.Asset>(assetProperty: FW.AssetProperty) {
-    return this.dataProcessing<T>(this.assetMgr.get(assetProperty));
+    return this.process<T>(this.assetMgr.get(assetProperty));
   }
   /**
    * 获取资源
@@ -110,7 +110,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @returns
    */
   getAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty): T {
-    return this.dataProcessing<T>(this.assetMgr.get(assetProperty)).asset as T;
+    return this.process<T>(this.assetMgr.get(assetProperty)).asset as T;
   }
 
   /**
@@ -141,7 +141,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param res
    * @returns
    */
-  private dataProcessing<T extends cc.Asset>(res: FW.AssetData) {
+  private process<T extends cc.Asset>(res: FW.AssetData) {
     let asset: cc.Asset;
 
     if (res.asset instanceof cc.Texture2D) {

package/manager/FWTaskManager.ts

@@ -3,7 +3,9 @@ import { FWManager } from './FWManager';
 
 export default class FWTaskManager extends FWManager implements FW.TaskManager {
   public initialize(): void {}
-  public onDestroy(): void {}
+  public onDestroy(): void {
+    this.tasks.forEach((task) => task.stop());
+  }
   /**
    * 任务合集
    */

package/manager/FWTimeManager.ts

@@ -133,46 +133,18 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     let cb: () => void;
     let tag: string;
     let target: any;
-    if (arguments.length == 1) {
-      if (typeof arguments[0] === 'number') time = arguments[0];
-      else if (typeof arguments[0] === 'function') cb = arguments[0];
-    } else if (arguments.length == 2) {
-      if (typeof arguments[0] === 'number') {
-        time = arguments[0];
-        if (typeof arguments[1] === 'string') {
-          tag = arguments[1];
-        } else if (typeof arguments[1] === 'object') {
-          cb = arguments[1];
-        } else {
-          target = arguments[1];
-        }
-      } else if (typeof arguments[0] === 'function') {
-        cb = arguments[0];
-        if (typeof arguments[1] === 'string') {
-          tag = arguments[1];
-        } else if (typeof arguments[1] === 'number') {
-          time = arguments[1];
-        } else {
-          target = arguments[1];
-        }
-      }
-    } else if (arguments.length == 3) {
-      if (typeof arguments[0] === 'number') {
-        time = arguments[0];
-        cb = arguments[1];
-        if (typeof arguments[2] === 'string') {
-          tag = arguments[2];
-        } else {
-          target = arguments[2];
-        }
-      } else if (typeof arguments[0] === 'function') {
-        cb = arguments[0];
-        time = arguments[1];
-        if (typeof arguments[2] === 'string') {
-          tag = arguments[2];
-        } else {
-          target = arguments[2];
-        }
+
+    const config: any = {};
+
+    for (const arg of arguments) {
+      if (typeof arg === 'function') {
+        cb = arg;
+      } else if (typeof arg === 'number') {
+        time = arg;
+      } else if (typeof arg === 'string') {
+        tag = arg;
+      } else if (arg) {
+        target = arg;
       }
     }
 

package/package.json

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

package/service/FWService.ts

@@ -1,54 +1,10 @@
-import FWLog from '../log/FWLog';
+import { FrameworkBase } from '../FrameworkBase';
 
-export default abstract class FWService {
-  constructor() {
-    this.initialize();
-  }
+export default abstract class FWService extends FrameworkBase {
   public abstract initialize(): void;
-  public abstract destroy(): void;
-  public abstract readonly serviceName: string;
-
-  protected async invoke<T>(operation: Promise<T>, operationName: string = 'unknown'): Promise<T> {
-    const startTime = this.getCurrentTime();
-
-    try {
-      const result = await operation;
-      const duration = this.getCurrentTime() - startTime;
-
-      this.recordPerformanceMetric(operationName, duration);
-      return result;
-    } catch (error) {
-      this.handleError(operationName, error);
-      return undefined;
-    }
-  }
-
-  private recordPerformanceMetric(operationName: string, duration: number): void {
-    if (FW.Entry.performanceMgr) {
-      FW.Entry.performanceMgr.recordOperationMetric(this.serviceName, operationName, duration);
-    }
-
-    if (FW.Entry.engineMgr.debug) {
-      const log = duration > 1000 ? FWLog.warn : FWLog.debug;
-      log(`Operation ${operationName} took ${duration}ms`);
-    }
-  }
-
-  protected getCurrentTime(): number {
-    return Date.now();
-  }
-
-  protected handleError(operation: string, error: any): void {
-    const errorInfo = {
-      manager: this.serviceName,
-      operation,
-      error: error?.message || error,
-      stack: error?.stack,
-    };
-
-    FWLog.error(`Manager error in ${this.serviceName}.${operation}:`, errorInfo);
-
-    if (FW.Entry.engineMgr.debug) {
-    }
+  public abstract onDestroy(): void;
+  protected onRestart() {
+    this.onDestroy();
+    this.initialize();
   }
 }

package/service/http/FWHttp.ts

@@ -1,11 +1,11 @@
+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 serviceName: string = 'HTTP';
   public initialize(): void {}
-  public destroy(): void {}
+  public onDestroy(): void {}
 
   protected async getMessage(
     url: string,
@@ -13,7 +13,7 @@ export default class FWHttp extends FWService {
     cb?: (response: string) => void,
     tag?: string,
   ): Promise<string> {
-    return this.dataProcessing(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.GET);
+    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.GET);
   }
 
   protected async postMessage(
@@ -22,10 +22,10 @@ export default class FWHttp extends FWService {
     cb?: (response: string) => void,
     tag?: string,
   ): Promise<string> {
-    return this.dataProcessing(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.POST);
+    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.POST);
   }
 
-  private async dataProcessing(
+  private async process(
     url: string,
     params: string,
     cb: (response: any) => void,
@@ -33,40 +33,45 @@ export default class FWHttp extends FWService {
     type: FWSystemDefine.FWHttpRequestType,
   ): Promise<string> {
     let xhr: XMLHttpRequest;
-    return await this.invoke(
-      FW.Entry.promiseMgr.execute<string>(
-        (resolve, reject) => {
-          xhr = new XMLHttpRequest();
-          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}`);
-          };
+    const promiseProxy: FW.PromiseProxy<string> = FW.Entry.promiseMgr.execute<string>(
+      (resolve, reject, signal, reason) => {
+        xhr = new XMLHttpRequest();
 
-          xhr.ontimeout = () => {
-            this.onTimeout();
-            reject(`http request timeout!`);
-          };
+        xhr.onreadystatechange = () => {
+          if (xhr.readyState == 4 && xhr.status === 200) {
+            cb?.(xhr.response);
+            resolve(xhr.response);
+          }
+        };
 
-          xhr.open(type, url, true);
-          xhr.send(params);
-        },
-        {
-          retryCount: 3,
-          retryCondition(error, retryCount) {
-            return xhr.readyState != 4 || (xhr.status !== 200 && retryCount < 3);
-          },
+        xhr.onerror = (err: any) => {
+          FWLog.error(err);
+          this.onError?.(err);
+          reject(`http request error:${err}`);
+        };
+
+        xhr.ontimeout = () => {
+          this.onTimeout?.();
+          reject(`http request timeout!`);
+        };
+
+        xhr.open(type, url, true);
+        xhr.send(params);
+      },
+      {
+        ...FWSystemConfig.PromiseConfig.http,
+        retryCondition(error, retryCount) {
+          return xhr.readyState != 4 || (xhr.status !== 200 && retryCount < 3);
         },
-      ).promise,
-      tag ? `http request ->${tag}` : '',
+      },
     );
+
+    promiseProxy.addAbortEventListener(() => {
+      xhr.abort();
+    });
+
+    return await this.invoke(promiseProxy.promise, tag ? `http request ->${tag}` : '');
   }
 
   onError?(err: any);

package/service/socket/FWSocket.ts

@@ -1,12 +1,13 @@
 import { FWSystemConfig } from '../../config/FWSystemConfig';
 import FWLog from '../../log/FWLog';
+import FWService from '../FWService';
 import FWSocketHandle from './FWSocketHandle';
 import FWSocketSender from './FWSocketSender';
 
 /**
  * TODO 犹豫socket没有改版暂时已老的cmd字符串映射方式做,后期优化
  */
-export default class FWSocket implements FW.Socket {
+export default class FWSocket extends FWService implements FW.Socket {
   /** 发送心跳时间抽 */
   private sendHeartTimestamp: number;
   /** 接收心跳时间戳 */
@@ -54,10 +55,6 @@ export default class FWSocket implements FW.Socket {
    */
   protected messageEvents: { [key: string]: (msg: any) => void };
 
-  constructor() {
-    this.initialize();
-  }
-
   public initialize(): void {
     this.messageEvents = cc.js.createMap();
     this.protocolContainer = new Map<Symbol, FW.ProtocolPolling>();
@@ -102,8 +99,6 @@ export default class FWSocket implements FW.Socket {
         }
       }
 
-
-
       this.socket.onopen = this.onSocketOpen.bind(this);
       this.socket.onclose = this.onSocketClose.bind(this);
       this.socket.onerror = this.onSocketError.bind(this);
@@ -147,6 +142,7 @@ export default class FWSocket implements FW.Socket {
 
   public onDestroy(): void {
     this.messageEvents = cc.js.createMap();
+    this.socket.close();
     this.socket = null;
   }
 
@@ -310,9 +306,9 @@ export default class FWSocket implements FW.Socket {
   /** 消息处理 */
   private async onSocketMessage(originalMsg: any) {
     const msg = await this.handle.onBeforeReceivingMessage(originalMsg);
-    
-    if(msg.error){
-      this.onSocketError(msg)
+
+    if (msg.error) {
+      this.onSocketError(msg);
       return;
     }
 
@@ -320,7 +316,7 @@ export default class FWSocket implements FW.Socket {
       this.receiveTimeStamp = new Date().getTime();
       return;
     }
-    
+
     this.remoteProtocol(msg);
 
     if (this.isPausedMessageHandle) return;