@ives_xxz/framework 1.0.4 → 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.4",
+  "version": "1.0.6",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": [

package/service/socket/FWSocket.ts

@@ -157,9 +157,7 @@ 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}`,
@@ -241,7 +239,11 @@ export default class FWSocket implements FW.Socket {
   }
 
   private sendMessage(msg: any) {
-    this.socket?.send(this.sender.onBeforeSendingMessage?.(msg) || msg);
+    try {
+      this.socket?.send(this.sender.onBeforeSendingMessage?.(msg) || msg);
+    } catch (e) {
+      this.socket?.send(msg);
+    }
   }
 
   /** socket关闭 */
@@ -266,6 +268,19 @@ export default class FWSocket implements FW.Socket {
       return;
     }
 
+    this.remoteProtocol(msg);
+
+    if (this.isPausedMessageHandle) return;
+
+    this.handle?.onMessage?.(msg);
+  }
+  /** 错误处理 */
+  private async onSocketError(msg: any) {
+    await this.remoteProtocol(msg);
+    this.handle?.onError?.(msg);
+  }
+
+  private async remoteProtocol(msg: any) {
     const protocolKey = await this.handle.getProtocolKey?.(msg);
     if (protocolKey && this.protocolRegistry.has(protocolKey)) {
       const symbolSet = this.protocolRegistry.get(protocolKey);
@@ -282,12 +297,5 @@ export default class FWSocket implements FW.Socket {
         }
       }
     }
-
-    if (this.isPausedMessageHandle) return;
-    this.handle?.onMessage?.(msg);
-  }
-  /** 错误处理 */
-  private onSocketError(msg: any) {
-    this.handle?.onError?.(msg);
   }
 }

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++;
     }