@vendure/asset-server-plugin 2.0.0-beta.1 → 2.0.0-beta.3

package/lib/src/s3-asset-storage-strategy.d.ts

@@ -1,16 +1,10 @@
 /// <reference types="node" />
 /// <reference types="node" />
+import { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@aws-sdk/types';
 import { AssetStorageStrategy } from '@vendure/core';
 import { Request } from 'express';
-import { Stream } from 'stream';
+import { Readable } from 'node:stream';
 import { AssetServerOptions } from './types';
-export type S3Credentials = {
-    accessKeyId: string;
-    secretAccessKey: string;
-};
-export type S3CredentialsProfile = {
-    profile: string;
-};
 /**
  * @description
  * Configuration for connecting to AWS S3.
@@ -21,12 +15,12 @@ export type S3CredentialsProfile = {
 export interface S3Config {
     /**
      * @description
-     * The credentials used to access your s3 account. You can supply either the access key ID & secret,
-     * or you can make use of a
+     * The credentials used to access your s3 account. You can supply either the access key ID & secret, or you can make use of a
      * [shared credentials file](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/loading-node-credentials-shared.html)
-     * and supply the profile name (e.g. `'default'`).
+     * To use a shared credentials file, import the `fromIni()` function from the "@aws-sdk/credential-provider-ini" or "@aws-sdk/credential-providers" package and supply
+     * the profile name (e.g. `{ profile: 'default' }`) as its argument.
      */
-    credentials?: S3Credentials | S3CredentialsProfile;
+    credentials: AwsCredentialIdentity | AwsCredentialIdentityProvider;
     /**
      * @description
      * The S3 bucket in which to store the assets. If it does not exist, it will be created on startup.
@@ -52,16 +46,17 @@ export interface S3Config {
  * Returns a configured instance of the {@link S3AssetStorageStrategy} which can then be passed to the {@link AssetServerOptions}
  * `storageStrategyFactory` property.
  *
- * Before using this strategy, make sure you have the `aws-sdk` package installed:
+ * Before using this strategy, make sure you have the `@aws-sdk/client-s3` and `@aws-sdk/lib-storage` package installed:
  *
  * ```sh
- * npm install aws-sdk
+ * npm install @aws-sdk/client-s3 @aws-sdk/lib-storage
  * ```
  *
  * @example
  * ```TypeScript
  * import { AssetServerPlugin, configureS3AssetStorage } from '\@vendure/asset-server-plugin';
  * import { DefaultAssetNamingStrategy } from '\@vendure/core';
+ * import { fromEnv } from '\@aws-sdk/credential-providers';
  *
  * // ...
  *
@@ -72,10 +67,7 @@ export interface S3Config {
  *     namingStrategy: new DefaultAssetNamingStrategy(),
  *     storageStrategyFactory: configureS3AssetStorage({
  *       bucket: 'my-s3-bucket',
- *       credentials: {
- *         accessKeyId: process.env.AWS_ACCESS_KEY_ID,
- *         secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
- *       },
+ *       credentials: fromEnv(), // or any other credential provider
  *     }),
  * }),
  * ```
@@ -118,12 +110,12 @@ export declare function configureS3AssetStorage(s3Config: S3Config): (options: A
  * @description
  * An {@link AssetStorageStrategy} which uses [Amazon S3](https://aws.amazon.com/s3/) object storage service.
  * To us this strategy you must first have access to an AWS account.
- * See their [getting started guide](https://aws.amazon.com/s3/getting-started/?nc=sn&loc=5) for how to get set up.
+ * See their [getting started guide](https://aws.amazon.com/s3/getting-started/) for how to get set up.
  *
- * Before using this strategy, make sure you have the `aws-sdk` package installed:
+ * Before using this strategy, make sure you have the `@aws-sdk/client-s3` and `@aws-sdk/lib-storage` package installed:
  *
  * ```sh
- * npm install aws-sdk
+ * npm install @aws-sdk/client-s3 @aws-sdk/lib-storage
  * ```
  *
  * **Note:** Rather than instantiating this manually, use the {@link configureS3AssetStorage} function.
@@ -140,18 +132,21 @@ export declare class S3AssetStorageStrategy implements AssetStorageStrategy {
     private s3Config;
     readonly toAbsoluteUrl: (request: Request, identifier: string) => string;
     private AWS;
-    private s3;
+    private libStorage;
+    private s3Client;
     constructor(s3Config: S3Config, toAbsoluteUrl: (request: Request, identifier: string) => string);
     init(): Promise<void>;
     destroy?: (() => void | Promise<void>) | undefined;
     writeFileFromBuffer(fileName: string, data: Buffer): Promise<string>;
-    writeFileFromStream(fileName: string, data: Stream): Promise<string>;
+    writeFileFromStream(fileName: string, data: Readable): Promise<string>;
     readFileToBuffer(identifier: string): Promise<Buffer>;
-    readFileToStream(identifier: string): Promise<Stream>;
+    readFileToStream(identifier: string): Promise<Readable>;
+    private readFile;
+    private writeFile;
     deleteFile(identifier: string): Promise<void>;
     fileExists(fileName: string): Promise<boolean>;
     private getObjectParams;
-    private getS3Credentials;
     private ensureBucket;
+    private getCredentials;
     private isCredentialsProfile;
 }

package/lib/src/s3-asset-storage-strategy.js

@@ -22,11 +22,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.S3AssetStorageStrategy = exports.configureS3AssetStorage = void 0;
 const core_1 = require("@vendure/core");
-const path = __importStar(require("path"));
-const stream_1 = require("stream");
+const path = __importStar(require("node:path"));
+const node_stream_1 = require("node:stream");
 const common_1 = require("./common");
 const constants_1 = require("./constants");
 /**
@@ -34,16 +41,17 @@ const constants_1 = require("./constants");
  * Returns a configured instance of the {@link S3AssetStorageStrategy} which can then be passed to the {@link AssetServerOptions}
  * `storageStrategyFactory` property.
  *
- * Before using this strategy, make sure you have the `aws-sdk` package installed:
+ * Before using this strategy, make sure you have the `@aws-sdk/client-s3` and `@aws-sdk/lib-storage` package installed:
  *
  * ```sh
- * npm install aws-sdk
+ * npm install @aws-sdk/client-s3 @aws-sdk/lib-storage
  * ```
  *
  * @example
  * ```TypeScript
  * import { AssetServerPlugin, configureS3AssetStorage } from '\@vendure/asset-server-plugin';
  * import { DefaultAssetNamingStrategy } from '\@vendure/core';
+ * import { fromEnv } from '\@aws-sdk/credential-providers';
  *
  * // ...
  *
@@ -54,10 +62,7 @@ const constants_1 = require("./constants");
  *     namingStrategy: new DefaultAssetNamingStrategy(),
  *     storageStrategyFactory: configureS3AssetStorage({
  *       bucket: 'my-s3-bucket',
- *       credentials: {
- *         accessKeyId: process.env.AWS_ACCESS_KEY_ID,
- *         secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
- *       },
+ *       credentials: fromEnv(), // or any other credential provider
  *     }),
  * }),
  * ```
@@ -97,7 +102,6 @@ const constants_1 = require("./constants");
  */
 function configureS3AssetStorage(s3Config) {
     return (options) => {
-        const { assetUrlPrefix, route } = options;
         const prefixFn = (0, common_1.getAssetUrlPrefixFn)(options);
         const toAbsoluteUrlFn = (request, identifier) => {
             if (!identifier) {
@@ -114,12 +118,12 @@ exports.configureS3AssetStorage = configureS3AssetStorage;
  * @description
  * An {@link AssetStorageStrategy} which uses [Amazon S3](https://aws.amazon.com/s3/) object storage service.
  * To us this strategy you must first have access to an AWS account.
- * See their [getting started guide](https://aws.amazon.com/s3/getting-started/?nc=sn&loc=5) for how to get set up.
+ * See their [getting started guide](https://aws.amazon.com/s3/getting-started/) for how to get set up.
  *
- * Before using this strategy, make sure you have the `aws-sdk` package installed:
+ * Before using this strategy, make sure you have the `@aws-sdk/client-s3` and `@aws-sdk/lib-storage` package installed:
  *
  * ```sh
- * npm install aws-sdk
+ * npm install @aws-sdk/client-s3 @aws-sdk/lib-storage
  * ```
  *
  * **Note:** Rather than instantiating this manually, use the {@link configureS3AssetStorage} function.
@@ -139,84 +143,95 @@ class S3AssetStorageStrategy {
     }
     async init() {
         try {
-            this.AWS = await Promise.resolve().then(() => __importStar(require('aws-sdk')));
+            this.AWS = await Promise.resolve().then(() => __importStar(require('@aws-sdk/client-s3')));
         }
-        catch (e) {
-            core_1.Logger.error('Could not find the "aws-sdk" package. Make sure it is installed', constants_1.loggerCtx, e.stack);
+        catch (err) {
+            core_1.Logger.error('Could not find the "@aws-sdk/client-s3" package. Make sure it is installed', constants_1.loggerCtx, err.stack);
         }
-        const config = Object.assign({ credentials: this.getS3Credentials() }, this.s3Config.nativeS3Configuration);
-        this.s3 = new this.AWS.S3(config);
-        await this.ensureBucket(this.s3Config.bucket);
+        try {
+            this.libStorage = await Promise.resolve().then(() => __importStar(require('@aws-sdk/lib-storage')));
+        }
+        catch (err) {
+            core_1.Logger.error('Could not find the "@aws-sdk/lib-storage" package. Make sure it is installed', constants_1.loggerCtx, err.stack);
+        }
+        const config = Object.assign(Object.assign({}, this.s3Config.nativeS3Configuration), { credentials: await this.getCredentials() // Avoid credentials overriden by nativeS3Configuration
+         });
+        this.s3Client = new this.AWS.S3Client(config);
+        await this.ensureBucket();
     }
     async writeFileFromBuffer(fileName, data) {
-        const result = await this.s3
-            .upload({
-            Bucket: this.s3Config.bucket,
-            Key: fileName,
-            Body: data,
-        }, this.s3Config.nativeS3UploadConfiguration)
-            .promise();
-        return result.Key;
+        return this.writeFile(fileName, data);
     }
     async writeFileFromStream(fileName, data) {
-        const result = await this.s3
-            .upload({
-            Bucket: this.s3Config.bucket,
-            Key: fileName,
-            Body: data,
-        }, this.s3Config.nativeS3UploadConfiguration)
-            .promise();
-        return result.Key;
+        return this.writeFile(fileName, data);
     }
     async readFileToBuffer(identifier) {
-        const result = await this.s3.getObject(this.getObjectParams(identifier)).promise();
-        const body = result.Body;
+        var _a, e_1, _b, _c;
+        const body = await this.readFile(identifier);
         if (!body) {
             core_1.Logger.error(`Got undefined Body for ${identifier}`, constants_1.loggerCtx);
             return Buffer.from('');
         }
-        if (body instanceof Buffer) {
-            return body;
-        }
-        if (body instanceof Uint8Array || typeof body === 'string') {
-            return Buffer.from(body);
+        const chunks = [];
+        try {
+            for (var _d = true, body_1 = __asyncValues(body), body_1_1; body_1_1 = await body_1.next(), _a = body_1_1.done, !_a;) {
+                _c = body_1_1.value;
+                _d = false;
+                try {
+                    const chunk = _c;
+                    chunks.push(chunk);
+                }
+                finally {
+                    _d = true;
+                }
+            }
         }
-        if (body instanceof stream_1.Readable) {
-            return new Promise((resolve, reject) => {
-                const buf = [];
-                body.on('data', data => buf.push(data));
-                body.on('error', err => reject(err));
-                body.on('end', () => {
-                    const intArray = Uint8Array.from(buf);
-                    resolve(Buffer.concat([intArray]));
-                });
-            });
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (!_d && !_a && (_b = body_1.return)) await _b.call(body_1);
+            }
+            finally { if (e_1) throw e_1.error; }
         }
-        return Buffer.from(body);
+        return Buffer.concat(chunks);
     }
     async readFileToStream(identifier) {
-        const result = await this.s3.getObject(this.getObjectParams(identifier)).promise();
-        const body = result.Body;
-        if (!(body instanceof stream_1.Stream)) {
-            const readable = new stream_1.Readable();
-            readable._read = () => {
-                /* noop */
-            };
-            readable.push(body);
-            readable.push(null);
-            return readable;
+        const body = await this.readFile(identifier);
+        if (!body) {
+            return new node_stream_1.Readable({ read() { this.push(null); } });
         }
         return body;
     }
+    async readFile(identifier) {
+        const { GetObjectCommand } = this.AWS;
+        const result = await this.s3Client.send(new GetObjectCommand(this.getObjectParams(identifier)));
+        return result.Body;
+    }
+    async writeFile(fileName, data) {
+        const { Upload } = this.libStorage;
+        const upload = new Upload({
+            client: this.s3Client,
+            params: Object.assign(Object.assign({}, this.s3Config.nativeS3UploadConfiguration), { Bucket: this.s3Config.bucket, Key: fileName, Body: data }),
+        });
+        return upload.done().then((result) => {
+            if (!('Key' in result) || !result.Key) {
+                core_1.Logger.error(`Got undefined Key for ${fileName}`, constants_1.loggerCtx);
+                throw new Error(`Got undefined Key for ${fileName}`);
+            }
+            return result.Key;
+        });
+    }
     async deleteFile(identifier) {
-        await this.s3.deleteObject(this.getObjectParams(identifier)).promise();
+        const { DeleteObjectCommand } = this.AWS;
+        await this.s3Client.send(new DeleteObjectCommand(this.getObjectParams(identifier)));
     }
     async fileExists(fileName) {
+        const { HeadObjectCommand } = this.AWS;
         try {
-            await this.s3.headObject(this.getObjectParams(fileName)).promise();
+            await this.s3Client.send(new HeadObjectCommand(this.getObjectParams(fileName)));
             return true;
         }
-        catch (e) {
+        catch (err) {
             return false;
         }
     }
@@ -226,38 +241,37 @@ class S3AssetStorageStrategy {
             Key: path.join(identifier.replace(/^\//, '')),
         };
     }
-    getS3Credentials() {
-        const { credentials } = this.s3Config;
-        if (credentials == null) {
-            return null;
+    async ensureBucket(bucket = this.s3Config.bucket) {
+        const { HeadBucketCommand, CreateBucketCommand } = this.AWS;
+        try {
+            await this.s3Client.send(new HeadBucketCommand({ Bucket: bucket }));
+            core_1.Logger.verbose(`Found S3 bucket "${bucket}"`, constants_1.loggerCtx);
+            return;
         }
-        else if (this.isCredentialsProfile(credentials)) {
-            return new this.AWS.SharedIniFileCredentials(credentials);
+        catch (err) {
+            core_1.Logger.verbose(`Could not find bucket "${bucket}: ${JSON.stringify(err.message)}". Attempting to create...`);
         }
-        return new this.AWS.Credentials(credentials);
-    }
-    async ensureBucket(bucket) {
-        let bucketExists = false;
         try {
-            await this.s3.headBucket({ Bucket: this.s3Config.bucket }).promise();
-            bucketExists = true;
-            core_1.Logger.verbose(`Found S3 bucket "${bucket}"`, constants_1.loggerCtx);
+            await this.s3Client.send(new CreateBucketCommand({ Bucket: bucket, ACL: 'private' }));
+            core_1.Logger.verbose(`Created S3 bucket "${bucket}"`, constants_1.loggerCtx);
         }
-        catch (e) {
-            core_1.Logger.verbose(`Could not find bucket "${bucket}: ${JSON.stringify(e.message)}". Attempting to create...`);
+        catch (err) {
+            core_1.Logger.error(`Could not find nor create the S3 bucket "${bucket}: ${JSON.stringify(err.message)}"`, constants_1.loggerCtx, err.stack);
         }
-        if (!bucketExists) {
-            try {
-                await this.s3.createBucket({ Bucket: bucket, ACL: 'private' }).promise();
-                core_1.Logger.verbose(`Created S3 bucket "${bucket}"`, constants_1.loggerCtx);
-            }
-            catch (e) {
-                core_1.Logger.error(`Could not find nor create the S3 bucket "${bucket}: ${JSON.stringify(e.message)}"`, constants_1.loggerCtx, e.stack);
-            }
+    }
+    async getCredentials() {
+        if (this.s3Config.credentials == null) {
+            return undefined;
+        }
+        if (this.isCredentialsProfile(this.s3Config.credentials)) {
+            core_1.Logger.warn('The "profile" property of the "s3Config.credentials" is deprecated. ' +
+                'Please use the "fromIni()" function from the "@aws-sdk/credential-provider-ini" or "@aws-sdk/credential-providers" package instead.', constants_1.loggerCtx);
+            return (await Promise.resolve().then(() => __importStar(require('@aws-sdk/credential-provider-ini')))).fromIni({ profile: this.s3Config.credentials.profile });
         }
+        return this.s3Config.credentials;
     }
     isCredentialsProfile(credentials) {
-        return credentials.hasOwnProperty('profile');
+        return credentials !== null && typeof credentials === 'object' && 'profile' in credentials && Object.keys(credentials).length === 1;
     }
 }
 exports.S3AssetStorageStrategy = S3AssetStorageStrategy;

package/lib/src/s3-asset-storage-strategy.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/asset-server-plugin",
-    "version": "2.0.0-beta.1",
+    "version": "2.0.0-beta.3",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "files": [
@@ -21,13 +21,14 @@
         "access": "public"
     },
     "devDependencies": {
+        "@aws-sdk/client-s3": "^3.312.0",
+        "@aws-sdk/lib-storage": "^3.312.0",
         "@types/express": "^4.17.8",
         "@types/fs-extra": "^9.0.8",
         "@types/node-fetch": "^2.5.8",
         "@types/sharp": "^0.30.4",
-        "@vendure/common": "^2.0.0-beta.1",
-        "@vendure/core": "^2.0.0-beta.1",
-        "aws-sdk": "^2.856.0",
+        "@vendure/common": "2.0.0-beta.3",
+        "@vendure/core": "2.0.0-beta.3",
         "express": "^4.17.1",
         "node-fetch": "^2.6.7",
         "rimraf": "^3.0.2",
@@ -38,5 +39,5 @@
         "fs-extra": "^10.0.0",
         "sharp": "~0.31.2"
     },
-    "gitHead": "1283d87f0fe171a174507bfa1926520e1fbc97b1"
+    "gitHead": "609e2ed4a0f8b5101a5fa0824e2caca791efca66"
 }