@travetto/model-s3 6.0.1 → 7.0.0-rc.0

package/README.md

@@ -55,7 +55,6 @@ export class S3ModelConfig {
   @EnvVar('AWS_PROFILE')
   profile?: string;
 
-  @Field(Object)
   @Required(false)
   config: s3.S3ClientConfig; // Additional s3 config
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-s3",
-  "version": "6.0.1",
+  "version": "7.0.0-rc.0",
   "description": "S3 backing for the travetto model module.",
   "keywords": [
     "s3",
@@ -25,12 +25,12 @@
     "directory": "module/model-s3"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.901.0",
-    "@aws-sdk/credential-provider-ini": "^3.901.0",
-    "@aws-sdk/s3-request-presigner": "^3.901.0",
-    "@travetto/cli": "^6.0.1",
-    "@travetto/config": "^6.0.1",
-    "@travetto/model": "^6.0.1"
+    "@aws-sdk/client-s3": "^3.940.0",
+    "@aws-sdk/credential-provider-ini": "^3.940.0",
+    "@aws-sdk/s3-request-presigner": "^3.940.0",
+    "@travetto/cli": "^7.0.0-rc.0",
+    "@travetto/config": "^7.0.0-rc.0",
+    "@travetto/model": "^7.0.0-rc.0"
   },
   "travetto": {
     "displayName": "S3 Model Support"

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 { Field, Required } from '@travetto/schema';
+import { Required } from '@travetto/schema';
 import { Runtime } from '@travetto/runtime';
 
 /**
@@ -22,7 +22,6 @@ export class S3ModelConfig {
   @EnvVar('AWS_PROFILE')
   profile?: string;
 
-  @Field(Object)
   @Required(false)
   config: s3.S3ClientConfig; // Additional s3 config
 

package/src/service.ts

@@ -8,9 +8,8 @@ import { NodeHttpHandler } from '@smithy/node-http-handler';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 
 import {
-  ModelCrudSupport, ModelStorageSupport, ModelType, ModelRegistry, ExistsError, NotFoundError, OptionalId,
+  ModelCrudSupport, ModelStorageSupport, ModelType, ModelRegistryIndex, ExistsError, NotFoundError, OptionalId,
   ModelBlobSupport, 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';
@@ -65,7 +64,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
   }
 
   #resolveKey(cls: Class | string, id?: string): string {
-    let key = typeof cls === 'string' ? cls : ModelRegistry.getStore(cls);
+    let key = typeof cls === 'string' ? cls : ModelRegistryIndex.getStoreName(cls);
     if (id) {
       key = `${key}:${id}`;
     }
@@ -85,7 +84,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
 
 
   #getExpiryConfig<T extends ModelType>(cls: Class<T>, item: T): { Expires?: Date } {
-    if (ModelRegistry.get(cls).expiresAt) {
+    if (ModelRegistryIndex.getConfig(cls).expiresAt) {
       const { expiresAt } = ModelExpiryUtil.getExpiryState(cls, item);
       if (expiresAt) {
         return { Expires: expiresAt };
@@ -197,8 +196,8 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
   async head<T extends ModelType>(cls: Class<T>, id: string): Promise<boolean> {
     try {
       const result = await this.client.headObject(this.#q(cls, id));
-      const { expiresAt } = ModelRegistry.get(cls);
-      if (expiresAt && result.Expires && result.Expires.getTime() < Date.now()) {
+      const { expiresAt } = ModelRegistryIndex.getConfig(cls);
+      if (expiresAt && result.ExpiresString && Date.parse(result.ExpiresString) < Date.now()) {
         return false;
       }
       return true;
@@ -219,7 +218,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
         const body = await toText(castTo(result.Body));
         const output = await ModelCrudUtil.load(cls, body);
         if (output) {
-          const { expiresAt } = ModelRegistry.get(cls);
+          const { expiresAt } = ModelRegistryIndex.getConfig(cls);
           if (expiresAt) {
             const expiry = ModelExpiryUtil.getExpiryState(cls, output);
             if (!expiry.expired) {

package/support/service.s3.ts

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