@watsonserve/stock-base 0.0.14 → 0.0.16

package/dao.js

@@ -1,15 +1,19 @@
 import { InfluxDB, Point } from '@influxdata/influxdb-client';
 import { request } from 'node:http';
 import { EnCurrency, EnMarket } from './stock.js';
-function getStartTime() {
-    switch (new Date().getUTCDay()) {
+export function latestDay() {
+    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)
@@ -84,7 +88,7 @@ export class InfluxDAO {
         await writeClient.flush();
         await writeClient.close();
     }
-    async __query(fileds, start, markets, ncs) {
+    async __query(fileds, duration, markets, ncs) {
         const { origin: url, token, org, bucket } = this;
         const client = new InfluxDB({ url, token });
         const queryClient = client.getQueryApi(org);
@@ -93,7 +97,7 @@ export class InfluxDAO {
         const fdQuery = fileds.map(fd => `r["_field"] == "${fd}"`).join(' or ');
         const filters = [mkQuery, ncQuery, fdQuery].filter(Boolean).map(str => `|> filter(fn: (r) => ${str})`).join('\n');
         const fluxQuery = `from(bucket: "${bucket}")
-  |> range(start: ${start})
+  |> range(start: ${duration[0]}, end: ${duration[1]})
   ${filters}
   |> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value")`;
         return new Promise((resolve, reject) => {
@@ -110,12 +114,12 @@ export class InfluxDAO {
         });
     }
     ;
-    async readFxLatest() {
-        const list = await this.__query([EnCurrency.SGD, EnCurrency.HKD, EnCurrency.CNY], getStartTime(), [EnMarket.FX], []);
+    async readFx(duration) {
+        const list = await this.__query([EnCurrency.SGD, EnCurrency.HKD, EnCurrency.CNY], duration, [EnMarket.FX], []);
         return list[0];
     }
-    readStockLatest(ncs) {
-        return this.__query(['c', 'v'], getStartTime(), [EnMarket.SGX, EnMarket.USA, EnMarket.HKEX], ncs);
+    readStock(ncs, duration) {
+        return this.__query(['c', 'v'], duration, [EnMarket.SGX, EnMarket.USA, EnMarket.HKEX], ncs);
     }
     async _readDividend(ncs) {
         const { origin: url, token, org, bucket } = this;

package/package.json

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

package/types/dao.d.ts

@@ -24,6 +24,7 @@ interface IDiv {
     currency: EnCurrency;
     amount: number;
 }
+export declare function latestDay(): string;
 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[];
@@ -36,8 +37,8 @@ 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[]>;
+    readFx(duration: string[]): Promise<IFxData>;
+    readStock(ncs: string[], duration: string[]): Promise<IStData[]>;
     _readDividend(ncs: string[]): Promise<Record<string, IDiv[]>>;
     private static ignore;
     readDividend(ncs: string[]): Promise<Record<string, IDiv[]>>;