@sitepong/cli 0.1.37 → 0.1.38
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/dist/auth/login.js +189 -95
- package/dist/auth/login.js.map +1 -1
- package/dist/client/hosting.js +3 -2
- package/dist/client/hosting.js.map +1 -1
- package/dist/commands/account/tokens.js +32 -46
- package/dist/commands/account/tokens.js.map +1 -1
- package/dist/commands/alerts/index.js +16 -7
- package/dist/commands/alerts/index.js.map +1 -1
- package/dist/commands/auth/logout.js +2 -1
- package/dist/commands/auth/logout.js.map +1 -1
- package/dist/commands/auth/switch.js +8 -5
- package/dist/commands/auth/switch.js.map +1 -1
- package/dist/commands/auth/whoami.js +2 -1
- package/dist/commands/auth/whoami.js.map +1 -1
- package/dist/commands/builds/builds-extra.test.js +1 -1
- package/dist/commands/builds/index.js +7 -6
- package/dist/commands/builds/index.js.map +1 -1
- package/dist/commands/deploy/index.js +10 -9
- package/dist/commands/deploy/index.js.map +1 -1
- package/dist/commands/errors/index.js +2 -2
- package/dist/commands/errors/index.js.map +1 -1
- package/dist/commands/experiments/index.js +2 -1
- package/dist/commands/experiments/index.js.map +1 -1
- package/dist/commands/flags/index.js +8 -4
- package/dist/commands/flags/index.js.map +1 -1
- package/dist/commands/hosting/auth-users.js +4 -2
- package/dist/commands/hosting/auth-users.js.map +1 -1
- package/dist/commands/hosting/backups.js +2 -2
- package/dist/commands/hosting/backups.js.map +1 -1
- package/dist/commands/hosting/config.js +2 -1
- package/dist/commands/hosting/config.js.map +1 -1
- package/dist/commands/hosting/db.js +2 -1
- package/dist/commands/hosting/db.js.map +1 -1
- package/dist/commands/hosting/functions.js +4 -5
- package/dist/commands/hosting/functions.js.map +1 -1
- package/dist/commands/hosting/instances.js +26 -20
- package/dist/commands/hosting/instances.js.map +1 -1
- package/dist/commands/hosting/keys.js +1 -1
- package/dist/commands/hosting/keys.js.map +1 -1
- package/dist/commands/hosting/secrets.js +2 -1
- package/dist/commands/hosting/secrets.js.map +1 -1
- package/dist/commands/hosting/storage.js +4 -3
- package/dist/commands/hosting/storage.js.map +1 -1
- package/dist/commands/init/index.js +30 -30
- package/dist/commands/init/index.js.map +1 -1
- package/dist/commands/monitoring/index.js +4 -3
- package/dist/commands/monitoring/index.js.map +1 -1
- package/dist/commands/open/index.js +2 -2
- package/dist/commands/open/index.js.map +1 -1
- package/dist/commands/orgs/index.js +3 -2
- package/dist/commands/orgs/index.js.map +1 -1
- package/dist/commands/ota/index.js +3 -3
- package/dist/commands/ota/index.js.map +1 -1
- package/dist/commands/patrol/index.js +12 -10
- package/dist/commands/patrol/index.js.map +1 -1
- package/dist/commands/projects/index.js +3 -2
- package/dist/commands/projects/index.js.map +1 -1
- package/dist/commands/serve/index.js +20 -16
- package/dist/commands/serve/index.js.map +1 -1
- package/dist/commands/servernet/index.js +10 -8
- package/dist/commands/servernet/index.js.map +1 -1
- package/dist/commands/team/index.js +5 -3
- package/dist/commands/team/index.js.map +1 -1
- package/dist/commands/workflows/index.js +3 -2
- package/dist/commands/workflows/index.js.map +1 -1
- package/dist/config/context.js +3 -2
- package/dist/config/context.js.map +1 -1
- package/dist/index.js +9 -4
- package/dist/index.js.map +1 -1
- package/dist/output/__tests__/colors.test.js +77 -31
- package/dist/output/__tests__/colors.test.js.map +1 -1
- package/dist/output/__tests__/errors.test.js +55 -0
- package/dist/output/__tests__/errors.test.js.map +1 -0
- package/dist/output/__tests__/tokens-sync.test.js +17 -0
- package/dist/output/__tests__/tokens-sync.test.js.map +1 -0
- package/dist/output/colors.js +77 -13
- package/dist/output/colors.js.map +1 -1
- package/dist/output/errors.js +65 -0
- package/dist/output/errors.js.map +1 -0
- package/dist/output/format.js +129 -21
- package/dist/output/format.js.map +1 -1
- package/dist/output/format.test.js +34 -0
- package/dist/output/format.test.js.map +1 -1
- package/dist/output/log.js +87 -7
- package/dist/output/log.js.map +1 -1
- package/dist/output/log.test.js +37 -5
- package/dist/output/log.test.js.map +1 -1
- package/dist/output/spinner.js +90 -4
- package/dist/output/spinner.js.map +1 -1
- package/dist/output/spinner.test.js +10 -2
- package/dist/output/spinner.test.js.map +1 -1
- package/dist/output/term.js +75 -0
- package/dist/output/term.js.map +1 -0
- package/dist/output/tokens.js +63 -0
- package/dist/output/tokens.js.map +1 -0
- package/dist/util/prompt.js +27 -7
- package/dist/util/prompt.js.map +1 -1
- package/dist/util/update-check.js +9 -13
- package/dist/util/update-check.js.map +1 -1
- package/dist/util/update-check.test.js +1 -1
- package/package.json +4 -2
package/dist/auth/login.js
CHANGED
|
@@ -1,95 +1,141 @@
|
|
|
1
|
-
import readline from 'node:readline';
|
|
2
1
|
import { loginWithEmail } from './token.js';
|
|
3
2
|
import { writeAuth } from '../config/paths.js';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const stdin = process.stdin;
|
|
10
|
-
const wasRaw = stdin.isRaw;
|
|
11
|
-
if (stdin.isTTY)
|
|
12
|
-
stdin.setRawMode(true);
|
|
13
|
-
let input = '';
|
|
14
|
-
const onData = (ch) => {
|
|
15
|
-
const c = ch.toString();
|
|
16
|
-
if (c === '\n' || c === '\r') {
|
|
17
|
-
if (stdin.isTTY)
|
|
18
|
-
stdin.setRawMode(wasRaw ?? false);
|
|
19
|
-
stdin.removeListener('data', onData);
|
|
20
|
-
process.stdout.write('\n');
|
|
21
|
-
rl.close();
|
|
22
|
-
resolve(input);
|
|
23
|
-
}
|
|
24
|
-
else if (c === '\x03') {
|
|
25
|
-
process.exit(1);
|
|
26
|
-
}
|
|
27
|
-
else if (c === '\x7f' || c === '\b') {
|
|
28
|
-
input = input.slice(0, -1);
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
input += c;
|
|
32
|
-
}
|
|
33
|
-
};
|
|
34
|
-
stdin.on('data', onData);
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
rl.question(question, (answer) => {
|
|
38
|
-
rl.close();
|
|
39
|
-
resolve(answer);
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
});
|
|
43
|
-
}
|
|
3
|
+
import { ce, glyph } from '../output/colors.js';
|
|
4
|
+
import { createSpinner, withSpinner } from '../output/spinner.js';
|
|
5
|
+
import { error, hint, success, emphasize } from '../output/log.js';
|
|
6
|
+
import { isLive, wantsJson } from '../output/term.js';
|
|
7
|
+
import { ask, askSecret } from '../util/prompt.js';
|
|
44
8
|
function getApiUrl() {
|
|
45
9
|
return process.env.SITEPONG_API_URL || 'https://api.sitepong.com';
|
|
46
10
|
}
|
|
11
|
+
/** Interaction goes to stderr so stdout carries only the result. */
|
|
12
|
+
function say(line = '') {
|
|
13
|
+
console.error(line);
|
|
14
|
+
}
|
|
15
|
+
const POLL_MS = 2000;
|
|
16
|
+
function formatRemaining(ms) {
|
|
17
|
+
const s = Math.max(0, Math.ceil(ms / 1000));
|
|
18
|
+
return `${Math.floor(s / 60)}:${String(s % 60).padStart(2, '0')}`;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Device approval: ask the API for a code, show it with the link, open the
|
|
22
|
+
* browser, then wait with a live countdown until the code is approved,
|
|
23
|
+
* expires or is declined.
|
|
24
|
+
*/
|
|
47
25
|
async function browserLogin() {
|
|
48
26
|
const apiUrl = getApiUrl();
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
27
|
+
let start;
|
|
28
|
+
try {
|
|
29
|
+
const res = await fetch(`${apiUrl}/api/cli/auth`, {
|
|
30
|
+
method: 'POST',
|
|
31
|
+
headers: { 'Content-Type': 'application/json' },
|
|
32
|
+
body: JSON.stringify({ device_name: `CLI (${process.platform})` }),
|
|
33
|
+
});
|
|
34
|
+
if (!res.ok)
|
|
35
|
+
return { kind: 'unavailable', reason: `SitePong answered ${res.status}` };
|
|
36
|
+
start = await res.json();
|
|
37
|
+
}
|
|
38
|
+
catch {
|
|
39
|
+
return { kind: 'unavailable', reason: `couldn't reach ${apiUrl}` };
|
|
40
|
+
}
|
|
41
|
+
const { request_id, code, auth_url, expires_at } = start;
|
|
42
|
+
const deadline = new Date(expires_at).getTime();
|
|
43
|
+
say();
|
|
44
|
+
say(ce.bold('Log in to SitePong'));
|
|
45
|
+
say();
|
|
46
|
+
say(` ${ce.muted('Code')} ${ce.bold(ce.accent(code))}`);
|
|
47
|
+
say(` ${ce.muted('Link')} ${ce.underline(auth_url)}`);
|
|
48
|
+
say();
|
|
49
|
+
let opened = false;
|
|
60
50
|
try {
|
|
61
51
|
const open = (await import('open')).default;
|
|
62
52
|
await open(auth_url);
|
|
53
|
+
opened = true;
|
|
63
54
|
}
|
|
64
55
|
catch {
|
|
65
|
-
//
|
|
56
|
+
// No browser here (SSH, a container). The link above still works.
|
|
66
57
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
if (
|
|
87
|
-
|
|
88
|
-
|
|
58
|
+
if (opened) {
|
|
59
|
+
say(`${ce.ok(glyph.ok)} Opened your browser. Check the code matches, then approve.`);
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
say(`${ce.warn(glyph.warn)} ${ce.warn("Couldn't open a browser.")} Open the link above on any device to approve.`);
|
|
63
|
+
}
|
|
64
|
+
const live = isLive();
|
|
65
|
+
const waiting = `Waiting for approval`;
|
|
66
|
+
const spinner = createSpinner(live ? waiting : `${waiting} (the code expires in ${formatRemaining(deadline - Date.now())})`);
|
|
67
|
+
spinner.start();
|
|
68
|
+
let reconnecting = false;
|
|
69
|
+
const render = () => {
|
|
70
|
+
spinner.text = reconnecting ? `${waiting}, reconnecting` : waiting;
|
|
71
|
+
spinner.suffixText = ` ${ce.faint(`${formatRemaining(deadline - Date.now())} left`)}`;
|
|
72
|
+
};
|
|
73
|
+
if (live)
|
|
74
|
+
render();
|
|
75
|
+
const tick = live ? setInterval(render, 1000) : null;
|
|
76
|
+
const onSigint = () => {
|
|
77
|
+
if (tick)
|
|
78
|
+
clearInterval(tick);
|
|
79
|
+
spinner.stop();
|
|
80
|
+
error('Login cancelled. Nothing was saved.', 'Run `sitepong login` to start again.');
|
|
81
|
+
process.exit(130);
|
|
82
|
+
};
|
|
83
|
+
process.once('SIGINT', onSigint);
|
|
84
|
+
const finish = () => {
|
|
85
|
+
if (tick)
|
|
86
|
+
clearInterval(tick);
|
|
87
|
+
process.removeListener('SIGINT', onSigint);
|
|
88
|
+
};
|
|
89
|
+
try {
|
|
90
|
+
while (Date.now() < deadline) {
|
|
91
|
+
await new Promise(r => setTimeout(r, POLL_MS));
|
|
92
|
+
let data;
|
|
93
|
+
try {
|
|
94
|
+
const pollRes = await fetch(`${apiUrl}/api/cli/auth?request_id=${request_id}`);
|
|
95
|
+
if (!pollRes.ok) {
|
|
96
|
+
reconnecting = true;
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
data = await pollRes.json();
|
|
100
|
+
reconnecting = false;
|
|
101
|
+
}
|
|
102
|
+
catch {
|
|
103
|
+
reconnecting = true;
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
106
|
+
if (data.status === 'approved') {
|
|
107
|
+
const auth = {
|
|
108
|
+
access_token: data.access_token,
|
|
109
|
+
refresh_token: data.refresh_token || '',
|
|
110
|
+
expires_at: Math.floor(Date.now() / 1000) + (data.expires_in ?? 3600),
|
|
111
|
+
user_id: data.user?.id || '',
|
|
112
|
+
email: data.user?.email || '',
|
|
113
|
+
};
|
|
114
|
+
writeAuth(auth);
|
|
115
|
+
finish();
|
|
116
|
+
spinner.succeed('Approved in your browser');
|
|
117
|
+
return { kind: 'ok', auth };
|
|
118
|
+
}
|
|
119
|
+
if (data.status === 'expired') {
|
|
120
|
+
finish();
|
|
121
|
+
spinner.fail('The code expired before it was approved.');
|
|
122
|
+
hint('Run `sitepong login` to get a new code.', true);
|
|
123
|
+
return { kind: 'failed' };
|
|
124
|
+
}
|
|
125
|
+
if (data.status === 'denied' || data.status === 'rejected' || data.status === 'cancelled') {
|
|
126
|
+
finish();
|
|
127
|
+
spinner.fail('Login was declined in the browser.');
|
|
128
|
+
hint('Run `sitepong login` to try again.', true);
|
|
129
|
+
return { kind: 'failed' };
|
|
130
|
+
}
|
|
89
131
|
}
|
|
90
132
|
}
|
|
91
|
-
|
|
92
|
-
|
|
133
|
+
finally {
|
|
134
|
+
finish();
|
|
135
|
+
}
|
|
136
|
+
spinner.fail('The code expired before it was approved.');
|
|
137
|
+
hint('Run `sitepong login` to get a new code.', true);
|
|
138
|
+
return { kind: 'failed' };
|
|
93
139
|
}
|
|
94
140
|
async function appPasswordLogin(password) {
|
|
95
141
|
const apiUrl = getApiUrl();
|
|
@@ -114,22 +160,45 @@ async function appPasswordLogin(password) {
|
|
|
114
160
|
return auth;
|
|
115
161
|
}
|
|
116
162
|
async function emailPasswordLogin() {
|
|
117
|
-
|
|
118
|
-
|
|
163
|
+
if (!process.stdin.isTTY) {
|
|
164
|
+
error('Password login needs a terminal to type into.', 'In scripts and CI, use `sitepong login --token <app password>`.');
|
|
165
|
+
return null;
|
|
166
|
+
}
|
|
167
|
+
say();
|
|
168
|
+
say(ce.bold('Log in with email and password'));
|
|
169
|
+
say();
|
|
170
|
+
let email;
|
|
171
|
+
let password;
|
|
172
|
+
try {
|
|
173
|
+
email = await ask('Email');
|
|
174
|
+
password = await askSecret('Password');
|
|
175
|
+
}
|
|
176
|
+
catch {
|
|
177
|
+
error('Login cancelled. Nothing was saved.');
|
|
178
|
+
return null;
|
|
179
|
+
}
|
|
119
180
|
if (!email || !password) {
|
|
120
|
-
|
|
181
|
+
error('Email and password are both needed.', 'Run `sitepong login --method password` to try again.');
|
|
121
182
|
return null;
|
|
122
183
|
}
|
|
123
184
|
try {
|
|
124
|
-
const auth = await loginWithEmail(email, password);
|
|
185
|
+
const auth = await withSpinner('Logging in', () => loginWithEmail(email, password), { done: 'Password accepted' });
|
|
125
186
|
const mfaCheck = await checkMfaRequired(auth.access_token);
|
|
126
187
|
if (mfaCheck) {
|
|
127
|
-
|
|
188
|
+
let code;
|
|
189
|
+
try {
|
|
190
|
+
code = await ask('Two-factor code');
|
|
191
|
+
}
|
|
192
|
+
catch {
|
|
193
|
+
code = '';
|
|
194
|
+
}
|
|
128
195
|
if (!code) {
|
|
129
|
-
|
|
196
|
+
error('A two-factor code is needed for this account.', 'Run `sitepong login` to try again.');
|
|
130
197
|
return null;
|
|
131
198
|
}
|
|
132
|
-
const verified = await verifyMfa(auth.access_token, mfaCheck.factorId, code)
|
|
199
|
+
const verified = await withSpinner('Checking code', () => verifyMfa(auth.access_token, mfaCheck.factorId, code), {
|
|
200
|
+
done: (v) => (v ? 'Code accepted' : 'Code checked'),
|
|
201
|
+
});
|
|
133
202
|
if (verified) {
|
|
134
203
|
const updatedAuth = {
|
|
135
204
|
...auth,
|
|
@@ -139,13 +208,15 @@ async function emailPasswordLogin() {
|
|
|
139
208
|
writeAuth(updatedAuth);
|
|
140
209
|
return updatedAuth;
|
|
141
210
|
}
|
|
142
|
-
|
|
211
|
+
error("That two-factor code didn't match.", 'Run `sitepong login` to try again with a fresh code.');
|
|
143
212
|
return null;
|
|
144
213
|
}
|
|
145
214
|
return auth;
|
|
146
215
|
}
|
|
147
216
|
catch (err) {
|
|
148
|
-
|
|
217
|
+
if (!err.reported)
|
|
218
|
+
error(`Login failed: ${err.message}`);
|
|
219
|
+
hint('Check your email and password, or run `sitepong login` to log in with your browser.', true);
|
|
149
220
|
return null;
|
|
150
221
|
}
|
|
151
222
|
}
|
|
@@ -187,32 +258,55 @@ async function verifyMfa(token, factorId, code) {
|
|
|
187
258
|
return null;
|
|
188
259
|
}
|
|
189
260
|
}
|
|
261
|
+
/** The result line, then where to go next. */
|
|
262
|
+
async function signedIn(auth) {
|
|
263
|
+
if (wantsJson()) {
|
|
264
|
+
console.log(JSON.stringify({ email: auth.email, user_id: auth.user_id }));
|
|
265
|
+
return;
|
|
266
|
+
}
|
|
267
|
+
success(`Logged in as ${auth.email}`);
|
|
268
|
+
let hasOrg = false;
|
|
269
|
+
try {
|
|
270
|
+
const { resolveContext } = await import('../config/context.js');
|
|
271
|
+
hasOrg = !!resolveContext({}).org_id;
|
|
272
|
+
}
|
|
273
|
+
catch {
|
|
274
|
+
// no stored context yet
|
|
275
|
+
}
|
|
276
|
+
hint(hasOrg
|
|
277
|
+
? ['See your active organization and project with `sitepong whoami`.']
|
|
278
|
+
: ['Pick an organization and project with `sitepong switch`.']);
|
|
279
|
+
}
|
|
190
280
|
export async function interactiveLogin(opts) {
|
|
191
281
|
if (opts?.token) {
|
|
192
282
|
try {
|
|
193
|
-
const auth = await appPasswordLogin(opts.token)
|
|
283
|
+
const auth = await withSpinner('Checking app password', () => appPasswordLogin(opts.token), {
|
|
284
|
+
done: 'App password accepted',
|
|
285
|
+
});
|
|
194
286
|
if (auth) {
|
|
195
|
-
|
|
287
|
+
await signedIn(auth);
|
|
196
288
|
return;
|
|
197
289
|
}
|
|
198
290
|
}
|
|
199
|
-
catch
|
|
200
|
-
|
|
291
|
+
catch {
|
|
292
|
+
hint('Check the app password, or run `sitepong login` to log in with your browser.', true);
|
|
201
293
|
process.exit(1);
|
|
202
294
|
}
|
|
203
295
|
}
|
|
204
296
|
const method = opts?.method || (process.stdout.isTTY ? 'browser' : 'password');
|
|
205
297
|
if (method === 'browser') {
|
|
206
|
-
const
|
|
207
|
-
if (
|
|
208
|
-
|
|
298
|
+
const result = await browserLogin();
|
|
299
|
+
if (result.kind === 'ok') {
|
|
300
|
+
await signedIn(result.auth);
|
|
209
301
|
return;
|
|
210
302
|
}
|
|
211
|
-
|
|
303
|
+
if (result.kind === 'failed')
|
|
304
|
+
process.exit(1);
|
|
305
|
+
say(`${ce.warn(glyph.warn)} ${ce.warn(`Browser login isn't available (${result.reason}).`)} ${emphasize('Logging in with email and password instead.', ce)}`);
|
|
212
306
|
}
|
|
213
307
|
const auth = await emailPasswordLogin();
|
|
214
308
|
if (auth) {
|
|
215
|
-
|
|
309
|
+
await signedIn(auth);
|
|
216
310
|
}
|
|
217
311
|
else {
|
|
218
312
|
process.exit(1);
|
package/dist/auth/login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/auth/login.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/auth/login.ts"],"names":[],"mappings":"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"}
|
package/dist/client/hosting.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SitePongClient, getHostingUrl } from './base.js';
|
|
2
2
|
import { resolveContext } from '../config/context.js';
|
|
3
3
|
import { readOrgContext, writeOrgContext } from '../config/paths.js';
|
|
4
|
+
import { error as logError } from '../output/log.js';
|
|
4
5
|
let _client = null;
|
|
5
6
|
export function hostingClient() {
|
|
6
7
|
if (!_client) {
|
|
@@ -42,14 +43,14 @@ export async function getInstanceServiceKey(instanceId) {
|
|
|
42
43
|
// Need to fetch — but we must have an instance id to fetch by.
|
|
43
44
|
const id = instanceId || cachedId;
|
|
44
45
|
if (!id) {
|
|
45
|
-
|
|
46
|
+
logError('No hosting instance specified. Pass an instance id or run `sitepong hosting link <instance-id>` first.');
|
|
46
47
|
process.exit(1);
|
|
47
48
|
}
|
|
48
49
|
const resp = await hostingClient().get(`/api/hosting/instances/${id}`);
|
|
49
50
|
const instance = resp?.data ?? resp;
|
|
50
51
|
const key = instance?.management_api_token || instance?.supabase_service_key;
|
|
51
52
|
if (!key) {
|
|
52
|
-
|
|
53
|
+
logError(`Instance ${id} has no management token, so its management API can't be called.`);
|
|
53
54
|
process.exit(1);
|
|
54
55
|
}
|
|
55
56
|
// Cache only when no instance is linked yet, so naming another instance
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosting.js","sourceRoot":"","sources":["../../src/client/hosting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"hosting.js","sourceRoot":"","sources":["../../src/client/hosting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,KAAK,IAAI,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAErD,IAAI,OAAO,GAA0B,IAAI,CAAC;AAE1C,MAAM,UAAU,aAAa;IAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,wEAAwE;QACxE,iDAAiD;QACjD,MAAM,GAAG,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,CAAC,mBAAmB,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC;QAC1D,OAAO,GAAG,IAAI,cAAc,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,UAAkB;IACjD,OAAO,IAAI,cAAc,CAAC,aAAa,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC;AACrE,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,UAAmB;IAC7D,MAAM,GAAG,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE9D,MAAM,SAAS,GAAG,MAAM,EAAE,oBAAoB,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,EAAE,WAAW,CAAC;IAErC,+FAA+F;IAC/F,IAAI,SAAS,IAAI,CAAC,CAAC,UAAU,IAAI,UAAU,KAAK,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IAE5E,+DAA+D;IAC/D,MAAM,EAAE,GAAG,UAAU,IAAI,QAAQ,CAAC;IAClC,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,QAAQ,CAAC,wGAAwG,CAAC,CAAC;QACnH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAAM,0BAA0B,EAAE,EAAE,CAAC,CAAC;IAC5E,MAAM,QAAQ,GAAG,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC;IACpC,MAAM,GAAG,GAAG,QAAQ,EAAE,oBAAoB,IAAI,QAAQ,EAAE,oBAAoB,CAAC;IAC7E,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,QAAQ,CAAC,YAAY,EAAE,kEAAkE,CAAC,CAAC;QAC3F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,wEAAwE;IACxE,wDAAwD;IACxD,IAAI,MAAM,IAAI,CAAC,CAAC,QAAQ,IAAI,QAAQ,KAAK,EAAE,CAAC,EAAE,CAAC;QAC7C,MAAM,CAAC,WAAW,GAAG,EAAE,CAAC;QACxB,MAAM,CAAC,oBAAoB,GAAG,GAAG,CAAC;QAClC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
*/
|
|
15
15
|
import { spawnSync } from 'node:child_process';
|
|
16
16
|
import { writeFileSync } from 'node:fs';
|
|
17
|
+
import { error as logError } from '../../output/log.js';
|
|
17
18
|
const ALLOWED_SCOPES = ['projects:read', 'projects:write', 'invoke', 'secrets:write', '*'];
|
|
18
19
|
export function registerAccountTokens(parent) {
|
|
19
20
|
const tokens = parent
|
|
@@ -54,7 +55,8 @@ export function registerAccountTokens(parent) {
|
|
|
54
55
|
.option('--write-to <path>', 'Also write the secret to this file (mode 0600)')
|
|
55
56
|
.action(async (opts) => {
|
|
56
57
|
const { hostingClient } = await import('../../client/hosting.js');
|
|
57
|
-
const { success, info } = await import('../../output/log.js');
|
|
58
|
+
const { success, info, warn, error, heading, hint, gap } = await import('../../output/log.js');
|
|
59
|
+
const { formatDetail } = await import('../../output/format.js');
|
|
58
60
|
const { c } = await import('../../output/colors.js');
|
|
59
61
|
const scopes = parseScopes(opts.scope);
|
|
60
62
|
const expiresAt = opts.expiresIn ? parseDuration(opts.expiresIn) : null;
|
|
@@ -62,26 +64,25 @@ export function registerAccountTokens(parent) {
|
|
|
62
64
|
// Output: never include the secret in machine-readable formats by
|
|
63
65
|
// default — pipe-able output should be the safe shape. The
|
|
64
66
|
// plaintext lives only in the human-readable lines below.
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
console.log(
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
console.log(c.bold(
|
|
76
|
-
|
|
77
|
-
console.log();
|
|
67
|
+
success(`API token ${created.name} created`);
|
|
68
|
+
gap();
|
|
69
|
+
console.log(formatDetail({
|
|
70
|
+
id: created.id,
|
|
71
|
+
name: created.name,
|
|
72
|
+
scopes: created.scopes.join(', '),
|
|
73
|
+
...(created.expires_at ? { expires: new Date(created.expires_at).toISOString() } : {}),
|
|
74
|
+
}));
|
|
75
|
+
gap();
|
|
76
|
+
heading('Token', 'shown once');
|
|
77
|
+
console.log(c.bold(c.accent(created.token)));
|
|
78
|
+
gap();
|
|
78
79
|
if (opts.writeTo) {
|
|
79
80
|
try {
|
|
80
81
|
writeFileSync(opts.writeTo, created.token + '\n', { mode: 0o600 });
|
|
81
|
-
|
|
82
|
+
success(`Secret written to ${opts.writeTo} (mode 0600).`);
|
|
82
83
|
}
|
|
83
84
|
catch (err) {
|
|
84
|
-
|
|
85
|
+
logError(`Couldn't write ${opts.writeTo}: ${err instanceof Error ? err.message : err}`);
|
|
85
86
|
process.exitCode = 1;
|
|
86
87
|
}
|
|
87
88
|
}
|
|
@@ -90,11 +91,11 @@ export function registerAccountTokens(parent) {
|
|
|
90
91
|
success('Copied to clipboard.');
|
|
91
92
|
}
|
|
92
93
|
else {
|
|
93
|
-
info('Clipboard copy unavailable
|
|
94
|
+
info('Clipboard copy is unavailable here; copy the token above.');
|
|
94
95
|
}
|
|
95
96
|
}
|
|
96
|
-
|
|
97
|
-
|
|
97
|
+
warn('This is the only time the token is shown.');
|
|
98
|
+
hint('Store it in a secret manager. If it is lost, create a new token and revoke this one.');
|
|
98
99
|
});
|
|
99
100
|
// ─── revoke ─────────────────────────────────────────────────────────
|
|
100
101
|
tokens
|
|
@@ -103,7 +104,7 @@ export function registerAccountTokens(parent) {
|
|
|
103
104
|
.option('--yes', 'Skip the confirmation prompt')
|
|
104
105
|
.action(async (idOrPrefix, opts) => {
|
|
105
106
|
const { hostingClient } = await import('../../client/hosting.js');
|
|
106
|
-
const { success } = await import('../../output/log.js');
|
|
107
|
+
const { success, error, hint } = await import('../../output/log.js');
|
|
107
108
|
// Resolve prefix → id if a non-UUID was passed. A bare 'spa_xxxxxxxx'
|
|
108
109
|
// is more memorable than the full id for humans typing this at a
|
|
109
110
|
// terminal.
|
|
@@ -112,19 +113,23 @@ export function registerAccountTokens(parent) {
|
|
|
112
113
|
const list = await hostingClient().get('/api/hosting/account-tokens');
|
|
113
114
|
const matches = list.data.filter((r) => !r.revoked_at && r.token_prefix.startsWith(idOrPrefix));
|
|
114
115
|
if (matches.length === 0) {
|
|
115
|
-
|
|
116
|
+
logError(`No active token matches '${idOrPrefix}'.`, 'See your tokens with `sitepong account tokens list`.');
|
|
116
117
|
process.exit(1);
|
|
117
118
|
}
|
|
118
119
|
if (matches.length > 1) {
|
|
119
|
-
|
|
120
|
+
logError(`'${idOrPrefix}' matches ${matches.length} tokens.`, 'Use the full id from `sitepong account tokens list`.');
|
|
120
121
|
process.exit(1);
|
|
121
122
|
}
|
|
122
123
|
tokenId = matches[0].id;
|
|
123
124
|
}
|
|
124
125
|
if (!opts.yes) {
|
|
125
|
-
const
|
|
126
|
+
const { confirm, isInteractive } = await import('../../util/prompt.js');
|
|
127
|
+
const { status } = await import('../../output/log.js');
|
|
128
|
+
const ok = isInteractive() && await confirm(`Revoke token ${tokenId}? Anything using it stops working within 30 seconds.`);
|
|
126
129
|
if (!ok) {
|
|
127
|
-
|
|
130
|
+
status('Nothing was revoked.');
|
|
131
|
+
if (!isInteractive())
|
|
132
|
+
hint('Pass --yes to revoke without asking.');
|
|
128
133
|
return;
|
|
129
134
|
}
|
|
130
135
|
}
|
|
@@ -139,12 +144,12 @@ function parseScopes(input) {
|
|
|
139
144
|
.map((s) => s.trim())
|
|
140
145
|
.filter(Boolean);
|
|
141
146
|
if (list.length === 0) {
|
|
142
|
-
|
|
147
|
+
logError('At least one scope is required.');
|
|
143
148
|
process.exit(1);
|
|
144
149
|
}
|
|
145
150
|
for (const s of list) {
|
|
146
151
|
if (!ALLOWED_SCOPES.includes(s)) {
|
|
147
|
-
|
|
152
|
+
logError(`Invalid scope '${s}'. Allowed: ${ALLOWED_SCOPES.join(', ')}`);
|
|
148
153
|
process.exit(1);
|
|
149
154
|
}
|
|
150
155
|
}
|
|
@@ -165,7 +170,7 @@ function parseDuration(s) {
|
|
|
165
170
|
}
|
|
166
171
|
const t = Date.parse(s);
|
|
167
172
|
if (Number.isNaN(t)) {
|
|
168
|
-
|
|
173
|
+
logError(`Invalid duration '${s}'. Use e.g. 30d, 12h, or an ISO8601 timestamp.`);
|
|
169
174
|
process.exit(1);
|
|
170
175
|
}
|
|
171
176
|
return new Date(t).toISOString();
|
|
@@ -190,25 +195,6 @@ function copyToClipboard(text) {
|
|
|
190
195
|
return true;
|
|
191
196
|
return false;
|
|
192
197
|
}
|
|
193
|
-
async function confirm(prompt) {
|
|
194
|
-
if (!process.stdin.isTTY)
|
|
195
|
-
return false;
|
|
196
|
-
process.stdout.write(`${prompt} [y/N] `);
|
|
197
|
-
return await new Promise((resolve) => {
|
|
198
|
-
let answer = '';
|
|
199
|
-
process.stdin.setEncoding('utf8');
|
|
200
|
-
const onData = (chunk) => {
|
|
201
|
-
answer += chunk;
|
|
202
|
-
if (answer.includes('\n')) {
|
|
203
|
-
process.stdin.removeListener('data', onData);
|
|
204
|
-
process.stdin.pause();
|
|
205
|
-
resolve(/^y(es)?$/i.test(answer.trim()));
|
|
206
|
-
}
|
|
207
|
-
};
|
|
208
|
-
process.stdin.resume();
|
|
209
|
-
process.stdin.on('data', onData);
|
|
210
|
-
});
|
|
211
|
-
}
|
|
212
198
|
function formatRelative(iso) {
|
|
213
199
|
const then = new Date(iso).getTime();
|
|
214
200
|
const now = Date.now();
|