@payloadcms/storage-s3 4.0.0-internal.cd69eef → 4.0.0-internal.d1cc1d3

package/dist/adapter.js

@@ -11,16 +11,18 @@ export function createS3Adapter({ acl, bucket, clientUploads, config, getStorage
                     prefix: urlPrefix,
                     useCompositePrefixes
                 }),
-            uploadInstructions: clientUploads ? {
-                access: typeof clientUploads === 'object' ? clientUploads.access : undefined,
+            uploadInstructions: {
+                enabled: Boolean(clientUploads),
                 generate: generateUploadInstructions({
+                    access: typeof clientUploads === 'object' ? clientUploads.access : undefined,
                     acl,
                     bucket,
                     collectionPrefix: prefix,
                     getStorageClient,
                     useCompositePrefixes
-                })
-            } : undefined,
+                }),
+                useInAdmin: true
+            },
             // Helpers below dynamic-import their @aws-sdk dependencies so the SDK only
             // loads on the first request that actually needs it.
             handleDelete: async ({ doc: { prefix: docPrefix = '' }, filename })=>{
@@ -50,19 +52,19 @@ export function createS3Adapter({ acl, bucket, clientUploads, config, getStorage
                 });
                 return data;
             },
-            staticHandler: async (req, { headers, params: { directUpload, filename, prefix: prefixQueryParam } })=>{
+            staticHandler: async (req, { headers, params: { filename, prefix: prefixQueryParam, uploadReference } })=>{
                 const { getFile } = await import('./getFile.js');
                 return getFile({
                     bucket,
                     client: getStorageClient(),
                     collection,
                     collectionPrefix: prefix,
-                    directUpload,
                     filename,
                     incomingHeaders: headers,
                     prefixQueryParam,
                     req,
                     signedDownloads,
+                    uploadReference,
                     useCompositePrefixes
                 });
             }

package/dist/adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type { S3, S3ClientConfig } from '@aws-sdk/client-s3'\nimport type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport type { SignedDownloadsConfig } from './getFile.js'\n\nimport { generateUploadInstructions } from './generateUploadInstructions.js'\nimport { generateURL } from './generateURL.js'\n\ninterface CreateS3AdapterArgs {\n  acl?: 'private' | 'public-read'\n  bucket: string\n  clientUploads?: ClientUploadsConfig\n  config: S3ClientConfig\n  getStorageClient: () => S3\n  signedDownloads: SignedDownloadsConfig\n  useCompositePrefixes?: boolean\n}\n\nexport function createS3Adapter({\n  acl,\n  bucket,\n  clientUploads,\n  config,\n  getStorageClient,\n  signedDownloads,\n  useCompositePrefixes = false,\n}: CreateS3AdapterArgs): Adapter {\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 's3',\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        bucket,\n        collectionPrefix: prefix,\n        endpoint: config.endpoint,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    uploadInstructions: clientUploads\n      ? {\n          access: typeof clientUploads === 'object' ? clientUploads.access : undefined,\n          generate: generateUploadInstructions({\n            acl,\n            bucket,\n            collectionPrefix: prefix,\n            getStorageClient,\n            useCompositePrefixes,\n          }),\n        }\n      : undefined,\n\n    // Helpers below dynamic-import their @aws-sdk dependencies so the SDK only\n    // loads on the first request that actually needs it.\n    handleDelete: async ({ doc: { prefix: docPrefix = '' }, filename }) => {\n      const { deleteFile } = await import('./deleteFile.js')\n      return deleteFile({\n        bucket,\n        client: getStorageClient(),\n        collectionPrefix: prefix,\n        docPrefix,\n        filename,\n        useCompositePrefixes,\n      })\n    },\n\n    handleUpload: async ({ data, file }) => {\n      const { uploadFile } = await import('./uploadFile.js')\n      await uploadFile({\n        acl,\n        bucket,\n        buffer: file.buffer,\n        client: getStorageClient(),\n        collectionPrefix: prefix,\n        docPrefix: data.prefix,\n        filename: file.filename,\n        mimeType: file.mimeType,\n        tempFilePath: file.tempFilePath,\n        useCompositePrefixes,\n      })\n\n      return data\n    },\n\n    staticHandler: async (\n      req,\n      { headers, params: { directUpload, filename, prefix: prefixQueryParam } },\n    ) => {\n      const { getFile } = await import('./getFile.js')\n      return getFile({\n        bucket,\n        client: getStorageClient(),\n        collection,\n        collectionPrefix: prefix,\n        directUpload,\n        filename,\n        incomingHeaders: headers,\n        prefixQueryParam,\n        req,\n        signedDownloads,\n        useCompositePrefixes,\n      })\n    },\n  })\n}\n"],"names":["generateUploadInstructions","generateURL","createS3Adapter","acl","bucket","clientUploads","config","getStorageClient","signedDownloads","useCompositePrefixes","collection","prefix","name","filename","urlPrefix","collectionPrefix","endpoint","uploadInstructions","access","undefined","generate","handleDelete","doc","docPrefix","deleteFile","client","handleUpload","data","file","uploadFile","buffer","mimeType","tempFilePath","staticHandler","req","headers","params","directUpload","prefixQueryParam","getFile","incomingHeaders"],"mappings":"AASA,SAASA,0BAA0B,QAAQ,kCAAiC;AAC5E,SAASC,WAAW,QAAQ,mBAAkB;AAY9C,OAAO,SAASC,gBAAgB,EAC9BC,GAAG,EACHC,MAAM,EACNC,aAAa,EACbC,MAAM,EACNC,gBAAgB,EAChBC,eAAe,EACfC,uBAAuB,KAAK,EACR;IACpB,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YAENX,aAAa,CAAC,EAAEY,QAAQ,EAAEF,QAAQG,YAAY,EAAE,EAAE,GAChDb,YAAY;oBACVG;oBACAW,kBAAkBJ;oBAClBK,UAAUV,OAAOU,QAAQ;oBACzBH;oBACAF,QAAQG;oBACRL;gBACF;YAEFQ,oBAAoBZ,gBAChB;gBACEa,QAAQ,OAAOb,kBAAkB,WAAWA,cAAca,MAAM,GAAGC;gBACnEC,UAAUpB,2BAA2B;oBACnCG;oBACAC;oBACAW,kBAAkBJ;oBAClBJ;oBACAE;gBACF;YACF,IACAU;YAEJ,2EAA2E;YAC3E,qDAAqD;YACrDE,cAAc,OAAO,EAAEC,KAAK,EAAEX,QAAQY,YAAY,EAAE,EAAE,EAAEV,QAAQ,EAAE;gBAChE,MAAM,EAAEW,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;gBACpC,OAAOA,WAAW;oBAChBpB;oBACAqB,QAAQlB;oBACRQ,kBAAkBJ;oBAClBY;oBACAV;oBACAJ;gBACF;YACF;YAEAiB,cAAc,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE;gBACjC,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;gBACpC,MAAMA,WAAW;oBACf1B;oBACAC;oBACA0B,QAAQF,KAAKE,MAAM;oBACnBL,QAAQlB;oBACRQ,kBAAkBJ;oBAClBY,WAAWI,KAAKhB,MAAM;oBACtBE,UAAUe,KAAKf,QAAQ;oBACvBkB,UAAUH,KAAKG,QAAQ;oBACvBC,cAAcJ,KAAKI,YAAY;oBAC/BvB;gBACF;gBAEA,OAAOkB;YACT;YAEAM,eAAe,OACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,YAAY,EAAExB,QAAQ,EAAEF,QAAQ2B,gBAAgB,EAAE,EAAE;gBAEzE,MAAM,EAAEC,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC;gBACjC,OAAOA,QAAQ;oBACbnC;oBACAqB,QAAQlB;oBACRG;oBACAK,kBAAkBJ;oBAClB0B;oBACAxB;oBACA2B,iBAAiBL;oBACjBG;oBACAJ;oBACA1B;oBACAC;gBACF;YACF;QACF,CAAA;AACF"}
+{"version":3,"sources":["../src/adapter.ts"],"sourcesContent":["import type { S3, S3ClientConfig } from '@aws-sdk/client-s3'\nimport type {\n  Adapter,\n  ClientUploadsConfig,\n  GeneratedAdapter,\n} from '@payloadcms/plugin-cloud-storage/types'\n\nimport type { SignedDownloadsConfig } from './getFile.js'\n\nimport { generateUploadInstructions } from './generateUploadInstructions.js'\nimport { generateURL } from './generateURL.js'\n\ninterface CreateS3AdapterArgs {\n  acl?: 'private' | 'public-read'\n  bucket: string\n  clientUploads?: ClientUploadsConfig\n  config: S3ClientConfig\n  getStorageClient: () => S3\n  signedDownloads: SignedDownloadsConfig\n  useCompositePrefixes?: boolean\n}\n\nexport function createS3Adapter({\n  acl,\n  bucket,\n  clientUploads,\n  config,\n  getStorageClient,\n  signedDownloads,\n  useCompositePrefixes = false,\n}: CreateS3AdapterArgs): Adapter {\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 's3',\n\n    generateURL: ({ filename, prefix: urlPrefix = '' }) =>\n      generateURL({\n        bucket,\n        collectionPrefix: prefix,\n        endpoint: config.endpoint,\n        filename,\n        prefix: urlPrefix,\n        useCompositePrefixes,\n      }),\n\n    uploadInstructions: {\n      enabled: Boolean(clientUploads),\n      generate: generateUploadInstructions({\n        access: typeof clientUploads === 'object' ? clientUploads.access : undefined,\n        acl,\n        bucket,\n        collectionPrefix: prefix,\n        getStorageClient,\n        useCompositePrefixes,\n      }),\n      useInAdmin: true,\n    },\n\n    // Helpers below dynamic-import their @aws-sdk dependencies so the SDK only\n    // loads on the first request that actually needs it.\n    handleDelete: async ({ doc: { prefix: docPrefix = '' }, filename }) => {\n      const { deleteFile } = await import('./deleteFile.js')\n      return deleteFile({\n        bucket,\n        client: getStorageClient(),\n        collectionPrefix: prefix,\n        docPrefix,\n        filename,\n        useCompositePrefixes,\n      })\n    },\n\n    handleUpload: async ({ data, file }) => {\n      const { uploadFile } = await import('./uploadFile.js')\n      await uploadFile({\n        acl,\n        bucket,\n        buffer: file.buffer,\n        client: getStorageClient(),\n        collectionPrefix: prefix,\n        docPrefix: data.prefix,\n        filename: file.filename,\n        mimeType: file.mimeType,\n        tempFilePath: file.tempFilePath,\n        useCompositePrefixes,\n      })\n\n      return data\n    },\n\n    staticHandler: async (\n      req,\n      { headers, params: { filename, prefix: prefixQueryParam, uploadReference } },\n    ) => {\n      const { getFile } = await import('./getFile.js')\n      return getFile({\n        bucket,\n        client: getStorageClient(),\n        collection,\n        collectionPrefix: prefix,\n        filename,\n        incomingHeaders: headers,\n        prefixQueryParam,\n        req,\n        signedDownloads,\n        uploadReference,\n        useCompositePrefixes,\n      })\n    },\n  })\n}\n"],"names":["generateUploadInstructions","generateURL","createS3Adapter","acl","bucket","clientUploads","config","getStorageClient","signedDownloads","useCompositePrefixes","collection","prefix","name","filename","urlPrefix","collectionPrefix","endpoint","uploadInstructions","enabled","Boolean","generate","access","undefined","useInAdmin","handleDelete","doc","docPrefix","deleteFile","client","handleUpload","data","file","uploadFile","buffer","mimeType","tempFilePath","staticHandler","req","headers","params","prefixQueryParam","uploadReference","getFile","incomingHeaders"],"mappings":"AASA,SAASA,0BAA0B,QAAQ,kCAAiC;AAC5E,SAASC,WAAW,QAAQ,mBAAkB;AAY9C,OAAO,SAASC,gBAAgB,EAC9BC,GAAG,EACHC,MAAM,EACNC,aAAa,EACbC,MAAM,EACNC,gBAAgB,EAChBC,eAAe,EACfC,uBAAuB,KAAK,EACR;IACpB,OAAO,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YAENX,aAAa,CAAC,EAAEY,QAAQ,EAAEF,QAAQG,YAAY,EAAE,EAAE,GAChDb,YAAY;oBACVG;oBACAW,kBAAkBJ;oBAClBK,UAAUV,OAAOU,QAAQ;oBACzBH;oBACAF,QAAQG;oBACRL;gBACF;YAEFQ,oBAAoB;gBAClBC,SAASC,QAAQd;gBACjBe,UAAUpB,2BAA2B;oBACnCqB,QAAQ,OAAOhB,kBAAkB,WAAWA,cAAcgB,MAAM,GAAGC;oBACnEnB;oBACAC;oBACAW,kBAAkBJ;oBAClBJ;oBACAE;gBACF;gBACAc,YAAY;YACd;YAEA,2EAA2E;YAC3E,qDAAqD;YACrDC,cAAc,OAAO,EAAEC,KAAK,EAAEd,QAAQe,YAAY,EAAE,EAAE,EAAEb,QAAQ,EAAE;gBAChE,MAAM,EAAEc,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;gBACpC,OAAOA,WAAW;oBAChBvB;oBACAwB,QAAQrB;oBACRQ,kBAAkBJ;oBAClBe;oBACAb;oBACAJ;gBACF;YACF;YAEAoB,cAAc,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE;gBACjC,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;gBACpC,MAAMA,WAAW;oBACf7B;oBACAC;oBACA6B,QAAQF,KAAKE,MAAM;oBACnBL,QAAQrB;oBACRQ,kBAAkBJ;oBAClBe,WAAWI,KAAKnB,MAAM;oBACtBE,UAAUkB,KAAKlB,QAAQ;oBACvBqB,UAAUH,KAAKG,QAAQ;oBACvBC,cAAcJ,KAAKI,YAAY;oBAC/B1B;gBACF;gBAEA,OAAOqB;YACT;YAEAM,eAAe,OACbC,KACA,EAAEC,OAAO,EAAEC,QAAQ,EAAE1B,QAAQ,EAAEF,QAAQ6B,gBAAgB,EAAEC,eAAe,EAAE,EAAE;gBAE5E,MAAM,EAAEC,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC;gBACjC,OAAOA,QAAQ;oBACbtC;oBACAwB,QAAQrB;oBACRG;oBACAK,kBAAkBJ;oBAClBE;oBACA8B,iBAAiBL;oBACjBE;oBACAH;oBACA7B;oBACAiC;oBACAhC;gBACF;YACF;QACF,CAAA;AACF"}

package/dist/generateUploadInstructions.d.ts

@@ -1,12 +1,13 @@
 import type { S3 } from '@aws-sdk/client-s3';
-import type { GenerateUploadInstructions } from 'payload';
+import type { GenerateUploadInstructions, UploadInstructionsAccess } from 'payload';
 interface Args {
+    access?: UploadInstructionsAccess;
     acl?: 'private' | 'public-read';
     bucket: string;
     collectionPrefix: string;
     getStorageClient: () => S3;
     useCompositePrefixes?: boolean;
 }
-export declare const generateUploadInstructions: ({ acl, bucket, collectionPrefix, getStorageClient, useCompositePrefixes, }: Args) => GenerateUploadInstructions;
+export declare const generateUploadInstructions: ({ access, acl, bucket, collectionPrefix, getStorageClient, useCompositePrefixes, }: Args) => GenerateUploadInstructions;
 export {};
 //# sourceMappingURL=generateUploadInstructions.d.ts.map

package/dist/generateUploadInstructions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateUploadInstructions.d.ts","sourceRoot":"","sources":["../src/generateUploadInstructions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAA;AAMzD,UAAU,IAAI;IACZ,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,eAAO,MAAM,0BAA0B,+EAMpC,IAAI,KAAG,0BAyDT,CAAA"}
+{"version":3,"file":"generateUploadInstructions.d.ts","sourceRoot":"","sources":["../src/generateUploadInstructions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,KAAK,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAOnF,UAAU,IAAI;IACZ,MAAM,CAAC,EAAE,wBAAwB,CAAA;IACjC,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,eAAO,MAAM,0BAA0B,uFAOpC,IAAI,KAAG,0BAqET,CAAA"}

package/dist/generateUploadInstructions.js

@@ -1,8 +1,15 @@
 import { PutObjectCommand } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities';
-export const generateUploadInstructions = ({ acl, bucket, collectionPrefix, getStorageClient, useCompositePrefixes = false })=>{
-    return async ({ collectionSlug, docPrefix, filename, filesize, mimeType, req })=>{
+import { Forbidden } from 'payload';
+export const generateUploadInstructions = ({ access, acl, bucket, collectionPrefix, getStorageClient, useCompositePrefixes = false })=>{
+    return async ({ collectionSlug, docPrefix, filename, filesize, mimeType, overrideAccess, req })=>{
+        if (!overrideAccess && (access ? !await access({
+            collectionSlug,
+            req
+        }) : !req.user)) {
+            throw new Forbidden(req.t);
+        }
         let filesizeLimit = req.payload.config.upload.limits?.fileSize;
         if (filesizeLimit === Infinity) {
             filesizeLimit = undefined;
@@ -33,12 +40,12 @@ export const generateUploadInstructions = ({ acl, bucket, collectionPrefix, getS
         return {
             type: 'http',
             file: {
-                directUpload: {
-                    prefix: sanitizedDocPrefix
-                },
                 filename: sanitizedFilename,
                 mimeType,
-                size: filesize
+                size: filesize,
+                uploadReference: {
+                    prefix: sanitizedDocPrefix
+                }
             },
             request: {
                 headers: {

package/dist/generateUploadInstructions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateUploadInstructions.ts"],"sourcesContent":["import type { S3 } from '@aws-sdk/client-s3'\nimport type { GenerateUploadInstructions } from 'payload'\n\nimport { PutObjectCommand } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\n\ninterface Args {\n  acl?: 'private' | 'public-read'\n  bucket: string\n  collectionPrefix: string\n  getStorageClient: () => S3\n  useCompositePrefixes?: boolean\n}\n\nexport const generateUploadInstructions = ({\n  acl,\n  bucket,\n  collectionPrefix,\n  getStorageClient,\n  useCompositePrefixes = false,\n}: Args): GenerateUploadInstructions => {\n  return async ({ collectionSlug, docPrefix, filename, filesize, mimeType, req }) => {\n    let filesizeLimit = req.payload.config.upload.limits?.fileSize\n\n    if (filesizeLimit === Infinity) {\n      filesizeLimit = undefined\n    }\n\n    const { fileKey, sanitizedDocPrefix, sanitizedFilename } = await resolveSignedURLKey({\n      collectionPrefix,\n      collectionSlug,\n      docPrefix,\n      filename,\n      req,\n      useCompositePrefixes,\n    })\n\n    const signableHeaders = new Set<string>()\n\n    if (filesizeLimit) {\n      // Still force S3 to validate\n      signableHeaders.add('content-length')\n    }\n\n    const url = await getSignedUrl(\n      getStorageClient(),\n      new PutObjectCommand({\n        ACL: acl,\n        Bucket: bucket,\n        ContentLength: filesizeLimit ? Math.min(filesize, filesizeLimit) : undefined,\n        ContentType: mimeType,\n        Key: fileKey,\n      }),\n      {\n        expiresIn: 600,\n        signableHeaders,\n      },\n    )\n\n    return {\n      type: 'http',\n      file: {\n        directUpload: { prefix: sanitizedDocPrefix },\n        filename: sanitizedFilename,\n        mimeType,\n        size: filesize,\n      },\n      request: {\n        headers: {\n          'Content-Length': String(filesize),\n          'Content-Type': mimeType,\n        },\n        method: 'PUT',\n        url,\n      },\n    }\n  }\n}\n"],"names":["PutObjectCommand","getSignedUrl","resolveSignedURLKey","generateUploadInstructions","acl","bucket","collectionPrefix","getStorageClient","useCompositePrefixes","collectionSlug","docPrefix","filename","filesize","mimeType","req","filesizeLimit","payload","config","upload","limits","fileSize","Infinity","undefined","fileKey","sanitizedDocPrefix","sanitizedFilename","signableHeaders","Set","add","url","ACL","Bucket","ContentLength","Math","min","ContentType","Key","expiresIn","type","file","directUpload","prefix","size","request","headers","String","method"],"mappings":"AAGA,SAASA,gBAAgB,QAAQ,qBAAoB;AACrD,SAASC,YAAY,QAAQ,gCAA+B;AAC5D,SAASC,mBAAmB,QAAQ,6CAA4C;AAUhF,OAAO,MAAMC,6BAA6B,CAAC,EACzCC,GAAG,EACHC,MAAM,EACNC,gBAAgB,EAChBC,gBAAgB,EAChBC,uBAAuB,KAAK,EACvB;IACL,OAAO,OAAO,EAAEC,cAAc,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,GAAG,EAAE;QAC5E,IAAIC,gBAAgBD,IAAIE,OAAO,CAACC,MAAM,CAACC,MAAM,CAACC,MAAM,EAAEC;QAEtD,IAAIL,kBAAkBM,UAAU;YAC9BN,gBAAgBO;QAClB;QAEA,MAAM,EAAEC,OAAO,EAAEC,kBAAkB,EAAEC,iBAAiB,EAAE,GAAG,MAAMvB,oBAAoB;YACnFI;YACAG;YACAC;YACAC;YACAG;YACAN;QACF;QAEA,MAAMkB,kBAAkB,IAAIC;QAE5B,IAAIZ,eAAe;YACjB,6BAA6B;YAC7BW,gBAAgBE,GAAG,CAAC;QACtB;QAEA,MAAMC,MAAM,MAAM5B,aAChBM,oBACA,IAAIP,iBAAiB;YACnB8B,KAAK1B;YACL2B,QAAQ1B;YACR2B,eAAejB,gBAAgBkB,KAAKC,GAAG,CAACtB,UAAUG,iBAAiBO;YACnEa,aAAatB;YACbuB,KAAKb;QACP,IACA;YACEc,WAAW;YACXX;QACF;QAGF,OAAO;YACLY,MAAM;YACNC,MAAM;gBACJC,cAAc;oBAAEC,QAAQjB;gBAAmB;gBAC3Cb,UAAUc;gBACVZ;gBACA6B,MAAM9B;YACR;YACA+B,SAAS;gBACPC,SAAS;oBACP,kBAAkBC,OAAOjC;oBACzB,gBAAgBC;gBAClB;gBACAiC,QAAQ;gBACRjB;YACF;QACF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/generateUploadInstructions.ts"],"sourcesContent":["import type { S3 } from '@aws-sdk/client-s3'\nimport type { GenerateUploadInstructions, UploadInstructionsAccess } from 'payload'\n\nimport { PutObjectCommand } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { resolveSignedURLKey } from '@payloadcms/plugin-cloud-storage/utilities'\nimport { Forbidden } from 'payload'\n\ninterface Args {\n  access?: UploadInstructionsAccess\n  acl?: 'private' | 'public-read'\n  bucket: string\n  collectionPrefix: string\n  getStorageClient: () => S3\n  useCompositePrefixes?: boolean\n}\n\nexport const generateUploadInstructions = ({\n  access,\n  acl,\n  bucket,\n  collectionPrefix,\n  getStorageClient,\n  useCompositePrefixes = false,\n}: Args): GenerateUploadInstructions => {\n  return async ({\n    collectionSlug,\n    docPrefix,\n    filename,\n    filesize,\n    mimeType,\n    overrideAccess,\n    req,\n  }) => {\n    if (!overrideAccess && (access ? !(await access({ collectionSlug, req })) : !req.user)) {\n      throw new Forbidden(req.t)\n    }\n\n    let filesizeLimit = req.payload.config.upload.limits?.fileSize\n\n    if (filesizeLimit === Infinity) {\n      filesizeLimit = undefined\n    }\n\n    const { fileKey, sanitizedDocPrefix, sanitizedFilename } = await resolveSignedURLKey({\n      collectionPrefix,\n      collectionSlug,\n      docPrefix,\n      filename,\n      req,\n      useCompositePrefixes,\n    })\n\n    const signableHeaders = new Set<string>()\n\n    if (filesizeLimit) {\n      // Still force S3 to validate\n      signableHeaders.add('content-length')\n    }\n\n    const url = await getSignedUrl(\n      getStorageClient(),\n      new PutObjectCommand({\n        ACL: acl,\n        Bucket: bucket,\n        ContentLength: filesizeLimit ? Math.min(filesize, filesizeLimit) : undefined,\n        ContentType: mimeType,\n        Key: fileKey,\n      }),\n      {\n        expiresIn: 600,\n        signableHeaders,\n      },\n    )\n\n    return {\n      type: 'http',\n      file: {\n        filename: sanitizedFilename,\n        mimeType,\n        size: filesize,\n        uploadReference: { prefix: sanitizedDocPrefix },\n      },\n      request: {\n        headers: {\n          'Content-Length': String(filesize),\n          'Content-Type': mimeType,\n        },\n        method: 'PUT',\n        url,\n      },\n    }\n  }\n}\n"],"names":["PutObjectCommand","getSignedUrl","resolveSignedURLKey","Forbidden","generateUploadInstructions","access","acl","bucket","collectionPrefix","getStorageClient","useCompositePrefixes","collectionSlug","docPrefix","filename","filesize","mimeType","overrideAccess","req","user","t","filesizeLimit","payload","config","upload","limits","fileSize","Infinity","undefined","fileKey","sanitizedDocPrefix","sanitizedFilename","signableHeaders","Set","add","url","ACL","Bucket","ContentLength","Math","min","ContentType","Key","expiresIn","type","file","size","uploadReference","prefix","request","headers","String","method"],"mappings":"AAGA,SAASA,gBAAgB,QAAQ,qBAAoB;AACrD,SAASC,YAAY,QAAQ,gCAA+B;AAC5D,SAASC,mBAAmB,QAAQ,6CAA4C;AAChF,SAASC,SAAS,QAAQ,UAAS;AAWnC,OAAO,MAAMC,6BAA6B,CAAC,EACzCC,MAAM,EACNC,GAAG,EACHC,MAAM,EACNC,gBAAgB,EAChBC,gBAAgB,EAChBC,uBAAuB,KAAK,EACvB;IACL,OAAO,OAAO,EACZC,cAAc,EACdC,SAAS,EACTC,QAAQ,EACRC,QAAQ,EACRC,QAAQ,EACRC,cAAc,EACdC,GAAG,EACJ;QACC,IAAI,CAACD,kBAAmBX,CAAAA,SAAS,CAAE,MAAMA,OAAO;YAAEM;YAAgBM;QAAI,KAAM,CAACA,IAAIC,IAAI,AAAD,GAAI;YACtF,MAAM,IAAIf,UAAUc,IAAIE,CAAC;QAC3B;QAEA,IAAIC,gBAAgBH,IAAII,OAAO,CAACC,MAAM,CAACC,MAAM,CAACC,MAAM,EAAEC;QAEtD,IAAIL,kBAAkBM,UAAU;YAC9BN,gBAAgBO;QAClB;QAEA,MAAM,EAAEC,OAAO,EAAEC,kBAAkB,EAAEC,iBAAiB,EAAE,GAAG,MAAM5B,oBAAoB;YACnFM;YACAG;YACAC;YACAC;YACAI;YACAP;QACF;QAEA,MAAMqB,kBAAkB,IAAIC;QAE5B,IAAIZ,eAAe;YACjB,6BAA6B;YAC7BW,gBAAgBE,GAAG,CAAC;QACtB;QAEA,MAAMC,MAAM,MAAMjC,aAChBQ,oBACA,IAAIT,iBAAiB;YACnBmC,KAAK7B;YACL8B,QAAQ7B;YACR8B,eAAejB,gBAAgBkB,KAAKC,GAAG,CAACzB,UAAUM,iBAAiBO;YACnEa,aAAazB;YACb0B,KAAKb;QACP,IACA;YACEc,WAAW;YACXX;QACF;QAGF,OAAO;YACLY,MAAM;YACNC,MAAM;gBACJ/B,UAAUiB;gBACVf;gBACA8B,MAAM/B;gBACNgC,iBAAiB;oBAAEC,QAAQlB;gBAAmB;YAChD;YACAmB,SAAS;gBACPC,SAAS;oBACP,kBAAkBC,OAAOpC;oBACzB,gBAAgBC;gBAClB;gBACAoC,QAAQ;gBACRjB;YACF;QACF;IACF;AACF,EAAC"}

package/dist/getFile.d.ts

@@ -14,14 +14,14 @@ interface GetFileArgs {
     client: AWS.S3;
     collection: CollectionConfig;
     collectionPrefix?: string;
-    directUpload?: unknown;
     filename: string;
     incomingHeaders?: Headers;
     prefixQueryParam?: string;
     req: PayloadRequest;
     signedDownloads: SignedDownloadsConfig;
+    uploadReference?: unknown;
     useCompositePrefixes?: boolean;
 }
-export declare function getFile({ bucket, client, collection, collectionPrefix, directUpload, filename, incomingHeaders, prefixQueryParam, req, signedDownloads, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
+export declare function getFile({ bucket, client, collection, collectionPrefix, filename, incomingHeaders, prefixQueryParam, req, signedDownloads, uploadReference, useCompositePrefixes, }: GetFileArgs): Promise<Response>;
 export {};
 //# sourceMappingURL=getFile.d.ts.map

package/dist/getFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAW/D,MAAM,MAAM,qBAAqB,GAC7B;IACE,oBAAoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kBAAkB,CAAC,CAAC,IAAI,EAAE;QACxB,UAAU,EAAE,gBAAgB,CAAA;QAC5B,QAAQ,EAAE,MAAM,CAAA;QAChB,GAAG,EAAE,cAAc,CAAA;KACpB,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC/B,GACD,OAAO,CAAA;AAEX,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,GAAG,CAAC,EAAE,CAAA;IACd,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,eAAe,EAAE,qBAAqB,CAAA;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AA8BD,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,MAAM,EACN,UAAU,EACV,gBAAqB,EACrB,YAAY,EACZ,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,eAAe,EACf,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA8JjC"}
+{"version":3,"file":"getFile.d.ts","sourceRoot":"","sources":["../src/getFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAW/D,MAAM,MAAM,qBAAqB,GAC7B;IACE,oBAAoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kBAAkB,CAAC,CAAC,IAAI,EAAE;QACxB,UAAU,EAAE,gBAAgB,CAAA;QAC5B,QAAQ,EAAE,MAAM,CAAA;QAChB,GAAG,EAAE,cAAc,CAAA;KACpB,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC/B,GACD,OAAO,CAAA;AAEX,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,GAAG,CAAC,EAAE,CAAA;IACd,UAAU,EAAE,gBAAgB,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,eAAe,EAAE,qBAAqB,CAAA;IACtC,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AA8BD,wBAAsB,OAAO,CAAC,EAC5B,MAAM,EACN,MAAM,EACN,UAAU,EACV,gBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,eAAe,EACf,eAAe,EACf,oBAA4B,GAC7B,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CA8JjC"}

package/dist/getFile.js

@@ -14,7 +14,7 @@ const abortRequestAndDestroyStream = ({ abortController, object })=>{
         object.Body.destroy();
     }
 };
-export async function getFile({ bucket, client, collection, collectionPrefix = '', directUpload, filename, incomingHeaders, prefixQueryParam, req, signedDownloads, useCompositePrefixes = false }) {
+export async function getFile({ bucket, client, collection, collectionPrefix = '', filename, incomingHeaders, prefixQueryParam, req, signedDownloads, uploadReference, useCompositePrefixes = false }) {
     let object = undefined;
     let streamed = false;
     const abortController = new AbortController();
@@ -29,10 +29,10 @@ export async function getFile({ bucket, client, collection, collectionPrefix = '
     try {
         const docPrefix = await getDocPrefix({
             collection,
-            directUpload,
             filename,
             prefixQueryParam,
-            req
+            req,
+            uploadReference
         });
         const { fileKey: key } = getFileKey({
             collectionPrefix,
@@ -40,7 +40,7 @@ export async function getFile({ bucket, client, collection, collectionPrefix = '
             filename,
             useCompositePrefixes
         });
-        if (signedDownloads && !directUpload) {
+        if (signedDownloads && !uploadReference) {
             let useSignedURL = true;
             if (typeof signedDownloads === 'object' && typeof signedDownloads.shouldUseSignedURL === 'function') {
                 useSignedURL = await signedDownloads.shouldUseSignedURL({

package/dist/getFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\nimport type { CollectionConfig, PayloadRequest } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { GetObjectCommand } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport {\n  getFilePrefix as getDocPrefix,\n  getFileKey,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { getRangeRequestInfo } from 'payload/internal'\n\nexport type SignedDownloadsConfig =\n  | {\n      /** @default 7200 */\n      expiresIn?: number\n      shouldUseSignedURL?(args: {\n        collection: CollectionConfig\n        filename: string\n        req: PayloadRequest\n      }): boolean | Promise<boolean>\n    }\n  | boolean\n\ninterface GetFileArgs {\n  bucket: string\n  client: AWS.S3\n  collection: CollectionConfig\n  collectionPrefix?: string\n  directUpload?: unknown\n  filename: string\n  incomingHeaders?: Headers\n  prefixQueryParam?: string\n  req: PayloadRequest\n  signedDownloads: SignedDownloadsConfig\n  useCompositePrefixes?: boolean\n}\n\nconst isNodeReadableStream = (body: AWS.GetObjectOutput['Body']): body is Readable => {\n  return (\n    typeof body === 'object' &&\n    body !== null &&\n    'pipe' in body &&\n    typeof body.pipe === 'function' &&\n    'destroy' in body &&\n    typeof body.destroy === 'function'\n  )\n}\n\nconst abortRequestAndDestroyStream = ({\n  abortController,\n  object,\n}: {\n  abortController: AbortController\n  object?: AWS.GetObjectOutput\n}) => {\n  try {\n    abortController.abort()\n  } catch {\n    /* noop */\n  }\n  if (object?.Body && isNodeReadableStream(object.Body)) {\n    object.Body.destroy()\n  }\n}\n\nexport async function getFile({\n  bucket,\n  client,\n  collection,\n  collectionPrefix = '',\n  directUpload,\n  filename,\n  incomingHeaders,\n  prefixQueryParam,\n  req,\n  signedDownloads,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  let object: AWS.GetObjectOutput | undefined = undefined\n  let streamed = false\n\n  const abortController = new AbortController()\n  if (req.signal) {\n    req.signal.addEventListener('abort', () => {\n      abortRequestAndDestroyStream({ abortController, object })\n    })\n  }\n\n  try {\n    const docPrefix = await getDocPrefix({\n      collection,\n      directUpload,\n      filename,\n      prefixQueryParam,\n      req,\n    })\n\n    const { fileKey: key } = getFileKey({\n      collectionPrefix,\n      docPrefix,\n      filename,\n      useCompositePrefixes,\n    })\n\n    if (signedDownloads && !directUpload) {\n      let useSignedURL = true\n      if (\n        typeof signedDownloads === 'object' &&\n        typeof signedDownloads.shouldUseSignedURL === 'function'\n      ) {\n        useSignedURL = await signedDownloads.shouldUseSignedURL({ collection, filename, req })\n      }\n\n      if (useSignedURL) {\n        const command = new GetObjectCommand({ Bucket: bucket, Key: key })\n        const signedUrl = await getSignedUrl(\n          client,\n          command,\n          typeof signedDownloads === 'object' ? signedDownloads : { expiresIn: 7200 },\n        )\n        return Response.redirect(signedUrl, 302)\n      }\n    }\n\n    // Get file size first for range validation and to set Content-Length header before streaming\n    const headObject = await client.headObject({\n      Bucket: bucket,\n      Key: key,\n    })\n    const fileSize = headObject.ContentLength\n\n    if (!fileSize) {\n      return new Response('Internal Server Error', { status: 500 })\n    }\n\n    // Handle range request\n    const rangeHeader = req.headers.get('range')\n    const rangeResult = getRangeRequestInfo({ fileSize, rangeHeader })\n\n    if (rangeResult.type === 'invalid') {\n      return new Response(null, {\n        headers: new Headers(rangeResult.headers),\n        status: rangeResult.status,\n      })\n    }\n\n    const rangeForS3 =\n      rangeResult.type === 'partial'\n        ? `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`\n        : undefined\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [headerKey, value] of Object.entries(rangeResult.headers)) {\n      headers.append(headerKey, value)\n    }\n\n    headers.append('Content-Type', String(headObject.ContentType))\n    if (headObject.ETag) {\n      headers.append('ETag', headObject.ETag)\n    }\n\n    // Add Content-Security-Policy header for SVG files to prevent executable code\n    if (headObject.ContentType === 'image/svg+xml') {\n      headers.append('Content-Security-Policy', \"script-src 'none'\")\n    }\n\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n    const objectEtag = headObject.ETag\n\n    if (\n      collection.upload &&\n      typeof collection.upload === 'object' &&\n      typeof collection.upload.modifyResponseHeaders === 'function'\n    ) {\n      headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n    }\n\n    if (etagFromHeaders && etagFromHeaders === objectEtag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    object = await client.getObject(\n      {\n        Bucket: bucket,\n        Key: key,\n        Range: rangeForS3,\n      },\n      { abortSignal: abortController.signal },\n    )\n\n    if (!object.Body) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n\n    if (!isNodeReadableStream(object.Body)) {\n      req.payload.logger.error({\n        key,\n        msg: 'S3 object body is not a readable stream',\n      })\n      return new Response('Internal Server Error', { status: 500 })\n    }\n\n    const stream = object.Body\n    stream.on('error', (err: Error) => {\n      req.payload.logger.error({\n        err,\n        key,\n        msg: 'Error while streaming S3 object (aborting)',\n      })\n      abortRequestAndDestroyStream({ abortController, object })\n    })\n\n    streamed = true\n    return new Response(stream, { headers, status: rangeResult.status })\n  } catch (err) {\n    if (\n      err &&\n      typeof err === 'object' &&\n      (('name' in err && (err.name === 'NoSuchKey' || err.name === 'NotFound')) ||\n        ('httpStatusCode' in err && err.httpStatusCode === 404))\n    ) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n    req.payload.logger.error(err)\n    return new Response('Internal Server Error', { status: 500 })\n  } finally {\n    if (!streamed) {\n      abortRequestAndDestroyStream({ abortController, object })\n    }\n  }\n}\n"],"names":["GetObjectCommand","getSignedUrl","getFilePrefix","getDocPrefix","getFileKey","getRangeRequestInfo","isNodeReadableStream","body","pipe","destroy","abortRequestAndDestroyStream","abortController","object","abort","Body","getFile","bucket","client","collection","collectionPrefix","directUpload","filename","incomingHeaders","prefixQueryParam","req","signedDownloads","useCompositePrefixes","undefined","streamed","AbortController","signal","addEventListener","docPrefix","fileKey","key","useSignedURL","shouldUseSignedURL","command","Bucket","Key","signedUrl","expiresIn","Response","redirect","headObject","fileSize","ContentLength","status","rangeHeader","headers","get","rangeResult","type","Headers","rangeForS3","rangeStart","rangeEnd","headerKey","value","Object","entries","append","String","ContentType","ETag","etagFromHeaders","objectEtag","upload","modifyResponseHeaders","getObject","Range","abortSignal","statusText","payload","logger","error","msg","stream","on","err","name","httpStatusCode"],"mappings":"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"}
+{"version":3,"sources":["../src/getFile.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\nimport type { CollectionConfig, PayloadRequest } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { GetObjectCommand } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport {\n  getFilePrefix as getDocPrefix,\n  getFileKey,\n} from '@payloadcms/plugin-cloud-storage/utilities'\nimport { getRangeRequestInfo } from 'payload/internal'\n\nexport type SignedDownloadsConfig =\n  | {\n      /** @default 7200 */\n      expiresIn?: number\n      shouldUseSignedURL?(args: {\n        collection: CollectionConfig\n        filename: string\n        req: PayloadRequest\n      }): boolean | Promise<boolean>\n    }\n  | boolean\n\ninterface GetFileArgs {\n  bucket: string\n  client: AWS.S3\n  collection: CollectionConfig\n  collectionPrefix?: string\n  filename: string\n  incomingHeaders?: Headers\n  prefixQueryParam?: string\n  req: PayloadRequest\n  signedDownloads: SignedDownloadsConfig\n  uploadReference?: unknown\n  useCompositePrefixes?: boolean\n}\n\nconst isNodeReadableStream = (body: AWS.GetObjectOutput['Body']): body is Readable => {\n  return (\n    typeof body === 'object' &&\n    body !== null &&\n    'pipe' in body &&\n    typeof body.pipe === 'function' &&\n    'destroy' in body &&\n    typeof body.destroy === 'function'\n  )\n}\n\nconst abortRequestAndDestroyStream = ({\n  abortController,\n  object,\n}: {\n  abortController: AbortController\n  object?: AWS.GetObjectOutput\n}) => {\n  try {\n    abortController.abort()\n  } catch {\n    /* noop */\n  }\n  if (object?.Body && isNodeReadableStream(object.Body)) {\n    object.Body.destroy()\n  }\n}\n\nexport async function getFile({\n  bucket,\n  client,\n  collection,\n  collectionPrefix = '',\n  filename,\n  incomingHeaders,\n  prefixQueryParam,\n  req,\n  signedDownloads,\n  uploadReference,\n  useCompositePrefixes = false,\n}: GetFileArgs): Promise<Response> {\n  let object: AWS.GetObjectOutput | undefined = undefined\n  let streamed = false\n\n  const abortController = new AbortController()\n  if (req.signal) {\n    req.signal.addEventListener('abort', () => {\n      abortRequestAndDestroyStream({ abortController, object })\n    })\n  }\n\n  try {\n    const docPrefix = await getDocPrefix({\n      collection,\n      filename,\n      prefixQueryParam,\n      req,\n      uploadReference,\n    })\n\n    const { fileKey: key } = getFileKey({\n      collectionPrefix,\n      docPrefix,\n      filename,\n      useCompositePrefixes,\n    })\n\n    if (signedDownloads && !uploadReference) {\n      let useSignedURL = true\n      if (\n        typeof signedDownloads === 'object' &&\n        typeof signedDownloads.shouldUseSignedURL === 'function'\n      ) {\n        useSignedURL = await signedDownloads.shouldUseSignedURL({ collection, filename, req })\n      }\n\n      if (useSignedURL) {\n        const command = new GetObjectCommand({ Bucket: bucket, Key: key })\n        const signedUrl = await getSignedUrl(\n          client,\n          command,\n          typeof signedDownloads === 'object' ? signedDownloads : { expiresIn: 7200 },\n        )\n        return Response.redirect(signedUrl, 302)\n      }\n    }\n\n    // Get file size first for range validation and to set Content-Length header before streaming\n    const headObject = await client.headObject({\n      Bucket: bucket,\n      Key: key,\n    })\n    const fileSize = headObject.ContentLength\n\n    if (!fileSize) {\n      return new Response('Internal Server Error', { status: 500 })\n    }\n\n    // Handle range request\n    const rangeHeader = req.headers.get('range')\n    const rangeResult = getRangeRequestInfo({ fileSize, rangeHeader })\n\n    if (rangeResult.type === 'invalid') {\n      return new Response(null, {\n        headers: new Headers(rangeResult.headers),\n        status: rangeResult.status,\n      })\n    }\n\n    const rangeForS3 =\n      rangeResult.type === 'partial'\n        ? `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`\n        : undefined\n\n    let headers = new Headers(incomingHeaders)\n\n    // Add range-related headers from the result\n    for (const [headerKey, value] of Object.entries(rangeResult.headers)) {\n      headers.append(headerKey, value)\n    }\n\n    headers.append('Content-Type', String(headObject.ContentType))\n    if (headObject.ETag) {\n      headers.append('ETag', headObject.ETag)\n    }\n\n    // Add Content-Security-Policy header for SVG files to prevent executable code\n    if (headObject.ContentType === 'image/svg+xml') {\n      headers.append('Content-Security-Policy', \"script-src 'none'\")\n    }\n\n    const etagFromHeaders = req.headers.get('etag') || req.headers.get('if-none-match')\n    const objectEtag = headObject.ETag\n\n    if (\n      collection.upload &&\n      typeof collection.upload === 'object' &&\n      typeof collection.upload.modifyResponseHeaders === 'function'\n    ) {\n      headers = collection.upload.modifyResponseHeaders({ headers }) || headers\n    }\n\n    if (etagFromHeaders && etagFromHeaders === objectEtag) {\n      return new Response(null, {\n        headers,\n        status: 304,\n      })\n    }\n\n    object = await client.getObject(\n      {\n        Bucket: bucket,\n        Key: key,\n        Range: rangeForS3,\n      },\n      { abortSignal: abortController.signal },\n    )\n\n    if (!object.Body) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n\n    if (!isNodeReadableStream(object.Body)) {\n      req.payload.logger.error({\n        key,\n        msg: 'S3 object body is not a readable stream',\n      })\n      return new Response('Internal Server Error', { status: 500 })\n    }\n\n    const stream = object.Body\n    stream.on('error', (err: Error) => {\n      req.payload.logger.error({\n        err,\n        key,\n        msg: 'Error while streaming S3 object (aborting)',\n      })\n      abortRequestAndDestroyStream({ abortController, object })\n    })\n\n    streamed = true\n    return new Response(stream, { headers, status: rangeResult.status })\n  } catch (err) {\n    if (\n      err &&\n      typeof err === 'object' &&\n      (('name' in err && (err.name === 'NoSuchKey' || err.name === 'NotFound')) ||\n        ('httpStatusCode' in err && err.httpStatusCode === 404))\n    ) {\n      return new Response(null, { status: 404, statusText: 'Not Found' })\n    }\n    req.payload.logger.error(err)\n    return new Response('Internal Server Error', { status: 500 })\n  } finally {\n    if (!streamed) {\n      abortRequestAndDestroyStream({ abortController, object })\n    }\n  }\n}\n"],"names":["GetObjectCommand","getSignedUrl","getFilePrefix","getDocPrefix","getFileKey","getRangeRequestInfo","isNodeReadableStream","body","pipe","destroy","abortRequestAndDestroyStream","abortController","object","abort","Body","getFile","bucket","client","collection","collectionPrefix","filename","incomingHeaders","prefixQueryParam","req","signedDownloads","uploadReference","useCompositePrefixes","undefined","streamed","AbortController","signal","addEventListener","docPrefix","fileKey","key","useSignedURL","shouldUseSignedURL","command","Bucket","Key","signedUrl","expiresIn","Response","redirect","headObject","fileSize","ContentLength","status","rangeHeader","headers","get","rangeResult","type","Headers","rangeForS3","rangeStart","rangeEnd","headerKey","value","Object","entries","append","String","ContentType","ETag","etagFromHeaders","objectEtag","upload","modifyResponseHeaders","getObject","Range","abortSignal","statusText","payload","logger","error","msg","stream","on","err","name","httpStatusCode"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-s3",
-  "version": "4.0.0-internal.cd69eef",
+  "version": "4.0.0-internal.d1cc1d3",
   "description": "Payload storage adapter for Amazon S3",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -35,14 +35,14 @@
     "@aws-sdk/client-s3": "^3.614.0",
     "@aws-sdk/lib-storage": "^3.614.0",
     "@aws-sdk/s3-request-presigner": "^3.614.0",
-    "@payloadcms/plugin-cloud-storage": "4.0.0-internal.cd69eef"
+    "@payloadcms/plugin-cloud-storage": "4.0.0-internal.d1cc1d3"
   },
   "devDependencies": {
     "@smithy/node-http-handler": "4.0.3",
-    "payload": "4.0.0-internal.cd69eef"
+    "payload": "4.0.0-internal.d1cc1d3"
   },
   "peerDependencies": {
-    "payload": "4.0.0-internal.cd69eef"
+    "payload": "4.0.0-internal.d1cc1d3"
   },
   "engines": {
     "node": ">=24.15.0"