🐛 修复vscode连接问题

Author: CodFrm

example/gm_xhr.js

@@ -25,6 +25,8 @@ GM_xmlhttpRequest({
   method: "POST",
   responseType: "blob",
   data: data,
+  cookie: "ceshi=123",
+  anonymous: true,
   headers: {
     referer: "http://www.example.com/",
     origin: "www.example.com",

src/app/service/offscreen/index.ts

@@ -55,7 +55,7 @@ export class OffscreenManager {
 
     const gmApi = new GMApi(this.windowServer.group("gmApi"));
     gmApi.init();
-    const vscodeConnect = new VSCodeConnect(this.windowServer.group("vscodeConnect"));
+    const vscodeConnect = new VSCodeConnect(this.windowServer.group("vscodeConnect"), this.extensionMessage);
     vscodeConnect.init();
 
     this.windowServer.on("createObjectURL", (data: Blob) => {

src/app/service/offscreen/vscode-connect.ts

@@ -1,7 +1,8 @@
 import LoggerCore from "@App/app/logger/core";
 import Logger from "@App/app/logger/logger";
-import { prepareScriptByCode } from "@App/pkg/utils/script";
-import { Group } from "@Packages/message/server";
+import { Group, MessageSend } from "@Packages/message/server";
+import { ScriptClient } from "../service_worker/client";
+import { v5 as uuidv5 } from "uuid";
 
 // 在offscreen下与scriptcat-vscode建立websocket连接
 // 需要在vscode中安装scriptcat-vscode插件
@@ -14,7 +15,14 @@ export class VSCodeConnect {
 
   connectVSCodeTimer: any;
 
-  constructor(private group: Group) {}
+  scriptClient: ScriptClient;
+
+  constructor(
+    private group: Group,
+    private send: MessageSend
+  ) {
+    this.scriptClient = new ScriptClient(this.send);
+  }
 
   connect({ url, reconnect }: { url: string; reconnect: boolean }) {
     // 如果已经连接，断开重连
@@ -64,9 +72,8 @@ export class VSCodeConnect {
         switch (data.action) {
           case "onchange": {
             // 调用安装脚本接口
-            // const code = data.data.script;
-            // const prepareScript = await prepareScriptByCode(code, "", uuidv5(data.data.uri, uuidv5.URL), true);
-            // this.scriptManager.event.upsertHandler(prepareScript.script, "vscode");
+            const code = data.data.script;
+            this.scriptClient.installByCode(uuidv5(data.data.uri, uuidv5.URL), code, "vscode");
             break;
           }
           default:

src/app/service/service_worker/client.ts

@@ -89,6 +89,10 @@ export class ScriptClient extends Client {
     return this.do("importByUrl", url);
   }
 
+  installByCode(uuid: string, code: string, upsertBy: InstallSource = "user") {
+    return this.do("installByCode", { uuid, code, upsertBy });
+  }
+
   async formatUrl(url: string) {
     try {
       const newUrl = new URL(url.replace(/\/$/, ""));

src/app/service/service_worker/script.ts

@@ -1,5 +1,5 @@
 import { fetchScriptInfo, prepareScriptByCode } from "@App/pkg/utils/script";
-import { v4 as uuidv4 } from "uuid";
+import { v4 as uuidv4, v5 as uuidv5 } from "uuid";
 import { Group } from "@Packages/message/server";
 import Logger from "@App/app/logger/logger";
 import LoggerCore from "@App/app/logger/core";
@@ -174,6 +174,17 @@ export class ScriptService {
     return Promise.resolve(prepareScript.script);
   }
 
+  // 直接通过code静默安装脚本
+  async installByCode(param: { uuid: string; code: string; upsertBy: InstallSource }) {
+    const prepareScript = await prepareScriptByCode(param.code, "", param.uuid, true);
+    this.installScript({
+      script: prepareScript.script,
+      code: param.code,
+      upsertBy: param.upsertBy,
+    });
+    return Promise.resolve(prepareScript.script);
+  }
+
   // 获取安装信息
   getInstallInfo(uuid: string) {
     return Cache.getInstance().get(CacheKey.scriptInstallInfo(uuid));
@@ -563,6 +574,7 @@ export class ScriptService {
     this.group.on("isInstalled", this.isInstalled.bind(this));
     this.group.on("sortScript", this.sortScript.bind(this));
     this.group.on("importByUrl", this.importByUrl.bind(this));
+    this.group.on("installByCode", this.installByCode.bind(this));
 
     // 定时检查更新, 每10分钟检查一次
     chrome.alarms.create("checkScriptUpdate", {

src/app/service/service_worker/system.ts

@@ -16,7 +16,7 @@ export class SystemService {
     // 如果开启了自动连接vscode，则自动连接
     // 使用tx来确保service_worker恢复时不会再执行
     Cache.getInstance().tx("vscodeReconnect", async (init) => {
-      if (init) {
+      if (!init) {
         if (await this.systemConfig.getVscodeReconnect()) {
           // 调用连接
           vscodeConnect.connect({