From 7dd343191670b2efdd3fbba7f01309b2f0453169 Mon Sep 17 00:00:00 2001 From: Xi Xu Date: Thu, 10 Oct 2024 13:42:39 +0800 Subject: [PATCH] Update script.js --- script.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/script.js b/script.js index 4e11357..2ef8d47 100644 --- a/script.js +++ b/script.js @@ -474,10 +474,19 @@ const ruleProviders = { // generate configuration using the above settings function validateConfig(config) { - if (!Array.isArray(config.proxies) && !config["proxy-providers"]) + const proxyCount = Array.isArray(config.proxies) + ? config.proxies.length + : 0; + const proxyProviderCount = + typeof config["proxy-providers"] === "object" && + config["proxy-providers"] !== null + ? Object.keys(config["proxy-providers"]).length + : 0; + if (proxyCount === 0 && proxyProviderCount === 0) { throw new Error( - "The configuration you provide must include either a proxies array or a proxy-providers object." + "the configuration you provide must contain a non-empty proxies array or a proxy-providers object" ); + } } function main(config) { @@ -496,7 +505,8 @@ function main(config) { return config; } catch (error) { console.error( - "An error occurred during configuration generation: " + error + "An error occurred during configuration generation: " + + error.message ); return { error: error.message, originalConfig: config }; }