@ives_xxz/framework 1.0.5 → 1.0.6

package/define/FWEventDefine.ts

@@ -22,5 +22,6 @@ export namespace FWEventDefine {
     FRAME_END = 'FRAME_END',
     QUEUE = 'QUEUE',
     ALL_COMPLETE = 'ALL_COMPLETE',
+    ERROR = 'ERROR',
   }
 }

package/log/FWLog.ts

@@ -26,83 +26,100 @@ class FWLog {
   private constructor() {}
 
   public get debug() {
-    return window.console.log.bind(
-      window.console,
-      `%c[debug]:${FW.Entry.timeMgr.getTime()}`,
-      `color: black; background-color: ${FWLogColorMap.get(
-        FWSystemDefine.FWLogType.DEBUG,
-      )}; font-weight: bold; font-size: 10;`,
-    );
+    if (cc.sys.isBrowser)
+      return window.console.log.bind(
+        window.console,
+        `%c[debug]:${FW.Entry.timeMgr.getTime()}`,
+        `color: black; background-color: ${FWLogColorMap.get(
+          FWSystemDefine.FWLogType.DEBUG,
+        )}; font-weight: bold; font-size: 10;`,
+      );
+
+    return console.log;
   }
 
   get send() {
-    return window.console.log.bind(
-      window.console,
-      `%c[sendMsg]:${FW.Entry.timeMgr.getTime()}`,
-      `color: black; background-color: ${FWLogColorMap.get(
-        FWSystemDefine.FWLogType.SOCKET_SEND,
-      )}; font-weight: bold; font-size: 10;`,
-    );
+    if (cc.sys.isBrowser)
+      return window.console.log.bind(
+        window.console,
+        `%c[sendMsg]:${FW.Entry.timeMgr.getTime()}`,
+        `color: black; background-color: ${FWLogColorMap.get(
+          FWSystemDefine.FWLogType.SOCKET_SEND,
+        )}; font-weight: bold; font-size: 10;`,
+      );
+    return console.log;
   }
 
   get receive() {
-    return window.console.log.bind(
-      window.console,
-      `%c[receiveMsg]:${FW.Entry.timeMgr.getTime()}`,
-      `color: black; background-color: ${FWLogColorMap.get(
-        FWSystemDefine.FWLogType.SOCKET_RECEIVE,
-      )}; font-weight: bold; font-size: 10;`,
-    );
+    if (cc.sys.isBrowser)
+      return window.console.log.bind(
+        window.console,
+        `%c[receiveMsg]:${FW.Entry.timeMgr.getTime()}`,
+        `color: black; background-color: ${FWLogColorMap.get(
+          FWSystemDefine.FWLogType.SOCKET_RECEIVE,
+        )}; font-weight: bold; font-size: 10;`,
+      );
+    return console.log;
   }
 
   get request() {
-    return window.console.log.bind(
-      window.console,
-      `%c[request]:${FW.Entry.timeMgr.getTime()}`,
-      `color: black; background-color: ${FWLogColorMap.get(
-        FWSystemDefine.FWLogType.REQUEST,
-      )}; font-weight: bold; font-size: 10;`,
-    );
+    if (cc.sys.isBrowser)
+      return window.console.log.bind(
+        window.console,
+        `%c[request]:${FW.Entry.timeMgr.getTime()}`,
+        `color: black; background-color: ${FWLogColorMap.get(
+          FWSystemDefine.FWLogType.REQUEST,
+        )}; font-weight: bold; font-size: 10;`,
+      );
+    return console.log;
   }
 
   get response() {
-    return window.console.log.bind(
-      window.console,
-      `%c[response]:${FW.Entry.timeMgr.getTime()}`,
-      `color: black; background-color: ${FWLogColorMap.get(
-        FWSystemDefine.FWLogType.RESPONSE,
-      )}; font-weight: bold; font-size: 10;`,
-    );
+    if (cc.sys.isBrowser)
+      return window.console.log.bind(
+        window.console,
+        `%c[response]:${FW.Entry.timeMgr.getTime()}`,
+        `color: black; background-color: ${FWLogColorMap.get(
+          FWSystemDefine.FWLogType.RESPONSE,
+        )}; font-weight: bold; font-size: 10;`,
+      );
+    return console.log;
   }
 
   get system() {
-    return window.console.log.bind(
-      window.console,
-      `%c[system]:${FW.Entry.timeMgr.getTime()}`,
-      `color: black; background-color: ${FWLogColorMap.get(
-        FWSystemDefine.FWLogType.SYSTEM,
-      )}; font-weight: bold; font-size: 10;`,
-    );
+    if (cc.sys.isBrowser)
+      return window.console.log.bind(
+        window.console,
+        `%c[system]:${FW.Entry.timeMgr.getTime()}`,
+        `color: black; background-color: ${FWLogColorMap.get(
+          FWSystemDefine.FWLogType.SYSTEM,
+        )}; font-weight: bold; font-size: 10;`,
+      );
+    return console.log;
   }
 
   get warn() {
-    return window.console.warn.bind(
-      window.console,
-      `%c[warn]:${FW.Entry.timeMgr.getTime()}`,
-      `color: black; background-color: ${FWLogColorMap.get(
-        FWSystemDefine.FWLogType.WARN,
-      )}; font-weight: bold; font-size: 10;`,
-    );
+    if (cc.sys.isBrowser)
+      return window.console.warn.bind(
+        window.console,
+        `%c[warn]:${FW.Entry.timeMgr.getTime()}`,
+        `color: black; background-color: ${FWLogColorMap.get(
+          FWSystemDefine.FWLogType.WARN,
+        )}; font-weight: bold; font-size: 10;`,
+      );
+    return console.warn;
   }
 
   get error() {
-    return window.console.error.bind(
-      window.console,
-      `%c[error]:${FW.Entry.timeMgr.getTime()}`,
-      `color: black; background-color: ${FWLogColorMap.get(
-        FWSystemDefine.FWLogType.ERROR,
-      )}; font-weight: bold; font-size: 10;`,
-    );
+    if (cc.sys.isBrowser)
+      return window.console.error.bind(
+        window.console,
+        `%c[error]:${FW.Entry.timeMgr.getTime()}`,
+        `color: black; background-color: ${FWLogColorMap.get(
+          FWSystemDefine.FWLogType.ERROR,
+        )}; font-weight: bold; font-size: 10;`,
+      );
+    return console.error;
   }
 }
 

package/manager/FWTaskManager.ts

@@ -7,7 +7,7 @@ export default class FWTaskManager extends FWManager implements FW.TaskManager {
   /**
    * 任务合集
    */
-  private tasks: Map<number, FWTask> = new Map();
+  private tasks: Map<number, FWTask> = new Map<number, FWTask>();
   /**
    * 任务id
    */

package/manager/FWTimeManager.ts

@@ -69,7 +69,7 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     cb: () => void,
     time?: number,
     repeat?: number,
-    target?: Comment | Object | cc.Node,
+    target?: FW.TargetType,
     tag?: string,
   ): FW.TimerSchedule {
     const timer = new FWTimer();

package/package.json

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

package/service/socket/FWSocket.ts

@@ -1,7 +1,7 @@
-import { FWSystemConfig } from "../../config/FWSystemConfig";
-import FWLog from "../../log/FWLog";
-import FWSocketHandle from "./FWSocketHandle";
-import FWSocketSender from "./FWSocketSender";
+import { FWSystemConfig } from '../../config/FWSystemConfig';
+import FWLog from '../../log/FWLog';
+import FWSocketHandle from './FWSocketHandle';
+import FWSocketSender from './FWSocketSender';
 
 /**
  * TODO 犹豫socket没有改版暂时已老的cmd字符串映射方式做,后期优化
@@ -67,7 +67,7 @@ export default class FWSocket implements FW.Socket {
     tag: string,
     sender: FW.SocketSender,
     handle: FW.SocketHandle,
-    config: FW.SocketConfig
+    config: FW.SocketConfig,
   ): FW.SocketPromiseProxy {
     FW.Entry.timeMgr.unSchedule(this);
 
@@ -94,12 +94,9 @@ export default class FWSocket implements FW.Socket {
     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.maxReconnectTimes = config?.maxReconnectTimes || defaultConfig.maxReconnectTimes;
+    this.reconnectInternal = config?.reconnectInternal || defaultConfig.reconnectInternal;
+    this.protocolSymbol = config?.protocolSymbol || defaultConfig.protocolSymbol;
 
     this.promiseProxy = {
       promise: undefined,
@@ -160,12 +157,10 @@ export default class FWSocket implements FW.Socket {
   }
 
   reconnect(force?: boolean) {
-    if (force) {
-      this.reconnectTimes = 0;
-    }
+    if (force) this.reconnectTimes = 0;
 
     FWLog.debug(
-      `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`
+      `socket reconnect : reconnectTimes->${this.reconnectTimes},maxReconnectTimes->${this.maxReconnectTimes}`,
     );
     if (++this.reconnectTimes >= this.maxReconnectTimes) {
       this.handle?.onTimeout?.();
@@ -192,8 +187,7 @@ export default class FWSocket implements FW.Socket {
       const protocolKey = this.sender.getProtocolKey?.(msg);
       if (protocolKey) {
         const symbol = Symbol(protocolKey);
-        const registry =
-          this.protocolRegistry.get(protocolKey) || new Set<Symbol>();
+        const registry = this.protocolRegistry.get(protocolKey) || new Set<Symbol>();
         this.protocolRegistry.set(protocolKey, registry.add(symbol));
         this.protocolContainer.set(symbol, msg);
       }
@@ -203,7 +197,7 @@ export default class FWSocket implements FW.Socket {
 
   /** 连接打开 */
   private onSocketOpen() {
-    FWLog.debug("on open!");
+    FWLog.debug('on open!');
     FW.Entry.timeMgr.unSchedule(this);
     this.reconnectTimes = 0;
     this.sendHeartTimestamp = 0;
@@ -235,7 +229,7 @@ export default class FWSocket implements FW.Socket {
       },
       this.heartInternal / 1000,
       cc.macro.REPEAT_FOREVER,
-      this
+      this,
     );
   }
 
@@ -258,11 +252,11 @@ export default class FWSocket implements FW.Socket {
     FW.Entry.timeMgr.scheduleOnce(
       () => {
         if (!this.isReconnect) return;
-        FWLog.debug("on close!");
+        FWLog.debug('on close!');
         this.reconnect();
       },
       this.reconnectInternal,
-      this
+      this,
     );
   }
   /** 消息处理 */

package/service/socket/FWSocketSender.ts

@@ -9,11 +9,11 @@ export default class FWSocketSender implements FW.SocketSender {
   initialize?();
   onDestroy?();
   sendHeart?();
+  onHeart?(msg: any): Promise<boolean>;
+  onBeforeSendingMessage?(msg: any): string;
+  getProtocolKey?(msg: any): string;
 
   send(msg: any) {
     FW.Entry.socketMgr.getSocket()?.send(msg);
   }
-  onHeart?(msg: any): Promise<boolean>;
-  onBeforeSendingMessage?(msg: any): string;
-  getProtocolKey?(msg: any): string;
 }

package/utils/FWTask.ts

@@ -47,6 +47,7 @@ export default class FWTask implements FW.Task {
       taskId,
     });
     this.taskStartTime = FW.Entry.timeMgr.getTime();
+    FWLog.debug('执行任务开始', this.taskStartTime);
     await this.executeFrame();
     return this;
   }
@@ -118,32 +119,45 @@ export default class FWTask implements FW.Task {
       performance.now() - frameStart < this.frameBudget
     ) {
       const task = this.taskQueue[0];
-
       const taskId = (task as any).taskId || `id-${processed}`;
 
-      const result = await task.next();
-
-      if (result.done) {
+      try {
+        const result = await task.next();
+
+        if (result.done) {
+          this.taskQueue.shift();
+          this.recordEvent({
+            type: FWEventDefine.TaskEvent.COMPLETE,
+            progress: 1,
+            message: '任务完成',
+            taskId,
+          });
+        } else if (result.value) {
+          this.recordEvent({
+            ...result.value,
+            taskId,
+          });
+        }
+
+        frameTasks.push({
+          taskId: taskId,
+          result: result.done ? FWEventDefine.TaskEvent.COMPLETE : FWEventDefine.TaskEvent.YIELDED,
+          message: (result?.value as any)?.message,
+        });
+      } catch (error) {
+        FWLog.error('执行任务出错', error);
         this.taskQueue.shift();
         this.recordEvent({
-          type: FWEventDefine.TaskEvent.COMPLETE,
-          progress: 1,
-          message: '任务完成',
+          type: FWEventDefine.TaskEvent.ERROR,
+          message: `任务执行出错: ${error.message}`,
           taskId,
         });
-      } else if (result.value) {
-        this.recordEvent({
-          ...result.value,
-          taskId,
+        frameTasks.push({
+          taskId: taskId,
+          result: FWEventDefine.TaskEvent.ERROR,
+          message: error.message,
         });
       }
-
-      frameTasks.push({
-        taskId: taskId,
-        result: result.done ? FWEventDefine.TaskEvent.COMPLETE : FWEventDefine.TaskEvent.YIELDED,
-        message: (result?.value as any)?.message,
-      });
-
       processed++;
     }