@botiverse/hands-cli 0.5.33 → 0.5.35
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/commands/app_store.d.ts +22 -0
- package/dist/commands/app_store.js +386 -0
- package/dist/commands/app_store.js.map +1 -0
- package/dist/index.js +26 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/redact_for_log.d.ts +9 -0
- package/dist/lib/redact_for_log.js +20 -0
- package/dist/lib/redact_for_log.js.map +1 -0
- package/package.json +3 -3
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { Command } from "commander";
|
|
2
|
+
/** Must match the server's per-push bound. */
|
|
3
|
+
export declare const MAX_SCREENSHOT_PUSH_BYTES: number;
|
|
4
|
+
export interface ScreenshotSetPlan {
|
|
5
|
+
locale: string;
|
|
6
|
+
display_type: string;
|
|
7
|
+
files: string[];
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Read `<dir>/<locale>/<display_type>/NN-name.png`. Locale and display type are
|
|
11
|
+
* passed through as written (en-US, APP_IPHONE_67); the server validates both.
|
|
12
|
+
* Files are ordered by name, numeric-aware, which is the App Store display order.
|
|
13
|
+
*/
|
|
14
|
+
export declare function collectScreenshotSets(dir: string, locales?: string[]): Promise<ScreenshotSetPlan[]>;
|
|
15
|
+
export declare function formatScreenshotResult(body: any): string;
|
|
16
|
+
export declare function formatLocalizationResult(body: any): string;
|
|
17
|
+
/**
|
|
18
|
+
* localizations file: { "<locale>": { description, keywords, promotionalText,
|
|
19
|
+
* marketingUrl, supportUrl, whatsNew } }. Passed through; the server validates.
|
|
20
|
+
*/
|
|
21
|
+
export declare function parseLocalizationsFile(raw: unknown): Record<string, Record<string, string>>;
|
|
22
|
+
export declare function registerAppStoreCommands(program: Command): void;
|
|
@@ -0,0 +1,386 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { readdir, readFile, stat } from "node:fs/promises";
|
|
3
|
+
import { extname, join } from "node:path";
|
|
4
|
+
import { agentAwareFetch, apiRequest, getApiBase, QuiverApiError } from "../lib/api.js";
|
|
5
|
+
import { jsonRequested } from "../lib/json_output.js";
|
|
6
|
+
const IMAGE_EXTENSIONS = new Set([".png", ".jpg", ".jpeg"]);
|
|
7
|
+
/** Must match the server's per-push bound. */
|
|
8
|
+
export const MAX_SCREENSHOT_PUSH_BYTES = 24 * 1024 * 1024;
|
|
9
|
+
async function resolveAppId(input) {
|
|
10
|
+
if (/^[0-9a-f]{8}-[0-9a-f-]{27,}$/i.test(input))
|
|
11
|
+
return input;
|
|
12
|
+
const { apps } = await apiRequest("/api/apps");
|
|
13
|
+
const app = apps.find((item) => item.slug === input);
|
|
14
|
+
if (!app)
|
|
15
|
+
throw new Error(`App not found: ${input}`);
|
|
16
|
+
return app.id;
|
|
17
|
+
}
|
|
18
|
+
async function status(appId, versionString, platform) {
|
|
19
|
+
return apiRequest(`/api/apps/${appId}/app-store/status`, {
|
|
20
|
+
query: { version_string: versionString, ...(platform ? { platform } : {}) },
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
/** --version-id wins; otherwise --version is resolved through the status endpoint. */
|
|
24
|
+
async function resolveVersionId(appId, opts) {
|
|
25
|
+
if (opts.versionId && opts.version)
|
|
26
|
+
throw new Error("pass --version or --version-id, not both");
|
|
27
|
+
if (opts.versionId)
|
|
28
|
+
return opts.versionId;
|
|
29
|
+
if (!opts.version)
|
|
30
|
+
throw new Error("pass --version <marketing version> or --version-id <ASC version id>");
|
|
31
|
+
return (await status(appId, opts.version, opts.platform)).version_id;
|
|
32
|
+
}
|
|
33
|
+
async function subdirs(dir) {
|
|
34
|
+
const entries = await readdir(dir, { withFileTypes: true });
|
|
35
|
+
return entries.filter((e) => e.isDirectory() && !e.name.startsWith(".")).map((e) => e.name).sort();
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Read `<dir>/<locale>/<display_type>/NN-name.png`. Locale and display type are
|
|
39
|
+
* passed through as written (en-US, APP_IPHONE_67); the server validates both.
|
|
40
|
+
* Files are ordered by name, numeric-aware, which is the App Store display order.
|
|
41
|
+
*/
|
|
42
|
+
export async function collectScreenshotSets(dir, locales) {
|
|
43
|
+
const sets = [];
|
|
44
|
+
for (const locale of await subdirs(dir)) {
|
|
45
|
+
if (locales && !locales.includes(locale))
|
|
46
|
+
continue;
|
|
47
|
+
for (const displayType of await subdirs(join(dir, locale))) {
|
|
48
|
+
const folder = join(dir, locale, displayType);
|
|
49
|
+
const entries = await readdir(folder, { withFileTypes: true });
|
|
50
|
+
const names = entries.filter((e) => e.isFile() && !e.name.startsWith(".")).map((e) => e.name);
|
|
51
|
+
for (const name of names) {
|
|
52
|
+
if (!IMAGE_EXTENSIONS.has(extname(name).toLowerCase()))
|
|
53
|
+
throw new Error(`${join(folder, name)}: only .png, .jpg and .jpeg are uploaded`);
|
|
54
|
+
}
|
|
55
|
+
const files = names.sort((a, b) => a.localeCompare(b, "en", { numeric: true })).map((name) => join(folder, name));
|
|
56
|
+
if (files.length > 0)
|
|
57
|
+
sets.push({ locale, display_type: displayType, files });
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
if (locales) {
|
|
61
|
+
const missing = locales.filter((l) => !sets.some((s) => s.locale === l));
|
|
62
|
+
if (missing.length)
|
|
63
|
+
throw new Error(`--locales names locales with no screenshots in ${dir}: ${missing.join(", ")}`);
|
|
64
|
+
}
|
|
65
|
+
return sets;
|
|
66
|
+
}
|
|
67
|
+
async function buildScreenshotRequest(sets, mode) {
|
|
68
|
+
const parts = [];
|
|
69
|
+
let total = 0;
|
|
70
|
+
const declared = [];
|
|
71
|
+
for (const set of sets) {
|
|
72
|
+
const images = [];
|
|
73
|
+
for (const path of set.files) {
|
|
74
|
+
const bytes = await readFile(path);
|
|
75
|
+
const name = `img${parts.length + 1}`;
|
|
76
|
+
parts.push({ name, path, bytes });
|
|
77
|
+
total += bytes.byteLength;
|
|
78
|
+
images.push({ part: name, sha256: createHash("sha256").update(bytes).digest("hex") });
|
|
79
|
+
}
|
|
80
|
+
declared.push({ locale: set.locale, display_type: set.display_type, images });
|
|
81
|
+
}
|
|
82
|
+
if (total > MAX_SCREENSHOT_PUSH_BYTES) {
|
|
83
|
+
throw new Error(`screenshots total ${total} bytes; Hands accepts ${MAX_SCREENSHOT_PUSH_BYTES} per push. Push fewer locales at a time with --locales.`);
|
|
84
|
+
}
|
|
85
|
+
return { request: { mode, sets: declared }, parts };
|
|
86
|
+
}
|
|
87
|
+
async function postMultipart(path, request, parts) {
|
|
88
|
+
const url = new URL(path, getApiBase());
|
|
89
|
+
const res = await agentAwareFetch((bearer) => {
|
|
90
|
+
const form = new FormData();
|
|
91
|
+
form.append("request", JSON.stringify(request));
|
|
92
|
+
for (const part of parts) {
|
|
93
|
+
const type = extname(part.path).toLowerCase() === ".png" ? "image/png" : "image/jpeg";
|
|
94
|
+
form.append(part.name, new Blob([new Uint8Array(part.bytes)], { type }), part.path.split(/[\\/]/).pop());
|
|
95
|
+
}
|
|
96
|
+
const headers = { accept: "application/json" };
|
|
97
|
+
if (bearer)
|
|
98
|
+
headers.authorization = `Bearer ${bearer}`;
|
|
99
|
+
return fetch(url.toString(), { method: "POST", headers, body: form });
|
|
100
|
+
});
|
|
101
|
+
const text = await res.text();
|
|
102
|
+
let data = text;
|
|
103
|
+
try {
|
|
104
|
+
data = JSON.parse(text);
|
|
105
|
+
}
|
|
106
|
+
catch { /* keep text */ }
|
|
107
|
+
if (!res.ok) {
|
|
108
|
+
const message = data && typeof data === "object" && "error" in data ? String(data.error) : `${res.status} ${res.statusText}`;
|
|
109
|
+
throw new QuiverApiError(res.status, data, message);
|
|
110
|
+
}
|
|
111
|
+
return data;
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* A refused or failed push still carries the plan / per-item detail. Print it (or
|
|
115
|
+
* the whole body under --json) before the top-level handler prints the error.
|
|
116
|
+
*/
|
|
117
|
+
async function withDetail(json, format, run) {
|
|
118
|
+
try {
|
|
119
|
+
return await run();
|
|
120
|
+
}
|
|
121
|
+
catch (error) {
|
|
122
|
+
if (error instanceof QuiverApiError && error.body && typeof error.body === "object") {
|
|
123
|
+
const body = error.body;
|
|
124
|
+
if (json)
|
|
125
|
+
console.log(JSON.stringify(body, null, 2));
|
|
126
|
+
else if (body.sets || body.localizations || body.results || body.versions)
|
|
127
|
+
console.error(format(body));
|
|
128
|
+
}
|
|
129
|
+
throw error;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
export function formatScreenshotResult(body) {
|
|
133
|
+
const lines = [];
|
|
134
|
+
const v = body.version;
|
|
135
|
+
if (v)
|
|
136
|
+
lines.push(`Version ${v.version_string} (${v.id}, ${v.state})`);
|
|
137
|
+
for (const set of body.sets ?? []) {
|
|
138
|
+
const head = ` ${set.locale} ${set.display_type}: ${set.blocker ? `BLOCKED (${set.blocker})` : set.action}${set.status ? ` -> ${set.status}` : ""}`;
|
|
139
|
+
lines.push(head);
|
|
140
|
+
if (set.existing && set.desired && !set.status)
|
|
141
|
+
lines.push(` ${set.existing.length} on Apple -> ${set.desired.length} requested`);
|
|
142
|
+
for (const image of set.images ?? []) {
|
|
143
|
+
lines.push(` #${image.index + 1} ${image.screenshot_id ?? "-"} ${image.state}${image.error ? ` (${image.error})` : ""}${image.errors?.length ? ` ${image.errors.map((e) => e.code).join(",")}` : ""}`);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
if (body.outcome === "planned")
|
|
147
|
+
lines.push("Dry run: nothing was written. Run again with --commit to apply.");
|
|
148
|
+
else if (body.outcome === "no_changes")
|
|
149
|
+
lines.push("No changes: Apple already has these screenshots in this order.");
|
|
150
|
+
else if (body.outcome === "committed")
|
|
151
|
+
lines.push("Committed and read back from Apple.");
|
|
152
|
+
return lines.join("\n");
|
|
153
|
+
}
|
|
154
|
+
function preview(value) {
|
|
155
|
+
if (value === undefined)
|
|
156
|
+
return "(not sent)";
|
|
157
|
+
if (value === null)
|
|
158
|
+
return "(unset)";
|
|
159
|
+
const flat = value.replace(/\s+/g, " ");
|
|
160
|
+
const chars = [...flat];
|
|
161
|
+
return JSON.stringify(chars.length > 60 ? `${chars.slice(0, 60).join("")}…` : flat) + ` [${[...value].length}]`;
|
|
162
|
+
}
|
|
163
|
+
export function formatLocalizationResult(body) {
|
|
164
|
+
const lines = [];
|
|
165
|
+
const v = body.version;
|
|
166
|
+
if (v)
|
|
167
|
+
lines.push(`Version ${v.version_string} (${v.id}, ${v.state})`);
|
|
168
|
+
for (const plan of body.localizations ?? []) {
|
|
169
|
+
lines.push(` ${plan.blocker ? `BLOCKED (${plan.blocker})` : plan.action.padEnd(9)} ${plan.locale}`);
|
|
170
|
+
for (const field of plan.changed_fields ?? []) {
|
|
171
|
+
lines.push(` ${field}: ${preview(plan.before?.[field])} -> ${preview(plan.after?.[field])}`);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
for (const result of body.results ?? []) {
|
|
175
|
+
if (!body.localizations)
|
|
176
|
+
lines.push(` ${result.status.padEnd(13)} ${result.locale}`);
|
|
177
|
+
}
|
|
178
|
+
for (const mismatch of body.mismatches ?? [])
|
|
179
|
+
lines.push(` read-back mismatch: ${mismatch.locale} ${mismatch.field}`);
|
|
180
|
+
if (body.outcome === "planned")
|
|
181
|
+
lines.push("Dry run: nothing was written. Run again with --commit to apply.");
|
|
182
|
+
else if (body.outcome === "committed")
|
|
183
|
+
lines.push("Committed and read back from Apple.");
|
|
184
|
+
else if (body.outcome === "no_changes")
|
|
185
|
+
lines.push("No changes.");
|
|
186
|
+
return lines.join("\n");
|
|
187
|
+
}
|
|
188
|
+
/**
|
|
189
|
+
* localizations file: { "<locale>": { description, keywords, promotionalText,
|
|
190
|
+
* marketingUrl, supportUrl, whatsNew } }. Passed through; the server validates.
|
|
191
|
+
*/
|
|
192
|
+
export function parseLocalizationsFile(raw) {
|
|
193
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw))
|
|
194
|
+
throw new Error("localizations file must be a JSON object keyed by locale");
|
|
195
|
+
for (const [locale, value] of Object.entries(raw)) {
|
|
196
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
197
|
+
throw new Error(`${locale}: expected an object of fields`);
|
|
198
|
+
}
|
|
199
|
+
return raw;
|
|
200
|
+
}
|
|
201
|
+
export function registerAppStoreCommands(program) {
|
|
202
|
+
const group = program.command("app-store").description("App Store release through Hands: prepare, listing text, screenshots, submit, withdraw, release, status. Writes need --commit.");
|
|
203
|
+
group
|
|
204
|
+
.command("status <appIdOrSlug>")
|
|
205
|
+
.description("Review state of one version: state, build attached, pending submission. Read-only.")
|
|
206
|
+
.requiredOption("--version <version>", "Marketing version, e.g. 1.17.0.")
|
|
207
|
+
.option("--platform <platform>", "IOS (default) or MAC_OS.")
|
|
208
|
+
.option("--json", "Output JSON.", false)
|
|
209
|
+
.action(async (appIdOrSlug, opts) => {
|
|
210
|
+
const result = await status(await resolveAppId(appIdOrSlug), opts.version, opts.platform);
|
|
211
|
+
if (jsonRequested(program, opts.json)) {
|
|
212
|
+
console.log(JSON.stringify(result, null, 2));
|
|
213
|
+
return;
|
|
214
|
+
}
|
|
215
|
+
console.log(`${result.version_string} ${result.version_id}: ${result.state}; build ${result.build_attached ? "attached" : "not attached"}; pending submission: ${result.pending_submission ? `${result.pending_submission.id} (${result.pending_submission.state})` : "none"}`);
|
|
216
|
+
});
|
|
217
|
+
group
|
|
218
|
+
.command("prepare <appIdOrSlug>")
|
|
219
|
+
.description("Create, reuse, or rename the App Store version and attach a build. Dry run by default; --commit writes.")
|
|
220
|
+
.requiredOption("--version <version>", "Marketing version, e.g. 1.17.0.")
|
|
221
|
+
.option("--build <ascBuildId>", "App Store Connect build id to attach.")
|
|
222
|
+
.option("--platform <platform>", "IOS (default) or MAC_OS.")
|
|
223
|
+
.option("--release-type <type>", "MANUAL | AFTER_APPROVAL. Applied to a created, reused or renamed version; omitted keeps Apple's value (MANUAL on create).")
|
|
224
|
+
.option("--commit", "Apply the plan.", false)
|
|
225
|
+
.option("--json", "Output JSON.", false)
|
|
226
|
+
.action(async (appIdOrSlug, opts) => {
|
|
227
|
+
const appId = await resolveAppId(appIdOrSlug);
|
|
228
|
+
const json = jsonRequested(program, opts.json);
|
|
229
|
+
const result = await withDetail(json, (b) => JSON.stringify(b.versions ?? b, null, 2), () => apiRequest(`/api/apps/${appId}/app-store/versions`, {
|
|
230
|
+
method: "POST",
|
|
231
|
+
body: {
|
|
232
|
+
version_string: opts.version,
|
|
233
|
+
mode: opts.commit ? "commit" : "dry_run",
|
|
234
|
+
...(opts.build ? { asc_build_id: opts.build } : {}),
|
|
235
|
+
...(opts.platform ? { platform: opts.platform } : {}),
|
|
236
|
+
...(opts.releaseType ? { release_type: opts.releaseType } : {}),
|
|
237
|
+
},
|
|
238
|
+
}));
|
|
239
|
+
if (json) {
|
|
240
|
+
console.log(JSON.stringify(result, null, 2));
|
|
241
|
+
return;
|
|
242
|
+
}
|
|
243
|
+
const what = result.action === "renamed"
|
|
244
|
+
? `rename ${result.previous_version_string} (${result.version_id}, ${result.state}) to ${result.version_string}`
|
|
245
|
+
: result.action === "reused" ? `reuse ${result.version_string} (${result.version_id}, ${result.state})` : `create ${result.version_string}`;
|
|
246
|
+
const rt = result.changes?.release_type;
|
|
247
|
+
if (result.mode === "dry_run") {
|
|
248
|
+
console.log(`Dry run: would ${what}${opts.build ? ` and attach build ${opts.build}` : ""}${rt ? `; release type ${rt.from ?? "(new)"} -> ${rt.to}` : ""}. Nothing was written. Run again with --commit to apply.`);
|
|
249
|
+
}
|
|
250
|
+
else {
|
|
251
|
+
console.log(`Done: ${result.action} ${result.version_string} (${result.version_id}, ${result.state}); build ${result.build_attached === null ? "unknown" : result.build_attached ? result.build_id : "not attached"}; release type ${result.release_type}. Read back from Apple.`);
|
|
252
|
+
}
|
|
253
|
+
});
|
|
254
|
+
const screenshots = group.command("screenshots").description("App Store screenshot sets.");
|
|
255
|
+
screenshots
|
|
256
|
+
.command("push <appIdOrSlug>")
|
|
257
|
+
.description("Replace screenshot sets from <dir>/<locale>/<display_type>/NN.png. Identical sets are skipped. Dry run by default; --commit writes (deletes and re-uploads changed sets).")
|
|
258
|
+
.requiredOption("--dir <dir>", "Screenshots directory, e.g. shots/en-US/APP_IPHONE_67/01.png.")
|
|
259
|
+
.option("--version <version>", "Marketing version (resolved to its ASC id).")
|
|
260
|
+
.option("--version-id <id>", "ASC appStoreVersions id.")
|
|
261
|
+
.option("--platform <platform>", "Platform for --version lookup.")
|
|
262
|
+
.option("--locales <list>", "Only these locales, comma-separated.")
|
|
263
|
+
.option("--commit", "Apply the plan.", false)
|
|
264
|
+
.option("--json", "Output JSON.", false)
|
|
265
|
+
.action(async (appIdOrSlug, opts) => {
|
|
266
|
+
if (!(await stat(opts.dir).catch(() => null))?.isDirectory())
|
|
267
|
+
throw new Error(`${opts.dir} is not a directory`);
|
|
268
|
+
const locales = opts.locales?.split(",").map((l) => l.trim()).filter(Boolean);
|
|
269
|
+
const sets = await collectScreenshotSets(opts.dir, locales);
|
|
270
|
+
if (sets.length === 0)
|
|
271
|
+
throw new Error(`${opts.dir} has no <locale>/<display_type>/ image folders`);
|
|
272
|
+
const appId = await resolveAppId(appIdOrSlug);
|
|
273
|
+
const versionId = await resolveVersionId(appId, opts);
|
|
274
|
+
const { request, parts } = await buildScreenshotRequest(sets, opts.commit ? "commit" : "dry_run");
|
|
275
|
+
const json = jsonRequested(program, opts.json);
|
|
276
|
+
const result = await withDetail(json, formatScreenshotResult, () => postMultipart(`/api/apps/${appId}/app-store/versions/${encodeURIComponent(versionId)}/screenshots`, request, parts));
|
|
277
|
+
console.log(json ? JSON.stringify(result, null, 2) : formatScreenshotResult(result));
|
|
278
|
+
});
|
|
279
|
+
const localizations = group.command("localizations").description("App Store listing text (appStoreVersionLocalizations).");
|
|
280
|
+
localizations
|
|
281
|
+
.command("push <appIdOrSlug>")
|
|
282
|
+
.description("Write listing text from a JSON file keyed by locale. Dry run by default; --commit writes.")
|
|
283
|
+
.requiredOption("--file <json>", '{"en-US":{"description":"...","keywords":"...","promotionalText":"...","whatsNew":"...","supportUrl":"...","marketingUrl":"..."}}')
|
|
284
|
+
.option("--version <version>", "Marketing version (resolved to its ASC id).")
|
|
285
|
+
.option("--version-id <id>", "ASC appStoreVersions id.")
|
|
286
|
+
.option("--platform <platform>", "Platform for --version lookup.")
|
|
287
|
+
.option("--commit", "Apply the plan.", false)
|
|
288
|
+
.option("--json", "Output JSON.", false)
|
|
289
|
+
.action(async (appIdOrSlug, opts) => {
|
|
290
|
+
let raw;
|
|
291
|
+
try {
|
|
292
|
+
raw = JSON.parse(await readFile(opts.file, "utf8"));
|
|
293
|
+
}
|
|
294
|
+
catch (error) {
|
|
295
|
+
throw new Error(`cannot read ${opts.file}: ${error.message}`);
|
|
296
|
+
}
|
|
297
|
+
const body = { mode: opts.commit ? "commit" : "dry_run", localizations: parseLocalizationsFile(raw) };
|
|
298
|
+
const appId = await resolveAppId(appIdOrSlug);
|
|
299
|
+
const versionId = await resolveVersionId(appId, opts);
|
|
300
|
+
const json = jsonRequested(program, opts.json);
|
|
301
|
+
const result = await withDetail(json, formatLocalizationResult, () => apiRequest(`/api/apps/${appId}/app-store/versions/${encodeURIComponent(versionId)}/localizations`, { method: "POST", body }));
|
|
302
|
+
console.log(json ? JSON.stringify(result, null, 2) : formatLocalizationResult(result));
|
|
303
|
+
});
|
|
304
|
+
group
|
|
305
|
+
.command("submit <appIdOrSlug>")
|
|
306
|
+
.description("Submit a prepared version for App Store review. Without --commit, only shows what would be submitted.")
|
|
307
|
+
.requiredOption("--version <version>", "Marketing version to submit.")
|
|
308
|
+
.option("--platform <platform>", "IOS (default) or MAC_OS.")
|
|
309
|
+
.option("--commit", "Really submit for review.", false)
|
|
310
|
+
.option("--json", "Output JSON.", false)
|
|
311
|
+
.action(async (appIdOrSlug, opts) => {
|
|
312
|
+
const appId = await resolveAppId(appIdOrSlug);
|
|
313
|
+
const current = await status(appId, opts.version, opts.platform);
|
|
314
|
+
const json = jsonRequested(program, opts.json);
|
|
315
|
+
if (!opts.commit) {
|
|
316
|
+
if (json) {
|
|
317
|
+
console.log(JSON.stringify({ mode: "dry_run", would_submit: current }, null, 2));
|
|
318
|
+
return;
|
|
319
|
+
}
|
|
320
|
+
console.log(`Dry run: would submit ${current.version_string} (${current.version_id}, ${current.state}; build ${current.build_attached ? "attached" : "NOT attached"}). Pending submission: ${current.pending_submission ? `${current.pending_submission.id} (${current.pending_submission.state})` : "none"}.`);
|
|
321
|
+
console.log("Run again with --commit to submit for review.");
|
|
322
|
+
return;
|
|
323
|
+
}
|
|
324
|
+
const result = await apiRequest(`/api/apps/${appId}/app-store/versions/${encodeURIComponent(current.version_id)}/submit`, { method: "POST" });
|
|
325
|
+
console.log(json ? JSON.stringify(result, null, 2) : `Submitted ${current.version_string} (${current.version_id}); review submission ${result.submission_id}.`);
|
|
326
|
+
});
|
|
327
|
+
group
|
|
328
|
+
.command("release <appIdOrSlug> <versionId>")
|
|
329
|
+
.description("Release an approved version (PENDING_DEVELOPER_RELEASE) to the App Store. IRREVERSIBLE. Dry run by default; --commit releases. --version (and --build) must match what Apple holds.")
|
|
330
|
+
.requiredOption("--version <version>", "Exact marketing version the version must have, e.g. 1.17.0.")
|
|
331
|
+
.option("--build <ascBuildId>", "Exact App Store Connect build id that must be attached.")
|
|
332
|
+
.option("--commit", "Really release (cannot be undone).", false)
|
|
333
|
+
.option("--json", "Output JSON.", false)
|
|
334
|
+
.action(async (appIdOrSlug, versionId, opts) => {
|
|
335
|
+
const appId = await resolveAppId(appIdOrSlug);
|
|
336
|
+
const json = jsonRequested(program, opts.json);
|
|
337
|
+
const result = await withDetail(json, (b) => JSON.stringify(b, null, 2), () => apiRequest(`/api/apps/${appId}/app-store/versions/${encodeURIComponent(versionId)}/release`, {
|
|
338
|
+
method: "POST",
|
|
339
|
+
body: {
|
|
340
|
+
mode: opts.commit ? "commit" : "dry_run",
|
|
341
|
+
version_string: opts.version,
|
|
342
|
+
...(opts.build ? { asc_build_id: opts.build } : {}),
|
|
343
|
+
},
|
|
344
|
+
}));
|
|
345
|
+
if (json) {
|
|
346
|
+
console.log(JSON.stringify(result, null, 2));
|
|
347
|
+
return;
|
|
348
|
+
}
|
|
349
|
+
if (result.outcome === "planned") {
|
|
350
|
+
const v = result.version ?? {};
|
|
351
|
+
console.log(`Dry run: would release ${v.version_string} (${v.version_id}, ${v.state}; build ${v.build_id ?? "unknown"}). Nothing was sent.`);
|
|
352
|
+
console.log("Run again with --commit to release. This cannot be undone.");
|
|
353
|
+
}
|
|
354
|
+
else if (result.outcome === "released") {
|
|
355
|
+
console.log(`Released ${result.version_string} (${result.version_id}): Apple shows ${result.observed_state}.`);
|
|
356
|
+
}
|
|
357
|
+
else {
|
|
358
|
+
console.log(`Release requested for ${result.version_string ?? result.version?.version_string} (${result.version_id ?? result.version?.version_id}); Apple shows ${result.observed_state ?? "unknown"} and releases asynchronously.${result.prior_operation_id ? ` Already requested earlier (operation ${result.prior_operation_id}); nothing new was sent.` : ""}`);
|
|
359
|
+
console.log("Check with `hands app-store status` until READY_FOR_SALE. Do not release again.");
|
|
360
|
+
}
|
|
361
|
+
});
|
|
362
|
+
group
|
|
363
|
+
.command("withdraw <appIdOrSlug>")
|
|
364
|
+
.description("Withdraw the pending review of a version (cancels its review submission). Without --commit, only shows what would be withdrawn.")
|
|
365
|
+
.requiredOption("--version <version>", "Marketing version whose review to withdraw.")
|
|
366
|
+
.option("--platform <platform>", "IOS (default) or MAC_OS.")
|
|
367
|
+
.option("--commit", "Really withdraw.", false)
|
|
368
|
+
.option("--json", "Output JSON.", false)
|
|
369
|
+
.action(async (appIdOrSlug, opts) => {
|
|
370
|
+
const appId = await resolveAppId(appIdOrSlug);
|
|
371
|
+
const current = await status(appId, opts.version, opts.platform);
|
|
372
|
+
const json = jsonRequested(program, opts.json);
|
|
373
|
+
if (!opts.commit) {
|
|
374
|
+
if (json) {
|
|
375
|
+
console.log(JSON.stringify({ mode: "dry_run", would_withdraw: current }, null, 2));
|
|
376
|
+
return;
|
|
377
|
+
}
|
|
378
|
+
console.log(`Dry run: would withdraw the pending review of ${current.version_string} (${current.version_id}, ${current.state}).`);
|
|
379
|
+
console.log("Run again with --commit to withdraw.");
|
|
380
|
+
return;
|
|
381
|
+
}
|
|
382
|
+
const result = await apiRequest(`/api/apps/${appId}/app-store/withdraw`, { method: "POST", body: { version_id: current.version_id } });
|
|
383
|
+
console.log(json ? JSON.stringify(result, null, 2) : `Withdrew review submission ${result.submission_id} for ${current.version_string}.`);
|
|
384
|
+
});
|
|
385
|
+
}
|
|
386
|
+
//# sourceMappingURL=app_store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app_store.js","sourceRoot":"","sources":["../../src/commands/app_store.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -31,8 +31,10 @@ import { registerWebhookCommands } from "./commands/webhooks.js";
|
|
|
31
31
|
import { registerTestflightCommands } from "./commands/testflight.js";
|
|
32
32
|
import { registerAgcCommands } from "./commands/agc.js";
|
|
33
33
|
import { registerStoreListingCommands } from "./commands/store_listing.js";
|
|
34
|
+
import { registerAppStoreCommands } from "./commands/app_store.js";
|
|
34
35
|
import { registerApiCommand } from "./commands/api.js";
|
|
35
36
|
import { getConfig } from "./lib/config.js";
|
|
37
|
+
import { redactForLog } from "./lib/redact_for_log.js";
|
|
36
38
|
import { readEnv } from "./lib/env.js";
|
|
37
39
|
import { setApiBase, AgentEnvironmentError } from "./lib/api.js";
|
|
38
40
|
import { recordCliEvent } from "./lib/logging.js";
|
|
@@ -78,6 +80,14 @@ Common recipes:
|
|
|
78
80
|
hands store-listing pull <app> --out listing.json Google Play listing text as JSON
|
|
79
81
|
hands store-listing push <app> --listing listing.json [--commit]
|
|
80
82
|
Dry-run (default) or commit listing text to Play
|
|
83
|
+
hands app-store prepare <app> --version 1.17.0 --build <ascBuildId> [--commit]
|
|
84
|
+
Create, reuse, or rename the App Store version (dry run by default)
|
|
85
|
+
hands app-store screenshots push <app> --version 1.17.0 --dir shots [--commit]
|
|
86
|
+
shots/<locale>/<display_type>/NN.png; identical sets skipped
|
|
87
|
+
hands app-store localizations push <app> --version 1.17.0 --file listing.json [--commit]
|
|
88
|
+
hands app-store submit|withdraw <app> --version 1.17.0 [--commit]
|
|
89
|
+
hands app-store release <app> <versionId> --version 1.17.0 [--build <ascBuildId>] [--commit]
|
|
90
|
+
Release an approved version (irreversible; dry run by default)
|
|
81
91
|
hands logs collect Bundle local CLI logs for a bug report
|
|
82
92
|
|
|
83
93
|
Every command supports --json for scripts/agents. Full docs:
|
|
@@ -114,6 +124,7 @@ registerWebhookCommands(program);
|
|
|
114
124
|
registerTestflightCommands(program);
|
|
115
125
|
registerAgcCommands(program);
|
|
116
126
|
registerStoreListingCommands(program);
|
|
127
|
+
registerAppStoreCommands(program);
|
|
117
128
|
registerFeedbackCommands(program);
|
|
118
129
|
registerDeployTokenCommands(program);
|
|
119
130
|
registerLogsCommands(program);
|
|
@@ -150,6 +161,21 @@ program.parseAsync(process.argv).catch((err) => {
|
|
|
150
161
|
else if (typeof info.manage_url === "string") {
|
|
151
162
|
console.error(`Next action: see ${info.manage_url}`);
|
|
152
163
|
}
|
|
164
|
+
// A non-JSON error body is the one case where the response did not come from our
|
|
165
|
+
// Worker: every Hands error is `c.json({...})` with a code, so raw text means an
|
|
166
|
+
// intermediary answered (a Cloudflare 5xx carries an HTML page). Printing a bounded,
|
|
167
|
+
// redacted excerpt is the only way to tell those apart from a single CI run -- and
|
|
168
|
+
// without it the body is discarded and the failure is unattributable.
|
|
169
|
+
// >= 400, not >= 500: an intermediary can answer a 4xx too, and those bodies are
|
|
170
|
+
// the same HTML (a Cloudflare 413 for an oversized body, a 403 for a block). Our own
|
|
171
|
+
// 4xx all come from `c.json`, so they never reach here. The exception is the public
|
|
172
|
+
// history routes, which do return plain text -- the CLI does not call them today, so
|
|
173
|
+
// if one of them is ever wired in, narrow this rather than accept the noise.
|
|
174
|
+
const status = err.status;
|
|
175
|
+
if (typeof status === "number" && status >= 400 && typeof body === "string") {
|
|
176
|
+
console.error(`Status: ${status}`);
|
|
177
|
+
console.error(`Body (first 500 bytes): ${redactForLog(body).slice(0, 500)}`);
|
|
178
|
+
}
|
|
153
179
|
if (readEnv("VERBOSE") === "1" && err.stack) {
|
|
154
180
|
console.error(err.stack);
|
|
155
181
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,sFAAsF;AACtF,yFAAyF;AACzF,kFAAkF;AAClF,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAC7D,iBAAiB,CACK,CAAC;AAEzB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,OAAO,CAAC;KACb,WAAW,CAAC,8DAA8D,CAAC;KAC3E,OAAO,CAAC,WAAW,CAAC;KACpB,MAAM,CACL,aAAa,EACb,qEAAqE,CACtE;KACA,MAAM,CAAC,QAAQ,EAAE,wDAAwD,EAAE,KAAK,CAAC;KACjF,MAAM,CAAC,WAAW,EAAE,0CAA0C,EAAE,KAAK,CAAC;KACtE,WAAW,CACV,OAAO,EACP
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Strip anything credential-shaped from a raw error body before it reaches a log.
|
|
3
|
+
*
|
|
4
|
+
* This prints the bodies of 5xx responses that did not come from our Worker, so the
|
|
5
|
+
* exact shape is unknown -- it could carry a signed URL (whose query string is the
|
|
6
|
+
* credential), a bearer token, or a bearer-like query parameter. Redacting by pattern
|
|
7
|
+
* rather than by expected field means an unexpected body still cannot leak.
|
|
8
|
+
*/
|
|
9
|
+
export declare function redactForLog(text: string): string;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Strip anything credential-shaped from a raw error body before it reaches a log.
|
|
3
|
+
*
|
|
4
|
+
* This prints the bodies of 5xx responses that did not come from our Worker, so the
|
|
5
|
+
* exact shape is unknown -- it could carry a signed URL (whose query string is the
|
|
6
|
+
* credential), a bearer token, or a bearer-like query parameter. Redacting by pattern
|
|
7
|
+
* rather than by expected field means an unexpected body still cannot leak.
|
|
8
|
+
*/
|
|
9
|
+
export function redactForLog(text) {
|
|
10
|
+
return text
|
|
11
|
+
.replace(/(https?:\/\/[^\s"'<>?]*)\?[^\s"'<>]*/g, "$1?<redacted>")
|
|
12
|
+
// One rule for both shapes: "Authorization: Bearer X", "authorization=X" and a bare
|
|
13
|
+
// "Bearer X". Splitting them into two passes does not work -- the key/value rule
|
|
14
|
+
// matches "Authorization:" and consumes only the word "Bearer" as its value,
|
|
15
|
+
// leaving the token in the output.
|
|
16
|
+
.replace(/((?:authorization|bearer)\s*[=:]?\s*(?:Bearer\s+)?)((?:"[^"]*"|[^\s,"&}]+))/gi, "$1<redacted>")
|
|
17
|
+
.replace(/((?:token|secret|password|signature|credential|key)[A-Za-z0-9_-]*\s*[=:]\s*)("[^"]*"|[^\s,"&}]+)/gi, "$1<redacted>")
|
|
18
|
+
.replace(/\b[A-Fa-f0-9]{32,}\b/g, "<redacted>");
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=redact_for_log.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redact_for_log.js","sourceRoot":"","sources":["../../src/lib/redact_for_log.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,OAAO,IAAI;SACR,OAAO,CAAC,uCAAuC,EAAE,eAAe,CAAC;QAClE,oFAAoF;QACpF,iFAAiF;QACjF,6EAA6E;QAC7E,mCAAmC;SAClC,OAAO,CACN,+EAA+E,EAC/E,cAAc,CACf;SACA,OAAO,CAAC,oGAAoG,EAAE,cAAc,CAAC;SAC7H,OAAO,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC;AACpD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@botiverse/hands-cli",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.35",
|
|
4
4
|
"description": "Hands CLI — manage apps, builds, releases from the terminal.",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "jiacheng",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
],
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"commander": "^12.1.0",
|
|
27
|
-
"@botiverse/
|
|
28
|
-
"@botiverse/
|
|
27
|
+
"@botiverse/hands-node": "0.5.2",
|
|
28
|
+
"@botiverse/agent-session-store": "0.2.0"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"@types/node": "^22.10.0",
|