From 31894bfb59e6c1c98b276031513a3acb914d8611 Mon Sep 17 00:00:00 2001 From: yiling Date: Thu, 30 Jul 2026 08:29:18 +0800 Subject: [PATCH 1/2] fix(s3): enforce property syntax in S3Service interface and wrap ReadableStream in Response for S3StorageService --- packages/core/src/s3/s3.test.ts | 35 ++++++++++++++++++++++++++++++++ packages/core/src/s3/s3.ts | 36 ++++++++++++++++++--------------- 2 files changed, 55 insertions(+), 16 deletions(-) diff --git a/packages/core/src/s3/s3.test.ts b/packages/core/src/s3/s3.test.ts index 61e56762..ba12098e 100644 --- a/packages/core/src/s3/s3.test.ts +++ b/packages/core/src/s3/s3.test.ts @@ -154,6 +154,41 @@ describe('S3Service implementations', () => { expect(url2).toBe('http://download-url-2') expect(s3PresignSpy).toHaveBeenCalledTimes(2) }) + + it('should handle ReadableStream in putObject by wrapping in Response', async () => { + const s3 = new S3StorageService('http://localhost:9000', 'key', 'secret', 'test-bucket') + s3WriteSpy.mockClear() + + const stream = new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('stream content')) + controller.close() + }, + }) + + await s3.putObject('test-bucket', 'file.txt', stream, 14, 'text/plain') + + expect(s3WriteSpy).toHaveBeenCalledWith( + 'file.txt', + expect.any(Response), + expect.objectContaining({ bucket: 'test-bucket', type: 'text/plain' }), + ) + }) + + it('should handle ArrayBuffer in putObject', async () => { + const s3 = new S3StorageService('http://localhost:9000', 'key', 'secret', 'test-bucket') + s3WriteSpy.mockClear() + + const arrayBuffer = new TextEncoder().encode('array buffer content').buffer + + await s3.putObject('test-bucket', 'file.txt', arrayBuffer, 20, 'text/plain') + + expect(s3WriteSpy).toHaveBeenCalledWith( + 'file.txt', + arrayBuffer, + expect.objectContaining({ bucket: 'test-bucket', type: 'text/plain' }), + ) + }) }) describe('LocalStorageService', () => { diff --git a/packages/core/src/s3/s3.ts b/packages/core/src/s3/s3.ts index b5b1a9ae..07b91958 100644 --- a/packages/core/src/s3/s3.ts +++ b/packages/core/src/s3/s3.ts @@ -33,29 +33,29 @@ export interface S3Object { } export interface S3Service { - getObjectSize(bucket: string, key: string): Promise - putObject( + getObjectSize: (bucket: string, key: string) => Promise + putObject: ( bucket: string, key: string, body: Buffer | Uint8Array | ArrayBuffer | string | ReadableStream, size: number, contentType?: string, - ): Promise - getObject(bucket: string, key: string): Promise - copyObject( + ) => Promise + getObject: (bucket: string, key: string) => Promise + copyObject: ( sourceBucket: string, sourceKey: string, destBucket: string, destKey: string, - ): Promise - downloadToFile(bucket: string, key: string, filePath: string): Promise - deleteObject(bucket: string, key: string): Promise - deletePrefix(bucket: string, prefix: string): Promise - headObject(bucket: string, key: string): Promise - listObjects(bucket: string, prefix: string): Promise - uploadFile(filePath: string, contentType: string): Promise - uploadFileToKey(filePath: string, key: string, contentType: string): Promise - presign(bucket: string, key: string, method: string, download?: boolean): Promise + ) => Promise + downloadToFile: (bucket: string, key: string, filePath: string) => Promise + deleteObject: (bucket: string, key: string) => Promise + deletePrefix: (bucket: string, prefix: string) => Promise + headObject: (bucket: string, key: string) => Promise + listObjects: (bucket: string, prefix: string) => Promise + uploadFile: (filePath: string, contentType: string) => Promise + uploadFileToKey: (filePath: string, key: string, contentType: string) => Promise + presign: (bucket: string, key: string, method: string, download?: boolean) => Promise } export class S3StorageService implements S3Service { @@ -87,11 +87,15 @@ export class S3StorageService implements S3Service { async putObject( bucket: string, key: string, - body: Buffer | Uint8Array | string, + body: Buffer | Uint8Array | ArrayBuffer | string | ReadableStream, _size: number, contentType?: string, ): Promise { - await this.client.write(key, body, { + const payload = + body && typeof body === 'object' && 'getReader' in body + ? new Response(body as ReadableStream) + : body + await this.client.write(key, payload as string | Buffer | ArrayBuffer | Uint8Array | Response, { bucket, type: contentType, }) From e802469a70dc21eb07a96e473d607472ee99e147 Mon Sep 17 00:00:00 2001 From: yiling Date: Thu, 30 Jul 2026 08:36:57 +0800 Subject: [PATCH 2/2] refactor(s3): remove unnecessary type cast on payload in S3StorageService.putObject --- packages/core/src/s3/s3.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/s3/s3.ts b/packages/core/src/s3/s3.ts index 07b91958..2a9dacc2 100644 --- a/packages/core/src/s3/s3.ts +++ b/packages/core/src/s3/s3.ts @@ -95,7 +95,7 @@ export class S3StorageService implements S3Service { body && typeof body === 'object' && 'getReader' in body ? new Response(body as ReadableStream) : body - await this.client.write(key, payload as string | Buffer | ArrayBuffer | Uint8Array | Response, { + await this.client.write(key, payload, { bucket, type: contentType, })