koatty_store 1.5.4 → 1.5.6

package/dist/store/redis.js

@@ -1,228 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisStore = void 0;
-const tslib_1 = require("tslib");
-/*
- * @Author: richen
- * @Date: 2020-11-30 15:56:08
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-12-02 15:30:11
- * @License: BSD (3-Clause)
- * @Copyright (c) - <richenlin(at)gmail.com>
- */
-const helper = (0, tslib_1.__importStar)(require("koatty_lib"));
-const koatty_logger_1 = require("koatty_logger");
-const ioredis_1 = (0, tslib_1.__importDefault)(require("ioredis"));
-const generic_pool_1 = (0, tslib_1.__importDefault)(require("generic-pool"));
-const store_1 = require("../store");
-/**
- *
- *
- * @export
- * @class RedisStore
- */
-class RedisStore extends store_1.CacheStore {
-    /**
-     * Creates an instance of RedisStore.
-     * @param {StoreOptions} options
-     * @memberof RedisStore
-     */
-    constructor(options) {
-        super(options);
-        this.options = this.parseOpt(options);
-        this.pool = null;
-        this.client = null;
-    }
-    // parseOpt
-    parseOpt(options) {
-        const opt = {
-            host: options.host || '127.0.0.1',
-            port: options.port || 3306,
-            username: options.username || "",
-            password: options.password || "",
-            db: options.db || 0,
-            timeout: options.timeout,
-            keyPrefix: options.keyPrefix || '',
-            poolSize: options.poolSize || 10,
-            connectTimeout: options.connectTimeout || 500,
-        };
-        if (helper.isArray(options.host)) {
-            const hosts = [];
-            for (let i = 0; i < options.host.length; i++) {
-                const h = options.host[i];
-                if (!helper.isEmpty(options.host[i])) {
-                    let p;
-                    if (helper.isArray(options.port)) {
-                        p = options.port[i];
-                    }
-                    else {
-                        p = options.port || 6379;
-                    }
-                    hosts.push({
-                        host: h,
-                        port: helper.toNumber(p),
-                    });
-                }
-            }
-            // sentinel
-            if (!helper.isEmpty(options.name)) {
-                opt.host = "";
-                opt.port = null;
-                opt.sentinels = [...hosts];
-                opt.sentinelUsername = options.username;
-                opt.sentinelPassword = options.password;
-            }
-            else {
-                // cluster
-                opt.host = "";
-                opt.port = null;
-                opt.clusters = [...hosts];
-            }
-        }
-        return opt;
-    }
-    /**
-     * create connection by native
-     *
-     * @param {number} [connNum=0]
-     * @returns {*}  {Promise<IORedis.Redis | IORedis.Cluster>}
-     * @memberof RedisStore
-     */
-    async connect(connNum = 0) {
-        if (this.client && this.client.status === 'ready') {
-            return this.client;
-        }
-        const defer = helper.getDefer();
-        let connection;
-        if (!helper.isEmpty(this.options.clusters)) {
-            connection = new ioredis_1.default.Cluster([...this.options.clusters], { redisOptions: this.options });
-        }
-        else {
-            connection = new ioredis_1.default(this.options);
-        }
-        connection.on('end', () => {
-            if (connNum < 3) {
-                connNum++;
-                defer.resolve(this.connect(connNum));
-            }
-            else {
-                this.close();
-                defer.reject('redis connection end');
-            }
-        });
-        connection.on('ready', () => {
-            this.client = connection;
-            defer.resolve(connection);
-        });
-        return defer.promise;
-    }
-    /**
-     * get connection from pool
-     *
-     * @returns {*}
-     * @memberof RedisStore
-     */
-    getConnection() {
-        if (!this.pool || !this.pool.acquire) {
-            const factory = {
-                create: () => {
-                    return this.connect();
-                },
-                destroy: () => {
-                    return this.close();
-                },
-                validate: (resource) => {
-                    return Promise.resolve(resource.status === 'ready');
-                }
-            };
-            this.pool = generic_pool_1.default.createPool(factory, {
-                max: this.options.poolSize || 10,
-                min: 2 // minimum size of the pool
-            });
-            this.pool.on('factoryCreateError', function (err) {
-                koatty_logger_1.DefaultLogger.Error(err);
-            });
-            this.pool.on('factoryDestroyError', function (err) {
-                koatty_logger_1.DefaultLogger.Error(err);
-            });
-        }
-        return this.pool.acquire();
-    }
-    /**
-     * close connection
-     *
-     * @returns {*}
-     * @memberof RedisStore
-     */
-    async close() {
-        this.client.disconnect();
-        this.client = null;
-        this.pool.destroy(this.client);
-        this.pool = null;
-        return;
-    }
-    /**
-     *
-     *
-     * @param {*} conn
-     * @returns {*}
-     * @memberof RedisStore
-     */
-    async release(conn) {
-        if (this.pool.isBorrowedResource(conn)) {
-            return this.pool.release(conn);
-        }
-        return Promise.resolve();
-    }
-    /**
-     * defineCommand
-     *
-     * @param {string} name
-     * @param {{ numberOfKeys?: number; lua?: string; }} scripts
-     * @returns {*}
-     * @memberof RedisStore
-     */
-    async defineCommand(name, scripts) {
-        const conn = await this.getConnection();
-        if (!conn[name]) {
-            conn.defineCommand(name, scripts);
-        }
-        return conn;
-    }
-    /**
-     * get and compare value
-     *
-     * @param {string} name
-     * @param {(string | number)} value
-     * @returns {*}  {Promise<any>}
-     * @memberof RedisStore
-     */
-    async getCompare(name, value) {
-        let conn;
-        try {
-            conn = await this.defineCommand("getCompare", {
-                numberOfKeys: 1,
-                lua: `
-                    local remote_value = redis.call("get",KEYS[1])
-                    
-                    if (not remote_value) then
-                        return 0
-                    elseif (remote_value == ARGV[1]) then
-                        return redis.call("del",KEYS[1])
-                    else
-                        return -1
-                    end
-            `
-            });
-            return conn.getCompare(name, value);
-        }
-        catch (error) {
-            throw error;
-        }
-        finally {
-            this.release(conn);
-        }
-    }
-}
-exports.RedisStore = RedisStore;
-//# sourceMappingURL=redis.js.map

package/dist/store/redis.js.map

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

package/dist/store.d.ts

@@ -1,252 +0,0 @@
-import { StoreOptions } from "./index";
-/**
- *
- *
- * @export
- * @class Store
- */
-export declare class CacheStore {
-    client: any;
-    pool: any;
-    options: StoreOptions;
-    /**
-     * Creates an instance of CacheStore.
-     * @param {StoreOptions} options
-     * @memberof CacheStore
-     */
-    constructor(options: StoreOptions);
-    getConnection(): void;
-    close(): Promise<void>;
-    release(conn: any): Promise<void>;
-    defineCommand(name: string, scripts: any): void;
-    getCompare(name: string, value: string | number): Promise<any>;
-    /**
-     * handler for native client
-     *
-     * @param {string} name
-     * @param {any[]} data
-     * @returns {*}
-     * @memberof RedisStore
-     */
-    protected wrap(name: string, data: any[]): Promise<any>;
-    /**
-     * 字符串获取
-     * @param name
-     */
-    get(name: string): Promise<any>;
-    /**
-     * 字符串写入
-     * @param name
-     * @param value
-     * @param timeout
-     * @returns {Promise}
-     */
-    set(name: string, value: string | number, timeout?: number): Promise<any>;
-    /**
-     * 以秒为单位，返回给定 key 的剩余生存时间
-     * @param name
-     * @returns {*}
-     */
-    ttl(name: string): Promise<any>;
-    /**
-     * 设置key超时属性
-     * @param name
-     * @param timeout
-     */
-    expire(name: string, timeout?: number): Promise<any>;
-    /**
-     * 删除key
-     * @param name
-     */
-    rm(name: string): Promise<any>;
-    /**
-     *
-     *
-     * @param {*} name
-     * @returns
-     */
-    del(name: string): Promise<any>;
-    /**
-     * 判断key是否存在
-     * @param name
-     */
-    exists(name: string): Promise<any>;
-    /**
-     * 自增
-     * @param name
-     */
-    incr(name: string): Promise<any>;
-    /**
-     * 自减
-     * @param name
-     * @returns {*}
-     */
-    decr(name: string): Promise<any>;
-    /**
-     * 将 key 所储存的值增加增量
-     * @param name
-     * @param incr
-     * @returns {*}
-     */
-    incrby(name: string, incr?: number): Promise<any>;
-    /**
-     * 将 key 所储存的值减去减量
-     *
-     * @param {any} name
-     * @param {any} decr
-     */
-    decrby(name: string, decr?: number): Promise<any>;
-    /**
-     * 哈希写入
-     * @param name
-     * @param key
-     * @param value
-     * @param timeout
-     */
-    hset(name: string, key: string, value: string | number, timeout?: number): Promise<any[]>;
-    /**
-     * 哈希获取
-     * @param name
-     * @param key
-     * @returns {*}
-     */
-    hget(name: string, key: string): Promise<any>;
-    /**
-     * 查看哈希表 hashKey 中，给定域 key 是否存在
-     * @param name
-     * @param key
-     * @returns {*}
-     */
-    hexists(name: string, key: string): Promise<any>;
-    /**
-     * 哈希删除
-     * @param name
-     * @param key
-     * @returns {*}
-     */
-    hdel(name: string, key: string): Promise<any[]>;
-    /**
-     * 返回哈希表 key 中域的数量
-     * @param name
-     * @returns {*}
-     */
-    hlen(name: string): Promise<any>;
-    /**
-     * 给哈希表指定key，增加increment
-     * @param name
-     * @param key
-     * @param incr
-     * @returns {*}
-     */
-    hincrby(name: string, key: string, incr?: number): Promise<any>;
-    /**
-     * 返回哈希表所有key-value
-     * @param name
-     * @returns {*}
-     */
-    hgetall(name: string): Promise<any>;
-    /**
-     * 返回哈希表所有key
-     * @param name
-     * @returns {*}
-     */
-    hkeys(name: string): Promise<any>;
-    /**
-     * 返回哈希表所有value
-     * @param name
-     * @returns {*}
-     */
-    hvals(name: string): Promise<any>;
-    /**
-     * 判断列表长度，若不存在则表示为空
-     * @param name
-     * @returns {*}
-     */
-    llen(name: string): Promise<any>;
-    /**
-     * 将值插入列表表尾
-     * @param name
-     * @param value
-     * @returns {*}
-     */
-    rpush(name: string, value: string | number): Promise<any>;
-    /**
-     *
-     *
-     * @param {string} name
-     * @param {(string | number)} value
-     * @returns {*}
-     * @memberof RedisStore
-     */
-    lpush(name: string, value: string | number): Promise<any>;
-    /**
-     * 将列表表头取出，并去除
-     * @param name
-     * @returns {*}
-     */
-    lpop(name: string): Promise<any>;
-    /**
-     *
-     *
-     * @param {string} name
-     * @returns {*}
-     * @memberof RedisStore
-     */
-    rpop(name: string): Promise<any>;
-    /**
-     * 返回列表 key 中指定区间内的元素，区间以偏移量 start 和 stop 指定
-     * @param name
-     * @param start
-     * @param stop
-     * @returns {*}
-     */
-    lrange(name: string, start: number, stop: number): Promise<any>;
-    /**
-     * 集合新增
-     * @param name
-     * @param value
-     * @param timeout
-     * @returns {*}
-     */
-    sadd(name: string, value: string | number, timeout?: number): Promise<any[]>;
-    /**
-     * 返回集合的基数(集合中元素的数量)
-     * @param name
-     * @returns {*}
-     */
-    scard(name: string): Promise<any>;
-    /**
-     * 判断 member 元素是否集合的成员
-     * @param name
-     * @param key
-     * @returns {*}
-     */
-    sismember(name: string, key: string): Promise<any>;
-    /**
-     * 返回集合中的所有成员
-     * @param name
-     * @returns {*}
-     */
-    smembers(name: string): Promise<any>;
-    /**
-     * 移除并返回集合中的一个随机元素
-     * @param name
-     * @returns {*}
-     */
-    spop(name: string): Promise<any>;
-    /**
-     * 移除集合 key 中的一个 member 元素
-     * @param name
-     * @param key
-     * @returns {*}
-     */
-    srem(name: string, key: string): Promise<any>;
-    /**
-     * 将 member 元素从 source 集合移动到 destination 集合
-     * @param source
-     * @param destination
-     * @param member
-     * @returns {*}
-     */
-    smove(source: string, destination: string, member: string): Promise<any>;
-}