@stacksjs/storage 0.75.408 → 0.75.417

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/README.md CHANGED
@@ -47,6 +47,20 @@ import {
47
47
 
48
48
  To view the full documentation, please visit [<https://stacksjs.com/storag>e](https://stacksjs.com/storage).
49
49
 
50
+ ## Disk containment and signed URL revocation
51
+
52
+ Local and Bun adapters reject descendant symlinks, including final file
53
+ symlinks, before filesystem operations. The configured root and its ancestors
54
+ are trusted and may use aliases. Keep the tree under application control during
55
+ I/O; these checks do not sandbox concurrent filesystem replacement.
56
+
57
+ Signed URL revocation uses canonical signature bytes, so alternate base64
58
+ encodings cannot bypass a revoke. Revocations remain process-local and are lost
59
+ on restart. The 100,000-entry limit discards only entries whose authenticated
60
+ expiry has passed. A bare signature has no known expiry. When capacity is full,
61
+ revocation throws explicitly and preserves existing revocations; rotate
62
+ `APP_KEY` or supply a durable application revocation store before retrying.
63
+
50
64
  ## Bounded local text reads
51
65
 
52
66
  Use the standalone entrypoint for local text supplied by a user or worker:
@@ -1 +1 @@
1
- import{Buffer}from"node:buffer";import{file,write as bunWrite}from"bun";import{chmod,copyFile,lstat,mkdir,rename,rm,unlink}from"node:fs/promises";import{dirname,join,relative}from"node:path";import{createDirectoryListing}from"../types";import{createSignedStorageToken}from"../signed-url";import{publicUrlFor,signedUrlBase,writeAtomically}from"../filesystem-common";export class BunStorageAdapter{root;url;disk;constructor(config={}){this.root=config.root||process.cwd();this.url=config.url;this.disk=config.disk}resolvePath(path){const resolved=join(this.root,path),rel=relative(this.root,resolved);if(rel.startsWith("..")||rel.startsWith("../")||rel.startsWith("..\\"))throw Error(`Path traversal detected: '${path}' resolves outside storage root`);return resolved}async write(path,contents){const fullPath=this.resolvePath(path);if(!(typeof contents==="string"||contents instanceof Uint8Array)){if(typeof contents.getReader!=="function")throw TypeError("[storage/bun] contents must be a web-standard ReadableStream (with .getReader()), not a Node stream.Readable. Convert via Readable.toWeb(nodeStream) before passing.")}await writeAtomically(fullPath,async(temporary)=>{if(typeof contents==="string"||contents instanceof Uint8Array)await bunWrite(temporary,contents);else await bunWrite(temporary,new Response(contents))});const written=file(fullPath);return{path,size:written.size,lastModified:written.lastModified}}async read(path){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);return await bunFile.arrayBuffer().then((buf)=>new Uint8Array(buf))}async getStream(path,_options){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);return bunFile.stream()}async putStream(path,stream,options){const fullPath=this.resolvePath(path),signal=options?.signal;signal?.throwIfAborted();await writeAtomically(fullPath,async(temporary)=>{const source=signal?stream.pipeThrough(new TransformStream,{signal}):stream;await bunWrite(temporary,new Response(source))});const written=file(fullPath);return{path,size:written.size,contentType:options?.contentType,lastModified:written.lastModified}}async readToString(path){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);return await bunFile.text()}async readToBuffer(path){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);const arrayBuffer=await bunFile.arrayBuffer();return Buffer.from(arrayBuffer)}async readToUint8Array(path){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);const arrayBuffer=await bunFile.arrayBuffer();return new Uint8Array(arrayBuffer)}async deleteFile(path){const fullPath=this.resolvePath(path);await unlink(fullPath).catch((error)=>{if(error.code!=="ENOENT")throw error})}async deleteDirectory(path){const fullPath=this.resolvePath(path);await rm(fullPath,{recursive:!0,force:!0})}async createDirectory(path){const fullPath=this.resolvePath(path);await mkdir(fullPath,{recursive:!0})}async moveFile(from,to){const fromPath=this.resolvePath(from),toPath=this.resolvePath(to);await mkdir(dirname(toPath),{recursive:!0});await rename(fromPath,toPath)}async copyFile(from,to){const fromPath=this.resolvePath(from),toPath=this.resolvePath(to);await mkdir(dirname(toPath),{recursive:!0});await copyFile(fromPath,toPath)}async stat(path){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);const stats=await Bun.file(fullPath).stat(),isDir=stats.isDirectory();return{path,type:isDir?"directory":"file",visibility:await this.visibility(path),size:isDir?0:stats.size,lastModified:stats.mtime?.getTime()||Date.now(),mimeType:isDir?void 0:bunFile.type}}list(path,options={}){const fullPath=this.resolvePath(path);return this.createAsyncIterator(fullPath,options.deep||!1)}async*createAsyncIterator(dirPath,deep){const entries=[];try{const glob=new Bun.Glob(deep?"**/*":"*");for await(const entry of glob.scan({cwd:dirPath,onlyFiles:!1})){const fullEntryPath=join(dirPath,entry),stats=await Bun.file(fullEntryPath).stat();entries.push({path:relative(this.root,fullEntryPath),type:stats.isDirectory()?"directory":"file"})}}catch(error){return}yield*createDirectoryListing(entries)}async changeVisibility(path,vis){const fullPath=this.resolvePath(path),isDir=(await lstat(fullPath)).isDirectory();await chmod(fullPath,vis==="public"?isDir?493:420:isDir?448:384)}async visibility(path){const fullPath=this.resolvePath(path);return(await lstat(fullPath)).mode&511&4?"public":"private"}async fileExists(path){const fullPath=this.resolvePath(path);return await file(fullPath).exists()}async directoryExists(path){const fullPath=this.resolvePath(path);try{return(await Bun.file(fullPath).stat()).isDirectory()}catch{return!1}}async publicUrl(path,options={}){return publicUrlFor(path,{domain:options.domain,diskUrl:this.url})}async temporaryUrl(path,options){return await this.signedUrl(path,{expiresIn:options.expiresIn})}async signedUrl(path,options){const token=createSignedStorageToken(path,{...options,disk:options.disk??this.disk});return`${signedUrlBase(options.baseUrl)}/__storage/${encodeURIComponent(path)}?token=${token}`}async checksum(path,options={}){const algorithm=options.algorithm||"sha256",fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);const hasher=new Bun.CryptoHasher(algorithm),arrayBuffer=await bunFile.arrayBuffer();hasher.update(new Uint8Array(arrayBuffer));return hasher.digest("hex")}async mimeType(path,_options={}){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);return bunFile.type||"application/octet-stream"}async lastModified(path){return(await this.stat(path)).lastModified}async fileSize(path){return(await this.stat(path)).size}}export function createBunStorage(config={}){return new BunStorageAdapter(config)}
1
+ import{Buffer}from"node:buffer";import{file,write as bunWrite}from"bun";import{chmod,copyFile,lstat,mkdir,rename,rm,unlink}from"node:fs/promises";import{dirname,join,relative}from"node:path";import{createDirectoryListing}from"../types";import{createSignedStorageToken}from"../signed-url";import{publicUrlFor,resolveStoragePath,signedUrlBase,writeAtomically}from"../filesystem-common";export class BunStorageAdapter{root;url;disk;constructor(config={}){this.root=config.root||process.cwd();this.url=config.url;this.disk=config.disk}resolvePath(path){return resolveStoragePath(this.root,path)}async write(path,contents){const fullPath=this.resolvePath(path);if(!(typeof contents==="string"||contents instanceof Uint8Array)){if(typeof contents.getReader!=="function")throw TypeError("[storage/bun] contents must be a web-standard ReadableStream (with .getReader()), not a Node stream.Readable. Convert via Readable.toWeb(nodeStream) before passing.")}await writeAtomically(fullPath,async(temporary)=>{if(typeof contents==="string"||contents instanceof Uint8Array)await bunWrite(temporary,contents);else await bunWrite(temporary,new Response(contents))});const written=file(fullPath);return{path,size:written.size,lastModified:written.lastModified}}async read(path){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);return await bunFile.arrayBuffer().then((buf)=>new Uint8Array(buf))}async getStream(path,_options){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);return bunFile.stream()}async putStream(path,stream,options){const fullPath=this.resolvePath(path),signal=options?.signal;signal?.throwIfAborted();await writeAtomically(fullPath,async(temporary)=>{const source=signal?stream.pipeThrough(new TransformStream,{signal}):stream;await bunWrite(temporary,new Response(source))});const written=file(fullPath);return{path,size:written.size,contentType:options?.contentType,lastModified:written.lastModified}}async readToString(path){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);return await bunFile.text()}async readToBuffer(path){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);const arrayBuffer=await bunFile.arrayBuffer();return Buffer.from(arrayBuffer)}async readToUint8Array(path){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);const arrayBuffer=await bunFile.arrayBuffer();return new Uint8Array(arrayBuffer)}async deleteFile(path){const fullPath=this.resolvePath(path);await unlink(fullPath).catch((error)=>{if(error.code!=="ENOENT")throw error})}async deleteDirectory(path){const fullPath=this.resolvePath(path);await rm(fullPath,{recursive:!0,force:!0})}async createDirectory(path){const fullPath=this.resolvePath(path);await mkdir(fullPath,{recursive:!0})}async moveFile(from,to){const fromPath=this.resolvePath(from),toPath=this.resolvePath(to);await mkdir(dirname(toPath),{recursive:!0});await rename(fromPath,toPath)}async copyFile(from,to){const fromPath=this.resolvePath(from),toPath=this.resolvePath(to);await mkdir(dirname(toPath),{recursive:!0});await copyFile(fromPath,toPath)}async stat(path){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);const stats=await Bun.file(fullPath).stat(),isDir=stats.isDirectory();return{path,type:isDir?"directory":"file",visibility:await this.visibility(path),size:isDir?0:stats.size,lastModified:stats.mtime?.getTime()||Date.now(),mimeType:isDir?void 0:bunFile.type}}list(path,options={}){const fullPath=this.resolvePath(path);return this.createAsyncIterator(fullPath,options.deep||!1)}async*createAsyncIterator(dirPath,deep){const entries=[];try{const glob=new Bun.Glob(deep?"**/*":"*");for await(const entry of glob.scan({cwd:dirPath,onlyFiles:!1})){const fullEntryPath=join(dirPath,entry),stats=await Bun.file(fullEntryPath).stat();entries.push({path:relative(this.root,fullEntryPath),type:stats.isDirectory()?"directory":"file"})}}catch(error){return}yield*createDirectoryListing(entries)}async changeVisibility(path,vis){const fullPath=this.resolvePath(path),isDir=(await lstat(fullPath)).isDirectory();await chmod(fullPath,vis==="public"?isDir?493:420:isDir?448:384)}async visibility(path){const fullPath=this.resolvePath(path);return(await lstat(fullPath)).mode&511&4?"public":"private"}async fileExists(path){const fullPath=this.resolvePath(path);return await file(fullPath).exists()}async directoryExists(path){const fullPath=this.resolvePath(path);try{return(await Bun.file(fullPath).stat()).isDirectory()}catch{return!1}}async publicUrl(path,options={}){return publicUrlFor(path,{domain:options.domain,diskUrl:this.url})}async temporaryUrl(path,options){return await this.signedUrl(path,{expiresIn:options.expiresIn})}async signedUrl(path,options){const token=createSignedStorageToken(path,{...options,disk:options.disk??this.disk});return`${signedUrlBase(options.baseUrl)}/__storage/${encodeURIComponent(path)}?token=${token}`}async checksum(path,options={}){const algorithm=options.algorithm||"sha256",fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);const hasher=new Bun.CryptoHasher(algorithm),arrayBuffer=await bunFile.arrayBuffer();hasher.update(new Uint8Array(arrayBuffer));return hasher.digest("hex")}async mimeType(path,_options={}){const fullPath=this.resolvePath(path),bunFile=file(fullPath);if(!await bunFile.exists())throw Error(`File not found: ${path}`);return bunFile.type||"application/octet-stream"}async lastModified(path){return(await this.stat(path)).lastModified}async fileSize(path){return(await this.stat(path)).size}}export function createBunStorage(config={}){return new BunStorageAdapter(config)}
@@ -1 +1 @@
1
- import{Buffer}from"node:buffer";import{createReadStream,createWriteStream}from"node:fs";import{access,chmod,constants,copyFile,lstat,mkdir,readdir,readFile,rename,rm,stat,unlink,writeFile}from"node:fs/promises";import{basename,dirname,join,relative}from"node:path";import{Readable}from"node:stream";import{pipeline}from"node:stream/promises";import{createDirectoryListing}from"../types";import{createSignedStorageToken}from"../signed-url";import{publicUrlFor,signedUrlBase,writeAtomically}from"../filesystem-common";export class LocalStorageAdapter{root;url;disk;constructor(config={}){this.root=config.root||process.cwd();this.url=config.url;this.disk=config.disk}resolvePath(path){const resolved=join(this.root,path),rel=relative(this.root,resolved);if(rel.startsWith("..")||rel.startsWith("../")||rel.startsWith("..\\"))throw Error(`Path traversal detected: '${path}' resolves outside storage root`);return resolved}async write(path,contents){const fullPath=this.resolvePath(path);await writeAtomically(fullPath,async(temporary)=>{if(typeof contents==="string")await writeFile(temporary,contents,"utf8");else if(contents instanceof Uint8Array)await writeFile(temporary,contents);else{const nodeReadable=Readable.fromWeb(contents);await pipeline(nodeReadable,createWriteStream(temporary))}});const st=await stat(fullPath);return{path,size:st.size,lastModified:st.mtimeMs}}async read(path){const fullPath=this.resolvePath(path);return await readFile(fullPath)}async getStream(path,options){const fullPath=this.resolvePath(path);await access(fullPath,constants.R_OK);const nodeStream=createReadStream(fullPath,{signal:options?.signal});return Readable.toWeb(nodeStream)}async putStream(path,stream,options){const fullPath=this.resolvePath(path);await writeAtomically(fullPath,async(temporary)=>{const nodeReadable=Readable.fromWeb(stream);await pipeline(nodeReadable,createWriteStream(temporary),{signal:options?.signal})});const st=await stat(fullPath);return{path,size:st.size,contentType:options?.contentType,lastModified:st.mtimeMs}}async readToString(path){const fullPath=this.resolvePath(path);return await readFile(fullPath,"utf8")}async readToBuffer(path){const fullPath=this.resolvePath(path);return await readFile(fullPath)}async readToUint8Array(path){const fullPath=this.resolvePath(path),buffer=await readFile(fullPath);return new Uint8Array(buffer)}async deleteFile(path){const fullPath=this.resolvePath(path);await unlink(fullPath).catch((error)=>{if(error.code!=="ENOENT")throw error})}async deleteDirectory(path){const fullPath=this.resolvePath(path);await rm(fullPath,{recursive:!0,force:!0})}async createDirectory(path){const fullPath=this.resolvePath(path);await mkdir(fullPath,{recursive:!0})}async moveFile(from,to){const fromPath=this.resolvePath(from),toPath=this.resolvePath(to),toDir=dirname(toPath);await mkdir(toDir,{recursive:!0});await rename(fromPath,toPath)}async copyFile(from,to){const fromPath=this.resolvePath(from),toPath=this.resolvePath(to),toDir=dirname(toPath);await mkdir(toDir,{recursive:!0});await copyFile(fromPath,toPath)}async stat(path){const fullPath=this.resolvePath(path),stats=await lstat(fullPath);return{path,type:stats.isDirectory()?"directory":"file",visibility:await this.visibility(path),size:stats.size,lastModified:stats.mtimeMs,mimeType:stats.isFile()?await this.detectMimeType(fullPath):void 0}}list(path,options={}){return this.createAsyncIterator(path,options.deep||!1)}async*createAsyncIterator(path,deep){const fullPath=this.resolvePath(path);try{await access(fullPath,constants.R_OK)}catch{return}const entries=await this.readDirectoryRecursive(fullPath,deep);yield*createDirectoryListing(entries)}async readDirectoryRecursive(dirPath,deep){const entries=[];try{const items=await readdir(dirPath,{withFileTypes:!0});for(const item of items){const itemPath=join(dirPath,item.name),relativePath=relative(this.root,itemPath);entries.push({path:relativePath,type:item.isDirectory()?"directory":"file"});if(deep&&item.isDirectory()){const subEntries=await this.readDirectoryRecursive(itemPath,!0);entries.push(...subEntries)}}}catch(error){if(error?.code!=="EACCES"&&error?.code!=="EPERM")throw error}return entries}async changeVisibility(path,vis){const fullPath=this.resolvePath(path),isDir=(await lstat(fullPath)).isDirectory();await chmod(fullPath,vis==="public"?isDir?493:420:isDir?448:384)}async visibility(path){const fullPath=this.resolvePath(path);return(await lstat(fullPath)).mode&511&4?"public":"private"}async fileExists(path){const fullPath=this.resolvePath(path);try{return(await lstat(fullPath)).isFile()}catch{return!1}}async directoryExists(path){const fullPath=this.resolvePath(path);try{return(await lstat(fullPath)).isDirectory()}catch{return!1}}async publicUrl(path,options={}){return publicUrlFor(path,{domain:options.domain,diskUrl:this.url})}async temporaryUrl(path,options){return await this.signedUrl(path,{expiresIn:options.expiresIn})}async signedUrl(path,options){const token=createSignedStorageToken(path,{...options,disk:options.disk??this.disk});return`${signedUrlBase(options.baseUrl)}/__storage/${encodeURIComponent(path)}?token=${token}`}async checksum(path,options={}){const algorithm=options.algorithm||"sha256",fullPath=this.resolvePath(path),content=await readFile(fullPath),hasher=new Bun.CryptoHasher(algorithm);hasher.update(content);return hasher.digest("hex")}async mimeType(path,options={}){const fullPath=this.resolvePath(path);return await this.detectMimeType(fullPath)}async detectMimeType(filePath){const ext=basename(filePath).split(".").pop()?.toLowerCase();return{txt:"text/plain",html:"text/html",css:"text/css",js:"application/javascript",json:"application/json",xml:"application/xml",pdf:"application/pdf",zip:"application/zip",jpg:"image/jpeg",jpeg:"image/jpeg",png:"image/png",gif:"image/gif",svg:"image/svg+xml",mp4:"video/mp4",mp3:"audio/mpeg",wav:"audio/wav"}[ext||""]||"application/octet-stream"}async lastModified(path){return(await this.stat(path)).lastModified}async fileSize(path){return(await this.stat(path)).size}}export function createLocalStorage(config={}){return new LocalStorageAdapter(config)}
1
+ import{Buffer}from"node:buffer";import{createReadStream,createWriteStream}from"node:fs";import{access,chmod,constants,copyFile,lstat,mkdir,readdir,readFile,rename,rm,stat,unlink,writeFile}from"node:fs/promises";import{basename,dirname,join,relative}from"node:path";import{Readable}from"node:stream";import{pipeline}from"node:stream/promises";import{createDirectoryListing}from"../types";import{createSignedStorageToken}from"../signed-url";import{publicUrlFor,resolveStoragePath,signedUrlBase,writeAtomically}from"../filesystem-common";export class LocalStorageAdapter{root;url;disk;constructor(config={}){this.root=config.root||process.cwd();this.url=config.url;this.disk=config.disk}resolvePath(path){return resolveStoragePath(this.root,path)}async write(path,contents){const fullPath=this.resolvePath(path);await writeAtomically(fullPath,async(temporary)=>{if(typeof contents==="string")await writeFile(temporary,contents,"utf8");else if(contents instanceof Uint8Array)await writeFile(temporary,contents);else{const nodeReadable=Readable.fromWeb(contents);await pipeline(nodeReadable,createWriteStream(temporary))}});const st=await stat(fullPath);return{path,size:st.size,lastModified:st.mtimeMs}}async read(path){const fullPath=this.resolvePath(path);return await readFile(fullPath)}async getStream(path,options){const fullPath=this.resolvePath(path);await access(fullPath,constants.R_OK);const nodeStream=createReadStream(fullPath,{signal:options?.signal});return Readable.toWeb(nodeStream)}async putStream(path,stream,options){const fullPath=this.resolvePath(path);await writeAtomically(fullPath,async(temporary)=>{const nodeReadable=Readable.fromWeb(stream);await pipeline(nodeReadable,createWriteStream(temporary),{signal:options?.signal})});const st=await stat(fullPath);return{path,size:st.size,contentType:options?.contentType,lastModified:st.mtimeMs}}async readToString(path){const fullPath=this.resolvePath(path);return await readFile(fullPath,"utf8")}async readToBuffer(path){const fullPath=this.resolvePath(path);return await readFile(fullPath)}async readToUint8Array(path){const fullPath=this.resolvePath(path),buffer=await readFile(fullPath);return new Uint8Array(buffer)}async deleteFile(path){const fullPath=this.resolvePath(path);await unlink(fullPath).catch((error)=>{if(error.code!=="ENOENT")throw error})}async deleteDirectory(path){const fullPath=this.resolvePath(path);await rm(fullPath,{recursive:!0,force:!0})}async createDirectory(path){const fullPath=this.resolvePath(path);await mkdir(fullPath,{recursive:!0})}async moveFile(from,to){const fromPath=this.resolvePath(from),toPath=this.resolvePath(to),toDir=dirname(toPath);await mkdir(toDir,{recursive:!0});await rename(fromPath,toPath)}async copyFile(from,to){const fromPath=this.resolvePath(from),toPath=this.resolvePath(to),toDir=dirname(toPath);await mkdir(toDir,{recursive:!0});await copyFile(fromPath,toPath)}async stat(path){const fullPath=this.resolvePath(path),stats=await lstat(fullPath);return{path,type:stats.isDirectory()?"directory":"file",visibility:await this.visibility(path),size:stats.size,lastModified:stats.mtimeMs,mimeType:stats.isFile()?await this.detectMimeType(fullPath):void 0}}list(path,options={}){return this.createAsyncIterator(path,options.deep||!1)}async*createAsyncIterator(path,deep){const fullPath=this.resolvePath(path);try{await access(fullPath,constants.R_OK)}catch{return}const entries=await this.readDirectoryRecursive(fullPath,deep);yield*createDirectoryListing(entries)}async readDirectoryRecursive(dirPath,deep){const entries=[];try{const items=await readdir(dirPath,{withFileTypes:!0});for(const item of items){const itemPath=join(dirPath,item.name),relativePath=relative(this.root,itemPath);entries.push({path:relativePath,type:item.isDirectory()?"directory":"file"});if(deep&&item.isDirectory()){const subEntries=await this.readDirectoryRecursive(itemPath,!0);entries.push(...subEntries)}}}catch(error){if(error?.code!=="EACCES"&&error?.code!=="EPERM")throw error}return entries}async changeVisibility(path,vis){const fullPath=this.resolvePath(path),isDir=(await lstat(fullPath)).isDirectory();await chmod(fullPath,vis==="public"?isDir?493:420:isDir?448:384)}async visibility(path){const fullPath=this.resolvePath(path);return(await lstat(fullPath)).mode&511&4?"public":"private"}async fileExists(path){const fullPath=this.resolvePath(path);try{return(await lstat(fullPath)).isFile()}catch{return!1}}async directoryExists(path){const fullPath=this.resolvePath(path);try{return(await lstat(fullPath)).isDirectory()}catch{return!1}}async publicUrl(path,options={}){return publicUrlFor(path,{domain:options.domain,diskUrl:this.url})}async temporaryUrl(path,options){return await this.signedUrl(path,{expiresIn:options.expiresIn})}async signedUrl(path,options){const token=createSignedStorageToken(path,{...options,disk:options.disk??this.disk});return`${signedUrlBase(options.baseUrl)}/__storage/${encodeURIComponent(path)}?token=${token}`}async checksum(path,options={}){const algorithm=options.algorithm||"sha256",fullPath=this.resolvePath(path),content=await readFile(fullPath),hasher=new Bun.CryptoHasher(algorithm);hasher.update(content);return hasher.digest("hex")}async mimeType(path,options={}){const fullPath=this.resolvePath(path);return await this.detectMimeType(fullPath)}async detectMimeType(filePath){const ext=basename(filePath).split(".").pop()?.toLowerCase();return{txt:"text/plain",html:"text/html",css:"text/css",js:"application/javascript",json:"application/json",xml:"application/xml",pdf:"application/pdf",zip:"application/zip",jpg:"image/jpeg",jpeg:"image/jpeg",png:"image/png",gif:"image/gif",svg:"image/svg+xml",mp4:"video/mp4",mp3:"audio/mpeg",wav:"audio/wav"}[ext||""]||"application/octet-stream"}async lastModified(path){return(await this.stat(path)).lastModified}async fileSize(path){return(await this.stat(path)).size}}export function createLocalStorage(config={}){return new LocalStorageAdapter(config)}
@@ -1 +1 @@
1
- import{Buffer}from"node:buffer";import{mimeFromExtension}from"../mime-from-extension";import{createDirectoryListing,normalizeExpiryToDate}from"../types";export class InMemoryStorageAdapter{files;directories;constructor(){this.files=new Map;this.directories=new Set;this.directories.add("")}normalizePath(path){return path.replace(/^\/+/,"").replace(/\/+$/,"")}getDirectoryPath(path){const parts=path.split("/").filter(Boolean);parts.pop();return parts.join("/")}async contentsToUint8Array(contents){if(typeof contents==="string")return new TextEncoder().encode(contents);else if(contents instanceof Buffer)return new Uint8Array(contents);else if(contents instanceof Uint8Array)return contents;else{if(typeof contents.getReader!=="function")throw TypeError("[storage/memory] contents must be a web-standard ReadableStream (with .getReader()), not a Node stream.Readable. Convert via Readable.toWeb(nodeStream) before passing.");const reader=contents.getReader(),chunks=[];while(!0){const{done,value}=await reader.read();if(done)break;if(value)chunks.push(value)}const totalLength=chunks.reduce((sum,chunk)=>sum+chunk.length,0),result=new Uint8Array(totalLength);let offset=0;for(const chunk of chunks){result.set(chunk,offset);offset+=chunk.length}return result}}async write(path,contents){const normalized=this.normalizePath(path),dirPath=this.getDirectoryPath(normalized);if(dirPath)await this.createDirectory(dirPath);const data=await this.contentsToUint8Array(contents),lastModified=Date.now(),mimeType=this.detectMimeType(normalized);this.files.set(normalized,{contents:data,visibility:"private",mimeType,lastModified});return{path:normalized,size:data.length,contentType:mimeType,lastModified}}async read(path){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(!file)throw Error(`File not found: ${path}`);return file.contents}async getStream(path,_options){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(!file)throw Error(`File not found: ${path}`);const bytes=file.contents;return new ReadableStream({start(controller){controller.enqueue(bytes);controller.close()}})}async putStream(path,stream,options){const normalized=this.normalizePath(path),dirPath=this.getDirectoryPath(normalized);if(dirPath)await this.createDirectory(dirPath);const chunks=[],reader=stream.getReader(),abort=options?.signal;try{while(!0){if(abort?.aborted)throw Error("aborted");const{done,value}=await reader.read();if(done)break;if(value)chunks.push(value)}}finally{try{reader.releaseLock()}catch{}}const totalLength=chunks.reduce((sum,c)=>sum+c.length,0),data=new Uint8Array(totalLength);let offset=0;for(const c of chunks){data.set(c,offset);offset+=c.length}const lastModified=Date.now(),mimeType=options?.contentType??this.detectMimeType(normalized);this.files.set(normalized,{contents:data,visibility:"private",mimeType,lastModified});return{path:normalized,size:data.length,contentType:mimeType,lastModified}}async readToString(path){const data=await this.read(path);return new TextDecoder().decode(data)}async readToBuffer(path){const data=await this.read(path);return Buffer.from(data)}async readToUint8Array(path){return await this.read(path)}async deleteFile(path){this.files.delete(this.normalizePath(path))}async deleteDirectory(path){const normalized=this.normalizePath(path),prefix=normalized?`${normalized}/`:"";for(const filePath of this.files.keys())if(filePath===normalized||filePath.startsWith(prefix))this.files.delete(filePath);for(const dir of this.directories)if(dir===normalized||dir.startsWith(prefix))this.directories.delete(dir)}async createDirectory(path){const normalized=this.normalizePath(path);if(!normalized)return;const parts=normalized.split("/").filter(Boolean);let current="";for(const part of parts){current=current?`${current}/${part}`:part;this.directories.add(current)}}async moveFile(from,to){const normalizedFrom=this.normalizePath(from),normalizedTo=this.normalizePath(to),file=this.files.get(normalizedFrom);if(!file)throw Error(`File not found: ${from}`);const toDir=this.getDirectoryPath(normalizedTo);if(toDir)await this.createDirectory(toDir);this.files.set(normalizedTo,{...file,lastModified:Date.now()});this.files.delete(normalizedFrom)}async copyFile(from,to){const normalizedFrom=this.normalizePath(from),normalizedTo=this.normalizePath(to),file=this.files.get(normalizedFrom);if(!file)throw Error(`File not found: ${from}`);const toDir=this.getDirectoryPath(normalizedTo);if(toDir)await this.createDirectory(toDir);const contentsCopy=new Uint8Array(file.contents);this.files.set(normalizedTo,{...file,contents:contentsCopy,lastModified:Date.now()})}async stat(path){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(file)return{path:normalized,type:"file",visibility:file.visibility,size:file.contents.length,lastModified:file.lastModified,mimeType:file.mimeType};if(this.directories.has(normalized)||normalized==="")return{path:normalized,type:"directory",visibility:"private",size:0,lastModified:Date.now()};throw Error(`Path not found: ${path}`)}list(path,options={}){return this.createAsyncIterator(path,options.deep||!1)}async*createAsyncIterator(path,deep){const normalized=this.normalizePath(path),prefix=normalized?`${normalized}/`:"",entries=[],seen=new Set;for(const[filePath]of this.files)if(filePath.startsWith(prefix)||prefix===""){const relativePath=prefix?filePath.slice(prefix.length):filePath;if(!deep){if(relativePath.split("/").filter(Boolean).length===1)entries.push({path:filePath,type:"file"})}else entries.push({path:filePath,type:"file"})}for(const dir of this.directories)if((dir.startsWith(prefix)||prefix==="")&&dir!==normalized){const relativePath=prefix?dir.slice(prefix.length):dir;if(!deep){if(relativePath.split("/").filter(Boolean).length===1&&!seen.has(dir)){entries.push({path:dir,type:"directory"});seen.add(dir)}}else if(!seen.has(dir)){entries.push({path:dir,type:"directory"});seen.add(dir)}}yield*createDirectoryListing(entries)}async changeVisibility(path,visibility){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(!file)throw Error(`File not found: ${path}`);file.visibility=visibility}async visibility(path){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(!file)throw Error(`File not found: ${path}`);return file.visibility}async fileExists(path){const normalized=this.normalizePath(path);return this.files.has(normalized)}async directoryExists(path){const normalized=this.normalizePath(path);return this.directories.has(normalized)||normalized===""}async publicUrl(path,options={}){return`${(options.domain||process.env.APP_URL||"http://localhost").replace(/\/$/,"")}/${this.normalizePath(path)}`}async temporaryUrl(path,options){const expiry=normalizeExpiryToDate(options.expiresIn);return`http://localhost/temp/${Buffer.from(`${path}:${expiry.getTime()}`).toString("base64url")}`}async signedUrl(_path,_options){throw Error("[storage/memory] signedUrl is not supported on the in-memory adapter - switch to local or s3 disk for signed URL generation.")}async checksum(path,options={}){const algorithm=options.algorithm||"sha256",data=await this.readToUint8Array(path),hasher=new Bun.CryptoHasher(algorithm);hasher.update(data);return hasher.digest("hex")}async mimeType(path,_options={}){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(!file)throw Error(`File not found: ${path}`);return file.mimeType}detectMimeType(path){return mimeFromExtension(path)}async lastModified(path){return(await this.stat(path)).lastModified}async fileSize(path){return(await this.stat(path)).size}clear(){this.files.clear();this.directories.clear();this.directories.add("")}}export function createMemoryStorage(){return new InMemoryStorageAdapter}
1
+ import{Buffer}from"node:buffer";import{mimeFromExtension}from"../mime-from-extension";import{createDirectoryListing,normalizeExpiryToDate}from"../types";export class InMemoryStorageAdapter{files;directories;constructor(){this.files=new Map;this.directories=new Set;this.directories.add("")}normalizePath(path){return path.replace(/^\/+/,"").replace(/\/+$/,"")}getDirectoryPath(path){const parts=path.split("/").filter(Boolean);parts.pop();return parts.join("/")}async contentsToUint8Array(contents){if(typeof contents==="string")return new TextEncoder().encode(contents);else if(contents instanceof Buffer)return new Uint8Array(contents);else if(contents instanceof Uint8Array)return new Uint8Array(contents);else{if(typeof contents.getReader!=="function")throw TypeError("[storage/memory] contents must be a web-standard ReadableStream (with .getReader()), not a Node stream.Readable. Convert via Readable.toWeb(nodeStream) before passing.");const reader=contents.getReader(),chunks=[];while(!0){const{done,value}=await reader.read();if(done)break;if(value)chunks.push(value)}const totalLength=chunks.reduce((sum,chunk)=>sum+chunk.length,0),result=new Uint8Array(totalLength);let offset=0;for(const chunk of chunks){result.set(chunk,offset);offset+=chunk.length}return result}}async write(path,contents){const normalized=this.normalizePath(path),dirPath=this.getDirectoryPath(normalized);if(dirPath)await this.createDirectory(dirPath);const data=await this.contentsToUint8Array(contents),lastModified=Date.now(),mimeType=this.detectMimeType(normalized);this.files.set(normalized,{contents:data,visibility:"private",mimeType,lastModified});return{path:normalized,size:data.length,contentType:mimeType,lastModified}}async read(path){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(!file)throw Error(`File not found: ${path}`);return new Uint8Array(file.contents)}async getStream(path,_options){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(!file)throw Error(`File not found: ${path}`);const bytes=new Uint8Array(file.contents);return new ReadableStream({start(controller){controller.enqueue(bytes);controller.close()}})}async putStream(path,stream,options){const normalized=this.normalizePath(path),dirPath=this.getDirectoryPath(normalized);if(dirPath)await this.createDirectory(dirPath);const chunks=[],reader=stream.getReader(),abort=options?.signal;try{while(!0){if(abort?.aborted)throw Error("aborted");const{done,value}=await reader.read();if(done)break;if(value)chunks.push(value)}}finally{try{reader.releaseLock()}catch{}}const totalLength=chunks.reduce((sum,c)=>sum+c.length,0),data=new Uint8Array(totalLength);let offset=0;for(const c of chunks){data.set(c,offset);offset+=c.length}const lastModified=Date.now(),mimeType=options?.contentType??this.detectMimeType(normalized);this.files.set(normalized,{contents:data,visibility:"private",mimeType,lastModified});return{path:normalized,size:data.length,contentType:mimeType,lastModified}}async readToString(path){const data=await this.read(path);return new TextDecoder().decode(data)}async readToBuffer(path){const data=await this.read(path);return Buffer.from(data)}async readToUint8Array(path){return await this.read(path)}async deleteFile(path){this.files.delete(this.normalizePath(path))}async deleteDirectory(path){const normalized=this.normalizePath(path),prefix=normalized?`${normalized}/`:"";for(const filePath of this.files.keys())if(filePath===normalized||filePath.startsWith(prefix))this.files.delete(filePath);for(const dir of this.directories)if(dir===normalized||dir.startsWith(prefix))this.directories.delete(dir)}async createDirectory(path){const normalized=this.normalizePath(path);if(!normalized)return;const parts=normalized.split("/").filter(Boolean);let current="";for(const part of parts){current=current?`${current}/${part}`:part;this.directories.add(current)}}async moveFile(from,to){const normalizedFrom=this.normalizePath(from),normalizedTo=this.normalizePath(to),file=this.files.get(normalizedFrom);if(!file)throw Error(`File not found: ${from}`);const toDir=this.getDirectoryPath(normalizedTo);if(toDir)await this.createDirectory(toDir);this.files.set(normalizedTo,{...file,lastModified:Date.now()});this.files.delete(normalizedFrom)}async copyFile(from,to){const normalizedFrom=this.normalizePath(from),normalizedTo=this.normalizePath(to),file=this.files.get(normalizedFrom);if(!file)throw Error(`File not found: ${from}`);const toDir=this.getDirectoryPath(normalizedTo);if(toDir)await this.createDirectory(toDir);const contentsCopy=new Uint8Array(file.contents);this.files.set(normalizedTo,{...file,contents:contentsCopy,lastModified:Date.now()})}async stat(path){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(file)return{path:normalized,type:"file",visibility:file.visibility,size:file.contents.length,lastModified:file.lastModified,mimeType:file.mimeType};if(this.directories.has(normalized)||normalized==="")return{path:normalized,type:"directory",visibility:"private",size:0,lastModified:Date.now()};throw Error(`Path not found: ${path}`)}list(path,options={}){return this.createAsyncIterator(path,options.deep||!1)}async*createAsyncIterator(path,deep){const normalized=this.normalizePath(path),prefix=normalized?`${normalized}/`:"",entries=[],seen=new Set;for(const[filePath]of this.files)if(filePath.startsWith(prefix)||prefix===""){const relativePath=prefix?filePath.slice(prefix.length):filePath;if(!deep){if(relativePath.split("/").filter(Boolean).length===1)entries.push({path:filePath,type:"file"})}else entries.push({path:filePath,type:"file"})}for(const dir of this.directories)if((dir.startsWith(prefix)||prefix==="")&&dir!==normalized){const relativePath=prefix?dir.slice(prefix.length):dir;if(!deep){if(relativePath.split("/").filter(Boolean).length===1&&!seen.has(dir)){entries.push({path:dir,type:"directory"});seen.add(dir)}}else if(!seen.has(dir)){entries.push({path:dir,type:"directory"});seen.add(dir)}}yield*createDirectoryListing(entries)}async changeVisibility(path,visibility){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(!file)throw Error(`File not found: ${path}`);file.visibility=visibility}async visibility(path){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(!file)throw Error(`File not found: ${path}`);return file.visibility}async fileExists(path){const normalized=this.normalizePath(path);return this.files.has(normalized)}async directoryExists(path){const normalized=this.normalizePath(path);return this.directories.has(normalized)||normalized===""}async publicUrl(path,options={}){return`${(options.domain||process.env.APP_URL||"http://localhost").replace(/\/$/,"")}/${this.normalizePath(path)}`}async temporaryUrl(path,options){const expiry=normalizeExpiryToDate(options.expiresIn);return`http://localhost/temp/${Buffer.from(`${path}:${expiry.getTime()}`).toString("base64url")}`}async signedUrl(_path,_options){throw Error("[storage/memory] signedUrl is not supported on the in-memory adapter - switch to local or s3 disk for signed URL generation.")}async checksum(path,options={}){const algorithm=options.algorithm||"sha256",data=await this.readToUint8Array(path),hasher=new Bun.CryptoHasher(algorithm);hasher.update(data);return hasher.digest("hex")}async mimeType(path,_options={}){const normalized=this.normalizePath(path),file=this.files.get(normalized);if(!file)throw Error(`File not found: ${path}`);return file.mimeType}detectMimeType(path){return mimeFromExtension(path)}async lastModified(path){return(await this.stat(path)).lastModified}async fileSize(path){return(await this.stat(path)).size}clear(){this.files.clear();this.directories.clear();this.directories.add("")}}export function createMemoryStorage(){return new InMemoryStorageAdapter}
@@ -1 +1 @@
1
- import{Buffer}from"node:buffer";import{extensionForContentType,mimeFromExtension}from"../mime-from-extension";import{normalizeExpiryToMilliseconds}from"../types";import{sanitizePresignedDir,sanitizePresignedFilename}from"../path-sanitize";import{signS3PresignedPost}from"../s3-presigned-post";import process from"node:process";const S3_MIN_PART_SIZE=5242880,S3_MAX_PART_SIZE=5368709120;function clampPartSize(requested){if(!Number.isFinite(requested))return S3_MIN_PART_SIZE;return Math.max(S3_MIN_PART_SIZE,Math.min(Math.floor(requested),S3_MAX_PART_SIZE))}class ChunkBuffer{chunks=[];total=0;constructor(_partSize){}get length(){return this.total}push(c){this.chunks.push(c);this.total+=c.length}take(n){const out=new Uint8Array(n);let written=0;while(written<n&&this.chunks.length>0){const head=this.chunks[0],need=n-written;if(head.length<=need){out.set(head,written);written+=head.length;this.chunks.shift()}else{out.set(head.subarray(0,need),written);this.chunks[0]=head.subarray(need);written+=need}}this.total-=n;return out}flush(){const out=new Uint8Array(this.total);let off=0;for(const c of this.chunks){out.set(c,off);off+=c.length}this.chunks=[];this.total=0;return out}}async function isSettled(p){const sentinel=Symbol("pending");return await Promise.race([p.then(()=>"settled",()=>"settled"),Promise.resolve(sentinel)])!==sentinel}export function resolveS3ClientOptions(config){const options={};if(config.endpoint)options.endpoint=config.endpoint.replace(/^https:\/\//i,"").replace(/\/+$/,"");if(config.usePathStyleEndpoint)options.forcePathStyle=!0;if(config.credentials)options.credentials=config.credentials;return Object.keys(options).length>0?options:void 0}export class S3StorageAdapter{_client;_clientPromise=null;bucket;prefix;region;endpoint;usePathStyleEndpoint;publicBaseUrl;credentials;constructor(client,config){this._client=client;this.bucket=config.bucket||"";this.prefix=config.prefix||"";this.region=config.region||"us-east-1";this.credentials=config.credentials;this.endpoint=config.endpoint;this.usePathStyleEndpoint=config.usePathStyleEndpoint;this.publicBaseUrl=config.url?.replace(/\/+$/,"");if(!this.bucket)throw Error("S3 bucket name is required")}async getClient(){if(this._client)return this._client;if(!this._clientPromise)this._clientPromise=import("@stacksjs/ts-cloud").then((cloud)=>{this._client=new cloud.S3Client(this.region,void 0,resolveS3ClientOptions({endpoint:this.endpoint,usePathStyleEndpoint:this.usePathStyleEndpoint,credentials:this.credentials}));return this._client});return this._clientPromise}resolveCredentials(){if(this.credentials?.accessKeyId&&this.credentials.secretAccessKey)return this.credentials;const accessKeyId=process.env.AWS_ACCESS_KEY_ID,secretAccessKey=process.env.AWS_SECRET_ACCESS_KEY,sessionToken=process.env.AWS_SESSION_TOKEN;if(!accessKeyId||!secretAccessKey)throw Error("[storage/s3] presignedUploadPolicy requires AWS credentials - pass them via S3DiskConfig.credentials or set AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY.");return{accessKeyId,secretAccessKey,sessionToken}}prefixPath(path){if(!this.prefix)return path;return`${this.prefix}/${path}`.replace(/\/+/g,"/")}stripPrefix(path){if(!this.prefix)return path;const prefixWithSlash=`${this.prefix}/`;return path.startsWith(prefixWithSlash)?path.slice(prefixWithSlash.length):path}async contentsToBuffer(contents){if(typeof contents==="string")return Buffer.from(contents,"utf8");else if(contents instanceof Buffer)return contents;else if(contents instanceof Uint8Array)return Buffer.from(contents);else{if(typeof contents.getReader!=="function")throw TypeError("[storage/s3] contents must be a web-standard ReadableStream (with .getReader()), not a Node stream.Readable. Convert via Readable.toWeb(nodeStream) before passing.");const reader=contents.getReader(),chunks=[];while(!0){const{done,value}=await reader.read();if(done)break;if(value)chunks.push(value)}return Buffer.concat(chunks.map((c)=>Buffer.from(c)))}}async write(path,contents){const key=this.prefixPath(path),body=await this.contentsToBuffer(contents),contentType=this.detectMimeType(path);await(await this.getClient()).putObject({bucket:this.bucket,key,body,contentType});return{path,size:body.length,contentType,lastModified:Date.now()}}async read(path){const key=this.prefixPath(path),response=await(await this.getClient()).getObjectBytes(this.bucket,key);if(!response?.body)throw Error(`Failed to read file: ${path}`);return Buffer.from(response.body)}async getStream(path,_options){const key=this.prefixPath(path),buf=await(await this.getClient()).getObjectBuffer(this.bucket,key);if(!buf)throw Error(`Failed to read file: ${path}`);const bytes=new Uint8Array(buf);return new ReadableStream({start(controller){controller.enqueue(bytes);controller.close()}})}async putStream(path,stream,options){const key=this.prefixPath(path),contentType=options?.contentType??this.detectMimeType(path),partSize=clampPartSize(options?.partSize??5242880),concurrency=Math.max(1,Math.min(options?.concurrency??4,100)),maxRetries=Math.max(0,options?.maxRetries??3),signal=options?.signal,reader=stream.getReader();let firstChunk=null,firstDone=!1;{const buf=new ChunkBuffer(partSize);while(!firstDone&&buf.length<partSize){if(signal?.aborted){try{reader.releaseLock()}catch{}throw Error("aborted")}const{value,done}=await reader.read();if(done){firstDone=!0;break}if(value)buf.push(value)}firstChunk=buf.flush()}if(firstDone){try{reader.releaseLock()}catch{}await(await this.getClient()).putObject({bucket:this.bucket,key,body:Buffer.from(firstChunk),contentType});return{path,size:firstChunk.length,contentType,lastModified:Date.now()}}const{UploadId:uploadId}=await(await this.getClient()).createMultipartUpload(this.bucket,key,{contentType}),completedParts=[];let totalBytes=0,partNumber=1;const inflight=[],uploadOne=async(body,n)=>{let attempt=0;while(!0){if(signal?.aborted)throw Error("aborted");try{const{ETag}=await(await this.getClient()).uploadPart(this.bucket,key,uploadId,n,Buffer.from(body));completedParts.push({PartNumber:n,ETag});totalBytes+=body.length;return}catch(err){if(attempt>=maxRetries)throw err;attempt+=1}}};try{inflight.push(uploadOne(firstChunk,partNumber++));firstChunk=null;const buf=new ChunkBuffer(partSize);while(!0){if(signal?.aborted)throw Error("aborted");const{value,done}=await reader.read();if(done)break;if(value)buf.push(value);while(buf.length>=partSize){const part=buf.take(partSize);if(inflight.length>=concurrency){await Promise.race(inflight.map((p,i)=>p.then(()=>i)));for(let i=inflight.length-1;i>=0;i--)if(await isSettled(inflight[i]))inflight.splice(i,1)}inflight.push(uploadOne(part,partNumber++))}}try{reader.releaseLock()}catch{}const tail=buf.flush();if(tail.length>0)inflight.push(uploadOne(tail,partNumber++));await Promise.all(inflight);completedParts.sort((a,b)=>a.PartNumber-b.PartNumber);await(await this.getClient()).completeMultipartUpload(this.bucket,key,uploadId,completedParts);return{path,size:totalBytes,contentType,lastModified:Date.now()}}catch(err){try{await(await this.getClient()).abortMultipartUpload(this.bucket,key,uploadId)}catch{}throw err}}async readToString(path){const key=this.prefixPath(path),response=await(await this.getClient()).getObject(this.bucket,key);if(!response)throw Error(`Failed to read file: ${path}`);return response}async readToBuffer(path){return await this.read(path)}async readToUint8Array(path){const buffer=await this.readToBuffer(path);return new Uint8Array(buffer)}async deleteFile(path){const key=this.prefixPath(path);await(await this.getClient()).deleteObject(this.bucket,key)}async deleteDirectory(path){const prefix=this.prefixPath(path),normalizedPrefix=prefix.endsWith("/")?prefix:`${prefix}/`,keys=(await(await this.getClient()).listAllObjects({bucket:this.bucket,prefix:normalizedPrefix})).map((obj)=>obj.Key).filter((k)=>typeof k==="string");if(keys.length===0)return;await(await this.getClient()).deleteObjects(this.bucket,keys)}async createDirectory(_path){}async moveFile(from,to){await this.copyFile(from,to);await this.deleteFile(from)}async copyFile(from,to){const fromKey=this.prefixPath(from),toKey=this.prefixPath(to);await(await this.getClient()).copyObject({sourceBucket:this.bucket,sourceKey:fromKey,destinationBucket:this.bucket,destinationKey:toKey})}async stat(path){const key=this.prefixPath(path),result=await(await this.getClient()).headObject(this.bucket,key);if(!result)throw Error(`File not found: ${path}`);return{path,type:"file",visibility:"private",size:result.ContentLength||0,lastModified:result.LastModified?new Date(result.LastModified).getTime():Date.now(),mimeType:result.ContentType}}list(path,options={}){return this.createAsyncIterator(path,options.deep||!1)}async*createAsyncIterator(path,deep){const prefix=this.prefixPath(path),normalizedPrefix=prefix?`${prefix}/`:void 0;if(deep){const objects=await(await this.getClient()).listAllObjects({bucket:this.bucket,prefix:normalizedPrefix});for(const obj of objects)yield{path:this.stripPrefix(obj.Key),type:"file"}}else{let continuationToken;do{const result=await(await this.getClient()).listObjects({bucket:this.bucket,prefix:normalizedPrefix,delimiter:"/",continuationToken});for(const obj of result.objects||[]){if(obj.Key===normalizedPrefix)continue;yield{path:this.stripPrefix(obj.Key),type:"file"}}for(const folder of result.commonPrefixes||[])yield{path:this.stripPrefix(folder.replace(/\/$/,"")),type:"directory"};continuationToken=result.nextContinuationToken}while(continuationToken)}}async changeVisibility(path,vis){const key=this.prefixPath(path),acl=vis==="public"?"public-read":"private";await(await this.getClient()).putObjectAcl(this.bucket,key,acl)}async visibility(path){const key=this.prefixPath(path),grant=(await(await this.getClient()).getObjectAcl(this.bucket,key))?.AccessControlList?.Grant;return(grant===void 0?[]:Array.isArray(grant)?grant:[grant]).some((g)=>g.Grantee?.URI==="http://acs.amazonaws.com/groups/global/AllUsers"&&(g.Permission==="READ"||g.Permission==="FULL_CONTROL"))?"public":"private"}async fileExists(path){const key=this.prefixPath(path);try{return!!await(await this.getClient()).headObject(this.bucket,key)}catch(error){if(!error.message?.includes("404")&&!error.message?.includes("NoSuchKey")&&!error.message?.includes("NotFound"))console.debug(`[s3] Unexpected error checking file existence for ${path}: ${error.message}`);return!1}}async directoryExists(path){const prefix=this.prefixPath(path);return((await(await this.getClient()).listObjects({bucket:this.bucket,prefix:`${prefix}/`,maxKeys:1})).objects||[]).length>0}async publicUrl(path,options={}){const key=this.prefixPath(path),base=options.domain?.replace(/\/+$/,"")??this.publicBaseUrl;if(base)return`${base}/${key}`;if(this.endpoint)return`${this.endpointBaseUrl()}/${key}`;return`https://${this.bucket}.s3.${this.region}.amazonaws.com/${key}`}endpointBaseUrl(){const endpoint=this.endpoint.replace(/\/+$/,""),withScheme=/^https?:\/\//.test(endpoint)?endpoint:`https://${endpoint}`;if(this.usePathStyleEndpoint)return`${withScheme}/${this.bucket}`;const url=new URL(withScheme);url.hostname=`${this.bucket}.${url.hostname}`;return url.origin}async temporaryUrl(path,options){const key=this.prefixPath(path),expiresIn=Math.floor(normalizeExpiryToMilliseconds(options.expiresIn)/1000),MIN_EXPIRY=60,MAX_EXPIRY=604800;if(!Number.isFinite(expiresIn)||expiresIn<MIN_EXPIRY||expiresIn>MAX_EXPIRY)throw RangeError(`[storage/s3] temporaryUrl expiresIn must be between 60s and 7 days (got ${expiresIn}s)`);return await(await this.getClient()).getSignedUrl({bucket:this.bucket,key,expiresIn,operation:"getObject"})}async signedUrl(path,options){return this.temporaryUrl(path,{expiresIn:options.expiresIn})}async presignedUploadUrl(options){if(!options.contentType)throw Error("[storage/s3] presignedUploadUrl requires `contentType` - S3 signs against the exact header.");const expiresIn=Math.floor(options.expiresIn),MIN_EXPIRY=60,MAX_EXPIRY=604800;if(!Number.isFinite(expiresIn)||expiresIn<MIN_EXPIRY||expiresIn>MAX_EXPIRY)throw RangeError(`[storage/s3] presignedUploadUrl expiresIn must be between 60s and 7 days (got ${expiresIn}s)`);const safeDir=sanitizePresignedDir(options.dir),safeFilename=options.filename!==void 0?sanitizePresignedFilename(options.filename):`${crypto.randomUUID().replace(/-/g,"")}${this.extensionForContentType(options.contentType)}`,path=safeDir?`${safeDir}/${safeFilename}`:safeFilename,key=this.prefixPath(path);return{url:await(await this.getClient()).getSignedUrl({bucket:this.bucket,key,expiresIn,operation:"putObject"}),path,key,contentType:options.contentType,maxBytes:options.maxBytes}}async presignedUploadPolicy(options){const credentials=this.resolveCredentials(),scopedKey=typeof options.key==="string"?this.prefixPath(options.key):{startsWith:this.prefixPath(options.key.startsWith)};return signS3PresignedPost({bucket:this.bucket,region:this.region,credentials,key:scopedKey,contentType:options.contentType,contentLengthRange:options.contentLengthRange,acl:options.acl,expiresIn:options.expiresIn,fields:options.fields})}extensionForContentType(contentType){return extensionForContentType(contentType)}async checksum(path,options={}){const algorithm=options.algorithm||"sha256",content=await this.readToUint8Array(path),hasher=new Bun.CryptoHasher(algorithm);hasher.update(content);return hasher.digest("hex")}async mimeType(path,_options={}){return(await this.stat(path)).mimeType||this.detectMimeType(path)}detectMimeType(path){return mimeFromExtension(path)}async lastModified(path){return(await this.stat(path)).lastModified}async fileSize(path){return(await this.stat(path)).size}}export function createS3Storage(client,config){return new S3StorageAdapter(client,config)}
1
+ import{Buffer}from"node:buffer";import{extensionForContentType,mimeFromExtension}from"../mime-from-extension";import{normalizeExpiryToMilliseconds}from"../types";import{sanitizePresignedDir,sanitizePresignedFilename}from"../path-sanitize";import{signS3PresignedPost}from"../s3-presigned-post";import process from"node:process";const S3_MIN_PART_SIZE=5242880,S3_MAX_PART_SIZE=5368709120;function clampPartSize(requested){if(!Number.isFinite(requested))return S3_MIN_PART_SIZE;return Math.max(S3_MIN_PART_SIZE,Math.min(Math.floor(requested),S3_MAX_PART_SIZE))}class ChunkBuffer{chunks=[];total=0;constructor(_partSize){}get length(){return this.total}push(c){this.chunks.push(c);this.total+=c.length}take(n){const out=new Uint8Array(n);let written=0;while(written<n&&this.chunks.length>0){const head=this.chunks[0],need=n-written;if(head.length<=need){out.set(head,written);written+=head.length;this.chunks.shift()}else{out.set(head.subarray(0,need),written);this.chunks[0]=head.subarray(need);written+=need}}this.total-=n;return out}flush(){const out=new Uint8Array(this.total);let off=0;for(const c of this.chunks){out.set(c,off);off+=c.length}this.chunks=[];this.total=0;return out}}async function isSettled(p){const sentinel=Symbol("pending");return await Promise.race([p.then(()=>"settled",()=>"settled"),Promise.resolve(sentinel)])!==sentinel}export function resolveS3ClientOptions(config){const options={};if(config.endpoint)options.endpoint=config.endpoint.replace(/^https:\/\//i,"").replace(/\/+$/,"");if(config.usePathStyleEndpoint)options.forcePathStyle=!0;if(config.credentials)options.credentials=config.credentials;return Object.keys(options).length>0?options:void 0}export class S3StorageAdapter{_client;_clientPromise=null;bucket;prefix;region;endpoint;usePathStyleEndpoint;publicBaseUrl;credentials;constructor(client,config){this._client=client;this.bucket=config.bucket||"";this.prefix=config.prefix||"";this.region=config.region||"us-east-1";this.credentials=config.credentials;this.endpoint=config.endpoint;this.usePathStyleEndpoint=config.usePathStyleEndpoint;this.publicBaseUrl=config.url?.replace(/\/+$/,"");if(!this.bucket)throw Error("S3 bucket name is required")}async getClient(){if(this._client)return this._client;if(!this._clientPromise)this._clientPromise=import("@stacksjs/ts-cloud").then((cloud)=>{this._client=new cloud.S3Client(this.region,void 0,resolveS3ClientOptions({endpoint:this.endpoint,usePathStyleEndpoint:this.usePathStyleEndpoint,credentials:this.credentials}));return this._client});return this._clientPromise}resolveCredentials(){if(this.credentials?.accessKeyId&&this.credentials.secretAccessKey)return this.credentials;const accessKeyId=process.env.AWS_ACCESS_KEY_ID,secretAccessKey=process.env.AWS_SECRET_ACCESS_KEY,sessionToken=process.env.AWS_SESSION_TOKEN;if(!accessKeyId||!secretAccessKey)throw Error("[storage/s3] presignedUploadPolicy requires AWS credentials - pass them via S3DiskConfig.credentials or set AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY.");return{accessKeyId,secretAccessKey,sessionToken}}prefixPath(path){if(!this.prefix)return path;return`${this.prefix}/${path}`.replace(/\/+/g,"/")}stripPrefix(path){if(!this.prefix)return path;const prefixWithSlash=`${this.prefix}/`;return path.startsWith(prefixWithSlash)?path.slice(prefixWithSlash.length):path}async contentsToBuffer(contents){if(typeof contents==="string")return Buffer.from(contents,"utf8");else if(contents instanceof Buffer)return contents;else if(contents instanceof Uint8Array)return Buffer.from(contents);else{if(typeof contents.getReader!=="function")throw TypeError("[storage/s3] contents must be a web-standard ReadableStream (with .getReader()), not a Node stream.Readable. Convert via Readable.toWeb(nodeStream) before passing.");const reader=contents.getReader(),chunks=[];while(!0){const{done,value}=await reader.read();if(done)break;if(value)chunks.push(value)}return Buffer.concat(chunks.map((c)=>Buffer.from(c)))}}async write(path,contents){const key=this.prefixPath(path),body=await this.contentsToBuffer(contents),contentType=this.detectMimeType(path);await(await this.getClient()).putObject({bucket:this.bucket,key,body,contentType});return{path,size:body.length,contentType,lastModified:Date.now()}}async read(path){const key=this.prefixPath(path),response=await(await this.getClient()).getObjectBytes(this.bucket,key);if(!response?.body)throw Error(`Failed to read file: ${path}`);return Buffer.from(response.body)}async getStream(path,_options){const key=this.prefixPath(path),buf=await(await this.getClient()).getObjectBuffer(this.bucket,key);if(!buf)throw Error(`Failed to read file: ${path}`);const bytes=new Uint8Array(buf);return new ReadableStream({start(controller){controller.enqueue(bytes);controller.close()}})}async putStream(path,stream,options){const key=this.prefixPath(path),contentType=options?.contentType??this.detectMimeType(path),partSize=clampPartSize(options?.partSize??5242880),concurrency=Math.max(1,Math.min(options?.concurrency??4,100)),maxRetries=Math.max(0,options?.maxRetries??3),signal=options?.signal,reader=stream.getReader();let firstChunk=null,firstDone=!1;{const buf=new ChunkBuffer(partSize);while(!firstDone&&buf.length<partSize){if(signal?.aborted){try{reader.releaseLock()}catch{}throw Error("aborted")}const{value,done}=await reader.read();if(done){firstDone=!0;break}if(value)buf.push(value)}firstChunk=buf.flush()}if(firstDone){try{reader.releaseLock()}catch{}await(await this.getClient()).putObject({bucket:this.bucket,key,body:Buffer.from(firstChunk),contentType});return{path,size:firstChunk.length,contentType,lastModified:Date.now()}}const{UploadId:uploadId}=await(await this.getClient()).createMultipartUpload(this.bucket,key,{contentType}),completedParts=[];let totalBytes=0,partNumber=1;const inflight=[],uploadOne=async(body,n)=>{let attempt=0;while(!0){if(signal?.aborted)throw Error("aborted");try{const{ETag}=await(await this.getClient()).uploadPart(this.bucket,key,uploadId,n,Buffer.from(body));completedParts.push({PartNumber:n,ETag});totalBytes+=body.length;return}catch(err){if(attempt>=maxRetries)throw err;attempt+=1}}};try{inflight.push(uploadOne(firstChunk,partNumber++));firstChunk=null;const buf=new ChunkBuffer(partSize);while(!0){if(signal?.aborted)throw Error("aborted");const{value,done}=await reader.read();if(done)break;if(value)buf.push(value);while(buf.length>=partSize){const part=buf.take(partSize);if(inflight.length>=concurrency){await Promise.race(inflight.map((p,i)=>p.then(()=>i)));for(let i=inflight.length-1;i>=0;i--)if(await isSettled(inflight[i]))inflight.splice(i,1)}inflight.push(uploadOne(part,partNumber++))}}try{reader.releaseLock()}catch{}const tail=buf.flush();if(tail.length>0)inflight.push(uploadOne(tail,partNumber++));await Promise.all(inflight);completedParts.sort((a,b)=>a.PartNumber-b.PartNumber);await(await this.getClient()).completeMultipartUpload(this.bucket,key,uploadId,completedParts);return{path,size:totalBytes,contentType,lastModified:Date.now()}}catch(err){try{await(await this.getClient()).abortMultipartUpload(this.bucket,key,uploadId)}catch{}throw err}}async readToString(path){const key=this.prefixPath(path),response=await(await this.getClient()).getObject(this.bucket,key);if(!response)throw Error(`Failed to read file: ${path}`);return response}async readToBuffer(path){return await this.read(path)}async readToUint8Array(path){const buffer=await this.readToBuffer(path);return new Uint8Array(buffer)}async deleteFile(path){const key=this.prefixPath(path);await(await this.getClient()).deleteObject(this.bucket,key)}async deleteDirectory(path){const prefix=this.prefixPath(path).replace(/\/+$/,""),normalizedPrefix=prefix?`${prefix}/`:void 0,keys=(await(await this.getClient()).listAllObjects({bucket:this.bucket,prefix:normalizedPrefix})).map((obj)=>obj.Key).filter((k)=>typeof k==="string");if(keys.length===0)return;await(await this.getClient()).deleteObjects(this.bucket,keys)}async createDirectory(_path){}async moveFile(from,to){await this.copyFile(from,to);await this.deleteFile(from)}async copyFile(from,to){const fromKey=this.prefixPath(from),toKey=this.prefixPath(to);await(await this.getClient()).copyObject({sourceBucket:this.bucket,sourceKey:fromKey,destinationBucket:this.bucket,destinationKey:toKey})}async stat(path){const key=this.prefixPath(path),result=await(await this.getClient()).headObject(this.bucket,key);if(!result)throw Error(`File not found: ${path}`);return{path,type:"file",visibility:"private",size:result.ContentLength||0,lastModified:result.LastModified?new Date(result.LastModified).getTime():Date.now(),mimeType:result.ContentType}}list(path,options={}){return this.createAsyncIterator(path,options.deep||!1)}async*createAsyncIterator(path,deep){const prefix=this.prefixPath(path).replace(/\/+$/,""),normalizedPrefix=prefix?`${prefix}/`:void 0;if(deep){const objects=await(await this.getClient()).listAllObjects({bucket:this.bucket,prefix:normalizedPrefix});for(const obj of objects)yield{path:this.stripPrefix(obj.Key),type:"file"}}else{let continuationToken;do{const result=await(await this.getClient()).listObjects({bucket:this.bucket,prefix:normalizedPrefix,delimiter:"/",continuationToken});for(const obj of result.objects||[]){if(obj.Key===normalizedPrefix)continue;yield{path:this.stripPrefix(obj.Key),type:"file"}}for(const folder of result.commonPrefixes||[])yield{path:this.stripPrefix(folder.replace(/\/$/,"")),type:"directory"};continuationToken=result.nextContinuationToken}while(continuationToken)}}async changeVisibility(path,vis){const key=this.prefixPath(path),acl=vis==="public"?"public-read":"private";await(await this.getClient()).putObjectAcl(this.bucket,key,acl)}async visibility(path){const key=this.prefixPath(path),grant=(await(await this.getClient()).getObjectAcl(this.bucket,key))?.AccessControlList?.Grant;return(grant===void 0?[]:Array.isArray(grant)?grant:[grant]).some((g)=>g.Grantee?.URI==="http://acs.amazonaws.com/groups/global/AllUsers"&&(g.Permission==="READ"||g.Permission==="FULL_CONTROL"))?"public":"private"}async fileExists(path){const key=this.prefixPath(path);try{return!!await(await this.getClient()).headObject(this.bucket,key)}catch(error){if(!error.message?.includes("404")&&!error.message?.includes("NoSuchKey")&&!error.message?.includes("NotFound"))console.debug(`[s3] Unexpected error checking file existence for ${path}: ${error.message}`);return!1}}async directoryExists(path){const prefix=this.prefixPath(path);return((await(await this.getClient()).listObjects({bucket:this.bucket,prefix:`${prefix}/`,maxKeys:1})).objects||[]).length>0}async publicUrl(path,options={}){const key=this.prefixPath(path),base=options.domain?.replace(/\/+$/,"")??this.publicBaseUrl;if(base)return`${base}/${key}`;if(this.endpoint)return`${this.endpointBaseUrl()}/${key}`;return`https://${this.bucket}.s3.${this.region}.amazonaws.com/${key}`}endpointBaseUrl(){const endpoint=this.endpoint.replace(/\/+$/,""),withScheme=/^https?:\/\//.test(endpoint)?endpoint:`https://${endpoint}`;if(this.usePathStyleEndpoint)return`${withScheme}/${this.bucket}`;const url=new URL(withScheme);url.hostname=`${this.bucket}.${url.hostname}`;return url.origin}async temporaryUrl(path,options){const key=this.prefixPath(path),expiresIn=Math.floor(normalizeExpiryToMilliseconds(options.expiresIn)/1000),MIN_EXPIRY=60,MAX_EXPIRY=604800;if(!Number.isFinite(expiresIn)||expiresIn<MIN_EXPIRY||expiresIn>MAX_EXPIRY)throw RangeError(`[storage/s3] temporaryUrl expiresIn must be between 60s and 7 days (got ${expiresIn}s)`);return await(await this.getClient()).getSignedUrl({bucket:this.bucket,key,expiresIn,operation:"getObject"})}async signedUrl(path,options){return this.temporaryUrl(path,{expiresIn:options.expiresIn})}async presignedUploadUrl(options){if(!options.contentType)throw Error("[storage/s3] presignedUploadUrl requires `contentType` - S3 signs against the exact header.");const expiresIn=Math.floor(options.expiresIn),MIN_EXPIRY=60,MAX_EXPIRY=604800;if(!Number.isFinite(expiresIn)||expiresIn<MIN_EXPIRY||expiresIn>MAX_EXPIRY)throw RangeError(`[storage/s3] presignedUploadUrl expiresIn must be between 60s and 7 days (got ${expiresIn}s)`);const safeDir=sanitizePresignedDir(options.dir),safeFilename=options.filename!==void 0?sanitizePresignedFilename(options.filename):`${crypto.randomUUID().replace(/-/g,"")}${this.extensionForContentType(options.contentType)}`,path=safeDir?`${safeDir}/${safeFilename}`:safeFilename,key=this.prefixPath(path);return{url:await(await this.getClient()).getSignedUrl({bucket:this.bucket,key,expiresIn,operation:"putObject"}),path,key,contentType:options.contentType,maxBytes:options.maxBytes}}async presignedUploadPolicy(options){const credentials=this.resolveCredentials(),scopedKey=typeof options.key==="string"?this.prefixPath(options.key):{startsWith:this.prefixPath(options.key.startsWith)};return signS3PresignedPost({bucket:this.bucket,region:this.region,credentials,key:scopedKey,contentType:options.contentType,contentLengthRange:options.contentLengthRange,acl:options.acl,expiresIn:options.expiresIn,fields:options.fields})}extensionForContentType(contentType){return extensionForContentType(contentType)}async checksum(path,options={}){const algorithm=options.algorithm||"sha256",content=await this.readToUint8Array(path),hasher=new Bun.CryptoHasher(algorithm);hasher.update(content);return hasher.digest("hex")}async mimeType(path,_options={}){return(await this.stat(path)).mimeType||this.detectMimeType(path)}detectMimeType(path){return mimeFromExtension(path)}async lastModified(path){return(await this.stat(path)).lastModified}async fileSize(path){return(await this.stat(path)).size}}export function createS3Storage(client,config){return new S3StorageAdapter(client,config)}
@@ -1 +1 @@
1
- const DEFAULT_SCOPE_PATTERN=/^[a-z0-9_-]+$/i;export class ScopedStorageAdapter{inner;scope;scopeWithSlash;constructor(inner,options){const pattern=options.scopePattern??DEFAULT_SCOPE_PATTERN,cleaned=String(options.scope).replace(/^\/+|\/+$/g,"");if(!cleaned)throw Error("[storage/scoped] scope is required");if(!pattern.test(cleaned))throw Error(`[storage/scoped] scope '${cleaned}' contains disallowed characters`);if(cleaned.includes("..")||cleaned.includes("/"))throw Error(`[storage/scoped] scope '${cleaned}' cannot contain path separators or traversal`);this.inner=inner;this.scope=cleaned;this.scopeWithSlash=`${cleaned}/`}scopePath(path){if(typeof path!=="string")throw Error("[storage/scoped] path must be a string");if(path.length===0)return this.scope;if(path.includes("\x00"))throw Error("[storage/scoped] path contains a null byte");if(path.startsWith("/")||/^[A-Za-z]:[\\/]/.test(path))throw Error(`[storage/scoped] path '${path}' is absolute - refusing to escape scope`);if(path.split(/[/\\]/).some((s)=>s===".."))throw Error(`[storage/scoped] path '${path}' contains a '..' segment - refusing to escape scope`);return`${this.scope}/${path.replace(/^\/+/,"")}`}unscopePath(path){if(path===this.scope)return"";if(path.startsWith(this.scopeWithSlash))return path.slice(this.scopeWithSlash.length);return path}async write(path,contents){const result=await this.inner.write(this.scopePath(path),contents);return{...result,path:this.unscopePath(result.path)}}async read(path){return this.inner.read(this.scopePath(path))}async readToString(path){return this.inner.readToString(this.scopePath(path))}async readToBuffer(path){return this.inner.readToBuffer(this.scopePath(path))}async readToUint8Array(path){return this.inner.readToUint8Array(this.scopePath(path))}async deleteFile(path){return this.inner.deleteFile(this.scopePath(path))}async deleteDirectory(path){return this.inner.deleteDirectory(this.scopePath(path))}async createDirectory(path){return this.inner.createDirectory(this.scopePath(path))}async moveFile(from,to){return this.inner.moveFile(this.scopePath(from),this.scopePath(to))}async copyFile(from,to){return this.inner.copyFile(this.scopePath(from),this.scopePath(to))}async stat(path){const entry=await this.inner.stat(this.scopePath(path));return{...entry,path:this.unscopePath(entry.path)}}list(path,options){const inner=this.inner.list(this.scopePath(path),options),unscope=this.unscopePath.bind(this);return async function*(){for await(const entry of inner)yield{...entry,path:unscope(entry.path)}}()}async changeVisibility(path,visibility){return this.inner.changeVisibility(this.scopePath(path),visibility)}async visibility(path){return this.inner.visibility(this.scopePath(path))}async fileExists(path){return this.inner.fileExists(this.scopePath(path))}async directoryExists(path){return this.inner.directoryExists(this.scopePath(path))}async publicUrl(path,options){return this.inner.publicUrl(this.scopePath(path),options)}async temporaryUrl(path,options){return this.inner.temporaryUrl(this.scopePath(path),options)}async signedUrl(path,options){if(typeof this.inner.signedUrl!=="function")throw Error("[storage/scoped] wrapped adapter does not support signedUrl");return this.inner.signedUrl(this.scopePath(path),options)}async presignedUploadUrl(options){if(typeof this.inner.presignedUploadUrl!=="function")throw Error("[storage/scoped] wrapped adapter does not support presignedUploadUrl");const scopedDir=options.dir?`${this.scope}/${options.dir.replace(/^\/+/,"")}`:this.scope,result=await this.inner.presignedUploadUrl({...options,dir:scopedDir});return{...result,path:this.unscopePath(result.path),key:this.unscopePath(result.key)}}async presignedUploadPolicy(options){if(typeof this.inner.presignedUploadPolicy!=="function")throw Error("[storage/scoped] wrapped adapter does not support presignedUploadPolicy");const scopedKey=typeof options.key==="string"?this.scopePath(options.key):{startsWith:this.scopePath(options.key.startsWith)},result=await this.inner.presignedUploadPolicy({...options,key:scopedKey});return{...result,key:this.unscopePath(result.key)}}async getStream(path,options){if(typeof this.inner.getStream!=="function")throw Error("[storage/scoped] wrapped adapter does not support getStream");return this.inner.getStream(this.scopePath(path),options)}async putStream(path,stream,options){if(typeof this.inner.putStream!=="function")throw Error("[storage/scoped] wrapped adapter does not support putStream");const result=await this.inner.putStream(this.scopePath(path),stream,options);return{...result,path:this.unscopePath(result.path)}}async checksum(path,options){return this.inner.checksum(this.scopePath(path),options)}async mimeType(path,options){return this.inner.mimeType(this.scopePath(path),options)}async lastModified(path){return this.inner.lastModified(this.scopePath(path))}async fileSize(path){return this.inner.fileSize(this.scopePath(path))}}export function scoped(inner,options){return new ScopedStorageAdapter(inner,options)}
1
+ const DEFAULT_SCOPE_PATTERN=/^[a-z0-9_-]+$/i;export class ScopedStorageAdapter{inner;scope;scopeWithSlash;constructor(inner,options){const pattern=options.scopePattern??DEFAULT_SCOPE_PATTERN,cleaned=String(options.scope).replace(/^\/+|\/+$/g,"");if(!cleaned)throw Error("[storage/scoped] scope is required");if(!pattern.test(cleaned))throw Error(`[storage/scoped] scope '${cleaned}' contains disallowed characters`);if(cleaned.includes("..")||cleaned.includes("/"))throw Error(`[storage/scoped] scope '${cleaned}' cannot contain path separators or traversal`);this.inner=inner;this.scope=cleaned;this.scopeWithSlash=`${cleaned}/`}scopePath(path){if(typeof path!=="string")throw Error("[storage/scoped] path must be a string");if(path.length===0)return this.scope;if(path.includes("\x00"))throw Error("[storage/scoped] path contains a null byte");if(path.startsWith("/")||/^[A-Za-z]:[\\/]/.test(path))throw Error(`[storage/scoped] path '${path}' is absolute - refusing to escape scope`);if(path.split(/[/\\]/).some((s)=>s===".."))throw Error(`[storage/scoped] path '${path}' contains a '..' segment - refusing to escape scope`);return`${this.scope}/${path.replace(/^\/+/,"")}`}unscopePath(path){if(path===this.scope)return"";if(path.startsWith(this.scopeWithSlash))return path.slice(this.scopeWithSlash.length);return path}async write(path,contents){const result=await this.inner.write(this.scopePath(path),contents);return{...result,path:this.unscopePath(result.path)}}async read(path){return this.inner.read(this.scopePath(path))}async readToString(path){return this.inner.readToString(this.scopePath(path))}async readToBuffer(path){return this.inner.readToBuffer(this.scopePath(path))}async readToUint8Array(path){return this.inner.readToUint8Array(this.scopePath(path))}async deleteFile(path){return this.inner.deleteFile(this.scopePath(path))}async deleteDirectory(path){return this.inner.deleteDirectory(this.scopePath(path))}async createDirectory(path){return this.inner.createDirectory(this.scopePath(path))}async moveFile(from,to){return this.inner.moveFile(this.scopePath(from),this.scopePath(to))}async copyFile(from,to){return this.inner.copyFile(this.scopePath(from),this.scopePath(to))}async stat(path){const entry=await this.inner.stat(this.scopePath(path));return{...entry,path:this.unscopePath(entry.path)}}list(path,options){const inner=this.inner.list(this.scopePath(path),options),unscope=this.unscopePath.bind(this);return async function*(){for await(const entry of inner)yield{...entry,path:unscope(entry.path)}}()}async changeVisibility(path,visibility){return this.inner.changeVisibility(this.scopePath(path),visibility)}async visibility(path){return this.inner.visibility(this.scopePath(path))}async fileExists(path){return this.inner.fileExists(this.scopePath(path))}async directoryExists(path){return this.inner.directoryExists(this.scopePath(path))}async publicUrl(path,options){return this.inner.publicUrl(this.scopePath(path),options)}async temporaryUrl(path,options){return this.inner.temporaryUrl(this.scopePath(path),options)}async signedUrl(path,options){if(typeof this.inner.signedUrl!=="function")throw Error("[storage/scoped] wrapped adapter does not support signedUrl");return this.inner.signedUrl(this.scopePath(path),options)}async presignedUploadUrl(options){if(typeof this.inner.presignedUploadUrl!=="function")throw Error("[storage/scoped] wrapped adapter does not support presignedUploadUrl");const scopedDir=options.dir?`${this.scope}/${options.dir.replace(/^\/+/,"")}`:this.scope,result=await this.inner.presignedUploadUrl({...options,dir:scopedDir});return{...result,path:this.unscopePath(result.path),key:this.unscopePath(result.key)}}async presignedUploadPolicy(options){if(typeof this.inner.presignedUploadPolicy!=="function")throw Error("[storage/scoped] wrapped adapter does not support presignedUploadPolicy");const scopedKey=typeof options.key==="string"?this.scopePath(options.key):{startsWith:options.key.startsWith===""?this.scopeWithSlash:this.scopePath(options.key.startsWith)},result=await this.inner.presignedUploadPolicy({...options,key:scopedKey});return{...result,key:this.unscopePath(result.key)}}async getStream(path,options){if(typeof this.inner.getStream!=="function")throw Error("[storage/scoped] wrapped adapter does not support getStream");return this.inner.getStream(this.scopePath(path),options)}async putStream(path,stream,options){if(typeof this.inner.putStream!=="function")throw Error("[storage/scoped] wrapped adapter does not support putStream");const result=await this.inner.putStream(this.scopePath(path),stream,options);return{...result,path:this.unscopePath(result.path)}}async checksum(path,options){return this.inner.checksum(this.scopePath(path),options)}async mimeType(path,options){return this.inner.mimeType(this.scopePath(path),options)}async lastModified(path){return this.inner.lastModified(this.scopePath(path))}async fileSize(path){return this.inner.fileSize(this.scopePath(path))}}export function scoped(inner,options){return new ScopedStorageAdapter(inner,options)}
@@ -1,3 +1,10 @@
1
+ /**
2
+ * Resolve beneath the configured root without following descendant symlinks.
3
+ * The root (including its ancestor aliases) is trusted configuration. Its
4
+ * descendants must remain under application control during filesystem I/O;
5
+ * this check is not a sandbox against concurrent filesystem replacement.
6
+ */
7
+ export declare function resolveStoragePath(root: string, path: string): string;
1
8
  /**
2
9
  * Write `fullPath` through a temporary file beside it, renamed into place
3
10
  * once the write has finished.
@@ -1 +1 @@
1
- import{randomBytes}from"node:crypto";import{chmod,mkdir,rename,rm,stat}from"node:fs/promises";import{basename,dirname,join}from"node:path";import process from"node:process";export async function writeAtomically(fullPath,write){await mkdir(dirname(fullPath),{recursive:!0});const temporary=join(dirname(fullPath),`.${basename(fullPath)}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`);try{await write(temporary);const previous=await stat(fullPath).catch(()=>null);if(previous)await chmod(temporary,previous.mode&4095);await rename(temporary,fullPath)}catch(error){await rm(temporary,{force:!0}).catch(()=>{});throw error}}export function encodeStoragePath(path){return path.split("/").map((segment)=>encodeURIComponent(segment)).join("/")}export function publicUrlFor(path,options){return`${withScheme(options.domain??options.diskUrl??process.env.APP_URL??"http://localhost").replace(/\/+$/,"")}/${encodeStoragePath(path.replace(/^\/+/,""))}`}export function signedUrlBase(baseUrl){return withScheme(baseUrl||process.env.APP_URL||"http://localhost").replace(/\/+$/,"")}function withScheme(base){if(base===""||base.startsWith("/")||/^[a-z][a-z0-9+.-]*:\/\//i.test(base))return base;return`https://${base}`}
1
+ import{randomBytes}from"node:crypto";import{lstatSync}from"node:fs";import{chmod,mkdir,rename,rm,stat}from"node:fs/promises";import{basename,dirname,isAbsolute,join,relative,resolve,sep}from"node:path";import process from"node:process";export function resolveStoragePath(root,path){const base=resolve(root),target=join(base,path),rel=relative(base,target);if(rel===".."||rel.startsWith(`..${sep}`)||isAbsolute(rel))throw Error(`Path traversal detected: '${path}' resolves outside storage root`);let current=base;for(const segment of rel.split(sep).filter(Boolean)){current=join(current,segment);try{if(lstatSync(current).isSymbolicLink())throw Error(`Storage path '${path}' contains a symlink`)}catch(error){if(error.code==="ENOENT")break;throw error}}return target}export async function writeAtomically(fullPath,write){await mkdir(dirname(fullPath),{recursive:!0});const temporary=join(dirname(fullPath),`.${basename(fullPath)}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`);try{await write(temporary);const previous=await stat(fullPath).catch(()=>null);if(previous)await chmod(temporary,previous.mode&4095);await rename(temporary,fullPath)}catch(error){await rm(temporary,{force:!0}).catch(()=>{});throw error}}export function encodeStoragePath(path){return path.split("/").map((segment)=>encodeURIComponent(segment)).join("/")}export function publicUrlFor(path,options){return`${withScheme(options.domain??options.diskUrl??process.env.APP_URL??"http://localhost").replace(/\/+$/,"")}/${encodeStoragePath(path.replace(/^\/+/,""))}`}export function signedUrlBase(baseUrl){return withScheme(baseUrl||process.env.APP_URL||"http://localhost").replace(/\/+$/,"")}function withScheme(base){if(base===""||base.startsWith("/")||/^[a-z][a-z0-9+.-]*:\/\//i.test(base))return base;return`https://${base}`}
@@ -1 +1 @@
1
- import{Buffer}from"node:buffer";import{createHmac,timingSafeEqual}from"node:crypto";import process from"node:process";const ALG="HS256";function getAppKey(){const k=process.env.APP_KEY;if(!k||k.length<16){if(process.env.APP_ENV==="production"||process.env.NODE_ENV==="production")throw Error("[storage/signed-url] APP_KEY is missing or too short (need \u226516 chars). Cannot sign URL.")}return k||"stacks-default-key-dev-only-do-not-use-prod"}function base64UrlEncode(buf){return buf.toString("base64url")}function base64UrlDecode(str){return Buffer.from(str,"base64url")}function normalizeExpiry(expiresIn){if(expiresIn instanceof Date)return Math.floor(expiresIn.getTime()/1000);return Math.floor(Date.now()/1000)+Math.floor(expiresIn)}export function createSignedStorageToken(path,options){const exp=normalizeExpiry(options.expiresIn),iat=Math.floor(Date.now()/1000),header={alg:ALG,typ:"JWT"},payload={iss:options.issuer||"stacks",iat,exp,path,...options.disk?{disk:options.disk}:{}},headerPart=base64UrlEncode(Buffer.from(JSON.stringify(header))),payloadPart=base64UrlEncode(Buffer.from(JSON.stringify(payload))),signingInput=`${headerPart}.${payloadPart}`,sig=base64UrlEncode(createHmac("sha256",getAppKey()).update(signingInput).digest());return`${signingInput}.${sig}`}const REVOCATION_LIMIT=1e5,revokedSignatures=new Set;function rememberRevoked(sigPart){if(revokedSignatures.has(sigPart))return;if(revokedSignatures.size>=REVOCATION_LIMIT){const oldest=revokedSignatures.values().next().value;if(oldest!==void 0)revokedSignatures.delete(oldest)}revokedSignatures.add(sigPart)}export function revokeSignedStorageToken(token){if(typeof token!=="string"||token.length===0)return;const parts=token.split("."),sig=parts.length===3?parts[2]:token;if(sig)rememberRevoked(sig)}export function isSignedStorageTokenRevoked(sigPart){return revokedSignatures.has(sigPart)}export function clearRevokedSignedStorageTokens(){revokedSignatures.clear()}export function verifySignedStorageToken(token,requestedPath){if(typeof token!=="string")return{valid:!1,reason:"malformed"};const parts=token.split(".");if(parts.length!==3)return{valid:!1,reason:"malformed"};const headerPart=parts[0],payloadPart=parts[1],sigPart=parts[2],signingInput=`${headerPart}.${payloadPart}`,expectedSig=createHmac("sha256",getAppKey()).update(signingInput).digest();let providedSig;try{providedSig=base64UrlDecode(sigPart)}catch{return{valid:!1,reason:"malformed"}}if(providedSig.length!==expectedSig.length||!timingSafeEqual(providedSig,expectedSig))return{valid:!1,reason:"bad_signature"};if(revokedSignatures.has(sigPart))return{valid:!1,reason:"revoked"};let claims;try{claims=JSON.parse(base64UrlDecode(payloadPart).toString("utf8"))}catch{return{valid:!1,reason:"malformed"}}const now=Math.floor(Date.now()/1000);if(typeof claims.exp!=="number"||now>=claims.exp)return{valid:!1,reason:"expired"};if(claims.path!==requestedPath)return{valid:!1,reason:"path_mismatch"};return{valid:!0,claims}}
1
+ import{Buffer}from"node:buffer";import{createHmac,timingSafeEqual}from"node:crypto";import process from"node:process";const ALG="HS256";function getAppKey(){const k=process.env.APP_KEY;if(!k||k.length<16){if(process.env.APP_ENV==="production"||process.env.NODE_ENV==="production")throw Error("[storage/signed-url] APP_KEY is missing or too short (need \u226516 chars). Cannot sign URL.")}return k||"stacks-default-key-dev-only-do-not-use-prod"}function base64UrlEncode(buf){return buf.toString("base64url")}function base64UrlDecode(str){return Buffer.from(str,"base64url")}function normalizeExpiry(expiresIn){if(expiresIn instanceof Date)return Math.floor(expiresIn.getTime()/1000);return Math.floor(Date.now()/1000)+Math.floor(expiresIn)}export function createSignedStorageToken(path,options){const exp=normalizeExpiry(options.expiresIn),iat=Math.floor(Date.now()/1000),header={alg:ALG,typ:"JWT"},payload={iss:options.issuer||"stacks",iat,exp,path,...options.disk?{disk:options.disk}:{}},headerPart=base64UrlEncode(Buffer.from(JSON.stringify(header))),payloadPart=base64UrlEncode(Buffer.from(JSON.stringify(payload))),signingInput=`${headerPart}.${payloadPart}`,sig=base64UrlEncode(createHmac("sha256",getAppKey()).update(signingInput).digest());return`${signingInput}.${sig}`}const REVOCATION_LIMIT=1e5,revokedSignatures=new Map;function rememberRevoked(sigPart,expiresAt){if(revokedSignatures.has(sigPart))return;if(revokedSignatures.size>=REVOCATION_LIMIT){const now=Math.floor(Date.now()/1000);for(const[signature,expiry]of revokedSignatures)if(expiry!==void 0&&expiry<=now)revokedSignatures.delete(signature)}if(revokedSignatures.size>=REVOCATION_LIMIT)throw Error("[storage/signed-url] Revocation capacity reached. Rotate APP_KEY or use a durable revocation store.");revokedSignatures.set(sigPart,expiresAt)}export function revokeSignedStorageToken(token){if(typeof token!=="string"||token.length===0)return;const parts=token.split("."),sig=parts.length===3?parts[2]:token;if(!sig)return;let expiresAt;if(parts.length===3)try{const payload=JSON.parse(base64UrlDecode(parts[1]).toString("utf8"));if(typeof payload?.path==="string"){const verified=verifySignedStorageToken(token,payload.path);if(verified.valid&&Number.isFinite(verified.claims?.exp))expiresAt=verified.claims.exp}}catch{}rememberRevoked(base64UrlEncode(base64UrlDecode(sig)),expiresAt)}export function isSignedStorageTokenRevoked(sigPart){return revokedSignatures.has(base64UrlEncode(base64UrlDecode(sigPart)))}export function clearRevokedSignedStorageTokens(){revokedSignatures.clear()}export function verifySignedStorageToken(token,requestedPath){if(typeof token!=="string")return{valid:!1,reason:"malformed"};const parts=token.split(".");if(parts.length!==3)return{valid:!1,reason:"malformed"};const headerPart=parts[0],payloadPart=parts[1],sigPart=parts[2],signingInput=`${headerPart}.${payloadPart}`,expectedSig=createHmac("sha256",getAppKey()).update(signingInput).digest();let providedSig;try{providedSig=base64UrlDecode(sigPart)}catch{return{valid:!1,reason:"malformed"}}if(providedSig.length!==expectedSig.length||!timingSafeEqual(providedSig,expectedSig))return{valid:!1,reason:"bad_signature"};if(revokedSignatures.has(base64UrlEncode(providedSig)))return{valid:!1,reason:"revoked"};let claims;try{claims=JSON.parse(base64UrlDecode(payloadPart).toString("utf8"))}catch{return{valid:!1,reason:"malformed"}}const now=Math.floor(Date.now()/1000);if(typeof claims.exp!=="number"||now>=claims.exp)return{valid:!1,reason:"expired"};if(claims.path!==requestedPath)return{valid:!1,reason:"path_mismatch"};return{valid:!0,claims}}
@@ -1,7 +1,7 @@
1
1
  /**
2
2
  * Serve a static file with production-grade cache headers:
3
3
  * - Strong ETag (sha256, first 16 hex chars) computed once per
4
- * `(path, mtime)` and cached in-process.
4
+ * `(path, file version)` and cached in-process.
5
5
  * - `Last-Modified` from the file's mtime.
6
6
  * - 304 Not Modified on GET/HEAD when `If-None-Match` names the ETag
7
7
  * (or is `*`), or, only when no `If-None-Match` was sent, when
@@ -1 +1 @@
1
- import{createHash}from"node:crypto";import{extname}from"node:path";const etagCache=new Map,ETAG_CACHE_MAX=5000,FINGERPRINTED=/\.[a-f0-9]{8,}\./;export async function serveFile(req,filePath,options={}){const file=Bun.file(filePath);if(!await file.exists())return new Response("Not Found",{status:404});const stat=await file.stat(),mtimeMs=Math.floor(typeof stat.mtimeMs==="number"?stat.mtimeMs:stat.mtime?.getTime()??Date.now()),lastModified=new Date(mtimeMs).toUTCString(),contentType=options.contentType||file.type||guessMime(filePath);let etag;if(options.etag!==!1)etag=await computeEtag(filePath,mtimeMs,file);if(req.method==="GET"||req.method==="HEAD"){const headers=()=>buildHeaders({etag,lastModified,contentType,filePath,options,omitContentType:!0}),ifNoneMatch=req.headers.get("if-none-match");if(ifNoneMatch!==null){if(noneMatchHits(ifNoneMatch,etag))return new Response(null,{status:304,headers:headers()})}else{const ifModifiedSince=req.headers.get("if-modified-since"),sinceMs=ifModifiedSince?Date.parse(ifModifiedSince):Number.NaN;if(!Number.isNaN(sinceMs)&&Math.floor(mtimeMs/1000)*1000<=sinceMs)return new Response(null,{status:304,headers:headers()})}}return new Response(file,{status:200,headers:buildHeaders({etag,lastModified,contentType,filePath,options})})}function buildHeaders(input){const h=new Headers;if(!input.omitContentType)h.set("Content-Type",input.contentType);h.set("Last-Modified",input.lastModified);if(input.etag)h.set("ETag",`"${input.etag}"`);h.set("Cache-Control",input.options.cacheControl||pickCacheControl(input.filePath,input.options));h.set("Vary","Accept-Encoding");return h}function pickCacheControl(filePath,options){if(FINGERPRINTED.test(filePath))return"public, max-age=31536000, immutable";return`public, max-age=${options.defaultMaxAge??300}, must-revalidate`}async function computeEtag(filePath,mtimeMs,file){const cached=etagCache.get(filePath);if(cached&&cached.mtimeMs===mtimeMs)return cached.etag;const buf=await file.arrayBuffer(),etag=createHash("sha256").update(new Uint8Array(buf)).digest("hex").slice(0,16);if(etagCache.size>=ETAG_CACHE_MAX){const firstKey=etagCache.keys().next().value;if(firstKey!==void 0)etagCache.delete(firstKey)}etagCache.set(filePath,{mtimeMs,etag});return etag}function noneMatchHits(header,etag){const value=header.trim();if(value==="*")return!0;if(!etag)return!1;return value.split(",").some((entry)=>{let tag=entry.trim();if(tag.startsWith("W/"))tag=tag.slice(2);if(tag.startsWith('"')&&tag.endsWith('"'))tag=tag.slice(1,-1);return tag===etag})}function guessMime(filePath){switch(extname(filePath).toLowerCase()){case".js":case".mjs":case".cjs":return"application/javascript; charset=utf-8";case".css":return"text/css; charset=utf-8";case".html":case".htm":return"text/html; charset=utf-8";case".json":return"application/json; charset=utf-8";case".svg":return"image/svg+xml";case".webp":return"image/webp";case".png":return"image/png";case".jpg":case".jpeg":return"image/jpeg";case".gif":return"image/gif";case".ico":return"image/x-icon";case".woff":return"font/woff";case".woff2":return"font/woff2";case".ttf":return"font/ttf";case".txt":return"text/plain; charset=utf-8";case".wasm":return"application/wasm";case".map":return"application/json; charset=utf-8";default:return"application/octet-stream"}}
1
+ import{createHash}from"node:crypto";import{extname}from"node:path";const etagCache=new Map,ETAG_CACHE_MAX=5000,FINGERPRINTED=/\.[a-f0-9]{8,}\./;export async function serveFile(req,filePath,options={}){const file=Bun.file(filePath);if(!await file.exists())return new Response("Not Found",{status:404});const stat=await file.stat(),mtimeMs=Math.floor(typeof stat.mtimeMs==="number"?stat.mtimeMs:stat.mtime?.getTime()??Date.now()),lastModified=new Date(mtimeMs).toUTCString(),contentType=options.contentType||file.type||guessMime(filePath);let etag;if(options.etag!==!1){const version=[stat.dev,stat.ino,stat.size,stat.mtimeMs,stat.ctimeMs].join(":");etag=await computeEtag(filePath,version,file)}if(req.method==="GET"||req.method==="HEAD"){const headers=()=>buildHeaders({etag,lastModified,contentType,filePath,options,omitContentType:!0}),ifNoneMatch=req.headers.get("if-none-match");if(ifNoneMatch!==null){if(noneMatchHits(ifNoneMatch,etag))return new Response(null,{status:304,headers:headers()})}else{const ifModifiedSince=req.headers.get("if-modified-since"),sinceMs=ifModifiedSince?Date.parse(ifModifiedSince):Number.NaN;if(!Number.isNaN(sinceMs)&&Math.floor(mtimeMs/1000)*1000<=sinceMs)return new Response(null,{status:304,headers:headers()})}}return new Response(file,{status:200,headers:buildHeaders({etag,lastModified,contentType,filePath,options})})}function buildHeaders(input){const h=new Headers;if(!input.omitContentType)h.set("Content-Type",input.contentType);h.set("Last-Modified",input.lastModified);if(input.etag)h.set("ETag",`"${input.etag}"`);h.set("Cache-Control",input.options.cacheControl||pickCacheControl(input.filePath,input.options));h.set("Vary","Accept-Encoding");return h}function pickCacheControl(filePath,options){if(FINGERPRINTED.test(filePath))return"public, max-age=31536000, immutable";return`public, max-age=${options.defaultMaxAge??300}, must-revalidate`}async function computeEtag(filePath,version,file){const cached=etagCache.get(filePath);if(cached&&cached.version===version)return cached.etag;const buf=await file.arrayBuffer(),etag=createHash("sha256").update(new Uint8Array(buf)).digest("hex").slice(0,16);if(etagCache.size>=ETAG_CACHE_MAX){const firstKey=etagCache.keys().next().value;if(firstKey!==void 0)etagCache.delete(firstKey)}etagCache.set(filePath,{version,etag});return etag}function noneMatchHits(header,etag){const value=header.trim();if(value==="*")return!0;if(!etag)return!1;return value.split(",").some((entry)=>{let tag=entry.trim();if(tag.startsWith("W/"))tag=tag.slice(2);if(tag.startsWith('"')&&tag.endsWith('"'))tag=tag.slice(1,-1);return tag===etag})}function guessMime(filePath){switch(extname(filePath).toLowerCase()){case".js":case".mjs":case".cjs":return"application/javascript; charset=utf-8";case".css":return"text/css; charset=utf-8";case".html":case".htm":return"text/html; charset=utf-8";case".json":return"application/json; charset=utf-8";case".svg":return"image/svg+xml";case".webp":return"image/webp";case".png":return"image/png";case".jpg":case".jpeg":return"image/jpeg";case".gif":return"image/gif";case".ico":return"image/x-icon";case".woff":return"font/woff";case".woff2":return"font/woff2";case".ttf":return"font/ttf";case".txt":return"text/plain; charset=utf-8";case".wasm":return"application/wasm";case".map":return"application/json; charset=utf-8";default:return"application/octet-stream"}}
@@ -1 +1 @@
1
- import{basename,extname,join}from"node:path";export class UploadedFile{_file;_hashName=null;constructor(file){this._file=file}get name(){return this._file.name}get extension(){return extname(this._file.name).slice(1).toLowerCase()}get mimeType(){return this._file.type}get size(){return this._file.size}get file(){return this._file}hashName(extension){if(!this._hashName){const hash=crypto.randomUUID().replace(/-/g,"").slice(0,32),ext=extension||this.extension;this._hashName=ext?`${hash}.${ext}`:hash}return this._hashName}async arrayBuffer(){return this._file.arrayBuffer()}async bytes(){const buffer=await this._file.arrayBuffer();return new Uint8Array(buffer)}async text(){return this._file.text()}isValid(){return this._file.size>0}async store(path="",disk="local"){const filename=this.hashName(),fullPath=path?join(path,filename):filename,contents=await this.bytes(),{Storage}=await import("./facade");await Storage.disk(disk).write(fullPath,contents);return fullPath}async storeAs(path,name,disk="local"){if(name.includes("..")||name.includes("/")||name.includes("\\"))throw Error("Invalid filename: path traversal or directory separator detected");const sanitizedName=basename(name),fullPath=path?join(path,sanitizedName):sanitizedName,contents=await this.bytes(),{Storage}=await import("./facade");await Storage.disk(disk).write(fullPath,contents);return fullPath}async storePublicly(path=""){return this.store(path,"public")}async storePubliclyAs(path,name){return this.storeAs(path,name,"public")}async move(path,disk="local"){const contents=await this.bytes(),{Storage}=await import("./facade");await Storage.disk(disk).write(path,contents);return path}getClientOriginalName(){return basename(this._file.name,extname(this._file.name))}getClientOriginalExtension(){return this.extension}getClientMimeType(){return this._file.type}getSize(){const bytes=this._file.size;if(bytes<1024)return`${bytes} B`;if(bytes<1048576)return`${(bytes/1024).toFixed(2)} KB`;if(bytes<1073741824)return`${(bytes/1048576).toFixed(2)} MB`;return`${(bytes/1073741824).toFixed(2)} GB`}isOneOf(mimeTypes){return mimeTypes.some((type)=>{if(type.endsWith("/*")){const category=type.slice(0,-2);return this._file.type.startsWith(category)}return this._file.type===type})}isImage(){return this._file.type.startsWith("image/")}isVideo(){return this._file.type.startsWith("video/")}isAudio(){return this._file.type.startsWith("audio/")}isPdf(){return this._file.type==="application/pdf"}}export function uploadedFile(file){return new UploadedFile(file)}export function uploadedFiles(files){return files.map((f)=>new UploadedFile(f))}
1
+ import{basename,extname,join}from"node:path";export class UploadedFile{_file;_hashName=null;constructor(file){this._file=file}get name(){return this._file.name}get extension(){return extname(this._file.name).slice(1).toLowerCase()}get mimeType(){return this._file.type}get size(){return this._file.size}get file(){return this._file}hashName(extension){if(!this._hashName){const hash=crypto.randomUUID().replace(/-/g,"").slice(0,32),ext=extension||this.extension;this._hashName=ext?`${hash}.${ext}`:hash}return this._hashName}async arrayBuffer(){return this._file.arrayBuffer()}async bytes(){const buffer=await this._file.arrayBuffer();return new Uint8Array(buffer)}async text(){return this._file.text()}isValid(){return this._file.size>0}async store(path="",disk="local"){const filename=this.hashName(),fullPath=path?join(path,filename):filename,contents=await this.bytes(),{Storage}=await import("./facade");await Storage.disk(disk).write(fullPath,contents);return fullPath}async storeAs(path,name,disk="local"){if(name.includes("..")||name.includes("/")||name.includes("\\"))throw Error("Invalid filename: path traversal or directory separator detected");const sanitizedName=basename(name),fullPath=path?join(path,sanitizedName):sanitizedName,contents=await this.bytes(),{Storage}=await import("./facade");await Storage.disk(disk).write(fullPath,contents);return fullPath}async storePublicly(path=""){return this.store(path,"public")}async storePubliclyAs(path,name){return this.storeAs(path,name,"public")}async move(path,disk="local"){const contents=await this.bytes(),{Storage}=await import("./facade");await Storage.disk(disk).write(path,contents);return path}getClientOriginalName(){return basename(this._file.name,extname(this._file.name))}getClientOriginalExtension(){return this.extension}getClientMimeType(){return this._file.type}getSize(){const bytes=this._file.size;if(bytes<1024)return`${bytes} B`;if(bytes<1048576)return`${(bytes/1024).toFixed(2)} KB`;if(bytes<1073741824)return`${(bytes/1048576).toFixed(2)} MB`;return`${(bytes/1073741824).toFixed(2)} GB`}isOneOf(mimeTypes){return mimeTypes.some((type)=>{if(type.endsWith("/*")){const category=type.slice(0,-2);return this._file.type.startsWith(`${category}/`)}return this._file.type===type})}isImage(){return this._file.type.startsWith("image/")}isVideo(){return this._file.type.startsWith("video/")}isAudio(){return this._file.type.startsWith("audio/")}isPdf(){return this._file.type==="application/pdf"}}export function uploadedFile(file){return new UploadedFile(file)}export function uploadedFiles(files){return files.map((f)=>new UploadedFile(f))}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@stacksjs/storage",
3
3
  "type": "module",
4
4
  "sideEffects": false,
5
- "version": "0.75.408",
5
+ "version": "0.75.417",
6
6
  "description": "The Stacks file system.",
7
7
  "author": "Chris Breuer",
8
8
  "contributors": [
@@ -61,20 +61,20 @@
61
61
  "prepublishOnly": "bun run build"
62
62
  },
63
63
  "dependencies": {
64
- "@stacksjs/arrays": "0.75.408",
65
- "@stacksjs/cli": "0.75.408",
66
- "@stacksjs/config": "0.75.408",
67
- "@stacksjs/env": "0.75.408",
68
- "@stacksjs/error-handling": "0.75.408",
69
- "@stacksjs/logging": "0.75.408",
70
- "@stacksjs/path": "0.75.408",
71
- "@stacksjs/strings": "0.75.408",
64
+ "@stacksjs/arrays": "0.75.417",
65
+ "@stacksjs/cli": "0.75.417",
66
+ "@stacksjs/config": "0.75.417",
67
+ "@stacksjs/env": "0.75.417",
68
+ "@stacksjs/error-handling": "0.75.417",
69
+ "@stacksjs/logging": "0.75.417",
70
+ "@stacksjs/path": "0.75.417",
71
+ "@stacksjs/strings": "0.75.417",
72
72
  "@stacksjs/ts-cloud": "^0.16.91",
73
73
  "@stacksjs/ts-xml": "^0.1.0",
74
74
  "ts-images": "^0.2.23"
75
75
  },
76
76
  "devDependencies": {
77
- "@stacksjs/types": "0.75.408",
77
+ "@stacksjs/types": "0.75.417",
78
78
  "better-dx": "^0.2.24"
79
79
  }
80
80
  }