@363045841yyt/klinechart-core 0.7.11 → 0.7.12

package/src/engine/indicators/indicator.worker.ts

@@ -7,10 +7,12 @@ import type {
     IndicatorWorkerRequest,
     IndicatorWorkerResponse,
     IndicatorConfigSnapshot,
+    SerializedRuntimeDescriptor,
 } from './workerProtocol'
 import { PROTOCOL_VERSION } from './workerProtocol'
 import type { KLineData } from '../../types/price'
-import { IndicatorRuntime } from './indicatorRuntime'
+import { IndicatorRuntime, CALCULATOR_MAP, createWorkerCompute } from './indicatorRuntime'
+import type { IndicatorRuntimeDescriptor } from './indicatorMetadata'
 
 // Worker 全局作用域
 const ctx = self as unknown as Worker
@@ -28,14 +30,40 @@ function postResponse(response: IndicatorWorkerResponse): void {
 /**
  * 处理初始化
  */
-function handleInit(): void {
-    runtime = new IndicatorRuntime()
+function handleInit(msg?: { descriptors?: SerializedRuntimeDescriptor[] }): void {
+    const serializedDescs = msg?.descriptors ?? []
+    const descriptors: IndicatorRuntimeDescriptor[] = serializedDescs.map(d => ({
+        configKey: d.configKey as any,
+        paneIdKey: d.paneIdKey as any,
+        defaultConfig: d.defaultConfig,
+        computeKey: d.computeKey,
+        compute: createWorkerCompute(d),
+    }))
+    runtime = new IndicatorRuntime(descriptors)
     postResponse({
         type: 'ready',
         protocolVersion: PROTOCOL_VERSION,
     })
 }
 
+function handleAddDescriptor(descriptor: SerializedRuntimeDescriptor): void {
+    if (!runtime) {
+        postResponse({
+            type: 'error',
+            stage: 'init',
+            message: 'Runtime not initialized',
+        })
+        return
+    }
+    runtime.addDescriptor({
+        configKey: descriptor.configKey as any,
+        paneIdKey: descriptor.paneIdKey as any,
+        defaultConfig: descriptor.defaultConfig,
+        computeKey: descriptor.computeKey,
+        compute: createWorkerCompute(descriptor),
+    })
+}
+
 /**
  * 处理设置数据
  */
@@ -135,7 +163,11 @@ ctx.onmessage = (event: MessageEvent<IndicatorWorkerRequest>) => {
 
     switch (msg.type) {
         case 'init':
-            handleInit()
+            handleInit(msg)
+            break
+
+        case 'addDescriptor':
+            handleAddDescriptor(msg.descriptor)
             break
 
         case 'setData':

package/src/engine/indicators/indicatorDefinitionRegistry.ts

@@ -5,6 +5,7 @@ import type {
     RendererFactory,
     ScaleRendererFactory,
     IndicatorConfigUpdater,
+    IndicatorRuntimeDescriptor,
 } from './indicatorMetadata'
 import type { PluginHost } from '../../plugin'
 
@@ -15,7 +16,7 @@ export type IndicatorDefinitionConfig<T = unknown> = {
     category: IndicatorCategory
     stateKey: StateKey
     defaultPaneId: string
-    paneIdField?: keyof import('./workerProtocol').IndicatorConfigSnapshot
+    paneIdField?: string
     allowMainPane?: boolean
     scaleRendererFactory?: ScaleRendererFactory
     scale?: IndicatorMetadata['scale']
@@ -23,6 +24,7 @@ export type IndicatorDefinitionConfig<T = unknown> = {
     applyResult?: (host: PluginHost, state: unknown, paneId: string) => void
     mainPane?: IndicatorMetadata['mainPane']
     visibleState?: IndicatorMetadata['visibleState']
+    runtime?: IndicatorRuntimeDescriptor
     semantic?: IndicatorMetadata<T>['semantic']
 }
 

package/src/engine/indicators/indicatorMetadata.ts

@@ -7,6 +7,7 @@
 
 import type { PluginHost, RendererPluginWithHost } from '../../plugin'
 import type { IndicatorConfigSnapshot, IndicatorSeriesBundle } from './workerProtocol'
+import type { KLineData } from '../../types/price'
 
 export type IndicatorId = string
 
@@ -85,6 +86,27 @@ export type IndicatorVisibleStateComposer = (
     context: IndicatorVisibleStateComposeContext,
 ) => unknown
 
+/**
+ * 指标计算描述符
+ * 描述每个指标的计算逻辑，供 IndicatorRuntime 驱动
+ *
+ * - 主线程：直接调用 compute
+ * - Worker：用 computeKey 从 calculators 模块映射到实际函数
+ * - 自定义运行时指标：无 computeKey，仅主线程 inline 运行
+ */
+export interface IndicatorRuntimeDescriptor<C = any> {
+    /** configSnapshot 中的 key，通常等于 name（如 'macd'） */
+    configKey: string
+    /** paneId 在 configSnapshot 中的 key（如 'macdPaneId'），可省略 */
+    paneIdKey?: string
+    /** 默认配置值 */
+    defaultConfig: C
+    /** 计算函数（主线程直接调用，Worker 用 computeKey 桥接） */
+    compute: (data: KLineData[], config: C) => unknown
+    /** Worker 端计算键名，映射到 calculators 模块的导出 */
+    computeKey: string
+}
+
 /**
  * 指标元数据接口
  */
@@ -121,7 +143,7 @@ export interface IndicatorMetadata<T = unknown> {
      * 在 configSnapshot 中的 paneId 字段名
      * 用于从配置中获取当前 pane ID
      */
-    paneIdField?: keyof IndicatorConfigSnapshot
+    paneIdField?: string
 
     /**
      * 渲染器工厂函数
@@ -190,6 +212,12 @@ export interface IndicatorMetadata<T = unknown> {
         compose: IndicatorVisibleStateComposer
     }
 
+    /**
+     * 计算描述符（可选）
+     * 提供后，IndicatorRuntime 可据此自动调度计算，无需手写展开
+     */
+    runtime?: IndicatorRuntimeDescriptor
+
     /**
      * 语义配置应用入口。
      */