surgio 2.16.0 → 2.18.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +27 -0
- package/build/generator/artifact.d.ts +3 -1
- package/build/generator/artifact.js +7 -5
- package/build/index.d.ts +2 -1
- package/build/index.js +6 -3
- package/build/provider/ClashProvider.d.ts +12 -3
- package/build/provider/ClashProvider.js +17 -8
- package/build/provider/Provider.d.ts +7 -2
- package/build/provider/Provider.js +37 -10
- package/build/provider/ShadowsocksJsonSubscribeProvider.d.ts +5 -3
- package/build/provider/ShadowsocksJsonSubscribeProvider.js +42 -4
- package/build/provider/ShadowsocksSubscribeProvider.d.ts +7 -3
- package/build/provider/ShadowsocksSubscribeProvider.js +9 -7
- package/build/provider/ShadowsocksrSubscribeProvider.d.ts +7 -3
- package/build/provider/ShadowsocksrSubscribeProvider.js +9 -7
- package/build/provider/SsdProvider.d.ts +7 -3
- package/build/provider/SsdProvider.js +9 -7
- package/build/provider/TrojanProvider.d.ts +12 -3
- package/build/provider/TrojanProvider.js +17 -7
- package/build/provider/V2rayNSubscribeProvider.d.ts +11 -2
- package/build/provider/V2rayNSubscribeProvider.js +16 -14
- package/build/types.d.ts +2 -1
- package/build/utils/cache.d.ts +4 -3
- package/build/utils/cache.js +17 -9
- package/build/utils/clash.d.ts +1 -1
- package/build/utils/dns.js +5 -5
- package/build/utils/env-flag.js +1 -1
- package/build/utils/index.d.ts +3 -2
- package/build/utils/index.js +7 -41
- package/build/utils/patch-proxy.js +7 -2
- package/build/utils/surge.d.ts +1 -1
- package/package.json +2 -3
package/build/utils/index.js
CHANGED
|
@@ -17,9 +17,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
17
17
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
18
|
};
|
|
19
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
-
exports.isRailway = exports.isPkgBundle = exports.isGitLabCI = exports.isGitHubActions = exports.isHeroku = exports.isVercel = exports.isNow = exports.isIp = exports.lowercaseHeaderKeys = exports.formatV2rayConfig = exports.ensureConfigFolder = exports.normalizeClashProxyGroupConfig = exports.decodeStringList = exports.pickAndFormatStringList = exports.toYaml = exports.generateClashProxyGroup = exports.getNodeNames = exports.getShadowsocksNodesJSON = exports.getV2rayNNodes = exports.getShadowsocksrNodes = exports.getShadowsocksNodes = exports.fromBase64 = exports.toBase64 = exports.fromUrlSafeBase64 = exports.toUrlSafeBase64 = exports.getMellowNodes = exports.
|
|
20
|
+
exports.isNetlify = exports.isRailway = exports.isPkgBundle = exports.isGitLabCI = exports.isGitHubActions = exports.isHeroku = exports.isVercel = exports.isNow = exports.isIp = exports.msToSeconds = exports.lowercaseHeaderKeys = exports.formatV2rayConfig = exports.ensureConfigFolder = exports.normalizeClashProxyGroupConfig = exports.decodeStringList = exports.pickAndFormatStringList = exports.toYaml = exports.generateClashProxyGroup = exports.getNodeNames = exports.getShadowsocksNodesJSON = exports.getV2rayNNodes = exports.getShadowsocksrNodes = exports.getShadowsocksNodes = exports.fromBase64 = exports.toBase64 = exports.fromUrlSafeBase64 = exports.toUrlSafeBase64 = exports.getMellowNodes = exports.getUrl = exports.getDownloadUrl = void 0;
|
|
21
21
|
const logger_1 = require("@surgio/logger");
|
|
22
|
-
const assert_1 = __importDefault(require("assert"));
|
|
23
22
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
24
23
|
const lodash_1 = __importDefault(require("lodash"));
|
|
25
24
|
const os_1 = __importDefault(require("os"));
|
|
@@ -30,10 +29,8 @@ const urlsafe_base64_1 = __importDefault(require("urlsafe-base64"));
|
|
|
30
29
|
const yaml_1 = __importDefault(require("yaml"));
|
|
31
30
|
const net_1 = __importDefault(require("net"));
|
|
32
31
|
const types_1 = require("../types");
|
|
33
|
-
const cache_1 = require("./cache");
|
|
34
32
|
const constant_1 = require("../constant");
|
|
35
33
|
const filter_1 = require("./filter");
|
|
36
|
-
const http_client_1 = __importDefault(require("./http-client"));
|
|
37
34
|
const v2ray_1 = require("./v2ray");
|
|
38
35
|
__exportStar(require("./surge"), exports);
|
|
39
36
|
__exportStar(require("./clash"), exports);
|
|
@@ -69,42 +66,6 @@ const getUrl = (baseUrl, path, accessToken) => {
|
|
|
69
66
|
return url.toString();
|
|
70
67
|
};
|
|
71
68
|
exports.getUrl = getUrl;
|
|
72
|
-
const getShadowsocksJSONConfig = async (url, udpRelay) => {
|
|
73
|
-
(0, assert_1.default)(url, '未指定订阅地址 url');
|
|
74
|
-
async function requestConfigFromRemote() {
|
|
75
|
-
const response = cache_1.ConfigCache.has(url)
|
|
76
|
-
? JSON.parse(cache_1.ConfigCache.get(url))
|
|
77
|
-
: await (async () => {
|
|
78
|
-
const res = await http_client_1.default.get(url);
|
|
79
|
-
cache_1.ConfigCache.set(url, res.body);
|
|
80
|
-
return JSON.parse(res.body);
|
|
81
|
-
})();
|
|
82
|
-
return response.configs.map((item) => {
|
|
83
|
-
const nodeConfig = {
|
|
84
|
-
nodeName: item.remarks,
|
|
85
|
-
type: types_1.NodeTypeEnum.Shadowsocks,
|
|
86
|
-
hostname: item.server,
|
|
87
|
-
port: item.server_port,
|
|
88
|
-
method: item.method,
|
|
89
|
-
password: item.password,
|
|
90
|
-
};
|
|
91
|
-
if (typeof udpRelay === 'boolean') {
|
|
92
|
-
nodeConfig['udp-relay'] = udpRelay;
|
|
93
|
-
}
|
|
94
|
-
if (item.plugin === 'obfs-local') {
|
|
95
|
-
const obfs = item.plugin_opts.match(/obfs=(\w+)/);
|
|
96
|
-
const obfsHost = item.plugin_opts.match(/obfs-host=(.+)$/);
|
|
97
|
-
if (obfs) {
|
|
98
|
-
nodeConfig.obfs = obfs[1];
|
|
99
|
-
nodeConfig['obfs-host'] = obfsHost ? obfsHost[1] : 'www.bing.com';
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
return nodeConfig;
|
|
103
|
-
});
|
|
104
|
-
}
|
|
105
|
-
return await requestConfigFromRemote();
|
|
106
|
-
};
|
|
107
|
-
exports.getShadowsocksJSONConfig = getShadowsocksJSONConfig;
|
|
108
69
|
const getMellowNodes = function (list, filter) {
|
|
109
70
|
// istanbul ignore next
|
|
110
71
|
if (arguments.length === 2 && typeof filter === 'undefined') {
|
|
@@ -471,6 +432,8 @@ const lowercaseHeaderKeys = (headers) => {
|
|
|
471
432
|
return wsHeaders;
|
|
472
433
|
};
|
|
473
434
|
exports.lowercaseHeaderKeys = lowercaseHeaderKeys;
|
|
435
|
+
const msToSeconds = (ms) => Math.floor(ms / 1000);
|
|
436
|
+
exports.msToSeconds = msToSeconds;
|
|
474
437
|
// istanbul ignore next
|
|
475
438
|
const isIp = (str) => net_1.default.isIPv4(str) || net_1.default.isIPv6(str);
|
|
476
439
|
exports.isIp = isIp;
|
|
@@ -496,4 +459,7 @@ exports.isPkgBundle = isPkgBundle;
|
|
|
496
459
|
// istanbul ignore next
|
|
497
460
|
const isRailway = () => typeof process.env.RAILWAY_STATIC_URL !== 'undefined';
|
|
498
461
|
exports.isRailway = isRailway;
|
|
499
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/utils/index.ts"],"names":[],"mappings":"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"}
|
|
462
|
+
// istanbul ignore next
|
|
463
|
+
const isNetlify = () => typeof process.env.NETLIFY !== 'undefined';
|
|
464
|
+
exports.isNetlify = isNetlify;
|
|
465
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/utils/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,12 @@ const logger_1 = require("@surgio/logger");
|
|
|
5
5
|
const _1 = require("./");
|
|
6
6
|
const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:patch-proxy' });
|
|
7
7
|
const keys = ['http_proxy', 'https_proxy', 'all_proxy'];
|
|
8
|
-
if (!(0, _1.
|
|
8
|
+
if (!(0, _1.isNow)() &&
|
|
9
|
+
!(0, _1.isHeroku)() &&
|
|
10
|
+
!(0, _1.isGitHubActions)() &&
|
|
11
|
+
!(0, _1.isGitLabCI)() &&
|
|
12
|
+
!(0, _1.isRailway)() &&
|
|
13
|
+
!(0, _1.isNetlify)()) {
|
|
9
14
|
process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE = '';
|
|
10
15
|
keys.forEach((key) => {
|
|
11
16
|
if (key in process.env) {
|
|
@@ -16,4 +21,4 @@ if (!(0, _1.isHeroku)() && !(0, _1.isNow)() && !(0, _1.isGitHubActions)() && !(0
|
|
|
16
21
|
}
|
|
17
22
|
});
|
|
18
23
|
}
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0Y2gtcHJveHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvcGF0Y2gtcHJveHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUF1Qjs7QUFFdkIsMkNBQThDO0FBQzlDLHlCQU9ZO0FBRVosTUFBTSxNQUFNLEdBQUcsSUFBQSxxQkFBWSxFQUFDLEVBQUUsT0FBTyxFQUFFLDBCQUEwQixFQUFFLENBQUMsQ0FBQztBQUNyRSxNQUFNLElBQUksR0FBMEIsQ0FBQyxZQUFZLEVBQUUsYUFBYSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBRS9FLElBQ0UsQ0FBQyxJQUFBLFFBQUssR0FBRTtJQUNSLENBQUMsSUFBQSxXQUFRLEdBQUU7SUFDWCxDQUFDLElBQUEsa0JBQWUsR0FBRTtJQUNsQixDQUFDLElBQUEsYUFBVSxHQUFFO0lBQ2IsQ0FBQyxJQUFBLFlBQVMsR0FBRTtJQUNaLENBQUMsSUFBQSxZQUFTLEdBQUUsRUFDWjtJQUNBLE9BQU8sQ0FBQyxHQUFHLENBQUMsMkNBQTJDLEdBQUcsRUFBRSxDQUFDO0lBRTdELElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtRQUNuQixJQUFJLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFO1lBQ3RCLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQyxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBRS9CLE1BQU0sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBQ2xFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDO1NBQzdCO0lBQ0gsQ0FBQyxDQUFDLENBQUM7Q0FDSiJ9
|
package/build/utils/surge.d.ts
CHANGED
|
@@ -3,4 +3,4 @@ export declare const getSurgeExtendHeaders: (wsHeaders: Record<string, string>)
|
|
|
3
3
|
/**
|
|
4
4
|
* @see https://manual.nssurge.com/policy/proxy.html
|
|
5
5
|
*/
|
|
6
|
-
export declare const getSurgeNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?:
|
|
6
|
+
export declare const getSurgeNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: SortedNodeNameFilterType | NodeFilterType | undefined) => string;
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "surgio",
|
|
3
3
|
"description": "Generating rules for Surge, Clash, Quantumult like a PRO",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.18.1",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"typings": "build/index.d.ts",
|
|
7
7
|
"bin": {
|
|
@@ -65,9 +65,9 @@
|
|
|
65
65
|
"joi": "^17.1.1",
|
|
66
66
|
"listr": "^0.14.3",
|
|
67
67
|
"lodash": "^4.17.19",
|
|
68
|
-
"lru-cache": "^6.0.0",
|
|
69
68
|
"merge-stream": "^2.0.0",
|
|
70
69
|
"ms": "^2.1.3",
|
|
70
|
+
"node-cache": "^5.1.2",
|
|
71
71
|
"node-dir": "^0.1.17",
|
|
72
72
|
"nunjucks": "^3.2.1",
|
|
73
73
|
"ora": "^5.1.0",
|
|
@@ -92,7 +92,6 @@
|
|
|
92
92
|
"@types/inquirer": "^7.3.0",
|
|
93
93
|
"@types/listr": "^0.14.2",
|
|
94
94
|
"@types/lodash": "^4.14.174",
|
|
95
|
-
"@types/lru-cache": "^5.1.0",
|
|
96
95
|
"@types/node": "^16",
|
|
97
96
|
"@types/nunjucks": "^3.2.0",
|
|
98
97
|
"@types/sinon": "^10.0.6",
|