surgio 2.10.0 → 2.11.0

package/build/provider/BlackSSLProvider.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const joi_1 = __importDefault(require("@hapi/joi"));
+const joi_1 = __importDefault(require("joi"));
 const assert_1 = __importDefault(require("assert"));
 const types_1 = require("../types");
 const cache_1 = require("../utils/cache");
@@ -39,8 +39,8 @@ class BlackSSLProvider extends Provider_1.default {
     }
     // istanbul ignore next
     async getBlackSSLConfig(username, password) {
-        assert_1.default(username, '未指定 BlackSSL username.');
-        assert_1.default(password, '未指定 BlackSSL password.');
+        (0, assert_1.default)(username, '未指定 BlackSSL username.');
+        (0, assert_1.default)(password, '未指定 BlackSSL password.');
         const key = `blackssl_${username}`;
         const response = cache_1.ConfigCache.has(key)
             ? JSON.parse(cache_1.ConfigCache.get(key))
@@ -76,4 +76,4 @@ class BlackSSLProvider extends Provider_1.default {
     }
 }
 exports.default = BlackSSLProvider;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmxhY2tTU0xQcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9wcm92aWRlci9CbGFja1NTTFByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx1QkFBdUI7Ozs7O0FBRXZCLG9EQUE0QjtBQUM1QixvREFBNEI7QUFFNUIsb0NBS2tCO0FBQ2xCLDBDQUE2QztBQUM3Qyx1RUFBOEM7QUFDOUMsMERBQWtDO0FBRWxDLE1BQXFCLGdCQUFpQixTQUFRLGtCQUFRO0lBSXBELFlBQVksSUFBWSxFQUFFLE1BQThCO1FBQ3RELEtBQUssQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFcEIsTUFBTSxNQUFNLEdBQUcsYUFBRyxDQUFDLE1BQU0sQ0FBQztZQUN4QixRQUFRLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtZQUNqQyxRQUFRLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtTQUNsQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUUxQyx1QkFBdUI7UUFDdkIsSUFBSSxLQUFLLEVBQUU7WUFDVCxNQUFNLEtBQUssQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO1FBQ2hDLElBQUksQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQztRQUNoQyxJQUFJLENBQUMsOEJBQThCLEdBQUcsSUFBSSxDQUFDO0lBQzdDLENBQUM7SUFFTSxLQUFLLENBQUMsdUJBQXVCO1FBR2xDLE1BQU0sRUFBRSxvQkFBb0IsRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUMzRCxJQUFJLENBQUMsUUFBUSxFQUNiLElBQUksQ0FBQyxRQUFRLENBQ2QsQ0FBQztRQUVGLElBQUksb0JBQW9CLEVBQUU7WUFDeEIsT0FBTyxvQkFBb0IsQ0FBQztTQUM3QjtRQUNELE9BQU8sS0FBSyxDQUFDLENBQUM7SUFDaEIsQ0FBQztJQUVNLEtBQUssQ0FBQyxXQUFXO1FBQ3RCLE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FDL0MsSUFBSSxDQUFDLFFBQVEsRUFDYixJQUFJLENBQUMsUUFBUSxDQUNkLENBQUM7UUFDRixPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDO0lBRUQsdUJBQXVCO0lBQ2YsS0FBSyxDQUFDLGlCQUFpQixDQUM3QixRQUFnQixFQUNoQixRQUFnQjtRQUtoQixnQkFBTSxDQUFDLFFBQVEsRUFBRSx3QkFBd0IsQ0FBQyxDQUFDO1FBQzNDLGdCQUFNLENBQUMsUUFBUSxFQUFFLHdCQUF3QixDQUFDLENBQUM7UUFFM0MsTUFBTSxHQUFHLEdBQUcsWUFBWSxRQUFRLEVBQUUsQ0FBQztRQUVuQyxNQUFNLFFBQVEsR0FBRyxtQkFBVyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUM7WUFDbkMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsbUJBQVcsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFXLENBQUM7WUFDNUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLElBQUksRUFBRTtnQkFDaEIsTUFBTSxHQUFHLEdBQUcsTUFBTSxxQkFBVSxDQUFDLEdBQUcsQ0FDOUIsNkNBQTZDLEVBQzdDO29CQUNFLFlBQVksRUFBRTt3QkFDWixRQUFRO3dCQUNSLFFBQVE7cUJBQ1Q7b0JBQ0QsT0FBTyxFQUFFO3dCQUNQLFlBQVksRUFDVixxREFBcUQ7cUJBQ3hEO2lCQUNGLENBQ0YsQ0FBQztnQkFFRixtQkFBVyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO2dCQUUvQixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzlCLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFFVCxPQUFPO1lBQ0wsUUFBUSxFQUFHLFFBQVEsQ0FBQyxTQUE0QixDQUFDLEdBQUcsQ0FDbEQsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUM7Z0JBQ1QsUUFBUSxFQUFFLElBQUksQ0FBQyxJQUFJO2dCQUNuQixJQUFJLEVBQUUsb0JBQVksQ0FBQyxLQUFLO2dCQUN4QixRQUFRLEVBQUUsSUFBSSxDQUFDLE1BQU07Z0JBQ3JCLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTtnQkFDZixRQUFRO2dCQUNSLFFBQVE7YUFDVCxDQUFDLENBQ0g7WUFDRCxvQkFBb0IsRUFBRTtnQkFDcEIsTUFBTSxFQUFFLENBQUM7Z0JBQ1QsUUFBUSxFQUFFLFFBQVEsQ0FBQyxhQUFhO2dCQUNoQyxLQUFLLEVBQUUsUUFBUSxDQUFDLGVBQWU7Z0JBQy9CLE1BQU0sRUFBRSxRQUFRLENBQUMsVUFBVTthQUM1QjtTQUNGLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUFwR0QsbUNBb0dDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmxhY2tTU0xQcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9wcm92aWRlci9CbGFja1NTTFByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx1QkFBdUI7Ozs7O0FBRXZCLDhDQUFzQjtBQUN0QixvREFBNEI7QUFFNUIsb0NBS2tCO0FBQ2xCLDBDQUE2QztBQUM3Qyx1RUFBOEM7QUFDOUMsMERBQWtDO0FBRWxDLE1BQXFCLGdCQUFpQixTQUFRLGtCQUFRO0lBSXBELFlBQVksSUFBWSxFQUFFLE1BQThCO1FBQ3RELEtBQUssQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFcEIsTUFBTSxNQUFNLEdBQUcsYUFBRyxDQUFDLE1BQU0sQ0FBQztZQUN4QixRQUFRLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtZQUNqQyxRQUFRLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtTQUNsQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUUxQyx1QkFBdUI7UUFDdkIsSUFBSSxLQUFLLEVBQUU7WUFDVCxNQUFNLEtBQUssQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO1FBQ2hDLElBQUksQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQztRQUNoQyxJQUFJLENBQUMsOEJBQThCLEdBQUcsSUFBSSxDQUFDO0lBQzdDLENBQUM7SUFFTSxLQUFLLENBQUMsdUJBQXVCO1FBR2xDLE1BQU0sRUFBRSxvQkFBb0IsRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUMzRCxJQUFJLENBQUMsUUFBUSxFQUNiLElBQUksQ0FBQyxRQUFRLENBQ2QsQ0FBQztRQUVGLElBQUksb0JBQW9CLEVBQUU7WUFDeEIsT0FBTyxvQkFBb0IsQ0FBQztTQUM3QjtRQUNELE9BQU8sS0FBSyxDQUFDLENBQUM7SUFDaEIsQ0FBQztJQUVNLEtBQUssQ0FBQyxXQUFXO1FBQ3RCLE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FDL0MsSUFBSSxDQUFDLFFBQVEsRUFDYixJQUFJLENBQUMsUUFBUSxDQUNkLENBQUM7UUFDRixPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDO0lBRUQsdUJBQXVCO0lBQ2YsS0FBSyxDQUFDLGlCQUFpQixDQUM3QixRQUFnQixFQUNoQixRQUFnQjtRQUtoQixJQUFBLGdCQUFNLEVBQUMsUUFBUSxFQUFFLHdCQUF3QixDQUFDLENBQUM7UUFDM0MsSUFBQSxnQkFBTSxFQUFDLFFBQVEsRUFBRSx3QkFBd0IsQ0FBQyxDQUFDO1FBRTNDLE1BQU0sR0FBRyxHQUFHLFlBQVksUUFBUSxFQUFFLENBQUM7UUFFbkMsTUFBTSxRQUFRLEdBQUcsbUJBQVcsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDO1lBQ25DLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLG1CQUFXLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBVyxDQUFDO1lBQzVDLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxJQUFJLEVBQUU7Z0JBQ2hCLE1BQU0sR0FBRyxHQUFHLE1BQU0scUJBQVUsQ0FBQyxHQUFHLENBQzlCLDZDQUE2QyxFQUM3QztvQkFDRSxZQUFZLEVBQUU7d0JBQ1osUUFBUTt3QkFDUixRQUFRO3FCQUNUO29CQUNELE9BQU8sRUFBRTt3QkFDUCxZQUFZLEVBQ1YscURBQXFEO3FCQUN4RDtpQkFDRixDQUNGLENBQUM7Z0JBRUYsbUJBQVcsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFFL0IsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUM5QixDQUFDLENBQUMsRUFBRSxDQUFDO1FBRVQsT0FBTztZQUNMLFFBQVEsRUFBRyxRQUFRLENBQUMsU0FBNEIsQ0FBQyxHQUFHLENBQ2xELENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO2dCQUNULFFBQVEsRUFBRSxJQUFJLENBQUMsSUFBSTtnQkFDbkIsSUFBSSxFQUFFLG9CQUFZLENBQUMsS0FBSztnQkFDeEIsUUFBUSxFQUFFLElBQUksQ0FBQyxNQUFNO2dCQUNyQixJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUk7Z0JBQ2YsUUFBUTtnQkFDUixRQUFRO2FBQ1QsQ0FBQyxDQUNIO1lBQ0Qsb0JBQW9CLEVBQUU7Z0JBQ3BCLE1BQU0sRUFBRSxDQUFDO2dCQUNULFFBQVEsRUFBRSxRQUFRLENBQUMsYUFBYTtnQkFDaEMsS0FBSyxFQUFFLFFBQVEsQ0FBQyxlQUFlO2dCQUMvQixNQUFNLEVBQUUsUUFBUSxDQUFDLFVBQVU7YUFDNUI7U0FDRixDQUFDO0lBQ0osQ0FBQztDQUNGO0FBcEdELG1DQW9HQyJ9

package/build/provider/ClashProvider.js

@@ -1,42 +1,21 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseClashConfig = exports.getClashSubscription = void 0;
-const joi_1 = __importDefault(require("@hapi/joi"));
+const joi_1 = __importDefault(require("joi"));
 const assert_1 = __importDefault(require("assert"));
 const yaml_1 = __importDefault(require("yaml"));
 const lodash_1 = __importDefault(require("lodash"));
 const logger_1 = require("@surgio/logger");
 const types_1 = require("../types");
 const utils_1 = require("../utils");
-const http_client_1 = __importStar(require("../utils/http-client"));
+const http_client_1 = require("../utils/http-client");
 const relayable_url_1 = __importDefault(require("../utils/relayable-url"));
-const subscription_1 = require("../utils/subscription");
-const cache_1 = require("../utils/cache");
 const constant_1 = require("../utils/constant");
 const Provider_1 = __importDefault(require("./Provider"));
-const logger = logger_1.createLogger({
+const logger = (0, logger_1.createLogger)({
     service: 'surgio:ClashProvider',
 });
 class ClashProvider extends Provider_1.default {
@@ -63,44 +42,29 @@ class ClashProvider extends Provider_1.default {
     }
     // istanbul ignore next
     get url() {
-        return relayable_url_1.default(this._url, this.relayUrl);
+        return (0, relayable_url_1.default)(this._url, this.relayUrl);
     }
     async getSubscriptionUserInfo() {
-        const { subscriptionUserinfo } = await exports.getClashSubscription(this.url, this.udpRelay, this.tls13);
+        const { subscriptionUserinfo } = await (0, exports.getClashSubscription)(this.url, this.udpRelay, this.tls13);
         if (subscriptionUserinfo) {
             return subscriptionUserinfo;
         }
         return void 0;
     }
     async getNodeList() {
-        const { nodeList } = await exports.getClashSubscription(this.url, this.udpRelay, this.tls13);
+        const { nodeList } = await (0, exports.getClashSubscription)(this.url, this.udpRelay, this.tls13);
         return nodeList;
     }
 }
 exports.default = ClashProvider;
 const getClashSubscription = async (url, udpRelay, tls13) => {
-    assert_1.default(url, '未指定订阅地址 url');
-    const response = cache_1.SubscriptionCache.has(url)
-        ? cache_1.SubscriptionCache.get(url)
-        : await (async () => {
-            const res = await http_client_1.default.get(url, {
-                responseType: 'text',
-                headers: {
-                    'user-agent': http_client_1.getUserAgent(constant_1.NETWORK_CLASH_UA),
-                },
-            });
-            const subsciptionCacheItem = {
-                body: res.body,
-            };
-            if (res.headers['subscription-userinfo']) {
-                subsciptionCacheItem.subscriptionUserinfo = subscription_1.parseSubscriptionUserInfo(res.headers['subscription-userinfo']);
-                logger.debug('%s received subscription userinfo - raw: %s | parsed: %j', url, res.headers['subscription-userinfo'], subsciptionCacheItem.subscriptionUserinfo);
-            }
-            cache_1.SubscriptionCache.set(url, subsciptionCacheItem);
-            return subsciptionCacheItem;
-        })();
+    (0, assert_1.default)(url, '未指定订阅地址 url');
+    const response = await Provider_1.default.requestCacheableResource(url, {
+        requestUserAgent: (0, http_client_1.getUserAgent)(constant_1.NETWORK_CLASH_UA),
+    });
     let clashConfig;
     try {
+        // eslint-disable-next-line prefer-const
         clashConfig = yaml_1.default.parse(response.body);
     }
     catch (err) /* istanbul ignore next */ {
@@ -116,7 +80,7 @@ const getClashSubscription = async (url, udpRelay, tls13) => {
         throw new Error(`${url} 订阅内容有误，请检查后重试`);
     }
     return {
-        nodeList: exports.parseClashConfig(proxyList, udpRelay, tls13),
+        nodeList: (0, exports.parseClashConfig)(proxyList, udpRelay, tls13),
         subscriptionUserinfo: response.subscriptionUserinfo,
     };
 };
@@ -137,7 +101,7 @@ const parseClashConfig = (proxyList, udpRelay, tls13) => {
                     logger.warn(`不支持从 Clash 订阅中读取 QUIC 模式的 Shadowsocks 节点，节点 ${item.name} 会被省略`);
                     return void 0;
                 }
-                const wsHeaders = utils_1.lowercaseHeaderKeys(lodash_1.default.get(item, 'plugin-opts.headers', {}));
+                const wsHeaders = (0, utils_1.lowercaseHeaderKeys)(lodash_1.default.get(item, 'plugin-opts.headers', {}));
                 return Object.assign(Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Shadowsocks, nodeName: item.name, hostname: item.server, port: item.port, method: item.cipher, password: item.password, 'udp-relay': resolveUdpRelay(item.udp, udpRelay) }, (item.plugin && item.plugin === 'obfs'
                     ? {
                         obfs: item['plugin-opts'].mode,
@@ -168,7 +132,7 @@ const parseClashConfig = (proxyList, udpRelay, tls13) => {
                     logger.warn(`不支持从 Clash 订阅中读取 network 类型为 ${item.network} 的 Vmess 节点，节点 ${item.name} 会被省略`);
                     return void 0;
                 }
-                const wsHeaders = utils_1.lowercaseHeaderKeys(lodash_1.default.get(item, 'ws-headers', {}));
+                const wsHeaders = (0, utils_1.lowercaseHeaderKeys)(lodash_1.default.get(item, 'ws-headers', {}));
                 return Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Vmess, nodeName: item.name, hostname: item.server, port: item.port, uuid: item.uuid, alterId: item.alterId ? `${item.alterId}` : '0', method: item.cipher || 'auto', 'udp-relay': resolveUdpRelay(item.udp, udpRelay), tls: (_a = item.tls) !== null && _a !== void 0 ? _a : false, network: item.network || 'tcp' }, (item.network === 'ws'
                     ? {
                         path: lodash_1.default.get(item, 'ws-path', '/'),
@@ -240,4 +204,4 @@ function resolveUdpRelay(val, defaultVal = false) {
     }
     return defaultVal;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ClashProvider.js","sourceRoot":"","sources":["../../lib/provider/ClashProvider.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ClashProvider.js","sourceRoot":"","sources":["../../lib/provider/ClashProvider.ts"],"names":[],"mappings":"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"}

package/build/provider/CustomProvider.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const joi_1 = __importDefault(require("@hapi/joi"));
+const joi_1 = __importDefault(require("joi"));
 const types_1 = require("../types");
 const Provider_1 = __importDefault(require("./Provider"));
 class CustomProvider extends Provider_1.default {
@@ -22,9 +22,7 @@ class CustomProvider extends Provider_1.default {
             underlyingProxy: joi_1.default.string(),
         }).unknown();
         const schema = joi_1.default.object({
-            nodeList: joi_1.default.array()
-                .items(nodeSchema)
-                .required(),
+            nodeList: joi_1.default.array().items(nodeSchema).required(),
         }).unknown();
         const { error } = schema.validate(config);
         // istanbul ignore next
@@ -48,4 +46,4 @@ class CustomProvider extends Provider_1.default {
     }
 }
 exports.default = CustomProvider;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvQ3VzdG9tUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxvREFBNEI7QUFDNUIsb0NBSWtCO0FBQ2xCLDBEQUFrQztBQUVsQyxNQUFxQixjQUFlLFNBQVEsa0JBQVE7SUFHbEQsWUFBWSxJQUFZLEVBQUUsTUFBNEI7UUFDcEQsS0FBSyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVwQixNQUFNLFVBQVUsR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQzVCLElBQUksRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNmLEtBQUssQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQVMsb0JBQVksQ0FBQyxDQUFDO2lCQUM3QyxRQUFRLEVBQUU7WUFDYixRQUFRLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtZQUNqQyxNQUFNLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUM5QixHQUFHLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUMzQixLQUFLLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUM3QixPQUFPLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtZQUNyQixTQUFTLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtZQUN2QixlQUFlLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtTQUM5QixDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDYixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLFFBQVEsRUFBRSxhQUFHLENBQUMsS0FBSyxFQUFFO2lCQUNsQixLQUFLLENBQUMsVUFBVSxDQUFDO2lCQUNqQixRQUFRLEVBQUU7U0FDZCxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUUxQyx1QkFBdUI7UUFDdkIsSUFBSSxLQUFLLEVBQUU7WUFDVCxNQUFNLEtBQUssQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO0lBQ2xDLENBQUM7SUFFTSxLQUFLLENBQUMsV0FBVztRQUN0QixNQUFNLFdBQVcsR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQzdCLFdBQVcsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ2pDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUNoQyxNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsV0FBVyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUU3Qyx1QkFBdUI7WUFDdkIsSUFBSSxLQUFLLEVBQUU7Z0JBQ1QsTUFBTSxLQUFLLENBQUM7YUFDYjtZQUVELE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUFsREQsaUNBa0RDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvQ3VzdG9tUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw4Q0FBc0I7QUFDdEIsb0NBSWtCO0FBQ2xCLDBEQUFrQztBQUVsQyxNQUFxQixjQUFlLFNBQVEsa0JBQVE7SUFHbEQsWUFBWSxJQUFZLEVBQUUsTUFBNEI7UUFDcEQsS0FBSyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVwQixNQUFNLFVBQVUsR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQzVCLElBQUksRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNmLEtBQUssQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQVMsb0JBQVksQ0FBQyxDQUFDO2lCQUM3QyxRQUFRLEVBQUU7WUFDYixRQUFRLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtZQUNqQyxNQUFNLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUM5QixHQUFHLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUMzQixLQUFLLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUM3QixPQUFPLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtZQUNyQixTQUFTLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtZQUN2QixlQUFlLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtTQUM5QixDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDYixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLFFBQVEsRUFBRSxhQUFHLENBQUMsS0FBSyxFQUFFLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDLFFBQVEsRUFBRTtTQUNuRCxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUUxQyx1QkFBdUI7UUFDdkIsSUFBSSxLQUFLLEVBQUU7WUFDVCxNQUFNLEtBQUssQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO0lBQ2xDLENBQUM7SUFFTSxLQUFLLENBQUMsV0FBVztRQUN0QixNQUFNLFdBQVcsR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQzdCLFdBQVcsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ2pDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUNoQyxNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsV0FBVyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUU3Qyx1QkFBdUI7WUFDdkIsSUFBSSxLQUFLLEVBQUU7Z0JBQ1QsTUFBTSxLQUFLLENBQUM7YUFDYjtZQUVELE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUFoREQsaUNBZ0RDIn0=

package/build/provider/Provider.d.ts

@@ -1,4 +1,5 @@
 import { ProviderConfig, SupportProviderEnum, PossibleNodeConfigType, SubscriptionUserinfo } from '../types';
+import { SubsciptionCacheItem } from '../utils/cache';
 export default class Provider {
     name: string;
     readonly type: SupportProviderEnum;
@@ -15,6 +16,9 @@ export default class Provider {
     supportGetSubscriptionUserInfo: boolean;
     startPort?: number;
     constructor(name: string, config: ProviderConfig);
+    static requestCacheableResource(url: string, options?: {
+        requestUserAgent?: string;
+    }): Promise<SubsciptionCacheItem>;
     get nextPort(): number;
     getSubscriptionUserInfo(): Promise<SubscriptionUserinfo | undefined>;
     getNodeList(): Promise<ReadonlyArray<PossibleNodeConfigType>>;

package/build/provider/Provider.js

@@ -3,8 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const joi_1 = __importDefault(require("@hapi/joi"));
+const logger_1 = require("@surgio/logger");
+const joi_1 = __importDefault(require("joi"));
 const types_1 = require("../types");
+const cache_1 = require("../utils/cache");
+const http_client_1 = __importDefault(require("../utils/http-client"));
+const subscription_1 = require("../utils/subscription");
+const logger = (0, logger_1.createLogger)({
+    service: 'surgio:Provider',
+});
 class Provider {
     constructor(name, config) {
         this.name = name;
@@ -32,10 +39,7 @@ class Provider {
             removeExistingFlag: joi_1.default.boolean().strict(),
             mptcp: joi_1.default.boolean().strict(),
             tfo: joi_1.default.boolean().strict(),
-            startPort: joi_1.default.number()
-                .integer()
-                .min(1024)
-                .max(65535),
+            startPort: joi_1.default.number().integer().min(1024).max(65535),
             relayUrl: [joi_1.default.boolean().strict(), joi_1.default.string()],
             renameNode: joi_1.default.function(),
         }).unknown();
@@ -62,6 +66,30 @@ class Provider {
             this[key] = config[key];
         });
     }
+    static async requestCacheableResource(url, options = {}) {
+        return cache_1.SubscriptionCache.has(url)
+            ? cache_1.SubscriptionCache.get(url)
+            : await (async () => {
+                const headers = {};
+                if (options.requestUserAgent) {
+                    headers['user-agent'] = options.requestUserAgent;
+                }
+                const res = await http_client_1.default.get(url, {
+                    responseType: 'text',
+                    headers,
+                });
+                const subsciptionCacheItem = {
+                    body: res.body,
+                };
+                if (res.headers['subscription-userinfo']) {
+                    subsciptionCacheItem.subscriptionUserinfo =
+                        (0, subscription_1.parseSubscriptionUserInfo)(res.headers['subscription-userinfo']);
+                    logger.debug('%s received subscription userinfo - raw: %s | parsed: %j', url, res.headers['subscription-userinfo'], subsciptionCacheItem.subscriptionUserinfo);
+                }
+                cache_1.SubscriptionCache.set(url, subsciptionCacheItem);
+                return subsciptionCacheItem;
+            })();
+    }
     get nextPort() {
         if (this.startPort) {
             return this.startPort++;
@@ -78,4 +106,4 @@ class Provider {
     }
 }
 exports.default = Provider;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxvREFBNEI7QUFFNUIsb0NBS2tCO0FBRWxCLE1BQXFCLFFBQVE7SUFpQjNCLFlBQW1CLElBQVksRUFBRSxNQUFzQjtRQUFwQyxTQUFJLEdBQUosSUFBSSxDQUFRO1FBQzdCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsSUFBSSxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2YsS0FBSyxDQUFDLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBUywyQkFBbUIsQ0FBQyxDQUFDO2lCQUNwRCxRQUFRLEVBQUU7WUFDYixVQUFVLEVBQUUsYUFBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FDekIsYUFBRyxDQUFDLFFBQVEsRUFBRSxFQUNkLGFBQUcsQ0FBQyxNQUFNLENBQUM7Z0JBQ1QsTUFBTSxFQUFFLGFBQUcsQ0FBQyxRQUFRLEVBQUU7Z0JBQ3RCLFdBQVcsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO2FBQ3BDLENBQUMsQ0FDSDtZQUNELGFBQWEsRUFBRSxhQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsS0FBSyxDQUM1QixhQUFHLENBQUMsUUFBUSxFQUFFLEVBQ2QsYUFBRyxDQUFDLE1BQU0sQ0FBQztnQkFDVCxNQUFNLEVBQUUsYUFBRyxDQUFDLFFBQVEsRUFBRTtnQkFDdEIsV0FBVyxFQUFFLGFBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxNQUFNLEVBQUU7YUFDcEMsQ0FBQyxDQUNIO1lBQ0Qsb0JBQW9CLEVBQUUsYUFBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FDbkMsYUFBRyxDQUFDLFFBQVEsRUFBRSxFQUNkLGFBQUcsQ0FBQyxNQUFNLENBQUM7Z0JBQ1QsTUFBTSxFQUFFLGFBQUcsQ0FBQyxRQUFR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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSwyQ0FBOEM7QUFDOUMsOENBQXNCO0FBRXRCLG9DQUtrQjtBQUNsQiwwQ0FBeUU7QUFDekUsdUVBQThDO0FBQzlDLHdEQUFrRTtBQUVsRSxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLGlCQUFpQjtDQUMzQixDQUFDLENBQUM7QUFFSCxNQUFxQixRQUFRO0lBaUIzQixZQUFtQixJQUFZLEVBQUUsTUFBc0I7UUFBcEMsU0FBSSxHQUFKLElBQUksQ0FBUTtRQUM3QixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLElBQUksRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNmLEtBQUssQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQVMsMkJBQW1CLENBQUMsQ0FBQztpQkFDcEQsUUFBUSxFQUFFO1lBQ2IsVUFBVSxFQUFFLGFBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQ3pCLGFBQUcsQ0FBQyxRQUFRLEVBQUUsRUFDZCxhQUFHLENBQUMsTUFBTSxDQUFDO2dCQUNULE1BQU0sRUFBRSxhQUFHLENBQUMsUUFBUSxFQUFFO2dCQUN0QixXQUFXLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTthQUNwQyxDQUFDLENBQ0g7WUFDRCxhQUFhLEVBQUUsYUFBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FDNUIsYUFBRyxDQUFDLFFBQVEsRUFBRSxFQUNkLGFBQUcsQ0FBQyxNQUFNLENBQUM7Z0JBQ1QsTUFBTSxFQUFFLGFBQUcsQ0FBQyxRQUFRLEVBQUU7Z0JBQ3RCLFdBQVcsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO2FBQ3BDLENBQUMsQ0FDSDtZ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

package/build/provider/ShadowsocksJsonSubscribeProvider.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const joi_1 = __importDefault(require("@hapi/joi"));
+const joi_1 = __importDefault(require("joi"));
 const utils_1 = require("../utils");
 const relayable_url_1 = __importDefault(require("../utils/relayable-url"));
 const Provider_1 = __importDefault(require("./Provider"));
@@ -28,11 +28,11 @@ class ShadowsocksJsonSubscribeProvider extends Provider_1.default {
     }
     // istanbul ignore next
     get url() {
-        return relayable_url_1.default(this._url, this.relayUrl);
+        return (0, relayable_url_1.default)(this._url, this.relayUrl);
     }
     getNodeList() {
-        return utils_1.getShadowsocksJSONConfig(this.url, this.udpRelay);
+        return (0, utils_1.getShadowsocksJSONConfig)(this.url, this.udpRelay);
     }
 }
 exports.default = ShadowsocksJsonSubscribeProvider;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhZG93c29ja3NKc29uU3Vic2NyaWJlUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvU2hhZG93c29ja3NKc29uU3Vic2NyaWJlUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxvREFBNEI7QUFFNUIsb0NBQW9EO0FBQ3BELDJFQUFrRDtBQUNsRCwwREFBa0M7QUFFbEMsTUFBcUIsZ0NBQWlDLFNBQVEsa0JBQVE7SUFJcEUsWUFBWSxJQUFZLEVBQUUsTUFBOEM7UUFDdEUsS0FBSyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVwQixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLEdBQUcsRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNkLEdBQUcsQ0FBQztnQkFDSCxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUM7YUFDbkIsQ0FBQztpQkFDRCxRQUFRLEVBQUU7WUFDYixRQUFRLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtTQUNqQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUUxQyx1QkFBdUI7UUFDdkIsSUFBSSxLQUFLLEVBQUU7WUFDVCxNQUFNLEtBQUssQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQztJQUNsQyxDQUFDO0lBRUQsdUJBQXVCO0lBQ3ZCLElBQVcsR0FBRztRQUNaLE9BQU8sdUJBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRU0sV0FBVztRQUNoQixPQUFPLGdDQUF3QixDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzNELENBQUM7Q0FDRjtBQW5DRCxtREFtQ0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhZG93c29ja3NKc29uU3Vic2NyaWJlUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvU2hhZG93c29ja3NKc29uU3Vic2NyaWJlUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw4Q0FBc0I7QUFFdEIsb0NBQW9EO0FBQ3BELDJFQUFrRDtBQUNsRCwwREFBa0M7QUFFbEMsTUFBcUIsZ0NBQWlDLFNBQVEsa0JBQVE7SUFJcEUsWUFBWSxJQUFZLEVBQUUsTUFBOEM7UUFDdEUsS0FBSyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVwQixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLEdBQUcsRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNkLEdBQUcsQ0FBQztnQkFDSCxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUM7YUFDbkIsQ0FBQztpQkFDRCxRQUFRLEVBQUU7WUFDYixRQUFRLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtTQUNqQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUUxQyx1QkFBdUI7UUFDdkIsSUFBSSxLQUFLLEVBQUU7WUFDVCxNQUFNLEtBQUssQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQztJQUNsQyxDQUFDO0lBRUQsdUJBQXVCO0lBQ3ZCLElBQVcsR0FBRztRQUNaLE9BQU8sSUFBQSx1QkFBWSxFQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2hELENBQUM7SUFFTSxXQUFXO1FBQ2hCLE9BQU8sSUFBQSxnQ0FBd0IsRUFBQyxJQUFJLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUMzRCxDQUFDO0NBQ0Y7QUFuQ0QsbURBbUNDIn0=

package/build/provider/ShadowsocksSubscribeProvider.js

@@ -4,17 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getShadowsocksSubscription = void 0;
-const joi_1 = __importDefault(require("@hapi/joi"));
+const joi_1 = __importDefault(require("joi"));
 const assert_1 = __importDefault(require("assert"));
 const logger_1 = require("@surgio/logger");
 const utils_1 = require("../utils");
-const http_client_1 = __importDefault(require("../utils/http-client"));
 const relayable_url_1 = __importDefault(require("../utils/relayable-url"));
 const ss_1 = require("../utils/ss");
-const subscription_1 = require("../utils/subscription");
-const cache_1 = require("../utils/cache");
 const Provider_1 = __importDefault(require("./Provider"));
-const logger = logger_1.createLogger({
+const logger = (0, logger_1.createLogger)({
     service: 'surgio:ShadowsocksSubscribeProvider',
 });
 class ShadowsocksSubscribeProvider extends Provider_1.default {
@@ -39,17 +36,17 @@ class ShadowsocksSubscribeProvider extends Provider_1.default {
     }
     // istanbul ignore next
     get url() {
-        return relayable_url_1.default(this._url, this.relayUrl);
+        return (0, relayable_url_1.default)(this._url, this.relayUrl);
     }
     async getSubscriptionUserInfo() {
-        const { subscriptionUserinfo } = await exports.getShadowsocksSubscription(this.url, this.udpRelay);
+        const { subscriptionUserinfo } = await (0, exports.getShadowsocksSubscription)(this.url, this.udpRelay);
         if (subscriptionUserinfo) {
             return subscriptionUserinfo;
         }
         return undefined;
     }
     async getNodeList() {
-        const { nodeList } = await exports.getShadowsocksSubscription(this.url, this.udpRelay);
+        const { nodeList } = await (0, exports.getShadowsocksSubscription)(this.url, this.udpRelay);
         return nodeList;
     }
 }
@@ -58,26 +55,13 @@ exports.default = ShadowsocksSubscribeProvider;
  * @see https://shadowsocks.org/en/spec/SIP002-URI-Scheme.html
  */
 const getShadowsocksSubscription = async (url, udpRelay) => {
-    assert_1.default(url, '未指定订阅地址 url');
-    const response = cache_1.SubscriptionCache.has(url)
-        ? cache_1.SubscriptionCache.get(url)
-        : await (async () => {
-            const res = await http_client_1.default.get(url);
-            const subsciptionCacheItem = {
-                body: res.body,
-            };
-            if (res.headers['subscription-userinfo']) {
-                subsciptionCacheItem.subscriptionUserinfo = subscription_1.parseSubscriptionUserInfo(res.headers['subscription-userinfo']);
-                logger.debug('%s received subscription userinfo - raw: %s | parsed: %j', url, res.headers['subscription-userinfo'], subsciptionCacheItem.subscriptionUserinfo);
-            }
-            cache_1.SubscriptionCache.set(url, subsciptionCacheItem);
-            return subsciptionCacheItem;
-        })();
-    const nodeList = utils_1.fromBase64(response.body)
+    (0, assert_1.default)(url, '未指定订阅地址 url');
+    const response = await Provider_1.default.requestCacheableResource(url);
+    const nodeList = (0, utils_1.fromBase64)(response.body)
         .split('\n')
         .filter((item) => !!item && item.startsWith('ss://'))
         .map((item) => {
-        const nodeConfig = ss_1.parseSSUri(item);
+        const nodeConfig = (0, ss_1.parseSSUri)(item);
         if (udpRelay !== void 0) {
             nodeConfig['udp-relay'] = udpRelay;
         }
@@ -89,4 +73,4 @@ const getShadowsocksSubscription = async (url, udpRelay) => {
     };
 };
 exports.getShadowsocksSubscription = getShadowsocksSubscription;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhZG93c29ja3NTdWJzY3JpYmVQcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9wcm92aWRlci9TaGFkb3dzb2Nrc1N1YnNjcmliZVByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLG9EQUE0QjtBQUM1QixvREFBNEI7QUFDNUIsMkNBQThDO0FBTzlDLG9DQUFzQztBQUN0Qyx1RUFBOEM7QUFDOUMsMkVBQWtEO0FBQ2xELG9DQUF5QztBQUN6Qyx3REFBa0U7QUFDbEUsMENBQXlFO0FBQ3pFLDBEQUFrQztBQUVsQyxNQUFNLE1BQU0sR0FBRyxxQkFBWSxDQUFDO0lBQzFCLE9BQU8sRUFBRSxxQ0FBcUM7Q0FDL0MsQ0FBQyxDQUFDO0FBRUgsTUFBcUIsNEJBQTZCLFNBQVEsa0JBQVE7SUFJaEUsWUFBWSxJQUFZLEVBQUUsTUFBMEM7UUFDbEUsS0FBSyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVwQixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLEdBQUcsRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNkLEdBQUcsQ0FBQztnQkFDSCxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUM7YUFDbkIsQ0FBQztpQkFDRCxRQUFRLEVBQUU7WUFDYixRQUFRLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtTQUNqQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUUxQyx1QkFBdUI7UUFDdkIsSUFBSSxLQUFLLEVBQUU7WUFDVCxNQUFNLEtBQUssQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLFFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhZG93c29ja3NTdWJzY3JpYmVQcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9wcm92aWRlci9TaGFkb3dzb2Nrc1N1YnNjcmliZVByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDhDQUFzQjtBQUN0QixvREFBNEI7QUFDNUIsMkNBQThDO0FBTzlDLG9DQUFzQztBQUN0QywyRUFBa0Q7QUFDbEQsb0NBQXlDO0FBQ3pDLDBEQUFrQztBQUVsQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLHFDQUFxQztDQUMvQyxDQUFDLENBQUM7QUFFSCxNQUFxQiw0QkFBNkIsU0FBUSxrQkFBUTtJQUloRSxZQUFZLElBQVksRUFBRSxNQUEwQztRQUNsRSxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ2pDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO1FBQ2hDLElBQUksQ0FBQyw4QkFBOEIsR0FBRyxJQUFJLENBQUM7SUFDN0MsQ0FBQztJQUVELHVCQUF1QjtJQUN2QixJQUFXLEdBQUc7UUFDWixPQUFPLElBQUEsdUJBQVksRUFBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRU0sS0FBSyxDQUFDLHVCQUF1QjtRQUdsQyxNQUFNLEVBQUUsb0JBQW9CLEVBQUUsR0FBRyxNQUFNLElBQUEsa0NBQTBCLEVBQy9ELElBQUksQ0FBQyxHQUFHLEVBQ1IsSUFBSSxDQUFDLFFBQVEsQ0FDZCxDQUFDO1FBRUYsSUFBSSxvQkFBb0IsRUFBRTtZQUN4QixPQUFPLG9CQUFvQixDQUFDO1NBQzdCO1FBQ0QsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVNLEtBQUssQ0FBQyxXQUFXO1FBQ3RCLE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxNQUFNLElBQUEsa0NBQTBCLEVBQ25ELElBQUksQ0FBQyxHQUFHLEVBQ1IsSUFBSSxDQUFDLFFBQVEsQ0FDZCxDQUFDO1FBRUYsT0FBTyxRQUFRLENBQUM7SUFDbEIsQ0FBQztDQUNGO0FBdkRELCtDQXVEQztBQUVEOztHQUVHO0FBQ0ksTUFBTSwwQkFBMEIsR0FBRyxLQUFLLEVBQzdDLEdBQVcsRUFDWCxRQUFrQixFQUlqQixFQUFFO0lBQ0gsSUFBQSxnQkFBTSxFQUFDLEdBQUcsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUUzQixNQUFNLFFBQVEsR0FBRyxNQUFNLGtCQUFRLENBQUMsd0JBQXdCLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDOUQsTUFBTSxRQUFRLEdBQUcsSUFBQSxrQkFBVSxFQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUM7U0FDdkMsS0FBSyxDQUFDLElBQUksQ0FBQztTQUNYLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQ3BELEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBeUIsRUFBRTtRQUNuQyxNQUFNLFVBQVUsR0FBRyxJQUFBLGVBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztRQUVwQyxJQUFJLFFBQVEsS0FBSyxLQUFLLENBQUMsRUFBRTtZQUN0QixVQUFVLENBQUMsV0FBVyxDQUFhLEdBQUcsUUFBUSxDQUFDO1NBQ2pEO1FBRUQsT0FBTyxVQUFVLENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7SUFFTCxPQUFPO1FBQ0wsUUFBUTtRQUNSLG9CQUFvQixFQUFFLFFBQVEsQ0FBQyxvQkFBb0I7S0FDcEQsQ0FBQztBQUNKLENBQUMsQ0FBQztBQTNCVyxRQUFBLDBCQUEwQiw4QkEyQnJDIn0=

package/build/provider/ShadowsocksrSubscribeProvider.js

@@ -4,17 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getShadowsocksrSubscription = void 0;
-const joi_1 = __importDefault(require("@hapi/joi"));
+const joi_1 = __importDefault(require("joi"));
 const logger_1 = require("@surgio/logger");
 const assert_1 = __importDefault(require("assert"));
 const utils_1 = require("../utils");
-const http_client_1 = __importDefault(require("../utils/http-client"));
 const relayable_url_1 = __importDefault(require("../utils/relayable-url"));
 const subscription_1 = require("../utils/subscription");
-const cache_1 = require("../utils/cache");
 const ssr_1 = require("../utils/ssr");
 const Provider_1 = __importDefault(require("./Provider"));
-const logger = logger_1.createLogger({
+const logger = (0, logger_1.createLogger)({
     service: 'surgio:ShadowsocksrSubscribeProvider',
 });
 class ShadowsocksrSubscribeProvider extends Provider_1.default {
@@ -39,42 +37,29 @@ class ShadowsocksrSubscribeProvider extends Provider_1.default {
     }
     // istanbul ignore next
     get url() {
-        return relayable_url_1.default(this._url, this.relayUrl);
+        return (0, relayable_url_1.default)(this._url, this.relayUrl);
     }
     async getSubscriptionUserInfo() {
-        const { subscriptionUserinfo } = await exports.getShadowsocksrSubscription(this.url, this.udpRelay);
+        const { subscriptionUserinfo } = await (0, exports.getShadowsocksrSubscription)(this.url, this.udpRelay);
         if (subscriptionUserinfo) {
             return subscriptionUserinfo;
         }
         return undefined;
     }
     async getNodeList() {
-        const { nodeList } = await exports.getShadowsocksrSubscription(this.url, this.udpRelay);
+        const { nodeList } = await (0, exports.getShadowsocksrSubscription)(this.url, this.udpRelay);
         return nodeList;
     }
 }
 exports.default = ShadowsocksrSubscribeProvider;
 const getShadowsocksrSubscription = async (url, udpRelay) => {
-    assert_1.default(url, '未指定订阅地址 url');
-    const response = cache_1.SubscriptionCache.has(url)
-        ? cache_1.SubscriptionCache.get(url)
-        : await (async () => {
-            const res = await http_client_1.default.get(url);
-            const subsciptionCacheItem = {
-                body: res.body,
-            };
-            if (res.headers['subscription-userinfo']) {
-                subsciptionCacheItem.subscriptionUserinfo = subscription_1.parseSubscriptionUserInfo(res.headers['subscription-userinfo']);
-                logger.debug('%s received subscription userinfo - raw: %s | parsed: %j', url, res.headers['subscription-userinfo'], subsciptionCacheItem.subscriptionUserinfo);
-            }
-            cache_1.SubscriptionCache.set(url, subsciptionCacheItem);
-            return subsciptionCacheItem;
-        })();
-    const nodeList = utils_1.fromBase64(response.body)
+    (0, assert_1.default)(url, '未指定订阅地址 url');
+    const response = await Provider_1.default.requestCacheableResource(url);
+    const nodeList = (0, utils_1.fromBase64)(response.body)
         .split('\n')
         .filter((item) => !!item && item.startsWith('ssr://'))
         .map((str) => {
-        const nodeConfig = ssr_1.parseSSRUri(str);
+        const nodeConfig = (0, ssr_1.parseSSRUri)(str);
         if (udpRelay !== void 0) {
             nodeConfig['udp-relay'] = udpRelay;
         }
@@ -84,7 +69,7 @@ const getShadowsocksrSubscription = async (url, udpRelay) => {
         nodeList[0].nodeName.includes('剩余流量')) {
         const dataNode = nodeList[0];
         const expireNode = nodeList[1];
-        response.subscriptionUserinfo = subscription_1.parseSubscriptionNode(dataNode.nodeName, expireNode.nodeName);
+        response.subscriptionUserinfo = (0, subscription_1.parseSubscriptionNode)(dataNode.nodeName, expireNode.nodeName);
         logger.debug('%s received subscription node - raw: %s %s | parsed: %j', url, dataNode.nodeName, expireNode.nodeName, response.subscriptionUserinfo);
     }
     return {
@@ -93,4 +78,4 @@ const getShadowsocksrSubscription = async (url, udpRelay) => {
     };
 };
 exports.getShadowsocksrSubscription = getShadowsocksrSubscription;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhZG93c29ja3NyU3Vic2NyaWJlUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvU2hhZG93c29ja3NyU3Vic2NyaWJlUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsb0RBQTRCO0FBQzVCLDJDQUE4QztBQUM5QyxvREFBNEI7QUFPNUIsb0NBQXNDO0FBQ3RDLHVFQUE4QztBQUM5QywyRUFBa0Q7QUFDbEQsd0RBRytCO0FBQy9CLDBDQUF5RTtBQUN6RSxzQ0FBMkM7QUFDM0MsMERBQWtDO0FBRWxDLE1BQU0sTUFBTSxHQUFHLHFCQUFZLENBQUM7SUFDMUIsT0FBTyxFQUFFLHNDQUFzQztDQUNoRCxDQUFDLENBQUM7QUFFSCxNQUFxQiw2QkFBOEIsU0FBUSxrQkFBUTtJQUlqRSxZQUFZLElBQVksRUFBRSxNQUEyQztRQUNuRSxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ2pDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhZG93c29ja3NyU3Vic2NyaWJlUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvU2hhZG93c29ja3NyU3Vic2NyaWJlUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsOENBQXNCO0FBQ3RCLDJDQUE4QztBQUM5QyxvREFBNEI7QUFPNUIsb0NBQXNDO0FBQ3RDLDJFQUFrRDtBQUNsRCx3REFBOEQ7QUFDOUQsc0NBQTJDO0FBQzNDLDBEQUFrQztBQUVsQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLHNDQUFzQztDQUNoRCxDQUFDLENBQUM7QUFFSCxNQUFxQiw2QkFBOEIsU0FBUSxrQkFBUTtJQUlqRSxZQUFZLElBQVksRUFBRSxNQUEyQztRQUNuRSxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ2pDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO1FBQ2hDLElBQUks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