layerbase 1.0.0 → 1.2.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 +110 -4
- package/dist/cli.js +166 -3
- package/dist/cli.js.map +1 -1
- package/dist/commands/agent-init.js +112 -0
- package/dist/commands/agent-init.js.map +1 -0
- package/dist/commands/cloud-branch.js +97 -0
- package/dist/commands/cloud-branch.js.map +1 -0
- package/dist/commands/cloud-write.js +133 -0
- package/dist/commands/cloud-write.js.map +1 -0
- package/dist/commands/connection-string.js +17 -16
- package/dist/commands/connection-string.js.map +1 -1
- package/dist/commands/import.js +96 -0
- package/dist/commands/import.js.map +1 -0
- package/dist/commands/interactive.js +2 -0
- package/dist/commands/interactive.js.map +1 -1
- package/dist/commands/key-login.js +48 -0
- package/dist/commands/key-login.js.map +1 -0
- package/dist/commands/ls.js +17 -5
- package/dist/commands/ls.js.map +1 -1
- package/dist/commands/migrate.js +331 -0
- package/dist/commands/migrate.js.map +1 -0
- package/dist/commands/whoami-run.js +87 -0
- package/dist/commands/whoami-run.js.map +1 -0
- package/dist/commands/whoami.js +1 -1
- package/dist/commands/whoami.js.map +1 -1
- package/dist/lib/cli-output.js +28 -0
- package/dist/lib/cli-output.js.map +1 -0
- package/dist/lib/cloud-api.js +333 -20
- package/dist/lib/cloud-api.js.map +1 -1
- package/dist/lib/commands.js +18 -1
- package/dist/lib/commands.js.map +1 -1
- package/dist/lib/config.js +18 -0
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/confirm.js +17 -0
- package/dist/lib/confirm.js.map +1 -0
- package/dist/lib/duration.js +33 -0
- package/dist/lib/duration.js.map +1 -0
- package/dist/lib/migration-catalog.js +209 -0
- package/dist/lib/migration-catalog.js.map +1 -0
- package/dist/lib/redact.js +23 -0
- package/dist/lib/redact.js.map +1 -0
- package/dist/lib/select.js +48 -0
- package/dist/lib/select.js.map +1 -0
- package/dist/ui/app.js +1 -1
- package/dist/ui/app.js.map +1 -1
- package/package.json +4 -2
- package/skills/layerbase/SKILL.md +222 -0
|
@@ -0,0 +1,331 @@
|
|
|
1
|
+
import { discoverSources, getMigrationRun, listDatabases, migrateFromSource, migratePreflight, resolveDatabaseId, CloudApiError, } from '../lib/cloud-api.js';
|
|
2
|
+
import { getCatalogSource, catalogSourceIds, } from '../lib/migration-catalog.js';
|
|
3
|
+
import { redactSecrets } from '../lib/redact.js';
|
|
4
|
+
import { promptLine, selectFromList } from '../lib/select.js';
|
|
5
|
+
import { confirm } from '../lib/confirm.js';
|
|
6
|
+
import { reportError, writeJson } from '../lib/cli-output.js';
|
|
7
|
+
// Every secret string we collected, so error/report text can be scrubbed of any
|
|
8
|
+
// accidental echo before it is written.
|
|
9
|
+
function secretValues(creds) {
|
|
10
|
+
return [
|
|
11
|
+
creds.connectionString,
|
|
12
|
+
creds.sourceKey,
|
|
13
|
+
creds.sourceId,
|
|
14
|
+
creds.sourceSecret,
|
|
15
|
+
].filter((v) => typeof v === 'string' && v.length > 0);
|
|
16
|
+
}
|
|
17
|
+
function usage() {
|
|
18
|
+
process.stderr.write('Usage: layerbase migrate --source <id> --target <db-id-or-name> [creds] [--yes] [--json]\n' +
|
|
19
|
+
`Sources: ${catalogSourceIds().join(', ')}\n`);
|
|
20
|
+
}
|
|
21
|
+
// Resolve credentials from flags, with friendly per-source aliases. In an
|
|
22
|
+
// interactive TTY, prompt for anything still missing; in a non-TTY context,
|
|
23
|
+
// collect the list of missing required flags so the caller can exit 1.
|
|
24
|
+
async function resolveCredentials(options) {
|
|
25
|
+
const { source, flags, interactive } = options;
|
|
26
|
+
const creds = {};
|
|
27
|
+
const missing = [];
|
|
28
|
+
const req = source.credentials;
|
|
29
|
+
if (req.connectionString) {
|
|
30
|
+
// --url is a friendly alias of --connection-string for paste sources.
|
|
31
|
+
let value = flags.connectionString ?? flags.url ?? '';
|
|
32
|
+
if (!value && interactive) {
|
|
33
|
+
value = await promptLine(req.connectionString.label);
|
|
34
|
+
}
|
|
35
|
+
if (!value)
|
|
36
|
+
missing.push('--connection-string');
|
|
37
|
+
else
|
|
38
|
+
creds.connectionString = value;
|
|
39
|
+
}
|
|
40
|
+
if (req.sourceKey) {
|
|
41
|
+
// --token is a friendly alias of --source-key.
|
|
42
|
+
let value = flags.sourceKey ?? flags.token ?? '';
|
|
43
|
+
if (!value && interactive)
|
|
44
|
+
value = await promptLine(req.sourceKey.label);
|
|
45
|
+
if (!value)
|
|
46
|
+
missing.push('--source-key');
|
|
47
|
+
else
|
|
48
|
+
creds.sourceKey = value;
|
|
49
|
+
}
|
|
50
|
+
if (req.sourceId) {
|
|
51
|
+
// Friendly per-provider aliases all feed the single apiKeyId slot.
|
|
52
|
+
let value = flags.sourceId ??
|
|
53
|
+
flags.appId ??
|
|
54
|
+
flags.email ??
|
|
55
|
+
flags.tokenId ??
|
|
56
|
+
flags.url ??
|
|
57
|
+
'';
|
|
58
|
+
if (!value && interactive)
|
|
59
|
+
value = await promptLine(req.sourceId.label);
|
|
60
|
+
if (!value)
|
|
61
|
+
missing.push('--source-id');
|
|
62
|
+
else
|
|
63
|
+
creds.sourceId = value;
|
|
64
|
+
}
|
|
65
|
+
if (req.sourceSecret) {
|
|
66
|
+
// --db-password is a friendly alias of --source-secret.
|
|
67
|
+
let value = flags.sourceSecret ?? flags.dbPassword ?? '';
|
|
68
|
+
if (!value && interactive)
|
|
69
|
+
value = await promptLine(req.sourceSecret.label);
|
|
70
|
+
if (!value)
|
|
71
|
+
missing.push('--source-secret');
|
|
72
|
+
else
|
|
73
|
+
creds.sourceSecret = value;
|
|
74
|
+
}
|
|
75
|
+
return { creds, missing };
|
|
76
|
+
}
|
|
77
|
+
// Poll a migration run to completion, printing coarse progress (non-json only).
|
|
78
|
+
// Returns the terminal run. Retries transient read failures a few times so a
|
|
79
|
+
// blip mid-run does not abort a migration that is still progressing.
|
|
80
|
+
async function pollMigration(options) {
|
|
81
|
+
const { targetId, runId, json, secrets } = options;
|
|
82
|
+
let lastReport = '';
|
|
83
|
+
let lastStatus = '';
|
|
84
|
+
let transientErrors = 0;
|
|
85
|
+
for (;;) {
|
|
86
|
+
let run;
|
|
87
|
+
try {
|
|
88
|
+
run = await getMigrationRun({ targetId, runId });
|
|
89
|
+
transientErrors = 0;
|
|
90
|
+
}
|
|
91
|
+
catch (error) {
|
|
92
|
+
if (error instanceof CloudApiError && error.info.status >= 500) {
|
|
93
|
+
transientErrors += 1;
|
|
94
|
+
if (transientErrors <= 5) {
|
|
95
|
+
await sleep(2000);
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
throw error;
|
|
100
|
+
}
|
|
101
|
+
if (!json) {
|
|
102
|
+
if (run.status !== lastStatus) {
|
|
103
|
+
process.stdout.write(`Status: ${run.status}\n`);
|
|
104
|
+
lastStatus = run.status;
|
|
105
|
+
}
|
|
106
|
+
if (run.report && run.report !== lastReport) {
|
|
107
|
+
process.stdout.write(` ${redactSecrets(run.report, secrets)}\n`);
|
|
108
|
+
lastReport = run.report;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
if (run.status === 'completed' || run.status === 'failed') {
|
|
112
|
+
return run;
|
|
113
|
+
}
|
|
114
|
+
await sleep(2000);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
function sleep(ms) {
|
|
118
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
119
|
+
}
|
|
120
|
+
// Pick which discovered source database to migrate. Auto-selects a single
|
|
121
|
+
// match; otherwise honours --source-db (label match or 1-based index), prompts
|
|
122
|
+
// on a TTY, and errors with the available labels in a non-TTY context.
|
|
123
|
+
async function pickDiscoveredSource(options) {
|
|
124
|
+
const { databases, selector, interactive } = options;
|
|
125
|
+
if (databases.length === 0)
|
|
126
|
+
return undefined;
|
|
127
|
+
if (databases.length === 1)
|
|
128
|
+
return databases[0];
|
|
129
|
+
if (selector) {
|
|
130
|
+
const asIndex = Number(selector);
|
|
131
|
+
if (Number.isInteger(asIndex) &&
|
|
132
|
+
asIndex >= 1 &&
|
|
133
|
+
asIndex <= databases.length) {
|
|
134
|
+
return databases[asIndex - 1];
|
|
135
|
+
}
|
|
136
|
+
const lower = selector.toLowerCase();
|
|
137
|
+
return databases.find((d) => d.label.toLowerCase().includes(lower));
|
|
138
|
+
}
|
|
139
|
+
if (interactive) {
|
|
140
|
+
return selectFromList({
|
|
141
|
+
title: 'Select a source database to migrate:',
|
|
142
|
+
items: databases,
|
|
143
|
+
render: (d) => d.label,
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
return undefined;
|
|
147
|
+
}
|
|
148
|
+
// `layerbase migrate --source <id> --target <db> [creds] [--yes] [--json]`
|
|
149
|
+
export async function runMigrate(options) {
|
|
150
|
+
const { flags } = options;
|
|
151
|
+
const json = flags.json ?? false;
|
|
152
|
+
const interactive = Boolean(process.stdin.isTTY) && !json;
|
|
153
|
+
// 1. Resolve the source.
|
|
154
|
+
let sourceId = flags.source;
|
|
155
|
+
if (!sourceId && interactive) {
|
|
156
|
+
const chosen = await selectFromList({
|
|
157
|
+
title: 'Migrate from which source?',
|
|
158
|
+
items: catalogSourceIds(),
|
|
159
|
+
render: (id) => id,
|
|
160
|
+
});
|
|
161
|
+
sourceId = chosen;
|
|
162
|
+
}
|
|
163
|
+
if (!sourceId) {
|
|
164
|
+
usage();
|
|
165
|
+
return 1;
|
|
166
|
+
}
|
|
167
|
+
const source = getCatalogSource(sourceId);
|
|
168
|
+
if (!source) {
|
|
169
|
+
process.stderr.write(`Unknown source "${sourceId}". Sources: ${catalogSourceIds().join(', ')}\n`);
|
|
170
|
+
return 1;
|
|
171
|
+
}
|
|
172
|
+
// 2. Resolve the target database (id or name).
|
|
173
|
+
const targetRef = flags.target;
|
|
174
|
+
if (!targetRef) {
|
|
175
|
+
process.stderr.write('Missing --target. Pass a cloud database id or name (see `layerbase cloud ls`).\n');
|
|
176
|
+
return 1;
|
|
177
|
+
}
|
|
178
|
+
// 3. Collect credentials.
|
|
179
|
+
const { creds, missing } = await resolveCredentials({
|
|
180
|
+
source,
|
|
181
|
+
flags,
|
|
182
|
+
interactive,
|
|
183
|
+
});
|
|
184
|
+
if (missing.length > 0) {
|
|
185
|
+
process.stderr.write(`Missing required credentials for source "${source.id}": ${missing.join(', ')}.\n` +
|
|
186
|
+
`Hint: ${source.hint}\n`);
|
|
187
|
+
return 1;
|
|
188
|
+
}
|
|
189
|
+
const secrets = secretValues(creds);
|
|
190
|
+
try {
|
|
191
|
+
const targetId = await resolveDatabaseId(targetRef);
|
|
192
|
+
// Best-effort lookup for a friendlier confirmation line; never fatal.
|
|
193
|
+
const target = (await listDatabases()).find((d) => d.id === targetId);
|
|
194
|
+
let body;
|
|
195
|
+
let sourceLabel = source.label;
|
|
196
|
+
let sizeBytes = null;
|
|
197
|
+
if (source.kind === 'connection-string') {
|
|
198
|
+
// Preflight validates + wakes + sizes the source (paste sources only).
|
|
199
|
+
const pre = await migratePreflight({
|
|
200
|
+
targetId,
|
|
201
|
+
connectionString: creds.connectionString ?? '',
|
|
202
|
+
});
|
|
203
|
+
sizeBytes = pre.sizeBytes ?? null;
|
|
204
|
+
if (pre.note)
|
|
205
|
+
sourceLabel = `${source.label} (${pre.note})`;
|
|
206
|
+
body = { connectionString: creds.connectionString };
|
|
207
|
+
}
|
|
208
|
+
else {
|
|
209
|
+
// API-key sources: discover the account, then pick one database.
|
|
210
|
+
if (!source.provider) {
|
|
211
|
+
process.stderr.write(`Source "${source.id}" is misconfigured (no provider).\n`);
|
|
212
|
+
return 1;
|
|
213
|
+
}
|
|
214
|
+
const discovery = await discoverSources({
|
|
215
|
+
provider: source.provider,
|
|
216
|
+
apiKey: creds.sourceKey ?? '',
|
|
217
|
+
apiKeyId: creds.sourceId,
|
|
218
|
+
});
|
|
219
|
+
const picked = await pickDiscoveredSource({
|
|
220
|
+
databases: discovery.databases,
|
|
221
|
+
selector: flags.sourceDb,
|
|
222
|
+
interactive,
|
|
223
|
+
});
|
|
224
|
+
if (!picked) {
|
|
225
|
+
if (discovery.databases.length === 0) {
|
|
226
|
+
process.stderr.write(`No importable databases found in the ${source.label} account.\n`);
|
|
227
|
+
}
|
|
228
|
+
else {
|
|
229
|
+
process.stderr.write(`Multiple source databases found. Pass --source-db <label-or-number>:\n` +
|
|
230
|
+
discovery.databases
|
|
231
|
+
.map((d, i) => ` ${i + 1}) ${d.label}`)
|
|
232
|
+
.join('\n') +
|
|
233
|
+
'\n');
|
|
234
|
+
}
|
|
235
|
+
return 1;
|
|
236
|
+
}
|
|
237
|
+
sourceLabel = `${source.label}: ${picked.label}`;
|
|
238
|
+
sizeBytes = picked.sizeHint ?? null;
|
|
239
|
+
body = {
|
|
240
|
+
provider: source.provider,
|
|
241
|
+
apiKey: creds.sourceKey,
|
|
242
|
+
sourceRef: picked.ref,
|
|
243
|
+
};
|
|
244
|
+
if (creds.sourceId)
|
|
245
|
+
body.apiKeyId = creds.sourceId;
|
|
246
|
+
if (creds.sourceSecret)
|
|
247
|
+
body.sourceSecret = creds.sourceSecret;
|
|
248
|
+
}
|
|
249
|
+
// 4. Show what will happen and confirm (unless --yes / --json non-TTY).
|
|
250
|
+
const targetName = target ? `${target.name} (${target.engine})` : targetId;
|
|
251
|
+
const sizeLine = sizeBytes != null ? ` Source size: ~${formatBytes(sizeBytes)}.` : '';
|
|
252
|
+
if (!json) {
|
|
253
|
+
process.stdout.write(`Migrate ${sourceLabel}\n into ${targetName}.${sizeLine}\n` +
|
|
254
|
+
' This imports into the target and may overwrite existing data.\n');
|
|
255
|
+
}
|
|
256
|
+
if (!flags.yes) {
|
|
257
|
+
if (!interactive) {
|
|
258
|
+
process.stderr.write('Refusing to start a migration without confirmation. ' +
|
|
259
|
+
'Pass --yes (-y) to run non-interactively.\n');
|
|
260
|
+
return 1;
|
|
261
|
+
}
|
|
262
|
+
const ok = await confirm('Start this migration?');
|
|
263
|
+
if (!ok) {
|
|
264
|
+
process.stdout.write('Aborted.\n');
|
|
265
|
+
return 1;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
// 5. Kick off + poll.
|
|
269
|
+
const start = await migrateFromSource({ targetId, body });
|
|
270
|
+
if (!json) {
|
|
271
|
+
process.stdout.write(`Started migration run ${start.runId}.\n`);
|
|
272
|
+
}
|
|
273
|
+
const run = await pollMigration({
|
|
274
|
+
targetId,
|
|
275
|
+
runId: start.runId,
|
|
276
|
+
json,
|
|
277
|
+
secrets,
|
|
278
|
+
});
|
|
279
|
+
if (run.status === 'failed') {
|
|
280
|
+
const message = redactSecrets(run.error ?? 'Migration failed.', secrets);
|
|
281
|
+
if (json) {
|
|
282
|
+
writeJson({
|
|
283
|
+
ok: false,
|
|
284
|
+
runId: run.id,
|
|
285
|
+
status: run.status,
|
|
286
|
+
error: message,
|
|
287
|
+
});
|
|
288
|
+
}
|
|
289
|
+
else {
|
|
290
|
+
process.stderr.write(`Migration failed: ${message}\n`);
|
|
291
|
+
}
|
|
292
|
+
return 1;
|
|
293
|
+
}
|
|
294
|
+
if (json) {
|
|
295
|
+
writeJson({
|
|
296
|
+
ok: true,
|
|
297
|
+
runId: run.id,
|
|
298
|
+
status: run.status,
|
|
299
|
+
databaseId: run.databaseId,
|
|
300
|
+
report: run.report ? redactSecrets(run.report, secrets) : null,
|
|
301
|
+
});
|
|
302
|
+
}
|
|
303
|
+
else {
|
|
304
|
+
process.stdout.write(`Migration complete (run ${run.id}).\n`);
|
|
305
|
+
}
|
|
306
|
+
return 0;
|
|
307
|
+
}
|
|
308
|
+
catch (error) {
|
|
309
|
+
// Scrub any secret the error text might have echoed before reporting.
|
|
310
|
+
if (error instanceof CloudApiError) {
|
|
311
|
+
error.info.message = redactSecrets(error.info.message, secrets);
|
|
312
|
+
}
|
|
313
|
+
else if (error instanceof Error) {
|
|
314
|
+
error.message = redactSecrets(error.message, secrets);
|
|
315
|
+
}
|
|
316
|
+
return reportError(error, json);
|
|
317
|
+
}
|
|
318
|
+
}
|
|
319
|
+
function formatBytes(bytes) {
|
|
320
|
+
if (bytes < 1024)
|
|
321
|
+
return `${bytes} B`;
|
|
322
|
+
const units = ['KB', 'MB', 'GB', 'TB'];
|
|
323
|
+
let value = bytes / 1024;
|
|
324
|
+
let unit = 0;
|
|
325
|
+
while (value >= 1024 && unit < units.length - 1) {
|
|
326
|
+
value /= 1024;
|
|
327
|
+
unit += 1;
|
|
328
|
+
}
|
|
329
|
+
return `${value.toFixed(1)} ${units[unit]}`;
|
|
330
|
+
}
|
|
331
|
+
//# sourceMappingURL=migrate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import { getMe, listDatabases, resolveApiKey, } from '../lib/cloud-api.js';
|
|
2
|
+
import { loadCredentials } from '../lib/config.js';
|
|
3
|
+
import { decodeTokenClaims } from '../lib/token.js';
|
|
4
|
+
import { reportError } from '../lib/cli-output.js';
|
|
5
|
+
// The top-level `whoami`, scriptable and mode-aware:
|
|
6
|
+
// - key mode: GET /v1/me for identity + programmatic-create usage. Falls back
|
|
7
|
+
// to a /v1/databases probe (validates the key) when /v1/me is not deployed.
|
|
8
|
+
// - browser-JWT mode: decodes the stored token offline (no network), same as
|
|
9
|
+
// before, so it works even before the web endpoints are deployed.
|
|
10
|
+
// Never renders Ink, so it is safe in CI/non-TTY.
|
|
11
|
+
export async function runWhoami(options) {
|
|
12
|
+
const { json } = options;
|
|
13
|
+
const key = await resolveApiKey();
|
|
14
|
+
if (key) {
|
|
15
|
+
try {
|
|
16
|
+
const me = await getMe();
|
|
17
|
+
if (me) {
|
|
18
|
+
const usage = me.usage?.programmaticCreates;
|
|
19
|
+
if (json) {
|
|
20
|
+
process.stdout.write(`${JSON.stringify({
|
|
21
|
+
loggedIn: true,
|
|
22
|
+
mode: 'api-key',
|
|
23
|
+
user: me.user,
|
|
24
|
+
usage: me.usage ?? null,
|
|
25
|
+
})}\n`);
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
const plan = me.user.plan ? ` (${me.user.plan} plan)` : '';
|
|
29
|
+
process.stdout.write(`Authenticated as ${me.user.email}${plan}.\n`);
|
|
30
|
+
if (usage) {
|
|
31
|
+
const limit = usage.limit == null ? 'unlimited' : usage.limit;
|
|
32
|
+
process.stdout.write(`Programmatic creates this month: ${usage.used}/${limit}` +
|
|
33
|
+
` (resets ${usage.resetsAt}).\n`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return 0;
|
|
37
|
+
}
|
|
38
|
+
// /v1/me not available yet: validate the key with a cheap read instead.
|
|
39
|
+
await listDatabases();
|
|
40
|
+
if (json) {
|
|
41
|
+
process.stdout.write(`${JSON.stringify({
|
|
42
|
+
loggedIn: true,
|
|
43
|
+
mode: 'api-key',
|
|
44
|
+
identity: 'unavailable',
|
|
45
|
+
})}\n`);
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
process.stdout.write('Authenticated with API key (identity endpoint unavailable).\n');
|
|
49
|
+
}
|
|
50
|
+
return 0;
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
return reportError(error, json);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
// Browser-JWT mode: read the cached token, no network.
|
|
57
|
+
const credentials = await loadCredentials();
|
|
58
|
+
if (!credentials?.token) {
|
|
59
|
+
if (json) {
|
|
60
|
+
process.stdout.write(`${JSON.stringify({ loggedIn: false })}\n`);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
process.stderr.write('Not logged in. Run `layerbase login`, or set LAYERBASE_API_KEY.\n');
|
|
64
|
+
}
|
|
65
|
+
return 1;
|
|
66
|
+
}
|
|
67
|
+
const claims = decodeTokenClaims(credentials.token);
|
|
68
|
+
const email = claims?.email ?? 'unknown';
|
|
69
|
+
const expiresAtMs = claims?.exp ? claims.exp * 1000 : null;
|
|
70
|
+
if (json) {
|
|
71
|
+
process.stdout.write(`${JSON.stringify({
|
|
72
|
+
loggedIn: true,
|
|
73
|
+
mode: 'browser',
|
|
74
|
+
email,
|
|
75
|
+
apiUrl: credentials.apiUrl,
|
|
76
|
+
expiresAt: expiresAtMs,
|
|
77
|
+
})}\n`);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
const expiry = expiresAtMs
|
|
81
|
+
? ` Token expires ${new Date(expiresAtMs).toISOString().slice(0, 10)}.`
|
|
82
|
+
: '';
|
|
83
|
+
process.stdout.write(`Signed in as ${email} at ${credentials.apiUrl}.${expiry}\n`);
|
|
84
|
+
}
|
|
85
|
+
return 0;
|
|
86
|
+
}
|
|
87
|
+
//# sourceMappingURL=whoami-run.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"whoami-run.js","sourceRoot":"","sources":["../../src/commands/whoami-run.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/whoami.js
CHANGED
|
@@ -12,7 +12,7 @@ export function Whoami({ json }) {
|
|
|
12
12
|
useEffect(() => {
|
|
13
13
|
async function fetchAndSetWhoami() {
|
|
14
14
|
const creds = await loadCredentials();
|
|
15
|
-
if (!creds) {
|
|
15
|
+
if (!creds?.token) {
|
|
16
16
|
if (json) {
|
|
17
17
|
process.stdout.write(`${JSON.stringify({ loggedIn: false })}\n`);
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/commands/whoami.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAO/C,+EAA+E;AAC/E,+EAA+E;AAC/E,iFAAiF;AACjF,MAAM,UAAU,MAAM,CAAC,EAAE,IAAI,EAAqB;IAChD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAA;IACzB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IAE9D,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,UAAU,iBAAiB;YAC9B,MAAM,KAAK,GAAG,MAAM,eAAe,EAAE,CAAA;YACrC,IAAI,CAAC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/commands/whoami.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { CloudApiError, exitCodeForStatus } from '../lib/cloud-api.js';
|
|
2
|
+
// Render an error for a scriptable command: a JSON object on stdout when --json,
|
|
3
|
+
// otherwise a human line on stderr. Returns the exit code the caller should use
|
|
4
|
+
// (script-friendly per exitCodeForStatus for cloud errors, 1 otherwise).
|
|
5
|
+
export function reportError(error, json) {
|
|
6
|
+
if (error instanceof CloudApiError) {
|
|
7
|
+
const { status, code, message } = error.info;
|
|
8
|
+
if (json) {
|
|
9
|
+
process.stdout.write(`${JSON.stringify({ ok: false, error: message, code, status })}\n`);
|
|
10
|
+
}
|
|
11
|
+
else {
|
|
12
|
+
process.stderr.write(`${message}\n`);
|
|
13
|
+
}
|
|
14
|
+
return exitCodeForStatus(status);
|
|
15
|
+
}
|
|
16
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
17
|
+
if (json) {
|
|
18
|
+
process.stdout.write(`${JSON.stringify({ ok: false, error: message })}\n`);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
process.stderr.write(`${message}\n`);
|
|
22
|
+
}
|
|
23
|
+
return 1;
|
|
24
|
+
}
|
|
25
|
+
export function writeJson(value) {
|
|
26
|
+
process.stdout.write(`${JSON.stringify(value, null, 2)}\n`);
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=cli-output.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-output.js","sourceRoot":"","sources":["../../src/lib/cli-output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAElE,iFAAiF;AACjF,gFAAgF;AAChF,yEAAyE;AACzE,MAAM,UAAU,WAAW,CAAC,KAAc,EAAE,IAAa;IACvD,IAAI,KAAK,YAAY,aAAa,EAAE,CAAC;QACnC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;QAC5C,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,CACnE,CAAA;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAA;QACtC,CAAC;QACD,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACtE,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,CAAA;IAC5E,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,KAAc;IACtC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAA;AAC7D,CAAC"}
|