quote-observer 1.8.1 → 2.0.1

package/{cmd/ma.js → core.js}

@@ -5,8 +5,9 @@
  * @Last Modified time: 2021-11-09 10:43:03
  */
 
-const logger = require('../logger')();
-const Api = require('../api');
+const logger = require('./logger')();
+const Futu = require('./services/futu');
+const KLine = require('./services/kline');
 
 // https://github.com/Marak/colors.js/blob/56de9f0983f68cd0a08c5b76d10a783e4b881716/lib/styles.js
 const styleCodes = {
@@ -99,7 +100,7 @@ function sale_signal(code, now) {
 }
 
 function start() {
-  let quotes = [...STOCKS_MAP.keys()].map(code => Api.quote.kline_dayqfq(code, 10));
+  let quotes = [...STOCKS_MAP.keys()].map(code => KLine(code, 10));
   Promise.all(quotes).then(resps => {
     console.reset();
     console.log((new Date()).toTimeString().split(' ')[0]);
@@ -142,7 +143,7 @@ function update_stocks() {
   // SH,SZ,HK,US => [ 'SH', 'SZ', 'HK', 'US' ]
   const markets = String(global.config?.opts?.market || '').trim()
     .split(',').map(v => v.trim().toUpperCase()).filter(v => v);
-  return Promise.all([Api.futu.position(), Api.futu.following()]).then(([holders, follows]) => {
+  return Promise.all([Futu.position(), Futu.following()]).then(([holders, follows]) => {
     STOCKS_MAP.clear();
     [
       ...Object.values(holders),

package/index.js

@@ -11,7 +11,6 @@ global.MARKET = {};
 global.config = require('rc')('stock');
 const { program } = require('commander');
 const pkg = require('./package.json');
-const cmd = require('./cmd');
 
 program
   .version(pkg.version)
@@ -31,4 +30,4 @@ console.reset = function () {
   console.clear();
 };
 
-cmd.ma();
+require('./core')();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quote-observer",
-  "version": "1.8.1",
+  "version": "2.0.1",
   "description": "quote observer",
   "main": "index.js",
   "scripts": {

package/{api/quote.js → services/kline.js}

@@ -5,16 +5,17 @@
  * @Last Modified time: 2021-06-01 14:30:29
  */
 
-// http://web.ifzq.gtimg.cn/appstock/app/usfqkline/get?_var=kline_dayqfq&param=usTSLA.OQ,day,,,10,qfq&r=0.2834233560574715
-// http://web.ifzq.gtimg.cn/appstock/app/hkfqkline/get?_var=kline_dayqfq&param=hk00700,day,,,10,qfq&r=0.283423356057471500
-// http://web.ifzq.gtimg.cn/appstock/app/fqkline/get?_var=kline_dayqfq&param=sz399006,day,,,10,qfq&r=0.4519900299757633000
+// https://web.ifzq.gtimg.cn/appstock/app/usfqkline/get?_var=kline_dayqfq&param=usTSLA.OQ,day,,,10,qfq&r=0.2834233560574715
+// https://web.ifzq.gtimg.cn/appstock/app/hkfqkline/get?_var=kline_dayqfq&param=hk00700,day,,,10,qfq&r=0.283423356057471500
+// https://web.ifzq.gtimg.cn/appstock/app/fqkline/get?_var=kline_dayqfq&param=sz399006,day,,,10,qfq&r=0.4519900299757633000
 
 const fs = require('fs');
 const axios = require('axios');
 const logger = require('../logger')();
 const querystring = require('querystring');
+const quote_conf = global.config.quote || {};
 
-const base_url = `http://web.ifzq.gtimg.cn/appstock/app`;
+const base_url = quote_conf.base_url || `https://web.ifzq.gtimg.cn/appstock/app`;
 const path_mkt = {
   SH: `/fqkline/get`,
   SZ: `/fqkline/get`,
@@ -32,16 +33,16 @@ const save_resp = (data) => {
       fs.writeFileSync(`${root}/stock-quote-${data.fid}.json`, JSON.stringify(data));
     }
   } catch (error) {
-    logger.error(`Save resp error:`, error);
+    logger.error(`[${data.fid}] SAVE RESP ERROR:`, error.message);
   } finally {
     return data;
   }
 };
 
-function kline_dayqfq(id, days = 10) {
+function kline(id, days = 10) {
   let [mkt, code] = id.split('.');
   if (!code) {
-    logger.info(`Query ${id}: index skip`);
+    logger.info(`[${id}] INDEX SKIP`);
     return {};
   }
   let _id = fix_id(`${mkt.toLowerCase()}${code}${'US' === mkt ? '.OQ' : ''}`);
@@ -52,9 +53,8 @@ function kline_dayqfq(id, days = 10) {
     param: `${_id},day,,,${days},qfq`,
   };
   let url = `${base_url}${path_mkt[mkt]}?${querystring.stringify(params)}`;
-  logger.info(`Query ${id}: ${url}`);
-  return axios
-    .get(url)
+  logger.info(`[${id}] -> ${url}`);
+  return axios.get(url)
     .then((raw = '') => {
       try {
         let resp = JSON.parse(raw.data.toString().replace(`${_var}=`, ''));
@@ -62,12 +62,14 @@ function kline_dayqfq(id, days = 10) {
         let info = (data.qt || {})[_id] || [];
         return save_resp({ fid: id, id: _id, info, data: (data.day || data.qfqday || []).reverse() });
       } catch (error) {
-        logger.error(id, error);
+        logger.error(`[${id}] PARSE RESPONSE ERROR:`, error.message);
         return {};
       }
+    })
+    .catch((error) => {
+      logger.error(`[${id}] FETCH ERROR:`, error.message);
+      return {};
     });
 }
 
-module.exports = {
-  kline_dayqfq,
-};
+module.exports = kline;

package/api/index.js

@@ -1,11 +0,0 @@
-/*
- * @Author: kael 
- * @Date: 2020-11-05 18:25:47 
- * @Last Modified by: kael
- * @Last Modified time: 2020-11-06 17:50:17
- */
-
-module.exports = {
-  futu: require('./futu'),
-  quote: require('./quote'),
-};

package/cmd/index.js

@@ -1,10 +0,0 @@
-/*
- * @Author: kael 
- * @Date: 2020-11-05 18:19:53 
- * @Last Modified by: kael
- * @Last Modified time: 2020-11-05 18:20:25
- */
-
-module.exports = {
-  ma: require('./ma'),
-};