diff --git a/assets/Script/network/NetInterface.ts b/assets/Script/network/NetInterface.ts index 67249a4..71ee142 100644 --- a/assets/Script/network/NetInterface.ts +++ b/assets/Script/network/NetInterface.ts @@ -21,13 +21,13 @@ export interface RequestObject { rspObject: CallbackObject, // 等待响应的回调对象 } -// 协议对象 +// 协议辅助接口 export interface IProtocolHelper { getHeadlen(): number; // 返回包头长度 getHearbeat(): NetData; // 返回一个心跳包 getPackageLen(msg: NetData): number; // 返回整个包的长度 - checkHead(msg: NetData): boolean; // 检查数据头部是否合法 - checkCmd(msg: NetData): number; // 获取协议类型或id + checkPackage(msg: NetData): boolean; // 检查包数据是否合法 + getPackageId(msg: NetData): number; // 返回包的id或协议类型 } // 默认字符串协议对象 @@ -42,26 +42,27 @@ export class DefStringProtocol implements IProtocolHelper { { return msg.toString().length; } - checkHead(msg: NetData): boolean { + checkPackage(msg: NetData): boolean { return true; } - checkCmd(msg: NetData): number { + getPackageId(msg: NetData): number { return 0; } } -// Socket对象 +// Socket接口 export interface ISocket { - onConnected: (event) => void; - onMessage: (msg: NetData) => void; - onError: (event) => void; - onClosed: (event) => void; - connect(options: any): boolean; - send(buffer: NetData): boolean; - close(code?: number, reason?: string); + onConnected: (event) => void; // 连接回调 + onMessage: (msg: NetData) => void; // 消息回调 + onError: (event) => void; // 错误回调 + onClosed: (event) => void; // 关闭回调 + + connect(options: any); // 连接接口 + send(buffer: NetData); // 数据发送接口 + close(code?: number, reason?: string); // 关闭接口 } -// 网络提示对象 +// 网络提示接口 export interface INetworkTips { connectTips(isShow: boolean): void; reconnectTips(isShow: boolean): void; diff --git a/assets/Script/network/NetNode.ts b/assets/Script/network/NetNode.ts index 2ee51b1..78e4947 100644 --- a/assets/Script/network/NetNode.ts +++ b/assets/Script/network/NetNode.ts @@ -153,7 +153,7 @@ export class NetNode { protected onMessage(msg): void { // console.log(`NetNode onMessage status = ` + this._state); // 进行头部的校验(实际包长与头部长度是否匹配) - if (!this._protocolHelper.checkHead(msg)) { + if (!this._protocolHelper.checkPackage(msg)) { console.error(`NetNode checkHead Error`); return; } @@ -162,7 +162,7 @@ export class NetNode { // 重置心跳包发送器 this.resetHearbeatTimer(); // 触发消息执行 - let rspCmd = this._protocolHelper.checkCmd(msg); + let rspCmd = this._protocolHelper.getPackageId(msg); console.log(`NetNode onMessage rspCmd = ` + rspCmd); // 优先触发request队列 if (this._requests.length > 0) {