surgio 2.14.2 → 2.17.0
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 +80 -50
- package/README.md +2 -5
- package/build/command/generate.js +2 -2
- package/build/command/lint.js +2 -2
- package/build/constant/index.js +6 -2
- package/build/generator/artifact.d.ts +3 -1
- package/build/generator/artifact.js +7 -5
- package/build/index.d.ts +3 -1
- package/build/index.js +11 -4
- package/build/provider/ClashProvider.d.ts +9 -2
- package/build/provider/ClashProvider.js +24 -10
- package/build/provider/CustomProvider.js +14 -5
- package/build/provider/Provider.d.ts +3 -1
- package/build/provider/Provider.js +31 -6
- package/build/provider/ShadowsocksJsonSubscribeProvider.d.ts +5 -3
- package/build/provider/ShadowsocksJsonSubscribeProvider.js +42 -4
- package/build/provider/ShadowsocksSubscribeProvider.d.ts +4 -2
- package/build/provider/ShadowsocksSubscribeProvider.js +7 -5
- package/build/provider/ShadowsocksrSubscribeProvider.d.ts +4 -2
- package/build/provider/ShadowsocksrSubscribeProvider.js +7 -5
- package/build/provider/SsdProvider.d.ts +4 -2
- package/build/provider/SsdProvider.js +7 -5
- package/build/provider/TrojanProvider.d.ts +9 -2
- package/build/provider/TrojanProvider.js +15 -6
- package/build/provider/V2rayNSubscribeProvider.d.ts +11 -2
- package/build/provider/V2rayNSubscribeProvider.js +17 -15
- package/build/types.d.ts +3 -0
- package/build/utils/cache.d.ts +4 -3
- package/build/utils/cache.js +17 -9
- package/build/utils/clash.d.ts +3 -0
- package/build/utils/clash.js +147 -0
- package/build/utils/constant.js +6 -2
- package/build/utils/dns.js +5 -5
- package/build/utils/env-flag.js +1 -1
- package/build/utils/error-helper.js +2 -2
- package/build/utils/filter.d.ts +1 -0
- package/build/utils/filter.js +27 -3
- package/build/utils/http-client.js +6 -2
- package/build/utils/index.d.ts +7 -15
- package/build/utils/index.js +28 -739
- package/build/utils/loon.js +52 -20
- package/build/utils/patch-proxy.js +7 -2
- package/build/utils/quantumult.d.ts +6 -0
- package/build/utils/quantumult.js +255 -0
- package/build/utils/surge.d.ts +6 -0
- package/build/utils/surge.js +365 -0
- package/package.json +5 -5
|
@@ -113,12 +113,14 @@ class Artifact extends events_1.EventEmitter {
|
|
|
113
113
|
}
|
|
114
114
|
: {}));
|
|
115
115
|
}
|
|
116
|
-
async init() {
|
|
116
|
+
async init({ requestUserAgent, } = {}) {
|
|
117
117
|
if (this.isReady) {
|
|
118
118
|
throw new Error('Artifact 已经初始化完成');
|
|
119
119
|
}
|
|
120
120
|
this.emit('initArtifact:start', { artifact: this.artifact });
|
|
121
|
-
await bluebird_1.default.map(this.providerNameList,
|
|
121
|
+
await bluebird_1.default.map(this.providerNameList, async (providerName) => {
|
|
122
|
+
await this.providerMapper(providerName, { requestUserAgent });
|
|
123
|
+
}, {
|
|
122
124
|
concurrency: (0, env_flag_1.getNetworkConcurrency)(),
|
|
123
125
|
});
|
|
124
126
|
this.providerNameList.forEach((providerName) => {
|
|
@@ -156,7 +158,7 @@ class Artifact extends events_1.EventEmitter {
|
|
|
156
158
|
this.emit('renderArtifact', { artifact: this.artifact, result });
|
|
157
159
|
return result;
|
|
158
160
|
}
|
|
159
|
-
async providerMapper(providerName) {
|
|
161
|
+
async providerMapper(providerName, { requestUserAgent } = {}) {
|
|
160
162
|
const config = this.surgioConfig;
|
|
161
163
|
const mainProviderName = this.artifact.provider;
|
|
162
164
|
const filePath = path_1.default.resolve(config.providerDir, `${providerName}.js`);
|
|
@@ -179,7 +181,7 @@ class Artifact extends events_1.EventEmitter {
|
|
|
179
181
|
throw err;
|
|
180
182
|
}
|
|
181
183
|
try {
|
|
182
|
-
nodeConfigList = await provider.getNodeList();
|
|
184
|
+
nodeConfigList = await provider.getNodeList({ requestUserAgent });
|
|
183
185
|
}
|
|
184
186
|
catch (err) /* istanbul ignore next */ {
|
|
185
187
|
err.message = `获取 ${providerName} 节点时出现错误,相关文件 ${filePath} ,错误原因: ${err.message}`;
|
|
@@ -287,4 +289,4 @@ class Artifact extends events_1.EventEmitter {
|
|
|
287
289
|
}
|
|
288
290
|
}
|
|
289
291
|
exports.Artifact = Artifact;
|
|
290
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../lib/generator/artifact.ts"],"names":[],"mappings":"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"}
|
|
292
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../lib/generator/artifact.ts"],"names":[],"mappings":"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"}
|
package/build/index.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import './utils/patch-proxy';
|
|
|
3
3
|
import Command from 'common-bin';
|
|
4
4
|
import { PackageJson } from 'type-fest';
|
|
5
5
|
import * as filter from './utils/filter';
|
|
6
|
+
import * as caches from './utils/cache';
|
|
6
7
|
declare const pkg: PackageJson;
|
|
7
8
|
export declare class SurgioCommand extends Command {
|
|
8
9
|
constructor(rawArgv?: string[]);
|
|
@@ -16,6 +17,7 @@ export declare const utils: {
|
|
|
16
17
|
SortFilterWithSortedFilters: typeof filter.SortFilterWithSortedFilters;
|
|
17
18
|
SortFilterWithSortedKeywords: typeof filter.SortFilterWithSortedKeywords;
|
|
18
19
|
validateFilter: (filter: any) => boolean;
|
|
20
|
+
applyFilter: <T extends import("./types").SimpleNodeConfig>(nodeList: readonly T[], filter?: import("./types").SortedNodeNameFilterType | import("./types").NodeNameFilterType | undefined) => readonly T[];
|
|
19
21
|
mergeFilters: (filters: readonly import("./types").NodeNameFilterType[], isStrict?: boolean | undefined) => import("./types").NodeNameFilterType;
|
|
20
22
|
useKeywords: (keywords: readonly string[], isStrict?: boolean | undefined) => import("./types").NodeNameFilterType;
|
|
21
23
|
discardKeywords: (keywords: readonly string[], isStrict?: boolean | undefined) => import("./types").NodeNameFilterType;
|
|
@@ -54,4 +56,4 @@ export declare const categories: {
|
|
|
54
56
|
CLASH: string;
|
|
55
57
|
LOON: string;
|
|
56
58
|
};
|
|
57
|
-
export { pkg };
|
|
59
|
+
export { pkg, caches };
|
package/build/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -22,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
22
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
27
|
};
|
|
24
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
exports.pkg = exports.categories = exports.utils = exports.SurgioCommand = void 0;
|
|
29
|
+
exports.caches = exports.pkg = exports.categories = exports.utils = exports.SurgioCommand = void 0;
|
|
26
30
|
require("source-map-support/register");
|
|
27
31
|
require("./utils/patch-proxy");
|
|
28
32
|
const global_agent_1 = require("global-agent");
|
|
@@ -34,6 +38,8 @@ const update_notifier_1 = __importDefault(require("update-notifier"));
|
|
|
34
38
|
const logger_1 = require("@surgio/logger");
|
|
35
39
|
const utils_1 = require("./utils");
|
|
36
40
|
const filter = __importStar(require("./utils/filter"));
|
|
41
|
+
const caches = __importStar(require("./utils/cache"));
|
|
42
|
+
exports.caches = caches;
|
|
37
43
|
const error_helper_1 = require("./utils/error-helper");
|
|
38
44
|
const constant_1 = require("./constant");
|
|
39
45
|
// istanbul ignore next
|
|
@@ -41,7 +47,8 @@ if (!(0, utils_1.isNow)() &&
|
|
|
41
47
|
!(0, utils_1.isHeroku)() &&
|
|
42
48
|
!(0, utils_1.isGitHubActions)() &&
|
|
43
49
|
!(0, utils_1.isGitLabCI)() &&
|
|
44
|
-
!(0, utils_1.isRailway)()
|
|
50
|
+
!(0, utils_1.isRailway)() &&
|
|
51
|
+
!(0, utils_1.isNetlify)()) {
|
|
45
52
|
// Global proxy
|
|
46
53
|
(0, global_agent_1.bootstrap)();
|
|
47
54
|
}
|
|
@@ -83,4 +90,4 @@ exports.utils = Object.assign(Object.assign({}, filter), { isHeroku: utils_1.isH
|
|
|
83
90
|
isGitHubActions: utils_1.isGitHubActions,
|
|
84
91
|
isGitLabCI: utils_1.isGitLabCI });
|
|
85
92
|
exports.categories = Object.assign({}, constant_1.CATEGORIES);
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9saWIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx1Q0FBcUM7QUFDckMsK0JBQTZCO0FBRTdCLCtDQUF5QztBQUN6Qyw0REFBaUM7QUFDakMsd0RBQTBCO0FBQzFCLGdEQUF3QjtBQUN4QiwrQkFBcUM7QUFFckMsc0VBQTZDO0FBQzdDLDJDQUE0QztBQUU1QyxtQ0FPaUI7QUFDakIsdURBQXlDO0FBQ3pDLHNEQUF3QztBQXFFMUIsd0JBQU07QUFwRXBCLHVEQUFvRDtBQUNwRCx5Q0FBd0M7QUFFeEMsdUJBQXVCO0FBQ3ZCLElBQ0UsQ0FBQyxJQUFBLGFBQUssR0FBRTtJQUNSLENBQUMsSUFBQSxnQkFBUSxHQUFFO0lBQ1gsQ0FBQyxJQUFBLHVCQUFlLEdBQUU7SUFDbEIsQ0FBQyxJQUFBLGtCQUFVLEdBQUU7SUFDYixDQUFDLElBQUEsaUJBQVMsR0FBRTtJQUNaLENBQUMsSUFBQSxpQkFBUyxHQUFFLEVBQ1o7SUFDQSxlQUFlO0lBQ2YsSUFBQSx3QkFBUyxHQUFFLENBQUM7Q0FDYjtBQUVELE1BQU0sT0FBTyxHQUFHLElBQUEsY0FBTyxFQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxRQUFRLENBQUMsQ0FBQztBQUNqRCxNQUFNLEdBQUcsR0FBRyxrQkFBRSxDQUFDLFlBQVksQ0FBQyxJQUFBLFdBQUksRUFBQyxTQUFTLEVBQUUsaUJBQWlCLENBQUMsQ0FBZ0IsQ0FBQztBQW1EdEUsa0JBQUc7QUFqRFosTUFBYSxhQUFjLFNBQVEsb0JBQU87SUFDeEMsWUFBWSxPQUFrQjtRQUM1QixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFFZix1QkFBdUI7UUFDdkIsSUFBSSxrQkFBRSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUMxQixJQUFBLGNBQUksRUFBQyxPQUFPLENBQUMsQ0FBQztTQUNmO1FBRUQsSUFBQSx5QkFBYyxFQUFDLEVBQUUsR0FBRyxFQUFFLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUU3RCxJQUFJLENBQUMsS0FBSyxHQUFHLGtDQUFrQyxDQUFDO1FBRWhELElBQUksQ0FBQyxJQUFJLENBQUMsSUFBQSxXQUFJLEVBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFFeEMsSUFBSSxDQUFDLE9BQU8sR0FBRztZQUNiLENBQUMsRUFBRTtnQkFDRCxLQUFLLEVBQUUsU0FBUztnQkFDaEIsWUFBWSxFQUFFLEtBQUs7Z0JBQ25CLFFBQVEsRUFBRSxRQUFRO2dCQUNsQixJQUFJLEVBQUUsU0FBUzthQUNoQjtTQUNGLENBQUM7UUFDRixtREFBbUQ7UUFDbkQsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFdkIsdUJBQXVCO1FBQ3ZCLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQzNCLG1CQUFVLENBQUMsT0FBTyxDQUFDLEtBQUssR0FBRyxPQUFPLENBQUM7U0FDcEM7SUFDSCxDQUFDO0lBRU0sWUFBWSxDQUFDLEdBQUc7UUFDckIsMkJBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQy9CLENBQUM7Q0FDRjtBQW5DRCxzQ0FtQ0M7QUFFWSxRQUFBLEtBQUssbUNBQ2IsTUFBTSxLQUNULFFBQVEsRUFBUixnQkFBUTtJQUNSLEtBQUssRUFBTCxhQUFLO0lBQ0wsZUFBZSxFQUFmLHVCQUFlO0lBQ2YsVUFBVSxFQUFWLGtCQUFVLElBQ1Y7QUFFVyxRQUFBLFVBQVUscUJBQ2xCLHFCQUFVLEVBQ2IifQ==
|
|
@@ -8,9 +8,16 @@ export default class ClashProvider extends Provider {
|
|
|
8
8
|
constructor(name: string, config: ClashProviderConfig);
|
|
9
9
|
get url(): string;
|
|
10
10
|
getSubscriptionUserInfo(): Promise<SubscriptionUserinfo | undefined>;
|
|
11
|
-
getNodeList(
|
|
11
|
+
getNodeList({ requestUserAgent, }?: {
|
|
12
|
+
requestUserAgent?: string;
|
|
13
|
+
}): Promise<ReadonlyArray<SupportConfigTypes>>;
|
|
12
14
|
}
|
|
13
|
-
export declare const getClashSubscription: (url
|
|
15
|
+
export declare const getClashSubscription: ({ url, udpRelay, tls13, requestUserAgent, }: {
|
|
16
|
+
url: string;
|
|
17
|
+
udpRelay?: boolean | undefined;
|
|
18
|
+
tls13?: boolean | undefined;
|
|
19
|
+
requestUserAgent?: string | undefined;
|
|
20
|
+
}) => Promise<{
|
|
14
21
|
readonly nodeList: ReadonlyArray<SupportConfigTypes>;
|
|
15
22
|
readonly subscriptionUserinfo?: SubscriptionUserinfo;
|
|
16
23
|
}>;
|
|
@@ -12,7 +12,6 @@ const logger_1 = require("@surgio/logger");
|
|
|
12
12
|
const types_1 = require("../types");
|
|
13
13
|
const utils_1 = require("../utils");
|
|
14
14
|
const env_flag_1 = require("../utils/env-flag");
|
|
15
|
-
const http_client_1 = require("../utils/http-client");
|
|
16
15
|
const relayable_url_1 = __importDefault(require("../utils/relayable-url"));
|
|
17
16
|
const Provider_1 = __importDefault(require("./Provider"));
|
|
18
17
|
const logger = (0, logger_1.createLogger)({
|
|
@@ -45,22 +44,31 @@ class ClashProvider extends Provider_1.default {
|
|
|
45
44
|
return (0, relayable_url_1.default)(this._url, this.relayUrl);
|
|
46
45
|
}
|
|
47
46
|
async getSubscriptionUserInfo() {
|
|
48
|
-
const { subscriptionUserinfo } = await (0, exports.getClashSubscription)(
|
|
47
|
+
const { subscriptionUserinfo } = await (0, exports.getClashSubscription)({
|
|
48
|
+
url: this.url,
|
|
49
|
+
udpRelay: this.udpRelay,
|
|
50
|
+
tls13: this.tls13,
|
|
51
|
+
});
|
|
49
52
|
if (subscriptionUserinfo) {
|
|
50
53
|
return subscriptionUserinfo;
|
|
51
54
|
}
|
|
52
55
|
return void 0;
|
|
53
56
|
}
|
|
54
|
-
async getNodeList() {
|
|
55
|
-
const { nodeList } = await (0, exports.getClashSubscription)(
|
|
57
|
+
async getNodeList({ requestUserAgent, } = {}) {
|
|
58
|
+
const { nodeList } = await (0, exports.getClashSubscription)({
|
|
59
|
+
url: this.url,
|
|
60
|
+
udpRelay: this.udpRelay,
|
|
61
|
+
tls13: this.tls13,
|
|
62
|
+
requestUserAgent,
|
|
63
|
+
});
|
|
56
64
|
return nodeList;
|
|
57
65
|
}
|
|
58
66
|
}
|
|
59
67
|
exports.default = ClashProvider;
|
|
60
|
-
const getClashSubscription = async (url, udpRelay, tls13) => {
|
|
68
|
+
const getClashSubscription = async ({ url, udpRelay, tls13, requestUserAgent, }) => {
|
|
61
69
|
(0, assert_1.default)(url, '未指定订阅地址 url');
|
|
62
70
|
const response = await Provider_1.default.requestCacheableResource(url, {
|
|
63
|
-
requestUserAgent:
|
|
71
|
+
requestUserAgent: requestUserAgent || (0, env_flag_1.getNetworkClashUA)(),
|
|
64
72
|
});
|
|
65
73
|
let clashConfig;
|
|
66
74
|
try {
|
|
@@ -196,10 +204,16 @@ const parseClashConfig = (proxyList, udpRelay, tls13) => {
|
|
|
196
204
|
method: item.cipher,
|
|
197
205
|
'udp-relay': resolveUdpRelay(item.udp, udpRelay),
|
|
198
206
|
};
|
|
199
|
-
case 'trojan':
|
|
200
|
-
|
|
207
|
+
case 'trojan': {
|
|
208
|
+
const network = item.network;
|
|
209
|
+
const wsOpts = lodash_1.default.get(item, 'ws-opts', {});
|
|
210
|
+
const wsHeaders = (0, utils_1.lowercaseHeaderKeys)(lodash_1.default.get(wsOpts, 'headers', {}));
|
|
211
|
+
return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Trojan, nodeName: item.name, hostname: item.server, port: item.port, password: item.password }, ('skip-cert-verify' in item
|
|
201
212
|
? { skipCertVerify: item['skip-cert-verify'] === true }
|
|
202
|
-
: null)), ('alpn' in item ? { alpn: item.alpn } : null)), ('sni' in item ? { sni: item.sni } : null)), { 'udp-relay': resolveUdpRelay(item.udp, udpRelay), tls13: tls13 !== null && tls13 !== void 0 ? tls13 : false })
|
|
213
|
+
: null)), ('alpn' in item ? { alpn: item.alpn } : null)), ('sni' in item ? { sni: item.sni } : null)), { 'udp-relay': resolveUdpRelay(item.udp, udpRelay), tls13: tls13 !== null && tls13 !== void 0 ? tls13 : false }), (network === 'ws'
|
|
214
|
+
? { network: 'ws', wsPath: lodash_1.default.get(wsOpts, 'path', '/'), wsHeaders }
|
|
215
|
+
: null));
|
|
216
|
+
}
|
|
203
217
|
default:
|
|
204
218
|
logger.warn(`不支持从 Clash 订阅中读取 ${item.type} 的节点,节点 ${item.name} 会被省略`);
|
|
205
219
|
return void 0;
|
|
@@ -214,4 +228,4 @@ function resolveUdpRelay(val, defaultVal = false) {
|
|
|
214
228
|
}
|
|
215
229
|
return defaultVal;
|
|
216
230
|
}
|
|
217
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ClashProvider.js","sourceRoot":"","sources":["../../lib/provider/ClashProvider.ts"],"names":[],"mappings":"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"}
|
|
231
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ClashProvider.js","sourceRoot":"","sources":["../../lib/provider/ClashProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,18 +32,27 @@ class CustomProvider extends Provider_1.default {
|
|
|
32
32
|
this.nodeList = config.nodeList;
|
|
33
33
|
}
|
|
34
34
|
async getNodeList() {
|
|
35
|
-
const
|
|
35
|
+
const udpRelayCheckSchema = joi_1.default.object({
|
|
36
36
|
'udp-relay': joi_1.default.bool().strict(),
|
|
37
37
|
}).unknown();
|
|
38
38
|
return this.nodeList.map((item) => {
|
|
39
|
-
const { error } =
|
|
39
|
+
const { error: udpRelayCheckError } = udpRelayCheckSchema.validate(item);
|
|
40
|
+
const lowercaseKeys = ['wsHeaders'];
|
|
40
41
|
// istanbul ignore next
|
|
41
|
-
if (
|
|
42
|
-
throw
|
|
42
|
+
if (udpRelayCheckError) {
|
|
43
|
+
throw udpRelayCheckError;
|
|
43
44
|
}
|
|
45
|
+
lowercaseKeys.forEach((key) => {
|
|
46
|
+
if (item[key]) {
|
|
47
|
+
item[key] = Object.keys(item[key]).reduce((acc, curr) => {
|
|
48
|
+
acc[curr.toLowerCase()] = item[key][curr];
|
|
49
|
+
return acc;
|
|
50
|
+
}, {});
|
|
51
|
+
}
|
|
52
|
+
});
|
|
44
53
|
return item;
|
|
45
54
|
});
|
|
46
55
|
}
|
|
47
56
|
}
|
|
48
57
|
exports.default = CustomProvider;
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvQ3VzdG9tUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw4Q0FBc0I7QUFDdEIsb0NBSWtCO0FBQ2xCLDBEQUFrQztBQUVsQyxNQUFxQixjQUFlLFNBQVEsa0JBQVE7SUFHbEQsWUFBWSxJQUFZLEVBQUUsTUFBNEI7UUFDcEQsS0FBSyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVwQixNQUFNLFVBQVUsR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQzVCLElBQUksRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNmLEtBQUssQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQVMsb0JBQVksQ0FBQyxDQUFDO2lCQUM3QyxRQUFRLEVBQUU7WUFDYixRQUFRLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtZQUNqQyxNQUFNLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUM5QixHQUFHLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUMzQixLQUFLLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUM3QixPQUFPLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtZQUNyQixTQUFTLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtZQUN2QixlQUFlLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtTQUM5QixDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDYixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLFFBQVEsRUFBRSxhQUFHLENBQUMsS0FBSyxFQUFFLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDLFFBQVEsRUFBRTtTQUNuRCxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUUxQyx1QkFBdUI7UUFDdkIsSUFBSSxLQUFLLEVBQUU7WUFDVCxNQUFNLEtBQUssQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO0lBQ2xDLENBQUM7SUFFTSxLQUFLLENBQUMsV0FBVztRQUN0QixNQUFNLG1CQUFtQixHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDckMsV0FBVyxFQUFFLGFBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEVBQUU7U0FDakMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBRWIsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1lBQ2hDLE1BQU0sRUFBRSxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsR0FBRyxtQkFBbUIsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDekUsTUFBTSxhQUFhLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztZQUVwQyx1QkFBdUI7WUFDdkIsSUFBSSxrQkFBa0IsRUFBRTtnQkFDdEIsTUFBTSxrQkFBa0IsQ0FBQzthQUMxQjtZQUVELGFBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtnQkFDNUIsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUU7b0JBQ2IsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFO3dCQUN0RCxHQUFHLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDO3dCQUMxQyxPQUFPLEdBQUcsQ0FBQztvQkFDYixDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7aUJBQ1I7WUFDSCxDQUFDLENBQUMsQ0FBQztZQUVILE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUExREQsaUNBMERDIn0=
|
|
@@ -21,5 +21,7 @@ export default class Provider {
|
|
|
21
21
|
}): Promise<SubsciptionCacheItem>;
|
|
22
22
|
get nextPort(): number;
|
|
23
23
|
getSubscriptionUserInfo(): Promise<SubscriptionUserinfo | undefined>;
|
|
24
|
-
getNodeList(
|
|
24
|
+
getNodeList({}?: {
|
|
25
|
+
requestUserAgent?: string;
|
|
26
|
+
}): Promise<ReadonlyArray<PossibleNodeConfigType>>;
|
|
25
27
|
}
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -7,8 +30,9 @@ const logger_1 = require("@surgio/logger");
|
|
|
7
30
|
const joi_1 = __importDefault(require("joi"));
|
|
8
31
|
const types_1 = require("../types");
|
|
9
32
|
const cache_1 = require("../utils/cache");
|
|
10
|
-
const http_client_1 =
|
|
33
|
+
const http_client_1 = __importStar(require("../utils/http-client"));
|
|
11
34
|
const subscription_1 = require("../utils/subscription");
|
|
35
|
+
const utils_1 = require("../utils");
|
|
12
36
|
const logger = (0, logger_1.createLogger)({
|
|
13
37
|
service: 'surgio:Provider',
|
|
14
38
|
});
|
|
@@ -67,8 +91,9 @@ class Provider {
|
|
|
67
91
|
});
|
|
68
92
|
}
|
|
69
93
|
static async requestCacheableResource(url, options = {}) {
|
|
70
|
-
|
|
71
|
-
|
|
94
|
+
const cacheKey = `${(0, utils_1.toBase64)((0, http_client_1.getUserAgent)(options.requestUserAgent || ''))}:${url}`;
|
|
95
|
+
return cache_1.SubscriptionCache.has(cacheKey)
|
|
96
|
+
? cache_1.SubscriptionCache.get(cacheKey)
|
|
72
97
|
: await (async () => {
|
|
73
98
|
const headers = {};
|
|
74
99
|
if (options.requestUserAgent) {
|
|
@@ -86,7 +111,7 @@ class Provider {
|
|
|
86
111
|
(0, subscription_1.parseSubscriptionUserInfo)(res.headers['subscription-userinfo']);
|
|
87
112
|
logger.debug('%s received subscription userinfo - raw: %s | parsed: %j', url, res.headers['subscription-userinfo'], subsciptionCacheItem.subscriptionUserinfo);
|
|
88
113
|
}
|
|
89
|
-
cache_1.SubscriptionCache.set(
|
|
114
|
+
cache_1.SubscriptionCache.set(cacheKey, subsciptionCacheItem);
|
|
90
115
|
return subsciptionCacheItem;
|
|
91
116
|
})();
|
|
92
117
|
}
|
|
@@ -101,9 +126,9 @@ class Provider {
|
|
|
101
126
|
throw new Error('此 Provider 不支持该功能');
|
|
102
127
|
}
|
|
103
128
|
// istanbul ignore next
|
|
104
|
-
getNodeList() {
|
|
129
|
+
getNodeList({} = {}) {
|
|
105
130
|
return Promise.resolve([]);
|
|
106
131
|
}
|
|
107
132
|
}
|
|
108
133
|
exports.default = Provider;
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDJDQUE4QztBQUM5Qyw4Q0FBc0I7QUFFdEIsb0NBS2tCO0FBQ2xCLDBDQUF5RTtBQUN6RSxvRUFBZ0U7QUFDaEUsd0RBQWtFO0FBQ2xFLG9DQUFvQztBQUVwQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLGlCQUFpQjtDQUMzQixDQUFDLENBQUM7QUFFSCxNQUFxQixRQUFRO0lBaUIzQixZQUFtQixJQUFZLEVBQUUsTUFBc0I7UUFBcEMsU0FBSSxHQUFKLElBQUksQ0FBUTtRQUM3QixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLElBQUksRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNmLEtBQUssQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQVMsMkJBQW1CLENBQUMsQ0FBQztpQkFDcEQsUUFBUSxFQUFFO1lBQ2IsVUFBVSxFQUFFLGFBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQ3pCLGFBQUcsQ0FBQyxRQUFRLEVBQUUsRUFDZCxhQUFHLENBQUMsTUFBTSxDQUFDO2dCQUNULE1BQU0sRUFBRSxhQUFHLENBQUMsUUFBUSxFQUFFO2dCQUN0QixXQUFXLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTthQUNwQyxDQUFDLENBQ0g7WUFDRCxhQUFhLEVBQUUsYUFBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FDNUIsYUFBRyxDQUFDLFFBQVEsRUFBRSxFQUNkLGFBQUcsQ0FBQyxNQUFNLENBQUM7Z0JBQ1QsTUFBTSxFQUFFLGFBQUcsQ0FBQyxRQUFRLEVBQUU7Z0JBQ3RCLFdBQVcsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO2FBQ3BDLENBQUMsQ0FDSDtZQUNELG9CQUFvQixFQUFFLGFBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQ25DLGFBQUcsQ0FBQyxRQUFRLEVBQUUsRUFDZCxhQUFHLENBQUMsTUFBTSxDQUFDO2dCQUNULE1BQU0sRUFBRSxhQUFHLENBQUMsUUFBUSxFQUFFO2dCQUN0QixXQUFXLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTthQUNwQyxDQUFDLENBQ0g7WUFDRCxhQUFhLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLE9BQU8sQ0FDakMsYUFBRyxDQUFDLE1BQU0sRUFBRSxFQUNaLGFBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQ2IsYUFBRyxDQUFDLFFBQVEsRUFBRSxFQUNkLGFBQUcsQ0FBQyxNQUFNLENBQUM7Z0JBQ1QsTUFBTSxFQUFFLGFBQUcsQ0FBQyxRQUFRLEVBQUU7Z0JBQ3RCLFdBQVcsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO2FBQ3BDLENBQUMsQ0FDSCxDQUNGO1lBQ0QsT0FBTyxFQUFFLGFBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxNQUFNLEVBQUU7WUFDL0Isa0JBQWtCLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUMxQyxLQUFLLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUM3QixHQUFHLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUMzQixTQUFTLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDO1lBQ3RELFFBQVEsRUFBRSxDQUFDLGFBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDaEQsVUFBVSxFQUFFLGFBQUcsQ0FBQyxRQUFRLEVBQUU7U0FDM0IsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBRWIsTUFBTSxFQUFFLEtBQUssRUFBRSxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFMUMsdUJBQXVCO1FBQ3ZCLElBQUksS0FBSyxFQUFFO1lBQ1QsTUFBTSxLQUFLLENBQUM7U0FDYjtRQUVELElBQUksQ0FBQyw4QkFBOEIsR0FBRyxLQUFLLENBQUM7UUFFNUM7WUFDRSxNQUFNO1lBQ04sWUFBWTtZQUNaLGVBQWU7WUFDZixzQkFBc0I7WUFDdEIsZUFBZTtZQUNmLFNBQVM7WUFDVCxvQkFBb0I7WUFDcEIsS0FBSztZQUNMLE9BQU87WUFDUCxXQUFXO1lBQ1gsWUFBWTtZQUNaLFVBQVU7U0FDWCxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1lBQ2hCLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDMUIsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyx3QkFBd0IsQ0FDbkMsR0FBVyxFQUNYLFVBRUksRUFBRTtRQUVOLE1BQU0sUUFBUSxHQUFHLEdBQUcsSUFBQSxnQkFBUSxFQUMxQixJQUFBLDBCQUFZLEVBQUMsT0FBTyxDQUFDLGdCQUFnQixJQUFJLEVBQUUsQ0FBQyxDQUM3QyxJQUFJLEdBQUcsRUFBRSxDQUFDO1FBRVgsT0FBTyx5QkFBaUIsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1lBQ3BDLENBQUMsQ0FBRSx5QkFBaUIsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUEwQjtZQUMzRCxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssSUFBSSxFQUFFO2dCQUNoQixNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUM7Z0JBRW5CLElBQUksT0FBTyxDQUFDLGdCQUFnQixFQUFFO29CQUM1QixPQUFPLENBQUMsWUFBWSxDQUFDLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDO2lCQUNsRDtnQkFFRCxNQUFNLEdBQUcsR0FBRyxNQUFNLHFCQUFVLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRTtvQkFDcEMsWUFBWSxFQUFFLE1BQU07b0JBQ3BCLE9BQU87aUJBQ1IsQ0FBQyxDQUFDO2dCQUNILE1BQU0sb0JBQW9CLEdBQXlCO29CQUNqRCxJQUFJLEVBQUUsR0FBRyxDQUFDLElBQUk7aUJBQ2YsQ0FBQztnQkFFRixJQUFJLEdBQUcsQ0FBQyxPQUFPLENBQUMsdUJBQXVCLENBQUMsRUFBRTtvQkFDeEMsb0JBQW9CLENBQUMsb0JBQW9CO3dCQUN2QyxJQUFBLHdDQUF5QixFQUN2QixHQUFHLENBQUMsT0FBTyxDQUFDLHVCQUF1QixDQUFXLENBQy9DLENBQUM7b0JBQ0osTUFBTSxDQUFDLEtBQUssQ0FDViwwREFBMEQsRUFDMUQsR0FBRyxFQUNILEdBQUcsQ0FBQyxPQUFPLENBQUMsdUJBQXVCLENBQUMsRUFDcEMsb0JBQW9CLENBQUMsb0JBQW9CLENBQzFDLENBQUM7aUJBQ0g7Z0JBRUQseUJBQWlCLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxvQkFBb0IsQ0FBQyxDQUFDO2dCQUV0RCxPQUFPLG9CQUFvQixDQUFDO1lBQzlCLENBQUMsQ0FBQyxFQUFFLENBQUM7SUFDWCxDQUFDO0lBRUQsSUFBVyxRQUFRO1FBQ2pCLElBQUksSUFBSSxDQUFDLFNBQVMsRUFBRTtZQUNsQixPQUFPLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztTQUN6QjtRQUNELE9BQU8sQ0FBQyxDQUFDO0lBQ1gsQ0FBQztJQUVELHVCQUF1QjtJQUNoQixLQUFLLENBQUMsdUJBQXVCO1FBR2xDLE1BQU0sSUFBSSxLQUFLLENBQUMsbUJBQW1CLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBRUQsdUJBQXVCO0lBQ2hCLFdBQVcsQ0FBQyxLQUFvQyxFQUFFO1FBR3ZELE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUM3QixDQUFDO0NBQ0Y7QUEzSkQsMkJBMkpDIn0=
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import { ShadowsocksJsonSubscribeProviderConfig } from '../types';
|
|
2
|
-
import { getShadowsocksJSONConfig } from '../utils';
|
|
1
|
+
import { ShadowsocksJsonSubscribeProviderConfig, ShadowsocksNodeConfig } from '../types';
|
|
3
2
|
import Provider from './Provider';
|
|
4
3
|
export default class ShadowsocksJsonSubscribeProvider extends Provider {
|
|
5
4
|
readonly udpRelay?: boolean;
|
|
6
5
|
private readonly _url;
|
|
7
6
|
constructor(name: string, config: ShadowsocksJsonSubscribeProviderConfig);
|
|
8
7
|
get url(): string;
|
|
9
|
-
getNodeList(
|
|
8
|
+
getNodeList({ requestUserAgent, }?: {
|
|
9
|
+
requestUserAgent?: string;
|
|
10
|
+
}): ReturnType<typeof getShadowsocksJSONConfig>;
|
|
10
11
|
}
|
|
12
|
+
export declare const getShadowsocksJSONConfig: (url: string, udpRelay?: boolean | undefined, requestUserAgent?: string | undefined) => Promise<ReadonlyArray<ShadowsocksNodeConfig>>;
|
|
@@ -3,8 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getShadowsocksJSONConfig = void 0;
|
|
7
|
+
const assert_1 = __importDefault(require("assert"));
|
|
6
8
|
const joi_1 = __importDefault(require("joi"));
|
|
7
|
-
const
|
|
9
|
+
const types_1 = require("../types");
|
|
8
10
|
const relayable_url_1 = __importDefault(require("../utils/relayable-url"));
|
|
9
11
|
const Provider_1 = __importDefault(require("./Provider"));
|
|
10
12
|
class ShadowsocksJsonSubscribeProvider extends Provider_1.default {
|
|
@@ -30,9 +32,45 @@ class ShadowsocksJsonSubscribeProvider extends Provider_1.default {
|
|
|
30
32
|
get url() {
|
|
31
33
|
return (0, relayable_url_1.default)(this._url, this.relayUrl);
|
|
32
34
|
}
|
|
33
|
-
getNodeList() {
|
|
34
|
-
return (0,
|
|
35
|
+
getNodeList({ requestUserAgent, } = {}) {
|
|
36
|
+
return (0, exports.getShadowsocksJSONConfig)(this.url, this.udpRelay, requestUserAgent);
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
39
|
exports.default = ShadowsocksJsonSubscribeProvider;
|
|
38
|
-
|
|
40
|
+
const getShadowsocksJSONConfig = async (url, udpRelay, requestUserAgent) => {
|
|
41
|
+
(0, assert_1.default)(url, '未指定订阅地址 url');
|
|
42
|
+
async function requestConfigFromRemote() {
|
|
43
|
+
const response = await Provider_1.default.requestCacheableResource(url, {
|
|
44
|
+
requestUserAgent: requestUserAgent || 'shadowrocket',
|
|
45
|
+
});
|
|
46
|
+
const config = JSON.parse(response.body);
|
|
47
|
+
if (!config || !config.configs) {
|
|
48
|
+
throw new Error('订阅地址返回的数据格式不正确');
|
|
49
|
+
}
|
|
50
|
+
return config.configs.map((item) => {
|
|
51
|
+
const nodeConfig = {
|
|
52
|
+
nodeName: item.remarks,
|
|
53
|
+
type: types_1.NodeTypeEnum.Shadowsocks,
|
|
54
|
+
hostname: item.server,
|
|
55
|
+
port: item.server_port,
|
|
56
|
+
method: item.method,
|
|
57
|
+
password: item.password,
|
|
58
|
+
};
|
|
59
|
+
if (typeof udpRelay === 'boolean') {
|
|
60
|
+
nodeConfig['udp-relay'] = udpRelay;
|
|
61
|
+
}
|
|
62
|
+
if (item.plugin === 'obfs-local') {
|
|
63
|
+
const obfs = item.plugin_opts.match(/obfs=(\w+)/);
|
|
64
|
+
const obfsHost = item.plugin_opts.match(/obfs-host=(.+)$/);
|
|
65
|
+
if (obfs) {
|
|
66
|
+
nodeConfig.obfs = obfs[1];
|
|
67
|
+
nodeConfig['obfs-host'] = obfsHost ? obfsHost[1] : 'www.bing.com';
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return nodeConfig;
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
return await requestConfigFromRemote();
|
|
74
|
+
};
|
|
75
|
+
exports.getShadowsocksJSONConfig = getShadowsocksJSONConfig;
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhZG93c29ja3NKc29uU3Vic2NyaWJlUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvU2hhZG93c29ja3NKc29uU3Vic2NyaWJlUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsb0RBQTRCO0FBQzVCLDhDQUFzQjtBQUN0QixvQ0FJa0I7QUFDbEIsMkVBQWtEO0FBQ2xELDBEQUFrQztBQUVsQyxNQUFxQixnQ0FBaUMsU0FBUSxrQkFBUTtJQUlwRSxZQUFZLElBQVksRUFBRSxNQUE4QztRQUN0RSxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ2pDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO0lBQ2xDLENBQUM7SUFFRCx1QkFBdUI7SUFDdkIsSUFBVyxHQUFHO1FBQ1osT0FBTyxJQUFBLHVCQUFZLEVBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUVNLFdBQVcsQ0FBQyxFQUNqQixnQkFBZ0IsTUFDaUIsRUFBRTtRQUduQyxPQUFPLElBQUEsZ0NBQXdCLEVBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsUUFBUSxFQUFFLGdCQUFnQixDQUFDLENBQUM7SUFDN0UsQ0FBQztDQUNGO0FBdkNELG1EQXVDQztBQUVNLE1BQU0sd0JBQXdCLEdBQUcsS0FBSyxFQUMzQyxHQUFXLEVBQ1gsUUFBa0IsRUFDbEIsZ0JBQXlCLEVBQ3NCLEVBQUU7SUFDakQsSUFBQSxnQkFBTSxFQUFDLEdBQUcsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUUzQixLQUFLLFVBQVUsdUJBQXVCO1FBR3BDLE1BQU0sUUFBUSxHQUFHLE1BQU0sa0JBQVEsQ0FBQyx3QkFBd0IsQ0FBQyxHQUFHLEVBQUU7WUFDNUQsZ0JBQWdCLEVBQUUsZ0JBQWdCLElBQUksY0FBYztTQUNyRCxDQUFDLENBQUM7UUFDSCxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBRXRDLENBQUM7UUFFRixJQUFJLENBQUMsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRTtZQUM5QixNQUFNLElBQUksS0FBSyxDQUFDLGdCQUFnQixDQUFDLENBQUM7U0FDbkM7UUFFRCxPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUF5QixFQUFFO1lBQ3hELE1BQU0sVUFBVSxHQUFRO2dCQUN0QixRQUFRLEVBQUUsSUFBSSxDQUFDLE9BQWlCO2dCQUNoQyxJQUFJLEVBQUUsb0JBQVksQ0FBQyxXQUFXO2dCQUM5QixRQUFRLEVBQUUsSUFBSSxDQUFDLE1BQWdCO2dCQUMvQixJQUFJLEVBQUUsSUFBSSxDQUFDLFdBQXFCO2dCQUNoQyxNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQWdCO2dCQUM3QixRQUFRLEVBQUUsSUFBSSxDQUFDLFFBQWtCO2FBQ2xDLENBQUM7WUFFRixJQUFJLE9BQU8sUUFBUSxLQUFLLFNBQVMsRUFBRTtnQkFDakMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxHQUFHLFFBQVEsQ0FBQzthQUNwQztZQUNELElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxZQUFZLEVBQUU7Z0JBQ2hDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO2dCQUNsRCxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO2dCQUUzRCxJQUFJLElBQUksRUFBRTtvQkFDUixVQUFVLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDMUIsVUFBVSxDQUFDLFdBQVcsQ0FBQyxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUM7aUJBQ25FO2FBQ0Y7WUFFRCxPQUFPLFVBQVUsQ0FBQztRQUNwQixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPLE1BQU0sdUJBQXVCLEVBQUUsQ0FBQztBQUN6QyxDQUFDLENBQUM7QUFqRFcsUUFBQSx3QkFBd0IsNEJBaURuQyJ9
|
|
@@ -6,12 +6,14 @@ export default class ShadowsocksSubscribeProvider extends Provider {
|
|
|
6
6
|
constructor(name: string, config: ShadowsocksSubscribeProviderConfig);
|
|
7
7
|
get url(): string;
|
|
8
8
|
getSubscriptionUserInfo(): Promise<SubscriptionUserinfo | undefined>;
|
|
9
|
-
getNodeList(
|
|
9
|
+
getNodeList({ requestUserAgent, }?: {
|
|
10
|
+
requestUserAgent?: string;
|
|
11
|
+
}): Promise<ReadonlyArray<ShadowsocksNodeConfig>>;
|
|
10
12
|
}
|
|
11
13
|
/**
|
|
12
14
|
* @see https://shadowsocks.org/en/spec/SIP002-URI-Scheme.html
|
|
13
15
|
*/
|
|
14
|
-
export declare const getShadowsocksSubscription: (url: string, udpRelay?: boolean | undefined) => Promise<{
|
|
16
|
+
export declare const getShadowsocksSubscription: (url: string, udpRelay?: boolean | undefined, requestUserAgent?: string | undefined) => Promise<{
|
|
15
17
|
readonly nodeList: ReadonlyArray<ShadowsocksNodeConfig>;
|
|
16
18
|
readonly subscriptionUserinfo?: SubscriptionUserinfo | undefined;
|
|
17
19
|
}>;
|
|
@@ -45,8 +45,8 @@ class ShadowsocksSubscribeProvider extends Provider_1.default {
|
|
|
45
45
|
}
|
|
46
46
|
return undefined;
|
|
47
47
|
}
|
|
48
|
-
async getNodeList() {
|
|
49
|
-
const { nodeList } = await (0, exports.getShadowsocksSubscription)(this.url, this.udpRelay);
|
|
48
|
+
async getNodeList({ requestUserAgent, } = {}) {
|
|
49
|
+
const { nodeList } = await (0, exports.getShadowsocksSubscription)(this.url, this.udpRelay, requestUserAgent);
|
|
50
50
|
return nodeList;
|
|
51
51
|
}
|
|
52
52
|
}
|
|
@@ -54,9 +54,11 @@ exports.default = ShadowsocksSubscribeProvider;
|
|
|
54
54
|
/**
|
|
55
55
|
* @see https://shadowsocks.org/en/spec/SIP002-URI-Scheme.html
|
|
56
56
|
*/
|
|
57
|
-
const getShadowsocksSubscription = async (url, udpRelay) => {
|
|
57
|
+
const getShadowsocksSubscription = async (url, udpRelay, requestUserAgent) => {
|
|
58
58
|
(0, assert_1.default)(url, '未指定订阅地址 url');
|
|
59
|
-
const response = await Provider_1.default.requestCacheableResource(url
|
|
59
|
+
const response = await Provider_1.default.requestCacheableResource(url, {
|
|
60
|
+
requestUserAgent,
|
|
61
|
+
});
|
|
60
62
|
const nodeList = (0, utils_1.fromBase64)(response.body)
|
|
61
63
|
.split('\n')
|
|
62
64
|
.filter((item) => !!item && item.startsWith('ss://'))
|
|
@@ -73,4 +75,4 @@ const getShadowsocksSubscription = async (url, udpRelay) => {
|
|
|
73
75
|
};
|
|
74
76
|
};
|
|
75
77
|
exports.getShadowsocksSubscription = getShadowsocksSubscription;
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhZG93c29ja3NTdWJzY3JpYmVQcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9wcm92aWRlci9TaGFkb3dzb2Nrc1N1YnNjcmliZVByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDhDQUFzQjtBQUN0QixvREFBNEI7QUFDNUIsMkNBQThDO0FBTzlDLG9DQUFzQztBQUN0QywyRUFBa0Q7QUFDbEQsb0NBQXlDO0FBQ3pDLDBEQUFrQztBQUVsQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLHFDQUFxQztDQUMvQyxDQUFDLENBQUM7QUFFSCxNQUFxQiw0QkFBNkIsU0FBUSxrQkFBUTtJQUloRSxZQUFZLElBQVksRUFBRSxNQUEwQztRQUNsRSxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ2pDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO1FBQ2hDLElBQUksQ0FBQyw4QkFBOEIsR0FBRyxJQUFJLENBQUM7SUFDN0MsQ0FBQztJQUVELHVCQUF1QjtJQUN2QixJQUFXLEdBQUc7UUFDWixPQUFPLElBQUEsdUJBQVksRUFBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRU0sS0FBSyxDQUFDLHVCQUF1QjtRQUdsQyxNQUFNLEVBQUUsb0JBQW9CLEVBQUUsR0FBRyxNQUFNLElBQUEsa0NBQTBCLEVBQy9ELElBQUksQ0FBQyxHQUFHLEVBQ1IsSUFBSSxDQUFDLFFBQVEsQ0FDZCxDQUFDO1FBRUYsSUFBSSxvQkFBb0IsRUFBRTtZQUN4QixPQUFPLG9CQUFvQixDQUFDO1NBQzdCO1FBQ0QsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVNLEtBQUssQ0FBQyxXQUFXLENBQUMsRUFDdkIsZ0JBQWdCLE1BQ2lCLEVBQUU7UUFHbkMsTUFBTSxFQUFFLFFBQVEsRUFBRSxHQUFHLE1BQU0sSUFBQSxrQ0FBMEIsRUFDbkQsSUFBSSxDQUFDLEdBQUcsRUFDUixJQUFJLENBQUMsUUFBUSxFQUNiLGdCQUFnQixDQUNqQixDQUFDO1FBRUYsT0FBTyxRQUFRLENBQUM7SUFDbEIsQ0FBQztDQUNGO0FBNURELCtDQTREQztBQUVEOztHQUVHO0FBQ0ksTUFBTSwwQkFBMEIsR0FBRyxLQUFLLEVBQzdDLEdBQVcsRUFDWCxRQUFrQixFQUNsQixnQkFBeUIsRUFJeEIsRUFBRTtJQUNILElBQUEsZ0JBQU0sRUFBQyxHQUFHLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFFM0IsTUFBTSxRQUFRLEdBQUcsTUFBTSxrQkFBUSxDQUFDLHdCQUF3QixDQUFDLEdBQUcsRUFBRTtRQUM1RCxnQkFBZ0I7S0FDakIsQ0FBQyxDQUFDO0lBQ0gsTUFBTSxRQUFRLEdBQUcsSUFBQSxrQkFBVSxFQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUM7U0FDdkMsS0FBSyxDQUFDLElBQUksQ0FBQztTQUNYLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQ3BELEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBeUIsRUFBRTtRQUNuQyxNQUFNLFVBQVUsR0FBRyxJQUFBLGVBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztRQUVwQyxJQUFJLFFBQVEsS0FBSyxLQUFLLENBQUMsRUFBRTtZQUN0QixVQUFVLENBQUMsV0FBVyxDQUFhLEdBQUcsUUFBUSxDQUFDO1NBQ2pEO1FBRUQsT0FBTyxVQUFVLENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7SUFFTCxPQUFPO1FBQ0wsUUFBUTtRQUNSLG9CQUFvQixFQUFFLFFBQVEsQ0FBQyxvQkFBb0I7S0FDcEQsQ0FBQztBQUNKLENBQUMsQ0FBQztBQTlCVyxRQUFBLDBCQUEwQiw4QkE4QnJDIn0=
|