Skip to content

Commit 11f4326

Browse files
fix(cli): name the refused file and parameter when a cloud upload is rejected (#7155)
* fix(cli): name the refused file and parameter when a cloud upload is rejected * fix(cli): blame the file type only for type refusals at upload complete
1 parent 50ce9fb commit 11f4326

4 files changed

Lines changed: 99 additions & 5 deletions

File tree

‎packages/cli/src/cloud/errors.test.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,21 @@ describe("cloud/errors reportApiError", () => {
109109
);
110110
});
111111

112+
it("names the refused parameter next to the server's message", () => {
113+
const err = new HyperframesApiError({
114+
status: 400,
115+
message: "Stored file type not supported",
116+
code: "invalid_parameter",
117+
param: "content_type",
118+
});
119+
expect(() => reportApiError("Media upload failed", err)).toThrow(CliRuntimeError);
120+
expect(errorBox).toHaveBeenCalledWith(
121+
"Media upload failed (HTTP 400)",
122+
"Stored file type not supported (parameter: content_type)",
123+
expect.any(String),
124+
);
125+
});
126+
112127
it("omits the third line when there is no code, hint, or suggestion", () => {
113128
const err = new HyperframesApiError({ status: 503, message: "unavailable" });
114129
expect(() => reportApiError("Get failed", err)).toThrow(CliRuntimeError);

‎packages/cli/src/cloud/errors.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,22 @@ export function reportApiError(
7575
const code = hintCode(err);
7676
const hint = code ? hints[code] : undefined;
7777
const title = `${stage} (HTTP ${err.status})`;
78+
const message =
79+
err.param && !err.message.includes(err.param)
80+
? `${err.message} (parameter: ${err.param})`
81+
: err.message;
7882
// Priority: code-specific hint > caller suggestion > bare code
7983
// label > no third line. Code-specific hints win because they
8084
// address the specific failure mode; the caller suggestion is a
8185
// generic-context fallback.
8286
if (hint) {
83-
errorBox(title, err.message, hint);
87+
errorBox(title, message, hint);
8488
} else if (options.suggestion) {
85-
errorBox(title, err.message, options.suggestion);
89+
errorBox(title, message, options.suggestion);
8690
} else if (err.code) {
87-
errorBox(title, err.message, `code: ${err.code}`);
91+
errorBox(title, message, `code: ${err.code}`);
8892
} else {
89-
errorBox(title, err.message);
93+
errorBox(title, message);
9094
}
9195
failCommand();
9296
}

‎packages/cli/src/cloud/upload.test.ts‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,62 @@ describe("uploadZipViaDirectUpload", () => {
192192
expect(completeCalls).toBe(1);
193193
});
194194

195+
it("names the file and keeps the server's words when complete refuses its type", async () => {
196+
const completeAssetUpload = vi.fn(async () => {
197+
throw new HyperframesApiError({
198+
status: 400,
199+
message: "Stored file type not supported: application/octet-stream",
200+
code: "invalid_parameter",
201+
param: "asset_id",
202+
});
203+
});
204+
const client = makeClient({
205+
completeAssetUpload:
206+
completeAssetUpload as unknown as HyperframesCloudClient["completeAssetUpload"],
207+
});
208+
209+
const err = await uploadAssetViaDirectUpload({
210+
client,
211+
bytes: new Uint8Array([0]),
212+
filename: "song.mp3",
213+
contentType: "audio/mpeg",
214+
fetchImpl: makeFetchOk(),
215+
}).catch((e: unknown) => e);
216+
217+
expect(err).toBeInstanceOf(HyperframesApiError);
218+
expect((err as HyperframesApiError).message).toBe(
219+
"The cloud couldn't read this audio file's type: song.mp3. It said: Stored file type not supported: application/octet-stream",
220+
);
221+
expect((err as HyperframesApiError).param).toBe("asset_id");
222+
expect((err as HyperframesApiError).status).toBe(400);
223+
});
224+
225+
it("does not blame the file's type when complete refuses an expired upload", async () => {
226+
const completeAssetUpload = vi.fn(async () => {
227+
throw new HyperframesApiError({
228+
status: 400,
229+
message: "This upload has expired; create a new upload.",
230+
code: "invalid_parameter",
231+
});
232+
});
233+
const client = makeClient({
234+
completeAssetUpload:
235+
completeAssetUpload as unknown as HyperframesCloudClient["completeAssetUpload"],
236+
});
237+
238+
const err = await uploadAssetViaDirectUpload({
239+
client,
240+
bytes: new Uint8Array([0]),
241+
filename: "song.mp3",
242+
contentType: "audio/mpeg",
243+
fetchImpl: makeFetchOk(),
244+
}).catch((e: unknown) => e);
245+
246+
expect((err as HyperframesApiError).message).toBe(
247+
"The cloud refused song.mp3: This upload has expired; create a new upload.",
248+
);
249+
});
250+
195251
it("surfaces PUT failures with response body detail", async () => {
196252
const client = makeClient();
197253
const fetchImpl = vi.fn(

‎packages/cli/src/cloud/upload.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,19 @@ async function completeWithRetry(
199199
throw lastErr ?? new Error("completeAssetUpload retries exhausted");
200200
}
201201

202+
// complete answers invalid_parameter for type, size, checksum and expiry; only type refusals blame the type.
203+
const TYPE_REFUSAL = /^(Stored file type|content_type not allowed|Stored file does not have a ZIP)/;
204+
205+
function nameRefusedFile(err: unknown, filename: string, contentType: string): unknown {
206+
if (!(err instanceof HyperframesApiError) || err.code !== "invalid_parameter") return err;
207+
const kind = contentType.split("/")[0];
208+
const noun = kind === "audio" || kind === "video" || kind === "image" ? `${kind} file` : "file";
209+
const lead = TYPE_REFUSAL.test(err.message)
210+
? `The cloud couldn't read this ${noun}'s type: ${filename}. It said:`
211+
: `The cloud refused ${filename}:`;
212+
return new HyperframesApiError({ ...err, message: `${lead} ${err.message}` });
213+
}
214+
202215
export async function uploadAssetViaDirectUpload(
203216
opts: Omit<UploadZipViaDirectOptions, "bytes"> & { contentType: string } & (
204217
| { bytes: Uint8Array }
@@ -231,7 +244,13 @@ export async function uploadAssetViaDirectUpload(
231244
opts.onProgress?.({ phase: "upload", percent: 100 });
232245

233246
opts.onProgress?.({ phase: "complete" });
234-
const completed = await completeWithRetry(opts.client, initialize.asset_id, checksum_sha256);
247+
const completed = await completeWithRetry(
248+
opts.client,
249+
initialize.asset_id,
250+
checksum_sha256,
251+
).catch((err: unknown) => {
252+
throw nameRefusedFile(err, filename, opts.contentType);
253+
});
235254
return {
236255
asset_id: completed.asset_id,
237256
url: completed.url,

0 commit comments

Comments
 (0)