@travetto/cache 7.1.4 → 8.0.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cache",
-  "version": "7.1.4",
+  "version": "8.0.0-alpha.0",
   "type": "module",
   "description": "Caching functionality with decorators for declarative use.",
   "keywords": [
@@ -26,12 +26,12 @@
     "directory": "module/cache"
   },
   "dependencies": {
-    "@travetto/di": "^7.1.4",
-    "@travetto/model": "^7.1.4"
+    "@travetto/di": "^8.0.0-alpha.0",
+    "@travetto/model": "^8.0.0-alpha.0"
   },
   "peerDependencies": {
-    "@travetto/test": "^7.1.4",
-    "@travetto/transformer": "^7.1.3"
+    "@travetto/test": "^8.0.0-alpha.0",
+    "@travetto/transformer": "^8.0.0-alpha.0"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/decorator.ts

@@ -16,7 +16,7 @@ export function Cache<F extends string, U extends Record<F, CacheService>>(
 ): MethodDecorator {
   if (input !== undefined) {
     if (typeof input === 'string' || typeof input === 'number') {
-      config.maxAge = TimeUtil.asMillis(input);
+      config.maxAge = TimeUtil.duration(input, 'ms');
     } else {
       config = input;
     }

package/src/error.ts

@@ -1,4 +1,4 @@
-import { AppError } from '@travetto/runtime';
+import { RuntimeError } from '@travetto/runtime';
 
 /** Cache Error Class */
-export class CacheError extends AppError { }
+export class CacheError extends RuntimeError { }

package/src/service.ts

@@ -1,13 +1,13 @@
 import { ExpiresAt, Index, Model, type ModelExpirySupport, NotFoundError, ModelStorageUtil, ModelIndexedUtil } from '@travetto/model';
 import { Text } from '@travetto/schema';
 import { Inject, Injectable } from '@travetto/di';
-import { AppError, JSONUtil, TimeUtil } from '@travetto/runtime';
+import { RuntimeError, JSONUtil, TimeUtil } from '@travetto/runtime';
 
 import { CacheError } from './error.ts';
 import { CacheUtil } from './util.ts';
 import { type CacheAware, CacheConfigSymbol, CacheModelSymbol, EvictConfigSymbol } from './types.ts';
 
-const INFINITE_MAX_AGE = TimeUtil.asMillis(10, 'y');
+const INFINITE_MAX_AGE = TimeUtil.duration('10y', 'ms');
 
 @Index({
   name: 'keySpace',
@@ -65,7 +65,7 @@ export class CacheService {
       }
     }
 
-    return JSONUtil.parseBase64(entry);
+    return JSONUtil.fromBase64(entry);
   }
 
   /**
@@ -74,7 +74,7 @@ export class CacheService {
    * @returns
    */
   async set(id: string, keySpace: string, entry: unknown, maxAge?: number): Promise<unknown> {
-    const entryText = JSONUtil.stringifyBase64(entry);
+    const entryText = JSONUtil.toBase64(entry);
 
     const store = await this.#modelService.upsert(CacheRecord,
       CacheRecord.from({
@@ -86,7 +86,7 @@ export class CacheService {
       }),
     );
 
-    return JSONUtil.parseBase64(store.entry);
+    return JSONUtil.fromBase64(store.entry);
   }
 
   /**
@@ -109,7 +109,7 @@ export class CacheService {
       }
       await Promise.all(removes);
     } else {
-      throw new AppError('Unable to delete all on an un-indexed database');
+      throw new RuntimeError('Unable to delete all on an un-indexed database');
     }
   }
 

package/src/util.ts

@@ -1,4 +1,4 @@
-import { BinaryUtil, JSONUtil } from '@travetto/runtime';
+import { BinaryMetadataUtil, JSONUtil } from '@travetto/runtime';
 
 import type { CoreCacheConfig } from './types.ts';
 
@@ -13,7 +13,7 @@ export class CacheUtil {
   static generateKey(config: CoreCacheConfig, params: unknown[]): string {
     const input = config.params?.(params) ?? params;
     const keyParams = config.key?.(...input) ?? input;
-    const key = `${config.keySpace!}_${JSONUtil.stringifyBase64(keyParams)}`;
-    return BinaryUtil.hash(key, 32);
+    const key = `${config.keySpace!}_${JSONUtil.toBase64(keyParams)}`;
+    return BinaryMetadataUtil.hash(key, { length: 32 });
   }
 }

package/support/test/service.ts

@@ -96,7 +96,7 @@ export abstract class CacheServiceSuite {
 
   @Test()
   async basic() {
-    const service = await this.testService;
+    const service = this.testService;
     let start = Date.now();
     let res = await service.basic(10);
     let diff = Date.now() - start;
@@ -112,7 +112,7 @@ export abstract class CacheServiceSuite {
 
   @Test()
   async aging() {
-    const service = await this.testService;
+    const service = this.testService;
 
     let start = Date.now();
     let res = await service.agesQuickly(10);
@@ -131,7 +131,7 @@ export abstract class CacheServiceSuite {
 
   @Test()
   async ageWithExtension() {
-    const service = await this.testService;
+    const service = this.testService;
 
     let start = Date.now();
     let res = await service.ageExtension(10);
@@ -159,7 +159,7 @@ export abstract class CacheServiceSuite {
 
   @Test()
   async complex() {
-    const service = await this.testService;
+    const service = this.testService;
 
     const val = await service.complexInput({ a: 5, b: 20 }, 20);
     const val2 = await service.complexInput({ a: 5, b: 20 }, 20);
@@ -174,7 +174,7 @@ export abstract class CacheServiceSuite {
 
   @Test()
   async customKey() {
-    const service = await this.testService;
+    const service = this.testService;
 
     const val4 = await service.customKey({ a: 5, b: 20 }, 20);
     const val5 = await service.customKey({ b: 5, a: 20 }, 30);
@@ -186,7 +186,7 @@ export abstract class CacheServiceSuite {
 
   @Test()
   async reinstating() {
-    const service = await this.testService;
+    const service = this.testService;
 
     const user = await service.getUser('200');
     assert(user instanceof User);
@@ -197,7 +197,7 @@ export abstract class CacheServiceSuite {
 
   @Test()
   async eviction() {
-    const service = await this.testService;
+    const service = this.testService;
 
     await service.getUser('200');
     const start = Date.now();
@@ -221,7 +221,7 @@ export abstract class CacheServiceSuite {
       return;
     }
 
-    const service = await this.testService;
+    const service = this.testService;
 
     // Prime cache
     for (let i = 0; i < 10; i++) {