@capuchoo/cli 0.6.0 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +41 -20
- package/bin/run.js +22 -0
- package/dist/cli/menu.d.ts +38 -0
- package/dist/cli/menu.d.ts.map +1 -0
- package/dist/cli/menu.js +62 -0
- package/dist/cli/menu.js.map +1 -0
- package/dist/cli/prompts.d.ts +15 -0
- package/dist/cli/prompts.d.ts.map +1 -1
- package/dist/cli/prompts.js +42 -0
- package/dist/cli/prompts.js.map +1 -1
- package/dist/commands/app/list.d.ts.map +1 -1
- package/dist/commands/app/list.js +2 -1
- package/dist/commands/app/list.js.map +1 -1
- package/dist/commands/auth/whoami.d.ts.map +1 -1
- package/dist/commands/auth/whoami.js +2 -1
- package/dist/commands/auth/whoami.js.map +1 -1
- package/dist/commands/channel/list.d.ts.map +1 -1
- package/dist/commands/channel/list.js +2 -1
- package/dist/commands/channel/list.js.map +1 -1
- package/dist/commands/doctor.d.ts +2 -0
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +86 -13
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/init.d.ts +22 -3
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +53 -19
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/menu.d.ts +39 -0
- package/dist/commands/menu.d.ts.map +1 -0
- package/dist/commands/menu.js +130 -0
- package/dist/commands/menu.js.map +1 -0
- package/dist/deploy/execute.d.ts.map +1 -1
- package/dist/deploy/execute.js +25 -5
- package/dist/deploy/execute.js.map +1 -1
- package/dist/deploy/signing.d.ts +24 -0
- package/dist/deploy/signing.d.ts.map +1 -0
- package/dist/deploy/signing.js +57 -0
- package/dist/deploy/signing.js.map +1 -0
- package/dist/pipeline/android-signing.d.ts +41 -0
- package/dist/pipeline/android-signing.d.ts.map +1 -0
- package/dist/pipeline/android-signing.js +82 -0
- package/dist/pipeline/android-signing.js.map +1 -0
- package/dist/pipeline/capacitor-support.d.ts +1 -1
- package/dist/pipeline/capacitor-support.js +1 -1
- package/dist/services/cloud.d.ts +13 -1
- package/dist/services/cloud.d.ts.map +1 -1
- package/dist/services/cloud.js +19 -4
- package/dist/services/cloud.js.map +1 -1
- package/dist/utils/http.d.ts.map +1 -1
- package/dist/utils/http.js +16 -5
- package/dist/utils/http.js.map +1 -1
- package/oclif.manifest.json +90 -67
- package/package.json +2 -2
package/dist/deploy/execute.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { resolveSigning } from "./signing.js";
|
|
2
|
+
import { askText, confirm, isInteractive, selectOne, whileWaiting } from "../cli/prompts.js";
|
|
2
3
|
import { bumpVersion } from "@capuchoo/core";
|
|
3
4
|
import { Command, Flags } from "@oclif/core";
|
|
4
5
|
import chalk from "chalk";
|
|
@@ -90,7 +91,9 @@ export async function executeDeploy(options) {
|
|
|
90
91
|
", or set CAPUCHOO_ENDPOINT and CAPUCHOO_API_KEY.");
|
|
91
92
|
}
|
|
92
93
|
const cloud = new CloudClient(credentials.endpoint, credentials.apiKey);
|
|
93
|
-
|
|
94
|
+
// The backend sleeps when idle, so this first call can take fifteen seconds.
|
|
95
|
+
// Unannounced, it looked like the CLI had hung before the deploy even started.
|
|
96
|
+
const profile = await whileWaiting("Reaching the backend...", cloud.whoami());
|
|
94
97
|
if (!profile) {
|
|
95
98
|
fail(command, `The credentials for ${credentials.endpoint} were rejected. ` +
|
|
96
99
|
(credentials.source === "environment"
|
|
@@ -162,8 +165,20 @@ export async function executeDeploy(options) {
|
|
|
162
165
|
: "");
|
|
163
166
|
const currentVersion = readAppVersion(appDir);
|
|
164
167
|
const version = bump ? bumpVersion(currentVersion, bump) : currentVersion;
|
|
165
|
-
const buildType = (flags.type ?? "release");
|
|
166
168
|
const platform = (flags.platform ?? "android");
|
|
169
|
+
const signing = await resolveSigning({
|
|
170
|
+
appDir,
|
|
171
|
+
kind,
|
|
172
|
+
platform,
|
|
173
|
+
interactive,
|
|
174
|
+
requested: flags.type,
|
|
175
|
+
allowUnsigned: flags["allow-unsigned"] ?? false,
|
|
176
|
+
});
|
|
177
|
+
if (!signing) {
|
|
178
|
+
command.log(chalk.dim("Cancelled."));
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
const { buildType, allowUnsigned } = signing;
|
|
167
182
|
// --- confirmation ----------------------------------------------------------
|
|
168
183
|
if (interactive) {
|
|
169
184
|
command.log("");
|
|
@@ -171,7 +186,12 @@ export async function executeDeploy(options) {
|
|
|
171
186
|
command.log(` channel ${chalk.green(channel.name)} (${environment})`);
|
|
172
187
|
command.log(` version ${chalk.green(version)}${bump ? chalk.dim(` (${bump} from ${currentVersion})`) : ""}`);
|
|
173
188
|
if (kind === "native") {
|
|
174
|
-
|
|
189
|
+
const signedNote = buildType === "debug"
|
|
190
|
+
? chalk.dim(" (debug-signed)")
|
|
191
|
+
: allowUnsigned
|
|
192
|
+
? chalk.yellow(" (unsigned)")
|
|
193
|
+
: "";
|
|
194
|
+
command.log(` platform ${chalk.green(platform)} / ${buildType}${signedNote}`);
|
|
175
195
|
}
|
|
176
196
|
command.log(` serve now ${active ? chalk.green("yes") : "no"}`);
|
|
177
197
|
command.log(` required ${required ? chalk.yellow("yes") : "no"}`);
|
|
@@ -200,7 +220,7 @@ export async function executeDeploy(options) {
|
|
|
200
220
|
buildType,
|
|
201
221
|
skipAssets: flags["skip-assets"],
|
|
202
222
|
skipBuild: flags["skip-build"],
|
|
203
|
-
allowUnsigned
|
|
223
|
+
allowUnsigned,
|
|
204
224
|
flavor: flags.flavor,
|
|
205
225
|
dryRun: flags["dry-run"],
|
|
206
226
|
verbose: flags.verbose,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/deploy/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAmC,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACL,eAAe,EACf,WAAW,EACX,SAAS,GAGV,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,kBAAkB,EAClB,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD;;;;;;;;GAQG;AAEH,yCAAyC;AACzC,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,6DAA6D;KAC3E,CAAC;IACF,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,8BAA8B,EAAE,CAAC;IAC9E,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,wCAAwC;QACrD,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;KACrC,CAAC;IACF,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,gCAAgC;KAC9C,CAAC;IACF,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,oCAAoC;KAClD,CAAC;IACF,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC;QAC3B,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,kCAAkC;KAChD,CAAC;IACF,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;QAC1B,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,yCAAyC;KACvD,CAAC;IACF,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;QACvB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,uCAAuC;KACrD,CAAC;IACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC;QAClB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,0CAA0C;KACxD,CAAC;IACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;QACrB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,qCAAqC;KACnD,CAAC;IACF,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC;QACjB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,sCAAsC;KACpD,CAAC;CACM,CAAC;AA0BX;;;;;GAKG;AACH,SAAS,IAAI,CAAC,OAAgB,EAAE,OAAe;IAC7C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACvB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc;AAC1C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAA6B;IAC/D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACzC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAExB,8EAA8E;IAC9E,sEAAsE;IACtE,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,KAAK,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAExE,MAAM,OAAO,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAE7C,MAAM,WAAW,GAAG,kBAAkB,EAAE,CAAC;IACzC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,IAAI,CACF,OAAO,EACP,yBAAyB;YACvB,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC;YACjC,kDAAkD,CACrD,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACxE,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;IACrC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,IAAI,CACF,OAAO,EACP,uBAAuB,WAAW,CAAC,QAAQ,kBAAkB;YAC3D,CAAC,WAAW,CAAC,MAAM,KAAK,aAAa;gBACnC,CAAC,CAAC,yBAAyB;gBAC3B,CAAC,CAAC,OAAO,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CACzD,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,SAAS,CAAC,CAAC,CAAC;QAChF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAC5E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC5D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC9D,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;IAED,8EAA8E;IAE9E,IAAI,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC;IAChC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAErE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,IAAI,CACF,OAAO,EACP,sFAAsF;gBACpF,+EAA+E;gBAC/E,mBAAmB,CACtB,CAAC;QACJ,CAAC;QAED,sEAAsE;QACtE,2BAA2B;QAC3B,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,WAAW,GAAG,UAAU,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC;QACpC,CAAC;aAAM,IAAI,KAAK,CAAC,GAAG,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACjD,IAAI,CACF,OAAO,EACP,4CAA4C,UAAU,CAAC,MAAM,IAAI;gBAC/D,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CACnE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,WAAW,GAAG,MAAM,SAAS,CAC3B,SAAS,EACT,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC3B,KAAK,EAAE,OAAO,CAAC,IAAI;gBACnB,KAAK,EAAE,OAAO,CAAC,IAAI;gBACnB,IAAI,EAAE,OAAO,CAAC,WAAW;aAC1B,CAAC,CAAC,EACH,WAAW,CACZ,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAC5E,MAAM,WAAW,GAAgB,OAAO,CAAC,WAAW,CAAC;IAErD,8EAA8E;IAE9E,2EAA2E;IAC3E,sEAAsE;IACtE,gDAAgD;IAChD,MAAM,WAAW,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,aAAa,EAAE,CAAC;IAE3D,MAAM,MAAM,GACV,KAAK,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAChG,MAAM,QAAQ,GACZ,KAAK,CAAC,QAAQ;QACd,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,mBAAmB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAEjF,IAAI,IAAI,GAAG,KAAK,CAAC,OAA+B,CAAC;IACjD,IAAI,CAAC,IAAI,IAAI,WAAW,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,SAAS,CAC5B,mBAAmB,EACnB;YACE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE;YAC1E,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;YAClC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;YAClC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;SACnC,EACD,WAAW,CACZ,CAAC;QACF,IAAI,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAE,MAAmB,CAAC;IAC1D,CAAC;IAED,MAAM,IAAI,GACR,KAAK,CAAC,IAAI;QACV,CAAC,WAAW;YACV,CAAC,CAAC,MAAM,OAAO,CAAC,eAAe,EAAE;gBAC7B,WAAW,EAAE,qCAAqC;gBAClD,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;aACf,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC,CAAC;IAEV,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;IAE1E,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,SAAS,CAAwB,CAAC;IACnE,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,SAAS,CAAsB,CAAC;IAEpE,8EAA8E;IAE9E,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,WAAW,GAAG,CAAC,CAAC;QAC5E,OAAO,CAAC,GAAG,CACT,kBAAkB,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,SAAS,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CACtG,CAAC;QACF,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,kBAAkB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,kBAAkB,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACvE,IAAI,KAAK,CAAC,SAAS,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;QACxF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEhB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;YACrC,OAAO;QACT,CAAC;IACH,CAAC;IAED,yEAAyE;IACzE,iCAAiC;IACjC,IAAI,IAAI;QAAE,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE3C,MAAM,OAAO,GAAkB;QAC7B,MAAM;QACN,OAAO;QACP,IAAI;QACJ,QAAQ;QACR,OAAO,EAAE,OAAO,CAAC,IAAI;QACrB,WAAW;QACX,OAAO;QACP,SAAS;QACT,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC;QAChC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC;QAC9B,aAAa,EAAE,KAAK,CAAC,gBAAgB,CAAC,IAAI,KAAK;QAC/C,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC;QACxB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,KAAK,EAAE,IAAI;KACZ,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAEpE,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACtB,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAEzB,MAAM,MAAM,GACV,IAAI,KAAK,KAAK;gBACZ,CAAC,CAAC,MAAM,KAAK,CAAC,YAAY,CAAC;oBACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,OAAO,EAAE,OAAO,CAAC,IAAI;oBACrB,QAAQ;oBACR,WAAW,EAAE,OAAO,CAAC,OAAO;oBAC5B,YAAY,EAAE,IAAI,IAAI,EAAE;oBACxB,MAAM;oBACN,QAAQ;iBACT,CAAC;gBACJ,CAAC,CAAC,MAAM,KAAK,CAAC,YAAY,CAAC;oBACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,OAAO,EAAE,OAAO,CAAC,IAAI;oBACrB,QAAQ;oBACR,WAAW,EAAE,OAAO,CAAC,OAAO;oBAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,YAAY,EAAE,IAAI,IAAI,EAAE;oBACxB,MAAM;oBACN,QAAQ;iBACT,CAAC,CAAC;YAET,QAAQ,GAAG,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;YACvD,QAAQ,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAE5D,yEAAyE;YACzE,uCAAuC;YACvC,IAAI,QAAQ,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;gBAC/B,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QAED,QAAQ,CAAC,MAAM,CACb,KAAK,CAAC,SAAS,CAAC;YACd,CAAC,CAAC,uBAAuB,OAAO,CAAC,OAAO,6BAA6B;YACrE,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,kBAAkB,OAAO,CAAC,IAAI,GAAG,CACzD,CAAC;QAEF,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACvC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,OAAO,IAAI,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,IAAI,EAAE,CAAC;YACT,uDAAuD;YACvD,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,SAAS,CACZ;gBACE,EAAE,EAAE,IAAI;gBACR,IAAI;gBACJ,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,QAAQ;gBACR,QAAQ;gBACR,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC;gBACxB,QAAQ,EAAE;oBACR,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;oBACtD,KAAK,EAAE,QAAQ,CAAC,QAAQ;oBACxB,KAAK,EAAE,QAAQ,CAAC,SAAS;oBACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;iBACxB;gBACD,YAAY,EAAE,OAAO,CAAC,kBAAkB;gBACxC,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B,EACD,IAAI,EACJ,CAAC,CACF,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/C,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE/B,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACpE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QAED,IAAI,IAAI,EAAE,CAAC;YACT,gEAAgE;YAChE,kEAAkE;YAClE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,KAAK,CAAC,MAAM,CACV,0CAA0C,OAAO,IAAI;gBACnD,mCAAmC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,IAAI,CACxE,CACF,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/deploy/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
export interface SigningChoice {
|
|
2
|
+
buildType: "debug" | "release";
|
|
3
|
+
allowUnsigned: boolean;
|
|
4
|
+
}
|
|
5
|
+
export interface SigningInput {
|
|
6
|
+
appDir: string;
|
|
7
|
+
kind: "ota" | "native";
|
|
8
|
+
platform: "android" | "ios";
|
|
9
|
+
interactive: boolean;
|
|
10
|
+
/** `--type`, which wins over any prompt. */
|
|
11
|
+
requested?: "debug" | "release" | undefined;
|
|
12
|
+
/** `--allow-unsigned`. */
|
|
13
|
+
allowUnsigned: boolean;
|
|
14
|
+
}
|
|
15
|
+
/** Reads the project's release signing state, or null when there is no Android project. */
|
|
16
|
+
export declare function androidSigningState(appDir: string): import("../pipeline/android-signing.js").SigningStatus | null;
|
|
17
|
+
/**
|
|
18
|
+
* Decides what to build and whether an unsigned release is acceptable.
|
|
19
|
+
*
|
|
20
|
+
* Only asks when a release build would fail for want of a keystore. Returns null
|
|
21
|
+
* when the user cancels.
|
|
22
|
+
*/
|
|
23
|
+
export declare function resolveSigning(input: SigningInput): Promise<SigningChoice | null>;
|
|
24
|
+
//# sourceMappingURL=signing.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signing.d.ts","sourceRoot":"","sources":["../../src/deploy/signing.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,KAAK,GAAG,QAAQ,CAAC;IACvB,QAAQ,EAAE,SAAS,GAAG,KAAK,CAAC;IAC5B,WAAW,EAAE,OAAO,CAAC;IACrB,4CAA4C;IAC5C,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;IAC5C,0BAA0B;IAC1B,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,2FAA2F;AAC3F,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,iEAUjD;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CA4CvF"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { inspectReleaseSigning } from "../pipeline/android-signing.js";
|
|
4
|
+
import { log, selectOne } from "../cli/prompts.js";
|
|
5
|
+
/** Reads the project's release signing state, or null when there is no Android project. */
|
|
6
|
+
export function androidSigningState(appDir) {
|
|
7
|
+
const gradlePath = path.join(appDir, "android", "app", "build.gradle");
|
|
8
|
+
if (!fs.existsSync(gradlePath))
|
|
9
|
+
return null;
|
|
10
|
+
const propertiesPath = path.join(appDir, "android", "local.properties");
|
|
11
|
+
return inspectReleaseSigning({
|
|
12
|
+
buildGradle: fs.readFileSync(gradlePath, "utf8"),
|
|
13
|
+
localProperties: fs.existsSync(propertiesPath) ? fs.readFileSync(propertiesPath, "utf8") : "",
|
|
14
|
+
});
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Decides what to build and whether an unsigned release is acceptable.
|
|
18
|
+
*
|
|
19
|
+
* Only asks when a release build would fail for want of a keystore. Returns null
|
|
20
|
+
* when the user cancels.
|
|
21
|
+
*/
|
|
22
|
+
export async function resolveSigning(input) {
|
|
23
|
+
const { appDir, kind, platform, interactive, requested, allowUnsigned } = input;
|
|
24
|
+
if (kind !== "native" || platform !== "android") {
|
|
25
|
+
return { buildType: requested ?? "release", allowUnsigned };
|
|
26
|
+
}
|
|
27
|
+
const state = androidSigningState(appDir);
|
|
28
|
+
if (requested === "debug")
|
|
29
|
+
return { buildType: "debug", allowUnsigned };
|
|
30
|
+
if (allowUnsigned)
|
|
31
|
+
return { buildType: requested ?? "release", allowUnsigned: true };
|
|
32
|
+
if (!state || state.kind === "ready") {
|
|
33
|
+
return { buildType: requested ?? "release", allowUnsigned: false };
|
|
34
|
+
}
|
|
35
|
+
const problem = state.kind === "unconfigured"
|
|
36
|
+
? `signingConfigs.${state.configName} needs ${state.missing.join(", ")} in android/local.properties`
|
|
37
|
+
: "the release build type declares no signingConfig";
|
|
38
|
+
if (!interactive) {
|
|
39
|
+
log.warn(`Release signing is not ready: ${problem}. Building debug instead.`);
|
|
40
|
+
return { buildType: "debug", allowUnsigned: false };
|
|
41
|
+
}
|
|
42
|
+
log.warn(`Release signing is not ready: ${problem}.`);
|
|
43
|
+
return selectOne("How should this be built?", [
|
|
44
|
+
{
|
|
45
|
+
value: { buildType: "debug", allowUnsigned: false },
|
|
46
|
+
label: "Debug",
|
|
47
|
+
hint: "signed with the debug key, installs anywhere",
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
value: { buildType: "release", allowUnsigned: true },
|
|
51
|
+
label: "Release, unsigned",
|
|
52
|
+
hint: "sign it yourself before distributing",
|
|
53
|
+
},
|
|
54
|
+
{ value: null, label: "Cancel", hint: "fill in the keystore first" },
|
|
55
|
+
], "--type debug or --allow-unsigned");
|
|
56
|
+
}
|
|
57
|
+
//# sourceMappingURL=signing.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signing.js","sourceRoot":"","sources":["../../src/deploy/signing.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Whether this project can actually produce a signed release APK.
|
|
3
|
+
*
|
|
4
|
+
* A `deploy native` to a prod channel spent 1m51s compiling and then failed at
|
|
5
|
+
* `:app:packageProdRelease` with
|
|
6
|
+
*
|
|
7
|
+
* A failure occurred while executing PackageAndroidArtifact$IncrementalSplitterRunnable
|
|
8
|
+
*
|
|
9
|
+
* which names neither signing nor the missing values. The cause was an empty
|
|
10
|
+
* `signingConfigs.release`: the build file reads `RELEASE_STORE_FILE` and three
|
|
11
|
+
* siblings out of `local.properties`, and none of them were set on that machine.
|
|
12
|
+
* `doctor` had reported everything green beforehand, because it never looked.
|
|
13
|
+
*
|
|
14
|
+
* Pure over the two files' contents, so the rule is testable without an Android
|
|
15
|
+
* SDK, a keystore, or two minutes of Gradle.
|
|
16
|
+
*/
|
|
17
|
+
export type SigningStatus =
|
|
18
|
+
/** The release build type signs with nothing, so Gradle emits an unsigned APK. */
|
|
19
|
+
{
|
|
20
|
+
kind: "unsigned";
|
|
21
|
+
}
|
|
22
|
+
/** A signing config is wired up, but the values it reads are absent. */
|
|
23
|
+
| {
|
|
24
|
+
kind: "unconfigured";
|
|
25
|
+
configName: string;
|
|
26
|
+
missing: string[];
|
|
27
|
+
}
|
|
28
|
+
/** Every property the signing config reads is present. */
|
|
29
|
+
| {
|
|
30
|
+
kind: "ready";
|
|
31
|
+
configName: string;
|
|
32
|
+
storeFile: string | null;
|
|
33
|
+
};
|
|
34
|
+
export declare function inspectReleaseSigning(input: {
|
|
35
|
+
buildGradle: string;
|
|
36
|
+
/** Contents of `android/local.properties`, or "" when the file is absent. */
|
|
37
|
+
localProperties: string;
|
|
38
|
+
}): SigningStatus;
|
|
39
|
+
/** One line naming what to do about it. */
|
|
40
|
+
export declare function describeSigning(status: SigningStatus): string;
|
|
41
|
+
//# sourceMappingURL=android-signing.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"android-signing.d.ts","sourceRoot":"","sources":["../../src/pipeline/android-signing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAqBH,MAAM,MAAM,aAAa;AACvB,kFAAkF;AAChF;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE;AACtB,wEAAwE;GACtE;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE;AACjE,0DAA0D;GACxD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAEpE,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,6EAA6E;IAC7E,eAAe,EAAE,MAAM,CAAC;CACzB,GAAG,aAAa,CAqChB;AAED,2CAA2C;AAC3C,wBAAgB,eAAe,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAiB7D"}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Whether this project can actually produce a signed release APK.
|
|
3
|
+
*
|
|
4
|
+
* A `deploy native` to a prod channel spent 1m51s compiling and then failed at
|
|
5
|
+
* `:app:packageProdRelease` with
|
|
6
|
+
*
|
|
7
|
+
* A failure occurred while executing PackageAndroidArtifact$IncrementalSplitterRunnable
|
|
8
|
+
*
|
|
9
|
+
* which names neither signing nor the missing values. The cause was an empty
|
|
10
|
+
* `signingConfigs.release`: the build file reads `RELEASE_STORE_FILE` and three
|
|
11
|
+
* siblings out of `local.properties`, and none of them were set on that machine.
|
|
12
|
+
* `doctor` had reported everything green beforehand, because it never looked.
|
|
13
|
+
*
|
|
14
|
+
* Pure over the two files' contents, so the rule is testable without an Android
|
|
15
|
+
* SDK, a keystore, or two minutes of Gradle.
|
|
16
|
+
*/
|
|
17
|
+
/** The balanced body of `name { ... }`, or null when there is no such block. */
|
|
18
|
+
function blockBody(source, name) {
|
|
19
|
+
const start = source.search(new RegExp(`\\b${name}\\s*\\{`));
|
|
20
|
+
if (start === -1)
|
|
21
|
+
return null;
|
|
22
|
+
const open = source.indexOf("{", start);
|
|
23
|
+
let depth = 0;
|
|
24
|
+
for (let i = open; i < source.length; i += 1) {
|
|
25
|
+
if (source[i] === "{")
|
|
26
|
+
depth += 1;
|
|
27
|
+
else if (source[i] === "}") {
|
|
28
|
+
depth -= 1;
|
|
29
|
+
if (depth === 0)
|
|
30
|
+
return source.slice(open + 1, i);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
export function inspectReleaseSigning(input) {
|
|
36
|
+
const buildTypes = blockBody(input.buildGradle, "buildTypes") ?? "";
|
|
37
|
+
const release = blockBody(buildTypes, "release") ?? "";
|
|
38
|
+
const wired = /signingConfig\s+signingConfigs\.(\w+)/.exec(release);
|
|
39
|
+
if (!wired)
|
|
40
|
+
return { kind: "unsigned" };
|
|
41
|
+
const configName = wired[1];
|
|
42
|
+
const configs = blockBody(input.buildGradle, "signingConfigs") ?? "";
|
|
43
|
+
const config = blockBody(configs, configName) ?? "";
|
|
44
|
+
// Whatever the build file actually reads, rather than a hard-coded list of
|
|
45
|
+
// names - a project is free to call them anything.
|
|
46
|
+
const needed = [...config.matchAll(/getProperty\(\s*["']([^"']+)["']\s*\)/g)].map((match) => match[1]);
|
|
47
|
+
const present = new Map();
|
|
48
|
+
for (const line of input.localProperties.split(/\r?\n/)) {
|
|
49
|
+
if (line.trimStart().startsWith("#"))
|
|
50
|
+
continue;
|
|
51
|
+
const match = /^\s*([\w.]+)\s*=\s*(.*)$/.exec(line);
|
|
52
|
+
if (match)
|
|
53
|
+
present.set(match[1], match[2].trim());
|
|
54
|
+
}
|
|
55
|
+
const missing = [...new Set(needed)].filter((key) => !present.get(key));
|
|
56
|
+
if (missing.length > 0)
|
|
57
|
+
return { kind: "unconfigured", configName, missing };
|
|
58
|
+
// The store path is reported so the caller can check the file exists - a path
|
|
59
|
+
// that points at nothing fails the same way as a missing property.
|
|
60
|
+
const storeKey = needed.find((key) => /STORE_FILE|KEYSTORE/i.test(key));
|
|
61
|
+
return {
|
|
62
|
+
kind: "ready",
|
|
63
|
+
configName,
|
|
64
|
+
storeFile: storeKey ? (present.get(storeKey) ?? null) : null,
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
/** One line naming what to do about it. */
|
|
68
|
+
export function describeSigning(status) {
|
|
69
|
+
switch (status.kind) {
|
|
70
|
+
case "unsigned":
|
|
71
|
+
return ("The release build type declares no signingConfig, so Gradle will emit an " +
|
|
72
|
+
"unsigned APK and Android will refuse to install it.");
|
|
73
|
+
case "unconfigured":
|
|
74
|
+
return (`signingConfigs.${status.configName} reads ` +
|
|
75
|
+
`${status.missing.join(", ")} from android/local.properties, and ` +
|
|
76
|
+
`${status.missing.length === 1 ? "it is" : "they are"} not set. The build ` +
|
|
77
|
+
"reaches the packaging task and fails there, after compiling everything.");
|
|
78
|
+
case "ready":
|
|
79
|
+
return `signingConfigs.${status.configName}`;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
//# sourceMappingURL=android-signing.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"android-signing.js","sourceRoot":"","sources":["../../src/pipeline/android-signing.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
* manager believes `latest` is, and pnpm caches registry metadata - so minutes
|
|
24
24
|
* after a release it installs the previous version and says nothing.
|
|
25
25
|
*/
|
|
26
|
-
export declare const RUNTIME_VERSION = "0.
|
|
26
|
+
export declare const RUNTIME_VERSION = "0.6.0";
|
|
27
27
|
/** Capacitor majors this toolchain installs for. */
|
|
28
28
|
export declare const SUPPORTED_MAJORS: readonly [7, 8];
|
|
29
29
|
export type CapacitorMajor = (typeof SUPPORTED_MAJORS)[number];
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
* manager believes `latest` is, and pnpm caches registry metadata - so minutes
|
|
24
24
|
* after a release it installs the previous version and says nothing.
|
|
25
25
|
*/
|
|
26
|
-
export const RUNTIME_VERSION = "0.
|
|
26
|
+
export const RUNTIME_VERSION = "0.6.0";
|
|
27
27
|
/** Capacitor majors this toolchain installs for. */
|
|
28
28
|
export const SUPPORTED_MAJORS = [7, 8];
|
|
29
29
|
/**
|
package/dist/services/cloud.d.ts
CHANGED
|
@@ -13,7 +13,19 @@ export declare class CloudClient {
|
|
|
13
13
|
private readonly options;
|
|
14
14
|
constructor(endpoint: string, apiKey: string);
|
|
15
15
|
get endpoint(): string;
|
|
16
|
-
/**
|
|
16
|
+
/**
|
|
17
|
+
* The signed-in account, or null when the server refuses these credentials.
|
|
18
|
+
*
|
|
19
|
+
* `null` means the server answered and said no. Anything else - a timeout, a
|
|
20
|
+
* 502 from a service waking up, DNS - throws, because it is a failure to *ask*
|
|
21
|
+
* and not an answer.
|
|
22
|
+
*
|
|
23
|
+
* This used to swallow every error into `null`, so `doctor` reported
|
|
24
|
+
* "Credentials rejected - the endpoint did not accept the stored API key" for
|
|
25
|
+
* a backend that was merely asleep. The key was valid; the same command
|
|
26
|
+
* succeeded on the next run. A wrong diagnosis is worse than none, because it
|
|
27
|
+
* sends you looking in the wrong place with confidence.
|
|
28
|
+
*/
|
|
17
29
|
whoami(): Promise<UserProfile | null>;
|
|
18
30
|
organizations(): Promise<CloudOrganization[]>;
|
|
19
31
|
apps(): Promise<CloudApp[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud.d.ts","sourceRoot":"","sources":["../../src/services/cloud.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,WAAW,EACX,WAAW,EACZ,MAAM,gBAAgB,CAAC;AAGxB;;;;;;;;;GASG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAI5C,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED
|
|
1
|
+
{"version":3,"file":"cloud.d.ts","sourceRoot":"","sources":["../../src/services/cloud.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,WAAW,EACX,WAAW,EACZ,MAAM,gBAAgB,CAAC;AAGxB;;;;;;;;;GASG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAI5C,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED;;;;;;;;;;;;OAYG;IACG,MAAM,IAAI,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAW3C,aAAa,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAI7C,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAI3B,SAAS,CAAC,KAAK,EAAE;QACf,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe,EAAE,MAAM,CAAC;KACzB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIrB,gFAAgF;IAChF,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5C,kBAAkB,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIvE;;;;;;;OAOG;IACH,aAAa,CAAC,KAAK,EAAE;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;KAC1B,GAAG,OAAO,CAAC,YAAY,CAAC;IAIzB,sFAAsF;IACtF,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnE,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAIrD,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAKvE;;;;;;OAMG;IACG,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAoB7E,YAAY,CAAC,KAAK,EAAE;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,MAAM,EAAE,OAAO,CAAC;QAChB,QAAQ,EAAE,OAAO,CAAC;KACnB;IAiBD,YAAY,CAAC,KAAK,EAAE;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,MAAM,EAAE,OAAO,CAAC;QAChB,QAAQ,EAAE,OAAO,CAAC;KACnB;CAiBF"}
|
package/dist/services/cloud.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { del, get, post, uploadArtifact } from "../utils/http.js";
|
|
1
|
+
import { HttpError, del, get, post, uploadArtifact } from "../utils/http.js";
|
|
2
2
|
/**
|
|
3
3
|
* The Capuchoo API client.
|
|
4
4
|
*
|
|
@@ -17,13 +17,28 @@ export class CloudClient {
|
|
|
17
17
|
get endpoint() {
|
|
18
18
|
return this.options.endpoint;
|
|
19
19
|
}
|
|
20
|
-
/**
|
|
20
|
+
/**
|
|
21
|
+
* The signed-in account, or null when the server refuses these credentials.
|
|
22
|
+
*
|
|
23
|
+
* `null` means the server answered and said no. Anything else - a timeout, a
|
|
24
|
+
* 502 from a service waking up, DNS - throws, because it is a failure to *ask*
|
|
25
|
+
* and not an answer.
|
|
26
|
+
*
|
|
27
|
+
* This used to swallow every error into `null`, so `doctor` reported
|
|
28
|
+
* "Credentials rejected - the endpoint did not accept the stored API key" for
|
|
29
|
+
* a backend that was merely asleep. The key was valid; the same command
|
|
30
|
+
* succeeded on the next run. A wrong diagnosis is worse than none, because it
|
|
31
|
+
* sends you looking in the wrong place with confidence.
|
|
32
|
+
*/
|
|
21
33
|
async whoami() {
|
|
22
34
|
try {
|
|
23
35
|
return await get("/api/auth/me", this.options);
|
|
24
36
|
}
|
|
25
|
-
catch {
|
|
26
|
-
|
|
37
|
+
catch (error) {
|
|
38
|
+
if (error instanceof HttpError && (error.status === 401 || error.status === 403)) {
|
|
39
|
+
return null;
|
|
40
|
+
}
|
|
41
|
+
throw error;
|
|
27
42
|
}
|
|
28
43
|
}
|
|
29
44
|
organizations() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud.js","sourceRoot":"","sources":["../../src/services/cloud.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAoB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"cloud.js","sourceRoot":"","sources":["../../src/services/cloud.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/http.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/utils/http.ts"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH,qBAAa,SAAU,SAAQ,KAAK;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;gBAEX,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;CAM3D;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/utils/http.ts"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH,qBAAa,SAAU,SAAQ,KAAK;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;gBAEX,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;CAM3D;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAmFD,wBAAgB,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAEzE;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAEzF;AAED,uEAAuE;AACvE,wBAAsB,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/E;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,OAAO,EAAE,WAAW,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAChE,OAAO,CAAC,YAAY,CAAC,CA8CvB"}
|
package/dist/utils/http.js
CHANGED
|
@@ -37,11 +37,22 @@ function messageFrom(body, fallback) {
|
|
|
37
37
|
return body;
|
|
38
38
|
if (body && typeof body === "object") {
|
|
39
39
|
const record = body;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
40
|
+
// `details` carries the reason on this API's 500s, where `error` is a
|
|
41
|
+
// category: {"error":"Upload failed","details":"duplicate key ..."}. Reading
|
|
42
|
+
// only `error` turned every upload problem into the word "Upload failed",
|
|
43
|
+
// which says nothing a caller can act on. Both are reported when both exist.
|
|
44
|
+
const category = ["message", "error"]
|
|
45
|
+
.map((key) => record[key])
|
|
46
|
+
.find((value) => typeof value === "string" && value.length > 0);
|
|
47
|
+
const reason = ["details", "detail"]
|
|
48
|
+
.map((key) => record[key])
|
|
49
|
+
.find((value) => typeof value === "string" && value.length > 0);
|
|
50
|
+
if (category && reason)
|
|
51
|
+
return `${category}: ${reason}`;
|
|
52
|
+
if (category)
|
|
53
|
+
return category;
|
|
54
|
+
if (reason)
|
|
55
|
+
return reason;
|
|
45
56
|
}
|
|
46
57
|
return fallback;
|
|
47
58
|
}
|
package/dist/utils/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/utils/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B;;;;;;;;GAQG;AAEH,MAAM,OAAO,SAAU,SAAQ,KAAK;IACzB,MAAM,CAAS;IACf,IAAI,CAAU;IAEvB,YAAY,OAAe,EAAE,MAAc,EAAE,IAAa;QACxD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAQD,KAAK,UAAU,QAAQ,CAAC,QAAkB;IACxC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAY,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,yEAAyE;AACzE,SAAS,WAAW,CAAC,IAAa,EAAE,QAAgB;IAClD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7D,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,IAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/utils/http.ts"],"names":[],"mappings":"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"}
|