@dshtrading/client-ui-strategies 0.6.3 → 0.7.0

package/lib/client.js

@@ -8261,6 +8261,12 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region ../indicators/lib/validate.js
+		/**
+		* Worker 启动兜底（毫秒）。WebKit 上新建 Worker + 编译 blob 脚本是几十到上百毫秒，
+		* 且这段属于环境开销而不是指标代码的耗时——试算超时只从 Worker 报到 start 之后算，
+		* 这里给启动本身留足余量，同时不让它无限挂着。
+		*/
+		const WORKER_STARTUP_TIMEOUT_MS = 1e4;
 		/** 生成特征测试 K 线序列。 */
 		function createSampleBars() {
 			const baseTime = 17e11;
@@ -8358,6 +8364,9 @@ window.__ModuleLoader__.load({
 		const WORKER_TRIAL_SCRIPT = `self.onmessage = (event) => {
   const { source, bars, params } = event.data
   try {
+    // 先报一声"开始算了"，主线程据此才起超时计时：Worker 的创建与脚本编译在 WebKit
+    // 上是几十到上百毫秒，算作执行时间会把合法指标误判成死循环。
+    self.postMessage({ phase: 'start' })
     const trimmed = String(source).trim()
     let fn
     if (/^(?:\\([a-zA-Z0-9_,\\s]*\\)|[a-zA-Z0-9_]+)\\s*=>/.test(trimmed) || /^function\\b/.test(trimmed)) {
@@ -8389,19 +8398,31 @@ window.__ModuleLoader__.load({
 				const url = URL.createObjectURL(blob);
 				const worker = new Worker(url);
 				let settled = false;
+				/** 当前生效的计时器：先是启动兜底，收到 Worker 的 start 后换成 compute 超时。 */
+				let timer;
+				const arm = (action, ms) => {
+					if (timer !== void 0) clearTimeout(timer);
+					timer = setTimeout(action, ms);
+				};
 				const finish = (action) => {
 					if (settled) return;
 					settled = true;
-					clearTimeout(timer);
+					if (timer !== void 0) clearTimeout(timer);
 					worker.terminate();
 					URL.revokeObjectURL(url);
 					action();
 				};
-				const timer = setTimeout(() => {
-					finish(() => reject(/* @__PURE__ */ new Error(`compute 执行超时（超过 ${timeoutMs}ms），可能存在死循环（如 while/for 未退出）`)));
-				}, timeoutMs);
+				arm(() => {
+					finish(() => reject(/* @__PURE__ */ new Error("compute 试算环境没有起来（Worker 启动超时）")));
+				}, WORKER_STARTUP_TIMEOUT_MS);
 				worker.onmessage = (event) => {
 					const data = event.data;
+					if (data.phase === "start") {
+						arm(() => {
+							finish(() => reject(/* @__PURE__ */ new Error(`compute 执行超时（超过 ${timeoutMs}ms），可能存在死循环（如 while/for 未退出）`)));
+						}, timeoutMs);
+						return;
+					}
 					finish(() => {
 						if (data.ok) resolve(data.result);
 						else reject(new Error(data.message ?? "compute 执行失败"));
@@ -9984,30 +10005,30 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var StrategyEditor_module_css_default = {
-			"panelHeader": "_9mrMhW_panelHeader",
-			"sourceArea": "_9mrMhW_sourceArea",
-			"secondaryBtn": "_9mrMhW_secondaryBtn",
-			"panel": "_9mrMhW_panel",
-			"noticeError": "_9mrMhW_noticeError",
+			"paramTable": "_9mrMhW_paramTable",
+			"fieldLabel": "_9mrMhW_fieldLabel",
+			"actionSpacer": "_9mrMhW_actionSpacer",
+			"paramRemove": "_9mrMhW_paramRemove",
+			"overlay": "_9mrMhW_overlay",
 			"noticeOk": "_9mrMhW_noticeOk",
-			"columnHeadRow": "_9mrMhW_columnHeadRow",
-			"columnRow": "_9mrMhW_columnRow",
 			"field": "_9mrMhW_field",
+			"noticeError": "_9mrMhW_noticeError",
+			"actionBar": "_9mrMhW_actionBar",
 			"paramCell": "_9mrMhW_paramCell",
+			"paramRow": "_9mrMhW_paramRow",
+			"secondaryBtn": "_9mrMhW_secondaryBtn",
+			"panelTitle": "_9mrMhW_panelTitle",
+			"columnRow": "_9mrMhW_columnRow",
 			"addParamBtn": "_9mrMhW_addParamBtn",
-			"actionBar": "_9mrMhW_actionBar",
+			"panel": "_9mrMhW_panel",
 			"closeBtn": "_9mrMhW_closeBtn",
-			"overlay": "_9mrMhW_overlay",
-			"fieldLabel": "_9mrMhW_fieldLabel",
+			"panelHeader": "_9mrMhW_panelHeader",
+			"primaryBtn": "_9mrMhW_primaryBtn",
 			"fieldInput": "_9mrMhW_fieldInput",
-			"paramRemove": "_9mrMhW_paramRemove",
-			"paramHeadRow": "_9mrMhW_paramHeadRow",
-			"paramRow": "_9mrMhW_paramRow",
 			"formGrid": "_9mrMhW_formGrid",
-			"actionSpacer": "_9mrMhW_actionSpacer",
-			"panelTitle": "_9mrMhW_panelTitle",
-			"paramTable": "_9mrMhW_paramTable",
-			"primaryBtn": "_9mrMhW_primaryBtn"
+			"paramHeadRow": "_9mrMhW_paramHeadRow",
+			"sourceArea": "_9mrMhW_sourceArea",
+			"columnHeadRow": "_9mrMhW_columnHeadRow"
 		};
 		//#endregion
 		//#region src/client/ScreenerEditor.tsx
@@ -10460,47 +10481,47 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var StrategyView_module_css_default = {
+			"trendUp": "jg958W_trendUp",
 			"configBar": "jg958W_configBar",
+			"strategyCards": "jg958W_strategyCards",
+			"tableSection": "jg958W_tableSection",
+			"progressFill": "jg958W_progressFill",
+			"progressWrap": "jg958W_progressWrap",
+			"metricValue": "jg958W_metricValue",
+			"chartWrapper": "jg958W_chartWrapper",
+			"strategyCard": "jg958W_strategyCard",
+			"mgmtRow": "jg958W_mgmtRow",
+			"newStrategyBtn": "jg958W_newStrategyBtn",
+			"root": "jg958W_root",
+			"emptyIcon": "jg958W_emptyIcon",
+			"horizonSelector": "jg958W_horizonSelector",
 			"horizonBtn": "jg958W_horizonBtn",
-			"metricsGrid": "jg958W_metricsGrid",
+			"paramInput": "jg958W_paramInput",
 			"metricCard": "jg958W_metricCard",
-			"cardSummary": "jg958W_cardSummary",
-			"scanMeta": "jg958W_scanMeta",
-			"metricLabel": "jg958W_metricLabel",
-			"cardTitle": "jg958W_cardTitle",
+			"chartContainer": "jg958W_chartContainer",
 			"tableTitle": "jg958W_tableTitle",
-			"tradesTable": "jg958W_tradesTable",
+			"cardBadge": "jg958W_cardBadge",
 			"cardActions": "jg958W_cardActions",
-			"chartWrapper": "jg958W_chartWrapper",
+			"trendDown": "jg958W_trendDown",
+			"tradesTableWrapper": "jg958W_tradesTableWrapper",
+			"tableEmptyCell": "jg958W_tableEmptyCell",
+			"tradesTable": "jg958W_tradesTable",
+			"cardTitleRow": "jg958W_cardTitleRow",
 			"paramLabel": "jg958W_paramLabel",
-			"progressWrap": "jg958W_progressWrap",
-			"chartContainer": "jg958W_chartContainer",
-			"header": "jg958W_header",
+			"runBtn": "jg958W_runBtn",
+			"errorMessage": "jg958W_errorMessage",
+			"scanMeta": "jg958W_scanMeta",
+			"symbolValue": "jg958W_symbolValue",
+			"cardTitle": "jg958W_cardTitle",
 			"paramGroup": "jg958W_paramGroup",
-			"progressFill": "jg958W_progressFill",
-			"tableSection": "jg958W_tableSection",
+			"cardSummary": "jg958W_cardSummary",
+			"header": "jg958W_header",
+			"cardActionBtn": "jg958W_cardActionBtn",
+			"metricLabel": "jg958W_metricLabel",
 			"reasonCell": "jg958W_reasonCell",
-			"trendUp": "jg958W_trendUp",
-			"mgmtRow": "jg958W_mgmtRow",
-			"paramInput": "jg958W_paramInput",
-			"symbolValue": "jg958W_symbolValue",
-			"tradesTableWrapper": "jg958W_tradesTableWrapper",
-			"horizonSelector": "jg958W_horizonSelector",
 			"emptyState": "jg958W_emptyState",
-			"cardBadge": "jg958W_cardBadge",
-			"emptyIcon": "jg958W_emptyIcon",
 			"nameCell": "jg958W_nameCell",
-			"metricValue": "jg958W_metricValue",
-			"trendDown": "jg958W_trendDown",
-			"cardActionBtn": "jg958W_cardActionBtn",
-			"root": "jg958W_root",
-			"errorMessage": "jg958W_errorMessage",
-			"newStrategyBtn": "jg958W_newStrategyBtn",
-			"strategyCard": "jg958W_strategyCard",
-			"strategyCards": "jg958W_strategyCards",
-			"tableEmptyCell": "jg958W_tableEmptyCell",
-			"runBtn": "jg958W_runBtn",
-			"cardTitleRow": "jg958W_cardTitleRow"
+			"metricsGrid": "jg958W_metricsGrid"
 		};
 		//#endregion
 		//#region src/client/ScreenerPane.tsx
@@ -12105,18 +12126,18 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var toolview_module_css_default = {
-			"spark": "MbbyQa_spark",
-			"card": "MbbyQa_card",
+			"metric": "MbbyQa_metric",
 			"reason": "MbbyQa_reason",
+			"head": "MbbyQa_head",
 			"title": "MbbyQa_title",
-			"metric": "MbbyQa_metric",
-			"meta": "MbbyQa_meta",
+			"metricValue": "MbbyQa_metricValue",
 			"chip": "MbbyQa_chip",
+			"card": "MbbyQa_card",
+			"meta": "MbbyQa_meta",
+			"spark": "MbbyQa_spark",
+			"params": "MbbyQa_params",
 			"metrics": "MbbyQa_metrics",
-			"metricLabel": "MbbyQa_metricLabel",
-			"head": "MbbyQa_head",
-			"metricValue": "MbbyQa_metricValue",
-			"params": "MbbyQa_params"
+			"metricLabel": "MbbyQa_metricLabel"
 		};
 		//#endregion
 		//#region src/client/toolview.tsx