medusa-plugin-r2 1.0.4 → 1.1.1

package/.medusa/server/src/providers/__tests__/provider.unit.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/.medusa/server/src/providers/__tests__/provider.unit.spec.js

@@ -0,0 +1,516 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/// <reference types="jest" />
+const client_s3_1 = require("@aws-sdk/client-s3");
+const lib_storage_1 = require("@aws-sdk/lib-storage");
+const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
+const utils_1 = require("@medusajs/framework/utils");
+const provider_1 = require("../r2/provider");
+jest.mock('@aws-sdk/client-s3');
+jest.mock('@aws-sdk/lib-storage');
+jest.mock('@aws-sdk/s3-request-presigner');
+jest.mock('ulid', () => ({ ulid: () => 'TESTULID0000000000000000' }));
+// ─── Helpers ─────────────────────────────────────────────────────────────────
+const SIGNED_URL = 'https://signed.r2.example.com/file?X-Amz-Signature=abc';
+const baseOptions = {
+    region: 'auto',
+    bucket: 'public-bucket',
+    accessKeyId: 'pub-key-id',
+    secretAccessKey: 'pub-secret',
+    fileUrl: 'https://cdn.example.com',
+    endpoint: 'https://account.r2.cloudflarestorage.com',
+    privateRegion: 'auto',
+    privateBucket: 'private-bucket',
+    privateAccessKeyId: 'priv-key-id',
+    privateSecretAccessKey: 'priv-secret',
+    privateEndpoint: 'https://account-private.r2.cloudflarestorage.com'
+};
+const mockLogger = {
+    error: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    debug: jest.fn()
+};
+function makeService(overrides = {}) {
+    return new provider_1.R2FileProvider({ logger: mockLogger }, { ...baseOptions, ...overrides });
+}
+// ─── Mock state ───────────────────────────────────────────────────────────────
+let mockSend;
+let mockUploadDone;
+beforeEach(() => {
+    jest.clearAllMocks();
+    mockSend = jest.fn().mockResolvedValue({
+        Body: {
+            transformToByteArray: jest.fn().mockResolvedValue(new Uint8Array([72, 101, 108, 108, 111]))
+        }
+    });
+    client_s3_1.S3Client.mockImplementation(() => ({ send: mockSend, destroy: jest.fn() }));
+    mockUploadDone = jest.fn().mockResolvedValue({});
+    lib_storage_1.Upload.mockImplementation(() => ({ done: mockUploadDone }));
+    s3_request_presigner_1.getSignedUrl.mockResolvedValue(SIGNED_URL);
+});
+// ─── Constructor ──────────────────────────────────────────────────────────────
+describe('R2FileService — constructor', () => {
+    it('throws when accessKeyId is missing', () => {
+        expect(() => makeService({ accessKeyId: undefined })).toThrow(utils_1.MedusaError);
+    });
+    it('throws when secretAccessKey is missing', () => {
+        expect(() => makeService({ secretAccessKey: undefined })).toThrow(utils_1.MedusaError);
+    });
+    it('throws when private bucket config is incomplete', () => {
+        expect(() => makeService({ privateBucket: undefined })).toThrow(utils_1.MedusaError);
+    });
+    it('throws when privateAccessKeyId is missing', () => {
+        expect(() => makeService({ privateAccessKeyId: undefined })).toThrow(utils_1.MedusaError);
+    });
+    it('constructs successfully with full config', () => {
+        expect(() => makeService()).not.toThrow();
+    });
+    it('creates two S3Client instances (public + private)', () => {
+        makeService();
+        expect(client_s3_1.S3Client).toHaveBeenCalledTimes(2);
+    });
+    it('applies globalPrefix default to empty string', () => {
+        const svc = makeService({ globalPrefix: undefined });
+        expect(svc.config_.globalPrefix).toBe('');
+    });
+    it('applies custom globalPrefix', () => {
+        const svc = makeService({ globalPrefix: 'media/' });
+        expect(svc.config_.globalPrefix).toBe('media/');
+    });
+    it('uses default cacheControl when not specified', () => {
+        const svc = makeService({ cacheControl: undefined });
+        expect(svc.config_.cacheControl).toBe('public, max-age=31536000');
+    });
+    it('uses default downloadFileDuration of 3600', () => {
+        const svc = makeService({ downloadFileDuration: undefined });
+        expect(svc.config_.downloadFileDuration).toBe(3600);
+    });
+});
+// ─── upload() — public ACL ────────────────────────────────────────────────────
+describe('R2FileService — upload() — public', () => {
+    it('sends PutObjectCommand to the public bucket', async () => {
+        const svc = makeService();
+        await svc.upload({
+            filename: 'photo.jpg',
+            mimeType: 'image/jpeg',
+            content: 'aGVsbG8=', // base64 "hello"
+            access: 'public'
+        });
+        expect(client_s3_1.PutObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'public-bucket' }));
+        expect(mockSend).toHaveBeenCalledTimes(1);
+    });
+    it('returns a public CDN url with encoded key', async () => {
+        const svc = makeService();
+        const result = await svc.upload({
+            filename: 'photo.jpg',
+            mimeType: 'image/jpeg',
+            content: 'aGVsbG8=',
+            access: 'public'
+        });
+        expect(result.url).toMatch(/^https:\/\/cdn\.example\.com\//);
+        expect(result.key).toMatch(/^photo-TESTULID0000000000000000\.jpg$/);
+    });
+    it('includes globalPrefix in the file key', async () => {
+        const svc = makeService({ globalPrefix: 'uploads/' });
+        const result = await svc.upload({
+            filename: 'banner.png',
+            mimeType: 'image/png',
+            content: 'aGVsbG8=',
+            access: 'public'
+        });
+        expect(result.key).toMatch(/^uploads\/banner-/);
+    });
+    it('includes the file prefix in the key when provided', async () => {
+        const svc = makeService();
+        const result = await svc.upload({
+            filename: 'thumb.png',
+            mimeType: 'image/png',
+            content: 'aGVsbG8=',
+            access: 'public',
+            prefix: 'thumbnails/'
+        });
+        expect(result.key).toMatch(/^thumbnails\/thumb-/);
+    });
+    it('stores original-filename in object metadata', async () => {
+        const svc = makeService();
+        await svc.upload({
+            filename: 'my file.pdf',
+            mimeType: 'application/pdf',
+            content: 'aGVsbG8=',
+            access: 'public'
+        });
+        expect(client_s3_1.PutObjectCommand).toHaveBeenCalledWith(expect.objectContaining({
+            Metadata: expect.objectContaining({
+                'original-filename': encodeURIComponent('my file.pdf')
+            })
+        }));
+    });
+    it('sets ContentType on the command', async () => {
+        const svc = makeService();
+        await svc.upload({
+            filename: 'doc.pdf',
+            mimeType: 'application/pdf',
+            content: 'aGVsbG8=',
+            access: 'public'
+        });
+        expect(client_s3_1.PutObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ ContentType: 'application/pdf' }));
+    });
+    it('decodes valid base64 content', async () => {
+        const svc = makeService();
+        const b64 = Buffer.from('Hello World').toString('base64'); // 'SGVsbG8gV29ybGQ='
+        await svc.upload({
+            filename: 'hello.txt',
+            mimeType: 'text/plain',
+            content: b64,
+            access: 'public'
+        });
+        const [call] = client_s3_1.PutObjectCommand.mock.calls;
+        const body = call[0].Body;
+        expect(body.toString('utf8')).toBe('Hello World');
+    });
+    it('treats non-base64 content as utf8', async () => {
+        const svc = makeService();
+        await svc.upload({
+            filename: 'data.json',
+            mimeType: 'application/json',
+            content: '{"key":"value"}',
+            access: 'public'
+        });
+        const [call] = client_s3_1.PutObjectCommand.mock.calls;
+        const body = call[0].Body;
+        expect(body.toString('utf8')).toBe('{"key":"value"}');
+    });
+    it('handles PNG image upload', async () => {
+        const svc = makeService();
+        const fakePng = Buffer.from([0x89, 0x50, 0x4e, 0x47]).toString('base64');
+        const result = await svc.upload({
+            filename: 'image.png',
+            mimeType: 'image/png',
+            content: fakePng,
+            access: 'public'
+        });
+        expect(result.url).toContain('cdn.example.com');
+        expect(result.key).toContain('.png');
+    });
+    it('handles SVG upload', async () => {
+        const svc = makeService();
+        const result = await svc.upload({
+            filename: 'icon.svg',
+            mimeType: 'image/svg+xml',
+            content: '<svg xmlns="http://www.w3.org/2000/svg"/>',
+            access: 'public'
+        });
+        expect(result.key).toContain('.svg');
+    });
+    it('preserves file extension including double extensions', async () => {
+        const svc = makeService();
+        const result = await svc.upload({
+            filename: 'archive.tar.gz',
+            mimeType: 'application/gzip',
+            content: 'aGVsbG8=',
+            access: 'public'
+        });
+        // path.parse('archive.tar.gz').ext === '.gz'
+        expect(result.key).toMatch(/\.gz$/);
+    });
+});
+// ─── upload() — private ACL ───────────────────────────────────────────────────
+describe('R2FileService — upload() — private', () => {
+    it('sends PutObjectCommand to the private bucket', async () => {
+        const svc = makeService();
+        await svc.upload({
+            filename: 'report.pdf',
+            mimeType: 'application/pdf',
+            content: 'aGVsbG8=',
+            access: 'private'
+        });
+        expect(client_s3_1.PutObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket' }));
+    });
+    it('returns an empty url for private files', async () => {
+        const svc = makeService();
+        const result = await svc.upload({
+            filename: 'secret.pdf',
+            mimeType: 'application/pdf',
+            content: 'aGVsbG8=',
+            access: 'private'
+        });
+        expect(result.url).toBe('');
+        expect(result.key).toBeTruthy();
+    });
+    it('handles CSV upload to private bucket', async () => {
+        const svc = makeService();
+        const result = await svc.upload({
+            filename: 'export.csv',
+            mimeType: 'text/csv',
+            content: 'id,name\n1,Alice',
+            access: 'private'
+        });
+        expect(result.key).toContain('.csv');
+        expect(result.url).toBe('');
+    });
+});
+// ─── upload() — validation ────────────────────────────────────────────────────
+describe('R2FileService — upload() — validation', () => {
+    it('throws when filename is missing', async () => {
+        const svc = makeService();
+        await expect(svc.upload({ mimeType: 'image/jpeg', content: 'aGVsbG8=', access: 'public' })).rejects.toThrow(utils_1.MedusaError);
+    });
+    it('propagates S3 send errors', async () => {
+        mockSend.mockRejectedValue(new Error('S3 network error'));
+        const svc = makeService();
+        await expect(svc.upload({
+            filename: 'photo.jpg',
+            mimeType: 'image/jpeg',
+            content: 'aGVsbG8=',
+            access: 'public'
+        })).rejects.toThrow('S3 network error');
+        expect(mockLogger.error).toHaveBeenCalled();
+    });
+});
+// ─── delete() ────────────────────────────────────────────────────────────────
+describe('R2FileService — delete()', () => {
+    it('sends DeleteObjectCommand for a single public file', async () => {
+        const svc = makeService();
+        await svc.delete({ fileKey: 'photo-TESTULID.jpg', access: 'public' });
+        expect(client_s3_1.DeleteObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'public-bucket', Key: 'photo-TESTULID.jpg' }));
+    });
+    it('sends DeleteObjectCommand for a single private file', async () => {
+        const svc = makeService();
+        await svc.delete({ fileKey: 'secret-TESTULID.pdf', access: 'private' });
+        expect(client_s3_1.DeleteObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket', Key: 'secret-TESTULID.pdf' }));
+    });
+    it('sends DeleteObjectsCommand for an array of files', async () => {
+        const svc = makeService();
+        await svc.delete([
+            { fileKey: 'file-1.jpg', access: 'public' },
+            { fileKey: 'file-2.jpg', access: 'public' }
+        ]);
+        expect(client_s3_1.DeleteObjectsCommand).toHaveBeenCalledWith(expect.objectContaining({
+            Bucket: 'public-bucket',
+            Delete: {
+                Objects: [{ Key: 'file-1.jpg' }, { Key: 'file-2.jpg' }],
+                Quiet: true
+            }
+        }));
+    });
+    it('logs errors instead of throwing on S3 failure', async () => {
+        mockSend.mockRejectedValue(new Error('Delete failed'));
+        const svc = makeService();
+        await expect(svc.delete({ fileKey: 'gone.jpg', access: 'public' })).resolves.toBeUndefined();
+        expect(mockLogger.error).toHaveBeenCalled();
+    });
+});
+// ─── getPresignedDownloadUrl() ────────────────────────────────────────────────
+describe('R2FileService — getPresignedDownloadUrl()', () => {
+    it('returns a signed URL for private files', async () => {
+        const svc = makeService();
+        const url = await svc.getPresignedDownloadUrl({
+            fileKey: 'secret-TESTULID.pdf',
+            access: 'private'
+        });
+        expect(url).toBe(SIGNED_URL);
+        expect(s3_request_presigner_1.getSignedUrl).toHaveBeenCalledTimes(1);
+    });
+    it('creates GetObjectCommand with private bucket and key', async () => {
+        const svc = makeService();
+        await svc.getPresignedDownloadUrl({
+            fileKey: 'report.pdf',
+            access: 'private'
+        });
+        expect(client_s3_1.GetObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket', Key: 'report.pdf' }));
+    });
+    it('uses the configured downloadFileDuration for expiry', async () => {
+        const svc = makeService({ downloadFileDuration: 1800 });
+        await svc.getPresignedDownloadUrl({ fileKey: 'file.pdf', access: 'private' });
+        expect(s3_request_presigner_1.getSignedUrl).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ expiresIn: 1800 }));
+    });
+    it('throws MedusaError for public files', async () => {
+        const svc = makeService();
+        await expect(svc.getPresignedDownloadUrl({ fileKey: 'photo.jpg', access: 'public' })).rejects.toThrow(utils_1.MedusaError);
+    });
+    it('throws with INVALID_DATA type for public files', async () => {
+        const svc = makeService();
+        await expect(svc.getPresignedDownloadUrl({ fileKey: 'photo.jpg', access: 'public' })).rejects.toMatchObject({ type: utils_1.MedusaError.Types.INVALID_DATA });
+    });
+});
+// ─── getPresignedUploadUrl() ──────────────────────────────────────────────────
+describe('R2FileService — getPresignedUploadUrl()', () => {
+    it('returns a signed URL and key for private files', async () => {
+        const svc = makeService();
+        const result = await svc.getPresignedUploadUrl({
+            filename: 'upload.pdf',
+            mimeType: 'application/pdf',
+            access: 'private'
+        });
+        expect(result.url).toBe(SIGNED_URL);
+        expect(result.key).toBe('upload.pdf'); // globalPrefix is '' by default
+    });
+    it('includes globalPrefix in the key', async () => {
+        const svc = makeService({ globalPrefix: 'docs/' });
+        const result = await svc.getPresignedUploadUrl({
+            filename: 'contract.pdf',
+            mimeType: 'application/pdf',
+            access: 'private'
+        });
+        expect(result.key).toBe('docs/contract.pdf');
+    });
+    it('creates PutObjectCommand with private bucket', async () => {
+        const svc = makeService();
+        await svc.getPresignedUploadUrl({
+            filename: 'upload.pdf',
+            mimeType: 'application/pdf',
+            access: 'private'
+        });
+        expect(client_s3_1.PutObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket' }));
+    });
+    it('uses the provided expiresIn duration', async () => {
+        const svc = makeService();
+        await svc.getPresignedUploadUrl({
+            filename: 'upload.pdf',
+            mimeType: 'application/pdf',
+            access: 'private',
+            expiresIn: 300
+        });
+        expect(s3_request_presigner_1.getSignedUrl).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ expiresIn: 300 }));
+    });
+    it('falls back to 3600s when expiresIn is not provided', async () => {
+        const svc = makeService();
+        await svc.getPresignedUploadUrl({
+            filename: 'upload.pdf',
+            mimeType: 'application/pdf',
+            access: 'private'
+        });
+        expect(s3_request_presigner_1.getSignedUrl).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ expiresIn: 3600 }));
+    });
+    it('throws MedusaError for public files', async () => {
+        const svc = makeService();
+        await expect(svc.getPresignedUploadUrl({
+            filename: 'photo.jpg',
+            mimeType: 'image/jpeg',
+            access: 'public'
+        })).rejects.toThrow(utils_1.MedusaError);
+    });
+    it('throws MedusaError when filename is missing', async () => {
+        const svc = makeService();
+        await expect(svc.getPresignedUploadUrl({
+            mimeType: 'application/pdf',
+            access: 'private'
+        })).rejects.toThrow(utils_1.MedusaError);
+    });
+});
+// ─── getDownloadStream() ──────────────────────────────────────────────────────
+describe('R2FileService — getDownloadStream()', () => {
+    it('throws when fileKey is missing', async () => {
+        const svc = makeService();
+        await expect(svc.getDownloadStream({ access: 'public' })).rejects.toThrow(utils_1.MedusaError);
+    });
+    it('sends GetObjectCommand to public bucket for public files', async () => {
+        const svc = makeService();
+        await svc.getDownloadStream({ fileKey: 'photo.jpg', access: 'public' });
+        expect(client_s3_1.GetObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'public-bucket', Key: 'photo.jpg' }));
+    });
+    it('sends GetObjectCommand to private bucket for private files', async () => {
+        const svc = makeService();
+        await svc.getDownloadStream({ fileKey: 'report.pdf', access: 'private' });
+        expect(client_s3_1.GetObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket', Key: 'report.pdf' }));
+    });
+    it('returns the response Body stream', async () => {
+        const fakeStream = { pipe: jest.fn() };
+        mockSend.mockResolvedValue({ Body: fakeStream });
+        const svc = makeService();
+        const result = await svc.getDownloadStream({ fileKey: 'photo.jpg', access: 'public' });
+        expect(result).toBe(fakeStream);
+    });
+});
+// ─── getAsBuffer() ────────────────────────────────────────────────────────────
+describe('R2FileService — getAsBuffer()', () => {
+    it('throws when fileKey is missing', async () => {
+        const svc = makeService();
+        await expect(svc.getAsBuffer({ access: 'public' })).rejects.toThrow(utils_1.MedusaError);
+    });
+    it('sends GetObjectCommand to public bucket for public files', async () => {
+        const svc = makeService();
+        await svc.getAsBuffer({ fileKey: 'photo.jpg', access: 'public' });
+        expect(client_s3_1.GetObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'public-bucket', Key: 'photo.jpg' }));
+    });
+    it('sends GetObjectCommand to private bucket for private files', async () => {
+        const svc = makeService();
+        await svc.getAsBuffer({ fileKey: 'report.pdf', access: 'private' });
+        expect(client_s3_1.GetObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket', Key: 'report.pdf' }));
+    });
+    it('returns file contents as a Buffer', async () => {
+        const content = new Uint8Array([1, 2, 3, 4, 5]);
+        mockSend.mockResolvedValue({
+            Body: { transformToByteArray: jest.fn().mockResolvedValue(content) }
+        });
+        const svc = makeService();
+        const result = await svc.getAsBuffer({ fileKey: 'data.bin', access: 'public' });
+        expect(Buffer.isBuffer(result)).toBe(true);
+        expect(result).toEqual(Buffer.from(content));
+    });
+});
+// ─── getUploadStream() ────────────────────────────────────────────────────────
+describe('R2FileService — getUploadStream()', () => {
+    it('throws when filename is missing', async () => {
+        const svc = makeService();
+        await expect(svc.getUploadStream({ mimeType: 'image/jpeg', access: 'public' })).rejects.toThrow(utils_1.MedusaError);
+    });
+    it('returns writeStream, promise, url, and fileKey', async () => {
+        const svc = makeService();
+        const result = await svc.getUploadStream({
+            filename: 'video.mp4',
+            mimeType: 'video/mp4',
+            access: 'public'
+        });
+        expect(result.writeStream).toBeDefined();
+        expect(result.promise).toBeInstanceOf(Promise);
+        expect(result.url).toContain('cdn.example.com');
+        expect(result.fileKey).toMatch(/^video-TESTULID/);
+    });
+    it('passes public bucket to Upload for public access', async () => {
+        const svc = makeService();
+        await svc.getUploadStream({
+            filename: 'video.mp4',
+            mimeType: 'video/mp4',
+            access: 'public'
+        });
+        const uploadCall = lib_storage_1.Upload.mock.calls[0][0];
+        expect(uploadCall.params.Bucket).toBe('public-bucket');
+    });
+    it('passes private bucket to Upload for private access', async () => {
+        const svc = makeService();
+        await svc.getUploadStream({
+            filename: 'backup.zip',
+            mimeType: 'application/zip',
+            access: 'private'
+        });
+        const uploadCall = lib_storage_1.Upload.mock.calls[0][0];
+        expect(uploadCall.params.Bucket).toBe('private-bucket');
+    });
+    it('promise resolves to url + key for public upload', async () => {
+        mockUploadDone.mockResolvedValue({});
+        const svc = makeService();
+        const { promise } = await svc.getUploadStream({
+            filename: 'photo.jpg',
+            mimeType: 'image/jpeg',
+            access: 'public'
+        });
+        const result = await promise;
+        expect(result.url).toMatch(/^https:\/\/cdn\.example\.com\//);
+        expect(result.key).toMatch(/^photo-TESTULID/);
+    });
+    it('promise resolves to empty url for private upload', async () => {
+        mockUploadDone.mockResolvedValue({});
+        const svc = makeService();
+        const { promise } = await svc.getUploadStream({
+            filename: 'secret.zip',
+            mimeType: 'application/zip',
+            access: 'private'
+        });
+        const result = await promise;
+        expect(result.url).toBe('');
+        expect(result.key).toMatch(/^secret-TESTULID/);
+    });
+});
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provider.unit.spec.js","sourceRoot":"","sources":["../../../../../src/providers/__tests__/provider.unit.spec.ts"],"names":[],"mappings":"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"}

package/.medusa/server/src/providers/r2/index.d.ts

@@ -0,0 +1,3 @@
+declare const _default: import("@medusajs/types").ModuleProviderExports;
+export default _default;
+export * from './provider';

package/.medusa/server/src/providers/r2/index.js

@@ -1,8 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@medusajs/framework/utils");
 const provider_1 = require("./provider");
 exports.default = (0, utils_1.ModuleProvider)(utils_1.Modules.FILE, {
     services: [provider_1.R2FileProvider]
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3IyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEscURBQW1FO0FBQ25FLHlDQUEyQztBQUUzQyxrQkFBZSxJQUFBLHNCQUFjLEVBQUMsZUFBTyxDQUFDLElBQUksRUFBRTtJQUMzQyxRQUFRLEVBQUUsQ0FBQyx5QkFBYyxDQUFDO0NBQzFCLENBQUMsQ0FBQSJ9
+__exportStar(require("./provider"), exports);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3IyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxxREFBbUU7QUFDbkUseUNBQTJDO0FBRTNDLGtCQUFlLElBQUEsc0JBQWMsRUFBQyxlQUFPLENBQUMsSUFBSSxFQUFFO0lBQzNDLFFBQVEsRUFBRSxDQUFDLHlCQUFjLENBQUM7Q0FDMUIsQ0FBQyxDQUFBO0FBRUYsNkNBQTBCIn0=

package/.medusa/server/src/providers/r2/provider.d.ts

@@ -0,0 +1,52 @@
+import { S3Client } from '@aws-sdk/client-s3';
+import { FileTypes, Logger } from '@medusajs/framework/types';
+import { AbstractFileProviderService } from '@medusajs/framework/utils';
+import { Readable, Writable } from 'stream';
+type InjectedDependencies = {
+    logger: Logger;
+};
+export interface R2FileProviderConfig {
+    region: string;
+    bucket: string;
+    accessKeyId?: string;
+    secretAccessKey?: string;
+    fileUrl: string;
+    endpoint?: string;
+    globalPrefix?: string;
+    cacheControl?: string;
+    downloadFileDuration?: number;
+    additionalClientConfig?: Record<string, any>;
+    privateRegion?: string;
+    privateBucket?: string;
+    privateAccessKeyId?: string;
+    privateSecretAccessKey?: string;
+    privateEndpoint?: string;
+}
+export declare class R2FileProvider extends AbstractFileProviderService {
+    static identifier: string;
+    protected config_: R2FileProviderConfig;
+    protected logger_: Logger;
+    protected client_: S3Client;
+    protected privateClient_: S3Client;
+    constructor({ logger }: InjectedDependencies, options: R2FileProviderConfig);
+    protected getClient(priv?: boolean): S3Client;
+    upload(file: FileTypes.ProviderUploadFileDTO & {
+        prefix?: string;
+    }): Promise<FileTypes.ProviderFileResultDTO>;
+    getUploadStream(fileData: FileTypes.ProviderUploadStreamDTO & {
+        prefix?: string;
+    }): Promise<{
+        writeStream: Writable;
+        promise: Promise<FileTypes.ProviderFileResultDTO>;
+        url: string;
+        fileKey: string;
+    }>;
+    delete(files: FileTypes.ProviderDeleteFileDTO | FileTypes.ProviderDeleteFileDTO[]): Promise<void>;
+    deleteByUrl(url: string): Promise<void>;
+    getPresignedDownloadUrl(fileData: FileTypes.ProviderGetFileDTO): Promise<string>;
+    getPresignedUploadUrl(fileData: FileTypes.ProviderGetPresignedUploadUrlDTO): Promise<FileTypes.ProviderFileResultDTO>;
+    getDownloadStream(file: FileTypes.ProviderGetFileDTO): Promise<Readable>;
+    getAsBuffer(file: FileTypes.ProviderGetFileDTO): Promise<Buffer>;
+    private getFileKey;
+}
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "medusa-plugin-r2",
-	"version": "1.0.4",
+	"version": "1.1.1",
 	"description": "R2 file storage provider for Medusa v2",
 	"author": "Lacey Pevey",
 	"license": "MIT",
@@ -14,11 +14,26 @@
 	],
 	"exports": {
 		"./package.json": "./package.json",
-		"./.medusa/server/src/modules/*": "./.medusa/server/src/modules/*/index.js",
-		"./modules/*": "./.medusa/server/src/modules/*/index.js",
-		"./providers/*": "./.medusa/server/src/providers/*/index.js",
-		"./*": "./.medusa/server/src/*.js",
-		".": "./.medusa/server/src/providers/r2/index.js"
+		"./.medusa/server/src/modules/*": {
+			"types": "./.medusa/server/src/modules/*/index.d.ts",
+			"default": "./.medusa/server/src/modules/*/index.js"
+		},
+		"./modules/*": {
+			"types": "./.medusa/server/src/modules/*/index.d.ts",
+			"default": "./.medusa/server/src/modules/*/index.js"
+		},
+		"./providers/*": {
+			"types": "./.medusa/server/src/providers/*/index.d.ts",
+			"default": "./.medusa/server/src/providers/*/index.js"
+		},
+		"./*": {
+			"types": "./.medusa/server/src/*.d.ts",
+			"default": "./.medusa/server/src/*.js"
+		},
+		".": {
+			"types": "./.medusa/server/src/providers/r2/index.d.ts",
+			"default": "./.medusa/server/src/providers/r2/index.js"
+		}
 	},
 	"keywords": [
 		"medusa-plugin-integration",
@@ -39,40 +54,35 @@
 		"test:integration": "NODE_OPTIONS=--experimental-vm-modules jest --silent --runInBand --detectOpenHandles --forceExit -- integration-tests"
 	},
 	"devDependencies": {
-		"@medusajs/admin-sdk": "2.13.6",
-		"@medusajs/cli": "2.13.6",
-		"@medusajs/framework": "2.13.6",
-		"@medusajs/icons": "2.13.6",
-		"@medusajs/medusa": "2.13.6",
-		"@medusajs/test-utils": "2.13.6",
-		"@medusajs/ui": "4.0.25",
-		"@swc/core": "^1.7.28",
-		"@swc/jest": "^0.2.39",
-		"@types/jest": "^30.0.0",
-		"@types/node": "^20.0.0",
-		"@types/react": "^18.3.2",
-		"@types/react-dom": "^18.2.25",
-		"axios": "^1.7.0",
-		"jest": "^29.7.0",
-		"prop-types": "^15.8.1",
-		"react": "^18.2.0",
-		"react-dom": "^18.2.0",
-		"ts-node": "^10.9.2",
-		"typescript": "^5.6.2",
-		"vite": "^5.2.11",
-		"yalc": "^1.0.0-pre.53"
+		"@medusajs/admin-sdk": "2.16.0",
+		"@medusajs/cli": "2.16.0",
+		"@medusajs/framework": "2.16.0",
+		"@medusajs/icons": "2.16.0",
+		"@medusajs/ui": "4.1.16",
+		"@swc/core": "1.15.33",
+		"@swc/jest": "0.2.39",
+		"@types/jest": "30.0.0",
+		"@types/node": "20.0.0",
+		"@types/react": "18.3.2",
+		"@types/react-dom": "18.2.25",
+		"axios": "1.7.0",
+		"jest": "29.7.0",
+		"prop-types": "15.8.1",
+		"react": "18.3.1",
+		"react-dom": "18.3.1",
+		"ts-node": "10.9.2",
+		"typescript": "6.0.3",
+		"vite": "8.0.8",
+		"yalc": "1.0.0-pre.53"
 	},
 	"peerDependencies": {
-		"@medusajs/admin-sdk": "2.13.6",
-		"@medusajs/cli": "2.13.6",
-		"@medusajs/framework": "2.13.6",
-		"@medusajs/icons": "2.13.6",
-		"@medusajs/medusa": "2.13.6",
-		"@medusajs/test-utils": "2.13.6",
-		"@medusajs/ui": "4.0.25"
+		"@medusajs/framework": "2.16.0",
+		"@medusajs/js-sdk": "2.16.0",
+		"@medusajs/medusa": "2.16.0"
 	},
 	"engines": {
 		"node": ">=20"
 	},
-	"packageManager": "yarn@4.13.0+sha512.5c20ba010c99815433e5c8453112165e673f1c7948d8d2b267f4b5e52097538658388ebc9f9580656d9b75c5cc996f990f611f99304a2197d4c56d21eea370e7"
-}
+	"packageManager": "yarn@4.13.0+sha512.5c20ba010c99815433e5c8453112165e673f1c7948d8d2b267f4b5e52097538658388ebc9f9580656d9b75c5cc996f990f611f99304a2197d4c56d21eea370e7",
+	"gitHead": "e09c71de0e01897fa9441b40b67315b5a7b6d5bf"
+}