@ives_xxz/framework 1.3.9 → 1.4.0

package/FW.d.ts

@@ -40,6 +40,7 @@ declare namespace FW {
     getComponents<T>(serviceIdentifier?: FW.ServiceIdentifier<T>): T[];
     launchScene(bundleName: string): void;
     register(data: RegisterBundle): void;
+    unRegister(data: RegisterBundle): void;
     getSceneName(bundleName: string): string;
     getDepend(bundleName: string): string[];
     update(dt: number): void;
@@ -47,6 +48,13 @@ declare namespace FW {
     onDestroy(): void;
   };
 
+  type Registry = {
+    /** 注册 */
+    register(): void;
+    /** 注销 */
+    unRegister(): void;
+  };
+
   type LanguageManager = {
     registerLanguagePackageEnum(
       bundleName: string,
@@ -88,7 +96,7 @@ declare namespace FW {
     /** 获取协议Key值 */
     getProtocolKey?(msg: any): string;
     /** 消息发送前回调函数*/
-    onBeforeSendingMessage?(msg: any): string;
+    onBeforeSendingMessage?(msg: any): Promise<FW.SocketMessage>;
     /** 是否是心跳消息 */
     onHeart?(msg: any): Promise<boolean>;
   };
@@ -170,9 +178,9 @@ declare namespace FW {
   };
 
   type SocketMessage = {
-    data:any;
-    error:boolean;
-  }
+    data: any;
+    error: boolean;
+  };
 
   type SocketManager = {
     createSocket(
@@ -1180,9 +1188,9 @@ declare namespace FW {
   };
 
   type SocketMessage = {
-    data:any;
-    error:boolean;
-  }
+    data: any;
+    error: boolean;
+  };
 
   type AnimationManager = {
     initialize(): void;

package/Framework.ts

@@ -2,20 +2,21 @@ 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;
+  private registry: Map<string, new () => FW.Registry>;
   private static instance: Framework;
-  private constructor() {
+  private constructor() {}
+
+  initialize() {
     this.container = new Container({
       defaultScope: 'Singleton',
       autoBindInjectable: true,
     });
+    this.registry = new Map<string, new () => FW.Registry>();
   }
 
-  initialize() {}
-
   public static getInstance() {
     if (!this.instance) {
       this.instance = new Framework();
@@ -89,6 +90,51 @@ class Framework {
     return instances;
   }
 
+  /**
+   * 是否已经注册注册表
+   * @param bundleName
+   * @returns
+   */
+  hasRegistry(bundleName: string) {
+    return this.registry.has(bundleName);
+  }
+
+  /**
+   * 添加进注册表
+   * @param bundleName
+   * @param registry
+   */
+  addRegistry(bundleName: string, registry: new () => FW.Registry) {
+    this.registry.set(bundleName, registry);
+  }
+
+  /**
+   * 获取注册表
+   * @param bundleName
+   */
+  getRegistry(bundleName: string): FW.Registry {
+    return this.container.get(this.registry.get(bundleName));
+  }
+
+  /**
+   * 创建注册表
+   */
+  createRegistry(bundleName: string): FW.Registry {
+    if (!this.registry.has(bundleName)) return;
+    this.container.bind(this.registry.get(bundleName)).toSelf().inSingletonScope();
+    return this.getRegistry(bundleName);
+  }
+
+  /**
+   * 销毁注册表
+   * @param bundleName
+   */
+  destroyRegistry(bundleName: string) {
+    if (this.registry.has(bundleName)) return;
+    this.registry.delete(bundleName);
+    this.container.unbind(this.registry.get(bundleName));
+  }
+
   /**
    * 注册数据
    * @param data

package/entry/FWEntry.ts

@@ -147,17 +147,19 @@ export default class FWEntry implements FW.Entry {
   releaseBundle(bundleName: string) {
     this.resMgr.releaseBundle(bundleName);
     const depend = this.getDepend(bundleName);
-    for(const d of depend){
+    for (const d of depend) {
       this.resMgr.releaseBundle(d);
-      this.evtMgr.dispatch(`${FWEventDefine.SystemEvent.BUNDLE_RELEASE}-${d}`);
     }
-    this.evtMgr.dispatch(`${FWEventDefine.SystemEvent.BUNDLE_RELEASE}-${bundleName}`);
   }
 
   register(data: FW.RegisterBundle) {
     this.map.set(data.bundleName, data);
   }
 
+  unRegister(data: FW.RegisterBundle): void {
+    this.map.has(data?.bundleName) && this.map.delete(data?.bundleName);
+  }
+
   bundleAutoRelease(bundleName: string) {
     const autoRelease = this.map.get(bundleName)?.autoRelease;
     return autoRelease === undefined ? true : autoRelease;

package/manager/FWBundleManager.ts

@@ -1,5 +1,6 @@
 import { FWManager } from './FWManager';
 import FWLog from '../log/FWLog';
+import Framework from '../Framework';
 
 export class FWBundleManager extends FWManager implements FW.BundleManager {
   bundleMap: Map<string, cc.AssetManager.Bundle>;
@@ -47,6 +48,9 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
               reject(err);
             }
             this.bundleMap.set(bundleName, bundle);
+
+            Framework.createRegistry(bundleName)?.register();
+
             resolve(bundle);
           },
         );
@@ -74,6 +78,8 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
     }
     cc.assetManager.removeBundle(this.bundleMap.get(bundleName));
     this.bundleMap.delete(bundleName);
+    Framework.getRegistry(bundleName)?.unRegister();
+    Framework.destroyRegistry(bundleName);
   }
 
   /**

package/package.json

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

package/register/FWRegistry.ts

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

package/register/FWRegistry.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "5da2833a-dc4a-48c5-a865-cd79ab529ddc",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

package/register.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "f339a6ec-8f57-4d08-beb3-9527709af63d",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

package/service/socket/FWSocketSender.ts

@@ -10,7 +10,7 @@ export default class FWSocketSender implements FW.SocketSender {
   onDestroy?();
   sendHeart?();
   onHeart?(msg: any): Promise<boolean>;
-  onBeforeSendingMessage?(msg: any): string;
+  onBeforeSendingMessage?(msg: any): Promise<FW.SocketMessage>;
   getProtocolKey?(msg: any): string;
 
   send(msg: any) {