🐛 升级为es2022并解决语法错误 #1186

Author: CodFrm

src/app/service/offscreen/index.ts

@@ -12,15 +12,19 @@ import { makeBlobURL } from "@App/pkg/utils/utils";
 
 // offscreen环境的管理器
 export class OffscreenManager {
-  private windowMessage = new WindowMessage(window, sandbox, true);
+  private windowMessage: WindowMessage;
 
-  private windowServer: Server = new Server("offscreen", this.windowMessage);
+  private windowServer: Server;
 
   private messageQueue = new MessageQueue();
 
-  private serviceWorker = new ServiceWorkerClient(this.extMsgSender);
+  private serviceWorker: ServiceWorkerClient;
 
-  constructor(private extMsgSender: MessageSend) {}
+  constructor(private extMsgSender: MessageSend) {
+    this.windowMessage = new WindowMessage(window, sandbox, true);
+    this.windowServer = new Server("offscreen", this.windowMessage);
+    this.serviceWorker = new ServiceWorkerClient(this.extMsgSender);
+  }
 
   logger(data: Logger) {
     // 发送日志消息

src/app/service/offscreen/script.ts

@@ -18,9 +18,9 @@ import type { TDeleteScript, TInstallScript, TEnableScript } from "../queue";
 export class ScriptService {
   logger: Logger;
 
-  scriptClient: ScriptClient = new ScriptClient(this.extMsgSender);
-  resourceClient: ResourceClient = new ResourceClient(this.extMsgSender);
-  valueClient: ValueClient = new ValueClient(this.extMsgSender);
+  scriptClient: ScriptClient;
+  resourceClient: ResourceClient;
+  valueClient: ValueClient;
 
   constructor(
     private group: Group,
@@ -29,6 +29,9 @@ export class ScriptService {
     private messageQueue: IMessageQueue
   ) {
     this.logger = LoggerCore.logger().with({ service: "script" });
+    this.scriptClient = new ScriptClient(this.extMsgSender);
+    this.resourceClient = new ResourceClient(this.extMsgSender);
+    this.valueClient = new ValueClient(this.extMsgSender);
   }
 
   runScript(script: ScriptRunResource) {

src/app/service/sandbox/index.ts

@@ -5,9 +5,11 @@ import { Runtime } from "./runtime";
 
 // sandbox环境的管理器
 export class SandboxManager {
-  api: Server = new Server("sandbox", this.windowMessage);
+  api: Server;
 
-  constructor(private windowMessage: WindowMessage) {}
+  constructor(private windowMessage: WindowMessage) {
+    this.api = new Server("sandbox", this.windowMessage);
+  }
 
   initManager() {
     const runtime = new Runtime(this.windowMessage, this.api);

src/app/service/service_worker/synchronize.ts

@@ -1,7 +1,13 @@
 import LoggerCore from "@App/app/logger/core";
 import Logger from "@App/app/logger/logger";
 import type { Resource } from "@App/app/repo/resource";
-import { type Script, SCRIPT_STATUS_DISABLE, SCRIPT_STATUS_ENABLE, type ScriptDAO } from "@App/app/repo/scripts";
+import {
+  type Script,
+  SCRIPT_STATUS_DISABLE,
+  SCRIPT_STATUS_ENABLE,
+  type ScriptDAO,
+  type ScriptCodeDAO,
+} from "@App/app/repo/scripts";
 import BackupExport from "@App/pkg/backup/export";
 import type { BackupData, ResourceBackup, ScriptBackupData, ScriptOptions, ValueStorage } from "@App/pkg/backup/struct";
 import type { FileInfo } from "@Packages/filesystem/filesystem";
@@ -62,7 +68,7 @@ type PushScriptParam = TInstallScriptParams;
 export class SynchronizeService {
   logger: Logger;
 
-  scriptCodeDAO = this.scriptDAO.scriptCodeDAO;
+  scriptCodeDAO: ScriptCodeDAO;
 
   storage: ChromeStorage = new ChromeStorage("sync", false);
 
@@ -77,6 +83,7 @@ export class SynchronizeService {
     private scriptDAO: ScriptDAO
   ) {
     this.logger = LoggerCore.logger().with({ service: "synchronize" });
+    this.scriptCodeDAO = this.scriptDAO.scriptCodeDAO;
   }
 
   // 生成备份文件到文件系统

tsconfig.json

@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2022",
     "lib": [
       "DOM",
-      "ES2020",
+      "ES2022",
       "WebWorker"
     ],
     "module": "nodenext",