@yuants/app-virtual-exchange 0.17.0 → 0.18.0

package/lib/series-collector/forwards-ohlc.js

@@ -4,78 +4,45 @@
 // 然后对每个序列，向对应的 IngestOHLC Service 发送拉取请求，补齐历史数据。
 // 使用 Token Bucket 控制每个数据源的请求速率，避免过载。
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleIngestOHLCForward = void 0;
 const data_ohlc_1 = require("@yuants/data-ohlc");
-const exchange_1 = require("@yuants/exchange");
 const protocol_1 = require("@yuants/protocol");
 const sql_1 = require("@yuants/sql");
 const utils_1 = require("@yuants/utils");
-const rxjs_1 = require("rxjs");
 const terminal = protocol_1.Terminal.fromNodeEnv();
-const listForwardSeriesIds = async () => {
-    const product_ids = await (0, sql_1.requestSQL)(terminal, `select product_id from product`);
-    console.time('[SeriesCollector][OHLC][Forwards] calc');
-    const series_ids = new Set();
-    for (const terminalInfo of terminal.terminalInfos) {
-        for (const serviceInfo of Object.values(terminalInfo.serviceInfo || {})) {
-            if (serviceInfo.method !== 'IngestOHLC')
-                continue;
-            try {
-                const meta = (0, exchange_1.parseOHLCServiceMetadataFromSchema)(serviceInfo.schema);
-                if (meta.direction !== 'forward')
-                    continue;
-                for (const { product_id } of product_ids) {
-                    if (!product_id.startsWith(meta.product_id_prefix))
-                        continue;
-                    for (const duration of meta.duration_list) {
-                        const series_id = (0, data_ohlc_1.encodeOHLCSeriesId)(product_id, duration);
-                        series_ids.add(series_id);
-                    }
-                }
-            }
-            finally {
-            }
-        }
+const ingestCounter = terminal.metrics
+    .counter('series_collector_ingest_count', '')
+    .labels({ terminal_id: terminal.terminal_id, type: 'ohlc', task: 'forward' });
+const handleIngestOHLCForward = async (series_id, direction, signal) => {
+    var _a, _b, _c, _d;
+    const { product_id, duration } = (0, data_ohlc_1.decodeOHLCSeriesId)(series_id);
+    const [datasource_id] = (0, utils_1.decodePath)(product_id);
+    // 控制速率：每个数据源每秒钟只能请求一次
+    await (0, utils_1.tokenBucket)(`ohlc:forward:${datasource_id}`).acquire();
+    let req;
+    if (direction === 'forward') {
+        const [record] = await (0, sql_1.requestSQL)(terminal, `select end_time from series_data_range where series_id = ${(0, sql_1.escapeSQL)(series_id)} and table_name = 'ohlc_v2' order by end_time desc limit 1`);
+        const time = record ? new Date(record.end_time).getTime() : 0;
+        req = {
+            product_id,
+            duration,
+            direction: 'forward',
+            time,
+        };
     }
-    console.timeEnd('[SeriesCollector][OHLC][Forwards] calc');
-    return series_ids;
+    else {
+        // backward
+        req = {
+            product_id,
+            duration,
+            direction,
+            time: Date.now(),
+        };
+    }
+    console.info((0, utils_1.formatTime)(Date.now()), '[SeriesCollector][OHLC][Forward]', 'Request', `product_id=${req.product_id}, duration=${req.duration}, direction=${req.direction}, time=${(0, utils_1.formatTime)(req.time)}`);
+    const res = await terminal.client.requestForResponseData('IngestOHLC', req);
+    ingestCounter.inc(res.wrote_count || 0);
+    console.info((0, utils_1.formatTime)(Date.now()), '[SeriesCollector][OHLC][Forward]', 'Response', `series_id=${series_id}, ingested_count=${res.wrote_count}, start_time=${(0, utils_1.formatTime)((_b = (_a = res.range) === null || _a === void 0 ? void 0 : _a.start_time) !== null && _b !== void 0 ? _b : NaN)}, end_time=${(0, utils_1.formatTime)((_d = (_c = res.range) === null || _c === void 0 ? void 0 : _c.end_time) !== null && _d !== void 0 ? _d : NaN)}`);
 };
-(0, rxjs_1.defer)(async () => {
-    const time = Date.now();
-    const series_ids = await listForwardSeriesIds();
-    console.log(`[SeriesCollector][OHLC][Forwards] Found ${series_ids.size} series to collect forwards data for. (${(0, utils_1.formatTime)(Date.now() - time)})`);
-    await Promise.all([...series_ids].map(async (series_id) => {
-        var _a, _b, _c, _d;
-        try {
-            const { product_id, duration } = (0, data_ohlc_1.decodeOHLCSeriesId)(series_id);
-            const [datasource_id] = (0, utils_1.decodePath)(product_id);
-            // 控制速率：每个数据源每秒钟只能请求一次
-            await (0, utils_1.tokenBucket)(`ohlc_forwards_target_${datasource_id}`, {
-                refillInterval: 1000,
-                capacity: 1,
-            }).acquire();
-            {
-                const [record] = await (0, sql_1.requestSQL)(terminal, `select end_time from series_data_range where series_id = ${(0, sql_1.escapeSQL)(series_id)} and table_name = 'ohlc_v2' order by end_time desc limit 1`);
-                const time = record ? new Date(record.end_time).getTime() : 0;
-                const req = {
-                    product_id,
-                    duration,
-                    direction: 'forward',
-                    time,
-                };
-                console.info((0, utils_1.formatTime)(Date.now()), 'DispatchIngestOHLC_Forwards', `product_id=${product_id}, duration=${duration}, time=${(0, utils_1.formatTime)(time)}`);
-                const res = await terminal.client.requestForResponseData('IngestOHLC', req);
-                terminal.metrics
-                    .counter('series_collector_forwards_ingest_count', '')
-                    .labels({ terminal_id: terminal.terminal_id, type: 'ohlc' })
-                    .inc(res.wrote_count || 0);
-                console.info((0, utils_1.formatTime)(Date.now()), 'DispatchIngestOHLCResult_Forwards', `series_id=${series_id}, ingested_count=${res.wrote_count}, start_time=${(0, utils_1.formatTime)((_b = (_a = res.range) === null || _a === void 0 ? void 0 : _a.start_time) !== null && _b !== void 0 ? _b : NaN)}, end_time=${(0, utils_1.formatTime)((_d = (_c = res.range) === null || _c === void 0 ? void 0 : _c.end_time) !== null && _d !== void 0 ? _d : NaN)}`);
-            }
-        }
-        catch (e) {
-            console.info((0, utils_1.formatTime)(Date.now()), 'DispatchIngestOHLCError_Forwards', `series_id=${series_id}`, e);
-        }
-    }));
-})
-    .pipe((0, rxjs_1.retry)({ delay: 1000 }), (0, rxjs_1.repeat)({ delay: 1000 }))
-    .subscribe();
+exports.handleIngestOHLCForward = handleIngestOHLCForward;
 //# sourceMappingURL=forwards-ohlc.js.map

package/lib/series-collector/forwards-ohlc.js.map

@@ -1 +1 @@
-{"version":3,"file":"forwards-ohlc.js","sourceRoot":"","sources":["../../src/series-collector/forwards-ohlc.ts"],"names":[],"mappings":"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","sourcesContent":["// 解决 Forwards 拉取历史数据的调度器\n// 该文件会定期扫描所有 Terminal 的 ServiceInfo，提取出所有支持 Forwards 拉取的序列。\n// 然后对每个序列，向对应的 IngestOHLC Service 发送拉取请求，补齐历史数据。\n// 使用 Token Bucket 控制每个数据源的请求速率，避免过载。\n\nimport { decodeOHLCSeriesId, encodeOHLCSeriesId } from '@yuants/data-ohlc';\nimport {\n  IIngestOHLCRequest,\n  ISeriesIngestResult,\n  parseOHLCServiceMetadataFromSchema,\n} from '@yuants/exchange';\nimport { Terminal } from '@yuants/protocol';\nimport { escapeSQL, requestSQL } from '@yuants/sql';\nimport { decodePath, formatTime, tokenBucket } from '@yuants/utils';\nimport { defer, repeat, retry } from 'rxjs';\n\nconst terminal = Terminal.fromNodeEnv();\n\nconst listForwardSeriesIds = async () => {\n  const product_ids = await requestSQL<{ product_id: string }[]>(terminal, `select product_id from product`);\n\n  console.time('[SeriesCollector][OHLC][Forwards] calc');\n\n  const series_ids = new Set<string>();\n  for (const terminalInfo of terminal.terminalInfos) {\n    for (const serviceInfo of Object.values(terminalInfo.serviceInfo || {})) {\n      if (serviceInfo.method !== 'IngestOHLC') continue;\n      try {\n        const meta = parseOHLCServiceMetadataFromSchema(serviceInfo.schema);\n        if (meta.direction !== 'forward') continue;\n\n        for (const { product_id } of product_ids) {\n          if (!product_id.startsWith(meta.product_id_prefix)) continue;\n          for (const duration of meta.duration_list) {\n            const series_id = encodeOHLCSeriesId(product_id, duration);\n            series_ids.add(series_id);\n          }\n        }\n      } finally {\n      }\n    }\n  }\n\n  console.timeEnd('[SeriesCollector][OHLC][Forwards] calc');\n\n  return series_ids;\n};\n\ndefer(async () => {\n  const time = Date.now();\n  const series_ids = await listForwardSeriesIds();\n  console.log(\n    `[SeriesCollector][OHLC][Forwards] Found ${\n      series_ids.size\n    } series to collect forwards data for. (${formatTime(Date.now() - time)})`,\n  );\n\n  await Promise.all(\n    [...series_ids].map(async (series_id) => {\n      try {\n        const { product_id, duration } = decodeOHLCSeriesId(series_id);\n        const [datasource_id] = decodePath(product_id);\n        // 控制速率：每个数据源每秒钟只能请求一次\n        await tokenBucket(`ohlc_forwards_target_${datasource_id}`, {\n          refillInterval: 1000,\n          capacity: 1,\n        }).acquire();\n        {\n          const [record] = await requestSQL<\n            {\n              end_time: string;\n            }[]\n          >(\n            terminal,\n            `select end_time from series_data_range where series_id = ${escapeSQL(\n              series_id,\n            )} and table_name = 'ohlc_v2' order by end_time desc limit 1`,\n          );\n\n          const time = record ? new Date(record.end_time).getTime() : 0;\n\n          const req: IIngestOHLCRequest = {\n            product_id,\n            duration,\n            direction: 'forward',\n            time,\n          };\n\n          console.info(\n            formatTime(Date.now()),\n            'DispatchIngestOHLC_Forwards',\n            `product_id=${product_id}, duration=${duration}, time=${formatTime(time)}`,\n          );\n\n          const res = await terminal.client.requestForResponseData<IIngestOHLCRequest, ISeriesIngestResult>(\n            'IngestOHLC',\n            req,\n          );\n\n          terminal.metrics\n            .counter('series_collector_forwards_ingest_count', '')\n            .labels({ terminal_id: terminal.terminal_id, type: 'ohlc' })\n            .inc(res.wrote_count || 0);\n\n          console.info(\n            formatTime(Date.now()),\n            'DispatchIngestOHLCResult_Forwards',\n            `series_id=${series_id}, ingested_count=${res.wrote_count}, start_time=${formatTime(\n              res.range?.start_time ?? NaN,\n            )}, end_time=${formatTime(res.range?.end_time ?? NaN)}`,\n          );\n        }\n      } catch (e) {\n        console.info(formatTime(Date.now()), 'DispatchIngestOHLCError_Forwards', `series_id=${series_id}`, e);\n      }\n    }),\n  );\n})\n  .pipe(retry({ delay: 1000 }), repeat({ delay: 1000 }))\n  .subscribe();\n"]}
+{"version":3,"file":"forwards-ohlc.js","sourceRoot":"","sources":["../../src/series-collector/forwards-ohlc.ts"],"names":[],"mappings":";AAAA,yBAAyB;AACzB,4DAA4D;AAC5D,iDAAiD;AACjD,qCAAqC;;;AAErC,iDAAuD;AAEvD,+CAA4C;AAC5C,qCAAoD;AACpD,yCAAoE;AAEpE,MAAM,QAAQ,GAAG,mBAAQ,CAAC,WAAW,EAAE,CAAC;AAExC,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO;KACnC,OAAO,CAAC,+BAA+B,EAAE,EAAE,CAAC;KAC5C,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;AAEzE,MAAM,uBAAuB,GAAG,KAAK,EAC1C,SAAiB,EACjB,SAAiC,EACjC,MAAmB,EACnB,EAAE;;IACF,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAA,8BAAkB,EAAC,SAAS,CAAC,CAAC;IAC/D,MAAM,CAAC,aAAa,CAAC,GAAG,IAAA,kBAAU,EAAC,UAAU,CAAC,CAAC;IAC/C,sBAAsB;IACtB,MAAM,IAAA,mBAAW,EAAC,gBAAgB,aAAa,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC7D,IAAI,GAAuB,CAAC;IAC5B,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAA,gBAAU,EAK/B,QAAQ,EACR,4DAA4D,IAAA,eAAS,EACnE,SAAS,CACV,4DAA4D,CAC9D,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9D,GAAG,GAAG;YACJ,UAAU;YACV,QAAQ;YACR,SAAS,EAAE,SAAS;YACpB,IAAI;SACL,CAAC;KACH;SAAM;QACL,WAAW;QACX,GAAG,GAAG;YACJ,UAAU;YACV,QAAQ;YACR,SAAS;YACT,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;SACjB,CAAC;KACH;IAED,OAAO,CAAC,IAAI,CACV,IAAA,kBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EACtB,kCAAkC,EAClC,SAAS,EACT,cAAc,GAAG,CAAC,UAAU,cAAc,GAAG,CAAC,QAAQ,eAAe,GAAG,CAAC,SAAS,UAAU,IAAA,kBAAU,EACpG,GAAG,CAAC,IAAI,CACT,EAAE,CACJ,CAAC;IAEF,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,sBAAsB,CACtD,YAAY,EACZ,GAAG,CACJ,CAAC;IAEF,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;IAExC,OAAO,CAAC,IAAI,CACV,IAAA,kBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EACtB,kCAAkC,EAClC,UAAU,EACV,aAAa,SAAS,oBAAoB,GAAG,CAAC,WAAW,gBAAgB,IAAA,kBAAU,EACjF,MAAA,MAAA,GAAG,CAAC,KAAK,0CAAE,UAAU,mCAAI,GAAG,CAC7B,cAAc,IAAA,kBAAU,EAAC,MAAA,MAAA,GAAG,CAAC,KAAK,0CAAE,QAAQ,mCAAI,GAAG,CAAC,EAAE,CACxD,CAAC;AACJ,CAAC,CAAC;AAhEW,QAAA,uBAAuB,2BAgElC","sourcesContent":["// 解决 Forwards 拉取历史数据的调度器\n// 该文件会定期扫描所有 Terminal 的 ServiceInfo，提取出所有支持 Forwards 拉取的序列。\n// 然后对每个序列，向对应的 IngestOHLC Service 发送拉取请求，补齐历史数据。\n// 使用 Token Bucket 控制每个数据源的请求速率，避免过载。\n\nimport { decodeOHLCSeriesId } from '@yuants/data-ohlc';\nimport { IIngestOHLCRequest, ISeriesIngestResult } from '@yuants/exchange';\nimport { Terminal } from '@yuants/protocol';\nimport { escapeSQL, requestSQL } from '@yuants/sql';\nimport { decodePath, formatTime, tokenBucket } from '@yuants/utils';\n\nconst terminal = Terminal.fromNodeEnv();\n\nconst ingestCounter = terminal.metrics\n  .counter('series_collector_ingest_count', '')\n  .labels({ terminal_id: terminal.terminal_id, type: 'ohlc', task: 'forward' });\n\nexport const handleIngestOHLCForward = async (\n  series_id: string,\n  direction: 'forward' | 'backward',\n  signal: AbortSignal,\n) => {\n  const { product_id, duration } = decodeOHLCSeriesId(series_id);\n  const [datasource_id] = decodePath(product_id);\n  // 控制速率：每个数据源每秒钟只能请求一次\n  await tokenBucket(`ohlc:forward:${datasource_id}`).acquire();\n  let req: IIngestOHLCRequest;\n  if (direction === 'forward') {\n    const [record] = await requestSQL<\n      {\n        end_time: string;\n      }[]\n    >(\n      terminal,\n      `select end_time from series_data_range where series_id = ${escapeSQL(\n        series_id,\n      )} and table_name = 'ohlc_v2' order by end_time desc limit 1`,\n    );\n\n    const time = record ? new Date(record.end_time).getTime() : 0;\n\n    req = {\n      product_id,\n      duration,\n      direction: 'forward',\n      time,\n    };\n  } else {\n    // backward\n    req = {\n      product_id,\n      duration,\n      direction,\n      time: Date.now(),\n    };\n  }\n\n  console.info(\n    formatTime(Date.now()),\n    '[SeriesCollector][OHLC][Forward]',\n    'Request',\n    `product_id=${req.product_id}, duration=${req.duration}, direction=${req.direction}, time=${formatTime(\n      req.time,\n    )}`,\n  );\n\n  const res = await terminal.client.requestForResponseData<IIngestOHLCRequest, ISeriesIngestResult>(\n    'IngestOHLC',\n    req,\n  );\n\n  ingestCounter.inc(res.wrote_count || 0);\n\n  console.info(\n    formatTime(Date.now()),\n    '[SeriesCollector][OHLC][Forward]',\n    'Response',\n    `series_id=${series_id}, ingested_count=${res.wrote_count}, start_time=${formatTime(\n      res.range?.start_time ?? NaN,\n    )}, end_time=${formatTime(res.range?.end_time ?? NaN)}`,\n  );\n};\n"]}

package/lib/series-collector/index.d.ts

@@ -1,4 +1,3 @@
-import './backwards-ohlc';
-import './forwards-ohlc';
 import './interest-rate';
+import './ohlc';
 //# sourceMappingURL=index.d.ts.map

package/lib/series-collector/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/series-collector/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,iBAAiB,CAAC;AACzB,OAAO,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/series-collector/index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AACzB,OAAO,QAAQ,CAAC"}

package/lib/series-collector/index.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-require("./backwards-ohlc");
-require("./forwards-ohlc");
 require("./interest-rate");
+require("./ohlc");
 //# sourceMappingURL=index.js.map

package/lib/series-collector/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/series-collector/index.ts"],"names":[],"mappings":";;AAAA,4BAA0B;AAC1B,2BAAyB;AACzB,2BAAyB","sourcesContent":["import './backwards-ohlc';\nimport './forwards-ohlc';\nimport './interest-rate';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/series-collector/index.ts"],"names":[],"mappings":";;AAAA,2BAAyB;AACzB,kBAAgB","sourcesContent":["import './interest-rate';\nimport './ohlc';\n"]}

package/lib/series-collector/interest-rate.js

@@ -17,7 +17,9 @@ const patch_interest_rate_1 = require("./patch-interest-rate");
     const forwardTask = (0, rxjs_1.defer)(async () => {
         await (0, forwards_interest_rate_1.handleIngestInterestRateForward)(product_id, meta, abortController.signal);
     })
-        .pipe((0, rxjs_1.retry)(), (0, rxjs_1.repeat)())
+        .pipe((0, rxjs_1.tap)({
+        error: (err) => console.info((0, utils_1.formatTime)(Date.now()), `[SeriesCollector][InterestRate][Forward]`, 'Error', err),
+    }), (0, rxjs_1.retry)(), (0, rxjs_1.repeat)())
         .subscribe();
     sub.add(() => {
         forwardTask.unsubscribe();
@@ -26,7 +28,9 @@ const patch_interest_rate_1 = require("./patch-interest-rate");
     const backwardTask = (0, rxjs_1.defer)(async () => {
         await (0, backwards_interest_rate_1.handleIngestInterestRateBackward)(product_id, meta, abortController.signal);
     })
-        .pipe((0, rxjs_1.retry)(), (0, rxjs_1.repeat)())
+        .pipe((0, rxjs_1.tap)({
+        error: (err) => console.info((0, utils_1.formatTime)(Date.now()), `[SeriesCollector][InterestRate][Backward]`, 'Error', err),
+    }), (0, rxjs_1.retry)(), (0, rxjs_1.repeat)())
         .subscribe();
     sub.add(() => {
         backwardTask.unsubscribe();
@@ -35,7 +39,9 @@ const patch_interest_rate_1 = require("./patch-interest-rate");
     const patchTask = (0, rxjs_1.defer)(async () => {
         await (0, patch_interest_rate_1.handleInterestRatePatch)(product_id, meta, abortController.signal);
     })
-        .pipe((0, rxjs_1.retry)(), (0, rxjs_1.repeat)())
+        .pipe((0, rxjs_1.tap)({
+        error: (err) => console.info((0, utils_1.formatTime)(Date.now()), `[SeriesCollector][InterestRate][Patch]`, 'Error', err),
+    }), (0, rxjs_1.retry)(), (0, rxjs_1.repeat)())
         .subscribe();
     sub.add(() => {
         patchTask.unsubscribe();

package/lib/series-collector/interest-rate.js.map

@@ -1 +1 @@
-{"version":3,"file":"interest-rate.js","sourceRoot":"","sources":["../../src/series-collector/interest-rate.ts"],"names":[],"mappings":";;AAAA,yCAA0C;AAC1C,+BAA6D;AAC7D,uEAA6E;AAC7E,2CAAwD;AACxD,qEAA2E;AAC3E,+DAAgE;AAEhE,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAA,qCAAyB,GAAE,CAAC;KACrC,IAAI,CACH,IAAA,YAAK,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACtB,IAAA,aAAM,EAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EACxB,IAAA,UAAG,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EACnC,IAAA,iBAAS,EACP,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EACX,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,CACrB,IAAI,iBAAU,CAAC,CAAC,GAAG,EAAE,EAAE;IACrB,mDAAmD;IACnD,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAE9C,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE;QACX,eAAe,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,UAAU;IACV,MAAM,WAAW,GAAG,IAAA,YAAK,EAAC,KAAK,IAAI,EAAE;QACnC,MAAM,IAAA,wDAA+B,EAAC,UAAU,EAAE,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IAClF,CAAC,CAAC;SACC,IAAI,CAAC,IAAA,YAAK,GAAE,EAAE,IAAA,aAAM,GAAE,CAAC;SACvB,SAAS,EAAE,CAAC;IAEf,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE;QACX,WAAW,CAAC,WAAW,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,SAAS;IACT,MAAM,YAAY,GAAG,IAAA,YAAK,EAAC,KAAK,IAAI,EAAE;QACpC,MAAM,IAAA,0DAAgC,EAAC,UAAU,EAAE,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IACnF,CAAC,CAAC;SACC,IAAI,CAAC,IAAA,YAAK,GAAE,EAAE,IAAA,aAAM,GAAE,CAAC;SACvB,SAAS,EAAE,CAAC;IAEf,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE;QACX,YAAY,CAAC,WAAW,EAAE,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,SAAS;IACT,MAAM,SAAS,GAAG,IAAA,YAAK,EAAC,KAAK,IAAI,EAAE;QACjC,MAAM,IAAA,6CAAuB,EAAC,UAAU,EAAE,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IAC1E,CAAC,CAAC;SACC,IAAI,CAAC,IAAA,YAAK,GAAE,EAAE,IAAA,aAAM,GAAE,CAAC;SACvB,SAAS,EAAE,CAAC;IAEf,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE;QACX,SAAS,CAAC,WAAW,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CACL,CACF;KACA,SAAS,EAAE,CAAC","sourcesContent":["import { listWatch } from '@yuants/utils';\nimport { defer, map, Observable, repeat, retry } from 'rxjs';\nimport { handleIngestInterestRateBackward } from './backwards-interest-rate';\nimport { listInterestRateSeriesIds } from './discovery';\nimport { handleIngestInterestRateForward } from './forwards-interest-rate';\nimport { handleInterestRatePatch } from './patch-interest-rate';\n\ndefer(() => listInterestRateSeriesIds())\n  .pipe(\n    retry({ delay: 1000 }),\n    repeat({ delay: 60000 }),\n    map((x) => Array.from(x.entries())),\n    listWatch(\n      (x) => x[0],\n      ([product_id, meta]) =>\n        new Observable((sub) => {\n          // 处理每个利率品种任务: (forward / backward / patch)，都需要独立调度\n          const abortController = new AbortController();\n\n          sub.add(() => {\n            abortController.abort();\n          });\n\n          // 先处理前向任务\n          const forwardTask = defer(async () => {\n            await handleIngestInterestRateForward(product_id, meta, abortController.signal);\n          })\n            .pipe(retry(), repeat())\n            .subscribe();\n\n          sub.add(() => {\n            forwardTask.unsubscribe();\n          });\n\n          // 设置后向任务\n          const backwardTask = defer(async () => {\n            await handleIngestInterestRateBackward(product_id, meta, abortController.signal);\n          })\n            .pipe(retry(), repeat())\n            .subscribe();\n\n          sub.add(() => {\n            backwardTask.unsubscribe();\n          });\n\n          // 设置补齐任务\n          const patchTask = defer(async () => {\n            await handleInterestRatePatch(product_id, meta, abortController.signal);\n          })\n            .pipe(retry(), repeat())\n            .subscribe();\n\n          sub.add(() => {\n            patchTask.unsubscribe();\n          });\n        }),\n    ),\n  )\n  .subscribe();\n"]}
+{"version":3,"file":"interest-rate.js","sourceRoot":"","sources":["../../src/series-collector/interest-rate.ts"],"names":[],"mappings":"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","sourcesContent":["import { formatTime, listWatch } from '@yuants/utils';\nimport { defer, map, Observable, repeat, retry, tap } from 'rxjs';\nimport { handleIngestInterestRateBackward } from './backwards-interest-rate';\nimport { listInterestRateSeriesIds } from './discovery';\nimport { handleIngestInterestRateForward } from './forwards-interest-rate';\nimport { handleInterestRatePatch } from './patch-interest-rate';\n\ndefer(() => listInterestRateSeriesIds())\n  .pipe(\n    retry({ delay: 1000 }),\n    repeat({ delay: 60000 }),\n    map((x) => Array.from(x.entries())),\n    listWatch(\n      (x) => x[0],\n      ([product_id, meta]) =>\n        new Observable((sub) => {\n          // 处理每个利率品种任务: (forward / backward / patch)，都需要独立调度\n          const abortController = new AbortController();\n\n          sub.add(() => {\n            abortController.abort();\n          });\n\n          // 先处理前向任务\n          const forwardTask = defer(async () => {\n            await handleIngestInterestRateForward(product_id, meta, abortController.signal);\n          })\n            .pipe(\n              tap({\n                error: (err) =>\n                  console.info(\n                    formatTime(Date.now()),\n                    `[SeriesCollector][InterestRate][Forward]`,\n                    'Error',\n                    err,\n                  ),\n              }),\n\n              retry(),\n              repeat(),\n            )\n            .subscribe();\n\n          sub.add(() => {\n            forwardTask.unsubscribe();\n          });\n\n          // 设置后向任务\n          const backwardTask = defer(async () => {\n            await handleIngestInterestRateBackward(product_id, meta, abortController.signal);\n          })\n            .pipe(\n              tap({\n                error: (err) =>\n                  console.info(\n                    formatTime(Date.now()),\n                    `[SeriesCollector][InterestRate][Backward]`,\n                    'Error',\n                    err,\n                  ),\n              }),\n              retry(),\n              repeat(),\n            )\n            .subscribe();\n\n          sub.add(() => {\n            backwardTask.unsubscribe();\n          });\n\n          // 设置补齐任务\n          const patchTask = defer(async () => {\n            await handleInterestRatePatch(product_id, meta, abortController.signal);\n          })\n            .pipe(\n              tap({\n                error: (err) =>\n                  console.info(\n                    formatTime(Date.now()),\n                    `[SeriesCollector][InterestRate][Patch]`,\n                    'Error',\n                    err,\n                  ),\n              }),\n              retry(),\n              repeat(),\n            )\n            .subscribe();\n\n          sub.add(() => {\n            patchTask.unsubscribe();\n          });\n        }),\n    ),\n  )\n  .subscribe();\n"]}

package/lib/series-collector/ohlc.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ohlc.d.ts.map

package/lib/series-collector/ohlc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ohlc.d.ts","sourceRoot":"","sources":["../../src/series-collector/ohlc.ts"],"names":[],"mappings":""}

package/lib/series-collector/ohlc.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@yuants/utils");
+const rxjs_1 = require("rxjs");
+const discovery_1 = require("./discovery");
+const forwards_ohlc_1 = require("./forwards-ohlc");
+const backwards_ohlc_1 = require("./backwards-ohlc");
+const patch_ohlc_1 = require("./patch-ohlc");
+(0, rxjs_1.defer)(() => (0, discovery_1.listOHLCSeriesIds)())
+    .pipe((0, rxjs_1.retry)({ delay: 1000 }), (0, rxjs_1.repeat)({ delay: 60000 }), (0, rxjs_1.map)((x) => Array.from(x.entries())), (0, utils_1.listWatch)((x) => x[0], ([product_id, direction]) => new rxjs_1.Observable((sub) => {
+    // 处理每个利率品种任务: (forward / backward / patch)，都需要独立调度
+    const abortController = new AbortController();
+    sub.add(() => {
+        abortController.abort();
+    });
+    // 先处理前向任务
+    const forwardTask = (0, rxjs_1.defer)(async () => {
+        await (0, forwards_ohlc_1.handleIngestOHLCForward)(product_id, direction, abortController.signal);
+    })
+        .pipe((0, rxjs_1.tap)({
+        error: (err) => console.info((0, utils_1.formatTime)(Date.now()), `[SeriesCollector][OHLC][Forward]`, 'Error', err),
+    }), (0, rxjs_1.retry)(), (0, rxjs_1.repeat)())
+        .subscribe();
+    sub.add(() => {
+        forwardTask.unsubscribe();
+    });
+    // 设置后向任务
+    const backwardTask = (0, rxjs_1.defer)(async () => {
+        await (0, backwards_ohlc_1.handleIngestOHLCBackward)(product_id, direction, abortController.signal);
+    })
+        .pipe((0, rxjs_1.tap)({
+        error: (err) => console.info((0, utils_1.formatTime)(Date.now()), `[SeriesCollector][OHLC][Backward]`, 'Error', err),
+    }), (0, rxjs_1.retry)(), (0, rxjs_1.repeat)())
+        .subscribe();
+    sub.add(() => {
+        backwardTask.unsubscribe();
+    });
+    // 设置补齐任务
+    const patchTask = (0, rxjs_1.defer)(async () => {
+        await (0, patch_ohlc_1.handleOHLCPatch)(product_id, direction, abortController.signal);
+    })
+        .pipe((0, rxjs_1.tap)({
+        error: (err) => console.info((0, utils_1.formatTime)(Date.now()), `[SeriesCollector][OHLC][Patch]`, 'Error', err),
+    }), (0, rxjs_1.retry)(), (0, rxjs_1.repeat)())
+        .subscribe();
+    sub.add(() => {
+        patchTask.unsubscribe();
+    });
+})))
+    .subscribe();
+//# sourceMappingURL=ohlc.js.map

package/lib/series-collector/ohlc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ohlc.js","sourceRoot":"","sources":["../../src/series-collector/ohlc.ts"],"names":[],"mappings":"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","sourcesContent":["import { formatTime, listWatch } from '@yuants/utils';\nimport { defer, map, Observable, repeat, retry, tap } from 'rxjs';\nimport { handleIngestInterestRateBackward } from './backwards-interest-rate';\nimport { listOHLCSeriesIds } from './discovery';\nimport { handleIngestInterestRateForward } from './forwards-interest-rate';\nimport { handleInterestRatePatch } from './patch-interest-rate';\nimport { handleIngestOHLCForward } from './forwards-ohlc';\nimport { handleIngestOHLCBackward } from './backwards-ohlc';\nimport { handleOHLCPatch } from './patch-ohlc';\n\ndefer(() => listOHLCSeriesIds())\n  .pipe(\n    retry({ delay: 1000 }),\n    repeat({ delay: 60000 }),\n    map((x) => Array.from(x.entries())),\n    listWatch(\n      (x) => x[0],\n      ([product_id, direction]) =>\n        new Observable((sub) => {\n          // 处理每个利率品种任务: (forward / backward / patch)，都需要独立调度\n          const abortController = new AbortController();\n\n          sub.add(() => {\n            abortController.abort();\n          });\n\n          // 先处理前向任务\n          const forwardTask = defer(async () => {\n            await handleIngestOHLCForward(product_id, direction, abortController.signal);\n          })\n            .pipe(\n              tap({\n                error: (err) =>\n                  console.info(formatTime(Date.now()), `[SeriesCollector][OHLC][Forward]`, 'Error', err),\n              }),\n\n              retry(),\n              repeat(),\n            )\n            .subscribe();\n\n          sub.add(() => {\n            forwardTask.unsubscribe();\n          });\n\n          // 设置后向任务\n          const backwardTask = defer(async () => {\n            await handleIngestOHLCBackward(product_id, direction, abortController.signal);\n          })\n            .pipe(\n              tap({\n                error: (err) =>\n                  console.info(formatTime(Date.now()), `[SeriesCollector][OHLC][Backward]`, 'Error', err),\n              }),\n              retry(),\n              repeat(),\n            )\n            .subscribe();\n\n          sub.add(() => {\n            backwardTask.unsubscribe();\n          });\n\n          // 设置补齐任务\n          const patchTask = defer(async () => {\n            await handleOHLCPatch(product_id, direction, abortController.signal);\n          })\n            .pipe(\n              tap({\n                error: (err) =>\n                  console.info(formatTime(Date.now()), `[SeriesCollector][OHLC][Patch]`, 'Error', err),\n              }),\n              retry(),\n              repeat(),\n            )\n            .subscribe();\n\n          sub.add(() => {\n            patchTask.unsubscribe();\n          });\n        }),\n    ),\n  )\n  .subscribe();\n"]}

package/lib/series-collector/patch-interest-rate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"patch-interest-rate.d.ts","sourceRoot":"","sources":["../../src/series-collector/patch-interest-rate.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,4BAA4B,EAE7B,MAAM,kBAAkB,CAAC;AAQ1B,eAAO,MAAM,uBAAuB,eACtB,MAAM,QACZ,4BAA4B,UAC1B,WAAW,kBAmFpB,CAAC"}
+{"version":3,"file":"patch-interest-rate.d.ts","sourceRoot":"","sources":["../../src/series-collector/patch-interest-rate.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,4BAA4B,EAE7B,MAAM,kBAAkB,CAAC;AAY1B,eAAO,MAAM,uBAAuB,eACtB,MAAM,QACZ,4BAA4B,UAC1B,WAAW,kBAqFpB,CAAC"}

package/lib/series-collector/patch-interest-rate.js

@@ -5,6 +5,9 @@ const protocol_1 = require("@yuants/protocol");
 const sql_1 = require("@yuants/sql");
 const utils_1 = require("@yuants/utils");
 const terminal = protocol_1.Terminal.fromNodeEnv();
+const ingestCounter = terminal.metrics
+    .counter('series_collector_ingest_count', '')
+    .labels({ terminal_id: terminal.terminal_id, type: 'interest_rate', task: 'forward' });
 // Patch 任务：查找数据缺口并进行补齐
 const handleInterestRatePatch = async (product_id, meta, signal) => {
     var _a, _b, _c, _d;
@@ -57,6 +60,7 @@ LIMIT 1;
     }
     console.info((0, utils_1.formatTime)(Date.now()), '[SeriesCollector][InterestRate][Patch]', product_id, 'PatchRequest', `direction=${req.direction}, time=${(0, utils_1.formatTime)(req.time)}`);
     const res = await terminal.client.requestForResponseData('IngestInterestRate', req);
+    ingestCounter.inc(res.wrote_count || 0);
     console.info((0, utils_1.formatTime)(Date.now()), '[SeriesCollector][InterestRate][Patch]', product_id, 'PatchBackwardResult', `ingested_count=${res.wrote_count}, start_time=${(0, utils_1.formatTime)((_b = (_a = res.range) === null || _a === void 0 ? void 0 : _a.start_time) !== null && _b !== void 0 ? _b : NaN)}, end_time=${(0, utils_1.formatTime)((_d = (_c = res.range) === null || _c === void 0 ? void 0 : _c.end_time) !== null && _d !== void 0 ? _d : NaN)}`);
 };
 exports.handleInterestRatePatch = handleInterestRatePatch;

package/lib/series-collector/patch-interest-rate.js.map

@@ -1 +1 @@
-{"version":3,"file":"patch-interest-rate.js","sourceRoot":"","sources":["../../src/series-collector/patch-interest-rate.ts"],"names":[],"mappings":";;;AAKA,+CAA4C;AAC5C,qCAAoD;AACpD,yCAAoE;AAEpE,MAAM,QAAQ,GAAG,mBAAQ,CAAC,WAAW,EAAE,CAAC;AAExC,uBAAuB;AAChB,MAAM,uBAAuB,GAAG,KAAK,EAC1C,UAAkB,EAClB,IAAkC,EAClC,MAAmB,EACnB,EAAE;;IACF,MAAM,CAAC,aAAa,CAAC,GAAG,IAAA,kBAAU,EAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,IAAA,mBAAW,EAAC,uBAAuB,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC7E,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAA,gBAAU,EAC/B,QAAQ,EACR;;;;;;;;;;;wBAWoB,IAAA,eAAS,EAAC,UAAU,CAAC;;;;;;;;;;KAUxC,CACF,CAAC;IAEF,SAAS;IACT,IAAI,CAAC,MAAM;QAAE,OAAO;IAEpB,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/D,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;IAE3D,OAAO,CAAC,IAAI,CACV,IAAA,kBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EACtB,wCAAwC,EACxC,SAAS,EACT,UAAU,UAAU,UAAU,IAAA,kBAAU,EAAC,YAAY,CAAC,QAAQ,IAAA,kBAAU,EAAC,UAAU,CAAC,EAAE,CACvF,CAAC;IAEF,IAAI,GAA+B,CAAC;IAEpC,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;QAChC,gBAAgB;QAChB,GAAG,GAAG;YACJ,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,SAAkB;YAC7B,IAAI,EAAE,YAAY;SACnB,CAAC;KACH;SAAM;QACL,iBAAiB;QACjB,GAAG,GAAG;YACJ,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,UAAmB;YAC9B,IAAI,EAAE,UAAU;SACjB,CAAC;KACH;IAED,OAAO,CAAC,IAAI,CACV,IAAA,kBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EACtB,wCAAwC,EACxC,UAAU,EACV,cAAc,EACd,aAAa,GAAG,CAAC,SAAS,UAAU,IAAA,kBAAU,EAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAC3D,CAAC;IAEF,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,sBAAsB,CACtD,oBAAoB,EACpB,GAAG,CACJ,CAAC;IAEF,OAAO,CAAC,IAAI,CACV,IAAA,kBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EACtB,wCAAwC,EACxC,UAAU,EACV,qBAAqB,EACrB,kBAAkB,GAAG,CAAC,WAAW,gBAAgB,IAAA,kBAAU,EACzD,MAAA,MAAA,GAAG,CAAC,KAAK,0CAAE,UAAU,mCAAI,GAAG,CAC7B,cAAc,IAAA,kBAAU,EAAC,MAAA,MAAA,GAAG,CAAC,KAAK,0CAAE,QAAQ,mCAAI,GAAG,CAAC,EAAE,CACxD,CAAC;AACJ,CAAC,CAAC;AAtFW,QAAA,uBAAuB,2BAsFlC","sourcesContent":["import {\n  IIngestInterestRateRequest,\n  IInterestRateServiceMetadata,\n  ISeriesIngestResult,\n} from '@yuants/exchange';\nimport { Terminal } from '@yuants/protocol';\nimport { escapeSQL, requestSQL } from '@yuants/sql';\nimport { decodePath, formatTime, tokenBucket } from '@yuants/utils';\n\nconst terminal = Terminal.fromNodeEnv();\n\n// Patch 任务：查找数据缺口并进行补齐\nexport const handleInterestRatePatch = async (\n  product_id: string,\n  meta: IInterestRateServiceMetadata,\n  signal: AbortSignal,\n) => {\n  const [datasource_id] = decodePath(product_id);\n  await tokenBucket(`interest_rate:patch:${datasource_id}`).acquire(1, signal);\n  const [record] = await requestSQL<{ gap_start_time: string; gap_end_time: string }[]>(\n    terminal,\n    `\nWITH reversed_ranges AS (\n    SELECT \n        start_time,\n        end_time,\n        LEAD(end_time) OVER (\n            PARTITION BY table_name, series_id \n            ORDER BY start_time DESC\n        ) AS next_end_time  -- 注意：倒序时 LEAD 是前一个区间\n    FROM series_data_range\n    WHERE table_name = 'interest_rate' \n      AND series_id = ${escapeSQL(product_id)}\n)\nSELECT \n    next_end_time AS gap_start_time,  -- 前一个区间的结束时间\n    start_time AS gap_end_time        -- 当前区间的开始时间\nFROM reversed_ranges\nWHERE next_end_time IS NOT NULL \n  AND start_time > next_end_time      -- 有空缺\nORDER BY start_time DESC              -- 从最新开始\nLIMIT 1;\n    `,\n  );\n\n  // no gap\n  if (!record) return;\n\n  const gapStartTime = new Date(record.gap_start_time).getTime();\n  const gapEndTime = new Date(record.gap_end_time).getTime();\n\n  console.info(\n    formatTime(Date.now()),\n    '[SeriesCollector][InterestRate][Patch]',\n    'FindGap',\n    `series=${product_id}, from=${formatTime(gapStartTime)}, to=${formatTime(gapEndTime)}`,\n  );\n\n  let req: IIngestInterestRateRequest;\n\n  if (meta.direction === 'forward') {\n    // forward patch\n    req = {\n      product_id: product_id,\n      direction: 'forward' as const,\n      time: gapStartTime,\n    };\n  } else {\n    // backward patch\n    req = {\n      product_id: product_id,\n      direction: 'backward' as const,\n      time: gapEndTime,\n    };\n  }\n\n  console.info(\n    formatTime(Date.now()),\n    '[SeriesCollector][InterestRate][Patch]',\n    product_id,\n    'PatchRequest',\n    `direction=${req.direction}, time=${formatTime(req.time)}`,\n  );\n\n  const res = await terminal.client.requestForResponseData<IIngestInterestRateRequest, ISeriesIngestResult>(\n    'IngestInterestRate',\n    req,\n  );\n\n  console.info(\n    formatTime(Date.now()),\n    '[SeriesCollector][InterestRate][Patch]',\n    product_id,\n    'PatchBackwardResult',\n    `ingested_count=${res.wrote_count}, start_time=${formatTime(\n      res.range?.start_time ?? NaN,\n    )}, end_time=${formatTime(res.range?.end_time ?? NaN)}`,\n  );\n};\n"]}
+{"version":3,"file":"patch-interest-rate.js","sourceRoot":"","sources":["../../src/series-collector/patch-interest-rate.ts"],"names":[],"mappings":";;;AAKA,+CAA4C;AAC5C,qCAAoD;AACpD,yCAAoE;AAEpE,MAAM,QAAQ,GAAG,mBAAQ,CAAC,WAAW,EAAE,CAAC;AAExC,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO;KACnC,OAAO,CAAC,+BAA+B,EAAE,EAAE,CAAC;KAC5C,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;AAEzF,uBAAuB;AAChB,MAAM,uBAAuB,GAAG,KAAK,EAC1C,UAAkB,EAClB,IAAkC,EAClC,MAAmB,EACnB,EAAE;;IACF,MAAM,CAAC,aAAa,CAAC,GAAG,IAAA,kBAAU,EAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,IAAA,mBAAW,EAAC,uBAAuB,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC7E,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAA,gBAAU,EAC/B,QAAQ,EACR;;;;;;;;;;;wBAWoB,IAAA,eAAS,EAAC,UAAU,CAAC;;;;;;;;;;KAUxC,CACF,CAAC;IAEF,SAAS;IACT,IAAI,CAAC,MAAM;QAAE,OAAO;IAEpB,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/D,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;IAE3D,OAAO,CAAC,IAAI,CACV,IAAA,kBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EACtB,wCAAwC,EACxC,SAAS,EACT,UAAU,UAAU,UAAU,IAAA,kBAAU,EAAC,YAAY,CAAC,QAAQ,IAAA,kBAAU,EAAC,UAAU,CAAC,EAAE,CACvF,CAAC;IAEF,IAAI,GAA+B,CAAC;IAEpC,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;QAChC,gBAAgB;QAChB,GAAG,GAAG;YACJ,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,SAAkB;YAC7B,IAAI,EAAE,YAAY;SACnB,CAAC;KACH;SAAM;QACL,iBAAiB;QACjB,GAAG,GAAG;YACJ,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,UAAmB;YAC9B,IAAI,EAAE,UAAU;SACjB,CAAC;KACH;IAED,OAAO,CAAC,IAAI,CACV,IAAA,kBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EACtB,wCAAwC,EACxC,UAAU,EACV,cAAc,EACd,aAAa,GAAG,CAAC,SAAS,UAAU,IAAA,kBAAU,EAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAC3D,CAAC;IAEF,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,sBAAsB,CACtD,oBAAoB,EACpB,GAAG,CACJ,CAAC;IAEF,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;IAExC,OAAO,CAAC,IAAI,CACV,IAAA,kBAAU,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EACtB,wCAAwC,EACxC,UAAU,EACV,qBAAqB,EACrB,kBAAkB,GAAG,CAAC,WAAW,gBAAgB,IAAA,kBAAU,EACzD,MAAA,MAAA,GAAG,CAAC,KAAK,0CAAE,UAAU,mCAAI,GAAG,CAC7B,cAAc,IAAA,kBAAU,EAAC,MAAA,MAAA,GAAG,CAAC,KAAK,0CAAE,QAAQ,mCAAI,GAAG,CAAC,EAAE,CACxD,CAAC;AACJ,CAAC,CAAC;AAxFW,QAAA,uBAAuB,2BAwFlC","sourcesContent":["import {\n  IIngestInterestRateRequest,\n  IInterestRateServiceMetadata,\n  ISeriesIngestResult,\n} from '@yuants/exchange';\nimport { Terminal } from '@yuants/protocol';\nimport { escapeSQL, requestSQL } from '@yuants/sql';\nimport { decodePath, formatTime, tokenBucket } from '@yuants/utils';\n\nconst terminal = Terminal.fromNodeEnv();\n\nconst ingestCounter = terminal.metrics\n  .counter('series_collector_ingest_count', '')\n  .labels({ terminal_id: terminal.terminal_id, type: 'interest_rate', task: 'forward' });\n\n// Patch 任务：查找数据缺口并进行补齐\nexport const handleInterestRatePatch = async (\n  product_id: string,\n  meta: IInterestRateServiceMetadata,\n  signal: AbortSignal,\n) => {\n  const [datasource_id] = decodePath(product_id);\n  await tokenBucket(`interest_rate:patch:${datasource_id}`).acquire(1, signal);\n  const [record] = await requestSQL<{ gap_start_time: string; gap_end_time: string }[]>(\n    terminal,\n    `\nWITH reversed_ranges AS (\n    SELECT \n        start_time,\n        end_time,\n        LEAD(end_time) OVER (\n            PARTITION BY table_name, series_id \n            ORDER BY start_time DESC\n        ) AS next_end_time  -- 注意：倒序时 LEAD 是前一个区间\n    FROM series_data_range\n    WHERE table_name = 'interest_rate' \n      AND series_id = ${escapeSQL(product_id)}\n)\nSELECT \n    next_end_time AS gap_start_time,  -- 前一个区间的结束时间\n    start_time AS gap_end_time        -- 当前区间的开始时间\nFROM reversed_ranges\nWHERE next_end_time IS NOT NULL \n  AND start_time > next_end_time      -- 有空缺\nORDER BY start_time DESC              -- 从最新开始\nLIMIT 1;\n    `,\n  );\n\n  // no gap\n  if (!record) return;\n\n  const gapStartTime = new Date(record.gap_start_time).getTime();\n  const gapEndTime = new Date(record.gap_end_time).getTime();\n\n  console.info(\n    formatTime(Date.now()),\n    '[SeriesCollector][InterestRate][Patch]',\n    'FindGap',\n    `series=${product_id}, from=${formatTime(gapStartTime)}, to=${formatTime(gapEndTime)}`,\n  );\n\n  let req: IIngestInterestRateRequest;\n\n  if (meta.direction === 'forward') {\n    // forward patch\n    req = {\n      product_id: product_id,\n      direction: 'forward' as const,\n      time: gapStartTime,\n    };\n  } else {\n    // backward patch\n    req = {\n      product_id: product_id,\n      direction: 'backward' as const,\n      time: gapEndTime,\n    };\n  }\n\n  console.info(\n    formatTime(Date.now()),\n    '[SeriesCollector][InterestRate][Patch]',\n    product_id,\n    'PatchRequest',\n    `direction=${req.direction}, time=${formatTime(req.time)}`,\n  );\n\n  const res = await terminal.client.requestForResponseData<IIngestInterestRateRequest, ISeriesIngestResult>(\n    'IngestInterestRate',\n    req,\n  );\n\n  ingestCounter.inc(res.wrote_count || 0);\n\n  console.info(\n    formatTime(Date.now()),\n    '[SeriesCollector][InterestRate][Patch]',\n    product_id,\n    'PatchBackwardResult',\n    `ingested_count=${res.wrote_count}, start_time=${formatTime(\n      res.range?.start_time ?? NaN,\n    )}, end_time=${formatTime(res.range?.end_time ?? NaN)}`,\n  );\n};\n"]}

package/lib/series-collector/patch-ohlc.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" />
+export declare const handleOHLCPatch: (series_id: string, direction: 'forward' | 'backward', signal: AbortSignal) => Promise<void>;
+//# sourceMappingURL=patch-ohlc.d.ts.map

package/lib/series-collector/patch-ohlc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"patch-ohlc.d.ts","sourceRoot":"","sources":["../../src/series-collector/patch-ohlc.ts"],"names":[],"mappings":";AAaA,eAAO,MAAM,eAAe,cACf,MAAM,aACN,SAAS,GAAG,UAAU,UACzB,WAAW,kBAyFpB,CAAC"}

package/lib/series-collector/patch-ohlc.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleOHLCPatch = void 0;
+const data_ohlc_1 = require("@yuants/data-ohlc");
+const protocol_1 = require("@yuants/protocol");
+const sql_1 = require("@yuants/sql");
+const utils_1 = require("@yuants/utils");
+const terminal = protocol_1.Terminal.fromNodeEnv();
+const ingestCounter = terminal.metrics
+    .counter('series_collector_ingest_count', '')
+    .labels({ terminal_id: terminal.terminal_id, type: 'ohlc', task: 'forward' });
+// Patch 任务：查找数据缺口并进行补齐
+const handleOHLCPatch = async (series_id, direction, signal) => {
+    var _a, _b, _c, _d;
+    const [datasource_id] = (0, utils_1.decodePath)(series_id);
+    await (0, utils_1.tokenBucket)(`ohlc:patch:${datasource_id}`).acquire(1, signal);
+    const [record] = await (0, sql_1.requestSQL)(terminal, `
+WITH reversed_ranges AS (
+    SELECT 
+        start_time,
+        end_time,
+        LEAD(end_time) OVER (
+            PARTITION BY table_name, series_id 
+            ORDER BY start_time DESC
+        ) AS next_end_time  -- 注意：倒序时 LEAD 是前一个区间
+    FROM series_data_range
+    WHERE table_name = 'ohlc_v2' 
+      AND series_id = ${(0, sql_1.escapeSQL)(series_id)}
+)
+SELECT 
+    next_end_time AS gap_start_time,  -- 前一个区间的结束时间
+    start_time AS gap_end_time        -- 当前区间的开始时间
+FROM reversed_ranges
+WHERE next_end_time IS NOT NULL 
+  AND start_time > next_end_time      -- 有空缺
+ORDER BY start_time DESC              -- 从最新开始
+LIMIT 1;
+    `);
+    // no gap
+    if (!record)
+        return;
+    const gapStartTime = new Date(record.gap_start_time).getTime();
+    const gapEndTime = new Date(record.gap_end_time).getTime();
+    console.info((0, utils_1.formatTime)(Date.now()), '[SeriesCollector][OHLC][Patch]', 'FindGap', `series=${series_id}, from=${(0, utils_1.formatTime)(gapStartTime)}, to=${(0, utils_1.formatTime)(gapEndTime)}`);
+    const { product_id, duration } = (0, data_ohlc_1.decodeOHLCSeriesId)(series_id);
+    let req;
+    if (direction === 'forward') {
+        // forward patch
+        req = {
+            product_id: product_id,
+            duration,
+            direction: 'forward',
+            time: gapStartTime,
+        };
+    }
+    else {
+        // backward patch
+        req = {
+            product_id: product_id,
+            duration,
+            direction: 'backward',
+            time: gapEndTime,
+        };
+    }
+    console.info((0, utils_1.formatTime)(Date.now()), '[SeriesCollector][OHLC][Patch]', series_id, 'PatchRequest', `direction=${req.direction}, time=${(0, utils_1.formatTime)(req.time)}`);
+    const res = await terminal.client.requestForResponseData('IngestOHLC', req);
+    ingestCounter.inc(res.wrote_count || 0);
+    console.info((0, utils_1.formatTime)(Date.now()), '[SeriesCollector][OHLC][Patch]', series_id, 'PatchBackwardResult', `ingested_count=${res.wrote_count}, start_time=${(0, utils_1.formatTime)((_b = (_a = res.range) === null || _a === void 0 ? void 0 : _a.start_time) !== null && _b !== void 0 ? _b : NaN)}, end_time=${(0, utils_1.formatTime)((_d = (_c = res.range) === null || _c === void 0 ? void 0 : _c.end_time) !== null && _d !== void 0 ? _d : NaN)}`);
+};
+exports.handleOHLCPatch = handleOHLCPatch;
+//# sourceMappingURL=patch-ohlc.js.map

package/lib/series-collector/patch-ohlc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"patch-ohlc.js","sourceRoot":"","sources":["../../src/series-collector/patch-ohlc.ts"],"names":[],"mappings":"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","sourcesContent":["import { decodeOHLCSeriesId } from '@yuants/data-ohlc';\nimport { IIngestOHLCRequest, ISeriesIngestResult } from '@yuants/exchange';\nimport { Terminal } from '@yuants/protocol';\nimport { escapeSQL, requestSQL } from '@yuants/sql';\nimport { decodePath, formatTime, tokenBucket } from '@yuants/utils';\n\nconst terminal = Terminal.fromNodeEnv();\n\nconst ingestCounter = terminal.metrics\n  .counter('series_collector_ingest_count', '')\n  .labels({ terminal_id: terminal.terminal_id, type: 'ohlc', task: 'forward' });\n\n// Patch 任务：查找数据缺口并进行补齐\nexport const handleOHLCPatch = async (\n  series_id: string,\n  direction: 'forward' | 'backward',\n  signal: AbortSignal,\n) => {\n  const [datasource_id] = decodePath(series_id);\n  await tokenBucket(`ohlc:patch:${datasource_id}`).acquire(1, signal);\n  const [record] = await requestSQL<{ gap_start_time: string; gap_end_time: string }[]>(\n    terminal,\n    `\nWITH reversed_ranges AS (\n    SELECT \n        start_time,\n        end_time,\n        LEAD(end_time) OVER (\n            PARTITION BY table_name, series_id \n            ORDER BY start_time DESC\n        ) AS next_end_time  -- 注意：倒序时 LEAD 是前一个区间\n    FROM series_data_range\n    WHERE table_name = 'ohlc_v2' \n      AND series_id = ${escapeSQL(series_id)}\n)\nSELECT \n    next_end_time AS gap_start_time,  -- 前一个区间的结束时间\n    start_time AS gap_end_time        -- 当前区间的开始时间\nFROM reversed_ranges\nWHERE next_end_time IS NOT NULL \n  AND start_time > next_end_time      -- 有空缺\nORDER BY start_time DESC              -- 从最新开始\nLIMIT 1;\n    `,\n  );\n\n  // no gap\n  if (!record) return;\n\n  const gapStartTime = new Date(record.gap_start_time).getTime();\n  const gapEndTime = new Date(record.gap_end_time).getTime();\n\n  console.info(\n    formatTime(Date.now()),\n    '[SeriesCollector][OHLC][Patch]',\n    'FindGap',\n    `series=${series_id}, from=${formatTime(gapStartTime)}, to=${formatTime(gapEndTime)}`,\n  );\n\n  const { product_id, duration } = decodeOHLCSeriesId(series_id);\n\n  let req: IIngestOHLCRequest;\n\n  if (direction === 'forward') {\n    // forward patch\n    req = {\n      product_id: product_id,\n      duration,\n      direction: 'forward' as const,\n      time: gapStartTime,\n    };\n  } else {\n    // backward patch\n    req = {\n      product_id: product_id,\n      duration,\n      direction: 'backward' as const,\n      time: gapEndTime,\n    };\n  }\n\n  console.info(\n    formatTime(Date.now()),\n    '[SeriesCollector][OHLC][Patch]',\n    series_id,\n    'PatchRequest',\n    `direction=${req.direction}, time=${formatTime(req.time)}`,\n  );\n\n  const res = await terminal.client.requestForResponseData<IIngestOHLCRequest, ISeriesIngestResult>(\n    'IngestOHLC',\n    req,\n  );\n\n  ingestCounter.inc(res.wrote_count || 0);\n\n  console.info(\n    formatTime(Date.now()),\n    '[SeriesCollector][OHLC][Patch]',\n    series_id,\n    'PatchBackwardResult',\n    `ingested_count=${res.wrote_count}, start_time=${formatTime(\n      res.range?.start_time ?? NaN,\n    )}, end_time=${formatTime(res.range?.end_time ?? NaN)}`,\n  );\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@yuants/app-virtual-exchange",
-	"version": "0.17.0",
+	"version": "0.18.0",
 	"main": "lib/index.js",
 	"files": [
 		"dist",