surgio 2.25.3 → 3.0.0-alpha.1

package/build/provider/Provider.d.ts

@@ -1,31 +1,18 @@
-import { ProviderConfig, SupportProviderEnum, PossibleNodeConfigType, SubscriptionUserinfo } from '../types';
+import { ProviderConfig, SupportProviderEnum } from '../types';
 import { SubsciptionCacheItem } from '../utils/cache';
-export default class Provider {
+import { GetNodeListFunction, GetSubscriptionUserInfoFunction } from './types';
+export default abstract class Provider {
     name: string;
     readonly type: SupportProviderEnum;
-    readonly nodeFilter?: ProviderConfig['nodeFilter'];
-    readonly netflixFilter?: ProviderConfig['netflixFilter'];
-    readonly youtubePremiumFilter?: ProviderConfig['youtubePremiumFilter'];
-    readonly customFilters?: ProviderConfig['customFilters'];
-    readonly addFlag?: boolean;
-    readonly removeExistingFlag?: boolean;
-    readonly tfo?: boolean;
-    readonly underlyingProxy?: string;
-    readonly mptcp?: boolean;
-    readonly renameNode?: ProviderConfig['renameNode'];
-    readonly relayUrl?: boolean | string;
-    readonly requestUserAgent?: string;
+    readonly config: ProviderConfig;
     supportGetSubscriptionUserInfo: boolean;
-    startPort?: number;
-    constructor(name: string, config: ProviderConfig);
+    passGatewayRequestUserAgent: boolean;
+    protected constructor(name: string, config: ProviderConfig);
     static requestCacheableResource(url: string, options?: {
         requestUserAgent?: string;
     }): Promise<SubsciptionCacheItem>;
+    determineRequestUserAgent(requestUserAgent?: string | undefined): string | undefined;
     get nextPort(): number;
-    getSubscriptionUserInfo({}?: {
-        requestUserAgent?: string;
-    }): Promise<SubscriptionUserinfo | undefined>;
-    getNodeList({}?: {
-        requestUserAgent?: string;
-    }): Promise<ReadonlyArray<PossibleNodeConfigType>>;
+    getSubscriptionUserInfo: GetSubscriptionUserInfoFunction;
+    getNodeList: GetNodeListFunction;
 }

package/build/provider/Provider.js

@@ -22,85 +22,45 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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 });
 const logger_1 = require("@surgio/logger");
-const joi_1 = __importDefault(require("joi"));
 const constant_1 = require("../constant");
-const types_1 = require("../types");
 const cache_1 = require("../utils/cache");
-const config_1 = require("../utils/config");
+const config_1 = require("../config");
 const env_flag_1 = require("../utils/env-flag");
 const http_client_1 = __importStar(require("../utils/http-client"));
-const subscription_1 = require("../utils/subscription");
 const utils_1 = require("../utils");
+const validators_1 = require("../validators");
 const logger = (0, logger_1.createLogger)({
     service: 'surgio:Provider',
 });
 class Provider {
+    name;
+    type;
+    config;
+    // 是否支持在订阅中获取用户流量信息
+    supportGetSubscriptionUserInfo;
+    // 是否传递 Gateway 请求的 User-Agent
+    passGatewayRequestUserAgent;
     constructor(name, config) {
         this.name = name;
-        const schema = joi_1.default.object({
-            type: joi_1.default.string()
-                .valid(...Object.values(types_1.SupportProviderEnum))
-                .required(),
-            nodeFilter: joi_1.default.any().allow(joi_1.default.function(), joi_1.default.object({
-                filter: joi_1.default.function(),
-                supportSort: joi_1.default.boolean().strict(),
-            })),
-            netflixFilter: joi_1.default.any().allow(joi_1.default.function(), joi_1.default.object({
-                filter: joi_1.default.function(),
-                supportSort: joi_1.default.boolean().strict(),
-            })),
-            youtubePremiumFilter: joi_1.default.any().allow(joi_1.default.function(), joi_1.default.object({
-                filter: joi_1.default.function(),
-                supportSort: joi_1.default.boolean().strict(),
-            })),
-            customFilters: joi_1.default.object().pattern(joi_1.default.string(), joi_1.default.any().allow(joi_1.default.function(), joi_1.default.object({
-                filter: joi_1.default.function(),
-                supportSort: joi_1.default.boolean().strict(),
-            }))),
-            addFlag: joi_1.default.boolean().strict(),
-            removeExistingFlag: joi_1.default.boolean().strict(),
-            mptcp: joi_1.default.boolean().strict(),
-            tfo: joi_1.default.boolean().strict(),
-            underlyingProxy: joi_1.default.string(),
-            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(),
-            requestUserAgent: joi_1.default.string(),
-        }).unknown();
-        const { error, value } = schema.validate(config);
+        const result = validators_1.ProviderValidator.safeParse(config);
         // istanbul ignore next
-        if (error) {
-            throw error;
+        if (!result.success) {
+            throw new utils_1.SurgioError('Provider 配置校验失败', {
+                cause: result.error,
+                providerName: name,
+            });
         }
         this.supportGetSubscriptionUserInfo = false;
-        [
-            'type',
-            'nodeFilter',
-            'netflixFilter',
-            'youtubePremiumFilter',
-            'customFilters',
-            'addFlag',
-            'removeExistingFlag',
-            'tfo',
-            'mptcp',
-            'startPort',
-            'renameNode',
-            'relayUrl',
-            'requestUserAgent',
-            'underlyingProxy',
-        ].forEach((key) => {
-            this[key] = value[key];
-        });
+        this.config = result.data;
+        this.type = result.data.type;
+        this.passGatewayRequestUserAgent =
+            (0, config_1.getConfig)()?.gateway?.passRequestUserAgent ?? false;
     }
     static async requestCacheableResource(url, options = {}) {
-        var _a, _b;
-        const cacheType = ((_b = (_a = (0, config_1.getConfig)()) === null || _a === void 0 ? void 0 : _a.cache) === null || _b === void 0 ? void 0 : _b.type) || 'default';
-        const cacheKey = `${constant_1.CACHE_KEYS.Provider}:${(0, utils_1.toMD5)((0, http_client_1.getUserAgent)(options.requestUserAgent || '') + url)}`;
+        const cacheType = (0, config_1.getConfig)()?.cache?.type || 'default';
+        const cacheKey = `${constant_1.CACHE_KEYS.Provider}:${(0, utils_1.toMD5)((0, http_client_1.getUserAgent)(options.requestUserAgent) + url)}`;
         const requestResource = async () => {
             const headers = {};
             if (options.requestUserAgent) {
@@ -114,7 +74,7 @@ class Provider {
                 body: res.body,
             };
             if (res.headers['subscription-userinfo']) {
-                subsciptionCacheItem.subscriptionUserinfo = (0, subscription_1.parseSubscriptionUserInfo)(res.headers['subscription-userinfo']);
+                subsciptionCacheItem.subscriptionUserinfo = (0, utils_1.parseSubscriptionUserInfo)(res.headers['subscription-userinfo']);
                 logger.debug('%s received subscription userinfo - raw: %s | parsed: %j', url, res.headers['subscription-userinfo'], subsciptionCacheItem.subscriptionUserinfo);
             }
             return subsciptionCacheItem;
@@ -142,20 +102,25 @@ class Provider {
                 })();
         }
     }
+    determineRequestUserAgent(requestUserAgent) {
+        return this.passGatewayRequestUserAgent
+            ? requestUserAgent || this.config.requestUserAgent
+            : this.config.requestUserAgent;
+    }
     get nextPort() {
-        if (this.startPort) {
-            return this.startPort++;
+        if (this.config.startPort) {
+            return this.config.startPort++;
         }
         return 0;
     }
     // istanbul ignore next
-    async getSubscriptionUserInfo({} = {}) {
+    getSubscriptionUserInfo = async () => {
         throw new Error('此 Provider 不支持该功能');
-    }
+    };
     // istanbul ignore next
-    getNodeList({} = {}) {
+    getNodeList = () => {
         return Promise.resolve([]);
-    }
+    };
 }
 exports.default = Provider;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDJDQUE4QztBQUM5Qyw4Q0FBc0I7QUFFdEIsMENBQXlDO0FBQ3pDLG9DQUtrQjtBQUNsQiwwQ0FJd0I7QUFDeEIsNENBQTRDO0FBQzVDLGdEQUEyRDtBQUMzRCxvRUFBZ0U7QUFDaEUsd0RBQWtFO0FBQ2xFLG9DQUE4QztBQUU5QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLGlCQUFpQjtDQUMzQixDQUFDLENBQUM7QUFFSCxNQUFxQixRQUFRO0lBbUIzQixZQUFtQixJQUFZLEVBQUUsTUFBc0I7UUFBcEMsU0FBSSxHQUFKLElBQUksQ0FBUTtRQUM3QixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLElBQUksRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNmLEtBQUssQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQVMsMkJBQW1CLENBQUMsQ0FBQztpQkFDcEQsUUFBUSxFQUFFO1lBQ2IsVUFBVSxFQUFFLGFBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQ3pCLGFBQUcsQ0FBQyxRQUFRLEVBQUUsRUFDZCxhQUFHLENBQUMsTUFBTSxDQUFDO2dCQUNULE1BQU0sRUFBRSxhQUFHLENBQUMsUUFBUSxFQUFFO2dCQUN0QixXQUFXLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTthQUNwQyxDQUFDLENBQ0g7WUFDRCxhQUFhLEVBQUUsYUFBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FDNUIsYUFBRyxDQUFDLFFBQVEsRUFBRSxFQUNkLGFBQUcsQ0FBQyxNQUFNLENBQUM7Z0JBQ1QsTUFBTSxFQUFFLGFBQUcsQ0FBQyxRQUFR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
+//# sourceMappingURL=Provider.js.map

package/build/provider/Provider.js.map

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

package/build/provider/ShadowsocksJsonSubscribeProvider.d.ts

@@ -1,12 +1,11 @@
 import { ShadowsocksJsonSubscribeProviderConfig, ShadowsocksNodeConfig } from '../types';
 import Provider from './Provider';
+import { GetNodeListFunction } from './types';
 export default class ShadowsocksJsonSubscribeProvider extends Provider {
+    #private;
     readonly udpRelay?: boolean;
-    private readonly _url;
     constructor(name: string, config: ShadowsocksJsonSubscribeProviderConfig);
     get url(): string;
-    getNodeList({ requestUserAgent, }?: {
-        requestUserAgent?: string;
-    }): ReturnType<typeof getShadowsocksJSONConfig>;
+    getNodeList: GetNodeListFunction;
 }
-export declare const getShadowsocksJSONConfig: (url: string, udpRelay?: boolean, requestUserAgent?: string) => Promise<ReadonlyArray<ShadowsocksNodeConfig>>;
+export declare const getShadowsocksJSONConfig: (url: string, udpRelay?: boolean, requestUserAgent?: string) => Promise<Array<ShadowsocksNodeConfig>>;

package/build/provider/ShadowsocksJsonSubscribeProvider.js

@@ -5,36 +5,46 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getShadowsocksJSONConfig = void 0;
 const assert_1 = __importDefault(require("assert"));
-const joi_1 = __importDefault(require("joi"));
+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 Provider_1 = __importDefault(require("./Provider"));
 class ShadowsocksJsonSubscribeProvider 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('ShadowsocksJsonSubscribeProvider 配置校验失败', {
+                cause: result.error,
+                providerName: name,
+            });
         }
-        this._url = config.url;
-        this.udpRelay = config.udpRelay;
+        this.#originalUrl = result.data.url;
+        this.udpRelay = result.data.udpRelay;
     }
     // istanbul ignore next
     get url() {
-        return (0, relayable_url_1.default)(this._url, this.relayUrl);
-    }
-    getNodeList({ requestUserAgent, } = {}) {
-        return (0, exports.getShadowsocksJSONConfig)(this.url, this.udpRelay, requestUserAgent || this.requestUserAgent);
+        return (0, relayable_url_1.default)(this.#originalUrl, this.config.relayUrl);
     }
+    getNodeList = async (params = {}) => {
+        const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
+        const nodeList = await (0, exports.getShadowsocksJSONConfig)(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 = ShadowsocksJsonSubscribeProvider;
 const getShadowsocksJSONConfig = async (url, udpRelay, requestUserAgent) => {
@@ -57,14 +67,14 @@ const getShadowsocksJSONConfig = async (url, udpRelay, requestUserAgent) => {
                 password: item.password,
             };
             if (typeof udpRelay === 'boolean') {
-                nodeConfig['udp-relay'] = udpRelay;
+                nodeConfig.udpRelay = udpRelay;
             }
             if (item.plugin === 'obfs-local') {
                 const obfs = item.plugin_opts.match(/obfs=(\w+)/);
                 const obfsHost = item.plugin_opts.match(/obfs-host=(.+)$/);
                 if (obfs) {
                     nodeConfig.obfs = obfs[1];
-                    nodeConfig['obfs-host'] = obfsHost ? obfsHost[1] : 'www.bing.com';
+                    nodeConfig.obfsHost = obfsHost ? obfsHost[1] : 'www.bing.com';
                 }
             }
             return nodeConfig;
@@ -73,4 +83,4 @@ const getShadowsocksJSONConfig = async (url, udpRelay, requestUserAgent) => {
     return await requestConfigFromRemote();
 };
 exports.getShadowsocksJSONConfig = getShadowsocksJSONConfig;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhZG93c29ja3NKc29uU3Vic2NyaWJlUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvU2hhZG93c29ja3NKc29uU3Vic2NyaWJlUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsb0RBQTRCO0FBQzVCLDhDQUFzQjtBQUN0QixvQ0FJa0I7QUFDbEIsMkVBQWtEO0FBQ2xELDBEQUFrQztBQUVsQyxNQUFxQixnQ0FBaUMsU0FBUSxrQkFBUTtJQUlwRSxZQUFZLElBQVksRUFBRSxNQUE4QztRQUN0RSxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ2pDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO0lBQ2xDLENBQUM7SUFFRCx1QkFBdUI7SUFDdkIsSUFBVyxHQUFHO1FBQ1osT0FBTyxJQUFBLHVCQUFZLEVBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUVNLFdBQVcsQ0FBQyxFQUNqQixnQkFBZ0IsTUFDaUIsRUFBRTtRQUduQyxPQUFPLElBQUEsZ0NBQXdCLEVBQzdCLElBQUksQ0FBQyxHQUFHLEVBQ1IsSUFBSSxDQUFDLFFBQVEsRUFDYixnQkFBZ0IsSUFBSSxJQUFJLENBQUMsZ0JBQWdCLENBQzFDLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUEzQ0QsbURBMkNDO0FBRU0sTUFBTSx3QkFBd0IsR0FBRyxLQUFLLEVBQzNDLEdBQVcsRUFDWCxRQUFrQixFQUNsQixnQkFBeUIsRUFDc0IsRUFBRTtJQUNqRCxJQUFBLGdCQUFNLEVBQUMsR0FBRyxFQUFFLGFBQWEsQ0FBQyxDQUFDO0lBRTNCLEtBQUssVUFBVSx1QkFBdUI7UUFHcEMsTUFBTSxRQUFRLEdBQUcsTUFBTSxrQkFBUSxDQUFDLHdCQUF3QixDQUFDLEdBQUcsRUFBRTtZQUM1RCxnQkFBZ0IsRUFBRSxnQkFBZ0IsSUFBSSxjQUFjO1NBQ3JELENBQUMsQ0FBQztRQUNILE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLElBQUksQ0FFdEMsQ0FBQztRQUVGLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO1lBQzlCLE1BQU0sSUFBSSxLQUFLLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztTQUNuQztRQUVELE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQXlCLEVBQUU7WUFDeEQsTUFBTSxVQUFVLEdBQVE7Z0JBQ3RCLFFBQVEsRUFBRSxJQUFJLENBQUMsT0FBaUI7Z0JBQ2hDLElBQUksRUFBRSxvQkFBWSxDQUFDLFdBQVc7Z0JBQzlCLFFBQVEsRUFBRSxJQUFJLENBQUMsTUFBZ0I7Z0JBQy9CLElBQUksRUFBRSxJQUFJLENBQUMsV0FBcUI7Z0JBQ2hDLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBZ0I7Z0JBQzdCLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBa0I7YUFDbEMsQ0FBQztZQUVGLElBQUksT0FBTyxRQUFRLEtBQUssU0FBUyxFQUFFO2dCQUNqQyxVQUFVLENBQUMsV0FBVyxDQUFDLEdBQUcsUUFBUSxDQUFDO2FBQ3BDO1lBQ0QsSUFBSSxJQUFJLENBQUMsTUFBTSxLQUFLLFlBQVksRUFBRTtnQkFDaEMsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQ2xELE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7Z0JBRTNELElBQUksSUFBSSxFQUFFO29CQUNSLFVBQVUsQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUMxQixVQUFVLENBQUMsV0FBVyxDQUFDLEdBQUcsUUFBUSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQztpQkFDbkU7YUFDRjtZQUVELE9BQU8sVUFBVSxDQUFDO1FBQ3BCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sTUFBTSx1QkFBdUIsRUFBRSxDQUFDO0FBQ3pDLENBQUMsQ0FBQztBQWpEVyxRQUFBLHdCQUF3Qiw0QkFpRG5DIn0=
+//# sourceMappingURL=ShadowsocksJsonSubscribeProvider.js.map

package/build/provider/ShadowsocksJsonSubscribeProvider.js.map

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

package/build/provider/ShadowsocksSubscribeProvider.d.ts

@@ -1,21 +1,18 @@
 import { ShadowsocksNodeConfig, ShadowsocksSubscribeProviderConfig, SubscriptionUserinfo } from '../types';
 import Provider from './Provider';
+import { GetNodeListFunction, GetSubscriptionUserInfoFunction } from './types';
 export default class ShadowsocksSubscribeProvider extends Provider {
+    #private;
     readonly udpRelay?: boolean;
-    private readonly _url;
     constructor(name: string, config: ShadowsocksSubscribeProviderConfig);
     get url(): string;
-    getSubscriptionUserInfo({ requestUserAgent, }?: {
-        requestUserAgent?: string;
-    }): Promise<SubscriptionUserinfo | undefined>;
-    getNodeList({ requestUserAgent, }?: {
-        requestUserAgent?: string;
-    }): Promise<ReadonlyArray<ShadowsocksNodeConfig>>;
+    getSubscriptionUserInfo: GetSubscriptionUserInfoFunction;
+    getNodeList: GetNodeListFunction;
 }
 /**
  * @see https://shadowsocks.org/en/spec/SIP002-URI-Scheme.html
  */
 export declare const getShadowsocksSubscription: (url: string, udpRelay?: boolean, requestUserAgent?: string) => Promise<{
-    readonly nodeList: ReadonlyArray<ShadowsocksNodeConfig>;
+    readonly nodeList: Array<ShadowsocksNodeConfig>;
     readonly subscriptionUserinfo?: SubscriptionUserinfo | undefined;
 }>;

package/build/provider/ShadowsocksSubscribeProvider.js

@@ -4,51 +4,56 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getShadowsocksSubscription = 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 ss_1 = require("../utils/ss");
 const Provider_1 = __importDefault(require("./Provider"));
-const logger = (0, logger_1.createLogger)({
-    service: 'surgio:ShadowsocksSubscribeProvider',
-});
 class ShadowsocksSubscribeProvider extends Provider_1.default {
+    udpRelay;
+    #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.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('ShadowsocksSubscribeProvider 配置校验失败', {
+                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.getShadowsocksSubscription)(this.url, this.udpRelay, requestUserAgent || this.requestUserAgent);
+    getSubscriptionUserInfo = async (params = {}) => {
+        const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
+        const { subscriptionUserinfo } = await (0, exports.getShadowsocksSubscription)(this.url, this.udpRelay, requestUserAgent);
         if (subscriptionUserinfo) {
             return subscriptionUserinfo;
         }
         return undefined;
-    }
-    async getNodeList({ requestUserAgent, } = {}) {
-        const { nodeList } = await (0, exports.getShadowsocksSubscription)(this.url, this.udpRelay, requestUserAgent || this.requestUserAgent);
+    };
+    getNodeList = async (params = {}) => {
+        const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
+        const { nodeList } = await (0, exports.getShadowsocksSubscription)(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 = ShadowsocksSubscribeProvider;
 /**
@@ -65,7 +70,8 @@ const getShadowsocksSubscription = async (url, udpRelay, requestUserAgent) => {
         .map((item) => {
         const nodeConfig = (0, ss_1.parseSSUri)(item);
         if (udpRelay !== void 0) {
-            nodeConfig['udp-relay'] = udpRelay;
+            ;
+            nodeConfig.udpRelay = udpRelay;
         }
         return nodeConfig;
     });
@@ -75,4 +81,4 @@ const getShadowsocksSubscription = async (url, udpRelay, requestUserAgent) => {
     };
 };
 exports.getShadowsocksSubscription = getShadowsocksSubscription;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhZG93c29ja3NTdWJzY3JpYmVQcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9wcm92aWRlci9TaGFkb3dzb2Nrc1N1YnNjcmliZVByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDhDQUFzQjtBQUN0QixvREFBNEI7QUFDNUIsMkNBQThDO0FBTzlDLG9DQUFzQztBQUN0QywyRUFBa0Q7QUFDbEQsb0NBQXlDO0FBQ3pDLDBEQUFrQztBQUVsQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLHFDQUFxQztDQUMvQyxDQUFDLENBQUM7QUFFSCxNQUFxQiw0QkFBNkIsU0FBUSxrQkFBUTtJQUloRSxZQUFZLElBQVksRUFBRSxNQUEwQztRQUNsRSxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ2pDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO1FBQ2hDLElBQUksQ0FBQyw4QkFBOEIsR0FBRyxJQUFJLENBQUM7SUFDN0MsQ0FBQztJQUVELHVCQUF1QjtJQUN2QixJQUFXLEdBQUc7UUFDWixPQUFPLElBQUEsdUJBQVksRUFBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRU0sS0FBSyxDQUFDLHVCQUF1QixDQUFDLEVBQ25DLGdCQUFnQixNQUNpQixFQUFFO1FBR25DLE1BQU0sRUFBRSxvQkFBb0IsRUFBRSxHQUFHLE1BQU0sSUFBQSxrQ0FBMEIsRUFDL0QsSUFBSSxDQUFDLEdBQUcsRUFDUixJQUFJLENBQUMsUUFBUSxFQUNiLGdCQUFnQixJQUFJLElBQUksQ0FBQyxnQkFBZ0IsQ0FDMUMsQ0FBQztRQUVGLElBQUksb0JBQW9CLEVBQUU7WUFDeEIsT0FBTyxvQkFBb0IsQ0FBQztTQUM3QjtRQUNELE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFTSxLQUFLLENBQUMsV0FBVyxDQUFDLEVBQ3ZCLGdCQUFnQixNQUNpQixFQUFFO1FBR25DLE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxNQUFNLElBQUEsa0NBQTBCLEVBQ25ELElBQUksQ0FBQyxHQUFHLEVBQ1IsSUFBSSxDQUFDLFFBQVEsRUFDYixnQkFBZ0IsSUFBSSxJQUFJLENBQUMsZ0JBQWdCLENBQzFDLENBQUM7UUFFRixPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDO0NBQ0Y7QUEvREQsK0NBK0RDO0FBRUQ7O0dBRUc7QUFDSSxNQUFNLDBCQUEwQixHQUFHLEtBQUssRUFDN0MsR0FBVyxFQUNYLFFBQWtCLEVBQ2xCLGdCQUF5QixFQUl4QixFQUFFO0lBQ0gsSUFBQSxnQkFBTSxFQUFDLEdBQUcsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUUzQixNQUFNLFFBQVEsR0FBRyxNQUFNLGtCQUFRLENBQUMsd0JBQXdCLENBQUMsR0FBRyxFQUFFO1FBQzVELGdCQUFnQjtLQUNqQixDQUFDLENBQUM7SUFDSCxNQUFNLFFBQVEsR0FBRyxJQUFBLGtCQUFVLEVBQUMsUUFBUSxDQUFDLElBQUksQ0FBQztTQUN2QyxLQUFLLENBQUMsSUFBSSxDQUFDO1NBQ1gsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDcEQsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUF5QixFQUFFO1FBQ25DLE1BQU0sVUFBVSxHQUFHLElBQUEsZUFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO1FBRXBDLElBQUksUUFBUSxLQUFLLEtBQUssQ0FBQyxFQUFFO1lBQ3RCLFVBQVUsQ0FBQyxXQUFXLENBQWEsR0FBRyxRQUFRLENBQUM7U0FDakQ7UUFFRCxPQUFPLFVBQVUsQ0FBQztJQUNwQixDQUFDLENBQUMsQ0FBQztJQUVMLE9BQU87UUFDTCxRQUFRO1FBQ1Isb0JBQW9CLEVBQUUsUUFBUSxDQUFDLG9CQUFvQjtLQUNwRCxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBOUJXLFFBQUEsMEJBQTBCLDhCQThCckMifQ==
+//# sourceMappingURL=ShadowsocksSubscribeProvider.js.map

package/build/provider/ShadowsocksSubscribeProvider.js.map

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

package/build/provider/ShadowsocksrSubscribeProvider.d.ts

@@ -1,18 +1,15 @@
 import { ShadowsocksrNodeConfig, ShadowsocksrSubscribeProviderConfig, SubscriptionUserinfo } from '../types';
 import Provider from './Provider';
+import { GetNodeListFunction, GetSubscriptionUserInfoFunction } from './types';
 export default class ShadowsocksrSubscribeProvider extends Provider {
+    #private;
     readonly udpRelay?: boolean;
-    private readonly _url;
     constructor(name: string, config: ShadowsocksrSubscribeProviderConfig);
     get url(): string;
-    getSubscriptionUserInfo({ requestUserAgent, }?: {
-        requestUserAgent?: string;
-    }): Promise<SubscriptionUserinfo | undefined>;
-    getNodeList({ requestUserAgent, }?: {
-        requestUserAgent?: string;
-    }): Promise<ReadonlyArray<ShadowsocksrNodeConfig>>;
+    getSubscriptionUserInfo: GetSubscriptionUserInfoFunction;
+    getNodeList: GetNodeListFunction;
 }
 export declare const getShadowsocksrSubscription: (url: string, udpRelay?: boolean, requestUserAgent?: string) => Promise<{
-    readonly nodeList: ReadonlyArray<ShadowsocksrNodeConfig>;
+    readonly nodeList: Array<ShadowsocksrNodeConfig>;
     readonly subscriptionUserinfo?: SubscriptionUserinfo | undefined;
 }>;

package/build/provider/ShadowsocksrSubscribeProvider.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getShadowsocksrSubscription = 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 utils_1 = require("../utils");
 const relayable_url_1 = __importDefault(require("../utils/relayable-url"));
 const subscription_1 = require("../utils/subscription");
@@ -16,40 +16,49 @@ const logger = (0, logger_1.createLogger)({
     service: 'surgio:ShadowsocksrSubscribeProvider',
 });
 class ShadowsocksrSubscribeProvider extends Provider_1.default {
+    udpRelay;
+    #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.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('ShadowsocksrSubscribeProvider 配置校验失败', {
+                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.getShadowsocksrSubscription)(this.url, this.udpRelay, requestUserAgent || this.requestUserAgent);
+    getSubscriptionUserInfo = async (params = {}) => {
+        const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
+        const { subscriptionUserinfo } = await (0, exports.getShadowsocksrSubscription)(this.url, this.udpRelay, requestUserAgent);
         if (subscriptionUserinfo) {
             return subscriptionUserinfo;
         }
         return undefined;
-    }
-    async getNodeList({ requestUserAgent, } = {}) {
-        const { nodeList } = await (0, exports.getShadowsocksrSubscription)(this.url, this.udpRelay, requestUserAgent || this.requestUserAgent);
+    };
+    getNodeList = async (params = {}) => {
+        const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
+        const { nodeList } = await (0, exports.getShadowsocksrSubscription)(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 = ShadowsocksrSubscribeProvider;
 const getShadowsocksrSubscription = async (url, udpRelay, requestUserAgent) => {
@@ -63,7 +72,8 @@ const getShadowsocksrSubscription = async (url, udpRelay, requestUserAgent) => {
         .map((str) => {
         const nodeConfig = (0, ssr_1.parseSSRUri)(str);
         if (udpRelay !== void 0) {
-            nodeConfig['udp-relay'] = udpRelay;
+            ;
+            nodeConfig.udpRelay = udpRelay;
         }
         return nodeConfig;
     });
@@ -80,4 +90,4 @@ const getShadowsocksrSubscription = async (url, udpRelay, requestUserAgent) => {
     };
 };
 exports.getShadowsocksrSubscription = getShadowsocksrSubscription;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhZG93c29ja3NyU3Vic2NyaWJlUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvU2hhZG93c29ja3NyU3Vic2NyaWJlUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsOENBQXNCO0FBQ3RCLDJDQUE4QztBQUM5QyxvREFBNEI7QUFPNUIsb0NBQXNDO0FBQ3RDLDJFQUFrRDtBQUNsRCx3REFBOEQ7QUFDOUQsc0NBQTJDO0FBQzNDLDBEQUFrQztBQUVsQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLHNDQUFzQztDQUNoRCxDQUFDLENBQUM7QUFFSCxNQUFxQiw2QkFBOEIsU0FBUSxrQkFBUTtJQUlqRSxZQUFZLElBQVksRUFBRSxNQUEyQztRQUNuRSxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXBCLE1BQU0sTUFBTSxHQUFHLGFBQUcsQ0FBQyxNQUFNLENBQUM7WUFDeEIsR0FBRyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7aUJBQ2QsR0FBRyxDQUFDO2dCQUNILE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQzthQUNuQixDQUFDO2lCQUNELFFBQVEsRUFBRTtZQUNiLFFBQVEsRUFBRSxhQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ2pDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTFDLHVCQUF1QjtRQUN2QixJQUFJLEtBQUssRUFBRTtZQUNULE1BQU0sS0FBSyxDQUFDO1NBQ2I7UUFFRCxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDdkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO1FBQ2hDLElBQUks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
+//# sourceMappingURL=ShadowsocksrSubscribeProvider.js.map

package/build/provider/ShadowsocksrSubscribeProvider.js.map

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

package/build/provider/SsdProvider.d.ts

@@ -1,19 +1,16 @@
 import { ShadowsocksNodeConfig, SsdProviderConfig, SubscriptionUserinfo } from '../types';
 import Provider from './Provider';
+import { GetNodeListFunction, GetSubscriptionUserInfoFunction } from './types';
 export default class SsdProvider extends Provider {
-    readonly _url: string;
+    #private;
     readonly udpRelay?: boolean;
     constructor(name: string, config: SsdProviderConfig);
     get url(): string;
-    getSubscriptionUserInfo({ requestUserAgent, }?: {
-        requestUserAgent?: string;
-    }): Promise<SubscriptionUserinfo | undefined>;
-    getNodeList({ requestUserAgent, }?: {
-        requestUserAgent?: string;
-    }): Promise<ReadonlyArray<ShadowsocksNodeConfig>>;
+    getSubscriptionUserInfo: GetSubscriptionUserInfoFunction;
+    getNodeList: GetNodeListFunction;
 }
 export declare const getSsdSubscription: (url: string, udpRelay?: boolean, requestUserAgent?: string) => Promise<{
-    readonly nodeList: ReadonlyArray<ShadowsocksNodeConfig>;
+    readonly nodeList: Array<ShadowsocksNodeConfig>;
     readonly subscriptionUserinfo?: SubscriptionUserinfo | undefined;
 }>;
 export declare const parseSsdConfig: (globalConfig: SsdSubscription, server: SsdServer, udpRelay?: boolean) => ShadowsocksNodeConfig | undefined;