@ives_xxz/framework 1.5.1 → 1.5.2

package/FW.d.ts

@@ -296,6 +296,8 @@ declare namespace FW {
 
     send(msg);
 
+    socket: WebSocket;
+
     createSocket(
       address: string,
       tag: string,

package/Framework.ts

@@ -2,7 +2,6 @@ import 'reflect-metadata';
 import { Container, interfaces } from 'inversify';
 import { FWSystemDefine } from './define/FWSystemDefine';
 import FWLog from './log/FWLog';
-import { FWEventDefine } from './define/FWEventDefine';
 
 class Framework {
   private container: Container;

package/FrameworkBase.ts

@@ -1,23 +1,87 @@
 import { injectable } from 'inversify';
 import { FWEventDefine } from './define/FWEventDefine';
 import FWLog from './log/FWLog';
+import { FWSystemDefine } from './define/FWSystemDefine';
+import Framework from './Framework';
+import FWLogic from './logic/FWLogic';
+import FWData from './data/FWData';
 @injectable()
 export abstract class FrameworkBase {
   public readonly entry: FW.Entry = FW.Entry;
+  public logic?: FW.Logic;
+  public data?: FW.Data;
+  public config?: FW.Config;
+  public sender?: FW.SocketSender;
+  public handle?: FW.SocketHandle;
+  protected abstract initialize?(): void;
+  protected abstract onDestroy?(): void;
+  protected onRestart?(): void;
 
   constructor() {
     this.initialize?.();
-
     this.entry.evtMgr.register(FWEventDefine.SystemEvent.SYSTEM_RESTART, this.onRestart, this);
   }
 
-  public abstract initialize?(): void;
-  public abstract onDestroy?(): void;
-
   protected get moduleName(): string {
     return this.constructor.name;
   }
-  protected onRestart?(): void;
+
+  public getLogic<T extends FW.Logic = FWLogic>() {
+    return this.logic as T;
+  }
+
+  public getData<T extends FW.Data = FWData>() {
+    return this.data as T;
+  }
+
+  public getSender<T extends FW.SocketSender>() {
+    return this.sender as T;
+  }
+
+  public getHandle<T extends FW.SocketHandle>() {
+    return this.handle as T;
+  }
+
+  public getConfig<T extends FW.Config>() {
+    return this.config as T;
+  }
+
+  protected dependencies(): void {
+    const bundleName = this.findBundleNameByClassName();
+    if (!bundleName) return;
+
+    const tag = this.getTag();
+
+    if (tag !== FWSystemDefine.FWBindTag.LOGIC) {
+      this.logic = Framework.getComponent<FW.Logic>(
+        `${bundleName}${FWSystemDefine.FWBindTag.LOGIC}`,
+      );
+    }
+
+    if (tag !== FWSystemDefine.FWBindTag.DATA) {
+      this.data = Framework.getComponent<FW.Data>(`${bundleName}${FWSystemDefine.FWBindTag.DATA}`);
+    }
+
+    if (tag !== FWSystemDefine.FWBindTag.CONFIG) {
+      this.config = Framework.getComponent<FW.Config>(
+        `${bundleName}${FWSystemDefine.FWBindTag.CONFIG}`,
+      );
+    }
+
+    if (tag !== FWSystemDefine.FWBindTag.SENDER) {
+      this.sender = Framework.getComponent<FW.SocketSender>(
+        `${bundleName}${FWSystemDefine.FWBindTag.SENDER}`,
+      );
+    }
+
+    if (tag !== FWSystemDefine.FWBindTag.HANDLE) {
+      this.handle = Framework.getComponent<FW.SocketHandle>(
+        `${bundleName}${FWSystemDefine.FWBindTag.HANDLE}`,
+      );
+    }
+
+    FWLog.debug(`[${this.moduleName}] Dependencies setup for bundle: ${bundleName}`);
+  }
 
   protected async invoke<T>(operation: Promise<T>, operationName: string = 'unknown'): Promise<T> {
     const startTime = this.getCurrentTime();
@@ -60,4 +124,37 @@ export abstract class FrameworkBase {
   protected getCurrentTime(): number {
     return Date.now();
   }
+
+  private findBundleNameByClassName(): string | undefined {
+    const registeredComponents = Framework.getRegisteredComponents();
+
+    const bundleNames = Array.from(registeredComponents.keys());
+
+    for (const bundleName of bundleNames) {
+      if (this.doesClassNameContainBundleName(this.moduleName, bundleName)) {
+        return bundleName;
+      }
+    }
+
+    return undefined;
+  }
+
+  private doesClassNameContainBundleName(className: string, bundleName: string): boolean {
+    const bundleNameLower = bundleName.toLowerCase();
+    const classNameLower = className.toLowerCase();
+    return classNameLower.includes(bundleNameLower);
+  }
+
+  private getTag(): FWSystemDefine.FWBindTag {
+    const className = this.moduleName;
+    if (className.endsWith('Logic')) return FWSystemDefine.FWBindTag.LOGIC;
+    if (className.endsWith('Data')) return FWSystemDefine.FWBindTag.DATA;
+    if (className.endsWith('Config') || className.endsWith('AssetConfig'))
+      return FWSystemDefine.FWBindTag.CONFIG;
+    if (className.endsWith('Sender') || className.endsWith('SocketSender'))
+      return FWSystemDefine.FWBindTag.SENDER;
+    if (className.endsWith('Handle') || className.endsWith('SocketHandle'))
+      return FWSystemDefine.FWBindTag.HANDLE;
+    return;
+  }
 }

package/controller/FWLayerController.ts

@@ -34,7 +34,9 @@ export abstract class FWLayerController extends FrameworkBase implements FW.Laye
   onEnable?();
   onDisable?();
   onDestroy?();
-  initialize() {}
+  initialize() {
+    this.dependencies();
+  }
   async onClose?();
 
   async destroy() {

package/data/FWData.ts

@@ -2,6 +2,8 @@ import { injectable } from 'inversify';
 import { FrameworkBase } from '../FrameworkBase';
 @injectable()
 export default class FWData extends FrameworkBase implements FW.Data {
-  public initialize?(): void;
+  public initialize() {
+    this.dependencies();
+  }
   public onDestroy?(): void;
 }

package/logic/FWLogic.ts

@@ -1,7 +1,10 @@
 import { injectable } from 'inversify';
 import { FrameworkBase } from '../FrameworkBase';
+import { FWSystemDefine } from '../define/FWSystemDefine';
 @injectable()
 export default class FWLogic extends FrameworkBase implements FW.Logic {
-  initialize?();
-  onDestroy?();
+  public initialize() {
+    this.dependencies();
+  }
+  public onDestroy?(): void;
 }

package/manager/FWEngineManager.ts

@@ -18,6 +18,7 @@ export default class FWEngineManager extends FWManager implements FW.EngineManag
 
   restart() {
     FW.Entry.evtMgr.dispatch(FWEventDefine.SystemEvent.SYSTEM_RESTART);
+    FW.Entry.initialize();
     Framework.restart();
     cc.game.restart();
   }

package/manager/FWEventManager.ts

@@ -42,7 +42,7 @@ class FWObserver implements FW.Observer {
     args10?: FW.EventManagerArgs,
   ) {
     if (this.pause) return;
-    this.cb.call(
+    this.cb?.call(
       this.target,
       args1,
       args2,

package/package.json

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

package/service/FWService.ts

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

package/service/http/FWHttp.ts

@@ -4,8 +4,8 @@ import FWLog from '../../log/FWLog';
 import FWService from '../FWService';
 
 export default class FWHttp extends FWService {
-  public initialize(): void {}
   public onDestroy(): void {}
+  protected onRestart(): void {}
 
   protected async getMessage(
     url: string,

package/service/socket/FWSocket.ts

@@ -15,9 +15,9 @@ export default class FWSocket extends FWService implements FW.Socket {
   /** socket */
   socket: WebSocket = null;
   /** 消息发送者 */
-  protected sender: FWSocketSender;
+  protected socketSender: FWSocketSender;
   /** 消息处理者 */
-  protected handle: FWSocketHandle;
+  protected socketHandle: FWSocketHandle;
   /** 重连次数 */
   protected reconnectTimes: number;
   /** 心跳间隔时间 */
@@ -56,6 +56,7 @@ 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>>();
@@ -65,8 +66,8 @@ export default class FWSocket extends FWService implements FW.Socket {
   createSocket(
     address: string,
     tag: string,
-    sender: FW.SocketSender,
-    handle: FW.SocketHandle,
+    socketSender: FW.SocketSender,
+    socketHandle: FW.SocketHandle,
     config: FW.SocketConfig,
   ): FW.SocketPromiseProxy {
     try {
@@ -104,8 +105,8 @@ export default class FWSocket extends FWService implements FW.Socket {
       this.socket.onerror = this.onSocketError.bind(this);
       this.socket.onmessage = this.onSocketMessage.bind(this);
 
-      this.sender = sender;
-      this.handle = handle;
+      this.socketSender = socketSender;
+      this.socketHandle = socketHandle;
 
       const defaultConfig = FWSystemConfig.SocketDefaultConfig;
       this.heartInternal = config?.heartInternal || defaultConfig.heartInternal;
@@ -197,7 +198,7 @@ export default class FWSocket extends FWService implements FW.Socket {
       `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`,
     );
     if (++this.reconnectTimes >= this.maxReconnectTimes) {
-      this.handle?.onTimeout?.();
+      this.socketHandle?.onTimeout?.();
       return;
     }
     this.clear();
@@ -205,7 +206,7 @@ export default class FWSocket extends FWService implements FW.Socket {
     this.socket?.close();
     this.socket = null;
 
-    this.createSocket(this.address, this.tag, this.sender, this.handle, {
+    this.createSocket(this.address, this.tag, this.socketSender, this.socketHandle, {
       heartInternal: this.heartInternal,
       heartTimeout: this.heartTimeout,
       heartWeakTime: this.heartWeakTime,
@@ -220,8 +221,8 @@ export default class FWSocket extends FWService implements FW.Socket {
   async send(msg: string) {
     if (this.getReadyState() != WebSocket.OPEN) return;
     if (this.isPausedMessageHandle) return;
-    if (!(await this.sender.onHeart?.(msg))) {
-      const protocolKey = this.sender.getProtocolKey?.(msg);
+    if (!(await this.socketSender.onHeart?.(msg))) {
+      const protocolKey = this.socketSender.getProtocolKey?.(msg);
       if (protocolKey) {
         const symbol = Symbol(protocolKey);
         const registry = this.protocolRegistry.get(protocolKey) || new Set<Symbol>();
@@ -250,7 +251,7 @@ export default class FWSocket extends FWService implements FW.Socket {
     this.reconnectTimes = 0;
     this.sendHeartTimestamp = 0;
     this.receiveTimeStamp = new Date().getTime();
-    this.handle?.onOpen?.();
+    this.socketHandle?.onOpen?.();
     this.heartHandle();
     this.promiseProxy?.resolve(this);
   }
@@ -260,7 +261,7 @@ export default class FWSocket extends FWService implements FW.Socket {
       () => {
         const interval = this.sendHeartTimestamp - this.receiveTimeStamp;
         if (interval >= this.heartWeakTime) {
-          this.handle.onWeakNetWork?.();
+          this.socketHandle.onWeakNetWork?.();
           if (interval >= this.heartTimeout) {
             this.reconnect();
             return;
@@ -276,12 +277,12 @@ export default class FWSocket extends FWService implements FW.Socket {
 
   private sendHeart() {
     this.sendHeartTimestamp = new Date().getTime();
-    this.sender?.sendHeart?.();
+    this.socketSender?.sendHeart?.();
   }
 
   private sendMessage(msg: any) {
     try {
-      this.socket?.send(this.sender.onBeforeSendingMessage?.(msg) || msg);
+      this.socket?.send(this.socketSender.onBeforeSendingMessage?.(msg) || msg);
     } catch (e) {
       this.socket?.send(msg);
     }
@@ -290,7 +291,7 @@ export default class FWSocket extends FWService implements FW.Socket {
   /** socket关闭 */
   private onSocketClose() {
     FWLog.debug('on close!');
-    this.handle?.onClose?.();
+    this.socketHandle?.onClose?.();
     FW.Entry.timeMgr.scheduleOnce(
       () => {
         if (this.getReadyState() == WebSocket.CLOSING || this.getReadyState() == WebSocket.CLOSED) {
@@ -305,14 +306,14 @@ export default class FWSocket extends FWService implements FW.Socket {
 
   /** 消息处理 */
   private async onSocketMessage(originalMsg: any) {
-    const msg = await this.handle.onBeforeReceivingMessage(originalMsg);
+    const msg = await this.socketHandle.onBeforeReceivingMessage(originalMsg);
 
     if (msg.error) {
       this.onSocketError(msg);
       return;
     }
 
-    if (await this.handle?.onHeart?.(msg)) {
+    if (await this.socketHandle?.onHeart?.(msg)) {
       this.receiveTimeStamp = new Date().getTime();
       return;
     }
@@ -321,16 +322,16 @@ export default class FWSocket extends FWService implements FW.Socket {
 
     if (this.isPausedMessageHandle) return;
 
-    this.handle?.onMessage?.(msg);
+    this.socketHandle?.onMessage?.(msg);
   }
   /** 错误处理 */
   private async onSocketError(msg: any) {
     await this.remoteProtocol(msg);
-    this.handle?.onError?.(msg);
+    this.socketHandle?.onError?.(msg);
   }
 
   private async remoteProtocol(msg: any) {
-    const protocolKey = await this.handle.getProtocolKey?.(msg);
+    const protocolKey = await this.socketHandle.getProtocolKey?.(msg);
     if (protocolKey && this.protocolRegistry.has(protocolKey)) {
       const symbolSet = this.protocolRegistry.get(protocolKey);