feat: 读取节点的 ca-str 字段, 自动计算 fingerprint

backend/package.json

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

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

@@ -471,17 +471,11 @@ function lastParse(proxy) {
         delete proxy['ca_str'];
         proxy['ca-str'] = caStr;
     }
-    try {
-        if ($.env.isNode && !caStr && proxy['_ca']) {
-            caStr = $.node.fs.readFileSync(proxy['_ca'], {
-                encoding: 'utf8',
-            });
-        }
-    } catch (e) {
-        $.error(`Read ca file failed\nReason: ${e}`);
-    }
-    if (!proxy['tls-fingerprint'] && caStr) {
-        proxy['tls-fingerprint'] = rs.generateFingerprint(caStr);
+    // if ($.env.isNode && !caStr && proxy.ca) {
+    //     caStr = $.node.fs.readFileSync(proxy.ca, { encoding: 'utf8' });
+    // }
+    if (!proxy.fingerprint && caStr) {
+        proxy.fingerprint = rs.generateFingerprint(caStr);
     }
     return proxy;
 }

backend/src/core/proxy-utils/parsers/peggy/loon.js

@@ -68,7 +68,7 @@ trojan = tag equals "trojan"i address password (transport/transport_host/transpo
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/others)* {
+hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/udp_relay/fast_open/download_bandwidth/ecn/others)* {
     proxy.type = "hysteria2";
 }
 https = tag equals "https"i address (username password)? (tls_host/tls_verification/fast_open/udp_relay/others)* {
@@ -178,7 +178,6 @@ udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
 
 ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
 download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
-salamander_password = comma "salamander-password" equals match:[^,]+ { proxy['obfs-password'] = match.join(""); proxy.obfs = 'salamander'; }
 
 tag = match:[^=,]* { proxy.name = match.join("").trim(); }
 comma = _ "," _

backend/src/core/proxy-utils/parsers/peggy/loon.peg

@@ -66,7 +66,7 @@ trojan = tag equals "trojan"i address password (transport/transport_host/transpo
     proxy.type = "trojan";
     handleTransport();
 }
-hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/udp_relay/fast_open/download_bandwidth/salamander_password/ecn/others)* {
+hysteria2 = tag equals "hysteria2"i address password (tls_host/tls_verification/udp_relay/fast_open/download_bandwidth/ecn/others)* {
     proxy.type = "hysteria2";
 }
 https = tag equals "https"i address (username password)? (tls_host/tls_verification/fast_open/udp_relay/others)* {
@@ -176,7 +176,6 @@ udp_relay = comma "udp" equals flag:bool { proxy.udp = flag; }
 
 ecn = comma "ecn" equals flag:bool { proxy.ecn = flag; }
 download_bandwidth = comma "download-bandwidth" equals match:[^,]+ { proxy.down = match.join(""); }
-salamander_password = comma "salamander-password" equals match:[^,]+ { proxy['obfs-password'] = match.join(""); proxy.obfs = 'salamander'; }
 
 tag = match:[^=,]* { proxy.name = match.join("").trim(); }
 comma = _ "," _

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

@@ -408,8 +408,8 @@ function wireguard(proxy) {
 }
 
 function hysteria2(proxy) {
-    if (proxy['obfs-password'] && proxy.obfs != 'salamander') {
-        throw new Error(`only salamander obfs is supported`);
+    if (proxy.obfs || proxy['obfs-password']) {
+        throw new Error(`obfs is unsupported`);
     }
     const result = new Result(proxy);
     result.append(`${proxy.name}=Hysteria2,${proxy.server},${proxy.port}`);
@@ -423,10 +423,6 @@ function hysteria2(proxy) {
         'skip-cert-verify',
     );
 
-    if (proxy['obfs-password'] && proxy.obfs == 'salamander') {
-        result.append(`,salamander-password=${proxy['obfs-password']}`);
-    }
-
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');