@travetto/model-redis 6.0.0 → 7.0.0-rc.0

package/README.md

@@ -37,14 +37,12 @@ export class Init {
 }
 ```
 
-where the [RedisModelConfig](https://github.com/travetto/travetto/tree/main/module/model-redis/src/config.ts#L7) is defined by:
+where the [RedisModelConfig](https://github.com/travetto/travetto/tree/main/module/model-redis/src/config.ts#L6) is defined by:
 
 **Code: Structure of RedisModelConfig**
 ```typescript
 @Config('model.redis')
 export class RedisModelConfig {
-
-  @Field(Object)
   client: redis.RedisClientOptions = {};
   namespace?: string;
   autoCreate?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-redis",
-  "version": "6.0.0",
+  "version": "7.0.0-rc.0",
   "description": "Redis backing for the travetto model module.",
   "keywords": [
     "typescript",
@@ -25,10 +25,10 @@
     "directory": "module/model-redis"
   },
   "dependencies": {
-    "@travetto/cli": "^6.0.0",
-    "@travetto/config": "^6.0.0",
-    "@travetto/model": "^6.0.0",
-    "redis": "^4.7.0"
+    "@redis/client": "^5.10.0",
+    "@travetto/cli": "^7.0.0-rc.0",
+    "@travetto/config": "^7.0.0-rc.0",
+    "@travetto/model": "^7.0.0-rc.0"
   },
   "travetto": {
     "displayName": "Redis Model Support"

package/src/config.ts

@@ -1,12 +1,9 @@
 import type redis from 'redis';
 
 import { Config } from '@travetto/config';
-import { Field } from '@travetto/schema';
 
 @Config('model.redis')
 export class RedisModelConfig {
-
-  @Field(Object)
   client: redis.RedisClientOptions = {};
   namespace?: string;
   autoCreate?: boolean;

package/src/service.ts

@@ -1,8 +1,8 @@
-import { createClient } from 'redis';
+import { createClient } from '@redis/client';
 
 import { ShutdownManager, type Class, type DeepPartial } from '@travetto/runtime';
 import {
-  ModelCrudSupport, ModelExpirySupport, ModelRegistry, ModelType, ModelStorageSupport,
+  ModelCrudSupport, ModelExpirySupport, ModelRegistryIndex, ModelType, ModelStorageSupport,
   NotFoundError, ExistsError, ModelIndexedSupport, OptionalId,
   ModelCrudUtil, ModelExpiryUtil, ModelIndexedUtil, ModelStorageUtil,
 } from '@travetto/model';
@@ -27,7 +27,7 @@ export class RedisModelService implements ModelCrudSupport, ModelExpirySupport,
   constructor(config: RedisModelConfig) { this.config = config; }
 
   #resolveKey(cls: Class | string, id?: string, extra?: 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}`;
     }
@@ -41,7 +41,7 @@ export class RedisModelService implements ModelCrudSupport, ModelExpirySupport,
   }
 
   async * #streamValues(op: 'scan' | 'sScan' | 'zScan', search: RedisScan, count = 100): AsyncIterable<string[]> {
-    let prevCursor = 0;
+    let prevCursor = '0';
     let done = false;
 
     const flags = { COUNT: count, ...('match' in search ? { MATCH: search.match } : {}) };
@@ -60,7 +60,7 @@ export class RedisModelService implements ModelCrudSupport, ModelExpirySupport,
 
       yield results;
 
-      if (cursor === 0) {
+      if (cursor === '0') {
         done = true;
       }
     }
@@ -71,7 +71,7 @@ export class RedisModelService implements ModelCrudSupport, ModelExpirySupport,
   }
 
   #removeIndices<T extends ModelType>(cls: Class, item: T, multi: RedisMulti): void {
-    for (const idx of ModelRegistry.getIndices(cls, ['sorted', 'unsorted'])) {
+    for (const idx of ModelRegistryIndex.getIndices(cls, ['sorted', 'unsorted'])) {
       const { key } = ModelIndexedUtil.computeIndexKey(cls, idx, item);
       const fullKey = this.#resolveKey(cls, idx.name, key);
       switch (idx.type) {
@@ -82,7 +82,7 @@ export class RedisModelService implements ModelCrudSupport, ModelExpirySupport,
   }
 
   #addIndices<T extends ModelType>(cls: Class, item: T, multi: RedisMulti): void {
-    for (const idx of ModelRegistry.getIndices(cls, ['sorted', 'unsorted'])) {
+    for (const idx of ModelRegistryIndex.getIndices(cls, ['sorted', 'unsorted'])) {
       const { key, sort } = ModelIndexedUtil.computeIndexKey(cls, idx, item);
       const fullKey = this.#resolveKey(cls, idx.name, key);
 
@@ -95,7 +95,7 @@ export class RedisModelService implements ModelCrudSupport, ModelExpirySupport,
 
   async #store<T extends ModelType>(cls: Class<T>, item: T, action: 'write' | 'delete'): Promise<void> {
     const key = this.#resolveKey(cls, item.id);
-    const config = ModelRegistry.get(cls);
+    const config = ModelRegistryIndex.getConfig(cls);
     const existing = await this.get(cls, item.id).catch(() => undefined);
 
     // Store with indices
@@ -149,7 +149,7 @@ export class RedisModelService implements ModelCrudSupport, ModelExpirySupport,
   async #getIdByIndex<T extends ModelType>(cls: Class<T>, idx: string, body: DeepPartial<T>): Promise<string> {
     ModelCrudUtil.ensureNotSubType(cls);
 
-    const idxCfg = ModelRegistry.getIndex(cls, idx, ['sorted', 'unsorted']);
+    const idxCfg = ModelRegistryIndex.getIndex(cls, idx, ['sorted', 'unsorted']);
     const { key, sort } = ModelIndexedUtil.computeIndexKey(cls, idxCfg, body);
     const fullKey = this.#resolveKey(cls, idxCfg.name, key);
     let id: string | undefined;
@@ -171,9 +171,9 @@ export class RedisModelService implements ModelCrudSupport, ModelExpirySupport,
     this.client = createClient(this.config.client);
     await this.client.connect();
     await ModelStorageUtil.registerModelChangeListener(this);
-    ShutdownManager.onGracefulShutdown(() => this.client.disconnect(), this);
-    for (const el of ModelRegistry.getClasses()) {
-      for (const idx of ModelRegistry.get(el).indices ?? []) {
+    ShutdownManager.onGracefulShutdown(() => this.client.destroy());
+    for (const el of ModelRegistryIndex.getClasses()) {
+      for (const idx of ModelRegistryIndex.getConfig(el).indices ?? []) {
         switch (idx.type) {
           case 'unique': {
             console.error('Unique indices are not supported in redis for', { cls: el.Ⲑid, idx: idx.name });
@@ -309,7 +309,7 @@ export class RedisModelService implements ModelCrudSupport, ModelExpirySupport,
   async * listByIndex<T extends ModelType>(cls: Class<T>, idx: string, body?: DeepPartial<T>): AsyncIterable<T> {
     ModelCrudUtil.ensureNotSubType(cls);
 
-    const idxCfg = ModelRegistry.getIndex(cls, idx, ['sorted', 'unsorted']);
+    const idxCfg = ModelRegistryIndex.getIndex(cls, idx, ['sorted', 'unsorted']);
 
     let stream: AsyncIterable<string[]>;
 

package/support/service.redis.ts

@@ -1,6 +1,6 @@
 import type { ServiceDescriptor } from '@travetto/cli';
 
-const version = process.env.REDIS_VERSION || '7.4';
+const version = process.env.REDIS_VERSION || '8.4';
 
 export const service: ServiceDescriptor = {
   name: 'redis',