fix(core): 修复跨域问题

ocsjs · Jun 4, 2022 · 8ad21bf · 8ad21bf
1 parent 79e209b
commit 8ad21bf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/packages/core/src/core/utils/common.ts b/packages/core/src/core/utils/common.ts
@@ -123,12 +123,11 @@ export async function getRemoteSetting(port: number) {
   let count = 3;
   while (count > 0) {
     try {
-      const res = await request(`http://localhost:${port}/setting`, {
+      return await request(`http://localhost:${port}/setting`, {
         type: 'GM_xmlhttpRequest',
         method: 'get',
         contentType: 'json'
       });
-      return res;
     } catch { }
     count--;
   }

diff --git a/packages/core/src/script/common/index.ts b/packages/core/src/script/common/index.ts
@@ -1,6 +1,7 @@
 import { createNote } from '../../components';
 import { defineScript } from '../../core/define.script';
 import { getRemoteSetting, onComplete, onInteractive, useUnsafeWindow } from '../../core/utils';
+import { logger } from '../../logger';
 import { useSettings } from '../../store';
 
 const supports = ['*'];
@@ -63,12 +64,15 @@ export const CommonScript = defineScript({
       name: '获取软件题库配置脚本',
       url: supports,
       async onload() {
-        const { common } = useSettings();
-        if (common.answererWrappers.length) {
-          const setting = await getRemoteSetting(15319);
-          if (setting?.answererWrappers) {
-            const { common } = useSettings();
-            common.answererWrappers = setting.answererWrappers;
+        if (top === self) {
+          const { common } = useSettings();
+          if (common.answererWrappers.length === 0) {
+            const setting = await getRemoteSetting(15319);
+            if (setting?.answererWrappers) {
+              logger('debug', '成功读取本地题库配置');
+              const { common } = useSettings();
+              common.answererWrappers = setting.answererWrappers;
+            }
           }
         }
       }

diff --git a/packages/core/src/script/cx/recognize.ts b/packages/core/src/script/cx/recognize.ts
@@ -18,7 +18,7 @@ export async function mapRecognize() {
     logger('debug', '正在加载字典库...');
     // 预加载字体库
     const res = await request('https://cdn.ocsjs.com/resources/font/table.json', {
-      type: 'fetch',
+      type: 'GM_xmlhttpRequest',
       method: 'get',
       contentType: 'json'
     });

diff --git a/userjs.template b/userjs.template
@@ -10,6 +10,8 @@
 // @icon					https://cdn.ocsjs.com/logo.ico
 // @connect					enncy.cn
 // @connect					icodef.com
+// @connect                 ocsjs.com
+// @connect                 localhost
 // @match					*://*.chaoxing.com/*
 // @match					*://*.edu.cn/*
 // @match					*://*.org.cn/*