koatty_store 1.4.7 → 1.5.2

package/.eslintrc.js

@@ -22,12 +22,13 @@ module.exports = {
   },
   rules: {
     "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-require-imports": "off",
+    // "@typescript-eslint/no-require-imports": "off",
     "@typescript-eslint/no-var-requires": "off",
     "@typescript-eslint/member-ordering": "off",
     "@typescript-eslint/consistent-type-assertions": "off",
     "@typescript-eslint/no-param-reassign": "off",
     "@typescript-eslint/no-empty-function": "off",
+    "@typescript-eslint/no-empty-interface": "off",
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/ban-types": ["error",
       {

package/.vscode/launch.json

@@ -0,0 +1,25 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Typescript Project",
+            "type": "node",
+            "request": "launch",
+            "args": [
+                "${workspaceRoot}/test/test.ts"
+            ],
+            "runtimeArgs": [
+                "--nolazy",
+                "-r",
+                "ts-node/register"
+            ],
+            "sourceMaps": true,
+            "cwd": "${workspaceRoot}",
+            "protocol": "inspector",
+            "internalConsoleOptions": "neverOpen"
+        }
+    ]
+}

package/CHANGELOG.md

@@ -2,10 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [1.4.6](https://github.com/koatty/koatty_store/compare/v1.4.2...v1.4.6) (2021-06-30)
+### [1.5.2](https://github.com/koatty/koatty_store/compare/v1.4.10...v1.5.2) (2021-12-02)
 
-### [1.4.2](https://github.com/koatty/koatty_store/compare/v1.3.3...v1.4.2) (2021-06-30)
-
-### [1.3.3](https://github.com/koatty/koatty_store/compare/v1.3.2...v1.3.3) (2021-06-30)
-
-### 1.3.2 (2021-06-23)
+### [1.4.10](https://github.com/koatty/koatty_store/compare/v1.4.8...v1.4.10) (2021-11-20)

package/LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2020, ThinkKoa
+Copyright (c) 2020, Koatty
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

package/babel.config.js

@@ -1,11 +1,6 @@
 /*
  * @Description  : babel配置
  * @usage        : 用于jest执行用例
- * @Date         : 2020-10-19 23:08:40
- * @Author       : fankerwang<fankerwang@tencent.com>
- * @LastEditors  : fankerwang<fankerwang@tencent.com>
- * @LastEditTime : 2021-05-21 20:27:11
- * @FilePath     : /tkoatty/babel.config.js
  */
 
 module.exports = {

package/dist/index.d.ts

@@ -1,7 +1,5 @@
-import { MemoryStore } from "./memory";
-import { RedisStore } from "./redis";
-export { RedisStore, RedisStoreOptions } from "./redis";
-export { MemoryStore, MemoryStoreOptions } from "./memory";
+import { CacheStore } from "./store";
+export { MemoryStore } from "./store/memory";
 /**
  *
  *
@@ -9,34 +7,27 @@ export { MemoryStore, MemoryStoreOptions } from "./memory";
  * @interface StoreOptions
  */
 export interface StoreOptions {
-    type: string;
-    key_prefix: string;
-    host: string | Array<string>;
+    type?: string;
+    keyPrefix?: string;
+    host?: string | Array<string>;
     port?: number | Array<number>;
-    name?: string;
     username?: string;
     password?: string;
     db?: number;
     timeout?: number;
-    pool_size?: number;
-    conn_timeout?: number;
-}
-/**
- * CacheStore interface
- *
- * @export
- * @interface CacheStore
- */
-export interface CacheStore {
-    client: any;
-    getConnection(): any;
-    close(): Promise<void>;
-    release(conn: any): Promise<void>;
-    get(name: string): Promise<any>;
-    set(name: string, value: string | number, timeout?: number): Promise<any>;
-    del(name: string): Promise<any>;
-    defineCommand(name: string, scripts: any): any;
-    getCompare(name: string, value: string | number): Promise<any>;
+    poolSize?: number;
+    connectTimeout?: number;
+    name?: string;
+    sentinelUsername?: string;
+    sentinelPassword?: string;
+    sentinels?: Array<{
+        host: string;
+        port: number;
+    }>;
+    clusters?: Array<{
+        host: string;
+        port: number;
+    }>;
 }
 /**
  *
@@ -53,5 +44,5 @@ export declare class Store {
      * @returns
      * @memberof ValidateUtil
      */
-    static getInstance(options: StoreOptions): MemoryStore | RedisStore;
+    static getInstance(options: StoreOptions): CacheStore;
 }

package/dist/index.js

@@ -1,19 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Store = exports.MemoryStore = exports.RedisStore = void 0;
-/*
- * @Author: richen
- * @Date: 2020-11-30 11:48:12
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-01 11:03:36
- * @License: BSD (3-Clause)
- * @Copyright (c) - <richenlin(at)gmail.com>
- */
-const memory_1 = require("./memory");
-const redis_1 = require("./redis");
-var redis_2 = require("./redis");
-Object.defineProperty(exports, "RedisStore", { enumerable: true, get: function () { return redis_2.RedisStore; } });
-var memory_2 = require("./memory");
+exports.Store = exports.MemoryStore = void 0;
+const memory_1 = require("./store/memory");
+const redis_1 = require("./store/redis");
+var memory_2 = require("./store/memory");
 Object.defineProperty(exports, "MemoryStore", { enumerable: true, get: function () { return memory_2.MemoryStore; } });
 /**
  *
@@ -36,12 +26,13 @@ class Store {
         options = {
             ...{
                 type: 'memory',
-                host: '127.0.0.1',
-                port: 3306,
-                key_prefix: 'Koatty',
-                timeout: 21600,
-                pool_size: 10,
-                conn_timeout: 500,
+                host: '',
+                port: 0,
+                keyPrefix: 'Koatty',
+                timeout: 600,
+                poolSize: 10,
+                connectTimeout: 500,
+                db: 0
             }, ...options
         };
         switch (options.type) {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;GAOG;AACH,qCAAuC;AACvC,mCAAqC;AACrC,iCAAwD;AAA/C,mGAAA,UAAU,OAAA;AACnB,mCAA2D;AAAlD,qGAAA,WAAW,OAAA;AA0CpB;;;;;GAKG;AACH,MAAa,KAAK;IAGd;;;;;;OAMG;IACH,MAAM,CAAC,WAAW,CAAC,OAAqB;QACpC,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,OAAO,IAAI,CAAC,QAAQ,CAAC;SACxB;QACD,OAAO,GAAG;YACN,GAAG;gBACC,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,IAAI;gBACV,UAAU,EAAE,QAAQ;gBACpB,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,EAAE;gBACb,YAAY,EAAE,GAAG;aACpB,EAAE,GAAG,OAAO;SAChB,CAAC;QACF,QAAQ,OAAO,CAAC,IAAI,EAAE;YAClB,KAAK,OAAO;gBACR,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAU,CAAC,OAAO,CAAC,CAAC;gBACxC,MAAM;YACV,KAAK,QAAQ,CAAC;YACd;gBACI,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAW,CAAC,OAAO,CAAC,CAAC;gBACzC,MAAM;SACb;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CAGJ;AAvCD,sBAuCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AASA,2CAA6C;AAC7C,yCAA2C;AAC3C,yCAA6C;AAApC,qGAAA,WAAW,OAAA;AA8BpB;;;;;GAKG;AACH,MAAa,KAAK;IAGd;;;;;;OAMG;IACH,MAAM,CAAC,WAAW,CAAC,OAAqB;QACpC,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,OAAO,IAAI,CAAC,QAAQ,CAAC;SACxB;QACD,OAAO,GAAG;YACN,GAAG;gBACC,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,CAAC;gBACP,SAAS,EAAE,QAAQ;gBACnB,OAAO,EAAE,GAAG;gBACZ,QAAQ,EAAE,EAAE;gBACZ,cAAc,EAAE,GAAG;gBACnB,EAAE,EAAE,CAAC;aACR,EAAE,GAAG,OAAO;SAChB,CAAC;QACF,QAAQ,OAAO,CAAC,IAAI,EAAE;YAClB,KAAK,OAAO;gBACR,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAU,CAAC,OAAO,CAAC,CAAC;gBACxC,MAAM;YACV,KAAK,QAAQ,CAAC;YACd;gBACI,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAW,CAAC,OAAO,CAAC,CAAC;gBACzC,MAAM;SACb;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAtCD,sBAsCC"}

package/dist/{memory.d.ts → store/memory.d.ts}

@@ -1,17 +1,10 @@
-import { CacheStore, StoreOptions } from ".";
-/**
- * MemoryStore Options
- *
- * @export
- * @interface MemoryStoreOptions
- */
-export interface MemoryStoreOptions {
-    timeout?: number;
-}
-export declare class MemoryStore implements CacheStore {
+import { CacheStore } from "../store";
+import { StoreOptions } from "../index";
+import { MemoryCache } from "./memory_cache";
+export declare class MemoryStore extends CacheStore {
     client: any;
-    private options;
-    private pool;
+    pool: any;
+    options: StoreOptions;
     /**
      * Creates an instance of MemoryStore.
      * @param {StoreOptions} options
@@ -24,7 +17,7 @@ export declare class MemoryStore implements CacheStore {
      * @returns {*}
      * @memberof MemoryStore
      */
-    getConnection(): any;
+    getConnection(): MemoryCache;
     /**
      * close
      *
@@ -47,7 +40,7 @@ export declare class MemoryStore implements CacheStore {
      * @param {*} scripts
      * @memberof MemoryStore
      */
-    defineCommand(name: string, scripts: any): Promise<any>;
+    defineCommand(name: string, scripts: any): Promise<void>;
     /**
      * get and compare value
      *
@@ -57,30 +50,4 @@ export declare class MemoryStore implements CacheStore {
      * @memberof MemoryStore
      */
     getCompare(name: string, value: string | number): Promise<any>;
-    /**
-     * get
-     *
-     * @param {string} name
-     * @returns {*}  {Promise<any>}
-     * @memberof MemoryStore
-     */
-    get(name: string): Promise<any>;
-    /**
-     * set
-     *
-     * @param {string} name
-     * @param {(string | number)} value
-     * @param {number} [timeout]
-     * @returns {*}  {Promise<any>}
-     * @memberof MemoryStore
-     */
-    set(name: string, value: string | number, timeout?: number): Promise<any>;
-    /**
-     * del
-     *
-     * @param {string} name
-     * @returns {*}
-     * @memberof MemoryStore
-     */
-    del(name: string): any;
 }

package/dist/{memory.js → store/memory.js}

@@ -1,23 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryStore = void 0;
-const tslib_1 = require("tslib");
-const helper = tslib_1.__importStar(require("koatty_lib"));
-const MemoryCache = require('@outofsync/memory-cache');
+const store_1 = require("../store");
+const memory_cache_1 = require("./memory_cache");
+// const MemoryCache = require('@outofsync/memory-cache');
 /*
  * @Description:
  * @Usage:
  * @Author: richen
  * @Date: 2021-06-29 19:07:57
- * @LastEditTime: 2021-06-29 19:45:25
+ * @LastEditTime: 2021-12-02 15:30:12
  */
-class MemoryStore {
+class MemoryStore extends store_1.CacheStore {
     /**
      * Creates an instance of MemoryStore.
      * @param {StoreOptions} options
      * @memberof MemoryStore
      */
     constructor(options) {
+        super(options);
         this.options = options;
         this.client = null;
     }
@@ -29,7 +30,9 @@ class MemoryStore {
      */
     getConnection() {
         if (!this.pool) {
-            this.pool = new MemoryCache({ bypassUnsupported: true });
+            this.pool = new memory_cache_1.MemoryCache({
+                database: this.options.db
+            });
         }
         if (!this.client) {
             this.client = this.pool.createClient();
@@ -65,16 +68,7 @@ class MemoryStore {
      * @memberof MemoryStore
      */
     async defineCommand(name, scripts) {
-        const client = this.getConnection();
-        Object.defineProperty(client, name, {
-            value: async function () {
-                return scripts;
-            },
-            writable: false,
-            configurable: false,
-            enumerable: true,
-        });
-        return client;
+        throw new Error(memory_cache_1.messages.unsupported);
     }
     /**
      * get and compare value
@@ -86,55 +80,17 @@ class MemoryStore {
      */
     async getCompare(name, value) {
         const client = this.getConnection();
-        const val = client.get(name);
+        const val = client.get(`${this.options.keyPrefix}${name}`);
         if (!val) {
             return 0;
         }
         else if (val == value) {
-            return client.del(name);
+            return client.del(`${this.options.keyPrefix}${name}`);
         }
         else {
             return -1;
         }
     }
-    /**
-     * get
-     *
-     * @param {string} name
-     * @returns {*}  {Promise<any>}
-     * @memberof MemoryStore
-     */
-    get(name) {
-        const client = this.getConnection();
-        return client.getAsync(name);
-    }
-    /**
-     * set
-     *
-     * @param {string} name
-     * @param {(string | number)} value
-     * @param {number} [timeout]
-     * @returns {*}  {Promise<any>}
-     * @memberof MemoryStore
-     */
-    set(name, value, timeout) {
-        const client = this.getConnection();
-        if (helper.isTrueEmpty(timeout)) {
-            timeout = this.options.timeout;
-        }
-        return client.setAsync(name, value, "ex", timeout);
-    }
-    /**
-     * del
-     *
-     * @param {string} name
-     * @returns {*}
-     * @memberof MemoryStore
-     */
-    del(name) {
-        const client = this.getConnection();
-        return client.delAsync(name);
-    }
 }
 exports.MemoryStore = MemoryStore;
 //# sourceMappingURL=memory.js.map

package/dist/store/memory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/store/memory.ts"],"names":[],"mappings":";;;AACA,oCAAsC;AAEtC,iDAAuD;AACvD,0DAA0D;AAE1D;;;;;;GAMG;AACH,MAAa,WAAY,SAAQ,kBAAU;IAKvC;;;;OAIG;IACH,YAAY,OAAqB;QAC7B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,aAAa;QACT,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACZ,IAAI,CAAC,IAAI,GAAG,IAAI,0BAAW,CAAC;gBACxB,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;aAC5B,CAAC,CAAC;SACN;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC;SAChC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;QACjB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,CAAC;IACD;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,CAAC,IAAS;QACnB,OAAO;IACX,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,aAAa,CAAC,IAAY,EAAE,OAAY;QAC1C,MAAM,IAAI,KAAK,CAAC,uBAAQ,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,UAAU,CAAC,IAAY,EAAE,KAAsB;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,GAAG,EAAE;YACN,OAAO,CAAC,CAAC;SACZ;aAAM,IAAI,GAAG,IAAI,KAAK,EAAE;YACrB,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,EAAE,CAAC,CAAC;SACzD;aAAM;YACH,OAAO,CAAC,CAAC,CAAC;SACb;IACL,CAAC;CAGJ;AAzFD,kCAyFC"}