@yuants/exchange 0.8.12 → 0.8.14

package/lib/trade_history.d.ts

@@ -0,0 +1,24 @@
+import { IServiceOptions, Terminal } from '@yuants/protocol';
+import { ITradeHistory } from '@yuants/data-trade';
+interface IExchangeCredential {
+    type: string;
+    payload: any;
+}
+interface IIngestInterestLedgerRequest {
+    credential: IExchangeCredential;
+    account_id: string;
+    time: number;
+    trade_type: string;
+}
+/**
+ * @public
+ */
+export declare const provideTradeHistoryService: (terminal: Terminal, metadata: {
+    direction: string;
+    type: string;
+    trade_type: string[];
+}, fetchPage: (request: IIngestInterestLedgerRequest) => Promise<ITradeHistory[]>, serviceOptions?: IServiceOptions) => {
+    dispose: () => void;
+};
+export {};
+//# sourceMappingURL=trade_history.d.ts.map

package/lib/trade_history.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"trade_history.d.ts","sourceRoot":"","sources":["../src/trade_history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD,UAAU,mBAAmB;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,GAAG,CAAC;CACd;AAED,UAAU,4BAA4B;IACpC,UAAU,EAAE,mBAAmB,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAwCD;;GAEG;AACH,eAAO,MAAM,0BAA0B,GACrC,UAAU,QAAQ,EAClB,UAAU;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,EACnE,WAAW,CAAC,OAAO,EAAE,4BAA4B,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC,EAC9E,iBAAiB,eAAe;;CAkFjC,CAAC"}

package/lib/trade_history.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.provideTradeHistoryService = void 0;
+const sql_1 = require("@yuants/sql");
+const computeInterestRatePageRange = (items) => {
+    if (items.length === 0)
+        return undefined;
+    let start = items[0];
+    let startMs = Date.parse(start.created_at);
+    let end = items[0];
+    let endMs = Date.parse(end.created_at);
+    for (const item of items) {
+        const createdAtMs = Date.parse(item.created_at);
+        if (!isNaN(createdAtMs) && (isNaN(startMs) || createdAtMs < startMs)) {
+            start = item;
+            startMs = createdAtMs;
+        }
+        if (!isNaN(createdAtMs) && (isNaN(endMs) || createdAtMs > endMs)) {
+            end = item;
+            endMs = createdAtMs;
+        }
+    }
+    return { start_time: start.created_at, end_time: end.created_at };
+};
+const TRADE_HISTORY_INSERT_COLUMNS = [
+    'id',
+    'product_id',
+    'account_id',
+    'direction',
+    'size',
+    'price',
+    'fee',
+    'fee_currency',
+    'pnl',
+    'created_at',
+];
+/**
+ * @public
+ */
+const provideTradeHistoryService = (terminal, metadata, fetchPage, serviceOptions) => {
+    return terminal.server.provideService('IngestTradeHistory', {
+        type: 'object',
+        required: ['account_id', 'direction', 'time', 'credential', 'trade_type'],
+        properties: {
+            account_id: { type: 'string', pattern: `^${metadata.type}` },
+            direction: { const: metadata.direction },
+            time: { type: 'number' },
+            trade_type: { type: 'string', enum: metadata.trade_type },
+            credential: {
+                type: 'object',
+                required: ['type', 'payload'],
+                properties: {
+                    type: { type: 'string', const: metadata.type },
+                    payload: { type: 'object' },
+                },
+            },
+        },
+    }, async (msg) => {
+        try {
+            const tradeHistory = await fetchPage(Object.assign({}, msg.req));
+            const range = computeInterestRatePageRange(tradeHistory);
+            // Atomic write: data rows + series_data_range in the same statement.
+            if (tradeHistory.length > 0 && range) {
+                const writeInterestRate = `${(0, sql_1.buildInsertManyIntoTableSQL)(tradeHistory, 'trade_history', {
+                    columns: TRADE_HISTORY_INSERT_COLUMNS,
+                    conflictKeys: ['id', 'account_id'],
+                })} RETURNING 1`;
+                const writeRange = `${(0, sql_1.buildInsertManyIntoTableSQL)([
+                    {
+                        series_id: msg.req.account_id,
+                        table_name: 'trade_history',
+                        start_time: range.start_time,
+                        end_time: range.end_time,
+                    },
+                ], 'series_data_range', {
+                    columns: ['series_id', 'table_name', 'start_time', 'end_time'],
+                    ignoreConflict: true,
+                })} RETURNING 1`;
+                await (0, sql_1.requestSQL)(terminal, `
+            WITH
+              write_trade_history AS (
+                ${writeInterestRate}
+              ),
+              write_range AS (
+                ${writeRange}
+              )
+            SELECT 1 as ok;
+            `);
+            }
+            else if (tradeHistory.length > 0) {
+                await (0, sql_1.requestSQL)(terminal, (0, sql_1.buildInsertManyIntoTableSQL)(tradeHistory, 'trade_history', {
+                    columns: TRADE_HISTORY_INSERT_COLUMNS,
+                    conflictKeys: ['id', 'account_id'],
+                }));
+            }
+            return {
+                res: { code: 0, message: 'OK', data: { wrote_count: tradeHistory.length, range } },
+            };
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : `${error}`;
+            return { res: { code: 1, message } };
+        }
+    }, serviceOptions);
+};
+exports.provideTradeHistoryService = provideTradeHistoryService;
+//# sourceMappingURL=trade_history.js.map

package/lib/trade_history.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trade_history.js","sourceRoot":"","sources":["../src/trade_history.ts"],"names":[],"mappings":"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","sourcesContent":["import { IServiceOptions, Terminal } from '@yuants/protocol';\nimport { ITradeHistory } from '@yuants/data-trade';\nimport { ISeriesIngestResult } from './types';\nimport { buildInsertManyIntoTableSQL, requestSQL } from '@yuants/sql';\n\ninterface IExchangeCredential {\n  type: string;\n  payload: any;\n}\n\ninterface IIngestInterestLedgerRequest {\n  credential: IExchangeCredential;\n  account_id: string;\n  time: number;\n  trade_type: string;\n}\n\nconst computeInterestRatePageRange = (\n  items: ITradeHistory[],\n): { start_time: string; end_time: string } | undefined => {\n  if (items.length === 0) return undefined;\n\n  let start = items[0];\n  let startMs = Date.parse(start.created_at);\n  let end = items[0];\n  let endMs = Date.parse(end.created_at);\n\n  for (const item of items) {\n    const createdAtMs = Date.parse(item.created_at);\n    if (!isNaN(createdAtMs) && (isNaN(startMs) || createdAtMs < startMs)) {\n      start = item;\n      startMs = createdAtMs;\n    }\n    if (!isNaN(createdAtMs) && (isNaN(endMs) || createdAtMs > endMs)) {\n      end = item;\n      endMs = createdAtMs;\n    }\n  }\n\n  return { start_time: start.created_at, end_time: end.created_at };\n};\n\nconst TRADE_HISTORY_INSERT_COLUMNS: Array<keyof ITradeHistory> = [\n  'id',\n  'product_id',\n  'account_id',\n  'direction',\n  'size',\n  'price',\n  'fee',\n  'fee_currency',\n  'pnl',\n  'created_at',\n];\n\n/**\n * @public\n */\nexport const provideTradeHistoryService = (\n  terminal: Terminal,\n  metadata: { direction: string; type: string; trade_type: string[] },\n  fetchPage: (request: IIngestInterestLedgerRequest) => Promise<ITradeHistory[]>,\n  serviceOptions?: IServiceOptions,\n) => {\n  return terminal.server.provideService<IIngestInterestLedgerRequest, ISeriesIngestResult>(\n    'IngestTradeHistory',\n    {\n      type: 'object',\n      required: ['account_id', 'direction', 'time', 'credential', 'trade_type'],\n      properties: {\n        account_id: { type: 'string', pattern: `^${metadata.type}` },\n        direction: { const: metadata.direction },\n        time: { type: 'number' },\n        trade_type: { type: 'string', enum: metadata.trade_type },\n        credential: {\n          type: 'object',\n          required: ['type', 'payload'],\n          properties: {\n            type: { type: 'string', const: metadata.type },\n            payload: { type: 'object' },\n          },\n        },\n      },\n    },\n    async (msg) => {\n      try {\n        const tradeHistory = await fetchPage({ ...msg.req });\n        const range = computeInterestRatePageRange(tradeHistory);\n        // Atomic write: data rows + series_data_range in the same statement.\n        if (tradeHistory.length > 0 && range) {\n          const writeInterestRate = `${buildInsertManyIntoTableSQL(tradeHistory, 'trade_history', {\n            columns: TRADE_HISTORY_INSERT_COLUMNS,\n            conflictKeys: ['id', 'account_id'],\n          })} RETURNING 1`;\n\n          const writeRange = `${buildInsertManyIntoTableSQL(\n            [\n              {\n                series_id: msg.req.account_id,\n                table_name: 'trade_history',\n                start_time: range.start_time,\n                end_time: range.end_time,\n              },\n            ],\n            'series_data_range',\n            {\n              columns: ['series_id', 'table_name', 'start_time', 'end_time'],\n              ignoreConflict: true,\n            },\n          )} RETURNING 1`;\n\n          await requestSQL(\n            terminal,\n            `\n            WITH\n              write_trade_history AS (\n                ${writeInterestRate}\n              ),\n              write_range AS (\n                ${writeRange}\n              )\n            SELECT 1 as ok;\n            `,\n          );\n        } else if (tradeHistory.length > 0) {\n          await requestSQL(\n            terminal,\n            buildInsertManyIntoTableSQL(tradeHistory, 'trade_history', {\n              columns: TRADE_HISTORY_INSERT_COLUMNS,\n              conflictKeys: ['id', 'account_id'],\n            }),\n          );\n        }\n\n        return {\n          res: { code: 0, message: 'OK', data: { wrote_count: tradeHistory.length, range } },\n        };\n      } catch (error) {\n        const message = error instanceof Error ? error.message : `${error}`;\n        return { res: { code: 1, message } };\n      }\n    },\n    serviceOptions,\n  );\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuants/exchange",
-  "version": "0.8.12",
+  "version": "0.8.14",
   "main": "lib/index.js",
   "module": "dist/index.js",
   "files": [
@@ -26,15 +26,16 @@
   "dependencies": {
     "rxjs": "~7.5.6",
     "@yuants/protocol": "0.54.1",
+    "@yuants/data-trade": "0.1.31",
     "@yuants/data-account": "0.11.8",
+    "@yuants/data-order": "0.7.9",
     "@yuants/data-product": "0.5.9",
     "@yuants/data-quote": "0.4.8",
-    "@yuants/data-order": "0.7.9",
     "@yuants/data-ohlc": "0.6.4",
-    "@yuants/data-interest-rate": "0.2.8",
-    "@yuants/cache": "0.3.12",
+    "@yuants/data-interest-rate": "0.2.9",
     "@yuants/sql": "0.9.39",
-    "@yuants/utils": "0.19.4"
+    "@yuants/utils": "0.19.4",
+    "@yuants/cache": "0.3.12"
   },
   "scripts": {
     "build": "heft test --clean && api-extractor run --local --config ./config/api-extractor.json && yuan-toolkit post-build"