@supersdk/supercli 0.2.1-staging.20 → 0.3.0-staging.22
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/consoleClient.js +17 -12
- package/dist/api/consoleClient.js.map +1 -1
- package/dist/auth/browserAuth.js +42 -44
- package/dist/auth/browserAuth.js.map +1 -1
- package/dist/auth/tokenAuth.js +46 -0
- package/dist/auth/tokenAuth.js.map +1 -0
- package/dist/cli.js +70 -8
- package/dist/cli.js.map +1 -1
- package/dist/commands/accounts.js +89 -31
- package/dist/commands/accounts.js.map +1 -1
- package/dist/commands/add.js +519 -0
- package/dist/commands/add.js.map +1 -0
- package/dist/commands/init.js +234 -0
- package/dist/commands/init.js.map +1 -0
- package/dist/commands/login.js +75 -48
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.js +20 -25
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/publishSite.js +491 -149
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/switchaccount.js +36 -24
- package/dist/commands/switchaccount.js.map +1 -1
- package/dist/config/appConfig.js +160 -45
- package/dist/config/appConfig.js.map +1 -1
- package/dist/config/environments.js +17 -1
- package/dist/config/environments.js.map +1 -1
- package/dist/exit/exitCodes.js +55 -0
- package/dist/exit/exitCodes.js.map +1 -0
- package/dist/output/envelope.js +104 -0
- package/dist/output/envelope.js.map +1 -0
- package/dist/output/resultPrinter.js +70 -0
- package/dist/output/resultPrinter.js.map +1 -0
- package/dist/publish/siteClient.js +14 -4
- package/dist/publish/siteClient.js.map +1 -1
- package/dist/publish/siteConfig.js +278 -63
- package/dist/publish/siteConfig.js.map +1 -1
- package/dist/store/accountStore.js +2 -2
- package/dist/store/accountStore.js.map +1 -1
- package/dist/store/backends/encryptedFile.js +4 -1
- package/dist/store/backends/encryptedFile.js.map +1 -1
- package/dist/store/backends/osKeyring.js +4 -8
- package/dist/store/backends/osKeyring.js.map +1 -1
- package/dist/store/credentialStore.js +22 -0
- package/dist/store/credentialStore.js.map +1 -1
- package/dist/template/README.md +144 -85
- package/dist/template/android/app/build.gradle.kts +0 -3
- package/dist/template/android/app/src/main/java/com/supersdk/simple/EnvironmentStore.java +41 -0
- package/dist/template/android/app/src/main/java/com/supersdk/simple/MainActivity.java +57 -4
- package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +3 -1
- package/dist/template/android/gradle/supersdk-config-reader.gradle +5 -3
- package/dist/template/android/supersdk-default.config.json +4 -3
- package/dist/template/ios/Sources/App/EnvironmentStore.swift +35 -0
- package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +2 -1
- package/dist/template/ios/Sources/App/SimpleSDKProbe.swift +15 -0
- package/dist/template/ios/Sources/App/SimpleViewController.swift +52 -8
- package/dist/template/ios/Tests/SimpleAppTests/SimpleSDKInitializationTests.swift +12 -1
- package/dist/template/scripts/android_snapshot_canary.py +17 -8
- package/dist/template/scripts/build_android.sh +36 -9
- package/dist/template/scripts/build_ios.sh +63 -24
- package/dist/template/scripts/build_site.sh +43 -0
- package/dist/template/scripts/lib/workspace.sh +43 -0
- package/dist/template/scripts/serve_web.py +26 -9
- package/dist/template/scripts/super_build_orchestrator.py +49 -28
- package/dist/template/scripts/supersdk_template.py +759 -240
- package/dist/template/scripts/web_package.py +44 -20
- package/dist/template/super_build.sh +40 -12
- package/dist/template/supersdk.json +25 -13
- package/dist/template/template_manifest.json +25 -0
- package/dist/template/web/src/css/style.css +28 -0
- package/dist/template/web/src/index.html +8 -0
- package/dist/template/web/src/js/app.js +92 -19
- package/dist/util/log.js +10 -1
- package/dist/util/log.js.map +1 -1
- package/dist/util/prompt.js +25 -0
- package/dist/util/prompt.js.map +1 -1
- package/dist/workspace/config.js +440 -0
- package/dist/workspace/config.js.map +1 -0
- package/dist/workspace/identity.js +106 -0
- package/dist/workspace/identity.js.map +1 -0
- package/dist/workspace/interactive.js +96 -0
- package/dist/workspace/interactive.js.map +1 -0
- package/dist/workspace/template.js +357 -0
- package/dist/workspace/template.js.map +1 -0
- package/package.json +1 -1
- package/dist/auth/refresh.js +0 -32
- package/dist/auth/refresh.js.map +0 -1
- package/dist/commands/createApp.js +0 -448
- package/dist/commands/createApp.js.map +0 -1
- package/dist/createApp/copyTemplate.js +0 -561
- package/dist/createApp/copyTemplate.js.map +0 -1
- package/dist/template/scripts/build_web.sh +0 -12
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Programmable exit-code classification (AC-3). Maps a command outcome kind to
|
|
3
|
+
// (a) the process exit code and (b) the stable `error.code` string in the JSON
|
|
4
|
+
// envelope, so an Agent can branch on either channel.
|
|
5
|
+
//
|
|
6
|
+
// success / soft_success -> 0 (soft_success also sets soft:true)
|
|
7
|
+
// business_error / forbidden -> 2
|
|
8
|
+
// auth_invalid / needs_login -> 3
|
|
9
|
+
// rate_limited -> 4
|
|
10
|
+
// infra_error -> 5
|
|
11
|
+
// usage_error (commander) -> 6
|
|
12
|
+
//
|
|
13
|
+
// 🔴 exit 2 (forbidden: you lack this permission / are no longer in this org)
|
|
14
|
+
// and exit 3 (auth_invalid: the token itself is gone/expired) are deliberately
|
|
15
|
+
// distinct — AC-6/TC-048 requires the CLI to tell "token deleted" (exit 3) apart
|
|
16
|
+
// from "removed from org" (exit 2).
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.ERROR_CODE = exports.EXIT = void 0;
|
|
19
|
+
exports.classifyFailure = classifyFailure;
|
|
20
|
+
exports.EXIT = {
|
|
21
|
+
SUCCESS: 0,
|
|
22
|
+
BUSINESS: 2,
|
|
23
|
+
AUTH: 3,
|
|
24
|
+
RATE_LIMITED: 4,
|
|
25
|
+
INFRA: 5,
|
|
26
|
+
USAGE: 6,
|
|
27
|
+
};
|
|
28
|
+
/** Stable envelope `error.code` strings (machine-readable failure categories). */
|
|
29
|
+
exports.ERROR_CODE = {
|
|
30
|
+
BUSINESS_ERROR: 'BUSINESS_ERROR',
|
|
31
|
+
FORBIDDEN: 'FORBIDDEN',
|
|
32
|
+
AUTH_INVALID: 'AUTH_INVALID',
|
|
33
|
+
RATE_LIMITED: 'RATE_LIMITED',
|
|
34
|
+
INFRA_ERROR: 'INFRA_ERROR',
|
|
35
|
+
USAGE_ERROR: 'USAGE_ERROR',
|
|
36
|
+
};
|
|
37
|
+
/** Maps a failing outcome kind to its envelope error.code + process exit code. */
|
|
38
|
+
function classifyFailure(kind) {
|
|
39
|
+
switch (kind) {
|
|
40
|
+
case 'business_error':
|
|
41
|
+
return { errorCode: exports.ERROR_CODE.BUSINESS_ERROR, exitCode: exports.EXIT.BUSINESS };
|
|
42
|
+
case 'forbidden':
|
|
43
|
+
return { errorCode: exports.ERROR_CODE.FORBIDDEN, exitCode: exports.EXIT.BUSINESS };
|
|
44
|
+
case 'auth_invalid':
|
|
45
|
+
case 'needs_login':
|
|
46
|
+
return { errorCode: exports.ERROR_CODE.AUTH_INVALID, exitCode: exports.EXIT.AUTH };
|
|
47
|
+
case 'rate_limited':
|
|
48
|
+
return { errorCode: exports.ERROR_CODE.RATE_LIMITED, exitCode: exports.EXIT.RATE_LIMITED };
|
|
49
|
+
case 'infra_error':
|
|
50
|
+
return { errorCode: exports.ERROR_CODE.INFRA_ERROR, exitCode: exports.EXIT.INFRA };
|
|
51
|
+
case 'usage_error':
|
|
52
|
+
return { errorCode: exports.ERROR_CODE.USAGE_ERROR, exitCode: exports.EXIT.USAGE };
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=exitCodes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exitCodes.js","sourceRoot":"","sources":["../../src/exit/exitCodes.ts"],"names":[],"mappings":";AAAA,+EAA+E;AAC/E,+EAA+E;AAC/E,sDAAsD;AACtD,EAAE;AACF,sEAAsE;AACtE,oCAAoC;AACpC,oCAAoC;AACpC,kCAAkC;AAClC,kCAAkC;AAClC,kCAAkC;AAClC,EAAE;AACF,8EAA8E;AAC9E,+EAA+E;AAC/E,iFAAiF;AACjF,oCAAoC;;;AAuCpC,0CAgBC;AArDY,QAAA,IAAI,GAAG;IAClB,OAAO,EAAE,CAAC;IACV,QAAQ,EAAE,CAAC;IACX,IAAI,EAAE,CAAC;IACP,YAAY,EAAE,CAAC;IACf,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;CACA,CAAC;AAmBX,kFAAkF;AACrE,QAAA,UAAU,GAAG;IACxB,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,cAAc;IAC5B,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;CAClB,CAAC;AAEX,kFAAkF;AAClF,SAAgB,eAAe,CAAC,IAAsD;IACpF,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,gBAAgB;YACnB,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,cAAc,EAAE,QAAQ,EAAE,YAAI,CAAC,QAAQ,EAAE,CAAC;QAC3E,KAAK,WAAW;YACd,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,SAAS,EAAE,QAAQ,EAAE,YAAI,CAAC,QAAQ,EAAE,CAAC;QACtE,KAAK,cAAc,CAAC;QACpB,KAAK,aAAa;YAChB,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,YAAI,CAAC,IAAI,EAAE,CAAC;QACrE,KAAK,cAAc;YACjB,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,YAAI,CAAC,YAAY,EAAE,CAAC;QAC7E,KAAK,aAAa;YAChB,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,WAAW,EAAE,QAAQ,EAAE,YAAI,CAAC,KAAK,EAAE,CAAC;QACrE,KAAK,aAAa;YAChB,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,WAAW,EAAE,QAAQ,EAAE,YAAI,CAAC,KAAK,EAAE,CAAC;IACvE,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,104 @@
|
|
|
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.ResultLeakError = exports.SCHEMA_VERSION = void 0;
|
|
37
|
+
exports.generateRequestId = generateRequestId;
|
|
38
|
+
exports.redactTokenShaped = redactTokenShaped;
|
|
39
|
+
exports.assertNoTokenShapedValue = assertNoTokenShapedValue;
|
|
40
|
+
// Agent Contract JSON envelope (AC-1). The single, stable shape every command
|
|
41
|
+
// emits on stdout under `--output json`:
|
|
42
|
+
//
|
|
43
|
+
// { schema_version, ok, result | error{code,message}, request_id, soft? }
|
|
44
|
+
//
|
|
45
|
+
// Compatibility promise (AC-1): `schema_version` is a NUMBER and the skeleton is
|
|
46
|
+
// append-only — fields are added, never renamed or removed, so an older parser
|
|
47
|
+
// keeps working. `request_id` is CLI-generated locally (AC-10), present even for
|
|
48
|
+
// a usage error that fails before any network call is made.
|
|
49
|
+
const crypto = __importStar(require("node:crypto"));
|
|
50
|
+
/** Envelope skeleton version. Bump only when adding fields (never breaking). */
|
|
51
|
+
exports.SCHEMA_VERSION = 1;
|
|
52
|
+
/** CLI-local request id — never depends on a server response (AC-10 / TC-044). */
|
|
53
|
+
function generateRequestId() {
|
|
54
|
+
return `cli_${crypto.randomUUID()}`;
|
|
55
|
+
}
|
|
56
|
+
// A full CLI/service token is `cli_`/`sst_` followed by a long base64url run
|
|
57
|
+
// (alphabet A-Za-z0-9 plus `-` and `_` — the generator uses base64url, so ~40% of real
|
|
58
|
+
// tokens carry a `-`/`_` within the first 16 chars and MUST be matched · review EXR-4).
|
|
59
|
+
// A masked identity (e.g. `cli_…a1b2`) uses an ellipsis (not in the class), so it does
|
|
60
|
+
// not trip this guard.
|
|
61
|
+
const TOKEN_VALUE_PATTERN = /(?:cli|sst)_[A-Za-z0-9_-]{16,}/;
|
|
62
|
+
/**
|
|
63
|
+
* Global variant used to REDACT (not assert) token-shaped runs from a free-text error
|
|
64
|
+
* message before it reaches stdout/stderr (review EXR-5 · defense-in-depth). Unlike result
|
|
65
|
+
* payloads (which fail closed via assertNoTokenShapedValue), an error message may legitimately
|
|
66
|
+
* echo user input, so we scrub rather than throw — never lose the error, never leak a token.
|
|
67
|
+
*/
|
|
68
|
+
const TOKEN_VALUE_PATTERN_G = /(?:cli|sst)_[A-Za-z0-9_-]{16,}/g;
|
|
69
|
+
function redactTokenShaped(message) {
|
|
70
|
+
return message.replace(TOKEN_VALUE_PATTERN_G, '[redacted]');
|
|
71
|
+
}
|
|
72
|
+
class ResultLeakError extends Error {
|
|
73
|
+
constructor(where) {
|
|
74
|
+
super(`refusing to emit result: a token-shaped value was found at ${where}`);
|
|
75
|
+
this.name = 'ResultLeakError';
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
exports.ResultLeakError = ResultLeakError;
|
|
79
|
+
/**
|
|
80
|
+
* Defense-in-depth self-check (PRD "开工前项"): a `result` payload is written to
|
|
81
|
+
* stdout WITHOUT going through log.ts's redact(), so before emitting it we assert
|
|
82
|
+
* no string value looks like a live token. Fails closed (throws) rather than ever
|
|
83
|
+
* leaking a token onto stdout — the primary control is still "commands never put
|
|
84
|
+
* a raw token into result".
|
|
85
|
+
*/
|
|
86
|
+
function assertNoTokenShapedValue(value, pathStr = '$', depth = 0) {
|
|
87
|
+
if (value == null || depth > 8)
|
|
88
|
+
return;
|
|
89
|
+
if (typeof value === 'string') {
|
|
90
|
+
if (TOKEN_VALUE_PATTERN.test(value))
|
|
91
|
+
throw new ResultLeakError(pathStr);
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
if (Array.isArray(value)) {
|
|
95
|
+
value.forEach((v, i) => assertNoTokenShapedValue(v, `${pathStr}[${i}]`, depth + 1));
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
if (typeof value === 'object') {
|
|
99
|
+
for (const [k, v] of Object.entries(value)) {
|
|
100
|
+
assertNoTokenShapedValue(v, `${pathStr}.${k}`, depth + 1);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=envelope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"envelope.js","sourceRoot":"","sources":["../../src/output/envelope.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BA,8CAEC;AAgBD,8CAEC;AAgBD,4DAeC;AAhFD,8EAA8E;AAC9E,yCAAyC;AACzC,EAAE;AACF,4EAA4E;AAC5E,EAAE;AACF,iFAAiF;AACjF,+EAA+E;AAC/E,iFAAiF;AACjF,4DAA4D;AAC5D,oDAAsC;AAEtC,gFAAgF;AACnE,QAAA,cAAc,GAAG,CAAC,CAAC;AAgBhC,kFAAkF;AAClF,SAAgB,iBAAiB;IAC/B,OAAO,OAAO,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;AACtC,CAAC;AAED,6EAA6E;AAC7E,uFAAuF;AACvF,wFAAwF;AACxF,uFAAuF;AACvF,uBAAuB;AACvB,MAAM,mBAAmB,GAAG,gCAAgC,CAAC;AAE7D;;;;;GAKG;AACH,MAAM,qBAAqB,GAAG,iCAAiC,CAAC;AAChE,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,OAAO,OAAO,CAAC,OAAO,CAAC,qBAAqB,EAAE,YAAY,CAAC,CAAC;AAC9D,CAAC;AAED,MAAa,eAAgB,SAAQ,KAAK;IACxC,YAAY,KAAa;QACvB,KAAK,CAAC,8DAA8D,KAAK,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAChC,CAAC;CACF;AALD,0CAKC;AAED;;;;;;GAMG;AACH,SAAgB,wBAAwB,CAAC,KAAc,EAAE,OAAO,GAAG,GAAG,EAAE,KAAK,GAAG,CAAC;IAC/E,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,GAAG,CAAC;QAAE,OAAO;IACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;QACxE,OAAO;IACT,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,wBAAwB,CAAC,CAAC,EAAE,GAAG,OAAO,IAAI,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;QACpF,OAAO;IACT,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;YACtE,wBAAwB,CAAC,CAAC,EAAE,GAAG,OAAO,IAAI,CAAC,EAAE,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ResultPrinter = void 0;
|
|
4
|
+
// The single result-output channel (AC-1). Independent of log.ts:
|
|
5
|
+
// - json mode: emits EXACTLY ONE line on stdout — the envelope — and nothing
|
|
6
|
+
// else; every process log line is forced onto stderr (setLogJsonMode).
|
|
7
|
+
// - human mode: prints a human-readable message via log (info->stdout,
|
|
8
|
+
// error->stderr), preserving the pre-Agent-Contract UX.
|
|
9
|
+
// Either way, failures set process.exitCode from the AC-3 classification table.
|
|
10
|
+
const envelope_1 = require("./envelope");
|
|
11
|
+
const exitCodes_1 = require("../exit/exitCodes");
|
|
12
|
+
const log_1 = require("../util/log");
|
|
13
|
+
function writeStdoutLine(s) {
|
|
14
|
+
process.stdout.write(`${s}\n`);
|
|
15
|
+
}
|
|
16
|
+
class ResultPrinter {
|
|
17
|
+
mode;
|
|
18
|
+
requestId;
|
|
19
|
+
constructor(mode, requestId) {
|
|
20
|
+
this.mode = mode;
|
|
21
|
+
this.requestId = requestId ?? (0, envelope_1.generateRequestId)();
|
|
22
|
+
}
|
|
23
|
+
/** Emit a success result (exit stays 0). */
|
|
24
|
+
success(result, opts = {}) {
|
|
25
|
+
if (this.mode === 'json') {
|
|
26
|
+
(0, envelope_1.assertNoTokenShapedValue)(result);
|
|
27
|
+
const envelope = {
|
|
28
|
+
schema_version: envelope_1.SCHEMA_VERSION,
|
|
29
|
+
ok: true,
|
|
30
|
+
result,
|
|
31
|
+
request_id: this.requestId,
|
|
32
|
+
...(opts.soft ? { soft: true } : {}),
|
|
33
|
+
};
|
|
34
|
+
writeStdoutLine(JSON.stringify(envelope));
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
if (opts.humanMessage)
|
|
38
|
+
log_1.log.info(opts.humanMessage);
|
|
39
|
+
}
|
|
40
|
+
/** Emit a structured failure and set process.exitCode from the AC-3 table. */
|
|
41
|
+
failure(kind, message) {
|
|
42
|
+
// EXR-5: scrub any token-shaped run from the free-text message before it reaches
|
|
43
|
+
// stdout (json) or stderr (human) — error messages bypass log.ts's redact().
|
|
44
|
+
const safeMessage = (0, envelope_1.redactTokenShaped)(message);
|
|
45
|
+
const { errorCode, exitCode } = (0, exitCodes_1.classifyFailure)(kind);
|
|
46
|
+
process.exitCode = exitCode;
|
|
47
|
+
if (this.mode === 'json') {
|
|
48
|
+
const envelope = {
|
|
49
|
+
schema_version: envelope_1.SCHEMA_VERSION,
|
|
50
|
+
ok: false,
|
|
51
|
+
error: { code: errorCode, message: safeMessage },
|
|
52
|
+
request_id: this.requestId,
|
|
53
|
+
};
|
|
54
|
+
writeStdoutLine(JSON.stringify(envelope));
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
log_1.log.error(safeMessage);
|
|
58
|
+
}
|
|
59
|
+
/** Render a CommandOutcome uniformly. */
|
|
60
|
+
emit(outcome) {
|
|
61
|
+
if (outcome.ok) {
|
|
62
|
+
this.success(outcome.result, { soft: outcome.soft, humanMessage: outcome.humanMessage });
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
this.failure(outcome.kind, outcome.message);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
exports.ResultPrinter = ResultPrinter;
|
|
70
|
+
//# sourceMappingURL=resultPrinter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resultPrinter.js","sourceRoot":"","sources":["../../src/output/resultPrinter.ts"],"names":[],"mappings":";;;AAAA,kEAAkE;AAClE,+EAA+E;AAC/E,2EAA2E;AAC3E,yEAAyE;AACzE,4DAA4D;AAC5D,gFAAgF;AAChF,yCAMoB;AACpB,iDAAsE;AACtE,qCAAkC;AASlC,SAAS,eAAe,CAAC,CAAS;IAChC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC;AAED,MAAa,aAAa;IAIb;IAHF,SAAS,CAAS;IAE3B,YACW,IAAgB,EACzB,SAAkB;QADT,SAAI,GAAJ,IAAI,CAAY;QAGzB,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,IAAA,4BAAiB,GAAE,CAAC;IACpD,CAAC;IAED,4CAA4C;IAC5C,OAAO,CAAC,MAAe,EAAE,OAAkD,EAAE;QAC3E,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,IAAA,mCAAwB,EAAC,MAAM,CAAC,CAAC;YACjC,MAAM,QAAQ,GAAa;gBACzB,cAAc,EAAE,yBAAc;gBAC9B,EAAE,EAAE,IAAI;gBACR,MAAM;gBACN,UAAU,EAAE,IAAI,CAAC,SAAS;gBAC1B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACrC,CAAC;YACF,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,YAAY;YAAE,SAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACrD,CAAC;IAED,8EAA8E;IAC9E,OAAO,CAAC,IAAsD,EAAE,OAAe;QAC7E,iFAAiF;QACjF,6EAA6E;QAC7E,MAAM,WAAW,GAAG,IAAA,4BAAiB,EAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC;QACtD,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAa;gBACzB,cAAc,EAAE,yBAAc;gBAC9B,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE;gBAChD,UAAU,EAAE,IAAI,CAAC,SAAS;aAC3B,CAAC;YACF,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QACD,SAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC;IAED,yCAAyC;IACzC,IAAI,CAAC,OAAuB;QAC1B,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;QAC3F,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;CACF;AAvDD,sCAuDC"}
|
|
@@ -62,7 +62,10 @@ class SiteClient {
|
|
|
62
62
|
const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? 60_000);
|
|
63
63
|
let res;
|
|
64
64
|
try {
|
|
65
|
-
const headers = this.headers(ctx,
|
|
65
|
+
const headers = this.headers(ctx, {
|
|
66
|
+
...(opts.jsonBody !== undefined ? { 'content-type': 'application/json' } : {}),
|
|
67
|
+
...(opts.extraHeaders ?? {}),
|
|
68
|
+
});
|
|
66
69
|
res = await this.fetchImpl(`${this.apiOrigin}${path}`, {
|
|
67
70
|
method,
|
|
68
71
|
headers,
|
|
@@ -99,7 +102,9 @@ class SiteClient {
|
|
|
99
102
|
message: `zip file is ${input.zip.length} bytes — over the 50 MiB upload limit`,
|
|
100
103
|
});
|
|
101
104
|
}
|
|
102
|
-
|
|
105
|
+
// A real deploy must reference a verified site id; a dry-run of a not-yet-
|
|
106
|
+
// created site legitimately has none (0), so the guard only applies off dry-run.
|
|
107
|
+
if (!input.dryRun && (!Number.isSafeInteger(input.expectedSiteId) || input.expectedSiteId <= 0)) {
|
|
103
108
|
return Promise.resolve({
|
|
104
109
|
kind: 'infra_error',
|
|
105
110
|
message: 'expectedSiteId must be a positive integer from a verified SiteView',
|
|
@@ -114,8 +119,13 @@ class SiteClient {
|
|
|
114
119
|
form.append('version', input.version);
|
|
115
120
|
if (input.description !== undefined)
|
|
116
121
|
form.append('description', input.description);
|
|
117
|
-
|
|
118
|
-
|
|
122
|
+
if (Number.isSafeInteger(input.expectedSiteId) && input.expectedSiteId > 0) {
|
|
123
|
+
form.append('expected_site_id', String(input.expectedSiteId));
|
|
124
|
+
}
|
|
125
|
+
if (input.dryRun)
|
|
126
|
+
form.append('dry_run', 'true');
|
|
127
|
+
const extraHeaders = input.idempotencyKey ? { 'x-idempotency-key': input.idempotencyKey } : undefined;
|
|
128
|
+
return this.send(ctx, 'POST', `/api/console/projects/${encodeURIComponent(spid)}/sites/${encodeURIComponent(slug)}/envs/${encodeURIComponent(env)}/deploys`, { formBody: form, extraHeaders });
|
|
119
129
|
}
|
|
120
130
|
}
|
|
121
131
|
exports.SiteClient = SiteClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteClient.js","sourceRoot":"","sources":["../../src/publish/siteClient.ts"],"names":[],"mappings":";;;AAAA,oEAAoE;AACpE,yBAAyB;AACzB,iFAAiF;AACjF,yDAAyD;AACzD,4EAA4E;AAC5E,4EAA4E;AAC5E,+EAA+E;AAC/E,gFAAgF;AAChF,6EAA6E;AAC7E,2BAA2B;AAC3B,6DAAiG;AAmBjG,+EAA+E;AAC/E,iFAAiF;AACjF,6CAA6C;AAC7C,MAAM,uBAAuB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"siteClient.js","sourceRoot":"","sources":["../../src/publish/siteClient.ts"],"names":[],"mappings":"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"}
|