mirror of
https://github.com/hanzo-apps/dataroom.git
synced 2026-10-30 14:47:36 +00:00
zeekayandHanzo Dev
23a1657d2e
features/storage/ was Papermark's ee/features/storage — commercial-licensed
code that commit 98f0da7fa renamed out of ee/ byte-identical rather than
deleting, leaving it under our AGPL root licence. Deleted and rewritten.
lib/storage/config.ts resolves one bucket from the environment. The upstream
version carried a hardcoded EU/US region matrix selected by the `usStorage`
feature flag; that flag is served by @vercel/edge-config, is false whenever
EDGE_CONFIG is unset, and no per-document region is persisted anywhere in the
schema — so the second region was unreachable on our deployments. Required
vars now throw at the boundary instead of resolving a partial config.
lib/storage/tus-store.ts builds a plain S3Store. MultiRegionS3Store subclassed
it and reassigned this.client/this.bucket per request on a shared instance, so
two concurrent uploads from different teams could observe each other's bucket.
Construction-time config removes the race. It also now forwards the endpoint,
so resumable uploads reach S3-compatible backends.
lib/files/aws-client.ts collapses to two functions: with one config the
team/non-team split was duplication, and getS3Client, getS3ClientForTeam and
getLambdaClient had no callers outside the module.
LICENSE: drop the carve-out clause pointing at ee/LICENSE and app/(ee) —
both directories are gone, so the pointer dangled. Papermark's copyright
line and the AGPL-3.0 text are untouched.
Co-authored-by: Hanzo Dev <[email protected]>
56 lines
1.2 KiB
TypeScript
56 lines
1.2 KiB
TypeScript
import { Upload } from "@aws-sdk/lib-storage";
|
|
import { DocumentStorageType } from "@prisma/client";
|
|
import path from "node:path";
|
|
import { Readable } from "stream";
|
|
|
|
import { safeSlugify } from "@/lib/utils";
|
|
|
|
import { getS3ClientAndConfig } from "./aws-client";
|
|
|
|
type StreamFile = {
|
|
name: string;
|
|
type: string;
|
|
stream: Readable;
|
|
};
|
|
|
|
export const streamFileServer = async ({
|
|
file,
|
|
teamId,
|
|
docId,
|
|
}: {
|
|
file: StreamFile;
|
|
teamId: string;
|
|
docId: string;
|
|
}) => {
|
|
const { client, config } = getS3ClientAndConfig();
|
|
|
|
// Get the basename and extension for the file
|
|
const { name, ext } = path.parse(file.name);
|
|
|
|
const slugifiedName = safeSlugify(name) + ext;
|
|
const originalFileName = `${name}${ext}`;
|
|
const key = `${teamId}/${docId}/${slugifiedName}`;
|
|
|
|
const params = {
|
|
client,
|
|
params: {
|
|
Bucket: config.bucket,
|
|
Key: key,
|
|
Body: file.stream,
|
|
ContentType: file.type,
|
|
ContentDisposition: `attachment; filename="${slugifiedName}"; filename*=UTF-8''${encodeURIComponent(originalFileName)}`,
|
|
},
|
|
};
|
|
|
|
// Use Upload for multipart upload support
|
|
const upload = new Upload(params);
|
|
|
|
// Send the upload to S3
|
|
await upload.done();
|
|
|
|
return {
|
|
type: DocumentStorageType.S3_PATH,
|
|
data: key,
|
|
};
|
|
};
|