@jayfong/x-server 2.108.5 → 2.108.6

package/lib/_cjs/services/cache.js

@@ -212,30 +212,25 @@ class CacheService {
       return 0;
     }
     const redisKeys = keys.map(key => this.toRedisKey(key));
+    const count = await _x.x.redis.del(...redisKeys);
     if (this.options.memory) {
       redisKeys.forEach(redisKey => {
         this.memoryCache.delete(redisKey);
       });
     }
-    return _x.x.redis.del(...redisKeys);
+    return count;
   }
 
   /**
    * 清空全部缓存。
    */
   async clearAll() {
-    if (this.options.memory) {
-      this.memoryCache.forEach((_v, k) => {
-        if (k.startsWith(this.prefix)) {
-          this.memoryCache.delete(k);
-        }
-      });
-    }
     const keys = await _x.x.redis.keys(`${this.prefix}*`);
-    if (keys.length) {
-      return _x.x.redis.del(...keys);
+    const count = keys.length ? await _x.x.redis.del(...keys) : 0;
+    if (this.options.memory) {
+      this.memoryCache.clear();
     }
-    return 0;
+    return count;
   }
 
   /**
@@ -245,18 +240,16 @@ class CacheService {
     if (!prefixes.length) {
       return 0;
     }
+    const keys = (await Promise.all(prefixes.map(prefix => _x.x.redis.keys(`${this.toRedisKey(prefix)}*`)))).flat();
+    const count = keys.length ? await _x.x.redis.del(...keys) : 0;
     if (this.options.memory) {
       this.memoryCache.forEach((_v, k) => {
-        if (prefixes.some(prefix => k.startsWith(Array.isArray(prefix) ? prefix.join('_') : String(prefix)))) {
+        if (prefixes.some(prefix => k.startsWith(this.toRedisKey(prefix)))) {
           this.memoryCache.delete(k);
         }
       });
     }
-    const keys = (await Promise.all(prefixes.map(prefix => _x.x.redis.keys(`${this.toRedisKey(prefix)}*`)))).flat();
-    if (keys.length) {
-      return _x.x.redis.del(...keys);
-    }
-    return 0;
+    return count;
   }
 
   /**

package/lib/services/cache.d.ts

@@ -1,6 +1,6 @@
-import { MsValue } from 'vtils';
-import { AsyncOrSync, IsEmptyArray } from 'vtils/types';
-import { BaseService } from './base';
+import { type MsValue } from 'vtils';
+import type { AsyncOrSync, IsEmptyArray } from 'vtils/types';
+import type { BaseService } from './base';
 export interface CacheServiceOptions {
     /** 默认过期时间 */
     ttl: MsValue;

package/lib/services/cache.js

@@ -207,30 +207,25 @@ export class CacheService {
       return 0;
     }
     const redisKeys = keys.map(key => this.toRedisKey(key));
+    const count = await x.redis.del(...redisKeys);
     if (this.options.memory) {
       redisKeys.forEach(redisKey => {
         this.memoryCache.delete(redisKey);
       });
     }
-    return x.redis.del(...redisKeys);
+    return count;
   }
 
   /**
    * 清空全部缓存。
    */
   async clearAll() {
-    if (this.options.memory) {
-      this.memoryCache.forEach((_v, k) => {
-        if (k.startsWith(this.prefix)) {
-          this.memoryCache.delete(k);
-        }
-      });
-    }
     const keys = await x.redis.keys(`${this.prefix}*`);
-    if (keys.length) {
-      return x.redis.del(...keys);
+    const count = keys.length ? await x.redis.del(...keys) : 0;
+    if (this.options.memory) {
+      this.memoryCache.clear();
     }
-    return 0;
+    return count;
   }
 
   /**
@@ -240,18 +235,16 @@ export class CacheService {
     if (!prefixes.length) {
       return 0;
     }
+    const keys = (await Promise.all(prefixes.map(prefix => x.redis.keys(`${this.toRedisKey(prefix)}*`)))).flat();
+    const count = keys.length ? await x.redis.del(...keys) : 0;
     if (this.options.memory) {
       this.memoryCache.forEach((_v, k) => {
-        if (prefixes.some(prefix => k.startsWith(Array.isArray(prefix) ? prefix.join('_') : String(prefix)))) {
+        if (prefixes.some(prefix => k.startsWith(this.toRedisKey(prefix)))) {
           this.memoryCache.delete(k);
         }
       });
     }
-    const keys = (await Promise.all(prefixes.map(prefix => x.redis.keys(`${this.toRedisKey(prefix)}*`)))).flat();
-    if (keys.length) {
-      return x.redis.del(...keys);
-    }
-    return 0;
+    return count;
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.108.5",
+  "version": "2.108.6",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",