@alepha/bucket-vercel 0.10.4 → 0.10.5

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { FileStorageProvider } from "@alepha/bucket";
+import { FileMetadataService, FileStorageProvider } from "@alepha/bucket";
 import * as _alepha_core1 from "@alepha/core";
 import { Alepha, FileLike, Static } from "@alepha/core";
 import { DateTimeProvider } from "@alepha/datetime";
@@ -31,8 +31,10 @@ declare class VercelFileStorageProvider implements FileStorageProvider {
   protected readonly time: DateTimeProvider;
   protected readonly stores: Set<string>;
   protected readonly vercelBlobApi: VercelBlobApi;
+  protected readonly metadataService: FileMetadataService;
   protected readonly onStart: _alepha_core1.HookDescriptor<"start">;
   convertName(name: string): string;
+  protected createId(): string;
   upload(bucketName: string, file: FileLike, fileId?: string): Promise<string>;
   download(bucketName: string, fileId: string): Promise<FileLike>;
   exists(bucketName: string, fileId: string): Promise<boolean>;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/providers/VercelBlobProvider.ts","../src/providers/VercelFileStorageProvider.ts","../src/index.ts"],"sourcesContent":[],"mappings":";;;;;;;;cAEa,aAAA;cACA;eACC;cACD;;;;cCgBP,yBAAS;yBAIb,aAAA,CAAA;;;EDvBW,UAAA,GAAA,SC0BU,OD1BG,CC0BK,MD1BL,CAAA,OC0BmB,SD1BnB,CAAA,CAAA,CAAA,CAAA;;;;;cCgCb,yBAAA,YAAqC;0BAAX,eAAA,CAChB;;IAdjB,qBAIJ,EAAA,MAAA;EAAA,CAAA;qBAAA,MAAA,EAYwB,MAZxB;qBAJa,IAAA,EAiBS,gBAjBT;EAAA,mBAAA,MAAA,EAkBa,GAlBb,CAAA,MAAA,CAAA;EAAA,mBAAA,aAAA,EAmBkB,aAnBlB;EAAA,mBAAA,OAAA,EAmBkB,aAAA,CAEN,cArBZ,CAAA,OAAA,CAAA;aAO8B,CAAA,IAAA,EAAA,MAAA,CAAA,EAAA,MAAA;QAAd,CAAA,UAAA,EAAA,MAAA,EAAA,IAAA,EA0CvB,QA1CuB,EAAA,MAAA,CAAA,EAAA,MAAA,CAAA,EA4C3B,OA5C2B,CAAA,MAAA,CAAA;UAAR,CAAA,UAAA,EAAA,MAAA,EAAA,MAAA,EAAA,MAAA,CAAA,EAkFqC,OAlFrC,CAkF6C,QAlF7C,CAAA;EAAO,MAAA,CAAA,UAAA,EAAA,MAAA,EAAA,MAAA,EAAA,MAAA,CAAA,EA0I4B,OA1I5B,CAAA,OAAA,CAAA;EAAA,MAAA,CAAA,UAAA,EAAA,MAAA,EAAA,MAAA,EAAA,MAAA,CAAA,EA6J4B,OA7J5B,CAAA,IAAA,CAAA;AAM9B;;;;;;;;;cClBa,oBAAkB,aAAA,CAAA,QAW7B,aAAA,CAX6B"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/providers/VercelBlobProvider.ts","../src/providers/VercelFileStorageProvider.ts","../src/index.ts"],"sourcesContent":[],"mappings":";;;;;;;;cAEa,aAAA;cACA;eACC;cACD;;;;cCkBP,yBAAS;yBAIb,aAAA,CAAA;;;EDzBW,UAAA,GAAA,SC4BU,OD5BG,CC4BK,MD5BL,CAAA,OC4BmB,SD5BnB,CAAA,CAAA,CAAA,CAAA;;;;;cCkCb,yBAAA,YAAqC;0BAAX,eAAA,CAChB;;IAdjB,qBAIJ,EAAA,MAAA;EAAA,CAAA;qBAAA,MAAA,EAYwB,MAZxB;qBAJa,IAAA,EAiBS,gBAjBT;EAAA,mBAAA,MAAA,EAkBa,GAlBb,CAAA,MAAA,CAAA;EAAA,mBAAA,aAAA,EAmBkB,aAnBlB;EAAA,mBAAA,eAAA,EAoBoB,mBApBpB;qBAO8B,OAAA,EAaV,aAAA,CAER,cAfkB,CAAA,OAAA,CAAA;aAAd,CAAA,IAAA,EAAA,MAAA,CAAA,EAAA,MAAA;YAAR,QAAA,CAAA,CAAA,EAAA,MAAA;EAAO,MAAA,CAAA,UAAA,EAAA,MAAA,EAAA,IAAA,EA+CtB,QA/CsB,EAAA,MAAA,CAAA,EAAA,MAAA,CAAA,EAiD1B,OAjD0B,CAAA,MAAA,CAAA;EAAA,QAAA,CAAA,UAAA,EAAA,MAAA,EAAA,MAAA,EAAA,MAAA,CAAA,EA6F8B,OA7F9B,CA6FsC,QA7FtC,CAAA;EAMjB,MAAA,CAAA,UAAA,EAAA,MAAA,EAAA,MAA0B,EAAA,MAAA,CAAA,EAoJmB,OApJnB,CAAA,OAAA,CAAA;EAAA,MAAA,CAAA,UAAA,EAAA,MAAA,EAAA,MAAA,EAAA,MAAA,CAAA,EAuKmB,OAvKnB,CAAA,IAAA,CAAA;;;;;;;;;;cCpB1B,oBAAkB,aAAA,CAAA,QAW7B,aAAA,CAX6B"}

package/dist/index.js

@@ -1,5 +1,6 @@
-import { $bucket, AlephaBucket, FileNotFoundError, FileStorageProvider } from "@alepha/bucket";
+import { $bucket, AlephaBucket, FileMetadataService, FileNotFoundError, FileStorageProvider } from "@alepha/bucket";
 import { $env, $hook, $inject, $module, Alepha, AlephaError, t } from "@alepha/core";
+import { randomUUID } from "node:crypto";
 import { DateTimeProvider } from "@alepha/datetime";
 import { createFile } from "@alepha/file";
 import { $logger } from "@alepha/logger";
@@ -25,6 +26,7 @@ var VercelFileStorageProvider = class {
 	time = $inject(DateTimeProvider);
 	stores = /* @__PURE__ */ new Set();
 	vercelBlobApi = $inject(VercelBlobApi);
+	metadataService = $inject(FileMetadataService);
 	onStart = $hook({
 		on: "start",
 		handler: async () => {
@@ -40,15 +42,20 @@ var VercelFileStorageProvider = class {
 	convertName(name) {
 		return name.replaceAll("/", "-").toLowerCase();
 	}
+	createId() {
+		return randomUUID();
+	}
 	async upload(bucketName, file, fileId) {
-		fileId = file.name;
+		fileId ??= this.createId();
 		this.log.trace(`Uploading file '${file.name}' to bucket '${bucketName}' with id '${fileId}'...`);
 		const storeName = this.convertName(bucketName);
 		const pathname = `${storeName}/${fileId}`;
 		try {
-			const result = await this.vercelBlobApi.put(pathname, file.stream(), {
+			const contentBuffer = Buffer.from(await file.arrayBuffer());
+			const fileBuffer = this.metadataService.createFileBuffer(file, contentBuffer);
+			const result = await this.vercelBlobApi.put(pathname, fileBuffer, {
 				access: "public",
-				contentType: file.type,
+				contentType: file.type || "application/octet-stream",
 				token: this.env.BLOB_READ_WRITE_TOKEN,
 				allowOverwrite: true
 			});
@@ -69,13 +76,15 @@ var VercelFileStorageProvider = class {
 			if (!headResult) throw new FileNotFoundError(`File '${fileId}' not found in bucket '${bucketName}'`);
 			const response = await fetch(headResult.url);
 			if (!response.ok) throw new FileNotFoundError(`Failed to fetch file: ${response.statusText}`);
-			const stream = response.body;
-			if (!stream) throw new FileNotFoundError("File not found - empty response body");
-			const originalType = response.headers.get("Content-Type") || "application/octet-stream";
-			return createFile(stream, {
-				name: fileId,
-				type: originalType,
-				size: headResult.size
+			const arrayBuffer = await response.arrayBuffer();
+			if (!arrayBuffer) throw new FileNotFoundError("File not found - empty response body");
+			const buffer = Buffer.from(arrayBuffer);
+			const { metadata, contentStart } = this.metadataService.decodeMetadataFromBuffer(buffer);
+			const content = buffer.subarray(contentStart);
+			return createFile(content, {
+				name: metadata.name,
+				type: metadata.type,
+				size: content.length
 			});
 		} catch (error) {
 			if (error instanceof FileNotFoundError) throw error;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../src/providers/VercelBlobProvider.ts","../src/providers/VercelFileStorageProvider.ts","../src/index.ts"],"sourcesContent":["import { del, head, put } from \"@vercel/blob\";\n\nexport class VercelBlobApi {\n\tput: typeof put = put;\n\thead: typeof head = head;\n\tdel: typeof del = del;\n}\n","import type { Readable } from \"node:stream\";\nimport {\n\t$bucket,\n\tFileNotFoundError,\n\ttype FileStorageProvider,\n} from \"@alepha/bucket\";\nimport {\n\t$env,\n\t$hook,\n\t$inject,\n\tAlepha,\n\tAlephaError,\n\ttype FileLike,\n\ttype Static,\n\tt,\n} from \"@alepha/core\";\nimport { DateTimeProvider } from \"@alepha/datetime\";\nimport { createFile } from \"@alepha/file\";\nimport { $logger } from \"@alepha/logger\";\nimport { VercelBlobApi } from \"./VercelBlobProvider.ts\";\n\nconst envSchema = t.object({\n\tBLOB_READ_WRITE_TOKEN: t.text({\n\t\tsize: \"long\",\n\t}),\n});\n\ndeclare module \"@alepha/core\" {\n\tinterface Env extends Partial<Static<typeof envSchema>> {}\n}\n\n/**\n * Vercel Blob Storage implementation of File Storage Provider.\n */\nexport class VercelFileStorageProvider implements FileStorageProvider {\n\tprotected readonly log = $logger();\n\tprotected readonly env = $env(envSchema);\n\tprotected readonly alepha = $inject(Alepha);\n\tprotected readonly time = $inject(DateTimeProvider);\n\tprotected readonly stores: Set<string> = new Set();\n\tprotected readonly vercelBlobApi = $inject(VercelBlobApi);\n\n\tprotected readonly onStart = $hook({\n\t\ton: \"start\",\n\t\thandler: async () => {\n\t\t\tfor (const bucket of this.alepha.descriptors($bucket)) {\n\t\t\t\tif (bucket.provider !== this) {\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\n\t\t\t\tconst storeName = this.convertName(bucket.name);\n\n\t\t\t\tthis.log.debug(`Prepare store '${storeName}' ...`);\n\n\t\t\t\t// Vercel Blob doesn't require explicit store/container creation\n\t\t\t\t// We just track the store names for reference\n\t\t\t\tthis.stores.add(storeName);\n\n\t\t\t\tthis.log.info(`Store '${bucket.name}' OK`);\n\t\t\t}\n\t\t},\n\t});\n\n\tpublic convertName(name: string): string {\n\t\t// Convert to a valid path-like name for Vercel Blob\n\t\treturn name.replaceAll(\"/\", \"-\").toLowerCase();\n\t}\n\n\tpublic async upload(\n\t\tbucketName: string,\n\t\tfile: FileLike,\n\t\tfileId?: string,\n\t): Promise<string> {\n\t\t// force file id as filename for Vercel because we can't store filename as metadata\n\t\t// it's bad, but we have no choice for now\n\t\tfileId = file.name;\n\n\t\tthis.log.trace(\n\t\t\t`Uploading file '${file.name}' to bucket '${bucketName}' with id '${fileId}'...`,\n\t\t);\n\n\t\tconst storeName = this.convertName(bucketName);\n\t\tconst pathname = `${storeName}/${fileId}`;\n\n\t\ttry {\n\t\t\tconst result = await this.vercelBlobApi.put(\n\t\t\t\tpathname,\n\t\t\t\tfile.stream() as Readable,\n\t\t\t\t{\n\t\t\t\t\taccess: \"public\",\n\t\t\t\t\tcontentType: file.type,\n\t\t\t\t\ttoken: this.env.BLOB_READ_WRITE_TOKEN,\n\t\t\t\t\tallowOverwrite: true,\n\t\t\t\t},\n\t\t\t);\n\n\t\t\tthis.log.trace(`File uploaded successfully: ${result.url}`);\n\t\t\treturn fileId;\n\t\t} catch (error) {\n\t\t\tthis.log.error(`Failed to upload file: ${error}`);\n\t\t\tif (error instanceof Error) {\n\t\t\t\tthrow new AlephaError(`Upload failed: ${error.message}`, {\n\t\t\t\t\tcause: error,\n\t\t\t\t});\n\t\t\t}\n\n\t\t\tthrow error;\n\t\t}\n\t}\n\n\tpublic async download(bucketName: string, fileId: string): Promise<FileLike> {\n\t\tthis.log.trace(\n\t\t\t`Downloading file '${fileId}' from bucket '${bucketName}'...`,\n\t\t);\n\n\t\tconst storeName = this.convertName(bucketName);\n\t\tconst pathname = `${storeName}/${fileId}`;\n\n\t\ttry {\n\t\t\t// check if the file exists and get metadata\n\t\t\tconst headResult = await this.vercelBlobApi.head(pathname, {\n\t\t\t\ttoken: this.env.BLOB_READ_WRITE_TOKEN,\n\t\t\t});\n\n\t\t\tif (!headResult) {\n\t\t\t\tthrow new FileNotFoundError(\n\t\t\t\t\t`File '${fileId}' not found in bucket '${bucketName}'`,\n\t\t\t\t);\n\t\t\t}\n\n\t\t\t// fetch the actual file content\n\t\t\tconst response = await fetch(headResult.url);\n\n\t\t\tif (!response.ok) {\n\t\t\t\tthrow new FileNotFoundError(\n\t\t\t\t\t`Failed to fetch file: ${response.statusText}`,\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tconst stream = response.body;\n\t\t\tif (!stream) {\n\t\t\t\tthrow new FileNotFoundError(\"File not found - empty response body\");\n\t\t\t}\n\n\t\t\tconst originalType =\n\t\t\t\tresponse.headers.get(\"Content-Type\") || \"application/octet-stream\";\n\n\t\t\treturn createFile(stream, {\n\t\t\t\tname: fileId,\n\t\t\t\ttype: originalType,\n\t\t\t\tsize: headResult.size,\n\t\t\t});\n\t\t} catch (error) {\n\t\t\tif (error instanceof FileNotFoundError) {\n\t\t\t\tthrow error;\n\t\t\t}\n\n\t\t\tthis.log.error(`Failed to download file: ${error}`);\n\t\t\tif (error instanceof Error) {\n\t\t\t\tthrow new FileNotFoundError(\"Error downloading file\", { cause: error });\n\t\t\t}\n\n\t\t\tthrow error;\n\t\t}\n\t}\n\n\tpublic async exists(bucketName: string, fileId: string): Promise<boolean> {\n\t\tthis.log.trace(\n\t\t\t`Checking existence of file '${fileId}' in bucket '${bucketName}'...`,\n\t\t);\n\n\t\tconst storeName = this.convertName(bucketName);\n\t\tconst pathname = `${storeName}/${fileId}`;\n\n\t\ttry {\n\t\t\tconst result = await this.vercelBlobApi.head(pathname, {\n\t\t\t\ttoken: this.env.BLOB_READ_WRITE_TOKEN,\n\t\t\t});\n\t\t\treturn result !== null;\n\t\t} catch (error) {\n\t\t\t// Vercel Blob head() throws for non-existent files\n\t\t\treturn false;\n\t\t}\n\t}\n\n\tpublic async delete(bucketName: string, fileId: string): Promise<void> {\n\t\tthis.log.trace(`Deleting file '${fileId}' from bucket '${bucketName}'...`);\n\n\t\tconst storeName = this.convertName(bucketName);\n\t\tconst pathname = `${storeName}/${fileId}`;\n\n\t\ttry {\n\t\t\tawait this.vercelBlobApi.del(pathname, {\n\t\t\t\ttoken: this.env.BLOB_READ_WRITE_TOKEN,\n\t\t\t});\n\t\t} catch (error) {\n\t\t\tthis.log.error(`Failed to delete file: ${error}`);\n\t\t\tif (error instanceof Error) {\n\t\t\t\tthrow new FileNotFoundError(\"Error deleting file\", { cause: error });\n\t\t\t}\n\t\t\tthrow error;\n\t\t}\n\t}\n}\n","import { AlephaBucket, FileStorageProvider } from \"@alepha/bucket\";\nimport { $module } from \"@alepha/core\";\nimport { VercelFileStorageProvider } from \"./providers/VercelFileStorageProvider.ts\";\n\n// ---------------------------------------------------------------------------------------------------------------------\n\nexport * from \"./providers/VercelFileStorageProvider.ts\";\n\n// ---------------------------------------------------------------------------------------------------------------------\n\n/**\n * Plugin for Alepha Bucket that provides Vercel Blob Storage capabilities.\n *\n * @see {@link VercelFileStorageProvider}\n * @module alepha.bucket.vercel\n */\nexport const AlephaBucketVercel = $module({\n\tname: \"alepha.bucket.vercel\",\n\tservices: [VercelFileStorageProvider],\n\tregister: (alepha) =>\n\t\talepha\n\t\t\t.with({\n\t\t\t\toptional: true,\n\t\t\t\tprovide: FileStorageProvider,\n\t\t\t\tuse: VercelFileStorageProvider,\n\t\t\t})\n\t\t\t.with(AlephaBucket),\n});\n"],"mappings":";;;;;;;;AAEA,IAAa,gBAAb,MAA2B;CAC1B,MAAkB;CAClB,OAAoB;CACpB,MAAkB;AAClB;;;;ACeD,MAAM,YAAY,EAAE,OAAO,EAC1B,uBAAuB,EAAE,KAAK,EAC7B,MAAM,QACN,GACD;;;;AASD,IAAa,4BAAb,MAAsE;CACrE,AAAmB,MAAM;CACzB,AAAmB,MAAM,KAAK;CAC9B,AAAmB,SAAS,QAAQ;CACpC,AAAmB,OAAO,QAAQ;CAClC,AAAmB,yBAAsB,IAAI;CAC7C,AAAmB,gBAAgB,QAAQ;CAE3C,AAAmB,UAAU,MAAM;EAClC,IAAI;EACJ,SAAS,YAAY;AACpB,QAAK,MAAM,UAAU,KAAK,OAAO,YAAY,UAAU;AACtD,QAAI,OAAO,aAAa,KACvB;IAGD,MAAM,YAAY,KAAK,YAAY,OAAO;AAE1C,SAAK,IAAI,MAAM,kBAAkB,UAAU;AAI3C,SAAK,OAAO,IAAI;AAEhB,SAAK,IAAI,KAAK,UAAU,OAAO,KAAK;GACpC;EACD;EACD;CAED,AAAO,YAAY,MAAsB;AAExC,SAAO,KAAK,WAAW,KAAK,KAAK;CACjC;CAED,MAAa,OACZ,YACA,MACA,QACkB;AAGlB,WAAS,KAAK;AAEd,OAAK,IAAI,MACR,mBAAmB,KAAK,KAAK,eAAe,WAAW,aAAa,OAAO;EAG5E,MAAM,YAAY,KAAK,YAAY;EACnC,MAAM,WAAW,GAAG,UAAU,GAAG;AAEjC,MAAI;GACH,MAAM,SAAS,MAAM,KAAK,cAAc,IACvC,UACA,KAAK,UACL;IACC,QAAQ;IACR,aAAa,KAAK;IAClB,OAAO,KAAK,IAAI;IAChB,gBAAgB;IAChB;AAGF,QAAK,IAAI,MAAM,+BAA+B,OAAO;AACrD,UAAO;EACP,SAAQ,OAAO;AACf,QAAK,IAAI,MAAM,0BAA0B;AACzC,OAAI,iBAAiB,MACpB,OAAM,IAAI,YAAY,kBAAkB,MAAM,WAAW,EACxD,OAAO,OACP;AAGF,SAAM;EACN;CACD;CAED,MAAa,SAAS,YAAoB,QAAmC;AAC5E,OAAK,IAAI,MACR,qBAAqB,OAAO,iBAAiB,WAAW;EAGzD,MAAM,YAAY,KAAK,YAAY;EACnC,MAAM,WAAW,GAAG,UAAU,GAAG;AAEjC,MAAI;GAEH,MAAM,aAAa,MAAM,KAAK,cAAc,KAAK,UAAU,EAC1D,OAAO,KAAK,IAAI,uBAChB;AAED,OAAI,CAAC,WACJ,OAAM,IAAI,kBACT,SAAS,OAAO,yBAAyB,WAAW;GAKtD,MAAM,WAAW,MAAM,MAAM,WAAW;AAExC,OAAI,CAAC,SAAS,GACb,OAAM,IAAI,kBACT,yBAAyB,SAAS;GAIpC,MAAM,SAAS,SAAS;AACxB,OAAI,CAAC,OACJ,OAAM,IAAI,kBAAkB;GAG7B,MAAM,eACL,SAAS,QAAQ,IAAI,mBAAmB;AAEzC,UAAO,WAAW,QAAQ;IACzB,MAAM;IACN,MAAM;IACN,MAAM,WAAW;IACjB;EACD,SAAQ,OAAO;AACf,OAAI,iBAAiB,kBACpB,OAAM;AAGP,QAAK,IAAI,MAAM,4BAA4B;AAC3C,OAAI,iBAAiB,MACpB,OAAM,IAAI,kBAAkB,0BAA0B,EAAE,OAAO,OAAO;AAGvE,SAAM;EACN;CACD;CAED,MAAa,OAAO,YAAoB,QAAkC;AACzE,OAAK,IAAI,MACR,+BAA+B,OAAO,eAAe,WAAW;EAGjE,MAAM,YAAY,KAAK,YAAY;EACnC,MAAM,WAAW,GAAG,UAAU,GAAG;AAEjC,MAAI;GACH,MAAM,SAAS,MAAM,KAAK,cAAc,KAAK,UAAU,EACtD,OAAO,KAAK,IAAI,uBAChB;AACD,UAAO,WAAW;EAClB,SAAQ,OAAO;AAEf,UAAO;EACP;CACD;CAED,MAAa,OAAO,YAAoB,QAA+B;AACtE,OAAK,IAAI,MAAM,kBAAkB,OAAO,iBAAiB,WAAW;EAEpE,MAAM,YAAY,KAAK,YAAY;EACnC,MAAM,WAAW,GAAG,UAAU,GAAG;AAEjC,MAAI;AACH,SAAM,KAAK,cAAc,IAAI,UAAU,EACtC,OAAO,KAAK,IAAI,uBAChB;EACD,SAAQ,OAAO;AACf,QAAK,IAAI,MAAM,0BAA0B;AACzC,OAAI,iBAAiB,MACpB,OAAM,IAAI,kBAAkB,uBAAuB,EAAE,OAAO,OAAO;AAEpE,SAAM;EACN;CACD;AACD;;;;;;;;;;AC3LD,MAAa,qBAAqB,QAAQ;CACzC,MAAM;CACN,UAAU,CAAC,0BAA0B;CACrC,WAAW,WACV,OACE,KAAK;EACL,UAAU;EACV,SAAS;EACT,KAAK;EACL,EACA,KAAK;CACR"}
+{"version":3,"file":"index.js","names":[],"sources":["../src/providers/VercelBlobProvider.ts","../src/providers/VercelFileStorageProvider.ts","../src/index.ts"],"sourcesContent":["import { del, head, put } from \"@vercel/blob\";\n\nexport class VercelBlobApi {\n\tput: typeof put = put;\n\thead: typeof head = head;\n\tdel: typeof del = del;\n}\n","import { randomUUID } from \"node:crypto\";\nimport type { Readable } from \"node:stream\";\nimport {\n\t$bucket,\n\tFileMetadataService,\n\tFileNotFoundError,\n\ttype FileStorageProvider,\n} from \"@alepha/bucket\";\nimport {\n\t$env,\n\t$hook,\n\t$inject,\n\tAlepha,\n\tAlephaError,\n\ttype FileLike,\n\ttype Static,\n\tt,\n} from \"@alepha/core\";\nimport { DateTimeProvider } from \"@alepha/datetime\";\nimport { createFile } from \"@alepha/file\";\nimport { $logger } from \"@alepha/logger\";\nimport { VercelBlobApi } from \"./VercelBlobProvider.ts\";\n\nconst envSchema = t.object({\n\tBLOB_READ_WRITE_TOKEN: t.text({\n\t\tsize: \"long\",\n\t}),\n});\n\ndeclare module \"@alepha/core\" {\n\tinterface Env extends Partial<Static<typeof envSchema>> {}\n}\n\n/**\n * Vercel Blob Storage implementation of File Storage Provider.\n */\nexport class VercelFileStorageProvider implements FileStorageProvider {\n\tprotected readonly log = $logger();\n\tprotected readonly env = $env(envSchema);\n\tprotected readonly alepha = $inject(Alepha);\n\tprotected readonly time = $inject(DateTimeProvider);\n\tprotected readonly stores: Set<string> = new Set();\n\tprotected readonly vercelBlobApi = $inject(VercelBlobApi);\n\tprotected readonly metadataService = $inject(FileMetadataService);\n\n\tprotected readonly onStart = $hook({\n\t\ton: \"start\",\n\t\thandler: async () => {\n\t\t\tfor (const bucket of this.alepha.descriptors($bucket)) {\n\t\t\t\tif (bucket.provider !== this) {\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\n\t\t\t\tconst storeName = this.convertName(bucket.name);\n\n\t\t\t\tthis.log.debug(`Prepare store '${storeName}' ...`);\n\n\t\t\t\t// Vercel Blob doesn't require explicit store/container creation\n\t\t\t\t// We just track the store names for reference\n\t\t\t\tthis.stores.add(storeName);\n\n\t\t\t\tthis.log.info(`Store '${bucket.name}' OK`);\n\t\t\t}\n\t\t},\n\t});\n\n\tpublic convertName(name: string): string {\n\t\t// Convert to a valid path-like name for Vercel Blob\n\t\treturn name.replaceAll(\"/\", \"-\").toLowerCase();\n\t}\n\n\tprotected createId(): string {\n\t\treturn randomUUID();\n\t}\n\n\tpublic async upload(\n\t\tbucketName: string,\n\t\tfile: FileLike,\n\t\tfileId?: string,\n\t): Promise<string> {\n\t\tfileId ??= this.createId();\n\n\t\tthis.log.trace(\n\t\t\t`Uploading file '${file.name}' to bucket '${bucketName}' with id '${fileId}'...`,\n\t\t);\n\n\t\tconst storeName = this.convertName(bucketName);\n\t\tconst pathname = `${storeName}/${fileId}`;\n\n\t\ttry {\n\t\t\t// Create a buffer with metadata and content\n\t\t\tconst contentBuffer = Buffer.from(await file.arrayBuffer());\n\t\t\tconst fileBuffer = this.metadataService.createFileBuffer(\n\t\t\t\tfile,\n\t\t\t\tcontentBuffer,\n\t\t\t);\n\n\t\t\t// Upload the complete buffer (metadata + content) to Vercel Blob\n\t\t\tconst result = await this.vercelBlobApi.put(\n\t\t\t\tpathname,\n\t\t\t\tfileBuffer as unknown as Readable,\n\t\t\t\t{\n\t\t\t\t\taccess: \"public\",\n\t\t\t\t\tcontentType: file.type || \"application/octet-stream\",\n\t\t\t\t\ttoken: this.env.BLOB_READ_WRITE_TOKEN,\n\t\t\t\t\tallowOverwrite: true,\n\t\t\t\t},\n\t\t\t);\n\n\t\t\tthis.log.trace(`File uploaded successfully: ${result.url}`);\n\t\t\treturn fileId;\n\t\t} catch (error) {\n\t\t\tthis.log.error(`Failed to upload file: ${error}`);\n\t\t\tif (error instanceof Error) {\n\t\t\t\tthrow new AlephaError(`Upload failed: ${error.message}`, {\n\t\t\t\t\tcause: error,\n\t\t\t\t});\n\t\t\t}\n\n\t\t\tthrow error;\n\t\t}\n\t}\n\n\tpublic async download(bucketName: string, fileId: string): Promise<FileLike> {\n\t\tthis.log.trace(\n\t\t\t`Downloading file '${fileId}' from bucket '${bucketName}'...`,\n\t\t);\n\n\t\tconst storeName = this.convertName(bucketName);\n\t\tconst pathname = `${storeName}/${fileId}`;\n\n\t\ttry {\n\t\t\t// check if the file exists and get metadata\n\t\t\tconst headResult = await this.vercelBlobApi.head(pathname, {\n\t\t\t\ttoken: this.env.BLOB_READ_WRITE_TOKEN,\n\t\t\t});\n\n\t\t\tif (!headResult) {\n\t\t\t\tthrow new FileNotFoundError(\n\t\t\t\t\t`File '${fileId}' not found in bucket '${bucketName}'`,\n\t\t\t\t);\n\t\t\t}\n\n\t\t\t// fetch the actual file content (with metadata)\n\t\t\tconst response = await fetch(headResult.url);\n\n\t\t\tif (!response.ok) {\n\t\t\t\tthrow new FileNotFoundError(\n\t\t\t\t\t`Failed to fetch file: ${response.statusText}`,\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tconst arrayBuffer = await response.arrayBuffer();\n\t\t\tif (!arrayBuffer) {\n\t\t\t\tthrow new FileNotFoundError(\"File not found - empty response body\");\n\t\t\t}\n\n\t\t\t// Decode metadata from the buffer\n\t\t\tconst buffer = Buffer.from(arrayBuffer);\n\t\t\tconst { metadata, contentStart } =\n\t\t\t\tthis.metadataService.decodeMetadataFromBuffer(buffer);\n\n\t\t\t// Extract the actual content\n\t\t\tconst content = buffer.subarray(contentStart);\n\n\t\t\treturn createFile(content, {\n\t\t\t\tname: metadata.name,\n\t\t\t\ttype: metadata.type,\n\t\t\t\tsize: content.length,\n\t\t\t});\n\t\t} catch (error) {\n\t\t\tif (error instanceof FileNotFoundError) {\n\t\t\t\tthrow error;\n\t\t\t}\n\n\t\t\tthis.log.error(`Failed to download file: ${error}`);\n\t\t\tif (error instanceof Error) {\n\t\t\t\tthrow new FileNotFoundError(\"Error downloading file\", { cause: error });\n\t\t\t}\n\n\t\t\tthrow error;\n\t\t}\n\t}\n\n\tpublic async exists(bucketName: string, fileId: string): Promise<boolean> {\n\t\tthis.log.trace(\n\t\t\t`Checking existence of file '${fileId}' in bucket '${bucketName}'...`,\n\t\t);\n\n\t\tconst storeName = this.convertName(bucketName);\n\t\tconst pathname = `${storeName}/${fileId}`;\n\n\t\ttry {\n\t\t\tconst result = await this.vercelBlobApi.head(pathname, {\n\t\t\t\ttoken: this.env.BLOB_READ_WRITE_TOKEN,\n\t\t\t});\n\t\t\treturn result !== null;\n\t\t} catch (error) {\n\t\t\t// Vercel Blob head() throws for non-existent files\n\t\t\treturn false;\n\t\t}\n\t}\n\n\tpublic async delete(bucketName: string, fileId: string): Promise<void> {\n\t\tthis.log.trace(`Deleting file '${fileId}' from bucket '${bucketName}'...`);\n\n\t\tconst storeName = this.convertName(bucketName);\n\t\tconst pathname = `${storeName}/${fileId}`;\n\n\t\ttry {\n\t\t\tawait this.vercelBlobApi.del(pathname, {\n\t\t\t\ttoken: this.env.BLOB_READ_WRITE_TOKEN,\n\t\t\t});\n\t\t} catch (error) {\n\t\t\tthis.log.error(`Failed to delete file: ${error}`);\n\t\t\tif (error instanceof Error) {\n\t\t\t\tthrow new FileNotFoundError(\"Error deleting file\", { cause: error });\n\t\t\t}\n\t\t\tthrow error;\n\t\t}\n\t}\n}\n","import { AlephaBucket, FileStorageProvider } from \"@alepha/bucket\";\nimport { $module } from \"@alepha/core\";\nimport { VercelFileStorageProvider } from \"./providers/VercelFileStorageProvider.ts\";\n\n// ---------------------------------------------------------------------------------------------------------------------\n\nexport * from \"./providers/VercelFileStorageProvider.ts\";\n\n// ---------------------------------------------------------------------------------------------------------------------\n\n/**\n * Plugin for Alepha Bucket that provides Vercel Blob Storage capabilities.\n *\n * @see {@link VercelFileStorageProvider}\n * @module alepha.bucket.vercel\n */\nexport const AlephaBucketVercel = $module({\n\tname: \"alepha.bucket.vercel\",\n\tservices: [VercelFileStorageProvider],\n\tregister: (alepha) =>\n\t\talepha\n\t\t\t.with({\n\t\t\t\toptional: true,\n\t\t\t\tprovide: FileStorageProvider,\n\t\t\t\tuse: VercelFileStorageProvider,\n\t\t\t})\n\t\t\t.with(AlephaBucket),\n});\n"],"mappings":"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"}

package/package.json

@@ -10,7 +10,7 @@
 		"blob"
 	],
 	"author": "Feunard",
-	"version": "0.10.4",
+	"version": "0.10.5",
 	"type": "module",
 	"engines": {
 		"node": ">=22.0.0"
@@ -23,11 +23,11 @@
 		"src"
 	],
 	"dependencies": {
-		"@alepha/bucket": "0.10.4",
-		"@alepha/core": "0.10.4",
-		"@alepha/datetime": "0.10.4",
-		"@alepha/file": "0.10.4",
-		"@alepha/logger": "0.10.4",
+		"@alepha/bucket": "0.10.5",
+		"@alepha/core": "0.10.5",
+		"@alepha/datetime": "0.10.5",
+		"@alepha/file": "0.10.5",
+		"@alepha/logger": "0.10.5",
 		"@vercel/blob": "^2.0.0"
 	},
 	"devDependencies": {

package/src/providers/VercelFileStorageProvider.ts

@@ -1,6 +1,8 @@
+import { randomUUID } from "node:crypto";
 import type { Readable } from "node:stream";
 import {
 	$bucket,
+	FileMetadataService,
 	FileNotFoundError,
 	type FileStorageProvider,
 } from "@alepha/bucket";
@@ -39,6 +41,7 @@ export class VercelFileStorageProvider implements FileStorageProvider {
 	protected readonly time = $inject(DateTimeProvider);
 	protected readonly stores: Set<string> = new Set();
 	protected readonly vercelBlobApi = $inject(VercelBlobApi);
+	protected readonly metadataService = $inject(FileMetadataService);
 
 	protected readonly onStart = $hook({
 		on: "start",
@@ -66,14 +69,16 @@ export class VercelFileStorageProvider implements FileStorageProvider {
 		return name.replaceAll("/", "-").toLowerCase();
 	}
 
+	protected createId(): string {
+		return randomUUID();
+	}
+
 	public async upload(
 		bucketName: string,
 		file: FileLike,
 		fileId?: string,
 	): Promise<string> {
-		// force file id as filename for Vercel because we can't store filename as metadata
-		// it's bad, but we have no choice for now
-		fileId = file.name;
+		fileId ??= this.createId();
 
 		this.log.trace(
 			`Uploading file '${file.name}' to bucket '${bucketName}' with id '${fileId}'...`,
@@ -83,12 +88,20 @@ export class VercelFileStorageProvider implements FileStorageProvider {
 		const pathname = `${storeName}/${fileId}`;
 
 		try {
+			// Create a buffer with metadata and content
+			const contentBuffer = Buffer.from(await file.arrayBuffer());
+			const fileBuffer = this.metadataService.createFileBuffer(
+				file,
+				contentBuffer,
+			);
+
+			// Upload the complete buffer (metadata + content) to Vercel Blob
 			const result = await this.vercelBlobApi.put(
 				pathname,
-				file.stream() as Readable,
+				fileBuffer as unknown as Readable,
 				{
 					access: "public",
-					contentType: file.type,
+					contentType: file.type || "application/octet-stream",
 					token: this.env.BLOB_READ_WRITE_TOKEN,
 					allowOverwrite: true,
 				},
@@ -128,7 +141,7 @@ export class VercelFileStorageProvider implements FileStorageProvider {
 				);
 			}
 
-			// fetch the actual file content
+			// fetch the actual file content (with metadata)
 			const response = await fetch(headResult.url);
 
 			if (!response.ok) {
@@ -137,18 +150,23 @@ export class VercelFileStorageProvider implements FileStorageProvider {
 				);
 			}
 
-			const stream = response.body;
-			if (!stream) {
+			const arrayBuffer = await response.arrayBuffer();
+			if (!arrayBuffer) {
 				throw new FileNotFoundError("File not found - empty response body");
 			}
 
-			const originalType =
-				response.headers.get("Content-Type") || "application/octet-stream";
+			// Decode metadata from the buffer
+			const buffer = Buffer.from(arrayBuffer);
+			const { metadata, contentStart } =
+				this.metadataService.decodeMetadataFromBuffer(buffer);
+
+			// Extract the actual content
+			const content = buffer.subarray(contentStart);
 
-			return createFile(stream, {
-				name: fileId,
-				type: originalType,
-				size: headResult.size,
+			return createFile(content, {
+				name: metadata.name,
+				type: metadata.type,
+				size: content.length,
 			});
 		} catch (error) {
 			if (error instanceof FileNotFoundError) {