@ives_xxz/framework 1.6.5 → 2.0.0

package/manager/FWPromiseManager.ts

@@ -1,5 +1,3 @@
-import { FWSystemDefine } from '../define/FWSystemDefine';
-import FWLog from '../log/FWLog';
 import { FWManager } from './FWManager';
 
 export default class FWPromiseManager extends FWManager implements FW.PromiseManager {
@@ -37,7 +35,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
               (!options.retryCondition || options.retryCondition(timeoutError, retryCount))
             ) {
               retryCount++;
-              FWLog.debug(`Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`);
+              FW.Log.debug(`Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`);
               if (retryInterval > 0) {
                 FW.Entry.timeMgr.scheduleOnce(() => {
                   createPromise().then(resolve, reject);
@@ -53,10 +51,10 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         }
 
         const onAbort = () => {
-          FWLog.debug('promise abort');
+          FW.Log.debug('promise abort');
           timerSchedule?.unSchedule();
-          if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-            promiseProxy.status = FWSystemDefine.FWPromiseStatus.CANCELLED;
+          if (promiseProxy.status === FW.SystemDefine.FWPromiseStatus.PENDING) {
+            promiseProxy.status = FW.SystemDefine.FWPromiseStatus.CANCELLED;
             this.removePromise(id);
           }
         };
@@ -69,7 +67,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         abortController.signal.addEventListener('abort', onAbort);
 
         const wrappedResolve = (value: T | PromiseLike<T>) => {
-          promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
+          promiseProxy.status = FW.SystemDefine.FWPromiseStatus.FULFILLED;
           abortController.signal.removeEventListener('abort', onAbort);
           this.removePromise(id);
           timerSchedule?.unSchedule();
@@ -83,7 +81,10 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
             (!options.retryCondition || options.retryCondition(reason, retryCount))
           ) {
             retryCount++;
-            FWLog.debug(`Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`, reason);
+            FW.Log.debug(
+              `Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`,
+              reason,
+            );
             if (retryInterval > 0) {
               FW.Entry.timeMgr.scheduleOnce(() => {
                 createPromise().then(resolve, reject);
@@ -108,11 +109,11 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
     const promiseProxy: FW.PromiseProxy<T> = {
       id,
       promise,
-      status: FWSystemDefine.FWPromiseStatus.PENDING,
+      status: FW.SystemDefine.FWPromiseStatus.PENDING,
       abortController,
       abort: (reason?: any) => {
-        if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-          FWLog.debug(reason || 'promise cancelled');
+        if (promiseProxy.status === FW.SystemDefine.FWPromiseStatus.PENDING) {
+          FW.Log.debug(reason || 'promise cancelled');
           abortController.abort(reason);
         }
       },
@@ -151,7 +152,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
               (!options.retryCondition || options.retryCondition(timeoutError, retryCount))
             ) {
               retryCount++;
-              FWLog.debug(`All Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`);
+              FW.Log.debug(`All Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`);
               if (retryInterval > 0) {
                 FW.Entry.timeMgr.scheduleOnce(() => {
                   createPromise().then(resolve, reject);
@@ -168,8 +169,8 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
 
         const onAbort = () => {
           timerSchedule?.unSchedule();
-          if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-            promiseProxy.status = FWSystemDefine.FWPromiseStatus.CANCELLED;
+          if (promiseProxy.status === FW.SystemDefine.FWPromiseStatus.PENDING) {
+            promiseProxy.status = FW.SystemDefine.FWPromiseStatus.CANCELLED;
             this.removePromise(id);
           }
         };
@@ -206,7 +207,7 @@ 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 === FW.SystemDefine.FWPromiseStatus.CANCELLED) {
                 result.cancelled.push(promiseProxy.id);
               } else {
                 result.failed.push({
@@ -222,7 +223,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
 
         processAll()
           .then((result) => {
-            promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
+            promiseProxy.status = FW.SystemDefine.FWPromiseStatus.FULFILLED;
             abortController.signal.removeEventListener('abort', onAbort);
             this.removePromise(id);
             timerSchedule?.unSchedule();
@@ -235,7 +236,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
               (!options.retryCondition || options.retryCondition(error, retryCount))
             ) {
               retryCount++;
-              FWLog.debug(
+              FW.Log.debug(
                 `All Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`,
                 error,
               );
@@ -247,8 +248,8 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
                 createPromise().then(resolve, reject);
               }
             } else {
-              if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-                promiseProxy.status = FWSystemDefine.FWPromiseStatus.REJECTED;
+              if (promiseProxy.status === FW.SystemDefine.FWPromiseStatus.PENDING) {
+                promiseProxy.status = FW.SystemDefine.FWPromiseStatus.REJECTED;
                 abortController.signal.removeEventListener('abort', onAbort);
                 this.removePromise(id);
                 reject(error);
@@ -262,11 +263,11 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
     const promiseProxy: FW.PromiseProxy<FW.PromiseResult<T>> = {
       id,
       promise,
-      status: FWSystemDefine.FWPromiseStatus.PENDING,
+      status: FW.SystemDefine.FWPromiseStatus.PENDING,
       abortController,
       abort: (reason?: any) => {
-        if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-          FWLog.debug(reason || 'all promise cancelled');
+        if (promiseProxy.status === FW.SystemDefine.FWPromiseStatus.PENDING) {
+          FW.Log.debug(reason || 'all promise cancelled');
           abortController.abort(reason);
         }
       },
@@ -285,7 +286,7 @@ 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 === FW.SystemDefine.FWPromiseStatus.PENDING) {
       promiseProxy.abort(reason);
       return true;
     }
@@ -314,14 +315,14 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   }
 
   /** 获取Promise状态 */
-  public getStatus(id: number): FWSystemDefine.FWPromiseStatus | null {
+  public getStatus(id: number): FW.SystemDefine.FWPromiseStatus | null {
     const promiseProxy = this.promiseRegistry.get(id);
     return promiseProxy ? promiseProxy.status : null;
   }
 
   /** 获取所有Promise状态 */
-  public getAllStatus(): Map<number, FWSystemDefine.FWPromiseStatus> {
-    const statusMap = new Map<number, FWSystemDefine.FWPromiseStatus>();
+  public getAllStatus(): Map<number, FW.SystemDefine.FWPromiseStatus> {
+    const statusMap = new Map<number, FW.SystemDefine.FWPromiseStatus>();
     this.promiseRegistry.forEach((promiseProxy, id) => {
       statusMap.set(id, promiseProxy.status);
     });
@@ -336,7 +337,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 === FW.SystemDefine.FWPromiseStatus.PENDING,
     ).length;
   }
 
@@ -345,7 +346,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
     const completedIds: number[] = [];
 
     this.promiseRegistry.forEach((promiseProxy, id) => {
-      if (promiseProxy.status !== FWSystemDefine.FWPromiseStatus.PENDING) {
+      if (promiseProxy.status !== FW.SystemDefine.FWPromiseStatus.PENDING) {
         completedIds.push(id);
       }
     });

package/manager/FWResManager.ts

@@ -1,7 +1,5 @@
 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';
@@ -34,7 +32,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
               await this.loadBundle(depend);
 
               const config = FW.Entry.getComponent<FWAssetConfig>(
-                `${depend}${FWSystemDefine.FWBindTag.CONFIG}`,
+                `${depend}${FW.SystemDefine.FWBindTag.CONFIG}`,
               );
               if (!config) continue;
               const preLoad = config.preLoad;

package/manager/FWSocketManager.ts

@@ -1,7 +1,4 @@
-import FWLog from '../log/FWLog';
 import FWSocket from '../service/socket/FWSocket';
-import FWSocketHandle from '../service/socket/FWSocketHandle';
-import FWSocketSender from '../service/socket/FWSocketSender';
 import { FWManager } from './FWManager';
 
 /**
@@ -13,7 +10,7 @@ export default class FWSocketManager extends FWManager implements FW.SocketManag
   public initialize(): void {
     this.socketMap = new Map<string, FW.Socket>();
   }
-  public onDestroy(): void { }
+  public onDestroy(): void {}
 
   /**
    * 创建一个socket
@@ -82,7 +79,7 @@ export default class FWSocketManager extends FWManager implements FW.SocketManag
    * @returns
    */
   closeSocket(fs: FWSocket) {
-    FWLog.debug('主动关闭socket!');
+    FW.Log.debug('主动关闭socket!');
     const tag = fs.getTag();
     fs.socket.close();
     fs.socket = null;

package/manager/FWStateManager.ts

@@ -1,6 +1,4 @@
 import { FWManager } from './FWManager';
-import Framework from '../Framework';
-import FWLog from '../log/FWLog';
 import FWStateMachine from '../machine/FWStateMachine';
 
 export class FWStateManager extends FWManager implements FW.StateManager {
@@ -23,7 +21,7 @@ export class FWStateManager extends FWManager implements FW.StateManager {
     stateMachineName = stateMachineName || FW.Entry.bundleName;
 
     if (!this.stateMap.has(stateMachineName)) {
-      FWLog.warn('stateMachine is not register!');
+      FW.Log.warn('stateMachine is not register!');
       return;
     }
     const machine = this.stateMap.get(stateMachineName);
@@ -42,7 +40,7 @@ export class FWStateManager extends FWManager implements FW.StateManager {
   unRegister(stateType: number, stateMachineName?: string) {
     stateMachineName = stateMachineName || FW.Entry.bundleName;
     if (!this.stateMap.has(stateMachineName)) {
-      FWLog.warn('stateMachine is not register!');
+      FW.Log.warn('stateMachine is not register!');
       return;
     }
     this.stateMap.get(stateMachineName).unRegister(stateType);

package/manager/FWTimeManager.ts

@@ -1,5 +1,4 @@
-import FWLog from "../log/FWLog";
-import { FWManager } from "./FWManager";
+import { FWManager } from './FWManager';
 
 class FWTimer implements FW.Timer {
   constructor() {
@@ -70,13 +69,13 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     time?: number,
     repeat?: number,
     target?: FW.TargetType,
-    tag?: string
+    tag?: string,
   ): FW.TimerSchedule {
     const timer = new FWTimer();
 
     timer.internal = time || 0;
     timer.repeat = repeat || 0;
-    timer.tag = tag || "";
+    timer.tag = tag || '';
     timer.target = target || FW.Entry.scene;
     timer.cb = cb;
     timer.id = this.uniqueId++;
@@ -135,11 +134,11 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     let target: any;
 
     for (const arg of arguments) {
-      if (typeof arg === "function") {
+      if (typeof arg === 'function') {
         cb = arg;
-      } else if (typeof arg === "number") {
+      } else if (typeof arg === 'number') {
         time = arg;
-      } else if (typeof arg === "string") {
+      } else if (typeof arg === 'string') {
         tag = arg;
       } else if (arg) {
         target = arg;
@@ -193,9 +192,9 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     const args = arguments;
     if (!args || args?.length == 0) return;
 
-    if (typeof args[0] == "string") {
+    if (typeof args[0] == 'string') {
       this.removeTimerFromTag(args[0]);
-    } else if (typeof args[0] == "number") {
+    } else if (typeof args[0] == 'number') {
       this.removeTimerFromId(args[0]);
     } else {
       this.removeTimerFromTarget(args[0]);
@@ -224,9 +223,9 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
   pauseSchedule() {
     const args = arguments;
     if (!args || args?.length == 0) return;
-    if (typeof args[0] == "string") {
+    if (typeof args[0] == 'string') {
       this.pauseTimerFromTag(args[0], true);
-    } else if (typeof args[0] == "number") {
+    } else if (typeof args[0] == 'number') {
       this.pauseTimerFromId(args[0], true);
     } else {
       this.pauseTimerFromTarget(args[0], true);
@@ -254,9 +253,9 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
   resumeSchedule() {
     const args = arguments;
     if (!args || args?.length == 0) return;
-    if (typeof args[0] == "string") {
+    if (typeof args[0] == 'string') {
       this.pauseTimerFromTag(args[0], false);
-    } else if (typeof args[0] == "number") {
+    } else if (typeof args[0] == 'number') {
       this.pauseTimerFromId(args[0], false);
     } else {
       this.pauseTimerFromTarget(args[0], false);
@@ -297,7 +296,7 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     var target: FW.TargetType;
     var tag: string;
     if (args.length == 2) {
-      if (typeof args[1] == "string") {
+      if (typeof args[1] == 'string') {
         tag = args[1];
       } else {
         target = args[1];
@@ -311,7 +310,7 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     timer.cb = cb;
     timer.executeTime = 0;
     timer.internal = 0;
-    timer.tag = tag || "";
+    timer.tag = tag || '';
     timer.target = target || undefined;
     timer.pause = false;
     timer.repeat = cc.macro.REPEAT_FOREVER;

package/manager/FWUiManager.ts

@@ -1,5 +1,4 @@
 import { searchChild } from '../expand/FWDecorator';
-import FWLog from '../log/FWLog';
 import { FWManager } from './FWManager';
 
 export default class FWUiManager extends FWManager implements FW.UiManager {
@@ -71,14 +70,14 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
 
   find(path: string, rootNode: cc.Node): cc.Node | null {
     if (!cc.isValid(rootNode)) {
-      FWLog.error(`查找节点失败: ${path}, 根节点无效`);
+      FW.Log.error(`查找节点失败: ${path}, 根节点无效`);
       return null;
     }
 
     const node = searchChild(rootNode, path);
 
     if (!cc.isValid(node)) {
-      FWLog.warn(`未找到节点: ${path}`);
+      FW.Log.warn(`未找到节点: ${path}`);
       return null;
     }
 
@@ -113,7 +112,7 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
 
   register(args: FW.RegisterArgs) {
     if (!args.target) {
-      FWLog.error('注册事件失败,目标为空!');
+      FW.Log.error('注册事件失败,目标为空!');
       return;
     }
 

package/package.json

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

package/{register → registry}/FWRegistry.ts

@@ -1,7 +1,7 @@
 import { injectable } from 'inversify';
 
 @injectable()
-export default abstract class FWRegistry implements FW.Registry {
+export abstract class FWRegistry implements FW.Registry {
   /**
    * bundle名字
    */
@@ -9,15 +9,15 @@ export default abstract class FWRegistry implements FW.Registry {
   /**
    * 是否自动释放
    */
-  protected readonly autoRelease?: boolean;
+  readonly autoRelease?: boolean;
   /**
    * 场景名字
    */
-  protected readonly sceneName?: string;
+  readonly sceneName?: string;
   /**
    * 依赖
    */
-  protected readonly depend?: string[];
+  readonly depend?: string[];
   /**
    * 逻辑
    */
@@ -29,15 +29,15 @@ export default abstract class FWRegistry implements FW.Registry {
   /**
    * 资源配置
    */
-  readonly config?: FW.Newable<FW.Config>;
+  readonly config?: FW.Newable<FW.AssetConfig>;
   /**
    * socket发送者
    */
-  readonly sender?: FW.Newable<FW.SocketSender>;
+  readonly sender?: FW.Newable<FW.Sender>;
   /**
    * socket处理者
    */
-  readonly handle?: FW.Newable<FW.SocketHandle>;
+  readonly handle?: FW.Newable<FW.Handle>;
 
   register(): void {
     this.bundleEnabled(true);
@@ -46,7 +46,7 @@ export default abstract class FWRegistry implements FW.Registry {
     this.bundleEnabled(false);
   }
 
-  private bundleEnabled(enable?: boolean) {
+  bundleEnabled(enable?: boolean) {
     const frameworkInvoke = enable ? FW.Framework.register : FW.Framework.unRegister;
     const entryInvoke = enable ? FW.Entry.register : FW.Entry.unRegister;
     frameworkInvoke.bind(FW.Framework)({

package/service/http/FWHttp.ts

@@ -1,6 +1,4 @@
 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 {
@@ -14,7 +12,7 @@ export default class FWHttp extends FWService {
     cb?: (response: string) => void,
     tag?: string,
   ): Promise<string> {
-    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.GET);
+    return this.process(url, params, cb, tag, FW.SystemDefine.FWHttpRequestType.GET);
   }
 
   protected async postMessage(
@@ -23,7 +21,7 @@ export default class FWHttp extends FWService {
     cb?: (response: string) => void,
     tag?: string,
   ): Promise<string> {
-    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.POST);
+    return this.process(url, params, cb, tag, FW.SystemDefine.FWHttpRequestType.POST);
   }
 
   private async process(
@@ -31,7 +29,7 @@ export default class FWHttp extends FWService {
     params: string,
     cb: (response: any) => void,
     tag: string,
-    type: FWSystemDefine.FWHttpRequestType,
+    type: FW.SystemDefine.FWHttpRequestType,
   ): Promise<string> {
     let xhr: XMLHttpRequest;
 
@@ -47,7 +45,7 @@ export default class FWHttp extends FWService {
         };
 
         xhr.onerror = (err: any) => {
-          FWLog.error(err);
+          FW.Log.error(err);
           this.onError?.(err);
           reject(`http request error:${err}`);
         };
@@ -57,7 +55,7 @@ export default class FWHttp extends FWService {
           reject(`http request timeout!`);
         };
 
-        xhr.open(type, url, true);
+        xhr.open(type as string, url, true);
         xhr.send(params);
       },
       {

package/service/socket/FWSocket.ts

@@ -1,6 +1,5 @@
-import { FWSystemConfig } from "../../config/FWSystemConfig";
-import FWLog from "../../log/FWLog";
-import FWService from "../FWService";
+import { FWSystemConfig } from '../../config/FWSystemConfig';
+import FWService from '../FWService';
 
 /**
  * TODO 犹豫socket没有改版暂时已老的cmd字符串映射方式做,后期优化
@@ -65,7 +64,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);
@@ -109,14 +108,10 @@ 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,
@@ -130,7 +125,7 @@ export default class FWSocket extends FWService implements FW.Socket {
 
       return this.promiseProxy;
     } catch (e) {
-      FWLog.error("创建socket失败:", e);
+      FW.Log.error('创建socket失败:', e);
     }
   }
   /**
@@ -195,8 +190,8 @@ export default class FWSocket extends FWService implements FW.Socket {
   reconnect(force?: boolean) {
     if (force) this.reconnectTimes = 0;
 
-    FWLog.debug(
-      `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`
+    FW.Log.debug(
+      `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`,
     );
     if (++this.reconnectTimes >= this.maxReconnectTimes) {
       this.socketHandle?.onTimeout?.();
@@ -207,22 +202,16 @@ 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) {
@@ -232,8 +221,7 @@ 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(
@@ -242,7 +230,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));
@@ -254,7 +242,7 @@ export default class FWSocket extends FWService implements FW.Socket {
 
   /** 连接打开 */
   private onSocketOpen() {
-    FWLog.debug("on open!");
+    FW.Log.debug('on open!');
     FW.Entry.timeMgr.unSchedule(this);
     this.reconnectTimes = 0;
     this.sendHeartTimestamp = 0;
@@ -279,7 +267,7 @@ export default class FWSocket extends FWService implements FW.Socket {
       },
       this.heartInternal / 1000,
       cc.macro.REPEAT_FOREVER,
-      this
+      this,
     );
   }
 
@@ -298,20 +286,17 @@ export default class FWSocket extends FWService implements FW.Socket {
 
   /** socket关闭 */
   private onSocketClose() {
-    FWLog.debug("on close!");
+    FW.Log.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) {
+          FW.Log.debug('on close!');
           this.reconnect();
         }
       },
       this.reconnectInternal,
-      this
+      this,
     );
   }
 

package/service/socket/FWSocketHandle.ts

@@ -1,10 +1,7 @@
-import { injectable } from "inversify";
-import { FrameworkBase } from "../../FrameworkBase";
+import { injectable } from 'inversify';
+import { FrameworkBase } from '../../FrameworkBase';
 @injectable()
-export default abstract class FWSocketHandle
-  extends FrameworkBase
-  implements FW.SocketHandle
-{
+export abstract class FWSocketHandle extends FrameworkBase {
   initialize?();
   onDestroy?();
   onWeakNetWork?(): void;

package/service/socket/FWSocketSender.ts

@@ -1,15 +1,11 @@
-import { injectable } from "inversify";
-import FWLog from "../../log/FWLog";
-import { FrameworkBase } from "../../FrameworkBase";
+import { injectable } from 'inversify';
+import { FrameworkBase } from '../../FrameworkBase';
 @injectable()
-export default abstract class FWSocketSender
-  extends FrameworkBase
-  implements FW.SocketSender
-{
+export abstract class FWSocketSender extends FrameworkBase {
   initialize?();
   onDestroy?();
-  abstract sendHeart();
-  abstract onHeart?(msg: any): Promise<boolean>;
+  sendHeart?();
+  onHeart?(msg: any): Promise<boolean>;
   abstract onBeforeSendingMessage?(msg: any): Promise<FW.SocketMessage>;
   abstract getProtocolKey?(msg: any): string;
   send(msg: any) {