@the-seeker/madefeed 0.3.0 → 0.4.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/LICENSE +21 -0
- package/README.md +26 -1
- package/dist/cli.mjs +106 -40
- package/package.json +14 -4
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026 The Seeker Inc. ((주)더씨커)
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -10,10 +10,16 @@ npx @the-seeker/madefeed@latest
|
|
|
10
10
|
|
|
11
11
|
처음 실행하면 브라우저에서 기기를 연결하고, 이어서 사용량을 올려요. Node.js 22.13 이상이 필요해요.
|
|
12
12
|
|
|
13
|
+
첫 연결에서는 `--days`와 관계없이 오늘 포함 지난 30일(KST)의 사용량을 올려요. 연결 전 기록 합산은 **계정당 한 번**이에요. 다시 연결해도 이미 합산한 과거 기록은 중복으로 더하지 않아요. 같은 서버에 다시 로그인하면 새 토큰을 받은 뒤 이전 기기 연결부터 해제해요. 이전 버전에서 연결한 기기도 다음 실제 전송(예약 전송 포함)에서 30일 합산을 한 번 시도해요. 서버가 합산을 마감했어도 이후에는 평소 기간으로 전송해요. `--dry-run`은 네트워크 요청 없이 지정한 `--days` 기간만 보여주며, 첫 합산 상태를 바꾸지 않아요.
|
|
14
|
+
|
|
15
|
+
전송 결과에는 제외한 기록 수(있을 때), 지난 사용량 합산 여부, 남은 **누적 표**가 표시돼요. 누적 표는 쓰기 전까지 남아 있는 투표 잔액이에요. 예전 서버가 잔액을 보내지 않으면 표시하지 않아요.
|
|
16
|
+
|
|
17
|
+
`login --json`은 연결과 전송을 마친 뒤 표준 출력에 JSON 객체 하나만 출력해요. 예: `{"loggedIn":true,"accepted":12,"ignored":0,"backfill":"applied","weekTokens":3000000,"votesGranted":3,"bankVotes":3}`. 연결 안내는 표준 오류로 나가요. `upload --json`은 `loggedIn` 없이 같은 전송 결과를 출력해요. 예전 서버에서는 `ignored`는 `0`, `backfill`은 `null`이고 `bankVotes`는 생략돼요.
|
|
18
|
+
|
|
13
19
|
| 명령 | 하는 일 |
|
|
14
20
|
| --- | --- |
|
|
15
21
|
| `npx @the-seeker/madefeed@latest` 또는 `npx @the-seeker/madefeed@latest upload` | 연결이 없으면 연결하고, 사용량을 올려요. |
|
|
16
|
-
| `npx @the-seeker/madefeed@latest login` |
|
|
22
|
+
| `npx @the-seeker/madefeed@latest login` | 기기를 연결하고 지난 30일 사용량을 올려요. |
|
|
17
23
|
| `npx @the-seeker/madefeed@latest status` | 연결과 자동 전송 상태를 보여줘요. |
|
|
18
24
|
| `npx @the-seeker/madefeed@latest auto [status]` | 자동 전송 상태를 보여줘요. `--json`도 지원해요. |
|
|
19
25
|
| `npx @the-seeker/madefeed@latest auto on` | 연결된 기기의 자동 전송을 켜요. |
|
|
@@ -58,3 +64,22 @@ npx @the-seeker/madefeed@latest
|
|
|
58
64
|
## 읽는 곳
|
|
59
65
|
|
|
60
66
|
Claude Code, Codex, OpenCode, Gemini CLI의 로컬 사용 기록을 읽기 전용으로 읽어요. Cursor는 아직 지원하지 않아요.
|
|
67
|
+
|
|
68
|
+
## 개발
|
|
69
|
+
|
|
70
|
+
이 저장소는 MadeFeed 모노레포의 `packages/cli`를 내보낸 저장소예요. 개발하려면 Node.js 22.13 이상과 pnpm이 필요해요.
|
|
71
|
+
|
|
72
|
+
```sh
|
|
73
|
+
pnpm install
|
|
74
|
+
pnpm test
|
|
75
|
+
pnpm typecheck
|
|
76
|
+
pnpm build
|
|
77
|
+
```
|
|
78
|
+
|
|
79
|
+
설치할 때 pnpm이 esbuild의 빌드 스크립트를 건너뛰었다고 알려줘도 괜찮아요.
|
|
80
|
+
|
|
81
|
+
코드는 MadeFeed 모노레포에서 수정한 뒤 이 저장소로 내보내요.
|
|
82
|
+
|
|
83
|
+
## 라이선스
|
|
84
|
+
|
|
85
|
+
MIT 라이선스예요. 전문은 `LICENSE` 파일에 있어요.
|
package/dist/cli.mjs
CHANGED
|
@@ -121,6 +121,7 @@ var disconnected = `\uC11C\uBC84\uC5D0\uC11C \uC774 \uAE30\uAE30 \uC5F0\uACB0\uC
|
|
|
121
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
122
|
var logoutLocal = "\uC774 \uCEF4\uD4E8\uD130\uC758 \uC5F0\uACB0 \uC815\uBCF4\uC640 \uC790\uB3D9 \uC804\uC1A1\uC744 \uC9C0\uC6E0\uC5B4\uC694.";
|
|
123
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 reloginUnreachable = (url) => `\uC774\uC804 \uAE30\uAE30 \uC5F0\uACB0\uC744 \uB04A\uC9C0 \uBABB\uD588\uC5B4\uC694. ${url}/meter \uC5D0\uC11C \uC774\uC804 \uAE30\uAE30 \uC5F0\uACB0\uC744 \uB04A\uC5B4 \uC8FC\uC138\uC694.`;
|
|
124
125
|
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
126
|
var connected = (deviceName) => `${deviceName} \uAE30\uAE30\uB97C \uC5F0\uACB0\uD588\uC5B4\uC694.`;
|
|
126
127
|
var approval = (device) => [
|
|
@@ -130,8 +131,31 @@ var approval = (device) => [
|
|
|
130
131
|
];
|
|
131
132
|
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
133
|
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
|
-
|
|
134
|
-
|
|
134
|
+
function uploadResult(result) {
|
|
135
|
+
const lines = [
|
|
136
|
+
`\uC0AC\uC6A9\uB7C9 ${result.accepted}\uAC74\uC744 \uC62C\uB838\uC5B4\uC694.${result.ignored > 0 ? ` \uC81C\uC678\uD55C \uAE30\uB85D ${result.ignored}\uAC74.` : ""}${result.votesGranted > 0 ? ` \uC0C8\uB85C \uBC1B\uC740 \uD45C ${result.votesGranted}\uD45C.` : ""}`
|
|
137
|
+
];
|
|
138
|
+
switch (result.backfill) {
|
|
139
|
+
case "applied":
|
|
140
|
+
lines.push("\uC9C0\uB09C 30\uC77C \uC0AC\uC6A9\uB7C9\uB3C4 \uD55C \uBC88 \uD569\uC0B0\uD588\uC5B4\uC694.");
|
|
141
|
+
break;
|
|
142
|
+
case "closed":
|
|
143
|
+
lines.push(
|
|
144
|
+
"\uC774 \uACC4\uC815\uC740 \uC9C0\uB09C \uC0AC\uC6A9\uB7C9\uC744 \uC774\uBBF8 \uD55C \uBC88 \uD569\uC0B0\uD574\uC11C, \uC5F0\uACB0 \uC804 \uAE30\uB85D\uC740 \uBE7C\uACE0 \uC62C\uB838\uC5B4\uC694."
|
|
145
|
+
);
|
|
146
|
+
break;
|
|
147
|
+
case null:
|
|
148
|
+
break;
|
|
149
|
+
default: {
|
|
150
|
+
const unreachable = result.backfill;
|
|
151
|
+
return unreachable;
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
if (result.bankVotes !== void 0)
|
|
155
|
+
lines.push(`\uB204\uC801 \uD45C ${result.bankVotes}\uD45C.`);
|
|
156
|
+
return lines.join("\n");
|
|
157
|
+
}
|
|
158
|
+
var scheduledUpload = (now, result) => `${new Date(now).toISOString()} \uC0AC\uC6A9\uB7C9 ${result.accepted}\uAC74\uC744 \uC62C\uB838\uC5B4\uC694.${result.ignored > 0 ? ` \uC81C\uC678\uD55C \uAE30\uB85D ${result.ignored}\uAC74.` : ""}`;
|
|
135
159
|
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
160
|
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
161
|
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.`;
|
|
@@ -141,7 +165,7 @@ function helpText(version) {
|
|
|
141
165
|
|
|
142
166
|
\uBA85\uB839
|
|
143
167
|
(\uC5C6\uC74C), upload \uC5F0\uACB0\uC774 \uC5C6\uC73C\uBA74 \uC5F0\uACB0\uD558\uACE0, \uC0AC\uC6A9\uB7C9\uC744 \uC62C\uB824\uC694.
|
|
144
|
-
login \uAE30\uAE30\
|
|
168
|
+
login \uAE30\uAE30\uB97C \uC5F0\uACB0\uD558\uACE0 \uC9C0\uB09C 30\uC77C \uC0AC\uC6A9\uB7C9\uC744 \uC62C\uB824\uC694.
|
|
145
169
|
status \uC5F0\uACB0\uACFC \uC790\uB3D9 \uC804\uC1A1 \uC0C1\uD0DC\uB97C \uBCF4\uC5EC\uC918\uC694.
|
|
146
170
|
auto [on|off|status] \uC790\uB3D9 \uC804\uC1A1\uC744 \uCF1C\uAC70\uB098 \uB044\uAC70\uB098 \uD655\uC778\uD574\uC694.
|
|
147
171
|
logout \uC5F0\uACB0\uC744 \uB04A\uACE0 \uC774 \uCEF4\uD4E8\uD130\uC758 \uC5F0\uACB0 \uC815\uBCF4\uC640 \uC790\uB3D9 \uC804\uC1A1\uC744 \uC9C0\uC6CC\uC694.
|
|
@@ -149,6 +173,7 @@ function helpText(version) {
|
|
|
149
173
|
\uC635\uC158
|
|
150
174
|
--dry-run \uBCF4\uB0B4\uC9C0 \uC54A\uACE0, \uBCF4\uB0BC \uD569\uACC4\uC640 \uC694\uCCAD JSON\uB9CC \uBCF4\uC5EC\uC918\uC694.
|
|
151
175
|
--days N \uC624\uB298\uC744 \uD3EC\uD568\uD574 \uBA70\uCE60 \uCE58\uB97C \uC140\uC9C0 \uC815\uD574\uC694. \uAE30\uBCF8 14, \uCD5C\uB300 35 (KST).
|
|
176
|
+
\uCCAB \uC5F0\uACB0\xB7\uC774\uC804 \uBC84\uC804\uC758 \uCCAB \uC804\uC1A1\uC740 30\uC77C\uC774\uC5D0\uC694. --dry-run\uC740 \uC608\uC678\uC608\uC694.
|
|
152
177
|
--url URL \uC11C\uBC84 \uC8FC\uC18C\uC608\uC694. \uAE30\uBCF8\uC740 MADEFEED_URL \uB610\uB294 https://madefeed.dev.
|
|
153
178
|
--json \uAE30\uACC4\uAC00 \uC77D\uC744 JSON\uB9CC \uD45C\uC900 \uCD9C\uB825\uC73C\uB85C \uB0B4\uBCF4\uB0B4\uC694.
|
|
154
179
|
--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.
|
|
@@ -156,6 +181,8 @@ function helpText(version) {
|
|
|
156
181
|
--help \uB3C4\uC6C0\uB9D0\uC744 \uBCF4\uC5EC\uC918\uC694.
|
|
157
182
|
--version \uBC84\uC804\uC744 \uBCF4\uC5EC\uC918\uC694.
|
|
158
183
|
|
|
184
|
+
\uC9C0\uB09C \uC0AC\uC6A9\uB7C9 \uD569\uC0B0\uC740 \uACC4\uC815\uB2F9 \uD55C \uBC88\uC774\uBA70, \uACB0\uACFC\uC5D0 \uB0A8\uC740 \uB204\uC801 \uD45C\uB97C \uBCF4\uC5EC\uC918\uC694.
|
|
185
|
+
login --json\uC740 loggedIn\uACFC \uC804\uC1A1 \uACB0\uACFC\uB97C \uB2F4\uC740 JSON \uAC1D\uCCB4 \uD558\uB098\uB97C \uCD9C\uB825\uD574\uC694.
|
|
159
186
|
\uC77D\uB294 \uB3C4\uAD6C: Claude Code, Codex, OpenCode, Gemini CLI (Cursor\uB294 \uC544\uC9C1 \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC544\uC694)`;
|
|
160
187
|
}
|
|
161
188
|
|
|
@@ -280,6 +307,9 @@ async function uploadUsage(api, token2, body) {
|
|
|
280
307
|
let accepted = 0;
|
|
281
308
|
let weekTokens = 0;
|
|
282
309
|
let votesGranted = 0;
|
|
310
|
+
let ignored = 0;
|
|
311
|
+
let backfill = null;
|
|
312
|
+
let bankVotes;
|
|
283
313
|
const safe = payload(body.deviceName, body.rows);
|
|
284
314
|
let offset = 0;
|
|
285
315
|
do {
|
|
@@ -288,7 +318,8 @@ async function uploadUsage(api, token2, body) {
|
|
|
288
318
|
token: token2,
|
|
289
319
|
body: {
|
|
290
320
|
deviceName: safe.deviceName,
|
|
291
|
-
rows: safe.rows.slice(offset, offset + 200)
|
|
321
|
+
rows: safe.rows.slice(offset, offset + 200),
|
|
322
|
+
...body.backfill ? { backfill: true } : {}
|
|
292
323
|
}
|
|
293
324
|
});
|
|
294
325
|
if (status === 401 && record(data["error"])["code"] === "unauthorized")
|
|
@@ -297,9 +328,31 @@ async function uploadUsage(api, token2, body) {
|
|
|
297
328
|
accepted += responseNumber(data["accepted"]);
|
|
298
329
|
weekTokens = responseNumber(data["weekTokens"]);
|
|
299
330
|
votesGranted += responseNumber(data["votesGranted"]);
|
|
331
|
+
ignored += responseNumber(data["ignored"] ?? 0);
|
|
332
|
+
bankVotes = data["bankVotes"] === void 0 ? void 0 : responseNumber(data["bankVotes"]);
|
|
333
|
+
switch (data["backfill"]) {
|
|
334
|
+
case "applied":
|
|
335
|
+
backfill = "applied";
|
|
336
|
+
break;
|
|
337
|
+
case "closed":
|
|
338
|
+
backfill ??= "closed";
|
|
339
|
+
break;
|
|
340
|
+
case void 0:
|
|
341
|
+
case null:
|
|
342
|
+
break;
|
|
343
|
+
default:
|
|
344
|
+
throw new MeterError("\uC0AC\uC6A9\uB7C9 \uC800\uC7A5 \uC751\uB2F5\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC544\uC694.");
|
|
345
|
+
}
|
|
300
346
|
offset += 200;
|
|
301
347
|
} while (offset < safe.rows.length);
|
|
302
|
-
return {
|
|
348
|
+
return {
|
|
349
|
+
accepted,
|
|
350
|
+
ignored,
|
|
351
|
+
backfill,
|
|
352
|
+
weekTokens,
|
|
353
|
+
votesGranted,
|
|
354
|
+
...bankVotes === void 0 ? {} : { bankVotes }
|
|
355
|
+
};
|
|
303
356
|
}
|
|
304
357
|
|
|
305
358
|
// src/config.ts
|
|
@@ -340,6 +393,7 @@ async function readConfig(home) {
|
|
|
340
393
|
url: serviceUrl(data["url"]),
|
|
341
394
|
deviceToken: data["deviceToken"],
|
|
342
395
|
deviceName: data["deviceName"],
|
|
396
|
+
...data["backfill"] === "done" ? { backfill: "done" } : {},
|
|
343
397
|
...data["auto"] === "on" || data["auto"] === "off" ? { auto: data["auto"] } : {}
|
|
344
398
|
};
|
|
345
399
|
} catch (error) {
|
|
@@ -363,6 +417,11 @@ async function saveConfig(home, config) {
|
|
|
363
417
|
await rm(temporary, { force: true });
|
|
364
418
|
}
|
|
365
419
|
}
|
|
420
|
+
async function markBackfillDone(home, deviceToken) {
|
|
421
|
+
const current = await readConfig(home);
|
|
422
|
+
if (current?.deviceToken === deviceToken && current.backfill !== "done")
|
|
423
|
+
await saveConfig(home, { ...current, backfill: "done" });
|
|
424
|
+
}
|
|
366
425
|
async function logout(home) {
|
|
367
426
|
await rm(join2(home, ".config/madefeed/cli.json"), { force: true });
|
|
368
427
|
try {
|
|
@@ -871,6 +930,14 @@ async function readGemini(options) {
|
|
|
871
930
|
return { supported: true, rows };
|
|
872
931
|
}
|
|
873
932
|
|
|
933
|
+
// src/sources/index.ts
|
|
934
|
+
var sourceReaders = [
|
|
935
|
+
readClaude,
|
|
936
|
+
readCodex,
|
|
937
|
+
readOpenCode,
|
|
938
|
+
readGemini
|
|
939
|
+
];
|
|
940
|
+
|
|
874
941
|
// src/agent.ts
|
|
875
942
|
import { randomUUID as randomUUID2 } from "node:crypto";
|
|
876
943
|
import { chmod as chmod2, mkdir as mkdir2, open, realpath, rename as rename2, rm as rm2 } from "node:fs/promises";
|
|
@@ -1305,7 +1372,7 @@ async function autoCommand(action, config, options) {
|
|
|
1305
1372
|
|
|
1306
1373
|
// src/cli-options.ts
|
|
1307
1374
|
import { parseArgs } from "node:util";
|
|
1308
|
-
var VERSION = "0.
|
|
1375
|
+
var VERSION = "0.4.0";
|
|
1309
1376
|
var help = helpText(VERSION);
|
|
1310
1377
|
function cliOptions(args) {
|
|
1311
1378
|
try {
|
|
@@ -1454,18 +1521,35 @@ async function runCli(args, runtime = {}) {
|
|
|
1454
1521
|
return;
|
|
1455
1522
|
}
|
|
1456
1523
|
const now = runtime.now ?? Date.now();
|
|
1457
|
-
const options = { home, sinceMs: windowStart(now, days), env };
|
|
1458
1524
|
const api = {
|
|
1459
1525
|
url,
|
|
1460
1526
|
fetch: runtime.fetch ?? fetch,
|
|
1461
1527
|
...runtime.sleep ? { sleep: runtime.sleep } : {}
|
|
1462
1528
|
};
|
|
1463
|
-
|
|
1464
|
-
|
|
1465
|
-
|
|
1466
|
-
|
|
1467
|
-
|
|
1468
|
-
|
|
1529
|
+
let token2 = configured?.deviceToken;
|
|
1530
|
+
let saved = configured;
|
|
1531
|
+
const backfill = !values["dry-run"] && (command === "login" || configured?.backfill !== "done");
|
|
1532
|
+
if (!values["dry-run"] && !values["scheduled"] && (command === "login" || !token2)) {
|
|
1533
|
+
const device = await requestDevice(api, deviceName);
|
|
1534
|
+
const instructions = values["json"] ? diagnostic : output;
|
|
1535
|
+
for (const line of approval(device)) instructions(line);
|
|
1536
|
+
token2 = await pollToken(api, device);
|
|
1537
|
+
if (configured && await revokeDevice(api, configured.deviceToken) === "unreachable")
|
|
1538
|
+
diagnostic(reloginUnreachable(url));
|
|
1539
|
+
saved = {
|
|
1540
|
+
url,
|
|
1541
|
+
deviceName,
|
|
1542
|
+
deviceToken: token2,
|
|
1543
|
+
...config?.auto ? { auto: config.auto } : {},
|
|
1544
|
+
...configured?.backfill ? { backfill: configured.backfill } : {}
|
|
1545
|
+
};
|
|
1546
|
+
await saveConfig(home, saved);
|
|
1547
|
+
instructions(connected(deviceName));
|
|
1548
|
+
}
|
|
1549
|
+
if (!values["dry-run"] && !values["scheduled"] && !values["no-auto"] && env["MADEFEED_NO_AUTO"] !== "1" && saved && saved.auto !== "off")
|
|
1550
|
+
await auto.install(saved);
|
|
1551
|
+
const options = { home, sinceMs: windowStart(now, backfill ? 30 : days), env };
|
|
1552
|
+
const sources = await Promise.all(sourceReaders.map((read) => read(options)));
|
|
1469
1553
|
for (const source of sources) if (source.reason) diagnostic(source.reason);
|
|
1470
1554
|
const rows = aggregate(
|
|
1471
1555
|
sources.flatMap((source) => source.rows).filter((row) => row.date <= kstDateOf(now))
|
|
@@ -1483,35 +1567,13 @@ async function runCli(args, runtime = {}) {
|
|
|
1483
1567
|
output(JSON.stringify(body, null, values["json"] ? void 0 : 2));
|
|
1484
1568
|
return;
|
|
1485
1569
|
}
|
|
1486
|
-
let token2 = configured?.deviceToken;
|
|
1487
|
-
let saved = configured;
|
|
1488
|
-
if (!values["scheduled"] && (command === "login" || !token2)) {
|
|
1489
|
-
const device = await requestDevice(api, deviceName);
|
|
1490
|
-
const instructions = values["json"] ? diagnostic : output;
|
|
1491
|
-
for (const line of approval(device)) instructions(line);
|
|
1492
|
-
token2 = await pollToken(api, device);
|
|
1493
|
-
saved = {
|
|
1494
|
-
url,
|
|
1495
|
-
deviceName,
|
|
1496
|
-
deviceToken: token2,
|
|
1497
|
-
...config?.auto ? { auto: config.auto } : {}
|
|
1498
|
-
};
|
|
1499
|
-
await saveConfig(home, saved);
|
|
1500
|
-
if (command !== "login") instructions(connected(deviceName));
|
|
1501
|
-
}
|
|
1502
|
-
if (!values["scheduled"] && !values["no-auto"] && env["MADEFEED_NO_AUTO"] !== "1" && saved && saved.auto !== "off")
|
|
1503
|
-
await auto.install(saved);
|
|
1504
|
-
if (command === "login") {
|
|
1505
|
-
if (values["json"]) diagnostic(connected(deviceName));
|
|
1506
|
-
output(
|
|
1507
|
-
values["json"] ? JSON.stringify({ loggedIn: true }) : connected(deviceName)
|
|
1508
|
-
);
|
|
1509
|
-
return;
|
|
1510
|
-
}
|
|
1511
1570
|
if (!token2) return;
|
|
1512
1571
|
let result;
|
|
1513
1572
|
try {
|
|
1514
|
-
result = await uploadUsage(api, token2,
|
|
1573
|
+
result = await uploadUsage(api, token2, {
|
|
1574
|
+
...body,
|
|
1575
|
+
...backfill ? { backfill: true } : {}
|
|
1576
|
+
});
|
|
1515
1577
|
} catch (error) {
|
|
1516
1578
|
if (!(error instanceof DisconnectedError)) throw error;
|
|
1517
1579
|
await cleanDisconnected(session, {
|
|
@@ -1520,8 +1582,12 @@ async function runCli(args, runtime = {}) {
|
|
|
1520
1582
|
});
|
|
1521
1583
|
return;
|
|
1522
1584
|
}
|
|
1585
|
+
if (saved?.backfill !== "done") await markBackfillDone(home, token2);
|
|
1523
1586
|
output(
|
|
1524
|
-
values["scheduled"] ? scheduledUpload(now, result
|
|
1587
|
+
values["scheduled"] ? scheduledUpload(now, result) : values["json"] ? JSON.stringify({
|
|
1588
|
+
...command === "login" ? { loggedIn: true } : {},
|
|
1589
|
+
...result
|
|
1590
|
+
}) : uploadResult(result)
|
|
1525
1591
|
);
|
|
1526
1592
|
}
|
|
1527
1593
|
function invokedDirectly() {
|
package/package.json
CHANGED
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@the-seeker/madefeed",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "MadeFeed 토큰 미터: AI 코딩 도구의 토큰 사용량 합계를 madefeed.dev 에 올려요.",
|
|
5
5
|
"homepage": "https://madefeed.dev/meter",
|
|
6
|
-
"
|
|
6
|
+
"repository": {
|
|
7
|
+
"type": "git",
|
|
8
|
+
"url": "git+https://github.com/coin-seeker/madefeed-meter.git"
|
|
9
|
+
},
|
|
10
|
+
"bugs": {
|
|
11
|
+
"url": "https://github.com/coin-seeker/madefeed-meter/issues"
|
|
12
|
+
},
|
|
13
|
+
"license": "MIT",
|
|
7
14
|
"type": "module",
|
|
8
15
|
"engines": {
|
|
9
16
|
"node": ">=22.13"
|
|
@@ -13,7 +20,8 @@
|
|
|
13
20
|
},
|
|
14
21
|
"files": [
|
|
15
22
|
"dist",
|
|
16
|
-
"README.md"
|
|
23
|
+
"README.md",
|
|
24
|
+
"LICENSE"
|
|
17
25
|
],
|
|
18
26
|
"publishConfig": {
|
|
19
27
|
"access": "public"
|
|
@@ -24,7 +32,9 @@
|
|
|
24
32
|
"test": "vitest run --passWithNoTests"
|
|
25
33
|
},
|
|
26
34
|
"devDependencies": {
|
|
35
|
+
"@types/node": "^22.18.0",
|
|
27
36
|
"esbuild": "0.28.2",
|
|
28
|
-
"
|
|
37
|
+
"tsrs": "0.24.0-ts7.1.0-beta",
|
|
38
|
+
"vitest": "5.0.0"
|
|
29
39
|
}
|
|
30
40
|
}
|