surgio 2.25.3 → 3.0.0-alpha.1

package/build/provider/SsdProvider.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSsdConfig = exports.getSsdSubscription = void 0;
-const joi_1 = __importDefault(require("joi"));
 const logger_1 = require("@surgio/logger");
 const assert_1 = __importDefault(require("assert"));
 const bytes_1 = __importDefault(require("bytes"));
+const zod_1 = require("zod");
 const types_1 = require("../types");
 const utils_1 = require("../utils");
 const relayable_url_1 = __importDefault(require("../utils/relayable-url"));
@@ -16,40 +16,49 @@ const logger = (0, logger_1.createLogger)({
     service: 'surgio:SsdProvider',
 });
 class SsdProvider extends Provider_1.default {
+    #originalUrl;
+    udpRelay;
     constructor(name, config) {
         super(name, config);
-        const schema = joi_1.default.object({
-            url: joi_1.default.string()
-                .uri({
-                scheme: [/https?/],
-            })
-                .required(),
-            udpRelay: joi_1.default.boolean().strict(),
-        }).unknown();
-        const { error } = schema.validate(config);
+        const schema = zod_1.z.object({
+            url: zod_1.z.string().url(),
+            udpRelay: zod_1.z.boolean().optional(),
+        });
+        const result = schema.safeParse(config);
         // istanbul ignore next
-        if (error) {
-            throw error;
+        if (!result.success) {
+            throw new utils_1.SurgioError('SsdProvider 配置校验失败', {
+                cause: result.error,
+                providerName: name,
+            });
         }
-        this._url = config.url;
-        this.udpRelay = config.udpRelay;
+        this.#originalUrl = result.data.url;
+        this.udpRelay = result.data.udpRelay;
         this.supportGetSubscriptionUserInfo = true;
     }
     // istanbul ignore next
     get url() {
-        return (0, relayable_url_1.default)(this._url, this.relayUrl);
+        return (0, relayable_url_1.default)(this.#originalUrl, this.config.relayUrl);
     }
-    async getSubscriptionUserInfo({ requestUserAgent, } = {}) {
-        const { subscriptionUserinfo } = await (0, exports.getSsdSubscription)(this.url, this.udpRelay, requestUserAgent || this.requestUserAgent);
+    getSubscriptionUserInfo = async (params = {}) => {
+        const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
+        const { subscriptionUserinfo } = await (0, exports.getSsdSubscription)(this.url, this.udpRelay, requestUserAgent);
         if (subscriptionUserinfo) {
             return subscriptionUserinfo;
         }
-        return void 0;
-    }
-    async getNodeList({ requestUserAgent, } = {}) {
-        const { nodeList } = await (0, exports.getSsdSubscription)(this.url, this.udpRelay, requestUserAgent || this.requestUserAgent);
+        return undefined;
+    };
+    getNodeList = async (params = {}) => {
+        const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
+        const { nodeList } = await (0, exports.getSsdSubscription)(this.url, this.udpRelay, requestUserAgent);
+        if (this.config.hooks?.afterNodeListResponse) {
+            const newList = await this.config.hooks.afterNodeListResponse(nodeList, params);
+            if (newList) {
+                return newList;
+            }
+        }
         return nodeList;
-    }
+    };
 }
 exports.default = SsdProvider;
 // 协议定义：https://github.com/TheCGDF/SSD-Windows/wiki/HTTP%E8%AE%A2%E9%98%85%E5%8D%8F%E5%AE%9A
@@ -84,35 +93,46 @@ const getSsdSubscription = async (url, udpRelay, requestUserAgent) => {
 };
 exports.getSsdSubscription = getSsdSubscription;
 const parseSsdConfig = (globalConfig, server, udpRelay) => {
-    var _a, _b, _c, _d, _e, _f, _g;
     const { airport, port, encryption, password } = globalConfig;
-    const plugin = (_a = server.plugin) !== null && _a !== void 0 ? _a : globalConfig.plugin;
-    const pluginOptsString = (_b = server.plugin_options) !== null && _b !== void 0 ? _b : globalConfig.plugin_options;
+    const plugin = server.plugin ?? globalConfig.plugin;
+    const pluginOptsString = server.plugin_options ?? globalConfig.plugin_options;
     const pluginOpts = pluginOptsString
         ? (0, utils_1.decodeStringList)(pluginOptsString.split(';'))
         : {};
     // istanbul ignore next
     if (plugin && !['simple-obfs', 'v2ray-plugin'].includes(plugin)) {
         logger.warn(`不支持从 SSD 订阅中读取 ${plugin} 类型的 Shadowsocks 节点，节点 ${server.remarks} 会被省略`);
-        return void 0;
+        return undefined;
     }
     // istanbul ignore next
     if (plugin === 'v2ray-plugin' &&
         pluginOpts.mode.toLowerCase() === 'quic') {
         logger.warn(`不支持从 SSD 订阅中读取 QUIC 模式的 Shadowsocks 节点，节点 ${server.remarks} 会被省略`);
-        return void 0;
+        return undefined;
     }
-    return Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Shadowsocks, nodeName: (_c = server.remarks) !== null && _c !== void 0 ? _c : `${airport} ${server.server}:${(_d = server.port) !== null && _d !== void 0 ? _d : port}`, hostname: server.server, port: (_e = server.port) !== null && _e !== void 0 ? _e : port, method: (_f = server.encryption) !== null && _f !== void 0 ? _f : encryption, password: (_g = server.password) !== null && _g !== void 0 ? _g : password, 'udp-relay': udpRelay === true }, (plugin && plugin === 'simple-obfs'
-        ? {
-            obfs: pluginOpts.obfs,
-            'obfs-host': pluginOpts['obfs-host'] || 'www.bing.com',
-        }
-        : null)), (plugin && plugin === 'v2ray-plugin'
-        ? {
-            obfs: pluginOpts.tls ? 'wss' : 'ws',
-            'obfs-host': pluginOpts.host,
-        }
-        : null));
+    return {
+        type: types_1.NodeTypeEnum.Shadowsocks,
+        nodeName: server.remarks ?? `${airport} ${server.server}:${server.port ?? port}`,
+        hostname: server.server,
+        port: server.port ?? port,
+        method: server.encryption ?? encryption,
+        password: server.password ?? password,
+        udpRelay: udpRelay === true,
+        // obfs-local
+        ...(plugin && plugin === 'simple-obfs'
+            ? {
+                obfs: pluginOpts.obfs,
+                obfsHost: pluginOpts['obfs-host'] || 'www.bing.com',
+            }
+            : null),
+        // v2ray-plugin
+        ...(plugin && plugin === 'v2ray-plugin'
+            ? {
+                obfs: pluginOpts.tls ? 'wss' : 'ws',
+                obfsHost: pluginOpts.host,
+            }
+            : null),
+    };
 };
 exports.parseSsdConfig = parseSsdConfig;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3NkUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvU3NkUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsOENBQXNCO0FBQ3RCLDJDQUE4QztBQUM5QyxvREFBNEI7QUFDNUIsa0RBQTBCO0FBRTFCLG9DQUtrQjtBQUNsQixvQ0FBd0Q7QUFDeEQsMkVBQWtEO0FBQ2xELDBEQUFrQztBQUVsQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLG9CQUFvQjtDQUM5QixDQUFDLENBQUM7QUFFSCxNQUFxQixXQUFZLFNBQVEsa0JBQVE7SUFJL0MsWUFBWSxJQUFZLEVBQUUsTUFBeUI7UUFDakQsS0FBSyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVwQixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLEdBQUcsRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNkLEdBQUcsQ0FBQztnQkFDSCxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUM7YUFDbkIsQ0FBQztpQkFDRCxRQUFRLEVBQUU7WUFDYixRQUFRLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtTQUNqQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUUxQyx1QkFBdUI7UUFDdkIsSUFBSSxLQUFLLEVBQUU7WUFDVCxNQUFNLEtBQUssQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQztRQUNoQyxJQUFJLENBQUMsOEJBQThCLEdBQUcsSUFBSSxDQUFDO0lBQzdDLENBQUM7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
+//# sourceMappingURL=SsdProvider.js.map

package/build/provider/SsdProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SsdProvider.js","sourceRoot":"","sources":["../../src/provider/SsdProvider.ts"],"names":[],"mappings":"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"}

package/build/provider/TrojanProvider.d.ts

@@ -1,17 +1,14 @@
 import { SubscriptionUserinfo, TrojanNodeConfig, TrojanProviderConfig } from '../types';
 import Provider from './Provider';
+import { GetNodeListFunction, GetSubscriptionUserInfoFunction } from './types';
 export default class TrojanProvider extends Provider {
-    readonly _url: string;
+    #private;
     readonly udpRelay?: boolean;
     readonly tls13?: boolean;
     constructor(name: string, config: TrojanProviderConfig);
     get url(): string;
-    getSubscriptionUserInfo({ requestUserAgent, }?: {
-        requestUserAgent?: string;
-    }): Promise<SubscriptionUserinfo | undefined>;
-    getNodeList({ requestUserAgent, }?: {
-        requestUserAgent?: string;
-    }): Promise<ReadonlyArray<TrojanNodeConfig>>;
+    getSubscriptionUserInfo: GetSubscriptionUserInfoFunction;
+    getNodeList: GetNodeListFunction;
 }
 /**
  * @see https://github.com/trojan-gfw/trojan-url/blob/master/trojan-url.py
@@ -22,6 +19,6 @@ export declare const getTrojanSubscription: ({ url, udpRelay, tls13, requestUser
     tls13?: boolean | undefined;
     requestUserAgent?: string | undefined;
 }) => Promise<{
-    readonly nodeList: ReadonlyArray<TrojanNodeConfig>;
+    readonly nodeList: Array<TrojanNodeConfig>;
     readonly subscriptionUserinfo?: SubscriptionUserinfo | undefined;
 }>;

package/build/provider/TrojanProvider.js

@@ -4,63 +4,69 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTrojanSubscription = void 0;
-const joi_1 = __importDefault(require("joi"));
 const assert_1 = __importDefault(require("assert"));
-const logger_1 = require("@surgio/logger");
+const zod_1 = require("zod");
 const utils_1 = require("../utils");
 const relayable_url_1 = __importDefault(require("../utils/relayable-url"));
 const trojan_1 = require("../utils/trojan");
 const Provider_1 = __importDefault(require("./Provider"));
-const logger = (0, logger_1.createLogger)({
-    service: 'surgio:TrojanProvider',
-});
 class TrojanProvider extends Provider_1.default {
+    #originalUrl;
+    udpRelay;
+    tls13;
     constructor(name, config) {
         super(name, config);
-        const schema = joi_1.default.object({
-            url: joi_1.default.string()
-                .uri({
-                scheme: [/https?/],
-            })
-                .required(),
-            udpRelay: joi_1.default.bool().strict(),
-            tls13: joi_1.default.bool().strict(),
-        }).unknown();
-        const { error } = schema.validate(config);
+        const schema = zod_1.z.object({
+            url: zod_1.z.string().url(),
+            udpRelay: zod_1.z.boolean().optional(),
+            tls13: zod_1.z.boolean().optional(),
+        });
+        const result = schema.safeParse(config);
         // istanbul ignore next
-        if (error) {
-            throw error;
+        if (!result.success) {
+            throw new utils_1.SurgioError('TrojanProvider 配置校验失败', {
+                cause: result.error,
+                providerName: name,
+            });
         }
-        this._url = config.url;
-        this.udpRelay = config.udpRelay;
-        this.tls13 = config.tls13;
+        this.#originalUrl = result.data.url;
+        this.udpRelay = result.data.udpRelay;
+        this.tls13 = result.data.tls13;
         this.supportGetSubscriptionUserInfo = true;
     }
     // istanbul ignore next
     get url() {
-        return (0, relayable_url_1.default)(this._url, this.relayUrl);
+        return (0, relayable_url_1.default)(this.#originalUrl, this.config.relayUrl);
     }
-    async getSubscriptionUserInfo({ requestUserAgent, } = {}) {
+    getSubscriptionUserInfo = async (params = {}) => {
+        const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
         const { subscriptionUserinfo } = await (0, exports.getTrojanSubscription)({
             url: this.url,
             udpRelay: this.udpRelay,
             tls13: this.tls13,
-            requestUserAgent: requestUserAgent || this.requestUserAgent,
+            requestUserAgent: requestUserAgent || this.config.requestUserAgent,
         });
         if (subscriptionUserinfo) {
             return subscriptionUserinfo;
         }
-        return void 0;
-    }
-    async getNodeList({ requestUserAgent, } = {}) {
+        return undefined;
+    };
+    getNodeList = async (params = {}) => {
+        const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
         const { nodeList } = await (0, exports.getTrojanSubscription)({
             url: this.url,
             udpRelay: this.udpRelay,
             tls13: this.tls13,
-            requestUserAgent: requestUserAgent || this.requestUserAgent,
+            requestUserAgent: requestUserAgent,
         });
+        if (this.config.hooks?.afterNodeListResponse) {
+            const newList = await this.config.hooks.afterNodeListResponse(nodeList, params);
+            if (newList) {
+                return newList;
+            }
+        }
         return nodeList;
-    }
+    };
 }
 exports.default = TrojanProvider;
 /**
@@ -77,7 +83,11 @@ const getTrojanSubscription = async ({ url, udpRelay, tls13, requestUserAgent, }
         .filter((item) => !!item && item.startsWith('trojan://'))
         .map((item) => {
         const nodeConfig = (0, trojan_1.parseTrojanUri)(item);
-        return Object.assign(Object.assign({}, nodeConfig), { 'udp-relay': udpRelay, tls13 });
+        return {
+            ...nodeConfig,
+            udpRelay,
+            tls13,
+        };
     });
     return {
         nodeList,
@@ -85,4 +95,4 @@ const getTrojanSubscription = async ({ url, udpRelay, tls13, requestUserAgent, }
     };
 };
 exports.getTrojanSubscription = getTrojanSubscription;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVHJvamFuUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvVHJvamFuUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsOENBQXNCO0FBQ3RCLG9EQUE0QjtBQUM1QiwyQ0FBOEM7QUFPOUMsb0NBQXNDO0FBQ3RDLDJFQUFrRDtBQUNsRCw0Q0FBaUQ7QUFDakQsMERBQWtDO0FBRWxDLE1BQU0sTUFBTSxHQUFHLElBQUEscUJBQVksRUFBQztJQUMxQixPQUFPLEVBQUUsdUJBQXVCO0NBQ2pDLENBQUMsQ0FBQztBQUVILE1BQXFCLGNBQWUsU0FBUSxrQkFBUTtJQUtsRCxZQUFZLElBQVksRUFBRSxNQUE0QjtRQUNwRCxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1lBQzdCLEtBQUssRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQzNCLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO1FBQ2hD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
+//# sourceMappingURL=TrojanProvider.js.map

package/build/provider/TrojanProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TrojanProvider.js","sourceRoot":"","sources":["../../src/provider/TrojanProvider.ts"],"names":[],"mappings":"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"}

package/build/provider/V2rayNSubscribeProvider.d.ts

@@ -1,16 +1,15 @@
 import { ShadowsocksNodeConfig, V2rayNSubscribeProviderConfig, VmessNodeConfig } from '../types';
 import Provider from './Provider';
+import { GetNodeListFunction } from './types';
 export default class V2rayNSubscribeProvider extends Provider {
+    #private;
     readonly compatibleMode?: boolean;
     readonly skipCertVerify?: boolean;
     readonly udpRelay?: boolean;
     readonly tls13?: boolean;
-    private readonly _url;
     constructor(name: string, config: V2rayNSubscribeProviderConfig);
     get url(): string;
-    getNodeList({ requestUserAgent, }?: {
-        requestUserAgent?: string;
-    }): ReturnType<typeof getV2rayNSubscription>;
+    getNodeList: GetNodeListFunction;
 }
 /**
  * @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)
@@ -22,5 +21,5 @@ export declare const getV2rayNSubscription: ({ url, isCompatibleMode, skipCertVe
     udpRelay?: boolean | undefined;
     tls13?: boolean | undefined;
     requestUserAgent?: string | undefined;
-}) => Promise<ReadonlyArray<VmessNodeConfig | ShadowsocksNodeConfig>>;
+}) => Promise<Array<VmessNodeConfig | ShadowsocksNodeConfig>>;
 export declare const parseJSONConfig: (json: string, isCompatibleMode: boolean | undefined, skipCertVerify?: boolean | undefined, udpRelay?: boolean | undefined, tls13?: boolean | undefined) => VmessNodeConfig | undefined;

package/build/provider/V2rayNSubscribeProvider.js

@@ -4,53 +4,65 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseJSONConfig = exports.getV2rayNSubscription = void 0;
-const joi_1 = __importDefault(require("joi"));
 const logger_1 = require("@surgio/logger");
 const assert_1 = __importDefault(require("assert"));
+const zod_1 = require("zod");
 const types_1 = require("../types");
 const utils_1 = require("../utils");
 const relayable_url_1 = __importDefault(require("../utils/relayable-url"));
 const ss_1 = require("../utils/ss");
 const Provider_1 = __importDefault(require("./Provider"));
 class V2rayNSubscribeProvider extends Provider_1.default {
+    compatibleMode;
+    skipCertVerify;
+    udpRelay;
+    tls13;
+    #originalUrl;
     constructor(name, config) {
         super(name, config);
-        const schema = joi_1.default.object({
-            url: joi_1.default.string()
-                .uri({
-                scheme: [/https?/],
-            })
-                .required(),
-            udpRelay: joi_1.default.bool().strict(),
-            tls13: joi_1.default.bool().strict(),
-            compatibleMode: joi_1.default.bool().strict(),
-            skipCertVerify: joi_1.default.bool().strict(),
-        }).unknown();
-        const { error } = schema.validate(config);
+        const schema = zod_1.z.object({
+            url: zod_1.z.string().url(),
+            udpRelay: zod_1.z.boolean().optional(),
+            tls13: zod_1.z.boolean().optional(),
+            compatibleMode: zod_1.z.boolean().optional(),
+            skipCertVerify: zod_1.z.boolean().optional(),
+        });
+        const result = schema.safeParse(config);
         // istanbul ignore next
-        if (error) {
-            throw error;
+        if (!result.success) {
+            throw new utils_1.SurgioError('V2rayNSubscribeProvider 配置校验失败', {
+                cause: result.error,
+                providerName: name,
+            });
         }
-        this._url = config.url;
-        this.compatibleMode = config.compatibleMode;
-        this.skipCertVerify = config.skipCertVerify;
-        this.tls13 = config.tls13;
-        this.udpRelay = config.udpRelay;
+        this.#originalUrl = result.data.url;
+        this.compatibleMode = result.data.compatibleMode;
+        this.skipCertVerify = result.data.skipCertVerify;
+        this.tls13 = result.data.tls13;
+        this.udpRelay = result.data.udpRelay;
     }
     // istanbul ignore next
     get url() {
-        return (0, relayable_url_1.default)(this._url, this.relayUrl);
+        return (0, relayable_url_1.default)(this.#originalUrl, this.config.relayUrl);
     }
-    getNodeList({ requestUserAgent, } = {}) {
-        return (0, exports.getV2rayNSubscription)({
+    getNodeList = async (params = {}) => {
+        const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
+        const nodeList = await (0, exports.getV2rayNSubscription)({
             url: this.url,
             skipCertVerify: this.skipCertVerify,
             tls13: this.tls13,
             udpRelay: this.udpRelay,
             isCompatibleMode: this.compatibleMode,
-            requestUserAgent: requestUserAgent || this.requestUserAgent,
+            requestUserAgent: requestUserAgent,
         });
-    }
+        if (this.config.hooks?.afterNodeListResponse) {
+            const newList = await this.config.hooks.afterNodeListResponse(nodeList, params);
+            if (newList) {
+                return newList;
+            }
+        }
+        return nodeList;
+    };
 }
 exports.default = V2rayNSubscribeProvider;
 /**
@@ -82,7 +94,12 @@ const getV2rayNSubscription = async ({ url, isCompatibleMode, skipCertVerify, tl
                 return (0, exports.parseJSONConfig)((0, utils_1.fromBase64)(item.replace('vmess://', '')), isCompatibleMode, skipCertVerify, udpRelay, tls13);
             }
             if (item.startsWith('ss://')) {
-                return Object.assign(Object.assign({}, (0, ss_1.parseSSUri)(item)), { 'udp-relay': udpRelay, skipCertVerify: skipCertVerify, tls13: tls13 });
+                return {
+                    ...(0, ss_1.parseSSUri)(item),
+                    udpRelay: udpRelay,
+                    skipCertVerify: skipCertVerify,
+                    tls13: tls13,
+                };
             }
             return undefined;
         })
@@ -102,12 +119,26 @@ const parseJSONConfig = (json, isCompatibleMode, skipCertVerify, udpRelay, tls13
         logger_1.logger.warn(`不支持读取 network 类型为 ${config.net} 的 Vmess 节点，节点 ${config.ps} 会被省略。`);
         return undefined;
     }
-    return Object.assign({ nodeName: config.ps, type: types_1.NodeTypeEnum.Vmess, hostname: config.add, port: config.port, method: 'auto', uuid: config.id, alterId: config.aid || '0', network: config.net, tls: config.tls === 'tls', host: config.host, path: config.path || '/', 'udp-relay': udpRelay === true }, (config.tls === 'tls'
-        ? {
-            skipCertVerify: skipCertVerify !== null && skipCertVerify !== void 0 ? skipCertVerify : false,
-            tls13: tls13 !== null && tls13 !== void 0 ? tls13 : false,
-        }
-        : null));
+    return {
+        nodeName: config.ps,
+        type: types_1.NodeTypeEnum.Vmess,
+        hostname: config.add,
+        port: config.port,
+        method: 'auto',
+        uuid: config.id,
+        alterId: config.aid || '0',
+        network: config.net,
+        tls: config.tls === 'tls',
+        host: config.host,
+        path: config.path || '/',
+        udpRelay: udpRelay === true,
+        ...(config.tls === 'tls'
+            ? {
+                skipCertVerify: skipCertVerify ?? false,
+                tls13: tls13 ?? false,
+            }
+            : null),
+    };
 };
 exports.parseJSONConfig = parseJSONConfig;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVjJyYXlOU3Vic2NyaWJlUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvVjJyYXlOU3Vic2NyaWJlUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsOENBQXNCO0FBQ3RCLDJDQUF3QztBQUN4QyxvREFBNEI7QUFFNUIsb0NBS2tCO0FBQ2xCLG9DQUFzQztBQUN0QywyRUFBa0Q7QUFDbEQsb0NBQXlDO0FBQ3pDLDBEQUFrQztBQUVsQyxNQUFxQix1QkFBd0IsU0FBUSxrQkFBUTtJQVEzRCxZQUFZLElBQVksRUFBRSxNQUFxQztRQUM3RCxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1lBQzdCLEtBQUssRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1lBQzFCLGNBQWMsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1lBQ25DLGNBQWMsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ3BDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxH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
+//# sourceMappingURL=V2rayNSubscribeProvider.js.map

package/build/provider/V2rayNSubscribeProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"V2rayNSubscribeProvider.js","sourceRoot":"","sources":["../../src/provider/V2rayNSubscribeProvider.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAuC;AACvC,oDAA2B;AAC3B,6BAAuB;AAEvB,oCAKiB;AACjB,oCAAkD;AAClD,2EAAiD;AACjD,oCAAwC;AACxC,0DAAiC;AAGjC,MAAqB,uBAAwB,SAAQ,kBAAQ;IAC3C,cAAc,CAAU;IACxB,cAAc,CAAU;IACxB,QAAQ,CAAU;IAClB,KAAK,CAAU;IAEtB,YAAY,CAAQ;IAE7B,YAAY,IAAY,EAAE,MAAqC;QAC7D,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAEnB,MAAM,MAAM,GAAG,OAAC,CAAC,MAAM,CAAC;YACtB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;YACrB,QAAQ,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;YAChC,KAAK,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;YAC7B,cAAc,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;YACtC,cAAc,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;SACvC,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAEvC,uBAAuB;QACvB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,MAAM,IAAI,mBAAW,CAAC,gCAAgC,EAAE;gBACtD,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,YAAY,EAAE,IAAI;aACnB,CAAC,CAAA;SACH;QAED,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAA;QACnC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;QAChD,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;QAChD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAA;IACtC,CAAC;IAED,uBAAuB;IACvB,IAAW,GAAG;QACZ,OAAO,IAAA,uBAAY,EAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC9D,CAAC;IAEM,WAAW,GAAwB,KAAK,EAC7C,MAAM,GAAG,EAAE,EAC+B,EAAE;QAC5C,MAAM,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,CACrD,MAAM,CAAC,gBAAgB,CACxB,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAqB,EAAC;YAC3C,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,gBAAgB,EAAE,IAAI,CAAC,cAAc;YACrC,gBAAgB,EAAE,gBAAgB;SACnC,CAAC,CAAA;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,qBAAqB,EAAE;YAC5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAC3D,QAAQ,EACR,MAAM,CACP,CAAA;YAED,IAAI,OAAO,EAAE;gBACX,OAAO,OAAO,CAAA;aACf;SACF;QAED,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;CACF;AApED,0CAoEC;AAED;;GAEG;AACI,MAAM,qBAAqB,GAAG,KAAK,EAAE,EAC1C,GAAG,EACH,gBAAgB,EAChB,cAAc,EACd,KAAK,EACL,QAAQ,EACR,gBAAgB,GAQjB,EAA2D,EAAE;IAC5D,IAAA,gBAAM,EAAC,GAAG,EAAE,aAAa,CAAC,CAAA;IAE1B,IAAI,gBAAgB,EAAE;QACpB,eAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;KACrC;IAED,KAAK,UAAU,uBAAuB;QAGpC,MAAM,QAAQ,GAAG,MAAM,kBAAQ,CAAC,wBAAwB,CAAC,GAAG,EAAE;YAC5D,gBAAgB;SACjB,CAAC,CAAA;QACF,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAA;QAElC,MAAM,UAAU,GAAG,IAAA,kBAAU,EAAC,YAAY,CAAC;aACxC,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YACf,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YAEpE,IAAI,CAAC,IAAI,EAAE;gBACT,eAAM,CAAC,IAAI,CACT,uBAAuB,IAAI,WAAW,CACvC,CAAA;aACF;YAED,OAAO,IAAI,CAAA;QACb,CAAC,CAAC,CAAA;QAEJ,OAAO,UAAU;aACd,GAAG,CAAC,CAAC,IAAI,EAAuD,EAAE;YACjE,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC/B,OAAO,IAAA,uBAAe,EACpB,IAAA,kBAAU,EAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EACxC,gBAAgB,EAChB,cAAc,EACd,QAAQ,EACR,KAAK,CACN,CAAA;aACF;YAED,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBAC5B,OAAO;oBACL,GAAG,IAAA,eAAU,EAAC,IAAI,CAAC;oBACnB,QAAQ,EAAE,QAAQ;oBAClB,cAAc,EAAE,cAAc;oBAC9B,KAAK,EAAE,KAAK;iBACb,CAAA;aACF;YAED,OAAO,SAAS,CAAA;QAClB,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,IAAI,EAAmD,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAC9E,CAAC;IAED,OAAO,MAAM,uBAAuB,EAAE,CAAA;AACxC,CAAC,CAAA;AAvEY,QAAA,qBAAqB,yBAuEjC;AAEM,MAAM,eAAe,GAAG,CAC7B,IAAY,EACZ,gBAAqC,EACrC,cAAoC,EACpC,QAA8B,EAC9B,KAA2B,EACE,EAAE;IAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAE/B,uBAAuB;IACvB,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;QAC9D,MAAM,IAAI,KAAK,CACb,OAAO,MAAM,CAAC,EAAE,0EAA0E,CAC3F,CAAA;KACF;IACD,uBAAuB;IACvB,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;QAC5C,eAAM,CAAC,IAAI,CACT,qBAAqB,MAAM,CAAC,GAAG,kBAAkB,MAAM,CAAC,EAAE,QAAQ,CACnE,CAAA;QACD,OAAO,SAAS,CAAA;KACjB;IAED,OAAO;QACL,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,IAAI,EAAE,oBAAY,CAAC,KAAK;QACxB,QAAQ,EAAE,MAAM,CAAC,GAAG;QACpB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,MAAM,CAAC,EAAE;QACf,OAAO,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG;QAC1B,OAAO,EAAE,MAAM,CAAC,GAAG;QACnB,GAAG,EAAE,MAAM,CAAC,GAAG,KAAK,KAAK;QACzB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,GAAG;QACxB,QAAQ,EAAE,QAAQ,KAAK,IAAI;QAC3B,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,KAAK;YACtB,CAAC,CAAC;gBACE,cAAc,EAAE,cAAc,IAAI,KAAK;gBACvC,KAAK,EAAE,KAAK,IAAI,KAAK;aACtB;YACH,CAAC,CAAC,IAAI,CAAC;KACV,CAAA;AACH,CAAC,CAAA;AA3CY,QAAA,eAAe,mBA2C3B"}

package/build/provider/index.d.ts

@@ -1,3 +1,17 @@
+import { PossibleProviderConfigType } from '../types';
+import { ProviderDefineFunction } from '../configurables';
+import BlackSSLProvider from './BlackSSLProvider';
+import ClashProvider from './ClashProvider';
+import CustomProvider from './CustomProvider';
+import ShadowsocksJsonSubscribeProvider from './ShadowsocksJsonSubscribeProvider';
+import ShadowsocksrSubscribeProvider from './ShadowsocksrSubscribeProvider';
+import ShadowsocksSubscribeProvider from './ShadowsocksSubscribeProvider';
+import SsdProvider from './SsdProvider';
+import TrojanProvider from './TrojanProvider';
+import V2rayNSubscribeProvider from './V2rayNSubscribeProvider';
 import { PossibleProviderType } from './types';
-export { PossibleProviderType };
-export declare function getProvider(name: string, config: any): Promise<PossibleProviderType>;
+import Provider from './Provider';
+export { BlackSSLProvider, ClashProvider, CustomProvider, ShadowsocksJsonSubscribeProvider, ShadowsocksrSubscribeProvider, ShadowsocksSubscribeProvider, SsdProvider, TrojanProvider, V2rayNSubscribeProvider, };
+export type { Provider };
+export type * from './types';
+export declare function getProvider(name: string, config: ReturnType<ProviderDefineFunction<any>> | PossibleProviderConfigType): Promise<PossibleProviderType>;

package/build/provider/index.js

@@ -3,19 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProvider = void 0;
+exports.getProvider = exports.V2rayNSubscribeProvider = exports.TrojanProvider = exports.SsdProvider = exports.ShadowsocksSubscribeProvider = exports.ShadowsocksrSubscribeProvider = exports.ShadowsocksJsonSubscribeProvider = exports.CustomProvider = exports.ClashProvider = exports.BlackSSLProvider = void 0;
 const types_1 = require("../types");
 const BlackSSLProvider_1 = __importDefault(require("./BlackSSLProvider"));
+exports.BlackSSLProvider = BlackSSLProvider_1.default;
 const ClashProvider_1 = __importDefault(require("./ClashProvider"));
+exports.ClashProvider = ClashProvider_1.default;
 const CustomProvider_1 = __importDefault(require("./CustomProvider"));
+exports.CustomProvider = CustomProvider_1.default;
 const ShadowsocksJsonSubscribeProvider_1 = __importDefault(require("./ShadowsocksJsonSubscribeProvider"));
+exports.ShadowsocksJsonSubscribeProvider = ShadowsocksJsonSubscribeProvider_1.default;
 const ShadowsocksrSubscribeProvider_1 = __importDefault(require("./ShadowsocksrSubscribeProvider"));
+exports.ShadowsocksrSubscribeProvider = ShadowsocksrSubscribeProvider_1.default;
 const ShadowsocksSubscribeProvider_1 = __importDefault(require("./ShadowsocksSubscribeProvider"));
+exports.ShadowsocksSubscribeProvider = ShadowsocksSubscribeProvider_1.default;
 const SsdProvider_1 = __importDefault(require("./SsdProvider"));
+exports.SsdProvider = SsdProvider_1.default;
 const TrojanProvider_1 = __importDefault(require("./TrojanProvider"));
+exports.TrojanProvider = TrojanProvider_1.default;
 const V2rayNSubscribeProvider_1 = __importDefault(require("./V2rayNSubscribeProvider"));
+exports.V2rayNSubscribeProvider = V2rayNSubscribeProvider_1.default;
 async function getProvider(name, config) {
-    // 函数形式，需要先获取到返回值
     if (typeof config === 'function') {
         config = await config();
     }
@@ -28,9 +36,8 @@ async function getProvider(name, config) {
             return new ShadowsocksSubscribeProvider_1.default(name, config);
         case types_1.SupportProviderEnum.ShadowsocksrSubscribe:
             return new ShadowsocksrSubscribeProvider_1.default(name, config);
-        case types_1.SupportProviderEnum.Custom: {
+        case types_1.SupportProviderEnum.Custom:
             return new CustomProvider_1.default(name, config);
-        }
         case types_1.SupportProviderEnum.V2rayNSubscribe:
             return new V2rayNSubscribeProvider_1.default(name, config);
         case types_1.SupportProviderEnum.Clash:
@@ -44,4 +51,4 @@ async function getProvider(name, config) {
     }
 }
 exports.getProvider = getProvider;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsb0NBQStDO0FBQy9DLDBFQUFrRDtBQUNsRCxvRUFBNEM7QUFDNUMsc0VBQThDO0FBQzlDLDBHQUFrRjtBQUNsRixvR0FBNEU7QUFDNUUsa0dBQTBFO0FBQzFFLGdFQUF3QztBQUN4QyxzRUFBOEM7QUFFOUMsd0ZBQWdFO0FBSXpELEtBQUssVUFBVSxXQUFXLENBQy9CLElBQVksRUFDWixNQUFXO0lBRVgsaUJBQWlCO0lBQ2pCLElBQUksT0FBTyxNQUFNLEtBQUssVUFBVSxFQUFFO1FBQ2hDLE1BQU0sR0FBRyxNQUFNLE1BQU0sRUFBRSxDQUFDO0tBQ3pCO0lBRUQsUUFBUSxNQUFNLENBQUMsSUFBSSxFQUFFO1FBQ25CLEtBQUssMkJBQW1CLENBQUMsUUFBUTtZQUMvQixPQUFPLElBQUksMEJBQWdCLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRTVDLEtBQUssMkJBQW1CLENBQUMsd0JBQXdCO1lBQy9DLE9BQU8sSUFBSSwwQ0FBZ0MsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFNUQsS0FBSywyQkFBbUIsQ0FBQyxvQkFBb0I7WUFDM0MsT0FBTyxJQUFJLHNDQUE0QixDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUV4RCxLQUFLLDJCQUFtQixDQUFDLHFCQUFxQjtZQUM1QyxPQUFPLElBQUksdUNBQTZCLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXpELEtBQUssMkJBQW1CLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDL0IsT0FBTyxJQUFJLHdCQUFjLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1NBQ3pDO1FBRUQsS0FBSywyQkFBbUIsQ0FBQyxlQUFlO1lBQ3RDLE9BQU8sSUFBSSxpQ0FBdUIsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFbkQsS0FBSywyQkFBbUIsQ0FBQyxLQUFLO1lBQzVCLE9BQU8sSUFBSSx1QkFBYSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUV6QyxLQUFLLDJCQUFtQixDQUFDLEdBQUc7WUFDMUIsT0FBTyxJQUFJLHFCQUFXLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXZDLEtBQUssMkJBQW1CLENBQUMsTUFBTTtZQUM3QixPQUFPLElBQUksd0JBQWMsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFMUM7WUFDRSxNQUFNLElBQUksS0FBSyxDQUFDLDhCQUE4QixNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztLQUNoRTtBQUNILENBQUM7QUF6Q0Qsa0NBeUNDIn0=
+//# sourceMappingURL=index.js.map

package/build/provider/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/provider/index.ts"],"names":[],"mappings":";;;;;;AAAA,oCAA0E;AAE1E,0EAAiD;AAa/C,2BAbK,0BAAgB,CAaL;AAZlB,oEAA2C;AAazC,wBAbK,uBAAa,CAaL;AAZf,sEAA6C;AAa3C,yBAbK,wBAAc,CAaL;AAZhB,0GAAiF;AAa/E,2CAbK,0CAAgC,CAaL;AAZlC,oGAA2E;AAazE,wCAbK,uCAA6B,CAaL;AAZ/B,kGAAyE;AAavE,uCAbK,sCAA4B,CAaL;AAZ9B,gEAAuC;AAarC,sBAbK,qBAAW,CAaL;AAZb,sEAA6C;AAa3C,yBAbK,wBAAc,CAaL;AAZhB,wFAA+D;AAa7D,kCAbK,iCAAuB,CAaL;AAMlB,KAAK,UAAU,WAAW,CAC/B,IAAY,EACZ,MAA4E;IAE5E,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;QAChC,MAAM,GAAG,MAAM,MAAM,EAAE,CAAA;KACxB;IAED,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,2BAAmB,CAAC,QAAQ;YAC/B,OAAO,IAAI,0BAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAE3C,KAAK,2BAAmB,CAAC,wBAAwB;YAC/C,OAAO,IAAI,0CAAgC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAE3D,KAAK,2BAAmB,CAAC,oBAAoB;YAC3C,OAAO,IAAI,sCAA4B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAEvD,KAAK,2BAAmB,CAAC,qBAAqB;YAC5C,OAAO,IAAI,uCAA6B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAExD,KAAK,2BAAmB,CAAC,MAAM;YAC7B,OAAO,IAAI,wBAAc,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAEzC,KAAK,2BAAmB,CAAC,eAAe;YACtC,OAAO,IAAI,iCAAuB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAElD,KAAK,2BAAmB,CAAC,KAAK;YAC5B,OAAO,IAAI,uBAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAExC,KAAK,2BAAmB,CAAC,GAAG;YAC1B,OAAO,IAAI,qBAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAEtC,KAAK,2BAAmB,CAAC,MAAM;YAC7B,OAAO,IAAI,wBAAc,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAEzC;YACE,MAAM,IAAI,KAAK,CAAC,8BAA+B,MAAc,CAAC,IAAI,EAAE,CAAC,CAAA;KACxE;AACH,CAAC;AAvCD,kCAuCC"}

package/build/provider/types.d.ts

@@ -1,3 +1,4 @@
+import { PossibleNodeConfigType, SubscriptionUserinfo } from '../types';
 import BlackSSLProvider from './BlackSSLProvider';
 import ClashProvider from './ClashProvider';
 import CustomProvider from './CustomProvider';
@@ -5,5 +6,13 @@ import ShadowsocksJsonSubscribeProvider from './ShadowsocksJsonSubscribeProvider
 import ShadowsocksrSubscribeProvider from './ShadowsocksrSubscribeProvider';
 import ShadowsocksSubscribeProvider from './ShadowsocksSubscribeProvider';
 import SsdProvider from './SsdProvider';
+import TrojanProvider from './TrojanProvider';
 import V2rayNSubscribeProvider from './V2rayNSubscribeProvider';
-export declare type PossibleProviderType = BlackSSLProvider | ShadowsocksJsonSubscribeProvider | ShadowsocksSubscribeProvider | CustomProvider | V2rayNSubscribeProvider | ShadowsocksrSubscribeProvider | ClashProvider | SsdProvider;
+export type PossibleProviderType = BlackSSLProvider | ShadowsocksJsonSubscribeProvider | ShadowsocksSubscribeProvider | CustomProvider | V2rayNSubscribeProvider | ShadowsocksrSubscribeProvider | ClashProvider | SsdProvider | TrojanProvider;
+export type GetNodeListParams = Record<string, unknown> & {
+    requestUserAgent?: string;
+};
+export type GetNodeListFunction = (params?: GetNodeListParams) => Promise<ReadonlyArray<PossibleNodeConfigType>>;
+export type GetSubscriptionUserInfoFunction = (params?: {
+    requestUserAgent?: string;
+}) => Promise<SubscriptionUserinfo | undefined>;

package/build/provider/types.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
+//# sourceMappingURL=types.js.map

package/build/provider/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/provider/types.ts"],"names":[],"mappings":""}