@watsonserve/stock-loader 0.0.2-alpha.0 → 0.0.2-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@watsonserve/stock-loader",
-  "version": "0.0.2-alpha.0",
+  "version": "0.0.2-alpha.1",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",

package/src/history-loader.ts

@@ -1,11 +1,11 @@
-import { EnMarket } from '@watsonserve/stock-base';
+import { EnMarket, type StockPoint } from '@watsonserve/stock-base';
 import { getMarketCloseTime } from './close-time.js';
 import WebRequest from './web-request.js';
 import { sleep, splitFullNc } from './helper.js';
 
 // 历史数据
 export default class HistoryLoader extends WebRequest {
-  private async __getHKOrUSAHistory(market: EnMarket, nc: string) {
+  private async __getHKOrUSAHistory(market: EnMarket, nc: string): Promise<StockPoint[]> {
     let cntry = EnMarket.USA === market ? 'us' : 'hk';
     await this.goto(`https://quote.eastmoney.com/${cntry}/${nc}.html`);
 
@@ -36,13 +36,14 @@ export default class HistoryLoader extends WebRequest {
     return (klines as string[]).map(line => {
       const [date, open, close, hight, low, vol] = line.split(',');
       return {
-        market, nc, n: '', o:+open, c:+close, h:+hight, l:+low, v:+vol,
-        stamp: getMarketCloseTime(market, new Date(`${date}T15:00:00Z`).getTime())
+        market,
+        timestamp: getMarketCloseTime(market, new Date(`${date}T15:00:00Z`).getTime()),
+        st: { nc, n: '', o:+open, c:+close, h:+hight, l:+low, v:+vol }
       };
     });
   }
 
-  private async __getSGXHistory(nc: string) {
+  private async __getSGXHistory(nc: string): Promise<StockPoint[]> {
     const rsp = await super.get(`https://api.sgx.com/securities/v1.1//charts/historic/stocks/code/${nc}/5y`, { params: 'trading_time,vl,lt' });
     const { historic } = rsp.data;
     return (historic as any[]).map(st => {
@@ -50,8 +51,8 @@ export default class HistoryLoader extends WebRequest {
       const fullYear = trading_time.substring(0, 4);
       const month = trading_time.substring(4, 6);
       const date = trading_time.substring(6, 8);
-      const stamp = ~~(new Date(`${fullYear}-${month}-${date}T09:16:00Z`).getTime() / 1000);
-      return { market: EnMarket.SGX, nc, n: '', o: 0, c, h: 0, l: 0, v, stamp };
+      const timestamp = ~~(new Date(`${fullYear}-${month}-${date}T09:16:00Z`).getTime() / 1000);
+      return { market: EnMarket.SGX, timestamp, st: { nc, n: '', o: 0, c, h: 0, l: 0, v } };
     });
   }