padavan 2.0.1 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "padavan",
-	"version": "2.0.1",
+	"version": "2.1.0",
 	"private": false,
 	"type": "module",
 	"description": "The core library for interacting with routers running Padavan firmware. Provides a programmatic API for local control via HTTP.",

package/src/index.js

@@ -2,6 +2,7 @@ import { debuglog, inspect } from 'util';
 import jszip from 'jszip';
 import HttpClient from './transport/http.js';
 import GitHubClient from './transport/github.js';
+import { sanitizeObject } from './utils/sanitizers.js';
 import {
 	parsePageInputs, parseNvramOutput, parseLooseJson, normalizeTrafficHistory,
 	extractJsVariable, extractTextareaValue, extractMacsFromTextarea, extractCurrentChannel
@@ -94,7 +95,7 @@ export default class Padavan {
 	 * @type {Promise<any>}
 	 */
 	#commandQueue = Promise.resolve();
-	
+
 	/**
 	 * Кэшированный промис запроса NVRAM.
 	 * @type {Promise<Record<string, string>>|null}
@@ -118,13 +119,16 @@ export default class Padavan {
 	 * @param {Config} config Конфигурация для подключения.
 	 */
 	constructor(config = {}) {
-		this.config = config;
+		const sanitized = sanitizeObject(config, ['credentials', 'logLevel']);
+		if (sanitized.credentials)
+			sanitized.credentials = sanitizeObject(sanitized.credentials, ['host', 'port', 'username', 'password', 'repo', 'branch', 'token']);
+		this.config = sanitized;
 		this.#debugLog = debuglog(LIB_ID);
 		this.#isDebugEnvEnabled = process.env.NODE_DEBUG && new RegExp(`\\b${LIB_ID}\\b`, 'i').test(process.env.NODE_DEBUG);
 		this.#logLevelNumber = LOG_LEVELS[config?.logLevel] || LOG_LEVELS[DEFAULT_LOG_LEVEL];
 		this.#http = new HttpClient(this.config?.credentials, this.log.bind(this));
 		this.#github = new GitHubClient(this.config?.credentials, this.log.bind(this));
-		this.log('debug', 'Padavan instance created with config:', config);
+		this.log('debug', 'Padavan instance created with config:', this.config);
 	};
 
 	/**
@@ -596,11 +600,6 @@ export default class Padavan {
 			const artifact = await this.#github.getLatestArtifact();
 			const toIdMatch = artifact.name.match(/-([0-9a-f]{7,})$/);
 			const toId = toIdMatch ? toIdMatch[1]?.substring(0, 7) : null;
-			console.log({
-				currentFirmware, fromId,
-				artifact,
-				toIdMatch, toId
-			});
 
 			if (!fromId || !toId)
 				throw new Error(`Could not determine firmware versions (current: ${fromId}, latest: ${toId})`);

package/src/utils/sanitizers.js

@@ -0,0 +1,26 @@
+/**
+ * Рекурсивно очищает объект от пустых значений и неразрешенных ключей
+ * @param {Object} obj Исходный объект.
+ * @param {string[]} [allowedKeys] Список разрешенных ключей (если null - разрешены все).
+ * @returns {Object} Очищенный объект.
+ */
+export function sanitizeObject(obj, allowedKeys = null) {
+	if (!obj || typeof obj !== 'object' || Array.isArray(obj))
+		return obj;
+
+	const result = {};
+	for (const [key, value] of Object.entries(obj)) {
+		if (allowedKeys && !allowedKeys.includes(key))
+			continue;
+		if (value === '' || value === null || value === undefined)
+			continue;
+		if (typeof value === 'object' && !Array.isArray(value)) {
+			const cleaned = sanitizeObject(value);
+			if (Object.keys(cleaned).length > 0)
+				result[key] = cleaned;
+		} else
+			result[key] = value;
+	}
+
+	return result;
+};