@363045841yyt/klinechart-core 0.7.11 → 0.7.12

package/dist/engine/indicators/scheduler.js

@@ -57,6 +57,7 @@ export class IndicatorScheduler {
     // 当前数据和配置快照
     currentData = [];
     configSnapshot = this.getDefaultConfig();
+    paneIdOverrides = new Map();
     // Worker 相关
     worker = null;
     workerReady = false;
@@ -87,6 +88,21 @@ export class IndicatorScheduler {
             console.warn(`[IndicatorScheduler] '${meta.name}' already registered, overwriting`);
         }
         this.registry.register(meta);
+        if (meta.runtime && this.inlineRuntime) {
+            this.inlineRuntime.addDescriptor(meta.runtime);
+        }
+        if (meta.runtime && this.useWorker && this.worker && this.workerReady) {
+            const rt = meta.runtime;
+            this.worker.postMessage({
+                type: 'addDescriptor',
+                descriptor: {
+                    configKey: rt.configKey,
+                    paneIdKey: rt.paneIdKey,
+                    defaultConfig: typeof rt.defaultConfig === 'function' ? rt.defaultConfig() : rt.defaultConfig,
+                    computeKey: rt.computeKey,
+                },
+            });
+        }
         this.configVersion++;
         this.triggerRecompute();
         console.log(`[IndicatorScheduler] Registered indicator '${meta.name}' (${meta.displayName})`);
@@ -279,41 +295,6 @@ export class IndicatorScheduler {
                 showPOC: true,
                 showValueArea: true,
             },
-            rsiPaneId: 'sub_RSI',
-            cciPaneId: 'sub_CCI',
-            stochPaneId: 'sub_STOCH',
-            momPaneId: 'sub_MOM',
-            wmsrPaneId: 'sub_WMSR',
-            kstPaneId: 'sub_KST',
-            fastkPaneId: 'sub_FASTK',
-            macdPaneId: 'sub_MACD',
-            atrPaneId: 'sub_ATR',
-            wmaPaneId: 'sub_WMA',
-            demaPaneId: 'sub_DEMA',
-            temaPaneId: 'sub_TEMA',
-            hmaPaneId: 'sub_HMA',
-            kamaPaneId: 'sub_KAMA',
-            sarPaneId: 'sub_SAR',
-            supertrendPaneId: 'sub_SuperTrend',
-            keltnerPaneId: 'sub_Keltner',
-            donchianPaneId: 'sub_Donchian',
-            ichimokuPaneId: 'sub_Ichimoku',
-            rocPaneId: 'sub_ROC',
-            trixPaneId: 'sub_TRIX',
-            hvPaneId: 'sub_HV',
-            parkinsonPaneId: 'sub_Parkinson',
-            chaikinVolPaneId: 'sub_ChaikinVol',
-            vmaPaneId: 'sub_VMA',
-            obvPaneId: 'sub_OBV',
-            pvtPaneId: 'sub_PVT',
-            vwapPaneId: 'sub_VWAP',
-            cmfPaneId: 'sub_CMF',
-            mfiPaneId: 'sub_MFI',
-            pivotPaneId: 'sub_Pivot',
-            fibPaneId: 'sub_Fib',
-            structurePaneId: 'sub_Structure',
-            zonesPaneId: 'sub_Zones',
-            volumeProfilePaneId: 'sub_VolumeProfile',
         };
     }
     initBackend() {
@@ -330,8 +311,7 @@ export class IndicatorScheduler {
             return false;
         }
         try {
-            // Vite 模块 Worker
-            const workerUrl = new URL('./indicator.worker.ts', import.meta.url);
+            const workerUrl = new URL('./indicator.worker.js', import.meta.url);
             console.log('[IndicatorScheduler] Creating worker from:', workerUrl.href);
             this.worker = new Worker(workerUrl, { type: 'module' });
             console.log('[IndicatorScheduler] Worker created, waiting for ready...');
@@ -340,7 +320,6 @@ export class IndicatorScheduler {
                 console.error('[IndicatorScheduler] Worker error:', err);
                 this.fallbackToInline();
             };
-            // 发送 init
             this.worker.postMessage({
                 type: 'init',
                 protocolVersion: PROTOCOL_VERSION,
@@ -354,7 +333,10 @@ export class IndicatorScheduler {
     }
     initInlineRuntime() {
         console.log('[IndicatorScheduler] Using INLINE runtime (fallback)');
-        this.inlineRuntime = new IndicatorRuntime();
+        const runtimeDescs = this.registry.getAll()
+            .filter(m => m.runtime)
+            .map(m => m.runtime);
+        this.inlineRuntime = new IndicatorRuntime(runtimeDescs);
         this.useWorker = false;
         this.workerReady = true;
     }
@@ -388,7 +370,20 @@ export class IndicatorScheduler {
                 this.workerReady = true;
                 this.useWorker = true;
                 console.log('[IndicatorScheduler] Worker READY - using Worker backend');
-                // Worker 就绪后补算一次，但仅在有数据时（避免空数据产出 Infinity 极值）
+                for (const meta of this.registry.getAll()) {
+                    if (!meta.runtime)
+                        continue;
+                    const rt = meta.runtime;
+                    this.worker.postMessage({
+                        type: 'addDescriptor',
+                        descriptor: {
+                            configKey: rt.configKey,
+                            paneIdKey: rt.paneIdKey,
+                            defaultConfig: typeof rt.defaultConfig === 'function' ? rt.defaultConfig() : rt.defaultConfig,
+                            computeKey: rt.computeKey,
+                        },
+                    });
+                }
                 if (this.currentData.length > 0) {
                     this.triggerRecompute();
                 }
@@ -455,9 +450,7 @@ export class IndicatorScheduler {
             if (!state)
                 continue;
             this.checkVisibleExtremes(state, meta.displayName);
-            const paneId = meta.paneIdField
-                ? this.configSnapshot[meta.paneIdField]
-                : meta.defaultPaneId;
+            const paneId = this.paneIdOverrides.get(meta.name) ?? meta.defaultPaneId;
             meta.applyResult(this.pluginHost, state, paneId);
         }
     }
@@ -475,9 +468,7 @@ export class IndicatorScheduler {
                 continue;
             let state;
             if (meta.category === 'main') {
-                const paneId = meta.paneIdField
-                    ? this.configSnapshot[meta.paneIdField]
-                    : meta.defaultPaneId;
+                const paneId = this.paneIdOverrides.get(meta.name) ?? meta.defaultPaneId;
                 const current = this.pluginHost.getSharedState(resolveStateKey(meta.stateKey, paneId));
                 const currentValid = current &&
                     Number.isFinite(current.visibleMin) &&
@@ -494,9 +485,7 @@ export class IndicatorScheduler {
             if (state === undefined)
                 continue;
             this.checkVisibleExtremes(state, meta.displayName);
-            const paneId = meta.paneIdField
-                ? this.configSnapshot[meta.paneIdField]
-                : meta.defaultPaneId;
+            const paneId = this.paneIdOverrides.get(meta.name) ?? meta.defaultPaneId;
             meta.applyResult(this.pluginHost, state, paneId);
             if (meta.category === 'main') {
                 mainStateUpdated = true;
@@ -509,9 +498,7 @@ export class IndicatorScheduler {
         const activeIds = this.getActiveSubPaneIds?.() ?? [];
         const mask = {};
         for (const meta of this.registry.getAll()) {
-            if (!meta.paneIdField)
-                continue;
-            const paneId = this.configSnapshot[meta.paneIdField] ?? meta.defaultPaneId;
+            const paneId = this.paneIdOverrides.get(meta.name) ?? meta.defaultPaneId;
             mask[meta.name] = activeIds.includes(paneId) || !!(meta.allowMainPane && paneId === 'main');
         }
         return mask;
@@ -523,9 +510,7 @@ export class IndicatorScheduler {
             return { ...this.configSnapshot };
         const cfg = { ...this.configSnapshot };
         for (const meta of this.registry.getAll()) {
-            if (!meta.paneIdField)
-                continue;
-            const paneId = cfg[meta.paneIdField];
+            const paneId = this.paneIdOverrides.get(meta.name) ?? meta.defaultPaneId;
             if (!activeIds.includes(paneId) && paneId !== 'main') {
                 const subCfg = { ...cfg[meta.name] };
                 for (const k of Object.keys(subCfg)) {
@@ -569,385 +554,25 @@ export class IndicatorScheduler {
         }
     }
     /**
-     * MA 配置变更
-     */
-    updateMAConfig(config) {
-        this.configSnapshot.ma = { ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * BOLL 配置变更
-     */
-    updateBOLLConfig(config) {
-        this.configSnapshot.boll = { ...this.configSnapshot.boll, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * EXPMA 配置变更
-     */
-    updateEXPMAConfig(config) {
-        this.configSnapshot.expma = { ...this.configSnapshot.expma, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * ENE 配置变更
-     */
-    updateENEConfig(config) {
-        this.configSnapshot.ene = { ...this.configSnapshot.ene, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * RSI 配置变更
-     */
-    updateRSIConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.rsiPaneId = paneId;
-        }
-        this.configSnapshot.rsi = { ...this.configSnapshot.rsi, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * CCI 配置变更
-     */
-    updateCCIConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.cciPaneId = paneId;
-        }
-        this.configSnapshot.cci = { ...this.configSnapshot.cci, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * STOCH 配置变更
-     */
-    updateSTOCHConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.stochPaneId = paneId;
-        }
-        this.configSnapshot.stoch = { ...this.configSnapshot.stoch, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * MOM 配置变更
-     */
-    updateMOMConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.momPaneId = paneId;
-        }
-        this.configSnapshot.mom = { ...this.configSnapshot.mom, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * WMSR 配置变更
-     */
-    updateWMSRConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.wmsrPaneId = paneId;
-        }
-        this.configSnapshot.wmsr = { ...this.configSnapshot.wmsr, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * KST 配置变更
-     */
-    updateKSTConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.kstPaneId = paneId;
-        }
-        this.configSnapshot.kst = { ...this.configSnapshot.kst, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * FASTK 配置变更
-     */
-    updateFASTKConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.fastkPaneId = paneId;
-        }
-        this.configSnapshot.fastk = { ...this.configSnapshot.fastk, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * MACD 配置变更
-     */
-    updateMACDConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.macdPaneId = paneId;
-        }
-        this.configSnapshot.macd = { ...this.configSnapshot.macd, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * ATR 配置变更
-     */
-    updateATRConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.atrPaneId = paneId;
-        }
-        this.configSnapshot.atr = { ...this.configSnapshot.atr, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * WMA 配置变更
-     */
-    updateWMAConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.wmaPaneId = paneId;
-        }
-        this.configSnapshot.wma = { ...this.configSnapshot.wma, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * DEMA 配置变更
-     */
-    updateDEMAConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.demaPaneId = paneId;
-        }
-        this.configSnapshot.dema = { ...this.configSnapshot.dema, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * TEMA 配置变更
-     */
-    updateTEMAConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.temaPaneId = paneId;
-        }
-        this.configSnapshot.tema = { ...this.configSnapshot.tema, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * HMA 配置变更
+     * 通用指标配置变更入口
      */
-    updateHMAConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.hmaPaneId = paneId;
+    updateIndicatorConfig(indicatorId, config, paneId) {
+        const meta = this.registry.get(indicatorId);
+        if (!meta?.runtime) {
+            console.warn(`[IndicatorScheduler] Unknown or unregistered indicator: ${indicatorId}`);
+            return;
         }
-        this.configSnapshot.hma = { ...this.configSnapshot.hma, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * KAMA 配置变更
-     */
-    updateKAMAConfig(config, paneId) {
+        const rt = meta.runtime;
+        // Update paneId if provided
         if (paneId !== undefined) {
-            this.configSnapshot.kamaPaneId = paneId;
+            this.paneIdOverrides.set(indicatorId, paneId);
         }
-        this.configSnapshot.kama = { ...this.configSnapshot.kama, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * SAR 配置变更
-     */
-    updateSARConfig(config, paneId) {
-        if (paneId !== undefined) {
-            this.configSnapshot.sarPaneId = paneId;
-        }
-        this.configSnapshot.sar = { ...this.configSnapshot.sar, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * SuperTrend 配置变更
-     */
-    updateSuperTrendConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.supertrendPaneId = paneId;
-        this.configSnapshot.supertrend = { ...this.configSnapshot.supertrend, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * Keltner 配置变更
-     */
-    updateKeltnerConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.keltnerPaneId = paneId;
-        this.configSnapshot.keltner = { ...this.configSnapshot.keltner, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * Donchian 配置变更
-     */
-    updateDonchianConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.donchianPaneId = paneId;
-        this.configSnapshot.donchian = { ...this.configSnapshot.donchian, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * Ichimoku 配置变更
-     */
-    updateIchimokuConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.ichimokuPaneId = paneId;
-        this.configSnapshot.ichimoku = { ...this.configSnapshot.ichimoku, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * ROC 配置变更
-     */
-    updateROCConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.rocPaneId = paneId;
-        this.configSnapshot.roc = { ...this.configSnapshot.roc, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * TRIX 配置变更
-     */
-    updateTRIXConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.trixPaneId = paneId;
-        this.configSnapshot.trix = { ...this.configSnapshot.trix, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * HV 配置变更
-     */
-    updateHVConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.hvPaneId = paneId;
-        this.configSnapshot.hv = { ...this.configSnapshot.hv, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * Parkinson 配置变更
-     */
-    updateParkinsonConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.parkinsonPaneId = paneId;
-        this.configSnapshot.parkinson = { ...this.configSnapshot.parkinson, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * ChaikinVol 配置变更
-     */
-    updateChaikinVolConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.chaikinVolPaneId = paneId;
-        this.configSnapshot.chaikinVol = { ...this.configSnapshot.chaikinVol, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * VMA 配置变更
-     */
-    updateVMAConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.vmaPaneId = paneId;
-        this.configSnapshot.vma = { ...this.configSnapshot.vma, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * OBV 配置变更
-     */
-    updateOBVConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.obvPaneId = paneId;
-        this.configSnapshot.obv = { ...this.configSnapshot.obv, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * PVT 配置变更
-     */
-    updatePVTConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.pvtPaneId = paneId;
-        this.configSnapshot.pvt = { ...this.configSnapshot.pvt, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /**
-     * VWAP 配置变更
-     */
-    updateVWAPConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.vwapPaneId = paneId;
-        this.configSnapshot.vwap = { ...this.configSnapshot.vwap, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /** CMF 配置变更 */
-    updateCMFConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.cmfPaneId = paneId;
-        this.configSnapshot.cmf = { ...this.configSnapshot.cmf, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /** MFI 配置变更 */
-    updateMFIConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.mfiPaneId = paneId;
-        this.configSnapshot.mfi = { ...this.configSnapshot.mfi, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /** Pivot 配置变更 */
-    updatePivotConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.pivotPaneId = paneId;
-        this.configSnapshot.pivot = { ...this.configSnapshot.pivot, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /** Fib 配置变更 */
-    updateFibConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.fibPaneId = paneId;
-        this.configSnapshot.fib = { ...this.configSnapshot.fib, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /** Structure 配置变更 */
-    updateStructureConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.structurePaneId = paneId;
-        this.configSnapshot.structure = { ...this.configSnapshot.structure, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /** Zones 配置变更 */
-    updateZonesConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.zonesPaneId = paneId;
-        this.configSnapshot.zones = { ...this.configSnapshot.zones, ...config };
-        this.configVersion++;
-        this.triggerRecompute();
-    }
-    /** Volume Profile 配置变更 */
-    updateVolumeProfileConfig(config, paneId) {
-        if (paneId !== undefined)
-            this.configSnapshot.volumeProfilePaneId = paneId;
-        this.configSnapshot.volumeProfile = { ...this.configSnapshot.volumeProfile, ...config };
+        // Merge config
+        ;
+        this.configSnapshot[rt.configKey] = {
+            ...(this.configSnapshot[rt.configKey] ?? {}),
+            ...config,
+        };
         this.configVersion++;
         this.triggerRecompute();
     }
@@ -1024,7 +649,10 @@ export class IndicatorScheduler {
     }
     computeWithInline() {
         if (!this.inlineRuntime) {
-            this.inlineRuntime = new IndicatorRuntime();
+            const runtimeDescs = this.registry.getAll()
+                .filter(m => m.runtime)
+                .map(m => m.runtime);
+            this.inlineRuntime = new IndicatorRuntime(runtimeDescs);
         }
         console.log(`[IndicatorScheduler] >> INLINE compute: dataV=${this.dataVersion} configV=${this.configVersion}`);
         // 设置数据和配置（仅活跃副图）