@ives_xxz/framework 1.5.5 → 1.5.8

package/manager/FWPromiseManager.ts

@@ -1,8 +1,11 @@
-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;
 
@@ -18,7 +21,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   /** 创建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();
@@ -30,13 +33,18 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
       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);
@@ -64,11 +72,11 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
           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);
@@ -78,10 +86,14 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
           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);
@@ -90,16 +102,23 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
               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(reason);
             }
           }
         };
         try {
-          executor(wrappedResolve, wrappedReject, abortController.signal, options.reason);
+          executor(
+            wrappedResolve,
+            wrappedReject,
+            abortController.signal,
+            options.reason
+          );
         } catch (error) {
           wrappedReject(error);
         }
@@ -114,16 +133,16 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
       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);
       },
     };
 
@@ -134,7 +153,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   /** 批量执行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();
@@ -148,13 +167,18 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         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);
@@ -182,7 +206,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
           return;
         }
 
-        abortController.signal.addEventListener('abort', onAbort);
+        abortController.signal.addEventListener("abort", onAbort);
 
         const processAll = async () => {
           const result: FW.PromiseResult<T> = {
@@ -199,8 +223,8 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
                   .filter(
                     (id) =>
                       !result.success.some((s) => s.id === id) &&
-                      !result.failed.some((f) => f.id === id),
-                  ),
+                      !result.failed.some((f) => f.id === id)
+                  )
               );
               break;
             }
@@ -209,7 +233,9 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
               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({
@@ -226,7 +252,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         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);
@@ -235,12 +261,13 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
             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(() => {
@@ -250,9 +277,11 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
                 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);
               }
@@ -269,15 +298,15 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
       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);
       },
     };
 
@@ -288,7 +317,10 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   /** 取消指定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;
     }
@@ -313,7 +345,6 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
       promiseProxy.abort(reason);
       cancelled.push(id);
     });
-    FWLog.error(cancelled);
     return cancelled;
   }
 
@@ -340,7 +371,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   /** 获取正在执行的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/FWTaskManager.ts

@@ -22,14 +22,14 @@ export default class FWTaskManager extends FWManager implements FW.TaskManager {
       taskId: options?.taskId || ++this.taskId,
       log: options?.log,
     });
-    this.tasks.set(task.id, task);
+    this.tasks.set(task.id, task); 
     return task;
   }
 
   getTask(taskId: number): FW.Task | undefined {
     return this.tasks.get(taskId);
   }
-
+ 
   stopTask(taskId: number): void {
     this.tasks.get(taskId)?.stop();
     this.tasks.delete(taskId);

package/package.json

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

package/service/FWService.ts

@@ -1,9 +1,7 @@
-import { FrameworkBase } from '../FrameworkBase';
+import { FrameworkBase } from "../FrameworkBase";
 
 export default abstract class FWService extends FrameworkBase {
-  public initialize() {
-    this.dependencies();
-  }
+  public abstract initialize();
   public abstract onDestroy(): void;
 
   protected onRestart() {

package/service/socket/FWSocket.ts

@@ -1,8 +1,6 @@
-import { FWSystemConfig } from '../../config/FWSystemConfig';
-import FWLog from '../../log/FWLog';
-import FWService from '../FWService';
-import FWSocketHandle from './FWSocketHandle';
-import FWSocketSender from './FWSocketSender';
+import { FWSystemConfig } from "../../config/FWSystemConfig";
+import FWLog from "../../log/FWLog";
+import FWService from "../FWService";
 
 /**
  * TODO 犹豫socket没有改版暂时已老的cmd字符串映射方式做,后期优化
@@ -15,9 +13,9 @@ export default class FWSocket extends FWService implements FW.Socket {
   /** socket */
   socket: WebSocket = null;
   /** 消息发送者 */
-  protected socketSender: FWSocketSender;
+  protected socketSender: FW.SocketSender;
   /** 消息处理者 */
-  protected socketHandle: FWSocketHandle;
+  protected socketHandle: FW.SocketHandle;
   /** 重连次数 */
   protected reconnectTimes: number;
   /** 心跳间隔时间 */
@@ -56,7 +54,6 @@ export default class FWSocket extends FWService implements FW.Socket {
   protected messageEvents: { [key: string]: (msg: any) => void };
 
   public initialize(): void {
-    super.initialize();
     this.messageEvents = cc.js.createMap();
     this.protocolContainer = new Map<Symbol, FW.ProtocolPolling>();
     this.protocolRegistry = new Map<string, Set<Symbol>>();
@@ -68,7 +65,7 @@ export default class FWSocket extends FWService implements FW.Socket {
     tag: string,
     socketSender: FW.SocketSender,
     socketHandle: FW.SocketHandle,
-    config: FW.SocketConfig,
+    config: FW.SocketConfig
   ): FW.SocketPromiseProxy {
     try {
       FW.Entry.timeMgr.unSchedule(this);
@@ -112,10 +109,14 @@ export default class FWSocket extends FWService 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,
@@ -129,7 +130,7 @@ export default class FWSocket extends FWService implements FW.Socket {
 
       return this.promiseProxy;
     } catch (e) {
-      FWLog.error('创建socket失败:', e);
+      FWLog.error("创建socket失败:", e);
     }
   }
   /**
@@ -195,7 +196,7 @@ export default class FWSocket extends FWService implements FW.Socket {
     if (force) this.reconnectTimes = 0;
 
     FWLog.debug(
-      `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`,
+      `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`
     );
     if (++this.reconnectTimes >= this.maxReconnectTimes) {
       this.socketHandle?.onTimeout?.();
@@ -206,16 +207,22 @@ export default class FWSocket extends FWService 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) {
@@ -225,7 +232,8 @@ export default class FWSocket extends FWService 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(
@@ -234,7 +242,7 @@ export default class FWSocket extends FWService implements FW.Socket {
             },
             this.protocolPollingTime,
             cc.macro.REPEAT_FOREVER,
-            this,
+            this
           ),
         };
         this.protocolRegistry.set(protocolKey, registry.add(symbol));
@@ -246,7 +254,7 @@ export default class FWSocket extends FWService implements FW.Socket {
 
   /** 连接打开 */
   private onSocketOpen() {
-    FWLog.debug('on open!');
+    FWLog.debug("on open!");
     FW.Entry.timeMgr.unSchedule(this);
     this.reconnectTimes = 0;
     this.sendHeartTimestamp = 0;
@@ -271,7 +279,7 @@ export default class FWSocket extends FWService implements FW.Socket {
       },
       this.heartInternal / 1000,
       cc.macro.REPEAT_FOREVER,
-      this,
+      this
     );
   }
 
@@ -290,17 +298,20 @@ export default class FWSocket extends FWService implements FW.Socket {
 
   /** socket关闭 */
   private onSocketClose() {
-    FWLog.debug('on close!');
+    FWLog.debug("on close!");
     this.socketHandle?.onClose?.();
     FW.Entry.timeMgr.scheduleOnce(
       () => {
-        if (this.getReadyState() == WebSocket.CLOSING || this.getReadyState() == WebSocket.CLOSED) {
-          FWLog.debug('on close!');
+        if (
+          this.getReadyState() == WebSocket.CLOSING ||
+          this.getReadyState() == WebSocket.CLOSED
+        ) {
+          FWLog.debug("on close!");
           this.reconnect();
         }
       },
       this.reconnectInternal,
-      this,
+      this
     );
   }
 

package/service/socket/FWSocketHandle.ts

@@ -1,19 +1,19 @@
-import { injectable } from 'inversify';
+import { injectable } from "inversify";
+import { FrameworkBase } from "../../FrameworkBase";
 @injectable()
-export default abstract class FWSocketHandle implements FW.SocketHandle {
-  constructor() {
-    this.initialize?.();
-  }
-  public readonly entry: FW.Entry = FW.Entry;
-  abstract onMessage(msg: any): void;
+export default abstract class FWSocketHandle
+  extends FrameworkBase
+  implements FW.SocketHandle
+{
   initialize?();
   onDestroy?();
-  onHeart?(msg: any): Promise<boolean>;
   onWeakNetWork?(): void;
-  onClose?(): void;
-  onOpen?(): void;
-  onError?(msg: any): void;
-  onTimeout?(): void;
-  getProtocolKey?(msg: any): string;
-  onBeforeReceivingMessage?(msg: any): Promise<FW.SocketMessage>;
+  abstract onMessage(msg: any): void;
+  abstract onHeart?(msg: any): Promise<boolean>;
+  abstract onClose?(): void;
+  abstract onOpen?(): void;
+  abstract onError?(msg: any): void;
+  abstract onTimeout?(): void;
+  abstract getProtocolKey?(msg: any): string;
+  abstract onBeforeReceivingMessage?(msg: any): Promise<FW.SocketMessage>;
 }

package/service/socket/FWSocketSender.ts

@@ -1,18 +1,17 @@
-import { injectable } from 'inversify';
-import FWLog from '../../log/FWLog';
+import { injectable } from "inversify";
+import FWLog from "../../log/FWLog";
+import { FrameworkBase } from "../../FrameworkBase";
 @injectable()
-export default class FWSocketSender implements FW.SocketSender {
-  constructor() {
-    this.initialize?.();
-  }
-  public readonly entry: FW.Entry = FW.Entry;
+export default abstract class FWSocketSender
+  extends FrameworkBase
+  implements FW.SocketSender
+{
   initialize?();
   onDestroy?();
-  sendHeart?();
-  onHeart?(msg: any): Promise<boolean>;
-  onBeforeSendingMessage?(msg: any): Promise<FW.SocketMessage>;
-  getProtocolKey?(msg: any): string;
-
+  abstract sendHeart();
+  abstract onHeart?(msg: any): Promise<boolean>;
+  abstract onBeforeSendingMessage?(msg: any): Promise<FW.SocketMessage>;
+  abstract getProtocolKey?(msg: any): string;
   send(msg: any) {
     FW.Entry.socketMgr.getSocket()?.send(msg);
   }