@tsed/adapters-redis 7.0.0-rc.2 → 7.0.0-rc.5

package/lib/cjs/adapters/OIDCRedisAdapter.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OIDCRedisAdapter = void 0;
+const tslib_1 = require("tslib");
+const di_1 = require("@tsed/di");
+const ioredis_1 = require("@tsed/ioredis");
+const RedisAdapter_1 = require("./RedisAdapter");
+const GRANTABLE = new Set(["AccessToken", "AuthorizationCode", "RefreshToken", "DeviceCode", "BackchannelAuthenticationRequest"]);
+const CONSUMABLE = new Set(["AuthorizationCode", "RefreshToken", "DeviceCode", "BackchannelAuthenticationRequest"]);
+function grantKeyFor(id) {
+    return `$oidc:grant:${id}`;
+}
+function userCodeKeyFor(userCode) {
+    return `$oidc:userCode:${userCode}`;
+}
+function uidKeyFor(uid) {
+    return `$oidc:uid:${uid}`;
+}
+let OIDCRedisAdapter = class OIDCRedisAdapter extends RedisAdapter_1.RedisAdapter {
+    configuration;
+    isGrantable;
+    constructor(options, connections, configuration) {
+        super(options, connections, configuration);
+        this.configuration = configuration;
+        this.useHash = CONSUMABLE.has(this.collectionName);
+        this.isGrantable = GRANTABLE.has(this.collectionName);
+        this.hooks.on("insert", this.onInsert.bind(this));
+    }
+    async onInsert(multi, payload, expiresIn) {
+        const id = payload._id;
+        const key = this.key(id);
+        if (this.isGrantable && payload.grantId) {
+            const grantKey = grantKeyFor(payload.grantId);
+            multi.rpush(grantKey, key);
+            // if you're seeing grant key lists growing out of acceptable proportions consider using LTRIM
+            // here to trim the list to an appropriate length
+            const ttl = await this.db.ttl(grantKey);
+            if (expiresIn && expiresIn > ttl) {
+                multi.expire(grantKey, expiresIn);
+            }
+        }
+        if (payload.userCode) {
+            const userCodeKey = userCodeKeyFor(payload.userCode);
+            multi.set(userCodeKey, id);
+            expiresIn && multi.expire(userCodeKey, expiresIn);
+        }
+        if (payload.uid) {
+            const uidKey = uidKeyFor(payload.uid);
+            multi.set(uidKey, id);
+            expiresIn && multi.expire(uidKey, expiresIn);
+        }
+        return multi;
+    }
+    async findByUid(uid) {
+        const id = await this.db.get(uidKeyFor(uid));
+        return id && this.findById(id);
+    }
+    async findByUserCode(userCode) {
+        const id = await this.db.get(userCodeKeyFor(userCode));
+        return id && this.findById(id);
+    }
+    async destroy(id) {
+        const key = this.key(id);
+        await this.db.del(key);
+    }
+    async revokeByGrantId(grantId) {
+        // eslint-disable-line class-methods-use-this
+        const multi = this.db.multi();
+        const key = grantKeyFor(grantId);
+        const tokens = await this.db.lrange(key, 0, -1);
+        tokens.forEach((token) => multi.del(token));
+        multi.del(grantKeyFor(grantId));
+        await multi.exec();
+    }
+    async consume(id) {
+        await this.db.hset(this.key(id), "consumed", Math.floor(Date.now() / 1000));
+    }
+};
+OIDCRedisAdapter = tslib_1.__decorate([
+    tslib_1.__param(0, di_1.Opts),
+    tslib_1.__param(1, (0, di_1.Inject)(ioredis_1.IOREDIS_CONNECTIONS)),
+    tslib_1.__param(2, (0, di_1.Configuration)()),
+    tslib_1.__metadata("design:paramtypes", [Object, Array, Object])
+], OIDCRedisAdapter);
+exports.OIDCRedisAdapter = OIDCRedisAdapter;
+//# sourceMappingURL=OIDCRedisAdapter.js.map

package/lib/cjs/adapters/OIDCRedisAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OIDCRedisAdapter.js","sourceRoot":"","sources":["../../../src/adapters/OIDCRedisAdapter.ts"],"names":[],"mappings":"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","sourcesContent":["import {AdapterModel} from \"@tsed/adapters\";\nimport {Configuration, Inject, Opts} from \"@tsed/di\";\nimport {ChainableCommander} from \"ioredis\";\nimport {IOREDIS_CONNECTIONS, IORedis} from \"@tsed/ioredis\";\n\nimport {RedisAdapter, RedisAdapterConstructorOptions} from \"./RedisAdapter\";\n\nconst GRANTABLE = new Set([\"AccessToken\", \"AuthorizationCode\", \"RefreshToken\", \"DeviceCode\", \"BackchannelAuthenticationRequest\"]);\nconst CONSUMABLE = new Set([\"AuthorizationCode\", \"RefreshToken\", \"DeviceCode\", \"BackchannelAuthenticationRequest\"]);\n\nfunction grantKeyFor(id: string) {\n  return `$oidc:grant:${id}`;\n}\n\nfunction userCodeKeyFor(userCode: string) {\n  return `$oidc:userCode:${userCode}`;\n}\n\nfunction uidKeyFor(uid: string) {\n  return `$oidc:uid:${uid}`;\n}\n\nexport class OIDCRedisAdapter<T extends AdapterModel> extends RedisAdapter<T> {\n  protected isGrantable: boolean;\n\n  constructor(\n    @Opts options: RedisAdapterConstructorOptions,\n    @Inject(IOREDIS_CONNECTIONS) connections: IORedis[],\n    @Configuration() protected configuration: Configuration\n  ) {\n    super(options, connections, configuration);\n\n    this.useHash = CONSUMABLE.has(this.collectionName);\n    this.isGrantable = GRANTABLE.has(this.collectionName);\n    this.hooks.on(\"insert\", this.onInsert.bind(this));\n  }\n\n  async onInsert(multi: ChainableCommander, payload: T, expiresIn: number) {\n    const id = payload._id;\n\n    const key = this.key(id);\n\n    if (this.isGrantable && payload.grantId) {\n      const grantKey = grantKeyFor(payload.grantId);\n\n      multi.rpush(grantKey, key);\n      // if you're seeing grant key lists growing out of acceptable proportions consider using LTRIM\n      // here to trim the list to an appropriate length\n      const ttl = await this.db.ttl(grantKey);\n\n      if (expiresIn && expiresIn > ttl) {\n        multi.expire(grantKey, expiresIn);\n      }\n    }\n\n    if (payload.userCode) {\n      const userCodeKey = userCodeKeyFor(payload.userCode);\n\n      multi.set(userCodeKey, id);\n      expiresIn && multi.expire(userCodeKey, expiresIn);\n    }\n\n    if (payload.uid) {\n      const uidKey = uidKeyFor(payload.uid);\n\n      multi.set(uidKey, id);\n      expiresIn && multi.expire(uidKey, expiresIn);\n    }\n\n    return multi;\n  }\n\n  async findByUid(uid: string) {\n    const id = await this.db.get(uidKeyFor(uid));\n\n    return id && this.findById(id);\n  }\n\n  async findByUserCode(userCode: string) {\n    const id = await this.db.get(userCodeKeyFor(userCode));\n    return id && this.findById(id);\n  }\n\n  async destroy(id: string) {\n    const key = this.key(id);\n    await this.db.del(key);\n  }\n\n  async revokeByGrantId(grantId: string) {\n    // eslint-disable-line class-methods-use-this\n    const multi = this.db.multi();\n    const key = grantKeyFor(grantId);\n    const tokens = await this.db.lrange(key, 0, -1);\n\n    tokens.forEach((token) => multi.del(token));\n    multi.del(grantKeyFor(grantId));\n\n    await multi.exec();\n  }\n\n  async consume(id: string) {\n    await this.db.hset(this.key(id), \"consumed\", Math.floor(Date.now() / 1000));\n  }\n}\n"]}

package/lib/cjs/adapters/RedisAdapter.js

@@ -3,24 +3,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisAdapter = void 0;
 const tslib_1 = require("tslib");
 const adapters_1 = require("@tsed/adapters");
+const core_1 = require("@tsed/core");
 const di_1 = require("@tsed/di");
-const ioredis_1 = tslib_1.__importDefault(require("ioredis"));
+const ioredis_1 = require("@tsed/ioredis");
 const uuid_1 = require("uuid");
-require("../services/RedisFactory");
-class RedisAdapter extends adapters_1.Adapter {
-    db;
+const getId = (key) => key.split(":")[2];
+const flatKeys = (keys) => {
+    return keys.flatMap(([, result]) => result).filter(Boolean);
+};
+let RedisAdapter = class RedisAdapter extends adapters_1.Adapter {
+    configuration;
+    hooks = new core_1.Hooks();
+    connectionName;
+    connection;
+    useHash = false;
+    constructor(options, connections, configuration) {
+        super(options, configuration);
+        this.configuration = configuration;
+        this.useHash = Boolean(options.useHash);
+        this.connectionName = options.connectionName || "default";
+        this.connection = connections.find((connection) => connection.name === this.connectionName); // || connections[0];
+    }
+    get db() {
+        return this.connection;
+    }
     key(id) {
         return `${this.collectionName}:${id}`;
     }
     async create(payload, expiresAt) {
-        payload._id = (0, uuid_1.v4)();
+        delete payload._id;
         return this.insert(payload, expiresAt);
     }
     async upsert(id, payload, expiresAt) {
-        let item = await this.findById(id);
+        const item = await this.findById(id);
         if (!item) {
             payload = { ...payload, _id: id };
-            return this.insert(payload, expiresAt);
+            return await this.insert(payload, expiresAt);
         }
         return (await this.update(id, payload, expiresAt));
     }
@@ -33,7 +51,8 @@ class RedisAdapter extends adapters_1.Adapter {
             return undefined;
         }
         return this.insert({
-            ...this.updateInstance(item, payload),
+            ...item,
+            ...(0, core_1.cleanObject)(payload),
             _id: item._id
         }, expiresAt);
     }
@@ -53,11 +72,19 @@ class RedisAdapter extends adapters_1.Adapter {
         return keys.length === foundKeys.length ? this.findById(id) : undefined;
     }
     async findById(_id) {
-        const item = await this.db.get(this.key(_id));
+        const key = this.key(_id);
+        const item = this.useHash ? await this.db.hgetall(key) : await this.db.get(key);
         if (!item) {
             return undefined;
         }
-        return this.deserialize(JSON.parse(item));
+        if ((0, core_1.isString)(item)) {
+            return this.deserialize(JSON.parse(item));
+        }
+        const { payload, ...rest } = item;
+        return {
+            ...rest,
+            ...(payload ? JSON.parse(payload) : {})
+        };
     }
     async findAll(predicate = {}) {
         const { _id, ...props } = predicate;
@@ -74,7 +101,9 @@ class RedisAdapter extends adapters_1.Adapter {
     async deleteOne(predicate) {
         const item = await this.findOne(predicate);
         if (item) {
-            await Promise.all([this.db.del(this.key(item._id)), this.cleanIndexes(item._id)]);
+            const id = this.key(item._id);
+            const indexIds = await this.getAllIndex(item._id);
+            await this.db.del([id, ...indexIds]);
             return this.deserialize(item);
         }
     }
@@ -83,23 +112,29 @@ class RedisAdapter extends adapters_1.Adapter {
     }
     async deleteMany(predicate) {
         const items = await this.findAll(predicate);
-        const promises = items.map(async (item) => {
-            await Promise.all([this.db.del(this.key(item._id)), this.cleanIndexes(item._id)]);
+        const pipeline = this.db.pipeline();
+        const ids = [];
+        const results = items.map((item) => {
+            ids.push(this.key(item._id));
+            this.getAllIndex(item._id, pipeline);
             return this.deserialize(item);
         });
-        return Promise.all(promises);
+        const keys = await pipeline.exec();
+        this.db.del([...ids, ...flatKeys(keys)]);
+        return results;
     }
     async findKeys(props) {
         const keys = Object.keys(props);
-        const promises = this.indexes
+        const pipeline = this.db.pipeline();
+        this.indexes
             .filter(({ propertyKey }) => keys.includes(propertyKey))
-            .map(({ propertyKey }) => {
+            .forEach(({ propertyKey }) => {
             const value = props[propertyKey];
             const patterns = this.getIndexedKey("*", propertyKey, value);
-            return this.db.keys(patterns);
+            pipeline.keys(patterns);
         });
-        const result = await Promise.all(promises);
-        return result.reduce((keys, input) => keys.concat(input), []).filter(Boolean);
+        const results = await pipeline.exec();
+        return flatKeys(results);
     }
     async insert(payload, expiresAt) {
         const id = (payload._id = payload._id || (0, uuid_1.v4)());
@@ -107,7 +142,8 @@ class RedisAdapter extends adapters_1.Adapter {
         await this.validate(payload);
         const multi = this.db.multi();
         const key = this.key(id);
-        await multi.set(key, JSON.stringify(this.serialize(payload)));
+        const strPayload = JSON.stringify(this.serialize(payload));
+        this.useHash ? await multi.hset(key, { payload: strPayload }) : await multi.set(key, strPayload);
         if (expiresIn) {
             multi.expire(key, expiresIn);
         }
@@ -117,13 +153,15 @@ class RedisAdapter extends adapters_1.Adapter {
             multi.set(indexedKey, id);
             expiresIn && multi.expire(indexedKey, expiresIn);
         });
+        await this.hooks.asyncAlter("insert", multi, [payload, expiresIn]);
         await multi.exec();
-        return this.deserialize(payload);
+        const result = this.deserialize(payload, { useAlias: false });
+        await this.hooks.asyncEmit("afterInsert", [result]);
+        return result;
     }
-    async cleanIndexes(id) {
+    getAllIndex(id, pipeline) {
         const key = ["$idx", this.key(id), "*"].join(":");
-        const keys = await this.db.keys(key);
-        return this.db.del(...keys);
+        return (pipeline || this.db).keys(key);
     }
     getIndexedKey(id, propertyKey, value) {
         const key = this.key(id);
@@ -131,16 +169,19 @@ class RedisAdapter extends adapters_1.Adapter {
     }
     async getAll() {
         const keys = await this.db.keys(`${this.collectionName}:*`);
-        const items = await Promise.all(keys.map((key) => this.findById(key.split(":")[1])));
-        return items.filter(Boolean);
+        const pipeline = this.db.pipeline();
+        keys.forEach((key) => {
+            pipeline.get(key);
+        });
+        const result = await pipeline.exec();
+        return (result || []).map(([, data]) => this.deserialize(JSON.parse(data))).filter(Boolean);
     }
     async findAllBy(props) {
         const keys = Object.keys(props);
-        let foundKeys = await this.findKeys(props);
+        const foundKeys = await this.findKeys(props);
         if (foundKeys.length < keys.length) {
             return [];
         }
-        const getId = (key) => key.split(":")[2];
         const map = foundKeys.reduce((map, key) => {
             const id = getId(key);
             const value = map.get(id) || 0;
@@ -150,10 +191,12 @@ class RedisAdapter extends adapters_1.Adapter {
         const result = await Promise.all(promises);
         return result.filter(Boolean);
     }
-}
-tslib_1.__decorate([
-    (0, di_1.Inject)(ioredis_1.default),
-    tslib_1.__metadata("design:type", Object)
-], RedisAdapter.prototype, "db", void 0);
+};
+RedisAdapter = tslib_1.__decorate([
+    tslib_1.__param(0, di_1.Opts),
+    tslib_1.__param(1, (0, di_1.Inject)(ioredis_1.IOREDIS_CONNECTIONS)),
+    tslib_1.__param(2, (0, di_1.Configuration)()),
+    tslib_1.__metadata("design:paramtypes", [Object, Array, Object])
+], RedisAdapter);
 exports.RedisAdapter = RedisAdapter;
 //# sourceMappingURL=RedisAdapter.js.map

package/lib/cjs/adapters/RedisAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisAdapter.js","sourceRoot":"","sources":["../../../src/adapters/RedisAdapter.ts"],"names":[],"mappings":"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","sourcesContent":["import {Adapter, AdapterModel} from \"@tsed/adapters\";\nimport {Inject} from \"@tsed/di\";\nimport IoRedis from \"ioredis\";\nimport type {Redis} from \"ioredis\";\nimport {v4 as uuid} from \"uuid\";\nimport \"../services/RedisFactory\";\n\nexport class RedisAdapter<T extends AdapterModel> extends Adapter<T> {\n  @Inject(IoRedis)\n  readonly db: Redis;\n\n  key(id: string) {\n    return `${this.collectionName}:${id}`;\n  }\n\n  public async create(payload: Partial<T>, expiresAt?: Date): Promise<T> {\n    payload._id = uuid();\n\n    return this.insert(payload, expiresAt);\n  }\n\n  public async upsert(id: string, payload: T, expiresAt?: Date): Promise<T> {\n    let item = await this.findById(id);\n\n    if (!item) {\n      payload = {...payload, _id: id};\n\n      return this.insert(payload, expiresAt);\n    }\n\n    return (await this.update(id, payload, expiresAt)) as T;\n  }\n\n  public async update(id: string, payload: T, expiresAt?: Date): Promise<T | undefined> {\n    return this.updateOne({_id: id}, payload, expiresAt);\n  }\n\n  public async updateOne(predicate: Partial<T & any>, payload: T, expiresAt?: Date): Promise<T | undefined> {\n    const item = await this.findOne(predicate);\n\n    if (!item) {\n      return undefined;\n    }\n\n    return this.insert(\n      {\n        ...this.updateInstance(item, payload),\n        _id: item._id\n      },\n      expiresAt\n    );\n  }\n\n  async findOne(predicate: Partial<T & any>): Promise<T | undefined> {\n    const {_id, ...props} = predicate;\n\n    if (_id) {\n      return this.findById(_id);\n    }\n\n    const keys = Object.keys(props);\n    let foundKeys = await this.findKeys(props);\n\n    if (foundKeys.length < keys.length) {\n      return undefined;\n    }\n\n    const getId = (key: string) => key.split(\":\")[2];\n\n    const id = getId(foundKeys[0]);\n\n    foundKeys = foundKeys.filter((key) => id === getId(key));\n\n    return keys.length === foundKeys.length ? this.findById(id) : undefined;\n  }\n\n  async findById(_id: string): Promise<T | undefined> {\n    const item = await this.db.get(this.key(_id));\n\n    if (!item) {\n      return undefined;\n    }\n\n    return this.deserialize(JSON.parse(item));\n  }\n\n  public async findAll(predicate: Partial<T & any> = {}): Promise<T[]> {\n    const {_id, ...props} = predicate;\n\n    if (_id) {\n      const item = await this.findById(_id);\n      return item ? [item] : [];\n    }\n\n    const keys = Object.keys(props);\n\n    if (keys.length === 0) {\n      return this.getAll();\n    }\n\n    return this.findAllBy(props);\n  }\n\n  public async deleteOne(predicate: Partial<T & any>): Promise<T | undefined> {\n    const item = await this.findOne(predicate);\n\n    if (item) {\n      await Promise.all([this.db.del(this.key(item._id)), this.cleanIndexes(item._id)]);\n\n      return this.deserialize(item);\n    }\n  }\n\n  public async deleteById(_id: string): Promise<T | undefined> {\n    return this.deleteOne({_id} as any);\n  }\n\n  public async deleteMany(predicate: Partial<T>): Promise<T[]> {\n    const items = await this.findAll(predicate);\n\n    const promises = items.map(async (item) => {\n      await Promise.all([this.db.del(this.key(item._id)), this.cleanIndexes(item._id)]);\n\n      return this.deserialize(item);\n    });\n\n    return Promise.all(promises);\n  }\n\n  protected async findKeys(props: any): Promise<string[]> {\n    const keys: any[] = Object.keys(props);\n\n    const promises = this.indexes\n      .filter(({propertyKey}) => keys.includes(propertyKey))\n      .map(({propertyKey}) => {\n        const value = props[propertyKey];\n        const patterns = this.getIndexedKey(\"*\", propertyKey, value);\n\n        return this.db.keys(patterns);\n      });\n\n    const result = await Promise.all(promises);\n\n    return result.reduce((keys: string[], input: string[]) => keys.concat(input), []).filter(Boolean);\n  }\n\n  protected async insert(payload: Partial<T>, expiresAt?: Date) {\n    const id = (payload._id = payload._id || uuid());\n\n    const expiresIn = expiresAt ? expiresAt.getTime() - Date.now() : null;\n\n    await this.validate(payload as T);\n\n    const multi = this.db.multi();\n    const key = this.key(id);\n\n    await multi.set(key, JSON.stringify(this.serialize(payload)));\n\n    if (expiresIn) {\n      multi.expire(key, expiresIn);\n    }\n\n    this.indexes.forEach(({propertyKey}) => {\n      const value = payload[propertyKey];\n      const indexedKey = this.getIndexedKey(id, propertyKey, value);\n\n      multi.set(indexedKey, id);\n      expiresIn && multi.expire(indexedKey, expiresIn);\n    });\n\n    await multi.exec();\n\n    return this.deserialize(payload);\n  }\n\n  protected async cleanIndexes(id: string) {\n    const key = [\"$idx\", this.key(id), \"*\"].join(\":\");\n\n    const keys = await this.db.keys(key);\n\n    return this.db.del(...keys);\n  }\n\n  protected getIndexedKey(id: string, propertyKey: string, value: any): string {\n    const key = this.key(id);\n    return [\"$idx\", key, `${propertyKey}(${value})`].map(String).join(\":\");\n  }\n\n  protected async getAll(): Promise<T[]> {\n    const keys = await this.db.keys(`${this.collectionName}:*`);\n    const items = await Promise.all(keys.map((key) => this.findById(key.split(\":\")[1])));\n\n    return items.filter(Boolean) as T[];\n  }\n\n  protected async findAllBy(props: Partial<T & any>): Promise<T[]> {\n    const keys = Object.keys(props);\n    let foundKeys = await this.findKeys(props);\n\n    if (foundKeys.length < keys.length) {\n      return [];\n    }\n\n    const getId = (key: string) => key.split(\":\")[2];\n\n    const map = foundKeys.reduce((map: Map<string, number>, key) => {\n      const id = getId(key);\n      const value = map.get(id) || 0;\n\n      return map.set(id, value + 1);\n    }, new Map());\n\n    const promises = [...map.entries()].filter(([, num]) => num === keys.length).map(([id]) => this.findById(id));\n\n    const result = await Promise.all(promises);\n\n    return result.filter(Boolean) as T[];\n  }\n}\n"]}
+{"version":3,"file":"RedisAdapter.js","sourceRoot":"","sources":["../../../src/adapters/RedisAdapter.ts"],"names":[],"mappings":"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","sourcesContent":["import {Adapter, AdapterConstructorOptions, AdapterModel} from \"@tsed/adapters\";\nimport {cleanObject, Hooks, isString} from \"@tsed/core\";\nimport {Configuration, Inject, Opts} from \"@tsed/di\";\nimport {IORedis, IOREDIS_CONNECTIONS} from \"@tsed/ioredis\";\nimport type {ChainableCommander, Redis} from \"ioredis\";\nimport {v4 as uuid} from \"uuid\";\n\nconst getId = (key: string) => key.split(\":\")[2];\nconst flatKeys = (keys: [Error | null, string[]][]): string[] => {\n  return keys.flatMap(([, result]) => result).filter(Boolean);\n};\n\nexport interface RedisAdapterConstructorOptions extends AdapterConstructorOptions {\n  connectionName?: string;\n  useHash?: boolean;\n}\n\nexport class RedisAdapter<Model extends AdapterModel> extends Adapter<Model> {\n  readonly hooks = new Hooks();\n  readonly connectionName: string;\n  readonly connection: IORedis;\n  protected useHash: boolean = false;\n\n  constructor(\n    @Opts options: RedisAdapterConstructorOptions,\n    @Inject(IOREDIS_CONNECTIONS) connections: IORedis[],\n    @Configuration() protected configuration: Configuration\n  ) {\n    super(options, configuration);\n\n    this.useHash = Boolean(options.useHash);\n    this.connectionName = options.connectionName || \"default\";\n    this.connection = connections.find((connection) => connection.name === this.connectionName)!; // || connections[0];\n  }\n\n  get db(): Redis {\n    return this.connection;\n  }\n\n  key(id: string) {\n    return `${this.collectionName}:${id}`;\n  }\n\n  public async create(payload: Partial<Model>, expiresAt?: Date): Promise<Model> {\n    delete payload._id;\n    return this.insert(payload, expiresAt);\n  }\n\n  public async upsert(id: string, payload: Model, expiresAt?: Date): Promise<Model> {\n    const item = await this.findById(id);\n\n    if (!item) {\n      payload = {...payload, _id: id};\n\n      return await this.insert(payload, expiresAt);\n    }\n\n    return (await this.update(id, payload, expiresAt)) as Model;\n  }\n\n  public async update(id: string, payload: Model, expiresAt?: Date): Promise<Model | undefined> {\n    return this.updateOne({_id: id}, payload, expiresAt);\n  }\n\n  public async updateOne(predicate: Partial<Model & any>, payload: Model, expiresAt?: Date): Promise<Model | undefined> {\n    const item = await this.findOne(predicate);\n\n    if (!item) {\n      return undefined;\n    }\n\n    return this.insert(\n      {\n        ...item,\n        ...cleanObject(payload),\n        _id: item._id\n      },\n      expiresAt\n    );\n  }\n\n  async findOne(predicate: Partial<Model & any>): Promise<Model | undefined> {\n    const {_id, ...props} = predicate;\n\n    if (_id) {\n      return this.findById(_id);\n    }\n\n    const keys = Object.keys(props);\n    let foundKeys = await this.findKeys(props);\n\n    if (foundKeys.length < keys.length) {\n      return undefined;\n    }\n\n    const getId = (key: string) => key.split(\":\")[2];\n    const id = getId(foundKeys[0]);\n\n    foundKeys = foundKeys.filter((key) => id === getId(key));\n\n    return keys.length === foundKeys.length ? this.findById(id) : undefined;\n  }\n\n  async findById(_id: string): Promise<Model | undefined> {\n    const key = this.key(_id);\n\n    const item = this.useHash ? await this.db.hgetall(key) : await this.db.get(key);\n\n    if (!item) {\n      return undefined;\n    }\n\n    if (isString(item)) {\n      return this.deserialize(JSON.parse(item));\n    }\n\n    const {payload, ...rest} = item;\n\n    return {\n      ...rest,\n      ...(payload ? JSON.parse(payload) : {})\n    };\n  }\n\n  public async findAll(predicate: Partial<Model & any> = {}): Promise<Model[]> {\n    const {_id, ...props} = predicate;\n\n    if (_id) {\n      const item = await this.findById(_id);\n      return item ? [item] : [];\n    }\n\n    const keys = Object.keys(props);\n\n    if (keys.length === 0) {\n      return this.getAll();\n    }\n\n    return this.findAllBy(props);\n  }\n\n  public async deleteOne(predicate: Partial<Model & any>): Promise<Model | undefined> {\n    const item = await this.findOne(predicate);\n\n    if (item) {\n      const id = this.key(item._id);\n      const indexIds = await this.getAllIndex(item._id);\n\n      await this.db.del([id, ...indexIds]);\n\n      return this.deserialize(item);\n    }\n  }\n\n  public async deleteById(_id: string): Promise<Model | undefined> {\n    return this.deleteOne({_id} as any);\n  }\n\n  public async deleteMany(predicate: Partial<Model>): Promise<Model[]> {\n    const items = await this.findAll(predicate);\n\n    const pipeline = this.db.pipeline();\n    const ids: string[] = [];\n\n    const results = items.map((item) => {\n      ids.push(this.key(item._id));\n\n      this.getAllIndex(item._id, pipeline);\n\n      return this.deserialize(item);\n    });\n\n    const keys = await pipeline.exec();\n\n    this.db.del([...ids, ...flatKeys(keys as any)]);\n\n    return results;\n  }\n\n  protected async findKeys(props: any): Promise<string[]> {\n    const keys: any[] = Object.keys(props);\n    const pipeline = this.db.pipeline();\n\n    this.indexes\n      .filter(({propertyKey}) => keys.includes(propertyKey))\n      .forEach(({propertyKey}) => {\n        const value = props[propertyKey];\n        const patterns = this.getIndexedKey(\"*\", propertyKey, value);\n\n        pipeline.keys(patterns);\n      });\n\n    const results = await pipeline.exec();\n\n    return flatKeys(results as any[]);\n  }\n\n  protected async insert(payload: Partial<Model>, expiresAt?: Date) {\n    const id = (payload._id = payload._id || uuid());\n\n    const expiresIn = expiresAt ? expiresAt.getTime() - Date.now() : null;\n\n    await this.validate(payload as Model);\n\n    const multi = this.db.multi();\n    const key = this.key(id);\n\n    const strPayload = JSON.stringify(this.serialize(payload));\n\n    this.useHash ? await multi.hset(key, {payload: strPayload}) : await multi.set(key, strPayload);\n\n    if (expiresIn) {\n      multi.expire(key, expiresIn);\n    }\n\n    this.indexes.forEach(({propertyKey}) => {\n      const value = payload[propertyKey];\n      const indexedKey = this.getIndexedKey(id, propertyKey, value);\n\n      multi.set(indexedKey, id);\n      expiresIn && multi.expire(indexedKey, expiresIn);\n    });\n\n    await this.hooks.asyncAlter(\"insert\", multi, [payload, expiresIn]);\n\n    await multi.exec();\n\n    const result = this.deserialize(payload, {useAlias: false});\n\n    await this.hooks.asyncEmit(\"afterInsert\", [result]);\n\n    return result;\n  }\n\n  protected getAllIndex(id: string): Promise<string[]>;\n  protected getAllIndex(id: string, pipeline: ChainableCommander): ChainableCommander;\n  protected getAllIndex(id: string, pipeline?: ChainableCommander) {\n    const key = [\"$idx\", this.key(id), \"*\"].join(\":\");\n\n    return (pipeline || this.db).keys(key);\n  }\n\n  protected getIndexedKey(id: string, propertyKey: string, value: any): string {\n    const key = this.key(id);\n    return [\"$idx\", key, `${propertyKey}(${value})`].map(String).join(\":\");\n  }\n\n  protected async getAll(): Promise<Model[]> {\n    const keys = await this.db.keys(`${this.collectionName}:*`);\n    const pipeline = this.db.pipeline();\n\n    keys.forEach((key) => {\n      pipeline.get(key);\n    });\n\n    const result = await pipeline.exec();\n    return (result || []).map(([, data]: [any, string]) => this.deserialize(JSON.parse(data))).filter(Boolean);\n  }\n\n  protected async findAllBy(props: Partial<Model & any>): Promise<Model[]> {\n    const keys = Object.keys(props);\n    const foundKeys = await this.findKeys(props);\n\n    if (foundKeys.length < keys.length) {\n      return [];\n    }\n\n    const map = foundKeys.reduce((map: Map<string, number>, key) => {\n      const id = getId(key);\n      const value = map.get(id) || 0;\n\n      return map.set(id, value + 1);\n    }, new Map());\n\n    const promises = [...map.entries()].filter(([, num]) => num === keys.length).map(([id]) => this.findById(id));\n\n    const result = await Promise.all(promises);\n\n    return result.filter(Boolean) as Model[];\n  }\n}\n"]}

package/lib/cjs/index.js

@@ -4,7 +4,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./adapters/OIDCRedisAdapter"), exports);
 tslib_1.__exportStar(require("./adapters/RedisAdapter"), exports);
 tslib_1.__exportStar(require("./domain/RedisAdaptersSettings"), exports);
-tslib_1.__exportStar(require("./services/RedisFactory"), exports);
 //# sourceMappingURL=index.js.map

package/lib/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,kEAAwC;AACxC,yEAA+C;AAC/C,kEAAwC","sourcesContent":["/**\n * @file Automatically generated by barrelsby.\n */\n\nexport * from \"./adapters/RedisAdapter\";\nexport * from \"./domain/RedisAdaptersSettings\";\nexport * from \"./services/RedisFactory\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,sEAA4C;AAC5C,kEAAwC;AACxC,yEAA+C","sourcesContent":["/**\n * @file Automatically generated by barrelsby.\n */\n\nexport * from \"./adapters/OIDCRedisAdapter\";\nexport * from \"./adapters/RedisAdapter\";\nexport * from \"./domain/RedisAdaptersSettings\";\n"]}

package/lib/esm/adapters/OIDCRedisAdapter.js

@@ -0,0 +1,83 @@
+import { __decorate, __metadata, __param } from "tslib";
+import { Configuration, Inject, Opts } from "@tsed/di";
+import { IOREDIS_CONNECTIONS } from "@tsed/ioredis";
+import { RedisAdapter } from "./RedisAdapter.js";
+const GRANTABLE = new Set(["AccessToken", "AuthorizationCode", "RefreshToken", "DeviceCode", "BackchannelAuthenticationRequest"]);
+const CONSUMABLE = new Set(["AuthorizationCode", "RefreshToken", "DeviceCode", "BackchannelAuthenticationRequest"]);
+function grantKeyFor(id) {
+    return `$oidc:grant:${id}`;
+}
+function userCodeKeyFor(userCode) {
+    return `$oidc:userCode:${userCode}`;
+}
+function uidKeyFor(uid) {
+    return `$oidc:uid:${uid}`;
+}
+let OIDCRedisAdapter = class OIDCRedisAdapter extends RedisAdapter {
+    configuration;
+    isGrantable;
+    constructor(options, connections, configuration) {
+        super(options, connections, configuration);
+        this.configuration = configuration;
+        this.useHash = CONSUMABLE.has(this.collectionName);
+        this.isGrantable = GRANTABLE.has(this.collectionName);
+        this.hooks.on("insert", this.onInsert.bind(this));
+    }
+    async onInsert(multi, payload, expiresIn) {
+        const id = payload._id;
+        const key = this.key(id);
+        if (this.isGrantable && payload.grantId) {
+            const grantKey = grantKeyFor(payload.grantId);
+            multi.rpush(grantKey, key);
+            // if you're seeing grant key lists growing out of acceptable proportions consider using LTRIM
+            // here to trim the list to an appropriate length
+            const ttl = await this.db.ttl(grantKey);
+            if (expiresIn && expiresIn > ttl) {
+                multi.expire(grantKey, expiresIn);
+            }
+        }
+        if (payload.userCode) {
+            const userCodeKey = userCodeKeyFor(payload.userCode);
+            multi.set(userCodeKey, id);
+            expiresIn && multi.expire(userCodeKey, expiresIn);
+        }
+        if (payload.uid) {
+            const uidKey = uidKeyFor(payload.uid);
+            multi.set(uidKey, id);
+            expiresIn && multi.expire(uidKey, expiresIn);
+        }
+        return multi;
+    }
+    async findByUid(uid) {
+        const id = await this.db.get(uidKeyFor(uid));
+        return id && this.findById(id);
+    }
+    async findByUserCode(userCode) {
+        const id = await this.db.get(userCodeKeyFor(userCode));
+        return id && this.findById(id);
+    }
+    async destroy(id) {
+        const key = this.key(id);
+        await this.db.del(key);
+    }
+    async revokeByGrantId(grantId) {
+        // eslint-disable-line class-methods-use-this
+        const multi = this.db.multi();
+        const key = grantKeyFor(grantId);
+        const tokens = await this.db.lrange(key, 0, -1);
+        tokens.forEach((token) => multi.del(token));
+        multi.del(grantKeyFor(grantId));
+        await multi.exec();
+    }
+    async consume(id) {
+        await this.db.hset(this.key(id), "consumed", Math.floor(Date.now() / 1000));
+    }
+};
+OIDCRedisAdapter = __decorate([
+    __param(0, Opts),
+    __param(1, Inject(IOREDIS_CONNECTIONS)),
+    __param(2, Configuration()),
+    __metadata("design:paramtypes", [Object, Array, Object])
+], OIDCRedisAdapter);
+export { OIDCRedisAdapter };
+//# sourceMappingURL=OIDCRedisAdapter.js.map

package/lib/esm/adapters/OIDCRedisAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OIDCRedisAdapter.js","sourceRoot":"","sources":["../../../src/adapters/OIDCRedisAdapter.ts"],"names":[],"mappings":"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","sourcesContent":["import {AdapterModel} from \"@tsed/adapters\";\nimport {Configuration, Inject, Opts} from \"@tsed/di\";\nimport {ChainableCommander} from \"ioredis\";\nimport {IOREDIS_CONNECTIONS, IORedis} from \"@tsed/ioredis\";\n\nimport {RedisAdapter, RedisAdapterConstructorOptions} from \"./RedisAdapter\";\n\nconst GRANTABLE = new Set([\"AccessToken\", \"AuthorizationCode\", \"RefreshToken\", \"DeviceCode\", \"BackchannelAuthenticationRequest\"]);\nconst CONSUMABLE = new Set([\"AuthorizationCode\", \"RefreshToken\", \"DeviceCode\", \"BackchannelAuthenticationRequest\"]);\n\nfunction grantKeyFor(id: string) {\n  return `$oidc:grant:${id}`;\n}\n\nfunction userCodeKeyFor(userCode: string) {\n  return `$oidc:userCode:${userCode}`;\n}\n\nfunction uidKeyFor(uid: string) {\n  return `$oidc:uid:${uid}`;\n}\n\nexport class OIDCRedisAdapter<T extends AdapterModel> extends RedisAdapter<T> {\n  protected isGrantable: boolean;\n\n  constructor(\n    @Opts options: RedisAdapterConstructorOptions,\n    @Inject(IOREDIS_CONNECTIONS) connections: IORedis[],\n    @Configuration() protected configuration: Configuration\n  ) {\n    super(options, connections, configuration);\n\n    this.useHash = CONSUMABLE.has(this.collectionName);\n    this.isGrantable = GRANTABLE.has(this.collectionName);\n    this.hooks.on(\"insert\", this.onInsert.bind(this));\n  }\n\n  async onInsert(multi: ChainableCommander, payload: T, expiresIn: number) {\n    const id = payload._id;\n\n    const key = this.key(id);\n\n    if (this.isGrantable && payload.grantId) {\n      const grantKey = grantKeyFor(payload.grantId);\n\n      multi.rpush(grantKey, key);\n      // if you're seeing grant key lists growing out of acceptable proportions consider using LTRIM\n      // here to trim the list to an appropriate length\n      const ttl = await this.db.ttl(grantKey);\n\n      if (expiresIn && expiresIn > ttl) {\n        multi.expire(grantKey, expiresIn);\n      }\n    }\n\n    if (payload.userCode) {\n      const userCodeKey = userCodeKeyFor(payload.userCode);\n\n      multi.set(userCodeKey, id);\n      expiresIn && multi.expire(userCodeKey, expiresIn);\n    }\n\n    if (payload.uid) {\n      const uidKey = uidKeyFor(payload.uid);\n\n      multi.set(uidKey, id);\n      expiresIn && multi.expire(uidKey, expiresIn);\n    }\n\n    return multi;\n  }\n\n  async findByUid(uid: string) {\n    const id = await this.db.get(uidKeyFor(uid));\n\n    return id && this.findById(id);\n  }\n\n  async findByUserCode(userCode: string) {\n    const id = await this.db.get(userCodeKeyFor(userCode));\n    return id && this.findById(id);\n  }\n\n  async destroy(id: string) {\n    const key = this.key(id);\n    await this.db.del(key);\n  }\n\n  async revokeByGrantId(grantId: string) {\n    // eslint-disable-line class-methods-use-this\n    const multi = this.db.multi();\n    const key = grantKeyFor(grantId);\n    const tokens = await this.db.lrange(key, 0, -1);\n\n    tokens.forEach((token) => multi.del(token));\n    multi.del(grantKeyFor(grantId));\n\n    await multi.exec();\n  }\n\n  async consume(id: string) {\n    await this.db.hset(this.key(id), \"consumed\", Math.floor(Date.now() / 1000));\n  }\n}\n"]}

package/lib/esm/adapters/RedisAdapter.js

@@ -1,23 +1,41 @@
-import { __decorate, __metadata } from "tslib";
+import { __decorate, __metadata, __param } from "tslib";
 import { Adapter } from "@tsed/adapters";
-import { Inject } from "@tsed/di";
-import IoRedis from "ioredis";
+import { cleanObject, Hooks, isString } from "@tsed/core";
+import { Configuration, Inject, Opts } from "@tsed/di";
+import { IOREDIS_CONNECTIONS } from "@tsed/ioredis";
 import { v4 as uuid } from "uuid";
-import "../services/RedisFactory.js";
-export class RedisAdapter extends Adapter {
-    db;
+const getId = (key) => key.split(":")[2];
+const flatKeys = (keys) => {
+    return keys.flatMap(([, result]) => result).filter(Boolean);
+};
+let RedisAdapter = class RedisAdapter extends Adapter {
+    configuration;
+    hooks = new Hooks();
+    connectionName;
+    connection;
+    useHash = false;
+    constructor(options, connections, configuration) {
+        super(options, configuration);
+        this.configuration = configuration;
+        this.useHash = Boolean(options.useHash);
+        this.connectionName = options.connectionName || "default";
+        this.connection = connections.find((connection) => connection.name === this.connectionName); // || connections[0];
+    }
+    get db() {
+        return this.connection;
+    }
     key(id) {
         return `${this.collectionName}:${id}`;
     }
     async create(payload, expiresAt) {
-        payload._id = uuid();
+        delete payload._id;
         return this.insert(payload, expiresAt);
     }
     async upsert(id, payload, expiresAt) {
-        let item = await this.findById(id);
+        const item = await this.findById(id);
         if (!item) {
             payload = { ...payload, _id: id };
-            return this.insert(payload, expiresAt);
+            return await this.insert(payload, expiresAt);
         }
         return (await this.update(id, payload, expiresAt));
     }
@@ -30,7 +48,8 @@ export class RedisAdapter extends Adapter {
             return undefined;
         }
         return this.insert({
-            ...this.updateInstance(item, payload),
+            ...item,
+            ...cleanObject(payload),
             _id: item._id
         }, expiresAt);
     }
@@ -50,11 +69,19 @@ export class RedisAdapter extends Adapter {
         return keys.length === foundKeys.length ? this.findById(id) : undefined;
     }
     async findById(_id) {
-        const item = await this.db.get(this.key(_id));
+        const key = this.key(_id);
+        const item = this.useHash ? await this.db.hgetall(key) : await this.db.get(key);
         if (!item) {
             return undefined;
         }
-        return this.deserialize(JSON.parse(item));
+        if (isString(item)) {
+            return this.deserialize(JSON.parse(item));
+        }
+        const { payload, ...rest } = item;
+        return {
+            ...rest,
+            ...(payload ? JSON.parse(payload) : {})
+        };
     }
     async findAll(predicate = {}) {
         const { _id, ...props } = predicate;
@@ -71,7 +98,9 @@ export class RedisAdapter extends Adapter {
     async deleteOne(predicate) {
         const item = await this.findOne(predicate);
         if (item) {
-            await Promise.all([this.db.del(this.key(item._id)), this.cleanIndexes(item._id)]);
+            const id = this.key(item._id);
+            const indexIds = await this.getAllIndex(item._id);
+            await this.db.del([id, ...indexIds]);
             return this.deserialize(item);
         }
     }
@@ -80,23 +109,29 @@ export class RedisAdapter extends Adapter {
     }
     async deleteMany(predicate) {
         const items = await this.findAll(predicate);
-        const promises = items.map(async (item) => {
-            await Promise.all([this.db.del(this.key(item._id)), this.cleanIndexes(item._id)]);
+        const pipeline = this.db.pipeline();
+        const ids = [];
+        const results = items.map((item) => {
+            ids.push(this.key(item._id));
+            this.getAllIndex(item._id, pipeline);
             return this.deserialize(item);
         });
-        return Promise.all(promises);
+        const keys = await pipeline.exec();
+        this.db.del([...ids, ...flatKeys(keys)]);
+        return results;
     }
     async findKeys(props) {
         const keys = Object.keys(props);
-        const promises = this.indexes
+        const pipeline = this.db.pipeline();
+        this.indexes
             .filter(({ propertyKey }) => keys.includes(propertyKey))
-            .map(({ propertyKey }) => {
+            .forEach(({ propertyKey }) => {
             const value = props[propertyKey];
             const patterns = this.getIndexedKey("*", propertyKey, value);
-            return this.db.keys(patterns);
+            pipeline.keys(patterns);
         });
-        const result = await Promise.all(promises);
-        return result.reduce((keys, input) => keys.concat(input), []).filter(Boolean);
+        const results = await pipeline.exec();
+        return flatKeys(results);
     }
     async insert(payload, expiresAt) {
         const id = (payload._id = payload._id || uuid());
@@ -104,7 +139,8 @@ export class RedisAdapter extends Adapter {
         await this.validate(payload);
         const multi = this.db.multi();
         const key = this.key(id);
-        await multi.set(key, JSON.stringify(this.serialize(payload)));
+        const strPayload = JSON.stringify(this.serialize(payload));
+        this.useHash ? await multi.hset(key, { payload: strPayload }) : await multi.set(key, strPayload);
         if (expiresIn) {
             multi.expire(key, expiresIn);
         }
@@ -114,13 +150,15 @@ export class RedisAdapter extends Adapter {
             multi.set(indexedKey, id);
             expiresIn && multi.expire(indexedKey, expiresIn);
         });
+        await this.hooks.asyncAlter("insert", multi, [payload, expiresIn]);
         await multi.exec();
-        return this.deserialize(payload);
+        const result = this.deserialize(payload, { useAlias: false });
+        await this.hooks.asyncEmit("afterInsert", [result]);
+        return result;
     }
-    async cleanIndexes(id) {
+    getAllIndex(id, pipeline) {
         const key = ["$idx", this.key(id), "*"].join(":");
-        const keys = await this.db.keys(key);
-        return this.db.del(...keys);
+        return (pipeline || this.db).keys(key);
     }
     getIndexedKey(id, propertyKey, value) {
         const key = this.key(id);
@@ -128,16 +166,19 @@ export class RedisAdapter extends Adapter {
     }
     async getAll() {
         const keys = await this.db.keys(`${this.collectionName}:*`);
-        const items = await Promise.all(keys.map((key) => this.findById(key.split(":")[1])));
-        return items.filter(Boolean);
+        const pipeline = this.db.pipeline();
+        keys.forEach((key) => {
+            pipeline.get(key);
+        });
+        const result = await pipeline.exec();
+        return (result || []).map(([, data]) => this.deserialize(JSON.parse(data))).filter(Boolean);
     }
     async findAllBy(props) {
         const keys = Object.keys(props);
-        let foundKeys = await this.findKeys(props);
+        const foundKeys = await this.findKeys(props);
         if (foundKeys.length < keys.length) {
             return [];
         }
-        const getId = (key) => key.split(":")[2];
         const map = foundKeys.reduce((map, key) => {
             const id = getId(key);
             const value = map.get(id) || 0;
@@ -147,9 +188,12 @@ export class RedisAdapter extends Adapter {
         const result = await Promise.all(promises);
         return result.filter(Boolean);
     }
-}
-__decorate([
-    Inject(IoRedis),
-    __metadata("design:type", Object)
-], RedisAdapter.prototype, "db", void 0);
+};
+RedisAdapter = __decorate([
+    __param(0, Opts),
+    __param(1, Inject(IOREDIS_CONNECTIONS)),
+    __param(2, Configuration()),
+    __metadata("design:paramtypes", [Object, Array, Object])
+], RedisAdapter);
+export { RedisAdapter };
 //# sourceMappingURL=RedisAdapter.js.map

package/lib/esm/adapters/RedisAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisAdapter.js","sourceRoot":"","sources":["../../../src/adapters/RedisAdapter.ts"],"names":[],"mappings":"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","sourcesContent":["import {Adapter, AdapterModel} from \"@tsed/adapters\";\nimport {Inject} from \"@tsed/di\";\nimport IoRedis from \"ioredis\";\nimport type {Redis} from \"ioredis\";\nimport {v4 as uuid} from \"uuid\";\nimport \"../services/RedisFactory\";\n\nexport class RedisAdapter<T extends AdapterModel> extends Adapter<T> {\n  @Inject(IoRedis)\n  readonly db: Redis;\n\n  key(id: string) {\n    return `${this.collectionName}:${id}`;\n  }\n\n  public async create(payload: Partial<T>, expiresAt?: Date): Promise<T> {\n    payload._id = uuid();\n\n    return this.insert(payload, expiresAt);\n  }\n\n  public async upsert(id: string, payload: T, expiresAt?: Date): Promise<T> {\n    let item = await this.findById(id);\n\n    if (!item) {\n      payload = {...payload, _id: id};\n\n      return this.insert(payload, expiresAt);\n    }\n\n    return (await this.update(id, payload, expiresAt)) as T;\n  }\n\n  public async update(id: string, payload: T, expiresAt?: Date): Promise<T | undefined> {\n    return this.updateOne({_id: id}, payload, expiresAt);\n  }\n\n  public async updateOne(predicate: Partial<T & any>, payload: T, expiresAt?: Date): Promise<T | undefined> {\n    const item = await this.findOne(predicate);\n\n    if (!item) {\n      return undefined;\n    }\n\n    return this.insert(\n      {\n        ...this.updateInstance(item, payload),\n        _id: item._id\n      },\n      expiresAt\n    );\n  }\n\n  async findOne(predicate: Partial<T & any>): Promise<T | undefined> {\n    const {_id, ...props} = predicate;\n\n    if (_id) {\n      return this.findById(_id);\n    }\n\n    const keys = Object.keys(props);\n    let foundKeys = await this.findKeys(props);\n\n    if (foundKeys.length < keys.length) {\n      return undefined;\n    }\n\n    const getId = (key: string) => key.split(\":\")[2];\n\n    const id = getId(foundKeys[0]);\n\n    foundKeys = foundKeys.filter((key) => id === getId(key));\n\n    return keys.length === foundKeys.length ? this.findById(id) : undefined;\n  }\n\n  async findById(_id: string): Promise<T | undefined> {\n    const item = await this.db.get(this.key(_id));\n\n    if (!item) {\n      return undefined;\n    }\n\n    return this.deserialize(JSON.parse(item));\n  }\n\n  public async findAll(predicate: Partial<T & any> = {}): Promise<T[]> {\n    const {_id, ...props} = predicate;\n\n    if (_id) {\n      const item = await this.findById(_id);\n      return item ? [item] : [];\n    }\n\n    const keys = Object.keys(props);\n\n    if (keys.length === 0) {\n      return this.getAll();\n    }\n\n    return this.findAllBy(props);\n  }\n\n  public async deleteOne(predicate: Partial<T & any>): Promise<T | undefined> {\n    const item = await this.findOne(predicate);\n\n    if (item) {\n      await Promise.all([this.db.del(this.key(item._id)), this.cleanIndexes(item._id)]);\n\n      return this.deserialize(item);\n    }\n  }\n\n  public async deleteById(_id: string): Promise<T | undefined> {\n    return this.deleteOne({_id} as any);\n  }\n\n  public async deleteMany(predicate: Partial<T>): Promise<T[]> {\n    const items = await this.findAll(predicate);\n\n    const promises = items.map(async (item) => {\n      await Promise.all([this.db.del(this.key(item._id)), this.cleanIndexes(item._id)]);\n\n      return this.deserialize(item);\n    });\n\n    return Promise.all(promises);\n  }\n\n  protected async findKeys(props: any): Promise<string[]> {\n    const keys: any[] = Object.keys(props);\n\n    const promises = this.indexes\n      .filter(({propertyKey}) => keys.includes(propertyKey))\n      .map(({propertyKey}) => {\n        const value = props[propertyKey];\n        const patterns = this.getIndexedKey(\"*\", propertyKey, value);\n\n        return this.db.keys(patterns);\n      });\n\n    const result = await Promise.all(promises);\n\n    return result.reduce((keys: string[], input: string[]) => keys.concat(input), []).filter(Boolean);\n  }\n\n  protected async insert(payload: Partial<T>, expiresAt?: Date) {\n    const id = (payload._id = payload._id || uuid());\n\n    const expiresIn = expiresAt ? expiresAt.getTime() - Date.now() : null;\n\n    await this.validate(payload as T);\n\n    const multi = this.db.multi();\n    const key = this.key(id);\n\n    await multi.set(key, JSON.stringify(this.serialize(payload)));\n\n    if (expiresIn) {\n      multi.expire(key, expiresIn);\n    }\n\n    this.indexes.forEach(({propertyKey}) => {\n      const value = payload[propertyKey];\n      const indexedKey = this.getIndexedKey(id, propertyKey, value);\n\n      multi.set(indexedKey, id);\n      expiresIn && multi.expire(indexedKey, expiresIn);\n    });\n\n    await multi.exec();\n\n    return this.deserialize(payload);\n  }\n\n  protected async cleanIndexes(id: string) {\n    const key = [\"$idx\", this.key(id), \"*\"].join(\":\");\n\n    const keys = await this.db.keys(key);\n\n    return this.db.del(...keys);\n  }\n\n  protected getIndexedKey(id: string, propertyKey: string, value: any): string {\n    const key = this.key(id);\n    return [\"$idx\", key, `${propertyKey}(${value})`].map(String).join(\":\");\n  }\n\n  protected async getAll(): Promise<T[]> {\n    const keys = await this.db.keys(`${this.collectionName}:*`);\n    const items = await Promise.all(keys.map((key) => this.findById(key.split(\":\")[1])));\n\n    return items.filter(Boolean) as T[];\n  }\n\n  protected async findAllBy(props: Partial<T & any>): Promise<T[]> {\n    const keys = Object.keys(props);\n    let foundKeys = await this.findKeys(props);\n\n    if (foundKeys.length < keys.length) {\n      return [];\n    }\n\n    const getId = (key: string) => key.split(\":\")[2];\n\n    const map = foundKeys.reduce((map: Map<string, number>, key) => {\n      const id = getId(key);\n      const value = map.get(id) || 0;\n\n      return map.set(id, value + 1);\n    }, new Map());\n\n    const promises = [...map.entries()].filter(([, num]) => num === keys.length).map(([id]) => this.findById(id));\n\n    const result = await Promise.all(promises);\n\n    return result.filter(Boolean) as T[];\n  }\n}\n"]}
+{"version":3,"file":"RedisAdapter.js","sourceRoot":"","sources":["../../../src/adapters/RedisAdapter.ts"],"names":[],"mappings":"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","sourcesContent":["import {Adapter, AdapterConstructorOptions, AdapterModel} from \"@tsed/adapters\";\nimport {cleanObject, Hooks, isString} from \"@tsed/core\";\nimport {Configuration, Inject, Opts} from \"@tsed/di\";\nimport {IORedis, IOREDIS_CONNECTIONS} from \"@tsed/ioredis\";\nimport type {ChainableCommander, Redis} from \"ioredis\";\nimport {v4 as uuid} from \"uuid\";\n\nconst getId = (key: string) => key.split(\":\")[2];\nconst flatKeys = (keys: [Error | null, string[]][]): string[] => {\n  return keys.flatMap(([, result]) => result).filter(Boolean);\n};\n\nexport interface RedisAdapterConstructorOptions extends AdapterConstructorOptions {\n  connectionName?: string;\n  useHash?: boolean;\n}\n\nexport class RedisAdapter<Model extends AdapterModel> extends Adapter<Model> {\n  readonly hooks = new Hooks();\n  readonly connectionName: string;\n  readonly connection: IORedis;\n  protected useHash: boolean = false;\n\n  constructor(\n    @Opts options: RedisAdapterConstructorOptions,\n    @Inject(IOREDIS_CONNECTIONS) connections: IORedis[],\n    @Configuration() protected configuration: Configuration\n  ) {\n    super(options, configuration);\n\n    this.useHash = Boolean(options.useHash);\n    this.connectionName = options.connectionName || \"default\";\n    this.connection = connections.find((connection) => connection.name === this.connectionName)!; // || connections[0];\n  }\n\n  get db(): Redis {\n    return this.connection;\n  }\n\n  key(id: string) {\n    return `${this.collectionName}:${id}`;\n  }\n\n  public async create(payload: Partial<Model>, expiresAt?: Date): Promise<Model> {\n    delete payload._id;\n    return this.insert(payload, expiresAt);\n  }\n\n  public async upsert(id: string, payload: Model, expiresAt?: Date): Promise<Model> {\n    const item = await this.findById(id);\n\n    if (!item) {\n      payload = {...payload, _id: id};\n\n      return await this.insert(payload, expiresAt);\n    }\n\n    return (await this.update(id, payload, expiresAt)) as Model;\n  }\n\n  public async update(id: string, payload: Model, expiresAt?: Date): Promise<Model | undefined> {\n    return this.updateOne({_id: id}, payload, expiresAt);\n  }\n\n  public async updateOne(predicate: Partial<Model & any>, payload: Model, expiresAt?: Date): Promise<Model | undefined> {\n    const item = await this.findOne(predicate);\n\n    if (!item) {\n      return undefined;\n    }\n\n    return this.insert(\n      {\n        ...item,\n        ...cleanObject(payload),\n        _id: item._id\n      },\n      expiresAt\n    );\n  }\n\n  async findOne(predicate: Partial<Model & any>): Promise<Model | undefined> {\n    const {_id, ...props} = predicate;\n\n    if (_id) {\n      return this.findById(_id);\n    }\n\n    const keys = Object.keys(props);\n    let foundKeys = await this.findKeys(props);\n\n    if (foundKeys.length < keys.length) {\n      return undefined;\n    }\n\n    const getId = (key: string) => key.split(\":\")[2];\n    const id = getId(foundKeys[0]);\n\n    foundKeys = foundKeys.filter((key) => id === getId(key));\n\n    return keys.length === foundKeys.length ? this.findById(id) : undefined;\n  }\n\n  async findById(_id: string): Promise<Model | undefined> {\n    const key = this.key(_id);\n\n    const item = this.useHash ? await this.db.hgetall(key) : await this.db.get(key);\n\n    if (!item) {\n      return undefined;\n    }\n\n    if (isString(item)) {\n      return this.deserialize(JSON.parse(item));\n    }\n\n    const {payload, ...rest} = item;\n\n    return {\n      ...rest,\n      ...(payload ? JSON.parse(payload) : {})\n    };\n  }\n\n  public async findAll(predicate: Partial<Model & any> = {}): Promise<Model[]> {\n    const {_id, ...props} = predicate;\n\n    if (_id) {\n      const item = await this.findById(_id);\n      return item ? [item] : [];\n    }\n\n    const keys = Object.keys(props);\n\n    if (keys.length === 0) {\n      return this.getAll();\n    }\n\n    return this.findAllBy(props);\n  }\n\n  public async deleteOne(predicate: Partial<Model & any>): Promise<Model | undefined> {\n    const item = await this.findOne(predicate);\n\n    if (item) {\n      const id = this.key(item._id);\n      const indexIds = await this.getAllIndex(item._id);\n\n      await this.db.del([id, ...indexIds]);\n\n      return this.deserialize(item);\n    }\n  }\n\n  public async deleteById(_id: string): Promise<Model | undefined> {\n    return this.deleteOne({_id} as any);\n  }\n\n  public async deleteMany(predicate: Partial<Model>): Promise<Model[]> {\n    const items = await this.findAll(predicate);\n\n    const pipeline = this.db.pipeline();\n    const ids: string[] = [];\n\n    const results = items.map((item) => {\n      ids.push(this.key(item._id));\n\n      this.getAllIndex(item._id, pipeline);\n\n      return this.deserialize(item);\n    });\n\n    const keys = await pipeline.exec();\n\n    this.db.del([...ids, ...flatKeys(keys as any)]);\n\n    return results;\n  }\n\n  protected async findKeys(props: any): Promise<string[]> {\n    const keys: any[] = Object.keys(props);\n    const pipeline = this.db.pipeline();\n\n    this.indexes\n      .filter(({propertyKey}) => keys.includes(propertyKey))\n      .forEach(({propertyKey}) => {\n        const value = props[propertyKey];\n        const patterns = this.getIndexedKey(\"*\", propertyKey, value);\n\n        pipeline.keys(patterns);\n      });\n\n    const results = await pipeline.exec();\n\n    return flatKeys(results as any[]);\n  }\n\n  protected async insert(payload: Partial<Model>, expiresAt?: Date) {\n    const id = (payload._id = payload._id || uuid());\n\n    const expiresIn = expiresAt ? expiresAt.getTime() - Date.now() : null;\n\n    await this.validate(payload as Model);\n\n    const multi = this.db.multi();\n    const key = this.key(id);\n\n    const strPayload = JSON.stringify(this.serialize(payload));\n\n    this.useHash ? await multi.hset(key, {payload: strPayload}) : await multi.set(key, strPayload);\n\n    if (expiresIn) {\n      multi.expire(key, expiresIn);\n    }\n\n    this.indexes.forEach(({propertyKey}) => {\n      const value = payload[propertyKey];\n      const indexedKey = this.getIndexedKey(id, propertyKey, value);\n\n      multi.set(indexedKey, id);\n      expiresIn && multi.expire(indexedKey, expiresIn);\n    });\n\n    await this.hooks.asyncAlter(\"insert\", multi, [payload, expiresIn]);\n\n    await multi.exec();\n\n    const result = this.deserialize(payload, {useAlias: false});\n\n    await this.hooks.asyncEmit(\"afterInsert\", [result]);\n\n    return result;\n  }\n\n  protected getAllIndex(id: string): Promise<string[]>;\n  protected getAllIndex(id: string, pipeline: ChainableCommander): ChainableCommander;\n  protected getAllIndex(id: string, pipeline?: ChainableCommander) {\n    const key = [\"$idx\", this.key(id), \"*\"].join(\":\");\n\n    return (pipeline || this.db).keys(key);\n  }\n\n  protected getIndexedKey(id: string, propertyKey: string, value: any): string {\n    const key = this.key(id);\n    return [\"$idx\", key, `${propertyKey}(${value})`].map(String).join(\":\");\n  }\n\n  protected async getAll(): Promise<Model[]> {\n    const keys = await this.db.keys(`${this.collectionName}:*`);\n    const pipeline = this.db.pipeline();\n\n    keys.forEach((key) => {\n      pipeline.get(key);\n    });\n\n    const result = await pipeline.exec();\n    return (result || []).map(([, data]: [any, string]) => this.deserialize(JSON.parse(data))).filter(Boolean);\n  }\n\n  protected async findAllBy(props: Partial<Model & any>): Promise<Model[]> {\n    const keys = Object.keys(props);\n    const foundKeys = await this.findKeys(props);\n\n    if (foundKeys.length < keys.length) {\n      return [];\n    }\n\n    const map = foundKeys.reduce((map: Map<string, number>, key) => {\n      const id = getId(key);\n      const value = map.get(id) || 0;\n\n      return map.set(id, value + 1);\n    }, new Map());\n\n    const promises = [...map.entries()].filter(([, num]) => num === keys.length).map(([id]) => this.findById(id));\n\n    const result = await Promise.all(promises);\n\n    return result.filter(Boolean) as Model[];\n  }\n}\n"]}

package/lib/esm/index.js

@@ -1,7 +1,7 @@
 /**
  * @file Automatically generated by barrelsby.
  */
+export * from "./adapters/OIDCRedisAdapter.js";
 export * from "./adapters/RedisAdapter.js";
 export * from "./domain/RedisAdaptersSettings.js";
-export * from "./services/RedisFactory.js";
 //# sourceMappingURL=index.js.map

package/lib/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yBAAyB,CAAC","sourcesContent":["/**\n * @file Automatically generated by barrelsby.\n */\n\nexport * from \"./adapters/RedisAdapter\";\nexport * from \"./domain/RedisAdaptersSettings\";\nexport * from \"./services/RedisFactory\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC","sourcesContent":["/**\n * @file Automatically generated by barrelsby.\n */\n\nexport * from \"./adapters/OIDCRedisAdapter\";\nexport * from \"./adapters/RedisAdapter\";\nexport * from \"./domain/RedisAdaptersSettings\";\n"]}

package/lib/types/adapters/OIDCRedisAdapter.d.ts

@@ -0,0 +1,16 @@
+import { AdapterModel } from "@tsed/adapters";
+import { Configuration } from "@tsed/di";
+import { ChainableCommander } from "ioredis";
+import { IORedis } from "@tsed/ioredis";
+import { RedisAdapter, RedisAdapterConstructorOptions } from "./RedisAdapter";
+export declare class OIDCRedisAdapter<T extends AdapterModel> extends RedisAdapter<T> {
+    protected configuration: Configuration;
+    protected isGrantable: boolean;
+    constructor(options: RedisAdapterConstructorOptions, connections: IORedis[], configuration: Configuration);
+    onInsert(multi: ChainableCommander, payload: T, expiresIn: number): Promise<ChainableCommander>;
+    findByUid(uid: string): Promise<"" | T | null | undefined>;
+    findByUserCode(userCode: string): Promise<"" | T | null | undefined>;
+    destroy(id: string): Promise<void>;
+    revokeByGrantId(grantId: string): Promise<void>;
+    consume(id: string): Promise<void>;
+}

package/lib/types/adapters/RedisAdapter.d.ts

@@ -1,23 +1,36 @@
-import { Adapter, AdapterModel } from "@tsed/adapters";
-import type { Redis } from "ioredis";
-import "../services/RedisFactory";
-export declare class RedisAdapter<T extends AdapterModel> extends Adapter<T> {
-    readonly db: Redis;
+import { Adapter, AdapterConstructorOptions, AdapterModel } from "@tsed/adapters";
+import { Hooks } from "@tsed/core";
+import { Configuration } from "@tsed/di";
+import { IORedis } from "@tsed/ioredis";
+import type { ChainableCommander, Redis } from "ioredis";
+export interface RedisAdapterConstructorOptions extends AdapterConstructorOptions {
+    connectionName?: string;
+    useHash?: boolean;
+}
+export declare class RedisAdapter<Model extends AdapterModel> extends Adapter<Model> {
+    protected configuration: Configuration;
+    readonly hooks: Hooks;
+    readonly connectionName: string;
+    readonly connection: IORedis;
+    protected useHash: boolean;
+    constructor(options: RedisAdapterConstructorOptions, connections: IORedis[], configuration: Configuration);
+    get db(): Redis;
     key(id: string): string;
-    create(payload: Partial<T>, expiresAt?: Date): Promise<T>;
-    upsert(id: string, payload: T, expiresAt?: Date): Promise<T>;
-    update(id: string, payload: T, expiresAt?: Date): Promise<T | undefined>;
-    updateOne(predicate: Partial<T & any>, payload: T, expiresAt?: Date): Promise<T | undefined>;
-    findOne(predicate: Partial<T & any>): Promise<T | undefined>;
-    findById(_id: string): Promise<T | undefined>;
-    findAll(predicate?: Partial<T & any>): Promise<T[]>;
-    deleteOne(predicate: Partial<T & any>): Promise<T | undefined>;
-    deleteById(_id: string): Promise<T | undefined>;
-    deleteMany(predicate: Partial<T>): Promise<T[]>;
+    create(payload: Partial<Model>, expiresAt?: Date): Promise<Model>;
+    upsert(id: string, payload: Model, expiresAt?: Date): Promise<Model>;
+    update(id: string, payload: Model, expiresAt?: Date): Promise<Model | undefined>;
+    updateOne(predicate: Partial<Model & any>, payload: Model, expiresAt?: Date): Promise<Model | undefined>;
+    findOne(predicate: Partial<Model & any>): Promise<Model | undefined>;
+    findById(_id: string): Promise<Model | undefined>;
+    findAll(predicate?: Partial<Model & any>): Promise<Model[]>;
+    deleteOne(predicate: Partial<Model & any>): Promise<Model | undefined>;
+    deleteById(_id: string): Promise<Model | undefined>;
+    deleteMany(predicate: Partial<Model>): Promise<Model[]>;
     protected findKeys(props: any): Promise<string[]>;
-    protected insert(payload: Partial<T>, expiresAt?: Date): Promise<any>;
-    protected cleanIndexes(id: string): Promise<number>;
+    protected insert(payload: Partial<Model>, expiresAt?: Date): Promise<any>;
+    protected getAllIndex(id: string): Promise<string[]>;
+    protected getAllIndex(id: string, pipeline: ChainableCommander): ChainableCommander;
     protected getIndexedKey(id: string, propertyKey: string, value: any): string;
-    protected getAll(): Promise<T[]>;
-    protected findAllBy(props: Partial<T & any>): Promise<T[]>;
+    protected getAll(): Promise<Model[]>;
+    protected findAllBy(props: Partial<Model & any>): Promise<Model[]>;
 }

package/lib/types/index.d.ts

@@ -1,6 +1,6 @@
 /**
  * @file Automatically generated by barrelsby.
  */
+export * from "./adapters/OIDCRedisAdapter";
 export * from "./adapters/RedisAdapter";
 export * from "./domain/RedisAdaptersSettings";
-export * from "./services/RedisFactory";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/adapters-redis",
-  "version": "7.0.0-rc.2",
+  "version": "7.0.0-rc.5",
   "description": "Redis adapter for Ts.ED",
   "private": false,
   "source": "./src/index.ts",
@@ -21,23 +21,20 @@
     "test": "cross-env NODE_ENV=test yarn jest"
   },
   "dependencies": {
-    "@tsed/adapters": "7.0.0-rc.2",
+    "@tsed/adapters": "7.0.0-rc.5",
+    "@tsed/ioredis": "7.0.0-rc.5",
     "tslib": "2.4.0"
   },
   "devDependencies": {
-    "@tsed/core": "7.0.0-rc.2",
-    "@types/ioredis": "4.28.10",
-    "@types/ioredis-mock": "5.6.0",
-    "ioredis": "4.28.5",
-    "ioredis-mock": "7.2.0"
+    "@tsed/core": "7.0.0-rc.5"
   },
   "peerDependencies": {
-    "@tsed/adapters": "^7.0.0-rc.2",
-    "@tsed/common": "^7.0.0-rc.2",
-    "@tsed/core": "^7.0.0-rc.2",
-    "@tsed/di": "^7.0.0-rc.2",
-    "ioredis": "^4.19.4",
-    "ioredis-mock": "^5.2.0",
+    "@tsed/adapters": "^7.0.0-rc.5",
+    "@tsed/common": "^7.0.0-rc.5",
+    "@tsed/core": "^7.0.0-rc.5",
+    "@tsed/di": "^7.0.0-rc.5",
+    "ioredis": ">=5.2.3",
+    "ioredis-mock": ">=8.2.2",
     "uuid": "8.3.2"
   },
   "repository": "https://github.com/tsedio/tsed",

package/readme.md

@@ -32,9 +32,9 @@ A package of Ts.ED framework. See website: https://tsed.io/tutorials/adapters
 
 ## Contributors
 
-Please read [contributing guidelines here](https://tsed.io/CONTRIBUTING.html)
+Please read [contributing guidelines here](https://tsed.io/contributing.html)
 
-<a href="https://github.com/tsedio/ts-express-decorators/graphs/contributors"><img src="https://opencollective.com/tsed/contributors.svg?width=890" /></a>
+<a href="https://github.com/tsedio/tsed/graphs/contributors"><img src="https://opencollective.com/tsed/contributors.svg?width=890" /></a>
 
 ## Backers
 

package/lib/cjs/services/RedisFactory.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const di_1 = require("@tsed/di");
-const ioredis_1 = tslib_1.__importDefault(require("ioredis"));
-(0, di_1.registerProvider)({
-    provide: ioredis_1.default,
-    deps: [di_1.Configuration],
-    useFactory(configuration) {
-        const options = configuration.get("adapters.redis");
-        // istanbul ignore next
-        if (options) {
-            return new ioredis_1.default(options);
-        }
-        return {};
-    }
-});
-//# sourceMappingURL=RedisFactory.js.map

package/lib/cjs/services/RedisFactory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RedisFactory.js","sourceRoot":"","sources":["../../../src/services/RedisFactory.ts"],"names":[],"mappings":";;;AAAA,iCAAyD;AACzD,8DAA8C;AAE9C,IAAA,qBAAgB,EAAC;IACf,OAAO,EAAE,iBAAO;IAChB,IAAI,EAAE,CAAC,kBAAa,CAAC;IACrB,UAAU,CAAC,aAA4B;QACrC,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAe,gBAAgB,CAAC,CAAC;QAElE,uBAAuB;QACvB,IAAI,OAAO,EAAE;YACX,OAAO,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC;SAC7B;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC,CAAC","sourcesContent":["import {Configuration, registerProvider} from \"@tsed/di\";\nimport IoRedis, {RedisOptions} from \"ioredis\";\n\nregisterProvider({\n  provide: IoRedis,\n  deps: [Configuration],\n  useFactory(configuration: Configuration) {\n    const options = configuration.get<RedisOptions>(\"adapters.redis\");\n\n    // istanbul ignore next\n    if (options) {\n      return new IoRedis(options);\n    }\n\n    return {};\n  }\n});\n"]}

package/lib/esm/services/RedisFactory.js

@@ -1,15 +0,0 @@
-import { Configuration, registerProvider } from "@tsed/di";
-import IoRedis from "ioredis";
-registerProvider({
-    provide: IoRedis,
-    deps: [Configuration],
-    useFactory(configuration) {
-        const options = configuration.get("adapters.redis");
-        // istanbul ignore next
-        if (options) {
-            return new IoRedis(options);
-        }
-        return {};
-    }
-});
-//# sourceMappingURL=RedisFactory.js.map

package/lib/esm/services/RedisFactory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RedisFactory.js","sourceRoot":"","sources":["../../../src/services/RedisFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,UAAU,CAAC;AACzD,OAAO,OAAuB,MAAM,SAAS,CAAC;AAE9C,gBAAgB,CAAC;IACf,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,CAAC,aAAa,CAAC;IACrB,UAAU,CAAC,aAA4B;QACrC,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAe,gBAAgB,CAAC,CAAC;QAElE,uBAAuB;QACvB,IAAI,OAAO,EAAE;YACX,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;SAC7B;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC,CAAC","sourcesContent":["import {Configuration, registerProvider} from \"@tsed/di\";\nimport IoRedis, {RedisOptions} from \"ioredis\";\n\nregisterProvider({\n  provide: IoRedis,\n  deps: [Configuration],\n  useFactory(configuration: Configuration) {\n    const options = configuration.get<RedisOptions>(\"adapters.redis\");\n\n    // istanbul ignore next\n    if (options) {\n      return new IoRedis(options);\n    }\n\n    return {};\n  }\n});\n"]}

package/lib/types/services/RedisFactory.d.ts

@@ -1 +0,0 @@
-export {};