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

package/README.md

@@ -67,6 +67,7 @@ export class S3ModelConfig {
   /**
    * Provide base URL for public access
    */
+  @Url()
   @Required(false)
   publicBaseUrl: string;
 
@@ -81,25 +82,13 @@ export class S3ModelConfig {
     }
 
     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;
-          }
-        }
+      if (this.endpoint?.includes('localhost')) {
+        this.publicBaseUrl = this.endpoint;
       } else {
         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.20",
+  "version": "8.0.0-alpha.21",
   "type": "module",
   "description": "S3 backing for the travetto model module.",
   "keywords": [

package/src/service.ts

@@ -22,7 +22,7 @@ function isMetadataBearer(value: unknown): value is MetadataBearer {
   return !!value && typeof value === 'object' && '$metadata' in value;
 }
 
-function hasContentType<T>(value: T): value is T & { contenttype?: string } {
+function hasLowerContentType<T>(value: T): value is T & { contenttype?: string } {
   return value !== undefined && value !== null && Object.hasOwn(value, 'contenttype');
 }
 
@@ -361,7 +361,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
     return BinaryMetadataUtil.makeBlob(() => this.#getObject(location, final), { ...metadata, range: final });
   }
 
-  async headBlob(location: string): Promise<{ Metadata?: BinaryMetadata, ContentLength?: number }> {
+  async headBlob(location: string): Promise<{ Metadata?: BinaryMetadata, ContentLength?: number, ContentType?: string }> {
     const query = this.#queryBlob(location);
     try {
       return (await this.client.headObject(query));
@@ -380,11 +380,11 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
 
     if (blob) {
       const metadata: BinaryMetadata = {
-        contentType: '',
+        contentType: blob.ContentType ?? '',
         ...blob.Metadata,
         size: blob.ContentLength!,
       };
-      if (hasContentType(metadata)) {
+      if (hasLowerContentType(metadata)) {
         metadata['contentType'] = metadata['contenttype']!;
         delete metadata['contenttype'];
       }