feat: sing-box 支持 naive 出站

Author: xream

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.20.51",
+  "version": "2.20.52",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
   "main": "src/main.js",
   "scripts": {

backend/src/core/proxy-utils/index.js

@@ -453,6 +453,7 @@ function lastParse(proxy) {
             'hysteria2',
             'juicity',
             'anytls',
+            'naive',
         ].includes(proxy.type)
     ) {
         proxy.tls = true;

backend/src/core/proxy-utils/parsers/index.js

@@ -1174,6 +1174,7 @@ function Clash_All() {
         }
         if (
             ![
+                'naive',
                 'anytls',
                 'mieru',
                 'sudoku',

backend/src/core/proxy-utils/producers/clash.js

@@ -169,6 +169,7 @@ export default function Clash_Producer() {
                         'hysteria2',
                         'juicity',
                         'anytls',
+                        'naive',
                     ].includes(proxy.type)
                 ) {
                     delete proxy.tls;

backend/src/core/proxy-utils/producers/clashmeta.js

@@ -16,7 +16,7 @@ export default function ClashMeta_Producer() {
                 if (opts['include-unsupported-proxy']) return true;
                 if (proxy.type === 'snell' && proxy.version >= 4) {
                     return false;
-                } else if (['juicity'].includes(proxy.type)) {
+                } else if (['juicity', 'naive'].includes(proxy.type)) {
                     return false;
                 } else if (
                     ['ss'].includes(proxy.type) &&
@@ -245,6 +245,7 @@ export default function ClashMeta_Producer() {
                         'hysteria2',
                         'juicity',
                         'anytls',
+                        'naive',
                     ].includes(proxy.type)
                 ) {
                     delete proxy.tls;

backend/src/core/proxy-utils/producers/shadowrocket.js

@@ -9,7 +9,7 @@ export default function Shadowrocket_Producer() {
                 if (opts['include-unsupported-proxy']) return true;
                 if (proxy.type === 'snell' && proxy.version >= 4) {
                     return false;
-                } else if (['mieru', 'sudoku'].includes(proxy.type)) {
+                } else if (['mieru', 'sudoku', 'naive'].includes(proxy.type)) {
                     return false;
                 }
                 return true;
@@ -213,6 +213,7 @@ export default function Shadowrocket_Producer() {
                         'hysteria2',
                         'juicity',
                         'anytls',
+                        'naive',
                     ].includes(proxy.type)
                 ) {
                     delete proxy.tls;

backend/src/core/proxy-utils/producers/sing-box.js

@@ -366,15 +366,23 @@ const socks5Parser = (proxy = {}) => {
         type: 'socks',
         server: proxy.server,
         server_port: parseInt(`${proxy.port}`, 10),
-        password: proxy.password,
         version: '5',
     };
     if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (proxy.username) parsedProxy.username = proxy.username;
     if (proxy.password) parsedProxy.password = proxy.password;
     if (proxy.uot) parsedProxy.udp_over_tcp = true;
-    if (proxy['udp-over-tcp']) parsedProxy.udp_over_tcp = true;
+    if (proxy['udp-over-tcp']) {
+        parsedProxy.udp_over_tcp = {
+            enabled: true,
+            version:
+                !proxy['udp-over-tcp-version'] ||
+                proxy['udp-over-tcp-version'] === 1
+                    ? 1
+                    : 2,
+        };
+    }
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     networkParser(proxy, parsedProxy);
     tfoParser(proxy, parsedProxy);
@@ -625,6 +633,45 @@ const trojanParser = (proxy = {}) => {
     ipVersionParser(proxy, parsedProxy);
     return parsedProxy;
 };
+const naiveParser = (proxy = {}) => {
+    const parsedProxy = {
+        tag: proxy.name,
+        type: 'naive',
+        server: proxy.server,
+        server_port: parseInt(`${proxy.port}`, 10),
+        tls: { enabled: true, server_name: proxy.server, insecure: false },
+    };
+    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
+        throw 'invalid port';
+    if (proxy.username) parsedProxy.username = proxy.username;
+    if (proxy.password) parsedProxy.password = proxy.password;
+    if (proxy.uot) parsedProxy.udp_over_tcp = true;
+    if (proxy['udp-over-tcp']) {
+        parsedProxy.udp_over_tcp = {
+            enabled: true,
+            version:
+                !proxy['udp-over-tcp-version'] ||
+                proxy['udp-over-tcp-version'] === 1
+                    ? 1
+                    : 2,
+        };
+    }
+    const insecure_concurrency = parseInt(
+        `${proxy['insecure-concurrency']}`,
+        10,
+    );
+    if (Number.isInteger(insecure_concurrency) && insecure_concurrency >= 0)
+        parsedProxy.insecure_concurrency = insecure_concurrency;
+    if (proxy['extra-headers'])
+        parsedProxy.extra_headers = proxy['extra-headers'];
+    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
+    tfoParser(proxy, parsedProxy);
+    detourParser(proxy, parsedProxy);
+    tlsParser(proxy, parsedProxy);
+    smuxParser(proxy.smux, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
+    return parsedProxy;
+};
 const hysteriaParser = (proxy = {}) => {
     const parsedProxy = {
         tag: proxy.name,
@@ -941,6 +988,9 @@ export default function singbox_Producer() {
                                 );
                             }
                             break;
+                        case 'naive':
+                            list.push(naiveParser(proxy));
+                            break;
                         case 'hysteria':
                             list.push(hysteriaParser(proxy));
                             break;

backend/src/core/proxy-utils/producers/stash.js

@@ -273,6 +273,7 @@ export default function Stash_Producer() {
                         'hysteria2',
                         'juicity',
                         'anytls',
+                        'naive',
                     ].includes(proxy.type)
                 ) {
                     delete proxy.tls;