mirror of
https://github.com/PR0M3TH3AN/bitvid.git
synced 2026-11-02 10:52:27 +00:00
thePR0M3TH3ANandClaude Opus 4.8
fdebf05e1a
Two gaps where generic S3 trailed Cloudflare R2: 1. Object cleanup on delete/edit didn't work for generic S3. deleteVideoStorage built its client via makeR2Client, which hard-forces path-style and ignores the connection's forcePathStyle -- so vhost-style S3 deletes were misaddressed and cleanup silently failed (S3 users' deleted/edited files orphaned). It is now provider-aware (mirrors uploadFile): R2 -> makeR2Client (path-style), generic S3 -> makeS3Client honoring forcePathStyle. makeS3Client is now injectable for testing. 2. CORS guidance on upload failure was R2-only. Extracted isLikelyCorsError + a generic-S3 guidance builder into js/utils/uploadErrorHints.js (re-exported from r2Service for back-compat); s3UploadService now appends actionable CORS guidance on an opaque "Failed to fetch" too. Generic S3 is now at functional parity with R2 for upload -> publish -> cleanup. Tests: r2-delete-video-storage (adds generic-S3 forcePathStyle routing), s3-upload-cors-guidance (new). Full suite green. Co-Authored-By: Claude Opus 4.8 <[email protected]>
78 lines
2.8 KiB
JavaScript
78 lines
2.8 KiB
JavaScript
// Scenario (SCN-s3-upload-cors-guidance):
|
|
// Parity with the R2 path — when a generic-S3 upload fails with an opaque
|
|
// browser CORS rejection ("Failed to fetch"), the user-facing status must
|
|
// include actionable CORS guidance, not a bare "Upload failed: Failed to
|
|
// fetch". Ordinary errors must NOT get the CORS hint.
|
|
|
|
import "../test-helpers/setup-localstorage.mjs";
|
|
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
|
|
import { S3UploadService } from "../../js/services/s3UploadService.js";
|
|
|
|
function makeDeps(uploadImpl) {
|
|
return {
|
|
ensureS3SdkLoaded: async () => {},
|
|
makeS3Client: () => ({}),
|
|
multipartUpload: uploadImpl,
|
|
buildR2Key: () => "u/np/ns/video.mp4",
|
|
computeStorageContentHash: async () => "sha256deadbeef",
|
|
buildS3ObjectUrl: () => "https://mock.example/file",
|
|
getCorsOrigins: () => ["*"],
|
|
prepareS3Connection: async (o) => ({ ...o }),
|
|
validateS3Connection: (s) => ({
|
|
...s,
|
|
endpoint: "https://s3.us-east-1.amazonaws.com",
|
|
region: "us-east-1",
|
|
accessKeyId: "k",
|
|
secretAccessKey: "s",
|
|
bucket: "b",
|
|
forcePathStyle: false,
|
|
publicBaseUrl: "https://mock.example",
|
|
}),
|
|
userLogger: { warn() {}, error() {} },
|
|
buildStoragePointerValue: () => "ptr",
|
|
buildStoragePrefixFromKey: () => "prefix",
|
|
getVideoNoteErrorMessage: (c) => `Error: ${c}`,
|
|
normalizeVideoNotePayload: (p) => ({ payload: p, errors: [] }),
|
|
calculateTorrentInfoHash: async () => "a".repeat(40),
|
|
};
|
|
}
|
|
|
|
const fakeFile = { name: "v.mp4", type: "video/mp4", size: 10, slice() { return this; } };
|
|
|
|
async function uploadAndCaptureError(uploadImpl) {
|
|
const service = new S3UploadService(makeDeps(uploadImpl));
|
|
const errors = [];
|
|
service.on("uploadStatus", (d) => {
|
|
if (d.variant === "error") errors.push(d.message);
|
|
});
|
|
await service.uploadVideo({
|
|
npub: "npub1x",
|
|
file: fakeFile,
|
|
metadata: { title: "T" },
|
|
settings: { endpoint: "https://s3.mock", accessKeyId: "k", secretAccessKey: "s", bucket: "b" },
|
|
infoHash: "a".repeat(40),
|
|
publishVideoNote: async () => true,
|
|
});
|
|
return errors;
|
|
}
|
|
|
|
test("a CORS-like upload failure surfaces actionable CORS guidance", async () => {
|
|
const errors = await uploadAndCaptureError(async () => {
|
|
throw new TypeError("Failed to fetch");
|
|
});
|
|
const msg = errors.join(" | ");
|
|
assert.match(msg, /CORS/i, `expected CORS guidance, got: ${msg}`);
|
|
assert.match(msg, /s3\.us-east-1\.amazonaws\.com/, "names the S3 endpoint to configure");
|
|
});
|
|
|
|
test("an ordinary upload error does NOT get the CORS hint", async () => {
|
|
const errors = await uploadAndCaptureError(async () => {
|
|
throw new Error("Access Denied");
|
|
});
|
|
const msg = errors.join(" | ");
|
|
assert.ok(msg.includes("Access Denied"));
|
|
assert.doesNotMatch(msg, /CORS/i);
|
|
});
|