feat: 同步 Sub-store 至 v2.20.19

Author: Kwisma

index.js

@@ -34,7 +34,7 @@ function renderUsageInstructions() {
     return new Response(
         JSON.stringify(
             {
-                version: 'SubStore v2.20.16',
+                version: 'SubStore v2.20.19',
                 message: '这是一个基于 cloudflare workers 的 sub-store 节点转换工具，仅转换节点用',
                 usage: {
                     target: '输出类型：{singbox|mihomo|v2ray|base64|qx|QX|QuantumultX|surge|Surge|SurgeMac|Loon|Clash|meta|clashmeta|clash.meta|Clash.Meta|ClashMeta|Mihomo|uri|URI|json|JSON|stash|Stash|shadowrocket|Shadowrocket|ShadowRocket|surfboard|Surfboard|egern|Egern}',

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sub-store-node",
-	"version": "1.0.9",
+	"version": "1.1.0",
 	"private": true,
 	"license": "GPL-3.0",
 	"scripts": {

src/core/producers/egern.js

@@ -272,7 +272,7 @@ export default function Egern_Producer() {
                         user_id: proxy.uuid,
                         security,
                         tfo: proxy.tfo || proxy['fast-open'],
-                        legacy: proxy.legacy,
+                        legacy: !proxy.aead,
                         udp_relay:
                             proxy.udp || proxy.udp_relay || proxy.udp_relay,
                         next_hop: proxy.next_hop,

src/core/producers/sing-box.js

@@ -1,6 +1,7 @@
 import ClashMeta_Producer from './clashmeta.js';
 import { isIPv4, isIPv6 } from '../utils/index.js';
 import { $ } from '../utils/log.js';
+
 const ipVersions = {
     ipv4: 'ipv4_only',
     ipv6: 'ipv6_only',
@@ -77,7 +78,9 @@ const wsParser = (proxy, parsedProxy) => {
             'early-data-header-name': early_data_header_name,
         } = proxy['ws-opts'];
         transport.early_data_header_name = early_data_header_name;
-        transport.max_early_data = parseInt(max_early_data, 10);
+        transport.max_early_data = max_early_data
+            ? parseInt(max_early_data, 10)
+            : undefined;
         if (wsPath !== '') transport.path = `${wsPath}`;
         if (Object.keys(wsHeaders).length > 0) {
             const headers = {};
@@ -612,6 +615,15 @@ const hysteriaParser = (proxy = {}) => {
     };
     if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
+    if (proxy['hop-interval'])
+        parsedProxy.hop_interval = /^\d+$/.test(proxy['hop-interval'])
+            ? `${proxy['hop-interval']}s`
+            : proxy['hop-interval'];
+    if (proxy['ports'])
+        parsedProxy.server_ports = proxy['ports'].split(/\s*,\s*/).map((p) => {
+            const range = p.replace(/\s*-\s*/g, ':');
+            return range.includes(':') ? range : `${range}:${range}`;
+        });
     if (proxy.auth_str) parsedProxy.auth_str = `${proxy.auth_str}`;
     if (proxy['auth-str']) parsedProxy.auth_str = `${proxy['auth-str']}`;
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
@@ -668,9 +680,10 @@ const hysteria2Parser = (proxy = {}) => {
             ? `${proxy['hop-interval']}s`
             : proxy['hop-interval'];
     if (proxy['ports'])
-        parsedProxy.server_ports = proxy['ports']
-            .split(/\s*,\s*/)
-            .map((p) => p.replace(/\s*-\s*/g, ':'));
+        parsedProxy.server_ports = proxy['ports'].split(/\s*,\s*/).map((p) => {
+            const range = p.replace(/\s*-\s*/g, ':');
+            return range.includes(':') ? range : `${range}:${range}`;
+        });
     if (proxy.up) parsedProxy.up_mbps = parseInt(`${proxy.up}`, 10);
     if (proxy.down) parsedProxy.down_mbps = parseInt(`${proxy.down}`, 10);
     if (proxy.obfs === 'salamander') parsedProxy.obfs.type = 'salamander';

src/index.js

@@ -4,7 +4,7 @@ import { fetchResponse } from './core/utils/download.js';
 import { safeLoad, safeDump } from './core/utils/yaml.js';
 import PROXY_PRODUCERS from './core/producers/index.js';
 
-// 同步更新到 Sub-Store  ：https://github.com/sub-store-org/Sub-Store/commit/bb443c8
+// 同步更新到 Sub-Store  ：https://github.com/sub-store-org/Sub-Store/commit/b1cc4bd
 
 /**
  * 订阅转换入口