🦄 refactor: 移除入参scriptCodeDAO

+ 调整scriptRes.code赋值

Author: WhiteSevs

src/app/service/content/utils.ts

@@ -6,8 +6,8 @@ import { Message } from "@Packages/message/server";
 import EventEmitter from "eventemitter3";
 
 // 构建脚本运行代码
-export function compileScriptCode(scriptRes: ScriptRunResouce): string {
-  const scriptCode = scriptRes.code;
+export function compileScriptCode(scriptRes: ScriptRunResouce, scriptCode?: string): string {
+  scriptCode = scriptCode ?? scriptRes.code;
   let requireCode = "";
   if (Array.isArray(scriptRes.metadata.require)) {
     requireCode += scriptRes.metadata.require
@@ -49,11 +49,17 @@ export function compileScript(code: string): ScriptFunc {
 /**
  * 将脚本函数编译为注入脚本代码
  * @param script
+ * @param scriptCode
  * @param [autoDeleteMountFunction=false] 是否自动删除挂载的函数
  */
-export function compileInjectScript(script: ScriptRunResouce, autoDeleteMountFunction: boolean = false): string {
+export function compileInjectScript(
+  script: ScriptRunResouce,
+  scriptCode?: string,
+  autoDeleteMountFunction: boolean = false
+): string {
+  scriptCode = scriptCode ?? script.code;
   return `window['${script.flag}'] = function(context, GM_info){
-${autoDeleteMountFunction ? `  try{delete window['${script.flag}'];}catch(e){};` : ""}${script.code}}`;
+${autoDeleteMountFunction ? `  try{delete window['${script.flag}'];}catch(e){};` : ""}${scriptCode}}`;
 }
 
 // 设置api依赖

src/app/service/service_worker/index.ts

@@ -34,8 +34,6 @@ export default class ServiceWorkerManager {
     const scriptDAO = new ScriptDAO();
     scriptDAO.enableCache();
 
-    const scriptCodeDAO = new ScriptCodeDAO();
-
     const systemConfig = new SystemConfig(this.mq);
 
     const resource = new ResourceService(this.api.group("resource"), this.mq);
@@ -51,8 +49,7 @@ export default class ServiceWorkerManager {
       value,
       script,
       resource,
-      scriptDAO,
-      scriptCodeDAO
+      scriptDAO
     );
     runtime.init();
     const popup = new PopupService(this.api.group("popup"), this.mq, runtime, scriptDAO);

src/app/service/service_worker/runtime.ts

@@ -67,8 +67,7 @@ export class RuntimeService {
     private value: ValueService,
     private script: ScriptService,
     private resource: ResourceService,
-    private scriptDAO: ScriptDAO,
-    private scriptCodeDAO: ScriptCodeDAO
+    private scriptDAO: ScriptDAO
   ) {
     this.logger = LoggerCore.logger({ component: "runtime" });
   }
@@ -420,19 +419,19 @@ export class RuntimeService {
             let scriptRes = needUpdateRegisteredUserScripts.find((script) => (script.uuid = scriptRegisterInfo.id));
             if (scriptRes) {
               let originScriptCode = scriptRegisterInfo.js[0]["code"];
-              if (scriptRes.code === "") {
-                // 重新获取脚本代码，不知道什么情况code会被置空，所以这里重新获取
-                scriptRes.code = (await this.scriptCodeDAO.get(scriptRes.uuid))!.code;
+              let scriptResCode = scriptRes.code;
+              if (scriptResCode === "") {
+                scriptResCode = (await this.scriptDAO.scriptCodeDAO.get(scriptRes.uuid))!.code;
               }
-              scriptRes.code = compileScriptCode(scriptRes);
-              scriptRes.code = compileInjectScript(scriptRes, true);
-              // 编译后的脚本和初始化时的脚本代码一致，则不更新
-              if (originScriptCode === scriptRes.code) {
+              let scriptCode = compileScriptCode(scriptRes, scriptResCode);
+              let scriptInjectCode = compileInjectScript(scriptRes, scriptCode, true);
+              // 若代码一致，则不更新
+              if (originScriptCode === scriptInjectCode) {
                 return;
               }
               scriptRegisterInfo.js = [
                 {
-                  code: scriptRes.code,
+                  code: scriptInjectCode,
                 },
               ];
               return scriptRegisterInfo;