quote-observer 1.3.5 → 1.4.0

package/api/quote.js

@@ -25,6 +25,10 @@ const fix_id = (id) => global.MARKET[id] || id;
 
 function kline_dayqfq(id, days = 10) {
   let [mkt, code] = id.split('.');
+  if (!code) {
+    logger.info(`Query ${id}: index skip`);
+    return {};
+  }
   let _id = fix_id(`${mkt.toLowerCase()}${code}${'US' === mkt ? '.OQ' : ''}`);
   let _var = 'kline_dayqfq';
   let params = {

package/cmd/ma.js

@@ -6,7 +6,6 @@
  */
 
 const logger = require('../logger')();
-const Fetch = require('../fetch');
 const Api = require('../api');
 
 // https://github.com/Marak/colors.js/blob/56de9f0983f68cd0a08c5b76d10a783e4b881716/lib/styles.js
@@ -54,7 +53,7 @@ function marginal_value(datas) {
 
 const padding = [
   16,
-  20,
+  24,
   15,
   15,
   15,
@@ -72,7 +71,7 @@ const pad = (items) => {
   }).join('');
 };
 
-const LINE = new Array(124).fill('=').join('');
+const LINE = new Array(128).fill('=').join('');
 
 const STOCKS_MAP = new Map();
 function holding(code) {
@@ -87,7 +86,7 @@ function roc(MV) {
 }
 
 function ceil(v, d = 2) {
-  return Math.ceil(Math.abs(v)).toString().padStart(d, '0');
+  return Math.ceil(Math.abs(v)).toString().padStart(d, '0').slice(-d);
 }
 
 function sale_signal(code, now) {
@@ -135,13 +134,24 @@ function start(codes) {
   });
 }
 
+const args = (name) => {
+  return ((global.config || {}).args || {})[name];
+};
+
+function market_match(stock, markets) {
+  return markets.includes(String(stock.code).toUpperCase().split('.').shift());
+}
+
 module.exports = () => {
-  Fetch.futu().then(([holders, follows]) => {
-    let stocks = [
+  const markets = args('market').map(v => v.toUpperCase());
+  Promise.all([Api.futu.position(), Api.futu.following()]).then(([holders, follows]) => {
+    [
       ...Object.values(holders),
-      ...Object.values(follows),
-    ].flat();
-    stocks.forEach(stock => STOCKS_MAP.has(stock.code) || STOCKS_MAP.set(stock.code, stock));
+      follows,
+    ]
+      .flat()
+      .filter(stock => market_match(stock, markets))
+      .forEach(stock => STOCKS_MAP.has(stock.code) || STOCKS_MAP.set(stock.code, stock));
     start([...STOCKS_MAP.keys()]);
   });
 };

package/package.json

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

package/fetch/futu.js

@@ -1,27 +0,0 @@
-/*
- * @Author: kael 
- * @Date: 2020-11-05 19:19:13 
- * @Last Modified by: kael
- * @Last Modified time: 2020-11-05 19:20:06
- */
-
-const API = require('../api');
-
-const args = (name) => {
-  return ((global.config || {}).args || {})[name];
-};
-
-const group = (data, mkt) => {
-  return data.filter(v => v.code.split('.')[0] === mkt);
-};
-
-const holders = () => {
-  return API.futu.position();
-};
-
-const follows = () => {
-  return API.futu.following().then(following =>
-    args('market').reduce((ret, mkt) => (ret[mkt] = group(following, mkt.toUpperCase()), ret), {}));
-};
-
-module.exports = () => Promise.all([holders(), follows()]);

package/fetch/index.js

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