fix: backup compat

Signed-off-by: ferhat elmas <elmas.ferhat@gmail.com>

Author: ferhatelmas

src/storage/backend/s3/adapter.ts

@@ -32,6 +32,7 @@ import {
   UploadPart,
   withOptionalVersion,
 } from './../adapter'
+import { encodeCopySource } from './copy-source'
 
 const {
   storageS3UploadQueueSize,
@@ -52,13 +53,6 @@ export interface S3ClientOptions {
   requestTimeout?: number
 }
 
-function encodeCopySource(bucket: string, key: string): string {
-  return `${encodeURIComponent(bucket)}/${key
-    .split('/')
-    .map((pathToken) => encodeURIComponent(pathToken))
-    .join('/')}`
-}
-
 /**
  * S3Backend
  * Interacts with a s3-compatible file system with this S3Adapter

src/storage/backend/s3/backup.ts

@@ -7,6 +7,7 @@ import {
   S3Client,
   UploadPartCopyCommand,
 } from '@aws-sdk/client-s3'
+import { encodeCopySource } from './copy-source'
 
 const FIVE_GB = 5 * 1024 * 1024 * 1024
 
@@ -69,7 +70,7 @@ export class ObjectBackup {
     const copyParams = {
       Bucket: destinationBucket,
       Key: destinationKey,
-      CopySource: encodeURIComponent(`/${sourceBucket}/${sourceKey}`),
+      CopySource: encodeCopySource(sourceBucket, sourceKey),
     }
 
     const copyCommand = new CopyObjectCommand(copyParams)
@@ -157,7 +158,7 @@ export class ObjectBackup {
         Key: destinationKey,
         PartNumber: partNumber,
         UploadId: uploadId,
-        CopySource: encodeURIComponent(`/${sourceBucket}/${sourceKey}`),
+        CopySource: encodeCopySource(sourceBucket, sourceKey),
         CopySourceRange: `bytes=${start}-${end}`,
       })
 

src/storage/backend/s3/copy-source.ts

@@ -0,0 +1,6 @@
+export function encodeCopySource(bucket: string, key: string): string {
+  return `${encodeURIComponent(bucket)}/${key
+    .split('/')
+    .map((pathToken) => encodeURIComponent(pathToken))
+    .join('/')}`
+}

src/test/s3-backup.test.ts

@@ -0,0 +1,114 @@
+'use strict'
+
+import {
+  CompleteMultipartUploadCommand,
+  CopyObjectCommand,
+  CreateMultipartUploadCommand,
+  S3Client,
+  UploadPartCopyCommand,
+} from '@aws-sdk/client-s3'
+import { ObjectBackup } from '../storage/backend/s3/backup'
+
+jest.mock('@aws-sdk/client-s3', () => {
+  const originalModule = jest.requireActual('@aws-sdk/client-s3')
+  return {
+    ...originalModule,
+    S3Client: jest.fn().mockImplementation(() => ({
+      send: jest.fn(),
+    })),
+  }
+})
+
+const encodeCopySourceByPathToken = (bucket: string, key: string) =>
+  `${encodeURIComponent(bucket)}/${key
+    .split('/')
+    .map((pathToken) => encodeURIComponent(pathToken))
+    .join('/')}`
+
+describe('ObjectBackup', () => {
+  let mockSend: jest.Mock
+  let client: S3Client
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+    mockSend = jest.fn()
+    ;(S3Client as jest.Mock).mockImplementation(() => ({
+      send: mockSend,
+    }))
+    client = new S3Client({}) as unknown as S3Client
+  })
+
+  test('singleCopy preserves path separators for Unicode source keys', async () => {
+    mockSend.mockResolvedValue({})
+
+    const sourceKey = 'folder one/일이삼/子目录/🙂?#%.png'
+    const destinationKey = 'backup/folder/복사본.png'
+
+    const backup = new ObjectBackup(client, {
+      sourceBucket: 'source-bucket',
+      sourceKey,
+      destinationBucket: 'backup-bucket',
+      destinationKey,
+      size: 1024,
+    })
+
+    await backup.backup()
+
+    expect(mockSend).toHaveBeenCalledTimes(1)
+    const command = mockSend.mock.calls[0][0] as CopyObjectCommand
+    expect(command).toBeInstanceOf(CopyObjectCommand)
+    expect(command.input.CopySource).toBe(encodeCopySourceByPathToken('source-bucket', sourceKey))
+    expect(command.input.CopySource).toContain('source-bucket/folder%20one/')
+    expect(command.input.CopySource).not.toContain('%2Fsource-bucket%2F')
+    expect(command.input.CopySource).not.toContain('source-bucket%2F')
+  })
+
+  test('multipartCopy preserves path separators for Unicode source keys', async () => {
+    mockSend.mockImplementation((command: unknown) => {
+      if (command instanceof CreateMultipartUploadCommand) {
+        return Promise.resolve({ UploadId: 'upload-id' })
+      }
+
+      if (command instanceof UploadPartCopyCommand) {
+        return Promise.resolve({
+          CopyPartResult: {
+            ETag: `"etag-${command.input.PartNumber}"`,
+          },
+        })
+      }
+
+      if (command instanceof CompleteMultipartUploadCommand) {
+        return Promise.resolve({})
+      }
+
+      return Promise.resolve({})
+    })
+
+    const sourceKey = 'folder one/일이삼/子目录/🙂?#%.png'
+    const destinationKey = 'backup/folder/복사본.png'
+    const partSize = 5 * 1024 * 1024 * 1024
+    const backup = new ObjectBackup(client, {
+      sourceBucket: 'source-bucket',
+      sourceKey,
+      destinationBucket: 'backup-bucket',
+      destinationKey,
+      size: partSize + 1024,
+    })
+
+    await backup.backup()
+
+    const uploadPartCommands = mockSend.mock.calls
+      .map(([command]) => command)
+      .filter(
+        (command): command is UploadPartCopyCommand => command instanceof UploadPartCopyCommand
+      )
+
+    expect(uploadPartCommands).toHaveLength(2)
+    for (const command of uploadPartCommands) {
+      expect(command.input.CopySource).toBe(encodeCopySourceByPathToken('source-bucket', sourceKey))
+      expect(command.input.CopySource).toContain('source-bucket/folder%20one/')
+      expect(command.input.CopySource).not.toContain('%2Fsource-bucket%2F')
+      expect(command.input.CopySource).not.toContain('source-bucket%2F')
+    }
+  })
+})