@watsonserve/stock-base 0.0.16 → 0.0.18

package/dao.js

@@ -56,6 +56,7 @@ function groupBy(key, list, delKey = false) {
         return pre;
     }, {});
 }
+const A_DAY_MS = 86400000;
 export class InfluxDAO {
     origin = '';
     org = '';
@@ -88,7 +89,7 @@ export class InfluxDAO {
         await writeClient.flush();
         await writeClient.close();
     }
-    async __query(fileds, duration, markets, ncs) {
+    async __queryLatest(fileds, lt, markets, ncs) {
         const { origin: url, token, org, bucket } = this;
         const client = new InfluxDB({ url, token });
         const queryClient = client.getQueryApi(org);
@@ -96,9 +97,11 @@ export class InfluxDAO {
         const ncQuery = ncs.map(nc => `r["nc"] == "${nc}"`).join(' or ');
         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 start = new Date(lt.getTime() - 30 * A_DAY_MS).toJSON().substring(0, 10);
         const fluxQuery = `from(bucket: "${bucket}")
-  |> range(start: ${duration[0]}, end: ${duration[1]})
+  |> range(start: ${start}, stop: ${lt.toJSON()})
   ${filters}
+  |> last()
   |> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value")`;
         return new Promise((resolve, reject) => {
             const list = [];
@@ -114,12 +117,12 @@ export class InfluxDAO {
         });
     }
     ;
-    async readFx(duration) {
-        const list = await this.__query([EnCurrency.SGD, EnCurrency.HKD, EnCurrency.CNY], duration, [EnMarket.FX], []);
+    async readLatestFx(lt) {
+        const list = await this.__queryLatest([EnCurrency.SGD, EnCurrency.HKD, EnCurrency.CNY], lt, [EnMarket.FX], []);
         return list[0];
     }
-    readStock(ncs, duration) {
-        return this.__query(['c', 'v'], duration, [EnMarket.SGX, EnMarket.USA, EnMarket.HKEX], ncs);
+    readLatestStock(ncs, lt) {
+        return this.__queryLatest(['c', 'v'], lt, [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.16",
+  "version": "0.0.18",
   "description": "",
   "type": "module",
   "keywords": [],

package/types/dao.d.ts

@@ -36,9 +36,9 @@ export declare class InfluxDAO {
     constructor(dbConf: IDBConf);
     rm(measurement: string, start: string, stop: string): Promise<unknown>;
     writeToInfluxDB(points: Point[]): Promise<void>;
-    private __query;
-    readFx(duration: string[]): Promise<IFxData>;
-    readStock(ncs: string[], duration: string[]): Promise<IStData[]>;
+    private __queryLatest;
+    readLatestFx(lt: Date): Promise<IFxData>;
+    readLatestStock(ncs: string[], lt: Date): Promise<IStData[]>;
     _readDividend(ncs: string[]): Promise<Record<string, IDiv[]>>;
     private static ignore;
     readDividend(ncs: string[]): Promise<Record<string, IDiv[]>>;