@payloadcms/storage-s3 4.0.0-internal.f15737c → 4.0.0-internal.f2a04f7

package/README.md

@@ -57,4 +57,4 @@ export default buildConfig({
 
 ### Configuration Options
 
-See the the [AWS SDK Package](https://github.com/aws/aws-sdk-js-v3) and [`S3ClientConfig`](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/s3) object for guidance on AWS S3 configuration.
+See the [AWS SDK Package](https://github.com/aws/aws-sdk-js-v3) and [`S3ClientConfig`](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/s3) object for guidance on AWS S3 configuration.

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAC5D,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAEpB,MAAM,wCAAwC,CAAA;AAE/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKzD,UAAU,mBAAmB;IAC3B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,MAAM,EAAE,cAAc,CAAA;IACtB,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,eAAe,EAAE,qBAAqB,CAAA;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,eAAe,CAAC,EAC9B,GAAG,EACH,MAAM,EACN,aAAa,EACb,MAAM,EACN,gBAAgB,EAChB,eAAe,EACf,oBAA4B,GAC7B,EAAE,mBAAmB,GAAG,OAAO,CA2E/B"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAC5D,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EAGpB,MAAM,wCAAwC,CAAA;AAE/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKzD,UAAU,mBAAmB;IAC3B,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,MAAM,EAAE,cAAc,CAAA;IACtB,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,eAAe,EAAE,qBAAqB,CAAA;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,wBAAgB,eAAe,CAAC,EAC9B,GAAG,EACH,MAAM,EACN,aAAa,EACb,MAAM,EACN,gBAAgB,EAChB,eAAe,EACf,oBAA4B,GAC7B,EAAE,mBAAmB,GAAG,OAAO,CAgF/B"}

package/dist/adapter.js

@@ -1,8 +1,29 @@
 import { generateUploadInstructions } from './generateUploadInstructions.js';
 import { generateURL } from './generateURL.js';
 export function createS3Adapter({ acl, bucket, clientUploads, config, getStorageClient, signedDownloads, useCompositePrefixes = false }) {
+    const deleteStoredFile = async ({ storageFilePath })=>{
+        const { deleteFile } = await import('./deleteFile.js');
+        return deleteFile({
+            bucket,
+            client: getStorageClient(),
+            storageFilePath
+        });
+    };
     return ({ collection, prefix = '' })=>({
             name: 's3',
+            supportsTempFiles: true,
+            copyFile: async ({ from, req, to })=>{
+                const { copyS3File } = await import('./copyFile.js');
+                await copyS3File({
+                    acl,
+                    bucket,
+                    client: getStorageClient(),
+                    from,
+                    req,
+                    to
+                });
+            },
+            deleteFile: deleteStoredFile,
             generateURL: ({ filename, prefix: urlPrefix = '' })=>generateURL({
                     bucket,
                     collectionPrefix: prefix,
@@ -26,14 +47,7 @@ export function createS3Adapter({ acl, bucket, clientUploads, config, getStorage
             },
             // Helpers below dynamic-import their @aws-sdk dependencies so the SDK only
             // loads on the first request that actually needs it.
-            handleDelete: async ({ storageFilePath })=>{
-                const { deleteFile } = await import('./deleteFile.js');
-                return deleteFile({
-                    bucket,
-                    client: getStorageClient(),
-                    storageFilePath
-                });
-            },
+            handleDelete: deleteStoredFile,
             handleUpload: async ({ data, file, storageFilePath })=>{
                 const { uploadFile } = await import('./uploadFile.js');
                 await uploadFile({

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: {\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      requiresUploadReceipt: true,\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 ({ storageFilePath }) => {\n      const { deleteFile } = await import('./deleteFile.js')\n      return deleteFile({\n        bucket,\n        client: getStorageClient(),\n        storageFilePath,\n      })\n    },\n\n    handleUpload: async ({ data, file, storageFilePath }) => {\n      const { uploadFile } = await import('./uploadFile.js')\n      await uploadFile({\n        acl,\n        bucket,\n        buffer: file.buffer,\n        client: getStorageClient(),\n        mimeType: file.mimeType,\n        storageFilePath,\n        tempFilePath: file.tempFilePath,\n      })\n\n      return data\n    },\n\n    staticHandler: async (\n      req,\n      { doc, headers, params: { filename, operation, uploadReference } },\n    ) => {\n      const { getFile } = await import('./getFile.js')\n      return getFile({\n        bucket,\n        client: getStorageClient(),\n        collection,\n        collectionPrefix: prefix,\n        doc,\n        filename,\n        incomingHeaders: headers,\n        operation,\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","requiresUploadReceipt","useInAdmin","handleDelete","storageFilePath","deleteFile","client","handleUpload","data","file","uploadFile","buffer","mimeType","tempFilePath","staticHandler","req","doc","headers","params","operation","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,uBAAuB;gBACvBC,YAAY;YACd;YAEA,2EAA2E;YAC3E,qDAAqD;YACrDC,cAAc,OAAO,EAAEC,eAAe,EAAE;gBACtC,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;gBACpC,OAAOA,WAAW;oBAChBvB;oBACAwB,QAAQrB;oBACRmB;gBACF;YACF;YAEAG,cAAc,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAEL,eAAe,EAAE;gBAClD,MAAM,EAAEM,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;gBACpC,MAAMA,WAAW;oBACf7B;oBACAC;oBACA6B,QAAQF,KAAKE,MAAM;oBACnBL,QAAQrB;oBACR2B,UAAUH,KAAKG,QAAQ;oBACvBR;oBACAS,cAAcJ,KAAKI,YAAY;gBACjC;gBAEA,OAAOL;YACT;YAEAM,eAAe,OACbC,KACA,EAAEC,GAAG,EAAEC,OAAO,EAAEC,QAAQ,EAAE3B,QAAQ,EAAE4B,SAAS,EAAEC,eAAe,EAAE,EAAE;gBAElE,MAAM,EAAEC,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC;gBACjC,OAAOA,QAAQ;oBACbvC;oBACAwB,QAAQrB;oBACRG;oBACAK,kBAAkBJ;oBAClB2B;oBACAzB;oBACA+B,iBAAiBL;oBACjBE;oBACAJ;oBACA7B;oBACAkC;oBACAjC;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  DeleteFile,\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  const deleteStoredFile: DeleteFile = async ({ storageFilePath }) => {\n    const { deleteFile } = await import('./deleteFile.js')\n    return deleteFile({ bucket, client: getStorageClient(), storageFilePath })\n  }\n\n  return ({ collection, prefix = '' }): GeneratedAdapter => ({\n    name: 's3',\n    supportsTempFiles: true,\n\n    copyFile: async ({ from, req, to }) => {\n      const { copyS3File } = await import('./copyFile.js')\n      await copyS3File({ acl, bucket, client: getStorageClient(), from, req, to })\n    },\n    deleteFile: deleteStoredFile,\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      requiresUploadReceipt: true,\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: deleteStoredFile,\n\n    handleUpload: async ({ data, file, storageFilePath }) => {\n      const { uploadFile } = await import('./uploadFile.js')\n      await uploadFile({\n        acl,\n        bucket,\n        buffer: file.buffer,\n        client: getStorageClient(),\n        mimeType: file.mimeType,\n        storageFilePath,\n        tempFilePath: file.tempFilePath,\n      })\n\n      return data\n    },\n\n    staticHandler: async (\n      req,\n      { doc, headers, params: { filename, operation, uploadReference } },\n    ) => {\n      const { getFile } = await import('./getFile.js')\n      return getFile({\n        bucket,\n        client: getStorageClient(),\n        collection,\n        collectionPrefix: prefix,\n        doc,\n        filename,\n        incomingHeaders: headers,\n        operation,\n        req,\n        signedDownloads,\n        uploadReference,\n        useCompositePrefixes,\n      })\n    },\n  })\n}\n"],"names":["generateUploadInstructions","generateURL","createS3Adapter","acl","bucket","clientUploads","config","getStorageClient","signedDownloads","useCompositePrefixes","deleteStoredFile","storageFilePath","deleteFile","client","collection","prefix","name","supportsTempFiles","copyFile","from","req","to","copyS3File","filename","urlPrefix","collectionPrefix","endpoint","uploadInstructions","enabled","Boolean","generate","access","undefined","requiresUploadReceipt","useInAdmin","handleDelete","handleUpload","data","file","uploadFile","buffer","mimeType","tempFilePath","staticHandler","doc","headers","params","operation","uploadReference","getFile","incomingHeaders"],"mappings":"AAUA,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,MAAMC,mBAA+B,OAAO,EAAEC,eAAe,EAAE;QAC7D,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;QACpC,OAAOA,WAAW;YAAER;YAAQS,QAAQN;YAAoBI;QAAgB;IAC1E;IAEA,OAAO,CAAC,EAAEG,UAAU,EAAEC,SAAS,EAAE,EAAE,GAAwB,CAAA;YACzDC,MAAM;YACNC,mBAAmB;YAEnBC,UAAU,OAAO,EAAEC,IAAI,EAAEC,GAAG,EAAEC,EAAE,EAAE;gBAChC,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;gBACpC,MAAMA,WAAW;oBAAEnB;oBAAKC;oBAAQS,QAAQN;oBAAoBY;oBAAMC;oBAAKC;gBAAG;YAC5E;YACAT,YAAYF;YAEZT,aAAa,CAAC,EAAEsB,QAAQ,EAAER,QAAQS,YAAY,EAAE,EAAE,GAChDvB,YAAY;oBACVG;oBACAqB,kBAAkBV;oBAClBW,UAAUpB,OAAOoB,QAAQ;oBACzBH;oBACAR,QAAQS;oBACRf;gBACF;YAEFkB,oBAAoB;gBAClBC,SAASC,QAAQxB;gBACjByB,UAAU9B,2BAA2B;oBACnC+B,QAAQ,OAAO1B,kBAAkB,WAAWA,cAAc0B,MAAM,GAAGC;oBACnE7B;oBACAC;oBACAqB,kBAAkBV;oBAClBR;oBACAE;gBACF;gBACAwB,uBAAuB;gBACvBC,YAAY;YACd;YAEA,2EAA2E;YAC3E,qDAAqD;YACrDC,cAAczB;YAEd0B,cAAc,OAAO,EAAEC,IAAI,EAAEC,IAAI,EAAE3B,eAAe,EAAE;gBAClD,MAAM,EAAE4B,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC;gBACpC,MAAMA,WAAW;oBACfpC;oBACAC;oBACAoC,QAAQF,KAAKE,MAAM;oBACnB3B,QAAQN;oBACRkC,UAAUH,KAAKG,QAAQ;oBACvB9B;oBACA+B,cAAcJ,KAAKI,YAAY;gBACjC;gBAEA,OAAOL;YACT;YAEAM,eAAe,OACbvB,KACA,EAAEwB,GAAG,EAAEC,OAAO,EAAEC,QAAQ,EAAEvB,QAAQ,EAAEwB,SAAS,EAAEC,eAAe,EAAE,EAAE;gBAElE,MAAM,EAAEC,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC;gBACjC,OAAOA,QAAQ;oBACb7C;oBACAS,QAAQN;oBACRO;oBACAW,kBAAkBV;oBAClB6B;oBACArB;oBACA2B,iBAAiBL;oBACjBE;oBACA3B;oBACAZ;oBACAwC;oBACAvC;gBACF;YACF;QACF,CAAA;AACF"}

package/dist/copyFile.d.ts

@@ -0,0 +1,13 @@
+import type { S3 } from '@aws-sdk/client-s3';
+import type { PayloadRequest } from 'payload';
+type CopyS3FileArgs = {
+    acl?: 'private' | 'public-read';
+    bucket: string;
+    client: S3;
+    from: string;
+    req?: PayloadRequest;
+    to: string;
+};
+export declare const copyS3File: ({ acl, bucket, client, from, req, to, }: CopyS3FileArgs) => Promise<void>;
+export {};
+//# sourceMappingURL=copyFile.d.ts.map

package/dist/copyFile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"copyFile.d.ts","sourceRoot":"","sources":["../src/copyFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,KAAK,cAAc,GAAG;IACpB,GAAG,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,EAAE,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAKD,eAAO,MAAM,UAAU,4CAOpB,cAAc,KAAG,OAAO,CAAC,IAAI,CAyI/B,CAAA"}

package/dist/copyFile.js

@@ -0,0 +1,145 @@
+const singleCopyLimit = 5 * 1024 ** 3;
+const partSize = 256 * 1024 ** 2;
+export const copyS3File = async ({ acl, bucket, client, from, req, to })=>{
+    if (from === to) {
+        throw new Error('Storage copy requires different source and destination keys');
+    }
+    const source = await client.headObject({
+        Bucket: bucket,
+        Key: from
+    });
+    const size = source.ContentLength;
+    if (size === undefined) {
+        throw new Error('Storage source has no known length');
+    }
+    const copySource = `${encodeURIComponent(bucket)}/${from.split('/').map(encodeURIComponent).join('/')}`;
+    let hasCopied = false;
+    let destinationETag;
+    let destinationVersion;
+    try {
+        if (size <= singleCopyLimit) {
+            const copied = await client.copyObject({
+                ACL: acl,
+                Bucket: bucket,
+                CopySource: copySource,
+                CopySourceIfMatch: source.ETag,
+                IfNoneMatch: '*',
+                Key: to,
+                MetadataDirective: 'COPY',
+                ServerSideEncryption: source.ServerSideEncryption,
+                SSEKMSKeyId: source.SSEKMSKeyId,
+                TaggingDirective: 'COPY'
+            });
+            hasCopied = true;
+            destinationETag = copied.CopyObjectResult?.ETag;
+            destinationVersion = copied.VersionId;
+        } else {
+            const { TagSet = [] } = await client.getObjectTagging({
+                Bucket: bucket,
+                Key: from
+            });
+            const tagging = new URLSearchParams();
+            for (const tag of TagSet){
+                if (tag.Key && tag.Value !== undefined) {
+                    tagging.set(tag.Key, tag.Value);
+                }
+            }
+            const upload = await client.createMultipartUpload({
+                ACL: acl,
+                Bucket: bucket,
+                CacheControl: source.CacheControl,
+                ContentDisposition: source.ContentDisposition,
+                ContentEncoding: source.ContentEncoding,
+                ContentLanguage: source.ContentLanguage,
+                ContentType: source.ContentType,
+                Expires: source.Expires,
+                Key: to,
+                Metadata: source.Metadata,
+                ServerSideEncryption: source.ServerSideEncryption,
+                SSEKMSKeyId: source.SSEKMSKeyId,
+                StorageClass: source.StorageClass,
+                Tagging: tagging.size ? tagging.toString() : undefined
+            });
+            if (!upload.UploadId) {
+                throw new Error('S3 did not return a multipart upload ID');
+            }
+            try {
+                const parts = [];
+                for(let partNumber = 1, start = 0; start < size; start += partSize, partNumber++){
+                    const end = Math.min(start + partSize, size) - 1;
+                    const part = await client.uploadPartCopy({
+                        Bucket: bucket,
+                        CopySource: copySource,
+                        CopySourceIfMatch: source.ETag,
+                        CopySourceRange: `bytes=${start}-${end}`,
+                        Key: to,
+                        PartNumber: partNumber,
+                        UploadId: upload.UploadId
+                    });
+                    if (!part.CopyPartResult?.ETag) {
+                        throw new Error(`S3 copy part ${partNumber} did not return an ETag`);
+                    }
+                    parts.push({
+                        ETag: part.CopyPartResult.ETag,
+                        PartNumber: partNumber
+                    });
+                }
+                const copied = await client.completeMultipartUpload({
+                    Bucket: bucket,
+                    IfNoneMatch: '*',
+                    Key: to,
+                    MultipartUpload: {
+                        Parts: parts
+                    },
+                    UploadId: upload.UploadId
+                });
+                hasCopied = true;
+                destinationETag = copied.ETag;
+                destinationVersion = copied.VersionId;
+            } catch (err) {
+                try {
+                    await client.abortMultipartUpload({
+                        Bucket: bucket,
+                        Key: to,
+                        UploadId: upload.UploadId
+                    });
+                } catch (cleanupError) {
+                    req?.payload.logger.error({
+                        err: cleanupError,
+                        msg: `Failed to abort S3 multipart copy at ${bucket}/${to} (upload ${upload.UploadId})`
+                    });
+                }
+                throw err;
+            }
+        }
+        const destination = await client.headObject({
+            Bucket: bucket,
+            Key: to
+        });
+        if (destination.ContentLength !== size) {
+            throw new Error(`Copied storage object is not readable at its expected length: ${to}`);
+        }
+    } catch (err) {
+        if (hasCopied) {
+            try {
+                if (!destinationETag && (!destinationVersion || destinationVersion === 'null')) {
+                    throw new Error('S3 copy did not return an ETag or version for safe cleanup');
+                }
+                await client.deleteObject({
+                    Bucket: bucket,
+                    IfMatch: destinationETag,
+                    Key: to,
+                    VersionId: destinationVersion
+                });
+            } catch (cleanupError) {
+                req?.payload.logger.error({
+                    err: cleanupError,
+                    msg: `Failed to remove unsuccessful S3 copy at ${bucket}/${to}`
+                });
+            }
+        }
+        throw err;
+    }
+};
+
+//# sourceMappingURL=copyFile.js.map

package/dist/copyFile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/copyFile.ts"],"sourcesContent":["import type { S3 } from '@aws-sdk/client-s3'\nimport type { PayloadRequest } from 'payload'\n\ntype CopyS3FileArgs = {\n  acl?: 'private' | 'public-read'\n  bucket: string\n  client: S3\n  from: string\n  req?: PayloadRequest\n  to: string\n}\n\nconst singleCopyLimit = 5 * 1024 ** 3\nconst partSize = 256 * 1024 ** 2\n\nexport const copyS3File = async ({\n  acl,\n  bucket,\n  client,\n  from,\n  req,\n  to,\n}: CopyS3FileArgs): Promise<void> => {\n  if (from === to) {\n    throw new Error('Storage copy requires different source and destination keys')\n  }\n\n  const source = await client.headObject({ Bucket: bucket, Key: from })\n  const size = source.ContentLength\n\n  if (size === undefined) {\n    throw new Error('Storage source has no known length')\n  }\n\n  const copySource = `${encodeURIComponent(bucket)}/${from.split('/').map(encodeURIComponent).join('/')}`\n\n  let hasCopied = false\n  let destinationETag: string | undefined\n  let destinationVersion: string | undefined\n\n  try {\n    if (size <= singleCopyLimit) {\n      const copied = await client.copyObject({\n        ACL: acl,\n        Bucket: bucket,\n        CopySource: copySource,\n        CopySourceIfMatch: source.ETag,\n        IfNoneMatch: '*',\n        Key: to,\n        MetadataDirective: 'COPY',\n        ServerSideEncryption: source.ServerSideEncryption,\n        SSEKMSKeyId: source.SSEKMSKeyId,\n        TaggingDirective: 'COPY',\n      })\n      hasCopied = true\n      destinationETag = copied.CopyObjectResult?.ETag\n      destinationVersion = copied.VersionId\n    } else {\n      const { TagSet = [] } = await client.getObjectTagging({ Bucket: bucket, Key: from })\n      const tagging = new URLSearchParams()\n\n      for (const tag of TagSet) {\n        if (tag.Key && tag.Value !== undefined) {\n          tagging.set(tag.Key, tag.Value)\n        }\n      }\n\n      const upload = await client.createMultipartUpload({\n        ACL: acl,\n        Bucket: bucket,\n        CacheControl: source.CacheControl,\n        ContentDisposition: source.ContentDisposition,\n        ContentEncoding: source.ContentEncoding,\n        ContentLanguage: source.ContentLanguage,\n        ContentType: source.ContentType,\n        Expires: source.Expires,\n        Key: to,\n        Metadata: source.Metadata,\n        ServerSideEncryption: source.ServerSideEncryption,\n        SSEKMSKeyId: source.SSEKMSKeyId,\n        StorageClass: source.StorageClass,\n        Tagging: tagging.size ? tagging.toString() : undefined,\n      })\n\n      if (!upload.UploadId) {\n        throw new Error('S3 did not return a multipart upload ID')\n      }\n\n      try {\n        const parts = []\n\n        for (let partNumber = 1, start = 0; start < size; start += partSize, partNumber++) {\n          const end = Math.min(start + partSize, size) - 1\n          const part = await client.uploadPartCopy({\n            Bucket: bucket,\n            CopySource: copySource,\n            CopySourceIfMatch: source.ETag,\n            CopySourceRange: `bytes=${start}-${end}`,\n            Key: to,\n            PartNumber: partNumber,\n            UploadId: upload.UploadId,\n          })\n\n          if (!part.CopyPartResult?.ETag) {\n            throw new Error(`S3 copy part ${partNumber} did not return an ETag`)\n          }\n\n          parts.push({ ETag: part.CopyPartResult.ETag, PartNumber: partNumber })\n        }\n\n        const copied = await client.completeMultipartUpload({\n          Bucket: bucket,\n          IfNoneMatch: '*',\n          Key: to,\n          MultipartUpload: { Parts: parts },\n          UploadId: upload.UploadId,\n        })\n        hasCopied = true\n        destinationETag = copied.ETag\n        destinationVersion = copied.VersionId\n      } catch (err) {\n        try {\n          await client.abortMultipartUpload({ Bucket: bucket, Key: to, UploadId: upload.UploadId })\n        } catch (cleanupError) {\n          req?.payload.logger.error({\n            err: cleanupError,\n            msg: `Failed to abort S3 multipart copy at ${bucket}/${to} (upload ${upload.UploadId})`,\n          })\n        }\n        throw err\n      }\n    }\n\n    const destination = await client.headObject({ Bucket: bucket, Key: to })\n\n    if (destination.ContentLength !== size) {\n      throw new Error(`Copied storage object is not readable at its expected length: ${to}`)\n    }\n  } catch (err) {\n    if (hasCopied) {\n      try {\n        if (!destinationETag && (!destinationVersion || destinationVersion === 'null')) {\n          throw new Error('S3 copy did not return an ETag or version for safe cleanup')\n        }\n        await client.deleteObject({\n          Bucket: bucket,\n          IfMatch: destinationETag,\n          Key: to,\n          VersionId: destinationVersion,\n        })\n      } catch (cleanupError) {\n        req?.payload.logger.error({\n          err: cleanupError,\n          msg: `Failed to remove unsuccessful S3 copy at ${bucket}/${to}`,\n        })\n      }\n    }\n    throw err\n  }\n}\n"],"names":["singleCopyLimit","partSize","copyS3File","acl","bucket","client","from","req","to","Error","source","headObject","Bucket","Key","size","ContentLength","undefined","copySource","encodeURIComponent","split","map","join","hasCopied","destinationETag","destinationVersion","copied","copyObject","ACL","CopySource","CopySourceIfMatch","ETag","IfNoneMatch","MetadataDirective","ServerSideEncryption","SSEKMSKeyId","TaggingDirective","CopyObjectResult","VersionId","TagSet","getObjectTagging","tagging","URLSearchParams","tag","Value","set","upload","createMultipartUpload","CacheControl","ContentDisposition","ContentEncoding","ContentLanguage","ContentType","Expires","Metadata","StorageClass","Tagging","toString","UploadId","parts","partNumber","start","end","Math","min","part","uploadPartCopy","CopySourceRange","PartNumber","CopyPartResult","push","completeMultipartUpload","MultipartUpload","Parts","err","abortMultipartUpload","cleanupError","payload","logger","error","msg","destination","deleteObject","IfMatch"],"mappings":"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"}

package/package.json

@@ -1,13 +1,8 @@
 {
   "name": "@payloadcms/storage-s3",
-  "version": "4.0.0-internal.f15737c",
+  "version": "4.0.0-internal.f2a04f7",
   "description": "Payload storage adapter for Amazon S3",
   "homepage": "https://payloadcms.com",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/payloadcms/payload.git",
-    "directory": "packages/storage-s3"
-  },
   "license": "MIT",
   "author": "Payload <dev@payloadcms.com> (https://payloadcms.com)",
   "maintainers": [
@@ -17,32 +12,42 @@
       "url": "https://payloadcms.com"
     }
   ],
-  "sideEffects": false,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/payloadcms/payload.git",
+    "directory": "packages/storage-s3"
+  },
+  "files": [
+    "dist"
+  ],
   "type": "module",
+  "sideEffects": false,
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "import": "./dist/index.js",
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
+    },
+    "./copy-file": {
+      "import": "./dist/copyFile.js",
+      "types": "./dist/copyFile.d.ts",
+      "default": "./dist/copyFile.js"
     }
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
   "dependencies": {
     "@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.f15737c"
+    "@payloadcms/plugin-cloud-storage": "4.0.0-internal.f2a04f7"
   },
   "devDependencies": {
     "@smithy/node-http-handler": "4.0.3",
-    "payload": "4.0.0-internal.f15737c"
+    "payload": "4.0.0-internal.f2a04f7"
   },
   "peerDependencies": {
-    "payload": "4.0.0-internal.f15737c"
+    "payload": "4.0.0-internal.f2a04f7"
   },
   "engines": {
     "node": ">=24.15.0"