node-karin 0.7.0 → 0.7.2

package/lib/adapter/onebot/11/index.js

@@ -208,12 +208,12 @@ export class AdapterOneBot11 {
         const selfUin = this.account.uin;
         const selfNick = this.account.name;
         for (const i of elements) {
-            const content = this.KarinConvertAdapter(i.content);
             const type = 'node';
             if (i.id) {
                 messages.push({ type, data: { id: i.id } });
             }
             else {
+                const content = this.KarinConvertAdapter(i.content);
                 const user_id = String(i.user_id || selfUin);
                 const nickname = String(i.nickname || selfNick);
                 messages.push({ type, data: { user_id, nickname, content } });

package/lib/db/redis_level.d.ts

@@ -10,25 +10,21 @@ export default class RedisLevel {
     get(key: string): Promise<string | null>;
     /**
      * set 设置数据
-     * @param {string} key 键
-     * @param {string} value 值
-     * @param {object} [options] 选项
-     * @param [options.EX] 过期时间 单位秒
-     * @returns {Promise<void>|Error}
+     * @param key 键
+     * @param value 值
+     * @param options 选项
      */
     set(key: string, value: string, options?: {
         EX: number;
     } | undefined): Promise<void>;
     /**
      * del 删除数据
-     * @param {string} key 键
-     * @returns {Promise<void>|Error}
+     * @param key 键
      */
     del(key: string): Promise<void>;
     /**
      * keys 获取所有键
-     * @param {string} [prefix] 前缀
-     * @returns {Promise<string[]>|Error} 键列表
+     * @param prefix 前缀
      */
     keys(prefix?: string): Promise<string[]>;
     /**

package/lib/db/redis_level.js

@@ -89,11 +89,9 @@ export default class RedisLevel {
 
   /**
      * set 设置数据
-     * @param {string} key 键
-     * @param {string} value 值
-     * @param {object} [options] 选项
-     * @param [options.EX] 过期时间 单位秒
-     * @returns {Promise<void>|Error}
+     * @param key 键
+     * @param value 值
+     * @param options 选项
      */
   async set (key, value, options) {
     if (options && options.EX) {
@@ -104,8 +102,7 @@ export default class RedisLevel {
 
   /**
      * del 删除数据
-     * @param {string} key 键
-     * @returns {Promise<void>|Error}
+     * @param key 键
      */
   async del (key) {
     this.#expireMap.delete(key)
@@ -114,22 +111,28 @@ export default class RedisLevel {
 
   /**
      * keys 获取所有键
-     * @param {string} [prefix] 前缀
-     * @returns {Promise<string[]>|Error} 键列表
+     * @param prefix 前缀
      */
   async keys (prefix = '') {
-    const keys = []
-    for await (const key of this.#level.keys({ gte: prefix, lt: prefix + '\xFF' })) {
-      // Check if the key has expired
+    /** 去掉末尾的* */
+    prefix = prefix.replace(/\*$/, '')
+    const list = await this.#level.keys({ gte: prefix, lt: `${prefix}\xFF` }).all()
+    this.#checkKeys(list)
+    return list
+  }
+
+  /**
+     * 给一个kyes 检查是否过期
+     * @param keys 键数组
+     */
+  async #checkKeys (keys) {
+    for (const key of keys) {
       const expire = this.#expireMap.get(key)
       if (expire && expire < Date.now()) {
         await this.#level.del(key)
         this.#expireMap.delete(key)
-      } else {
-        keys.push(key)
       }
     }
-    return keys
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",