@supersdk/supercli 0.3.8-staging.66 → 0.3.8-staging.69
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 +18 -8
- package/dist/api/resourceClient.js.map +1 -1
- package/dist/auth/browserAuth.js +1 -1
- package/dist/auth/browserAuth.js.map +1 -1
- package/dist/auth/identityOverride.js +46 -0
- package/dist/auth/identityOverride.js.map +1 -0
- package/dist/auth/tokenAuth.js +15 -6
- package/dist/auth/tokenAuth.js.map +1 -1
- package/dist/cli.js +66 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/accounts.js +8 -3
- package/dist/commands/accounts.js.map +1 -1
- package/dist/commands/deploy.js +6 -87
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/image.js +10 -28
- package/dist/commands/image.js.map +1 -1
- package/dist/commands/login.js +13 -0
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logs.js +4 -12
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/publishSite.js +2 -1
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/runLifecycle.js +79 -6
- package/dist/commands/runLifecycle.js.map +1 -1
- package/dist/commands/superRun.js +9 -41
- package/dist/commands/superRun.js.map +1 -1
- package/dist/config/superConfig.js.map +1 -1
- package/dist/deploy/runAdapter.js +1 -1
- package/dist/deploy/runAdapter.js.map +1 -1
- package/dist/deploy/siteAdapter.js +1 -1
- package/dist/deploy/siteAdapter.js.map +1 -1
- package/dist/publish/registryClient.js +1 -3
- package/dist/publish/registryClient.js.map +1 -1
- package/dist/publish/runClient.js +1 -2
- package/dist/publish/runClient.js.map +1 -1
- package/dist/publish/siteClient.js +7 -1
- package/dist/publish/siteClient.js.map +1 -1
- package/dist/store/accountStore.js +39 -4
- package/dist/store/accountStore.js.map +1 -1
- package/dist/template/android/supersdk-default.config.json +1 -1
- package/dist/template/web/src/js/supersdk.js +5 -1
- package/dist/template/web/src/js/supersdk.provenance.json +3 -3
- package/dist/util/deprecations.js +25 -0
- package/dist/util/deprecations.js.map +1 -0
- package/package.json +1 -1
- package/dist/publish/orgResolve.js +0 -29
- package/dist/publish/orgResolve.js.map +0 -1
|
@@ -163,22 +163,32 @@ class RunResourceClient {
|
|
|
163
163
|
});
|
|
164
164
|
}
|
|
165
165
|
/**
|
|
166
|
-
*
|
|
166
|
+
* Binds one custom hostname and returns the DNS records to create — a TXT record proving
|
|
167
|
+
* ownership and a CNAME record pointing traffic at the platform (`records[]`, always TXT
|
|
168
|
+
* then CNAME).
|
|
167
169
|
*
|
|
168
|
-
*
|
|
169
|
-
*
|
|
170
|
-
*
|
|
171
|
-
*
|
|
170
|
+
* 🔴 Not versioned. The former `custom-hosts/cname-v1` route has been retired together
|
|
171
|
+
* with the old `dns`/`verification_mode` response contract. Per the accepted rollout
|
|
172
|
+
* decision, this client does not add a compatibility probe or fallback; CLI and server
|
|
173
|
+
* versions outside the new contract are unsupported during the deployment window.
|
|
172
174
|
*/
|
|
173
175
|
addCustomHost(ctx, spid, slug, env, hostname) {
|
|
174
|
-
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'POST', `${serviceEnvPath(spid, slug, env)}/custom-hosts
|
|
176
|
+
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'POST', `${serviceEnvPath(spid, slug, env)}/custom-hosts`, { body: { hostname }, bearer: ctx.token, fetchImpl: this.fetchImpl, parseServerErrorEnvelope: true });
|
|
175
177
|
}
|
|
178
|
+
/**
|
|
179
|
+
* Re-checks DNS for one hostname. When this call reclaims the hostname from another
|
|
180
|
+
* service's binding, the server does two SuperRun outbound calls inside one advisory-lock
|
|
181
|
+
* critical section — worst case observed ≈60s — so the client timeout is 90s (not the usual
|
|
182
|
+
* default), leaving real margin. A CLI-side timeout here is not a half-applied state: the
|
|
183
|
+
* server side is idempotent and safe to replay, so the next `list`/`verify` is simply the
|
|
184
|
+
* truth.
|
|
185
|
+
*/
|
|
176
186
|
verifyCustomHost(ctx, spid, slug, env, hostname) {
|
|
177
|
-
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'POST', `${serviceEnvPath(spid, slug, env)}/custom-hosts/
|
|
187
|
+
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'POST', `${serviceEnvPath(spid, slug, env)}/custom-hosts/verify`, {
|
|
178
188
|
body: { hostname },
|
|
179
189
|
bearer: ctx.token,
|
|
180
190
|
fetchImpl: this.fetchImpl,
|
|
181
|
-
timeoutMs:
|
|
191
|
+
timeoutMs: 90_000,
|
|
182
192
|
parseServerErrorEnvelope: true,
|
|
183
193
|
});
|
|
184
194
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resourceClient.js","sourceRoot":"","sources":["../../src/api/resourceClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"resourceClient.js","sourceRoot":"","sources":["../../src/api/resourceClient.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/browserAuth.js
CHANGED
|
@@ -79,7 +79,7 @@ async function login(deps) {
|
|
|
79
79
|
return { ok: false, message: 'whoami did not return a user id; cannot establish a stable account identity' };
|
|
80
80
|
}
|
|
81
81
|
const orgId = String(who.org_id ?? issued.org_id ?? '');
|
|
82
|
-
const accountKey = (0, accountStore_1.deriveAccountKey)(env.label, env.apiOrigin, userId);
|
|
82
|
+
const accountKey = (0, accountStore_1.deriveAccountKey)(env.label, env.apiOrigin, userId, deps.label);
|
|
83
83
|
const existing = (0, accountStore_1.getAccount)(accountKey);
|
|
84
84
|
// Captured BEFORE any mutation so a failed commit can restore it exactly (TC-12).
|
|
85
85
|
// backend.get must be wrapped: the token is already minted, so any escape here
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browserAuth.js","sourceRoot":"","sources":["../../src/auth/browserAuth.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"browserAuth.js","sourceRoot":"","sources":["../../src/auth/browserAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* The identity chosen for THIS invocation by `--account`.
|
|
4
|
+
*
|
|
5
|
+
* # Why the precedence lives here and not in each command
|
|
6
|
+
*
|
|
7
|
+
* Every console-calling command resolves its credential the same way: `resolveEnvToken()`
|
|
8
|
+
* first, then the current stored account. If `--account` were honoured only in the second
|
|
9
|
+
* step, `SUPERCLI_TOKEN` would silently win whenever it happened to be exported — which is
|
|
10
|
+
* precisely the CI shell where per-command identity switching matters most. Putting the
|
|
11
|
+
* override in one leaf module that BOTH `resolveEnvToken` and `getCurrentAccount` consult
|
|
12
|
+
* makes the rule true everywhere without touching a single command.
|
|
13
|
+
*
|
|
14
|
+
* # The rule
|
|
15
|
+
*
|
|
16
|
+
* `--account` (a flag typed for this one call) beats `SUPERCLI_TOKEN` (ambient environment)
|
|
17
|
+
* beats the stored `current`. Most explicit and most local wins — the same order
|
|
18
|
+
* `gcloud --account`, `kubectl --context` and `git -c` use.
|
|
19
|
+
*
|
|
20
|
+
* 🔴 **Resolution failure must never fall back.** If `--account acme` cannot be resolved,
|
|
21
|
+
* the command aborts. Falling back to the env token or to `current` would run as an
|
|
22
|
+
* identity the caller did not ask for, which is the one outcome worth failing loudly to
|
|
23
|
+
* avoid — far worse than any confusion about precedence.
|
|
24
|
+
*/
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.setAccountOverride = setAccountOverride;
|
|
27
|
+
exports.accountOverrideKey = accountOverrideKey;
|
|
28
|
+
exports.hasAccountOverride = hasAccountOverride;
|
|
29
|
+
exports.clearAccountOverride = clearAccountOverride;
|
|
30
|
+
let overrideKey = null;
|
|
31
|
+
/** Records the account key `--account` resolved to. Only the CLI bootstrap calls this. */
|
|
32
|
+
function setAccountOverride(accountKey) {
|
|
33
|
+
overrideKey = accountKey;
|
|
34
|
+
}
|
|
35
|
+
/** The account key chosen for this invocation, or null when `--account` was not used. */
|
|
36
|
+
function accountOverrideKey() {
|
|
37
|
+
return overrideKey;
|
|
38
|
+
}
|
|
39
|
+
function hasAccountOverride() {
|
|
40
|
+
return overrideKey !== null;
|
|
41
|
+
}
|
|
42
|
+
/** Test-only reset; the real process sets this once and never clears it. */
|
|
43
|
+
function clearAccountOverride() {
|
|
44
|
+
overrideKey = null;
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=identityOverride.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"identityOverride.js","sourceRoot":"","sources":["../../src/auth/identityOverride.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;;AAKH,gDAEC;AAGD,gDAEC;AAED,gDAEC;AAGD,oDAEC;AAnBD,IAAI,WAAW,GAAkB,IAAI,CAAC;AAEtC,0FAA0F;AAC1F,SAAgB,kBAAkB,CAAC,UAAkB;IACnD,WAAW,GAAG,UAAU,CAAC;AAC3B,CAAC;AAED,yFAAyF;AACzF,SAAgB,kBAAkB;IAChC,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAgB,kBAAkB;IAChC,OAAO,WAAW,KAAK,IAAI,CAAC;AAC9B,CAAC;AAED,4EAA4E;AAC5E,SAAgB,oBAAoB;IAClC,WAAW,GAAG,IAAI,CAAC;AACrB,CAAC"}
|
package/dist/auth/tokenAuth.js
CHANGED
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SUPERCLI_TOKEN_ENV = void 0;
|
|
4
|
+
exports.resolveEnvToken = resolveEnvToken;
|
|
5
|
+
exports.resolveToken = resolveToken;
|
|
6
|
+
exports.maskToken = maskToken;
|
|
7
|
+
const identityOverride_1 = require("./identityOverride");
|
|
2
8
|
// Token identity (AC-5). The CLI's single credential is one user token, minted
|
|
3
9
|
// by `supercli login` (persisted) OR supplied out-of-band by the environment.
|
|
4
10
|
//
|
|
@@ -12,14 +18,17 @@
|
|
|
12
18
|
// Auth is attached as `Authorization: Bearer <token>` (+ `X-Org-Id`, added by
|
|
13
19
|
// the request clients); a `cli_`-prefixed token routes to the user-identity
|
|
14
20
|
// (AuthedUser) arm server-side.
|
|
15
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
exports.SUPERCLI_TOKEN_ENV = void 0;
|
|
17
|
-
exports.resolveEnvToken = resolveEnvToken;
|
|
18
|
-
exports.resolveToken = resolveToken;
|
|
19
|
-
exports.maskToken = maskToken;
|
|
20
21
|
exports.SUPERCLI_TOKEN_ENV = 'SUPERCLI_TOKEN';
|
|
21
|
-
/**
|
|
22
|
+
/**
|
|
23
|
+
* The `SUPERCLI_TOKEN` value if present and non-empty, else null.
|
|
24
|
+
*
|
|
25
|
+
* 🔴 Yields to `--account`. A flag typed for this one call is a more explicit statement of
|
|
26
|
+
* intent than an environment variable inherited from the shell, and honouring the env var
|
|
27
|
+
* here would make `--account` unusable in exactly the CI job where it is worth having.
|
|
28
|
+
*/
|
|
22
29
|
function resolveEnvToken() {
|
|
30
|
+
if ((0, identityOverride_1.hasAccountOverride)())
|
|
31
|
+
return null;
|
|
23
32
|
const raw = process.env[exports.SUPERCLI_TOKEN_ENV];
|
|
24
33
|
const trimmed = raw?.trim();
|
|
25
34
|
return trimmed && trimmed.length > 0 ? trimmed : null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenAuth.js","sourceRoot":"","sources":["../../src/auth/tokenAuth.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"tokenAuth.js","sourceRoot":"","sources":["../../src/auth/tokenAuth.ts"],"names":[],"mappings":";;;AAgCA,0CAKC;AAOD,oCAKC;AAGD,8BAKC;AAzDD,yDAAwD;AAExD,+EAA+E;AAC/E,8EAA8E;AAC9E,EAAE;AACF,4EAA4E;AAC5E,uEAAuE;AACvE,uEAAuE;AACvE,mEAAmE;AACnE,8EAA8E;AAC9E,qEAAqE;AACrE,EAAE;AACF,8EAA8E;AAC9E,4EAA4E;AAC5E,gCAAgC;AAEnB,QAAA,kBAAkB,GAAG,gBAAgB,CAAC;AASnD;;;;;;GAMG;AACH,SAAgB,eAAe;IAC7B,IAAI,IAAA,qCAAkB,GAAE;QAAE,OAAO,IAAI,CAAC;IACtC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,GAAG,EAAE,IAAI,EAAE,CAAC;IAC5B,OAAO,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACxD,CAAC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAC,eAAoC;IAC/D,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;IACnC,IAAI,QAAQ;QAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACxD,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC;AAED,6EAA6E;AAC7E,SAAgB,SAAS,CAAC,KAAa;IACrC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,OAAO,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC;AAC7B,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -28,6 +28,9 @@ const update_1 = require("./commands/update");
|
|
|
28
28
|
const resultPrinter_1 = require("./output/resultPrinter");
|
|
29
29
|
const log_1 = require("./util/log");
|
|
30
30
|
const prompt_1 = require("./util/prompt");
|
|
31
|
+
const identityOverride_1 = require("./auth/identityOverride");
|
|
32
|
+
const accountStore_1 = require("./store/accountStore");
|
|
33
|
+
const log_2 = require("./util/log");
|
|
31
34
|
// package.json is always shipped alongside dist/ in an npm package (npm
|
|
32
35
|
// always includes it regardless of the "files" allowlist), so this resolves
|
|
33
36
|
// correctly both in local dev and in an installed/packed tarball.
|
|
@@ -54,6 +57,62 @@ function detectOutputMode(argv) {
|
|
|
54
57
|
function detectNoInput(argv) {
|
|
55
58
|
return argv.includes('--no-input');
|
|
56
59
|
}
|
|
60
|
+
function detectAccountSelector(argv) {
|
|
61
|
+
for (let i = 2; i < argv.length; i++) {
|
|
62
|
+
const a = argv[i];
|
|
63
|
+
if (a === '--account')
|
|
64
|
+
return argv[i + 1];
|
|
65
|
+
if (a.startsWith('--account='))
|
|
66
|
+
return a.slice('--account='.length);
|
|
67
|
+
}
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Resolve `--account` to a stored account, before any command runs.
|
|
72
|
+
*
|
|
73
|
+
* 🔴 Every outcome except "resolved" aborts. Falling back to `SUPERCLI_TOKEN` or to the
|
|
74
|
+
* stored `current` would run the command as an identity the caller did not name — the one
|
|
75
|
+
* failure worth being loud about. Ambiguity aborts too, for the same reason.
|
|
76
|
+
*/
|
|
77
|
+
function applyAccountSelector(selector, mode) {
|
|
78
|
+
if (selector === undefined)
|
|
79
|
+
return true;
|
|
80
|
+
const value = selector.trim();
|
|
81
|
+
const fail = (message) => {
|
|
82
|
+
new resultPrinter_1.ResultPrinter(mode).failure('usage_error', message);
|
|
83
|
+
return false;
|
|
84
|
+
};
|
|
85
|
+
if (!value)
|
|
86
|
+
return fail('--account requires an account selector');
|
|
87
|
+
// `--account` names a stored credential; it is not a place to paste one. The no-secrets-on-argv
|
|
88
|
+
// rule that keeps `--token` from existing applies just as much here.
|
|
89
|
+
if (/^(?:cli_|sst_)/.test(value)) {
|
|
90
|
+
return fail('--account takes an account label, email or user id — not a token; use SUPERCLI_TOKEN to supply a token');
|
|
91
|
+
}
|
|
92
|
+
let accounts;
|
|
93
|
+
try {
|
|
94
|
+
accounts = (0, accountStore_1.listAccounts)();
|
|
95
|
+
}
|
|
96
|
+
catch (error) {
|
|
97
|
+
new resultPrinter_1.ResultPrinter(mode).failure('infra_error', `could not read the account list: ${error.message}`);
|
|
98
|
+
return false;
|
|
99
|
+
}
|
|
100
|
+
const resolution = (0, accountStore_1.resolveSelector)(accounts, value);
|
|
101
|
+
if (resolution.kind === 'not_found') {
|
|
102
|
+
return fail(`no saved account matches ${JSON.stringify(value)} — run \`supercli accounts\` to list them`);
|
|
103
|
+
}
|
|
104
|
+
if (resolution.kind === 'ambiguous') {
|
|
105
|
+
const keys = resolution.matches.map((account) => account.accountKey).join(', ');
|
|
106
|
+
return fail(`${JSON.stringify(value)} matches several accounts (${keys}) — name one by its account key`);
|
|
107
|
+
}
|
|
108
|
+
(0, identityOverride_1.setAccountOverride)(resolution.account.accountKey);
|
|
109
|
+
if (process.env.SUPERCLI_TOKEN?.trim()) {
|
|
110
|
+
// Not a conflict to refuse: the flag is the more explicit signal and wins. But an
|
|
111
|
+
// override of an exported token is worth saying out loud, once, on stderr.
|
|
112
|
+
log_2.log.warn(`--account ${resolution.account.accountKey} overrides SUPERCLI_TOKEN for this invocation`);
|
|
113
|
+
}
|
|
114
|
+
return true;
|
|
115
|
+
}
|
|
57
116
|
function buildProgram() {
|
|
58
117
|
const program = new commander_1.Command();
|
|
59
118
|
program
|
|
@@ -64,7 +123,8 @@ function buildProgram() {
|
|
|
64
123
|
.enablePositionalOptions()
|
|
65
124
|
.version(pkg.version, '--version', 'output the version number')
|
|
66
125
|
.option('--output <mode>', 'output mode: "json" emits a single machine-readable envelope on stdout')
|
|
67
|
-
.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)')
|
|
126
|
+
.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)')
|
|
127
|
+
.option('--account <selector>', 'act as one saved account for this invocation (account key, label, email or user id); overrides SUPERCLI_TOKEN');
|
|
68
128
|
(0, login_1.registerLoginCommand)(program);
|
|
69
129
|
(0, accounts_1.registerAccountsCommand)(program);
|
|
70
130
|
(0, projects_1.registerProjectsCommand)(program);
|
|
@@ -120,6 +180,9 @@ function buildProgram() {
|
|
|
120
180
|
if (!cmd.options.some((option) => option.long === '--no-input')) {
|
|
121
181
|
cmd.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)');
|
|
122
182
|
}
|
|
183
|
+
if (!cmd.options.some((option) => option.long === '--account')) {
|
|
184
|
+
cmd.option('--account <selector>', 'act as one saved account for this invocation (account key, label, email or user id); overrides SUPERCLI_TOKEN');
|
|
185
|
+
}
|
|
123
186
|
for (const child of cmd.commands)
|
|
124
187
|
ensureAgentOptions(child);
|
|
125
188
|
};
|
|
@@ -134,6 +197,8 @@ async function run() {
|
|
|
134
197
|
(0, log_1.setLogJsonMode)(mode === 'json');
|
|
135
198
|
// json mode implies non-interactive (AC-2); --no-input is the explicit form.
|
|
136
199
|
(0, prompt_1.setNonInteractive)(mode === 'json' || noInput);
|
|
200
|
+
if (!applyAccountSelector(detectAccountSelector(argv), mode))
|
|
201
|
+
return;
|
|
137
202
|
const program = buildProgram();
|
|
138
203
|
if (mode === 'json') {
|
|
139
204
|
// In json mode a commander parse error (unknown command / missing required
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runAccounts = runAccounts;
|
|
4
4
|
exports.registerAccountsCommand = registerAccountsCommand;
|
|
5
5
|
const accountStore_1 = require("../store/accountStore");
|
|
6
|
+
const identityOverride_1 = require("../auth/identityOverride");
|
|
6
7
|
const credentialStore_1 = require("../store/credentialStore");
|
|
7
8
|
const tokenAuth_1 = require("../auth/tokenAuth");
|
|
8
9
|
const resultPrinter_1 = require("../output/resultPrinter");
|
|
@@ -25,7 +26,7 @@ function defaultReadCredential(account) {
|
|
|
25
26
|
}
|
|
26
27
|
const defaultDeps = {
|
|
27
28
|
listAccounts: accountStore_1.listAccounts,
|
|
28
|
-
|
|
29
|
+
persistedCurrentKey: accountStore_1.persistedCurrentKey,
|
|
29
30
|
readCredential: defaultReadCredential,
|
|
30
31
|
};
|
|
31
32
|
/**
|
|
@@ -38,7 +39,7 @@ function runAccounts(deps = defaultDeps) {
|
|
|
38
39
|
let current;
|
|
39
40
|
try {
|
|
40
41
|
accounts = deps.listAccounts();
|
|
41
|
-
current = deps.
|
|
42
|
+
current = deps.persistedCurrentKey();
|
|
42
43
|
}
|
|
43
44
|
catch (err) {
|
|
44
45
|
return { ok: false, kind: 'infra_error', message: `无法读取账号列表:${err.message}` };
|
|
@@ -65,13 +66,14 @@ function runAccounts(deps = defaultDeps) {
|
|
|
65
66
|
});
|
|
66
67
|
return {
|
|
67
68
|
ok: true,
|
|
68
|
-
result: { current:
|
|
69
|
+
result: { current, accounts: views, ...((0, identityOverride_1.accountOverrideKey)() ? { actingAs: (0, identityOverride_1.accountOverrideKey)() } : {}) },
|
|
69
70
|
humanMessage: views.length === 0
|
|
70
71
|
? 'no saved accounts — run `supercli login` to add one'
|
|
71
72
|
: undefined,
|
|
72
73
|
};
|
|
73
74
|
}
|
|
74
75
|
function printHuman(current, views) {
|
|
76
|
+
const actingAs = (0, identityOverride_1.accountOverrideKey)();
|
|
75
77
|
if (views.length === 0) {
|
|
76
78
|
log_1.log.info('no saved accounts — run `supercli login` to add one');
|
|
77
79
|
return;
|
|
@@ -84,6 +86,9 @@ function printHuman(current, views) {
|
|
|
84
86
|
const idLabel = v.email ?? v.credentialMasked ?? `user:${v.accountKey}`;
|
|
85
87
|
log_1.log.info(`${marker} ${v.accountKey} ${idLabel} [${v.env}]${orgLabel}${statusLabel}${healthLabel}`);
|
|
86
88
|
}
|
|
89
|
+
// `*` marks the persisted default; say separately when this call is acting as another.
|
|
90
|
+
if (actingAs)
|
|
91
|
+
log_1.log.info(`acting as ${actingAs} for this invocation (--account)`);
|
|
87
92
|
}
|
|
88
93
|
function registerAccountsCommand(program) {
|
|
89
94
|
program
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../src/commands/accounts.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../src/commands/accounts.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/deploy.js
CHANGED
|
@@ -50,8 +50,8 @@ const registry_1 = require("../docker/registry");
|
|
|
50
50
|
const resultPrinter_1 = require("../output/resultPrinter");
|
|
51
51
|
const accountStore_1 = require("../store/accountStore");
|
|
52
52
|
const credentialStore_1 = require("../store/credentialStore");
|
|
53
|
-
const log_1 = require("../util/log");
|
|
54
53
|
const prompt_1 = require("../util/prompt");
|
|
54
|
+
const deprecations_1 = require("../util/deprecations");
|
|
55
55
|
// Security-oriented public parser retained for the registered name-only
|
|
56
56
|
// `--secret` flag. It is the same implementation used by deploy preflight.
|
|
57
57
|
var preflight_2 = require("../deploy/preflight");
|
|
@@ -81,15 +81,6 @@ function trim(value) {
|
|
|
81
81
|
function record(value) {
|
|
82
82
|
return value !== null && typeof value === 'object' ? value : undefined;
|
|
83
83
|
}
|
|
84
|
-
function failureKind(kind) {
|
|
85
|
-
switch (kind) {
|
|
86
|
-
case 'forbidden': return 'forbidden';
|
|
87
|
-
case 'rate_limited': return 'rate_limited';
|
|
88
|
-
case 'infra_error': return 'infra_error';
|
|
89
|
-
case 'auth_invalid': return 'auth_invalid';
|
|
90
|
-
default: return 'business_error';
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
84
|
function projectVersion(config, project) {
|
|
94
85
|
const fromProject = record(project.version)?.name;
|
|
95
86
|
const fromWorkspace = record(config.document.version)?.name;
|
|
@@ -167,61 +158,6 @@ function resolveAuth(deps) {
|
|
|
167
158
|
}
|
|
168
159
|
return { token, apiOrigin: account.apiOrigin, accountKey: account.accountKey };
|
|
169
160
|
}
|
|
170
|
-
async function resolveOrg(auth, config, explicitOrg, deps) {
|
|
171
|
-
const started = Date.now();
|
|
172
|
-
let who;
|
|
173
|
-
try {
|
|
174
|
-
who = await deps.fetchWhoami(auth.apiOrigin, auth.token);
|
|
175
|
-
}
|
|
176
|
-
catch (error) {
|
|
177
|
-
const message = `identity request failed: ${error.message}`;
|
|
178
|
-
log_1.log.error(message, {
|
|
179
|
-
target: auth.apiOrigin,
|
|
180
|
-
request_summary: `/api/open/whoami for ${config.spid}`,
|
|
181
|
-
response_summary: 'transport threw',
|
|
182
|
-
duration_ms: Date.now() - started,
|
|
183
|
-
retry: true,
|
|
184
|
-
});
|
|
185
|
-
return { ok: false, kind: 'infra_error', code: 'AUTH_RESOLUTION_FAILED', message };
|
|
186
|
-
}
|
|
187
|
-
if (who.kind === 'auth_invalid') {
|
|
188
|
-
log_1.log.error('identity request rejected the current credential', {
|
|
189
|
-
target: auth.apiOrigin,
|
|
190
|
-
request_summary: `/api/open/whoami for ${config.spid}`,
|
|
191
|
-
response_summary: 'AUTH_INVALID',
|
|
192
|
-
duration_ms: Date.now() - started,
|
|
193
|
-
retry: false,
|
|
194
|
-
});
|
|
195
|
-
if (auth.accountKey)
|
|
196
|
-
deps.markNeedsLogin(auth.accountKey);
|
|
197
|
-
return { ok: false, kind: 'needs_login', code: 'AUTH_INVALID', message: 'credentials are no longer valid — run `supercli login` again' };
|
|
198
|
-
}
|
|
199
|
-
if (who.kind !== 'success') {
|
|
200
|
-
const code = who.kind === 'forbidden' ? 'FORBIDDEN' : who.kind === 'rate_limited' ? 'RATE_LIMITED' : 'AUTH_RESOLUTION_FAILED';
|
|
201
|
-
log_1.log.error(`identity request failed: ${who.message}`, {
|
|
202
|
-
target: auth.apiOrigin,
|
|
203
|
-
request_summary: `/api/open/whoami for ${config.spid}`,
|
|
204
|
-
response_summary: code,
|
|
205
|
-
duration_ms: Date.now() - started,
|
|
206
|
-
retry: who.kind === 'rate_limited' || who.kind === 'infra_error',
|
|
207
|
-
});
|
|
208
|
-
return {
|
|
209
|
-
ok: false,
|
|
210
|
-
kind: failureKind(who.kind),
|
|
211
|
-
code,
|
|
212
|
-
message: `cannot resolve the org bound to the current token: ${'message' in who ? who.message : 'identity request failed'}`,
|
|
213
|
-
};
|
|
214
|
-
}
|
|
215
|
-
const tokenOrg = String(who.data.org_id ?? '');
|
|
216
|
-
const requested = trim(explicitOrg) ?? config.orgId ?? tokenOrg;
|
|
217
|
-
if (!/^[1-9][0-9]*$/.test(requested)) {
|
|
218
|
-
return { ok: false, kind: 'business_error', code: 'ORG_REQUIRED', message: 'the selected config/token has no valid org binding' };
|
|
219
|
-
}
|
|
220
|
-
if (tokenOrg !== requested || (config.orgId !== undefined && config.orgId !== requested)) {
|
|
221
|
-
return { ok: false, kind: 'forbidden', code: 'ORG_MISMATCH', message: 'the token org, --org and configured orgId must identify the same organization' };
|
|
222
|
-
}
|
|
223
|
-
return { ok: true, orgId: requested };
|
|
224
|
-
}
|
|
225
161
|
function replaceProjectResult(results, projectId, replacement) {
|
|
226
162
|
const index = results.findIndex((entry) => entry.projectId === projectId);
|
|
227
163
|
if (index >= 0)
|
|
@@ -312,25 +248,10 @@ async function runUnifiedDeploy(mode, options, deps = exports.defaultUnifiedDepl
|
|
|
312
248
|
}
|
|
313
249
|
return { ...auth, message: `${auth.message}; deploy result: ${writer.resultPath}`, result: publicDeployResult(writer, deploy) };
|
|
314
250
|
}
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
: project);
|
|
320
|
-
let deploy;
|
|
321
|
-
try {
|
|
322
|
-
deploy = writer.finalize({
|
|
323
|
-
...resultInputIdentity(config, envTarget, mode === 'single' ? projectId : undefined),
|
|
324
|
-
buildManifestSha256: preflight.buildManifestSha256,
|
|
325
|
-
overallStatus: 'failed',
|
|
326
|
-
projects,
|
|
327
|
-
});
|
|
328
|
-
}
|
|
329
|
-
catch (error) {
|
|
330
|
-
return { ok: false, kind: 'infra_error', publicCode: 'DEPLOY_RESULT_WRITE_FAILED', message: `deploy result could not be written: ${error.message}; invocation ${writer.invocationId}`, invocationId: writer.invocationId };
|
|
331
|
-
}
|
|
332
|
-
return { ok: false, kind: org.kind, publicCode: org.code, message: `${org.message}; deploy result: ${writer.resultPath}`, result: publicDeployResult(writer, deploy) };
|
|
333
|
-
}
|
|
251
|
+
// No org preflight. It cost a whoami round trip on every deploy to re-check something the
|
|
252
|
+
// server is the authority on: `resolve_caller_org` takes the org from `token.org` and 403s
|
|
253
|
+
// on any client-sent org that disagrees. A credential acts in exactly one org, decided when
|
|
254
|
+
// it was minted — the CLI has nothing to add.
|
|
334
255
|
const results = preflight.projects.map((project) => ({ ...project }));
|
|
335
256
|
let successes = 0;
|
|
336
257
|
let running = 0;
|
|
@@ -381,7 +302,6 @@ async function runUnifiedDeploy(mode, options, deps = exports.defaultUnifiedDepl
|
|
|
381
302
|
? await deps.deploySite({
|
|
382
303
|
apiOrigin: auth.apiOrigin,
|
|
383
304
|
token: auth.token,
|
|
384
|
-
orgId: org.orgId,
|
|
385
305
|
spid: config.spid,
|
|
386
306
|
projectId: plan.project.projectId,
|
|
387
307
|
target: plan.target,
|
|
@@ -394,7 +314,6 @@ async function runUnifiedDeploy(mode, options, deps = exports.defaultUnifiedDepl
|
|
|
394
314
|
: await deps.deployRun({
|
|
395
315
|
apiOrigin: auth.apiOrigin,
|
|
396
316
|
token: auth.token,
|
|
397
|
-
orgId: org.orgId,
|
|
398
317
|
spid: config.spid,
|
|
399
318
|
project: plan.project,
|
|
400
319
|
target: plan.target,
|
|
@@ -551,7 +470,7 @@ function addOptions(command, includeProject) {
|
|
|
551
470
|
.requiredOption('--env-target <name>', 'named deploy target from the selected project(s)')
|
|
552
471
|
.requiredOption('--build-dir <dir>', 'portable build directory containing super-build-manifest.json')
|
|
553
472
|
.option('--config <path>', 'explicit super.json-compatible config path')
|
|
554
|
-
.option('--org <id>',
|
|
473
|
+
.option('--org <id>', deprecations_1.IGNORED_ORG_DESCRIPTION, deprecations_1.acceptIgnoredOrg)
|
|
555
474
|
.option('--log-tail <count>', 'startup log lines retained when a service fails readiness (1..2000)', '50')
|
|
556
475
|
.option('--dry-run', 'validate through the platform without uploading, pushing or changing resources')
|
|
557
476
|
.option('--idempotency-key <key>', 'base idempotency key; projectId is appended per adapter call')
|