Исправление оставшихся синтаксических ошибок от скрипта дедупликации (updates.uc, rulesets.uc, constants.uc)
This commit is contained in:
@@ -4,6 +4,19 @@ let fs = require("fs");
|
|||||||
let uci_core = require("core.uci");
|
let uci_core = require("core.uci");
|
||||||
let connections = require("config.connections");
|
let connections = require("config.connections");
|
||||||
const CONFIG_NAME = getenv("TACHYON_CONFIG_NAME") || "tachyon";
|
const CONFIG_NAME = getenv("TACHYON_CONFIG_NAME") || "tachyon";
|
||||||
|
|
||||||
|
let common = require("core.common");
|
||||||
|
let option = common.option;
|
||||||
|
let command_status = common.command_status;
|
||||||
|
let command_success_from_args = common.command_success_from_args;
|
||||||
|
let bool_option = common.bool_option;
|
||||||
|
let command_output_from_args = common.command_output_from_args;
|
||||||
|
let command_from_args = common.command_from_args;
|
||||||
|
let object_or_empty = common.object_or_empty;
|
||||||
|
let write_json = common.write_json;
|
||||||
|
let array_or_empty = common.array_or_empty;
|
||||||
|
let command_output = common.command_output;
|
||||||
|
|
||||||
const LIB_DIR = getenv("TACHYON_LIB") || "/usr/lib/tachyon";
|
const LIB_DIR = getenv("TACHYON_LIB") || "/usr/lib/tachyon";
|
||||||
const BIN_PATH = getenv("TACHYON_BIN") || "/usr/bin/tachyon";
|
const BIN_PATH = getenv("TACHYON_BIN") || "/usr/bin/tachyon";
|
||||||
const TMP_SING_BOX_FOLDER = getenv("TMP_SING_BOX_FOLDER") || "/tmp/sing-box";
|
const TMP_SING_BOX_FOLDER = getenv("TMP_SING_BOX_FOLDER") || "/tmp/sing-box";
|
||||||
@@ -55,18 +68,6 @@ const SB_SERVICE_MIXED_INBOUND_PORT = getenv("SB_SERVICE_MIXED_INBOUND_PORT") ||
|
|||||||
const SB_VARIANT_STATE_FILE = getenv("SB_VARIANT_STATE_FILE") || "/etc/tachyon/sing-box-variant";
|
const SB_VARIANT_STATE_FILE = getenv("SB_VARIANT_STATE_FILE") || "/etc/tachyon/sing-box-variant";
|
||||||
const GITHUB_RAW_URL = getenv("GITHUB_RAW_URL") || "https://raw.githubusercontent.com/itdoginfo/allow-domains/main";
|
const GITHUB_RAW_URL = getenv("GITHUB_RAW_URL") || "https://raw.githubusercontent.com/itdoginfo/allow-domains/main";
|
||||||
const BUILTIN_SUBNET_URLS = {
|
const BUILTIN_SUBNET_URLS = {
|
||||||
|
|
||||||
let option = common.option;
|
|
||||||
let command_status = common.command_status;
|
|
||||||
let command_success_from_args = common.command_success_from_args;
|
|
||||||
let bool_option = common.bool_option;
|
|
||||||
let command_output_from_args = common.command_output_from_args;
|
|
||||||
let command_from_args = common.command_from_args;
|
|
||||||
let object_or_empty = common.object_or_empty;
|
|
||||||
let write_json = common.write_json;
|
|
||||||
let array_or_empty = common.array_or_empty;
|
|
||||||
let command_output = common.command_output;
|
|
||||||
|
|
||||||
twitter: getenv("SUBNETS_TWITTER") || GITHUB_RAW_URL + "/Subnets/IPv4/twitter.lst",
|
twitter: getenv("SUBNETS_TWITTER") || GITHUB_RAW_URL + "/Subnets/IPv4/twitter.lst",
|
||||||
meta: getenv("SUBNETS_META") || GITHUB_RAW_URL + "/Subnets/IPv4/meta.lst",
|
meta: getenv("SUBNETS_META") || GITHUB_RAW_URL + "/Subnets/IPv4/meta.lst",
|
||||||
discord: getenv("SUBNETS_DISCORD") || GITHUB_RAW_URL + "/Subnets/IPv4/discord.lst",
|
discord: getenv("SUBNETS_DISCORD") || GITHUB_RAW_URL + "/Subnets/IPv4/discord.lst",
|
||||||
@@ -94,7 +95,6 @@ function singbox_rulesets_module() {
|
|||||||
return singbox_rulesets_module_value;
|
return singbox_rulesets_module_value;
|
||||||
}
|
}
|
||||||
|
|
||||||
let common = require("core.common");
|
|
||||||
let as_string = common.as_string;
|
let as_string = common.as_string;
|
||||||
let shell_quote = common.shell_quote;
|
let shell_quote = common.shell_quote;
|
||||||
let read_json_file = common.read_json_file;
|
let read_json_file = common.read_json_file;
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
#!/usr/bin/env ucode
|
#!/usr/bin/env ucode
|
||||||
|
|
||||||
|
let common = require("core.common");
|
||||||
|
let as_string = common.as_string;
|
||||||
|
|
||||||
const DNS_SERVER_TAG = "dns-server";
|
const DNS_SERVER_TAG = "dns-server";
|
||||||
const FAKEIP_DNS_SERVER_TAG = "fakeip-server";
|
const FAKEIP_DNS_SERVER_TAG = "fakeip-server";
|
||||||
const BOOTSTRAP_DNS_SERVER_TAG = "bootstrap-dns-server";
|
const BOOTSTRAP_DNS_SERVER_TAG = "bootstrap-dns-server";
|
||||||
@@ -37,10 +40,6 @@ const BYEDPI_LISTEN_ADDRESS = "127.0.0.1";
|
|||||||
const BYEDPI_PORT_BASE = 1080;
|
const BYEDPI_PORT_BASE = 1080;
|
||||||
|
|
||||||
const RESERVED_TAGS = {
|
const RESERVED_TAGS = {
|
||||||
|
|
||||||
let common = require("core.common");
|
|
||||||
let as_string = common.as_string;
|
|
||||||
|
|
||||||
[DNS_SERVER_TAG]: true,
|
[DNS_SERVER_TAG]: true,
|
||||||
[FAKEIP_DNS_SERVER_TAG]: true,
|
[FAKEIP_DNS_SERVER_TAG]: true,
|
||||||
[BOOTSTRAP_DNS_SERVER_TAG]: true,
|
[BOOTSTRAP_DNS_SERVER_TAG]: true,
|
||||||
|
|||||||
@@ -5,11 +5,10 @@ const SRS_ADS_HAGEZI_PRO_URL = "https://github.com/zxc-rv/ad-filter/releases/lat
|
|||||||
const SRS_SUPERCELL_URL = "https://raw.githubusercontent.com/ushan0v/sing-box-supercell-ruleset/main/supercell.srs";
|
const SRS_SUPERCELL_URL = "https://raw.githubusercontent.com/ushan0v/sing-box-supercell-ruleset/main/supercell.srs";
|
||||||
const SRS_GITHUB_URL = "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/sing/geo/geosite/github.srs";
|
const SRS_GITHUB_URL = "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/sing/geo/geosite/github.srs";
|
||||||
|
|
||||||
const COMMUNITY_SERVICES = {
|
|
||||||
|
|
||||||
let common = require("core.common");
|
let common = require("core.common");
|
||||||
let as_string = common.as_string;
|
let as_string = common.as_string;
|
||||||
|
|
||||||
|
const COMMUNITY_SERVICES = {
|
||||||
russia_inside: true,
|
russia_inside: true,
|
||||||
russia_outside: true,
|
russia_outside: true,
|
||||||
ukraine_inside: true,
|
ukraine_inside: true,
|
||||||
|
|||||||
Reference in New Issue
Block a user