surgio 2.18.1 → 2.18.2

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [2.18.2](https://github.com/geekdada/surgio/compare/v2.18.1...v2.18.2) (2022-04-16)
+
+
+### Bug Fixes
+
+* wrong Trojan WSS config format for Quantumult X ([e953288](https://github.com/geekdada/surgio/commit/e953288911b62beeb0c431b53b4b28e72ce672d0))
+
+
+
 ## [2.18.1](https://github.com/geekdada/surgio/compare/v2.18.0...v2.18.1) (2022-04-15)
 
 

package/build/utils/quantumult.js

@@ -86,7 +86,7 @@ const getQuantumultXNodes = function (list, filter) {
     }
     const result = (0, filter_1.applyFilter)(list, filter)
         .map((nodeConfig) => {
-        var _a;
+        var _a, _b;
         switch (nodeConfig.type) {
             case types_1.NodeTypeEnum.Vmess: {
                 const config = [
@@ -219,26 +219,45 @@ const getQuantumultXNodes = function (list, filter) {
                 const config = [
                     `${nodeConfig.hostname}:${nodeConfig.port}`,
                     ...(0, index_1.pickAndFormatStringList)(nodeConfig, ['password']),
-                    'over-tls=true',
                     `tls-verification=${nodeConfig.skipCertVerify !== true}`,
-                    ...(nodeConfig.sni ? [`tls-host=${nodeConfig.sni}`] : []),
                     ...(nodeConfig.tfo ? [`fast-open=${nodeConfig.tfo}`] : []),
                     ...(nodeConfig['udp-relay'] ? [`udp-relay=true`] : []),
                     ...(nodeConfig.tls13 ? [`tls13=${nodeConfig.tls13}`] : []),
                 ];
                 if (nodeConfig.network === 'ws') {
+                    /**
+                     * The obfs field is only supported with websocket over tls for trojan. When using websocket over
+                     * tls you should not set over-tls and tls-host options anymore, instead set obfs=wss and
+                     * obfs-host options.
+                     */
                     config.push('obfs=wss');
                     if (nodeConfig.wsPath) {
                         config.push(`obfs-uri=${nodeConfig.wsPath}`);
                     }
-                    if (nodeConfig.wsHeaders && nodeConfig.wsHeaders.host) {
-                        config.push(`obfs-host=${nodeConfig.wsHeaders.host}`);
+                    const hostHeader = (_b = nodeConfig === null || nodeConfig === void 0 ? void 0 : nodeConfig.wsHeaders) === null || _b === void 0 ? void 0 : _b.host;
+                    const sni = nodeConfig.sni;
+                    if (sni) {
+                        config.push(`obfs-host=${sni}`);
+                    }
+                    else if (hostHeader) {
+                        config.push(`obfs-host=${hostHeader}`);
+                    }
+                    if (sni && hostHeader) {
+                        logger.warn(`Quantumult X 不支持同时定义 sni 和 wsHeaders.host，配置以 sni 为准，节点 ${nodeConfig.nodeName} 可能不可用`);
+                    }
+                    if (nodeConfig === null || nodeConfig === void 0 ? void 0 : nodeConfig.wsHeaders) {
                         // istanbul ignore next
                         if (Object.keys(lodash_1.default.omit(nodeConfig.wsHeaders, ['host'])).length > 0) {
                             logger.warn(`Quantumult X 不支持自定义额外的 Header 字段，节点 ${nodeConfig.nodeName} 可能不可用`);
                         }
                     }
                 }
+                else {
+                    config.push('over-tls=true');
+                    if (nodeConfig.sni) {
+                        config.push(`tls-host=${nodeConfig.sni}`);
+                    }
+                }
                 config.push(`tag=${nodeConfig.nodeName}`);
                 return `trojan=${config.join(', ')}`;
             }
@@ -252,4 +271,4 @@ const getQuantumultXNodes = function (list, filter) {
     return result.join('\n');
 };
 exports.getQuantumultXNodes = getQuantumultXNodes;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"quantumult.js","sourceRoot":"","sources":["../../lib/utils/quantumult.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"quantumult.js","sourceRoot":"","sources":["../../lib/utils/quantumult.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "surgio",
   "description": "Generating rules for Surge, Clash, Quantumult like a PRO",
-  "version": "2.18.1",
+  "version": "2.18.2",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
   "bin": {