@cc-component/cc-core 1.4.2 → 1.4.4

package/assets/core/lib/net/net/protocol/NetProtocolProtobuf.ts

@@ -6,9 +6,12 @@
  */
 
 import { IProtocolHelper, IRequestProtocol, IResponseProtocol } from "../NetInterface";
+import { createMessageWrapper } from "./MessageWrapper";
 
 /** 自定义通用包头长度 */
-var Head_Length = 8;
+var Head_Length = 4;
+
+var Head_Length_Request = 4;
 
 /** Protobuf.js 编码与解码逻辑 */
 export class NetProtocolProtobuf extends IProtocolHelper {
@@ -33,10 +36,10 @@ export class NetProtocolProtobuf extends IProtocolHelper {
         /** 【开发者自定义通用包头协议修改点】 */
         var id = ireqp.id;
         var cmd = ireqp.cmd;
-        var uid = 0;
-        dv.setUint16(0, id)                                 // 向二进制流中写入唯一编号
-        dv.setUint16(2, cmd);                               // 向二进制流中写入协议编号
-        dv.setUint32(4, uid);                               // 向二进制流中写入玩家编号数据
+        var uid = 0;/*  */
+        dv.setUint32(0, length);
+        // dv.setUint32(4, id)                                 // 向二进制流中写入唯一编号
+        // dv.setUint32(8, cmd);                               // 向二进制流中写入协议编号
         /** 【开发者自定义通用包头协议修改点】 */
 
         // 创建包头二进制数据
@@ -50,18 +53,20 @@ export class NetProtocolProtobuf extends IProtocolHelper {
         ireqp.buffer = buffer;
     }
 
-    decodeCommon(msg: ArrayBuffer): IResponseProtocol {
+    decodeCommonBak(msg: ArrayBuffer): IResponseProtocol {
         let dv = new DataView(msg);
         /** 【开发者自定义通用包头协议修改点】 */
-        var id = dv.getUint16(0);                           // 二进制流中读取唯一编号
-        var cmd = dv.getUint16(2);                          // 二进制流中读取协议编号
-        var code = dv.getUint32(4);                         // 二进制流中读取服务器返回错误码信息
-        /** 【开发者自定义通用包头协议修改点】 */
+        var length = dv.getUint32(0);                           // 二进制流中读取唯一编号
+        var id = dv.getUint32(4);                           // 二进制流中读取唯一编号
+        var cmd = dv.getUint32(8);                          // 二进制流中读取协议编号
+        var code = dv.getUint32(12);                         // 二进制流中读取服务器返回错误码信息
 
+        /** 【开发者自定义通用包头协议修改点】 */
         // 自定义Protobuf协议数据
+        const length_request = Head_Length_Request;
         var bytes: Uint8Array = null!;
-        if (msg.byteLength >= Head_Length) {
-            bytes = new Uint8Array(msg, Head_Length, msg.byteLength - Head_Length)
+        if (msg.byteLength >= length_request) {
+            bytes = new Uint8Array(msg, length_request, msg.byteLength - length_request)
         }
 
         var ipp: IResponseProtocol = {
@@ -81,5 +86,112 @@ export class NetProtocolProtobuf extends IProtocolHelper {
         }
     }
 
+
+
+    decodeCommon(msg: ArrayBuffer): IResponseProtocol {
+        let dv = new DataView(msg);
+        /** 【开发者自定义通用包头协议修改点】 */
+        var length = dv.getUint32(0);                           // 二进制流中读取唯一编号
+        // var id = dv.getUint32(4);                           // 二进制流中读取唯一编号
+        // var cmd = dv.getUint32(8);                          // 二进制流中读取协议编号
+        // var code = dv.getUint32(12);                         // 二进制流中读取服务器返回错误码信息
+
+
+
+        /** 【开发者自定义通用包头协议修改点】 */
+        // 自定义Protobuf协议数据
+        const length_request = Head_Length_Request;
+        var bytes: Uint8Array = null!;
+        if (msg.byteLength >= length_request) {
+            bytes = new Uint8Array(msg, length_request, msg.byteLength - length_request)
+        }
+
+        var ipp: IResponseProtocol = {
+            id: 0,
+            code: 0,
+            cmd: 0
+        }
+        if (bytes) ipp.data = bytes;
+
+        return ipp;
+    }
+
+    encodeCustomPackage(packageObj: any, ireqp: IRequestProtocol): void {
+        //  ireqp.id = this.getRequestId();
+
+        var length = 0;
+
+        // 自定义请求参数用Protobuf Api编码为Uint8Array对象
+        var bytes: Uint8Array = null!;
+        if (ireqp.reqName && ireqp.params) {
+            //console.log("packageObj", ireqp.params);
+            //@ts-ignore
+            var pb = message.GameRequest.encode(ireqp.params);
+            bytes = pb.finish();
+            length = bytes.length;                 // 计算请求包总长度
+        }
+
+        // 自定义包头编码
+        var abHead = new ArrayBuffer(Head_Length);
+        var dv = new DataView(abHead);
+
+        /** 【开发者自定义通用包头协议修改点】 */
+        var id = ireqp.id;
+        var cmd = ireqp.cmd;
+        var uid = 0;/*  */
+        dv.setUint32(0, length);
+        // dv.setUint32(4, id)                                 // 向二进制流中写入唯一编号
+        // dv.setUint32(8, cmd);                               // 向二进制流中写入协议编号
+        /** 【开发者自定义通用包头协议修改点】 */
+
+        // 创建包头二进制数据
+        var u8aBuffer = new Uint8Array(abHead);
+        var buffer = new Uint8Array(length + Head_Length);
+        buffer.set(u8aBuffer)
+
+        // 创建请求参数二进制数据
+        if (bytes) buffer.set(bytes, Head_Length);
+
+        ireqp.buffer = buffer;
+    }
+
+    decodeCustomPackage(packageObj: any, ireqp: IRequestProtocol, iresp: IResponseProtocol): void {
+        if (ireqp.respName) {
+            //@ts-ignore
+            iresp.data = message.GameResponse.decode(iresp.data);
+        }
+    }
+
+
+
     onHearbeat(): void { }
+
+    // data(cmd: number) {
+    //     const game = new message.GameRequest()
+    //     game.cmd = cmd
+    //     game.id = this.getRequestId()
+    //     game.timestamp = Date.now()
+    //     return game
+    // }
+
+    /**
+     * 封装请求参数
+     * @param cmd 命令
+     * @param subCmd 子命令 [认证 心跳 ping 同步 没有]
+     */
+    data(cmd: number, subCmd?: number) {
+        // 使用 createMessageWrapper 创建链式调用
+        // 协议字段改动时无需手动更新
+        const GameRequestWrapper = createMessageWrapper(message.GameRequest);
+        return GameRequestWrapper.builder()
+            .cmd(cmd)
+            .subCmd(subCmd)
+            .id(this.getRequestId())
+            .timestamp(Date.now());
+    }
+}
+
+window["GameRequest"] = new NetProtocolProtobuf();;
+declare global {
+    const GameRequest: NetProtocolProtobuf;
 }

package/assets/core/lib/net/net/protocol/NetProtocolProtobuf.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "8a3b5a19-5297-4ef3-8e94-60cfc572af79",
+  "uuid": "00b03846-5045-4dd8-92ed-28e98179b863",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/core/lib/net/net/protocol.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "42c511aa-1aaa-4a4e-b9aa-2a1cebb10982",
+  "uuid": "3063c4b0-90d0-43f6-bff2-5fd2b11054b5",
   "files": [],
   "subMetas": {},
   "userData": {}

package/index.ts

@@ -15,4 +15,22 @@ export * from './assets/core/home/BaseModuleConfig';
 export * from './assets/core/lib/ecs/ECS';
 export * from './assets/core/lib/logger/ELoggerLevel';
 
+//网络
+export * from './assets/core/lib/net/net/HttpManager';
+export * from './assets/core/lib/net/net/NetInterface';
+export * from './assets/core/lib/net/net/NetManager';
+export * from './assets/core/lib/net/net/NetNode';
+export * from './assets/core/lib/net/net/WebSock';
 
+
+//网络
+export * from './assets/core/lib/net/net/HttpManager';
+export * from './assets/core/lib/net/net/NetInterface';
+export * from './assets/core/lib/net/net/NetManager';
+export * from './assets/core/lib/net/net/NetNode';
+export * from './assets/core/lib/net/net/WebSock';
+
+export * from './assets/core/lib/net/net/protocol/NetProtocolProtobuf';
+export * from './assets/core/lib/net/net/protocol/MessageWrapper';
+export * from './assets/core/lib/net/net/protocol/Builder';
+export * from './assets/core/lib/net/net/protocol/NetProtocolJson';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cc-component/cc-core",
-    "version": "1.4.2",
+    "version": "1.4.4",
     "engine": ">=3.8.6",
     "description": "系统组件添加常用扩展方法",
     "main": "index.ts",