mm_config 2.1.1 → 2.1.2

package/base.js

@@ -1,9 +1,3 @@
-const JSON5 = require('json5')
-const {
-	writeFileSync,
-	readFileSync
-} = require('fs');
-
 /**
  * 重够配置，同步保存
  * @param {Object} _config 配置对象
@@ -14,18 +8,21 @@ module.exports = function(_config, _jsonFile) {
 		_jsonFile = this.filename;
 	}
 	if (!_config) {
-		var str = readFileSync(_jsonFile, 'utf-8');
-		if (!str) {
+		try {
+			_config = _jsonFile.loadJson();
+		} catch (error) {
 			_config = {};
-		} else {
-			_config = JSON5.parse(str);
 		}
 	}
 	return new Proxy(_config, {
 		set: function(obj, prop, value) {
 			obj[prop] = value;
 			if (_jsonFile) {
-				writeFileSync(_jsonFile, JSON.stringify(obj, null, 4), 'utf-8');
+				try {
+					_jsonFile.saveJson(obj); // 使用saveJson原型函数，参数为对象和缩进空格数
+				} catch (error) {
+					console.error('保存配置失败:', error);
+				}
 			}
 			return true
 		}

package/index.js

@@ -1,7 +1,4 @@
-const JSON5 = require('json5');
-const { writeFileSync, readFileSync, writeFile } = require('fs');
-const { promisify } = require('util');
-const writeFileAsync = promisify(writeFile);
+require('mm_logs');
 
 /**
  * 配置管理器类，提供同步和异步API
@@ -31,12 +28,9 @@ class ConfigManager {
     // 如果没有提供配置且有文件路径，则从文件加载
     if (!_config && _jsonFile) {
       try {
-        const content = readFileSync(_jsonFile, 'utf-8');
-        if (content) {
-          this.config = this.options.format === 'json5' ? JSON5.parse(content) : JSON.parse(content);
-        }
-      } catch (error) {
-        console.error(`Error loading config from ${_jsonFile}:`, error.message);
+        this.config = _jsonFile.loadJson();
+      } catch(error) {
+        $.log.error(`Error loading config from ${_jsonFile}:`, error.message);
         this.config = {};
       }
     }
@@ -46,16 +40,12 @@ class ConfigManager {
    * 保存配置到文件（同步）
    */
   saveSync() {
-    if (!this.filePath) return;
-    
+    if (!this.filePath) return false;
     try {
-      const content = this.options.pretty 
-        ? JSON.stringify(this.config, null, 4) 
-        : JSON.stringify(this.config);
-      writeFileSync(this.filePath, content, 'utf-8');
+      this.filePath.saveJson(this.config);
       return true;
-    } catch (error) {
-      console.error(`Error saving config to ${this.filePath}:`, error.message);
+    } catch(error) {
+      $.log.error(`Error saving config to ${this.filePath}:`, error.message);
       return false;
     }
   }
@@ -66,21 +56,20 @@ class ConfigManager {
    */
   async saveAsync() {
     if (!this.filePath) return Promise.resolve(true);
-    
+
     // 确保之前的写操作完成
     await this.writePromise;
-    
-    const content = this.options.pretty 
-      ? JSON.stringify(this.config, null, 4) 
-      : JSON.stringify(this.config);
-    
-    this.writePromise = writeFileAsync(this.filePath, content, 'utf-8')
-      .then(() => true)
+
+    this.writePromise = Promise.resolve()
+      .then(() => {
+        this.filePath.saveJson(this.config);
+        return true;
+      })
       .catch(error => {
-        console.error(`Error saving config to ${this.filePath}:`, error.message);
+        $.log.error(`Error saving config to ${this.filePath}:`, error.message);
         return false;
       });
-    
+
     return this.writePromise;
   }
 
@@ -90,11 +79,11 @@ class ConfigManager {
    */
   getProxy() {
     const self = this;
-    
+
     return new Proxy(this.config, {
       set(obj, prop, value) {
         obj[prop] = value;
-        
+
         if (self.options.debounceTime > 0) {
           // 防抖处理
           if (self.writeTimer) {
@@ -107,10 +96,10 @@ class ConfigManager {
           // 无防抖，直接保存
           self.saveSync();
         }
-        
+
         return true;
       },
-      
+
       get(obj, prop) {
         // 提供一些特殊属性访问
         if (prop === '_saveAsync') {
@@ -122,7 +111,7 @@ class ConfigManager {
         if (prop === '_raw') {
           return obj;
         }
-        
+
         return obj[prop];
       }
     });
@@ -134,11 +123,11 @@ class ConfigManager {
    */
   getAsyncProxy() {
     const self = this;
-    
+
     return new Proxy(this.config, {
       set(obj, prop, value) {
         obj[prop] = value;
-        
+
         if (self.options.debounceTime > 0) {
           if (self.writeTimer) {
             clearTimeout(self.writeTimer);
@@ -149,10 +138,10 @@ class ConfigManager {
         } else {
           self.saveAsync();
         }
-        
+
         return true;
       },
-      
+
       get(obj, prop) {
         if (prop === '_saveAsync') {
           return () => self.saveAsync();
@@ -163,7 +152,7 @@ class ConfigManager {
         if (prop === '_raw') {
           return obj;
         }
-        
+
         return obj[prop];
       }
     });
@@ -182,7 +171,7 @@ function createConfig(_config, _jsonFile, options = {}) {
   if (!_jsonFile && this && this.filename) {
     _jsonFile = this.filename;
   }
-  
+
   const manager = new ConfigManager(_config, _jsonFile, options);
   return manager.getProxy(); // 默认返回同步代理
 }
@@ -199,7 +188,7 @@ async function createConfigAsync(_config, _jsonFile, options = {}) {
   if (!_jsonFile && this && this.filename) {
     _jsonFile = this.filename;
   }
-  
+
   const manager = new ConfigManager(_config, _jsonFile, options);
   return manager.getAsyncProxy();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_config",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "description": "这是超级美眉配置同步器,用于更改配置同步保存为JSON文件",
     "main": "index.js",
     "scripts": {
@@ -26,7 +26,6 @@
     },
     "homepage": "https://gitee.com/qiuwenwu91/mm_config#readme",
     "dependencies": {
-        "json5": "^2.2.3",
-        "mm_expand": "^1.8.4"
+        "mm_logs": "^1.5.1"
     }
 }