@blackglory/cache-js 0.4.2 → 0.6.0

package/README.md

@@ -34,10 +34,6 @@ class CacheClient {
   has(namespace: string, key: string, timeout?: number): Promise<boolean>
 
   get(namespace: string, key: string, timeout?: number): Promise<string | null>
-  getWithMetadata(namespace: string, key: string, timeout?: number): Promise<{
-      value: string
-      metadata: IMetadata
-  } | null>
   bulkGet(
     namespace: string
   , keys: string[]

package/lib/{es2015/cache.d.ts → cache.d.ts}

@@ -20,11 +20,11 @@ export declare class CacheClient {
     close(): Promise<void>;
     has(namespace: string, key: string, timeout?: number): Promise<boolean>;
     get(namespace: string, key: string, timeout?: number): Promise<string | null>;
-    bulkGet(namespace: string, keys: string[], timeout?: number): Promise<Array<string | null>>;
     getWithMetadata(namespace: string, key: string, timeout?: number): Promise<{
         value: string;
         metadata: IMetadata;
     } | null>;
+    bulkGet(namespace: string, keys: string[], timeout?: number): Promise<Array<string | null>>;
     set(namespace: string, key: string, value: string, timeToLive: number | null, timeout?: number): Promise<void>;
     del(namespace: string, key: string, timeout?: number): Promise<void>;
     clear(namespace: string, timeout?: number): Promise<void>;

package/lib/{es2018/cache.js → cache.js}

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CacheClient = void 0;
 const rpc_client_1 = require("./utils/rpc-client");
-const prelude_1 = require("@blackglory/prelude");
 const extra_abort_1 = require("extra-abort");
+const prelude_1 = require("@blackglory/prelude");
 class CacheClient {
     constructor(client, batchClient, batchProxy, closeClients, timeout) {
         this.client = client;
@@ -25,12 +25,6 @@ class CacheClient {
     async get(namespace, key, timeout) {
         return await this.withTimeout(() => this.client.get(namespace, key), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
-    async bulkGet(namespace, keys, timeout) {
-        return await this.withTimeout(async () => {
-            const results = await this.batchClient.parallel(...keys.map(key => this.batchProxy.get(namespace, key)));
-            return results.map(result => result.unwrap());
-        }, timeout !== null && timeout !== void 0 ? timeout : this.timeout);
-    }
     async getWithMetadata(namespace, key, timeout) {
         return await this.withTimeout(async () => {
             const result = await this.client.getWithMetadata(namespace, key);
@@ -45,6 +39,12 @@ class CacheClient {
             };
         }, timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
+    async bulkGet(namespace, keys, timeout) {
+        return await this.withTimeout(async () => {
+            const results = await this.batchClient.parallel(...keys.map(key => this.batchProxy.get(namespace, key)));
+            return results.map(result => result.unwrap());
+        }, timeout !== null && timeout !== void 0 ? timeout : this.timeout);
+    }
     async set(namespace, key, value, timeToLive, timeout) {
         await this.withTimeout(() => this.client.set(namespace, key, value, timeToLive), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }

package/lib/cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":";;;AAAA,mDAAmD;AAGnD,6CAA4D;AAC5D,iDAA4C;AAc5C,MAAa,WAAW;IACtB,YACU,MAAyB,EACzB,WAAwB,EACxB,UAA2C,EAC3C,YAAiC,EACjC,OAAgB;QAJhB,WAAM,GAAN,MAAM,CAAmB;QACzB,gBAAW,GAAX,WAAW,CAAa;QACxB,eAAU,GAAV,UAAU,CAAiC;QAC3C,iBAAY,GAAZ,YAAY,CAAqB;QACjC,YAAO,GAAP,OAAO,CAAS;IACvB,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAA4B;QAC9C,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,4BAAe,EACjE,OAAO,CAAC,MAAM,CACf,CAAA;QACD,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;IAC5E,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,SAAiB,EAAE,GAAW,EAAE,OAAgB;QACxD,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,EACrC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,SAAiB,EAAE,GAAW,EAAE,OAAgB;QACxD,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,EACrC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAiB,EAAE,GAAW,EAAE,OAAgB;QAIpE,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,KAAK,IAAI,EAAE;YACT,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;YAChE,IAAI,IAAA,gBAAM,EAAC,MAAM,CAAC;gBAAE,OAAO,IAAI,CAAA;YAE/B,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,QAAQ,EAAE;oBACR,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS;oBACpC,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;iBACvC;aACF,CAAA;QACH,CAAC,EACD,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CACX,SAAiB,EACjB,IAAc,EACd,OAAgB;QAEhB,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,KAAK,IAAI,EAAE;YACT,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAC7C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CACxD,CAAA;YACD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/C,CAAC,EACD,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CACP,SAAiB,EACjB,GAAW,EACX,KAAa,EACb,UAAyB,EACzB,OAAgB;QAEhB,MAAM,IAAI,CAAC,WAAW,CACpB,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CACnB,SAAS,EACT,GAAG,EACH,KAAK,EACL,UAAU,CACX,EACD,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,SAAiB,EAAE,GAAW,EAAE,OAAgB;QACxD,MAAM,IAAI,CAAC,WAAW,CACpB,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,EACrC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,SAAiB,EAAE,OAAgB;QAC7C,MAAM,IAAI,CAAC,WAAW,CACpB,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAClC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,SAAiB,EAAE,OAAgB;QACtD,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAC3C,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAgB;QACrC,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,EACpC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,SAAiB,EAAE,OAAgB;QAC7C,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAClC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,EAAwB,EACxB,UAA8B,IAAI,CAAC,OAAO;QAE1C,IAAI,OAAO,EAAE;YACX,OAAO,MAAM,IAAA,6BAAe,EAAC,IAAA,2BAAa,EAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;SACzD;aAAM;YACL,OAAO,MAAM,EAAE,EAAE,CAAA;SAClB;IACH,CAAC;CACF;AAtID,kCAsIC"}

package/lib/{es2015/contract.d.ts → contract.d.ts}

@@ -20,4 +20,4 @@ export interface IMetadata {
     updatedAt: number;
     timeToLive: number | null;
 }
-export declare const expectedVersion = "0.3.0";
+export declare const expectedVersion = "0.5.0";

package/lib/{es2015/contract.js → contract.js}

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expectedVersion = void 0;
-exports.expectedVersion = '0.3.0';
+exports.expectedVersion = '0.5.0';
 //# sourceMappingURL=contract.js.map

package/lib/contract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":";;;AA+Ba,QAAA,eAAe,GAAG,OAAO,CAAA"}

package/lib/index.js.map

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

package/lib/utils/rpc-client.browser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpc-client.browser.js","sourceRoot":"","sources":["../../src/utils/rpc-client.browser.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,gFAAqF;AACrF,mEAA4E;AAErE,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC;IAOrC,MAAM,EAAE,GAAG,IAAI,6CAAoB,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAC7D,MAAM,mBAAmB,GAAG,IAAA,sCAAa,EAAC,EAAE,EAAE,4BAA4B,CAAC,CAAA;IAC3E,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,qCAAY,EAAO,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,0CAAiB,EAAC,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC;AA5BD,0CA4BC"}

package/lib/utils/rpc-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../src/utils/rpc-client.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,kEAA8E;AAC9E,2BAA8B;AAC9B,qDAA+D;AAExD,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC;IAOrC,MAAM,EAAE,GAAG,IAAI,gCAAc,CAAC,GAAG,EAAE,CAAC,IAAI,cAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IACvD,MAAM,mBAAmB,GAAG,IAAA,+BAAa,EAAC,EAAE,EAAE,4BAA4B,CAAC,CAAA;IAC3E,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,8BAAY,EAAO,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,mCAAiB,EAAC,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC;AA5BD,0CA4BC"}

package/package.json

@@ -1,36 +1,32 @@
 {
   "name": "@blackglory/cache-js",
-  "version": "0.4.2",
+  "version": "0.6.0",
   "description": "",
   "keywords": [],
   "files": [
-    "lib",
-    "dist"
+    "lib"
   ],
-  "main": "lib/es2018/index.js",
-  "types": "lib/es2018/index.d.ts",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "browser": {
-    "./lib/es2015/utils/rpc-client.js": "./lib/es2015/utils/rpc-client.browser.js",
-    "./lib/es2018/utils/rpc-client.js": "./lib/es2018/utils/rpc-client.browser.js"
+    "./lib/utils/rpc-client.js": "./lib/utils/rpc-client.browser.js"
   },
   "repository": "git@github.com:BlackGlory/cache-js.git",
   "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
   "license": "MIT",
   "sideEffects": false,
+  "engines": {
+    "node": ">=16"
+  },
   "scripts": {
     "prepare": "ts-patch install -s",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
     "test": "jest --runInBand --no-cache --config jest.config.js",
     "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
     "test:coverage": "jest --coverage --config jest.config.js",
-    "prepublishOnly": "run-s prepare clean build bundle",
-    "clean": "run-p clean:*",
-    "clean:build": "rimraf lib",
-    "clean:bundle": "rimraf dist",
-    "build": "run-p build:*",
-    "build:es2015": "tsc --project tsconfig.build.json --module commonjs --target es2015 --outDir lib/es2015",
-    "build:es2018": "tsc --project tsconfig.build.json --module commonjs --target es2018 --outDir lib/es2018",
-    "bundle": "rollup --config rollup.config.js",
+    "prepublishOnly": "run-s prepare clean build",
+    "clean": "rimraf lib",
+    "build": "tsc --project tsconfig.build.json --module commonjs --target es2018 --outDir lib",
     "docker:test": "run-s docker:test:clean docker:test:build docker:test:run docker:test:clean",
     "docker:coverage": "run-s docker:test:clean docker:test:build docker:test:coverage docker:test:clean",
     "docker:test:build": "docker-compose --project-name cache-js --file docker-compose.test.yml build",
@@ -40,47 +36,38 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "run-s prepare lint build bundle",
+      "pre-commit": "run-s prepare lint build docker:test",
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.0.3",
-    "@commitlint/config-conventional": "^17.0.3",
-    "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-commonjs": "^22.0.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^14.1.0",
-    "@rollup/plugin-replace": "^4.0.0",
-    "@rollup/plugin-typescript": "^8.3.4",
-    "@types/jest": "^28.1.6",
+    "@commitlint/cli": "^17.3.0",
+    "@commitlint/config-conventional": "^17.3.0",
+    "@types/jest": "^29.2.4",
     "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.31.0",
-    "@typescript-eslint/parser": "^5.31.0",
-    "eslint": "^8.20.0",
+    "@typescript-eslint/eslint-plugin": "^5.46.0",
+    "@typescript-eslint/parser": "^5.46.0",
+    "eslint": "^8.29.0",
     "husky": "4",
-    "jest": "^28.1.3",
-    "msw": "^0.42.1",
+    "jest": "^29.3.1",
+    "msw": "^0.49.1",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
-    "rollup": "^2.77.2",
-    "rollup-plugin-analyzer": "^4.0.0",
-    "rollup-plugin-terser": "^7.0.2",
     "standard-version": "^9.5.0",
-    "ts-jest": "^28.0.7",
-    "ts-patch": "^2.0.1",
+    "ts-jest": "^29.0.3",
+    "ts-patch": "^2.1.0",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4",
-    "typescript-transform-paths": "^3.3.1"
+    "typescript-transform-paths": "^3.4.4"
   },
   "dependencies": {
-    "@blackglory/prelude": "^0.1.3",
+    "@blackglory/prelude": "^0.1.8",
     "@delight-rpc/extra-native-websocket": "^0.3.1",
     "@delight-rpc/extra-websocket": "^0.3.1",
-    "delight-rpc": "^4.2.1",
-    "extra-abort": "^0.1.2",
+    "delight-rpc": "^4.3.2",
+    "extra-abort": "^0.2.0",
     "extra-native-websocket": "^0.3.1",
     "extra-websocket": "^0.3.0",
-    "ws": "^8.8.1"
+    "ws": "^8.11.0"
   }
 }