@watsonserve/stock-base 0.0.13 → 0.0.15

package/dao.js

@@ -2,14 +2,18 @@ import { InfluxDB, Point } from '@influxdata/influxdb-client';
 import { request } from 'node:http';
 import { EnCurrency, EnMarket } from './stock.js';
 function getStartTime() {
-    switch (new Date().getUTCDay()) {
+    const now = new Date();
+    let stamp = now.getTime() - 86400000;
+    switch (now.getUTCDay()) {
         case 0: // Sunday
-            return '-2d';
+            stamp -= 1 * 86400000;
+            break;
         case 1:
-            return '-3d';
+            stamp -= 2 * 86400000;
+            break;
         default:
     }
-    return '-1d';
+    return new Date(stamp).toJSON().substring(0, 10);
 }
 export function toFxPoint(sgd, hkd, cny, timestamp) {
     return new Point(EnMarket.FX)
@@ -110,14 +114,14 @@ export class InfluxDAO {
         });
     }
     ;
-    async readFxLatest() {
-        const list = await this.__query([EnCurrency.SGD, EnCurrency.HKD, EnCurrency.CNY], getStartTime(), [EnMarket.FX], []);
+    async readFxLatest(start = '') {
+        const list = await this.__query([EnCurrency.SGD, EnCurrency.HKD, EnCurrency.CNY], start || getStartTime(), [EnMarket.FX], []);
         return list[0];
     }
-    readStockLatest(ncs) {
-        return this.__query(['c', 'v'], getStartTime(), [EnMarket.SGX, EnMarket.USA, EnMarket.HKEX], ncs);
+    readStockLatest(ncs, start = '') {
+        return this.__query(['c', 'v'], start || getStartTime(), [EnMarket.SGX, EnMarket.USA, EnMarket.HKEX], ncs);
     }
-    async readDividend(ncs) {
+    async _readDividend(ncs) {
         const { origin: url, token, org, bucket } = this;
         const client = new InfluxDB({ url, token });
         const queryClient = client.getQueryApi(org);
@@ -136,8 +140,23 @@ export class InfluxDAO {
                     list.unshift({ time: new Date(_time), nc, currency, [_field]: _value });
                 },
                 error: reject,
-                complete: () => resolve(Object.entries(groupBy('nc', list, true))),
+                complete: () => resolve(groupBy('nc', list, true)),
             });
         });
     }
+    static ignore = new Set(['BRK.B']);
+    async readDividend(ncs) {
+        const divs = await this._readDividend(ncs);
+        // const none = ncs.filter(nc => !divs[nc]);
+        for (const nc of ncs) {
+            if (!divs[nc] && InfluxDAO.ignore.has(nc)) {
+                divs[nc] = [];
+                // none.push(nc);
+            }
+        }
+        return divs;
+    }
+    async writeNoRecord(nc) {
+        InfluxDAO.ignore.add(nc);
+    }
 }

package/package.json

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

package/types/dao.d.ts

@@ -18,6 +18,12 @@ interface IStData {
     c: number;
     v: number;
 }
+interface IDiv {
+    time: Date;
+    nc: string;
+    currency: EnCurrency;
+    amount: 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[];
@@ -30,8 +36,11 @@ export declare class InfluxDAO {
     rm(measurement: string, start: string, stop: string): Promise<unknown>;
     writeToInfluxDB(points: Point[]): Promise<void>;
     private __query;
-    readFxLatest(): Promise<IFxData>;
-    readStockLatest(ncs: string[]): Promise<IStData[]>;
-    readDividend(ncs: string[]): Promise<[string, any[]][]>;
+    readFxLatest(start?: string): Promise<IFxData>;
+    readStockLatest(ncs: string[], start?: string): Promise<IStData[]>;
+    _readDividend(ncs: string[]): Promise<Record<string, IDiv[]>>;
+    private static ignore;
+    readDividend(ncs: string[]): Promise<Record<string, IDiv[]>>;
+    writeNoRecord(nc: string): Promise<void>;
 }
 export {};