@hile/cache 2.0.3 → 2.0.5

package/dist/define.d.ts

@@ -1,6 +1,7 @@
 export declare class Cache<R> {
     readonly data: R;
     private _expire;
+    readonly __$flag__ = "cache";
     constructor(data: R);
     setExpire(seconds: number): this;
     get expire(): number;
@@ -13,5 +14,6 @@ export type DefineCacheHandler<T extends string = string, R = any> = (opts: Extr
 export type DefineCacheResult<T extends string = string, R = any> = {
     fn: DefineCacheHandler<T, R>;
     key: string;
+    fieldable: boolean;
 };
-export declare function defineCache<T extends string = string, R = any>(key: T, fn: DefineCacheHandler<T, R>): DefineCacheResult<T, R>;
+export declare function defineCache<T extends string = string, R = any>(key: T, fn: DefineCacheHandler<T, R>, fieldable?: boolean): DefineCacheResult<T, R>;

package/dist/define.js

@@ -1,6 +1,7 @@
 export class Cache {
     data;
     _expire = 0; // 0: 永不过期
+    __$flag__ = 'cache';
     constructor(data) {
         this.data = data;
     }
@@ -12,10 +13,11 @@ export class Cache {
         return this._expire;
     }
 }
-export function defineCache(key, fn) {
+export function defineCache(key, fn, fieldable = false) {
     return {
         fn,
         key,
+        fieldable,
     };
 }
 // defineCache('user:{id:string}:ddd:{x:number}:idsaf:{y:boolean}', async (params) => {

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { DefineCacheResult, ExtractParams } from './define.js';
-import { Redis } from 'ioredis';
+import { ChainableCommander, Redis } from 'ioredis';
 export * from './define.js';
 export declare class RedisCache {
     private readonly prefix;
@@ -7,6 +7,7 @@ export declare class RedisCache {
     private readonly _regexp;
     constructor(prefix: string, redis: Redis);
     private makeKey;
+    private _multi;
     private _write;
     private _read;
     private _remove;
@@ -16,5 +17,6 @@ export declare class RedisCache {
         read: (params: ExtractParams<T>) => Promise<R | undefined>;
         remove: (params: ExtractParams<T>) => Promise<number>;
         has: (params: ExtractParams<T>) => Promise<boolean>;
+        multi: (params: ExtractParams<T>, callback: (multi: ChainableCommander, key: string) => unknown) => Promise<[error: Error | null, result: unknown][] | null>;
     }>;
 }

package/dist/index.js

@@ -1,4 +1,3 @@
-import { Cache } from './define.js';
 export * from './define.js';
 export class RedisCache {
     prefix;
@@ -11,10 +10,20 @@ export class RedisCache {
     makeKey(key, options) {
         return this.prefix + key.replace(this._regexp, (_, key) => String(options[key]));
     }
+    async _multi(target, params, callback) {
+        const key = this.makeKey(target.key, params);
+        const redis = this.redis;
+        const exists = await redis.exists(key);
+        if (!exists)
+            await this._write(target, params);
+        const multi = redis.multi();
+        callback(multi, key);
+        return await multi.exec();
+    }
     async _write(target, params) {
         const key = this.makeKey(target.key, params);
         const cache = await target.fn(params);
-        if (!(cache instanceof Cache)) {
+        if (cache.__$flag__ !== 'cache') {
             throw new Error('Cache result must be an instance of Cache');
         }
         const redis = this.redis;
@@ -25,6 +34,13 @@ export class RedisCache {
             }
             return;
         }
+        if (target.fieldable) {
+            await redis.hset(key, cache.data);
+            if (cache.expire > 0) {
+                await redis.expire(key, cache.expire);
+            }
+            return cache.data;
+        }
         const payload = JSON.stringify(cache.data);
         if (cache.expire > 0) {
             await redis.setex(key, cache.expire, payload);
@@ -40,6 +56,10 @@ export class RedisCache {
         const exists = await redis.exists(key);
         if (!exists)
             return await this._write(target, params);
+        if (target.fieldable) {
+            const fields = await redis.hgetall(key);
+            return fields;
+        }
         const text = await redis.get(key);
         if (!text)
             return await this._write(target, params);
@@ -72,6 +92,9 @@ export class RedisCache {
             },
             has: async (params) => {
                 return await this._has(target, params);
+            },
+            multi: async (params, callback) => {
+                return await this._multi(target, params, callback);
             }
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hile/cache",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -23,5 +23,5 @@
   "dependencies": {
     "ioredis": "^5.11.0"
   },
-  "gitHead": "9f8e7074872709eccd3cac128999f872521b061e"
+  "gitHead": "ecfe460c6ccbd1c5cbe2189cb16d5b1e67aaff36"
 }