daxiapi-cli 2.3.3 → 2.4.2

package/README.md

@@ -220,6 +220,19 @@ daxiapi report finance 600036
 daxiapi report finance 000001
 ```
 
+### 新闻数据
+
+```bash
+# 获取个股舆情（内部自动将 code 转为 secid）
+daxiapi news sentiment -c 600031 -p 20
+
+# 获取个股公告
+daxiapi news notice -c 600031 -p 20 -i 1
+
+# 获取个股研报（支持时间区间）
+daxiapi news report -c 600031 -p 25 -i 1 -b 2026-01-01 -e 2026-04-08
+```
+
 ### 工具
 
 ```bash

package/bin/index.js

@@ -21,5 +21,6 @@ require('../commands/dividend')(program);
 require('../commands/hotrank')(program);
 require('../commands/turnover')(program);
 require('../commands/report')(program);
+require('../commands/news')(program);
 
 program.parse(process.argv);

package/commands/market.js

@@ -31,7 +31,24 @@ module.exports = function (program) {
                 process.exit(1);
             }
         });
+    marketCmd.command('compass')
+        .description('获取市场整合趋势结构、估值、情绪三层指标，用于A股市场三维结构分析系统，给出市场当前状态的综合判断与操作建议')
+        .action(async () => {
+            try {
+                const token = config.getToken();
+                if (!token) {
+                    const error = new Error('未配置 API Token');
+                    error.response = {status: 401};
+                    throw error;
+                }
 
+                const data = await api.getCompassData(token);
+                output(data);
+            } catch (error) {
+                handleError(error);
+                process.exit(1);
+            }
+        });
     marketCmd
         .command('temp')
         .description(

package/commands/news.js

@@ -0,0 +1,96 @@
+const api = require('../lib/api');
+const {handleError, createParameterError} = require('../lib/error');
+const {encode} = require('../lib/output');
+const {getSecid} = require('../lib/utils');
+
+function toPositiveInt(value, fieldName, examples) {
+    const number = Number.parseInt(value, 10);
+    if (!Number.isInteger(number) || number <= 0) {
+        throw createParameterError('参数无效', [`参数 '${fieldName}' 必须是大于0的整数`], examples);
+    }
+    return number;
+}
+
+function validateDate(value, fieldName, examples) {
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) {
+        throw createParameterError('参数无效', [`参数 '${fieldName}' 必须是 YYYY-MM-DD 格式`], examples);
+    }
+}
+
+module.exports = function (program) {
+    const newsCmd = program.command('news').description('获取个股舆情、公告、研报数据，用于跟踪个股信息面变化。');
+
+    newsCmd
+        .command('sentiment')
+        .description('获取个股舆情列表。')
+        .option('-c, --code <code>', '股票代码（6位），如600031', '600031')
+        .option('-p, --page-size <pageSize>', '每页条数，默认20', '20')
+        .action(async options => {
+            try {
+                if (!options.code) {
+                    throw createParameterError('参数无效', ["参数 'code' 不能为空"], ['daxiapi news sentiment -c600031 -p20']);
+                }
+
+                const secid = getSecid(options.code);
+                const pageSize = toPositiveInt(options.pageSize, 'pageSize', ['daxiapi news sentiment -c600031 -p20']);
+                const data = await api.getNewsSentiment(secid, pageSize);
+                console.log('```toon\n' + encode(data) + '\n```');
+            } catch (error) {
+                handleError(error);
+                process.exit(1);
+            }
+        });
+
+    newsCmd
+        .command('notice')
+        .description('获取个股公告列表。')
+        .option('-c, --code <code>', '股票代码（6位），如600031', '600031')
+        .option('-p, --page-size <pageSize>', '每页条数，默认20', '20')
+        .option('-i, --page-index <pageIndex>', '页码，默认1', '1')
+        .action(async options => {
+            try {
+                if (!options.code) {
+                    throw createParameterError('参数无效', ["参数 'code' 不能为空"], ['daxiapi news notice -c600031 -p20 -i1']);
+                }
+
+                const pageSize = toPositiveInt(options.pageSize, 'pageSize', ['daxiapi news notice -c600031 -p20 -i1']);
+                const pageIndex = toPositiveInt(options.pageIndex, 'pageIndex', ['daxiapi news notice -c600031 -p20 -i1']);
+                const data = await api.getNewsNotice(options.code, pageSize, pageIndex);
+                console.log('```toon\n' + encode(data) + '\n```');
+            } catch (error) {
+                handleError(error);
+                process.exit(1);
+            }
+        });
+
+    newsCmd
+        .command('report')
+        .description('获取个股研报列表。')
+        .option('-c, --code <code>', '股票代码（6位），如600031', '600031')
+        .option('-p, --page-size <pageSize>', '每页条数，默认25', '25')
+        .option('-i, --page-index <pageIndex>', '页码，默认1', '1')
+        .option('-b, --begin-time <beginTime>', '开始日期，格式 YYYY-MM-DD', '2026-01-01')
+        .option('-e, --end-time <endTime>', '结束日期，格式 YYYY-MM-DD')
+        .action(async options => {
+            try {
+                if (!options.code) {
+                    throw createParameterError('参数无效', ["参数 'code' 不能为空"], [
+                        'daxiapi news report -c600031 -p25 -i1 -b2026-01-01 -e2026-04-08'
+                    ]);
+                }
+
+                validateDate(options.beginTime, 'beginTime', ['daxiapi news report -b2026-01-01']);
+                const endTime = options.endTime || new Date().toISOString().slice(0, 10);
+                validateDate(endTime, 'endTime', ['daxiapi news report -e2026-04-08']);
+
+                const pageSize = toPositiveInt(options.pageSize, 'pageSize', ['daxiapi news report -p25']);
+                const pageIndex = toPositiveInt(options.pageIndex, 'pageIndex', ['daxiapi news report -i1']);
+
+                const data = await api.getNewsReport(options.code, pageSize, pageIndex, options.beginTime, endTime);
+                console.log('```toon\n' + encode(data) + '\n```');
+            } catch (error) {
+                handleError(error);
+                process.exit(1);
+            }
+        });
+};

package/commands/stock.js

@@ -1,7 +1,7 @@
 const config = require('../lib/config');
 const api = require('../lib/api');
 const {handleError, createParameterError} = require('../lib/error');
-const {output} = require('../lib/output');
+const {output, encode} = require('../lib/output');
 
 const SUPPORTED_PATTERNS = [
     'gxl',
@@ -142,4 +142,35 @@ module.exports = function (program) {
                 process.exit(1);
             }
         });
+
+    stockCmd
+        .command('capital-flow <code>')
+        .description(
+            '获取个股主力资金流向数据，返回最近N天的资金动向。' +
+                '包括主力净流入、主力净流入占比、五日主力净流入、板块资金流向等详细数据。' +
+                '支持6位数字代码，自动识别沪深市场。可用于分析主力资金动向和资金面分析。'
+        )
+        .option('--days <days>', '返回天数（默认5天）', '5')
+        .action(async (code, options) => {
+            try {
+                if (!code) {
+                    throw createParameterError('参数无效', ["参数 'code' 不能为空"], ['daxiapi stock capital-flow 000001']);
+                }
+
+                const days = parseInt(options.days, 10);
+                if (isNaN(days) || days < 1 || days > 30) {
+                    throw createParameterError(
+                        '参数无效',
+                        ["参数 'days' 必须是1-30之间的整数"],
+                        ['daxiapi stock capital-flow 000001 --days 5', 'daxiapi stock capital-flow 000001 --days 10']
+                    );
+                }
+
+                const data = await api.getCapitalFlow(code, days);
+                console.log('```toon\n' + encode(data) + '\n```');
+            } catch (error) {
+                handleError(error);
+                process.exit(1);
+            }
+        });
 };

package/lib/api.js

@@ -107,6 +107,10 @@ async function getSecId(token, code) {
     const client = createClient(token);
     return post(client, '/get_sec_id', {code});
 }
+async function getCompassData(token, ) {
+    const client = createClient(token);
+    return get(client, '/get_market_compass');
+}
 
 async function queryStockData(token, q, type = 'stock') {
     const client = createClient(token);
@@ -146,8 +150,8 @@ async function getDividendScore(token, code) {
         scores: recentScores.map(item => ({
             date: item.date,
             score: item.totalScore,
-            cs: item.cs.toFixed(2),
-            rsi: item.rsi.toFixed(2)
+            cs: item.cs != null ? item.cs.toFixed(2) : null,
+            rsi: item.rsi != null ? item.rsi.toFixed(2) : null
         }))
     };
 }
@@ -156,8 +160,6 @@ async function getStockRank(type = 'hour', listType = 'normal') {
     try {
         const params = {stock_type: 'a', list_type: listType};
 
-        // 只有 normal 和 skyrocket 才有 type 参数，默认为 hour
-        // 其他榜单类型固定为 day
         if (listType === 'normal' || listType === 'skyrocket') {
             params.type = type;
         } else {
@@ -204,19 +206,6 @@ async function getPlateRank(type = 'concept') {
         const data = extractData(response, 'plate_list');
 
         return data.map(d => {
-            //          - code: "881160"
-            // rise_and_fall: 1.4869
-            // etf_rise_and_fall: -0.1488
-            // hot_rank_chg: 0
-            // market_id: 48
-            // hot_tag: 连续11天上榜
-            // etf_product_id: "159766"
-            // rate: "10366.5"
-            // etf_name: 旅游ETF富国
-            // name: 旅游及酒店
-            // tag: 1家涨停
-            // etf_market_id: 36
-            // order: 20
             return {
                 code: d.code,
                 name: d.name,
@@ -270,19 +259,15 @@ async function getTurnoverData(type = 'day') {
             const currentTurnover = latest[1];
             const prevTurnover = previous[1];
             const diff = currentTurnover - prevTurnover;
-            const currentYi = currentTurnover / 100000000; // 先转为亿
-            const currentWanYi = (currentYi / 10000).toFixed(2); // 再转为万亿
-            const diffYi = (Math.abs(diff) / 100000000).toFixed(2); // 转为亿
+            const currentYi = currentTurnover / 100000000;
+            const currentWanYi = (currentYi / 10000).toFixed(2);
+            const diffYi = (Math.abs(diff) / 100000000).toFixed(2);
             const formattedData = {
                 当前成交额: currentWanYi + '万亿',
                 变化量: (diff > 0 ? '增加' : '减少') + diffYi + '亿',
                 较上日: diff > 0 ? '增加' : '减少'
             };
             const isTrading = minuteData.isTrading;
-            //               '0': { val: 1623545300000, name: '当日成交额', key: 'turnover' },
-            //   '1': { val: 1668872000000, name: '昨日成交额', key: 'turnover_pre' },
-            //   '2': { val: -45326700000, name: '较昨日变动', key: 'turnover_change' },
-            //   '3': { val: 1623545300000, name: '预测全天成交额', key: 'predict_turnover' },
             const rs = {};
             minuteData.header.forEach((item, index) => {
                 rs[item.name] = item.val;
@@ -339,9 +324,128 @@ async function getTurnoverDataByMinute() {
     }
 }
 
+function normalizeHttps(url) {
+    if (!url) {
+        return '';
+    }
+    return String(url).replace(/^http:\/\//, 'https://');
+}
+
+async function getNewsSentiment(secid, pageSize = 20) {
+    const response = await axios.get('https://np-listapi.eastmoney.com/comm/web/getListInfo', {
+        params: {
+            client: 'web',
+            biz: 'web_voice',
+            mTypeAndCode: secid,
+            pageSize,
+            type: 1,
+            req_trace: '3d4e684212bee1464c1b44611236955b',
+        },
+    });
+
+    const payload = response.data || {};
+    const list = payload.data?.list || [];
+    return {
+        pageIndex: payload.data?.page_index || 1,
+        pageSize: payload.data?.page_size || pageSize,
+        total: payload.data?.totle_hits || 0,
+        list: list.map((item) => ({
+            title: item.Art_Title,
+            showTime: item.Art_ShowTime,
+            artCode: item.Art_Code,
+            url: normalizeHttps(item.Art_Url),
+            originUrl: normalizeHttps(item.Art_OriginUrl),
+        })),
+    };
+}
+
+async function getNewsNotice(code, pageSize = 20, pageIndex = 1) {
+    const response = await axios.get('https://np-anotice-stock.eastmoney.com/api/security/ann', {
+        params: {
+            sr: -1,
+            page_size: pageSize,
+            page_index: pageIndex,
+            ann_type: 'A',
+            client_source: 'web',
+            stock_list: code,
+            f_node: 0,
+            s_node: 0,
+        },
+    });
+
+    const payload = response.data || {};
+    const data = payload.data || {};
+    const list = data.list || [];
+
+    return {
+        pageIndex: data.page_index || pageIndex,
+        pageSize: data.page_size || pageSize,
+        total: data.total_hits || 0,
+        list: list.map((item) => {
+            const stockCode = item.codes?.[0]?.stock_code || code;
+            return {
+                title: item.title,
+                noticeDate: item.notice_date,
+                displayTime: item.display_time,
+                artCode: item.art_code,
+                stockCode,
+                url: `https://data.eastmoney.com/notices/detail/${stockCode}/${item.art_code}.html`,
+                columns: (item.columns || []).map((column) => column.column_name),
+            };
+        }),
+    };
+}
+
+async function getNewsReport(code, pageSize = 25, pageIndex = 1, beginTime = '2026-01-01', endTime) {
+    const response = await axios.get('https://reportapi.eastmoney.com/report/list', {
+        params: {
+            pageNo: pageIndex,
+            pageSize,
+            code,
+            industryCode: '*',
+            industry: '*',
+            rating: '*',
+            ratingchange: '*',
+            beginTime,
+            endTime,
+            fields: '',
+            qType: 0,
+            sort: 'publishDate,desc',
+        },
+    });
+
+    const payload = response.data || {};
+    const list = payload.data || [];
+
+    return {
+        pageIndex: payload.pageNo || pageIndex,
+        pageSize: payload.size || pageSize,
+        total: payload.hits || 0,
+        list: list.map((item) => ({
+            title: item.title,
+            stockCode: item.stockCode,
+            stockName: item.stockName,
+            publishDate: item.publishDate,
+            orgName: item.orgName,
+            rating: item.emRatingName,
+            infoCode: item.infoCode,
+            predictNextTwoYearEps: item.predictNextTwoYearEps,
+            predictNextTwoYearPe: item.predictNextTwoYearPe,
+            predictNextYearEps: item.predictNextYearEps,
+            predictNextYearPe: item.predictNextYearPe,
+            predictThisYearEps: item.predictThisYearEps,
+            predictThisYearPe: item.predictThisYearPe,
+            predictLastYearEps: item.predictLastYearEps,
+            predictLastYearPe: item.predictLastYearPe,
+            url: `https://data.eastmoney.com/report/info/${item.infoCode}.html`,
+        })),
+    };
+}
+
 module.exports = {
     getMarketData,
     getMarketTemp,
+    getCompassData,
     getMarketStyle,
     getMarketValueData,
     getBkData,
@@ -361,5 +465,8 @@ module.exports = {
     getPlateRank,
     getTurnoverData,
     getTurnoverDataByMinute,
-    getFinanceReportDetail
+    getFinanceReportDetail,
+    getNewsSentiment,
+    getNewsNotice,
+    getNewsReport,
 };

package/lib/caibao.js

@@ -2,59 +2,57 @@
 // const vm = require('vm');
 
 // ?ut=&invt=2&fltt=2&fields=&secid=1.600862&cb=&_=1601168994587
+const axios = require('axios');
 const picker = require('@ksky521/html-picker');
 const iconv = require('./iconv');
 
 const {getHeader} = require('./thsUtils');
 
-const request = require('request-promise-native');
-
 const API_URL = 'http://basic.10jqka.com.cn/';
 
-function getDetail(stockId) {
+async function getDetail(stockId) {
     const prefix = `${API_URL}${stockId}`;
     const url = `${prefix}/finance.html`;
-    // console.log(url);
-    return request({
-        uri: url,
-        encoding: null,
+    const response = await axios.get(url, {
+        responseType: 'arraybuffer',
+        timeout: 30000,
         headers: getHeader({Referrer: prefix})
-    }).then(data => {
-        const html = iconv(data);
-        let rs = {};
-        picker(html, {
-            data: {
-                selector: 'p#main',
-                handler($node) {
-                    rs = JSON.parse($node.html());
-                }
+    });
+
+    const html = iconv(response.data);
+    let rs = {};
+    picker(html, {
+        data: {
+            selector: 'p#main',
+            handler($node) {
+                rs = JSON.parse($node.html());
             }
-        });
-        const titles = rs.title;
-        const content = rs.report;
-        const reports = [];
-        for (let index = 0; index < content[0].length; index++) {
-            const report = {};
-            for (let i = 0; i < titles.length; i++) {
-                let title = titles[i];
-                if (typeof title === 'string') {
-                    title = title.trim();
-                } else if (Array.isArray(title)) {
-                    title = title[0];
-                }
-                if (content[index]) {
-                    report[title] = content[i][index];
-                } else {
-                    // console.log(report[title]);
-                }
+        }
+    });
+    const titles = rs.title;
+    const content = rs.report;
+    const reports = [];
+    for (let index = 0; index < content[0].length; index++) {
+        const report = {};
+        for (let i = 0; i < titles.length; i++) {
+            let title = titles[i];
+            if (typeof title === 'string') {
+                title = title.trim();
+            } else if (Array.isArray(title)) {
+                title = title[0];
             }
-            if (Object.keys(report).length > 0) {
-                reports.push(report);
+            if (content[index]) {
+                report[title] = content[i][index];
+            } else {
+                // console.log(report[title]);
             }
         }
-        // console.log(titles.length, content.length);
-        return reports;
-    });
+        if (Object.keys(report).length > 0) {
+            reports.push(report);
+        }
+    }
+
+    return reports;
 }
 
 module.exports = getDetail;

package/lib/dividendUtils.js

@@ -1,7 +1,7 @@
 const DIVIDEND_SCORE_CONSTANTS = {
     ROLLING_WINDOW: 440,
-    PERCENTILE_LOW: 5,
-    PERCENTILE_HIGH: 95,
+    PERCENTILE_LOW: 0,
+    PERCENTILE_HIGH: 100,
     SCORE_MA_PERIOD: 5,
     EMA_PERIOD: 20,
     MA_PERIOD: 80,
@@ -140,6 +140,7 @@ function calculateScores(data) {
 
     const csValues = dataCopy.map(d => d.cs);
     const ma80BiasValues = dataCopy.map(d => d.ma80Bias);
+    const rsiValues = dataCopy.map(d => d.rsi);
 
     for (let i = 0; i < dataCopy.length; i++) {
         const current = dataCopy[i];
@@ -155,6 +156,7 @@ function calculateScores(data) {
         const startIdx = Math.max(0, i - DIVIDEND_SCORE_CONSTANTS.ROLLING_WINDOW + 1);
         const csHistory = csValues.slice(startIdx, i + 1);
         const ma80History = ma80BiasValues.slice(startIdx, i + 1);
+        const rsiHistory = rsiValues.slice(startIdx, i + 1);
 
         current.csScore = calculateRollingScore(
             current.cs,
@@ -168,7 +170,12 @@ function calculateScores(data) {
             DIVIDEND_SCORE_CONSTANTS.PERCENTILE_LOW,
             DIVIDEND_SCORE_CONSTANTS.PERCENTILE_HIGH
         );
-        current.rsiScore = current.rsi;
+        current.rsiScore = calculateRollingScore(
+            current.rsi,
+            rsiHistory,
+            DIVIDEND_SCORE_CONSTANTS.PERCENTILE_LOW,
+            DIVIDEND_SCORE_CONSTANTS.PERCENTILE_HIGH
+        );
 
         if (current.csScore !== null && current.ma80Score !== null && current.rsiScore !== null) {
             current.totalScore = parseFloat(

package/lib/output.js

@@ -8,7 +8,10 @@ function output(data) {
         console.log('[60]{"日期","分数","cs值","rsi值"}:');
 
         data.scores.forEach(item => {
-            console.log(`  ${item.date},${item.score || '-'},${item.cs || '-'},${item.rsi || '-'}`);
+            const score = item.score != null ? item.score : '-';
+            const cs = item.cs != null ? item.cs : '-';
+            const rsi = item.rsi != null ? item.rsi : '-';
+            console.log(`  ${item.date},${score},${cs},${rsi}`);
         });
 
         console.log('```');

package/package.json

@@ -1,13 +1,14 @@
 {
     "name": "daxiapi-cli",
-    "version": "2.3.3",
+    "version": "2.4.2",
     "description": "大虾皮金融数据API命令行工具",
     "bin": {
         "daxiapi": "./bin/index.js",
         "dxp": "./bin/index.js"
     },
     "scripts": {
-        "test": "node bin/index.js --help"
+        "test": "node --test test/*.test.js",
+        "test:coverage": "node --test --experimental-test-coverage --test-coverage-branches=80 --test-coverage-functions=80 --test-coverage-lines=80 test/*.test.js"
     },
     "keywords": [
         "stock",
@@ -20,8 +21,6 @@
     "license": "MIT",
     "dependencies": {
         "iconv-lite": "^0.5.0",
-        "request": "^2.88.0",
-        "request-promise-native": "^1.0.7",
         "@ksky521/html-picker": "^1.0.0",
         "@toon-format/toon": "^2.1.0",
         "axios": "^1.6.0",
@@ -38,4 +37,4 @@
         "lib",
         "README.md"
     ]
-}
+}