🐛 修复日志记录问题与暂时移除Firefox包 #449

Author: CodFrm

scripts/pack.js

@@ -99,13 +99,13 @@ chrome
   })
   .pipe(fs.createWriteStream(`./dist/${package.name}-v${package.version}-chrome.zip`));
 
-firefox
-  .generateNodeStream({
-    type: "nodebuffer",
-    streamFiles: true,
-    compression: "DEFLATE",
-  })
-  .pipe(fs.createWriteStream(`./dist/${package.name}-v${package.version}-firefox.zip`));
+// firefox
+//   .generateNodeStream({
+//     type: "nodebuffer",
+//     streamFiles: true,
+//     compression: "DEFLATE",
+//   })
+//   .pipe(fs.createWriteStream(`./dist/${package.name}-v${package.version}-firefox.zip`));
 
 // 处理crx
 const crx = new ChromeExtension({

src/app/logger/logger.ts

@@ -1,7 +1,8 @@
 import dayjs from "dayjs";
 import LoggerCore, { LogLabel, LogLevel } from "./core";
 
-const levelNumber = {
+const levelNumber: { [key in LogLevel]: number } = {
+  none: 0,
   trace: 10,
   debug: 100,
   info: 1000,

src/app/logger/message_writer.ts

@@ -6,13 +6,14 @@ export default class MessageWriter implements Writer {
   send: MessageSend;
 
   constructor(
-    connect: MessageSend,
+    send: MessageSend,
     private action: string = "logger"
   ) {
-    this.send = connect;
+    this.send = send;
   }
 
   write(level: LogLevel, message: string, label: LogLabel): void {
+    console.log(`[${level}] ${message}`, label);
     this.send.sendMessage({
       action: this.action,
       data: {

src/app/service/offscreen/index.ts

@@ -2,7 +2,6 @@ import { forwardMessage, MessageSend, Server } from "@Packages/message/server";
 import { ScriptService } from "./script";
 import { Logger, LoggerDAO } from "@App/app/repo/logger";
 import { WindowMessage } from "@Packages/message/window_message";
-import { ExtensionMessageSend } from "@Packages/message/extension_message";
 import { ServiceWorkerClient } from "../service_worker/client";
 import { sendMessage } from "@Packages/message/client";
 import GMApi from "./gm_api";
@@ -22,8 +21,11 @@ export class OffscreenManager {
   constructor(private extensionMessage: MessageSend) {}
 
   logger(data: Logger) {
-    const dao = new LoggerDAO();
-    dao.save(data);
+    // 发送日志消息
+    this.sendMessageToServiceWorker({
+      action: "logger",
+      data,
+    });
   }
 
   preparationSandbox() {

src/app/service/service_worker/index.ts

@@ -11,8 +11,9 @@ import { SynchronizeService } from "./synchronize";
 import { SubscribeService } from "./subscribe";
 import { ExtServer, ExtVersion } from "@App/app/const";
 import { systemConfig } from "@App/pages/store/global";
-import { ScriptCodeDAO, ScriptDAO } from "@App/app/repo/scripts";
+import { ScriptDAO } from "@App/app/repo/scripts";
 import { SystemService } from "./system";
+import { Logger, LoggerDAO } from "@App/app/repo/logger";
 
 export type InstallSource = "user" | "system" | "sync" | "subscribe" | "vscode";
 
@@ -24,7 +25,14 @@ export default class ServiceWorkerManager {
     private sender: ServiceWorkerMessageSend
   ) {}
 
+  logger(data: Logger) {
+    // 发送日志消息
+    const dao = new LoggerDAO();
+    dao.save(data);
+  }
+
   async initManager() {
+    this.api.on("logger", this.logger.bind(this));
     this.api.on("preparationOffscreen", async () => {
       // 准备好环境
       await this.sender.init();

src/offscreen.ts

@@ -8,7 +8,7 @@ function main() {
   // 初始化日志组件
   const extensionMessage: MessageSend = new ExtensionMessageSend();
   const loggerCore = new LoggerCore({
-    writer: new MessageWriter(extensionMessage),
+    writer: new MessageWriter(extensionMessage, "serviceWorker/logger"),
     labels: { env: "offscreen" },
   });
   loggerCore.logger().debug("offscreen start");

src/sandbox.ts

@@ -9,7 +9,7 @@ function main() {
 
   // 初始化日志组件
   const loggerCore = new LoggerCore({
-    writer: new MessageWriter(msg),
+    writer: new MessageWriter(msg, "offscreen/logger"),
     labels: { env: "sandbox" },
   });
   loggerCore.logger().debug("offscreen start");