fix

Author: cyfung1031

src/content.ts

@@ -5,7 +5,7 @@ import MessageInternal from "./app/message/internal";
 import ContentRuntime from "./runtime/content/content";
 // @ts-ignore
 import injectJs from "../dist/inject.js";
-import { randomString } from "./pkg/utils/utils";
+import { randomString, sourceMapTo } from "./pkg/utils/utils";
 
 const internalMessage = new MessageInternal("content");
 
@@ -21,7 +21,7 @@ const scriptFlag = randomString(8);
 const temp = document.createElementNS("http://www.w3.org/1999/xhtml", "script");
 temp.setAttribute("type", "text/javascript");
 temp.setAttribute("charset", "UTF-8");
-temp.textContent = `(function (ScriptFlag) {\n${injectJs}\n})('${scriptFlag}')`;
+temp.textContent = `(function (ScriptFlag) {\n${injectJs}\n})('${scriptFlag}')${sourceMapTo("injected.js")}`;
 temp.className = "injected-js";
 document.documentElement.appendChild(temp);
 temp.remove();

src/pages/confirm/main.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import ReactDOM from "react-dom/client";
 import "@arco-design/web-react/dist/css/arco.css";
 import MessageInternal from "@App/app/message/internal";

src/pages/import/main.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import ReactDOM from "react-dom/client";
 import "@arco-design/web-react/dist/css/arco.css";
 import MessageInternal from "@App/app/message/internal";

src/pages/install/App.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import Description from "./description";
 
 function App() {

src/pages/install/main.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import ReactDOM from "react-dom/client";
 import { registerEditor } from "@App/pkg/utils/monaco-editor/index";
 import "@arco-design/web-react/dist/css/arco.css";

src/pages/options/main.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import ReactDOM from "react-dom/client";
 import { registerEditor } from "@App/pkg/utils/monaco-editor/index";
 // eslint-disable-next-line import/no-unresolved
@@ -13,6 +12,7 @@ import GMApi from "@App/runtime/background/gm_api";
 import { MessageBroadcast, MessageHander } from "@App/app/message/message";
 import IoC from "@App/app/ioc";
 import LoggerCore from "@App/app/logger/core";
+import Logger from "@App/app/logger/logger";
 import DBWriter from "@App/app/logger/db_writer";
 import { LoggerDAO } from "@App/app/repo/logger";
 import { IPermissionVerify } from "@App/runtime/background/permission_verify";
@@ -66,6 +66,12 @@ tryConnect(message, (ok: boolean) => {
   } else {
     Message.error("后台通信连接失败,请注意保存当前页面数据,尝试重新连接中...");
   }
+}, (e: any) => {
+  // ignore
+  LoggerCore.getLogger({ component: "utils" }).error(
+    "re connect failed",
+    Logger.E(e)
+  );
 });
 
 // 处理沙盒加载消息

src/pages/popup/main.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import ReactDOM from "react-dom/client";
 import "@arco-design/web-react/dist/css/arco.css";
 import MessageInternal from "@App/app/message/internal";

src/pkg/utils/monaco-editor_.ts

@@ -1,8 +1,6 @@
 /* eslint-disable no-control-regex */
 /* eslint-disable import/prefer-default-export */
 /* eslint-disable default-case */
-import LoggerCore from "@App/app/logger/core";
-import Logger from "@App/app/logger/logger";
 import type { SCMetadata } from "@App/app/repo/scripts";
 import type MessageInternal from "@App/app/message/internal";
 
@@ -109,7 +107,8 @@ export function parseStorageValue(str: string): any {
 // 尝试重新链接和超时通知
 export function tryConnect(
   message: MessageInternal,
-  callback: (ok: boolean) => void
+  callback: (ok: boolean) => void,
+  onError: (e: any) => void
 ) {
   const ping = () => {
     return new Promise((resolve) => {
@@ -137,11 +136,7 @@ export function tryConnect(
         message.reconnect();
         callback(true);
       } catch (e) {
-        // ignore
-        LoggerCore.getLogger({ component: "utils" }).error(
-          "re connect failed",
-          Logger.E(e)
-        );
+        onError(e);
       }
     }
   }, 5000);
@@ -320,6 +315,11 @@ export function cleanFileName(name: string): string {
   return name.replace(/[\x00-\x1F\\\/:*?"<>|]+/g, "-").trim();
 }
 
+export const sourceMapTo = (scriptName: string) => {
+  const url = chrome.runtime.getURL(`/${encodeURI(scriptName)}`);
+  return `\n//# sourceURL=${url}`;
+};
+
 // 获取本周是第几周
 // 遵循 ISO 8601, 一月四日为Week 1，星期一为新一周
 // 能应对每年开始和结束（不会因为踏入新一年而重新计算）

src/pkg/utils/utils.ts

@@ -1,5 +1,6 @@
 import { type ScriptRunResource } from "@App/app/repo/scripts";
 import { has } from "@App/pkg/utils/lodash";
+import { sourceMapTo } from "@App/pkg/utils/utils"
 
 // 构建脚本运行代码
 export function compileScriptCode(scriptRes: ScriptRunResource): string {
@@ -14,9 +15,8 @@ export function compileScriptCode(scriptRes: ScriptRunResource): string {
     });
   }
   code = require + code;
-  return `with (context) return (async ()=>{\n${code}\n//# sourceURL=${chrome.runtime.getURL(
-    `/${encodeURI(scriptRes.name)}.user.js`
-  )}\n})()`;
+  const filepath = `${scriptRes.name}.user.js`;
+  return `with (context) return (async ()=>{\n${code}${sourceMapTo(filepath)}\n})()`;
 }
 
 // eslint-disable-next-line camelcase