@cc-component/cc-core 1.2.2 → 1.2.4

package/assets/core/lib/net/net/NetNode.ts

@@ -1,6 +1,5 @@
 import { error } from "cc";
 import { CallbackObject, INetworkTips, IProtocolHelper, IRequestProtocol, IResponseProtocol, ISocket, NetCallFunc, NetData } from "./NetInterface";
-import { Logger } from "../../Logger";
 
 /*
 *   CocosCreator网络节点基类，以及网络相关接口定义
@@ -80,7 +79,7 @@ export class NetNode {
 
     /********************** 网络相关处理 *********************/
     init(socket: ISocket, protocol: IProtocolHelper, networkTips: INetworkTips | null = null, execFunc: ExecuterFunc | null = null) {
-        Logger.logNet(`网络初始化`);
+        Logger.debug(`网络初始化`);
         this._socket = socket;
         this._protocolHelper = protocol;
         this._networkTips = networkTips;
@@ -137,7 +136,7 @@ export class NetNode {
      */
     close(code?: number, reason?: string) {
         if (this._state == NetNodeState.Closed) {
-            Logger.logNet(`网络节点已断开`);
+            Logger.debug(`网络节点已断开`);
             return;
         }
 
@@ -194,7 +193,7 @@ export class NetNode {
 
     /** 网络连接成功 */
     protected onConnected(event: any) {
-        Logger.logNet("网络已连接")
+        Logger.debug("网络已连接")
         this._isSocketOpen = true;
         // 如果设置了鉴权回调，在连接完成后进入鉴权阶段，等待鉴权结束
         if (this._connectedCallback !== null) {
@@ -204,18 +203,18 @@ export class NetNode {
         else {
             this.onChecked();
         }
-        Logger.logNet(`网络已连接当前状态为【${NetNodeStateStrs[this._state]}】`);
+        Logger.debug(`网络已连接当前状态为【${NetNodeStateStrs[this._state]}】`);
     }
 
     /** 连接验证成功，进入工作状态 */
     protected onChecked() {
-        Logger.logNet("连接验证成功，进入工作状态");
+        Logger.debug("连接验证成功，进入工作状态");
         this._state = NetNodeState.Working;
 
         // 重发待发送信息
         var requests = this._requests.concat();
         if (requests.length > 0) {
-            Logger.logNet(`请求【${this._requests.length}】个待发送的信息`);
+            Logger.debug(`请求【${this._requests.length}】个待发送的信息`);
 
             for (var i = 0; i < requests.length;) {
                 let req = requests[i];
@@ -237,7 +236,7 @@ export class NetNode {
 
     /** 接收到一个完整的消息包 */
     protected onMessage(msg: NetData): void {
-        // Logger.logNet(`接受消息状态为【${NetNodeStateStrs[this._state]}】`);
+        // Logger.debug(`接受消息状态为【${NetNodeStateStrs[this._state]}】`);
 
         var iresp: IResponseProtocol = this._protocolHelper.decodeCommon(msg);
 
@@ -249,14 +248,14 @@ export class NetNode {
         var id = iresp.id;
         var cmd = iresp.cmd;
 
-        Logger.logNet(`接受到命令【${cmd}】的消息`);
+        Logger.debug(`接受到命令【${cmd}】的消息`);
 
         // 触发请求队列中的回调函数
         if (this._requests.length > 0) {
             for (let reqIdx in this._requests) {
                 let ireqp = this._requests[reqIdx];
                 if (ireqp.id == id) {
-                    Logger.logNet(`触发请求命令【${cmd}】的回调`);
+                    Logger.debug(`触发请求命令【${cmd}】的回调`);
                     this._protocolHelper.decodeCustom(ireqp, iresp);
                     this._callbackExecuter(ireqp.callback, iresp);
                     this._requests.splice(parseInt(reqIdx), 1);
@@ -269,7 +268,7 @@ export class NetNode {
                 this.updateNetTips(NetTipsType.Requesting, false);
             }
             else {
-                Logger.logNet(`请求队列中还有【${this._requests.length}】个请求在等待`);
+                Logger.debug(`请求队列中还有【${this._requests.length}】个请求在等待`);
             }
         }
 
@@ -277,7 +276,7 @@ export class NetNode {
         let listeners = this._listener[cmd];
         if (null != listeners) {
             for (const ireqp of listeners) {
-                Logger.logNet(`触发监听命令【${cmd}】的回调`);
+                Logger.debug(`触发监听命令【${cmd}】的回调`);
                 this._protocolHelper.decodeCustom(ireqp, iresp);
                 this._callbackExecuter(ireqp.callback, iresp.data);
             }
@@ -297,7 +296,7 @@ export class NetNode {
 
         // 执行断线回调，返回false表示不进行重连
         if (this._disconnectCallback && !this._disconnectCallback()) {
-            Logger.logNet(`断开连接`);
+            Logger.debug(`断开连接`);
             return;
         }
 
@@ -342,7 +341,7 @@ export class NetNode {
 
         for (let i = 0; i < this._requests.length; ++i) {
             if (this._requests[i].cmd == reqProtocol.cmd) {
-                Logger.logNet(`命令【${reqProtocol.cmd}】重复请求`);
+                Logger.debug(`命令【${reqProtocol.cmd}】重复请求`);
                 return false;
             }
         }
@@ -356,7 +355,7 @@ export class NetNode {
             this._socket.send(reqProtocol.buffer!);
         }
 
-        Logger.logNet(`队列命令为【${reqProtocol.cmd}】的请求，等待请求数据的回调`);
+        Logger.debug(`队列命令为【${reqProtocol.cmd}】的请求，等待请求数据的回调`);
 
         // 进入发送缓存列表
         this._requests.push(reqProtocol);
@@ -437,7 +436,7 @@ export class NetNode {
         }
 
         this._receiveMsgTimer = setTimeout(() => {
-            Logger.logNet("接收消息定时器关闭网络连接");
+            Logger.debug("接收消息定时器关闭网络连接");
             this._socket.close();
         }, this._receiveTime);
     }
@@ -448,7 +447,7 @@ export class NetNode {
         }
 
         this._keepAliveTimer = setTimeout(() => {
-            Logger.logNet("网络节点发送心跳信息");
+            Logger.debug("网络节点发送心跳信息");
             if (this._state == NetNodeState.Working) {
                 this._protocolHelper.onHearbeat();
             }

package/assets/core/lib/net/net/WebSock.ts

@@ -4,7 +4,6 @@
  * @LastEditors: dgflash
  * @LastEditTime: 2022-09-09 17:42:19
  */
-import { Logger } from "../../Logger";
 import { ISocket, MessageFunc, NetData } from "./NetInterface";
 
 /**
@@ -29,7 +28,7 @@ export class WebSock implements ISocket {
     connect(options: any) {
         if (this._ws) {
             if (this._ws.readyState === WebSocket.CONNECTING) {
-                Logger.logNet("websocket connecting, wait for a moment...")
+                Logger.debug("websocket connecting, wait for a moment...")
                 return false;
             }
         }

package/assets/core/lib/net/net/custom/NetGameTips.ts

@@ -4,7 +4,6 @@
  * @LastEditTime: 2022-07-22 18:09:52
  */
 
-import { Logger } from "../../../Logger";
 import { INetworkTips } from "../NetInterface";
 import { netChannel } from "./NetChannelManager";
 
@@ -13,10 +12,10 @@ export class NetGameTips implements INetworkTips {
     /** 连接提示 */
     async connectTips(isShow: boolean) {
         if (isShow) {
-            Logger.logNet("游戏服务器正在连接");
+            Logger.debug("游戏服务器正在连接");
         }
         else {
-            Logger.logNet("游戏服务器连接成功");
+            Logger.debug("游戏服务器连接成功");
 
             // 连接成功后向服务器发数据
             // var ulq = new proto.UserLoginReq();
@@ -24,30 +23,30 @@ export class NetGameTips implements INetworkTips {
             // ulq.serverId = 8888;
             // var ret1 = await netChannel.game.req<proto.UserLoginReq>(proto.Cmd.UserLogin, "UserLoginReq", "UserLoginReq", ulq);
             // if (ret1.isSucc) {
-            //     console.log(`收到服务器【${proto.Cmd.UserLogin}】协议返回数据`, ret1.res);          // 处理正常逻辑
+            //     Logger.debug(`收到服务器【${proto.Cmd.UserLogin}】协议返回数据`, ret1.res);          // 处理正常逻辑
             // }
             // else {
-            //     console.log(`收到服务器【${proto.Cmd.UserLogin}】协议返回错误码`, ret1.err);        // 服务器错误码客户端出对应的提示
+            //     Logger.debug(`收到服务器【${proto.Cmd.UserLogin}】协议返回错误码`, ret1.err);        // 服务器错误码客户端出对应的提示
             // }
         }
     }
 
     /** 重连接提示 */
     reconnectTips(): void {
-        console.log("重连接提示");
+        Logger.debug("重连接提示");
     }
 
     /** 请求提示 */
     requestTips(isShow: boolean): void {
         if (isShow) {
-            console.log("有请求处理中");
+            Logger.debug("有请求处理中");
         }
         else {
-            console.log("所有请求结束");
+            Logger.debug("所有请求结束");
         }
     }
 
     disconnectTips(isShow: boolean): void {
-        console.log("断网", isShow);
+        Logger.debug("断网", isShow);
     }
 }

package/assets/core/lib/net/net/custom/NetNodeGame.ts

@@ -17,7 +17,7 @@ class GameProtocol extends NetProtocolProtobuf {
     async onHearbeat() {
         // var ret = await netChannel.game.req(proto.ClientCmd.HEART.toString(), null!, "GameHeartResp");
         // if (ret.isSucc) {
-        //     console.log(ret.res);
+        //     Logger.debug(ret.res);
         // }
     }
 }

package/package.json

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

package/assets/core/lib/Logger.ts

@@ -1,286 +0,0 @@
-import { log } from "cc";
-
-/** 日志类型 */
-export enum LogType {
-    Close = 100,
-    /** 网络层日志 */
-    Net = 1,
-    /** 数据结构层日志 */
-    Model = 2,
-    /** 业务逻辑层日志 */
-    Business = 4,
-    /** 视图层日志 */
-    View = 8,
-    /** 配置日志 */
-    Config = 16,
-    /** 标准日志 */
-    Trace = 32,
-}
-
-var names = {
-    "1": "网络日志",
-    "2": "数据日志",
-    "4": "业务日志",
-    "8": "视图日志",
-    "16": "配置日志",
-    "32": "标准日志",
-}
-
-/** 
- * 日志管理 
- * @example
-oops.log.trace("默认标准日志");
-oops.log.logConfig("灰色配置日志");
-oops.log.logNet("橙色网络日志");
-oops.log.logModel("紫色数据日志");
-oops.log.logBusiness("蓝色业务日志");
-oops.log.logView("绿色视图日志");
- */
-export class Logger {
-    private static tags: number = 0;
-
-    private static init(): void {
-        this.tags =
-            LogType.Net |
-            LogType.Model |
-            LogType.Business |
-            LogType.View |
-            LogType.Config |
-            LogType.Trace;
-
-    }
-
-    /** 
-     * 设置显示的日志类型，默认值为不显示任何类型日志
-     * @example
-oops.log.setTags(LogType.View|LogType.Business)
-     */
-    static setTags(tag: LogType = null!) {
-        if (tag) {
-            this.tags = tag;
-        }
-    }
-
-    /**
-     * 记录开始计时
-     * @param describe  标题描述
-     * @example
-oops.log.start();
-...
-省略N行代码
-...
-oops.log.end();
-     */
-    static start(describe: string = "Time"): void {
-        console.time(describe);
-    }
-
-    /**
-     * 打印范围内时间消耗
-     * @param describe  标题描述
-     * @example
-oops.log.start();
-...
-省略N行代码
-...
-oops.log.end();
-     */
-    static end(describe: string = "Time"): void {
-        console.timeEnd(describe);
-    }
-
-    /**
-     * 打印表格
-     * @param msg       日志消息
-     * @param describe  标题描述
-     * @example
-var object:any = {uid:1000, name:"oops"};
-oops.log.table(object);
-     */
-    static table(msg: any, describe?: string) {
-        if (!this.isOpen(LogType.Trace)) {
-            return;
-        }
-        console.table(msg);
-    }
-
-    /**
-     * 打印标准日志
-     * @param msg       日志消息
-     */
-    static trace(msg: any, color: string = "color:#000000;") {
-        // 标记没有打开，不打印该日志
-        if (!this.isOpen(LogType.Trace)) {
-            return;
-
-        }
-        var backLog = console.log || log;
-        backLog.call(null, "%c%s%s", color, this.getDateString(), msg);
-    }
-
-    /**
-     * 打印网络层日志
-     * @param msg       日志消息
-     * @param describe  标题描述
-     */
-    static logNet(msg: any, describe?: string) {
-        this.orange(LogType.Net, msg, describe);
-    }
-
-    /**
-     * 打印数据层日志
-     * @param msg       日志消息
-     * @param describe  标题描述
-     */
-    static logModel(msg: any, describe?: string) {
-        this.violet(LogType.Model, msg, describe);
-    }
-
-    /**
-     * 打印业务层日志
-     * @param msg       日志消息
-     * @param describe  标题描述
-     */
-    static logBusiness(msg: any, describe?: string) {
-        this.blue(LogType.Business, msg, describe);
-    }
-
-    /**
-     * 打印视图日志
-     * @param msg       日志消息
-     * @param describe  标题描述
-     */
-    static logView(msg: any, describe?: string) {
-        this.green(LogType.View, msg, describe);
-    }
-
-    /** 打印配置日志 */
-    static logConfig(msg: any, describe?: string) {
-        this.gray(LogType.Config, msg, describe);
-    }
-
-    // 橙色
-    private static orange(tag: LogType, msg: any, describe?: string) {
-        this.print(tag, msg, "color:#FFA442;", describe)
-    }
-
-    // 紫色
-    private static violet(tag: LogType, msg: any, describe?: string) {
-        this.print(tag, msg, "color:Violet;", describe)
-    }
-
-    // 蓝色
-    private static blue(tag: LogType, msg: any, describe?: string) {
-        this.print(tag, msg, "color:#3a5fcd;", describe)
-    }
-
-    // 绿色
-    private static green(tag: LogType, msg: any, describe?: string) {
-        this.print(tag, msg, "color:green;", describe)
-    }
-
-    // 灰色
-    private static gray(tag: LogType, msg: any, describe?: string) {
-        this.print(tag, msg, "color:gray;", describe)
-    }
-
-    private static isOpen(tag: LogType): boolean {
-        return (this.tags & tag) != 0;
-    }
-
-    /**
-     * 输出日志
-     * @param tag       日志类型
-     * @param msg       日志内容
-     * @param color     日志文本颜色
-     * @param describe  日志标题描述
-     */
-    private static print(tag: LogType, msg: any, color: string, describe?: string) {
-        // 标记没有打开，不打印该日志
-        if (!this.isOpen(tag)) {
-            return;
-
-        }
-        var backLog = console.log || log;
-        var type = names[tag];
-        if (describe) {
-            backLog.call(null, "%c%s%s%s:%s%o", color, this.getDateString(), '[' + type + ']', this.stack(5), describe, msg);
-        }
-        else {
-            backLog.call(null, "%c%s%s%s:%o", color, this.getDateString(), '[' + type + ']', this.stack(5), msg);
-        }
-    }
-
-    private static stack(index: number): string {
-        var e = new Error();
-        var lines = e.stack!.split("\n");
-        var result: Array<any> = [];
-        lines.forEach((line) => {
-            line = line.substring(7);
-            var lineBreak = line.split(" ");
-            if (lineBreak.length < 2) {
-                result.push(lineBreak[0]);
-            }
-            else {
-                result.push({ [lineBreak[0]]: lineBreak[1] });
-            }
-        });
-
-        var list: string[] = [];
-        var splitList: Array<string> = [];
-        if (index < result.length - 1) {
-            var value: string;
-            for (var a in result[index]) {
-                var splitList = a.split(".");
-
-                if (splitList.length == 2) {
-                    list = splitList.concat();
-                }
-                else {
-                    value = result[index][a];
-                    if (typeof value === "string") {
-                        var start = value!.lastIndexOf("/");
-                        var end = value!.lastIndexOf(".");
-                        if (start > -1 && end > -1) {
-                            var r = value!.substring(start + 1, end);
-                            list.push(r);
-                        }
-                        else {
-                            list.push(value);
-                        }
-                    }
-
-                }
-            }
-        }
-
-        if (list.length == 1) {
-            return "[" + list[0] + ".ts]";
-        }
-        else if (list.length == 2) {
-            return "[" + list[0] + ".ts->" + list[1] + "]";
-        }
-        return "";
-    }
-
-    private static getDateString(): string {
-        let d = new Date();
-        let str = d.getHours().toString();
-        let timeStr = "";
-        timeStr += (str.length == 1 ? "0" + str : str) + ":";
-        str = d.getMinutes().toString();
-        timeStr += (str.length == 1 ? "0" + str : str) + ":";
-        str = d.getSeconds().toString();
-        timeStr += (str.length == 1 ? "0" + str : str) + ":";
-        str = d.getMilliseconds().toString();
-        if (str.length == 1) str = "00" + str;
-        if (str.length == 2) str = "0" + str;
-        timeStr += str;
-
-        timeStr = "[" + timeStr + "]";
-        return timeStr;
-    }
-}
-
-// @ts-ignore
-Logger.init();

package/assets/core/lib/Logger.ts.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "eeda0ce3-1afb-4898-9449-53181c6e4288",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}