fix(all/api): plugin api is broken (FlysoftBeta#77)

* fix(renderer/api/waitForElement): `selectors.splice` breaks the loop * fix(all/loader): script entry is loaded multiple times * fix(renderer/api): add missing `ntCall` api
cesaryuan · Jul 6, 2023 · 49ae34c · 49ae34c
1 parent 42e8a47
commit 49ae34c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/loader.ts b/src/loader.ts
@@ -12,19 +12,21 @@ const s = path.sep;
 
 const loadedPlugins: LoadedPlugins = {};
 
-const stylesheets: [Plugin, string][] = [],
+let stylesheets: [Plugin, string][] = [],
     scripts: [Plugin, string][] = [];
 
 export function applyScripts(api: any) {
-    scripts.forEach(([plugin, script]) => {
+    scripts = scripts.filter(([plugin, script]) => {
         try {
             require(script)(api);
+            return false;
         } catch (reason) {
             console.error(
                 `[!Loader] 运行此插件脚本时出现意外错误：${script}，请联系插件作者 (${plugin.manifest.author}) 解决`
             );
             console.error(reason);
         }
+        return true;
     });
 }
 

diff --git a/src/renderer/api/index.ts b/src/renderer/api/index.ts
@@ -2,6 +2,7 @@ import * as fs from "fs-extra";
 import { InterruptIPC, InterruptIPCOptions, addInterruptIpc } from "../../ipc";
 import { nt } from "./nt";
 import { startWatchingElement, waitForElement } from "./waitForElement";
+import { ntCall } from "./nt/call";
 
 export function getAPI(windowLoadPromise: Promise<void>) {
     windowLoadPromise.then(() => startWatchingElement());
@@ -12,6 +13,7 @@ export function getAPI(windowLoadPromise: Promise<void>) {
                 addInterruptIpc(func, options),
         },
         nt: nt,
+        ntCall: ntCall,
         modules: {
             fs: fs,
         },

diff --git a/src/renderer/api/waitForElement.ts b/src/renderer/api/waitForElement.ts
@@ -1,4 +1,4 @@
-const waitForElementSelectors: [string, (element: HTMLElement) => void][] = [];
+let waitForElementSelectors: [string, (element: HTMLElement) => void][] = [];
 
 export function startWatchingElement() {
     new MutationObserver(() => refreshStatus()).observe(document.documentElement, {
@@ -8,12 +8,10 @@ export function startWatchingElement() {
 }
 
 export function refreshStatus() {
-    waitForElementSelectors.forEach((item, idx) => {
-        const ele = document.querySelector<HTMLElement>(item[0]);
-        if (ele) {
-            item[1](ele);
-            waitForElementSelectors.splice(idx);
-        }
+    waitForElementSelectors = waitForElementSelectors.filter(([selector, callback]) => {
+        const element = document.querySelector<HTMLElement>(selector);
+        element && callback(element);
+        return !element;
     });
 }