@ttkit/daily-hot-api 0.1.2 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.example +26 -0
- package/README.md +26 -0
- package/dist/app.module.js +2 -0
- package/dist/app.module.js.map +1 -1
- package/dist/cli/args.d.ts +3 -1
- package/dist/cli/args.js +25 -2
- package/dist/cli/args.js.map +1 -1
- package/dist/cli/commands/logs.js +5 -0
- package/dist/cli/commands/logs.js.map +1 -1
- package/dist/cli/commands/restart.js +14 -3
- package/dist/cli/commands/restart.js.map +1 -1
- package/dist/cli/commands/start.js +17 -9
- package/dist/cli/commands/start.js.map +1 -1
- package/dist/cli/commands/status.js +5 -4
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/commands/stop.js +1 -1
- package/dist/cli/commands/stop.js.map +1 -1
- package/dist/cli/env.d.ts +1 -0
- package/dist/cli/env.js +12 -0
- package/dist/cli/env.js.map +1 -1
- package/dist/cli/health.d.ts +1 -1
- package/dist/cli/health.js +32 -17
- package/dist/cli/health.js.map +1 -1
- package/dist/cli/help.js +14 -2
- package/dist/cli/help.js.map +1 -1
- package/dist/cli/log-file.d.ts +4 -0
- package/dist/cli/log-file.js +54 -5
- package/dist/cli/log-file.js.map +1 -1
- package/dist/cli/paths.d.ts +1 -0
- package/dist/cli/paths.js +2 -1
- package/dist/cli/paths.js.map +1 -1
- package/dist/cli/run-state.d.ts +6 -1
- package/dist/cli/run-state.js +18 -6
- package/dist/cli/run-state.js.map +1 -1
- package/dist/config/validation.schema.d.ts +54 -0
- package/dist/config/validation.schema.js +75 -0
- package/dist/config/validation.schema.js.map +1 -1
- package/dist/daily-brief/daily-brief.module.js +1 -1
- package/dist/daily-brief/daily-brief.module.js.map +1 -1
- package/dist/daily-brief/daily-brief.service.js +1 -1
- package/dist/daily-brief/daily-brief.service.js.map +1 -1
- package/dist/database/database.module.js +15 -2
- package/dist/database/database.module.js.map +1 -1
- package/dist/database/repositories/daily-brief.repository.js +11 -1
- package/dist/database/repositories/daily-brief.repository.js.map +1 -1
- package/dist/database/repositories/hot-item.repository.d.ts +1 -1
- package/dist/database/repositories/hot-item.repository.js +7 -4
- package/dist/database/repositories/hot-item.repository.js.map +1 -1
- package/dist/database/repositories/news-brief.repository.d.ts +81 -0
- package/dist/database/repositories/news-brief.repository.js +208 -0
- package/dist/database/repositories/news-brief.repository.js.map +1 -0
- package/dist/database/schemas/news-brief.schema.d.ts +48 -0
- package/dist/database/schemas/news-brief.schema.js +130 -0
- package/dist/database/schemas/news-brief.schema.js.map +1 -0
- package/dist/main.js +2 -1
- package/dist/main.js.map +1 -1
- package/dist/news-brief/categories/news-category.registry.d.ts +5 -0
- package/dist/news-brief/categories/news-category.registry.js +106 -0
- package/dist/news-brief/categories/news-category.registry.js.map +1 -0
- package/dist/news-brief/clients/news-brief-ai.client.d.ts +45 -0
- package/dist/news-brief/clients/news-brief-ai.client.js +314 -0
- package/dist/news-brief/clients/news-brief-ai.client.js.map +1 -0
- package/dist/news-brief/clients/news-brief-search.service.d.ts +12 -0
- package/dist/news-brief/clients/news-brief-search.service.js +57 -0
- package/dist/news-brief/clients/news-brief-search.service.js.map +1 -0
- package/dist/news-brief/dto/generate-news-brief.dto.d.ts +7 -0
- package/dist/news-brief/dto/generate-news-brief.dto.js +45 -0
- package/dist/news-brief/dto/generate-news-brief.dto.js.map +1 -0
- package/dist/news-brief/dto/list-news-briefs-query.dto.d.ts +7 -0
- package/dist/news-brief/dto/list-news-briefs-query.dto.js +59 -0
- package/dist/news-brief/dto/list-news-briefs-query.dto.js.map +1 -0
- package/dist/news-brief/dto/news-brief-date-param.dto.d.ts +3 -0
- package/dist/news-brief/dto/news-brief-date-param.dto.js +22 -0
- package/dist/news-brief/dto/news-brief-date-param.dto.js.map +1 -0
- package/dist/news-brief/interfaces/news-brief.interface.d.ts +202 -0
- package/dist/news-brief/interfaces/news-brief.interface.js +3 -0
- package/dist/news-brief/interfaces/news-brief.interface.js.map +1 -0
- package/dist/news-brief/news-brief.config.d.ts +33 -0
- package/dist/news-brief/news-brief.config.js +118 -0
- package/dist/news-brief/news-brief.config.js.map +1 -0
- package/dist/news-brief/news-brief.controller.d.ts +56 -0
- package/dist/news-brief/news-brief.controller.js +185 -0
- package/dist/news-brief/news-brief.controller.js.map +1 -0
- package/dist/news-brief/news-brief.module.d.ts +2 -0
- package/dist/news-brief/news-brief.module.js +47 -0
- package/dist/news-brief/news-brief.module.js.map +1 -0
- package/dist/news-brief/news-brief.scheduler.d.ts +34 -0
- package/dist/news-brief/news-brief.scheduler.js +143 -0
- package/dist/news-brief/news-brief.scheduler.js.map +1 -0
- package/dist/news-brief/news-brief.service.d.ts +60 -0
- package/dist/news-brief/news-brief.service.js +676 -0
- package/dist/news-brief/news-brief.service.js.map +1 -0
- package/package.json +3 -1
package/.env.example
CHANGED
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
# 也可以用 --config 指定其他配置文件;完整变量说明见 https://helti.github.io/daily-hot-api/reference/environment-variables 。
|
|
4
4
|
|
|
5
5
|
PORT=6689
|
|
6
|
+
# 监听地址。默认 0.0.0.0(所有网卡);只给本机或反向代理用时设 127.0.0.1
|
|
7
|
+
HOST="0.0.0.0"
|
|
6
8
|
# 允许的域名
|
|
7
9
|
ALLOWED_DOMAIN="*"
|
|
8
10
|
|
|
@@ -55,6 +57,30 @@ BRIEF_SEARCH_CONCURRENCY=3
|
|
|
55
57
|
# 搜索平台优先级,逗号分隔;可选 tavily、deepseek;留空关闭搜索增强
|
|
56
58
|
BRIEF_SEARCH_PROVIDERS=tavily,deepseek
|
|
57
59
|
|
|
60
|
+
# 通用新闻简报配置(独立 collection / 调度器 / 配置前缀;前端只读)
|
|
61
|
+
# 板块:finance 财经、general 综合新闻、tech 科技、sports 体育
|
|
62
|
+
NEWS_BRIEF_ENABLED=false
|
|
63
|
+
NEWS_BRIEF_CRON_EXPRESSION=30 8 * * *
|
|
64
|
+
NEWS_BRIEF_TIMEZONE=Asia/Shanghai
|
|
65
|
+
NEWS_BRIEF_CATEGORIES=finance,general,tech,sports
|
|
66
|
+
NEWS_BRIEF_LOOKBACK_HOURS=24
|
|
67
|
+
NEWS_BRIEF_TOP_ITEMS_PER_SOURCE=8
|
|
68
|
+
NEWS_BRIEF_MAX_CANDIDATES=40
|
|
69
|
+
NEWS_BRIEF_MAX_ITEMS_PER_CATEGORY=8
|
|
70
|
+
NEWS_BRIEF_SOURCE_CONCURRENCY=3
|
|
71
|
+
NEWS_BRIEF_CATEGORY_CONCURRENCY=1
|
|
72
|
+
NEWS_BRIEF_GENERATING_TIMEOUT_MINUTES=30
|
|
73
|
+
# 手动生成接口默认禁用:前端不允许触发;运维需要时临时设为 true 再重启
|
|
74
|
+
NEWS_BRIEF_MANUAL_GENERATE_ENABLED=false
|
|
75
|
+
# P1 搜索增强(默认关闭;开启后为候选新闻补充搜索证据,会产生搜索费用)
|
|
76
|
+
NEWS_BRIEF_SEARCH_ENABLED=false
|
|
77
|
+
NEWS_BRIEF_SEARCH_MAX_QUERIES=6
|
|
78
|
+
NEWS_BRIEF_SEARCH_CONCURRENCY=3
|
|
79
|
+
# 单条搜索词最大字符数(产品要求 2000 字以内)
|
|
80
|
+
NEWS_BRIEF_SEARCH_QUERY_MAX_CHARS=2000
|
|
81
|
+
# 搜索平台优先级,逗号分隔;可选 tavily、deepseek;留空关闭搜索增强
|
|
82
|
+
NEWS_BRIEF_SEARCH_PROVIDERS=tavily,deepseek
|
|
83
|
+
|
|
58
84
|
# OPENAI 配置
|
|
59
85
|
OPENAI_API_KEY=skxxx
|
|
60
86
|
OPENAI_API_BASE_URL=https://api.deepseek.com
|
package/README.md
CHANGED
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
|
|
5
5
|
📖 [在线文档](https://helti.github.io/daily-hot-api/) · [快速开始](./docs/guide/getting-started.md) · [API 参考](./docs/reference/api.md) · [开发指南](./docs/development/architecture.md)
|
|
6
6
|
|
|
7
|
+
[](https://skills.sh/HelTi/daily-hot-api)
|
|
8
|
+
|
|
7
9
|
|
|
8
10
|
## 功能特性
|
|
9
11
|
|
|
@@ -14,7 +16,9 @@
|
|
|
14
16
|
- 🔍 支持全文搜索和高级查询
|
|
15
17
|
- 🎯 基于 URL 的数据去重机制
|
|
16
18
|
- 🤖 AI分析数据生成深度简报
|
|
19
|
+
- 📰 通用新闻简报:按财经、综合新闻、科技、体育板块生成统一结构的新闻条目(标题、简介、内容、来源),支持多板块聚合、历史分页查询和可选搜索增强(默认关闭)
|
|
17
20
|
- 🖥️ 支持 npm 全局安装的 CLI,一条命令启动/停止热点服务
|
|
21
|
+
- 🧠 提供 Agent Skill,Claude Code、Codex、Cursor 等 agent 可直接查询热榜/历史/简报
|
|
18
22
|
|
|
19
23
|
## 支持的站点
|
|
20
24
|
|
|
@@ -146,6 +150,28 @@ node bin/daily-hot-api.js start -d --config .env
|
|
|
146
150
|
|
|
147
151
|
CLI 会把运行状态和后台日志写入 `~/.daily-hot-api`(可用 `DAILY_HOT_API_HOME` 或 `--home` 修改),端口默认取 `.env` 的 `PORT`,否则 6689。完整命令、退出码和故障排查见[命令行工具文档](https://helti.github.io/daily-hot-api/guide/cli)。
|
|
148
152
|
|
|
153
|
+
## Agent Skill(给 AI Agent 用)
|
|
154
|
+
|
|
155
|
+
仓库内置了符合 [Agent Skills](https://agentskills.io/specification) 规范的 skill:`skills/daily-hot-api`。安装后,Claude Code、Codex、Cursor、Copilot、OpenCode、OpenClaw 等 agent 可以直接获取 60+ 平台热榜、历史热点和只读的 AI 每日简报。
|
|
156
|
+
|
|
157
|
+
```bash
|
|
158
|
+
# 安装到用户级(所有项目可用)
|
|
159
|
+
npx skills add HelTi/daily-hot-api --skill daily-hot-api -g
|
|
160
|
+
|
|
161
|
+
# 或只装到 Claude Code
|
|
162
|
+
npx skills add HelTi/daily-hot-api --skill daily-hot-api -g -a claude-code -y
|
|
163
|
+
```
|
|
164
|
+
|
|
165
|
+
然后直接用自然语言提问,例如:
|
|
166
|
+
|
|
167
|
+
- “今天微博、知乎、B 站都有什么热点?各取前 10 条。”
|
|
168
|
+
- “汇总今天科技圈热榜,带来源链接。”
|
|
169
|
+
- “读一下今天的 AI 每日简报。”
|
|
170
|
+
|
|
171
|
+
skill 会自动连接或启动一个本地隔离实例(零配置、无需 API Key);历史热点与 AI 简报需要连接已配置 MongoDB / AI Key 的自建实例(`DAILY_HOT_API_BASE_URL`)。状态目录默认为 `~/.daily-hot-api-skill`,`stop` 只停止 skill 自己启动的实例。
|
|
172
|
+
|
|
173
|
+
环境要求:Node.js >= 22.20(推荐 24)、可访问 npm 与热榜来源站点。详见[Agent Skill 使用文档](https://helti.github.io/daily-hot-api/guide/agent-skill)和[维护说明](./docs/development/agent-skill.md)。
|
|
174
|
+
|
|
149
175
|
## API 接口
|
|
150
176
|
|
|
151
177
|
### 获取热榜列表
|
package/dist/app.module.js
CHANGED
|
@@ -15,6 +15,7 @@ const logger_middleware_1 = require("./common/middlewares/logger.middleware");
|
|
|
15
15
|
const config_module_1 = require("./config/config.module");
|
|
16
16
|
const database_module_1 = require("./database/database.module");
|
|
17
17
|
const daily_brief_module_1 = require("./daily-brief/daily-brief.module");
|
|
18
|
+
const news_brief_module_1 = require("./news-brief/news-brief.module");
|
|
18
19
|
const hot_lists_module_1 = require("./host-lists/hot-lists.module");
|
|
19
20
|
const history_module_1 = require("./history/history.module");
|
|
20
21
|
const scheduler_module_1 = require("./scheduler/scheduler.module");
|
|
@@ -34,6 +35,7 @@ exports.AppModule = AppModule = __decorate([
|
|
|
34
35
|
hot_lists_module_1.HotListsModule,
|
|
35
36
|
history_module_1.HistoryModule,
|
|
36
37
|
daily_brief_module_1.DailyBriefModule,
|
|
38
|
+
news_brief_module_1.NewsBriefModule,
|
|
37
39
|
scheduler_module_1.SchedulerModule,
|
|
38
40
|
token_module_1.TokenModule,
|
|
39
41
|
],
|
package/dist/app.module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwE;AACxE,qDAAiD;AACjD,+CAA2C;AAC3C,uDAAmD;AACnD,8EAA0E;AAC1E,0DAAyD;AACzD,gEAA4D;AAC5D,yEAAoE;AACpE,oEAA+D;AAC/D,6DAAyD;AACzD,mEAA+D;AAC/D,uDAAmD;
|
|
1
|
+
{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwE;AACxE,qDAAiD;AACjD,+CAA2C;AAC3C,uDAAmD;AACnD,8EAA0E;AAC1E,0DAAyD;AACzD,gEAA4D;AAC5D,yEAAoE;AACpE,sEAAiE;AACjE,oEAA+D;AAC/D,6DAAyD;AACzD,mEAA+D;AAC/D,uDAAmD;AAiB5C,IAAM,SAAS,GAAf,MAAM,SAAS;IACpB,SAAS,CAAC,QAA4B;QACpC,QAAQ,CAAC,KAAK,CAAC,oCAAgB,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;CACF,CAAA;AAJY,8BAAS;oBAAT,SAAS;IAfrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,0BAAW;YACX,+BAAe;YACf,gCAAc;YACd,iCAAc;YACd,8BAAa;YACb,qCAAgB;YAChB,mCAAe;YACf,kCAAe;YACf,0BAAW;SACZ;QACD,WAAW,EAAE,CAAC,8BAAa,CAAC;QAC5B,SAAS,EAAE,CAAC,wBAAU,EAAE,oCAAgB,CAAC;KAC1C,CAAC;GACW,SAAS,CAIrB"}
|
package/dist/cli/args.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export type CommandName = 'start' | 'stop' | 'status' | 'restart' | 'logs' | 'help' | 'version';
|
|
2
|
-
export type OptionKey = 'help' | 'version' | 'json' | 'daemon' | 'foreground' | 'port' | 'envFile' | 'home' | 'timeout' | 'force' | 'follow' | 'lines';
|
|
2
|
+
export type OptionKey = 'help' | 'version' | 'json' | 'daemon' | 'foreground' | 'port' | 'host' | 'envFile' | 'home' | 'timeout' | 'force' | 'follow' | 'lines' | 'clear';
|
|
3
3
|
export declare const COMMAND_NAMES: readonly CommandName[];
|
|
4
4
|
export interface CliOptions {
|
|
5
5
|
command: CommandName;
|
|
@@ -10,12 +10,14 @@ export interface CliOptions {
|
|
|
10
10
|
daemon: boolean;
|
|
11
11
|
foreground: boolean;
|
|
12
12
|
port?: number;
|
|
13
|
+
host?: string;
|
|
13
14
|
envFile?: string;
|
|
14
15
|
home?: string;
|
|
15
16
|
timeoutSeconds: number;
|
|
16
17
|
force: boolean;
|
|
17
18
|
follow: boolean;
|
|
18
19
|
lines: number;
|
|
20
|
+
clear: boolean;
|
|
19
21
|
helpTarget?: CommandName;
|
|
20
22
|
}
|
|
21
23
|
export declare const DEFAULT_LOG_LINES = 50;
|
package/dist/cli/args.js
CHANGED
|
@@ -27,6 +27,7 @@ const FLAG_MAP = {
|
|
|
27
27
|
'--foreground': 'foreground',
|
|
28
28
|
'-p': 'port',
|
|
29
29
|
'--port': 'port',
|
|
30
|
+
'--host': 'host',
|
|
30
31
|
'--config': 'envFile',
|
|
31
32
|
'--env-file': 'envFile',
|
|
32
33
|
'--home': 'home',
|
|
@@ -36,6 +37,7 @@ const FLAG_MAP = {
|
|
|
36
37
|
'--follow': 'follow',
|
|
37
38
|
'-n': 'lines',
|
|
38
39
|
'--lines': 'lines',
|
|
40
|
+
'--clear': 'clear',
|
|
39
41
|
};
|
|
40
42
|
const FLAG_DISPLAY = {
|
|
41
43
|
help: '--help',
|
|
@@ -44,22 +46,25 @@ const FLAG_DISPLAY = {
|
|
|
44
46
|
daemon: '--daemon',
|
|
45
47
|
foreground: '--foreground',
|
|
46
48
|
port: '--port',
|
|
49
|
+
host: '--host',
|
|
47
50
|
envFile: '--config',
|
|
48
51
|
home: '--home',
|
|
49
52
|
timeout: '--timeout',
|
|
50
53
|
force: '--force',
|
|
51
54
|
follow: '--follow',
|
|
52
55
|
lines: '--lines',
|
|
56
|
+
clear: '--clear',
|
|
53
57
|
};
|
|
54
58
|
const VALUE_OPTIONS = new Set([
|
|
55
59
|
'port',
|
|
60
|
+
'host',
|
|
56
61
|
'envFile',
|
|
57
62
|
'home',
|
|
58
63
|
'timeout',
|
|
59
64
|
'lines',
|
|
60
65
|
]);
|
|
61
66
|
const COMMAND_OPTIONS = {
|
|
62
|
-
start: ['help', 'daemon', 'port', 'envFile', 'home'],
|
|
67
|
+
start: ['help', 'daemon', 'port', 'host', 'envFile', 'home'],
|
|
63
68
|
stop: ['help', 'json', 'timeout', 'force', 'home'],
|
|
64
69
|
status: ['help', 'json', 'home'],
|
|
65
70
|
restart: [
|
|
@@ -67,12 +72,13 @@ const COMMAND_OPTIONS = {
|
|
|
67
72
|
'daemon',
|
|
68
73
|
'foreground',
|
|
69
74
|
'port',
|
|
75
|
+
'host',
|
|
70
76
|
'envFile',
|
|
71
77
|
'home',
|
|
72
78
|
'timeout',
|
|
73
79
|
'force',
|
|
74
80
|
],
|
|
75
|
-
logs: ['help', 'follow', 'lines', 'home'],
|
|
81
|
+
logs: ['help', 'follow', 'lines', 'clear', 'home'],
|
|
76
82
|
help: ['help'],
|
|
77
83
|
version: [],
|
|
78
84
|
};
|
|
@@ -120,8 +126,10 @@ function parseArgs(argv) {
|
|
|
120
126
|
foreground: false,
|
|
121
127
|
force: false,
|
|
122
128
|
follow: false,
|
|
129
|
+
clear: false,
|
|
123
130
|
};
|
|
124
131
|
let port;
|
|
132
|
+
let host;
|
|
125
133
|
let envFile;
|
|
126
134
|
let home;
|
|
127
135
|
let timeoutSeconds = paths_1.DEFAULT_STOP_TIMEOUT_SECONDS;
|
|
@@ -158,6 +166,12 @@ function parseArgs(argv) {
|
|
|
158
166
|
else if (key === 'home') {
|
|
159
167
|
home = raw;
|
|
160
168
|
}
|
|
169
|
+
else if (key === 'host') {
|
|
170
|
+
host = raw.trim();
|
|
171
|
+
if (!host) {
|
|
172
|
+
throw new errors_1.UsageError('--host 不能为空');
|
|
173
|
+
}
|
|
174
|
+
}
|
|
161
175
|
else {
|
|
162
176
|
envFile = raw;
|
|
163
177
|
}
|
|
@@ -188,6 +202,9 @@ function parseArgs(argv) {
|
|
|
188
202
|
case 'follow':
|
|
189
203
|
flags.follow = true;
|
|
190
204
|
break;
|
|
205
|
+
case 'clear':
|
|
206
|
+
flags.clear = true;
|
|
207
|
+
break;
|
|
191
208
|
default:
|
|
192
209
|
throw new errors_1.UsageError(`未知选项: ${flagName}`);
|
|
193
210
|
}
|
|
@@ -223,12 +240,16 @@ function parseArgs(argv) {
|
|
|
223
240
|
force: false,
|
|
224
241
|
follow: false,
|
|
225
242
|
lines: exports.DEFAULT_LOG_LINES,
|
|
243
|
+
clear: false,
|
|
226
244
|
};
|
|
227
245
|
}
|
|
228
246
|
const effectiveCommand = command ?? 'start';
|
|
229
247
|
if (flags.daemon && flags.foreground) {
|
|
230
248
|
throw new errors_1.UsageError('--daemon 与 --foreground 不能同时使用');
|
|
231
249
|
}
|
|
250
|
+
if (flags.clear && flags.follow) {
|
|
251
|
+
throw new errors_1.UsageError('--clear 与 --follow 不能同时使用');
|
|
252
|
+
}
|
|
232
253
|
if (!flags.help) {
|
|
233
254
|
const supported = COMMAND_OPTIONS[effectiveCommand];
|
|
234
255
|
for (const key of seen) {
|
|
@@ -246,12 +267,14 @@ function parseArgs(argv) {
|
|
|
246
267
|
daemon: flags.daemon,
|
|
247
268
|
foreground: flags.foreground,
|
|
248
269
|
port,
|
|
270
|
+
host,
|
|
249
271
|
envFile,
|
|
250
272
|
home,
|
|
251
273
|
timeoutSeconds,
|
|
252
274
|
force: flags.force,
|
|
253
275
|
follow: flags.follow,
|
|
254
276
|
lines,
|
|
277
|
+
clear: flags.clear,
|
|
255
278
|
helpTarget,
|
|
256
279
|
};
|
|
257
280
|
}
|
package/dist/cli/args.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/cli/args.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/cli/args.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,11 @@ async function logsCommand(options, context = {}) {
|
|
|
18
18
|
(0, output_1.fail)('前台模式的标准输出直接打印在启动终端,不会写入日志文件;请使用 daily-hot-api start -d 后台启动');
|
|
19
19
|
return errors_1.EXIT_CODES.error;
|
|
20
20
|
}
|
|
21
|
+
if (options.clear) {
|
|
22
|
+
(0, log_file_1.clearLogFile)(paths.logFile);
|
|
23
|
+
(0, output_1.info)(`已清空日志: ${paths.logFile}`);
|
|
24
|
+
return errors_1.EXIT_CODES.ok;
|
|
25
|
+
}
|
|
21
26
|
const content = (0, log_file_1.tailFile)(paths.logFile, options.lines);
|
|
22
27
|
if (content) {
|
|
23
28
|
process.stdout.write(content.endsWith('\n') ? content : `${content}\n`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/cli/commands/logs.ts"],"names":[],"mappings":";;AAWA,
|
|
1
|
+
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/cli/commands/logs.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,13 +16,17 @@ async function restartCommand(options, context = {}) {
|
|
|
16
16
|
const existing = (0, run_state_1.readRunState)(paths.stateFile);
|
|
17
17
|
if (existing.state &&
|
|
18
18
|
(0, run_state_1.isProcessAlive)(existing.state.pid) &&
|
|
19
|
-
!(0, run_state_1.processLooksLikeService)(existing.state.pid,
|
|
19
|
+
!(0, run_state_1.processLooksLikeService)(existing.state.pid, {
|
|
20
|
+
entry: existing.state.entry,
|
|
21
|
+
})) {
|
|
20
22
|
throw new errors_1.CliError(`运行状态文件记录的 PID ${existing.state.pid} 仍存活,但无法确认是 ${paths_1.APP_NAME} 进程。` +
|
|
21
23
|
`请先执行 ${paths_1.APP_NAME} stop --force 终止并清理状态文件,或手动删除 ${paths.stateFile}`);
|
|
22
24
|
}
|
|
23
25
|
const runningState = existing.state &&
|
|
24
26
|
(0, run_state_1.isProcessAlive)(existing.state.pid) &&
|
|
25
|
-
(0, run_state_1.processLooksLikeService)(existing.state.pid,
|
|
27
|
+
(0, run_state_1.processLooksLikeService)(existing.state.pid, {
|
|
28
|
+
entry: existing.state.entry,
|
|
29
|
+
})
|
|
26
30
|
? existing.state
|
|
27
31
|
: null;
|
|
28
32
|
const mode = options.daemon
|
|
@@ -31,10 +35,15 @@ async function restartCommand(options, context = {}) {
|
|
|
31
35
|
? 'foreground'
|
|
32
36
|
: (runningState?.mode ?? 'foreground');
|
|
33
37
|
const port = options.port ?? runningState?.port;
|
|
38
|
+
const host = options.host ?? runningState?.host ?? undefined;
|
|
34
39
|
const envFile = options.envFile ?? runningState?.envFile ?? undefined;
|
|
35
40
|
if (runningState) {
|
|
36
41
|
(0, output_1.info)(`正在重启热点服务(当前 PID ${runningState.pid},端口 ${runningState.port})...`);
|
|
37
|
-
await (0, stop_1.stopCommand)({ ...options, command: 'stop', json: false }, context);
|
|
42
|
+
const stopCode = await (0, stop_1.stopCommand)({ ...options, command: 'stop', json: false }, context);
|
|
43
|
+
if (stopCode !== errors_1.EXIT_CODES.ok) {
|
|
44
|
+
throw new errors_1.CliError(`停止旧实例失败(退出码 ${stopCode}),已中止重启。` +
|
|
45
|
+
`请根据上面的提示处理后重试,或执行 ${paths_1.APP_NAME} stop --force`);
|
|
46
|
+
}
|
|
38
47
|
}
|
|
39
48
|
else {
|
|
40
49
|
if (existing.state || existing.corrupt) {
|
|
@@ -54,7 +63,9 @@ async function restartCommand(options, context = {}) {
|
|
|
54
63
|
daemon: mode === 'daemon',
|
|
55
64
|
foreground: false,
|
|
56
65
|
port,
|
|
66
|
+
host,
|
|
57
67
|
envFile,
|
|
68
|
+
clear: false,
|
|
58
69
|
helpTarget: undefined,
|
|
59
70
|
};
|
|
60
71
|
return (0, start_1.startCommand)(startOptions, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../src/cli/commands/restart.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../src/cli/commands/restart.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,8 +61,10 @@ async function startCommand(options, context = {}) {
|
|
|
61
61
|
}
|
|
62
62
|
const port = (0, env_1.resolvePort)(options.port, env);
|
|
63
63
|
env.PORT = String(port);
|
|
64
|
+
const host = (0, env_1.resolveHost)(options.host, env);
|
|
65
|
+
env.HOST = host;
|
|
64
66
|
assertNoRunningInstance(paths);
|
|
65
|
-
if (await (0, run_state_1.isPortInUse)(port)) {
|
|
67
|
+
if (await (0, run_state_1.isPortInUse)(port, (0, run_state_1.probeHost)(host))) {
|
|
66
68
|
throw new errors_1.CliError(`端口 ${port} 已被其他进程占用,请使用 --port 指定其他端口,或先停止占用进程`);
|
|
67
69
|
}
|
|
68
70
|
const target = {
|
|
@@ -70,6 +72,7 @@ async function startCommand(options, context = {}) {
|
|
|
70
72
|
env,
|
|
71
73
|
paths,
|
|
72
74
|
port,
|
|
75
|
+
host,
|
|
73
76
|
envFile: envResolution?.path ?? null,
|
|
74
77
|
};
|
|
75
78
|
if (options.daemon) {
|
|
@@ -100,7 +103,7 @@ function assertNoRunningInstance(paths) {
|
|
|
100
103
|
return;
|
|
101
104
|
}
|
|
102
105
|
if ((0, run_state_1.isProcessAlive)(state.pid)) {
|
|
103
|
-
if ((0, run_state_1.processLooksLikeService)(state.pid)) {
|
|
106
|
+
if ((0, run_state_1.processLooksLikeService)(state.pid, { entry: state.entry })) {
|
|
104
107
|
throw new errors_1.CliError(`热点服务已在运行(PID ${state.pid},端口 ${state.port})。如需重启请运行: ${paths_1.APP_NAME} restart`);
|
|
105
108
|
}
|
|
106
109
|
throw new errors_1.CliError(`运行状态文件记录的 PID ${state.pid} 仍存活,但无法确认是 ${paths_1.APP_NAME} 进程。` +
|
|
@@ -111,7 +114,7 @@ function assertNoRunningInstance(paths) {
|
|
|
111
114
|
}
|
|
112
115
|
async function startForeground(target, mode) {
|
|
113
116
|
(0, output_1.info)(`正在启动 ${paths_1.APP_NAME}(${mode === 'daemon' ? '后台' : '前台'}模式)...`);
|
|
114
|
-
(0, output_1.info)(
|
|
117
|
+
(0, output_1.info)(`监听: ${target.host}:${target.port}`);
|
|
115
118
|
if (target.envFile) {
|
|
116
119
|
(0, output_1.info)(`配置文件: ${target.envFile}`);
|
|
117
120
|
}
|
|
@@ -119,6 +122,7 @@ async function startForeground(target, mode) {
|
|
|
119
122
|
const state = {
|
|
120
123
|
pid: process.pid,
|
|
121
124
|
port: target.port,
|
|
125
|
+
host: target.host,
|
|
122
126
|
mode,
|
|
123
127
|
startedAt: new Date().toISOString(),
|
|
124
128
|
cwd: target.cwd,
|
|
@@ -165,7 +169,7 @@ async function startForeground(target, mode) {
|
|
|
165
169
|
catch {
|
|
166
170
|
}
|
|
167
171
|
}
|
|
168
|
-
(0, output_1.info)(`热点服务已启动: http
|
|
172
|
+
(0, output_1.info)(`热点服务已启动: http://${(0, run_state_1.probeHost)(target.host)}:${actualPort}`);
|
|
169
173
|
if (mode === 'daemon') {
|
|
170
174
|
(0, output_1.info)(`PID: ${process.pid}`);
|
|
171
175
|
(0, output_1.info)(`日志: ${target.paths.logFile}`);
|
|
@@ -177,6 +181,9 @@ async function startForeground(target, mode) {
|
|
|
177
181
|
}
|
|
178
182
|
async function startDaemon(target) {
|
|
179
183
|
ensureStateDir(target.paths.homeDir);
|
|
184
|
+
if ((0, log_file_1.rotateLogFile)(target.paths.logFile)) {
|
|
185
|
+
(0, output_1.info)(`日志超过上限已轮转: ${target.paths.logFile}.1`);
|
|
186
|
+
}
|
|
180
187
|
let logFd;
|
|
181
188
|
try {
|
|
182
189
|
logFd = (0, fs_1.openSync)(target.paths.logFile, 'a');
|
|
@@ -186,7 +193,7 @@ async function startDaemon(target) {
|
|
|
186
193
|
throw new errors_1.CliError(`无法写入日志文件 ${target.paths.logFile}: ${reason}。请检查状态目录是否可写`);
|
|
187
194
|
}
|
|
188
195
|
const startedAt = new Date().toISOString();
|
|
189
|
-
(0, fs_1.writeSync)(logFd, `\n[${startedAt}] ${paths_1.APP_NAME} background start (port=${target.port}${target.envFile ? `, env_file=${target.envFile}` : ''})\n`);
|
|
196
|
+
(0, fs_1.writeSync)(logFd, `\n[${startedAt}] ${paths_1.APP_NAME} background start (host=${target.host}, port=${target.port}${target.envFile ? `, env_file=${target.envFile}` : ''})\n`);
|
|
190
197
|
const childArgs = [(0, paths_1.getBinPath)(), 'start', '--home', target.paths.homeDir];
|
|
191
198
|
if (target.envFile) {
|
|
192
199
|
childArgs.push('--config', target.envFile);
|
|
@@ -194,6 +201,7 @@ async function startDaemon(target) {
|
|
|
194
201
|
const childEnv = {
|
|
195
202
|
...target.env,
|
|
196
203
|
PORT: String(target.port),
|
|
204
|
+
HOST: target.host,
|
|
197
205
|
[paths_1.DAEMON_CHILD_ENV]: '1',
|
|
198
206
|
};
|
|
199
207
|
let child;
|
|
@@ -218,7 +226,7 @@ async function startDaemon(target) {
|
|
|
218
226
|
throw new errors_1.CliError('后台进程创建失败: 未返回进程 PID');
|
|
219
227
|
}
|
|
220
228
|
(0, output_1.info)(`正在后台启动 ${paths_1.APP_NAME}(PID ${childPid})...`);
|
|
221
|
-
const ready = await waitForDaemonReady(childPid, child, target.port, target.paths.stateFile);
|
|
229
|
+
const ready = await waitForDaemonReady(childPid, child, target.port, target.host, target.paths.stateFile);
|
|
222
230
|
if (!ready.ok) {
|
|
223
231
|
await terminateFailedChild(childPid, target.paths.stateFile);
|
|
224
232
|
const reason = ready.reason === 'timeout'
|
|
@@ -233,20 +241,20 @@ async function startDaemon(target) {
|
|
|
233
241
|
.filter(Boolean)
|
|
234
242
|
.join('\n'));
|
|
235
243
|
}
|
|
236
|
-
(0, output_1.info)(`热点服务已在后台启动: http
|
|
244
|
+
(0, output_1.info)(`热点服务已在后台启动: http://${(0, run_state_1.probeHost)(target.host)}:${target.port}(监听 ${target.host})`);
|
|
237
245
|
(0, output_1.field)('PID', childPid);
|
|
238
246
|
(0, output_1.field)('日志', target.paths.logFile);
|
|
239
247
|
(0, output_1.info)(`停止: ${paths_1.APP_NAME} stop 状态: ${paths_1.APP_NAME} status 日志: ${paths_1.APP_NAME} logs -f`);
|
|
240
248
|
return errors_1.EXIT_CODES.ok;
|
|
241
249
|
}
|
|
242
|
-
async function waitForDaemonReady(pid, child, port, stateFile) {
|
|
250
|
+
async function waitForDaemonReady(pid, child, port, host, stateFile) {
|
|
243
251
|
const deadline = Date.now() + paths_1.START_TIMEOUT_MS;
|
|
244
252
|
while (Date.now() < deadline) {
|
|
245
253
|
if (!(0, run_state_1.isProcessAlive)(pid) || child.exitCode !== null) {
|
|
246
254
|
return { ok: false, reason: 'exited', exitCode: child.exitCode };
|
|
247
255
|
}
|
|
248
256
|
const { state } = (0, run_state_1.readRunState)(stateFile);
|
|
249
|
-
if (state?.pid === pid && (await (0, health_1.checkHealth)(port))) {
|
|
257
|
+
if (state?.pid === pid && (await (0, health_1.checkHealth)(port, 2000, host))) {
|
|
250
258
|
return { ok: true };
|
|
251
259
|
}
|
|
252
260
|
await (0, run_state_1.sleep)(paths_1.START_POLL_INTERVAL_MS);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/cli/commands/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/cli/commands/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,20 +24,21 @@ async function statusCommand(options, context = {}) {
|
|
|
24
24
|
(0, run_state_1.clearRunState)(paths.stateFile, state.pid);
|
|
25
25
|
return reportNotRunning(options.json, `PID ${state.pid} 已退出,已清理过期状态文件`, paths);
|
|
26
26
|
}
|
|
27
|
-
if (!(0, run_state_1.processLooksLikeService)(state.pid,
|
|
27
|
+
if (!(0, run_state_1.processLooksLikeService)(state.pid, { entry: state.entry })) {
|
|
28
28
|
return reportNotRunning(options.json, `PID ${state.pid} 仍存活但无法确认是 daily-hot-api 进程,状态文件可能已过期;可执行 daily-hot-api stop --force 清理`, paths);
|
|
29
29
|
}
|
|
30
|
-
const health = await (0, health_1.checkHealth)(state.port);
|
|
30
|
+
const health = await (0, health_1.checkHealth)(state.port, 2000, state.host);
|
|
31
31
|
const startedAtMs = Date.parse(state.startedAt);
|
|
32
32
|
const uptimeSeconds = Number.isFinite(startedAtMs)
|
|
33
33
|
? Math.max(0, Math.floor((Date.now() - startedAtMs) / 1000))
|
|
34
34
|
: 0;
|
|
35
|
-
const url = `http
|
|
35
|
+
const url = `http://${(0, run_state_1.probeHost)(state.host)}:${state.port}`;
|
|
36
36
|
if (options.json) {
|
|
37
37
|
console.log(JSON.stringify({
|
|
38
38
|
running: true,
|
|
39
39
|
pid: state.pid,
|
|
40
40
|
port: state.port,
|
|
41
|
+
host: state.host || '0.0.0.0',
|
|
41
42
|
url,
|
|
42
43
|
mode: state.mode,
|
|
43
44
|
startedAt: state.startedAt,
|
|
@@ -52,7 +53,7 @@ async function statusCommand(options, context = {}) {
|
|
|
52
53
|
}
|
|
53
54
|
(0, output_1.info)('热点服务运行中');
|
|
54
55
|
(0, output_1.field)('PID', state.pid);
|
|
55
|
-
(0, output_1.field)('
|
|
56
|
+
(0, output_1.field)('监听', `${state.host || '0.0.0.0'}:${state.port}`);
|
|
56
57
|
(0, output_1.field)('地址', url);
|
|
57
58
|
(0, output_1.field)('模式', state.mode === 'daemon' ? '后台 (daemon)' : '前台 (foreground)');
|
|
58
59
|
(0, output_1.field)('启动时间', `${state.startedAt}(已运行 ${(0, output_1.formatDuration)(uptimeSeconds)})`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ async function stopService(options, context = {}) {
|
|
|
51
51
|
message: `热点服务未在运行(PID ${state.pid} 已退出,已清理过期状态文件)`,
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
|
-
const trusted = (0, run_state_1.processLooksLikeService)(state.pid,
|
|
54
|
+
const trusted = (0, run_state_1.processLooksLikeService)(state.pid, { entry: state.entry });
|
|
55
55
|
if (!trusted && !options.force) {
|
|
56
56
|
return {
|
|
57
57
|
stopped: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../src/cli/commands/stop.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../src/cli/commands/stop.ts"],"names":[],"mappings":"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"}
|