@the-seeker/madefeed 0.2.0 → 0.3.0
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/README.md +17 -11
- package/dist/cli.mjs +250 -122
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -12,13 +12,13 @@ npx @the-seeker/madefeed@latest
|
|
|
12
12
|
|
|
13
13
|
| 명령 | 하는 일 |
|
|
14
14
|
| --- | --- |
|
|
15
|
-
| `madefeed` 또는 `madefeed upload` | 연결이 없으면 연결하고, 사용량을 올려요. |
|
|
16
|
-
| `madefeed login` | 기기만 연결해요. |
|
|
17
|
-
| `madefeed status` | 연결과 자동 전송 상태를 보여줘요. |
|
|
18
|
-
| `madefeed auto [status]` | 자동 전송 상태를 보여줘요. `--json`도 지원해요. |
|
|
19
|
-
| `madefeed auto on` | 연결된 기기의 자동 전송을 켜요. |
|
|
20
|
-
| `madefeed auto off` | 자동 전송을 끄고 실행 파일
|
|
21
|
-
| `madefeed logout` |
|
|
15
|
+
| `npx @the-seeker/madefeed@latest` 또는 `npx @the-seeker/madefeed@latest upload` | 연결이 없으면 연결하고, 사용량을 올려요. |
|
|
16
|
+
| `npx @the-seeker/madefeed@latest login` | 기기만 연결해요. |
|
|
17
|
+
| `npx @the-seeker/madefeed@latest status` | 연결과 자동 전송 상태를 보여줘요. |
|
|
18
|
+
| `npx @the-seeker/madefeed@latest auto [status]` | 자동 전송 상태를 보여줘요. `--json`도 지원해요. |
|
|
19
|
+
| `npx @the-seeker/madefeed@latest auto on` | 연결된 기기의 자동 전송을 켜요. |
|
|
20
|
+
| `npx @the-seeker/madefeed@latest auto off` | 자동 전송을 끄고 실행 파일 복사본과 로그를 지워요. 기기 연결은 유지해요. |
|
|
21
|
+
| `npx @the-seeker/madefeed@latest logout` | 서버의 기기 연결을 끊고 이 컴퓨터의 연결 정보와 자동 전송을 지워요. |
|
|
22
22
|
|
|
23
23
|
| 옵션 | 뜻 |
|
|
24
24
|
| --- | --- |
|
|
@@ -30,17 +30,23 @@ npx @the-seeker/madefeed@latest
|
|
|
30
30
|
|
|
31
31
|
## 자동 전송
|
|
32
32
|
|
|
33
|
-
기기를 연결하면 한 시간마다 최근 3일의 사용량을 자동으로 올려요. 이전 버전에서 연결했다면 다음 `upload` 실행 때 등록해요. 터미널을 계속 열어 둘 필요가 없어요.
|
|
33
|
+
기기를 연결하면 한 시간마다 최근 3일의 사용량을 자동으로 올려요. 이전 버전에서 연결했다면 다음 `npx @the-seeker/madefeed@latest upload` 실행 때 등록해요. 터미널을 계속 열어 둘 필요가 없어요.
|
|
34
34
|
|
|
35
35
|
- macOS: `~/Library/LaunchAgents/dev.madefeed.meter.plist`를 launchd에 등록해요. macOS가 **“백그라운드 항목이 추가됨”** 알림을 보여줄 수 있어요.
|
|
36
36
|
- Linux: `~/.config/systemd/user/madefeed-meter.service`와 `madefeed-meter.timer`를 등록해요. 사용자 systemd를 사용할 수 없으면 crontab의 `# madefeed-meter` 줄로 실행해요.
|
|
37
37
|
- Windows: 작업 스케줄러의 `MadeFeed Meter` 작업과 `~/.config/madefeed/agent/run.cmd`를 등록해요. Windows 경로에서는 `\` 구분자를 사용해요.
|
|
38
38
|
|
|
39
|
-
실행 파일은 `~/.config/madefeed/agent/cli.mjs`에 복사해 두고 Node.js로 실행해요. 매시간 npx나 npm에 접속하지 않아요. 자동 전송이 켜진 상태에서
|
|
39
|
+
실행 파일은 `~/.config/madefeed/agent/cli.mjs`에 복사해 두고 Node.js로 실행해요. 매시간 npx나 npm에 접속하지 않아요. 자동 전송이 켜진 상태에서 `npx @the-seeker/madefeed@latest login` 또는 `npx @the-seeker/madefeed@latest upload`를 실행하면 복사본도 갱신해요. `npx @the-seeker/madefeed@latest status`와 `npx @the-seeker/madefeed@latest auto status`는 조회만 해요. 로그는 `~/.config/madefeed/auto.log`에 남기고, 256 KB를 넘으면 다음 예약 실행 시작 때 마지막 200줄만 남겨요. 토큰과 전송 본문은 로그에 남기지 않아요.
|
|
40
40
|
|
|
41
|
-
`madefeed auto off`로 끄고, `madefeed auto on`으로 다시 켤 수 있어요. `--no-auto` 또는 `MADEFEED_NO_AUTO=1`은 이번 실행의 등록·갱신만 건너뛰며, 이미 등록한 작업을 끄지는 않아요. `--dry-run`도 등록하지 않아요. 예약 실행에는 `--scheduled`가 붙고, 연결 정보가 없으면 로그인 없이 건너뛰어요. 등록에 실패해도 `madefeed upload`로
|
|
41
|
+
`npx @the-seeker/madefeed@latest auto off`로 끄고, `npx @the-seeker/madefeed@latest auto on`으로 다시 켤 수 있어요. `--no-auto` 또는 `MADEFEED_NO_AUTO=1`은 이번 실행의 등록·갱신만 건너뛰며, 이미 등록한 작업을 끄지는 않아요. `--dry-run`도 등록하지 않아요. 예약 실행에는 `--scheduled`가 붙고, 연결 정보가 없으면 로그인 없이 건너뛰어요. 등록에 실패해도 `npx @the-seeker/madefeed@latest upload`로 직접 올릴 수 있어요.
|
|
42
42
|
|
|
43
|
-
설치할 때 설정한 `OPENCODE_DATA_DIR`, `XDG_DATA_HOME`, `GEMINI_DATA_DIR`, `MADEFEED_URL`은 예약 작업에도 전달해요.
|
|
43
|
+
설치할 때 설정한 `OPENCODE_DATA_DIR`, `XDG_DATA_HOME`, `GEMINI_DATA_DIR`, `MADEFEED_URL`은 예약 작업에도 전달해요.
|
|
44
|
+
|
|
45
|
+
## 연결 끊기와 정리
|
|
46
|
+
|
|
47
|
+
`npx @the-seeker/madefeed@latest logout`은 저장된 서버에 기기 연결 해제를 요청하고, agent 디렉터리·`auto.log`·`cli.json`을 지운 뒤 스케줄을 해제해요. 비어 있는 `~/.config/madefeed` 디렉터리도 지워요. 다른 설정 파일과 `~/.config`는 건드리지 않아요. 올린 사용량은 계정에 그대로 남아요. 서버에 닿지 못해도 로컬 정리는 진행하고, 웹에서 연결을 끊을 주소를 알려줘요.
|
|
48
|
+
|
|
49
|
+
웹에서 기기 연결을 끊거나 계정을 지우면 다음 전송에서 HTTP 401 `unauthorized`를 받은 CLI가 같은 정리를 스스로 해요. 예약 실행은 안내 한 줄을 남기고 정상 종료하며, 직접 실행한 전송은 다시 연결하라는 오류를 보여줘요. 사용량이 0건이어도 요청을 한 번 보내 연결 상태를 확인해요. 이 자가 정리는 0.3.0 이상 복사본에서 동작하므로, 이전 버전은 `npx @the-seeker/madefeed@latest`를 한 번 실행해 갱신해 주세요.
|
|
44
50
|
|
|
45
51
|
## 보내는 것과 보내지 않는 것
|
|
46
52
|
|
package/dist/cli.mjs
CHANGED
|
@@ -57,6 +57,15 @@ function aggregate(rows) {
|
|
|
57
57
|
function payload(deviceName, rows) {
|
|
58
58
|
return { deviceName, rows: aggregate(rows) };
|
|
59
59
|
}
|
|
60
|
+
async function directory(path) {
|
|
61
|
+
try {
|
|
62
|
+
return (await stat(path)).isDirectory();
|
|
63
|
+
} catch (error) {
|
|
64
|
+
if (error instanceof Error && "code" in error && error.code === "ENOENT")
|
|
65
|
+
return false;
|
|
66
|
+
throw error;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
60
69
|
async function* files(root) {
|
|
61
70
|
for (const entry of await readdir(root, { withFileTypes: true })) {
|
|
62
71
|
const path = join(root, entry.name);
|
|
@@ -84,15 +93,82 @@ function unsupported(error, reason) {
|
|
|
84
93
|
|
|
85
94
|
// src/api.ts
|
|
86
95
|
import { setTimeout as setTimeout2 } from "node:timers/promises";
|
|
96
|
+
|
|
97
|
+
// src/copy.ts
|
|
98
|
+
var RUN = "npx @the-seeker/madefeed@latest";
|
|
99
|
+
var setupFailure = `\uC790\uB3D9 \uC804\uC1A1\uC744 \uB4F1\uB85D\uD558\uC9C0 \uBABB\uD588\uC5B4\uC694. ${RUN} \uB85C \uC9C1\uC811 \uC62C\uB9B4 \uC218 \uC788\uC5B4\uC694.`;
|
|
100
|
+
var cleanupFailure = (scope) => `\uC9C0\uC6B0\uC9C0 \uBABB\uD55C \uD30C\uC77C\uC774 \uC788\uC5B4\uC694. ${RUN} ${scope === "auto" ? "auto off" : "logout"} \uC744 \uD55C \uBC88 \uB354 \uC2E4\uD589\uD574 \uC8FC\uC138\uC694.`;
|
|
101
|
+
var autoEnabled = [
|
|
102
|
+
"\uD55C \uC2DC\uAC04\uB9C8\uB2E4 \uC790\uB3D9\uC73C\uB85C \uC62C\uB824\uC694. \uD130\uBBF8\uB110\uC744 \uC5F4\uC5B4 \uB450\uC9C0 \uC54A\uC544\uB3C4 \uB3FC\uC694.",
|
|
103
|
+
` \uC790\uB3D9 \uC804\uC1A1 \uB044\uAE30 ${RUN} auto off`,
|
|
104
|
+
` \uC5F0\uACB0 \uB04A\uAE30 ${RUN} logout`
|
|
105
|
+
];
|
|
106
|
+
var connectionRequired = `\uBA3C\uC800 ${RUN} \uB85C \uAE30\uAE30\uB97C \uC5F0\uACB0\uD574 \uC8FC\uC138\uC694.`;
|
|
107
|
+
var invalidAuto = "auto on, off, status \uC911 \uD558\uB098\uB97C \uC0AC\uC6A9\uD574 \uC8FC\uC138\uC694.";
|
|
108
|
+
var invalidDays = "--days\uB294 1~35 \uC0AC\uC774\uC758 \uC815\uC218\uC5EC\uC57C \uD574\uC694.";
|
|
109
|
+
var unknownCommand = "\uC54C \uC218 \uC5C6\uB294 \uBA85\uB839\uC774\uC5D0\uC694. --help\uB97C \uD655\uC778\uD574 \uC8FC\uC138\uC694.";
|
|
110
|
+
var invalidDryRun = "--dry-run\uC740 \uAE30\uBCF8 \uC2E4\uD589 \uB610\uB294 upload\uC5D0\uC11C\uB9CC \uC0AC\uC6A9\uD560 \uC218 \uC788\uC5B4\uC694.";
|
|
111
|
+
var invalidScheduled = "--scheduled\uB294 upload\uC5D0\uC11C\uB9CC \uC0AC\uC6A9\uD560 \uC218 \uC788\uC5B4\uC694.";
|
|
112
|
+
var invalidOptions = "\uBA85\uB839 \uC635\uC158\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC544\uC694. --help\uB97C \uD655\uC778\uD574 \uC8FC\uC138\uC694.";
|
|
113
|
+
var invalidUrl = "\uC11C\uBC84 URL\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC544\uC694.";
|
|
114
|
+
var unsafeUrl = "\uC11C\uBC84 URL\uC740 \uC778\uC99D \uC815\uBCF4 \uC5C6\uB294 HTTPS origin\uC774\uC5B4\uC57C \uD574\uC694.";
|
|
115
|
+
var invalidConfig = `\uC124\uC815 \uD30C\uC77C\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC544\uC694. ${RUN} login \uC73C\uB85C \uB2E4\uC2DC \uC5F0\uACB0\uD574 \uC8FC\uC138\uC694.`;
|
|
116
|
+
var scheduledSkip = "\uC5F0\uACB0\uB41C \uAE30\uAE30\uAC00 \uC5C6\uC5B4 \uC790\uB3D9 \uC804\uC1A1\uC744 \uAC74\uB108\uB6F0\uC5C8\uC5B4\uC694.";
|
|
117
|
+
var dryRunHeader = "\uC804\uC1A1\uD558\uC9C0 \uC54A\uC558\uC5B4\uC694. \uC544\uB798 \uD569\uACC4\uC640 JSON\uB9CC \uC804\uC1A1 \uB300\uC0C1\uC774\uC5D0\uC694.";
|
|
118
|
+
var dryRunColumns = "date tool model tokens";
|
|
119
|
+
var localFailure = "\uB85C\uCEEC \uC0AC\uC6A9\uB7C9 \uB610\uB294 \uC124\uC815\uC744 \uCC98\uB9AC\uD560 \uC218 \uC5C6\uC5B4\uC694. \uC811\uADFC \uAD8C\uD55C\uACFC Node.js \uBC84\uC804\uC744 \uD655\uC778\uD574 \uC8FC\uC138\uC694.";
|
|
120
|
+
var disconnected = `\uC11C\uBC84\uC5D0\uC11C \uC774 \uAE30\uAE30 \uC5F0\uACB0\uC774 \uB04A\uACA8 \uC788\uC5B4\uC694. \uC790\uB3D9 \uC804\uC1A1\uACFC \uC774 \uCEF4\uD4E8\uD130\uC758 \uC5F0\uACB0 \uC815\uBCF4\uB97C \uC9C0\uC6E0\uC5B4\uC694. \uB2E4\uC2DC \uC5F0\uACB0\uD558\uB824\uBA74 ${RUN} \uB97C \uC2E4\uD589\uD574 \uC8FC\uC138\uC694.`;
|
|
121
|
+
var logoutRevoked = "\uC5F0\uACB0\uC744 \uB04A\uC5C8\uC5B4\uC694. \uC790\uB3D9 \uC804\uC1A1\uACFC \uC774 \uCEF4\uD4E8\uD130\uC758 \uC5F0\uACB0 \uC815\uBCF4\uB97C \uC9C0\uC6E0\uC5B4\uC694. \uC62C\uB9B0 \uC0AC\uC6A9\uB7C9\uC740 \uACC4\uC815\uC5D0 \uADF8\uB300\uB85C \uB0A8\uC544\uC694.";
|
|
122
|
+
var logoutLocal = "\uC774 \uCEF4\uD4E8\uD130\uC758 \uC5F0\uACB0 \uC815\uBCF4\uC640 \uC790\uB3D9 \uC804\uC1A1\uC744 \uC9C0\uC6E0\uC5B4\uC694.";
|
|
123
|
+
var logoutUnreachable = (url) => `\uC774 \uCEF4\uD4E8\uD130\uC758 \uC5F0\uACB0 \uC815\uBCF4\uC640 \uC790\uB3D9 \uC804\uC1A1\uC740 \uC9C0\uC6E0\uC5B4\uC694. \uC11C\uBC84\uC5D0\uB294 \uB2FF\uC9C0 \uBABB\uD588\uC73C\uB2C8 ${url}/meter \uC5D0\uC11C \uC774 \uAE30\uAE30 \uC5F0\uACB0\uC744 \uB04A\uC5B4 \uC8FC\uC138\uC694.`;
|
|
124
|
+
var scheduledDisconnected = (now) => `${new Date(now).toISOString()} \uC11C\uBC84\uC5D0\uC11C \uC774 \uAE30\uAE30 \uC5F0\uACB0\uC774 \uB04A\uACA8 \uC790\uB3D9 \uC804\uC1A1\uC744 \uD574\uC81C\uD558\uACE0 \uC5F0\uACB0 \uC815\uBCF4\uB97C \uC9C0\uC6E0\uC5B4\uC694.`;
|
|
125
|
+
var connected = (deviceName) => `${deviceName} \uAE30\uAE30\uB97C \uC5F0\uACB0\uD588\uC5B4\uC694.`;
|
|
126
|
+
var approval = (device) => [
|
|
127
|
+
"\uBE0C\uB77C\uC6B0\uC800\uC5D0\uC11C \uC544\uB798 \uC8FC\uC18C\uB97C \uC5F4\uACE0, \uCF54\uB4DC\uAC00 \uAC19\uC73C\uBA74 \uC2B9\uC778\uD574 \uC8FC\uC138\uC694.",
|
|
128
|
+
` \uC8FC\uC18C ${device.verification_uri}`,
|
|
129
|
+
` \uCF54\uB4DC ${device.user_code}`
|
|
130
|
+
];
|
|
131
|
+
var autoLine = (state) => state.enabled ? `\uC790\uB3D9 \uC804\uC1A1: \uCF1C\uC838 \uC788\uC5B4\uC694 (\uD55C \uC2DC\uAC04\uB9C8\uB2E4, ${state.kind}).` : "\uC790\uB3D9 \uC804\uC1A1: \uAEBC\uC838 \uC788\uC5B4\uC694.";
|
|
132
|
+
var connectionLine = (config) => config ? `\uC5F0\uACB0: ${config.deviceName} (${config.url})` : `\uC5F0\uACB0: \uC544\uC9C1 \uC5F0\uACB0\uD558\uC9C0 \uC54A\uC558\uC5B4\uC694. ${RUN} \uB85C \uC5F0\uACB0\uD574 \uC8FC\uC138\uC694.`;
|
|
133
|
+
var uploadResult = (result) => `\uC0AC\uC6A9\uB7C9 ${result.accepted}\uAC74\uC744 \uC62C\uB838\uC5B4\uC694.${result.votesGranted > 0 ? ` \uC0C8\uB85C \uBC1B\uC740 \uD45C ${result.votesGranted}\uD45C.` : ""}`;
|
|
134
|
+
var scheduledUpload = (now, accepted) => `${new Date(now).toISOString()} \uC0AC\uC6A9\uB7C9 ${accepted}\uAC74\uC744 \uC62C\uB838\uC5B4\uC694.`;
|
|
135
|
+
var apiFailure = (status) => status === 401 ? `HTTP 401: \uAE30\uAE30 \uC5F0\uACB0\uC774 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC544\uC694. ${RUN} login \uC73C\uB85C \uB2E4\uC2DC \uC5F0\uACB0\uD574 \uC8FC\uC138\uC694.` : status === 422 ? "HTTP 422: \uC0AC\uC6A9\uB7C9 \uD615\uC2DD\uC774 \uC11C\uBC84 \uADDC\uCE59\uACFC \uB9DE\uC9C0 \uC54A\uC544\uC694." : `HTTP ${status}: \uC11C\uBC84 \uC694\uCCAD\uC5D0 \uC2E4\uD328\uD588\uC5B4\uC694.`;
|
|
136
|
+
var expiredCode = `\uAE30\uAE30 \uC778\uC99D \uCF54\uB4DC\uAC00 \uB9CC\uB8CC\uB410\uC5B4\uC694. ${RUN} login \uC744 \uB2E4\uC2DC \uC2E4\uD589\uD574 \uC8FC\uC138\uC694.`;
|
|
137
|
+
var invalidCode = `\uC720\uD6A8\uD558\uC9C0 \uC54A\uC740 \uC778\uC99D \uCF54\uB4DC\uC608\uC694. ${RUN} login \uC744 \uB2E4\uC2DC \uC2E4\uD589\uD574 \uC8FC\uC138\uC694.`;
|
|
138
|
+
function helpText(version) {
|
|
139
|
+
return `madefeed ${version} \u2014 MadeFeed \uD1A0\uD070 \uBBF8\uD130
|
|
140
|
+
\uC0AC\uC6A9\uBC95: ${RUN} [\uBA85\uB839] [\uC635\uC158]
|
|
141
|
+
|
|
142
|
+
\uBA85\uB839
|
|
143
|
+
(\uC5C6\uC74C), upload \uC5F0\uACB0\uC774 \uC5C6\uC73C\uBA74 \uC5F0\uACB0\uD558\uACE0, \uC0AC\uC6A9\uB7C9\uC744 \uC62C\uB824\uC694.
|
|
144
|
+
login \uAE30\uAE30\uB9CC \uC5F0\uACB0\uD574\uC694.
|
|
145
|
+
status \uC5F0\uACB0\uACFC \uC790\uB3D9 \uC804\uC1A1 \uC0C1\uD0DC\uB97C \uBCF4\uC5EC\uC918\uC694.
|
|
146
|
+
auto [on|off|status] \uC790\uB3D9 \uC804\uC1A1\uC744 \uCF1C\uAC70\uB098 \uB044\uAC70\uB098 \uD655\uC778\uD574\uC694.
|
|
147
|
+
logout \uC5F0\uACB0\uC744 \uB04A\uACE0 \uC774 \uCEF4\uD4E8\uD130\uC758 \uC5F0\uACB0 \uC815\uBCF4\uC640 \uC790\uB3D9 \uC804\uC1A1\uC744 \uC9C0\uC6CC\uC694.
|
|
148
|
+
|
|
149
|
+
\uC635\uC158
|
|
150
|
+
--dry-run \uBCF4\uB0B4\uC9C0 \uC54A\uACE0, \uBCF4\uB0BC \uD569\uACC4\uC640 \uC694\uCCAD JSON\uB9CC \uBCF4\uC5EC\uC918\uC694.
|
|
151
|
+
--days N \uC624\uB298\uC744 \uD3EC\uD568\uD574 \uBA70\uCE60 \uCE58\uB97C \uC140\uC9C0 \uC815\uD574\uC694. \uAE30\uBCF8 14, \uCD5C\uB300 35 (KST).
|
|
152
|
+
--url URL \uC11C\uBC84 \uC8FC\uC18C\uC608\uC694. \uAE30\uBCF8\uC740 MADEFEED_URL \uB610\uB294 https://madefeed.dev.
|
|
153
|
+
--json \uAE30\uACC4\uAC00 \uC77D\uC744 JSON\uB9CC \uD45C\uC900 \uCD9C\uB825\uC73C\uB85C \uB0B4\uBCF4\uB0B4\uC694.
|
|
154
|
+
--no-auto \uC774\uBC88 \uC2E4\uD589\uC5D0\uC11C\uB294 \uC790\uB3D9 \uC804\uC1A1\uC744 \uB4F1\uB85D\uD558\uAC70\uB098 \uAC31\uC2E0\uD558\uC9C0 \uC54A\uC544\uC694.
|
|
155
|
+
--scheduled \uC608\uC57D \uC791\uC5C5\uC6A9\uC774\uC5D0\uC694. \uC5F0\uACB0 \uC808\uCC28 \uC5C6\uC774 \uC62C\uB824\uC694.
|
|
156
|
+
--help \uB3C4\uC6C0\uB9D0\uC744 \uBCF4\uC5EC\uC918\uC694.
|
|
157
|
+
--version \uBC84\uC804\uC744 \uBCF4\uC5EC\uC918\uC694.
|
|
158
|
+
|
|
159
|
+
\uC77D\uB294 \uB3C4\uAD6C: Claude Code, Codex, OpenCode, Gemini CLI (Cursor\uB294 \uC544\uC9C1 \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC544\uC694)`;
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
// src/api.ts
|
|
87
163
|
var ApiError = class extends MeterError {
|
|
88
164
|
constructor(status) {
|
|
89
|
-
super(
|
|
90
|
-
status === 401 ? "HTTP 401: \uAE30\uAE30 \uC778\uC99D\uC774 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC544\uC694. login\uC73C\uB85C \uB2E4\uC2DC \uC5F0\uACB0\uD574 \uC8FC\uC138\uC694." : status === 422 ? "HTTP 422: \uC0AC\uC6A9\uB7C9 \uD615\uC2DD\uC774 \uC11C\uBC84 \uADDC\uCE59\uACFC \uB9DE\uC9C0 \uC54A\uC544\uC694." : `HTTP ${status}: \uC11C\uBC84 \uC694\uCCAD\uC5D0 \uC2E4\uD328\uD588\uC5B4\uC694.`
|
|
91
|
-
);
|
|
165
|
+
super(apiFailure(status));
|
|
92
166
|
this.status = status;
|
|
93
167
|
}
|
|
94
168
|
status;
|
|
95
169
|
};
|
|
170
|
+
var DisconnectedError = class extends MeterError {
|
|
171
|
+
};
|
|
96
172
|
async function post(api, request) {
|
|
97
173
|
try {
|
|
98
174
|
const response = await api.fetch(`${api.url}${request.path}`, {
|
|
@@ -170,27 +246,43 @@ async function pollToken(api, device) {
|
|
|
170
246
|
case "authorization_pending":
|
|
171
247
|
continue;
|
|
172
248
|
case "expired_token":
|
|
173
|
-
throw new MeterError(
|
|
174
|
-
"\uAE30\uAE30 \uC778\uC99D \uCF54\uB4DC\uAC00 \uB9CC\uB8CC\uB410\uC5B4\uC694. login\uC744 \uB2E4\uC2DC \uC2E4\uD589\uD574 \uC8FC\uC138\uC694."
|
|
175
|
-
);
|
|
249
|
+
throw new MeterError(expiredCode);
|
|
176
250
|
case "invalid_grant":
|
|
177
|
-
throw new MeterError(
|
|
178
|
-
"\uC720\uD6A8\uD558\uC9C0 \uC54A\uC740 \uC778\uC99D \uCF54\uB4DC\uC608\uC694. login\uC744 \uB2E4\uC2DC \uC2E4\uD589\uD574 \uC8FC\uC138\uC694."
|
|
179
|
-
);
|
|
251
|
+
throw new MeterError(invalidCode);
|
|
180
252
|
default:
|
|
181
253
|
throw new ApiError(status);
|
|
182
254
|
}
|
|
183
255
|
}
|
|
184
|
-
throw new MeterError(
|
|
185
|
-
|
|
186
|
-
|
|
256
|
+
throw new MeterError(expiredCode);
|
|
257
|
+
}
|
|
258
|
+
async function revokeDevice(api, token2) {
|
|
259
|
+
try {
|
|
260
|
+
const { status, data } = await post(api, {
|
|
261
|
+
path: "/api/meter/revoke",
|
|
262
|
+
body: {},
|
|
263
|
+
token: token2
|
|
264
|
+
});
|
|
265
|
+
if (status === 200 && data["ok"] === true) return "revoked";
|
|
266
|
+
if (status === 401 && record(data["error"])["code"] === "unauthorized")
|
|
267
|
+
return "already";
|
|
268
|
+
return "unreachable";
|
|
269
|
+
} catch (error) {
|
|
270
|
+
if (error instanceof MeterError) return "unreachable";
|
|
271
|
+
throw error;
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
function responseNumber(value) {
|
|
275
|
+
if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0)
|
|
276
|
+
throw new MeterError("\uC0AC\uC6A9\uB7C9 \uC800\uC7A5 \uC751\uB2F5\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC544\uC694.");
|
|
277
|
+
return value;
|
|
187
278
|
}
|
|
188
279
|
async function uploadUsage(api, token2, body) {
|
|
189
280
|
let accepted = 0;
|
|
190
281
|
let weekTokens = 0;
|
|
191
282
|
let votesGranted = 0;
|
|
192
283
|
const safe = payload(body.deviceName, body.rows);
|
|
193
|
-
|
|
284
|
+
let offset = 0;
|
|
285
|
+
do {
|
|
194
286
|
const { status, data } = await post(api, {
|
|
195
287
|
path: "/api/meter/usage",
|
|
196
288
|
token: token2,
|
|
@@ -199,26 +291,27 @@ async function uploadUsage(api, token2, body) {
|
|
|
199
291
|
rows: safe.rows.slice(offset, offset + 200)
|
|
200
292
|
}
|
|
201
293
|
});
|
|
294
|
+
if (status === 401 && record(data["error"])["code"] === "unauthorized")
|
|
295
|
+
throw new DisconnectedError(apiFailure(status));
|
|
202
296
|
if (status !== 200) throw new ApiError(status);
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
const a = data["accepted"];
|
|
209
|
-
const w = data["weekTokens"];
|
|
210
|
-
const v = data["votesGranted"];
|
|
211
|
-
if (typeof a === "number" && typeof w === "number" && typeof v === "number") {
|
|
212
|
-
accepted += a;
|
|
213
|
-
weekTokens = w;
|
|
214
|
-
votesGranted += v;
|
|
215
|
-
}
|
|
216
|
-
}
|
|
297
|
+
accepted += responseNumber(data["accepted"]);
|
|
298
|
+
weekTokens = responseNumber(data["weekTokens"]);
|
|
299
|
+
votesGranted += responseNumber(data["votesGranted"]);
|
|
300
|
+
offset += 200;
|
|
301
|
+
} while (offset < safe.rows.length);
|
|
217
302
|
return { accepted, weekTokens, votesGranted };
|
|
218
303
|
}
|
|
219
304
|
|
|
220
305
|
// src/config.ts
|
|
221
|
-
import {
|
|
306
|
+
import {
|
|
307
|
+
chmod,
|
|
308
|
+
mkdir,
|
|
309
|
+
readFile,
|
|
310
|
+
rename,
|
|
311
|
+
rm,
|
|
312
|
+
rmdir,
|
|
313
|
+
writeFile
|
|
314
|
+
} from "node:fs/promises";
|
|
222
315
|
import { randomUUID } from "node:crypto";
|
|
223
316
|
import { join as join2 } from "node:path";
|
|
224
317
|
function serviceUrl(value) {
|
|
@@ -226,13 +319,12 @@ function serviceUrl(value) {
|
|
|
226
319
|
try {
|
|
227
320
|
url = new URL(value);
|
|
228
321
|
} catch (error) {
|
|
229
|
-
if (error instanceof TypeError)
|
|
230
|
-
throw new MeterError("\uC11C\uBC84 URL\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC544\uC694.");
|
|
322
|
+
if (error instanceof TypeError) throw new MeterError(invalidUrl);
|
|
231
323
|
throw error;
|
|
232
324
|
}
|
|
233
325
|
const local = ["127.0.0.1", "localhost", "[::1]"].includes(url.hostname);
|
|
234
326
|
if (url.protocol !== "https:" && !(url.protocol === "http:" && local) || url.username || url.password || url.search || url.hash || url.pathname !== "/")
|
|
235
|
-
throw new MeterError(
|
|
327
|
+
throw new MeterError(unsafeUrl);
|
|
236
328
|
return url.origin;
|
|
237
329
|
}
|
|
238
330
|
async function readConfig(home) {
|
|
@@ -243,9 +335,7 @@ async function readConfig(home) {
|
|
|
243
335
|
)
|
|
244
336
|
);
|
|
245
337
|
if (typeof data["url"] !== "string" || typeof data["deviceToken"] !== "string" || !/^mfd_[A-Za-z0-9_-]+$/.test(data["deviceToken"]) || typeof data["deviceName"] !== "string")
|
|
246
|
-
throw new MeterError(
|
|
247
|
-
"\uC124\uC815 \uD30C\uC77C\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC544\uC694. login\uC73C\uB85C \uB2E4\uC2DC \uC5F0\uACB0\uD574 \uC8FC\uC138\uC694."
|
|
248
|
-
);
|
|
338
|
+
throw new MeterError(invalidConfig);
|
|
249
339
|
return {
|
|
250
340
|
url: serviceUrl(data["url"]),
|
|
251
341
|
deviceToken: data["deviceToken"],
|
|
@@ -275,6 +365,13 @@ async function saveConfig(home, config) {
|
|
|
275
365
|
}
|
|
276
366
|
async function logout(home) {
|
|
277
367
|
await rm(join2(home, ".config/madefeed/cli.json"), { force: true });
|
|
368
|
+
try {
|
|
369
|
+
await rmdir(join2(home, ".config/madefeed"));
|
|
370
|
+
} catch (error) {
|
|
371
|
+
if (error instanceof Error && "code" in error && (error.code === "ENOTEMPTY" || error.code === "EEXIST" || error.code === "ENOENT"))
|
|
372
|
+
return;
|
|
373
|
+
throw error;
|
|
374
|
+
}
|
|
278
375
|
}
|
|
279
376
|
|
|
280
377
|
// src/kst.ts
|
|
@@ -292,7 +389,9 @@ import { join as join3 } from "node:path";
|
|
|
292
389
|
async function readClaude(options) {
|
|
293
390
|
const messages = /* @__PURE__ */ new Map();
|
|
294
391
|
try {
|
|
295
|
-
|
|
392
|
+
const root = join3(options.home, ".claude/projects");
|
|
393
|
+
if (!await directory(root)) return { supported: true, rows: [] };
|
|
394
|
+
for await (const path of files(root)) {
|
|
296
395
|
if (!path.endsWith(".jsonl") || !await recentFile(path, options.sinceMs))
|
|
297
396
|
continue;
|
|
298
397
|
for await (const value of jsonLines(path)) {
|
|
@@ -320,7 +419,7 @@ async function readClaude(options) {
|
|
|
320
419
|
} catch (error) {
|
|
321
420
|
return unsupported(
|
|
322
421
|
error,
|
|
323
|
-
"Claude Code \
|
|
422
|
+
"Claude Code \uAE30\uB85D\uC744 \uC77D\uC9C0 \uBABB\uD574 \uC774\uBC88\uC5D0\uB294 \uBE7C\uACE0 \uC62C\uB824\uC694."
|
|
324
423
|
);
|
|
325
424
|
}
|
|
326
425
|
}
|
|
@@ -330,7 +429,9 @@ import { join as join4, basename } from "node:path";
|
|
|
330
429
|
async function readCodex(options) {
|
|
331
430
|
const rows = [];
|
|
332
431
|
try {
|
|
333
|
-
|
|
432
|
+
const root = join4(options.home, ".codex/sessions");
|
|
433
|
+
if (!await directory(root)) return { supported: true, rows: [] };
|
|
434
|
+
for await (const path of files(root)) {
|
|
334
435
|
if (!basename(path).startsWith("rollout-") || !path.endsWith(".jsonl") || !await recentFile(path, options.sinceMs))
|
|
335
436
|
continue;
|
|
336
437
|
let model = "unknown";
|
|
@@ -362,10 +463,7 @@ async function readCodex(options) {
|
|
|
362
463
|
}
|
|
363
464
|
return { supported: true, rows };
|
|
364
465
|
} catch (error) {
|
|
365
|
-
return unsupported(
|
|
366
|
-
error,
|
|
367
|
-
"Codex \uB85C\uADF8\uB97C \uC77D\uC744 \uC218 \uC5C6\uC5B4 unsupported\uB85C \uCC98\uB9AC\uD574\uC694."
|
|
368
|
-
);
|
|
466
|
+
return unsupported(error, "Codex \uAE30\uB85D\uC744 \uC77D\uC9C0 \uBABB\uD574 \uC774\uBC88\uC5D0\uB294 \uBE7C\uACE0 \uC62C\uB824\uC694.");
|
|
369
467
|
}
|
|
370
468
|
}
|
|
371
469
|
|
|
@@ -517,7 +615,7 @@ function databaseWorker(input) {
|
|
|
517
615
|
}
|
|
518
616
|
|
|
519
617
|
// src/sources/opencode.ts
|
|
520
|
-
var failure = "OpenCode
|
|
618
|
+
var failure = "OpenCode \uAE30\uB85D\uC744 \uC81C\uD55C \uC2DC\uAC04 \uC548\uC5D0 \uC77D\uC9C0 \uBABB\uD574 \uC774\uBC88\uC5D0\uB294 \uBE7C\uACE0 \uC62C\uB824\uC694.";
|
|
521
619
|
async function databaseRows(input) {
|
|
522
620
|
const worker = new Worker(
|
|
523
621
|
`const {parentPort,workerData}=require('node:worker_threads'); parentPort.postMessage((${databaseWorker.toString()})(workerData))`,
|
|
@@ -544,15 +642,6 @@ async function databaseRows(input) {
|
|
|
544
642
|
await worker.terminate();
|
|
545
643
|
}
|
|
546
644
|
}
|
|
547
|
-
async function directory(path) {
|
|
548
|
-
try {
|
|
549
|
-
return (await stat2(path)).isDirectory();
|
|
550
|
-
} catch (error) {
|
|
551
|
-
if (error instanceof Error && "code" in error && error.code === "ENOENT")
|
|
552
|
-
return false;
|
|
553
|
-
throw error;
|
|
554
|
-
}
|
|
555
|
-
}
|
|
556
645
|
async function legacyRows(root, options) {
|
|
557
646
|
const rows = /* @__PURE__ */ new Map();
|
|
558
647
|
const storage = join5(root, "storage/message");
|
|
@@ -827,6 +916,9 @@ async function removeAgent(home) {
|
|
|
827
916
|
force: true
|
|
828
917
|
});
|
|
829
918
|
}
|
|
919
|
+
async function removeLog(home) {
|
|
920
|
+
await rm2(join7(home, ".config/madefeed/auto.log"), { force: true });
|
|
921
|
+
}
|
|
830
922
|
async function trimLog(home) {
|
|
831
923
|
let file;
|
|
832
924
|
try {
|
|
@@ -1058,11 +1150,11 @@ async function removeSchedule(context) {
|
|
|
1058
1150
|
const paths = schedulePaths(context);
|
|
1059
1151
|
switch (context.platform) {
|
|
1060
1152
|
case "darwin":
|
|
1153
|
+
await rm3(paths.plist, { force: true });
|
|
1061
1154
|
await succeeds(context, "launchctl", [
|
|
1062
1155
|
"bootout",
|
|
1063
1156
|
`gui/${context.uid}/${label}`
|
|
1064
1157
|
]);
|
|
1065
|
-
await rm3(paths.plist, { force: true });
|
|
1066
1158
|
return;
|
|
1067
1159
|
case "linux": {
|
|
1068
1160
|
await succeeds(context, "systemctl", [
|
|
@@ -1130,7 +1222,6 @@ async function scheduleStatus(context) {
|
|
|
1130
1222
|
}
|
|
1131
1223
|
|
|
1132
1224
|
// src/auto.ts
|
|
1133
|
-
var failure2 = "\uC790\uB3D9 \uC804\uC1A1\uC744 \uC124\uC815\uD560 \uC218 \uC5C6\uC5B4\uC694. madefeed upload\uB85C \uC218\uB3D9 \uC804\uC1A1\uD560 \uC218 \uC788\uC5B4\uC694.";
|
|
1134
1225
|
function automatic(options) {
|
|
1135
1226
|
const { runtime, home, env, diagnostic } = options;
|
|
1136
1227
|
const active = runtime.exec !== void 0 && runtime.self !== void 0;
|
|
@@ -1143,11 +1234,11 @@ function automatic(options) {
|
|
|
1143
1234
|
env,
|
|
1144
1235
|
...active ? { exec: runtime.exec } : {}
|
|
1145
1236
|
};
|
|
1146
|
-
async function safely(action) {
|
|
1237
|
+
async function safely(action, message) {
|
|
1147
1238
|
try {
|
|
1148
1239
|
await action();
|
|
1149
1240
|
} catch (error) {
|
|
1150
|
-
if (error instanceof Error) diagnostic(
|
|
1241
|
+
if (error instanceof Error) diagnostic(message);
|
|
1151
1242
|
else throw error;
|
|
1152
1243
|
}
|
|
1153
1244
|
}
|
|
@@ -1157,7 +1248,7 @@ function automatic(options) {
|
|
|
1157
1248
|
return await scheduleStatus(context);
|
|
1158
1249
|
} catch (error) {
|
|
1159
1250
|
if (!(error instanceof Error)) throw error;
|
|
1160
|
-
diagnostic(
|
|
1251
|
+
diagnostic(setupFailure);
|
|
1161
1252
|
return { enabled: false, kind: "none" };
|
|
1162
1253
|
}
|
|
1163
1254
|
},
|
|
@@ -1168,23 +1259,28 @@ function automatic(options) {
|
|
|
1168
1259
|
await installAgent(self, home);
|
|
1169
1260
|
const result = await installSchedule(context);
|
|
1170
1261
|
if (!result.supported) {
|
|
1171
|
-
diagnostic(
|
|
1262
|
+
diagnostic(setupFailure);
|
|
1172
1263
|
return;
|
|
1173
1264
|
}
|
|
1174
1265
|
await saveConfig(home, { ...config, auto: "on" });
|
|
1175
1266
|
if (config.auto !== "on")
|
|
1176
|
-
diagnostic(
|
|
1177
|
-
|
|
1178
|
-
);
|
|
1179
|
-
});
|
|
1267
|
+
for (const line of autoEnabled) diagnostic(line);
|
|
1268
|
+
}, setupFailure);
|
|
1180
1269
|
},
|
|
1181
|
-
async remove() {
|
|
1182
|
-
|
|
1183
|
-
|
|
1184
|
-
|
|
1270
|
+
async remove(scope) {
|
|
1271
|
+
const failure2 = cleanupFailure(scope);
|
|
1272
|
+
if (active) {
|
|
1273
|
+
await safely(() => removeAgent(home), failure2);
|
|
1274
|
+
await safely(() => removeLog(home), failure2);
|
|
1275
|
+
}
|
|
1276
|
+
try {
|
|
1277
|
+
if (scope === "device") await logout(home);
|
|
1278
|
+
} finally {
|
|
1279
|
+
if (active) await safely(() => removeSchedule(context), failure2);
|
|
1280
|
+
}
|
|
1185
1281
|
},
|
|
1186
1282
|
async trim() {
|
|
1187
|
-
await safely(() => trimLog(home));
|
|
1283
|
+
await safely(() => trimLog(home), setupFailure);
|
|
1188
1284
|
}
|
|
1189
1285
|
};
|
|
1190
1286
|
}
|
|
@@ -1192,37 +1288,25 @@ async function autoCommand(action, config, options) {
|
|
|
1192
1288
|
const auto = automatic(options);
|
|
1193
1289
|
switch (action) {
|
|
1194
1290
|
case "on":
|
|
1195
|
-
if (!config)
|
|
1196
|
-
throw new MeterError("\uBA3C\uC800 madefeed login\uC73C\uB85C \uAE30\uAE30\uB97C \uC5F0\uACB0\uD574 \uC8FC\uC138\uC694.");
|
|
1291
|
+
if (!config) throw new MeterError(connectionRequired);
|
|
1197
1292
|
await auto.install(config);
|
|
1198
1293
|
break;
|
|
1199
1294
|
case "off":
|
|
1200
|
-
await auto.remove();
|
|
1295
|
+
await auto.remove("auto");
|
|
1201
1296
|
if (config) await saveConfig(options.home, { ...config, auto: "off" });
|
|
1202
1297
|
break;
|
|
1203
1298
|
case "status":
|
|
1204
1299
|
break;
|
|
1205
1300
|
default:
|
|
1206
|
-
throw new MeterError(
|
|
1301
|
+
throw new MeterError(invalidAuto);
|
|
1207
1302
|
}
|
|
1208
1303
|
return auto.status();
|
|
1209
1304
|
}
|
|
1210
1305
|
|
|
1211
1306
|
// src/cli-options.ts
|
|
1212
1307
|
import { parseArgs } from "node:util";
|
|
1213
|
-
var VERSION = "0.
|
|
1214
|
-
var help =
|
|
1215
|
-
\uC0AC\uC6A9\uBC95: madefeed [login|upload|logout|status|auto [on|off|status]] [\uC635\uC158]
|
|
1216
|
-
--dry-run \uC804\uC1A1 \uC5C6\uC774 \uD569\uACC4\uC640 \uC815\uD655\uD55C \uC694\uCCAD JSON\uC744 \uCD9C\uB825\uD574\uC694.
|
|
1217
|
-
--days N \uC624\uB298\uC744 \uD3EC\uD568\uD55C KST \uC77C\uC218\uC608\uC694. \uAE30\uBCF8 14, \uCD5C\uB300 35\uC608\uC694.
|
|
1218
|
-
--url URL \uC11C\uBC84 \uC8FC\uC18C\uC608\uC694. MADEFEED_URL \uB610\uB294 https://madefeed.dev\uB97C \uC0AC\uC6A9\uD574\uC694.
|
|
1219
|
-
--json \uAE30\uACC4\uAC00 \uC77D\uC744 JSON\uB9CC \uD45C\uC900 \uCD9C\uB825\uC73C\uB85C \uB0B4\uBCF4\uB0B4\uC694.
|
|
1220
|
-
--no-auto \uC774\uBC88 \uC2E4\uD589\uC5D0\uC11C\uB294 \uC790\uB3D9 \uC804\uC1A1\uC744 \uB4F1\uB85D\uD558\uAC70\uB098 \uAC31\uC2E0\uD558\uC9C0 \uC54A\uC544\uC694.
|
|
1221
|
-
--scheduled \uC2A4\uCF00\uC904\uB7EC\uC5D0\uC11C \uB85C\uADF8\uC778 \uC5C6\uC774 \uC2E4\uD589\uD574\uC694.
|
|
1222
|
-
--help \uB3C4\uC6C0\uB9D0\uC744 \uBCF4\uC5EC\uC918\uC694.
|
|
1223
|
-
--version \uBC84\uC804\uC744 \uBCF4\uC5EC\uC918\uC694.
|
|
1224
|
-
Claude Code, Codex, OpenCode, Gemini CLI\uB97C \uC77D\uC5B4\uC694.
|
|
1225
|
-
\uAE30\uBCF8 \uC2E4\uD589\uC740 \uB85C\uADF8\uC778 \uD6C4 \uC0AC\uC6A9\uB7C9\uC744 \uC804\uC1A1\uD574\uC694. Cursor\uB294 unsupported\uC608\uC694.`;
|
|
1308
|
+
var VERSION = "0.3.0";
|
|
1309
|
+
var help = helpText(VERSION);
|
|
1226
1310
|
function cliOptions(args) {
|
|
1227
1311
|
try {
|
|
1228
1312
|
return parseArgs({
|
|
@@ -1240,14 +1324,51 @@ function cliOptions(args) {
|
|
|
1240
1324
|
}
|
|
1241
1325
|
});
|
|
1242
1326
|
} catch (error) {
|
|
1243
|
-
if (error instanceof Error)
|
|
1244
|
-
throw new MeterError(
|
|
1245
|
-
"\uBA85\uB839 \uC635\uC158\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC544\uC694. --help\uB97C \uD655\uC778\uD574 \uC8FC\uC138\uC694."
|
|
1246
|
-
);
|
|
1327
|
+
if (error instanceof Error) throw new MeterError(invalidOptions);
|
|
1247
1328
|
throw error;
|
|
1248
1329
|
}
|
|
1249
1330
|
}
|
|
1250
1331
|
|
|
1332
|
+
// src/disconnect.ts
|
|
1333
|
+
async function runLogout(session) {
|
|
1334
|
+
let config;
|
|
1335
|
+
try {
|
|
1336
|
+
config = await readConfig(session.home);
|
|
1337
|
+
} catch (error) {
|
|
1338
|
+
if (!(error instanceof Error)) throw error;
|
|
1339
|
+
}
|
|
1340
|
+
const server = config ? await revokeDevice(
|
|
1341
|
+
{ url: config.url, fetch: session.fetch },
|
|
1342
|
+
config.deviceToken
|
|
1343
|
+
) : "none";
|
|
1344
|
+
await session.auto.remove("device");
|
|
1345
|
+
let message;
|
|
1346
|
+
switch (server) {
|
|
1347
|
+
case "revoked":
|
|
1348
|
+
message = logoutRevoked;
|
|
1349
|
+
break;
|
|
1350
|
+
case "already":
|
|
1351
|
+
case "none":
|
|
1352
|
+
message = logoutLocal;
|
|
1353
|
+
break;
|
|
1354
|
+
case "unreachable":
|
|
1355
|
+
message = logoutUnreachable(config?.url ?? "");
|
|
1356
|
+
break;
|
|
1357
|
+
default: {
|
|
1358
|
+
const exhaustive = server;
|
|
1359
|
+
throw exhaustive;
|
|
1360
|
+
}
|
|
1361
|
+
}
|
|
1362
|
+
session.output(
|
|
1363
|
+
session.json ? JSON.stringify({ loggedIn: false, server }) : message
|
|
1364
|
+
);
|
|
1365
|
+
}
|
|
1366
|
+
async function cleanDisconnected(session, options) {
|
|
1367
|
+
if (options.scheduled) session.output(scheduledDisconnected(options.now));
|
|
1368
|
+
await session.auto.remove("device");
|
|
1369
|
+
if (!options.scheduled) throw new MeterError(disconnected);
|
|
1370
|
+
}
|
|
1371
|
+
|
|
1251
1372
|
// src/cli.ts
|
|
1252
1373
|
async function runCli(args, runtime = {}) {
|
|
1253
1374
|
const parsed = cliOptions(args);
|
|
@@ -1264,38 +1385,42 @@ async function runCli(args, runtime = {}) {
|
|
|
1264
1385
|
}
|
|
1265
1386
|
const days = Number(values["days"] ?? 14);
|
|
1266
1387
|
if (!Number.isInteger(days) || days < 1 || days > 35)
|
|
1267
|
-
throw new MeterError(
|
|
1388
|
+
throw new MeterError(invalidDays);
|
|
1268
1389
|
const command = positionals[0] ?? "upload";
|
|
1269
1390
|
if (positionals.length > (command === "auto" ? 2 : 1) || !["login", "upload", "logout", "status", "auto"].includes(command))
|
|
1270
|
-
throw new MeterError(
|
|
1391
|
+
throw new MeterError(unknownCommand);
|
|
1271
1392
|
if (values["dry-run"] && command !== "upload")
|
|
1272
|
-
throw new MeterError(
|
|
1273
|
-
"--dry-run\uC740 \uAE30\uBCF8 \uC2E4\uD589 \uB610\uB294 upload\uC5D0\uC11C\uB9CC \uC0AC\uC6A9\uD560 \uC218 \uC788\uC5B4\uC694."
|
|
1274
|
-
);
|
|
1393
|
+
throw new MeterError(invalidDryRun);
|
|
1275
1394
|
if (values["scheduled"] && command !== "upload")
|
|
1276
|
-
throw new MeterError(
|
|
1395
|
+
throw new MeterError(invalidScheduled);
|
|
1277
1396
|
const home = runtime.home ?? homedir();
|
|
1278
1397
|
const env = runtime.env ?? process.env;
|
|
1279
1398
|
const autoOptions = { runtime, home, env, diagnostic };
|
|
1280
1399
|
const auto = automatic(autoOptions);
|
|
1400
|
+
const session = {
|
|
1401
|
+
home,
|
|
1402
|
+
auto,
|
|
1403
|
+
output,
|
|
1404
|
+
json: values["json"] ?? false,
|
|
1405
|
+
fetch: runtime.fetch ?? fetch
|
|
1406
|
+
};
|
|
1281
1407
|
if (values["scheduled"]) await auto.trim();
|
|
1282
1408
|
if (command === "logout") {
|
|
1283
|
-
await
|
|
1284
|
-
await logout(home);
|
|
1285
|
-
output(
|
|
1286
|
-
values["json"] ? JSON.stringify({ loggedIn: false }) : "\uB85C\uCEEC \uAE30\uAE30 \uD1A0\uD070\uC744 \uC9C0\uC6E0\uC5B4\uC694. \uC11C\uBC84 \uAE30\uAE30 \uD574\uC81C\uB294 \uC6F9 \uC124\uC815\uC5D0\uC11C \uD560 \uC218 \uC788\uC5B4\uC694."
|
|
1287
|
-
);
|
|
1409
|
+
await runLogout(session);
|
|
1288
1410
|
return;
|
|
1289
1411
|
}
|
|
1290
1412
|
let config;
|
|
1291
1413
|
try {
|
|
1292
1414
|
config = await readConfig(home);
|
|
1293
1415
|
} catch (error) {
|
|
1294
|
-
if (
|
|
1295
|
-
|
|
1296
|
-
|
|
1416
|
+
if (command === "login" && error instanceof Error) config = void 0;
|
|
1417
|
+
else {
|
|
1418
|
+
if (values["scheduled"] && error instanceof MeterError) {
|
|
1419
|
+
output(scheduledSkip);
|
|
1420
|
+
return;
|
|
1421
|
+
}
|
|
1422
|
+
throw error;
|
|
1297
1423
|
}
|
|
1298
|
-
throw error;
|
|
1299
1424
|
}
|
|
1300
1425
|
if (command === "auto") {
|
|
1301
1426
|
const state = await autoCommand(
|
|
@@ -1303,18 +1428,14 @@ async function runCli(args, runtime = {}) {
|
|
|
1303
1428
|
config,
|
|
1304
1429
|
autoOptions
|
|
1305
1430
|
);
|
|
1306
|
-
output(
|
|
1307
|
-
values["json"] ? JSON.stringify(state) : `\uC790\uB3D9 \uC804\uC1A1: ${state.enabled ? `\uCF1C\uC838 \uC788\uC5B4\uC694 (${state.kind}).` : "\uAEBC\uC838 \uC788\uC5B4\uC694."}`
|
|
1308
|
-
);
|
|
1431
|
+
output(values["json"] ? JSON.stringify(state) : autoLine(state));
|
|
1309
1432
|
return;
|
|
1310
1433
|
}
|
|
1311
1434
|
const chosen = values["url"] ?? env["MADEFEED_URL"] ?? config?.url ?? "https://madefeed.dev";
|
|
1312
|
-
if (typeof chosen !== "string")
|
|
1313
|
-
throw new MeterError("\uC11C\uBC84 URL\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC544\uC694.");
|
|
1314
1435
|
const url = serviceUrl(chosen);
|
|
1315
1436
|
const configured = config?.url === url ? config : void 0;
|
|
1316
1437
|
if (values["scheduled"] && !configured) {
|
|
1317
|
-
output(
|
|
1438
|
+
output(scheduledSkip);
|
|
1318
1439
|
return;
|
|
1319
1440
|
}
|
|
1320
1441
|
const deviceName = configured?.deviceName ?? hostname().replace(/[^A-Za-z0-9._-]/g, "-").slice(0, 80);
|
|
@@ -1327,12 +1448,9 @@ async function runCli(args, runtime = {}) {
|
|
|
1327
1448
|
auto: state
|
|
1328
1449
|
};
|
|
1329
1450
|
output(
|
|
1330
|
-
values["json"] ? JSON.stringify(status) : configured
|
|
1451
|
+
values["json"] ? JSON.stringify(status) : connectionLine(configured)
|
|
1331
1452
|
);
|
|
1332
|
-
if (!values["json"])
|
|
1333
|
-
output(
|
|
1334
|
-
`\uC790\uB3D9 \uC804\uC1A1: ${state.enabled ? `\uCF1C\uC838 \uC788\uC5B4\uC694 (${state.kind}).` : "\uAEBC\uC838 \uC788\uC5B4\uC694."}`
|
|
1335
|
-
);
|
|
1453
|
+
if (!values["json"]) output(autoLine(state));
|
|
1336
1454
|
return;
|
|
1337
1455
|
}
|
|
1338
1456
|
const now = runtime.now ?? Date.now();
|
|
@@ -1355,8 +1473,8 @@ async function runCli(args, runtime = {}) {
|
|
|
1355
1473
|
const body = payload(deviceName, rows);
|
|
1356
1474
|
if (values["dry-run"]) {
|
|
1357
1475
|
if (!values["json"]) {
|
|
1358
|
-
output(
|
|
1359
|
-
output(
|
|
1476
|
+
output(dryRunHeader);
|
|
1477
|
+
output(dryRunColumns);
|
|
1360
1478
|
for (const row of rows)
|
|
1361
1479
|
output(
|
|
1362
1480
|
`${row.date} ${row.tool.padEnd(11)} ${row.model.padEnd(28)} ${row.tokens}`
|
|
@@ -1370,9 +1488,7 @@ async function runCli(args, runtime = {}) {
|
|
|
1370
1488
|
if (!values["scheduled"] && (command === "login" || !token2)) {
|
|
1371
1489
|
const device = await requestDevice(api, deviceName);
|
|
1372
1490
|
const instructions = values["json"] ? diagnostic : output;
|
|
1373
|
-
instructions(
|
|
1374
|
-
`\uBE0C\uB77C\uC6B0\uC800\uC5D0\uC11C ${device.verification_uri} \uC8FC\uC18C\uB97C \uC5F4\uACE0 ${device.user_code} \uCF54\uB4DC\uB97C \uC785\uB825\uD574 \uC8FC\uC138\uC694.`
|
|
1375
|
-
);
|
|
1491
|
+
for (const line of approval(device)) instructions(line);
|
|
1376
1492
|
token2 = await pollToken(api, device);
|
|
1377
1493
|
saved = {
|
|
1378
1494
|
url,
|
|
@@ -1381,19 +1497,31 @@ async function runCli(args, runtime = {}) {
|
|
|
1381
1497
|
...config?.auto ? { auto: config.auto } : {}
|
|
1382
1498
|
};
|
|
1383
1499
|
await saveConfig(home, saved);
|
|
1500
|
+
if (command !== "login") instructions(connected(deviceName));
|
|
1384
1501
|
}
|
|
1385
1502
|
if (!values["scheduled"] && !values["no-auto"] && env["MADEFEED_NO_AUTO"] !== "1" && saved && saved.auto !== "off")
|
|
1386
1503
|
await auto.install(saved);
|
|
1387
1504
|
if (command === "login") {
|
|
1505
|
+
if (values["json"]) diagnostic(connected(deviceName));
|
|
1388
1506
|
output(
|
|
1389
|
-
values["json"] ? JSON.stringify({ loggedIn: true }) :
|
|
1507
|
+
values["json"] ? JSON.stringify({ loggedIn: true }) : connected(deviceName)
|
|
1390
1508
|
);
|
|
1391
1509
|
return;
|
|
1392
1510
|
}
|
|
1393
1511
|
if (!token2) return;
|
|
1394
|
-
|
|
1512
|
+
let result;
|
|
1513
|
+
try {
|
|
1514
|
+
result = await uploadUsage(api, token2, body);
|
|
1515
|
+
} catch (error) {
|
|
1516
|
+
if (!(error instanceof DisconnectedError)) throw error;
|
|
1517
|
+
await cleanDisconnected(session, {
|
|
1518
|
+
scheduled: values["scheduled"] ?? false,
|
|
1519
|
+
now
|
|
1520
|
+
});
|
|
1521
|
+
return;
|
|
1522
|
+
}
|
|
1395
1523
|
output(
|
|
1396
|
-
values["scheduled"] ?
|
|
1524
|
+
values["scheduled"] ? scheduledUpload(now, result.accepted) : values["json"] ? JSON.stringify(result) : uploadResult(result)
|
|
1397
1525
|
);
|
|
1398
1526
|
}
|
|
1399
1527
|
function invokedDirectly() {
|
|
@@ -1427,7 +1555,7 @@ if (invokedDirectly()) {
|
|
|
1427
1555
|
platform: process.platform,
|
|
1428
1556
|
...process.getuid ? { uid: process.getuid() } : {}
|
|
1429
1557
|
}).catch((error) => {
|
|
1430
|
-
const message = error instanceof MeterError ? error.message :
|
|
1558
|
+
const message = error instanceof MeterError ? error.message : localFailure;
|
|
1431
1559
|
if (process.argv.includes("--json"))
|
|
1432
1560
|
console.error(JSON.stringify({ error: message }));
|
|
1433
1561
|
else console.error(message);
|