fix(script): 修复搜索结果超时后全部题库都显示超时的BUG

ocsjs · Apr 4, 2023 · a11b2a5 · a11b2a5
1 parent a1de6ab
commit a11b2a5
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 59 deletions.
diff --git a/packages/core/src/core/answer-wrapper/answer.wrapper.handler.ts b/packages/core/src/core/answer-wrapper/answer.wrapper.handler.ts
@@ -1,5 +1,6 @@
 import { AnswererWrapper, SearchInformation, Result } from './interface';
 import { request } from '../utils/request';
+import { $ } from '../../utils';
 
 /**
  *
@@ -78,7 +79,10 @@ export async function defaultAnswerWrapperHandler(
 					headers: JSON.parse(JSON.stringify(headers || {}))
 				};
 				// 发送请求
-				const responseData = await request(url, requestData);
+				const responseData = await Promise.race([request(url, requestData), $.sleep(30 * 1000)]);
+				if (responseData === undefined) {
+					throw new Error('题库连接超时，请检查网络或者重试。');
+				}
 				/** 从 handler 获取搜索到的题目和回答 */
 
 				// eslint-disable-next-line no-new-func

diff --git a/packages/core/src/core/utils/request.ts b/packages/core/src/core/utils/request.ts
@@ -56,7 +56,7 @@ export function request<T extends 'json' | 'text'>(
 					reject(new Error('GM_xmlhttpRequest is not defined'));
 				}
 			} else {
-				const fet: (...args: any[]) => Promise<Response> = env === 'node' ? require('node-fetch').default : fetch;
+				const fet: typeof fetch = env === 'node' ? require('node-fetch').default : fetch;
 
 				fet(url, { body: method === 'post' ? JSON.stringify(data) : undefined, method, headers })
 					.then((response) => {

diff --git a/packages/core/src/core/worker/worker.ts b/packages/core/src/core/worker/worker.ts
@@ -146,49 +146,43 @@ export class OCSWorker<E extends RawElements = RawElements> extends CommonEventE
 						});
 					}
 
-					/** 查找题目 */
-					const searchInfos = await this.doAnswer(ctx.elements, type, ctx);
-
+					/** 查找答案 */
+					const searchInfos = await this.opts.answerer(ctx.elements, type, ctx);
 					let resultPromise: { (): Promise<ResolverResult> } | undefined;
 
-					if (!searchInfos) {
-						error = '答案获取失败, 请重新运行, 或者忽略此题。';
-					} else {
-						// 答案为 undefined 的情况， 需要赋值给一个空字符串，因为可能传回的题目中带有其他提示信息，或者题目里包含答案。
-						searchInfos.forEach((info) => {
-							info.results = info.results.map((ans) => {
-								ans.answer = ans.answer ? ans.answer : '';
-								return ans;
-							});
+					// 答案为 undefined 的情况， 需要赋值给一个空字符串，因为可能传回的题目中带有其他提示信息，或者题目里包含答案。
+					searchInfos.forEach((info) => {
+						info.results = info.results.map((ans) => {
+							ans.answer = ans.answer ? ans.answer : '';
+							return ans;
 						});
+					});
 
-						ctx.searchInfos = searchInfos;
+					ctx.searchInfos = searchInfos;
 
-						if (searchInfos.length === 0) {
-							error = '搜索不到答案, 请重新运行, 或者忽略此题。';
-						}
+					if (searchInfos.length === 0) {
+						error = '搜索不到答案, 请重新运行, 或者忽略此题。';
+					}
 
-						/** 开始处理 */
-						if (typeof this.opts.work === 'object') {
-							if (ctx.elements.options) {
-								/** 使用默认处理器 */
-
-								if (type) {
-									const resolver = defaultQuestionResolve(ctx)[type];
-									const handler = this.opts.work.handler;
-									resultPromise = async () =>
-										await resolver(searchInfos, ctx.elements.options as HTMLElement[], handler);
-								} else {
-									error = '题目类型解析失败, 请自行提供解析器, 或者忽略此题。';
-								}
+					/** 开始处理 */
+					if (typeof this.opts.work === 'object') {
+						if (ctx.elements.options) {
+							/** 使用默认处理器 */
+
+							if (type) {
+								const resolver = defaultQuestionResolve(ctx)[type];
+								const handler = this.opts.work.handler;
+								resultPromise = async () => await resolver(searchInfos, ctx.elements.options as HTMLElement[], handler);
 							} else {
-								error = 'elements.options 为空 ! 使用默认处理器, 必须提供题目选项的选择器。';
+								error = '题目类型解析失败, 请自行提供解析器, 或者忽略此题。';
 							}
 						} else {
-							/** 使用自定义处理器 */
-							const work = this.opts.work;
-							resultPromise = async () => await work(ctx);
+							error = 'elements.options 为空 ! 使用默认处理器, 必须提供题目选项的选择器。';
 						}
+					} else {
+						/** 使用自定义处理器 */
+						const work = this.opts.work;
+						resultPromise = async () => await work(ctx);
 					}
 
 					if (resultPromise) {
@@ -290,29 +284,6 @@ export class OCSWorker<E extends RawElements = RawElements> extends CommonEventE
 		return results;
 	}
 
-	/** 获取答案 */
-	private async doAnswer(elements: WorkContext<E>['elements'], type: string | undefined, ctx: WorkContext<E>) {
-		const timeout = 30;
-		/** 解析选项，可以自定义查题器 */
-
-		const answer = async () => {
-			return await Promise.race([
-				this.opts.answerer(elements, type, ctx),
-				/** 最长请求时间 */
-				$.sleep(timeout * 1000)
-			]);
-		};
-
-		let answers = await answer();
-		await $.sleep(3000);
-		if (!answers) {
-			/** 重试一次获取答案 */
-			answers = await answer();
-		}
-
-		return answers;
-	}
-
 	/** 答题结果处理器 */
 	async uploadHandler(options: {
 		// doWork 的返回值结果

diff --git a/packages/core/src/elements/search.infos.ts b/packages/core/src/elements/search.infos.ts
@@ -34,7 +34,7 @@ export class SearchInfosElement extends IElement {
 					el('summary', [el('a', { href: info.homepage, innerText: info.name })]),
 					...(info.error
 						? /** 显示错误信息 */
-						  [el('span', { className: 'error' }, ['此题库搜题时发生错误：', info.error || '网络错误或者未知错误'])]
+						  [el('span', { className: 'error' }, [info.error || '网络错误或者未知错误'])]
 						: /** 显示结果列表 */
 						  [
 								...info.results.map((ans) => {

diff --git a/packages/scripts/assets/css/style.css b/packages/scripts/assets/css/style.css
@@ -736,6 +736,11 @@ search-infos-element .search-infos:hover .copy {
   display: inline;
   font-size: 12px;
 }
+search-infos-element .error {
+  color: #ff6b6ded;
+  display: inline-block;
+  padding-left: 12px;
+}
 .copy {
   margin-left: 4px;
   padding: 2px 4px;

diff --git a/packages/scripts/assets/less/style.less b/packages/scripts/assets/less/style.less
@@ -698,6 +698,12 @@ search-infos-element {
 			font-size: 12px;
 		}
 	}
+
+	.error {
+		color: #ff6b6ded;
+		display: inline-block;
+		padding-left: 12px;
+	}
 }
 
 .copy {