medusa-plugin-r2 1.0.2 → 1.1.0

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;
+};
+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/.medusa/server/src/providers/r2/provider.js

@@ -15,6 +15,14 @@ const DEFAULT_UPLOAD_EXPIRATION_DURATION_SECONDS = 60 * 60;
 class R2FileProvider extends utils_1.AbstractFileProviderService {
     constructor({ logger }, options) {
         super();
+        this.getFileKey = (url) => {
+            const parsedUrl = new URL(url);
+            const basePath = new URL(this.config_.fileUrl).pathname;
+            const fullPath = parsedUrl.pathname;
+            const fileKeyPath = fullPath.startsWith(basePath) ? fullPath.slice(basePath.length) : fullPath;
+            const fileKey = fileKeyPath.startsWith('/') ? fileKeyPath.slice(1) : fileKeyPath;
+            return decodeURIComponent(fileKey);
+        };
         if (!options.accessKeyId || !options.secretAccessKey) {
             throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Access key ID and secret access key are required when using access key authentication`);
         }
@@ -168,19 +176,47 @@ class R2FileProvider extends utils_1.AbstractFileProviderService {
                     }
                 }));
             }
-            else {
-                const client = files.access === 'public' ? this.client_ : this.privateClient_;
-                await client.send(new client_s3_1.DeleteObjectCommand({
-                    Bucket: files.access === 'public' ? this.config_.bucket : this.config_.privateBucket,
+            else if (files.access === 'public') {
+                await this.client_.send(new client_s3_1.DeleteObjectCommand({
+                    Bucket: this.config_.bucket,
+                    Key: files.fileKey
+                }));
+            }
+            else if (files.access === 'private') {
+                await this.privateClient_.send(new client_s3_1.DeleteObjectCommand({
+                    Bucket: this.config_.privateBucket,
                     Key: files.fileKey
                 }));
             }
+            else {
+                // Access not specified — check which bucket has the file
+                try {
+                    await this.client_.send(new client_s3_1.HeadObjectCommand({
+                        Bucket: this.config_.bucket,
+                        Key: files.fileKey
+                    }));
+                    await this.client_.send(new client_s3_1.DeleteObjectCommand({
+                        Bucket: this.config_.bucket,
+                        Key: files.fileKey
+                    }));
+                }
+                catch {
+                    await this.privateClient_.send(new client_s3_1.DeleteObjectCommand({
+                        Bucket: this.config_.privateBucket,
+                        Key: files.fileKey
+                    }));
+                }
+            }
         }
         catch (e) {
             // TODO: Rethrow depending on the error (eg. a file not found error is fine, but a failed request should be rethrown)
             this.logger_.error(e);
         }
     }
+    async deleteByUrl(url) {
+        const fileKey = this.getFileKey(url);
+        return await this.delete({ fileKey });
+    }
     async getPresignedDownloadUrl(fileData) {
         // For r2, only the private bucket supports presigned urls
         if (fileData.access === 'public') {
@@ -244,4 +280,4 @@ class R2FileProvider extends utils_1.AbstractFileProviderService {
 }
 exports.R2FileProvider = R2FileProvider;
 R2FileProvider.identifier = 'r2';
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../../src/providers/r2/provider.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../../src/providers/r2/provider.ts"],"names":[],"mappings":"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"}

package/README.md

@@ -23,7 +23,7 @@ The R2 api is based on the S3 api, enabling the official S3 file provider to som
 
 Therefore, using the S3 file provider for R2 meant it did not support the full provider interface. For a very basic Medusa project, this might not be a problem. But for projects needing to use features like private files and presigned urls, it is a problem.
 
-This R2-specific file provider handles the differences by accepting two buckets in it's configuration. One is meant for public access and will automatically be used any time the ACL is set to public. The other bucket is meant for private files and supports presigned url generation.
+This R2-specific file provider handles the differences by accepting two buckets in its configuration. One is meant for public access and will automatically be used any time the ACL is set to public. The other bucket is meant for private files and supports presigned url generation.
 
 ## Installation
 

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "medusa-plugin-r2",
-	"version": "1.0.2",
+	"version": "1.1.0",
 	"description": "R2 file storage provider for Medusa v2",
 	"author": "Lacey Pevey",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/pevey/medusa-plugin-r2"
+		"url": "https://github.com/pevey/medusa-plugins"
 	},
 	"homepage": "https://pevey.com/medusa-plugin-r2",
 	"files": [
@@ -14,65 +14,75 @@
 	],
 	"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",
+		"medusa-v2",
 		"medusa",
-		"plugin",
 		"medusa-plugin-r2",
 		"medusa r2",
-		"medusa-v2",
 		"r2",
 		"cloudflare r2",
-		"file",
 		"file storage",
 		"file provider"
 	],
 	"scripts": {
-		"prebuild": "node ./scripts/check-node-version.cjs",
 		"build": "medusa plugin:build",
 		"dev": "medusa plugin:develop",
-		"prepublishOnly": "node ./scripts/check-node-version.cjs && medusa plugin:build",
-		"test:unit": "TEST_TYPE=unit NODE_OPTIONS=--experimental-vm-modules jest --silent --runInBand --detectOpenHandles --forceExit"
+		"prepublishOnly": "medusa plugin:build",
+		"test:unit": "TEST_TYPE=unit NODE_OPTIONS=--experimental-vm-modules jest --silent --runInBand --detectOpenHandles --forceExit",
+		"test:integration": "NODE_OPTIONS=--experimental-vm-modules jest --silent --runInBand --detectOpenHandles --forceExit -- integration-tests"
 	},
 	"devDependencies": {
-		"@medusajs/admin-sdk": "2.12.4",
-		"@medusajs/cli": "2.12.4",
-		"@medusajs/framework": "2.12.4",
-		"@medusajs/icons": "2.12.4",
-		"@medusajs/medusa": "2.12.4",
-		"@medusajs/test-utils": "2.12.4",
-		"@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",
-		"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.14.2",
+		"@medusajs/cli": "2.14.2",
+		"@medusajs/framework": "2.14.2",
+		"@medusajs/icons": "2.14.2",
+		"@medusajs/ui": "4.1.9",
+		"@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.3.1",
+		"react-dom": "18.3.1",
+		"ts-node": "10.9.2",
+		"typescript": "5.6.2",
+		"vite": "5.4.14",
+		"yalc": "1.0.0-pre.53"
 	},
 	"peerDependencies": {
-		"@medusajs/admin-sdk": "2.12.4",
-		"@medusajs/cli": "2.12.4",
-		"@medusajs/framework": "2.12.4",
-		"@medusajs/icons": "2.12.4",
-		"@medusajs/medusa": "2.12.4",
-		"@medusajs/test-utils": "2.12.4",
-		"@medusajs/ui": "4.0.25"
+		"@medusajs/framework": "2.14.2",
+		"@medusajs/js-sdk": "2.14.2",
+		"@medusajs/medusa": "2.14.2"
 	},
 	"engines": {
 		"node": ">=20"
 	},
-	"packageManager": "yarn@4.13.0+sha512.5c20ba010c99815433e5c8453112165e673f1c7948d8d2b267f4b5e52097538658388ebc9f9580656d9b75c5cc996f990f611f99304a2197d4c56d21eea370e7"
+	"packageManager": "yarn@4.13.0+sha512.5c20ba010c99815433e5c8453112165e673f1c7948d8d2b267f4b5e52097538658388ebc9f9580656d9b75c5cc996f990f611f99304a2197d4c56d21eea370e7",
+	"gitHead": "35f16164d0d17e6281b2801a9f1eb355b5035571"
 }