@travetto/model-s3 4.0.7 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-s3",
-  "version": "4.0.7",
+  "version": "4.1.0",
   "description": "S3 backing for the travetto model module.",
   "keywords": [
     "s3",
@@ -25,13 +25,13 @@
     "directory": "module/model-s3"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.525.0",
-    "@aws-sdk/credential-provider-ini": "^3.525.0",
-    "@travetto/config": "^4.0.7",
-    "@travetto/model": "^4.0.7"
+    "@aws-sdk/client-s3": "^3.577.0",
+    "@aws-sdk/credential-provider-ini": "^3.577.0",
+    "@travetto/config": "^4.1.0",
+    "@travetto/model": "^4.1.0"
   },
   "peerDependencies": {
-    "@travetto/command": "^4.0.6"
+    "@travetto/command": "^4.1.0"
   },
   "peerDependenciesMeta": {
     "@travetto/command": {

package/src/service.ts

@@ -1,7 +1,9 @@
 import { Readable } from 'node:stream';
+import { Agent } from 'node:https';
 
 import { S3, CompletedPart, type CreateMultipartUploadRequest } from '@aws-sdk/client-s3';
 import type { MetadataBearer } from '@aws-sdk/types';
+import { NodeHttpHandler } from '@smithy/node-http-handler';
 
 import {
   ModelCrudSupport, ModelStreamSupport, ModelStorageSupport, StreamMeta,
@@ -14,7 +16,6 @@ import { ModelCrudUtil } from '@travetto/model/src/internal/service/crud';
 import { ModelExpirySupport } from '@travetto/model/src/service/expiry';
 import { ModelExpiryUtil } from '@travetto/model/src/internal/service/expiry';
 import { ModelStorageUtil } from '@travetto/model/src/internal/service/storage';
-import { ModelStreamUtil } from '@travetto/model/src/internal/service/stream';
 
 import { S3ModelConfig } from './config';
 
@@ -163,7 +164,17 @@ export class S3ModelService implements ModelCrudSupport, ModelStreamSupport, Mod
   }
 
   async postConstruct(): Promise<void> {
-    this.client = new S3(this.config.config);
+    this.client = new S3({
+      ...this.config.config,
+      ...('requestHandler' in this.config.config ? {
+        requestHandler: new NodeHttpHandler({
+          ...this.config.config.requestHandler,
+          ...('httpsAgent' in this.config.config.requestHandler! ? {
+            httpsAgent: new Agent({ ...this.config.config.requestHandler?.httpsAgent ?? {} }),
+          } : {})
+        }),
+      } : {})
+    });
     ModelStorageUtil.registerModelChangeListener(this);
   }
 
@@ -313,7 +324,7 @@ export class S3ModelService implements ModelCrudSupport, ModelStreamSupport, Mod
   async getStreamPartial(location: string, start: number, end?: number): Promise<PartialStream> {
     const meta = await this.describeStream(location);
 
-    [start, end] = ModelStreamUtil.enforceRange(start, end, meta.size);
+    [start, end] = StreamUtil.enforceRange(start, end, meta.size);
 
     // Read from s3
     const res = await this.client.getObject(this.#q(STREAM_SPACE, location, {