@watsonserve/stock-base 0.0.9 → 0.0.11

package/dao.js

@@ -41,11 +41,13 @@ export function toDivPoints(market, nc, data) {
         new Point('Dividend').tag('nc', `${nc}.${market}`).tag('type', 'paid').tag('currency', curr).floatField('amount', amount).timestamp(paid)
     ];
 }
-function groupBy(key, list) {
+function groupBy(key, list, delKey = false) {
     return list.reduce((pre, item) => {
         const foo = item[key];
         const fooList = pre[foo] || [];
         pre[foo] = fooList;
+        if (delKey)
+            delete item[key];
         fooList.push(item);
         return pre;
     }, {});
@@ -100,7 +102,7 @@ export class InfluxDAO {
                 next: (row, tableMeta) => {
                     const item = tableMeta.toObject(row);
                     const { result, table, _start, _stop, _measurement, _time, nc, ...content } = item;
-                    list.push({ time: new Date(_time), market: _measurement, nc, ...content });
+                    list.push({ time: new Date(_time), nc, ...content });
                 },
                 error: reject,
                 complete: () => resolve(list),
@@ -109,12 +111,11 @@ export class InfluxDAO {
     }
     ;
     async readFxLatest() {
-        const start = getStartTime();
-        return this.__query([EnCurrency.SGD, EnCurrency.HKD, EnCurrency.CNY], start, [EnMarket.FX], []);
+        const list = await this.__query([EnCurrency.SGD, EnCurrency.HKD, EnCurrency.CNY], getStartTime(), [EnMarket.FX], []);
+        return list[0];
     }
-    async readStockLatest(ncs) {
-        const start = getStartTime();
-        return this.__query(['c', 'v'], start, [EnMarket.SGX, EnMarket.USA, EnMarket.HKEX], ncs);
+    readStockLatest(ncs) {
+        return this.__query(['c', 'v'], getStartTime(), [EnMarket.SGX, EnMarket.USA, EnMarket.HKEX], ncs);
     }
     async readDividend(ncs) {
         const { origin: url, token, org, bucket } = this;
@@ -136,7 +137,7 @@ export class InfluxDAO {
                 },
                 error: reject,
                 complete: () => {
-                    resolve(groupBy('nc', list));
+                    resolve(groupBy('nc', list, true));
                 },
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@watsonserve/stock-base",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "",
   "type": "module",
   "keywords": [],

package/types/dao.d.ts

@@ -1,11 +1,22 @@
 import { Point } from '@influxdata/influxdb-client';
-import { EnMarket, IDividend, type IStock } from './stock.js';
+import { EnCurrency, EnMarket, IDividend, type IStock } from './stock.js';
 export interface IDBConf {
     origin: string;
     org: string;
     bucket: string;
     token: string;
 }
+interface IFxData {
+    time: string;
+    [EnCurrency.SGD]: number;
+    [EnCurrency.HKD]: number;
+    [EnCurrency.CNY]: number;
+}
+interface IStData {
+    time: string;
+    c: number;
+    v: number;
+}
 export declare function toFxPoint(sgd: number, hkd: number, cny: number, timestamp: number): Point;
 export declare function toStockPoint(market: EnMarket, st: IStock, timestamp: number): Point;
 export declare function toDivPoints(market: string, nc: string, data: IDividend): Point[];
@@ -18,7 +29,8 @@ export declare class InfluxDAO {
     rm(measurement: string, start: string, stop: string): Promise<unknown>;
     writeToInfluxDB(points: Point[]): Promise<void>;
     private __query;
-    readFxLatest(): Promise<any[]>;
-    readStockLatest(ncs: string[]): Promise<any[]>;
+    readFxLatest(): Promise<IFxData>;
+    readStockLatest(ncs: string[]): Promise<IStData[]>;
     readDividend(ncs: string[]): Promise<Record<string, any[]>>;
 }
+export {};