@travetto/model-s3 8.0.0-alpha.18 → 8.0.0-alpha.19

package/README.md

@@ -67,9 +67,8 @@ export class S3ModelConfig {
   /**
    * Provide host to bucket
    */
-  get hostName(): string {
-    return `${this.bucket}.s3.amazonaws.com`;
-  }
+  @Required(false)
+  hostName: string;
 
   /**
    * Produces the s3 config from the provide details, post construction
@@ -81,6 +80,14 @@ export class S3ModelConfig {
       this.bucket ??= 'app';
     }
 
+    if (!this.hostName) {
+      if (this.endpoint && !this.endpoint.includes('localhost')) {
+        this.hostName = new URL(this.endpoint).host;
+      } else {
+        this.hostName = `${this.bucket}.s3.amazonaws.com`;
+      }
+    }
+
     if (!this.accessKeyId && !this.secretAccessKey) {
       const creds = await fromIni({ profile: this.profile })();
       this.accessKeyId = creds.accessKeyId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-s3",
-  "version": "8.0.0-alpha.18",
+  "version": "8.0.0-alpha.19",
   "type": "module",
   "description": "S3 backing for the travetto model module.",
   "keywords": [
@@ -30,10 +30,10 @@
     "@aws-sdk/credential-provider-ini": "^3.972.50",
     "@aws-sdk/s3-request-presigner": "^3.1063.0",
     "@travetto/config": "^8.0.0-alpha.18",
-    "@travetto/model": "^8.0.0-alpha.18"
+    "@travetto/model": "^8.0.0-alpha.19"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.23"
+    "@travetto/cli": "^8.0.0-alpha.24"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/config.ts

@@ -35,9 +35,8 @@ export class S3ModelConfig {
   /**
    * Provide host to bucket
    */
-  get hostName(): string {
-    return `${this.bucket}.s3.amazonaws.com`;
-  }
+  @Required(false)
+  hostName: string;
 
   /**
    * Produces the s3 config from the provide details, post construction
@@ -49,6 +48,14 @@ export class S3ModelConfig {
       this.bucket ??= 'app';
     }
 
+    if (!this.hostName) {
+      if (this.endpoint && !this.endpoint.includes('localhost')) {
+        this.hostName = new URL(this.endpoint).host;
+      } else {
+        this.hostName = `${this.bucket}.s3.amazonaws.com`;
+      }
+    }
+
     if (!this.accessKeyId && !this.secretAccessKey) {
       const creds = await fromIni({ profile: this.profile })();
       this.accessKeyId = creds.accessKeyId;

package/src/service.ts

@@ -409,7 +409,17 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
   }
 
   // Signed urls
-  async getBlobReadUrl(location: string, expiresIn: TimeSpan = '1h'): Promise<string> {
+  async getBlobReadUrl(location: string, expiresIn: TimeSpan | false = '1h'): Promise<string> {
+    if (expiresIn === false) {
+      const key = this.#basicKey(location);
+      const host = this.config.hostName;
+      const protocol = this.config.endpoint?.startsWith('http://') ? 'http' : 'https';
+      if (this.config.config.forcePathStyle) {
+        return `${protocol}://${host}/${this.config.bucket}/${key}`;
+      } else {
+        return `${protocol}://${host}/${key}`;
+      }
+    }
     return await getSignedUrl(
       this.client,
       new GetObjectCommand(this.#queryBlob(location)),