fix(ucode): исправление синтаксиса ucode и вызова startsWith в генераторе sing-box (v1.2.28)
This commit is contained in:
@@ -397,7 +397,7 @@ function base_config(settings, service_address, runtime_context) {
|
||||
let dns_hosts = common.list_option(settings, "dns_hosts");
|
||||
for (let host_entry in dns_hosts) {
|
||||
let entry_str = trim(host_entry);
|
||||
if (entry_str == "" || startsWith(entry_str, "#")) continue;
|
||||
if (entry_str == "" || substr(entry_str, 0, 1) == "#") continue;
|
||||
let parts = split(entry_str, /[ \t]+/);
|
||||
if (length(parts) >= 2) {
|
||||
let p1 = parts[0];
|
||||
@@ -407,7 +407,7 @@ function base_config(settings, service_address, runtime_context) {
|
||||
let rr_type = index(ip, ":") != -1 ? "AAAA" : "A";
|
||||
for (let i = 1; i < length(parts); i++) {
|
||||
let d = parts[i];
|
||||
if (d != "" && !startsWith(d, "#")) {
|
||||
if (d != "" && substr(d, 0, 1) != "#") {
|
||||
push(dns_rules, {
|
||||
action: "predefined",
|
||||
domain: [d],
|
||||
|
||||
@@ -951,10 +951,11 @@ function add_dns_server_for_section(config, section) {
|
||||
let detour = dns_action_detour_tag(section);
|
||||
let server_tags = [];
|
||||
|
||||
for (let idx, s_val in servers) {
|
||||
for (let i = 0; i < length(servers); i++) {
|
||||
let s_val = servers[i];
|
||||
let tag_name = length(servers) <= 1
|
||||
? dns_action_server_tag(section_name)
|
||||
: dns_action_server_tag(section_name, idx + 1);
|
||||
: dns_action_server_tag(section_name, i + 1);
|
||||
let server = runtime_dns.server_from_options(
|
||||
tag_name,
|
||||
dns_type,
|
||||
@@ -1002,8 +1003,8 @@ function add_dns_action_rules_for_section(config, section) {
|
||||
if (length(section_servers) <= 1) {
|
||||
push(server_tags, dns_action_server_tag(section_name));
|
||||
} else {
|
||||
for (let idx, s_val in section_servers)
|
||||
push(server_tags, dns_action_server_tag(section_name, idx + 1));
|
||||
for (let i = 0; i < length(section_servers); i++)
|
||||
push(server_tags, dns_action_server_tag(section_name, i + 1));
|
||||
}
|
||||
let server_tag = single_or_array(server_tags);
|
||||
let has_inline_domains = length(domain) > 0 || length(domain_suffix) > 0 ||
|
||||
|
||||
Reference in New Issue
Block a user