medusa-plugin-r2 1.1.0 → 1.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,516 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/// <reference types="jest" />
|
|
4
|
+
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
5
|
+
const lib_storage_1 = require("@aws-sdk/lib-storage");
|
|
6
|
+
const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
|
|
7
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
8
|
+
const provider_1 = require("../r2/provider");
|
|
9
|
+
jest.mock('@aws-sdk/client-s3');
|
|
10
|
+
jest.mock('@aws-sdk/lib-storage');
|
|
11
|
+
jest.mock('@aws-sdk/s3-request-presigner');
|
|
12
|
+
jest.mock('ulid', () => ({ ulid: () => 'TESTULID0000000000000000' }));
|
|
13
|
+
// ─── Helpers ─────────────────────────────────────────────────────────────────
|
|
14
|
+
const SIGNED_URL = 'https://signed.r2.example.com/file?X-Amz-Signature=abc';
|
|
15
|
+
const baseOptions = {
|
|
16
|
+
region: 'auto',
|
|
17
|
+
bucket: 'public-bucket',
|
|
18
|
+
accessKeyId: 'pub-key-id',
|
|
19
|
+
secretAccessKey: 'pub-secret',
|
|
20
|
+
fileUrl: 'https://cdn.example.com',
|
|
21
|
+
endpoint: 'https://account.r2.cloudflarestorage.com',
|
|
22
|
+
privateRegion: 'auto',
|
|
23
|
+
privateBucket: 'private-bucket',
|
|
24
|
+
privateAccessKeyId: 'priv-key-id',
|
|
25
|
+
privateSecretAccessKey: 'priv-secret',
|
|
26
|
+
privateEndpoint: 'https://account-private.r2.cloudflarestorage.com'
|
|
27
|
+
};
|
|
28
|
+
const mockLogger = {
|
|
29
|
+
error: jest.fn(),
|
|
30
|
+
info: jest.fn(),
|
|
31
|
+
warn: jest.fn(),
|
|
32
|
+
debug: jest.fn()
|
|
33
|
+
};
|
|
34
|
+
function makeService(overrides = {}) {
|
|
35
|
+
return new provider_1.R2FileProvider({ logger: mockLogger }, { ...baseOptions, ...overrides });
|
|
36
|
+
}
|
|
37
|
+
// ─── Mock state ───────────────────────────────────────────────────────────────
|
|
38
|
+
let mockSend;
|
|
39
|
+
let mockUploadDone;
|
|
40
|
+
beforeEach(() => {
|
|
41
|
+
jest.clearAllMocks();
|
|
42
|
+
mockSend = jest.fn().mockResolvedValue({
|
|
43
|
+
Body: {
|
|
44
|
+
transformToByteArray: jest.fn().mockResolvedValue(new Uint8Array([72, 101, 108, 108, 111]))
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
client_s3_1.S3Client.mockImplementation(() => ({ send: mockSend, destroy: jest.fn() }));
|
|
48
|
+
mockUploadDone = jest.fn().mockResolvedValue({});
|
|
49
|
+
lib_storage_1.Upload.mockImplementation(() => ({ done: mockUploadDone }));
|
|
50
|
+
s3_request_presigner_1.getSignedUrl.mockResolvedValue(SIGNED_URL);
|
|
51
|
+
});
|
|
52
|
+
// ─── Constructor ──────────────────────────────────────────────────────────────
|
|
53
|
+
describe('R2FileService — constructor', () => {
|
|
54
|
+
it('throws when accessKeyId is missing', () => {
|
|
55
|
+
expect(() => makeService({ accessKeyId: undefined })).toThrow(utils_1.MedusaError);
|
|
56
|
+
});
|
|
57
|
+
it('throws when secretAccessKey is missing', () => {
|
|
58
|
+
expect(() => makeService({ secretAccessKey: undefined })).toThrow(utils_1.MedusaError);
|
|
59
|
+
});
|
|
60
|
+
it('throws when private bucket config is incomplete', () => {
|
|
61
|
+
expect(() => makeService({ privateBucket: undefined })).toThrow(utils_1.MedusaError);
|
|
62
|
+
});
|
|
63
|
+
it('throws when privateAccessKeyId is missing', () => {
|
|
64
|
+
expect(() => makeService({ privateAccessKeyId: undefined })).toThrow(utils_1.MedusaError);
|
|
65
|
+
});
|
|
66
|
+
it('constructs successfully with full config', () => {
|
|
67
|
+
expect(() => makeService()).not.toThrow();
|
|
68
|
+
});
|
|
69
|
+
it('creates two S3Client instances (public + private)', () => {
|
|
70
|
+
makeService();
|
|
71
|
+
expect(client_s3_1.S3Client).toHaveBeenCalledTimes(2);
|
|
72
|
+
});
|
|
73
|
+
it('applies globalPrefix default to empty string', () => {
|
|
74
|
+
const svc = makeService({ globalPrefix: undefined });
|
|
75
|
+
expect(svc.config_.globalPrefix).toBe('');
|
|
76
|
+
});
|
|
77
|
+
it('applies custom globalPrefix', () => {
|
|
78
|
+
const svc = makeService({ globalPrefix: 'media/' });
|
|
79
|
+
expect(svc.config_.globalPrefix).toBe('media/');
|
|
80
|
+
});
|
|
81
|
+
it('uses default cacheControl when not specified', () => {
|
|
82
|
+
const svc = makeService({ cacheControl: undefined });
|
|
83
|
+
expect(svc.config_.cacheControl).toBe('public, max-age=31536000');
|
|
84
|
+
});
|
|
85
|
+
it('uses default downloadFileDuration of 3600', () => {
|
|
86
|
+
const svc = makeService({ downloadFileDuration: undefined });
|
|
87
|
+
expect(svc.config_.downloadFileDuration).toBe(3600);
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
// ─── upload() — public ACL ────────────────────────────────────────────────────
|
|
91
|
+
describe('R2FileService — upload() — public', () => {
|
|
92
|
+
it('sends PutObjectCommand to the public bucket', async () => {
|
|
93
|
+
const svc = makeService();
|
|
94
|
+
await svc.upload({
|
|
95
|
+
filename: 'photo.jpg',
|
|
96
|
+
mimeType: 'image/jpeg',
|
|
97
|
+
content: 'aGVsbG8=', // base64 "hello"
|
|
98
|
+
access: 'public'
|
|
99
|
+
});
|
|
100
|
+
expect(client_s3_1.PutObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'public-bucket' }));
|
|
101
|
+
expect(mockSend).toHaveBeenCalledTimes(1);
|
|
102
|
+
});
|
|
103
|
+
it('returns a public CDN url with encoded key', async () => {
|
|
104
|
+
const svc = makeService();
|
|
105
|
+
const result = await svc.upload({
|
|
106
|
+
filename: 'photo.jpg',
|
|
107
|
+
mimeType: 'image/jpeg',
|
|
108
|
+
content: 'aGVsbG8=',
|
|
109
|
+
access: 'public'
|
|
110
|
+
});
|
|
111
|
+
expect(result.url).toMatch(/^https:\/\/cdn\.example\.com\//);
|
|
112
|
+
expect(result.key).toMatch(/^photo-TESTULID0000000000000000\.jpg$/);
|
|
113
|
+
});
|
|
114
|
+
it('includes globalPrefix in the file key', async () => {
|
|
115
|
+
const svc = makeService({ globalPrefix: 'uploads/' });
|
|
116
|
+
const result = await svc.upload({
|
|
117
|
+
filename: 'banner.png',
|
|
118
|
+
mimeType: 'image/png',
|
|
119
|
+
content: 'aGVsbG8=',
|
|
120
|
+
access: 'public'
|
|
121
|
+
});
|
|
122
|
+
expect(result.key).toMatch(/^uploads\/banner-/);
|
|
123
|
+
});
|
|
124
|
+
it('includes the file prefix in the key when provided', async () => {
|
|
125
|
+
const svc = makeService();
|
|
126
|
+
const result = await svc.upload({
|
|
127
|
+
filename: 'thumb.png',
|
|
128
|
+
mimeType: 'image/png',
|
|
129
|
+
content: 'aGVsbG8=',
|
|
130
|
+
access: 'public',
|
|
131
|
+
prefix: 'thumbnails/'
|
|
132
|
+
});
|
|
133
|
+
expect(result.key).toMatch(/^thumbnails\/thumb-/);
|
|
134
|
+
});
|
|
135
|
+
it('stores original-filename in object metadata', async () => {
|
|
136
|
+
const svc = makeService();
|
|
137
|
+
await svc.upload({
|
|
138
|
+
filename: 'my file.pdf',
|
|
139
|
+
mimeType: 'application/pdf',
|
|
140
|
+
content: 'aGVsbG8=',
|
|
141
|
+
access: 'public'
|
|
142
|
+
});
|
|
143
|
+
expect(client_s3_1.PutObjectCommand).toHaveBeenCalledWith(expect.objectContaining({
|
|
144
|
+
Metadata: expect.objectContaining({
|
|
145
|
+
'original-filename': encodeURIComponent('my file.pdf')
|
|
146
|
+
})
|
|
147
|
+
}));
|
|
148
|
+
});
|
|
149
|
+
it('sets ContentType on the command', async () => {
|
|
150
|
+
const svc = makeService();
|
|
151
|
+
await svc.upload({
|
|
152
|
+
filename: 'doc.pdf',
|
|
153
|
+
mimeType: 'application/pdf',
|
|
154
|
+
content: 'aGVsbG8=',
|
|
155
|
+
access: 'public'
|
|
156
|
+
});
|
|
157
|
+
expect(client_s3_1.PutObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ ContentType: 'application/pdf' }));
|
|
158
|
+
});
|
|
159
|
+
it('decodes valid base64 content', async () => {
|
|
160
|
+
const svc = makeService();
|
|
161
|
+
const b64 = Buffer.from('Hello World').toString('base64'); // 'SGVsbG8gV29ybGQ='
|
|
162
|
+
await svc.upload({
|
|
163
|
+
filename: 'hello.txt',
|
|
164
|
+
mimeType: 'text/plain',
|
|
165
|
+
content: b64,
|
|
166
|
+
access: 'public'
|
|
167
|
+
});
|
|
168
|
+
const [call] = client_s3_1.PutObjectCommand.mock.calls;
|
|
169
|
+
const body = call[0].Body;
|
|
170
|
+
expect(body.toString('utf8')).toBe('Hello World');
|
|
171
|
+
});
|
|
172
|
+
it('treats non-base64 content as utf8', async () => {
|
|
173
|
+
const svc = makeService();
|
|
174
|
+
await svc.upload({
|
|
175
|
+
filename: 'data.json',
|
|
176
|
+
mimeType: 'application/json',
|
|
177
|
+
content: '{"key":"value"}',
|
|
178
|
+
access: 'public'
|
|
179
|
+
});
|
|
180
|
+
const [call] = client_s3_1.PutObjectCommand.mock.calls;
|
|
181
|
+
const body = call[0].Body;
|
|
182
|
+
expect(body.toString('utf8')).toBe('{"key":"value"}');
|
|
183
|
+
});
|
|
184
|
+
it('handles PNG image upload', async () => {
|
|
185
|
+
const svc = makeService();
|
|
186
|
+
const fakePng = Buffer.from([0x89, 0x50, 0x4e, 0x47]).toString('base64');
|
|
187
|
+
const result = await svc.upload({
|
|
188
|
+
filename: 'image.png',
|
|
189
|
+
mimeType: 'image/png',
|
|
190
|
+
content: fakePng,
|
|
191
|
+
access: 'public'
|
|
192
|
+
});
|
|
193
|
+
expect(result.url).toContain('cdn.example.com');
|
|
194
|
+
expect(result.key).toContain('.png');
|
|
195
|
+
});
|
|
196
|
+
it('handles SVG upload', async () => {
|
|
197
|
+
const svc = makeService();
|
|
198
|
+
const result = await svc.upload({
|
|
199
|
+
filename: 'icon.svg',
|
|
200
|
+
mimeType: 'image/svg+xml',
|
|
201
|
+
content: '<svg xmlns="http://www.w3.org/2000/svg"/>',
|
|
202
|
+
access: 'public'
|
|
203
|
+
});
|
|
204
|
+
expect(result.key).toContain('.svg');
|
|
205
|
+
});
|
|
206
|
+
it('preserves file extension including double extensions', async () => {
|
|
207
|
+
const svc = makeService();
|
|
208
|
+
const result = await svc.upload({
|
|
209
|
+
filename: 'archive.tar.gz',
|
|
210
|
+
mimeType: 'application/gzip',
|
|
211
|
+
content: 'aGVsbG8=',
|
|
212
|
+
access: 'public'
|
|
213
|
+
});
|
|
214
|
+
// path.parse('archive.tar.gz').ext === '.gz'
|
|
215
|
+
expect(result.key).toMatch(/\.gz$/);
|
|
216
|
+
});
|
|
217
|
+
});
|
|
218
|
+
// ─── upload() — private ACL ───────────────────────────────────────────────────
|
|
219
|
+
describe('R2FileService — upload() — private', () => {
|
|
220
|
+
it('sends PutObjectCommand to the private bucket', async () => {
|
|
221
|
+
const svc = makeService();
|
|
222
|
+
await svc.upload({
|
|
223
|
+
filename: 'report.pdf',
|
|
224
|
+
mimeType: 'application/pdf',
|
|
225
|
+
content: 'aGVsbG8=',
|
|
226
|
+
access: 'private'
|
|
227
|
+
});
|
|
228
|
+
expect(client_s3_1.PutObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket' }));
|
|
229
|
+
});
|
|
230
|
+
it('returns an empty url for private files', async () => {
|
|
231
|
+
const svc = makeService();
|
|
232
|
+
const result = await svc.upload({
|
|
233
|
+
filename: 'secret.pdf',
|
|
234
|
+
mimeType: 'application/pdf',
|
|
235
|
+
content: 'aGVsbG8=',
|
|
236
|
+
access: 'private'
|
|
237
|
+
});
|
|
238
|
+
expect(result.url).toBe('');
|
|
239
|
+
expect(result.key).toBeTruthy();
|
|
240
|
+
});
|
|
241
|
+
it('handles CSV upload to private bucket', async () => {
|
|
242
|
+
const svc = makeService();
|
|
243
|
+
const result = await svc.upload({
|
|
244
|
+
filename: 'export.csv',
|
|
245
|
+
mimeType: 'text/csv',
|
|
246
|
+
content: 'id,name\n1,Alice',
|
|
247
|
+
access: 'private'
|
|
248
|
+
});
|
|
249
|
+
expect(result.key).toContain('.csv');
|
|
250
|
+
expect(result.url).toBe('');
|
|
251
|
+
});
|
|
252
|
+
});
|
|
253
|
+
// ─── upload() — validation ────────────────────────────────────────────────────
|
|
254
|
+
describe('R2FileService — upload() — validation', () => {
|
|
255
|
+
it('throws when filename is missing', async () => {
|
|
256
|
+
const svc = makeService();
|
|
257
|
+
await expect(svc.upload({ mimeType: 'image/jpeg', content: 'aGVsbG8=', access: 'public' })).rejects.toThrow(utils_1.MedusaError);
|
|
258
|
+
});
|
|
259
|
+
it('propagates S3 send errors', async () => {
|
|
260
|
+
mockSend.mockRejectedValue(new Error('S3 network error'));
|
|
261
|
+
const svc = makeService();
|
|
262
|
+
await expect(svc.upload({
|
|
263
|
+
filename: 'photo.jpg',
|
|
264
|
+
mimeType: 'image/jpeg',
|
|
265
|
+
content: 'aGVsbG8=',
|
|
266
|
+
access: 'public'
|
|
267
|
+
})).rejects.toThrow('S3 network error');
|
|
268
|
+
expect(mockLogger.error).toHaveBeenCalled();
|
|
269
|
+
});
|
|
270
|
+
});
|
|
271
|
+
// ─── delete() ────────────────────────────────────────────────────────────────
|
|
272
|
+
describe('R2FileService — delete()', () => {
|
|
273
|
+
it('sends DeleteObjectCommand for a single public file', async () => {
|
|
274
|
+
const svc = makeService();
|
|
275
|
+
await svc.delete({ fileKey: 'photo-TESTULID.jpg', access: 'public' });
|
|
276
|
+
expect(client_s3_1.DeleteObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'public-bucket', Key: 'photo-TESTULID.jpg' }));
|
|
277
|
+
});
|
|
278
|
+
it('sends DeleteObjectCommand for a single private file', async () => {
|
|
279
|
+
const svc = makeService();
|
|
280
|
+
await svc.delete({ fileKey: 'secret-TESTULID.pdf', access: 'private' });
|
|
281
|
+
expect(client_s3_1.DeleteObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket', Key: 'secret-TESTULID.pdf' }));
|
|
282
|
+
});
|
|
283
|
+
it('sends DeleteObjectsCommand for an array of files', async () => {
|
|
284
|
+
const svc = makeService();
|
|
285
|
+
await svc.delete([
|
|
286
|
+
{ fileKey: 'file-1.jpg', access: 'public' },
|
|
287
|
+
{ fileKey: 'file-2.jpg', access: 'public' }
|
|
288
|
+
]);
|
|
289
|
+
expect(client_s3_1.DeleteObjectsCommand).toHaveBeenCalledWith(expect.objectContaining({
|
|
290
|
+
Bucket: 'public-bucket',
|
|
291
|
+
Delete: {
|
|
292
|
+
Objects: [{ Key: 'file-1.jpg' }, { Key: 'file-2.jpg' }],
|
|
293
|
+
Quiet: true
|
|
294
|
+
}
|
|
295
|
+
}));
|
|
296
|
+
});
|
|
297
|
+
it('logs errors instead of throwing on S3 failure', async () => {
|
|
298
|
+
mockSend.mockRejectedValue(new Error('Delete failed'));
|
|
299
|
+
const svc = makeService();
|
|
300
|
+
await expect(svc.delete({ fileKey: 'gone.jpg', access: 'public' })).resolves.toBeUndefined();
|
|
301
|
+
expect(mockLogger.error).toHaveBeenCalled();
|
|
302
|
+
});
|
|
303
|
+
});
|
|
304
|
+
// ─── getPresignedDownloadUrl() ────────────────────────────────────────────────
|
|
305
|
+
describe('R2FileService — getPresignedDownloadUrl()', () => {
|
|
306
|
+
it('returns a signed URL for private files', async () => {
|
|
307
|
+
const svc = makeService();
|
|
308
|
+
const url = await svc.getPresignedDownloadUrl({
|
|
309
|
+
fileKey: 'secret-TESTULID.pdf',
|
|
310
|
+
access: 'private'
|
|
311
|
+
});
|
|
312
|
+
expect(url).toBe(SIGNED_URL);
|
|
313
|
+
expect(s3_request_presigner_1.getSignedUrl).toHaveBeenCalledTimes(1);
|
|
314
|
+
});
|
|
315
|
+
it('creates GetObjectCommand with private bucket and key', async () => {
|
|
316
|
+
const svc = makeService();
|
|
317
|
+
await svc.getPresignedDownloadUrl({
|
|
318
|
+
fileKey: 'report.pdf',
|
|
319
|
+
access: 'private'
|
|
320
|
+
});
|
|
321
|
+
expect(client_s3_1.GetObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket', Key: 'report.pdf' }));
|
|
322
|
+
});
|
|
323
|
+
it('uses the configured downloadFileDuration for expiry', async () => {
|
|
324
|
+
const svc = makeService({ downloadFileDuration: 1800 });
|
|
325
|
+
await svc.getPresignedDownloadUrl({ fileKey: 'file.pdf', access: 'private' });
|
|
326
|
+
expect(s3_request_presigner_1.getSignedUrl).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ expiresIn: 1800 }));
|
|
327
|
+
});
|
|
328
|
+
it('throws MedusaError for public files', async () => {
|
|
329
|
+
const svc = makeService();
|
|
330
|
+
await expect(svc.getPresignedDownloadUrl({ fileKey: 'photo.jpg', access: 'public' })).rejects.toThrow(utils_1.MedusaError);
|
|
331
|
+
});
|
|
332
|
+
it('throws with INVALID_DATA type for public files', async () => {
|
|
333
|
+
const svc = makeService();
|
|
334
|
+
await expect(svc.getPresignedDownloadUrl({ fileKey: 'photo.jpg', access: 'public' })).rejects.toMatchObject({ type: utils_1.MedusaError.Types.INVALID_DATA });
|
|
335
|
+
});
|
|
336
|
+
});
|
|
337
|
+
// ─── getPresignedUploadUrl() ──────────────────────────────────────────────────
|
|
338
|
+
describe('R2FileService — getPresignedUploadUrl()', () => {
|
|
339
|
+
it('returns a signed URL and key for private files', async () => {
|
|
340
|
+
const svc = makeService();
|
|
341
|
+
const result = await svc.getPresignedUploadUrl({
|
|
342
|
+
filename: 'upload.pdf',
|
|
343
|
+
mimeType: 'application/pdf',
|
|
344
|
+
access: 'private'
|
|
345
|
+
});
|
|
346
|
+
expect(result.url).toBe(SIGNED_URL);
|
|
347
|
+
expect(result.key).toBe('upload.pdf'); // globalPrefix is '' by default
|
|
348
|
+
});
|
|
349
|
+
it('includes globalPrefix in the key', async () => {
|
|
350
|
+
const svc = makeService({ globalPrefix: 'docs/' });
|
|
351
|
+
const result = await svc.getPresignedUploadUrl({
|
|
352
|
+
filename: 'contract.pdf',
|
|
353
|
+
mimeType: 'application/pdf',
|
|
354
|
+
access: 'private'
|
|
355
|
+
});
|
|
356
|
+
expect(result.key).toBe('docs/contract.pdf');
|
|
357
|
+
});
|
|
358
|
+
it('creates PutObjectCommand with private bucket', async () => {
|
|
359
|
+
const svc = makeService();
|
|
360
|
+
await svc.getPresignedUploadUrl({
|
|
361
|
+
filename: 'upload.pdf',
|
|
362
|
+
mimeType: 'application/pdf',
|
|
363
|
+
access: 'private'
|
|
364
|
+
});
|
|
365
|
+
expect(client_s3_1.PutObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket' }));
|
|
366
|
+
});
|
|
367
|
+
it('uses the provided expiresIn duration', async () => {
|
|
368
|
+
const svc = makeService();
|
|
369
|
+
await svc.getPresignedUploadUrl({
|
|
370
|
+
filename: 'upload.pdf',
|
|
371
|
+
mimeType: 'application/pdf',
|
|
372
|
+
access: 'private',
|
|
373
|
+
expiresIn: 300
|
|
374
|
+
});
|
|
375
|
+
expect(s3_request_presigner_1.getSignedUrl).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ expiresIn: 300 }));
|
|
376
|
+
});
|
|
377
|
+
it('falls back to 3600s when expiresIn is not provided', async () => {
|
|
378
|
+
const svc = makeService();
|
|
379
|
+
await svc.getPresignedUploadUrl({
|
|
380
|
+
filename: 'upload.pdf',
|
|
381
|
+
mimeType: 'application/pdf',
|
|
382
|
+
access: 'private'
|
|
383
|
+
});
|
|
384
|
+
expect(s3_request_presigner_1.getSignedUrl).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.objectContaining({ expiresIn: 3600 }));
|
|
385
|
+
});
|
|
386
|
+
it('throws MedusaError for public files', async () => {
|
|
387
|
+
const svc = makeService();
|
|
388
|
+
await expect(svc.getPresignedUploadUrl({
|
|
389
|
+
filename: 'photo.jpg',
|
|
390
|
+
mimeType: 'image/jpeg',
|
|
391
|
+
access: 'public'
|
|
392
|
+
})).rejects.toThrow(utils_1.MedusaError);
|
|
393
|
+
});
|
|
394
|
+
it('throws MedusaError when filename is missing', async () => {
|
|
395
|
+
const svc = makeService();
|
|
396
|
+
await expect(svc.getPresignedUploadUrl({
|
|
397
|
+
mimeType: 'application/pdf',
|
|
398
|
+
access: 'private'
|
|
399
|
+
})).rejects.toThrow(utils_1.MedusaError);
|
|
400
|
+
});
|
|
401
|
+
});
|
|
402
|
+
// ─── getDownloadStream() ──────────────────────────────────────────────────────
|
|
403
|
+
describe('R2FileService — getDownloadStream()', () => {
|
|
404
|
+
it('throws when fileKey is missing', async () => {
|
|
405
|
+
const svc = makeService();
|
|
406
|
+
await expect(svc.getDownloadStream({ access: 'public' })).rejects.toThrow(utils_1.MedusaError);
|
|
407
|
+
});
|
|
408
|
+
it('sends GetObjectCommand to public bucket for public files', async () => {
|
|
409
|
+
const svc = makeService();
|
|
410
|
+
await svc.getDownloadStream({ fileKey: 'photo.jpg', access: 'public' });
|
|
411
|
+
expect(client_s3_1.GetObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'public-bucket', Key: 'photo.jpg' }));
|
|
412
|
+
});
|
|
413
|
+
it('sends GetObjectCommand to private bucket for private files', async () => {
|
|
414
|
+
const svc = makeService();
|
|
415
|
+
await svc.getDownloadStream({ fileKey: 'report.pdf', access: 'private' });
|
|
416
|
+
expect(client_s3_1.GetObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket', Key: 'report.pdf' }));
|
|
417
|
+
});
|
|
418
|
+
it('returns the response Body stream', async () => {
|
|
419
|
+
const fakeStream = { pipe: jest.fn() };
|
|
420
|
+
mockSend.mockResolvedValue({ Body: fakeStream });
|
|
421
|
+
const svc = makeService();
|
|
422
|
+
const result = await svc.getDownloadStream({ fileKey: 'photo.jpg', access: 'public' });
|
|
423
|
+
expect(result).toBe(fakeStream);
|
|
424
|
+
});
|
|
425
|
+
});
|
|
426
|
+
// ─── getAsBuffer() ────────────────────────────────────────────────────────────
|
|
427
|
+
describe('R2FileService — getAsBuffer()', () => {
|
|
428
|
+
it('throws when fileKey is missing', async () => {
|
|
429
|
+
const svc = makeService();
|
|
430
|
+
await expect(svc.getAsBuffer({ access: 'public' })).rejects.toThrow(utils_1.MedusaError);
|
|
431
|
+
});
|
|
432
|
+
it('sends GetObjectCommand to public bucket for public files', async () => {
|
|
433
|
+
const svc = makeService();
|
|
434
|
+
await svc.getAsBuffer({ fileKey: 'photo.jpg', access: 'public' });
|
|
435
|
+
expect(client_s3_1.GetObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'public-bucket', Key: 'photo.jpg' }));
|
|
436
|
+
});
|
|
437
|
+
it('sends GetObjectCommand to private bucket for private files', async () => {
|
|
438
|
+
const svc = makeService();
|
|
439
|
+
await svc.getAsBuffer({ fileKey: 'report.pdf', access: 'private' });
|
|
440
|
+
expect(client_s3_1.GetObjectCommand).toHaveBeenCalledWith(expect.objectContaining({ Bucket: 'private-bucket', Key: 'report.pdf' }));
|
|
441
|
+
});
|
|
442
|
+
it('returns file contents as a Buffer', async () => {
|
|
443
|
+
const content = new Uint8Array([1, 2, 3, 4, 5]);
|
|
444
|
+
mockSend.mockResolvedValue({
|
|
445
|
+
Body: { transformToByteArray: jest.fn().mockResolvedValue(content) }
|
|
446
|
+
});
|
|
447
|
+
const svc = makeService();
|
|
448
|
+
const result = await svc.getAsBuffer({ fileKey: 'data.bin', access: 'public' });
|
|
449
|
+
expect(Buffer.isBuffer(result)).toBe(true);
|
|
450
|
+
expect(result).toEqual(Buffer.from(content));
|
|
451
|
+
});
|
|
452
|
+
});
|
|
453
|
+
// ─── getUploadStream() ────────────────────────────────────────────────────────
|
|
454
|
+
describe('R2FileService — getUploadStream()', () => {
|
|
455
|
+
it('throws when filename is missing', async () => {
|
|
456
|
+
const svc = makeService();
|
|
457
|
+
await expect(svc.getUploadStream({ mimeType: 'image/jpeg', access: 'public' })).rejects.toThrow(utils_1.MedusaError);
|
|
458
|
+
});
|
|
459
|
+
it('returns writeStream, promise, url, and fileKey', async () => {
|
|
460
|
+
const svc = makeService();
|
|
461
|
+
const result = await svc.getUploadStream({
|
|
462
|
+
filename: 'video.mp4',
|
|
463
|
+
mimeType: 'video/mp4',
|
|
464
|
+
access: 'public'
|
|
465
|
+
});
|
|
466
|
+
expect(result.writeStream).toBeDefined();
|
|
467
|
+
expect(result.promise).toBeInstanceOf(Promise);
|
|
468
|
+
expect(result.url).toContain('cdn.example.com');
|
|
469
|
+
expect(result.fileKey).toMatch(/^video-TESTULID/);
|
|
470
|
+
});
|
|
471
|
+
it('passes public bucket to Upload for public access', async () => {
|
|
472
|
+
const svc = makeService();
|
|
473
|
+
await svc.getUploadStream({
|
|
474
|
+
filename: 'video.mp4',
|
|
475
|
+
mimeType: 'video/mp4',
|
|
476
|
+
access: 'public'
|
|
477
|
+
});
|
|
478
|
+
const uploadCall = lib_storage_1.Upload.mock.calls[0][0];
|
|
479
|
+
expect(uploadCall.params.Bucket).toBe('public-bucket');
|
|
480
|
+
});
|
|
481
|
+
it('passes private bucket to Upload for private access', async () => {
|
|
482
|
+
const svc = makeService();
|
|
483
|
+
await svc.getUploadStream({
|
|
484
|
+
filename: 'backup.zip',
|
|
485
|
+
mimeType: 'application/zip',
|
|
486
|
+
access: 'private'
|
|
487
|
+
});
|
|
488
|
+
const uploadCall = lib_storage_1.Upload.mock.calls[0][0];
|
|
489
|
+
expect(uploadCall.params.Bucket).toBe('private-bucket');
|
|
490
|
+
});
|
|
491
|
+
it('promise resolves to url + key for public upload', async () => {
|
|
492
|
+
mockUploadDone.mockResolvedValue({});
|
|
493
|
+
const svc = makeService();
|
|
494
|
+
const { promise } = await svc.getUploadStream({
|
|
495
|
+
filename: 'photo.jpg',
|
|
496
|
+
mimeType: 'image/jpeg',
|
|
497
|
+
access: 'public'
|
|
498
|
+
});
|
|
499
|
+
const result = await promise;
|
|
500
|
+
expect(result.url).toMatch(/^https:\/\/cdn\.example\.com\//);
|
|
501
|
+
expect(result.key).toMatch(/^photo-TESTULID/);
|
|
502
|
+
});
|
|
503
|
+
it('promise resolves to empty url for private upload', async () => {
|
|
504
|
+
mockUploadDone.mockResolvedValue({});
|
|
505
|
+
const svc = makeService();
|
|
506
|
+
const { promise } = await svc.getUploadStream({
|
|
507
|
+
filename: 'secret.zip',
|
|
508
|
+
mimeType: 'application/zip',
|
|
509
|
+
access: 'private'
|
|
510
|
+
});
|
|
511
|
+
const result = await promise;
|
|
512
|
+
expect(result.url).toBe('');
|
|
513
|
+
expect(result.key).toMatch(/^secret-TESTULID/);
|
|
514
|
+
});
|
|
515
|
+
});
|
|
516
|
+
//# 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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "medusa-plugin-r2",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.1",
|
|
4
4
|
"description": "R2 file storage provider for Medusa v2",
|
|
5
5
|
"author": "Lacey Pevey",
|
|
6
6
|
"license": "MIT",
|
|
@@ -54,12 +54,12 @@
|
|
|
54
54
|
"test:integration": "NODE_OPTIONS=--experimental-vm-modules jest --silent --runInBand --detectOpenHandles --forceExit -- integration-tests"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
|
-
"@medusajs/admin-sdk": "2.
|
|
58
|
-
"@medusajs/cli": "2.
|
|
59
|
-
"@medusajs/framework": "2.
|
|
60
|
-
"@medusajs/icons": "2.
|
|
61
|
-
"@medusajs/ui": "4.1.
|
|
62
|
-
"@swc/core": "1.
|
|
57
|
+
"@medusajs/admin-sdk": "2.16.0",
|
|
58
|
+
"@medusajs/cli": "2.16.0",
|
|
59
|
+
"@medusajs/framework": "2.16.0",
|
|
60
|
+
"@medusajs/icons": "2.16.0",
|
|
61
|
+
"@medusajs/ui": "4.1.16",
|
|
62
|
+
"@swc/core": "1.15.33",
|
|
63
63
|
"@swc/jest": "0.2.39",
|
|
64
64
|
"@types/jest": "30.0.0",
|
|
65
65
|
"@types/node": "20.0.0",
|
|
@@ -71,18 +71,18 @@
|
|
|
71
71
|
"react": "18.3.1",
|
|
72
72
|
"react-dom": "18.3.1",
|
|
73
73
|
"ts-node": "10.9.2",
|
|
74
|
-
"typescript": "
|
|
75
|
-
"vite": "
|
|
74
|
+
"typescript": "6.0.3",
|
|
75
|
+
"vite": "8.0.8",
|
|
76
76
|
"yalc": "1.0.0-pre.53"
|
|
77
77
|
},
|
|
78
78
|
"peerDependencies": {
|
|
79
|
-
"@medusajs/framework": "2.
|
|
80
|
-
"@medusajs/js-sdk": "2.
|
|
81
|
-
"@medusajs/medusa": "2.
|
|
79
|
+
"@medusajs/framework": "2.16.0",
|
|
80
|
+
"@medusajs/js-sdk": "2.16.0",
|
|
81
|
+
"@medusajs/medusa": "2.16.0"
|
|
82
82
|
},
|
|
83
83
|
"engines": {
|
|
84
84
|
"node": ">=20"
|
|
85
85
|
},
|
|
86
86
|
"packageManager": "yarn@4.13.0+sha512.5c20ba010c99815433e5c8453112165e673f1c7948d8d2b267f4b5e52097538658388ebc9f9580656d9b75c5cc996f990f611f99304a2197d4c56d21eea370e7",
|
|
87
|
-
"gitHead": "
|
|
87
|
+
"gitHead": "e09c71de0e01897fa9441b40b67315b5a7b6d5bf"
|
|
88
88
|
}
|