@zenweb/cache 4.2.2 → 4.3.1

package/dist/cache.js

@@ -138,7 +138,7 @@ class Cache {
         // 使用锁设置缓存
         let locker;
         let refresh = opt.refresh || false; // 强制刷新
-        let retryCount = typeof opt.retryCount === 'number' ? opt.retryCount : 100;
+        let retryCount = typeof opt.retryCount === 'number' ? opt.retryCount : 10;
         while (true) {
             if (!refresh) {
                 // 尝试从 redis 中获取

package/dist/types.d.ts

@@ -89,7 +89,9 @@ export interface LockOption {
     lockTimeout?: number;
     /**
      * 锁获取失败重试次数
-     * @default 100
+     * - 0 不进行重试
+     * - lockGet 默认为 10
+     * - singleRunner 默认为 0
      */
     retryCount?: number;
     /**

package/dist/utils.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="debug" />
 import { Redis, RedisKey, RedisValue } from 'ioredis';
-export declare const debug: import("debug").Debugger;
+export declare const debug: import("@zenweb/core").Debugger;
 /**
  * Promise 等待
  * @param ms 毫秒
@@ -21,4 +20,4 @@ export declare function runRedisScript(redis: Redis, hash: string, script: strin
  * 生成一个参数缓存key
  * - 多个元素用 : 连接
  */
-export declare function normalKey(...key: (string | number | object)[]): string;
+export declare function cacheKey(...key: (string | number | object)[]): string;

package/dist/utils.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalKey = exports.runRedisScript = exports.sleep = exports.debug = void 0;
-const debug_1 = require("debug");
+exports.cacheKey = exports.runRedisScript = exports.sleep = exports.debug = void 0;
+const core_1 = require("@zenweb/core");
 const crypto = require("crypto");
-exports.debug = (0, debug_1.default)('zenweb:cache');
+exports.debug = (0, core_1.zenwebDebug)('cache');
 /**
  * Promise 等待
  * @param ms 毫秒
@@ -69,11 +69,11 @@ function plainifyOrHash(obj) {
  * 生成一个参数缓存key
  * - 多个元素用 : 连接
  */
-function normalKey(...key) {
+function cacheKey(...key) {
     return key.map(i => {
         if (typeof i === 'string')
             return i;
         return plainifyOrHash(i);
     }).join(':');
 }
-exports.normalKey = normalKey;
+exports.cacheKey = cacheKey;

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@zenweb/cache",
-  "version": "4.2.2",
+  "packageManager": "yarn@4.0.2",
+  "version": "4.3.1",
   "description": "Zenweb Cache module",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -8,10 +9,11 @@
     "dist"
   ],
   "scripts": {
+    "vscode": "yarn dlx @yarnpkg/sdks vscode",
     "build": "rimraf dist && tsc",
-    "prepublishOnly": "npm run build",
+    "prepublishOnly": "yarn run build",
     "test": "ts-mocha -p tsconfig.json test/**/*.test.ts",
-    "dev": "cd example && cross-env DEBUG=* NODE_ENV=development ts-node app"
+    "dev": "cd example && cross-env DEBUG=\\* NODE_ENV=development ts-node app"
   },
   "author": {
     "name": "YeFei",
@@ -31,16 +33,17 @@
   "homepage": "https://zenweb.node.ltd/docs/modules/cache",
   "devDependencies": {
     "@types/mocha": "^10.0.1",
+    "@types/node": "^20.10.6",
     "cross-env": "^7.0.3",
     "mocha": "^10.2.0",
     "rimraf": "^4.3.1",
     "ts-mocha": "^10.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.1.6",
-    "zenweb": "^4.0.1"
+    "typescript": "^5.3.3",
+    "zenweb": "^4.2.7"
   },
   "dependencies": {
-    "debug": "^4.3.4",
+    "@zenweb/core": "^4.2.3",
     "ioredis": "^5.3.2"
   }
 }

package/CHANGELOG.md

@@ -1,28 +0,0 @@
-# Changelog
-
-## [4.2.2] - 2023-8-23
-修改: 除了 Buffer 类型意外全部都使用 JSON 序列化
-
-## [4.2.1] - 2023-8-23
-fix: 内容未压缩，客户端支持压缩内容时却标识为压缩内容
-
-## [4.2.0] - 2023-8-22
-更新: cached 中间件支持 null key，不使用缓存
-
-## [4.1.3] - 2023-8-21
-fix: 二次获取缓存数据时会返回压缩数据的问题
-
-## [4.1.2] - 2023-8-21
-fix: 首次缓存新数据时会返回压缩数据的问题
-
-## [4.1.1] - 2023-8-18
-增加 normalKey number 参数
-
-## [4.1.0] - 2023-8-18
-增加 normalKey 方法
-
-## [4.0.1] - 2023-8-17
-cached 中间件增加 type 参数
-
-## [4.0.0] - 2023-8-8
-发布