@capuchoo/cli 0.2.0 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/prompts.d.ts +43 -0
- package/dist/cli/prompts.d.ts.map +1 -0
- package/dist/cli/prompts.js +137 -0
- package/dist/cli/prompts.js.map +1 -0
- package/dist/commands/auth/login.d.ts.map +1 -1
- package/dist/commands/auth/login.js +9 -12
- package/dist/commands/auth/login.js.map +1 -1
- package/dist/commands/auth/logout.js +2 -2
- package/dist/commands/auth/logout.js.map +1 -1
- package/dist/commands/auth/whoami.js +1 -1
- package/dist/commands/auth/whoami.js.map +1 -1
- package/dist/commands/doctor.d.ts +28 -0
- package/dist/commands/doctor.d.ts.map +1 -0
- package/dist/commands/doctor.js +263 -0
- package/dist/commands/doctor.js.map +1 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +21 -41
- package/dist/commands/init.js.map +1 -1
- package/dist/deploy/execute.d.ts.map +1 -1
- package/dist/deploy/execute.js +42 -29
- package/dist/deploy/execute.js.map +1 -1
- package/dist/utils/config.d.ts +1 -1
- package/dist/utils/config.js +3 -3
- package/dist/utils/config.js.map +1 -1
- package/oclif.manifest.json +23 -1
- package/package.json +3 -3
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
export declare class PromptCancelled extends Error {
|
|
2
|
+
constructor();
|
|
3
|
+
}
|
|
4
|
+
/** Raised when a prompt is unanswerable, naming the flag that replaces it. */
|
|
5
|
+
export declare class NonInteractive extends Error {
|
|
6
|
+
constructor(question: string, flag: string);
|
|
7
|
+
}
|
|
8
|
+
export interface Choice<T> {
|
|
9
|
+
value: T;
|
|
10
|
+
label: string;
|
|
11
|
+
hint?: string | undefined;
|
|
12
|
+
}
|
|
13
|
+
export declare function isInteractive(): boolean;
|
|
14
|
+
export declare function intro(title: string): void;
|
|
15
|
+
export declare function outro(message: string): void;
|
|
16
|
+
export declare const log: {
|
|
17
|
+
info: (message: string) => void;
|
|
18
|
+
step: (message: string) => void;
|
|
19
|
+
warn: (message: string) => void;
|
|
20
|
+
error: (message: string) => void;
|
|
21
|
+
success: (message: string) => void;
|
|
22
|
+
message: (message: string) => void;
|
|
23
|
+
};
|
|
24
|
+
/** A boxed aside - for the "here is what happens next" moments. */
|
|
25
|
+
export declare function note(body: string, title?: string): void;
|
|
26
|
+
export declare function spinner(): {
|
|
27
|
+
start: (m: string) => void;
|
|
28
|
+
stop: (m?: string) => void;
|
|
29
|
+
};
|
|
30
|
+
export declare function selectOne<T>(question: string, choices: Choice<T>[], flag: string): Promise<T>;
|
|
31
|
+
export declare function confirm(question: string, options?: {
|
|
32
|
+
default?: boolean;
|
|
33
|
+
flag?: string;
|
|
34
|
+
}): Promise<boolean>;
|
|
35
|
+
export declare function askText(question: string, options: {
|
|
36
|
+
placeholder?: string;
|
|
37
|
+
initial?: string;
|
|
38
|
+
flag: string;
|
|
39
|
+
validate?: (v: string) => string | undefined;
|
|
40
|
+
optional?: boolean;
|
|
41
|
+
}): Promise<string>;
|
|
42
|
+
export declare function askSecret(question: string): Promise<string>;
|
|
43
|
+
//# sourceMappingURL=prompts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/cli/prompts.ts"],"names":[],"mappings":"AAoBA,qBAAa,eAAgB,SAAQ,KAAK;;CAKzC;AAED,8EAA8E;AAC9E,qBAAa,cAAe,SAAQ,KAAK;gBAC3B,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAI3C;AAED,MAAM,WAAW,MAAM,CAAC,CAAC;IACvB,KAAK,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAED,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAOD,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAEzC;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAE3C;AAED,eAAO,MAAM,GAAG;oBACE,MAAM;oBACN,MAAM;oBACN,MAAM;qBACL,MAAM;uBACJ,MAAM;uBACN,MAAM;CAC1B,CAAC;AAEF,mEAAmE;AACnE,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAEvD;AAED,wBAAgB,OAAO,IAAI;IAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,CAMpF;AAED,wBAAsB,SAAS,CAAC,CAAC,EAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EACpB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,CAAC,CAAC,CAmCZ;AAED,wBAAsB,OAAO,CAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GACjD,OAAO,CAAC,OAAO,CAAC,CASlB;AAED,wBAAsB,OAAO,CAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE;IACP,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC7C,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GACA,OAAO,CAAC,MAAM,CAAC,CAoBjB;AAED,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAcjE"}
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
import * as clack from "@clack/prompts";
|
|
2
|
+
import { stdin, stdout } from "node:process";
|
|
3
|
+
/**
|
|
4
|
+
* Interactive prompts, with three rules that decide how this CLI feels.
|
|
5
|
+
*
|
|
6
|
+
* 1. **One choice is not a question.** If there is exactly one thing the user
|
|
7
|
+
* could pick, pick it and say so. Asking is theatre.
|
|
8
|
+
* 2. **A non-interactive shell is told which flag to use**, not left to guess
|
|
9
|
+
* or - worse - hung on a prompt nobody can answer. Every prompt names its
|
|
10
|
+
* escape hatch, because the same commands run in CI.
|
|
11
|
+
* 3. **Cancelling changes nothing**, and says so. Ctrl-C mid-wizard should not
|
|
12
|
+
* leave half a config behind.
|
|
13
|
+
*
|
|
14
|
+
* Long lists switch from a menu to a filter: past about eight entries, scrolling
|
|
15
|
+
* is worse than typing.
|
|
16
|
+
*/
|
|
17
|
+
const AUTOCOMPLETE_THRESHOLD = 8;
|
|
18
|
+
export class PromptCancelled extends Error {
|
|
19
|
+
constructor() {
|
|
20
|
+
super("Cancelled. Nothing changed.");
|
|
21
|
+
this.name = "PromptCancelled";
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
/** Raised when a prompt is unanswerable, naming the flag that replaces it. */
|
|
25
|
+
export class NonInteractive extends Error {
|
|
26
|
+
constructor(question, flag) {
|
|
27
|
+
super(`${question} cannot be asked in a non-interactive shell. Pass ${flag}.`);
|
|
28
|
+
this.name = "NonInteractive";
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
export function isInteractive() {
|
|
32
|
+
return Boolean(stdin.isTTY && stdout.isTTY);
|
|
33
|
+
}
|
|
34
|
+
function settle(answer) {
|
|
35
|
+
if (clack.isCancel(answer))
|
|
36
|
+
throw new PromptCancelled();
|
|
37
|
+
return answer;
|
|
38
|
+
}
|
|
39
|
+
export function intro(title) {
|
|
40
|
+
clack.intro(title);
|
|
41
|
+
}
|
|
42
|
+
export function outro(message) {
|
|
43
|
+
clack.outro(message);
|
|
44
|
+
}
|
|
45
|
+
export const log = {
|
|
46
|
+
info: (message) => clack.log.info(message),
|
|
47
|
+
step: (message) => clack.log.step(message),
|
|
48
|
+
warn: (message) => clack.log.warn(message),
|
|
49
|
+
error: (message) => clack.log.error(message),
|
|
50
|
+
success: (message) => clack.log.success(message),
|
|
51
|
+
message: (message) => clack.log.message(message),
|
|
52
|
+
};
|
|
53
|
+
/** A boxed aside - for the "here is what happens next" moments. */
|
|
54
|
+
export function note(body, title) {
|
|
55
|
+
clack.note(body, title);
|
|
56
|
+
}
|
|
57
|
+
export function spinner() {
|
|
58
|
+
const instance = clack.spinner();
|
|
59
|
+
return {
|
|
60
|
+
start: (message) => instance.start(message),
|
|
61
|
+
stop: (message) => instance.stop(message),
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
export async function selectOne(question, choices, flag) {
|
|
65
|
+
if (choices.length === 0)
|
|
66
|
+
throw new Error(`Nothing to choose from for: ${question}`);
|
|
67
|
+
if (choices.length === 1) {
|
|
68
|
+
const only = choices[0];
|
|
69
|
+
log.info(`${question}: ${only.label}`);
|
|
70
|
+
return only.value;
|
|
71
|
+
}
|
|
72
|
+
if (!isInteractive())
|
|
73
|
+
throw new NonInteractive(question, flag);
|
|
74
|
+
// clack's `Option` is an internal conditional type, not exported, and this
|
|
75
|
+
// workspace runs with exactOptionalPropertyTypes - so an inferred `hint?:
|
|
76
|
+
// string | undefined` is not assignable to its `hint?: string`. The cast goes
|
|
77
|
+
// through clack's own parameter type rather than a hand-written shape, so it
|
|
78
|
+
// still breaks if their option shape changes.
|
|
79
|
+
const options = choices.map((choice) => {
|
|
80
|
+
const option = {
|
|
81
|
+
value: choice.value,
|
|
82
|
+
label: choice.label,
|
|
83
|
+
};
|
|
84
|
+
if (choice.hint)
|
|
85
|
+
option.hint = choice.hint;
|
|
86
|
+
return option;
|
|
87
|
+
});
|
|
88
|
+
if (choices.length > AUTOCOMPLETE_THRESHOLD) {
|
|
89
|
+
return settle(await clack.autocomplete({
|
|
90
|
+
message: question,
|
|
91
|
+
options: options,
|
|
92
|
+
maxItems: AUTOCOMPLETE_THRESHOLD,
|
|
93
|
+
placeholder: "Type to filter...",
|
|
94
|
+
}));
|
|
95
|
+
}
|
|
96
|
+
return settle(await clack.select({ message: question, options }));
|
|
97
|
+
}
|
|
98
|
+
export async function confirm(question, options = {}) {
|
|
99
|
+
if (!isInteractive()) {
|
|
100
|
+
if (options.default === undefined) {
|
|
101
|
+
throw new NonInteractive(question, options.flag ?? "--yes");
|
|
102
|
+
}
|
|
103
|
+
return options.default;
|
|
104
|
+
}
|
|
105
|
+
return settle(await clack.confirm({ message: question, initialValue: options.default ?? false }));
|
|
106
|
+
}
|
|
107
|
+
export async function askText(question, options) {
|
|
108
|
+
if (!isInteractive()) {
|
|
109
|
+
if (options.initial !== undefined)
|
|
110
|
+
return options.initial;
|
|
111
|
+
if (options.optional)
|
|
112
|
+
return "";
|
|
113
|
+
throw new NonInteractive(question, options.flag);
|
|
114
|
+
}
|
|
115
|
+
const answer = settle(await clack.text({
|
|
116
|
+
message: question,
|
|
117
|
+
...(options.placeholder ? { placeholder: options.placeholder } : {}),
|
|
118
|
+
...(options.initial ? { initialValue: options.initial } : {}),
|
|
119
|
+
validate: (value) => {
|
|
120
|
+
if (!options.optional && !value?.trim())
|
|
121
|
+
return "Required.";
|
|
122
|
+
return options.validate?.(value ?? "");
|
|
123
|
+
},
|
|
124
|
+
}));
|
|
125
|
+
return answer.trim();
|
|
126
|
+
}
|
|
127
|
+
export async function askSecret(question) {
|
|
128
|
+
if (!isInteractive()) {
|
|
129
|
+
throw new Error(`${question} cannot be asked in a non-interactive shell. ` +
|
|
130
|
+
"Set CAPUCHOO_API_KEY, or pass --api-key.");
|
|
131
|
+
}
|
|
132
|
+
return settle(await clack.password({
|
|
133
|
+
message: question,
|
|
134
|
+
validate: (value) => (value?.trim() ? undefined : "Required."),
|
|
135
|
+
}));
|
|
136
|
+
}
|
|
137
|
+
//# sourceMappingURL=prompts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../src/cli/prompts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAChD,OAAgB,WAAW,SAA8C;IAEzE,OAAgB,QAAQ,WAGtB;IAEF,OAAgB,KAAK;;;MAMnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B;;;;;;OAMG;WACU,YAAY,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAChD,OAAgB,WAAW,SAA8C;IAEzE,OAAgB,QAAQ,WAGtB;IAEF,OAAgB,KAAK;;;MAMnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B;;;;;;OAMG;WACU,YAAY,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAiDrF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { askSecret, askText } from "../../cli/prompts.js";
|
|
2
2
|
import { Flags } from "@oclif/core";
|
|
3
3
|
import chalk from "chalk";
|
|
4
4
|
import ora from "ora";
|
|
@@ -33,23 +33,20 @@ export default class AuthLogin extends BaseCommand {
|
|
|
33
33
|
static async performLogin(flagEndpoint, flagApiKey) {
|
|
34
34
|
const existing = readGlobalConfig();
|
|
35
35
|
const endpoint = (flagEndpoint ??
|
|
36
|
-
(await
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
validate: (value) => /^https?:\/\/.+/.test(value.trim())
|
|
36
|
+
(await askText("Backend URL", {
|
|
37
|
+
initial: existing.endpoint ?? DEFAULT_ENDPOINT,
|
|
38
|
+
flag: "--endpoint",
|
|
39
|
+
validate: (value) => /^https?:\/\/.+/.test(value.trim()) ? undefined : "Must start with http:// or https://",
|
|
40
40
|
})))
|
|
41
41
|
.trim()
|
|
42
42
|
.replace(/\/+$/, "");
|
|
43
43
|
let apiKey = flagApiKey;
|
|
44
44
|
if (!apiKey) {
|
|
45
45
|
process.stderr.write(chalk.dim(`\n Create a key under Settings > API Keys at ${endpoint}\n\n`));
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
// business enforcing - a rotated prefix would have locked users out.
|
|
51
|
-
validate: (value) => value.trim().length >= 16 || "That key looks too short",
|
|
52
|
-
});
|
|
46
|
+
// Only a length check. The previous version required the key to start with
|
|
47
|
+
// "cap_", which is a server-side format decision the CLI has no business
|
|
48
|
+
// enforcing - a rotated prefix would have locked users out.
|
|
49
|
+
apiKey = await askSecret("API key");
|
|
53
50
|
}
|
|
54
51
|
apiKey = apiKey.trim();
|
|
55
52
|
const spinner = ora({ text: "Verifying", stream: process.stderr }).start();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,8 @@ export default class AuthLogout extends BaseCommand {
|
|
|
14
14
|
writeGlobalConfig({ endpoint: config.endpoint });
|
|
15
15
|
this.log(chalk.green("Signed out. The stored API key has been removed."));
|
|
16
16
|
}
|
|
17
|
-
if (process.env.
|
|
18
|
-
this.log(chalk.yellow("!
|
|
17
|
+
if (process.env.CAPUCHOO_API_KEY) {
|
|
18
|
+
this.log(chalk.yellow("! CAPUCHOO_API_KEY is set in this environment and still takes precedence."));
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IACjD,MAAM,CAAU,WAAW,GAAG,2BAA2B,CAAC;IAE1D,KAAK,CAAC,GAAG;QACP,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;QAElC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,wEAAwE;YACxE,+DAA+D;YAC/D,iBAAiB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IACjD,MAAM,CAAU,WAAW,GAAG,2BAA2B,CAAC;IAE1D,KAAK,CAAC,GAAG;QACP,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;QAElC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,wEAAwE;YACxE,+DAA+D;YAC/D,iBAAiB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,CACN,KAAK,CAAC,MAAM,CAAC,2EAA2E,CAAC,CAC1F,CAAC;QACJ,CAAC;IACH,CAAC"}
|
|
@@ -51,7 +51,7 @@ export default class AuthWhoami extends BaseCommand {
|
|
|
51
51
|
this.log(` ${chalk.bold("account")} ${chalk.green(profile.user.email)}`);
|
|
52
52
|
this.log(` ${chalk.bold("endpoint")} ${credentials.endpoint}`);
|
|
53
53
|
this.log(` ${chalk.bold("source")} ${credentials.source === "environment"
|
|
54
|
-
? "
|
|
54
|
+
? "CAPUCHOO_ENDPOINT / CAPUCHOO_API_KEY"
|
|
55
55
|
: "~/.capuchoo/config.json"}`);
|
|
56
56
|
if (profile.organizations.length > 0) {
|
|
57
57
|
this.log("");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../../src/commands/auth/whoami.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../../src/commands/auth/whoami.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { BaseCommand } from "../base-command.js";
|
|
2
|
+
/**
|
|
3
|
+
* Explains why a deploy will not work, before you run one.
|
|
4
|
+
*
|
|
5
|
+
* Every check here corresponds to something that has silently failed in this
|
|
6
|
+
* project: an endpoint pointing at a retired backend, a channel whose
|
|
7
|
+
* environment disagreed with its name, a channel serving nothing because the
|
|
8
|
+
* upload never moved its pointer, an app whose flavour env file did not exist.
|
|
9
|
+
* Each finding names the fix, because a diagnosis you cannot act on is just bad
|
|
10
|
+
* news.
|
|
11
|
+
*/
|
|
12
|
+
export default class Doctor extends BaseCommand {
|
|
13
|
+
static description: string;
|
|
14
|
+
static examples: string[];
|
|
15
|
+
run(): Promise<void>;
|
|
16
|
+
/**
|
|
17
|
+
* Looks for the two calls that decide whether updates work at all.
|
|
18
|
+
*
|
|
19
|
+
* Textual, not semantic: this is a hint, not a compiler. Worth doing anyway -
|
|
20
|
+
* a missing `notifyAppReady()` rolls back working bundles ten seconds after
|
|
21
|
+
* they install, and that is invisible until it happens on a device.
|
|
22
|
+
*/
|
|
23
|
+
private checkRuntimeWiring;
|
|
24
|
+
/** Shallow-ish walk: enough to find an import, cheap enough to run always. */
|
|
25
|
+
private sourceFiles;
|
|
26
|
+
private report;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=doctor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAcjD;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW;IAC7C,OAAgB,WAAW,SAAsE;IAEjG,OAAgB,QAAQ,WAAgC;IAElD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA2K1B;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IA6D1B,8EAA8E;IAC9E,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,MAAM;CA0Bf"}
|
|
@@ -0,0 +1,263 @@
|
|
|
1
|
+
import { hasEnvironmentMismatch, normaliseProjectConfig, suggestEnvironment, } from "@capuchoo/core";
|
|
2
|
+
import chalk from "chalk";
|
|
3
|
+
import fs from "node:fs";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import { BaseCommand } from "../base-command.js";
|
|
6
|
+
import { CloudClient } from "../services/cloud.js";
|
|
7
|
+
import { readProjectConfig, resolveCredentials } from "../utils/config.js";
|
|
8
|
+
/**
|
|
9
|
+
* Explains why a deploy will not work, before you run one.
|
|
10
|
+
*
|
|
11
|
+
* Every check here corresponds to something that has silently failed in this
|
|
12
|
+
* project: an endpoint pointing at a retired backend, a channel whose
|
|
13
|
+
* environment disagreed with its name, a channel serving nothing because the
|
|
14
|
+
* upload never moved its pointer, an app whose flavour env file did not exist.
|
|
15
|
+
* Each finding names the fix, because a diagnosis you cannot act on is just bad
|
|
16
|
+
* news.
|
|
17
|
+
*/
|
|
18
|
+
export default class Doctor extends BaseCommand {
|
|
19
|
+
static description = "Check that this app, its credentials and its channels are usable";
|
|
20
|
+
static examples = ["<%= config.bin %> doctor"];
|
|
21
|
+
async run() {
|
|
22
|
+
const appDir = process.cwd();
|
|
23
|
+
const findings = [];
|
|
24
|
+
// --- credentials ---------------------------------------------------------
|
|
25
|
+
const credentials = resolveCredentials();
|
|
26
|
+
if (!credentials) {
|
|
27
|
+
this.report([{ level: "fail", what: "Not signed in", fix: "capuchoo auth login" }]);
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
findings.push({ level: "ok", what: "Endpoint", detail: credentials.endpoint });
|
|
31
|
+
const cloud = new CloudClient(credentials.endpoint, credentials.apiKey);
|
|
32
|
+
const profile = await cloud.whoami().catch(() => null);
|
|
33
|
+
if (!profile) {
|
|
34
|
+
findings.push({
|
|
35
|
+
level: "fail",
|
|
36
|
+
what: "Credentials rejected",
|
|
37
|
+
detail: `${credentials.endpoint} did not accept the stored API key`,
|
|
38
|
+
// The endpoint is the likelier culprit: a retired backend answers
|
|
39
|
+
// /health but validates nothing.
|
|
40
|
+
fix: `capuchoo config set endpoint <url> (or capuchoo auth login)`,
|
|
41
|
+
});
|
|
42
|
+
this.report(findings);
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
findings.push({ level: "ok", what: "Signed in", detail: profile.user.email });
|
|
46
|
+
// --- the link between this directory and a cloud app ---------------------
|
|
47
|
+
// Normalised, not raw: a v1 project.json carries only the cloud identifiers
|
|
48
|
+
// and every flavour is defaulted at runtime. Reading the raw fields reported
|
|
49
|
+
// "no flavour configured" for an app that deploys fine.
|
|
50
|
+
const raw = readProjectConfig(appDir);
|
|
51
|
+
const project = raw ? normaliseProjectConfig(raw) : null;
|
|
52
|
+
if (!project) {
|
|
53
|
+
findings.push({
|
|
54
|
+
level: "fail",
|
|
55
|
+
what: "This directory is not linked to an app",
|
|
56
|
+
fix: "capuchoo init",
|
|
57
|
+
});
|
|
58
|
+
this.report(findings);
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
findings.push({
|
|
62
|
+
level: "ok",
|
|
63
|
+
what: "Linked",
|
|
64
|
+
detail: `${project.appName} (${project.appId})`,
|
|
65
|
+
});
|
|
66
|
+
// --- channels ------------------------------------------------------------
|
|
67
|
+
const channels = await cloud.channels(project.cloudAppId).catch(() => null);
|
|
68
|
+
if (!channels) {
|
|
69
|
+
findings.push({
|
|
70
|
+
level: "fail",
|
|
71
|
+
what: "The linked cloud app could not be read",
|
|
72
|
+
detail: `cloudAppId ${project.cloudAppId} - deleted, or belongs to another account`,
|
|
73
|
+
fix: "capuchoo init --force",
|
|
74
|
+
});
|
|
75
|
+
this.report(findings);
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
if (channels.length === 0) {
|
|
79
|
+
findings.push({
|
|
80
|
+
level: "fail",
|
|
81
|
+
what: "No channels",
|
|
82
|
+
detail: "Nothing can be deployed until a channel exists",
|
|
83
|
+
fix: "Create one in the dashboard",
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
for (const channel of channels) {
|
|
87
|
+
if (!channel.environment) {
|
|
88
|
+
findings.push({
|
|
89
|
+
level: "fail",
|
|
90
|
+
what: `Channel "${channel.name}" has no environment`,
|
|
91
|
+
detail: "The environment is what tells the CLI which flavour to build",
|
|
92
|
+
fix: `Set it in the dashboard (suggested: ${suggestEnvironment(channel.name) ?? "prod"})`,
|
|
93
|
+
});
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
if (hasEnvironmentMismatch(channel.name, channel.environment)) {
|
|
97
|
+
findings.push({
|
|
98
|
+
level: "warn",
|
|
99
|
+
what: `Channel "${channel.name}" is on the ${channel.environment} environment`,
|
|
100
|
+
detail: `Devices on it receive ${channel.environment} bundles, built from .env.${channel.environment}`,
|
|
101
|
+
fix: `Set it to ${suggestEnvironment(channel.name)} unless that is deliberate`,
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
// The pointer that decides what is served. An upload that does not move
|
|
105
|
+
// it leaves the channel answering "no update" forever.
|
|
106
|
+
if (!channel.current_version_id) {
|
|
107
|
+
findings.push({
|
|
108
|
+
level: "warn",
|
|
109
|
+
what: `Channel "${channel.name}" is serving no bundle`,
|
|
110
|
+
detail: "No OTA version is active on it yet",
|
|
111
|
+
fix: `capuchoo deploy ota --channel ${channel.name}`,
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
// --- flavours ------------------------------------------------------------
|
|
116
|
+
const environments = new Set(channels.map((channel) => channel.environment).filter(Boolean));
|
|
117
|
+
for (const environment of environments) {
|
|
118
|
+
const flavour = project.flavours[environment];
|
|
119
|
+
const envFile = path.join(appDir, flavour.envFile);
|
|
120
|
+
if (!fs.existsSync(envFile)) {
|
|
121
|
+
findings.push({
|
|
122
|
+
level: "fail",
|
|
123
|
+
what: `Missing ${flavour.envFile}`,
|
|
124
|
+
detail: `A ${environment} deploy reads it for the app id, version and update URL`,
|
|
125
|
+
fix: `Create ${flavour.envFile}`,
|
|
126
|
+
});
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
const contents = fs.readFileSync(envFile, "utf8");
|
|
130
|
+
const updateUrl = /^VITE_UPDATE_API_URL=(.*)$/m.exec(contents)?.[1]?.trim();
|
|
131
|
+
if (!updateUrl) {
|
|
132
|
+
findings.push({
|
|
133
|
+
level: "fail",
|
|
134
|
+
what: `${flavour.envFile} has no VITE_UPDATE_API_URL`,
|
|
135
|
+
detail: "The app would ship with updates silently disabled",
|
|
136
|
+
fix: `Add VITE_UPDATE_API_URL=${credentials.endpoint}`,
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
else if (updateUrl.replace(/\/+$/, "") !== credentials.endpoint.replace(/\/+$/, "")) {
|
|
140
|
+
// Not necessarily wrong - a custom domain in front of the same service
|
|
141
|
+
// is good practice - but it is the mistake that cost an afternoon.
|
|
142
|
+
findings.push({
|
|
143
|
+
level: "warn",
|
|
144
|
+
what: `${flavour.envFile} points at a different host`,
|
|
145
|
+
detail: `app: ${updateUrl} cli: ${credentials.endpoint}`,
|
|
146
|
+
fix: "Confirm both reach the same backend",
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
findings.push({ level: "ok", what: `Flavour ${environment}`, detail: flavour.envFile });
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
// --- the app's own wiring ------------------------------------------------
|
|
154
|
+
const webDir = path.join(appDir, project.webDir ?? "dist");
|
|
155
|
+
if (!fs.existsSync(webDir)) {
|
|
156
|
+
findings.push({
|
|
157
|
+
level: "warn",
|
|
158
|
+
what: `webDir "${project.webDir}" does not exist yet`,
|
|
159
|
+
detail: "Fine before the first build; a deploy builds it",
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
findings.push(...this.checkRuntimeWiring(appDir));
|
|
163
|
+
this.report(findings);
|
|
164
|
+
}
|
|
165
|
+
/**
|
|
166
|
+
* Looks for the two calls that decide whether updates work at all.
|
|
167
|
+
*
|
|
168
|
+
* Textual, not semantic: this is a hint, not a compiler. Worth doing anyway -
|
|
169
|
+
* a missing `notifyAppReady()` rolls back working bundles ten seconds after
|
|
170
|
+
* they install, and that is invisible until it happens on a device.
|
|
171
|
+
*/
|
|
172
|
+
checkRuntimeWiring(appDir) {
|
|
173
|
+
const findings = [];
|
|
174
|
+
const pkgPath = path.join(appDir, "package.json");
|
|
175
|
+
if (!fs.existsSync(pkgPath))
|
|
176
|
+
return findings;
|
|
177
|
+
const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
|
|
178
|
+
const deps = { ...pkg.dependencies, ...pkg.devDependencies };
|
|
179
|
+
if (!deps["@capuchoo/updater"]) {
|
|
180
|
+
findings.push({
|
|
181
|
+
level: "warn",
|
|
182
|
+
what: "@capuchoo/updater is not a dependency",
|
|
183
|
+
detail: "Deploys will work; the app will not check for what they publish",
|
|
184
|
+
fix: "pnpm add @capuchoo/updater",
|
|
185
|
+
});
|
|
186
|
+
return findings;
|
|
187
|
+
}
|
|
188
|
+
const sources = this.sourceFiles(path.join(appDir, "src"));
|
|
189
|
+
const joined = sources.map((file) => fs.readFileSync(file, "utf8")).join("\n");
|
|
190
|
+
if (!joined.includes("notifyAppReady")) {
|
|
191
|
+
findings.push({
|
|
192
|
+
level: "fail",
|
|
193
|
+
what: "notifyAppReady() is never called",
|
|
194
|
+
detail: "The plugin rolls back to the previous bundle when it does not hear this " +
|
|
195
|
+
"within its timeout - so every update would install and then revert",
|
|
196
|
+
fix: 'Call it early in main.ts: import { notifyAppReady } from "@capuchoo/updater"',
|
|
197
|
+
});
|
|
198
|
+
}
|
|
199
|
+
else {
|
|
200
|
+
findings.push({ level: "ok", what: "notifyAppReady() present" });
|
|
201
|
+
}
|
|
202
|
+
const capacitorConfig = ["capacitor.config.ts", "capacitor.config.js"]
|
|
203
|
+
.map((name) => path.join(appDir, name))
|
|
204
|
+
.find((file) => fs.existsSync(file));
|
|
205
|
+
if (capacitorConfig) {
|
|
206
|
+
const config = fs.readFileSync(capacitorConfig, "utf8");
|
|
207
|
+
if (!config.includes("capuchooUpdaterConfig") && !config.includes("capuchooUpdaterConfig")) {
|
|
208
|
+
findings.push({
|
|
209
|
+
level: "warn",
|
|
210
|
+
what: `${path.basename(capacitorConfig)} does not use capuchooUpdaterConfig()`,
|
|
211
|
+
detail: "Hand-written plugin config has shipped an empty updateUrl before, which " +
|
|
212
|
+
"disables updates without failing",
|
|
213
|
+
fix: "plugins.CapacitorUpdater = capuchooUpdaterConfig({ apiUrl, channel })",
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
else {
|
|
217
|
+
findings.push({ level: "ok", what: "Capacitor plugin config" });
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
return findings;
|
|
221
|
+
}
|
|
222
|
+
/** Shallow-ish walk: enough to find an import, cheap enough to run always. */
|
|
223
|
+
sourceFiles(dir, depth = 0) {
|
|
224
|
+
if (depth > 3 || !fs.existsSync(dir))
|
|
225
|
+
return [];
|
|
226
|
+
const found = [];
|
|
227
|
+
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
|
|
228
|
+
if (entry.name === "node_modules" || entry.name.startsWith("."))
|
|
229
|
+
continue;
|
|
230
|
+
const full = path.join(dir, entry.name);
|
|
231
|
+
if (entry.isDirectory())
|
|
232
|
+
found.push(...this.sourceFiles(full, depth + 1));
|
|
233
|
+
else if (/\.(ts|tsx|js|vue)$/.test(entry.name))
|
|
234
|
+
found.push(full);
|
|
235
|
+
}
|
|
236
|
+
return found;
|
|
237
|
+
}
|
|
238
|
+
report(findings) {
|
|
239
|
+
const mark = { ok: chalk.green("✓"), warn: chalk.yellow("!"), fail: chalk.red("✗") };
|
|
240
|
+
this.log("");
|
|
241
|
+
for (const finding of findings) {
|
|
242
|
+
this.log(` ${mark[finding.level]} ${finding.what}`);
|
|
243
|
+
if (finding.detail)
|
|
244
|
+
this.log(chalk.dim(` ${finding.detail}`));
|
|
245
|
+
if (finding.fix)
|
|
246
|
+
this.log(chalk.cyan(` → ${finding.fix}`));
|
|
247
|
+
}
|
|
248
|
+
const failed = findings.filter((f) => f.level === "fail").length;
|
|
249
|
+
const warned = findings.filter((f) => f.level === "warn").length;
|
|
250
|
+
this.log("");
|
|
251
|
+
if (failed === 0 && warned === 0) {
|
|
252
|
+
this.log(chalk.green(" Ready to deploy."));
|
|
253
|
+
}
|
|
254
|
+
else {
|
|
255
|
+
this.log(` ${failed} blocking, ${warned} worth a look. ` +
|
|
256
|
+
chalk.dim("Fix the blocking ones before deploying."));
|
|
257
|
+
}
|
|
258
|
+
this.log("");
|
|
259
|
+
if (failed > 0)
|
|
260
|
+
process.exitCode = 1;
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
//# sourceMappingURL=doctor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW;IAC3C,OAAgB,WAAW,SAC8C;IAEzE,OAAgB,QAAQ,WAA+D;IAEvF,OAAgB,KAAK;;;MAWnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW;IAC3C,OAAgB,WAAW,SAC8C;IAEzE,OAAgB,QAAQ,WAA+D;IAEvF,OAAgB,KAAK;;;MAWnB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA0I1B,iEAAiE;IACjE,OAAO,CAAC,cAAc;IAatB,iFAAiF;IACjF,OAAO,CAAC,YAAY;YAYN,YAAY;YAmBZ,SAAS;CA6DxB"}
|
package/dist/commands/init.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { askText, confirm, selectOne } from "../cli/prompts.js";
|
|
2
2
|
import { ENVIRONMENTS, PROJECT_CONFIG_VERSION, canCreateApps, defaultFlavour, isValidBundleId, } from "@capuchoo/core";
|
|
3
3
|
import { Flags } from "@oclif/core";
|
|
4
4
|
import chalk from "chalk";
|
|
@@ -34,13 +34,10 @@ export default class Init extends BaseCommand {
|
|
|
34
34
|
const existing = readProjectConfig(appDir);
|
|
35
35
|
if (existing && !flags.force) {
|
|
36
36
|
this.log(chalk.yellow(" Already initialised: ") + `${existing.appName} (${existing.appId})`);
|
|
37
|
-
const action = await
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
{ name: "Re-link to a different app", value: "relink" },
|
|
42
|
-
],
|
|
43
|
-
});
|
|
37
|
+
const action = await selectOne("What now?", [
|
|
38
|
+
{ value: "keep", label: "Keep it", hint: existing.appId },
|
|
39
|
+
{ value: "relink", label: "Re-link to a different app" },
|
|
40
|
+
], "--force");
|
|
44
41
|
if (action === "keep")
|
|
45
42
|
return;
|
|
46
43
|
}
|
|
@@ -67,13 +64,10 @@ export default class Init extends BaseCommand {
|
|
|
67
64
|
// --- pick or create the app ---------------------------------------------
|
|
68
65
|
const mode = flags.link
|
|
69
66
|
? "existing"
|
|
70
|
-
: await
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
{ name: "A new app", value: "new" },
|
|
75
|
-
],
|
|
76
|
-
});
|
|
67
|
+
: await selectOne("Link this directory to", [
|
|
68
|
+
{ value: "existing", label: "An app that already exists" },
|
|
69
|
+
{ value: "new", label: "A new app" },
|
|
70
|
+
], "--link");
|
|
77
71
|
const app = mode === "existing" ? await this.linkExisting(cloud) : await this.createNew(cloud);
|
|
78
72
|
// --- flavours ------------------------------------------------------------
|
|
79
73
|
const flavours = this.detectFlavours(appDir);
|
|
@@ -164,13 +158,7 @@ export default class Init extends BaseCommand {
|
|
|
164
158
|
this.error("This account has no apps yet. Re-run and choose to create one, or " +
|
|
165
159
|
"create it in the dashboard.");
|
|
166
160
|
}
|
|
167
|
-
return
|
|
168
|
-
message: "App",
|
|
169
|
-
choices: apps.map((app) => ({
|
|
170
|
-
name: `${app.name} ${chalk.dim(app.app_id)}`,
|
|
171
|
-
value: app,
|
|
172
|
-
})),
|
|
173
|
-
});
|
|
161
|
+
return selectOne("App", apps.map((app) => ({ value: app, label: app.name, hint: app.app_id })), "--link with the app selected in the dashboard");
|
|
174
162
|
}
|
|
175
163
|
async createNew(cloud) {
|
|
176
164
|
const spinner = ora({
|
|
@@ -188,28 +176,20 @@ export default class Init extends BaseCommand {
|
|
|
188
176
|
}
|
|
189
177
|
const organizationId = allowed.length === 1
|
|
190
178
|
? allowed[0].id
|
|
191
|
-
: await
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
value: org.id,
|
|
196
|
-
})),
|
|
197
|
-
});
|
|
198
|
-
const name = await input({
|
|
199
|
-
message: "App name",
|
|
200
|
-
default: path.basename(process.cwd()),
|
|
201
|
-
validate: (value) => value.trim().length > 0 || "Required",
|
|
179
|
+
: await selectOne("Organization", allowed.map((org) => ({ value: org.id, label: org.name, hint: org.role })), "--link");
|
|
180
|
+
const name = await askText("App name", {
|
|
181
|
+
initial: path.basename(process.cwd()),
|
|
182
|
+
flag: "--link",
|
|
202
183
|
});
|
|
203
|
-
const appId = await
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
184
|
+
const appId = await askText("Production bundle identifier", {
|
|
185
|
+
placeholder: "com.company.app",
|
|
186
|
+
flag: "--link",
|
|
187
|
+
validate: (value) => isValidBundleId(value.trim())
|
|
188
|
+
? undefined
|
|
189
|
+
: "Expected something like com.company.app - lower case, at least two segments",
|
|
207
190
|
});
|
|
208
191
|
// Creating an app is the one irreversible thing this command does.
|
|
209
|
-
const proceed = await confirm({
|
|
210
|
-
message: `Create "${name}" (${appId})?`,
|
|
211
|
-
default: true,
|
|
212
|
-
});
|
|
192
|
+
const proceed = await confirm(`Create "${name}" (${appId})?`, { default: true });
|
|
213
193
|
if (!proceed)
|
|
214
194
|
this.error("Cancelled.");
|
|
215
195
|
const creating = ora({ text: "Creating app", stream: process.stderr }).start();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/deploy/execute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,EAIL,KAAK,UAAU,EAEhB,MAAM,uBAAuB,CAAC;AAU/B;;;;;;;;GAQG;AAEH,yCAAyC;AACzC,eAAO,MAAM,iBAAiB;;;;;;;;;;;;CA8CpB,CAAC;AAEX,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,WAAW,CAAC;CACpB;AAaD,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/deploy/execute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,EAIL,KAAK,UAAU,EAEhB,MAAM,uBAAuB,CAAC;AAU/B;;;;;;;;GAQG;AAEH,yCAAyC;AACzC,eAAO,MAAM,iBAAiB;;;;;;;;;;;;CA8CpB,CAAC;AAEX,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,WAAW,CAAC;CACpB;AAaD,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwRhF"}
|
package/dist/deploy/execute.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { confirm,
|
|
1
|
+
import { askText, confirm, isInteractive, selectOne } from "../cli/prompts.js";
|
|
2
2
|
import { bumpVersion } from "@capuchoo/core";
|
|
3
3
|
import { Command, Flags } from "@oclif/core";
|
|
4
4
|
import chalk from "chalk";
|
|
@@ -87,14 +87,14 @@ export async function executeDeploy(options) {
|
|
|
87
87
|
if (!credentials) {
|
|
88
88
|
fail(command, "Not authenticated. Run " +
|
|
89
89
|
chalk.cyan("capuchoo auth login") +
|
|
90
|
-
", or set
|
|
90
|
+
", or set CAPUCHOO_ENDPOINT and CAPUCHOO_API_KEY.");
|
|
91
91
|
}
|
|
92
92
|
const cloud = new CloudClient(credentials.endpoint, credentials.apiKey);
|
|
93
93
|
const profile = await cloud.whoami();
|
|
94
94
|
if (!profile) {
|
|
95
95
|
fail(command, `The credentials for ${credentials.endpoint} were rejected. ` +
|
|
96
96
|
(credentials.source === "environment"
|
|
97
|
-
? "Check
|
|
97
|
+
? "Check CAPUCHOO_API_KEY."
|
|
98
98
|
: `Run ${chalk.cyan("capuchoo auth login")} again.`));
|
|
99
99
|
}
|
|
100
100
|
if (!json) {
|
|
@@ -108,45 +108,58 @@ export async function executeDeploy(options) {
|
|
|
108
108
|
// --- channel, and therefore environment ------------------------------------
|
|
109
109
|
let channelName = flags.channel;
|
|
110
110
|
if (!channelName) {
|
|
111
|
-
if (flags.yes || json) {
|
|
112
|
-
fail(command, "--channel is required when running non-interactively.");
|
|
113
|
-
}
|
|
114
111
|
const channels = await cloud.channels(project.cloudAppId);
|
|
115
112
|
const deployable = channels.filter((channel) => channel.environment);
|
|
116
113
|
if (deployable.length === 0) {
|
|
117
|
-
fail(command, "This app has no channel with an environment set.
|
|
114
|
+
fail(command, "This app has no channel with an environment set. Run `capuchoo channel list` to see " +
|
|
115
|
+
"what exists, then set an environment on one - it is what tells the CLI which " +
|
|
116
|
+
"flavour to build.");
|
|
117
|
+
}
|
|
118
|
+
// One channel is not a question, even under --yes or --json: there is
|
|
119
|
+
// nothing to disambiguate.
|
|
120
|
+
if (deployable.length === 1) {
|
|
121
|
+
channelName = deployable[0].name;
|
|
118
122
|
}
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
+
else if (flags.yes || json || !isInteractive()) {
|
|
124
|
+
fail(command, `--channel is required here. This app has ${deployable.length}: ` +
|
|
125
|
+
deployable.map((c) => `${c.name} (${c.environment})`).join(", "));
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
channelName = await selectOne("Channel", deployable.map((channel) => ({
|
|
123
129
|
value: channel.name,
|
|
124
|
-
|
|
125
|
-
|
|
130
|
+
label: channel.name,
|
|
131
|
+
hint: channel.environment,
|
|
132
|
+
})), "--channel");
|
|
133
|
+
}
|
|
126
134
|
}
|
|
127
135
|
const channel = await cloud.requireChannel(project.cloudAppId, channelName);
|
|
128
136
|
const environment = channel.environment;
|
|
129
137
|
// --- release options -------------------------------------------------------
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
138
|
+
// `isInteractive()` matters as much as the flags: without it a piped or CI
|
|
139
|
+
// shell reaches a prompt nobody can answer and the deploy dies at the
|
|
140
|
+
// question rather than doing the obvious thing.
|
|
141
|
+
const interactive = !flags.yes && !json && isInteractive();
|
|
142
|
+
const active = flags.active ?? (interactive ? await confirm("Serve immediately?", { default: true }) : true);
|
|
133
143
|
const required = flags.required ??
|
|
134
|
-
(interactive ? await confirm(
|
|
144
|
+
(interactive ? await confirm("Mark as required?", { default: false }) : false);
|
|
135
145
|
let bump = flags.version;
|
|
136
146
|
if (!bump && interactive) {
|
|
137
|
-
const answer = await
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
{ name: "major", value: "major" },
|
|
144
|
-
],
|
|
145
|
-
default: "",
|
|
146
|
-
});
|
|
147
|
+
const answer = await selectOne("Bump the version?", [
|
|
148
|
+
{ value: "", label: "No bump", hint: `stay on ${readAppVersion(appDir)}` },
|
|
149
|
+
{ value: "patch", label: "patch" },
|
|
150
|
+
{ value: "minor", label: "minor" },
|
|
151
|
+
{ value: "major", label: "major" },
|
|
152
|
+
], "--version");
|
|
147
153
|
bump = answer === "" ? undefined : answer;
|
|
148
154
|
}
|
|
149
|
-
const note = flags.note ??
|
|
155
|
+
const note = flags.note ??
|
|
156
|
+
(interactive
|
|
157
|
+
? await askText("Release notes", {
|
|
158
|
+
placeholder: "Shown to users in the update prompt",
|
|
159
|
+
flag: "--note",
|
|
160
|
+
optional: true,
|
|
161
|
+
})
|
|
162
|
+
: "");
|
|
150
163
|
const currentVersion = readAppVersion(appDir);
|
|
151
164
|
const version = bump ? bumpVersion(currentVersion, bump) : currentVersion;
|
|
152
165
|
const buildType = (flags.type ?? "release");
|
|
@@ -166,7 +179,7 @@ export async function executeDeploy(options) {
|
|
|
166
179
|
command.log(` ${chalk.yellow("dry run - nothing is uploaded")}`);
|
|
167
180
|
command.log(chalk.dim(" ─────────────────────────────────────────"));
|
|
168
181
|
command.log("");
|
|
169
|
-
const proceed = await confirm(
|
|
182
|
+
const proceed = await confirm("Deploy?", { default: true });
|
|
170
183
|
if (!proceed) {
|
|
171
184
|
command.log(chalk.dim("Cancelled."));
|
|
172
185
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/deploy/execute.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/deploy/execute.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/config.d.ts
CHANGED
|
@@ -24,7 +24,7 @@ export declare function updateGlobalConfig(patch: Partial<GlobalConfig>): Global
|
|
|
24
24
|
* Resolves credentials.
|
|
25
25
|
*
|
|
26
26
|
* Environment variables win, and are never written to disk. That is what makes
|
|
27
|
-
* a CI run safe: `
|
|
27
|
+
* a CI run safe: `CAPUCHOO_API_KEY` lives in the job for its lifetime and leaves
|
|
28
28
|
* nothing behind on the runner.
|
|
29
29
|
*/
|
|
30
30
|
export declare function resolveCredentials(): Credentials | null;
|
package/dist/utils/config.js
CHANGED
|
@@ -68,12 +68,12 @@ export function updateGlobalConfig(patch) {
|
|
|
68
68
|
* Resolves credentials.
|
|
69
69
|
*
|
|
70
70
|
* Environment variables win, and are never written to disk. That is what makes
|
|
71
|
-
* a CI run safe: `
|
|
71
|
+
* a CI run safe: `CAPUCHOO_API_KEY` lives in the job for its lifetime and leaves
|
|
72
72
|
* nothing behind on the runner.
|
|
73
73
|
*/
|
|
74
74
|
export function resolveCredentials() {
|
|
75
|
-
const envEndpoint = process.env.
|
|
76
|
-
const envKey = process.env.
|
|
75
|
+
const envEndpoint = process.env.CAPUCHOO_ENDPOINT;
|
|
76
|
+
const envKey = process.env.CAPUCHOO_API_KEY;
|
|
77
77
|
if (envEndpoint && envKey) {
|
|
78
78
|
return {
|
|
79
79
|
endpoint: envEndpoint.replace(/\/+$/, ""),
|
package/dist/utils/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,qBAAqB,GAGtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B;;;;;;;;;;;;;;GAcG;AAEH,MAAM,GAAG,GAAG,WAAW,CAAC;AACxB,MAAM,WAAW,GAAG,aAAa,CAAC;AAClC,MAAM,YAAY,GAAG,cAAc,CAAC;AAiBpC,MAAM,UAAU,gBAAgB;IAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,QAAQ,CAAI,IAAY;IAC/B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACtC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAM,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,uCAAuC,CAAC,CAAC;IAClE,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,IAAY,EAAE,KAAc;IAC7C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO,QAAQ,CAAe,gBAAgB,EAAE,CAAC,IAAI,EAAE,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAoB;IACpD,MAAM,IAAI,GAAG,gBAAgB,EAAE,CAAC;IAChC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAExB,yEAAyE;IACzE,mEAAmE;IACnE,IAAI,CAAC;QACH,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,iBAAiB;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAA4B;IAC7D,MAAM,IAAI,GAAG,EAAE,GAAG,gBAAgB,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC;IACjD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAA8B,EAAE,CAAC;QACjE,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IAChD,CAAC;IACD,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxB,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB;IAChC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
{
|
|
2
2
|
"commands": {
|
|
3
|
+
"doctor": {
|
|
4
|
+
"aliases": [],
|
|
5
|
+
"args": {},
|
|
6
|
+
"description": "Check that this app, its credentials and its channels are usable",
|
|
7
|
+
"examples": [
|
|
8
|
+
"<%= config.bin %> doctor"
|
|
9
|
+
],
|
|
10
|
+
"flags": {},
|
|
11
|
+
"hasDynamicHelp": false,
|
|
12
|
+
"hiddenAliases": [],
|
|
13
|
+
"id": "doctor",
|
|
14
|
+
"pluginAlias": "@capuchoo/cli",
|
|
15
|
+
"pluginName": "@capuchoo/cli",
|
|
16
|
+
"pluginType": "core",
|
|
17
|
+
"strict": true,
|
|
18
|
+
"isESM": true,
|
|
19
|
+
"relativePath": [
|
|
20
|
+
"dist",
|
|
21
|
+
"commands",
|
|
22
|
+
"doctor.js"
|
|
23
|
+
]
|
|
24
|
+
},
|
|
3
25
|
"init": {
|
|
4
26
|
"aliases": [],
|
|
5
27
|
"args": {},
|
|
@@ -564,5 +586,5 @@
|
|
|
564
586
|
]
|
|
565
587
|
}
|
|
566
588
|
},
|
|
567
|
-
"version": "0.
|
|
589
|
+
"version": "0.3.0"
|
|
568
590
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@capuchoo/cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"description": "Builds and publishes OTA and native releases for Capacitor applications through Capucho.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"capacitor",
|
|
@@ -32,12 +32,12 @@
|
|
|
32
32
|
"access": "public"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@
|
|
35
|
+
"@clack/prompts": "^1.7.0",
|
|
36
36
|
"@oclif/core": "^4",
|
|
37
37
|
"@oclif/plugin-help": "^6",
|
|
38
38
|
"chalk": "^5.6.2",
|
|
39
39
|
"ora": "^9.0.0",
|
|
40
|
-
"@capuchoo/core": "0.1.
|
|
40
|
+
"@capuchoo/core": "^0.1.2"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
43
|
"@types/node": "^24.10.4",
|