@directus/storage-driver-s3 10.0.4 → 10.0.6

package/dist/index.js

@@ -1,7 +1,10 @@
 import { CopyObjectCommand, DeleteObjectCommand, GetObjectCommand, HeadObjectCommand, ListObjectsV2Command, S3Client, } from '@aws-sdk/client-s3';
 import { Upload } from '@aws-sdk/lib-storage';
+import { NodeHttpHandler } from '@aws-sdk/node-http-handler';
 import { normalizePath } from '@directus/utils';
 import { isReadableStream } from '@directus/utils/node';
+import { Agent as HttpAgent } from 'node:http';
+import { Agent as HttpsAgent } from 'node:https';
 import { join } from 'node:path';
 export class DriverS3 {
     config;
@@ -13,7 +16,23 @@ export class DriverS3 {
         this.root = this.config.root ? normalizePath(this.config.root, { removeLeading: true }) : '';
     }
     getClient() {
-        const s3ClientConfig = {};
+        /*
+         * AWS' client default socket reusing can cause performance issues when using it very
+         * often in rapid succession, hitting the maxSockets limit of 50.
+         * The requestHandler is customized to get around this.
+         */
+        const connectionTimeout = 5000;
+        const socketTimeout = 120000;
+        const maxSockets = 500;
+        const keepAlive = true;
+        const s3ClientConfig = {
+            requestHandler: new NodeHttpHandler({
+                connectionTimeout,
+                socketTimeout,
+                httpAgent: new HttpAgent({ maxSockets, keepAlive }),
+                httpsAgent: new HttpsAgent({ maxSockets, keepAlive }),
+            }),
+        };
         if ((this.config.key && !this.config.secret) || (this.config.secret && !this.config.key)) {
             throw new Error('Both `key` and `secret` are required when defined');
         }
@@ -44,12 +63,6 @@ export class DriverS3 {
         return normalizePath(join(this.root, filepath));
     }
     async read(filepath, range) {
-        /*
-         * AWS' client default socket reusing and keepalive can cause performance issues when using it
-         * very often in rapid succession. For reads, where it's more likely to hit this limitation,
-         * we'll use a new non-shared S3 client to get around this.
-         */
-        const client = this.getClient();
         const commandInput = {
             Key: this.fullPath(filepath),
             Bucket: this.config.bucket,
@@ -57,11 +70,10 @@ export class DriverS3 {
         if (range) {
             commandInput.Range = `bytes=${range.start ?? ''}-${range.end ?? ''}`;
         }
-        const { Body: stream } = await client.send(new GetObjectCommand(commandInput));
+        const { Body: stream } = await this.client.send(new GetObjectCommand(commandInput));
         if (!stream || !isReadableStream(stream)) {
             throw new Error(`No stream returned for file "${filepath}"`);
         }
-        stream.on('finished', () => client.destroy());
         return stream;
     }
     async stat(filepath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/storage-driver-s3",
-  "version": "10.0.4",
+  "version": "10.0.6",
   "description": "S3 file storage abstraction for `@directus/storage`",
   "homepage": "https://directus.io",
   "repository": {
@@ -24,8 +24,9 @@
     "@aws-sdk/abort-controller": "3.329.0",
     "@aws-sdk/client-s3": "3.332.0",
     "@aws-sdk/lib-storage": "3.332.0",
-    "@directus/storage": "10.0.2",
-    "@directus/utils": "10.0.4"
+    "@aws-sdk/node-http-handler": "3.344.0",
+    "@directus/storage": "10.0.4",
+    "@directus/utils": "10.0.6"
   },
   "devDependencies": {
     "@ngneat/falso": "6.4.0",