mm_cachebase 1.8.8 → 1.9.0

package/index.js

@@ -1,13 +1,13 @@
 /**
  * CacheBase 是一个通用缓存基类，支持内存缓存和持久化缓存
  * @class CacheBase
- * @extends BaseService
+ * @extends Base
  */
 const {
-	BaseService
-} = require('mm_base_service');
+	Base
+} = require('mm_expand');
 
-class CacheBase extends BaseService {
+class CacheBase extends Base {
 	/**
 	 * 默认配置静态变量
 	 */
@@ -53,6 +53,24 @@ class CacheBase extends BaseService {
 	}
 }
 
+/**
+ * 初始化服务
+ * @returns {Promise<void>}
+ */
+CacheBase.prototype.init = async function() {
+	if (this.is_inited || this.is_destroyed) {
+		return;
+	}
+	
+	try {
+		await this._initService();
+		this.is_inited = true;
+		this.logger('info', 'CacheBase service initialized successfully');
+	} catch (error) {
+		this.logger('error', 'Failed to initialize CacheBase service:', error);
+	}
+};
+
 /**
  * 初始化服务
  * @private
@@ -87,7 +105,7 @@ CacheBase.prototype._initService = async function() {
 		// 设置初始化完成状态
 		this.is_inited = true;
 	} catch (error) {
-		throw new Error('Failed to initialize service: ' + error.message);
+		this.logger('error', 'Failed to initialize service:', error);
 	}
 };
 
@@ -142,8 +160,7 @@ CacheBase.prototype._loadData = function() {
 			$.log.info(`[CacheBase] [_loadData] 持久化未启用或文件路径未设置`);
 		}
 	} catch (error) {
-		$.log.error(`[CacheBase] [_loadData] 加载数据失败:`, error);
-		this.emit('error', new Error('Failed to load data: ' + error.message));
+		this.logger('error', '加载数据失败:', error);
 	}
 };
 
@@ -153,7 +170,7 @@ CacheBase.prototype._loadData = function() {
 CacheBase.prototype.save = function() {
 	// 检查服务状态
 	if (!this.is_inited || this.is_destroyed) {
-		this.emit('error', new Error('Service is not initialized or has been destroyed'));
+		this.logger('error', 'Service is not initialized or has been destroyed');
 		return;
 	}
 
@@ -162,7 +179,7 @@ CacheBase.prototype.save = function() {
 		this._saveData();
 		this.emit('save_after');
 	} catch (error) {
-		this.emit('error', new Error('Failed to save data: ' + error.message));
+		this.logger('error', 'Failed to save data:', error);
 	}
 };
 
@@ -190,7 +207,7 @@ CacheBase.prototype._saveData = function() {
 			file_path.saveJson(data_to_save, null, 2);
 		}
 	} catch (error) {
-		throw new Error('Failed to save data: ' + error.message);
+		this.logger('error', 'Failed to save data:', error);
 	}
 };
 
@@ -233,7 +250,7 @@ CacheBase.prototype.destroy = async function() {
 		// 触发自定义销毁事件
 		this.emit('destroy_after');
 	} catch (error) {
-		this.emit('error', new Error('Failed to destroy service: ' + error.message));
+		this.logger('error', 'Failed to destroy service:', error);
 	}
 };
 
@@ -247,15 +264,16 @@ CacheBase.prototype.destroy = async function() {
 CacheBase.prototype.set = function(key, value, ttl) {
 	// 检查服务状态
 	if (!this.is_inited || this.is_destroyed) {
-		this.emit('error', new Error('Service is not initialized or has been destroyed'));
+		this.logger('error', 'Service is not initialized or has been destroyed');
 		return false;
 	}
 
+	// 参数验证
+	if (!key || typeof key !== 'string') {
+		throw new TypeError('key必须是非空字符串');
+	}
+
 	try {
-		// 参数验证
-		if (!key || typeof key !== 'string') {
-			return false;
-		}
 
 		// 触发操作前事件
 		const event_data = {
@@ -294,7 +312,7 @@ CacheBase.prototype.set = function(key, value, ttl) {
 
 		return true;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to set key ${key}: ${error.message}`));
+		this.logger('error', `Failed to set key ${key}:`, error);
 		return false;
 	}
 };
@@ -307,7 +325,7 @@ CacheBase.prototype.set = function(key, value, ttl) {
 CacheBase.prototype.get = function(key) {
 	// 检查服务状态
 	if (!this.is_inited || this.is_destroyed) {
-		this.emit('error', new Error('Service is not initialized or has been destroyed'));
+		this.logger('error', 'Service is not initialized or has been destroyed');
 		return null;
 	}
 
@@ -320,23 +338,40 @@ CacheBase.prototype.get = function(key) {
 
 		return this._data[key];
 	} catch (error) {
-		this.emit('error', new Error(`Failed to get key ${key}: ${error.message}`));
+		this.logger('error', `Failed to get key ${key}:`, error);
 		return null;
 	}
 };
 
 /**
  * 删除键
- * @param {string} key - 键名
+ * @param {string|Array<string>} key - 键名或键名数组
  * @returns {boolean} 是否成功删除
  */
 CacheBase.prototype.del = function(key) {
-	try {
-		// 参数验证
-		if (!key || typeof key !== 'string') {
-			return false;
+	// 参数验证
+	if (!key) {
+		throw new TypeError('key必须是非空字符串或非空字符串数组');
+	}
+
+	// 如果是单个键，验证是否为非空字符串
+	if (typeof key === 'string') {
+		if (!key) {
+			throw new TypeError('key必须是非空字符串');
 		}
+	}
+	// 如果是数组，验证每个元素是否为非空字符串
+	else if (Array.isArray(key)) {
+		for (const k of key) {
+			if (!k || typeof k !== 'string') {
+				throw new TypeError('key必须是非空字符串或非空字符串数组');
+			}
+		}
+	} else {
+		throw new TypeError('key必须是非空字符串或非空字符串数组');
+	}
 
+	try {
 		// 触发操作前事件
 		const event_data = {
 			key,
@@ -348,30 +383,56 @@ CacheBase.prototype.del = function(key) {
 			return false;
 		}
 
-		// 检查键是否存在
-		if (!(key in this._data)) {
-			return false;
-		}
+		// 使用可能被修改的值
+		const finalKey = event_data.key;
 
-		// 删除键
-		delete this._data[key];
-		delete this._types[key];
-		delete this._expires[key];
+		let success = true;
+		let deleted = [];
+
+		if (Array.isArray(finalKey)) {
+			// 批量删除
+			for (const k of finalKey) {
+				// 检查键是否存在
+				if (k in this._data) {
+					// 删除键
+					delete this._data[k];
+					delete this._types[k];
+					delete this._expires[k];
+					deleted.push(k);
+				} else {
+					success = false;
+				}
+			}
+		} else {
+			// 单个删除
+			// 检查键是否存在
+			if (!(finalKey in this._data)) {
+				return false;
+			}
+
+			// 删除键
+			delete this._data[finalKey];
+			delete this._types[finalKey];
+			delete this._expires[finalKey];
+			deleted.push(finalKey);
+		}
 
 		// 触发操作后事件
 		this.emit('del_after', {
-			key
+			key: finalKey,
+			success,
+			deleted
 		});
 
-		return true;
+		return success;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to del: ${error.message}`));
+		this.logger('error', 'Failed to del:', error);
 		return false;
 	}
 };
 
 /**
- * 批量删除键
+ * 批量删除键（兼容方法，推荐使用del方法）
  * @param {Array} keys - 键名数组
  * @returns {number} 删除的键数量
  */
@@ -390,7 +451,7 @@ CacheBase.prototype.delBatch = function(keys) {
 
 		return deletedCount;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to delBatch: ${error.message}`));
+		this.logger('error', 'Failed to delBatch:', error);
 		return 0;
 	}
 };
@@ -409,7 +470,7 @@ CacheBase.prototype.exists = function(key) {
 
 		return key in this._data;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to check key ${key}: ${error.message}`));
+		this.logger('error', `Failed to check key ${key}:`, error);
 		return false;
 	}
 };
@@ -435,7 +496,7 @@ CacheBase.prototype.clearExpire = function() {
 			}
 		}
 	} catch (error) {
-		this.emit('error', new Error(`Failed to clear expired data: ${error.message}`));
+		this.logger('error', 'Failed to clear expired data:', error);
 	}
 };
 
@@ -494,7 +555,7 @@ CacheBase.prototype.expire = function(key, seconds) {
 			return false;
 		}
 
-		if (!Number.isInteger(seconds) || seconds <= 0) {
+		if (typeof seconds !== 'number' || seconds <= 0) {
 			return false;
 		}
 
@@ -527,7 +588,7 @@ CacheBase.prototype.expire = function(key, seconds) {
 
 		return true;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to set expire for key ${key}: ${error.message}`));
+		this.logger('error', `Failed to set expire for key ${key}:`, error);
 		return false;
 	}
 };
@@ -582,9 +643,9 @@ CacheBase.prototype.hset = function(key, field, value) {
 			success: true
 		});
 
-		return is_new_field ? 1 : 0;
+		return is_new_field ? 1 : 0; // 返回1表示新增，0表示更新
 	} catch (error) {
-		this.emit('error', new Error(`Failed to hset for key ${key}: ${error.message}`));
+		this.logger('error', `Failed to hset for key ${key}:`, error);
 		return 0;
 	}
 };
@@ -599,24 +660,23 @@ CacheBase.prototype.hget = function(key, field) {
 	try {
 		// 参数验证
 		if (!key || typeof key !== 'string' || !field || typeof field !== 'string') {
-			return undefined;
+			return;
 		}
 
 		// 检查是否过期
 		if (this._isExpired(key)) {
 			this.del(key);
-			return undefined;
+			return;
 		}
 
 		// 检查键是否存在且类型正确
 		if (!(key in this._data) || this._types[key] !== 'hash') {
-			return undefined;
+			return;
 		}
 
 		return this._data[key][field];
 	} catch (error) {
-		this.emit('error', new Error(`Failed to hget for key ${key}: ${error.message}`));
-		return undefined;
+		this.logger('error', `Failed to hget for key ${key}:`, error);
 	}
 };
 
@@ -656,7 +716,7 @@ CacheBase.prototype.hgetall = function(key) {
 			...this._data[key]
 		};
 	} catch (error) {
-		this.emit('error', new Error(`Failed to hgetall for key ${key}: ${error.message}`));
+		this.logger('error', `Failed to hgetall for key ${key}:`, error);
 		return {};
 	}
 };
@@ -665,7 +725,7 @@ CacheBase.prototype.hgetall = function(key) {
  * 删除哈希表字段
  * @param {string} key - 哈希表键名
  * @param {string|Array<string>} field - 字段名或字段名数组
- * @returns {boolean} 是否成功删除
+ * @returns {boolean} 删除成功返回true，失败返回false
  */
 CacheBase.prototype.hdel = function(key, field) {
 	try {
@@ -709,18 +769,18 @@ CacheBase.prototype.hdel = function(key, field) {
 
 		// 处理字段参数，支持单个字段或字段数组
 		const fields = Array.isArray(field) ? field : [field];
-		let deleted = false;
+		let deletedCount = 0;
 
 		// 遍历所有字段进行删除
 		for (const f of fields) {
 			if (typeof f === 'string' && f && f in this._data[key]) {
 				delete this._data[key][f];
-				deleted = true;
+				deletedCount++;
 			}
 		}
 
 		// 如果哈希表为空，删除整个键
-		if (deleted && Object.keys(this._data[key]).length === 0) {
+		if (deletedCount > 0 && Object.keys(this._data[key]).length === 0) {
 			delete this._data[key];
 			delete this._types[key];
 			delete this._expires[key];
@@ -730,17 +790,17 @@ CacheBase.prototype.hdel = function(key, field) {
 		this.emit('hdel_after', {
 			key,
 			field,
-			success: deleted
+			success: deletedCount > 0
 		});
 
-		return deleted;
+		return deletedCount > 0;
 	} catch (error) {
 		this.emit('hdel_error', {
 			key,
 			field,
 			error
 		});
-		this.emit('error', new Error(`Failed to hdel: ${error.message}`));
+		this.logger('error', 'Failed to hdel:', error);
 		return false;
 	}
 };
@@ -959,12 +1019,15 @@ CacheBase.prototype.decr = function(key, seconds = 0) {
  * @returns {Promise<number>} - 返回增加后的值
  */
 CacheBase.prototype.addInt = function(key, value, seconds = 0) {
+	// 参数验证
+	if (!key || typeof key !== 'string') {
+		throw new TypeError('key必须是非空字符串');
+	}
+	if (typeof value !== 'number') {
+		throw new TypeError('value必须是数字');
+	}
+	
 	try {
-		// 参数验证
-		if (!key || typeof key !== 'string' || typeof value !== 'number') {
-			$.log.error('[cachebase] addInt参数错误: key必须是非空字符串，value必须是数字');
-			return 0;
-		}
 
 		this.emit('addInt_before', {
 			key,
@@ -1044,7 +1107,7 @@ CacheBase.prototype.append = function(key, append) {
 
 		return current.length;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to append for key ${key}: ${error.message}`));
+		this.logger('error', `Failed to append for key ${key}:`, error);
 		return null;
 	}
 };
@@ -1079,7 +1142,7 @@ CacheBase.prototype.strlen = function(key) {
 
 		return this._data[key].length;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to strlen for key ${key}: ${error.message}`));
+		this.logger('error', `Failed to strlen for key ${key}:`, error);
 		return 0;
 	}
 };
@@ -1112,7 +1175,7 @@ CacheBase.prototype.flushdb = function() {
 
 		return true;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to flushdb: ${error.message}`));
+		this.logger('error', 'Failed to flushdb:', error);
 		return false;
 	}
 };
@@ -1135,7 +1198,7 @@ CacheBase.prototype.keys = function(pattern) {
 		}
 		return result;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to get keys: ${error.message}`));
+		this.logger('error', 'Failed to get keys:', error);
 		return [];
 	}
 };
@@ -1176,7 +1239,7 @@ CacheBase.prototype.dbsize = function() {
 		}
 		return count;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to get dbsize: ${error.message}`));
+		this.logger('error', 'Failed to get dbsize:', error);
 		return 0;
 	}
 };
@@ -1269,7 +1332,7 @@ CacheBase.prototype.getset = function(key, value, expire) {
 
 		return oldValue;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to getset: ${error.message}`));
+		this.logger('error', 'Failed to getset:', error);
 		return null;
 	}
 };
@@ -1563,8 +1626,8 @@ CacheBase.prototype.mset = function(...args) {
 			args,
 			error
 		});
-		this.emit('error', new Error(`Failed to mset: ${error.message}`));
-		throw error;
+		this.logger('error', 'Failed to mset:', error);
+		return false;
 	}
 };
 
@@ -1582,7 +1645,7 @@ CacheBase.prototype.ttl = function(key, seconds) {
 		}
 
 		// 判断是否为设置过期时间模式
-		if (arguments.length > 1) {
+		if (arguments.length > 1 && seconds !== undefined) {
 			// 设置过期时间模式
 			if (typeof seconds !== 'number' || seconds < 0) {
 				return false;
@@ -1633,12 +1696,12 @@ CacheBase.prototype.ttl = function(key, seconds) {
 			return Math.max(0, Math.ceil(remaining / 1000));
 		}
 	} catch (error) {
-		const errorMsg = arguments.length > 1 
-			? `Failed to set ttl for key ${key}: ${error.message}`
-			: `Failed to get ttl for key ${key}: ${error.message}`;
-		this.emit('error', new Error(errorMsg));
-		return arguments.length > 1 ? false : -2;
-	}
+			const errorMsg = arguments.length > 1 && seconds !== undefined 
+				? `Failed to set ttl for key ${key}: ${error.message}`
+				: `Failed to get ttl for key ${key}: ${error.message}`;
+			this.logger('error', errorMsg, error);
+			return arguments.length > 1 && seconds !== undefined ? false : -2;
+		}
 };
 
 /**
@@ -1688,7 +1751,7 @@ CacheBase.prototype.persist = function(key) {
 
 		return false; // 键没有设置过期时间
 	} catch (error) {
-		this.emit('error', new Error(`Failed to persist key ${key}: ${error.message}`));
+		this.logger('error', `Failed to persist key ${key}:`, error);
 		return false;
 	}
 };
@@ -1717,7 +1780,7 @@ CacheBase.prototype.mget = function(keys) {
 
 		return results;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to mget: ${error.message}`));
+		this.logger('error', 'Failed to mget:', error);
 		return [];
 	}
 };
@@ -1746,7 +1809,7 @@ CacheBase.prototype.dispose = function() {
 
 		return true;
 	} catch (error) {
-		this.emit('error', new Error(`Failed to dispose: ${error.message}`));
+		this.logger('error', 'Failed to dispose:', error);
 		return false;
 	}
 };
@@ -1794,7 +1857,7 @@ CacheBase.prototype.setForList = async function(key, value, maxAge = 0) {
 	try {
 		// 参数验证
 		if (!key || typeof key !== 'string') {
-			throw new Error('key必须是非空字符串');
+			return 0;
 		}
 
 		// 确保value是数组
@@ -1859,7 +1922,7 @@ CacheBase.prototype.setForList = async function(key, value, maxAge = 0) {
 			error
 		});
 		$.log.error('[CacheBase] setForList操作失败:', error);
-		throw error;
+		return 0;
 	}
 };
 
@@ -1874,7 +1937,7 @@ CacheBase.prototype.addForList = async function(key, value, maxAge = 0) {
 	try {
 		// 参数验证
 		if (!key || typeof key !== 'string') {
-			throw new Error('key必须是非空字符串');
+			return 0;
 		}
 
 		// 确保value是字符串
@@ -1936,7 +1999,7 @@ CacheBase.prototype.addForList = async function(key, value, maxAge = 0) {
 			error
 		});
 		$.log.error('[CacheBase] addForList操作失败:', error);
-		throw error;
+		return 0;
 	}
 };
 
@@ -2000,7 +2063,7 @@ CacheBase.prototype.hasForList = async function(key, value) {
 			error
 		});
 		$.log.error('[CacheBase] hasForList操作失败:', error);
-		throw error;
+		return false;
 	}
 };
 
@@ -2073,7 +2136,7 @@ CacheBase.prototype.getForList = async function(key, start = 0, stop = -1) {
 			error
 		});
 		$.log.error('[CacheBase] getForList操作失败:', error);
-		throw error;
+		return [];
 	}
 };
 
@@ -2146,7 +2209,7 @@ CacheBase.prototype.clearForList = async function(key) {
 			error
 		});
 		$.log.error('[CacheBase] clearForList操作失败:', error);
-		throw error;
+		return false;
 	}
 };
 
@@ -2209,7 +2272,7 @@ CacheBase.prototype.hmset = function(key, obj) {
 				obj,
 				error
 			});
-			this.emit('error', new Error(`Failed to hmset: ${error.message}`));
+			this.logger('error', 'Failed to hmset:', error);
 			resolve(false);
 		}
 	});
@@ -2256,7 +2319,7 @@ CacheBase.prototype.hmget = function(key, fields) {
 				fields,
 				error
 			});
-			this.emit('error', new Error(`Failed to hmget: ${error.message}`));
+			this.logger('error', 'Failed to hmget:', error);
 			resolve([]);
 		}
 	});
@@ -2295,7 +2358,7 @@ CacheBase.prototype.hlen = function(key) {
 				key,
 				error
 			});
-			this.emit('error', new Error(`Failed to hlen: ${error.message}`));
+			this.logger('error', 'Failed to hlen:', error);
 			resolve(0);
 		}
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_cachebase",
-    "version": "1.8.8",
+    "version": "1.9.0",
     "description": "一个轻量级的本地缓存类库，提供与Redis兼容的API接口，支持过期时间设置、哈希表操作、数值操作、字符串操作等功能，以及完整的事件通知系统和多文件持久化功能。",
     "main": "index.js",
     "scripts": {
@@ -39,6 +39,6 @@
     },
     "homepage": "https://gitee.com/qiuwenwu91/mm_cachebase#readme",
     "dependencies": {
-        "mm_base_service": "^1.0.0"
+        "mm_expand": "^1.9.7"
     }
 }