@supersdk/supercli 0.5.10 → 0.5.12-staging.123
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/api/cdnClient.js +63 -21
- package/dist/api/cdnClient.js.map +1 -1
- package/dist/api/cdnDomainClient.js +80 -0
- package/dist/api/cdnDomainClient.js.map +1 -0
- package/dist/api/dbClient.js.map +1 -1
- package/dist/api/experimentClient.js +178 -0
- package/dist/api/experimentClient.js.map +1 -0
- package/dist/cli.js +2 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/cdn.js +198 -0
- package/dist/commands/cdn.js.map +1 -0
- package/dist/commands/cdnDomain.js +203 -0
- package/dist/commands/cdnDomain.js.map +1 -0
- package/dist/commands/db.js +31 -4
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/delivery.js +3 -81
- package/dist/commands/delivery.js.map +1 -1
- package/dist/commands/experiment.js +1360 -0
- package/dist/commands/experiment.js.map +1 -0
- package/dist/output/envelope.js.map +1 -1
- package/dist/output/resultPrinter.js +2 -2
- package/dist/output/resultPrinter.js.map +1 -1
- package/dist/template/android/supersdk-default.config.json +1 -1
- package/dist/template/web/src/js/supersdk.js +2 -2
- package/dist/template/web/src/js/supersdk.provenance.json +3 -3
- package/package.json +1 -1
|
@@ -0,0 +1,198 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.runCdn = runCdn;
|
|
37
|
+
exports.registerCdnCommand = registerCdnCommand;
|
|
38
|
+
const fs = __importStar(require("node:fs"));
|
|
39
|
+
const path = __importStar(require("node:path"));
|
|
40
|
+
const cdnClient_1 = require("../api/cdnClient");
|
|
41
|
+
const resultPrinter_1 = require("../output/resultPrinter");
|
|
42
|
+
const prompt_1 = require("../util/prompt");
|
|
43
|
+
const cdnDomain_1 = require("./cdnDomain");
|
|
44
|
+
const settings_1 = require("./settings");
|
|
45
|
+
const defaults = {
|
|
46
|
+
auth: () => (0, settings_1.resolveSettingsAuth)(settings_1.defaultSettingsDeps), client: origin => new cdnClient_1.CdnClient(origin),
|
|
47
|
+
readFile: fs.readFileSync, nonInteractive: () => (0, prompt_1.isNonInteractive)() || process.stdin.isTTY !== true, prompt: prompt_1.promptLineSync,
|
|
48
|
+
};
|
|
49
|
+
const usage = (message) => ({ ok: false, kind: 'usage_error', message });
|
|
50
|
+
const BUCKET = /^bkt_[0-9a-f]{32}$/;
|
|
51
|
+
const CONTENT = /^obj_[0-9a-f]{32}$/;
|
|
52
|
+
function failure(outcome) {
|
|
53
|
+
switch (outcome.kind) {
|
|
54
|
+
case 'business_error': return { ok: false, kind: 'business_error', publicCode: outcome.code, message: `CDN request rejected (${outcome.code})` };
|
|
55
|
+
case 'auth_invalid': return { ok: false, kind: 'auth_invalid', message: 'CDN authentication failed; run supercli login or replace SUPERCLI_TOKEN' };
|
|
56
|
+
case 'forbidden': return { ok: false, kind: 'forbidden', publicCode: 'CDN_ADMIN_REQUIRED', message: 'CDN write requires an administrator in the owning organization' };
|
|
57
|
+
case 'rate_limited': return { ok: false, kind: 'rate_limited', publicCode: 'CDN_BUSY', message: 'CDN is busy; retry later' };
|
|
58
|
+
default: return { ok: false, kind: 'infra_error', message: 'CDN unavailable; for an uncertain upload retry the same file, path, version and --idempotency-key' };
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
function result(data, soft = false) {
|
|
62
|
+
return { ok: true, result: data, soft, humanMessage: JSON.stringify(data, null, 2) };
|
|
63
|
+
}
|
|
64
|
+
function operationResult(operation) {
|
|
65
|
+
if (!operation || !CONTENT.test(operation.content_id) || !BUCKET.test(operation.bucket_id) || typeof operation.path !== 'string') {
|
|
66
|
+
return { ok: false, kind: 'infra_error', message: 'CDN returned an invalid operation' };
|
|
67
|
+
}
|
|
68
|
+
const done = (operation.public_state === 'published' && operation.cleanup_state === 'not_needed') ||
|
|
69
|
+
(operation.public_state === 'revoked' && operation.cleanup_state === 'done');
|
|
70
|
+
if (operation.phase === 'failed' && !operation.retryable) {
|
|
71
|
+
return { ok: false, kind: 'business_error', publicCode: operation.error_code ?? 'CDN_OPERATION_FAILED', message: `CDN operation failed (${operation.content_id}); query with supercli cdn operation show --bucket ${operation.bucket_id} --content ${operation.content_id}` };
|
|
72
|
+
}
|
|
73
|
+
return result({ ...operation, query_command: `supercli cdn operation show --bucket ${operation.bucket_id} --content ${operation.content_id}` }, !done);
|
|
74
|
+
}
|
|
75
|
+
function validPath(value) {
|
|
76
|
+
if (!value || value.normalize('NFC') !== value || Buffer.byteLength(value) > 1024 || /[\\\u0000-\u001f\u007f]/.test(value) || /%[0-9a-f]{2}/i.test(value))
|
|
77
|
+
return false;
|
|
78
|
+
return value.split('/').every(part => part && part !== '.' && part !== '..' && Buffer.byteLength(part) <= 255);
|
|
79
|
+
}
|
|
80
|
+
async function runCdn(action, opts, file, deps = defaults) {
|
|
81
|
+
const scopeAction = ['bucket.create', 'bucket.list', 'usage', 'cleanup.retry'].includes(action);
|
|
82
|
+
if (scopeAction && (!/^[a-z0-9]{8}$/.test(opts.project ?? '') || !/^[a-z0-9]{1,10}$/.test(opts.env ?? '')))
|
|
83
|
+
return usage('--project (8 lowercase letters/digits) and --env (1–10 lowercase letters/digits) are required');
|
|
84
|
+
if (!scopeAction && !BUCKET.test(opts.bucket ?? ''))
|
|
85
|
+
return usage('--bucket must be a bkt_<32hex> ID');
|
|
86
|
+
if (['bucket.create', 'bucket.rename'].includes(action) && !opts.name?.trim())
|
|
87
|
+
return usage('--name is required');
|
|
88
|
+
if (opts.prefix !== undefined && opts.search !== undefined)
|
|
89
|
+
return usage('--prefix and --search are mutually exclusive');
|
|
90
|
+
if (opts.limit !== undefined && (!/^\d+$/.test(opts.limit) || Number(opts.limit) < 1 || Number(opts.limit) > 100))
|
|
91
|
+
return usage('--limit must be between 1 and 100');
|
|
92
|
+
if (['file.upload', 'file.delete'].includes(action) && !validPath(opts.path))
|
|
93
|
+
return usage('--path must be a valid raw file path, without leading/trailing slash or percent-encoded segments');
|
|
94
|
+
if (action === 'file.upload' && (!file || Boolean(opts.replace) !== Boolean(opts.expectedVersion)))
|
|
95
|
+
return usage('upload needs a file; overwrite requires --replace and --expected-version together');
|
|
96
|
+
if ((opts.expectedVersion && !CONTENT.test(opts.expectedVersion)) || (action === 'file.delete' && !CONTENT.test(opts.expectedVersion ?? '')))
|
|
97
|
+
return usage('--expected-version must be the current obj_<32hex> ID');
|
|
98
|
+
if (action === 'operation.show' && !CONTENT.test(opts.content ?? ''))
|
|
99
|
+
return usage('--content must be an obj_<32hex> ID');
|
|
100
|
+
if (['bucket.create', 'file.upload'].includes(action) && !/^[A-Za-z0-9._~-]{1,128}$/.test(opts.idempotencyKey ?? ''))
|
|
101
|
+
return usage('--idempotency-key is required (1–128 ASCII letters, digits, . _ ~ -); retain it for retries');
|
|
102
|
+
const destructive = ['bucket.delete', 'file.delete'].includes(action) || (action === 'file.upload' && opts.replace);
|
|
103
|
+
if (destructive && !opts.yes) {
|
|
104
|
+
if (deps.nonInteractive())
|
|
105
|
+
return usage('this operation requires --yes in noninteractive mode');
|
|
106
|
+
const target = `${opts.bucket}${opts.path ? ` / ${opts.path}` : ''}${opts.expectedVersion ? ` / ${opts.expectedVersion}` : ''}`;
|
|
107
|
+
if (deps.prompt(`Confirm ${action}: ${target}\nType yes to continue: `).trim() !== 'yes')
|
|
108
|
+
return usage('CDN operation canceled');
|
|
109
|
+
}
|
|
110
|
+
let bytes;
|
|
111
|
+
if (action === 'file.upload') {
|
|
112
|
+
try {
|
|
113
|
+
bytes = deps.readFile(file);
|
|
114
|
+
}
|
|
115
|
+
catch {
|
|
116
|
+
return usage('could not read the upload file');
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
const auth = deps.auth();
|
|
120
|
+
if ((0, settings_1.isCommandOutcome)(auth))
|
|
121
|
+
return auth;
|
|
122
|
+
const client = deps.client(auth.apiOrigin);
|
|
123
|
+
const ctx = { token: auth.token, idempotencyKey: opts.idempotencyKey };
|
|
124
|
+
const scope = { spid: opts.project, env: opts.env };
|
|
125
|
+
const pagination = { cursor: opts.cursor, limit: opts.limit };
|
|
126
|
+
let outcome;
|
|
127
|
+
switch (action) {
|
|
128
|
+
case 'bucket.create':
|
|
129
|
+
outcome = await client.createBucket(ctx, scope, opts.name);
|
|
130
|
+
break;
|
|
131
|
+
case 'bucket.list':
|
|
132
|
+
outcome = await client.listBuckets(ctx, scope, pagination);
|
|
133
|
+
break;
|
|
134
|
+
case 'bucket.show':
|
|
135
|
+
outcome = await client.showBucket(ctx, opts.bucket);
|
|
136
|
+
break;
|
|
137
|
+
case 'bucket.rename':
|
|
138
|
+
outcome = await client.renameBucket(ctx, opts.bucket, opts.name);
|
|
139
|
+
break;
|
|
140
|
+
case 'bucket.delete':
|
|
141
|
+
outcome = await client.deleteBucket(ctx, opts.bucket);
|
|
142
|
+
break;
|
|
143
|
+
case 'file.list':
|
|
144
|
+
outcome = await client.listFiles(ctx, opts.bucket, { ...pagination, prefix: opts.prefix, search: opts.search });
|
|
145
|
+
break;
|
|
146
|
+
case 'file.upload':
|
|
147
|
+
outcome = await client.upload(ctx, opts.bucket, { path: opts.path, replace: opts.replace ?? false, expected_version: opts.expectedVersion }, { name: path.basename(file), bytes: bytes });
|
|
148
|
+
break;
|
|
149
|
+
case 'file.delete':
|
|
150
|
+
outcome = await client.deleteFile(ctx, opts.bucket, opts.path, opts.expectedVersion);
|
|
151
|
+
break;
|
|
152
|
+
case 'operation.show':
|
|
153
|
+
outcome = await client.operation(ctx, opts.bucket, opts.content);
|
|
154
|
+
break;
|
|
155
|
+
case 'usage':
|
|
156
|
+
outcome = await client.usage(ctx, scope);
|
|
157
|
+
break;
|
|
158
|
+
case 'cleanup.retry':
|
|
159
|
+
outcome = await client.cleanupRetry(ctx, scope);
|
|
160
|
+
break;
|
|
161
|
+
default: return usage('unknown CDN command');
|
|
162
|
+
}
|
|
163
|
+
if (outcome.kind !== 'success')
|
|
164
|
+
return failure(outcome);
|
|
165
|
+
if (['file.upload', 'file.delete', 'operation.show'].includes(action))
|
|
166
|
+
return operationResult(outcome.data);
|
|
167
|
+
if (action === 'cleanup.retry')
|
|
168
|
+
return result({ ...outcome.data, query_command: `supercli cdn usage --project ${opts.project} --env ${opts.env}` }, true);
|
|
169
|
+
return result(outcome.data);
|
|
170
|
+
}
|
|
171
|
+
function registerCdnCommand(program, deps = defaults, domainDeps = cdnDomain_1.defaultCdnDomainDeps) {
|
|
172
|
+
const cdn = program.command('cdn').description('Manage CDN buckets and current files.');
|
|
173
|
+
(0, cdnDomain_1.registerCdnDomainCommand)(cdn, domainDeps);
|
|
174
|
+
const bucket = cdn.command('bucket').description('Manage explicit CDN buckets.');
|
|
175
|
+
const files = cdn.command('file').description('Manage current files without version history.');
|
|
176
|
+
const operations = cdn.command('operation').description('Query the original upload or deletion.');
|
|
177
|
+
const cleanup = cdn.command('cleanup').description('Retry cleanup of new bucket content.');
|
|
178
|
+
const scope = (cmd) => cmd.requiredOption('--project <spid>', 'project ID').requiredOption('--env <env>', 'project environment');
|
|
179
|
+
const target = (cmd) => cmd.requiredOption('--bucket <id>', 'bucket ID');
|
|
180
|
+
const pagination = (cmd) => cmd.option('--cursor <cursor>', 'next cursor').option('--limit <limit>', 'page size, up to 100');
|
|
181
|
+
const bind = (cmd, action, upload = false) => cmd.action(async (...args) => {
|
|
182
|
+
const command = args[args.length - 1];
|
|
183
|
+
const printer = new resultPrinter_1.ResultPrinter(command.optsWithGlobals().output === 'json' ? 'json' : 'human');
|
|
184
|
+
printer.emit(await runCdn(action, command.opts(), upload ? args[0] : undefined, deps));
|
|
185
|
+
});
|
|
186
|
+
bind(scope(bucket.command('create')).requiredOption('--name <name>', 'display name').requiredOption('--idempotency-key <key>', 'stable key retained for retries'), 'bucket.create');
|
|
187
|
+
bind(pagination(scope(bucket.command('list'))), 'bucket.list');
|
|
188
|
+
bind(target(bucket.command('show')), 'bucket.show');
|
|
189
|
+
bind(target(bucket.command('rename')).requiredOption('--name <name>', 'new display name'), 'bucket.rename');
|
|
190
|
+
bind(target(bucket.command('delete')).option('--yes', 'confirm deletion'), 'bucket.delete');
|
|
191
|
+
bind(pagination(target(files.command('list'))).option('--prefix <prefix>', 'browse a directory prefix').option('--search <search>', 'search all bucket paths'), 'file.list');
|
|
192
|
+
bind(target(files.command('upload <file>')).requiredOption('--path <path>', 'raw destination path').requiredOption('--idempotency-key <key>', 'stable key retained for retries').option('--replace', 'replace the specified current version').option('--expected-version <id>', 'observed current content ID').option('--yes', 'confirm overwrite'), 'file.upload', true);
|
|
193
|
+
bind(target(files.command('delete')).requiredOption('--path <path>', 'raw destination path').requiredOption('--expected-version <id>', 'observed current content ID').option('--yes', 'confirm deletion'), 'file.delete');
|
|
194
|
+
bind(target(operations.command('show')).requiredOption('--content <id>', 'original content/operation ID'), 'operation.show');
|
|
195
|
+
bind(scope(cdn.command('usage')), 'usage');
|
|
196
|
+
bind(scope(cleanup.command('retry')), 'cleanup.retry');
|
|
197
|
+
}
|
|
198
|
+
//# sourceMappingURL=cdn.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cdn.js","sourceRoot":"","sources":["../../src/commands/cdn.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.defaultCdnDomainDeps = exports.DEFAULT_WAIT_TIMEOUT_SECONDS = void 0;
|
|
4
|
+
exports.runCdnDomain = runCdnDomain;
|
|
5
|
+
exports.registerCdnDomainCommand = registerCdnDomainCommand;
|
|
6
|
+
const cdnDomainClient_1 = require("../api/cdnDomainClient");
|
|
7
|
+
const resultPrinter_1 = require("../output/resultPrinter");
|
|
8
|
+
const prompt_1 = require("../util/prompt");
|
|
9
|
+
const settings_1 = require("./settings");
|
|
10
|
+
exports.DEFAULT_WAIT_TIMEOUT_SECONDS = 300;
|
|
11
|
+
exports.defaultCdnDomainDeps = {
|
|
12
|
+
auth: () => (0, settings_1.resolveSettingsAuth)(settings_1.defaultSettingsDeps),
|
|
13
|
+
client: origin => new cdnDomainClient_1.CdnDomainClient(origin),
|
|
14
|
+
nonInteractive: () => (0, prompt_1.isNonInteractive)() || process.stdin.isTTY !== true,
|
|
15
|
+
prompt: prompt_1.promptLineSync,
|
|
16
|
+
now: () => Date.now(),
|
|
17
|
+
sleep: ms => new Promise(resolve => setTimeout(resolve, ms)),
|
|
18
|
+
pollIntervalMs: 3000,
|
|
19
|
+
};
|
|
20
|
+
const BUCKET = /^[A-Za-z0-9_-]{1,64}$/;
|
|
21
|
+
const DOMAIN_ID = /^dom_[0-9a-f]{32}$/;
|
|
22
|
+
const usage = (message) => ({ ok: false, kind: 'usage_error', message });
|
|
23
|
+
const result = (data, soft = false) => ({ ok: true, result: data, soft, humanMessage: JSON.stringify(data, null, 2) });
|
|
24
|
+
// Phases where waiting longer cannot help: the user must act (or the server gave up).
|
|
25
|
+
// Matched on both the display labels and snake_case spellings; everything else keeps polling.
|
|
26
|
+
// Phases where waiting cannot help: the admin has to act (add TXT, fix CAA/DNS, retry or unbind). Values match the server's DomainPhase.
|
|
27
|
+
const ACTION_PHASES = new Set(['txt_required', 'cert_failed', 'renewal_failed', 'recovering']);
|
|
28
|
+
function failure(outcome) {
|
|
29
|
+
switch (outcome.kind) {
|
|
30
|
+
case 'business_error': {
|
|
31
|
+
const hint = outcome.retryAfterSeconds ? `; retry after ${outcome.retryAfterSeconds}s` : '';
|
|
32
|
+
return { ok: false, kind: 'business_error', publicCode: outcome.code, message: `CDN domain request rejected (${outcome.code})${hint}`, ...(outcome.detail !== undefined ? { result: outcome.detail } : {}) };
|
|
33
|
+
}
|
|
34
|
+
case 'auth_invalid': return { ok: false, kind: 'auth_invalid', message: 'CDN authentication failed; run supercli login or replace SUPERCLI_TOKEN' };
|
|
35
|
+
case 'forbidden': return { ok: false, kind: 'forbidden', publicCode: 'CDN_ADMIN_REQUIRED', message: 'CDN domain write requires an administrator in the owning organization' };
|
|
36
|
+
case 'rate_limited': return { ok: false, kind: 'rate_limited', publicCode: 'CDN_BUSY', message: 'CDN is busy; retry later' };
|
|
37
|
+
case 'infra_error': return { ok: false, kind: 'infra_error', ...(outcome.code ? { publicCode: outcome.code } : {}), message: outcome.code ? `CDN domain service unavailable (${outcome.code})` : 'CDN domain service unavailable' };
|
|
38
|
+
default: return { ok: false, kind: 'infra_error', message: 'unexpected CDN domain outcome' };
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
function viewResult(view) {
|
|
42
|
+
return result(view, view?.effective !== true);
|
|
43
|
+
}
|
|
44
|
+
async function resolveDomain(client, token, bucket, selector) {
|
|
45
|
+
if (DOMAIN_ID.test(selector))
|
|
46
|
+
return { id: selector };
|
|
47
|
+
const listed = await client.list({ token }, bucket);
|
|
48
|
+
if (listed.kind !== 'success')
|
|
49
|
+
return failure(listed);
|
|
50
|
+
const wanted = selector.toLowerCase();
|
|
51
|
+
const hit = (listed.data?.domains ?? []).find(d => d.hostname?.toLowerCase() === wanted);
|
|
52
|
+
if (!hit)
|
|
53
|
+
return { ok: false, kind: 'business_error', publicCode: 'CDN_DOMAIN_NOT_FOUND', message: `no custom domain "${selector}" on bucket ${bucket}; list with supercli cdn domain list --bucket ${bucket}` };
|
|
54
|
+
return { id: hit.domain_id };
|
|
55
|
+
}
|
|
56
|
+
async function waitEffective(client, token, bucket, first, timeoutSeconds, deps) {
|
|
57
|
+
const deadline = deps.now() + timeoutSeconds * 1000;
|
|
58
|
+
let view = first;
|
|
59
|
+
for (;;) {
|
|
60
|
+
if (view?.effective === true)
|
|
61
|
+
return result(view);
|
|
62
|
+
if (view && ACTION_PHASES.has(view.phase)) {
|
|
63
|
+
return { ok: false, kind: 'business_error', publicCode: view.last_error_code || 'CDN_DOMAIN_NOT_READY', message: `domain ${view.domain_id} stopped in phase "${view.phase}"; see result for the failing check`, result: view };
|
|
64
|
+
}
|
|
65
|
+
const remaining = deadline - deps.now();
|
|
66
|
+
if (remaining <= 0)
|
|
67
|
+
break;
|
|
68
|
+
await deps.sleep(Math.min(deps.pollIntervalMs, remaining));
|
|
69
|
+
const polled = await client.show({ token }, bucket, view.domain_id);
|
|
70
|
+
if (polled.kind === 'success')
|
|
71
|
+
view = polled.data;
|
|
72
|
+
else if (polled.kind === 'infra_error' || polled.kind === 'rate_limited')
|
|
73
|
+
continue; // transient: keep waiting until the budget ends
|
|
74
|
+
else
|
|
75
|
+
return failure(polled);
|
|
76
|
+
}
|
|
77
|
+
return {
|
|
78
|
+
ok: false, kind: 'business_error', publicCode: 'CDN_DOMAIN_WAIT_TIMEOUT', retryable: true,
|
|
79
|
+
message: `domain ${view.domain_id} is still "${view.phase}" after ${timeoutSeconds}s; check with supercli cdn domain show --bucket ${bucket} --domain ${view.domain_id}`,
|
|
80
|
+
result: view,
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
async function runCdnDomain(action, opts, deps = exports.defaultCdnDomainDeps) {
|
|
84
|
+
if (!BUCKET.test(opts.bucket ?? ''))
|
|
85
|
+
return usage('--bucket is required (bucket ID)');
|
|
86
|
+
const needsDomain = action !== 'list' && action !== 'cleanup-retry' && !(action === 'prefer' && opts.default);
|
|
87
|
+
if (needsDomain && !opts.domain?.trim())
|
|
88
|
+
return usage('--domain is required (domain_id or hostname)');
|
|
89
|
+
if (action === 'prefer' && Boolean(opts.default) === Boolean(opts.domain))
|
|
90
|
+
return usage('prefer needs exactly one of --domain or --default');
|
|
91
|
+
let timeoutSeconds = exports.DEFAULT_WAIT_TIMEOUT_SECONDS;
|
|
92
|
+
if (opts.waitTimeout !== undefined) {
|
|
93
|
+
if (!/^\d+$/.test(opts.waitTimeout) || Number(opts.waitTimeout) < 1)
|
|
94
|
+
return usage('--wait-timeout must be a positive number of seconds');
|
|
95
|
+
timeoutSeconds = Number(opts.waitTimeout);
|
|
96
|
+
}
|
|
97
|
+
if (opts.waitTimeout !== undefined && !opts.wait)
|
|
98
|
+
return usage('--wait-timeout requires --wait');
|
|
99
|
+
if (opts.wait && action !== 'add' && action !== 'verify')
|
|
100
|
+
return usage('--wait is only supported by add and verify');
|
|
101
|
+
const bucket = opts.bucket;
|
|
102
|
+
if (action === 'remove' && !opts.yes) {
|
|
103
|
+
if (deps.nonInteractive())
|
|
104
|
+
return usage('remove requires --yes in noninteractive mode');
|
|
105
|
+
if (deps.prompt(`Remove custom domain ${opts.domain} from ${bucket}? Type yes to continue: `).trim() !== 'yes')
|
|
106
|
+
return usage('CDN domain removal canceled');
|
|
107
|
+
}
|
|
108
|
+
const auth = deps.auth();
|
|
109
|
+
if ((0, settings_1.isCommandOutcome)(auth))
|
|
110
|
+
return auth;
|
|
111
|
+
const client = deps.client(auth.apiOrigin);
|
|
112
|
+
const ctx = { token: auth.token };
|
|
113
|
+
switch (action) {
|
|
114
|
+
case 'list': {
|
|
115
|
+
const out = await client.list(ctx, bucket);
|
|
116
|
+
return out.kind === 'success' ? result(out.data) : failure(out);
|
|
117
|
+
}
|
|
118
|
+
case 'cleanup-retry': {
|
|
119
|
+
const out = await client.cleanupRetry(ctx, bucket);
|
|
120
|
+
if (out.kind !== 'success')
|
|
121
|
+
return failure(out);
|
|
122
|
+
return result({ ...(out.data && typeof out.data === 'object' ? out.data : {}), accepted: true, query_command: `supercli cdn domain list --bucket ${bucket}` }, true);
|
|
123
|
+
}
|
|
124
|
+
case 'add': {
|
|
125
|
+
const added = await client.add(ctx, bucket, opts.domain.trim());
|
|
126
|
+
if (added.kind !== 'success')
|
|
127
|
+
return failure(added);
|
|
128
|
+
return opts.wait ? waitEffective(client, auth.token, bucket, added.data, timeoutSeconds, deps) : viewResult(added.data);
|
|
129
|
+
}
|
|
130
|
+
case 'prefer': {
|
|
131
|
+
let id = null;
|
|
132
|
+
if (!opts.default) {
|
|
133
|
+
const resolved = await resolveDomain(client, auth.token, bucket, opts.domain.trim());
|
|
134
|
+
if ('ok' in resolved)
|
|
135
|
+
return resolved;
|
|
136
|
+
id = resolved.id;
|
|
137
|
+
}
|
|
138
|
+
const out = await client.prefer(ctx, bucket, id);
|
|
139
|
+
return out.kind === 'success' ? result(out.data) : failure(out);
|
|
140
|
+
}
|
|
141
|
+
default: break;
|
|
142
|
+
}
|
|
143
|
+
const resolved = await resolveDomain(client, auth.token, bucket, opts.domain.trim());
|
|
144
|
+
if ('ok' in resolved)
|
|
145
|
+
return resolved;
|
|
146
|
+
const id = resolved.id;
|
|
147
|
+
switch (action) {
|
|
148
|
+
case 'show': {
|
|
149
|
+
const out = await client.show(ctx, bucket, id);
|
|
150
|
+
return out.kind === 'success' ? viewResult(out.data) : failure(out);
|
|
151
|
+
}
|
|
152
|
+
case 'retry': {
|
|
153
|
+
const out = await client.retry(ctx, bucket, id);
|
|
154
|
+
return out.kind === 'success' ? viewResult(out.data) : failure(out);
|
|
155
|
+
}
|
|
156
|
+
case 'remove': {
|
|
157
|
+
const out = await client.remove(ctx, bucket, id);
|
|
158
|
+
return out.kind === 'success' ? result({ ...(out.data && typeof out.data === 'object' ? out.data : {}), removed: true, domain_id: id }) : failure(out);
|
|
159
|
+
}
|
|
160
|
+
case 'verify': {
|
|
161
|
+
let confirmTakeover = Boolean(opts.yes);
|
|
162
|
+
if (!confirmTakeover) {
|
|
163
|
+
// Takeover replaces another binding's ownership: confirm before the write is sent.
|
|
164
|
+
const current = await client.show(ctx, bucket, id);
|
|
165
|
+
if (current.kind !== 'success')
|
|
166
|
+
return failure(current);
|
|
167
|
+
if (current.data?.verification_method === 'txt') {
|
|
168
|
+
if (deps.nonInteractive())
|
|
169
|
+
return usage('this domain needs TXT takeover verification; re-run with --yes to confirm in noninteractive mode');
|
|
170
|
+
if (deps.prompt(`Verify and take over ${current.data.hostname}? Type yes to continue: `).trim() !== 'yes')
|
|
171
|
+
return usage('CDN domain takeover canceled');
|
|
172
|
+
confirmTakeover = true;
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
const out = await client.verify(ctx, bucket, id, confirmTakeover);
|
|
176
|
+
if (out.kind !== 'success')
|
|
177
|
+
return failure(out);
|
|
178
|
+
return opts.wait ? waitEffective(client, auth.token, bucket, out.data, timeoutSeconds, deps) : viewResult(out.data);
|
|
179
|
+
}
|
|
180
|
+
default: return usage('unknown CDN domain command');
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
function registerCdnDomainCommand(cdn, deps = exports.defaultCdnDomainDeps) {
|
|
184
|
+
const domain = cdn.command('domain').description('Manage custom HTTPS domains of a CDN bucket.');
|
|
185
|
+
const bucket = (cmd) => cmd.requiredOption('--bucket <id>', 'bucket ID');
|
|
186
|
+
const selector = (cmd) => bucket(cmd).requiredOption('--domain <domain>', 'domain_id or hostname');
|
|
187
|
+
const wait = (cmd) => cmd.option('--wait', 'poll until the domain is effective or the wait budget ends')
|
|
188
|
+
.option('--wait-timeout <seconds>', `wait budget in seconds (default ${exports.DEFAULT_WAIT_TIMEOUT_SECONDS})`);
|
|
189
|
+
const bind = (cmd, action) => cmd.action(async (...args) => {
|
|
190
|
+
const command = args[args.length - 1];
|
|
191
|
+
const printer = new resultPrinter_1.ResultPrinter(command.optsWithGlobals().output === 'json' ? 'json' : 'human');
|
|
192
|
+
printer.emit(await runCdnDomain(action, command.opts(), deps));
|
|
193
|
+
});
|
|
194
|
+
bind(wait(bucket(domain.command('add').description('Bind a hostname to the bucket').requiredOption('--domain <hostname>', 'hostname to bind'))), 'add');
|
|
195
|
+
bind(bucket(domain.command('list').description('List bindings, quota and preferred domain')), 'list');
|
|
196
|
+
bind(selector(domain.command('show').description('Show one binding with its four readiness checks and DNS records')), 'show');
|
|
197
|
+
bind(wait(selector(domain.command('verify').description('Verify now; a TXT takeover needs confirmation')).option('--yes', 'confirm a TXT takeover')), 'verify');
|
|
198
|
+
bind(bucket(domain.command('prefer').description('Set (or clear with --default) the preferred domain')).option('--domain <domain>', 'domain_id or hostname').option('--default', 'switch back to the default domain'), 'prefer');
|
|
199
|
+
bind(selector(domain.command('retry').description('Retry certificate issuance')), 'retry');
|
|
200
|
+
bind(selector(domain.command('remove').description('Unbind a domain')).option('--yes', 'confirm removal'), 'remove');
|
|
201
|
+
bind(bucket(domain.command('cleanup-retry').description('Retry cleanup of a released domain')), 'cleanup-retry');
|
|
202
|
+
}
|
|
203
|
+
//# sourceMappingURL=cdnDomain.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cdnDomain.js","sourceRoot":"","sources":["../../src/commands/cdnDomain.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/db.js
CHANGED
|
@@ -86,6 +86,8 @@ const SERVICE_SLUG_PATTERN = /^[a-z0-9]{1,32}$/;
|
|
|
86
86
|
const EXPECTED_MASKED_CREDENTIAL = '••••••••';
|
|
87
87
|
const BUSINESS_DB_CODES = new Set([
|
|
88
88
|
'DB_CONNECTION_NOT_FOUND',
|
|
89
|
+
'DB_MANAGED_CONNECTION_IMMUTABLE',
|
|
90
|
+
'DB_MANAGED_QUERY_UNAVAILABLE',
|
|
89
91
|
'DB_INVALID_SQL',
|
|
90
92
|
'DB_STATEMENT_REJECTED',
|
|
91
93
|
'DB_DANGEROUS_NEEDS_CONFIRM',
|
|
@@ -129,6 +131,8 @@ const DB_MESSAGES = {
|
|
|
129
131
|
DB_CONNECTION_DUPLICATE: 'the database connection request conflicts with an existing connection',
|
|
130
132
|
DB_QUOTA_EXCEEDED: 'the database connection quota has been reached for this environment',
|
|
131
133
|
DB_PLAINTEXT_NEEDS_CONFIRM: 'the database connection policy requires explicit plaintext confirmation',
|
|
134
|
+
DB_MANAGED_CONNECTION_IMMUTABLE: 'managed database connection credentials are maintained by the platform',
|
|
135
|
+
DB_MANAGED_QUERY_UNAVAILABLE: 'managed database browsing and SQL execution are not available yet; use the connection from your application',
|
|
132
136
|
DB_MODULE_DISABLED: 'database access is disabled for this Console deployment',
|
|
133
137
|
DB_BUSY: 'database service is busy; retry later',
|
|
134
138
|
DB_TARGET_UNREACHABLE: 'the target database is unreachable; retry later or ask an administrator to check it',
|
|
@@ -692,6 +696,7 @@ async function runDbConnUpdate(connName, opts, requestId, deps = exports.default
|
|
|
692
696
|
return dbSuccess(scope, { connection: outcome.data });
|
|
693
697
|
}
|
|
694
698
|
const DELETE_WARNING_CODES = ['FUTURE_APPLY_MAY_FAIL', 'EXISTING_CREDENTIALS_NOT_REVOKED'];
|
|
699
|
+
const MANAGED_DELETE_WARNING_CODES = ['FUTURE_APPLY_MAY_FAIL', 'DATABASE_ACCOUNT_WILL_BE_REVOKED', 'ACTIVE_SESSIONS_WILL_BE_TERMINATED'];
|
|
695
700
|
const DELETE_SERVICE_STATUSES = new Set(['provisioning', 'active', 'failed', 'timeout', 'disabled']);
|
|
696
701
|
const DELETE_RISK_MESSAGE = 'This deletes the platform connection registration and saved credential. '
|
|
697
702
|
+ 'It does not delete the external database, stop services, close business connections, or revoke previously injected credentials. '
|
|
@@ -700,6 +705,8 @@ const DELETE_RISK_MESSAGE = 'This deletes the platform connection registration a
|
|
|
700
705
|
/** Do not reflect arbitrary server text, status strings, extra fields or a different scope. */
|
|
701
706
|
function deletionPreview(value, scope, name) {
|
|
702
707
|
const item = asRecord(value);
|
|
708
|
+
const warnings = Array.isArray(item?.warnings) ? item.warnings : [];
|
|
709
|
+
const recognizedWarnings = [DELETE_WARNING_CODES, MANAGED_DELETE_WARNING_CODES].find((known) => known.length === warnings.length && known.every((code) => warnings.includes(code)));
|
|
703
710
|
if (!item || !hasExactKeys(item, [
|
|
704
711
|
'resource_ref', 'name', 'spid', 'env', 'known_affected_services', 'usage_complete', 'warnings',
|
|
705
712
|
]) || item.name !== name || item.spid !== scope.spid || item.env !== scope.env
|
|
@@ -707,8 +714,7 @@ function deletionPreview(value, scope, name) {
|
|
|
707
714
|
|| BigInt(item.resource_ref.slice(3)) > 9223372036854775807n
|
|
708
715
|
|| item.usage_complete !== false || !Array.isArray(item.known_affected_services)
|
|
709
716
|
|| item.known_affected_services.length > 10 || !Array.isArray(item.warnings)
|
|
710
|
-
||
|
|
711
|
-
|| !DELETE_WARNING_CODES.every((code) => item.warnings instanceof Array && item.warnings.includes(code))) {
|
|
717
|
+
|| !recognizedWarnings) {
|
|
712
718
|
return undefined;
|
|
713
719
|
}
|
|
714
720
|
const services = [];
|
|
@@ -725,14 +731,19 @@ function deletionPreview(value, scope, name) {
|
|
|
725
731
|
}
|
|
726
732
|
return {
|
|
727
733
|
resource_ref: item.resource_ref, name, spid: scope.spid, env: scope.env,
|
|
728
|
-
known_affected_services: services, usage_complete: false, warnings: [...
|
|
734
|
+
known_affected_services: services, usage_complete: false, warnings: [...recognizedWarnings],
|
|
729
735
|
};
|
|
730
736
|
}
|
|
731
737
|
function deletionRiskMessage(preview) {
|
|
732
738
|
const usage = preview.known_affected_services.length === 0
|
|
733
739
|
? 'No current known users were found.'
|
|
734
740
|
: `Known users: ${preview.known_affected_services.map((service) => `${service.service_slug} (${service.status})`).join(', ')}.`;
|
|
735
|
-
|
|
741
|
+
const risk = preview.warnings.includes('DATABASE_ACCOUNT_WILL_BE_REVOKED')
|
|
742
|
+
? 'This asynchronously revokes the managed database account and terminates its active sessions. '
|
|
743
|
+
+ 'Existing applications will lose database access. Database data is retained. '
|
|
744
|
+
+ 'Accepted does not mean revocation has completed. Known usage does not include all historical instances.'
|
|
745
|
+
: DELETE_RISK_MESSAGE;
|
|
746
|
+
return `${risk} ${usage}`;
|
|
736
747
|
}
|
|
737
748
|
async function runDbConnDelete(connName, opts, requestId, deps = exports.defaultDbDeps) {
|
|
738
749
|
const scope = validScope(opts);
|
|
@@ -767,6 +778,22 @@ async function runDbConnDelete(connName, opts, requestId, deps = exports.default
|
|
|
767
778
|
const confirmed = await client.deleteConnection({ token: auth.token, requestId }, scope, name, { confirm: true, expected_resource_ref: preview.resource_ref });
|
|
768
779
|
if (confirmed.kind !== 'success')
|
|
769
780
|
return handleFailure(confirmed, auth, deps);
|
|
781
|
+
if (preview.warnings.includes('DATABASE_ACCOUNT_WILL_BE_REVOKED')) {
|
|
782
|
+
const data = asRecord(confirmed.data);
|
|
783
|
+
const binding = asRecord(data?.binding);
|
|
784
|
+
const operation = asRecord(data?.operation);
|
|
785
|
+
if (!binding || !operation || binding.resource_ref !== preview.resource_ref
|
|
786
|
+
|| binding.connection_name !== name || binding.env !== scope.env
|
|
787
|
+
|| (binding.status !== 'revoking' && binding.status !== 'released')
|
|
788
|
+
|| operation.action !== 'unbind' || typeof operation.id !== 'number'
|
|
789
|
+
|| !Number.isSafeInteger(operation.id) || operation.id < 1) {
|
|
790
|
+
return { ok: false, kind: 'infra_error', message: 'managed database revocation was submitted but its receipt was invalid; check its status in Console' };
|
|
791
|
+
}
|
|
792
|
+
return dbSuccess(scope, {
|
|
793
|
+
connection: name, accepted: true, operation_id: operation.id,
|
|
794
|
+
status: binding.status,
|
|
795
|
+
});
|
|
796
|
+
}
|
|
770
797
|
return dbSuccess(scope, { connection: name, deleted: true });
|
|
771
798
|
}
|
|
772
799
|
async function runDbConnTest(connName, opts, requestId, deps = exports.defaultDbDeps) {
|