cc98-cli 0.4.0 → 0.4.2
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/CHANGELOG.md +14 -0
- package/dist/cli/commands/update.d.ts.map +1 -1
- package/dist/cli/commands/update.js +49 -3
- package/dist/cli/commands/update.js.map +1 -1
- package/dist/storage/settings-store.d.ts +10 -0
- package/dist/storage/settings-store.d.ts.map +1 -0
- package/dist/storage/settings-store.js +37 -0
- package/dist/storage/settings-store.js.map +1 -0
- package/dist/tui/components/content.d.ts +1 -0
- package/dist/tui/components/content.d.ts.map +1 -1
- package/dist/tui/components/content.js +26 -8
- package/dist/tui/components/content.js.map +1 -1
- package/dist/tui/components/status.d.ts +3 -0
- package/dist/tui/components/status.d.ts.map +1 -1
- package/dist/tui/components/status.js +21 -8
- package/dist/tui/components/status.js.map +1 -1
- package/dist/tui/controller.d.ts +17 -0
- package/dist/tui/controller.d.ts.map +1 -1
- package/dist/tui/controller.js +465 -108
- package/dist/tui/controller.js.map +1 -1
- package/dist/tui/keybindings.d.ts +24 -0
- package/dist/tui/keybindings.d.ts.map +1 -0
- package/dist/tui/keybindings.js +207 -0
- package/dist/tui/keybindings.js.map +1 -0
- package/dist/tui/navigation.d.ts.map +1 -1
- package/dist/tui/navigation.js +1 -0
- package/dist/tui/navigation.js.map +1 -1
- package/dist/tui/renderer.d.ts.map +1 -1
- package/dist/tui/renderer.js +36 -9
- package/dist/tui/renderer.js.map +1 -1
- package/dist/tui/state/store.d.ts.map +1 -1
- package/dist/tui/state/store.js +13 -2
- package/dist/tui/state/store.js.map +1 -1
- package/dist/tui/state/types.d.ts +16 -0
- package/dist/tui/state/types.d.ts.map +1 -1
- package/dist/tui/topic-reader.d.ts +9 -1
- package/dist/tui/topic-reader.d.ts.map +1 -1
- package/dist/tui/topic-reader.js +23 -11
- package/dist/tui/topic-reader.js.map +1 -1
- package/dist/update.d.ts +4 -1
- package/dist/update.d.ts.map +1 -1
- package/dist/update.js +71 -11
- package/dist/update.js.map +1 -1
- package/dist/version.d.ts +2 -2
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +10 -2
- package/dist/version.js.map +1 -1
- package/package.json +1 -1
- package/dist/tui/components/layout.d.ts +0 -3
- package/dist/tui/components/layout.d.ts.map +0 -1
- package/dist/tui/components/layout.js +0 -453
- package/dist/tui/components/layout.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## v0.4.2 - 2026-05-29
|
|
4
|
+
|
|
5
|
+
这次更新修复了 v0.4.1 发布流程中的 npm 2FA 自动发布问题，并整理 0.4.x 的发布说明来源。
|
|
6
|
+
|
|
7
|
+
### 改进
|
|
8
|
+
|
|
9
|
+
- GitHub Actions 发布流程改用 npm Trusted Publishing，支持通过 OIDC 自动发布 npm 包并附带 provenance。
|
|
10
|
+
- GitHub Release 正文改为从 `CHANGELOG.md` 中对应版本段落生成，确保发布页内容和项目变更记录一致。
|
|
11
|
+
|
|
12
|
+
### 发布说明
|
|
13
|
+
|
|
14
|
+
- 推送 `v0.4.2` tag 后会自动执行类型检查、npm 发布和 GitHub Release 创建。
|
|
15
|
+
- 需要在 npm 包设置中将 `Lucent-Snow/CC98-CLI` 的 `release.yml` 配置为 Trusted Publisher。
|
|
16
|
+
|
|
3
17
|
## v0.4.0 - 2026-05-28
|
|
4
18
|
|
|
5
19
|
这次更新增强了 WebVPN 的可靠性和会话持久化，并改进了 TUI 的帖子阅读体验。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"AAGA,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAgDjE"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createInterface } from "node:readline";
|
|
2
|
+
import { checkForUpdate, detectInstallMethod, formatUpdateResult, performUpdate } from "../../update.js";
|
|
2
3
|
export async function updateCommand(args) {
|
|
3
4
|
const [subcommand] = args;
|
|
4
5
|
if (subcommand === "--help" || subcommand === "-h" || subcommand === "help") {
|
|
@@ -8,14 +9,59 @@ export async function updateCommand(args) {
|
|
|
8
9
|
if (subcommand !== undefined) {
|
|
9
10
|
throw new Error(`unknown update command: ${subcommand}. Run "cc98 update --help" for usage.`);
|
|
10
11
|
}
|
|
12
|
+
console.log("正在检查更新...");
|
|
11
13
|
const result = await checkForUpdate();
|
|
12
|
-
|
|
14
|
+
const installMethod = await detectInstallMethod();
|
|
15
|
+
console.log(formatUpdateResult(result, installMethod));
|
|
16
|
+
if (!result.updateAvailable) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
// 提示用户是否自动更新
|
|
20
|
+
console.log("");
|
|
21
|
+
const answer = await prompt("是否自动更新？(Y/n) ");
|
|
22
|
+
if (answer === "" || answer.toLowerCase() === "y" || answer.toLowerCase() === "yes") {
|
|
23
|
+
console.log("");
|
|
24
|
+
console.log("正在更新...");
|
|
25
|
+
try {
|
|
26
|
+
const output = await performUpdate(installMethod);
|
|
27
|
+
console.log(output);
|
|
28
|
+
console.log("");
|
|
29
|
+
console.log("更新完成！请重新启动 cc98。");
|
|
30
|
+
}
|
|
31
|
+
catch (error) {
|
|
32
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
33
|
+
console.error(`更新失败：${message}`);
|
|
34
|
+
console.log("");
|
|
35
|
+
console.log("请手动更新：");
|
|
36
|
+
if (installMethod === "npm") {
|
|
37
|
+
console.log(" npm install -g cc98-cli");
|
|
38
|
+
}
|
|
39
|
+
else if (installMethod === "bun") {
|
|
40
|
+
console.log(" bun install -g cc98-cli");
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
console.log(` ${result.latest?.url}`);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
console.log("已取消更新。");
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
function prompt(question) {
|
|
52
|
+
const rl = createInterface({ input: process.stdin, output: process.stdout });
|
|
53
|
+
return new Promise((resolve) => {
|
|
54
|
+
rl.question(question, (answer) => {
|
|
55
|
+
rl.close();
|
|
56
|
+
resolve(answer);
|
|
57
|
+
});
|
|
58
|
+
});
|
|
13
59
|
}
|
|
14
60
|
function printUpdateHelp() {
|
|
15
61
|
console.log(`cc98 update
|
|
16
62
|
|
|
17
63
|
Usage:
|
|
18
|
-
cc98 update Check
|
|
64
|
+
cc98 update Check and install updates
|
|
19
65
|
|
|
20
66
|
Options:
|
|
21
67
|
-h, --help Show this help
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare class SettingsStore {
|
|
2
|
+
private readonly filePath;
|
|
3
|
+
private cache;
|
|
4
|
+
constructor();
|
|
5
|
+
getLastSeenVersion(): Promise<string | undefined>;
|
|
6
|
+
setLastSeenVersion(version: string): Promise<void>;
|
|
7
|
+
private load;
|
|
8
|
+
private save;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=settings-store.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settings-store.d.ts","sourceRoot":"","sources":["../../src/storage/settings-store.ts"],"names":[],"mappings":"AAQA,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,KAAK,CAAyB;;IAMhC,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKjD,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAM1C,IAAI;YAWJ,IAAI;CAKnB"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { readFile, writeFile, mkdir } from "node:fs/promises";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { getConfigDir } from "./paths.js";
|
|
4
|
+
export class SettingsStore {
|
|
5
|
+
filePath;
|
|
6
|
+
cache = null;
|
|
7
|
+
constructor() {
|
|
8
|
+
this.filePath = join(getConfigDir(), "settings.json");
|
|
9
|
+
}
|
|
10
|
+
async getLastSeenVersion() {
|
|
11
|
+
const settings = await this.load();
|
|
12
|
+
return settings.lastSeenVersion;
|
|
13
|
+
}
|
|
14
|
+
async setLastSeenVersion(version) {
|
|
15
|
+
const settings = await this.load();
|
|
16
|
+
settings.lastSeenVersion = version;
|
|
17
|
+
await this.save(settings);
|
|
18
|
+
}
|
|
19
|
+
async load() {
|
|
20
|
+
if (this.cache)
|
|
21
|
+
return this.cache;
|
|
22
|
+
try {
|
|
23
|
+
const raw = await readFile(this.filePath, "utf-8");
|
|
24
|
+
this.cache = JSON.parse(raw);
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
this.cache = {};
|
|
28
|
+
}
|
|
29
|
+
return this.cache;
|
|
30
|
+
}
|
|
31
|
+
async save(settings) {
|
|
32
|
+
this.cache = settings;
|
|
33
|
+
await mkdir(join(this.filePath, ".."), { recursive: true });
|
|
34
|
+
await writeFile(this.filePath, JSON.stringify(settings, null, 2) + "\n", "utf-8");
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=settings-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settings-store.js","sourceRoot":"","sources":["../../src/storage/settings-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM1C,MAAM,OAAO,aAAa;IACP,QAAQ,CAAS;IAC1B,KAAK,GAAoB,IAAI,CAAC;IAEtC;QACE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,EAAE,eAAe,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACnC,OAAO,QAAQ,CAAC,eAAe,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAAe;QACtC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACnC,QAAQ,CAAC,eAAe,GAAG,OAAO,CAAC;QACnC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,IAAI;QAChB,IAAI,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAa,CAAC;QAC3C,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAClB,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,IAAI,CAAC,QAAkB;QACnC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;QACtB,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IACpF,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../../../src/tui/components/content.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAY5C,qBAAa,OAAQ,YAAW,SAAS;IACvC,OAAO,UAAQ;IAEf,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;IAgBhE,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,UAAU;IA8ClB,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../../../src/tui/components/content.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAY5C,qBAAa,OAAQ,YAAW,SAAS;IACvC,OAAO,UAAQ;IAEf,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;IAgBhE,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,UAAU;IA8ClB,OAAO,CAAC,WAAW;IA8DnB,OAAO,CAAC,eAAe;CAUxB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// 中栏内容组件
|
|
2
2
|
import { ansi, bg, fg } from "../ansi.js";
|
|
3
|
-
import { fit, blank } from "./utils.js";
|
|
3
|
+
import { fit, blank, cellWidth } from "./utils.js";
|
|
4
4
|
const cc98Blue = fg(0, 130, 202);
|
|
5
5
|
const cc98BlueSoft = fg(94, 180, 232);
|
|
6
6
|
const white = fg(245, 250, 255);
|
|
@@ -103,27 +103,45 @@ export class Content {
|
|
|
103
103
|
rows.push(`${line}${"─".repeat(Math.max(0, width - 1))}${ansi.reset}`);
|
|
104
104
|
const viewport = Math.max(0, height - rows.length - 1);
|
|
105
105
|
const maxScroll = Math.max(0, topic.lines.length - viewport);
|
|
106
|
-
|
|
106
|
+
const maxCursor = Math.max(0, topic.lines.length - 1);
|
|
107
|
+
topic.viewportRows = viewport;
|
|
108
|
+
topic.cursorLine = Math.min(maxCursor, Math.max(0, topic.cursorLine));
|
|
109
|
+
state.scroll = Math.min(maxScroll, topic.cursorLine);
|
|
107
110
|
const body = topic.lines.slice(state.scroll, state.scroll + viewport);
|
|
108
|
-
for (
|
|
111
|
+
for (let offset = 0; offset < body.length; offset += 1) {
|
|
112
|
+
const bodyLine = body[offset] ?? "";
|
|
113
|
+
const lineIndex = state.scroll + offset;
|
|
114
|
+
const isCursor = lineIndex === topic.cursorLine;
|
|
115
|
+
let renderedLine;
|
|
109
116
|
if (bodyLine.startsWith("[image ")) {
|
|
110
|
-
|
|
117
|
+
renderedLine = `${cc98BlueSoft}${bodyLine}${ansi.reset}`;
|
|
111
118
|
}
|
|
112
119
|
else if (bodyLine.startsWith("│ ")) {
|
|
113
|
-
|
|
120
|
+
renderedLine = `${muted}${bodyLine}${ansi.reset}`;
|
|
114
121
|
}
|
|
115
122
|
else if (/^#\d+ /.test(bodyLine)) {
|
|
116
|
-
|
|
123
|
+
renderedLine = `${ok}${bodyLine}${ansi.reset}`;
|
|
117
124
|
}
|
|
118
125
|
else {
|
|
119
|
-
|
|
126
|
+
renderedLine = ` ${bodyLine}`;
|
|
120
127
|
}
|
|
128
|
+
rows.push(this.renderTopicLine(renderedLine, width, isCursor));
|
|
121
129
|
}
|
|
122
130
|
const pageInfo = topic.hasMore
|
|
123
|
-
? `已载入 ${topic.loaded}
|
|
131
|
+
? `已载入 ${topic.loaded} 楼`
|
|
124
132
|
: `已载入 ${topic.loaded} 楼，已到底`;
|
|
125
133
|
rows.push(fit(`${muted}${pageInfo}${state.loadingMore ? " · 加载中" : ""}${ansi.reset}`, width));
|
|
126
134
|
return rows.concat(blank(height - rows.length, width)).slice(0, height);
|
|
127
135
|
}
|
|
136
|
+
renderTopicLine(value, width, isCursor) {
|
|
137
|
+
if (!isCursor) {
|
|
138
|
+
return fit(value, width);
|
|
139
|
+
}
|
|
140
|
+
const marker = `${ok}${ansi.bold}▶${ansi.reset}`;
|
|
141
|
+
const contentWidth = Math.max(0, width - 1);
|
|
142
|
+
const fitted = fit(value, contentWidth);
|
|
143
|
+
const padding = Math.max(0, contentWidth - cellWidth(fitted));
|
|
144
|
+
return `${fitted}${" ".repeat(padding)}${marker}`;
|
|
145
|
+
}
|
|
128
146
|
}
|
|
129
147
|
//# sourceMappingURL=content.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content.js","sourceRoot":"","sources":["../../../src/tui/components/content.ts"],"names":[],"mappings":"AAAA,SAAS;AAIT,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"content.js","sourceRoot":"","sources":["../../../src/tui/components/content.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,10 @@ import type { TuiState } from "../state/types.js";
|
|
|
2
2
|
import type { Component } from "./types.js";
|
|
3
3
|
export declare class StatusBar implements Component {
|
|
4
4
|
visible: boolean;
|
|
5
|
+
private readonly keybindings;
|
|
5
6
|
render(state: TuiState, width: number): string;
|
|
7
|
+
private getStatusWithUpdate;
|
|
6
8
|
private getKeyHints;
|
|
9
|
+
private keys;
|
|
7
10
|
}
|
|
8
11
|
//# sourceMappingURL=status.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/tui/components/status.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/tui/components/status.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAS5C,qBAAa,SAAU,YAAW,SAAS;IACzC,OAAO,UAAQ;IACf,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IAEtD,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAU9C,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,WAAW;IAwBnB,OAAO,CAAC,IAAI;CAGb"}
|
|
@@ -2,41 +2,54 @@
|
|
|
2
2
|
import { fg } from "../ansi.js";
|
|
3
3
|
import { fit, cellWidth } from "./utils.js";
|
|
4
4
|
import { getStatus } from "../state/store.js";
|
|
5
|
+
import { getKeybindingManager } from "../keybindings.js";
|
|
5
6
|
const muted = fg(139, 152, 166);
|
|
6
7
|
const cc98Blue = fg(0, 130, 202);
|
|
7
8
|
export class StatusBar {
|
|
8
9
|
visible = true;
|
|
10
|
+
keybindings = getKeybindingManager();
|
|
9
11
|
render(state, width) {
|
|
10
12
|
if (state.inputMode) {
|
|
11
13
|
return fit(`${cc98Blue} ${state.inputPrompt}${state.inputValue}`, width);
|
|
12
14
|
}
|
|
13
|
-
const left =
|
|
15
|
+
const left = this.getStatusWithUpdate(state);
|
|
14
16
|
const right = this.getKeyHints(state);
|
|
15
17
|
const padding = Math.max(1, width - cellWidth(left) - cellWidth(right) - 2);
|
|
16
18
|
return fit(`${muted} ${left}${" ".repeat(padding)}${right} `, width);
|
|
17
19
|
}
|
|
20
|
+
getStatusWithUpdate(state) {
|
|
21
|
+
const status = getStatus(state);
|
|
22
|
+
if (state.updateAvailable) {
|
|
23
|
+
const updateHint = `⬆ ${state.updateAvailable.tagName}`;
|
|
24
|
+
return status ? `${status} ${updateHint}` : updateHint;
|
|
25
|
+
}
|
|
26
|
+
return status;
|
|
27
|
+
}
|
|
18
28
|
getKeyHints(state) {
|
|
19
29
|
if (state.modal === "search") {
|
|
20
|
-
return "
|
|
30
|
+
return `${this.keys("searchExecute")} 搜索/打开 ${this.keys("searchToggleMode")} 切换 ${this.keys("searchClose")} 关闭`;
|
|
21
31
|
}
|
|
22
32
|
if (state.modal === "menu") {
|
|
23
|
-
return "
|
|
33
|
+
return `${this.keys("menuNext")}/${this.keys("menuPrev")} 移动 ${this.keys("menuExecute")} 执行 ${this.keys("menuClose")} 关闭`;
|
|
24
34
|
}
|
|
25
35
|
if (state.modal === "user") {
|
|
26
36
|
return "f 关注 m 私信 u 关闭";
|
|
27
37
|
}
|
|
28
38
|
if (state.mode === "topic") {
|
|
29
|
-
return "
|
|
39
|
+
return `${this.keys("topicScrollDown")}/${this.keys("topicScrollUp")} 滚动 ${this.keys("topicNextPage")}/${this.keys("topicPrevPage")} 翻页 ${this.keys("topicNextFloor")}/${this.keys("topicPrevFloor")} 楼层 ${this.keys("back")} 返回`;
|
|
30
40
|
}
|
|
31
41
|
if (state.mode === "settings") {
|
|
32
|
-
return "
|
|
42
|
+
return `${this.keys("moveDown")}/${this.keys("moveUp")} 选择 ${this.keys("confirm")} 执行 ${this.keys("back")} 返回`;
|
|
33
43
|
}
|
|
34
44
|
if (state.currentChat) {
|
|
35
|
-
return "
|
|
45
|
+
return `${this.keys("listNext")}/${this.keys("listPrev")} 滚动 ${this.keys("listBack")} 返回 ${this.keys("listRefresh")} 刷新`;
|
|
36
46
|
}
|
|
37
47
|
return state.focus === "nav"
|
|
38
|
-
? "
|
|
39
|
-
: "
|
|
48
|
+
? `${this.keys("moveDown")}/${this.keys("moveUp")} 切换 ${this.keys("confirm")} 进入 ${this.keys("refresh")} 刷新 ${this.keys("search")} 搜索 ${this.keys("help")} 帮助 ${this.keys("quit")} 退出`
|
|
49
|
+
: `${this.keys("listNext")}/${this.keys("listPrev")} 选择 ${this.keys("listOpen")} 打开 ${this.keys("listBack")} 返回 ${this.keys("listRefresh")} 刷新 ${this.keys("search")} 搜索 ${this.keys("help")} 帮助`;
|
|
50
|
+
}
|
|
51
|
+
keys(action) {
|
|
52
|
+
return this.keybindings.formatActionKeys(action);
|
|
40
53
|
}
|
|
41
54
|
}
|
|
42
55
|
//# sourceMappingURL=status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/tui/components/status.ts"],"names":[],"mappings":"AAAA,UAAU;AAIV,OAAO,EAAE,EAAE,EAAE,MAAM,YAAY,CAAC;AAChC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/tui/components/status.ts"],"names":[],"mappings":"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"}
|
package/dist/tui/controller.d.ts
CHANGED
|
@@ -13,6 +13,9 @@ export declare class TuiController {
|
|
|
13
13
|
private readonly nextSignal;
|
|
14
14
|
private readonly abortCurrent;
|
|
15
15
|
private loadVersion;
|
|
16
|
+
private readonly keybindings;
|
|
17
|
+
private readonly settingsStore;
|
|
18
|
+
private updateChecked;
|
|
16
19
|
constructor(state: TuiState, client: CachedCc98Client, tokenStore: TokenStore, render: RenderFn, close: CloseFn, nextSignal: SignalFn, abortCurrent: () => void);
|
|
17
20
|
load(force?: boolean): Promise<void>;
|
|
18
21
|
handleKey(key: string): void;
|
|
@@ -39,6 +42,11 @@ export declare class TuiController {
|
|
|
39
42
|
private openBoard;
|
|
40
43
|
private openChat;
|
|
41
44
|
private loadNextChatPage;
|
|
45
|
+
private checkAutoLoad;
|
|
46
|
+
private jumpRelativeFloor;
|
|
47
|
+
private jumpToNextPage;
|
|
48
|
+
private jumpToPrevPage;
|
|
49
|
+
private jumpToTopicPage;
|
|
42
50
|
private loadNextTopicPage;
|
|
43
51
|
private jumpToTopicFloor;
|
|
44
52
|
private runReadOnlyAction;
|
|
@@ -57,10 +65,19 @@ export declare class TuiController {
|
|
|
57
65
|
private openImage;
|
|
58
66
|
private copyToClipboard;
|
|
59
67
|
private signin;
|
|
68
|
+
private openKeybindingEditor;
|
|
69
|
+
private openAccountSwitcher;
|
|
70
|
+
private switchAccount;
|
|
71
|
+
private confirmLogout;
|
|
72
|
+
private performLogout;
|
|
73
|
+
private openCacheManager;
|
|
74
|
+
private clearCache;
|
|
60
75
|
private openFriendUsers;
|
|
61
76
|
private openReadOnlyList;
|
|
62
77
|
private snapshotParent;
|
|
63
78
|
private restoreParentList;
|
|
79
|
+
private checkUpdate;
|
|
80
|
+
dismissUpdate(): void;
|
|
64
81
|
}
|
|
65
82
|
export {};
|
|
66
83
|
//# sourceMappingURL=controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/tui/controller.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/tui/controller.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAG5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAI3D,OAAO,KAAK,EAAqC,QAAQ,EAAU,MAAM,kBAAkB,CAAC;AA8B5F,KAAK,QAAQ,GAAG,MAAM,IAAI,CAAC;AAC3B,KAAK,OAAO,GAAG,MAAM,IAAI,CAAC;AAC1B,KAAK,QAAQ,GAAG,MAAM,WAAW,CAAC;AAElC,qBAAa,aAAa;IAOtB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAZ/B,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAuB;IACrD,OAAO,CAAC,aAAa,CAAS;gBAGX,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,gBAAgB,EACxB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,QAAQ,EAChB,KAAK,EAAE,OAAO,EACd,UAAU,EAAE,QAAQ,EACpB,YAAY,EAAE,MAAM,IAAI;IAKrC,IAAI,CAAC,KAAK,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDxC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IA0C5B,OAAO,CAAC,cAAc;IAsBtB,OAAO,CAAC,cAAc;IA8BtB,OAAO,CAAC,eAAe;IAmDvB,OAAO,CAAC,kBAAkB;IA4B1B,OAAO,CAAC,aAAa;IA0BrB,OAAO,CAAC,cAAc;IA+ItB,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,YAAY;IAwBpB,OAAO,CAAC,gBAAgB;IA8BxB,OAAO,CAAC,KAAK;IAmBb,OAAO,CAAC,OAAO;IAUf,OAAO,CAAC,UAAU;IAUlB,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,UAAU;YAQJ,QAAQ;YA0IR,eAAe;YA+Bf,mBAAmB;YAmCnB,SAAS;YAyBT,SAAS;YAuBT,QAAQ;YAuBR,gBAAgB;YAmBhB,aAAa;YAUb,iBAAiB;YAoBjB,cAAc;YAgBd,cAAc;YAWd,eAAe;YA0Bf,iBAAiB;YAiBjB,gBAAgB;YAqBhB,iBAAiB;YA0DjB,cAAc;YAMd,aAAa;IAmB3B,OAAO,CAAC,sBAAsB;YAQhB,cAAc;YAkBd,kBAAkB;YAkBlB,eAAe;YAYf,kBAAkB;YA2BlB,aAAa;YAcb,qBAAqB;YAgBrB,YAAY;YAmBZ,kBAAkB;IAUhC,OAAO,CAAC,mBAAmB;YAUb,SAAS;YAyBT,eAAe;YAsBf,MAAM;YAcN,oBAAoB;YAgCpB,mBAAmB;YAoCnB,aAAa;YAcb,aAAa;YAkBb,aAAa;YAcb,gBAAgB;YA4BhB,UAAU;YAWV,eAAe;IAM7B,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;YAiBX,WAAW;IAwCzB,aAAa,IAAI,IAAI;CAUtB"}
|