@hile/cache 2.0.2 → 2.0.4

package/README.md

@@ -1,6 +1,6 @@
 # @hile/cache
 
-基于 Redis 的类型安全读穿透缓存层，构建在 `@hile/core`（DI 容器）与 `@hile/ioredis`（Redis 客户端）之上。
+基于 Redis 的类型安全读穿透缓存层。依赖 `ioredis`，构造时注入已连接的 `Redis` 实例（可与 `@hile/ioredis` 配合使用）。
 
 ## 安装
 
@@ -8,7 +8,7 @@
 pnpm add @hile/cache
 ```
 
-依赖：`@hile/core`、`@hile/ioredis`。
+运行时需提供 `ioredis` 的 `Redis` 实例；在 Hile 应用中通常通过 `@hile/ioredis` 的 `createRedis()` 或 `loadService(ioredisService)` 获取。
 
 ## 快速开始
 
@@ -29,9 +29,12 @@ const userCache = defineCache('user:{id:string}:info', async (params) => {
 ### 2. 使用缓存
 
 ```typescript
+import { loadService } from '@hile/core';
+import redisService from '@hile/ioredis';
 import { RedisCache } from '@hile/cache';
 
-const cache = new RedisCache('myapp:'); // 统一前缀
+const redis = await loadService(redisService);
+const cache = new RedisCache('myapp:', redis); // 前缀 + Redis 实例
 
 const { read, write, remove, has } = await cache.loadCache(userCache);
 
@@ -100,7 +103,7 @@ function defineCache<T extends string = string, R = any>(
 
 ```typescript
 class RedisCache {
-  constructor(prefix: string);
+  constructor(prefix: string, redis: Redis);
 
   loadCache<T extends string, R>(
     target: DefineCacheResult<T, R>
@@ -135,7 +138,7 @@ myapp:user:u-001:info
 
 ## 与 @hile/cli 集成
 
-可在 `package.json` 中配置自动加载 Redis：
+在 `package.json` 中配置自动加载 Redis，在 boot 或服务工厂里注入客户端：
 
 ```json
 {
@@ -145,15 +148,27 @@ myapp:user:u-001:info
 }
 ```
 
-然后任何地方通过 `loadService(ioredisService)` 获取 Redis 客户端，`@hile/cache` 内部已自动处理。
+```typescript
+import { loadService } from '@hile/core';
+import redisService from '@hile/ioredis';
+import { defineCache, Cache, RedisCache } from '@hile/cache';
+
+// 在 defineService 工厂内
+const redis = await loadService(redisService);
+const cache = new RedisCache('myapp:', redis);
+```
 
 ---
 
 ## 完整示例
 
 ```typescript
+import { loadService } from '@hile/core';
+import redisService from '@hile/ioredis';
 import { defineCache, Cache, RedisCache } from '@hile/cache';
 
+const redis = await loadService(redisService);
+
 // 定义多条缓存
 const userCache = defineCache('user:{id:string}:info', async ({ id }) => {
   const user = await db.query('SELECT * FROM users WHERE id = $1', [id]);
@@ -166,7 +181,7 @@ const postCache = defineCache('post:{id:string}:detail', async ({ id }) => {
   return new Cache(post).setExpire(3600);
 });
 
-const cache = new RedisCache('myapp:');
+const cache = new RedisCache('myapp:', redis);
 
 // 批量加载
 const [userOps, postOps] = await Promise.all([

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;

package/dist/define.js

@@ -1,6 +1,7 @@
 export class Cache {
     data;
     _expire = 0; // 0: 永不过期
+    __$flag__ = 'cache';
     constructor(data) {
         this.data = data;
     }

package/dist/index.d.ts

@@ -1,9 +1,11 @@
 import { DefineCacheResult, ExtractParams } from './define.js';
+import { Redis } from 'ioredis';
 export * from './define.js';
 export declare class RedisCache {
     private readonly prefix;
+    private readonly redis;
     private readonly _regexp;
-    constructor(prefix: string);
+    constructor(prefix: string, redis: Redis);
     private makeKey;
     private _write;
     private _read;

package/dist/index.js

@@ -1,12 +1,11 @@
-import { loadService } from "@hile/core";
-import ioredisService from "@hile/ioredis";
-import { Cache } from './define.js';
 export * from './define.js';
 export class RedisCache {
     prefix;
+    redis;
     _regexp = /\{([^\:]+):[^\}]+\}/g;
-    constructor(prefix) {
+    constructor(prefix, redis) {
         this.prefix = prefix;
+        this.redis = redis;
     }
     makeKey(key, options) {
         return this.prefix + key.replace(this._regexp, (_, key) => String(options[key]));
@@ -14,10 +13,10 @@ export class RedisCache {
     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 = await loadService(ioredisService);
+        const redis = this.redis;
         const exists = await redis.exists(key);
         if (cache.data === undefined) {
             if (exists) {
@@ -36,7 +35,7 @@ export class RedisCache {
     }
     async _read(target, params) {
         const key = this.makeKey(target.key, params);
-        const redis = await loadService(ioredisService);
+        const redis = this.redis;
         const exists = await redis.exists(key);
         if (!exists)
             return await this._write(target, params);
@@ -47,7 +46,7 @@ export class RedisCache {
     }
     async _remove(target, params) {
         const key = this.makeKey(target.key, params);
-        const redis = await loadService(ioredisService);
+        const redis = this.redis;
         const exists = await redis.exists(key);
         if (!exists)
             return 0;
@@ -55,7 +54,7 @@ export class RedisCache {
     }
     async _has(target, params) {
         const key = this.makeKey(target.key, params);
-        const redis = await loadService(ioredisService);
+        const redis = this.redis;
         const exists = await redis.exists(key);
         return !!exists;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hile/cache",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -10,8 +10,7 @@
   },
   "files": [
     "dist",
-    "README.md",
-    "SKILL.md"
+    "README.md"
   ],
   "license": "MIT",
   "publishConfig": {
@@ -22,8 +21,7 @@
     "vitest": "^4.0.18"
   },
   "dependencies": {
-    "@hile/core": "^2.0.1",
-    "@hile/ioredis": "^2.0.2"
+    "ioredis": "^5.11.0"
   },
-  "gitHead": "d2495d1c31f5c5fbc25c9d447c8f32b484ab0340"
+  "gitHead": "2d8091212ef354336c03e346d6fd49b6b335a780"
 }