@strapi/provider-upload-aws-s3 0.0.0-next.dff425769af4d4d006725a10c395f59637403653 → 0.0.0-next.e9bb5ccdc459f4c6b6717a2d5d86359b7a47d47d

package/dist/index.d.ts

@@ -0,0 +1,46 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import type { ReadStream } from 'node:fs';
+import AWS from 'aws-sdk';
+interface File {
+    name: string;
+    alternativeText?: string;
+    caption?: string;
+    width?: number;
+    height?: number;
+    formats?: Record<string, unknown>;
+    hash: string;
+    ext?: string;
+    mime: string;
+    size: number;
+    url: string;
+    previewUrl?: string;
+    path?: string;
+    provider?: string;
+    provider_metadata?: Record<string, unknown>;
+    stream?: ReadStream;
+    buffer?: Buffer;
+}
+interface InitOptions extends Partial<AWS.S3.ClientConfiguration> {
+    baseUrl?: string;
+    rootPath?: string;
+    s3Options: AWS.S3.ClientConfiguration & {
+        params: {
+            Bucket: string;
+            ACL?: string;
+            signedUrlExpires?: string;
+        };
+    };
+}
+declare const _default: {
+    init({ baseUrl, rootPath, s3Options, ...legacyS3Options }: InitOptions): {
+        isPrivate(): boolean;
+        getSignedUrl(file: File): Promise<{
+            url: string;
+        }>;
+        uploadStream(file: File, customParams?: {}): Promise<void>;
+        upload(file: File, customParams?: {}): Promise<void>;
+        delete(file: File, customParams?: {}): Promise<void>;
+    };
+};
+export = _default;

package/dist/index.js

@@ -0,0 +1,112 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const fp_1 = require("lodash/fp");
+const aws_sdk_1 = __importDefault(require("aws-sdk"));
+const utils_1 = require("./utils");
+// TODO V5: Migrate to aws-sdk v3
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+require('aws-sdk/lib/maintenance_mode_message').suppress = true;
+function hasUrlProtocol(url) {
+    // Regex to test protocol like "http://", "https://"
+    return /^\w*:\/\//.test(url);
+}
+module.exports = {
+    init({ baseUrl, rootPath, s3Options, ...legacyS3Options }) {
+        if (Object.keys(legacyS3Options).length > 0) {
+            process.emitWarning("S3 configuration options passed at root level of the plugin's providerOptions is deprecated and will be removed in a future release. Please wrap them inside the 's3Options:{}' property.");
+        }
+        const config = { ...s3Options, ...legacyS3Options };
+        const S3 = new aws_sdk_1.default.S3({
+            apiVersion: '2006-03-01',
+            ...config,
+        });
+        const filePrefix = rootPath ? `${rootPath.replace(/\/+$/, '')}/` : '';
+        const getFileKey = (file) => {
+            const path = file.path ? `${file.path}/` : '';
+            return `${filePrefix}${path}${file.hash}${file.ext}`;
+        };
+        const ACL = (0, fp_1.getOr)('public-read', ['params', 'ACL'], config);
+        const upload = (file, customParams = {}) => new Promise((resolve, reject) => {
+            const fileKey = getFileKey(file);
+            if (!file.stream && !file.buffer) {
+                reject(new Error('Missing file stream or buffer'));
+                return;
+            }
+            const params = {
+                Key: fileKey,
+                Bucket: config.params.Bucket,
+                Body: file.stream || file.buffer,
+                ACL,
+                ContentType: file.mime,
+                ...customParams,
+            };
+            const onUploaded = (err, data) => {
+                if (err) {
+                    return reject(err);
+                }
+                // set the bucket file url
+                if (baseUrl) {
+                    // Construct the url with the baseUrl
+                    file.url = `${baseUrl}/${fileKey}`;
+                }
+                else {
+                    // Add the protocol if it is missing
+                    // Some providers like DigitalOcean Spaces return the url without the protocol
+                    file.url = hasUrlProtocol(data.Location) ? data.Location : `https://${data.Location}`;
+                }
+                resolve();
+            };
+            S3.upload(params, onUploaded);
+        });
+        return {
+            isPrivate() {
+                return ACL === 'private';
+            },
+            async getSignedUrl(file) {
+                // Do not sign the url if it does not come from the same bucket.
+                const { bucket } = (0, utils_1.getBucketFromUrl)(file.url);
+                if (bucket !== config.params.Bucket) {
+                    return { url: file.url };
+                }
+                return new Promise((resolve, reject) => {
+                    const fileKey = getFileKey(file);
+                    S3.getSignedUrl('getObject', {
+                        Bucket: config.params.Bucket,
+                        Key: fileKey,
+                        Expires: (0, fp_1.getOr)(15 * 60, ['params', 'signedUrlExpires'], config), // 15 minutes
+                    }, (err, url) => {
+                        if (err) {
+                            return reject(err);
+                        }
+                        resolve({ url });
+                    });
+                });
+            },
+            uploadStream(file, customParams = {}) {
+                return upload(file, customParams);
+            },
+            upload(file, customParams = {}) {
+                return upload(file, customParams);
+            },
+            delete(file, customParams = {}) {
+                return new Promise((resolve, reject) => {
+                    // delete file on S3 bucket
+                    const fileKey = getFileKey(file);
+                    S3.deleteObject({
+                        Key: fileKey,
+                        Bucket: config.params.Bucket,
+                        ...customParams,
+                    }, (err) => {
+                        if (err) {
+                            return reject(err);
+                        }
+                        resolve();
+                    });
+                });
+            },
+        };
+    },
+};
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/utils.d.ts

@@ -0,0 +1,15 @@
+interface BucketInfo {
+    bucket?: string | null;
+    err?: string;
+}
+/**
+ * Parse the bucket name from a URL.
+ * See all URL formats in https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-bucket-intro.html
+ *
+ * @param {string} fileUrl - the URL to parse
+ * @returns {object} result
+ * @returns {string} result.bucket - the bucket name
+ * @returns {string} result.err - if any
+ */
+export declare function getBucketFromUrl(fileUrl: string): BucketInfo;
+export {};

package/dist/utils.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBucketFromUrl = void 0;
+const ENDPOINT_PATTERN = /^(.+\.)?s3[.-]([a-z0-9-]+)\./;
+/**
+ * Parse the bucket name from a URL.
+ * See all URL formats in https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-bucket-intro.html
+ *
+ * @param {string} fileUrl - the URL to parse
+ * @returns {object} result
+ * @returns {string} result.bucket - the bucket name
+ * @returns {string} result.err - if any
+ */
+function getBucketFromUrl(fileUrl) {
+    const uri = new URL(fileUrl);
+    // S3://<bucket-name>/<key>
+    if (uri.protocol === 's3:') {
+        const bucket = uri.host;
+        if (!bucket) {
+            return { err: `Invalid S3 URI: no bucket: ${uri}` };
+        }
+        return { bucket };
+    }
+    if (!uri.host) {
+        return { err: `Invalid S3 URI: no hostname: ${uri}` };
+    }
+    const matches = uri.host.match(ENDPOINT_PATTERN);
+    if (!matches) {
+        return { err: `Invalid S3 URI: hostname does not appear to be a valid S3 endpoint: ${uri}` };
+    }
+    const prefix = matches[1];
+    // https://s3.amazonaws.com/<bucket-name>
+    if (!prefix) {
+        if (uri.pathname === '/') {
+            return { bucket: null };
+        }
+        const index = uri.pathname.indexOf('/', 1);
+        // https://s3.amazonaws.com/<bucket-name>
+        if (index === -1) {
+            return { bucket: uri.pathname.substring(1) };
+        }
+        // https://s3.amazonaws.com/<bucket-name>/
+        if (index === uri.pathname.length - 1) {
+            return { bucket: uri.pathname.substring(1, index) };
+        }
+        // https://s3.amazonaws.com/<bucket-name>/key
+        return { bucket: uri.pathname.substring(1, index) };
+    }
+    // https://<bucket-name>.s3.amazonaws.com/
+    return { bucket: prefix.substring(0, prefix.length - 1) };
+}
+exports.getBucketFromUrl = getBucketFromUrl;
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,MAAM,gBAAgB,GAAG,8BAA8B,CAAC;AAOxD;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAE7B,2BAA2B;IAC3B,IAAI,GAAG,CAAC,QAAQ,KAAK,KAAK,EAAE;QAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC;QAExB,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,EAAE,GAAG,EAAE,8BAA8B,GAAG,EAAE,EAAE,CAAC;SACrD;QACD,OAAO,EAAE,MAAM,EAAE,CAAC;KACnB;IAED,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;QACb,OAAO,EAAE,GAAG,EAAE,gCAAgC,GAAG,EAAE,EAAE,CAAC;KACvD;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACjD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,GAAG,EAAE,uEAAuE,GAAG,EAAE,EAAE,CAAC;KAC9F;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1B,yCAAyC;IACzC,IAAI,CAAC,MAAM,EAAE;QACX,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,EAAE;YACxB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SACzB;QAED,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAE3C,yCAAyC;QACzC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9C;QAED,0CAA0C;QAC1C,IAAI,KAAK,KAAK,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;SACrD;QAED,6CAA6C;QAC7C,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;KACrD;IAED,0CAA0C;IAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;AAC5D,CAAC;AA/CD,4CA+CC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/provider-upload-aws-s3",
-  "version": "0.0.0-next.dff425769af4d4d006725a10c395f59637403653",
+  "version": "0.0.0-next.e9bb5ccdc459f4c6b6717a2d5d86359b7a47d47d",
   "description": "AWS S3 provider for strapi upload",
   "keywords": [
     "upload",
@@ -29,22 +29,33 @@
       "url": "https://strapi.io"
     }
   ],
-  "main": "./lib",
-  "directories": {
-    "lib": "./lib"
-  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "./dist"
+  ],
   "scripts": {
+    "build": "run -T tsc",
+    "build:ts": "run -T tsc",
+    "watch": "run -T tsc -w --preserveWatchOutput",
+    "clean": "run -T rimraf ./dist",
+    "prepublishOnly": "yarn clean && yarn build",
     "test:unit": "run -T jest",
     "test:unit:watch": "run -T jest --watch",
     "lint": "run -T eslint ."
   },
   "dependencies": {
-    "aws-sdk": "2.1351.0",
+    "aws-sdk": "2.1372.0",
     "lodash": "4.17.21"
   },
+  "devDependencies": {
+    "@types/jest": "29.2.0",
+    "eslint-config-custom": "0.0.0-next.e9bb5ccdc459f4c6b6717a2d5d86359b7a47d47d",
+    "tsconfig": "0.0.0-next.e9bb5ccdc459f4c6b6717a2d5d86359b7a47d47d"
+  },
   "engines": {
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "dff425769af4d4d006725a10c395f59637403653"
+  "gitHead": "e9bb5ccdc459f4c6b6717a2d5d86359b7a47d47d"
 }

package/.eslintignore

@@ -1,2 +0,0 @@
-node_modules/
-.eslintrc.js

package/.eslintrc.js

@@ -1,4 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['custom/back'],
-};

package/lib/index.js

@@ -1,139 +0,0 @@
-'use strict';
-
-/**
- * Module dependencies
- */
-
-/* eslint-disable no-unused-vars */
-// Public node modules.
-const { getOr } = require('lodash/fp');
-// TODO V5: Migrate to aws-sdk v3
-require('aws-sdk/lib/maintenance_mode_message').suppress = true;
-const AWS = require('aws-sdk');
-const { getBucketFromUrl } = require('./utils');
-
-function assertUrlProtocol(url) {
-  // Regex to test protocol like "http://", "https://"
-  return /^\w*:\/\//.test(url);
-}
-
-module.exports = {
-  init({ baseUrl = null, rootPath = null, s3Options, ...legacyS3Options }) {
-    if (legacyS3Options) {
-      process.emitWarning(
-        "S3 configuration options passed at root level of the plugin's providerOptions is deprecated and will be removed in a future release. Please wrap them inside the 's3Options:{}' property."
-      );
-    }
-
-    const config = { ...s3Options, ...legacyS3Options };
-
-    const S3 = new AWS.S3({
-      apiVersion: '2006-03-01',
-      ...config,
-    });
-
-    const filePrefix = rootPath ? `${rootPath.replace(/\/+$/, '')}/` : '';
-
-    const getFileKey = (file) => {
-      const path = file.path ? `${file.path}/` : '';
-
-      return `${filePrefix}${path}${file.hash}${file.ext}`;
-    };
-
-    const ACL = getOr('public-read', ['params', 'ACL'], config);
-
-    const upload = (file, customParams = {}) =>
-      new Promise((resolve, reject) => {
-        // upload file on S3 bucket
-        const fileKey = getFileKey(file);
-        S3.upload(
-          {
-            Key: fileKey,
-            Body: file.stream || Buffer.from(file.buffer, 'binary'),
-            ACL,
-            ContentType: file.mime,
-            ...customParams,
-          },
-          (err, data) => {
-            if (err) {
-              return reject(err);
-            }
-
-            // set the bucket file url
-            if (assertUrlProtocol(data.Location)) {
-              file.url = baseUrl ? `${baseUrl}/${fileKey}` : data.Location;
-            } else {
-              // Default protocol to https protocol
-              file.url = `https://${data.Location}`;
-            }
-            resolve();
-          }
-        );
-      });
-
-    return {
-      isPrivate() {
-        return ACL === 'private';
-      },
-      /**
-       * @param {Object} file
-       * @param {string} file.path
-       * @param {string} file.hash
-       * @param {string} file.ext
-       * @param {Object} customParams
-       * @returns {Promise<{url: string}>}
-       */
-      getSignedUrl(file, customParams = {}) {
-        // Do not sign the url if it does not come from the same bucket.
-        const { bucket } = getBucketFromUrl(file.url);
-        if (bucket !== config.params.Bucket) {
-          return { url: file.url };
-        }
-
-        return new Promise((resolve, reject) => {
-          const fileKey = getFileKey(file);
-
-          S3.getSignedUrl(
-            'getObject',
-            {
-              Bucket: config.params.Bucket,
-              Key: fileKey,
-              Expires: getOr(15 * 60, ['params', 'signedUrlExpires'], config), // 15 minutes
-            },
-            (err, url) => {
-              if (err) {
-                return reject(err);
-              }
-              resolve({ url });
-            }
-          );
-        });
-      },
-      uploadStream(file, customParams = {}) {
-        return upload(file, customParams);
-      },
-      upload(file, customParams = {}) {
-        return upload(file, customParams);
-      },
-      delete(file, customParams = {}) {
-        return new Promise((resolve, reject) => {
-          // delete file on S3 bucket
-          const fileKey = getFileKey(file);
-          S3.deleteObject(
-            {
-              Key: fileKey,
-              ...customParams,
-            },
-            (err) => {
-              if (err) {
-                return reject(err);
-              }
-
-              resolve();
-            }
-          );
-        });
-      },
-    };
-  },
-};

package/lib/utils.js

@@ -1,63 +0,0 @@
-'use strict';
-
-const ENDPOINT_PATTERN = /^(.+\.)?s3[.-]([a-z0-9-]+)\./;
-
-/**
- * Parse the bucket name from a URL.
- * See all URL formats in https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-bucket-intro.html
- *
- * @param {string} fileUrl - the URL to parse
- * @returns {object} result
- * @returns {string} result.bucket - the bucket name
- * @returns {string} result.error - if any
- */
-function getBucketFromUrl(fileUrl) {
-  const uri = new URL(fileUrl);
-
-  // S3://<bucket-name>/<key>
-  if (uri.protocol === 's3:') {
-    const bucket = uri.host;
-
-    if (!bucket) {
-      return { err: `Invalid S3 URI: no bucket: ${uri}` };
-    }
-    return { bucket };
-  }
-
-  if (!uri.host) {
-    return { err: `Invalid S3 URI: no hostname: ${uri}` };
-  }
-
-  const matches = uri.host.match(ENDPOINT_PATTERN);
-  if (!matches) {
-    return { err: `Invalid S3 URI: hostname does not appear to be a valid S3 endpoint: ${uri}` };
-  }
-
-  const prefix = matches[1];
-  // https://s3.amazonaws.com/<bucket-name>
-  if (!prefix) {
-    if (uri.pathname === '/') {
-      return { bucket: null };
-    }
-
-    const index = uri.pathname.indexOf('/', 1);
-
-    // https://s3.amazonaws.com/<bucket-name>
-    if (index === -1) {
-      return { bucket: uri.pathname.substring(1) };
-    }
-
-    // https://s3.amazonaws.com/<bucket-name>/
-    if (index === uri.pathname.length - 1) {
-      return { bucket: uri.pathname.substring(1, index) };
-    }
-
-    // https://s3.amazonaws.com/<bucket-name>/key
-    return { bucket: uri.pathname.substring(1, index) };
-  }
-
-  // https://<bucket-name>.s3.amazonaws.com/
-  return { bucket: prefix.substring(0, prefix.length - 1) };
-}
-
-module.exports = { getBucketFromUrl };