@travetto/model-s3 8.0.3 → 8.0.5

package/README.md

@@ -91,6 +91,8 @@ export class S3ModelConfig {
     const isAws = !this.endpoint || hostname === 'amazonaws.com' || hostname.endsWith('.amazonaws.com');
 
     this.config = {
+      responseChecksumValidation: 'WHEN_REQUIRED',
+      requestChecksumCalculation: 'WHEN_REQUIRED',
       ...(this.config ?? {}),
       region: this.region,
       endpoint: this.endpoint || undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-s3",
-  "version": "8.0.3",
+  "version": "8.0.5",
   "description": "S3 backing for the travetto model module.",
   "keywords": [
     "model",
@@ -29,11 +29,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1127.0",
-    "@aws-sdk/credential-provider-ini": "^3.973.15",
-    "@aws-sdk/s3-request-presigner": "^3.1127.0",
-    "@travetto/config": "^8.0.2",
-    "@travetto/model": "^8.0.2"
+    "@aws-sdk/client-s3": "^3.1131.0",
+    "@aws-sdk/credential-provider-ini": "^3.973.16",
+    "@aws-sdk/s3-request-presigner": "^3.1131.0",
+    "@travetto/config": "^8.0.3",
+    "@travetto/model": "^8.0.4"
   },
   "peerDependencies": {
     "@travetto/cli": "^8.0.2"

package/src/config.ts

@@ -59,6 +59,8 @@ export class S3ModelConfig {
     const isAws = !this.endpoint || hostname === 'amazonaws.com' || hostname.endsWith('.amazonaws.com');
 
     this.config = {
+      responseChecksumValidation: 'WHEN_REQUIRED',
+      requestChecksumCalculation: 'WHEN_REQUIRED',
       ...(this.config ?? {}),
       region: this.region,
       endpoint: this.endpoint || undefined,

package/src/service.ts

@@ -45,6 +45,13 @@ function isMetadataBearer(value: unknown): value is MetadataBearer {
   return !!value && typeof value === 'object' && '$metadata' in value;
 }
 
+function isNotFoundError(error: unknown): error is Error | MetadataBearer {
+  return (
+    (isMetadataBearer(error) && error.$metadata.httpStatusCode === 404) ||
+    (error instanceof Error && (error.name === 'NoSuchBucket' || error.name === 'NotFound' || error.name === 'NoSuchKey'))
+  );
+}
+
 function hasLowerContentType<T>(value: T): value is T & { contenttype?: string } {
   return value !== undefined && value !== null && Object.hasOwn(value, 'contenttype');
 }
@@ -248,10 +255,8 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
       }
       return true;
     } catch (error) {
-      if (isMetadataBearer(error)) {
-        if (error.$metadata.httpStatusCode === 404) {
-          return false;
-        }
+      if (isNotFoundError(error)) {
+        return false;
       }
       throw error;
     }
@@ -277,7 +282,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
       }
       throw new NotFoundError(cls, id);
     } catch (error) {
-      if (isMetadataBearer(error) && error.$metadata.httpStatusCode === 404) {
+      if (isNotFoundError(error)) {
         throw new NotFoundError(cls, id);
       }
       throw error;
@@ -415,7 +420,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
     try {
       return await this.client.headObject(query);
     } catch (error) {
-      if (isMetadataBearer(error) && error.$metadata.httpStatusCode === 404) {
+      if (isNotFoundError(error)) {
         throw new NotFoundError('Blob', location);
       }
       throw error;
@@ -490,6 +495,10 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
     }
   }
 
+  async deleteModel<T extends ModelType>(model: Class<T>): Promise<void> {
+    await ModelStorageUtil.runAndIgnoreNotFound(() => this.truncateModel(model), isNotFoundError);
+  }
+
   async createStorage(): Promise<void> {
     try {
       await this.client.headBucket({ Bucket: this.config.bucket });
@@ -504,7 +513,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
         await this.#deleteKeys(items);
       }
     } else {
-      await this.client.deleteBucket({ Bucket: this.config.bucket });
+      await ModelStorageUtil.runAndIgnoreNotFound(() => this.client.deleteBucket({ Bucket: this.config.bucket }), isNotFoundError);
     }
   }
 }

package/support/service.s3.ts

@@ -1,6 +1,6 @@
 import type { ServiceDescriptor } from '@travetto/cli';
 
-const version = '4.12.4';
+const version = '5.2.2';
 
 export const service: ServiceDescriptor = {
   name: 's3',