@supersdk/supercli 0.4.0 → 0.5.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/dist/api/resourceClient.js +9 -0
- package/dist/api/resourceClient.js.map +1 -1
- package/dist/commands/deploy.js +23 -2
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/site.js +53 -0
- package/dist/commands/site.js.map +1 -1
- package/dist/deploy/resultWriter.js +42 -0
- package/dist/deploy/resultWriter.js.map +1 -1
- package/dist/deploy/siteAdapter.js +271 -49
- package/dist/deploy/siteAdapter.js.map +1 -1
- package/dist/publish/responseClassifier.js +2 -1
- package/dist/publish/responseClassifier.js.map +1 -1
- package/dist/publish/siteClient.js +30 -3
- package/dist/publish/siteClient.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
|
@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.defaultSiteAdapterDeps = void 0;
|
|
36
|
+
exports.defaultSiteAdapterDeps = exports.SITE_DEPLOY_POLL_INTERVAL_MS = exports.DEFAULT_SITE_WAIT_TIMEOUT_MS = void 0;
|
|
37
37
|
exports.deploySite = deploySite;
|
|
38
38
|
const crypto = __importStar(require("node:crypto"));
|
|
39
39
|
const log_1 = require("../util/log");
|
|
@@ -42,10 +42,21 @@ const siteClient_1 = require("../publish/siteClient");
|
|
|
42
42
|
const responseClassifier_1 = require("../publish/responseClassifier");
|
|
43
43
|
const envelope_1 = require("../output/envelope");
|
|
44
44
|
const domainEndpoints_1 = require("./domainEndpoints");
|
|
45
|
+
/**
|
|
46
|
+
* Default wait for a site deploy to reach `edge_ready` (CA-F260913145610 · AC-9): 7 minutes,
|
|
47
|
+
* i.e. the server's 5-minute processing deadline plus edge convergence margin. `--wait-timeout`
|
|
48
|
+
* overrides it per invocation; the upload itself is timed separately (`uploadTimeoutMs`).
|
|
49
|
+
*/
|
|
50
|
+
exports.DEFAULT_SITE_WAIT_TIMEOUT_MS = 420_000;
|
|
51
|
+
exports.SITE_DEPLOY_POLL_INTERVAL_MS = 3_000;
|
|
45
52
|
exports.defaultSiteAdapterDeps = {
|
|
46
53
|
createClient: (apiOrigin) => new siteClient_1.SiteClient(apiOrigin),
|
|
47
54
|
buildZip: siteZip_1.buildSiteZip,
|
|
48
55
|
randomId: crypto.randomUUID,
|
|
56
|
+
now: Date.now,
|
|
57
|
+
sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
|
|
58
|
+
pollIntervalMs: exports.SITE_DEPLOY_POLL_INTERVAL_MS,
|
|
59
|
+
waitTimeoutMs: exports.DEFAULT_SITE_WAIT_TIMEOUT_MS,
|
|
49
60
|
};
|
|
50
61
|
function object(value) {
|
|
51
62
|
return value !== null && typeof value === 'object' && !Array.isArray(value) ? value : undefined;
|
|
@@ -57,6 +68,16 @@ function id(value) {
|
|
|
57
68
|
const candidate = object(value)?.id;
|
|
58
69
|
return typeof candidate === 'number' && Number.isSafeInteger(candidate) && candidate > 0 ? candidate : undefined;
|
|
59
70
|
}
|
|
71
|
+
function stringField(value, key) {
|
|
72
|
+
const field = object(value)?.[key];
|
|
73
|
+
return typeof field === 'string' && field.length > 0 ? field : undefined;
|
|
74
|
+
}
|
|
75
|
+
function deployIdOf(view) {
|
|
76
|
+
return stringField(view, 'deploy_id');
|
|
77
|
+
}
|
|
78
|
+
function stateOf(view) {
|
|
79
|
+
return stringField(view, 'state');
|
|
80
|
+
}
|
|
60
81
|
function environmentExists(value, env) {
|
|
61
82
|
return Array.isArray(value) && value.some((entry) => object(entry)?.name === env);
|
|
62
83
|
}
|
|
@@ -73,6 +94,28 @@ function redact(message, values) {
|
|
|
73
94
|
const explicit = values.reduce((safe, value) => value.length > 0 ? safe.split(value).join('[REDACTED]') : safe, message);
|
|
74
95
|
return (0, envelope_1.redactTokenShaped)(explicit);
|
|
75
96
|
}
|
|
97
|
+
const PUBLIC_CODE = /^[A-Z][A-Z0-9_]{0,63}$/;
|
|
98
|
+
function bounded(message) {
|
|
99
|
+
return message.length <= 4_000 ? message : `${message.slice(0, 3_980)}\n[truncated]`;
|
|
100
|
+
}
|
|
101
|
+
/** `DeployView.error` → camelCase receipt; a missing/odd error is the documented `DEPLOY_FAILED` synthesis. */
|
|
102
|
+
function errorOf(view) {
|
|
103
|
+
const raw = object(object(view)?.error);
|
|
104
|
+
const code = typeof raw?.code === 'string' && PUBLIC_CODE.test(raw.code) ? raw.code : 'DEPLOY_FAILED';
|
|
105
|
+
const message = typeof raw?.message === 'string' ? bounded(raw.message) : '';
|
|
106
|
+
const retryable = typeof raw?.retryable === 'boolean' ? raw.retryable : true;
|
|
107
|
+
return { code, message, retryable };
|
|
108
|
+
}
|
|
109
|
+
function edgeOf(view) {
|
|
110
|
+
const raw = object(object(view)?.edge);
|
|
111
|
+
if (!raw)
|
|
112
|
+
return undefined;
|
|
113
|
+
return {
|
|
114
|
+
lastProbeAt: typeof raw.last_probe_at === 'string' ? raw.last_probe_at : null,
|
|
115
|
+
lastOutcome: typeof raw.last_outcome === 'string' ? raw.last_outcome : '',
|
|
116
|
+
observedDeployId: typeof raw.observed_deploy_id === 'string' ? raw.observed_deploy_id : null,
|
|
117
|
+
};
|
|
118
|
+
}
|
|
76
119
|
function failure(outcome, operation, input, started) {
|
|
77
120
|
const retryable = outcome.kind === 'rate_limited' || outcome.kind === 'infra_error'
|
|
78
121
|
|| (outcome.kind === 'business_error' && outcome.retryable);
|
|
@@ -114,6 +157,170 @@ async function call(operation, input, fn) {
|
|
|
114
157
|
function isFailure(value) {
|
|
115
158
|
return 'ok' in value && value.ok === false;
|
|
116
159
|
}
|
|
160
|
+
function scope(input) {
|
|
161
|
+
return `${input.spid}/${input.target.slug}/${input.target.env}`;
|
|
162
|
+
}
|
|
163
|
+
function showHint(input, deployId) {
|
|
164
|
+
return `supercli site deploy show ${input.target.slug} ${deployId} --env ${input.target.env}`;
|
|
165
|
+
}
|
|
166
|
+
function progress(input, message) {
|
|
167
|
+
// Progress lines go through `log` so that under `--output json` they land on stderr and
|
|
168
|
+
// stdout still carries exactly one envelope, emitted only at the terminal state.
|
|
169
|
+
log_1.log.info(`SuperSite [${input.projectId}/${input.target.envTarget}] ${message}`);
|
|
170
|
+
}
|
|
171
|
+
const NON_TERMINAL = new Set(['accepted', 'processing', 'committed']);
|
|
172
|
+
const IN_FLIGHT = new Set(['accepted', 'processing']);
|
|
173
|
+
function stopReached(stop, state) {
|
|
174
|
+
if (state === undefined)
|
|
175
|
+
return false;
|
|
176
|
+
return stop === 'terminal' ? !NON_TERMINAL.has(state) : !IN_FLIGHT.has(state);
|
|
177
|
+
}
|
|
178
|
+
/**
|
|
179
|
+
* Poll `GET …/deploys/{id}` every `pollIntervalMs` until `stop` is satisfied or the wait budget
|
|
180
|
+
* is spent. `terminal` waits for edge_ready/failed/superseded (the deploy we own); `settled`
|
|
181
|
+
* only waits for another caller's in-flight deploy to leave accepted/processing (committed is
|
|
182
|
+
* enough — we are not waiting for its edge). Transient poll errors are retried until the
|
|
183
|
+
* budget ends; credential/permission errors and non-retryable business errors (e.g. NOT_FOUND
|
|
184
|
+
* after a site deletion) stop the wait immediately.
|
|
185
|
+
*/
|
|
186
|
+
async function pollDeploy(client, context, input, deps, deployId, initialView, stop) {
|
|
187
|
+
const waitTimeoutMs = input.waitTimeoutMs ?? deps.waitTimeoutMs;
|
|
188
|
+
const startedAt = deps.now();
|
|
189
|
+
let view = initialView;
|
|
190
|
+
let state = stateOf(view);
|
|
191
|
+
let announced = state;
|
|
192
|
+
for (;;) {
|
|
193
|
+
if (stopReached(stop, state))
|
|
194
|
+
return { kind: 'reached', view, state: state };
|
|
195
|
+
const elapsed = deps.now() - startedAt;
|
|
196
|
+
if (elapsed >= waitTimeoutMs)
|
|
197
|
+
return { kind: 'timeout', view, state: state ?? 'unknown' };
|
|
198
|
+
await deps.sleep(Math.min(deps.pollIntervalMs, Math.max(0, waitTimeoutMs - elapsed)));
|
|
199
|
+
const polled = await client.getDeploy(context, input.spid, input.target.slug, input.target.env, deployId);
|
|
200
|
+
if (polled.kind === 'auth_invalid' || polled.kind === 'forbidden'
|
|
201
|
+
|| (polled.kind === 'business_error' && !polled.retryable)) {
|
|
202
|
+
return { kind: 'failure', failure: failure(polled, `check deploy ${deployId}`, input, Date.now()) };
|
|
203
|
+
}
|
|
204
|
+
if (polled.kind !== 'success' && polled.kind !== 'soft_success')
|
|
205
|
+
continue;
|
|
206
|
+
view = data(polled);
|
|
207
|
+
state = stateOf(view);
|
|
208
|
+
if (state !== undefined && state !== announced) {
|
|
209
|
+
progress(input, `deploy ${deployId} is ${state}`);
|
|
210
|
+
announced = state;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
/**
|
|
215
|
+
* Site deploys never resolve `ok:true` on anything but `edge_ready` (T-041). Every other
|
|
216
|
+
* outcome — committed, pending pointer, legacy 503 soft-success, wait timeout — is either
|
|
217
|
+
* polled further or reported as a non-zero failure that carries the deploy id to inspect.
|
|
218
|
+
*/
|
|
219
|
+
async function waitForSiteDeploy(client, context, input, deps, siteId, authoritativeSiteView, deployId, initialView) {
|
|
220
|
+
const polled = await pollDeploy(client, context, input, deps, deployId, initialView, 'terminal');
|
|
221
|
+
if (polled.kind === 'failure')
|
|
222
|
+
return { ...polled.failure, resource: { id: siteId, deployId, ...(stateOf(initialView) ? { state: stateOf(initialView) } : {}) } };
|
|
223
|
+
const { view, state } = polled;
|
|
224
|
+
if (polled.kind === 'timeout') {
|
|
225
|
+
const budgetSeconds = Math.round((input.waitTimeoutMs ?? deps.waitTimeoutMs) / 1000);
|
|
226
|
+
const edge = edgeOf(view);
|
|
227
|
+
const goneHint = edge?.lastOutcome === 'gone'
|
|
228
|
+
? ' (site appears disabled (edge returned 410); enable the site or check `supercli site show`)'
|
|
229
|
+
: '';
|
|
230
|
+
return {
|
|
231
|
+
ok: false,
|
|
232
|
+
kind: 'business_error',
|
|
233
|
+
code: 'SITE_DEPLOY_WAIT_TIMEOUT',
|
|
234
|
+
retryable: true,
|
|
235
|
+
message: `site deploy ${deployId} for ${scope(input)} is still ${state} after ${budgetSeconds}s${goneHint}; inspect \`${showHint(input, deployId)}\` — do not start a new deploy to check status (the same --idempotency-key only replays this one)`,
|
|
236
|
+
resource: { id: siteId, deployId, state, pending: true, ...(edge ? { edge } : {}) },
|
|
237
|
+
};
|
|
238
|
+
}
|
|
239
|
+
if (state === 'failed') {
|
|
240
|
+
const error = errorOf(view);
|
|
241
|
+
const reason = error.message.length > 0 ? error.message : error.code;
|
|
242
|
+
const guidance = error.retryable
|
|
243
|
+
? 're-run deploy with the same --idempotency-key to publish again (a failed deploy releases its key)'
|
|
244
|
+
: 'fix the reported cause before publishing again';
|
|
245
|
+
return {
|
|
246
|
+
ok: false,
|
|
247
|
+
kind: 'business_error',
|
|
248
|
+
code: error.code,
|
|
249
|
+
retryable: error.retryable,
|
|
250
|
+
message: redact(`site deploy ${deployId} for ${scope(input)} failed: ${reason}; ${guidance}; details: \`${showHint(input, deployId)}\``, [input.token]),
|
|
251
|
+
resource: { id: siteId, deployId, state, error: { ...error, message: redact(error.message, [input.token]) } },
|
|
252
|
+
};
|
|
253
|
+
}
|
|
254
|
+
if (state === 'superseded') {
|
|
255
|
+
const raw = object(view)?.superseded_by;
|
|
256
|
+
const supersededBy = typeof raw === 'string' && raw.length > 0 ? raw : null;
|
|
257
|
+
return {
|
|
258
|
+
ok: false,
|
|
259
|
+
kind: 'business_error',
|
|
260
|
+
code: 'SITE_DEPLOY_SUPERSEDED',
|
|
261
|
+
retryable: false,
|
|
262
|
+
message: supersededBy
|
|
263
|
+
? `site deploy ${deployId} for ${scope(input)} was superseded by ${supersededBy} before reaching the edge; the newer deploy is what serves now`
|
|
264
|
+
: `site deploy ${deployId} for ${scope(input)} was superseded and the site has been deleted (站点已删除); nothing is serving`,
|
|
265
|
+
resource: { id: siteId, deployId, state, supersededBy },
|
|
266
|
+
};
|
|
267
|
+
}
|
|
268
|
+
if (state !== 'edge_ready') {
|
|
269
|
+
// Defensive: an unknown terminal-looking state is never a success.
|
|
270
|
+
return {
|
|
271
|
+
ok: false,
|
|
272
|
+
kind: 'infra_error',
|
|
273
|
+
code: 'SITE_DEPLOY_STATE_UNKNOWN',
|
|
274
|
+
retryable: true,
|
|
275
|
+
message: `site deploy ${deployId} reported an unknown state ${JSON.stringify(state)}; inspect \`${showHint(input, deployId)}\``,
|
|
276
|
+
resource: { id: siteId, deployId, state, pending: true },
|
|
277
|
+
};
|
|
278
|
+
}
|
|
279
|
+
let targetEnvironment = siteEnvironment(authoritativeSiteView, input.target.env);
|
|
280
|
+
if (!targetEnvironment) {
|
|
281
|
+
const refreshed = await call('get site after committed deploy', input, () => (client.getSite(context, input.spid, input.target.slug, input.target.env)));
|
|
282
|
+
if (!isFailure(refreshed)) {
|
|
283
|
+
targetEnvironment = siteEnvironment(data(refreshed), input.target.env);
|
|
284
|
+
if (!targetEnvironment) {
|
|
285
|
+
log_1.log.error('SuperSite committed deploy has no authoritative target environment', {
|
|
286
|
+
target: 'SuperSite',
|
|
287
|
+
projectId: input.projectId,
|
|
288
|
+
envTarget: input.target.envTarget,
|
|
289
|
+
request_summary: scope(input),
|
|
290
|
+
response_summary: 'SITE_ENVIRONMENT_MISSING',
|
|
291
|
+
duration_ms: 0,
|
|
292
|
+
retry: false,
|
|
293
|
+
});
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
const platform = (0, domainEndpoints_1.createPlatformDomainEndpoint)(targetEnvironment?.domain, 'ready');
|
|
298
|
+
const domains = (0, domainEndpoints_1.mergeDomainEndpoints)(platform, []);
|
|
299
|
+
if (targetEnvironment && !platform) {
|
|
300
|
+
log_1.log.error('SuperSite authoritative target environment has no valid domain', {
|
|
301
|
+
target: 'SuperSite',
|
|
302
|
+
projectId: input.projectId,
|
|
303
|
+
envTarget: input.target.envTarget,
|
|
304
|
+
request_summary: scope(input),
|
|
305
|
+
response_summary: 'SITE_DOMAIN_INVALID',
|
|
306
|
+
duration_ms: 0,
|
|
307
|
+
retry: false,
|
|
308
|
+
});
|
|
309
|
+
}
|
|
310
|
+
const edge = edgeOf(view);
|
|
311
|
+
const resource = {
|
|
312
|
+
id: id(view) ?? siteId,
|
|
313
|
+
deployId,
|
|
314
|
+
state,
|
|
315
|
+
...(platform ? { domain: platform.domain, domains } : {}),
|
|
316
|
+
...(edge ? { edge } : {}),
|
|
317
|
+
};
|
|
318
|
+
return {
|
|
319
|
+
ok: true,
|
|
320
|
+
message: `deployed site ${scope(input)}; deploy ${deployId} is live at the edge`,
|
|
321
|
+
resource,
|
|
322
|
+
};
|
|
323
|
+
}
|
|
117
324
|
async function deploySite(input, deps = exports.defaultSiteAdapterDeps) {
|
|
118
325
|
let zip;
|
|
119
326
|
try {
|
|
@@ -148,7 +355,7 @@ async function deploySite(input, deps = exports.defaultSiteAdapterDeps) {
|
|
|
148
355
|
}));
|
|
149
356
|
if (isFailure(outcome))
|
|
150
357
|
return outcome;
|
|
151
|
-
return { ok: true, message: `validated site ${input
|
|
358
|
+
return { ok: true, message: `validated site ${scope(input)}`, resource: { ...(siteId ? { id: siteId } : {}) } };
|
|
152
359
|
}
|
|
153
360
|
const environments = await call('list environments', input, () => client.listEnvironments(context, input.spid));
|
|
154
361
|
if (isFailure(environments))
|
|
@@ -172,60 +379,75 @@ async function deploySite(input, deps = exports.defaultSiteAdapterDeps) {
|
|
|
172
379
|
if (siteId === 0)
|
|
173
380
|
return { ok: false, kind: 'infra_error', code: 'SITE_RESPONSE_INVALID', message: 'SuperSite create returned no valid site id', retryable: true };
|
|
174
381
|
}
|
|
175
|
-
|
|
382
|
+
// One idempotency key for the whole attempt: the DEPLOY_IN_PROGRESS retry below must replay
|
|
383
|
+
// it, never mint a second one (a second key would be a second deploy).
|
|
384
|
+
const idempotencyKey = input.idempotencyKey ?? deps.randomId();
|
|
385
|
+
const deployInput = {
|
|
176
386
|
zip: zip.buffer,
|
|
177
387
|
expectedSiteId: siteId,
|
|
178
388
|
version: input.version,
|
|
179
389
|
...(input.description ? { description: input.description } : {}),
|
|
180
|
-
idempotencyKey
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
retry: false,
|
|
202
|
-
});
|
|
390
|
+
idempotencyKey,
|
|
391
|
+
};
|
|
392
|
+
const submit = () => client.deploy(context, input.spid, input.target.slug, input.target.env, deployInput);
|
|
393
|
+
let started = Date.now();
|
|
394
|
+
let submitted = await submit();
|
|
395
|
+
if (submitted.kind === 'business_error' && submitted.code === 'DEPLOY_IN_PROGRESS') {
|
|
396
|
+
const inflight = deployIdOf(submitted.resource);
|
|
397
|
+
if (inflight) {
|
|
398
|
+
progress(input, `deploy ${inflight} is already in flight for ${scope(input)}; waiting for it to settle before retrying with the same idempotency key`);
|
|
399
|
+
const settled = await pollDeploy(client, context, input, deps, inflight, undefined, 'settled');
|
|
400
|
+
if (settled.kind === 'failure')
|
|
401
|
+
return { ...settled.failure, resource: { id: siteId, deployId: inflight } };
|
|
402
|
+
if (settled.kind === 'timeout') {
|
|
403
|
+
return {
|
|
404
|
+
ok: false,
|
|
405
|
+
kind: 'business_error',
|
|
406
|
+
code: 'DEPLOY_IN_PROGRESS',
|
|
407
|
+
retryable: true,
|
|
408
|
+
message: `site deploy ${inflight} for ${scope(input)} is still ${settled.state}; this upload was not started — inspect \`${showHint(input, inflight)}\` and retry once it settles`,
|
|
409
|
+
resource: { id: siteId, deployId: inflight, state: settled.state, pending: true },
|
|
410
|
+
};
|
|
203
411
|
}
|
|
412
|
+
started = Date.now();
|
|
413
|
+
submitted = await submit();
|
|
204
414
|
}
|
|
205
415
|
}
|
|
206
|
-
const
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
416
|
+
const deployed = submitted.kind === 'success' || submitted.kind === 'soft_success'
|
|
417
|
+
? submitted
|
|
418
|
+
: failure(submitted, 'deploy', input, started);
|
|
419
|
+
if (isFailure(deployed))
|
|
420
|
+
return deployed;
|
|
421
|
+
// From here on nothing short of `edge_ready` is a success — not a 202 receipt, not a
|
|
422
|
+
// committed row, not a legacy 503 POINTER_SYNC_PENDING soft-success from the classifier.
|
|
423
|
+
const accepted = data(deployed);
|
|
424
|
+
const deployId = deployIdOf(accepted);
|
|
425
|
+
if (!deployId) {
|
|
426
|
+
// Same disposition as the missing-state case below (malformed/too-old Console contract):
|
|
427
|
+
// upgrade the server or contact the platform, do not retry.
|
|
428
|
+
return {
|
|
429
|
+
ok: false,
|
|
430
|
+
kind: 'business_error',
|
|
431
|
+
code: 'SITE_DEPLOY_STATE_UNAVAILABLE',
|
|
432
|
+
retryable: false,
|
|
433
|
+
message: `the platform accepted the upload for ${scope(input)} without a deploy id; SuperCLI ≥ 0.5.0 requires the Console deploy-state contract — inspect \`supercli site deploys ${input.target.slug} --env ${input.target.env}\` before publishing again`,
|
|
434
|
+
resource: { id: siteId },
|
|
435
|
+
};
|
|
218
436
|
}
|
|
219
|
-
const
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
}
|
|
437
|
+
const initialState = stateOf(accepted);
|
|
438
|
+
if (!initialState) {
|
|
439
|
+
return {
|
|
440
|
+
ok: false,
|
|
441
|
+
kind: 'business_error',
|
|
442
|
+
code: 'SITE_DEPLOY_STATE_UNAVAILABLE',
|
|
443
|
+
retryable: false,
|
|
444
|
+
message: `the platform did not report a state for deploy ${deployId}; SuperCLI ≥ 0.5.0 requires the Console deploy-state contract — inspect \`supercli site deploys ${input.target.slug} --env ${input.target.env}\``,
|
|
445
|
+
resource: { id: siteId, deployId },
|
|
446
|
+
};
|
|
447
|
+
}
|
|
448
|
+
const replay = object(accepted)?.idempotent_replay === true ? ' (idempotent replay)' : '';
|
|
449
|
+
const waiting = NON_TERMINAL.has(initialState) ? '; waiting for edge_ready' : '';
|
|
450
|
+
progress(input, `deploy accepted: deployId=${deployId} state=${initialState}${replay}${waiting}`);
|
|
451
|
+
return waitForSiteDeploy(client, context, input, deps, siteId, authoritativeSiteView, deployId, accepted);
|
|
230
452
|
}
|
|
231
453
|
//# sourceMappingURL=siteAdapter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteAdapter.js","sourceRoot":"","sources":["../../src/deploy/siteAdapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"siteAdapter.js","sourceRoot":"","sources":["../../src/deploy/siteAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,8 @@ function classifySiteResponse(snap) {
|
|
|
75
75
|
}
|
|
76
76
|
const message = asString(snap.body?.message) ?? code;
|
|
77
77
|
const retryable = RETRYABLE_CODES.has(code) || extraRetryable(snap.body?.extra);
|
|
78
|
-
|
|
78
|
+
const resource = extraResource(snap.body?.extra);
|
|
79
|
+
return { kind: 'business_error', code, message, retryable, ...(resource !== undefined ? { resource } : {}) };
|
|
79
80
|
}
|
|
80
81
|
// 6. Anything else (unexpected 4xx that is not 401/403/429).
|
|
81
82
|
const message = asString(snap.body?.message) ?? `unexpected status ${snap.status}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responseClassifier.js","sourceRoot":"","sources":["../../src/publish/responseClassifier.ts"],"names":[],"mappings":";AAAA,+EAA+E;AAC/E,6EAA6E;AAC7E,gCAAgC;AAChC,+EAA+E;AAC/E,6EAA6E;AAC7E,6EAA6E;AAC7E,4EAA4E;AAC5E,qEAAqE;AACrE,gFAAgF;AAChF,gFAAgF;AAChF,4EAA4E;;;
|
|
1
|
+
{"version":3,"file":"responseClassifier.js","sourceRoot":"","sources":["../../src/publish/responseClassifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SiteClient = void 0;
|
|
3
|
+
exports.SiteClient = exports.TERMINAL_DEPLOY_STATES = void 0;
|
|
4
|
+
exports.uploadTimeoutMs = uploadTimeoutMs;
|
|
4
5
|
// Independent SuperSite HTTP client (AC-S6). A SEPARATE client from
|
|
5
6
|
// consoleClient because:
|
|
6
7
|
// - consoleClient is JSON-only (content-type: application/json, JSON.stringify
|
|
@@ -16,6 +17,19 @@ const responseClassifier_1 = require("./responseClassifier");
|
|
|
16
17
|
// a fail-fast on the file size only; the backend `inspect_zip` remains the final
|
|
17
18
|
// arbiter of the actual multipart body size.
|
|
18
19
|
const UPLOAD_FILE_LIMIT_BYTES = 50 * 1024 * 1024;
|
|
20
|
+
/** Default abort budget for the plain JSON calls (reads, environment/site creation). */
|
|
21
|
+
const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;
|
|
22
|
+
/**
|
|
23
|
+
* Upload-phase abort budget (CA-F260913145610 · AC-9): a base of 5 minutes plus one second per
|
|
24
|
+
* 256 KiB of archive, so a 50 MiB archive gets ≥ 8 minutes instead of the former flat 60 s that
|
|
25
|
+
* cut the whole request short. It only covers the POST that carries the bytes; the wait for
|
|
26
|
+
* `edge_ready` afterwards runs on its own clock in the site adapter.
|
|
27
|
+
*/
|
|
28
|
+
function uploadTimeoutMs(archiveBytes) {
|
|
29
|
+
const chunks = Math.ceil(Math.max(0, archiveBytes) / (256 * 1024));
|
|
30
|
+
return 300_000 + chunks * 1000;
|
|
31
|
+
}
|
|
32
|
+
exports.TERMINAL_DEPLOY_STATES = new Set(['edge_ready', 'superseded', 'failed']);
|
|
19
33
|
async function toSnapshot(res) {
|
|
20
34
|
const redirected = res.type === 'opaqueredirect' || (res.status >= 300 && res.status < 400);
|
|
21
35
|
if (redirected) {
|
|
@@ -65,7 +79,7 @@ class SiteClient {
|
|
|
65
79
|
return { kind: 'infra_error', message: 'no fetch implementation available (requires Node >=18)' };
|
|
66
80
|
}
|
|
67
81
|
const controller = new AbortController();
|
|
68
|
-
const timer = setTimeout(() => controller.abort(), opts.timeoutMs ??
|
|
82
|
+
const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS);
|
|
69
83
|
let res;
|
|
70
84
|
try {
|
|
71
85
|
const headers = this.headers(ctx, {
|
|
@@ -104,6 +118,19 @@ class SiteClient {
|
|
|
104
118
|
createSite(ctx, spid, body) {
|
|
105
119
|
return this.send(ctx, 'POST', `/api/console/projects/${encodeURIComponent(spid)}/sites`, { jsonBody: body });
|
|
106
120
|
}
|
|
121
|
+
/**
|
|
122
|
+
* Read one deploy by id (CA-F260913145610). Pure GET: no idempotency header, never starts or
|
|
123
|
+
* replays a deploy. A `deploy_id` outside this site/env is `NOT_FOUND`.
|
|
124
|
+
*/
|
|
125
|
+
getDeploy(ctx, spid, slug, env, deployId) {
|
|
126
|
+
return this.send(ctx, 'GET', `/api/console/projects/${encodeURIComponent(spid)}/sites/${encodeURIComponent(slug)}/envs/${encodeURIComponent(env)}/deploys/${encodeURIComponent(deployId)}`);
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* Publish one archive. Since CA-F260913145610 the server answers **HTTP 202** with the
|
|
130
|
+
* accepted `DeployView` (`state: "accepted"`) — a 2xx + `SUCCESS` envelope, which the shared
|
|
131
|
+
* classifier already reports as `success`; the site adapter then polls `getDeploy` until the
|
|
132
|
+
* row reaches a terminal state. `dry_run` still returns 200.
|
|
133
|
+
*/
|
|
107
134
|
deploy(ctx, spid, slug, env, input) {
|
|
108
135
|
if (input.zip.length > UPLOAD_FILE_LIMIT_BYTES) {
|
|
109
136
|
return Promise.resolve({
|
|
@@ -134,7 +161,7 @@ class SiteClient {
|
|
|
134
161
|
if (input.dryRun)
|
|
135
162
|
form.append('dry_run', 'true');
|
|
136
163
|
const extraHeaders = input.idempotencyKey ? { 'x-idempotency-key': input.idempotencyKey } : undefined;
|
|
137
|
-
return this.send(ctx, 'POST', `/api/console/projects/${encodeURIComponent(spid)}/sites/${encodeURIComponent(slug)}/envs/${encodeURIComponent(env)}/deploys`, { formBody: form, extraHeaders });
|
|
164
|
+
return this.send(ctx, 'POST', `/api/console/projects/${encodeURIComponent(spid)}/sites/${encodeURIComponent(slug)}/envs/${encodeURIComponent(env)}/deploys`, { formBody: form, extraHeaders, timeoutMs: uploadTimeoutMs(input.zip.byteLength) });
|
|
138
165
|
}
|
|
139
166
|
}
|
|
140
167
|
exports.SiteClient = SiteClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteClient.js","sourceRoot":"","sources":["../../src/publish/siteClient.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"siteClient.js","sourceRoot":"","sources":["../../src/publish/siteClient.ts"],"names":[],"mappings":"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"}
|