feat(core): 优化答题uploadHandler API，新增 commonWork.options.onWorkerCreat…

…ed 选项
ocsjs · Nov 29, 2023 · c4154df · c4154df
1 parent f79fb08
commit c4154df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/core/src/core/worker/worker.ts b/packages/core/src/core/worker/worker.ts
@@ -286,7 +286,7 @@ export class OCSWorker<E extends RawElements = RawElements> extends CommonEventE
 	}
 
 	/** 答题结果处理器 */
-	async uploadHandler(options: {
+	uploadHandler(options: {
 		// doWork 的返回值结果
 		results: WorkResult<E>[];
 		// 提交类型
@@ -309,9 +309,9 @@ export class OCSWorker<E extends RawElements = RawElements> extends CommonEventE
 		const rate = results.length === 0 ? 0 : (finished / results.length) * 100;
 		if (type !== 'nomove') {
 			if (type === 'force') {
-				await callback(rate, true);
+				return callback(rate, true);
 			} else {
-				await callback(rate, type === 'save' ? false : rate >= parseFloat(type.toString()));
+				return callback(rate, type === 'save' ? false : rate >= parseFloat(type.toString()));
 			}
 		}
 	}

diff --git a/packages/scripts/src/utils/work.ts b/packages/scripts/src/utils/work.ts
@@ -11,6 +11,7 @@ export function commonWork(
 		workerProvider: (opts: CommonWorkOptions) => OCSWorker<any> | undefined;
 		beforeRunning?: () => void | Promise<void>;
 		onRestart?: () => void | Promise<void>;
+		onWorkerCreated?: (worker: OCSWorker<any>) => void | Promise<void>;
 	}
 ) {
 	// 置顶当前脚本
@@ -101,6 +102,10 @@ export function commonWork(
 		await options.beforeRunning?.();
 		worker = options.workerProvider(workOptions);
 
+		if (worker) {
+			options.onWorkerCreated?.(worker);
+		}
+
 		const { container, controlBtn } = createControls();
 		// 更新状态
 		script.panel?.body?.replaceChildren(container, workResultPanel());