@subconverter/core 0.2.1 → 0.3.0

package/dist/index.cjs

@@ -79,6 +79,7 @@ __export(index_exports, {
   explodeVmess: () => explodeVmess,
   explodeVmessConf: () => explodeVmessConf,
   filterNodes: () => filterNodes,
+  filterNodesByCountry: () => filterNodesByCountry,
   findSection: () => findSection,
   fnv1a64: () => fnv1a64,
   fnv1a64Hex: () => fnv1a64Hex,
@@ -113,6 +114,7 @@ __export(index_exports, {
   nodeNameRegex: () => nodeNameRegex,
   nodeNameRemove: () => nodeNameRemove,
   nodeRename: () => nodeRename,
+  normalizeCountryCode: () => normalizeCountryCode,
   normalizeQueryKey: () => normalizeQueryKey,
   normalizeUserinfoProvider: () => normalizeUserinfoProvider,
   pad2: () => pad2,
@@ -142,8 +144,6 @@ __export(index_exports, {
   queryBoolFlag: () => queryBoolFlag,
   regMatch: () => regMatch,
   regReplace: () => regReplace,
-  regionDisplayName: () => regionDisplayName,
-  regionFlag: () => regionFlag,
   removeEmoji: () => removeEmoji,
   renderRawIni: () => renderRawIni,
   renderTemplate: () => renderTemplate,
@@ -452,12 +452,15 @@ function createExtraSettings() {
     clashProxiesStyle: "flow",
     clashProxyGroupsStyle: "flow",
     clashScript: false,
-    countryLocale: "zh-CN",
     countryResolver: void 0,
     dedupe: false,
     emojiArray: [],
     enableRuleGenerator: true,
+    excludeCountries: [],
+    excludeRemarks: [],
     filterDeprecated: false,
+    includeCountries: [],
+    includeRemarks: [],
     managedConfigPrefix: "",
     nameRegexArray: [],
     nameRemove: [],
@@ -943,8 +946,10 @@ function parseExternalConfig(content) {
     baseFiles: {},
     emoji: [],
     enableRuleGenerator: true,
+    excludeCountries: [],
     excludeRemarks: [],
     groups: [],
+    includeCountries: [],
     includeRemarks: [],
     nameRegex: [],
     nameRemove: [],
@@ -1013,6 +1018,22 @@ function parseExternalConfig(content) {
             result.includeRemarks.push(value);
           }
           break;
+        case "include_country":
+          for (const fragment of value.split(",")) {
+            const trimmed = fragment.trim().toUpperCase();
+            if (trimmed !== "") {
+              result.includeCountries.push(trimmed);
+            }
+          }
+          break;
+        case "exclude_country":
+          for (const fragment of value.split(",")) {
+            const trimmed = fragment.trim().toUpperCase();
+            if (trimmed !== "") {
+              result.excludeCountries.push(trimmed);
+            }
+          }
+          break;
         case "exclude_remarks":
         case "exclude":
           if (value !== "") {
@@ -1067,6 +1088,9 @@ function listArg(query, key) {
   const value = getUrlArg(query, key);
   return value === "" ? [] : value.split(",");
 }
+function countryListArg(query, key) {
+  return getAllUrlArgs(query, key).flatMap((raw) => raw.split(",")).map((raw) => raw.trim().toUpperCase()).filter((raw) => raw !== "");
+}
 function resolveNewFieldName(query) {
   if (boolArg(query, "legacy") || boolArg(query, "legacy_field_name") || boolArg(query, "legacy-field-name")) {
     return false;
@@ -1109,9 +1133,11 @@ function createRequestSettings() {
     classicalRuleset: false,
     dedupe: false,
     emoji: [],
+    excludeCountries: [],
     excludeRemarks: [],
     filterDeprecated: false,
     group: [],
+    includeCountries: [],
     includeRemarks: [],
     insert: false,
     interval: 0,
@@ -1172,6 +1198,8 @@ function parseRequestSettings(query) {
   settings.proxyGroupsStyle = getUrlArg(query, "proxy_groups_style") || "flow";
   settings.includeRemarks = listArg(query, "include");
   settings.excludeRemarks = listArg(query, "exclude");
+  settings.includeCountries = countryListArg(query, "include_country");
+  settings.excludeCountries = countryListArg(query, "exclude_country");
   settings.userinfoUrl = firstArg(query, "userinfo_url", "userinfo-url", "userinfo");
   settings.userinfoProvider = firstArg(
     query,
@@ -5117,7 +5145,11 @@ function normalizeRegionCode(code) {
   const upper = code.trim().toUpperCase();
   return /^[A-Z]{2}$/.test(upper) ? upper : "";
 }
-function regionDisplayName(code, locale = "zh-CN") {
+function normalizeCountryCode(code) {
+  const upper = normalizeRegionCode(code);
+  return upper !== "" && isRegionCode(upper) ? upper : void 0;
+}
+function displayName(code, locale) {
   const upper = normalizeRegionCode(code);
   if (upper === "") {
     return code.trim();
@@ -5160,8 +5192,8 @@ function buildAliasRegex() {
     }
   };
   for (const code of REGION_CODES) {
-    add(regionDisplayName(code, "zh-CN"));
-    add(regionDisplayName(code, "en"));
+    add(displayName(code, "zh-CN"));
+    add(displayName(code, "en"));
     add(regionFlag(code));
   }
   for (const alias of EXTRA_ALIASES) {
@@ -5201,13 +5233,13 @@ function hasRegionName(remark) {
   }
   return false;
 }
-function formatCountryRemark(remark, code, locale = "zh-CN") {
-  const name = regionDisplayName(code, locale);
+function formatCountryRemark(remark, code) {
+  const normalized = normalizeCountryCode(code);
   const trimmed = remark.trim();
-  if (name === "") {
+  if (normalized === void 0) {
     return trimmed;
   }
-  return trimmed === "" ? name : `${name}-${trimmed}`;
+  return trimmed === "" ? normalized : `${normalized}-${trimmed}`;
 }
 
 // src/generator/nodes.ts
@@ -5466,7 +5498,7 @@ function nodeRename(node, renameArray) {
     node.remark = original;
   }
 }
-function addCountryPrefix(node, resolve, locale = "zh-CN") {
+function addCountryPrefix(node, resolve) {
   const remark = node.remark.trim();
   if (hasRegionName(remark)) {
     return node.remark;
@@ -5475,7 +5507,31 @@ function addCountryPrefix(node, resolve, locale = "zh-CN") {
   if (code === void 0 || code === "") {
     return node.remark;
   }
-  return formatCountryRemark(remark, code, locale);
+  return formatCountryRemark(remark, code);
+}
+function filterNodesByCountry(nodes, resolve, include, exclude) {
+  const includeSet = new Set(
+    include.map((code) => normalizeCountryCode(code)).filter((code) => code !== void 0)
+  );
+  const excludeSet = new Set(
+    exclude.map((code) => normalizeCountryCode(code)).filter((code) => code !== void 0)
+  );
+  if (includeSet.size === 0 && excludeSet.size === 0) {
+    return;
+  }
+  const kept = [];
+  for (const node of nodes) {
+    const code = resolve ? normalizeCountryCode(resolve(node) ?? "") : void 0;
+    if (includeSet.size > 0 && (code === void 0 || !includeSet.has(code))) {
+      continue;
+    }
+    if (code !== void 0 && excludeSet.has(code)) {
+      continue;
+    }
+    kept.push(node);
+  }
+  nodes.length = 0;
+  nodes.push(...kept);
 }
 function preprocessNodes(nodes, options) {
   for (const node of nodes) {
@@ -5493,13 +5549,25 @@ function preprocessNodes(nodes, options) {
       node.remark = addEmoji(node, options.emojiArray);
     }
     if (options.autoCountry && options.countryResolver) {
-      node.remark = addCountryPrefix(
-        node,
-        options.countryResolver,
-        options.countryLocale ?? "zh-CN"
-      );
+      node.remark = addCountryPrefix(node, options.countryResolver);
     }
   }
+  filterNodesByCountry(
+    nodes,
+    options.countryResolver,
+    options.includeCountries ?? [],
+    options.excludeCountries ?? []
+  );
+  const includeRemarks = options.includeRemarks ?? [];
+  const excludeRemarks = options.excludeRemarks ?? [];
+  if (includeRemarks.length > 0 || excludeRemarks.length > 0) {
+    const kept = nodes.filter((node) => !checkIgnore(node, excludeRemarks, includeRemarks));
+    kept.forEach((node, index) => {
+      node.id = index;
+    });
+    nodes.length = 0;
+    nodes.push(...kept);
+  }
   if (options.sortFlag) {
     nodes.sort((a, b) => a.remark < b.remark ? -1 : a.remark > b.remark ? 1 : 0);
   }
@@ -8385,9 +8453,12 @@ function runPreprocess(nodes, settings) {
   preprocessNodes(nodes, {
     addEmoji: settings.addEmoji,
     autoCountry: settings.autoCountry,
-    countryLocale: settings.countryLocale,
     countryResolver: settings.countryResolver,
     emojiArray: settings.emojiArray,
+    excludeCountries: settings.excludeCountries,
+    excludeRemarks: settings.excludeRemarks,
+    includeCountries: settings.includeCountries,
+    includeRemarks: settings.includeRemarks,
     nameRegexArray: settings.nameRegexArray,
     nameRemove: settings.nameRemove,
     removeEmoji: settings.removeEmoji,