mm_cachebase 2.0.2 → 2.0.4

package/index.js

@@ -1925,6 +1925,12 @@ CacheBase.prototype.add = async function (key, value, seconds = 0) {
  * @returns {Promise<Boolean>} 成功返回true，失败返回false
  */
 CacheBase.prototype.mset = async function (obj, seconds = 0) {
+	// 检查服务状态
+	if (!this.is_inited || this.is_destroyed) {
+		this.log('error', 'Service is not initialized or has been destroyed');
+		return false;
+	}
+
 	try {
 		// 参数验证：必须是对象
 		if (!obj || typeof obj !== 'object' || Array.isArray(obj)) {
@@ -1949,12 +1955,16 @@ CacheBase.prototype.mset = async function (obj, seconds = 0) {
 			seconds: finalSeconds
 		} = ctx;
 
-		// 批量设置键值对
-		for (const [key, value] of Object.entries(finalKeyValuePairs)) {
+		// 先校验所有键的合法性，避免批量写入中途失败导致部分写入（保证原子性）
+		const entries = Object.entries(finalKeyValuePairs);
+		for (const [key] of entries) {
 			if (typeof key !== 'string' || !key) {
 				throw new TypeError('键必须是非空字符串');
 			}
+		}
 
+		// 批量设置键值对
+		for (const [key, value] of entries) {
 			// 检查键是否过期
 			if (this._isExpired(key)) {
 				await this.del(key);
@@ -1979,7 +1989,12 @@ CacheBase.prototype.mset = async function (obj, seconds = 0) {
 		return true;
 	} catch (error) {
 		this.emit('mset:error', { keyValuePairs: obj, error });
-		this.log('error', 'Failed to mset:', error);
+		// 参数校验类错误属预期内，用 debug 级别避免误导；运行时错误保留 error 级别
+		if (error instanceof TypeError) {
+			this.log('debug', `[mset] 参数错误: ${error.message}`);
+		} else {
+			this.log('error', 'Failed to mset:', error);
+		}
 		return false;
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_cachebase",
-    "version": "2.0.2",
+    "version": "2.0.4",
     "description": "一个轻量级的本地缓存类库，接口与 mm_redis 完全对齐：全异步API、冒号风格事件、统一签名与返回值，支持字符串、哈希、列表、集合、有序集合、发布订阅。",
     "main": "index.js",
     "scripts": {
@@ -39,6 +39,6 @@
     },
     "homepage": "https://gitee.com/qiuwenwu91/mm_cachebase#readme",
     "dependencies": {
-        "mm_expand": "^2.5.3"
+        "mm_expand": "^2.5.4"
     }
 }

package/test.js

@@ -618,55 +618,54 @@ async function test() {
     const eventCache = new CacheBase({ scope: 'test_event' });
     
     await runner.runTest('set事件触发（冒号风格）', async () => {
-      return new Promise(async (resolve, reject) => {
-        let beforeTriggered = false;
-        let afterTriggered = false;
-        
-        // 事件名改为冒号风格，对齐 mm_redis
-        eventCache.once('set:before', (data) => {
-          if (data.key === 'event_key' && data.value === 'event_value') {
-            beforeTriggered = true;
-          }
-        });
-        
-        eventCache.once('set:after', (data) => {
-          if (data.key === 'event_key' && data.value === 'event_value' && data.success === true) {
-            afterTriggered = true;
-            setTimeout(() => {
-              if (beforeTriggered && afterTriggered) {
-                resolve();
-              } else {
-                reject(new Error('set事件未全部触发'));
-              }
-            }, 10);
-          }
-        });
-        
-        await eventCache.set('event_key', 'event_value');
+      let beforeTriggered = false;
+      let afterTriggered = false;
+
+      // 事件名改为冒号风格，对齐 mm_redis
+      eventCache.once('set:before', (data) => {
+        if (data.key === 'event_key' && data.value === 'event_value') {
+          beforeTriggered = true;
+        }
+      });
+
+      eventCache.once('set:after', (data) => {
+        if (data.key === 'event_key' && data.value === 'event_value' && data.success === true) {
+          afterTriggered = true;
+        }
       });
+
+      await eventCache.set('event_key', 'event_value');
+
+      // 事件为同步触发，等待一个宏任务后校验两个事件均已触发
+      await new Promise(resolve => setTimeout(resolve, 10));
+      if (!beforeTriggered || !afterTriggered) {
+        throw new Error('set事件未全部触发');
+      }
     });
     
     await runner.runTest('error事件触发（冒号风格）', async () => {
-      return new Promise(async (resolve, reject) => {
-        // 事件名改为冒号风格
+      // 事件名改为冒号风格
+      const errorPromise = new Promise((resolve, reject) => {
+        // 超时保护，若事件未触发则失败
+        const timer = setTimeout(() => reject(new Error('mset:error事件未触发')), 100);
         eventCache.once('mset:error', (data) => {
+          clearTimeout(timer);
           if (data.error) {
             resolve();
           } else {
             reject(new Error('mset:error事件触发但数据不正确'));
           }
         });
-        
-        // 传入非法参数触发错误，mset 内部 catch 后返回 false 并触发 mset:error 事件
-        const result = await eventCache.mset(null);
-        if (result !== false) {
-          reject(new Error(`mset应返回false但返回: ${result}`));
-        }
-        // 超时保护，若事件未触发则失败
-        setTimeout(() => {
-          reject(new Error('mset:error事件未触发'));
-        }, 100);
       });
+
+      // 传入非法参数触发错误，mset 内部 catch 后返回 false 并触发 mset:error 事件
+      const result = await eventCache.mset(null);
+      if (result !== false) {
+        throw new Error(`mset应返回false但返回: ${result}`);
+      }
+
+      // 等待 mset:error 事件触发
+      await errorPromise;
     });
     
     // 测试管理功能