@ives_xxz/framework 1.0.2 → 1.0.4

package/manager/FWObjectManager.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "a490a2b7-8487-4fe1-a3ce-fbb473a39530",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "a490a2b7-8487-4fe1-a3ce-fbb473a39530",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/manager/FWResManager.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "fcb5dbc8-82ed-473e-bc81-c3b9b11a6ac6",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "fcb5dbc8-82ed-473e-bc81-c3b9b11a6ac6",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/manager/FWSocketManager.ts

@@ -25,22 +25,17 @@ export default class FWSocketManager extends FWManager implements FW.SocketManag
   async createSocket(
     tag: string,
     address: string,
-    sender: FWSocketSender,
-    handle: FWSocketHandle,
-    config: {
-      heartTimeout: number;
-      heartWeakTime: number;
-      heartInternal: number;
-      maxReconnectTimes: number;
-      reconnectInternal: number;
-    },
+    sender: FW.SocketSender,
+    handle: FW.SocketHandle,
+    config: FW.SocketConfig,
   ) {
     const proxy = new FWSocket().createSocket(address, tag, sender, handle, {
-      heartTimeout: config?.heartTimeout,
-      heartWeakTime: config?.heartWeakTime,
-      heartInternal: config?.heartInternal,
-      maxReconnectTimes: config?.maxReconnectTimes,
-      reconnectInternal: config?.reconnectInternal,
+      heartTimeout: config.heartTimeout,
+      heartWeakTime: config.heartWeakTime,
+      heartInternal: config.heartInternal,
+      maxReconnectTimes: config.maxReconnectTimes,
+      reconnectInternal: config.reconnectInternal,
+      protocolSymbol: config.protocolSymbol,
     });
     this.socketMap.set(tag, proxy.socket);
 

package/manager/FWSocketManager.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "0100af82-a0d2-4359-b2b7-3a384f150ce1",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "0100af82-a0d2-4359-b2b7-3a384f150ce1",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/manager/FWStateManager.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "23fb111f-4904-4335-9433-f24147af47c9",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "23fb111f-4904-4335-9433-f24147af47c9",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/manager/FWTaskManager.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "cd43dfbe-fd5d-4f6b-94de-01bc5c0a8368",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "cd43dfbe-fd5d-4f6b-94de-01bc5c0a8368",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/manager/FWTimeManager.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "ef42e04a-1f21-4d92-ac3c-916af646e1f8",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "ef42e04a-1f21-4d92-ac3c-916af646e1f8",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/manager/FWUiManager.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "d33acc3d-71a7-4fe4-86fb-a939985a4d1f",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "d33acc3d-71a7-4fe4-86fb-a939985a4d1f",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/manager.meta

@@ -1,13 +1,13 @@
-{
-  "ver": "1.1.3",
-  "uuid": "d591f127-6089-4134-a3fd-24c263480211",
-  "importer": "folder",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
+{
+  "ver": "1.1.3",
+  "uuid": "d591f127-6089-4134-a3fd-24c263480211",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "1.0.2",
-  "description": "cocoscreator 2.4.9 mvc framework",
+  "version": "1.0.4",
+  "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": [
     "123456"

package/package.json.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.2",
+  "uuid": "beb7dd18-de47-4e37-8a42-7798786baba5",
+  "importer": "json",
+  "subMetas": {}
+}

package/scene/FWScene.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "9d78ed88-e34f-455b-9d0f-73978b74107a",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "9d78ed88-e34f-455b-9d0f-73978b74107a",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/scene.meta

@@ -1,13 +1,13 @@
-{
-  "ver": "1.1.3",
-  "uuid": "f8d1e84d-5adb-468b-9dcf-c84901b90bce",
-  "importer": "folder",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
+{
+  "ver": "1.1.3",
+  "uuid": "f8d1e84d-5adb-468b-9dcf-c84901b90bce",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
 }

package/service/FWService.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "02e35f42-98e4-45c5-8139-e90f226d3782",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "02e35f42-98e4-45c5-8139-e90f226d3782",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/service/http/FWHttp.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "f0ad42b9-3784-4643-9175-bffd9d96570a",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "f0ad42b9-3784-4643-9175-bffd9d96570a",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/service/http.meta

@@ -1,13 +1,13 @@
-{
-  "ver": "1.1.3",
-  "uuid": "8af24859-b6c3-4ead-8cf8-386570d860a8",
-  "importer": "folder",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
+{
+  "ver": "1.1.3",
+  "uuid": "8af24859-b6c3-4ead-8cf8-386570d860a8",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
 }

package/service/socket/FWSocket.ts

@@ -1,4 +1,4 @@
-import Framework from '../../Framework';
+import { FWSystemConfig } from '../../config/FWSystemConfig';
 import FWLog from '../../log/FWLog';
 import FWSocketHandle from './FWSocketHandle';
 import FWSocketSender from './FWSocketSender';
@@ -37,8 +37,15 @@ export default class FWSocket implements FW.Socket {
   protected isPausedMessageHandle: boolean = false;
   /** 是否正在重连 */
   private isReconnect: boolean = false;
-
+  /** 代理 */
   private promiseProxy: FW.SocketPromiseProxy;
+  /** 协议符号 */
+  private protocolSymbol: FW.Symbol;
+  /** 协议注册表 */
+  private protocolRegistry: Map<string, Set<Symbol>>;
+  /** 协议符号容器 */
+  private protocolContainer: Map<Symbol, string>;
+
   /**
    *  消息事件列表
    * TODO 目前没有消息协议号,暂时无用
@@ -51,24 +58,29 @@ export default class FWSocket implements FW.Socket {
 
   public initialize(): void {
     this.messageEvents = cc.js.createMap();
+    this.protocolContainer = new Map<Symbol, string>();
+    this.protocolRegistry = new Map<string, Set<Symbol>>();
   }
 
   createSocket(
     address: string,
     tag: string,
-    sender: FWSocketSender,
-    handle: FWSocketHandle,
-    config: {
-      heartInternal: number;
-      heartTimeout: number;
-      heartWeakTime: number;
-      maxReconnectTimes: number;
-      reconnectInternal: number;
-    },
+    sender: FW.SocketSender,
+    handle: FW.SocketHandle,
+    config: FW.SocketConfig,
   ): FW.SocketPromiseProxy {
     FW.Entry.timeMgr.unSchedule(this);
+
     this.tag = tag;
     this.address = address;
+
+    this.messageEvents = {};
+    this.protocolContainer.clear();
+    this.protocolRegistry.clear();
+    this.isReconnect = true;
+    this.sendHeartTimestamp = 0;
+    this.receiveTimeStamp = new Date().getTime();
+
     this.socket = new WebSocket(address);
     this.socket.onopen = this.onSocketOpen.bind(this);
     this.socket.onclose = this.onSocketClose.bind(this);
@@ -78,15 +90,19 @@ export default class FWSocket implements FW.Socket {
     this.sender = sender;
     this.handle = handle;
 
-    this.heartInternal = config?.heartInternal;
-    this.heartTimeout = config?.heartTimeout;
-    this.heartWeakTime = config?.heartWeakTime;
-    this.maxReconnectTimes = config?.maxReconnectTimes;
+    const defaultConfig = FWSystemConfig.SocketDefaultConfig;
+    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.promiseProxy = {
       promise: undefined,
       socket: this,
     };
+
     new Promise<FWSocket>((resolve) => {
       this.promiseProxy.promise = resolve;
     });
@@ -140,7 +156,11 @@ export default class FWSocket implements FW.Socket {
     this.isPausedMessageHandle = false;
   }
 
-  private reconnect() {
+  reconnect(force?: boolean) {
+    if (force) {
+      this.reconnectTimes = 0;
+    }
+
     FWLog.debug(
       `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`,
     );
@@ -148,10 +168,7 @@ export default class FWSocket implements FW.Socket {
       this.handle?.onTimeout?.();
       return;
     }
-    FW.Entry.timeMgr.unSchedule(this);
-    this.isReconnect = true;
-    this.sendHeartTimestamp = 0;
-    this.receiveTimeStamp = 0;
+
     this.socket.close();
     this.socket = null;
 
@@ -161,16 +178,32 @@ export default class FWSocket implements FW.Socket {
       heartWeakTime: this.heartWeakTime,
       maxReconnectTimes: this.maxReconnectTimes,
       reconnectInternal: this.reconnectInternal,
+      protocolSymbol: this.protocolSymbol,
     });
   }
 
+  async send(msg: any) {
+    if (this.getReadyState() != WebSocket.OPEN) return;
+    if (this.isPausedMessageHandle) return;
+    if (!(await this.sender.onHeart?.(msg))) {
+      const protocolKey = this.sender.getProtocolKey?.(msg);
+      if (protocolKey) {
+        const symbol = Symbol(protocolKey);
+        const registry = this.protocolRegistry.get(protocolKey) || new Set<Symbol>();
+        this.protocolRegistry.set(protocolKey, registry.add(symbol));
+        this.protocolContainer.set(symbol, msg);
+      }
+    }
+    this.sendMessage(msg);
+  }
+
   /** 连接打开 */
   private onSocketOpen() {
     FWLog.debug('on open!');
     FW.Entry.timeMgr.unSchedule(this);
     this.reconnectTimes = 0;
     this.sendHeartTimestamp = 0;
-    this.receiveTimeStamp = 0;
+    this.receiveTimeStamp = new Date().getTime();
     this.isReconnect = false;
     this.handle?.onOpen?.();
     this.heartHandle();
@@ -189,6 +222,12 @@ export default class FWSocket implements FW.Socket {
           }
         }
         this.sendHeart();
+
+        if (this.protocolContainer.size > 0) {
+          this.protocolContainer?.forEach((msg) => {
+            this.sendMessage(msg);
+          });
+        }
       },
       this.heartInternal / 1000,
       cc.macro.REPEAT_FOREVER,
@@ -201,10 +240,8 @@ export default class FWSocket implements FW.Socket {
     this.sender?.sendHeart?.();
   }
 
-  send(msg: any) {
-    if (this.getReadyState() != WebSocket.OPEN) return;
-    if (this.isPausedMessageHandle) return;
-    this.socket?.send(msg);
+  private sendMessage(msg: any) {
+    this.socket?.send(this.sender.onBeforeSendingMessage?.(msg) || msg);
   }
 
   /** socket关闭 */
@@ -216,18 +253,38 @@ export default class FWSocket implements FW.Socket {
         FWLog.debug('on close!');
         this.reconnect();
       },
-      3,
+      this.reconnectInternal,
       this,
     );
   }
   /** 消息处理 */
-  private async onSocketMessage(msg: any) {
+  private async onSocketMessage(originalMsg: any) {
+    const msg = await this.handle.onBeforeReceivingMessage(originalMsg);
+
     if (await this.handle?.onHeart?.(msg)) {
       this.receiveTimeStamp = new Date().getTime();
-    } else {
-      if (this.isPausedMessageHandle) return;
-      this.handle?.onMessage?.(msg);
+      return;
     }
+
+    const protocolKey = await this.handle.getProtocolKey?.(msg);
+    if (protocolKey && this.protocolRegistry.has(protocolKey)) {
+      const symbolSet = this.protocolRegistry.get(protocolKey);
+
+      if (symbolSet && symbolSet.size > 0) {
+        const [symbol] = symbolSet;
+
+        symbolSet.delete(symbol);
+
+        this.protocolContainer.delete(symbol);
+
+        if (symbolSet.size === 0) {
+          this.protocolRegistry.delete(protocolKey);
+        }
+      }
+    }
+
+    if (this.isPausedMessageHandle) return;
+    this.handle?.onMessage?.(msg);
   }
   /** 错误处理 */
   private onSocketError(msg: any) {

package/service/socket/FWSocket.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "6bff4169-033b-4745-842d-fdb124b9ac6c",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "6bff4169-033b-4745-842d-fdb124b9ac6c",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/service/socket/FWSocketHandle.ts

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

package/service/socket/FWSocketHandle.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "2e34eee4-ca3e-4ffd-9ff5-3fab23ea4f76",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "2e34eee4-ca3e-4ffd-9ff5-3fab23ea4f76",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }

package/service/socket/FWSocketSender.ts

@@ -1,7 +1,7 @@
 import { injectable } from 'inversify';
 import FWLog from '../../log/FWLog';
 @injectable()
-export default class FWSocketSender implements FW.Sender {
+export default class FWSocketSender implements FW.SocketSender {
   constructor() {
     this.initialize?.();
   }
@@ -13,4 +13,7 @@ export default class FWSocketSender implements FW.Sender {
   send(msg: any) {
     FW.Entry.socketMgr.getSocket()?.send(msg);
   }
+  onHeart?(msg: any): Promise<boolean>;
+  onBeforeSendingMessage?(msg: any): string;
+  getProtocolKey?(msg: any): string;
 }

package/service/socket/FWSocketSender.ts.meta

@@ -1,10 +1,10 @@
-{
-  "ver": "1.1.0",
-  "uuid": "5ef12e31-ee4f-443b-9de1-9075ecdde103",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
+{
+  "ver": "1.1.0",
+  "uuid": "5ef12e31-ee4f-443b-9de1-9075ecdde103",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
 }