surgio 2.16.0 → 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.
@@ -6,9 +6,11 @@ export default class SsdProvider extends Provider {
6
6
  constructor(name: string, config: SsdProviderConfig);
7
7
  get url(): string;
8
8
  getSubscriptionUserInfo(): Promise<SubscriptionUserinfo | undefined>;
9
- getNodeList(): Promise<ReadonlyArray<ShadowsocksNodeConfig>>;
9
+ getNodeList({ requestUserAgent, }?: {
10
+ requestUserAgent?: string;
11
+ }): Promise<ReadonlyArray<ShadowsocksNodeConfig>>;
10
12
  }
11
- export declare const getSsdSubscription: (url: string, udpRelay?: boolean | undefined) => Promise<{
13
+ export declare const getSsdSubscription: (url: string, udpRelay?: boolean | undefined, requestUserAgent?: string | undefined) => Promise<{
12
14
  readonly nodeList: ReadonlyArray<ShadowsocksNodeConfig>;
13
15
  readonly subscriptionUserinfo?: SubscriptionUserinfo | undefined;
14
16
  }>;
@@ -46,16 +46,18 @@ class SsdProvider extends Provider_1.default {
46
46
  }
47
47
  return void 0;
48
48
  }
49
- async getNodeList() {
50
- const { nodeList } = await (0, exports.getSsdSubscription)(this.url, this.udpRelay);
49
+ async getNodeList({ requestUserAgent, } = {}) {
50
+ const { nodeList } = await (0, exports.getSsdSubscription)(this.url, this.udpRelay, requestUserAgent);
51
51
  return nodeList;
52
52
  }
53
53
  }
54
54
  exports.default = SsdProvider;
55
55
  // 协议定义:https://github.com/TheCGDF/SSD-Windows/wiki/HTTP%E8%AE%A2%E9%98%85%E5%8D%8F%E5%AE%9A
56
- const getSsdSubscription = async (url, udpRelay) => {
56
+ const getSsdSubscription = async (url, udpRelay, requestUserAgent) => {
57
57
  (0, assert_1.default)(url, '未指定订阅地址 url');
58
- const response = await Provider_1.default.requestCacheableResource(url);
58
+ const response = await Provider_1.default.requestCacheableResource(url, {
59
+ requestUserAgent,
60
+ });
59
61
  // istanbul ignore next
60
62
  if (!response.body.startsWith('ssd://')) {
61
63
  throw new Error(`暂仅支持 ssd:// 开头的订阅地址,${url} 无法处理`);
@@ -113,4 +115,4 @@ const parseSsdConfig = (globalConfig, server, udpRelay) => {
113
115
  : null));
114
116
  };
115
117
  exports.parseSsdConfig = parseSsdConfig;
116
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3NkUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvU3NkUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsOENBQXNCO0FBQ3RCLDJDQUE4QztBQUM5QyxvREFBNEI7QUFDNUIsa0RBQTBCO0FBRTFCLG9DQUtrQjtBQUNsQixvQ0FBd0Q7QUFDeEQsMkVBQWtEO0FBQ2xELDBEQUFrQztBQUVsQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLG9CQUFvQjtDQUM5QixDQUFDLENBQUM7QUFFSCxNQUFxQixXQUFZLFNBQVEsa0JBQVE7SUFJL0MsWUFBWSxJQUFZLEVBQUUsTUFBeUI7UUFDakQsS0FBSyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVwQixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLEdBQUcsRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNkLEdBQUcsQ0FBQztnQkFDSCxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUM7YUFDbkIsQ0FBQztpQkFDRCxRQUFRLEVBQUU7WUFDYixRQUFRLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtTQUNqQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUUxQyx1QkFBdUI7UUFDdkIsSUFBSSxLQUFLLEVBQUU7WUFDVCxNQUFNLEtBQUssQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQztRQUNoQyxJQUFJLENBQUMsOEJBQThCLEdBQUcsSUFBSSxDQUFDO0lBQzdDLENBQUM7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
118
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3NkUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvU3NkUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsOENBQXNCO0FBQ3RCLDJDQUE4QztBQUM5QyxvREFBNEI7QUFDNUIsa0RBQTBCO0FBRTFCLG9DQUtrQjtBQUNsQixvQ0FBd0Q7QUFDeEQsMkVBQWtEO0FBQ2xELDBEQUFrQztBQUVsQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLG9CQUFvQjtDQUM5QixDQUFDLENBQUM7QUFFSCxNQUFxQixXQUFZLFNBQVEsa0JBQVE7SUFJL0MsWUFBWSxJQUFZLEVBQUUsTUFBeUI7UUFDakQsS0FBSyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVwQixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLEdBQUcsRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNkLEdBQUcsQ0FBQztnQkFDSCxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUM7YUFDbkIsQ0FBQztpQkFDRCxRQUFRLEVBQUU7WUFDYixRQUFRLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtTQUNqQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUUxQyx1QkFBdUI7UUFDdkIsSUFBSSxLQUFLLEVBQUU7WUFDVCxNQUFNLEtBQUssQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQztRQUNoQyxJQUFJLENBQUMsOEJBQThCLEdBQUcsSUFBSSxDQUFDO0lBQzdDLENBQUM7SUFFRCx1QkFBdUI7SUFDdkIsSUFBVyxHQUFHO1FBQ1osT0FBTyxJQUFBLHVCQUFZLEVBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUVNLEtBQUssQ0FBQyx1QkFBdUI7UUFHbEMsTUFBTSxFQUFFLG9CQUFvQixFQUFFLEdBQUcsTUFBTSxJQUFBLDBCQUFrQixFQUN2RCxJQUFJLENBQUMsR0FBRyxFQUNSLElBQUksQ0FBQyxRQUFRLENBQ2QsQ0FBQztRQUVGLElBQUksb0JBQW9CLEVBQUU7WUFDeEIsT0FBTyxvQkFBb0IsQ0FBQztTQUM3QjtRQUNELE9BQU8sS0FBSyxDQUFDLENBQUM7SUFDaEIsQ0FBQztJQUVNLEtBQUssQ0FBQyxXQUFXLENBQUMsRUFDdkIsZ0JBQWdCLE1BQ2lCLEVBQUU7UUFHbkMsTUFBTSxFQUFFLFFBQVEsRUFBRSxHQUFHLE1BQU0sSUFBQSwwQkFBa0IsRUFDM0MsSUFBSSxDQUFDLEdBQUcsRUFDUixJQUFJLENBQUMsUUFBUSxFQUNiLGdCQUFnQixDQUNqQixDQUFDO1FBRUYsT0FBTyxRQUFRLENBQUM7SUFDbEIsQ0FBQztDQUNGO0FBNURELDhCQTREQztBQUVELDRGQUE0RjtBQUNyRixNQUFNLGtCQUFrQixHQUFHLEtBQUssRUFDckMsR0FBVyxFQUNYLFFBQWtCLEVBQ2xCLGdCQUF5QixFQUl4QixFQUFFO0lBQ0gsSUFBQSxnQkFBTSxFQUFDLEdBQUcsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUUzQixNQUFNLFFBQVEsR0FBRyxNQUFNLGtCQUFRLENBQUMsd0JBQXdCLENBQUMsR0FBRyxFQUFFO1FBQzVELGdCQUFnQjtLQUNqQixDQUFDLENBQUM7SUFFSCx1QkFBdUI7SUFDdkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFFO1FBQ3ZDLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLEdBQUcsT0FBTyxDQUFDLENBQUM7S0FDcEQ7SUFFRCxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDbkQsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFBLGtCQUFVLEVBQUMsTUFBTSxDQUFDLENBQW9CLENBQUM7SUFDL0QsTUFBTSxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsYUFBYSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQztJQUM5RCxNQUFNLFFBQVEsR0FDWixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFxQyxFQUFFLENBQ3hELElBQUEsc0JBQWMsRUFBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUN2QyxDQUFDO0lBRUosSUFDRSxDQUFDLFFBQVEsQ0FBQyxvQkFBb0I7UUFDOUIsWUFBWTtRQUNaLGFBQWE7UUFDYixNQUFNLEVBQ047UUFDQSxRQUFRLENBQUMsb0JBQW9CLEdBQUc7WUFDOUIsTUFBTSxFQUFFLENBQUM7WUFDVCxRQUFRLEVBQUUsZUFBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLFlBQVksSUFBSSxDQUFDO1lBQzFDLEtBQUssRUFBRSxlQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsYUFBYSxJQUFJLENBQUM7WUFDeEMsTUFBTSxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDO1NBQzlCLENBQUM7S0FDM0I7SUFFRCxPQUFPO1FBQ0wsUUFBUSxFQUFFLFFBQVEsQ0FBQyxNQUFNLENBQ3ZCLENBQUMsSUFBSSxFQUFpQyxFQUFFLENBQUMsSUFBSSxLQUFLLFNBQVMsQ0FDNUQ7UUFDRCxvQkFBb0IsRUFBRSxRQUFRLENBQUMsb0JBQW9CO0tBQ3BELENBQUM7QUFDSixDQUFDLENBQUM7QUEvQ1csUUFBQSxrQkFBa0Isc0JBK0M3QjtBQUVLLE1BQU0sY0FBYyxHQUFHLENBQzVCLFlBQTZCLEVBQzdCLE1BQWlCLEVBQ2pCLFFBQWtCLEVBQ2lCLEVBQUU7O0lBQ3JDLE1BQU0sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsR0FBRyxZQUFZLENBQUM7SUFDN0QsTUFBTSxNQUFNLEdBQUcsTUFBQSxNQUFNLENBQUMsTUFBTSxtQ0FBSSxZQUFZLENBQUMsTUFBTSxDQUFDO0lBQ3BELE1BQU0sZ0JBQWdCLEdBQUcsTUFBQSxNQUFNLENBQUMsY0FBYyxtQ0FBSSxZQUFZLENBQUMsY0FBYyxDQUFDO0lBQzlFLE1BQU0sVUFBVSxHQUFHLGdCQUFnQjtRQUNqQyxDQUFDLENBQUMsSUFBQSx3QkFBZ0IsRUFBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDL0MsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUVQLHVCQUF1QjtJQUN2QixJQUFJLE1BQU0sSUFBSSxDQUFDLENBQUMsYUFBYSxFQUFFLGNBQWMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsRUFBRTtRQUMvRCxNQUFNLENBQUMsSUFBSSxDQUNULGtCQUFrQixNQUFNLDBCQUEwQixNQUFNLENBQUMsT0FBTyxPQUFPLENBQ3hFLENBQUM7UUFDRixPQUFPLEtBQUssQ0FBQyxDQUFDO0tBQ2Y7SUFDRCx1QkFBdUI7SUFDdkIsSUFDRSxNQUFNLEtBQUssY0FBYztRQUN4QixVQUFVLENBQUMsSUFBZSxDQUFDLFdBQVcsRUFBRSxLQUFLLE1BQU0sRUFDcEQ7UUFDQSxNQUFNLENBQUMsSUFBSSxDQUNULDZDQUE2QyxNQUFNLENBQUMsT0FBTyxPQUFPLENBQ25FLENBQUM7UUFDRixPQUFPLEtBQUssQ0FBQyxDQUFDO0tBQ2Y7SUFFRCxxQ0FDRSxJQUFJLEVBQUUsb0JBQVksQ0FBQyxXQUFXLEVBQzlCLFFBQVEsRUFDTixNQUFBLE1BQU0sQ0FBQyxPQUFPLG1DQUFJLEdBQUcsT0FBTyxJQUFJLE1BQU0sQ0FBQyxNQUFNLElBQUksTUFBQSxNQUFNLENBQUMsSUFBSSxtQ0FBSSxJQUFJLEVBQUUsRUFDeEUsUUFBUSxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQ3ZCLElBQUksRUFBRSxNQUFBLE1BQU0sQ0FBQyxJQUFJLG1DQUFJLElBQUksRUFDekIsTUFBTSxFQUFFLE1BQUEsTUFBTSxDQUFDLFVBQVUsbUNBQUksVUFBVSxFQUN2QyxRQUFRLEVBQUUsTUFBQSxNQUFNLENBQUMsUUFBUSxtQ0FBSSxRQUFRLEVBQ3JDLFdBQVcsRUFBRSxRQUFRLEtBQUssSUFBSSxJQUczQixDQUFDLE1BQU0sSUFBSSxNQUFNLEtBQUssYUFBYTtRQUNwQyxDQUFDLENBQUM7WUFDRSxJQUFJLEVBQUUsVUFBVSxDQUFDLElBQXFDO1lBQ3RELFdBQVcsRUFBRyxVQUFVLENBQUMsV0FBVyxDQUFZLElBQUksY0FBYztTQUNuRTtRQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FHTixDQUFDLE1BQU0sSUFBSSxNQUFNLEtBQUssY0FBYztRQUNyQyxDQUFDLENBQUM7WUFDRSxJQUFJLEVBQUcsVUFBVSxDQUFDLEdBQWUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJO1lBQ2hELFdBQVcsRUFBRSxVQUFVLENBQUMsSUFBYztTQUN2QztRQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsRUFDVDtBQUNKLENBQUMsQ0FBQztBQXhEVyxRQUFBLGNBQWMsa0JBd0R6QiJ9
@@ -7,12 +7,19 @@ export default class TrojanProvider extends Provider {
7
7
  constructor(name: string, config: TrojanProviderConfig);
8
8
  get url(): string;
9
9
  getSubscriptionUserInfo(): Promise<SubscriptionUserinfo | undefined>;
10
- getNodeList(): Promise<ReadonlyArray<TrojanNodeConfig>>;
10
+ getNodeList({ requestUserAgent, }?: {
11
+ requestUserAgent?: string;
12
+ }): Promise<ReadonlyArray<TrojanNodeConfig>>;
11
13
  }
12
14
  /**
13
15
  * @see https://github.com/trojan-gfw/trojan-url/blob/master/trojan-url.py
14
16
  */
15
- export declare const getTrojanSubscription: (url: string, udpRelay?: boolean | undefined, tls13?: boolean | undefined) => Promise<{
17
+ export declare const getTrojanSubscription: ({ url, udpRelay, tls13, requestUserAgent, }: {
18
+ url: string;
19
+ udpRelay?: boolean | undefined;
20
+ tls13?: boolean | undefined;
21
+ requestUserAgent?: string | undefined;
22
+ }) => Promise<{
16
23
  readonly nodeList: ReadonlyArray<TrojanNodeConfig>;
17
24
  readonly subscriptionUserinfo?: SubscriptionUserinfo | undefined;
18
25
  }>;
@@ -41,14 +41,23 @@ class TrojanProvider extends Provider_1.default {
41
41
  return (0, relayable_url_1.default)(this._url, this.relayUrl);
42
42
  }
43
43
  async getSubscriptionUserInfo() {
44
- const { subscriptionUserinfo } = await (0, exports.getTrojanSubscription)(this.url, this.udpRelay, this.tls13);
44
+ const { subscriptionUserinfo } = await (0, exports.getTrojanSubscription)({
45
+ url: this.url,
46
+ udpRelay: this.udpRelay,
47
+ tls13: this.tls13,
48
+ });
45
49
  if (subscriptionUserinfo) {
46
50
  return subscriptionUserinfo;
47
51
  }
48
52
  return void 0;
49
53
  }
50
- async getNodeList() {
51
- const { nodeList } = await (0, exports.getTrojanSubscription)(this.url, this.udpRelay, this.tls13);
54
+ async getNodeList({ requestUserAgent, } = {}) {
55
+ const { nodeList } = await (0, exports.getTrojanSubscription)({
56
+ url: this.url,
57
+ udpRelay: this.udpRelay,
58
+ tls13: this.tls13,
59
+ requestUserAgent,
60
+ });
52
61
  return nodeList;
53
62
  }
54
63
  }
@@ -56,10 +65,10 @@ exports.default = TrojanProvider;
56
65
  /**
57
66
  * @see https://github.com/trojan-gfw/trojan-url/blob/master/trojan-url.py
58
67
  */
59
- const getTrojanSubscription = async (url, udpRelay, tls13) => {
68
+ const getTrojanSubscription = async ({ url, udpRelay, tls13, requestUserAgent, }) => {
60
69
  (0, assert_1.default)(url, '未指定订阅地址 url');
61
70
  const response = await Provider_1.default.requestCacheableResource(url, {
62
- requestUserAgent: 'shadowrocket',
71
+ requestUserAgent: requestUserAgent || 'shadowrocket',
63
72
  });
64
73
  const config = (0, utils_1.fromBase64)(response.body);
65
74
  const nodeList = config
@@ -75,4 +84,4 @@ const getTrojanSubscription = async (url, udpRelay, tls13) => {
75
84
  };
76
85
  };
77
86
  exports.getTrojanSubscription = getTrojanSubscription;
78
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVHJvamFuUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvVHJvamFuUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsOENBQXNCO0FBQ3RCLG9EQUE0QjtBQUM1QiwyQ0FBOEM7QUFPOUMsb0NBQXNDO0FBQ3RDLDJFQUFrRDtBQUNsRCw0Q0FBaUQ7QUFDakQsMERBQWtDO0FBRWxDLE1BQU0sTUFBTSxHQUFHLElBQUEscUJBQVksRUFBQztJQUMxQixPQUFPLEVBQUUsdUJBQXVCO0NBQ2pDLENBQUMsQ0FBQztBQUVILE1BQXFCLGNBQWUsU0FBUSxrQkFBUTtJQUtsRCxZQUFZLElBQVksRUFBRSxNQUE0QjtRQUNwRCxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1lBQzdCLEtBQUssRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQzNCLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO1FBQ2hDLElBQUksQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQztRQUMxQixJQUFJLENBQUMsOEJBQThCLEdBQUcsSUFBSSxDQUFDO0lBQzdDLENBQUM7SUFFRCx1QkFBdUI7SUFDdkIsSUFBVyxHQUFHO1FBQ1osT0FBTyxJQUFBLHVCQUFZLEVBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUVNLEtBQUssQ0FBQyx1QkFBdUI7UUFHbEMsTUFBTSxFQUFFLG9CQUFvQixFQUFFLEdBQUcsTUFBTSxJQUFBLDZCQUFxQixFQUMxRCxJQUFJLENBQUMsR0FBRyxFQUNSLElBQUksQ0FBQyxRQUFRLEVBQ2IsSUFBSSxDQUFDLEtBQUssQ0FDWCxDQUFDO1FBRUYsSUFBSSxvQkFBb0IsRUFBRTtZQUN4QixPQUFPLG9CQUFvQixDQUFDO1NBQzdCO1FBQ0QsT0FBTyxLQUFLLENBQUMsQ0FBQztJQUNoQixDQUFDO0lBRU0sS0FBSyxDQUFDLFdBQVc7UUFDdEIsTUFBTSxFQUFFLFFBQVEsRUFBRSxHQUFHLE1BQU0sSUFBQSw2QkFBcUIsRUFDOUMsSUFBSSxDQUFDLEdBQUcsRUFDUixJQUFJLENBQUMsUUFBUSxFQUNiLElBQUksQ0FBQyxLQUFLLENBQ1gsQ0FBQztRQUVGLE9BQU8sUUFBUSxDQUFDO0lBQ2xCLENBQUM7Q0FDRjtBQTVERCxpQ0E0REM7QUFFRDs7R0FFRztBQUNJLE1BQU0scUJBQXFCLEdBQUcsS0FBSyxFQUN4QyxHQUFXLEVBQ1gsUUFBa0IsRUFDbEIsS0FBZSxFQUlkLEVBQUU7SUFDSCxJQUFBLGdCQUFNLEVBQUMsR0FBRyxFQUFFLGFBQWEsQ0FBQyxDQUFDO0lBRTNCLE1BQU0sUUFBUSxHQUFHLE1BQU0sa0JBQVEsQ0FBQyx3QkFBd0IsQ0FBQyxHQUFHLEVBQUU7UUFDNUQsZ0JBQWdCLEVBQUUsY0FBYztLQUNqQyxDQUFDLENBQUM7SUFDSCxNQUFNLE1BQU0sR0FBRyxJQUFBLGtCQUFVLEVBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3pDLE1BQU0sUUFBUSxHQUFHLE1BQU07U0FDcEIsS0FBSyxDQUFDLElBQUksQ0FBQztTQUNYLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1NBQ3hELEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBb0IsRUFBRTtRQUM5QixNQUFNLFVBQVUsR0FBRyxJQUFBLHVCQUFjLEVBQUMsSUFBSSxDQUFDLENBQUM7UUFFeEMsdUNBQ0ssVUFBVSxLQUNiLFdBQVcsRUFBRSxRQUFRLEVBQ3JCLEtBQUssSUFDTDtJQUNKLENBQUMsQ0FBQyxDQUFDO0lBRUwsT0FBTztRQUNMLFFBQVE7UUFDUixvQkFBb0IsRUFBRSxRQUFRLENBQUMsb0JBQW9CO0tBQ3BELENBQUM7QUFDSixDQUFDLENBQUM7QUEvQlcsUUFBQSxxQkFBcUIseUJBK0JoQyJ9
87
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVHJvamFuUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvVHJvamFuUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsOENBQXNCO0FBQ3RCLG9EQUE0QjtBQUM1QiwyQ0FBOEM7QUFPOUMsb0NBQXNDO0FBQ3RDLDJFQUFrRDtBQUNsRCw0Q0FBaUQ7QUFDakQsMERBQWtDO0FBRWxDLE1BQU0sTUFBTSxHQUFHLElBQUEscUJBQVksRUFBQztJQUMxQixPQUFPLEVBQUUsdUJBQXVCO0NBQ2pDLENBQUMsQ0FBQztBQUVILE1BQXFCLGNBQWUsU0FBUSxrQkFBUTtJQUtsRCxZQUFZLElBQVksRUFBRSxNQUE0QjtRQUNwRCxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1lBQzdCLEtBQUssRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQzNCLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO1FBQ2hDLElBQUksQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQztRQUMxQixJQUFJLENBQUMsOEJBQThCLEdBQUcsSUFBSSxDQUFDO0lBQzdDLENBQUM7SUFFRCx1QkFBdUI7SUFDdkIsSUFBVyxHQUFHO1FBQ1osT0FBTyxJQUFBLHVCQUFZLEVBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUVNLEtBQUssQ0FBQyx1QkFBdUI7UUFHbEMsTUFBTSxFQUFFLG9CQUFvQixFQUFFLEdBQUcsTUFBTSxJQUFBLDZCQUFxQixFQUFDO1lBQzNELEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztZQUNiLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBUTtZQUN2QixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUs7U0FDbEIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxvQkFBb0IsRUFBRTtZQUN4QixPQUFPLG9CQUFvQixDQUFDO1NBQzdCO1FBQ0QsT0FBTyxLQUFLLENBQUMsQ0FBQztJQUNoQixDQUFDO0lBRU0sS0FBSyxDQUFDLFdBQVcsQ0FBQyxFQUN2QixnQkFBZ0IsTUFDaUIsRUFBRTtRQUduQyxNQUFNLEVBQUUsUUFBUSxFQUFFLEdBQUcsTUFBTSxJQUFBLDZCQUFxQixFQUFDO1lBQy9DLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztZQUNiLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBUTtZQUN2QixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUs7WUFDakIsZ0JBQWdCO1NBQ2pCLENBQUMsQ0FBQztRQUVILE9BQU8sUUFBUSxDQUFDO0lBQ2xCLENBQUM7Q0FDRjtBQWpFRCxpQ0FpRUM7QUFFRDs7R0FFRztBQUNJLE1BQU0scUJBQXFCLEdBQUcsS0FBSyxFQUFFLEVBQzFDLEdBQUcsRUFDSCxRQUFRLEVBQ1IsS0FBSyxFQUNMLGdCQUFnQixHQU1qQixFQUdFLEVBQUU7SUFDSCxJQUFBLGdCQUFNLEVBQUMsR0FBRyxFQUFFLGFBQWEsQ0FBQyxDQUFDO0lBRTNCLE1BQU0sUUFBUSxHQUFHLE1BQU0sa0JBQVEsQ0FBQyx3QkFBd0IsQ0FBQyxHQUFHLEVBQUU7UUFDNUQsZ0JBQWdCLEVBQUUsZ0JBQWdCLElBQUksY0FBYztLQUNyRCxDQUFDLENBQUM7SUFDSCxNQUFNLE1BQU0sR0FBRyxJQUFBLGtCQUFVLEVBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3pDLE1BQU0sUUFBUSxHQUFHLE1BQU07U0FDcEIsS0FBSyxDQUFDLElBQUksQ0FBQztTQUNYLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1NBQ3hELEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBb0IsRUFBRTtRQUM5QixNQUFNLFVBQVUsR0FBRyxJQUFBLHVCQUFjLEVBQUMsSUFBSSxDQUFDLENBQUM7UUFFeEMsdUNBQ0ssVUFBVSxLQUNiLFdBQVcsRUFBRSxRQUFRLEVBQ3JCLEtBQUssSUFDTDtJQUNKLENBQUMsQ0FBQyxDQUFDO0lBRUwsT0FBTztRQUNMLFFBQVE7UUFDUixvQkFBb0IsRUFBRSxRQUFRLENBQUMsb0JBQW9CO0tBQ3BELENBQUM7QUFDSixDQUFDLENBQUM7QUFyQ1csUUFBQSxxQkFBcUIseUJBcUNoQyJ9
@@ -8,10 +8,19 @@ export default class V2rayNSubscribeProvider extends Provider {
8
8
  private readonly _url;
9
9
  constructor(name: string, config: V2rayNSubscribeProviderConfig);
10
10
  get url(): string;
11
- getNodeList(): ReturnType<typeof getV2rayNSubscription>;
11
+ getNodeList({ requestUserAgent, }?: {
12
+ requestUserAgent?: string;
13
+ }): ReturnType<typeof getV2rayNSubscription>;
12
14
  }
13
15
  /**
14
16
  * @see https://github.com/2dust/v2rayN/wiki/%E5%88%86%E4%BA%AB%E9%93%BE%E6%8E%A5%E6%A0%BC%E5%BC%8F%E8%AF%B4%E6%98%8E(ver-2)
15
17
  */
16
- export declare const getV2rayNSubscription: (url: string, isCompatibleMode?: boolean | undefined, skipCertVerify?: boolean | undefined, udpRelay?: boolean | undefined, tls13?: boolean | undefined) => Promise<ReadonlyArray<VmessNodeConfig | ShadowsocksNodeConfig>>;
18
+ export declare const getV2rayNSubscription: ({ url, isCompatibleMode, skipCertVerify, tls13, udpRelay, requestUserAgent, }: {
19
+ url: string;
20
+ isCompatibleMode?: boolean | undefined;
21
+ skipCertVerify?: boolean | undefined;
22
+ udpRelay?: boolean | undefined;
23
+ tls13?: boolean | undefined;
24
+ requestUserAgent?: string | undefined;
25
+ }) => Promise<ReadonlyArray<VmessNodeConfig | ShadowsocksNodeConfig>>;
17
26
  export declare const parseJSONConfig: (json: string, isCompatibleMode: boolean | undefined, skipCertVerify?: boolean | undefined, udpRelay?: boolean | undefined, tls13?: boolean | undefined) => VmessNodeConfig | undefined;
@@ -9,8 +9,6 @@ const logger_1 = require("@surgio/logger");
9
9
  const assert_1 = __importDefault(require("assert"));
10
10
  const types_1 = require("../types");
11
11
  const utils_1 = require("../utils");
12
- const cache_1 = require("../utils/cache");
13
- const http_client_1 = __importDefault(require("../utils/http-client"));
14
12
  const relayable_url_1 = __importDefault(require("../utils/relayable-url"));
15
13
  const ss_1 = require("../utils/ss");
16
14
  const Provider_1 = __importDefault(require("./Provider"));
@@ -43,28 +41,32 @@ class V2rayNSubscribeProvider extends Provider_1.default {
43
41
  get url() {
44
42
  return (0, relayable_url_1.default)(this._url, this.relayUrl);
45
43
  }
46
- getNodeList() {
47
- return (0, exports.getV2rayNSubscription)(this.url, this.compatibleMode, this.skipCertVerify, this.udpRelay, this.tls13);
44
+ getNodeList({ requestUserAgent, } = {}) {
45
+ return (0, exports.getV2rayNSubscription)({
46
+ url: this.url,
47
+ skipCertVerify: this.skipCertVerify,
48
+ tls13: this.tls13,
49
+ udpRelay: this.udpRelay,
50
+ isCompatibleMode: this.compatibleMode,
51
+ requestUserAgent,
52
+ });
48
53
  }
49
54
  }
50
55
  exports.default = V2rayNSubscribeProvider;
51
56
  /**
52
57
  * @see https://github.com/2dust/v2rayN/wiki/%E5%88%86%E4%BA%AB%E9%93%BE%E6%8E%A5%E6%A0%BC%E5%BC%8F%E8%AF%B4%E6%98%8E(ver-2)
53
58
  */
54
- const getV2rayNSubscription = async (url, isCompatibleMode, skipCertVerify, udpRelay, tls13) => {
59
+ const getV2rayNSubscription = async ({ url, isCompatibleMode, skipCertVerify, tls13, udpRelay, requestUserAgent, }) => {
55
60
  (0, assert_1.default)(url, '未指定订阅地址 url');
56
61
  if (isCompatibleMode) {
57
62
  logger_1.logger.warn('运行在兼容模式,请注意生成的节点是否正确。');
58
63
  }
59
64
  async function requestConfigFromRemote() {
60
- const response = cache_1.ConfigCache.has(url)
61
- ? cache_1.ConfigCache.get(url)
62
- : await (async () => {
63
- const res = await http_client_1.default.get(url);
64
- cache_1.ConfigCache.set(url, res.body);
65
- return res.body;
66
- })();
67
- const configList = (0, utils_1.fromBase64)(response)
65
+ const response = await Provider_1.default.requestCacheableResource(url, {
66
+ requestUserAgent,
67
+ });
68
+ const configString = response.body;
69
+ const configList = (0, utils_1.fromBase64)(configString)
68
70
  .split('\n')
69
71
  .filter((item) => !!item)
70
72
  .filter((item) => {
@@ -108,4 +110,4 @@ const parseJSONConfig = (json, isCompatibleMode, skipCertVerify, udpRelay, tls13
108
110
  : null));
109
111
  };
110
112
  exports.parseJSONConfig = parseJSONConfig;
111
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVjJyYXlOU3Vic2NyaWJlUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvVjJyYXlOU3Vic2NyaWJlUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsOENBQXNCO0FBQ3RCLDJDQUF3QztBQUN4QyxvREFBNEI7QUFFNUIsb0NBS2tCO0FBQ2xCLG9DQUFzQztBQUN0QywwQ0FBNkM7QUFDN0MsdUVBQThDO0FBQzlDLDJFQUFrRDtBQUNsRCxvQ0FBeUM7QUFDekMsMERBQWtDO0FBRWxDLE1BQXFCLHVCQUF3QixTQUFRLGtCQUFRO0lBUTNELFlBQVksSUFBWSxFQUFFLE1BQXFDO1FBQzdELEtBQUssQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFcEIsTUFBTSxNQUFNLEdBQUcsYUFBRyxDQUFDLE1BQU0sQ0FBQztZQUN4QixHQUFHLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtpQkFDZCxHQUFHLENBQUM7Z0JBQ0gsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDO2FBQ25CLENBQUM7aUJBQ0QsUUFBUSxFQUFFO1lBQ2IsUUFBUSxFQUFFLGFBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEVBQUU7WUFDN0IsS0FBSyxFQUFFLGFBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEVBQUU7WUFDMUIsY0FBYyxFQUFFLGFBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEVBQUU7WUFDbkMsY0FBYyxFQUFFLGFBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEVBQUU7U0FDcEMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBRWIsTUFBTSxFQUFFLEtBQUssRUFBRSxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFMUMsdUJBQXVCO1FBQ3ZCLElBQUksS0FBSyxFQUFFO1lBQ1QsTUFBTSxLQUFLLENBQUM7U0FDYjtRQUVELElBQUks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
113
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVjJyYXlOU3Vic2NyaWJlUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvVjJyYXlOU3Vic2NyaWJlUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsOENBQXNCO0FBQ3RCLDJDQUF3QztBQUN4QyxvREFBNEI7QUFFNUIsb0NBS2tCO0FBQ2xCLG9DQUFzQztBQUN0QywyRUFBa0Q7QUFDbEQsb0NBQXlDO0FBQ3pDLDBEQUFrQztBQUVsQyxNQUFxQix1QkFBd0IsU0FBUSxrQkFBUTtJQVEzRCxZQUFZLElBQVksRUFBRSxNQUFxQztRQUM3RCxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1lBQzdCLEtBQUssRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1lBQzFCLGNBQWMsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1lBQ25DLGNBQWMsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ3BDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxH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
@@ -1,8 +1,9 @@
1
- import LRU from 'lru-cache';
1
+ import NodeCache from 'node-cache';
2
2
  import { SubscriptionUserinfo } from '../types';
3
3
  export interface SubsciptionCacheItem {
4
4
  readonly body: string;
5
5
  subscriptionUserinfo?: SubscriptionUserinfo;
6
6
  }
7
- export declare const ConfigCache: LRU<string, string>;
8
- export declare const SubscriptionCache: LRU<string, SubsciptionCacheItem>;
7
+ export declare const ConfigCache: NodeCache;
8
+ export declare const SubscriptionCache: NodeCache;
9
+ export declare const cleanCaches: () => void;
@@ -3,15 +3,23 @@ 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.SubscriptionCache = exports.ConfigCache = void 0;
7
- const lru_cache_1 = __importDefault(require("lru-cache"));
6
+ exports.cleanCaches = exports.SubscriptionCache = exports.ConfigCache = void 0;
7
+ const node_cache_1 = __importDefault(require("node-cache"));
8
8
  const env_flag_1 = require("./env-flag");
9
- exports.ConfigCache = new lru_cache_1.default({
10
- maxAge: (0, env_flag_1.getProviderCacheMaxage)(),
11
- max: 100,
9
+ const index_1 = require("./index");
10
+ exports.ConfigCache = new node_cache_1.default({
11
+ stdTTL: (0, index_1.msToSeconds)((0, env_flag_1.getProviderCacheMaxage)()),
12
+ maxKeys: 300,
13
+ useClones: false,
12
14
  });
13
- exports.SubscriptionCache = new lru_cache_1.default({
14
- maxAge: (0, env_flag_1.getProviderCacheMaxage)(),
15
- max: 100,
15
+ exports.SubscriptionCache = new node_cache_1.default({
16
+ stdTTL: (0, index_1.msToSeconds)((0, env_flag_1.getProviderCacheMaxage)()),
17
+ maxKeys: 300,
18
+ useClones: false,
16
19
  });
17
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsMERBQTRCO0FBRzVCLHlDQUFvRDtBQU92QyxRQUFBLFdBQVcsR0FBRyxJQUFJLG1CQUFHLENBQWlCO0lBQ2pELE1BQU0sRUFBRSxJQUFBLGlDQUFzQixHQUFFO0lBQ2hDLEdBQUcsRUFBRSxHQUFHO0NBQ1QsQ0FBQyxDQUFDO0FBRVUsUUFBQSxpQkFBaUIsR0FBRyxJQUFJLG1CQUFHLENBQStCO0lBQ3JFLE1BQU0sRUFBRSxJQUFBLGlDQUFzQixHQUFFO0lBQ2hDLEdBQUcsRUFBRSxHQUFHO0NBQ1QsQ0FBQyxDQUFDIn0=
20
+ const cleanCaches = () => {
21
+ exports.ConfigCache.flushAll();
22
+ exports.SubscriptionCache.flushAll();
23
+ };
24
+ exports.cleanCaches = cleanCaches;
25
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNERBQW1DO0FBR25DLHlDQUFvRDtBQUNwRCxtQ0FBc0M7QUFPekIsUUFBQSxXQUFXLEdBQUcsSUFBSSxvQkFBUyxDQUFDO0lBQ3ZDLE1BQU0sRUFBRSxJQUFBLG1CQUFXLEVBQUMsSUFBQSxpQ0FBc0IsR0FBRSxDQUFDO0lBQzdDLE9BQU8sRUFBRSxHQUFHO0lBQ1osU0FBUyxFQUFFLEtBQUs7Q0FDakIsQ0FBQyxDQUFDO0FBRVUsUUFBQSxpQkFBaUIsR0FBRyxJQUFJLG9CQUFTLENBQUM7SUFDN0MsTUFBTSxFQUFFLElBQUEsbUJBQVcsRUFBQyxJQUFBLGlDQUFzQixHQUFFLENBQUM7SUFDN0MsT0FBTyxFQUFFLEdBQUc7SUFDWixTQUFTLEVBQUUsS0FBSztDQUNqQixDQUFDLENBQUM7QUFFSSxNQUFNLFdBQVcsR0FBRyxHQUFHLEVBQUU7SUFDOUIsbUJBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUN2Qix5QkFBaUIsQ0FBQyxRQUFRLEVBQUUsQ0FBQztBQUMvQixDQUFDLENBQUM7QUFIVyxRQUFBLFdBQVcsZUFHdEIifQ==
@@ -1,3 +1,3 @@
1
1
  import { NodeFilterType, NodeNameFilterType, PossibleNodeConfigType, SimpleNodeConfig, SortedNodeNameFilterType } from '../types';
2
- export declare const getClashNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeNameFilterType | undefined) => ReadonlyArray<any>;
2
+ export declare const getClashNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: SortedNodeNameFilterType | NodeFilterType | undefined) => ReadonlyArray<any>;
3
3
  export declare const getClashNodeNames: (list: ReadonlyArray<SimpleNodeConfig>, filter?: SortedNodeNameFilterType | NodeNameFilterType | undefined, existingProxies?: readonly string[] | undefined) => ReadonlyArray<string>;
@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.resolve4And6 = exports.resolveDomain = void 0;
7
7
  const dns_1 = require("dns");
8
- const lru_cache_1 = __importDefault(require("lru-cache"));
9
8
  const logger_1 = require("@surgio/logger");
10
9
  const bluebird_1 = __importDefault(require("bluebird"));
10
+ const node_cache_1 = __importDefault(require("node-cache"));
11
11
  const env_flag_1 = require("./env-flag");
12
- const DomainCache = new lru_cache_1.default({
13
- max: 5000,
12
+ const DomainCache = new node_cache_1.default({
13
+ useClones: false,
14
14
  });
15
15
  const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:dns' });
16
16
  const resolveDomain = async (domain, timeout = (0, env_flag_1.getNetworkResolveTimeout)()) => {
@@ -26,7 +26,7 @@ const resolveDomain = async (domain, timeout = (0, env_flag_1.getNetworkResolveT
26
26
  logger.debug(`resolved domain ${domain}: ${JSON.stringify(records)} ${Date.now() - now}ms`);
27
27
  if (records.length) {
28
28
  const address = records.map((item) => item.address);
29
- DomainCache.set(domain, address, records[0].ttl * 1000);
29
+ DomainCache.set(domain, address, records[0].ttl); // ttl is in seconds
30
30
  return address;
31
31
  }
32
32
  // istanbul ignore next
@@ -45,4 +45,4 @@ const resolve4And6 = async (domain) => {
45
45
  return [...ipv4, ...ipv6];
46
46
  };
47
47
  exports.resolve4And6 = resolve4And6;
48
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL2Rucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSw2QkFBcUQ7QUFDckQsMERBQTRCO0FBQzVCLDJDQUE4QztBQUM5Qyx3REFBZ0M7QUFFaEMseUNBQXNEO0FBRXRELE1BQU0sV0FBVyxHQUFHLElBQUksbUJBQUcsQ0FBZ0M7SUFDekQsR0FBRyxFQUFFLElBQUk7Q0FDVixDQUFDLENBQUM7QUFDSCxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO0FBRXRELE1BQU0sYUFBYSxHQUFHLEtBQUssRUFDaEMsTUFBYyxFQUNkLFVBQWtCLElBQUEsbUNBQXdCLEdBQUUsRUFDWixFQUFFO0lBQ2xDLElBQUksV0FBVyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRTtRQUMzQixPQUFPLFdBQVcsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUEwQixDQUFDO0tBQ3pEO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyx5QkFBeUIsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUNoRCxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDdkIsTUFBTSxPQUFPLEdBQUcsTUFBTSxrQkFBUSxDQUFDLElBQUksQ0FBK0I7UUFDaEUsSUFBQSxvQkFBWSxFQUFDLE1BQU0sQ0FBQztRQUNwQixrQkFBUSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsRUFBRSxDQUFDO0tBQ3ZDLENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxLQUFLLENBQ1YsbUJBQW1CLE1BQU0sS0FBSyxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxJQUNuRCxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsR0FDZixJQUFJLENBQ0wsQ0FBQztJQUVGLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRTtRQUNsQixNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDcEQsV0FBVyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLEdBQUcsSUFBSSxDQUFDLENBQUM7UUFDeEQsT0FBTyxPQUFPLENBQUM7S0FDaEI7SUFFRCx1QkFBdUI7SUFDdkIsT0FBTyxFQUFFLENBQUM7QUFDWixDQUFDLENBQUM7QUE1QlcsUUFBQSxhQUFhLGlCQTRCeEI7QUFFSyxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQy9CLE1BQWMsRUFDeUIsRUFBRTtJQUN6Qyx1QkFBdUI7SUFDdkIsU0FBUyxLQUFLO1FBQ1osT0FBTyxFQUFFLENBQUM7SUFDWixDQUFDO0lBRUQsTUFBTSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUM7UUFDckMsY0FBRyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDO1FBQ2hELGNBQUcsQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQztLQUNqRCxDQUFDLENBQUM7SUFFSCxPQUFPLENBQUMsR0FBRyxJQUFJLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztBQUM1QixDQUFDLENBQUM7QUFkVyxRQUFBLFlBQVksZ0JBY3ZCIn0=
48
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL2Rucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSw2QkFBcUQ7QUFDckQsMkNBQThDO0FBQzlDLHdEQUFnQztBQUNoQyw0REFBbUM7QUFFbkMseUNBQXNEO0FBRXRELE1BQU0sV0FBVyxHQUFHLElBQUksb0JBQVMsQ0FBQztJQUNoQyxTQUFTLEVBQUUsS0FBSztDQUNqQixDQUFDLENBQUM7QUFDSCxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO0FBRXRELE1BQU0sYUFBYSxHQUFHLEtBQUssRUFDaEMsTUFBYyxFQUNkLFVBQWtCLElBQUEsbUNBQXdCLEdBQUUsRUFDWixFQUFFO0lBQ2xDLElBQUksV0FBVyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRTtRQUMzQixPQUFPLFdBQVcsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUEwQixDQUFDO0tBQ3pEO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyx5QkFBeUIsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUNoRCxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDdkIsTUFBTSxPQUFPLEdBQUcsTUFBTSxrQkFBUSxDQUFDLElBQUksQ0FBK0I7UUFDaEUsSUFBQSxvQkFBWSxFQUFDLE1BQU0sQ0FBQztRQUNwQixrQkFBUSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsRUFBRSxDQUFDO0tBQ3ZDLENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxLQUFLLENBQ1YsbUJBQW1CLE1BQU0sS0FBSyxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxJQUNuRCxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsR0FDZixJQUFJLENBQ0wsQ0FBQztJQUVGLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRTtRQUNsQixNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDcEQsV0FBVyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLG9CQUFvQjtRQUN0RSxPQUFPLE9BQU8sQ0FBQztLQUNoQjtJQUVELHVCQUF1QjtJQUN2QixPQUFPLEVBQUUsQ0FBQztBQUNaLENBQUMsQ0FBQztBQTVCVyxRQUFBLGFBQWEsaUJBNEJ4QjtBQUVLLE1BQU0sWUFBWSxHQUFHLEtBQUssRUFDL0IsTUFBYyxFQUN5QixFQUFFO0lBQ3pDLHVCQUF1QjtJQUN2QixTQUFTLEtBQUs7UUFDWixPQUFPLEVBQUUsQ0FBQztJQUNaLENBQUM7SUFFRCxNQUFNLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUNyQyxjQUFHLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUM7UUFDaEQsY0FBRyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDO0tBQ2pELENBQUMsQ0FBQztJQUVILE9BQU8sQ0FBQyxHQUFHLElBQUksRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDO0FBQzVCLENBQUMsQ0FBQztBQWRXLFFBQUEsWUFBWSxnQkFjdkIifQ==
@@ -20,7 +20,7 @@ const getNetworkConcurrency = () => process.env[constant_1.ENV_SURGIO_NETWORK_CO
20
20
  exports.getNetworkConcurrency = getNetworkConcurrency;
21
21
  const getNetworkRetry = () => process.env[constant_1.ENV_SURGIO_NETWORK_RETRY]
22
22
  ? Number(process.env[constant_1.ENV_SURGIO_NETWORK_RETRY])
23
- : 3;
23
+ : 0;
24
24
  exports.getNetworkRetry = getNetworkRetry;
25
25
  const getNetworkClashUA = () => { var _a; return (_a = process.env[constant_1.ENV_SURGIO_NETWORK_CLASH_UA]) !== null && _a !== void 0 ? _a : 'clash'; };
26
26
  exports.getNetworkClashUA = getNetworkClashUA;
@@ -5,8 +5,7 @@ export * from './clash';
5
5
  export * from './quantumult';
6
6
  export declare const getDownloadUrl: (baseUrl: string | undefined, artifactName: string, inline?: boolean, accessToken?: string | undefined) => string;
7
7
  export declare const getUrl: (baseUrl: string, path: string, accessToken?: string | undefined) => string;
8
- export declare const getShadowsocksJSONConfig: (url: string, udpRelay?: boolean | undefined) => Promise<ReadonlyArray<ShadowsocksNodeConfig>>;
9
- export declare const getMellowNodes: (list: ReadonlyArray<VmessNodeConfig | ShadowsocksNodeConfig>, filter?: NodeFilterType | SortedNodeNameFilterType | undefined) => string;
8
+ export declare const getMellowNodes: (list: ReadonlyArray<VmessNodeConfig | ShadowsocksNodeConfig>, filter?: SortedNodeNameFilterType | NodeFilterType | undefined) => string;
10
9
  export declare const toUrlSafeBase64: (str: string) => string;
11
10
  export declare const fromUrlSafeBase64: (str: string) => string;
12
11
  export declare const toBase64: (str: string) => string;
@@ -41,6 +40,7 @@ export declare const normalizeClashProxyGroupConfig: (nodeList: ReadonlyArray<Po
41
40
  export declare const ensureConfigFolder: (dir?: string) => string;
42
41
  export declare const formatV2rayConfig: (localPort: number, nodeConfig: VmessNodeConfig) => JsonObject;
43
42
  export declare const lowercaseHeaderKeys: (headers: Record<string, string>) => Record<string, string>;
43
+ export declare const msToSeconds: (ms: number) => number;
44
44
  export declare const isIp: (str: string) => boolean;
45
45
  export declare const isNow: () => boolean;
46
46
  export declare const isVercel: () => boolean;
@@ -49,3 +49,4 @@ export declare const isGitHubActions: () => boolean;
49
49
  export declare const isGitLabCI: () => boolean;
50
50
  export declare const isPkgBundle: () => boolean;
51
51
  export declare const isRailway: () => boolean;
52
+ export declare const isNetlify: () => boolean;
@@ -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.getShadowsocksJSONConfig = exports.getUrl = exports.getDownloadUrl = void 0;
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.isHeroku)() && !(0, _1.isNow)() && !(0, _1.isGitHubActions)() && !(0, _1.isGitLabCI)()) {
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0Y2gtcHJveHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvcGF0Y2gtcHJveHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUF1Qjs7QUFFdkIsMkNBQThDO0FBQzlDLHlCQUFrRTtBQUVsRSxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsQ0FBQyxDQUFDO0FBQ3JFLE1BQU0sSUFBSSxHQUEwQixDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFFL0UsSUFBSSxDQUFDLElBQUEsV0FBUSxHQUFFLElBQUksQ0FBQyxJQUFBLFFBQUssR0FBRSxJQUFJLENBQUMsSUFBQSxrQkFBZSxHQUFFLElBQUksQ0FBQyxJQUFBLGFBQVUsR0FBRSxFQUFFO0lBQ2xFLE9BQU8sQ0FBQyxHQUFHLENBQUMsMkNBQTJDLEdBQUcsRUFBRSxDQUFDO0lBRTdELElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtRQUNuQixJQUFJLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFO1lBQ3RCLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQyxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBRS9CLE1BQU0sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBQ2xFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDO1NBQzdCO0lBQ0gsQ0FBQyxDQUFDLENBQUM7Q0FDSiJ9
24
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0Y2gtcHJveHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvcGF0Y2gtcHJveHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUF1Qjs7QUFFdkIsMkNBQThDO0FBQzlDLHlCQU9ZO0FBRVosTUFBTSxNQUFNLEdBQUcsSUFBQSxxQkFBWSxFQUFDLEVBQUUsT0FBTyxFQUFFLDBCQUEwQixFQUFFLENBQUMsQ0FBQztBQUNyRSxNQUFNLElBQUksR0FBMEIsQ0FBQyxZQUFZLEVBQUUsYUFBYSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBRS9FLElBQ0UsQ0FBQyxJQUFBLFFBQUssR0FBRTtJQUNSLENBQUMsSUFBQSxXQUFRLEdBQUU7SUFDWCxDQUFDLElBQUEsa0JBQWUsR0FBRTtJQUNsQixDQUFDLElBQUEsYUFBVSxHQUFFO0lBQ2IsQ0FBQyxJQUFBLFlBQVMsR0FBRTtJQUNaLENBQUMsSUFBQSxZQUFTLEdBQUUsRUFDWjtJQUNBLE9BQU8sQ0FBQyxHQUFHLENBQUMsMkNBQTJDLEdBQUcsRUFBRSxDQUFDO0lBRTdELElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtRQUNuQixJQUFJLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFO1lBQ3RCLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQyxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBRS9CLE1BQU0sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBQ2xFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDO1NBQzdCO0lBQ0gsQ0FBQyxDQUFDLENBQUM7Q0FDSiJ9
@@ -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?: NodeFilterType | SortedNodeNameFilterType | undefined) => string;
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.16.0",
4
+ "version": "2.17.0",
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",