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

package/README.md

@@ -65,10 +65,10 @@ export class S3ModelConfig {
   modifyStorage?: boolean;
 
   /**
-   * Provide host to bucket
+   * Provide base URL for public access
    */
   @Required(false)
-  hostName: string;
+  publicBaseUrl: string;
 
   /**
    * Produces the s3 config from the provide details, post construction
@@ -80,14 +80,26 @@ export class S3ModelConfig {
       this.bucket ??= 'app';
     }
 
-    if (!this.hostName) {
-      if (this.endpoint && !this.endpoint.includes('localhost')) {
-        this.hostName = new URL(this.endpoint).host;
+    if (!this.publicBaseUrl) {
+      if (this.endpoint) {
+        if (this.endpoint.includes('localhost')) {
+          this.publicBaseUrl = this.endpoint;
+        } else {
+          try {
+            this.publicBaseUrl = new URL(this.endpoint).origin;
+          } catch {
+            this.publicBaseUrl = this.endpoint;
+          }
+        }
       } else {
-        this.hostName = `${this.bucket}.s3.amazonaws.com`;
+        this.publicBaseUrl = `https://${this.bucket}.s3.amazonaws.com`;
       }
     }
 
+    if (this.publicBaseUrl && !this.publicBaseUrl.includes('://')) {
+      this.publicBaseUrl = `https://${this.publicBaseUrl}`;
+    }
+
     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.19",
+  "version": "8.0.0-alpha.20",
   "type": "module",
   "description": "S3 backing for the travetto model module.",
   "keywords": [
@@ -29,11 +29,11 @@
     "@aws-sdk/client-s3": "^3.1063.0",
     "@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.19"
+    "@travetto/config": "^8.0.0-alpha.19",
+    "@travetto/model": "^8.0.0-alpha.20"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.24"
+    "@travetto/cli": "^8.0.0-alpha.25"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/config.ts

@@ -2,7 +2,7 @@ import { fromIni } from '@aws-sdk/credential-provider-ini';
 import type s3 from '@aws-sdk/client-s3';
 
 import { Config, EnvVar } from '@travetto/config';
-import { Required } from '@travetto/schema';
+import { Required, Url } from '@travetto/schema';
 import { Runtime } from '@travetto/runtime';
 import { PostConstruct } from '@travetto/di';
 
@@ -33,10 +33,11 @@ export class S3ModelConfig {
   modifyStorage?: boolean;
 
   /**
-   * Provide host to bucket
+   * Provide base URL for public access
    */
+  @Url()
   @Required(false)
-  hostName: string;
+  publicBaseUrl: string;
 
   /**
    * Produces the s3 config from the provide details, post construction
@@ -48,11 +49,11 @@ export class S3ModelConfig {
       this.bucket ??= 'app';
     }
 
-    if (!this.hostName) {
-      if (this.endpoint && !this.endpoint.includes('localhost')) {
-        this.hostName = new URL(this.endpoint).host;
+    if (!this.publicBaseUrl) {
+      if (this.endpoint?.includes('localhost')) {
+        this.publicBaseUrl = this.endpoint;
       } else {
-        this.hostName = `${this.bucket}.s3.amazonaws.com`;
+        this.publicBaseUrl = `https://${this.bucket}.s3.amazonaws.com`;
       }
     }
 

package/src/service.ts

@@ -412,12 +412,11 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
   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';
+      const baseUrl = this.config.publicBaseUrl;
       if (this.config.config.forcePathStyle) {
-        return `${protocol}://${host}/${this.config.bucket}/${key}`;
+        return `${baseUrl}/${this.config.bucket}/${key}`;
       } else {
-        return `${protocol}://${host}/${key}`;
+        return `${baseUrl}/${key}`;
       }
     }
     return await getSignedUrl(