@naturalcycles/redis-lib 2.0.0 → 3.0.0

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { RedisDB, RedisDBCfg } from './redis.db';
-export { RedisDBCfg, RedisDB };
+export * from './redisClient';
+export * from './redisKeyValueDB';

package/dist/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const redis_db_1 = require("./redis.db");
-exports.RedisDB = redis_db_1.RedisDB;
-//# sourceMappingURL=index.js.map
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./redisClient"), exports);
+tslib_1.__exportStar(require("./redisKeyValueDB"), exports);

package/dist/redisClient.d.ts

@@ -0,0 +1,63 @@
+/// <reference types="node" />
+import { CommonLogger, NullableBuffer, NullableString, Promisable, UnixTimestampNumber } from '@naturalcycles/js-lib';
+import { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import type { Redis, RedisOptions } from 'ioredis';
+import type { ScanStreamOptions } from 'ioredis/built/types';
+import type { ChainableCommander } from 'ioredis/built/utils/RedisCommander';
+export interface CommonClient extends AsyncDisposable {
+    connected: boolean;
+    connect: () => Promise<void>;
+    disconnect: () => Promise<void>;
+    ping: () => Promise<void>;
+}
+export interface RedisClientCfg {
+    redisOptions?: RedisOptions;
+    /**
+     * Defaults to console.
+     */
+    logger?: CommonLogger;
+}
+/**
+ Wraps the redis sdk with unified interface.
+ Features:
+ 
+ - Lazy loading & initialization
+ - Reasonable defaults
+ 
+ */
+export declare class RedisClient implements CommonClient {
+    constructor(cfg?: RedisClientCfg);
+    cfg: Required<RedisClientCfg>;
+    connected: boolean;
+    private _redis?;
+    redis(): Redis;
+    connect(): Promise<void>;
+    disconnect(): Promise<void>;
+    [Symbol.asyncDispose](): Promise<void>;
+    ping(): Promise<void>;
+    del(keys: string[]): Promise<number>;
+    get(key: string): Promise<NullableString>;
+    getBuffer(key: string): Promise<NullableBuffer>;
+    mget(keys: string[]): Promise<NullableString[]>;
+    mgetBuffer(keys: string[]): Promise<NullableBuffer[]>;
+    set(key: string, value: string | Buffer): Promise<void>;
+    setWithTTL(key: string, value: string | Buffer, expireAt: UnixTimestampNumber): Promise<void>;
+    mset(obj: Record<string, string>): Promise<void>;
+    msetBuffer(obj: Record<string, Buffer>): Promise<void>;
+    incr(key: string): Promise<number>;
+    ttl(key: string): Promise<number>;
+    dropTable(table: string): Promise<void>;
+    clearAll(): Promise<void>;
+    /**
+     Convenient type-safe wrapper.
+     Returns BATCHES of keys in each iteration (as-is).
+     */
+    scanStream(opt: ScanStreamOptions): ReadableTyped<string[]>;
+    /**
+     * Like scanStream, but flattens the stream of keys.
+     */
+    scanStreamFlat(opt: ScanStreamOptions): ReadableTyped<string>;
+    scanCount(opt: ScanStreamOptions): Promise<number>;
+    withPipeline(fn: (pipeline: ChainableCommander) => Promisable<void>): Promise<void>;
+    private log;
+}

package/dist/redisClient.js

@@ -0,0 +1,147 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisClient = void 0;
+/**
+ Wraps the redis sdk with unified interface.
+ Features:
+ 
+ - Lazy loading & initialization
+ - Reasonable defaults
+ 
+ */
+class RedisClient {
+    constructor(cfg = {}) {
+        this.connected = false;
+        this.cfg = {
+            logger: console,
+            ...cfg,
+            redisOptions: {
+                showFriendlyErrorStack: true,
+                lazyConnect: true,
+                ...cfg.redisOptions,
+            },
+        };
+    }
+    redis() {
+        if (this._redis)
+            return this._redis;
+        // lazy-load the library
+        const redisLib = require('ioredis');
+        const redis = new redisLib.Redis(this.cfg.redisOptions);
+        const { logger } = this.cfg;
+        const redisEvents = ['connect', 'close', 'reconnecting', 'end'];
+        redisEvents.forEach(e => redis.on(e, () => logger.log(`redis: ${e}`)));
+        const closeEvents = ['SIGINT', 'SIGTERM'];
+        closeEvents.forEach(e => process.once(e, () => redis.quit()));
+        redis.on('error', err => logger.error(err));
+        this.connected = true;
+        this._redis = redis;
+        this.log(`redis: created`);
+        return redis;
+    }
+    async connect() {
+        if (!this.connected) {
+            await this.redis().connect();
+            this.connected = true;
+        }
+    }
+    async disconnect() {
+        this.log('redis: quit...');
+        this.log(`redis: quit`, await this.redis().quit());
+        this.connected = false;
+    }
+    async [Symbol.asyncDispose]() {
+        await this.disconnect();
+    }
+    async ping() {
+        await this.redis().ping();
+    }
+    async del(keys) {
+        return await this.redis().del(keys);
+    }
+    async get(key) {
+        return await this.redis().get(key);
+    }
+    async getBuffer(key) {
+        return await this.redis().getBuffer(key);
+    }
+    async mget(keys) {
+        return await this.redis().mget(keys);
+    }
+    async mgetBuffer(keys) {
+        return await this.redis().mgetBuffer(keys);
+    }
+    async set(key, value) {
+        await this.redis().set(key, value);
+    }
+    async setWithTTL(key, value, expireAt) {
+        await this.redis().set(key, value, 'EXAT', expireAt);
+    }
+    async mset(obj) {
+        await this.redis().mset(obj);
+    }
+    async msetBuffer(obj) {
+        await this.redis().mset(obj);
+    }
+    async incr(key) {
+        return await this.redis().incr(key);
+    }
+    async ttl(key) {
+        return await this.redis().ttl(key);
+    }
+    async dropTable(table) {
+        let count = 0;
+        await this.withPipeline(async (pipeline) => {
+            await this.scanStream({
+                match: `${table}:*`,
+            }).forEach(keys => {
+                pipeline.del(keys);
+                count += keys.length;
+            });
+        });
+        this.log(`redis: dropped table ${table} (${count} keys)`);
+    }
+    async clearAll() {
+        this.log(`redis: clearAll...`);
+        let count = 0;
+        await this.withPipeline(async (pipeline) => {
+            await this.scanStream({
+                match: `*`,
+            }).forEach(keys => {
+                pipeline.del(keys);
+                count += keys.length;
+            });
+        });
+        this.log(`redis: clearAll removed ${count} keys`);
+    }
+    /**
+     Convenient type-safe wrapper.
+     Returns BATCHES of keys in each iteration (as-is).
+     */
+    scanStream(opt) {
+        return this.redis().scanStream(opt);
+    }
+    /**
+     * Like scanStream, but flattens the stream of keys.
+     */
+    scanStreamFlat(opt) {
+        return this.redis().scanStream(opt).flatMap(keys => keys);
+    }
+    async scanCount(opt) {
+        // todo: implement more efficiently, e.g via LUA?
+        let count = 0;
+        await this.redis().scanStream(opt).forEach(keys => {
+            count += keys.length;
+        });
+        return count;
+    }
+    async withPipeline(fn) {
+        const pipeline = this.redis().pipeline();
+        await fn(pipeline);
+        await pipeline.exec();
+    }
+    log(...args) {
+        this.cfg.logger.log(...args);
+    }
+}
+exports.RedisClient = RedisClient;

package/dist/redisKeyValueDB.d.ts

@@ -0,0 +1,25 @@
+/// <reference types="node" />
+import { CommonKeyValueDBSaveBatchOptions, CommonDBCreateOptions, CommonKeyValueDB, KeyValueDBTuple } from '@naturalcycles/db-lib';
+import { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import { RedisClient } from './redisClient';
+export interface RedisKeyValueDBCfg {
+    client: RedisClient;
+}
+export declare class RedisKeyValueDB implements CommonKeyValueDB, AsyncDisposable {
+    constructor(cfg: RedisKeyValueDBCfg);
+    client: RedisClient;
+    ping(): Promise<void>;
+    [Symbol.asyncDispose](): Promise<void>;
+    getByIds(table: string, ids: string[]): Promise<KeyValueDBTuple[]>;
+    deleteByIds(table: string, ids: string[]): Promise<void>;
+    saveBatch(table: string, entries: KeyValueDBTuple[], opt?: CommonKeyValueDBSaveBatchOptions): Promise<void>;
+    streamIds(table: string, limit?: number): ReadableTyped<string>;
+    streamValues(table: string, limit?: number): ReadableTyped<Buffer>;
+    streamEntries(table: string, limit?: number | undefined): ReadableTyped<KeyValueDBTuple>;
+    count(table: string): Promise<number>;
+    createTable(table: string, opt?: CommonDBCreateOptions): Promise<void>;
+    private idsToKeys;
+    private idToKey;
+    private keysToIds;
+    private keyToId;
+}

package/dist/redisKeyValueDB.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisKeyValueDB = void 0;
+const js_lib_1 = require("@naturalcycles/js-lib");
+class RedisKeyValueDB {
+    constructor(cfg) {
+        this.client = cfg.client;
+    }
+    async ping() {
+        await this.client.ping();
+    }
+    async [Symbol.asyncDispose]() {
+        await this.client.disconnect();
+    }
+    async getByIds(table, ids) {
+        if (!ids.length)
+            return [];
+        // we assume that the order of returned values is the same as order of input ids
+        const bufs = await this.client.mgetBuffer(this.idsToKeys(table, ids));
+        return bufs.map((buf, i) => [ids[i], buf]).filter(([_k, v]) => v !== null);
+    }
+    async deleteByIds(table, ids) {
+        if (!ids.length)
+            return;
+        await this.client.del(this.idsToKeys(table, ids));
+    }
+    async saveBatch(table, entries, opt) {
+        if (!entries.length)
+            return;
+        if (opt?.expireAt) {
+            // There's no supported mset with TTL: https://stackoverflow.com/questions/16423342/redis-multi-set-with-a-ttl
+            // so we gonna use a pipeline instead
+            await this.client.withPipeline(pipeline => {
+                for (const [k, v] of entries) {
+                    pipeline.set(this.idToKey(table, k), v, 'EXAT', opt.expireAt);
+                }
+            });
+        }
+        else {
+            const obj = Object.fromEntries(entries.map(([k, v]) => [this.idToKey(table, k), v]));
+            await this.client.msetBuffer(obj);
+        }
+    }
+    streamIds(table, limit) {
+        let stream = this.client
+            .scanStream({
+            match: `${table}:*`,
+            // count: limit, // count is actually a "batchSize", not a limit
+        })
+            .flatMap(keys => this.keysToIds(table, keys));
+        if (limit) {
+            stream = stream.take(limit);
+        }
+        return stream;
+    }
+    streamValues(table, limit) {
+        return this.client
+            .scanStream({
+            match: `${table}:*`,
+        })
+            .flatMap(async (keys) => {
+            return (await this.client.mgetBuffer(keys)).filter(js_lib_1._isTruthy);
+        }, {
+            concurrency: 16,
+        })
+            .take(limit || Infinity);
+    }
+    streamEntries(table, limit) {
+        return this.client
+            .scanStream({
+            match: `${table}:*`,
+        })
+            .flatMap(async (keys) => {
+            // casting as Buffer[], because values are expected to exist for given keys
+            const bufs = (await this.client.mgetBuffer(keys));
+            return (0, js_lib_1._zip)(this.keysToIds(table, keys), bufs);
+        }, {
+            concurrency: 16,
+        })
+            .take(limit || Infinity);
+    }
+    async count(table) {
+        // todo: implement more efficiently, e.g via LUA?
+        return await this.client.scanCount({
+            match: `${table}:*`,
+        });
+    }
+    async createTable(table, opt) {
+        if (!opt?.dropIfExists)
+            return;
+        await this.client.dropTable(table);
+    }
+    idsToKeys(table, ids) {
+        return ids.map(id => this.idToKey(table, id));
+    }
+    idToKey(table, id) {
+        return `${table}:${id}`;
+    }
+    keysToIds(table, keys) {
+        return keys.map(key => this.keyToId(table, key));
+    }
+    keyToId(table, key) {
+        return key.slice(table.length + 1);
+    }
+}
+exports.RedisKeyValueDB = RedisKeyValueDB;

package/package.json

@@ -1,22 +1,18 @@
 {
   "name": "@naturalcycles/redis-lib",
-  "scripts": {},
+  "scripts": {
+    "prepare": "husky"
+  },
   "dependencies": {
-    "@naturalcycles/db-lib": "^2.0.2",
-    "@naturalcycles/js-lib": "^8.5.1",
-    "@naturalcycles/nodejs-lib": "^6.11.1",
-    "@types/ioredis": "^4.0.15",
-    "chalk": "^2.4.2",
-    "ioredis": "^4.14.0"
+    "@naturalcycles/db-lib": "^9.9.2",
+    "@naturalcycles/js-lib": "^14.217.0",
+    "@naturalcycles/nodejs-lib": "^13.8.0",
+    "ioredis": "^5.3.2"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "^8.1.0",
-    "@types/node": "^12.7.2",
-    "dotenv": "^8.1.0",
-    "jest": "^24.9.0"
-  },
-  "resolutions": {
-    "@types/hapi__joi": "15.0.4"
+    "@naturalcycles/dev-lib": "^13.49.2",
+    "@types/node": "^20.12.2",
+    "jest": "^29.7.0"
   },
   "files": [
     "dist",
@@ -29,6 +25,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "publishConfig": {
+    "provenance": true,
     "access": "public"
   },
   "repository": {
@@ -36,10 +33,10 @@
     "url": "https://github.com/NaturalCycles/redis-lib"
   },
   "engines": {
-    "node": ">=10.13"
+    "node": ">=18.12"
   },
-  "version": "2.0.0",
-  "description": "Redis implementation of CommonDB interface",
+  "version": "3.0.0",
+  "description": "Redis implementation of CommonKeyValueDB interface",
   "author": "Natural Cycles Team",
   "license": "MIT"
 }

package/readme.md

@@ -1,6 +1,6 @@
 ## @naturalcycles/redis-lib
 
-> Redis implementation of CommonDB interface
+> Redis implementation of CommonKeyValueDB interface
 
 [![npm](https://img.shields.io/npm/v/@naturalcycles/redis-lib/latest.svg)](https://www.npmjs.com/package/@naturalcycles/redis-lib)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
@@ -9,28 +9,22 @@
 
 - ...
 
-# DEBUG namespaces
-
-- `nc:redis-lib`
-- `ioredis`, `ioredis:redis`, `ioredis:connection`
-
-# Packaging
-
-- `engines.node >= 10.13`: Latest Node.js LTS
-- `main: dist/index.js`: commonjs, es2018
-- `types: dist/index.d.ts`: typescript types
-- `/src` folder with source `*.ts` files included
-
 # Starting / debugging Redis server on OSX
 
-    brew install redis
-    brew services start redis
-    brew services stop redis
+```shell
+brew install redis
+brew services start redis
+brew services stop redis
+
+redis-server /usr/local/etc/redis.conf
 
-    redis-server /usr/local/etc/redis.conf
+redis-cli ping
+redis-cli flushall
 
-    redis-cli ping
-    redis-cli flushall
+# connect and list all keys
+redis-cli
+scan 0
+```
 
 Location and size of local DB:
 

package/src/index.ts

@@ -1,3 +1,2 @@
-import { RedisDB, RedisDBCfg } from './redis.db'
-
-export { RedisDBCfg, RedisDB }
+export * from './redisClient'
+export * from './redisKeyValueDB'

package/src/redisClient.ts

@@ -0,0 +1,217 @@
+import {
+  CommonLogger,
+  NullableBuffer,
+  NullableString,
+  Promisable,
+  UnixTimestampNumber,
+} from '@naturalcycles/js-lib'
+import { ReadableTyped } from '@naturalcycles/nodejs-lib'
+// eslint-disable-next-line import/no-duplicates
+import type { Redis, RedisOptions } from 'ioredis'
+// eslint-disable-next-line import/no-duplicates
+import type * as RedisLib from 'ioredis'
+import type { ScanStreamOptions } from 'ioredis/built/types'
+import type { ChainableCommander } from 'ioredis/built/utils/RedisCommander'
+
+export interface CommonClient extends AsyncDisposable {
+  connected: boolean
+  connect: () => Promise<void>
+  disconnect: () => Promise<void>
+  ping: () => Promise<void>
+}
+
+export interface RedisClientCfg {
+  redisOptions?: RedisOptions
+
+  /**
+   * Defaults to console.
+   */
+  logger?: CommonLogger
+}
+
+/**
+ Wraps the redis sdk with unified interface.
+ Features:
+ 
+ - Lazy loading & initialization
+ - Reasonable defaults
+ 
+ */
+export class RedisClient implements CommonClient {
+  constructor(cfg: RedisClientCfg = {}) {
+    this.cfg = {
+      logger: console,
+      ...cfg,
+      redisOptions: {
+        showFriendlyErrorStack: true,
+        lazyConnect: true,
+        ...cfg.redisOptions,
+      },
+    }
+  }
+
+  cfg!: Required<RedisClientCfg>
+
+  connected = false
+
+  private _redis?: Redis
+
+  redis(): Redis {
+    if (this._redis) return this._redis
+
+    // lazy-load the library
+    const redisLib = require('ioredis') as typeof RedisLib
+    const redis = new redisLib.Redis(this.cfg.redisOptions)
+
+    const { logger } = this.cfg
+
+    const redisEvents = ['connect', 'close', 'reconnecting', 'end']
+    redisEvents.forEach(e => redis.on(e, () => logger.log(`redis: ${e}`)))
+
+    const closeEvents: NodeJS.Signals[] = ['SIGINT', 'SIGTERM']
+    closeEvents.forEach(e => process.once(e, () => redis.quit()))
+
+    redis.on('error', err => logger.error(err))
+
+    this.connected = true
+    this._redis = redis
+    this.log(`redis: created`)
+    return redis
+  }
+
+  async connect(): Promise<void> {
+    if (!this.connected) {
+      await this.redis().connect()
+      this.connected = true
+    }
+  }
+
+  async disconnect(): Promise<void> {
+    this.log('redis: quit...')
+    this.log(`redis: quit`, await this.redis().quit())
+    this.connected = false
+  }
+
+  async [Symbol.asyncDispose](): Promise<void> {
+    await this.disconnect()
+  }
+
+  async ping(): Promise<void> {
+    await this.redis().ping()
+  }
+
+  async del(keys: string[]): Promise<number> {
+    return await this.redis().del(keys)
+  }
+
+  async get(key: string): Promise<NullableString> {
+    return await this.redis().get(key)
+  }
+
+  async getBuffer(key: string): Promise<NullableBuffer> {
+    return await this.redis().getBuffer(key)
+  }
+
+  async mget(keys: string[]): Promise<NullableString[]> {
+    return await this.redis().mget(keys)
+  }
+
+  async mgetBuffer(keys: string[]): Promise<NullableBuffer[]> {
+    return await this.redis().mgetBuffer(keys)
+  }
+
+  async set(key: string, value: string | Buffer): Promise<void> {
+    await this.redis().set(key, value)
+  }
+
+  async setWithTTL(
+    key: string,
+    value: string | Buffer,
+    expireAt: UnixTimestampNumber,
+  ): Promise<void> {
+    await this.redis().set(key, value, 'EXAT', expireAt)
+  }
+
+  async mset(obj: Record<string, string>): Promise<void> {
+    await this.redis().mset(obj)
+  }
+
+  async msetBuffer(obj: Record<string, Buffer>): Promise<void> {
+    await this.redis().mset(obj)
+  }
+
+  async incr(key: string): Promise<number> {
+    return await this.redis().incr(key)
+  }
+
+  async ttl(key: string): Promise<number> {
+    return await this.redis().ttl(key)
+  }
+
+  async dropTable(table: string): Promise<void> {
+    let count = 0
+
+    await this.withPipeline(async pipeline => {
+      await this.scanStream({
+        match: `${table}:*`,
+      }).forEach(keys => {
+        pipeline.del(keys)
+        count += keys.length
+      })
+    })
+
+    this.log(`redis: dropped table ${table} (${count} keys)`)
+  }
+
+  async clearAll(): Promise<void> {
+    this.log(`redis: clearAll...`)
+    let count = 0
+
+    await this.withPipeline(async pipeline => {
+      await this.scanStream({
+        match: `*`,
+      }).forEach(keys => {
+        pipeline.del(keys)
+        count += keys.length
+      })
+    })
+
+    this.log(`redis: clearAll removed ${count} keys`)
+  }
+
+  /**
+   Convenient type-safe wrapper.
+   Returns BATCHES of keys in each iteration (as-is).
+   */
+  scanStream(opt: ScanStreamOptions): ReadableTyped<string[]> {
+    return this.redis().scanStream(opt)
+  }
+
+  /**
+   * Like scanStream, but flattens the stream of keys.
+   */
+  scanStreamFlat(opt: ScanStreamOptions): ReadableTyped<string> {
+    return (this.redis().scanStream(opt) as ReadableTyped<string[]>).flatMap(keys => keys)
+  }
+
+  async scanCount(opt: ScanStreamOptions): Promise<number> {
+    // todo: implement more efficiently, e.g via LUA?
+    let count = 0
+
+    await (this.redis().scanStream(opt) as ReadableTyped<string[]>).forEach(keys => {
+      count += keys.length
+    })
+
+    return count
+  }
+
+  async withPipeline(fn: (pipeline: ChainableCommander) => Promisable<void>): Promise<void> {
+    const pipeline = this.redis().pipeline()
+    await fn(pipeline)
+    await pipeline.exec()
+  }
+
+  private log(...args: any[]): void {
+    this.cfg.logger.log(...args)
+  }
+}

package/src/redisKeyValueDB.ts

@@ -0,0 +1,142 @@
+import {
+  CommonKeyValueDBSaveBatchOptions,
+  CommonDBCreateOptions,
+  CommonKeyValueDB,
+  KeyValueDBTuple,
+} from '@naturalcycles/db-lib'
+import { _isTruthy, _zip } from '@naturalcycles/js-lib'
+import { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import { RedisClient } from './redisClient'
+
+export interface RedisKeyValueDBCfg {
+  client: RedisClient
+}
+
+export class RedisKeyValueDB implements CommonKeyValueDB, AsyncDisposable {
+  constructor(cfg: RedisKeyValueDBCfg) {
+    this.client = cfg.client
+  }
+
+  client: RedisClient
+
+  async ping(): Promise<void> {
+    await this.client.ping()
+  }
+
+  async [Symbol.asyncDispose](): Promise<void> {
+    await this.client.disconnect()
+  }
+
+  async getByIds(table: string, ids: string[]): Promise<KeyValueDBTuple[]> {
+    if (!ids.length) return []
+    // we assume that the order of returned values is the same as order of input ids
+    const bufs = await this.client.mgetBuffer(this.idsToKeys(table, ids))
+    return bufs.map((buf, i) => [ids[i], buf] as KeyValueDBTuple).filter(([_k, v]) => v !== null)
+  }
+
+  async deleteByIds(table: string, ids: string[]): Promise<void> {
+    if (!ids.length) return
+    await this.client.del(this.idsToKeys(table, ids))
+  }
+
+  async saveBatch(
+    table: string,
+    entries: KeyValueDBTuple[],
+    opt?: CommonKeyValueDBSaveBatchOptions,
+  ): Promise<void> {
+    if (!entries.length) return
+
+    if (opt?.expireAt) {
+      // There's no supported mset with TTL: https://stackoverflow.com/questions/16423342/redis-multi-set-with-a-ttl
+      // so we gonna use a pipeline instead
+      await this.client.withPipeline(pipeline => {
+        for (const [k, v] of entries) {
+          pipeline.set(this.idToKey(table, k), v, 'EXAT', opt.expireAt!)
+        }
+      })
+    } else {
+      const obj: Record<string, Buffer> = Object.fromEntries(
+        entries.map(([k, v]) => [this.idToKey(table, k), v]) as KeyValueDBTuple[],
+      )
+      await this.client.msetBuffer(obj)
+    }
+  }
+
+  streamIds(table: string, limit?: number): ReadableTyped<string> {
+    let stream = this.client
+      .scanStream({
+        match: `${table}:*`,
+        // count: limit, // count is actually a "batchSize", not a limit
+      })
+      .flatMap(keys => this.keysToIds(table, keys))
+
+    if (limit) {
+      stream = stream.take(limit)
+    }
+
+    return stream
+  }
+
+  streamValues(table: string, limit?: number): ReadableTyped<Buffer> {
+    return this.client
+      .scanStream({
+        match: `${table}:*`,
+      })
+      .flatMap(
+        async keys => {
+          return (await this.client.mgetBuffer(keys)).filter(_isTruthy)
+        },
+        {
+          concurrency: 16,
+        },
+      )
+      .take(limit || Infinity)
+  }
+
+  streamEntries(table: string, limit?: number | undefined): ReadableTyped<KeyValueDBTuple> {
+    return this.client
+      .scanStream({
+        match: `${table}:*`,
+      })
+      .flatMap(
+        async keys => {
+          // casting as Buffer[], because values are expected to exist for given keys
+          const bufs = (await this.client.mgetBuffer(keys)) as Buffer[]
+          return _zip(this.keysToIds(table, keys), bufs)
+        },
+        {
+          concurrency: 16,
+        },
+      )
+      .take(limit || Infinity)
+  }
+
+  async count(table: string): Promise<number> {
+    // todo: implement more efficiently, e.g via LUA?
+    return await this.client.scanCount({
+      match: `${table}:*`,
+    })
+  }
+
+  async createTable(table: string, opt?: CommonDBCreateOptions): Promise<void> {
+    if (!opt?.dropIfExists) return
+
+    await this.client.dropTable(table)
+  }
+
+  private idsToKeys(table: string, ids: string[]): string[] {
+    return ids.map(id => this.idToKey(table, id))
+  }
+
+  private idToKey(table: string, id: string): string {
+    return `${table}:${id}`
+  }
+
+  private keysToIds(table: string, keys: string[]): string[] {
+    return keys.map(key => this.keyToId(table, key))
+  }
+
+  private keyToId(table: string, key: string): string {
+    return key.slice(table.length + 1)
+  }
+}

package/CHANGELOG.md

@@ -1,32 +0,0 @@
-# [2.0.0](https://github.com/NaturalCycles/redis-lib/compare/v1.1.1...v2.0.0) (2019-10-19)
-
-
-### Features
-
-* impl CommonDB 2.0 ([4830225](https://github.com/NaturalCycles/redis-lib/commit/4830225))
-
-
-### BREAKING CHANGES
-
-* ^^^
-
-## [1.1.1](https://github.com/NaturalCycles/redis-lib/compare/v1.1.0...v1.1.1) (2019-09-20)
-
-
-### Bug Fixes
-
-* adapt to new db-lib ([d3555be](https://github.com/NaturalCycles/redis-lib/commit/d3555be))
-
-# [1.1.0](https://github.com/NaturalCycles/redis-lib/compare/v1.0.0...v1.1.0) (2019-08-23)
-
-
-### Features
-
-* namespacePrefix; adopt to db-lib ([e3b35f4](https://github.com/NaturalCycles/redis-lib/commit/e3b35f4))
-
-# 1.0.0 (2019-08-20)
-
-
-### Features
-
-* first version ([a80ee79](https://github.com/NaturalCycles/redis-lib/commit/a80ee79))

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,yCAAgD;AAE3B,kBAFZ,kBAAO,CAEY"}

package/dist/redis.db.d.ts

@@ -1,45 +0,0 @@
-/// <reference types="node" />
-import { CommonDB, CommonDBOptions, CommonDBSaveOptions, DBQuery, RunQueryResult, SavedDBEntity } from '@naturalcycles/db-lib';
-import { RedisOptions } from 'ioredis';
-import * as Redis from 'ioredis';
-import { Readable } from 'stream';
-export interface RedisDBCfg {
-    redisOptions?: RedisOptions;
-    /**
-     * If true - it will "emulate" queries by using SCAN $table_
-     * which will load ALL table keys into memory and filter in-memory.
-     * @default false
-     */
-    runQueries?: boolean;
-    /**
-     * If set - all keys will be prefixed by it.
-     * So the key will look like:
-     * ${namespacePrefix}${table}_${id}
-     */
-    namespacePrefix?: string;
-}
-/**
- * streamQuery doesn't support limit and order - it always returns unlimited unsorted results.
- */
-export declare class RedisDB implements CommonDB {
-    constructor(cfg?: RedisDBCfg);
-    cfg: Required<RedisDBCfg>;
-    redis: Redis.Redis;
-    protected create(): Redis.Redis;
-    quit(): Promise<void>;
-    resetCache(table?: string): Promise<void>;
-    key(table: string, id: string): string;
-    parseKey(table: string, key: string): {
-        table: string;
-        id: string;
-    };
-    serialize<T extends object>(obj: T): string;
-    deserialize<T = any>(s?: string | null): T;
-    saveBatch<DBM extends SavedDBEntity>(table: string, dbms: DBM[], opts?: CommonDBSaveOptions): Promise<void>;
-    getByIds<DBM extends SavedDBEntity>(table: string, ids: string[], opts?: CommonDBOptions): Promise<DBM[]>;
-    deleteByIds(table: string, ids: string[], opts?: CommonDBOptions): Promise<number>;
-    streamQuery<DBM extends SavedDBEntity>(q: DBQuery<DBM>, opts?: CommonDBOptions): Readable;
-    runQuery<DBM extends SavedDBEntity>(q: DBQuery<DBM>, opts?: CommonDBOptions): Promise<RunQueryResult<DBM>>;
-    runQueryCount<DBM extends SavedDBEntity>(q: DBQuery<DBM>, opts?: CommonDBOptions): Promise<number>;
-    deleteByQuery<DBM extends SavedDBEntity>(q: DBQuery<DBM>, opts?: CommonDBOptions): Promise<number>;
-}

package/dist/redis.db.js

@@ -1,120 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const inMemory_db_1 = require("@naturalcycles/db-lib/dist/inMemory.db");
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const chalk_1 = require("chalk");
-const Redis = require("ioredis");
-const stream_1 = require("stream");
-const log = nodejs_lib_1.Debug('nc:redis-lib');
-/**
- * streamQuery doesn't support limit and order - it always returns unlimited unsorted results.
- */
-class RedisDB {
-    constructor(cfg = {}) {
-        this.cfg = {
-            runQueries: false,
-            namespacePrefix: '',
-            ...cfg,
-            redisOptions: {
-                showFriendlyErrorStack: true,
-                lazyConnect: true,
-                ...cfg.redisOptions,
-            },
-        };
-        this.redis = this.create();
-    }
-    create() {
-        const redis = new Redis(this.cfg.redisOptions);
-        const redisEvents = ['connect', 'close', 'reconnecting', 'end'];
-        redisEvents.forEach(e => redis.on(e, () => log(`event:`, chalk_1.default.bold(e))));
-        const closeEvents = ['SIGINT', 'SIGTERM'];
-        closeEvents.forEach(e => process.once(e, () => redis.quit()));
-        redis.on('error', err => log.error(err));
-        // log('connected')
-        return redis;
-    }
-    async quit() {
-        log('disconnecting...');
-        log(`quit:`, await this.redis.quit());
-    }
-    async resetCache(table) {
-        const pattern = `${this.cfg.namespacePrefix}${table || ''}*`;
-        const keys = await this.redis.keys(pattern);
-        if (keys.length) {
-            await this.redis.del(...keys);
-        }
-        log(`resetCache deleted ${keys.length} keys under ${pattern}`);
-    }
-    key(table, id) {
-        return this.cfg.namespacePrefix + [table, id].join('_');
-    }
-    parseKey(table, key) {
-        return {
-            table,
-            id: key.substr(this.cfg.namespacePrefix.length + table.length + 1),
-        };
-    }
-    serialize(obj) {
-        return JSON.stringify(obj);
-    }
-    deserialize(s) {
-        try {
-            return s && JSON.parse(s);
-        }
-        catch (err) {
-            log.error(s, typeof s, err);
-            return undefined;
-        }
-    }
-    async saveBatch(table, dbms, opts) {
-        if (!dbms.length)
-            return;
-        await this.redis.mset(js_lib_1._flatten(dbms.map(dbm => [this.key(table, dbm.id), this.serialize(dbm)])));
-    }
-    async getByIds(table, ids, opts) {
-        if (!ids.length)
-            return [];
-        const dbms = (await this.redis.mget(...ids.map(id => this.key(table, id))));
-        return dbms.filter(Boolean).map(dbm => this.deserialize(dbm));
-    }
-    async deleteByIds(table, ids, opts) {
-        if (!ids.length)
-            return 0;
-        return await this.redis.del(...ids.map(id => this.key(table, id)));
-    }
-    streamQuery(q, opts) {
-        if (!this.cfg.runQueries)
-            return nodejs_lib_1.readableFrom([]);
-        const _this = this;
-        return this.redis
-            .scanStream({
-            match: `${this.cfg.namespacePrefix}${q.table}_*`,
-        })
-            .pipe(new stream_1.Transform({
-            objectMode: true,
-            async transform(keys, _encoding, cb) {
-                const ids = keys.map(k => _this.parseKey(q.table, k).id);
-                const dbms = await _this.getByIds(q.table, ids);
-                const items = inMemory_db_1.queryInMemory(q, dbms);
-                // tslint:disable-next-line:no-invalid-this
-                items.forEach(item => this.push(item)); // push multiple items!
-                cb();
-            },
-        }));
-    }
-    async runQuery(q, opts) {
-        const dbms = await nodejs_lib_1.streamToArray(this.streamQuery(q, opts));
-        return { records: inMemory_db_1.queryInMemory(q, dbms) };
-    }
-    async runQueryCount(q, opts) {
-        const { records } = await this.runQuery(q, opts);
-        return records.length;
-    }
-    async deleteByQuery(q, opts) {
-        const { records } = await this.runQuery(q, opts);
-        return await this.deleteByIds(q.table, records.map(dbm => dbm.id), opts);
-    }
-}
-exports.RedisDB = RedisDB;
-//# sourceMappingURL=redis.db.js.map

package/dist/redis.db.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"redis.db.js","sourceRoot":"","sources":["../src/redis.db.ts"],"names":[],"mappings":"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"}

package/src/redis.db.ts

@@ -1,183 +0,0 @@
-import {
-  CommonDB,
-  CommonDBOptions,
-  CommonDBSaveOptions,
-  DBQuery,
-  RunQueryResult,
-  SavedDBEntity,
-} from '@naturalcycles/db-lib'
-import { queryInMemory } from '@naturalcycles/db-lib/dist/inMemory.db'
-import { _flatten } from '@naturalcycles/js-lib'
-import { Debug, readableFrom, streamToArray } from '@naturalcycles/nodejs-lib'
-import c from 'chalk'
-import { RedisOptions } from 'ioredis'
-import * as Redis from 'ioredis'
-import { Readable, Transform } from 'stream'
-
-const log = Debug('nc:redis-lib')
-
-export interface RedisDBCfg {
-  redisOptions?: RedisOptions
-
-  /**
-   * If true - it will "emulate" queries by using SCAN $table_
-   * which will load ALL table keys into memory and filter in-memory.
-   * @default false
-   */
-  runQueries?: boolean
-
-  /**
-   * If set - all keys will be prefixed by it.
-   * So the key will look like:
-   * ${namespacePrefix}${table}_${id}
-   */
-  namespacePrefix?: string
-}
-
-/**
- * streamQuery doesn't support limit and order - it always returns unlimited unsorted results.
- */
-export class RedisDB implements CommonDB {
-  constructor(cfg: RedisDBCfg = {}) {
-    this.cfg = {
-      runQueries: false,
-      namespacePrefix: '',
-      ...cfg,
-      redisOptions: {
-        showFriendlyErrorStack: true,
-        lazyConnect: true,
-        ...cfg.redisOptions,
-      },
-    }
-
-    this.redis = this.create()
-  }
-
-  public cfg!: Required<RedisDBCfg>
-
-  redis!: Redis.Redis
-
-  protected create(): Redis.Redis {
-    const redis = new Redis(this.cfg.redisOptions)
-
-    const redisEvents = ['connect', 'close', 'reconnecting', 'end']
-    redisEvents.forEach(e => redis.on(e, () => log(`event:`, c.bold(e))))
-
-    const closeEvents: NodeJS.Signals[] = ['SIGINT', 'SIGTERM']
-    closeEvents.forEach(e => process.once(e, () => redis.quit()))
-
-    redis.on('error', err => log.error(err))
-
-    // log('connected')
-    return redis
-  }
-
-  async quit(): Promise<void> {
-    log('disconnecting...')
-    log(`quit:`, await this.redis.quit())
-  }
-
-  async resetCache(table?: string): Promise<void> {
-    const pattern = `${this.cfg.namespacePrefix}${table || ''}*`
-    const keys = await this.redis.keys(pattern)
-    if (keys.length) {
-      await this.redis.del(...keys)
-    }
-    log(`resetCache deleted ${keys.length} keys under ${pattern}`)
-  }
-
-  key(table: string, id: string): string {
-    return this.cfg.namespacePrefix + [table, id].join('_')
-  }
-
-  parseKey(table: string, key: string): { table: string; id: string } {
-    return {
-      table,
-      id: key.substr(this.cfg.namespacePrefix.length + table.length + 1),
-    }
-  }
-
-  serialize<T extends object>(obj: T): string {
-    return JSON.stringify(obj)
-  }
-
-  deserialize<T = any>(s?: string | null): T {
-    try {
-      return s && JSON.parse(s)
-    } catch (err) {
-      log.error(s, typeof s, err)
-      return undefined as any
-    }
-  }
-
-  async saveBatch<DBM extends SavedDBEntity>(
-    table: string,
-    dbms: DBM[],
-    opts?: CommonDBSaveOptions,
-  ): Promise<void> {
-    if (!dbms.length) return
-    await this.redis.mset(_flatten(dbms.map(dbm => [this.key(table, dbm.id), this.serialize(dbm)])))
-  }
-
-  async getByIds<DBM extends SavedDBEntity>(
-    table: string,
-    ids: string[],
-    opts?: CommonDBOptions,
-  ): Promise<DBM[]> {
-    if (!ids.length) return []
-    const dbms = (await this.redis.mget(...ids.map(id => this.key(table, id)))) as string[]
-    return dbms.filter(Boolean).map(dbm => this.deserialize<DBM>(dbm))
-  }
-
-  async deleteByIds(table: string, ids: string[], opts?: CommonDBOptions): Promise<number> {
-    if (!ids.length) return 0
-    return await this.redis.del(...ids.map(id => this.key(table, id)))
-  }
-
-  streamQuery<DBM extends SavedDBEntity>(q: DBQuery<DBM>, opts?: CommonDBOptions): Readable {
-    if (!this.cfg.runQueries) return readableFrom([])
-    const _this = this
-
-    return this.redis
-      .scanStream({
-        match: `${this.cfg.namespacePrefix}${q.table}_*`,
-      })
-      .pipe(
-        new Transform({
-          objectMode: true,
-          async transform(keys: string[], _encoding, cb) {
-            const ids = keys.map(k => _this.parseKey(q.table, k).id)
-            const dbms = await _this.getByIds<DBM>(q.table, ids)
-            const items = queryInMemory(q, dbms)
-            // tslint:disable-next-line:no-invalid-this
-            items.forEach(item => this.push(item)) // push multiple items!
-            cb()
-          },
-        }),
-      )
-  }
-
-  async runQuery<DBM extends SavedDBEntity>(
-    q: DBQuery<DBM>,
-    opts?: CommonDBOptions,
-  ): Promise<RunQueryResult<DBM>> {
-    const dbms = await streamToArray<DBM>(this.streamQuery(q, opts))
-    return { records: queryInMemory(q, dbms) }
-  }
-
-  async runQueryCount<DBM extends SavedDBEntity>(
-    q: DBQuery<DBM>,
-    opts?: CommonDBOptions,
-  ): Promise<number> {
-    const { records } = await this.runQuery(q, opts)
-    return records.length
-  }
-
-  async deleteByQuery<DBM extends SavedDBEntity>(
-    q: DBQuery<DBM>,
-    opts?: CommonDBOptions,
-  ): Promise<number> {
-    const { records } = await this.runQuery(q, opts)
-    return await this.deleteByIds(q.table, records.map(dbm => dbm.id), opts)
-  }
-}