surgio 2.18.1 → 2.18.4

package/CHANGELOG.md

@@ -1,3 +1,35 @@
+## [2.18.4](https://github.com/geekdada/surgio/compare/v2.18.3...v2.18.4) (2022-05-26)
+
+
+### Bug Fixes
+
+* flag_cn.ts ([483c5b8](https://github.com/geekdada/surgio/commit/483c5b8e8134ba272597f9f1b2aa4e07783689ca))
+
+
+
+## [2.18.3](https://github.com/geekdada/surgio/compare/v2.18.2...v2.18.3) (2022-05-21)
+
+
+### Bug Fixes
+
+* flag.test.ts ([52e23d0](https://github.com/geekdada/surgio/commit/52e23d09134a5c2ced2ec669fbad87636b12503c))
+
+
+### Features
+
+* Update flag_cn.ts ([478d694](https://github.com/geekdada/surgio/commit/478d6944a388727428cfd53f4fedf0134676fa94))
+
+
+
+## [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/misc/flag_cn.d.ts

@@ -5,34 +5,48 @@ declare const _default: {
     '\uD83C\uDDE6\uD83C\uDDF7': string[];
     '\uD83C\uDDE6\uD83C\uDDF9': string[];
     '\uD83C\uDDE6\uD83C\uDDFA': string[];
+    '\uD83C\uDDE7\uD83C\uDDEA': string[];
+    '\uD83C\uDDE7\uD83C\uDDEC': string[];
     '\uD83C\uDDF5\uD83C\uDDF0': string[];
     '\uD83C\uDDE7\uD83C\uDDF7': string[];
     '\uD83C\uDDE8\uD83C\uDDE6': string[];
     '\uD83C\uDDE8\uD83C\uDDED': string[];
     '\uD83C\uDDE9\uD83C\uDDEA': string[];
+    '\uD83C\uDDE9\uD83C\uDDF0': string[];
+    '\uD83C\uDDEA\uD83C\uDDF8': string[];
+    '\uD83C\uDDEA\uD83C\uDDFA': string[];
     '\uD83C\uDDEB\uD83C\uDDEE': string[];
     '\uD83C\uDDEB\uD83C\uDDF7': string[];
     '\uD83C\uDDEC\uD83C\uDDE7': string[];
+    '\uD83C\uDDFA\uD83C\uDDE6': string[];
+    '\uD83C\uDDED\uD83C\uDDFA': string[];
     '\uD83C\uDDED\uD83C\uDDF0': string[];
+    '\uD83C\uDDEE\uD83C\uDDF3': string[];
     '\uD83C\uDDEE\uD83C\uDDE9': string[];
     '\uD83C\uDDEE\uD83C\uDDEA': string[];
-    '\uD83C\uDDEE\uD83C\uDDF3': string[];
+    '\uD83C\uDDEE\uD83C\uDDF1': string[];
     '\uD83C\uDDEE\uD83C\uDDF9': string[];
     '\uD83C\uDDF0\uD83C\uDDF5': string[];
     '\uD83C\uDDF0\uD83C\uDDF7': string[];
+    '\uD83C\uDDF1\uD83C\uDDFB': string[];
+    '\uD83C\uDDF2\uD83C\uDDFD\uFE0F': string[];
     '\uD83C\uDDF2\uD83C\uDDF4': string[];
     '\uD83C\uDDF2\uD83C\uDDFE': string[];
     '\uD83C\uDDF3\uD83C\uDDF1': string[];
     '\uD83C\uDDF5\uD83C\uDDED': string[];
     '\uD83C\uDDF7\uD83C\uDDF4': string[];
     '\uD83C\uDDF7\uD83C\uDDFA': string[];
+    '\uD83C\uDDF8\uD83C\uDDE6': string[];
+    '\uD83C\uDDF8\uD83C\uDDEA': string[];
     '\uD83C\uDDF8\uD83C\uDDEC': string[];
     '\uD83C\uDDF9\uD83C\uDDED': string[];
     '\uD83C\uDDF9\uD83C\uDDF7': string[];
     '\uD83C\uDDFA\uD83C\uDDF8': string[];
     '\uD83C\uDDFB\uD83C\uDDF3': string[];
     '\uD83C\uDDFF\uD83C\uDDE6': string[];
+    '\uD83C\uDDE6\uD83C\uDDEA': string[];
     '\uD83C\uDDEF\uD83C\uDDF5': string[];
+    '\uD83C\uDDF3\uD83C\uDDF4': string[];
     '\uD83C\uDDE8\uD83C\uDDF3': string[];
 };
 export default _default;

package/build/misc/flag_cn.js

@@ -1,6 +1,7 @@
 "use strict";
 // istanbul ignore file
 // credit: https://github.com/JO2EY/Rules
+// flags from @KOP-XIAO: https://github.com/KOP-XIAO/QuantumultX/blob/master/Scripts/resource-parser.js
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TAIWAN = void 0;
 exports.TAIWAN = [
@@ -11,59 +12,91 @@ exports.TAIWAN = [
     '臺',
     '新北',
     '彰化',
+    'CHT',
+    'HINET',
 ];
 exports.default = {
-    '🏳️‍🌈': ['流量', '时间'],
+    '🏳️‍🌈': ['流量', '时间', '过期', 'BANDWIDTH', 'EXPIRE'],
     '🇸🇱': ['应急', '测试节点'],
-    '🇦🇷': ['阿根廷'],
-    '🇦🇹': ['奥地利', '维也纳'],
-    '🇦🇺': ['澳大利亚', '悉尼', '澳洲'],
-    '🇵🇰': ['巴基斯坦'],
-    '🇧🇷': ['巴西', '圣保罗'],
-    '🇨🇦': ['CANADA', '加拿大', '蒙特利尔', '温哥华'],
-    '🇨🇭': ['瑞士', '苏黎世'],
-    '🇩🇪': ['法兰克福', '德'],
-    '🇫🇮': ['芬兰', '赫尔辛基'],
-    '🇫🇷': ['FR', '法國', '法国', '巴黎'],
-    '🇬🇧': ['UK', '英', '伦敦'],
-    '🇭🇰': ['HK', '港', 'HONG KONG', 'HGC'],
-    '🇮🇩': ['印尼', '印度尼西亚', '雅加达'],
-    '🇮🇪': ['爱尔兰', '都柏林'],
-    '🇮🇳': ['印度', '孟买'],
-    '🇮🇹': ['意大利', '米兰', '義大利'],
+    '🇦🇷': ['ARGENTINA', '阿根廷'],
+    '🇦🇹': ['AUSTRIA', '奥地利', '维也纳'],
+    '🇦🇺': ['AUSTRALIA', '澳大利亚', '澳洲', '墨尔本', '悉尼', 'SYDNEY'],
+    '🇧🇪': ['BELGIUM', '比利时'],
+    '🇧🇬': ['BULGARIA', '保加利亚'],
+    '🇵🇰': ['PAKISTAN', '巴基斯坦'],
+    '🇧🇷': ['BRAZIL', '巴西', '圣保罗'],
+    '🇨🇦': [
+        'CANADA',
+        '加拿大',
+        'WATERLOO',
+        '蒙特利尔',
+        '温哥华',
+        '楓葉',
+        '枫叶',
+        '滑铁卢',
+        '多伦多',
+    ],
+    '🇨🇭': ['SWITZERLAND', '瑞士', '苏黎世'],
+    '🇩🇪': ['GERMAN', '德', '法兰克福'],
+    '🇩🇰': ['DENMARK', '丹麦'],
+    '🇪🇸': ['SPAIN', '西班牙'],
+    '🇪🇺': ['欧盟', '欧罗巴'],
+    '🇫🇮': ['FINLAND', '芬兰', '赫尔辛基'],
+    '🇫🇷': ['FR', 'FRANCE', '法国', '法國', '巴黎'],
+    '🇬🇧': ['UK', 'ENGLAND', 'UNITED KINGDOM', '英', '伦敦'],
+    '🇺🇦': ['UKRAINE', '乌克兰', '基辅'],
+    '🇭🇺': ['HUNGARY', '匈牙利'],
+    '🇭🇰': ['HK', '港', 'HONGKONG', 'HONG KONG', 'HGC', 'WTT', 'CMI'],
+    '🇮🇳': ['INDIA', '印度', '孟买', 'MUMBAI'],
+    '🇮🇩': ['INDONESIA', '印尼', '印度尼西亚', '雅加达'],
+    '🇮🇪': ['IRELAND', '爱尔兰', '都柏林'],
+    '🇮🇱': ['ISRAEL', '以色列'],
+    '🇮🇹': ['ITALY', 'NACHASH', '意大利', '米兰', '義大利'],
     '🇰🇵': ['朝鲜'],
-    '🇰🇷': ['KR', 'KOREA', '首尔', '棒子', '韩', '韓'],
-    '🇲🇴': ['澳门', 'MACAU'],
-    '🇲🇾': ['马来西亚'],
-    '🇳🇱': ['荷兰', '阿姆斯特丹'],
-    '🇵🇭': ['菲律宾'],
-    '🇷🇴': ['罗马尼亚'],
+    '🇰🇷': ['KR', 'KOREA', 'KOR', '首尔', '韩', '韓'],
+    '🇱🇻': ['LATVIA', 'LATVIJA', '拉脱维亚'],
+    '🇲🇽️': ['MEXICO', '墨西哥'],
+    '🇲🇴': ['MACAU', 'MACAO', '澳门', 'CTM'],
+    '🇲🇾': ['MALAYSIA', '马来西亚', '吉隆坡'],
+    '🇳🇱': ['NETHERLANDS', '荷兰', '荷蘭', '尼德蘭', '阿姆斯特丹'],
+    '🇵🇭': ['PHILIPPINES', '菲律宾'],
+    '🇷🇴': ['ROMANIA', '罗马尼亚'],
     '🇷🇺': [
         'RU',
         'RUSSIA',
         '普京',
         '俄罗斯',
+        '俄羅斯',
         '伯力',
         '莫斯科',
         '圣彼得堡',
         '西伯利亚',
+        '京俄',
+        '杭俄',
     ],
+    '🇸🇦': ['SAUDI', '沙特'],
+    '🇸🇪': ['SWEDEN', '瑞典'],
     '🇸🇬': [
         'SG',
         'SIN',
         'SINGAPORE',
         '新加坡',
         '狮城',
-        '深新',
         '沪新',
         '京新',
         '中新',
+        '泉新',
+        '穗新',
+        '深新',
+        '杭新',
         '广新',
     ],
-    '🇹🇭': ['泰', '曼谷'],
-    '🇹🇷': ['土耳其', '伊斯坦布尔'],
+    '🇹🇭': ['THAILAND', '泰', '曼谷'],
+    '🇹🇷': ['TURKEY', '土耳其', '伊斯坦布尔'],
     '🇺🇸': [
         'US',
+        'USA',
+        'AMERICA',
         'UNITED STATES',
         'LAX',
         'SFO',
@@ -74,16 +107,21 @@ exports.default = {
         '凤凰城',
         '费利蒙',
         '硅谷',
+        '矽谷',
         '拉斯维加斯',
         '洛杉矶',
         '圣何塞',
         '圣克拉拉',
         '西雅图',
         '芝加哥',
+        '哥伦布',
+        '纽约',
     ],
-    '🇻🇳': ['越南'],
-    '🇿🇦': ['南非'],
-    '🇯🇵': ['JP', 'JAPAN', '日本', '东京', '大阪', '埼玉', '沪日', '日'],
+    '🇻🇳': ['VIETNAM', '越南', '胡志明'],
+    '🇿🇦': ['SOUTH AFRICA', '南非'],
+    '🇦🇪': ['UNITED ARAB EMIRATES', '阿联酋', '迪拜'],
+    '🇯🇵': ['JP', 'JAPAN', '日', '东京', '大阪', '埼玉', 'NTT', 'KDDI'],
+    '🇳🇴': ['NORWAY', '挪威'],
     '🇨🇳': [
         ...exports.TAIWAN,
         'CHINA',
@@ -101,6 +139,7 @@ exports.default = {
         '青岛',
         '宁波',
         '镇江',
+        'BACK',
     ],
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmxhZ19jbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9taXNjL2ZsYWdfY24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUF1QjtBQUN2Qix5Q0FBeUM7OztBQUU1QixRQUFBLE1BQU0sR0FBMEI7SUFDM0MsSUFBSTtJQUNKLFFBQVE7SUFDUixJQUFJO0lBQ0osR0FBRztJQUNILEdBQUc7SUFDSCxJQUFJO0lBQ0osSUFBSTtDQUNMLENBQUM7QUFFRixrQkFBZTtJQUNiLFFBQVEsRUFBRSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUM7SUFDdEIsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUN0QixNQUFNLEVBQUUsQ0FBQyxLQUFLLENBQUM7SUFDZixNQUFNLEVBQUUsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDO0lBQ3RCLE1BQU0sRUFBRSxDQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDO0lBQzVCLE1BQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQztJQUNoQixNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDO0lBQ3JCLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQztJQUN4QyxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDO0lBQ3JCLE1BQU0sRUFBRSxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUM7SUFDckIsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUN0QixNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUM7SUFDaEMsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxJQUFJLENBQUM7SUFDekIsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxXQUFXLEVBQUUsS0FBSyxDQUFDO0lBQ3ZDLE1BQU0sRUFBRSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDO0lBQzlCLE1BQU0sRUFBRSxDQUFDLEtBQUssRUFBRSxLQUFLLENBQUM7SUFDdEIsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQztJQUNwQixNQUFNLEVBQUUsQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLEtBQUssQ0FBQztJQUM1QixNQUFNLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDZCxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQztJQUM3QyxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQztJQUNoQixNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxDQUFDLEtBQUssQ0FBQztJQUNmLE1BQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQztJQUNoQixNQUFNLEVBQUU7UUFDTixJQUFJO1FBQ0osUUFBUTtRQUNSLElBQUk7UUFDSixLQUFLO1FBQ0wsSUFBSTtRQUNKLEtBQUs7UUFDTCxNQUFNO1FBQ04sTUFBTTtLQUNQO0lBQ0QsTUFBTSxFQUFFO1FBQ04sSUFBSTtRQUNKLEtBQUs7UUFDTCxXQUFXO1FBQ1gsS0FBSztRQUNMLElBQUk7UUFDSixJQUFJO1FBQ0osSUFBSTtRQUNKLElBQUk7UUFDSixJQUFJO1FBQ0osSUFBSTtLQUNMO0lBQ0QsTUFBTSxFQUFFLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQztJQUNuQixNQUFNLEVBQUUsQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDO0lBQ3hCLE1BQU0sRUFBRTtRQUNOLElBQUk7UUFDSixlQUFlO1FBQ2YsS0FBSztRQUNMLEtBQUs7UUFDTCxHQUFHO1FBQ0gsS0FBSztRQUNMLEtBQUs7UUFDTCxLQUFLO1FBQ0wsS0FBSztRQUNMLEtBQUs7UUFDTCxJQUFJO1FBQ0osT0FBTztRQUNQLEtBQUs7UUFDTCxLQUFLO1FBQ0wsTUFBTTtRQUNOLEtBQUs7UUFDTCxLQUFLO0tBQ047SUFDRCxNQUFNLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDZCxNQUFNLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDZCxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDO0lBQzFELE1BQU0sRUFBRTtRQUNOLEdBQUcsY0FBTTtRQUNULE9BQU87UUFDUCxJQUFJO1FBQ0osSUFBSTtRQUNKLElBQUk7UUFDSixJQUFJO1FBQ0osSUFBSTtRQUNKLElBQUk7UUFDSixJQUFJO1FBQ0osSUFBSTtRQUNKLElBQUk7UUFDSixJQUFJO1FBQ0osSUFBSTtRQUNKLElBQUk7UUFDSixJQUFJO1FBQ0osSUFBSTtLQUNMO0NBQ0YsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmxhZ19jbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9taXNjL2ZsYWdfY24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUF1QjtBQUN2Qix5Q0FBeUM7QUFDekMsdUdBQXVHOzs7QUFFMUYsUUFBQSxNQUFNLEdBQTBCO0lBQzNDLElBQUk7SUFDSixRQUFRO0lBQ1IsSUFBSTtJQUNKLEdBQUc7SUFDSCxHQUFHO0lBQ0gsSUFBSTtJQUNKLElBQUk7SUFDSixLQUFLO0lBQ0wsT0FBTztDQUNSLENBQUM7QUFFRixrQkFBZTtJQUNiLFFBQVEsRUFBRSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxRQUFRLENBQUM7SUFDbkQsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUN0QixNQUFNLEVBQUUsQ0FBQyxXQUFXLEVBQUUsS0FBSyxDQUFDO0lBQzVCLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxLQUFLLEVBQUUsS0FBSyxDQUFDO0lBQ2pDLE1BQU0sRUFBRSxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsUUFBUSxDQUFDO0lBQzFELE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUM7SUFDMUIsTUFBTSxFQUFFLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUM1QixNQUFNLEVBQUUsQ0FBQyxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQzVCLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDO0lBQy9CLE1BQU0sRUFBRTtRQUNOLFFBQVE7UUFDUixLQUFLO1FBQ0wsVUFBVTtRQUNWLE1BQU07UUFDTixLQUFLO1FBQ0wsSUFBSTtRQUNKLElBQUk7UUFDSixLQUFLO1FBQ0wsS0FBSztLQUNOO0lBQ0QsTUFBTSxFQUFFLENBQUMsYUFBYSxFQUFFLElBQUksRUFBRSxLQUFL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

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.4",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
   "bin": {