@travetto/model-s3 7.0.5 → 7.0.7

package/README.md

@@ -25,7 +25,7 @@ Out of the box, by installing the module, everything should be wired up by defau
 **Code: Wiring up a custom Model Source**
 ```typescript
 import { InjectableFactory } from '@travetto/di';
-import { S3ModelConfig, S3ModelService } from '@travetto/model-s3';
+import { type S3ModelConfig, S3ModelService } from '@travetto/model-s3';
 
 export class Init {
   @InjectableFactory({
@@ -45,8 +45,10 @@ where the [S3ModelConfig](https://github.com/travetto/travetto/tree/main/module/
 export class S3ModelConfig {
   region = 'us-east-1'; // AWS Region
   namespace = ''; // S3 Bucket folder
-  bucket = ''; // S3 bucket
-  endpoint = ''; // Endpoint url
+  @Required(false)
+  bucket: string; // S3 bucket
+  @Required(false)
+  endpoint: string; // Endpoint url
 
   @EnvVar('AWS_ACCESS_KEY_ID')
   accessKeyId: string = '';
@@ -75,9 +77,7 @@ export class S3ModelConfig {
   async postConstruct(): Promise<void> {
     if (!Runtime.production) {
       this.endpoint ??= 'http://localhost:4566'; // From docker
-      if (this.endpoint.includes('localhost')) {
-        this.config.forcePathStyle ??= true;
-      }
+      this.bucket ??= 'app';
     }
 
     if (!this.accessKeyId && !this.secretAccessKey) {
@@ -95,6 +95,10 @@ export class S3ModelConfig {
         secretAccessKey: this.secretAccessKey
       }
     };
+
+    if (!Runtime.production && this.endpoint.includes('localhost')) {
+      this.config.forcePathStyle ??= true;
+    }
   }
 }
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-s3",
-  "version": "7.0.5",
+  "version": "7.0.7",
   "type": "module",
   "description": "S3 backing for the travetto model module.",
   "keywords": [
@@ -26,14 +26,14 @@
     "directory": "module/model-s3"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.962.0",
-    "@aws-sdk/credential-provider-ini": "^3.962.0",
-    "@aws-sdk/s3-request-presigner": "^3.962.0",
-    "@travetto/config": "^7.0.4",
-    "@travetto/model": "^7.0.4"
+    "@aws-sdk/client-s3": "^3.966.0",
+    "@aws-sdk/credential-provider-ini": "^3.966.0",
+    "@aws-sdk/s3-request-presigner": "^3.966.0",
+    "@travetto/config": "^7.0.6",
+    "@travetto/model": "^7.0.6"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.5"
+    "@travetto/cli": "^7.0.7"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/service.ts

@@ -2,19 +2,22 @@ import { Readable } from 'node:stream';
 import { text as toText, buffer as toBuffer } from 'node:stream/consumers';
 import { Agent } from 'node:https';
 
-import { S3, CompletedPart, type CreateMultipartUploadRequest, GetObjectCommand, PutObjectCommand } from '@aws-sdk/client-s3';
+import { S3, type CompletedPart, type CreateMultipartUploadRequest, GetObjectCommand, PutObjectCommand } from '@aws-sdk/client-s3';
 import type { MetadataBearer } from '@aws-sdk/types';
 import { NodeHttpHandler } from '@smithy/node-http-handler';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 
 import {
-  ModelCrudSupport, ModelStorageSupport, ModelType, ModelRegistryIndex, ExistsError, NotFoundError, OptionalId,
-  ModelBlobSupport, ModelExpirySupport, ModelBlobUtil, ModelCrudUtil, ModelExpiryUtil, ModelStorageUtil,
+  type ModelCrudSupport, type ModelStorageSupport, type ModelType, ModelRegistryIndex, ExistsError, NotFoundError, type OptionalId,
+  type ModelBlobSupport, type ModelExpirySupport, ModelBlobUtil, ModelCrudUtil, ModelExpiryUtil, ModelStorageUtil
 } from '@travetto/model';
 import { Injectable } from '@travetto/di';
-import { Class, AppError, castTo, asFull, BlobMeta, ByteRange, BinaryInput, BinaryUtil, TimeSpan, TimeUtil } from '@travetto/runtime';
+import {
+  type Class, AppError, castTo, asFull, type BlobMeta,
+  type ByteRange, type BinaryInput, BinaryUtil, type TimeSpan, TimeUtil
+} from '@travetto/runtime';
 
-import { S3ModelConfig } from './config.ts';
+import type { S3ModelConfig } from './config.ts';
 
 function isMetadataBearer(value: unknown): value is MetadataBearer {
   return !!value && typeof value === 'object' && '$metadata' in value;