mm_cachebase 1.9.1 → 1.9.3

package/eslint.config.js

@@ -0,0 +1,211 @@
+'use strict';
+
+const namingConventionPlugin = require('mm_eslint');
+
+/**
+ * 基于个人规则的ESLint配置
+ * 符合最新ESLint Flat Config格式
+ */
+
+module.exports = [
+  {
+    files: ['**/*.js'],
+    plugins: {
+      'naming-convention': namingConventionPlugin,
+      'jsdoc': require('eslint-plugin-jsdoc')
+    },
+    languageOptions: {
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+      parserOptions: {
+        ecmaVersion: 'latest',
+        sourceType: 'module'
+      }
+    },
+    
+    // 命名规范规则 - 由自定义插件处理
+    rules: {
+      // 自定义命名规范插件规则（优先使用）
+      'naming-convention/class-name': 'error',
+      'naming-convention/function-name': 'error',
+      'naming-convention/method-name': 'error',
+      'naming-convention/variable-name': 'warn',
+      'naming-convention/constant-name': 'error',
+      'naming-convention/private-method-naming': 'warn',
+      'naming-convention/private-variable-naming': 'warn',
+      'naming-convention/param-name': 'warn',
+      'naming-convention/property-name': 'warn',
+      'naming-convention/instance-property': 'warn',
+      
+      // 禁用与命名规范插件冲突的默认规则
+      'camelcase': 'off',
+      'id-match': 'off',
+      'new-cap': 'off',
+      'id-length': 'off',
+      'id-denylist': 'off',
+      'id-blacklist': 'off'
+    }
+  },
+  
+  {
+    // 代码风格规则
+    rules: {
+      // 最大行长度100字符
+      'max-len': ['error', {
+        code: 100,
+        ignoreComments: true,
+        ignoreUrls: true,
+        ignoreStrings: true,
+        ignoreTemplateLiterals: true
+      }],
+      
+      // 缩进2空格
+      'indent': ['error', 2, {
+        SwitchCase: 1,
+        VariableDeclarator: 1,
+        outerIIFEBody: 1,
+        MemberExpression: 1,
+        FunctionDeclaration: { parameters: 1, body: 1 },
+        FunctionExpression: { parameters: 1, body: 1 },
+        CallExpression: { arguments: 1 },
+        ArrayExpression: 1,
+        ObjectExpression: 1,
+        ImportDeclaration: 1,
+        flatTernaryExpressions: false,
+        ignoreComments: false
+      }],
+      
+      // 单引号
+      'quotes': ['error', 'single', {
+        avoidEscape: true,
+        allowTemplateLiterals: true
+      }],
+      
+      // 禁止制表符
+      'no-tabs': 'error',
+      
+      // 行尾分号
+      'semi': ['error', 'always'],
+      
+      // 逗号风格
+      'comma-style': ['error', 'last'],
+      
+      // 逗号后必须有空格，逗号前不能有空格
+      'comma-spacing': ['error', {
+        before: false,
+        after: true
+      }]
+    }
+  },
+  
+  {
+    // 错误处理规则
+    rules: {
+      // 必须进行参数校验
+      'no-unused-vars': ['error', {
+        args: 'all',
+        argsIgnorePattern: '^_',
+        caughtErrors: 'all',
+        caughtErrorsIgnorePattern: '^_',
+        destructuredArrayIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+        ignoreRestSiblings: true
+      }],
+      
+      // 建议使用try-catch
+      'no-unsafe-finally': 'warn',
+      
+      // 禁止直接抛出字符串
+      'no-throw-literal': 'error'
+    }
+  },
+  
+  {
+    // 最佳实践规则
+    rules: {
+      // 优先使用async/await
+      'prefer-promise-reject-errors': 'error',
+      
+      // 避免副作用
+      'no-param-reassign': ['error', {
+        props: true,
+        ignorePropertyModificationsFor: [
+          'acc', // for reduce accumulators
+          'accumulator', // for reduce accumulators
+          'e', // for e.returnvalue
+          'ctx', // for Koa routing
+          'context', // for Koa routing
+          'req', // for Express requests
+          'request', // for Express requests
+          'res', // for Express responses
+          'response', // for Express responses
+          '$scope', // for Angular 1 scopes
+          'staticContext' // for ReactRouter context
+        ]
+      }],
+      
+      // 优先链式编程
+      'prefer-object-spread': 'error',
+      
+      // 优先函数式编程
+      'prefer-arrow-callback': 'error',
+      
+      // 方法长度限制
+      'max-lines-per-function': ['warn', {
+        max: 40,
+        skipBlankLines: true,
+        skipComments: true
+      }],
+      
+      // 复杂度限制
+      'complexity': ['warn', 10]
+    }
+  },
+  
+  {
+    // JSDoc规则
+    rules: {
+      // 要求公开方法有JSDoc注释
+      'jsdoc/require-jsdoc': ['warn', {
+        publicOnly: true,
+        require: {
+          FunctionDeclaration: true,
+          MethodDefinition: true,
+          ClassDeclaration: true,
+          ArrowFunctionExpression: false,
+          FunctionExpression: false
+        }
+      }],
+      
+      // 检查JSDoc语法
+      'jsdoc/check-alignment': 'warn',
+      'jsdoc/check-indentation': 'warn',
+      'jsdoc/check-param-names': 'warn',
+      'jsdoc/check-syntax': 'warn',
+      'jsdoc/check-tag-names': 'warn',
+      'jsdoc/check-types': 'warn',
+      'jsdoc/no-undefined-types': 'warn',
+      'jsdoc/require-description': 'warn',
+      'jsdoc/require-param': 'warn',
+      'jsdoc/require-param-description': 'warn',
+      'jsdoc/require-param-name': 'warn',
+      'jsdoc/require-param-type': 'warn',
+      'jsdoc/require-returns': 'warn',
+      'jsdoc/require-returns-check': 'warn',
+      'jsdoc/require-returns-description': 'warn',
+      'jsdoc/require-returns-type': 'warn',
+      'jsdoc/valid-types': 'warn'
+    }
+  },
+  
+  {
+    // 忽略规则
+    ignores: [
+      'node_modules/**',
+      'dist/**',
+      'build/**',
+      'coverage/**',
+      '*.min.js'
+    ]
+  }
+];

package/index.js

@@ -11,10 +11,10 @@ class CacheBase extends Base {
 	/**
 	 * 默认配置静态变量
 	 */
-	static default_config = {
+	static config = {
 		enabled: true,
 		persist: true,
-		file_path: './test_cache/undefined.cache.json',
+		file_path: './cache/base.json',
 		debug: false,
 		auto_save: true,
 		save_interval: 30000,
@@ -28,7 +28,7 @@ class CacheBase extends Base {
 	 * @param {Object} config - 配置对象
 	 */
 	constructor(config = {}) {
-		super(config);
+		super(CacheBase.config);
 		// 存储实际数据
 		this._data = {};
 
@@ -65,9 +65,9 @@ CacheBase.prototype.init = async function() {
 	try {
 		await this._initService();
 		this.is_inited = true;
-		this.logger('info', 'CacheBase service initialized successfully');
+		this.log('info', 'CacheBase service initialized successfully');
 	} catch (error) {
-		this.logger('error', 'Failed to initialize CacheBase service:', error);
+		this.log('error', 'Failed to initialize CacheBase service:', error);
 	}
 };
 
@@ -105,7 +105,7 @@ CacheBase.prototype._initService = async function() {
 		// 设置初始化完成状态
 		this.is_inited = true;
 	} catch (error) {
-		this.logger('error', 'Failed to initialize service:', error);
+		this.log('error', 'Failed to initialize service:', error);
 	}
 };
 
@@ -131,19 +131,19 @@ CacheBase.prototype._loadData = function() {
 		if (this.config.persist && this.config.file_path) {
 			// 使用字符串的原型函数获取完整路径
 			const file_path = this.config.file_path.fullname();
-			$.log.info(`[CacheBase] [_loadData] 尝试加载文件: ${file_path}`);
+			this.log('info', `[_loadData] 尝试加载文件: ${file_path}`);
 
 			if (file_path.hasFile()) {
-				$.log.info(`[CacheBase] [_loadData] 文件存在，开始读取`);
+				this.log('info', `[_loadData] 文件存在，开始读取`);
 				// 使用mm_expand的原型函数读取JSON文件
 				const parsed_data = file_path.loadJson();
-				$.log.info(`[CacheBase] [_loadData] 文件读取成功，解析后的数据:`, Object.keys(parsed_data || {}));
+				this.log('info', `[_loadData] 文件读取成功，解析后的数据:`, Object.keys(parsed_data || {}));
 
 				if (parsed_data && parsed_data.data) {
 					this._data = parsed_data.data || {};
-					$.log.info(`[CacheBase] [_loadData] 数据加载成功，键数量:`, Object.keys(this._data).length);
+					this.log('info', `[_loadData] 数据加载成功，键数量:`, Object.keys(this._data).length);
 				} else {
-					$.log.warn(`[CacheBase] [_loadData] 解析后的数据中没有data字段`);
+					this.log('warn', `[_loadData] 解析后的数据中没有data字段`);
 				}
 
 				if (parsed_data && parsed_data.expires) {
@@ -154,13 +154,13 @@ CacheBase.prototype._loadData = function() {
 					this._types = parsed_data.types || {};
 				}
 			} else {
-				$.log.info(`[CacheBase] [_loadData] 文件不存在: ${file_path}`);
+				this.log('info', `[_loadData] 文件不存在: ${file_path}`);
 			}
 		} else {
-			$.log.info(`[CacheBase] [_loadData] 持久化未启用或文件路径未设置`);
+			this.log('info', `[_loadData] 持久化未启用或文件路径未设置`);
 		}
 	} catch (error) {
-		this.logger('error', '加载数据失败:', error);
+		this.log('error', '加载数据失败:', error);
 	}
 };
 
@@ -170,7 +170,7 @@ CacheBase.prototype._loadData = function() {
 CacheBase.prototype.save = function() {
 	// 检查服务状态
 	if (!this.is_inited || this.is_destroyed) {
-		this.logger('error', 'Service is not initialized or has been destroyed');
+		this.log('error', 'Service is not initialized or has been destroyed');
 		return;
 	}
 
@@ -179,7 +179,7 @@ CacheBase.prototype.save = function() {
 		this._saveData();
 		this.emit('save_after');
 	} catch (error) {
-		this.logger('error', 'Failed to save data:', error);
+		this.log('error', 'Failed to save data:', error);
 	}
 };
 
@@ -207,7 +207,7 @@ CacheBase.prototype._saveData = function() {
 			file_path.saveJson(data_to_save, null, 2);
 		}
 	} catch (error) {
-		this.logger('error', 'Failed to save data:', error);
+		this.log('error', 'Failed to save data:', error);
 	}
 };
 
@@ -250,7 +250,7 @@ CacheBase.prototype.destroy = async function() {
 		// 触发自定义销毁事件
 		this.emit('destroy_after');
 	} catch (error) {
-		this.logger('error', 'Failed to destroy service:', error);
+		this.log('error', 'Failed to destroy service:', error);
 	}
 };
 
@@ -264,7 +264,7 @@ CacheBase.prototype.destroy = async function() {
 CacheBase.prototype.set = function(key, value, ttl) {
 	// 检查服务状态
 	if (!this.is_inited || this.is_destroyed) {
-		this.logger('error', 'Service is not initialized or has been destroyed');
+		this.log('error', 'Service is not initialized or has been destroyed');
 		return false;
 	}
 
@@ -312,7 +312,7 @@ CacheBase.prototype.set = function(key, value, ttl) {
 
 		return true;
 	} catch (error) {
-		this.logger('error', `Failed to set key ${key}:`, error);
+		this.log('error', `Failed to set key ${key}:`, error);
 		return false;
 	}
 };
@@ -325,7 +325,7 @@ CacheBase.prototype.set = function(key, value, ttl) {
 CacheBase.prototype.get = function(key) {
 	// 检查服务状态
 	if (!this.is_inited || this.is_destroyed) {
-		this.logger('error', 'Service is not initialized or has been destroyed');
+		this.log('error', 'Service is not initialized or has been destroyed');
 		return null;
 	}
 
@@ -338,7 +338,7 @@ CacheBase.prototype.get = function(key) {
 
 		return this._data[key];
 	} catch (error) {
-		this.logger('error', `Failed to get key ${key}:`, error);
+		this.log('error', `Failed to get key ${key}:`, error);
 		return null;
 	}
 };
@@ -426,7 +426,7 @@ CacheBase.prototype.del = function(key) {
 
 		return success;
 	} catch (error) {
-		this.logger('error', 'Failed to del:', error);
+		this.log('error', 'Failed to del:', error);
 		return false;
 	}
 };
@@ -451,7 +451,7 @@ CacheBase.prototype.delBatch = function(keys) {
 
 		return deletedCount;
 	} catch (error) {
-		this.logger('error', 'Failed to delBatch:', error);
+		this.log('error', 'Failed to delBatch:', error);
 		return 0;
 	}
 };
@@ -470,7 +470,7 @@ CacheBase.prototype.exists = function(key) {
 
 		return key in this._data;
 	} catch (error) {
-		this.logger('error', `Failed to check key ${key}:`, error);
+		this.log('error', `Failed to check key ${key}:`, error);
 		return false;
 	}
 };
@@ -496,7 +496,7 @@ CacheBase.prototype.clearExpire = function() {
 			}
 		}
 	} catch (error) {
-		this.logger('error', 'Failed to clear expired data:', error);
+		this.log('error', 'Failed to clear expired data:', error);
 	}
 };
 
@@ -588,7 +588,7 @@ CacheBase.prototype.expire = function(key, seconds) {
 
 		return true;
 	} catch (error) {
-		this.logger('error', `Failed to set expire for key ${key}:`, error);
+		this.log('error', `Failed to set expire for key ${key}:`, error);
 		return false;
 	}
 };
@@ -645,7 +645,7 @@ CacheBase.prototype.hset = function(key, field, value) {
 
 		return is_new_field ? 1 : 0; // 返回1表示新增，0表示更新
 	} catch (error) {
-		this.logger('error', `Failed to hset for key ${key}:`, error);
+		this.log('error', `Failed to hset for key ${key}:`, error);
 		return 0;
 	}
 };
@@ -676,7 +676,7 @@ CacheBase.prototype.hget = function(key, field) {
 
 		return this._data[key][field];
 	} catch (error) {
-		this.logger('error', `Failed to hget for key ${key}:`, error);
+		this.log('error', `Failed to hget for key ${key}:`, error);
 	}
 };
 
@@ -716,7 +716,7 @@ CacheBase.prototype.hgetall = function(key) {
 			...this._data[key]
 		};
 	} catch (error) {
-		this.logger('error', `Failed to hgetall for key ${key}:`, error);
+		this.log('error', `Failed to hgetall for key ${key}:`, error);
 		return {};
 	}
 };
@@ -800,7 +800,7 @@ CacheBase.prototype.hdel = function(key, field) {
 			field,
 			error
 		});
-		this.logger('error', 'Failed to hdel:', error);
+		this.log('error', 'Failed to hdel:', error);
 		return false;
 	}
 };
@@ -859,7 +859,7 @@ CacheBase.prototype.incr = function(key, seconds = 0) {
 	try {
 		// 参数验证
 		if (!key || typeof key !== 'string') {
-			$.log.error('[cachebase] incr参数错误: key必须是非空字符串');
+			this.log('error', 'incr参数错误: key必须是非空字符串');
 			return 0;
 		}
 
@@ -906,7 +906,7 @@ CacheBase.prototype.incr = function(key, seconds = 0) {
 			ttl: seconds,
 			error
 		});
-		$.log.error('[cachebase] incr操作失败:', error);
+		this.log('error', 'incr操作失败:', error);
 		return 0;
 	}
 };
@@ -959,7 +959,7 @@ CacheBase.prototype.decr = function(key, seconds = 0) {
 	try {
 		// 参数验证
 		if (!key || typeof key !== 'string') {
-			$.log.error('[cachebase] decr参数错误: key必须是非空字符串');
+			this.log('error', 'decr参数错误: key必须是非空字符串');
 			return 0;
 		}
 
@@ -1006,7 +1006,7 @@ CacheBase.prototype.decr = function(key, seconds = 0) {
 			ttl: seconds,
 			error
 		});
-		$.log.error('[cachebase] decr操作失败:', error);
+		this.log('error', 'decr操作失败:', error);
 		return 0;
 	}
 };
@@ -1068,7 +1068,7 @@ CacheBase.prototype.addInt = function(key, value, seconds = 0) {
 			ttl: seconds,
 			error
 		});
-		$.log.error('[cachebase] addInt操作失败:', error);
+		this.log('error', 'addInt操作失败:', error);
 		return 0;
 	}
 };
@@ -1107,7 +1107,7 @@ CacheBase.prototype.append = function(key, append) {
 
 		return current.length;
 	} catch (error) {
-		this.logger('error', `Failed to append for key ${key}:`, error);
+		this.log('error', `Failed to append for key ${key}:`, error);
 		return null;
 	}
 };
@@ -1142,7 +1142,7 @@ CacheBase.prototype.strlen = function(key) {
 
 		return this._data[key].length;
 	} catch (error) {
-		this.logger('error', `Failed to strlen for key ${key}:`, error);
+		this.log('error', `Failed to strlen for key ${key}:`, error);
 		return 0;
 	}
 };
@@ -1175,7 +1175,7 @@ CacheBase.prototype.flushdb = function() {
 
 		return true;
 	} catch (error) {
-		this.logger('error', 'Failed to flushdb:', error);
+		this.log('error', 'Failed to flushdb:', error);
 		return false;
 	}
 };
@@ -1198,7 +1198,7 @@ CacheBase.prototype.keys = function(pattern) {
 		}
 		return result;
 	} catch (error) {
-		this.logger('error', 'Failed to get keys:', error);
+		this.log('error', 'Failed to get keys:', error);
 		return [];
 	}
 };
@@ -1239,7 +1239,7 @@ CacheBase.prototype.dbsize = function() {
 		}
 		return count;
 	} catch (error) {
-		this.logger('error', 'Failed to get dbsize:', error);
+		this.log('error', 'Failed to get dbsize:', error);
 		return 0;
 	}
 };
@@ -1255,7 +1255,7 @@ CacheBase.prototype.incrbyfloat = function(key, value = 1.0, seconds = 0) {
 	try {
 		// 参数验证
 		if (!key || typeof key !== 'string' || typeof value !== 'number') {
-			$.log.error('[cachebase] incrbyfloat参数错误: key必须是非空字符串，value必须是数字');
+			this.log('error', 'incrbyfloat参数错误: key必须是非空字符串，value必须是数字');
 			return 0;
 		}
 
@@ -1305,7 +1305,7 @@ CacheBase.prototype.incrbyfloat = function(key, value = 1.0, seconds = 0) {
 			ttl: seconds,
 			error
 		});
-		$.log.error('[cachebase] incrbyfloat操作失败:', error);
+		this.log('error', 'incrbyfloat操作失败:', error);
 		return 0;
 	}
 };
@@ -1332,7 +1332,7 @@ CacheBase.prototype.getset = function(key, value, expire) {
 
 		return oldValue;
 	} catch (error) {
-		this.logger('error', 'Failed to getset:', error);
+		this.log('error', 'Failed to getset:', error);
 		return null;
 	}
 };
@@ -1348,8 +1348,7 @@ CacheBase.prototype.add = function(key, value, maxAge = 0) {
 	try {
 		// 参数验证
 		if (!key || typeof key !== 'string') {
-			$.log.error('[cachebase] add参数错误: key必须是非空字符串');
-			return false;
+			throw new TypeError('add参数错误: key必须是非空字符串');
 		}
 
 		// 触发前置事件
@@ -1362,7 +1361,7 @@ CacheBase.prototype.add = function(key, value, maxAge = 0) {
 		this.emit('add_before', beforeEventData);
 
 		if (beforeEventData.cancel) {
-			$.log.debug(`[cachebase] add操作被事件处理器取消 [${key}]`);
+			this.log('debug', `add操作被事件处理器取消 [${key}]`);
 			return false;
 		}
 
@@ -1403,8 +1402,8 @@ CacheBase.prototype.add = function(key, value, maxAge = 0) {
 			success: true
 		});
 		return true;
-	} catch (error) {
-		$.log.error(`[cachebase] add操作失败 [${key}]:`, error);
+		} catch (error) {
+		this.log('error', `add操作失败 [${key}]:`, error);
 		this.emit('add_error', {
 			key,
 			value,
@@ -1426,8 +1425,7 @@ CacheBase.prototype.addFloat = function(key, num, seconds = 0) {
 	try {
 		// 参数验证
 		if (!key || typeof key !== 'string' || typeof num !== 'number') {
-			$.log.error('[cachebase] addFloat参数错误: key必须是非空字符串，num必须是数字');
-			return 0;
+			throw new TypeError('addFloat参数错误: key必须是非空字符串，num必须是数字');
 		}
 
 		this.emit('addFloat_before', {
@@ -1469,7 +1467,7 @@ CacheBase.prototype.addFloat = function(key, num, seconds = 0) {
 			ttl: seconds,
 			error
 		});
-		$.log.error('[cachebase] addFloat操作失败:', error);
+		this.log('error', 'addFloat操作失败:', error);
 		return 0;
 	}
 };
@@ -1485,8 +1483,7 @@ CacheBase.prototype.addStr = function(key, value, seconds = 0) {
 	try {
 		// 参数验证
 		if (!key || typeof key !== 'string' || typeof value !== 'string') {
-			$.log.error('[cachebase] addStr参数错误: key和value必须是非空字符串');
-			return 0;
+			throw new TypeError('addStr参数错误: key和value必须是非空字符串');
 		}
 
 		this.emit('addStr_before', {
@@ -1530,7 +1527,7 @@ CacheBase.prototype.addStr = function(key, value, seconds = 0) {
 			ttl: seconds,
 			error
 		});
-		$.log.error('[cachebase] addStr操作失败:', error);
+		this.log('error', 'addStr操作失败:', error);
 		return 0;
 	}
 };
@@ -1544,23 +1541,12 @@ CacheBase.prototype.mset = function(...args) {
 	try {
 		// 参数验证 - 特别处理null参数情况
 		if (args.length === 1 && args[0] === null) {
-			const error = new Error('mset参数必须是对象');
-			this.emit('mset_error', {
-				args,
-				error
-			});
-			throw error;
+			throw new TypeError('参数数量必须为偶数');
 		}
 
 		// 常规参数验证
 		if (args.length === 0 || args.length % 2 !== 0) {
-			$.log.error('[CacheBase] [mset] 参数错误: 参数数量必须为偶数');
-			const error = new Error('参数数量必须为偶数');
-			this.emit('mset_error', {
-				args,
-				error
-			});
-			throw error;
+			throw new TypeError('参数数量必须为偶数');
 		}
 
 		// 将参数列表转换为键值对对象
@@ -1570,13 +1556,7 @@ CacheBase.prototype.mset = function(...args) {
 			const value = args[i + 1];
 
 			if (typeof key !== 'string' || !key) {
-				$.log.error(`[CacheBase] [mset] 参数错误: 键 ${key} 必须是非空字符串`);
-				const error = new Error('键必须是非空字符串');
-				this.emit('mset_error', {
-					args,
-					error
-				});
-				throw error;
+				throw new TypeError('键必须是非空字符串');
 			}
 
 			keyValuePairs[key] = value;
@@ -1590,7 +1570,7 @@ CacheBase.prototype.mset = function(...args) {
 		this.emit('mset_before', beforeEventData);
 
 		if (beforeEventData.cancel) {
-			$.log.debug('[CacheBase] [mset] 操作被事件处理器取消');
+			this.log('debug', '[mset] 操作被事件处理器取消');
 			return false;
 		}
 
@@ -1626,7 +1606,7 @@ CacheBase.prototype.mset = function(...args) {
 			args,
 			error
 		});
-		this.logger('error', 'Failed to mset:', error);
+		this.log('error', 'Failed to mset:', error);
 		return false;
 	}
 };
@@ -1699,7 +1679,7 @@ CacheBase.prototype.ttl = function(key, seconds) {
 			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);
+			this.log('error', errorMsg, error);
 			return arguments.length > 1 && seconds !== undefined ? false : -2;
 		}
 };
@@ -1751,7 +1731,7 @@ CacheBase.prototype.persist = function(key) {
 
 		return false; // 键没有设置过期时间
 	} catch (error) {
-		this.logger('error', `Failed to persist key ${key}:`, error);
+		this.log('error', `Failed to persist key ${key}:`, error);
 		return false;
 	}
 };
@@ -1780,7 +1760,7 @@ CacheBase.prototype.mget = function(keys) {
 
 		return results;
 	} catch (error) {
-		this.logger('error', 'Failed to mget:', error);
+		this.log('error', 'Failed to mget:', error);
 		return [];
 	}
 };
@@ -1809,7 +1789,7 @@ CacheBase.prototype.dispose = function() {
 
 		return true;
 	} catch (error) {
-		this.logger('error', 'Failed to dispose:', error);
+		this.log('error', 'Failed to dispose:', error);
 		return false;
 	}
 };
@@ -1878,7 +1858,7 @@ CacheBase.prototype.setForList = async function(key, value, maxAge = 0) {
 		this.emit('setForList_before', beforeEventData);
 
 		if (beforeEventData.cancel) {
-			$.log.debug(`[CacheBase] setForList操作被事件处理器取消 [${key}]`);
+			this.log('debug', `setForList操作被事件处理器取消 [${key}]`);
 			return 0;
 		}
 
@@ -1921,7 +1901,7 @@ CacheBase.prototype.setForList = async function(key, value, maxAge = 0) {
 			maxAge,
 			error
 		});
-		$.log.error('[CacheBase] setForList操作失败:', error);
+		this.log('error', 'setForList操作失败:', error);
 		return 0;
 	}
 };
@@ -1953,7 +1933,7 @@ CacheBase.prototype.addForList = async function(key, value, maxAge = 0) {
 		this.emit('addForList_before', beforeEventData);
 
 		if (beforeEventData.cancel) {
-			$.log.debug(`[CacheBase] addForList操作被事件处理器取消 [${key}]`);
+			this.log('debug', `addForList操作被事件处理器取消 [${key}]`);
 			return 0;
 		}
 
@@ -1998,7 +1978,7 @@ CacheBase.prototype.addForList = async function(key, value, maxAge = 0) {
 			maxAge,
 			error
 		});
-		$.log.error('[CacheBase] addForList操作失败:', error);
+		this.log('error', 'addForList操作失败:', error);
 		return 0;
 	}
 };
@@ -2028,7 +2008,7 @@ CacheBase.prototype.hasForList = async function(key, value) {
 		this.emit('hasForList_before', beforeEventData);
 
 		if (beforeEventData.cancel) {
-			$.log.debug(`[CacheBase] hasForList操作被事件处理器取消 [${key}]`);
+			this.log('debug', `hasForList操作被事件处理器取消 [${key}]`);
 			return false;
 		}
 
@@ -2062,7 +2042,7 @@ CacheBase.prototype.hasForList = async function(key, value) {
 			value,
 			error
 		});
-		$.log.error('[CacheBase] hasForList操作失败:', error);
+		this.log('error', 'hasForList操作失败:', error);
 		return false;
 	}
 };
@@ -2091,7 +2071,7 @@ CacheBase.prototype.getForList = async function(key, start = 0, stop = -1) {
 		this.emit('getForList_before', beforeEventData);
 
 		if (beforeEventData.cancel) {
-			$.log.debug(`[CacheBase] getForList操作被事件处理器取消 [${key}]`);
+			this.log('debug', `getForList操作被事件处理器取消 [${key}]`);
 			return [];
 		}
 
@@ -2135,7 +2115,7 @@ CacheBase.prototype.getForList = async function(key, start = 0, stop = -1) {
 			stop,
 			error
 		});
-		$.log.error('[CacheBase] getForList操作失败:', error);
+		this.log('error', 'getForList操作失败:', error);
 		return [];
 	}
 };
@@ -2160,7 +2140,7 @@ CacheBase.prototype.clearForList = async function(key) {
 		this.emit('clearForList_before', beforeEventData);
 
 		if (beforeEventData.cancel) {
-			$.log.debug(`[CacheBase] clearForList操作被事件处理器取消 [${key}]`);
+			this.log('debug', `clearForList操作被事件处理器取消 [${key}]`);
 			return false;
 		}
 
@@ -2208,7 +2188,7 @@ CacheBase.prototype.clearForList = async function(key) {
 			key,
 			error
 		});
-		$.log.error('[CacheBase] clearForList操作失败:', error);
+		this.log('error', 'clearForList操作失败:', error);
 		return false;
 	}
 };
@@ -2272,7 +2252,7 @@ CacheBase.prototype.hmset = function(key, obj) {
 				obj,
 				error
 			});
-			this.logger('error', 'Failed to hmset:', error);
+			this.log('error', 'Failed to hmset:', error);
 			resolve(false);
 		}
 	});
@@ -2319,7 +2299,7 @@ CacheBase.prototype.hmget = function(key, fields) {
 				fields,
 				error
 			});
-			this.logger('error', 'Failed to hmget:', error);
+			this.log('error', 'Failed to hmget:', error);
 			resolve([]);
 		}
 	});
@@ -2358,15 +2338,20 @@ CacheBase.prototype.hlen = function(key) {
 				key,
 				error
 			});
-			this.logger('error', 'Failed to hlen:', error);
+			this.log('error', 'Failed to hlen:', error);
 			resolve(0);
 		}
 	});
 };
 
-// 导出类
-exports.CacheBase = CacheBase;
-exports.cachebaseAdmin = function(scope, dir) {
+
+/**
+ * @description CacheBase管理器，用于创建缓存
+ * @param {String} scope 作用域
+ * @param {Object} config 配置参数
+ * @return {Object} 返回一个CacheBase类实例
+ */
+function cachebaseAdmin(scope, config) {
 	if (!global.$) {
 		global.$ = {};
 	}
@@ -2381,11 +2366,18 @@ exports.cachebaseAdmin = function(scope, dir) {
 	}
 	var obj = global.$.pool.cachebase[scope];
 	if (!obj) {
-		const config = {
-			file_path: dir ? './cachebase_' + scope + '.json' : '/cache/cachebase_' + scope + '.json'
+		const dbConfig = {
+			file_path: config && config.dir ? './cachebase_' + scope + '.json' : '/cache/cachebase_' + scope + '.json',
+			...(typeof config === 'object' && config ? config : {})
 		};
-		global.$.pool.cachebase[scope] = new CacheBase(config);
+		global.$.pool.cachebase[scope] = new CacheBase(dbConfig);
 		obj = global.$.pool.cachebase[scope];
 	}
 	return obj;
+}
+
+// 导出类
+module.exports = {
+	CacheBase,
+	cachebaseAdmin,
 };

package/package.json

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

package/test.js

@@ -1,4 +1,4 @@
-const { CacheBase, cachebase_admin } = require('./index.js');
+const { CacheBase, cachebaseAdmin } = require('./index.js');
 
 class TestRunner {
   constructor() {
@@ -48,9 +48,9 @@ async function test() {
     
     // 测试基础方法
     $.log.debug('[CacheBase] \n========== 测试基础方法 ==========');
-    const cache = new CacheBase();
     
     await runner.runTest('set和get方法', async () => {
+      const cache = new CacheBase({ file_path: './test_cache/test_set_get.cache.json' });
       await cache.set('key1', 'value1');
       const value = await cache.get('key1');
       if (value !== 'value1') {
@@ -59,6 +59,7 @@ async function test() {
     });
     
     await runner.runTest('del方法', async () => {
+      const cache = new CacheBase({ file_path: './test_cache/test_del.cache.json' });
       await cache.set('key2', 'value2');
       const deleted = await cache.del('key2');
       if (deleted !== true) {
@@ -71,6 +72,7 @@ async function test() {
     });
     
     await runner.runTest('exists/has方法', async () => {
+      const cache = new CacheBase({ file_path: './test_cache/test_exists_has.cache.json' });
       await cache.set('key3', 'value3');
       const exists = await cache.exists('key3');
       if (exists !== true) {
@@ -83,7 +85,10 @@ async function test() {
     });
     
     await runner.runTest('keys方法', async () => {
-      await cache.clear();
+      const cache = new CacheBase({ 
+        persist: true,
+        file_path: './test_cache/test_keys.cache.json' 
+      });
       await cache.set('key4', 'value4');
       await cache.set('key5', 'value5');
       const keys = await cache.keys();
@@ -97,6 +102,12 @@ async function test() {
     });
     
     await runner.runTest('dbsize方法', async () => {
+      const cache = new CacheBase({ 
+        persist: true,
+        file_path: './test_cache/test_dbsize.cache.json' 
+      });
+      await cache.set('key4', 'value4');
+      await cache.set('key5', 'value5');
       const size = await cache.dbsize();
       if (size !== 2) {
         throw new Error(`dbsize失败，预期: 2, 实际: ${size}`);
@@ -104,6 +115,8 @@ async function test() {
     });
     
     await runner.runTest('getset方法', async () => {
+      const cache = new CacheBase({ file_path: './test_cache/test_getset.cache.json' });
+      await cache.set('key4', 'value4');
       const oldValue = await cache.getset('key4', 'newvalue4');
       if (oldValue !== 'value4') {
         throw new Error(`getset失败，预期旧值: value4, 实际: ${oldValue}`);
@@ -115,6 +128,11 @@ async function test() {
     });
     
     await runner.runTest('flushdb/clear方法', async () => {
+      const cache = new CacheBase({ 
+        persist: true,
+        file_path: './test_cache/test_flushdb.cache.json' 
+      });
+      await cache.set('key6', 'value6');
       let result = await cache.clear();
       if (result !== true) {
         throw new Error(`flushdb失败，预期: true, 实际: ${result}`);
@@ -125,7 +143,7 @@ async function test() {
       }
       
       // 测试clear方法（兼容）
-      await cache.set('key6', 'value6');
+      await cache.set('key7', 'value7');
       result = await cache.clear();
       if (result !== true) {
         throw new Error(`clear失败，预期: true, 实际: ${result}`);
@@ -138,7 +156,7 @@ async function test() {
     
     // 测试哈希表方法
     $.log.debug('[CacheBase] \n========== 测试哈希表方法 ==========');
-    const hashCache = new CacheBase();
+    const hashCache = new CacheBase({ file_path: './test_cache/test_hash.cache.json' });
     
     await runner.runTest('hset和hget方法', async () => {
       const result1 = await hashCache.hset('hash1', 'field1', 'value1');
@@ -184,7 +202,7 @@ async function test() {
     
     // 测试批量操作
     $.log.debug('[CacheBase] \n========== 测试批量操作 ==========');
-    const batchCache = new CacheBase();
+    const batchCache = new CacheBase({ file_path: './test_cache/test_batch.cache.json' });
     
     await runner.runTest('mset方法', async () => {
       const result = await batchCache.mset('key7', 'value7', 'key8', 'value8');
@@ -207,7 +225,7 @@ async function test() {
     
     // 测试过期时间
     $.log.debug('[CacheBase] \n========== 测试过期时间 ==========');
-    const expireCache = new CacheBase();
+    const expireCache = new CacheBase({ file_path: './test_cache/test_expire.cache.json' });
     
     await runner.runTest('set带过期时间', async () => {
       await expireCache.set('expire1', 'value1', 1); // 1秒过期
@@ -256,7 +274,7 @@ async function test() {
     
     // 测试数值操作
     $.log.debug('[CacheBase] \n========== 测试数值操作 ==========');
-    const numCache = new CacheBase();
+    const numCache = new CacheBase({ file_path: './test_cache/test_num.cache.json' });
     
     await runner.runTest('incr方法', async () => {
       const result1 = await numCache.incr('counter');
@@ -358,7 +376,7 @@ async function test() {
     
     // 测试字符串操作
     $.log.debug('[CacheBase] \n========== 测试字符串操作 ==========');
-    const strCache = new CacheBase();
+    const strCache = new CacheBase({ file_path: './test_cache/test_str.cache.json' });
     
     await runner.runTest('append方法', async () => {
       await strCache.set('str', 'hello');
@@ -398,7 +416,7 @@ async function test() {
     
     // 测试事件触发
     $.log.debug('[CacheBase] \n========== 测试事件触发 ==========');
-    const eventCache = new CacheBase();
+    const eventCache = new CacheBase({ file_path: './test_cache/test_event.cache.json' });
     
     await runner.runTest('set事件触发', async () => {
       return new Promise(async (resolve, reject) => {
@@ -431,7 +449,7 @@ async function test() {
     await runner.runTest('error事件触发', async () => {
       return new Promise(async (resolve, reject) => {
         eventCache.once('mset_error', (data) => {
-          if (data.error && data.error.message.includes('必须是对象')) {
+          if (data.error && data.error.message.includes('参数数量必须为偶数')) {
             resolve();
           } else {
             reject(new Error('mset_error事件触发但消息不正确'));
@@ -453,21 +471,24 @@ async function test() {
     // 测试管理功能
     $.log.debug('[CacheBase] \n========== 测试管理功能 ==========');
     
-    await runner.runTest('cachebase_admin创建实例', async () => {
-      const cache1 = cachebase_admin('test_scope');
-      const cache2 = cachebase_admin('test_scope');
+    await runner.runTest('cachebaseAdmin创建实例', async () => {
+      const cache1 = cachebaseAdmin('test_scope');
+      const cache2 = cachebaseAdmin('test_scope');
       if (cache1 !== cache2) {
-        throw new Error('cachebase_admin应返回相同实例但没有');
+        throw new Error('cachebaseAdmin应返回相同实例但没有');
       }
       
-      const cache3 = cachebase_admin('another_scope');
+      const cache3 = cachebaseAdmin('another_scope');
       if (cache1 === cache3) {
-        throw new Error('cachebase_admin应返回不同作用域的不同实例但没有');
+        throw new Error('cachebaseAdmin应返回不同作用域的不同实例但没有');
       }
     });
     
     await runner.runTest('dispose方法', async () => {
-      const disposeCache = new CacheBase();
+      const disposeCache = new CacheBase({ 
+        persist: true,
+        file_path: './test_cache/test_dispose.cache.json' 
+      });
       await disposeCache.set('key_to_dispose', 'value');
       disposeCache.dispose();