surgio 2.25.3 → 3.0.0-alpha.0

package/build/utils/ss.js

@@ -14,22 +14,32 @@ const parseSSUri = (str) => {
     const pluginInfo = typeof pluginString === 'string'
         ? (0, index_1.decodeStringList)(pluginString.split(';'))
         : {};
-    return Object.assign(Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Shadowsocks, nodeName: decodeURIComponent(scheme.hash.replace('#', '')), hostname: scheme.hostname, port: scheme.port, method: userInfo[0], password: userInfo[1] }, (pluginInfo['obfs-local']
-        ? {
-            obfs: pluginInfo.obfs,
-            'obfs-host': pluginInfo['obfs-host'] + '',
-        }
-        : null)), (pluginInfo['simple-obfs']
-        ? {
-            obfs: pluginInfo.obfs,
-            'obfs-host': pluginInfo['obfs-host'] + '',
-        }
-        : null)), (pluginInfo['v2ray-plugin']
-        ? {
-            obfs: pluginInfo.tls ? 'wss' : 'ws',
-            'obfs-host': pluginInfo.host + '',
-        }
-        : null));
+    return {
+        type: types_1.NodeTypeEnum.Shadowsocks,
+        nodeName: decodeURIComponent(scheme.hash.replace('#', '')),
+        hostname: scheme.hostname,
+        port: scheme.port,
+        method: userInfo[0],
+        password: userInfo[1],
+        ...(pluginInfo['obfs-local']
+            ? {
+                obfs: pluginInfo.obfs,
+                obfsHost: pluginInfo['obfs-host'] + '',
+            }
+            : null),
+        ...(pluginInfo['simple-obfs']
+            ? {
+                obfs: pluginInfo.obfs,
+                obfsHost: pluginInfo['obfs-host'] + '',
+            }
+            : null),
+        ...(pluginInfo['v2ray-plugin']
+            ? {
+                obfs: pluginInfo.tls ? 'wss' : 'ws',
+                obfsHost: pluginInfo.host + '',
+            }
+            : null),
+    };
 };
 exports.parseSSUri = parseSSUri;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQThDO0FBQzlDLDZCQUEwQjtBQUUxQixvQ0FBK0Q7QUFDL0QsbUNBQThEO0FBRTlELE1BQU0sTUFBTSxHQUFHLElBQUEscUJBQVksRUFBQyxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxDQUFDLENBQUM7QUFFckQsTUFBTSxVQUFVLEdBQUcsQ0FBQyxHQUFXLEVBQXlCLEVBQUU7SUFDL0QsTUFBTSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUVyQyxNQUFNLE1BQU0sR0FBRyxJQUFJLFNBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUM1QixNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN2RCxNQUFNLFFBQVEsR0FBRyxJQUFBLHlCQUFpQixFQUFDLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FDM0UsR0FBRyxDQUNKLENBQUM7SUFDRixNQUFNLFVBQVUsR0FDZCxPQUFPLFlBQVksS0FBSyxRQUFRO1FBQzlCLENBQUMsQ0FBQyxJQUFBLHdCQUFnQixFQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDM0MsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUVULG1EQUNFLElBQUksRUFBRSxvQkFBWSxDQUFDLFdBQVcsRUFDOUIsUUFBUSxFQUFFLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUMxRCxRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFDekIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJLEVBQ2pCLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQ25CLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQ2xCLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQztRQUMxQixDQUFDLENBQUM7WUFDRSxJQUFJLEVBQUUsVUFBVSxDQUFDLElBQXNCO1lBQ3ZDLFdBQVcsRUFBRSxVQUFVLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRTtTQUMxQztRQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FDTixDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUM7UUFDM0IsQ0FBQyxDQUFDO1lBQ0UsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFzQjtZQUN2QyxXQUFXLEVBQUUsVUFBVSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUU7U0FDMUM7UUFDSCxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQ04sQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUFDO1FBQzVCLENBQUMsQ0FBQztZQUNFLElBQUksRUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUk7WUFDbkMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxJQUFJLEdBQUcsRUFBRTtTQUNsQztRQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsRUFDVDtBQUNKLENBQUMsQ0FBQztBQXZDVyxRQUFBLFVBQVUsY0F1Q3JCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQTZDO0FBQzdDLDZCQUF5QjtBQUV6QixvQ0FBOEQ7QUFDOUQsbUNBQTZEO0FBRTdELE1BQU0sTUFBTSxHQUFHLElBQUEscUJBQVksRUFBQyxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxDQUFDLENBQUE7QUFFcEQsTUFBTSxVQUFVLEdBQUcsQ0FBQyxHQUFXLEVBQXlCLEVBQUU7SUFDL0QsTUFBTSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsRUFBRSxHQUFHLENBQUMsQ0FBQTtJQUVwQyxNQUFNLE1BQU0sR0FBRyxJQUFJLFNBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUMzQixNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUN0RCxNQUFNLFFBQVEsR0FBRyxJQUFBLHlCQUFpQixFQUFDLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FDM0UsR0FBRyxDQUNKLENBQUE7SUFDRCxNQUFNLFVBQVUsR0FDZCxPQUFPLFlBQVksS0FBSyxRQUFRO1FBQzlCLENBQUMsQ0FBQyxJQUFBLHdCQUFnQixFQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDM0MsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtJQUVSLE9BQU87UUFDTCxJQUFJLEVBQUUsb0JBQVksQ0FBQyxXQUFXO1FBQzlCLFFBQVEsRUFBRSxrQkFBa0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDMUQsUUFBUSxFQUFFLE1BQU0sQ0FBQyxRQUFRO1FBQ3pCLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSTtRQUNqQixNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNuQixRQUFRLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNyQixHQUFHLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQztZQUMxQixDQUFDLENBQUM7Z0JBQ0UsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFzQjtnQkFDdkMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxXQUFXLENBQUMsR0FBRyxFQUFFO2FBQ3ZDO1lBQ0gsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUNULEdBQUcsQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDO1lBQzNCLENBQUMsQ0FBQztnQkFDRSxJQUFJLEVBQUUsVUFBVSxDQUFDLElBQXNCO2dCQUN2QyxRQUFRLEVBQUUsVUFBVSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUU7YUFDdkM7WUFDSCxDQUFDLENBQUMsSUFBSSxDQUFDO1FBQ1QsR0FBRyxDQUFDLFVBQVUsQ0FBQyxjQUFjLENBQUM7WUFDNUIsQ0FBQyxDQUFDO2dCQUNFLElBQUksRUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUk7Z0JBQ25DLFFBQVEsRUFBRSxVQUFVLENBQUMsSUFBSSxHQUFHLEVBQUU7YUFDL0I7WUFDSCxDQUFDLENBQUMsSUFBSSxDQUFDO0tBQ1YsQ0FBQTtBQUNILENBQUMsQ0FBQTtBQXZDWSxRQUFBLFVBQVUsY0F1Q3RCIn0=

package/build/utils/ssr.js

@@ -11,7 +11,6 @@ const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:ssr' });
  * ssr://xxx:xxx:xxx:xxx:xxx:xxx
  */
 const parseSSRUri = (str) => {
-    var _a, _b;
     const scheme = (0, index_1.fromUrlSafeBase64)(str.replace('ssr://', ''));
     const configArray = scheme.split('/');
     const basicInfo = configArray[0].split(':');
@@ -38,8 +37,8 @@ const parseSSRUri = (str) => {
         method,
         obfs,
         password,
-        protoparam: (0, index_1.fromUrlSafeBase64)((_a = extras.protoparam) !== null && _a !== void 0 ? _a : '').replace(/\s/g, ''),
-        obfsparam: (0, index_1.fromUrlSafeBase64)((_b = extras.obfsparam) !== null && _b !== void 0 ? _b : '').replace(/\s/g, ''),
+        protoparam: (0, index_1.fromUrlSafeBase64)(extras.protoparam ?? '').replace(/\s/g, ''),
+        obfsparam: (0, index_1.fromUrlSafeBase64)(extras.obfsparam ?? '').replace(/\s/g, ''),
     };
 };
 exports.parseSSRUri = parseSSRUri;
@@ -51,4 +50,4 @@ function getUrlParameters(url) {
     });
     return result;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL3Nzci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBOEM7QUFFOUMsb0NBQWdFO0FBQ2hFLG1DQUE0QztBQUU1QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO0FBRTdEOzs7O0dBSUc7QUFDSSxNQUFNLFdBQVcsR0FBRyxDQUFDLEdBQVcsRUFBMEIsRUFBRTs7SUFDakUsTUFBTSxNQUFNLEdBQUcsSUFBQSx5QkFBaUIsRUFBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzVELE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdEMsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUU1QyxNQUFNLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUVoQyxRQUFRO0lBQ1IsV0FBVyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBRXBCLE1BQU0sV0FBVyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDMUMsTUFBTSxNQUFNLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQ2hFLE1BQU0sUUFBUSxHQUFHLElBQUEseUJBQWlCLEVBQUMsU0FBUyxDQUFDLEdBQUcsRUFBWSxDQUFDLENBQUM7SUFDOUQsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLEdBQUcsRUFBWSxDQUFDO0lBQ3ZDLE1BQU0sTUFBTSxHQUFHLFNBQVMsQ0FBQyxHQUFHLEVBQVksQ0FBQztJQUN6QyxNQUFNLFFBQVEsR0FBRyxTQUFTLENBQUMsR0FBRyxFQUFZLENBQUM7SUFDM0MsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLEdBQUcsRUFBWSxDQUFDO0lBQ3ZDLE1BQU0sUUFBUSxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDckMsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLE9BQU87UUFDN0IsQ0FBQyxDQUFDLElBQUEseUJBQWlCLEVBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQztRQUNuQyxDQUFDLENBQUMsR0FBRyxRQUFRLElBQUksSUFBSSxFQUFFLENBQUM7SUFFMUIsT0FBTztRQUNMLElBQUksRUFBRSxvQkFBWSxDQUFDLFlBQVk7UUFDL0IsUUFBUTtRQUNSLFFBQVE7UUFDUixJQUFJO1FBQ0osUUFBUTtRQUNSLE1BQU07UUFDTixJQUFJO1FBQ0osUUFBUTtRQUNSLFVBQVUsRUFBRSxJQUFBLHlCQUFpQixFQUFDLE1BQUEsTUFBTSxDQUFDLFVBQVUsbUNBQUksRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUM7UUFDekUsU0FBUyxFQUFFLElBQUEseUJBQWlCLEVBQUMsTUFBQSxNQUFNLENBQUMsU0FBUyxtQ0FBSSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQztLQUN4RSxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBbENXLFFBQUEsV0FBVyxlQWtDdEI7QUFFRixTQUFTLGdCQUFnQixDQUFDLEdBQVc7SUFDbkMsTUFBTSxNQUFNLEdBQTJCLEVBQUUsQ0FBQztJQUMxQyxHQUFHLENBQUMsT0FBTyxDQUFDLDBCQUEwQixFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN2RCxNQUFNLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2QsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQyxDQUFDLENBQUM7SUFDSCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3Nzci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBNkM7QUFFN0Msb0NBQStEO0FBQy9ELG1DQUEyQztBQUUzQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxDQUFBO0FBRTVEOzs7O0dBSUc7QUFDSSxNQUFNLFdBQVcsR0FBRyxDQUFDLEdBQVcsRUFBMEIsRUFBRTtJQUNqRSxNQUFNLE1BQU0sR0FBRyxJQUFBLHlCQUFpQixFQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUE7SUFDM0QsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUNyQyxNQUFNLFNBQVMsR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBRTNDLE1BQU0sQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxDQUFBO0lBRS9CLFFBQVE7SUFDUixXQUFXLENBQUMsS0FBSyxFQUFFLENBQUE7SUFFbkIsTUFBTSxXQUFXLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUN6QyxNQUFNLE1BQU0sR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUE7SUFDL0QsTUFBTSxRQUFRLEdBQUcsSUFBQSx5QkFBaUIsRUFBQyxTQUFTLENBQUMsR0FBRyxFQUFZLENBQUMsQ0FBQTtJQUM3RCxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsR0FBRyxFQUFZLENBQUE7SUFDdEMsTUFBTSxNQUFNLEdBQUcsU0FBUyxDQUFDLEdBQUcsRUFBWSxDQUFBO0lBQ3hDLE1BQU0sUUFBUSxHQUFHLFNBQVMsQ0FBQyxHQUFHLEVBQVksQ0FBQTtJQUMxQyxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsR0FBRyxFQUFZLENBQUE7SUFDdEMsTUFBTSxRQUFRLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUNwQyxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsT0FBTztRQUM3QixDQUFDLENBQUMsSUFBQSx5QkFBaUIsRUFBQyxNQUFNLENBQUMsT0FBTyxDQUFDO1FBQ25DLENBQUMsQ0FBQyxHQUFHLFFBQVEsSUFBSSxJQUFJLEVBQUUsQ0FBQTtJQUV6QixPQUFPO1FBQ0wsSUFBSSxFQUFFLG9CQUFZLENBQUMsWUFBWTtRQUMvQixRQUFRO1FBQ1IsUUFBUTtRQUNSLElBQUk7UUFDSixRQUFRO1FBQ1IsTUFBTTtRQUNOLElBQUk7UUFDSixRQUFRO1FBQ1IsVUFBVSxFQUFFLElBQUEseUJBQWlCLEVBQUMsTUFBTSxDQUFDLFVBQVUsSUFBSSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQztRQUN6RSxTQUFTLEVBQUUsSUFBQSx5QkFBaUIsRUFBQyxNQUFNLENBQUMsU0FBUyxJQUFJLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDO0tBQ3hFLENBQUE7QUFDSCxDQUFDLENBQUE7QUFsQ1ksUUFBQSxXQUFXLGVBa0N2QjtBQUVELFNBQVMsZ0JBQWdCLENBQUMsR0FBVztJQUNuQyxNQUFNLE1BQU0sR0FBMkIsRUFBRSxDQUFBO0lBQ3pDLEdBQUcsQ0FBQyxPQUFPLENBQUMsMEJBQTBCLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQ3ZELE1BQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDYixPQUFPLE1BQU0sQ0FBQTtJQUNmLENBQUMsQ0FBQyxDQUFBO0lBQ0YsT0FBTyxNQUFNLENBQUE7QUFDZixDQUFDIn0=

package/build/utils/subscription.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatSubscriptionUserInfo = exports.parseSubscriptionNode = exports.parseSubscriptionUserInfo = void 0;
-const filesize_1 = __importDefault(require("filesize"));
+const filesize_1 = require("filesize");
 const bytes_1 = __importDefault(require("bytes"));
 const date_fns_1 = require("date-fns");
 const parseSubscriptionUserInfo = (str) => {
@@ -51,17 +51,17 @@ const parseSubscriptionNode = (dataString, expireString) => {
 exports.parseSubscriptionNode = parseSubscriptionNode;
 const formatSubscriptionUserInfo = (userInfo) => {
     return {
-        upload: (0, filesize_1.default)(userInfo.upload, { base: 2 }),
-        download: (0, filesize_1.default)(userInfo.download, { base: 2 }),
-        used: (0, filesize_1.default)(userInfo.upload + userInfo.download, { base: 2 }),
-        left: (0, filesize_1.default)(userInfo.total - userInfo.upload - userInfo.download, {
+        upload: (0, filesize_1.filesize)(userInfo.upload, { base: 2 }),
+        download: (0, filesize_1.filesize)(userInfo.download, { base: 2 }),
+        used: (0, filesize_1.filesize)(userInfo.upload + userInfo.download, { base: 2 }),
+        left: (0, filesize_1.filesize)(userInfo.total - userInfo.upload - userInfo.download, {
             base: 2,
         }),
-        total: (0, filesize_1.default)(userInfo.total, { base: 2 }),
+        total: (0, filesize_1.filesize)(userInfo.total, { base: 2 }),
         expire: userInfo.expire
             ? `${(0, date_fns_1.format)(new Date(userInfo.expire * 1000), 'yyyy-MM-dd')} (${(0, date_fns_1.formatDistanceToNow)(new Date(userInfo.expire * 1000))})`
             : '无数据',
     };
 };
 exports.formatSubscriptionUserInfo = formatSubscriptionUserInfo;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Vic2NyaXB0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL3N1YnNjcmlwdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx3REFBZ0M7QUFDaEMsa0RBQTBCO0FBQzFCLHVDQUF1RDtBQUloRCxNQUFNLHlCQUF5QixHQUFHLENBQ3ZDLEdBQVcsRUFDVyxFQUFFO0lBQ3hCLE1BQU0sR0FBRyxHQUFHO1FBQ1YsTUFBTSxFQUFFLENBQUM7UUFDVCxRQUFRLEVBQUUsQ0FBQztRQUNYLEtBQUssRUFBRSxDQUFDO1FBQ1IsTUFBTSxFQUFFLENBQUM7S0FDVixDQUFDO0lBRUYsR0FBRyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUM5QixJQUFJLENBQUMsSUFBSSxFQUFFO1lBQ1QsT0FBTztTQUNSO1FBQ0QsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM3QixNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFFckMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDeEIsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztTQUM5QztJQUNILENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDLENBQUM7QUF2QlcsUUFBQSx5QkFBeUIsNkJBdUJwQztBQUVLLE1BQU0scUJBQXFCLEdBQUcsQ0FDbkMsVUFBa0IsRUFDbEIsWUFBb0IsRUFDYyxFQUFFO0lBQ3BDLG1DQUFtQztJQUNuQywyQ0FBMkM7SUFFM0MsTUFBTSxTQUFTLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO0lBQ3pFLE1BQU0sV0FBVyxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7SUFFckQsSUFBSSxTQUFTLElBQUksV0FBVyxFQUFFO1FBQzVCLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUM7UUFDM0MsTUFBTSxRQUFRLEdBQUcsZUFBSyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMzQyxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdEQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUVyRSxPQUFPO1lBQ0wsTUFBTSxFQUFFLENBQUM7WUFDVCxRQUFRLEVBQUUsS0FBSyxHQUFHLFFBQVE7WUFDMUIsS0FBSztZQUNMLE1BQU07U0FDUCxDQUFDO0tBQ0g7U0FBTTtRQUNMLE9BQU8sU0FBUyxDQUFDO0tBQ2xCO0FBQ0gsQ0FBQyxDQUFDO0FBekJXLFFBQUEscUJBQXFCLHlCQXlCaEM7QUFFSyxNQUFNLDBCQUEwQixHQUFHLENBQ3hDLFFBQThCLEVBUTlCLEVBQUU7SUFDRixPQUFPO1FBQ0wsTUFBTSxFQUFFLElBQUEsa0JBQVEsRUFBQyxRQUFRLENBQUMsTUFBTSxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDO1FBQzlDLFFBQVEsRUFBRSxJQUFBLGtCQUFRLEVBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQztRQUNsRCxJQUFJLEVBQUUsSUFBQSxrQkFBUSxFQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsUUFBUSxDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQztRQUNoRSxJQUFJLEVBQUUsSUFBQSxrQkFBUSxFQUFDLFFBQVEsQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFDLE1BQU0sR0FBRyxRQUFRLENBQUMsUUFBUSxFQUFFO1lBQ25FLElBQUksRUFBRSxDQUFDO1NBQ1IsQ0FBQztRQUNGLEtBQUssRUFBRSxJQUFBLGtCQUFRLEVBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQztRQUM1QyxNQUFNLEVBQUUsUUFBUSxDQUFDLE1BQU07WUFDckIsQ0FBQyxDQUFDLEdBQUcsSUFBQSxpQkFBTSxFQUNQLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLEVBQ2hDLFlBQVksQ0FDYixLQUFLLElBQUEsOEJBQW1CLEVBQUMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsQ0FBQyxHQUFHO1lBQ2hFLENBQUMsQ0FBQyxLQUFLO0tBQ1YsQ0FBQztBQUNKLENBQUMsQ0FBQztBQXpCVyxRQUFBLDBCQUEwQiw4QkF5QnJDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Vic2NyaXB0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3N1YnNjcmlwdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx1Q0FBbUM7QUFDbkMsa0RBQXlCO0FBQ3pCLHVDQUFzRDtBQUkvQyxNQUFNLHlCQUF5QixHQUFHLENBQ3ZDLEdBQVcsRUFDVyxFQUFFO0lBQ3hCLE1BQU0sR0FBRyxHQUFHO1FBQ1YsTUFBTSxFQUFFLENBQUM7UUFDVCxRQUFRLEVBQUUsQ0FBQztRQUNYLEtBQUssRUFBRSxDQUFDO1FBQ1IsTUFBTSxFQUFFLENBQUM7S0FDVixDQUFBO0lBRUQsR0FBRyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUM5QixJQUFJLENBQUMsSUFBSSxFQUFFO1lBQ1QsT0FBTTtTQUNQO1FBQ0QsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUM1QixNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUE7UUFFcEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDeEIsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQTtTQUM3QztJQUNILENBQUMsQ0FBQyxDQUFBO0lBRUYsT0FBTyxHQUFHLENBQUE7QUFDWixDQUFDLENBQUE7QUF2QlksUUFBQSx5QkFBeUIsNkJBdUJyQztBQUVNLE1BQU0scUJBQXFCLEdBQUcsQ0FDbkMsVUFBa0IsRUFDbEIsWUFBb0IsRUFDYyxFQUFFO0lBQ3BDLG1DQUFtQztJQUNuQywyQ0FBMkM7SUFFM0MsTUFBTSxTQUFTLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFBO0lBQ3hFLE1BQU0sV0FBVyxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUE7SUFFcEQsSUFBSSxTQUFTLElBQUksV0FBVyxFQUFFO1FBQzVCLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUE7UUFDMUMsTUFBTSxRQUFRLEdBQUcsZUFBSyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUMxQyxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDckQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQTtRQUVwRSxPQUFPO1lBQ0wsTUFBTSxFQUFFLENBQUM7WUFDVCxRQUFRLEVBQUUsS0FBSyxHQUFHLFFBQVE7WUFDMUIsS0FBSztZQUNMLE1BQU07U0FDUCxDQUFBO0tBQ0Y7U0FBTTtRQUNMLE9BQU8sU0FBUyxDQUFBO0tBQ2pCO0FBQ0gsQ0FBQyxDQUFBO0FBekJZLFFBQUEscUJBQXFCLHlCQXlCakM7QUFFTSxNQUFNLDBCQUEwQixHQUFHLENBQ3hDLFFBQThCLEVBUTlCLEVBQUU7SUFDRixPQUFPO1FBQ0wsTUFBTSxFQUFFLElBQUEsbUJBQVEsRUFBQyxRQUFRLENBQUMsTUFBTSxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFXO1FBQ3hELFFBQVEsRUFBRSxJQUFBLG1CQUFRLEVBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBVztRQUM1RCxJQUFJLEVBQUUsSUFBQSxtQkFBUSxFQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsUUFBUSxDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBVztRQUMxRSxJQUFJLEVBQUUsSUFBQSxtQkFBUSxFQUFDLFFBQVEsQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFDLE1BQU0sR0FBRyxRQUFRLENBQUMsUUFBUSxFQUFFO1lBQ25FLElBQUksRUFBRSxDQUFDO1NBQ1IsQ0FBVztRQUNaLEtBQUssRUFBRSxJQUFBLG1CQUFRLEVBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBVztRQUN0RCxNQUFNLEVBQUUsUUFBUSxDQUFDLE1BQU07WUFDckIsQ0FBQyxDQUFDLEdBQUcsSUFBQSxpQkFBTSxFQUNQLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLEVBQ2hDLFlBQVksQ0FDYixLQUFLLElBQUEsOEJBQW1CLEVBQUMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsQ0FBQyxHQUFHO1lBQ2hFLENBQUMsQ0FBQyxLQUFLO0tBQ1YsQ0FBQTtBQUNILENBQUMsQ0FBQTtBQXpCWSxRQUFBLDBCQUEwQiw4QkF5QnRDIn0=

package/build/utils/surfboard.d.ts

@@ -1,6 +1,7 @@
-import { NodeFilterType, PossibleNodeConfigType, SortedNodeNameFilterType } from '../types';
+import { NodeFilterType, PossibleNodeConfigType, SortedNodeFilterType } from '../types';
 export declare const getSurfboardExtendHeaders: (wsHeaders: Record<string, string>) => string;
 /**
  * @see https://manual.nssurge.com/policy/proxy.html
  */
-export declare const getSurfboardNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeNameFilterType) => string;
+export declare const getSurfboardNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeFilterType) => string;
+export declare const getSurfboardNodeNames: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeFilterType) => string;

package/build/utils/surfboard.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSurfboardNodes = exports.getSurfboardExtendHeaders = void 0;
+exports.getSurfboardNodeNames = exports.getSurfboardNodes = exports.getSurfboardExtendHeaders = void 0;
 const logger_1 = require("@surgio/logger");
 const lodash_1 = __importDefault(require("lodash"));
 const constant_1 = require("../constant");
@@ -21,145 +21,161 @@ exports.getSurfboardExtendHeaders = getSurfboardExtendHeaders;
  * @see https://manual.nssurge.com/policy/proxy.html
  */
 const getSurfboardNodes = function (list, filter) {
-    // istanbul ignore next
-    if (arguments.length === 2 && typeof filter === 'undefined') {
-        throw new Error(constant_1.ERR_INVALID_FILTER);
-    }
     const result = (0, filter_1.applyFilter)(list, filter)
-        .map((nodeConfig) => {
-        var _a;
-        switch (nodeConfig.type) {
-            case types_1.NodeTypeEnum.Shadowsocks: {
-                const config = nodeConfig;
-                if (config.obfs && ['ws', 'wss'].includes(config.obfs)) {
-                    logger.warn(`不支持为 Surfboard 生成 v2ray-plugin 的 Shadowsocks 节点，节点 ${nodeConfig.nodeName} 会被省略`);
-                    return void 0;
-                }
-                return [
-                    config.nodeName,
+        .map(nodeListMapper)
+        .filter((item) => item !== undefined)
+        .map((item) => item[1]);
+    return result.join('\n');
+};
+exports.getSurfboardNodes = getSurfboardNodes;
+const getSurfboardNodeNames = function (list, filter) {
+    return (0, filter_1.applyFilter)(list, filter)
+        .map(nodeListMapper)
+        .filter((item) => item !== undefined)
+        .map((item) => item[0])
+        .join(', ');
+};
+exports.getSurfboardNodeNames = getSurfboardNodeNames;
+function nodeListMapper(nodeConfig) {
+    switch (nodeConfig.type) {
+        case types_1.NodeTypeEnum.Shadowsocks: {
+            if (nodeConfig.obfs && ['ws', 'wss'].includes(nodeConfig.obfs)) {
+                logger.warn(`不支持为 Surfboard 生成 v2ray-plugin 的 Shadowsocks 节点，节点 ${nodeConfig.nodeName} 会被省略`);
+                return void 0;
+            }
+            return [
+                nodeConfig.nodeName,
+                [
+                    nodeConfig.nodeName,
                     [
                         'ss',
-                        config.hostname,
-                        config.port,
-                        'encrypt-method=' + config.method,
-                        ...(0, index_1.pickAndFormatStringList)(config, [
-                            'password',
-                            'udp-relay',
-                            'obfs',
-                            'obfs-host',
-                        ]),
+                        nodeConfig.hostname,
+                        nodeConfig.port,
+                        'encrypt-method=' + nodeConfig.method,
+                        ...(0, index_1.pickAndFormatStringList)(nodeConfig, ['password', 'udpRelay', 'obfs', 'obfsHost'], {
+                            keyFormat: 'kebabCase',
+                        }),
                     ].join(', '),
-                ].join(' = ');
-            }
-            case types_1.NodeTypeEnum.HTTPS: {
-                const config = nodeConfig;
-                return [
-                    config.nodeName,
+                ].join(' = '),
+            ];
+        }
+        case types_1.NodeTypeEnum.HTTPS: {
+            return [
+                nodeConfig.nodeName,
+                [
+                    nodeConfig.nodeName,
                     [
                         'https',
-                        config.hostname,
-                        config.port,
-                        config.username,
-                        config.password,
-                        ...(typeof config.skipCertVerify === 'boolean'
-                            ? [`skip-cert-verify=${config.skipCertVerify}`]
+                        nodeConfig.hostname,
+                        nodeConfig.port,
+                        nodeConfig.username,
+                        nodeConfig.password,
+                        ...(typeof nodeConfig.skipCertVerify === 'boolean'
+                            ? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
                             : []),
-                        ...(0, index_1.pickAndFormatStringList)(config, ['sni']),
+                        ...(0, index_1.pickAndFormatStringList)(nodeConfig, ['sni']),
                     ].join(', '),
-                ].join(' = ');
-            }
-            case types_1.NodeTypeEnum.HTTP: {
-                const config = nodeConfig;
-                return [
-                    config.nodeName,
+                ].join(' = '),
+            ];
+        }
+        case types_1.NodeTypeEnum.HTTP: {
+            return [
+                nodeConfig.nodeName,
+                [
+                    nodeConfig.nodeName,
                     [
                         'http',
-                        config.hostname,
-                        config.port,
-                        config.username,
-                        config.password,
+                        nodeConfig.hostname,
+                        nodeConfig.port,
+                        nodeConfig.username,
+                        nodeConfig.password,
                     ].join(', '),
-                ].join(' = ');
+                ].join(' = '),
+            ];
+        }
+        case types_1.NodeTypeEnum.Vmess: {
+            const result = [
+                'vmess',
+                nodeConfig.hostname,
+                nodeConfig.port,
+                `username=${nodeConfig.uuid}`,
+            ];
+            if (['chacha20-ietf-poly1305', 'aes-128-gcm'].includes(nodeConfig.method)) {
+                result.push(`encrypt-method=${nodeConfig.method}`);
             }
-            case types_1.NodeTypeEnum.Vmess: {
-                const config = nodeConfig;
-                const configList = [
-                    'vmess',
-                    config.hostname,
-                    config.port,
-                    `username=${config.uuid}`,
-                ];
-                if (['chacha20-ietf-poly1305', 'aes-128-gcm'].includes(config.method)) {
-                    configList.push(`encrypt-method=${config.method}`);
-                }
-                if (config.network === 'ws') {
-                    configList.push('ws=true');
-                    configList.push(`ws-path=${config.path}`);
-                    configList.push('ws-headers=' +
-                        JSON.stringify((0, exports.getSurfboardExtendHeaders)(Object.assign({ host: config.host || config.hostname, 'user-agent': constant_1.OBFS_UA }, lodash_1.default.omit(config.wsHeaders, ['host'])))));
-                }
-                if (config.tls) {
-                    configList.push('tls=true', ...(typeof config.skipCertVerify === 'boolean'
-                        ? [`skip-cert-verify=${config.skipCertVerify}`]
-                        : []), ...(config.host ? [`sni=${config.host}`] : []));
-                }
-                if ((_a = nodeConfig === null || nodeConfig === void 0 ? void 0 : nodeConfig.surfboardConfig) === null || _a === void 0 ? void 0 : _a.vmessAEAD) {
-                    configList.push('vmess-aead=true');
-                }
-                else {
-                    configList.push('vmess-aead=false');
-                }
-                return [config.nodeName, configList.join(', ')].join(' = ');
+            if (nodeConfig.network === 'ws') {
+                result.push('ws=true');
+                result.push(`ws-path=${nodeConfig.path}`);
+                result.push('ws-headers=' +
+                    JSON.stringify((0, exports.getSurfboardExtendHeaders)({
+                        host: nodeConfig.host || nodeConfig.hostname,
+                        'user-agent': constant_1.OBFS_UA,
+                        ...lodash_1.default.omit(nodeConfig.wsHeaders, ['host']), // host 本质上是一个头信息，所以可能存在冲突的情况。以 host 属性为准。
+                    })));
             }
-            case types_1.NodeTypeEnum.Trojan: {
-                const configList = [
-                    'trojan',
-                    nodeConfig.hostname,
-                    `${nodeConfig.port}`,
-                    `password=${nodeConfig.password}`,
-                    ...(0, index_1.pickAndFormatStringList)(nodeConfig, ['sni']),
-                    ...(typeof nodeConfig.skipCertVerify === 'boolean'
-                        ? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
-                        : []),
-                ];
-                if (nodeConfig.network === 'ws') {
-                    configList.push('ws=true');
-                    configList.push(`ws-path=${nodeConfig.wsPath}`);
-                    if (nodeConfig.wsHeaders) {
-                        configList.push('ws-headers=' +
-                            JSON.stringify((0, exports.getSurfboardExtendHeaders)(nodeConfig.wsHeaders)));
-                    }
-                }
-                return [nodeConfig.nodeName, configList.join(', ')].join(' = ');
+            if (nodeConfig.tls) {
+                result.push('tls=true', ...(typeof nodeConfig.skipCertVerify === 'boolean'
+                    ? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
+                    : []), ...(nodeConfig.host ? [`sni=${nodeConfig.host}`] : []));
             }
-            case types_1.NodeTypeEnum.Socks5: {
-                const config = [
-                    nodeConfig.tls === true ? 'socks5-tls' : 'socks5',
-                    nodeConfig.hostname,
-                    nodeConfig.port,
-                    ...(0, index_1.pickAndFormatStringList)(nodeConfig, [
-                        'username',
-                        'password',
-                        'sni',
-                    ]),
-                ];
-                if (nodeConfig.tls === true) {
-                    config.push(...(typeof nodeConfig.skipCertVerify === 'boolean'
-                        ? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
-                        : []), ...(typeof nodeConfig.clientCert === 'string'
-                        ? [`client-cert=${nodeConfig.clientCert}`]
-                        : []));
+            if (nodeConfig?.surfboardConfig?.vmessAEAD) {
+                result.push('vmess-aead=true');
+            }
+            else {
+                result.push('vmess-aead=false');
+            }
+            return [
+                nodeConfig.nodeName,
+                [nodeConfig.nodeName, result.join(', ')].join(' = '),
+            ];
+        }
+        case types_1.NodeTypeEnum.Trojan: {
+            const result = [
+                'trojan',
+                nodeConfig.hostname,
+                `${nodeConfig.port}`,
+                `password=${nodeConfig.password}`,
+                ...(0, index_1.pickAndFormatStringList)(nodeConfig, ['sni']),
+                ...(typeof nodeConfig.skipCertVerify === 'boolean'
+                    ? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
+                    : []),
+            ];
+            if (nodeConfig.network === 'ws') {
+                result.push('ws=true');
+                result.push(`ws-path=${nodeConfig.wsPath}`);
+                if (nodeConfig.wsHeaders) {
+                    result.push('ws-headers=' +
+                        JSON.stringify((0, exports.getSurfboardExtendHeaders)(nodeConfig.wsHeaders)));
                 }
-                return [nodeConfig.nodeName, config.join(', ')].join(' = ');
             }
-            // istanbul ignore next
-            default:
-                logger.warn(`不支持为 Surfboard 生成 ${nodeConfig.type} 的节点，节点 ${nodeConfig.nodeName} 会被省略`);
-                return void 0;
+            return [
+                nodeConfig.nodeName,
+                [nodeConfig.nodeName, result.join(', ')].join(' = '),
+            ];
         }
-    })
-        .filter((item) => item !== undefined);
-    return result.join('\n');
-};
-exports.getSurfboardNodes = getSurfboardNodes;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3VyZmJvYXJkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL3N1cmZib2FyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwyQ0FBOEM7QUFDOUMsb0RBQXVCO0FBQ3ZCLDBDQUEwRDtBQUMxRCxvQ0FTa0I7QUFDbEIsbUNBQWtEO0FBQ2xELHFDQUF1QztBQUV2QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsQ0FBQyxDQUFDO0FBRTVELE1BQU0seUJBQXlCLEdBQUcsQ0FDdkMsU0FBaUMsRUFDekIsRUFBRTtJQUNWLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7U0FDMUIsR0FBRyxDQUFDLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxHQUFHLFNBQVMsSUFBSSxTQUFTLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztTQUMxRCxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDZixDQUFDLENBQUM7QUFOVyxRQUFBLHlCQUF5Qiw2QkFNcEM7QUFFRjs7R0FFRztBQUNJLE1BQU0saUJBQWlCLEdBQUcsVUFDL0IsSUFBMkMsRUFDM0MsTUFBa0Q7SUFFbEQsdUJBQXVCO0lBQ3ZCLElBQUksU0FBUyxDQUFDLE1BQU0sS0FBSyxDQUFDLElBQUksT0FBTyxNQUFNLEtBQUssV0FBVyxFQUFFO1FBQzNELE1BQU0sSUFBSSxLQUFLLENBQUMsNkJBQWtCLENBQUMsQ0FBQztLQUNyQztJQUVELE1BQU0sTUFBTSxHQUFhLElBQUEsb0JBQVcsRUFBQyxJQUFJLEVBQUUsTUFBTSxDQUFDO1NBQy9DLEdBQUcsQ0FBQyxDQUFDLFVBQVUsRUFBc0IsRUFBRTs7UUFDdEMsUUFBUSxVQUFVLENBQUMsSUFBSSxFQUFFO1lBQ3ZCLEtBQUssb0JBQVksQ0FBQyxXQUFXLENBQUMsQ0FBQztnQkFDN0IsTUFBTSxNQUFNLEdBQUcsVUFBbUMsQ0FBQztnQkFF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
+        case types_1.NodeTypeEnum.Socks5: {
+            const result = [
+                nodeConfig.tls === true ? 'socks5-tls' : 'socks5',
+                nodeConfig.hostname,
+                nodeConfig.port,
+                ...(0, index_1.pickAndFormatStringList)(nodeConfig, ['username', 'password', 'sni']),
+            ];
+            if (nodeConfig.tls === true) {
+                result.push(...(typeof nodeConfig.skipCertVerify === 'boolean'
+                    ? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
+                    : []), ...(typeof nodeConfig.clientCert === 'string'
+                    ? [`client-cert=${nodeConfig.clientCert}`]
+                    : []));
+            }
+            return [
+                nodeConfig.nodeName,
+                [nodeConfig.nodeName, result.join(', ')].join(' = '),
+            ];
+        }
+        // istanbul ignore next
+        default:
+            logger.warn(`不支持为 Surfboard 生成 ${nodeConfig.type} 的节点，节点 ${nodeConfig.nodeName} 会被省略`);
+            return void 0;
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3VyZmJvYXJkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3N1cmZib2FyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwyQ0FBNkM7QUFDN0Msb0RBQXNCO0FBRXRCLDBDQUFxQztBQUNyQyxvQ0FLaUI7QUFDakIsbUNBQWlEO0FBQ2pELHFDQUFzQztBQUV0QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsQ0FBQyxDQUFBO0FBRTNELE1BQU0seUJBQXlCLEdBQUcsQ0FDdkMsU0FBaUMsRUFDekIsRUFBRTtJQUNWLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7U0FDMUIsR0FBRyxDQUFDLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxHQUFHLFNBQVMsSUFBSSxTQUFTLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztTQUMxRCxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7QUFDZCxDQUFDLENBQUE7QUFOWSxRQUFBLHlCQUF5Qiw2QkFNckM7QUFFRDs7R0FFRztBQUNJLE1BQU0saUJBQWlCLEdBQUcsVUFDL0IsSUFBMkMsRUFDM0MsTUFBOEM7SUFFOUMsTUFBTSxNQUFNLEdBQWEsSUFBQSxvQkFBVyxFQUFDLElBQUksRUFBRSxNQUFNLENBQUM7U0FDL0MsR0FBRyxDQUFDLGNBQWMsQ0FBQztTQUNuQixNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQTRCLEVBQUUsQ0FBQyxJQUFJLEtBQUssU0FBUyxDQUFDO1NBQzlELEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFFekIsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO0FBQzFCLENBQUMsQ0FBQTtBQVZZLFFBQUEsaUJBQWlCLHFCQVU3QjtBQUVNLE1BQU0scUJBQXFCLEdBQUcsVUFD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

package/build/utils/surge.d.ts

@@ -1,6 +1,8 @@
-import { NodeFilterType, PossibleNodeConfigType, SortedNodeNameFilterType } from '../types';
+import { NodeFilterType, PossibleNodeConfigType, SortedNodeFilterType } from '../types';
 export declare const getSurgeExtendHeaders: (wsHeaders: Record<string, string>) => string;
 /**
  * @see https://manual.nssurge.com/policy/proxy.html
  */
-export declare const getSurgeNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeNameFilterType) => string;
+export declare const getSurgeNodes: (nodeList: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeFilterType) => string;
+export declare const getSurgeWireguardNodes: (nodeList: ReadonlyArray<PossibleNodeConfigType>) => string;
+export declare const getSurgeNodeNames: (nodeList: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeFilterType) => string;