surgio 2.18.3 → 2.19.0-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/build/command/check.js +7 -11
  3. package/build/command/clean-cache.d.ts +1 -1
  4. package/build/command/clean-cache.js +10 -2
  5. package/build/command/doctor.js +6 -14
  6. package/build/command/generate.js +10 -12
  7. package/build/command/lint.js +1 -1
  8. package/build/command/new.js +4 -12
  9. package/build/command/subscriptions.js +5 -10
  10. package/build/command/upload.js +9 -13
  11. package/build/constant/constant.d.ts +4 -0
  12. package/build/constant/constant.js +6 -2
  13. package/build/generator/template.d.ts +1 -1
  14. package/build/index.d.ts +7 -1
  15. package/build/index.js +12 -13
  16. package/build/misc/flag_cn.d.ts +3 -1
  17. package/build/misc/flag_cn.js +7 -5
  18. package/build/provider/ClashProvider.d.ts +1 -1
  19. package/build/provider/Provider.js +47 -24
  20. package/build/provider/ShadowsocksJsonSubscribeProvider.d.ts +1 -1
  21. package/build/provider/ShadowsocksSubscribeProvider.d.ts +1 -1
  22. package/build/provider/ShadowsocksrSubscribeProvider.d.ts +1 -1
  23. package/build/provider/SsdProvider.d.ts +2 -2
  24. package/build/redis.d.ts +9 -0
  25. package/build/redis.js +61 -0
  26. package/build/types.d.ts +8 -1
  27. package/build/utils/cache.d.ts +13 -1
  28. package/build/utils/cache.js +41 -3
  29. package/build/utils/clash.d.ts +2 -2
  30. package/build/utils/command.d.ts +2 -0
  31. package/build/utils/command.js +23 -0
  32. package/build/utils/config.d.ts +3 -1
  33. package/build/utils/config.js +41 -3
  34. package/build/utils/filter.d.ts +4 -4
  35. package/build/utils/http-client.d.ts +1 -1
  36. package/build/utils/index.d.ts +8 -5
  37. package/build/utils/index.js +22 -5
  38. package/build/utils/linter.d.ts +1 -1
  39. package/build/utils/loon.d.ts +1 -1
  40. package/build/utils/patch-proxy.js +2 -7
  41. package/build/utils/quantumult.d.ts +2 -2
  42. package/build/utils/remote-snippet.d.ts +1 -1
  43. package/build/utils/remote-snippet.js +8 -5
  44. package/build/utils/ss.js +13 -15
  45. package/build/utils/ssr.js +4 -7
  46. package/build/utils/surge.d.ts +1 -1
  47. package/build/utils/tmp-helper.d.ts +21 -7
  48. package/build/utils/tmp-helper.js +47 -16
  49. package/build/utils/trojan.js +4 -7
  50. package/build/utils/v2ray.d.ts +1 -1
  51. package/build/utils/v2ray.js +6 -8
  52. package/package.json +10 -20
@@ -44,11 +44,13 @@ exports.default = {
44
44
  '🇫🇮': ['FINLAND', '芬兰', '赫尔辛基'],
45
45
  '🇫🇷': ['FR', 'FRANCE', '法国', '法國', '巴黎'],
46
46
  '🇬🇧': ['UK', 'ENGLAND', 'UNITED KINGDOM', '英', '伦敦'],
47
+ '🇺🇦': ['UKRAINE', '乌克兰', '基辅'],
47
48
  '🇭🇺': ['HUNGARY', '匈牙利'],
48
49
  '🇭🇰': ['HK', '港', 'HONGKONG', 'HONG KONG', 'HGC', 'WTT', 'CMI'],
50
+ '🇮🇳': ['INDIA', '印度', '孟买', 'MUMBAI'],
49
51
  '🇮🇩': ['INDONESIA', '印尼', '印度尼西亚', '雅加达'],
50
52
  '🇮🇪': ['IRELAND', '爱尔兰', '都柏林'],
51
- '🇮🇳': ['INDIA', '印度', '孟买', 'MUMBAI'],
53
+ '🇮🇱': ['ISRAEL', '以色列'],
52
54
  '🇮🇹': ['ITALY', 'NACHASH', '意大利', '米兰', '義大利'],
53
55
  '🇰🇵': ['朝鲜'],
54
56
  '🇰🇷': ['KR', 'KOREA', 'KOR', '首尔', '韩', '韓'],
@@ -72,7 +74,7 @@ exports.default = {
72
74
  '京俄',
73
75
  '杭俄',
74
76
  ],
75
- '🇸🇦': ['SAUDI', '沙特', '迪拜'],
77
+ '🇸🇦': ['SAUDI', '沙特'],
76
78
  '🇸🇪': ['SWEDEN', '瑞典'],
77
79
  '🇸🇬': [
78
80
  'SG',
@@ -117,8 +119,8 @@ exports.default = {
117
119
  ],
118
120
  '🇻🇳': ['VIETNAM', '越南', '胡志明'],
119
121
  '🇿🇦': ['SOUTH AFRICA', '南非'],
120
- '🇦🇪': ['UNITED ARAB EMIRATES', '阿联酋'],
121
- '🇯🇵': ['JP', 'JAPAN', '日', '东京', '大阪', '埼玉'],
122
+ '🇦🇪': ['UNITED ARAB EMIRATES', '阿联酋', '迪拜'],
123
+ '🇯🇵': ['JP', 'JAPAN', '日', '东京', '大阪', '埼玉', 'NTT', 'KDDI'],
122
124
  '🇳🇴': ['NORWAY', '挪威'],
123
125
  '🇨🇳': [
124
126
  ...exports.TAIWAN,
@@ -140,4 +142,4 @@ exports.default = {
140
142
  'BACK',
141
143
  ],
142
144
  };
143
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmxhZ19jbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9taXNjL2ZsYWdfY24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUF1QjtBQUN2Qix5Q0FBeUM7QUFDekMsdUdBQXVHOzs7QUFFMUYsUUFBQSxNQUFNLEdBQTBCO0lBQzNDLElBQUk7SUFDSixRQUFRO0lBQ1IsSUFBSTtJQUNKLEdBQUc7SUFDSCxHQUFHO0lBQ0gsSUFBSTtJQUNKLElBQUk7SUFDSixLQUFLO0lBQ0wsT0FBTztDQUNSLENBQUM7QUFFRixrQkFBZTtJQUNiLFFBQVEsRUFBRSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxRQUFRLENBQUM7SUFDbkQsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUN0QixNQUFNLEVBQUUsQ0FBQyxXQUFXLEVBQUUsS0FBSyxDQUFDO0lBQzVCLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxLQUFLLEVBQUUsS0FBSyxDQUFDO0lBQ2pDLE1BQU0sRUFBRSxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsUUFBUSxDQUFDO0lBQzFELE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUM7SUFDMUIsTUFBTSxFQUFFLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUM1QixNQUFNLEVBQUUsQ0FBQyxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQzVCLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDO0lBQy9CLE1BQU0sRUFBRTtRQUNOLFFBQVE7UUFDUixLQUFLO1FBQ0wsVUFBVTtRQUNWLE1BQU07UUFDTixLQUFLO1FBQ0wsSUFBSTtRQUNKLElBQUk7UUFDSixLQUFLO1FBQ0wsS0FBSztLQUNOO0lBQ0QsTUFBTSxFQUFFLENBQUMsYUFBYSxFQUFFLElBQUksRUFBRSxLQUFL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
145
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmxhZ19jbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9taXNjL2ZsYWdfY24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUF1QjtBQUN2Qix5Q0FBeUM7QUFDekMsdUdBQXVHOzs7QUFFMUYsUUFBQSxNQUFNLEdBQTBCO0lBQzNDLElBQUk7SUFDSixRQUFRO0lBQ1IsSUFBSTtJQUNKLEdBQUc7SUFDSCxHQUFHO0lBQ0gsSUFBSTtJQUNKLElBQUk7SUFDSixLQUFLO0lBQ0wsT0FBTztDQUNSLENBQUM7QUFFRixrQkFBZTtJQUNiLFFBQVEsRUFBRSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxRQUFRLENBQUM7SUFDbkQsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUN0QixNQUFNLEVBQUUsQ0FBQyxXQUFXLEVBQUUsS0FBSyxDQUFDO0lBQzVCLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxLQUFLLEVBQUUsS0FBSyxDQUFDO0lBQ2pDLE1BQU0sRUFBRSxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsUUFBUSxDQUFDO0lBQzFELE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUM7SUFDMUIsTUFBTSxFQUFFLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUM1QixNQUFNLEVBQUUsQ0FBQyxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQzVCLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDO0lBQy9CLE1BQU0sRUFBRTtRQUNOLFFBQVE7UUFDUixLQUFLO1FBQ0wsVUFBVTtRQUNWLE1BQU07UUFDTixLQUFLO1FBQ0wsSUFBSTtRQUNKLElBQUk7UUFDSixLQUFLO1FBQ0wsS0FBSztLQUNOO0lBQ0QsTUFBTSxFQUFFLENBQUMsYUFBYSxFQUFFLElBQUksRUFBRSxLQUFL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
@@ -23,5 +23,5 @@ export declare const getClashSubscription: ({ url, udpRelay, tls13, requestUserA
23
23
  readonly nodeList: ReadonlyArray<SupportConfigTypes>;
24
24
  readonly subscriptionUserinfo?: SubscriptionUserinfo;
25
25
  }>;
26
- export declare const parseClashConfig: (proxyList: ReadonlyArray<any>, udpRelay?: boolean | undefined, tls13?: boolean | undefined) => ReadonlyArray<SupportConfigTypes>;
26
+ export declare const parseClashConfig: (proxyList: ReadonlyArray<any>, udpRelay?: boolean, tls13?: boolean) => ReadonlyArray<SupportConfigTypes>;
27
27
  export {};
@@ -28,8 +28,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  const logger_1 = require("@surgio/logger");
30
30
  const joi_1 = __importDefault(require("joi"));
31
+ const constant_1 = require("../constant");
31
32
  const types_1 = require("../types");
32
33
  const cache_1 = require("../utils/cache");
34
+ const config_1 = require("../utils/config");
35
+ const env_flag_1 = require("../utils/env-flag");
33
36
  const http_client_1 = __importStar(require("../utils/http-client"));
34
37
  const subscription_1 = require("../utils/subscription");
35
38
  const utils_1 = require("../utils");
@@ -93,29 +96,49 @@ class Provider {
93
96
  });
94
97
  }
95
98
  static async requestCacheableResource(url, options = {}) {
96
- const cacheKey = `${(0, utils_1.toBase64)((0, http_client_1.getUserAgent)(options.requestUserAgent || ''))}:${url}`;
97
- return cache_1.SubscriptionCache.has(cacheKey)
98
- ? cache_1.SubscriptionCache.get(cacheKey)
99
- : await (async () => {
100
- const headers = {};
101
- if (options.requestUserAgent) {
102
- headers['user-agent'] = (0, http_client_1.getUserAgent)(options.requestUserAgent);
103
- }
104
- const res = await http_client_1.default.get(url, {
105
- responseType: 'text',
106
- headers,
107
- });
108
- const subsciptionCacheItem = {
109
- body: res.body,
110
- };
111
- if (res.headers['subscription-userinfo']) {
112
- subsciptionCacheItem.subscriptionUserinfo =
113
- (0, subscription_1.parseSubscriptionUserInfo)(res.headers['subscription-userinfo']);
114
- logger.debug('%s received subscription userinfo - raw: %s | parsed: %j', url, res.headers['subscription-userinfo'], subsciptionCacheItem.subscriptionUserinfo);
115
- }
116
- cache_1.SubscriptionCache.set(cacheKey, subsciptionCacheItem);
117
- return subsciptionCacheItem;
118
- })();
99
+ var _a, _b;
100
+ 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';
101
+ const cacheKey = `${constant_1.CACHE_KEYS.Provider}:${(0, utils_1.toMD5)((0, http_client_1.getUserAgent)(options.requestUserAgent || '') + url)}`;
102
+ const requestResource = async () => {
103
+ const headers = {};
104
+ if (options.requestUserAgent) {
105
+ headers['user-agent'] = (0, http_client_1.getUserAgent)(options.requestUserAgent);
106
+ }
107
+ const res = await http_client_1.default.get(url, {
108
+ responseType: 'text',
109
+ headers,
110
+ });
111
+ const subsciptionCacheItem = {
112
+ body: res.body,
113
+ };
114
+ if (res.headers['subscription-userinfo']) {
115
+ subsciptionCacheItem.subscriptionUserinfo = (0, subscription_1.parseSubscriptionUserInfo)(res.headers['subscription-userinfo']);
116
+ logger.debug('%s received subscription userinfo - raw: %s | parsed: %j', url, res.headers['subscription-userinfo'], subsciptionCacheItem.subscriptionUserinfo);
117
+ }
118
+ return subsciptionCacheItem;
119
+ };
120
+ if (cacheType === 'default') {
121
+ return cache_1.SubscriptionCache.has(cacheKey)
122
+ ? cache_1.SubscriptionCache.get(cacheKey)
123
+ : await (async () => {
124
+ const subsciptionCacheItem = await requestResource();
125
+ cache_1.SubscriptionCache.set(cacheKey, subsciptionCacheItem);
126
+ return subsciptionCacheItem;
127
+ })();
128
+ }
129
+ else {
130
+ const redisCache = new cache_1.RedisCache();
131
+ const cachedValue = await redisCache.getCache(cacheKey);
132
+ return cachedValue
133
+ ? cachedValue
134
+ : await (async () => {
135
+ const subsciptionCacheItem = await requestResource();
136
+ await redisCache.setCache(cacheKey, subsciptionCacheItem, {
137
+ ttl: (0, utils_1.msToSeconds)((0, env_flag_1.getProviderCacheMaxage)()),
138
+ });
139
+ return subsciptionCacheItem;
140
+ })();
141
+ }
119
142
  }
120
143
  get nextPort() {
121
144
  if (this.startPort) {
@@ -133,4 +156,4 @@ class Provider {
133
156
  }
134
157
  }
135
158
  exports.default = Provider;
136
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDJDQUE4QztBQUM5Qyw4Q0FBc0I7QUFFdEIsb0NBS2tCO0FBQ2xCLDBDQUF5RTtBQUN6RSxvRUFBZ0U7QUFDaEUsd0RBQWtFO0FBQ2xFLG9DQUFvQztBQUVwQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLGlCQUFpQjtDQUMzQixDQUFDLENBQUM7QUFFSCxNQUFxQixRQUFRO0lBa0IzQixZQUFtQixJQUFZLEVBQUUsTUFBc0I7UUFBcEMsU0FBSSxHQUFKLElBQUksQ0FBUTtRQUM3QixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLElBQUksRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNmLEtBQUssQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQVMsMkJBQW1CLENBQUMsQ0FBQztpQkFDcEQsUUFBUSxFQUFFO1lBQ2IsVUFBVSxFQUFFLGFBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQ3pCLGFBQUcsQ0FBQyxRQUFRLEVBQUUsRUFDZCxhQUFHLENBQUMsTUFBTSxDQUFDO2dCQUNULE1BQU0sRUFBRSxhQUFHLENBQUMsUUFBUSxFQUFFO2dCQUN0QixXQUFXLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTthQUNwQyxDQUFDLENBQ0g7WUFDRCxhQUFhLEVBQUUsYUFBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FDNUIsYUFBRyxDQUFDLFFBQVEsRUFBRSxFQUNkLGFBQUcsQ0FBQyxNQUFNLENBQUM7Z0JBQ1QsTUFBTSxFQUFFLGFBQUcsQ0FBQyxRQUFRLEVBQUU7Z0JBQ3RCLFdBQVcsRUFBRSxhQUFHLENBQUMsT0FBTyxF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
159
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDJDQUE4QztBQUM5Qyw4Q0FBc0I7QUFFdEIsMENBQXlDO0FBQ3pDLG9DQUtrQjtBQUNsQiwwQ0FJd0I7QUFDeEIsNENBQTRDO0FBQzVDLGdEQUEyRDtBQUMzRCxvRUFBZ0U7QUFDaEUsd0RBQWtFO0FBQ2xFLG9DQUE4QztBQUU5QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUM7SUFDMUIsT0FBTyxFQUFFLGlCQUFpQjtDQUMzQixDQUFDLENBQUM7QUFFSCxNQUFxQixRQUFRO0lBa0IzQixZQUFtQixJQUFZLEVBQUUsTUFBc0I7UUFBcEMsU0FBSSxHQUFKLElBQUksQ0FBUTtRQUM3QixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLElBQUksRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNmLEtBQUssQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQVMsMkJBQW1CLENBQUMsQ0FBQztpQkFDcEQsUUFBUSxFQUFFO1lBQ2IsVUFBVSxFQUFFLGFBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxLQUFLLENBQ3pCLGFBQUcsQ0FBQyxRQUFRLEVBQUUsRUFDZCxhQUFHLENBQUMsTUFBTSxDQUFDO2dCQUNULE1BQU0sRUFBRSxhQUFHLENBQUMsUUFBUSxFQUFFO2dCQUN0QixXQUFXLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTthQUNwQyxDQUFDLENBQ0g7WUFDRCxhQUFhLEVBQUUsYUFBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FDNUIsYUFBRyxDQUFDLFFBQVEsRUFBRSxFQUNkLGFBQUcsQ0FBQyxNQUFNLENBQUM7Z0JBQ1QsTUFBTSxFQUFFLGFBQUcsQ0FBQyxRQUFR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
@@ -9,4 +9,4 @@ export default class ShadowsocksJsonSubscribeProvider extends Provider {
9
9
  requestUserAgent?: string;
10
10
  }): ReturnType<typeof getShadowsocksJSONConfig>;
11
11
  }
12
- export declare const getShadowsocksJSONConfig: (url: string, udpRelay?: boolean | undefined, requestUserAgent?: string | undefined) => Promise<ReadonlyArray<ShadowsocksNodeConfig>>;
12
+ export declare const getShadowsocksJSONConfig: (url: string, udpRelay?: boolean, requestUserAgent?: string) => Promise<ReadonlyArray<ShadowsocksNodeConfig>>;
@@ -15,7 +15,7 @@ export default class ShadowsocksSubscribeProvider extends Provider {
15
15
  /**
16
16
  * @see https://shadowsocks.org/en/spec/SIP002-URI-Scheme.html
17
17
  */
18
- export declare const getShadowsocksSubscription: (url: string, udpRelay?: boolean | undefined, requestUserAgent?: string | undefined) => Promise<{
18
+ export declare const getShadowsocksSubscription: (url: string, udpRelay?: boolean, requestUserAgent?: string) => Promise<{
19
19
  readonly nodeList: ReadonlyArray<ShadowsocksNodeConfig>;
20
20
  readonly subscriptionUserinfo?: SubscriptionUserinfo | undefined;
21
21
  }>;
@@ -12,7 +12,7 @@ export default class ShadowsocksrSubscribeProvider extends Provider {
12
12
  requestUserAgent?: string;
13
13
  }): Promise<ReadonlyArray<ShadowsocksrNodeConfig>>;
14
14
  }
15
- export declare const getShadowsocksrSubscription: (url: string, udpRelay?: boolean | undefined, requestUserAgent?: string | undefined) => Promise<{
15
+ export declare const getShadowsocksrSubscription: (url: string, udpRelay?: boolean, requestUserAgent?: string) => Promise<{
16
16
  readonly nodeList: ReadonlyArray<ShadowsocksrNodeConfig>;
17
17
  readonly subscriptionUserinfo?: SubscriptionUserinfo | undefined;
18
18
  }>;
@@ -12,11 +12,11 @@ export default class SsdProvider extends Provider {
12
12
  requestUserAgent?: string;
13
13
  }): Promise<ReadonlyArray<ShadowsocksNodeConfig>>;
14
14
  }
15
- export declare const getSsdSubscription: (url: string, udpRelay?: boolean | undefined, requestUserAgent?: string | undefined) => Promise<{
15
+ export declare const getSsdSubscription: (url: string, udpRelay?: boolean, requestUserAgent?: string) => Promise<{
16
16
  readonly nodeList: ReadonlyArray<ShadowsocksNodeConfig>;
17
17
  readonly subscriptionUserinfo?: SubscriptionUserinfo | undefined;
18
18
  }>;
19
- export declare const parseSsdConfig: (globalConfig: SsdSubscription, server: SsdServer, udpRelay?: boolean | undefined) => ShadowsocksNodeConfig | undefined;
19
+ export declare const parseSsdConfig: (globalConfig: SsdSubscription, server: SsdServer, udpRelay?: boolean) => ShadowsocksNodeConfig | undefined;
20
20
  export interface SsdSubscription {
21
21
  airport: string;
22
22
  port: number;
@@ -0,0 +1,9 @@
1
+ import Redis from 'ioredis';
2
+ declare const redis: {
3
+ hasRedis: () => boolean;
4
+ createRedis(_redisURL: string, customRedis?: any): Redis;
5
+ getRedis(): Redis;
6
+ destroyRedis(): Promise<void>;
7
+ cleanCache(): Promise<void>;
8
+ };
9
+ export default redis;
package/build/redis.js ADDED
@@ -0,0 +1,61 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ const logger_1 = require("@surgio/logger");
7
+ const ioredis_1 = __importDefault(require("ioredis"));
8
+ const constant_1 = require("./constant");
9
+ const logger = (0, logger_1.createLogger)({ service: 'surgio:redis' });
10
+ const prepareRedis = () => {
11
+ let client = null;
12
+ let redisURL = null;
13
+ return {
14
+ hasRedis: () => !!client,
15
+ createRedis(_redisURL, customRedis) {
16
+ if (client && redisURL) {
17
+ logger.debug('Redis client already created with URL: %s', redisURL);
18
+ return client;
19
+ }
20
+ redisURL = _redisURL;
21
+ if (customRedis) {
22
+ client = new customRedis(_redisURL);
23
+ }
24
+ else {
25
+ client = new ioredis_1.default(_redisURL);
26
+ }
27
+ return client;
28
+ },
29
+ getRedis() {
30
+ if (!client) {
31
+ throw new Error('Redis client is not initialized');
32
+ }
33
+ return client;
34
+ },
35
+ async destroyRedis() {
36
+ if (client) {
37
+ await client.quit();
38
+ client = null;
39
+ redisURL = null;
40
+ }
41
+ },
42
+ async cleanCache() {
43
+ if (!client) {
44
+ return;
45
+ }
46
+ const keysToRemove = await Promise.all(Object.keys(constant_1.CACHE_KEYS).map((key) => {
47
+ if (!client)
48
+ return;
49
+ return client.keys(`${constant_1.CACHE_KEYS[key]}:*`);
50
+ }));
51
+ await Promise.all(keysToRemove.map((keys) => {
52
+ if (!client || !keys || !keys.length)
53
+ return;
54
+ return client.del(keys);
55
+ }));
56
+ },
57
+ };
58
+ };
59
+ const redis = prepareRedis();
60
+ exports.default = redis;
61
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9saWIvcmVkaXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSwyQ0FBOEM7QUFDOUMsc0RBQTRCO0FBRTVCLHlDQUF3QztBQUV4QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FBQztBQUV6RCxNQUFNLFlBQVksR0FBRyxHQUFHLEVBQUU7SUFDeEIsSUFBSSxNQUFNLEdBQWlCLElBQUksQ0FBQztJQUNoQyxJQUFJLFFBQVEsR0FBa0IsSUFBSSxDQUFDO0lBRW5DLE9BQU87UUFDTCxRQUFRLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU07UUFDeEIsV0FBVyxDQUFDLFNBQWlCLEVBQUUsV0FBaUI7WUFDOUMsSUFBSSxNQUFNLElBQUksUUFBUSxFQUFFO2dCQUN0QixNQUFNLENBQUMsS0FBSyxDQUFDLDJDQUEyQyxFQUFFLFFBQVEsQ0FBQyxDQUFDO2dCQUNwRSxPQUFPLE1BQU0sQ0FBQzthQUNmO1lBQ0QsUUFBUSxHQUFHLFNBQVMsQ0FBQztZQUVyQixJQUFJLFdBQVcsRUFBRTtnQkFDZixNQUFNLEdBQUcsSUFBSSxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUM7YUFDckM7aUJBQU07Z0JBQ0wsTUFBTSxHQUFHLElBQUksaUJBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQzthQUMvQjtZQUVELE9BQU8sTUFBZSxDQUFDO1FBQ3pCLENBQUM7UUFDRCxRQUFRO1lBQ04sSUFBSSxDQUFDLE1BQU0sRUFBRTtnQkFDWCxNQUFNLElBQUksS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUM7YUFDcEQ7WUFDRCxPQUFPLE1BQU0sQ0FBQztRQUNoQixDQUFDO1FBQ0QsS0FBSyxDQUFDLFlBQVk7WUFDaEIsSUFBSSxNQUFNLEVBQUU7Z0JBQ1YsTUFBTSxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ3BCLE1BQU0sR0FBRyxJQUFJLENBQUM7Z0JBQ2QsUUFBUSxHQUFHLElBQUksQ0FBQzthQUNqQjtRQUNILENBQUM7UUFDRCxLQUFLLENBQUMsVUFBVTtZQUNkLElBQUksQ0FBQyxNQUFNLEVBQUU7Z0JBQ1gsT0FBTzthQUNSO1lBRUQsTUFBTSxZQUFZLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUNwQyxNQUFNLENBQUMsSUFBSSxDQUFDLHFCQUFVLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtnQkFDbEMsSUFBSSxDQUFDLE1BQU07b0JBQUUsT0FBTztnQkFFcEIsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcscUJBQVUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDN0MsQ0FBQyxDQUFDLENBQ0gsQ0FBQztZQUVGLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FDZixZQUFZLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7Z0JBQ3hCLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTTtvQkFBRSxPQUFPO2dCQUM3QyxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDMUIsQ0FBQyxDQUFDLENBQ0gsQ0FBQztRQUNKLENBQUM7S0FDRixDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBQ0YsTUFBTSxLQUFLLEdBQUcsWUFBWSxFQUFFLENBQUM7QUFFN0Isa0JBQWUsS0FBSyxDQUFDIn0=
package/build/types.d.ts CHANGED
@@ -21,11 +21,11 @@ export declare enum SupportProviderEnum {
21
21
  Trojan = "trojan"
22
22
  }
23
23
  export interface CommandConfig {
24
+ publicUrl: string;
24
25
  readonly output: string;
25
26
  readonly artifacts: ReadonlyArray<ArtifactConfig>;
26
27
  readonly remoteSnippets?: ReadonlyArray<RemoteSnippetConfig>;
27
28
  readonly urlBase: string;
28
- publicUrl: string;
29
29
  readonly providerDir: string;
30
30
  readonly templateDir: string;
31
31
  readonly configDir: string;
@@ -71,6 +71,10 @@ export interface CommandConfig {
71
71
  readonly [name: string]: NodeNameFilterType | SortedNodeNameFilterType;
72
72
  };
73
73
  readonly customParams?: PlainObjectOf<string | boolean | number>;
74
+ readonly cache?: {
75
+ readonly type?: 'redis' | 'default';
76
+ readonly redisUrl?: string;
77
+ };
74
78
  }
75
79
  export interface RemoteSnippetConfig {
76
80
  readonly url: string;
@@ -109,6 +113,9 @@ export interface ProviderConfig {
109
113
  readonly renameNode?: (name: string) => string;
110
114
  readonly relayUrl?: boolean | string;
111
115
  readonly requestUserAgent?: string;
116
+ readonly cache?: {
117
+ readonly type?: 'redis' | 'default';
118
+ };
112
119
  }
113
120
  export interface BlackSSLProviderConfig extends ProviderConfig {
114
121
  readonly username: string;
@@ -6,4 +6,16 @@ export interface SubsciptionCacheItem {
6
6
  }
7
7
  export declare const ConfigCache: NodeCache;
8
8
  export declare const SubscriptionCache: NodeCache;
9
- export declare const cleanCaches: () => void;
9
+ export declare class RedisCache {
10
+ namespace?: string | undefined;
11
+ private redisClient;
12
+ constructor(namespace?: string | undefined);
13
+ getCacheKey(key: string): string;
14
+ setCache: (key: string, value: unknown, { ttl }?: {
15
+ ttl?: number | undefined;
16
+ }) => Promise<void>;
17
+ getCache: <T>(key: string) => Promise<T | undefined>;
18
+ hasCache: (key: string) => Promise<boolean>;
19
+ deleteCache: (key: string) => Promise<void>;
20
+ }
21
+ export declare const cleanCaches: () => Promise<void>;
@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.cleanCaches = exports.SubscriptionCache = exports.ConfigCache = void 0;
6
+ exports.cleanCaches = exports.RedisCache = exports.SubscriptionCache = exports.ConfigCache = void 0;
7
7
  const node_cache_1 = __importDefault(require("node-cache"));
8
8
  const env_flag_1 = require("./env-flag");
9
9
  const index_1 = require("./index");
10
+ const redis_1 = __importDefault(require("../redis"));
10
11
  exports.ConfigCache = new node_cache_1.default({
11
12
  stdTTL: (0, index_1.msToSeconds)((0, env_flag_1.getProviderCacheMaxage)()),
12
13
  maxKeys: 300,
@@ -17,9 +18,46 @@ exports.SubscriptionCache = new node_cache_1.default({
17
18
  maxKeys: 300,
18
19
  useClones: false,
19
20
  });
20
- const cleanCaches = () => {
21
+ class RedisCache {
22
+ constructor(namespace) {
23
+ this.namespace = namespace;
24
+ this.setCache = async (key, value, { ttl } = {}) => {
25
+ const storeValue = JSON.stringify(value);
26
+ if (typeof ttl === 'undefined') {
27
+ await this.redisClient.set(this.getCacheKey(key), storeValue);
28
+ }
29
+ else {
30
+ await this.redisClient.set(this.getCacheKey(key), storeValue, 'EX', ttl);
31
+ }
32
+ };
33
+ this.getCache = async (key) => {
34
+ const value = await this.redisClient.get(this.getCacheKey(key));
35
+ if (!value) {
36
+ return undefined;
37
+ }
38
+ return JSON.parse(value);
39
+ };
40
+ this.hasCache = async (key) => {
41
+ const value = await this.redisClient.exists(this.getCacheKey(key));
42
+ return !!value;
43
+ };
44
+ this.deleteCache = async (key) => {
45
+ await this.redisClient.del(this.getCacheKey(key));
46
+ };
47
+ this.redisClient = redis_1.default.getRedis();
48
+ }
49
+ getCacheKey(key) {
50
+ return this.namespace ? `${this.namespace}:${key}` : key;
51
+ }
52
+ }
53
+ exports.RedisCache = RedisCache;
54
+ // istanbul ignore next
55
+ const cleanCaches = async () => {
21
56
  exports.ConfigCache.flushAll();
22
57
  exports.SubscriptionCache.flushAll();
58
+ if (redis_1.default.hasRedis()) {
59
+ await redis_1.default.cleanCache();
60
+ }
23
61
  };
24
62
  exports.cleanCaches = cleanCaches;
25
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNERBQW1DO0FBR25DLHlDQUFvRDtBQUNwRCxtQ0FBc0M7QUFPekIsUUFBQSxXQUFXLEdBQUcsSUFBSSxvQkFBUyxDQUFDO0lBQ3ZDLE1BQU0sRUFBRSxJQUFBLG1CQUFXLEVBQUMsSUFBQSxpQ0FBc0IsR0FBRSxDQUFDO0lBQzdDLE9BQU8sRUFBRSxHQUFHO0lBQ1osU0FBUyxFQUFFLEtBQUs7Q0FDakIsQ0FBQyxDQUFDO0FBRVUsUUFBQSxpQkFBaUIsR0FBRyxJQUFJLG9CQUFTLENBQUM7SUFDN0MsTUFBTSxFQUFFLElBQUEsbUJBQVcsRUFBQyxJQUFBLGlDQUFzQixHQUFFLENBQUM7SUFDN0MsT0FBTyxFQUFFLEdBQUc7SUFDWixTQUFTLEVBQUUsS0FBSztDQUNqQixDQUFDLENBQUM7QUFFSSxNQUFNLFdBQVcsR0FBRyxHQUFHLEVBQUU7SUFDOUIsbUJBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUN2Qix5QkFBaUIsQ0FBQyxRQUFRLEVBQUUsQ0FBQztBQUMvQixDQUFDLENBQUM7QUFIVyxRQUFBLFdBQVcsZUFHdEIifQ==
63
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EsNERBQW1DO0FBR25DLHlDQUFvRDtBQUNwRCxtQ0FBc0M7QUFDdEMscURBQTZCO0FBT2hCLFFBQUEsV0FBVyxHQUFHLElBQUksb0JBQVMsQ0FBQztJQUN2QyxNQUFNLEVBQUUsSUFBQSxtQkFBVyxFQUFDLElBQUEsaUNBQXNCLEdBQUUsQ0FBQztJQUM3QyxPQUFPLEVBQUUsR0FBRztJQUNaLFNBQVMsRUFBRSxLQUFLO0NBQ2pCLENBQUMsQ0FBQztBQUVVLFFBQUEsaUJBQWlCLEdBQUcsSUFBSSxvQkFBUyxDQUFDO0lBQzdDLE1BQU0sRUFBRSxJQUFBLG1CQUFXLEVBQUMsSUFBQSxpQ0FBc0IsR0FBRSxDQUFDO0lBQzdDLE9BQU8sRUFBRSxHQUFHO0lBQ1osU0FBUyxFQUFFLEtBQUs7Q0FDakIsQ0FBQyxDQUFDO0FBRUgsTUFBYSxVQUFVO0lBR3JCLFlBQW1CLFNBQWtCO1FBQWxCLGNBQVMsR0FBVCxTQUFTLENBQVM7UUFRckMsYUFBUSxHQUFHLEtBQUssRUFDZCxHQUFXLEVBQ1gsS0FBYyxFQUNkLEVBQUUsR0FBRyxLQUF1QixFQUFFLEVBQzlCLEVBQUU7WUFDRixNQUFNLFVBQVUsR0FBVyxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBRWpELElBQUksT0FBTyxHQUFHLEtBQUssV0FBVyxFQUFFO2dCQUM5QixNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLEVBQUUsVUFBVSxDQUFDLENBQUM7YUFDL0Q7aUJBQU07Z0JBQ0wsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7YUFDMUU7UUFDSCxDQUFDLENBQUM7UUFFRixhQUFRLEdBQUcsS0FBSyxFQUFLLEdBQVcsRUFBMEIsRUFBRTtZQUMxRCxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztZQUVoRSxJQUFJLENBQUMsS0FBSyxFQUFFO2dCQUNWLE9BQU8sU0FBUyxDQUFDO2FBQ2xCO1lBRUQsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBTSxDQUFDO1FBQ2hDLENBQUMsQ0FBQztRQUVGLGFBQVEsR0FBRyxLQUFLLEVBQUUsR0FBVyxFQUFvQixFQUFFO1lBQ2pELE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBRW5FLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQztRQUNqQixDQUFDLENBQUM7UUFFRixnQkFBVyxHQUFHLEtBQUssRUFBRSxHQUFXLEVBQUUsRUFBRTtZQUNsQyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNwRCxDQUFDLENBQUM7UUF2Q0EsSUFBSSxDQUFDLFdBQVcsR0FBRyxlQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDdEMsQ0FBQztJQUVELFdBQVcsQ0FBQyxHQUFXO1FBQ3JCLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsU0FBUyxJQUFJLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7SUFDM0QsQ0FBQztDQW1DRjtBQTVDRCxnQ0E0Q0M7QUFFRCx1QkFBdUI7QUFDaEIsTUFBTSxXQUFXLEdBQUcsS0FBSyxJQUFJLEVBQUU7SUFDcEMsbUJBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUN2Qix5QkFBaUIsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUU3QixJQUFJLGVBQUssQ0FBQyxRQUFRLEVBQUUsRUFBRTtRQUNwQixNQUFNLGVBQUssQ0FBQyxVQUFVLEVBQUUsQ0FBQztLQUMxQjtBQUNILENBQUMsQ0FBQztBQVBXLFFBQUEsV0FBVyxlQU90QiJ9
@@ -1,3 +1,3 @@
1
1
  import { NodeFilterType, NodeNameFilterType, PossibleNodeConfigType, SimpleNodeConfig, SortedNodeNameFilterType } from '../types';
2
- export declare const getClashNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: SortedNodeNameFilterType | NodeFilterType | undefined) => ReadonlyArray<any>;
3
- export declare const getClashNodeNames: (list: ReadonlyArray<SimpleNodeConfig>, filter?: SortedNodeNameFilterType | NodeNameFilterType | undefined, existingProxies?: readonly string[] | undefined) => ReadonlyArray<string>;
2
+ export declare const getClashNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeNameFilterType) => ReadonlyArray<any>;
3
+ export declare const getClashNodeNames: (list: ReadonlyArray<SimpleNodeConfig>, filter?: NodeNameFilterType | SortedNodeNameFilterType, existingProxies?: ReadonlyArray<string>) => ReadonlyArray<string>;
@@ -0,0 +1,2 @@
1
+ import CommonBin from 'common-bin';
2
+ export declare const defineGlobalOptions: (yargs: CommonBin['yargs']) => void;
@@ -0,0 +1,23 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.defineGlobalOptions = void 0;
4
+ const defineGlobalOptions = (yargs) => {
5
+ yargs.options({
6
+ c: {
7
+ alias: 'config',
8
+ default: './surgio.conf.js',
9
+ description: '配置文件',
10
+ },
11
+ V: {
12
+ alias: 'verbose',
13
+ demandOption: false,
14
+ describe: '打印调试日志',
15
+ type: 'boolean',
16
+ },
17
+ });
18
+ yargs.group(['help', 'version', 'config', 'verbose'], 'Global Options:');
19
+ // 禁用 yargs 内部生成的 help 信息,似乎和 common-bin 的 load 有冲突
20
+ yargs.help(false);
21
+ };
22
+ exports.defineGlobalOptions = defineGlobalOptions;
23
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi91dGlscy9jb21tYW5kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVPLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxLQUF5QixFQUFRLEVBQUU7SUFDckUsS0FBSyxDQUFDLE9BQU8sQ0FBQztRQUNaLENBQUMsRUFBRTtZQUNELEtBQUssRUFBRSxRQUFRO1lBQ2YsT0FBTyxFQUFFLGtCQUFrQjtZQUMzQixXQUFXLEVBQUUsTUFBTTtTQUNwQjtRQUNELENBQUMsRUFBRTtZQUNELEtBQUssRUFBRSxTQUFTO1lBQ2hCLFlBQVksRUFBRSxLQUFLO1lBQ25CLFFBQVEsRUFBRSxRQUFRO1lBQ2xCLElBQUksRUFBRSxTQUFTO1NBQ2hCO0tBQ0YsQ0FBQyxDQUFDO0lBRUgsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLE1BQU0sRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLFNBQVMsQ0FBQyxFQUFFLGlCQUFpQixDQUFDLENBQUM7SUFFekUsbURBQW1EO0lBQ25ELEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDcEIsQ0FBQyxDQUFDO0FBbkJXLFFBQUEsbUJBQW1CLHVCQW1COUIifQ==
@@ -1,4 +1,6 @@
1
1
  import { CommandConfig } from '../types';
2
- export declare const loadConfig: (cwd: string, configPath: string, override?: Partial<CommandConfig> | undefined) => CommandConfig;
2
+ export declare const loadConfig: (cwd: string, configPath: string, override?: Partial<CommandConfig>) => CommandConfig;
3
+ export declare const getConfig: () => CommandConfig;
4
+ export declare const setConfig: <T extends keyof CommandConfig>(key: T, value: CommandConfig[T]) => CommandConfig;
3
5
  export declare const normalizeConfig: (cwd: string, userConfig: Partial<CommandConfig>) => CommandConfig;
4
6
  export declare const validateConfig: (userConfig: Partial<CommandConfig>) => void;
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.validateConfig = exports.normalizeConfig = exports.loadConfig = void 0;
6
+ exports.validateConfig = exports.normalizeConfig = exports.setConfig = exports.getConfig = exports.loadConfig = void 0;
7
7
  const joi_1 = __importDefault(require("joi"));
8
8
  const fs_extra_1 = __importDefault(require("fs-extra"));
9
9
  const lodash_1 = __importDefault(require("lodash"));
@@ -11,12 +11,14 @@ const path_1 = __importDefault(require("path"));
11
11
  const url_1 = require("url");
12
12
  const util_1 = require("util");
13
13
  const deprecation_1 = require("../misc/deprecation");
14
+ const redis_1 = __importDefault(require("../redis"));
14
15
  const constant_1 = require("../constant");
15
16
  const flag_1 = require("./flag");
16
17
  const index_1 = require("./index");
17
18
  const showDEP005 = (0, util_1.deprecate)(lodash_1.default.noop, deprecation_1.DEP005, 'DEP005');
18
19
  const showDEP006 = (0, util_1.deprecate)(lodash_1.default.noop, deprecation_1.DEP006, 'DEP006');
19
20
  const showDEP008 = (0, util_1.deprecate)(lodash_1.default.noop, deprecation_1.DEP008, 'DEP008');
21
+ let finalConfig = null;
20
22
  const loadConfig = (cwd, configPath, override) => {
21
23
  const absPath = path_1.default.resolve(cwd, configPath);
22
24
  if (!fs_extra_1.default.existsSync(absPath)) {
@@ -44,9 +46,30 @@ const loadConfig = (cwd, configPath, override) => {
44
46
  if (override) {
45
47
  return Object.assign(Object.assign({}, (0, exports.normalizeConfig)(cwd, userConfig)), override);
46
48
  }
47
- return (0, exports.normalizeConfig)(cwd, userConfig);
49
+ finalConfig = (0, exports.normalizeConfig)(cwd, userConfig);
50
+ return finalConfig;
48
51
  };
49
52
  exports.loadConfig = loadConfig;
53
+ const getConfig = () => {
54
+ if (!finalConfig) {
55
+ throw new Error('请先调用 loadConfig 方法');
56
+ }
57
+ return finalConfig;
58
+ };
59
+ exports.getConfig = getConfig;
60
+ const setConfig = (key, value) => {
61
+ if (!finalConfig) {
62
+ throw new Error('请先调用 loadConfig 方法');
63
+ }
64
+ if (lodash_1.default.isPlainObject(value)) {
65
+ finalConfig[key] = Object.assign(Object.assign({}, finalConfig[key]), value);
66
+ }
67
+ else {
68
+ finalConfig[key] = value;
69
+ }
70
+ return finalConfig;
71
+ };
72
+ exports.setConfig = setConfig;
50
73
  const normalizeConfig = (cwd, userConfig) => {
51
74
  var _a, _b, _c;
52
75
  const defaultConfig = {
@@ -71,6 +94,9 @@ const normalizeConfig = (cwd, userConfig) => {
71
94
  proxyTestUrl: constant_1.PROXY_TEST_URL,
72
95
  proxyTestInterval: constant_1.PROXY_TEST_INTERVAL,
73
96
  checkHostname: false,
97
+ cache: {
98
+ type: 'default',
99
+ },
74
100
  };
75
101
  const config = lodash_1.default.defaultsDeep(userConfig, defaultConfig);
76
102
  // istanbul ignore next
@@ -103,6 +129,12 @@ const normalizeConfig = (cwd, userConfig) => {
103
129
  if (((_c = config.clashConfig) === null || _c === void 0 ? void 0 : _c.ssrFormat) === 'legacy') {
104
130
  showDEP008();
105
131
  }
132
+ if (config.cache && config.cache.type === 'redis') {
133
+ if (!config.cache.redisUrl) {
134
+ throw new Error('缓存配置错误,请检查 cache.redisUrl 配置');
135
+ }
136
+ redis_1.default.createRedis(config.cache.redisUrl);
137
+ }
106
138
  return config;
107
139
  };
108
140
  exports.normalizeConfig = normalizeConfig;
@@ -177,6 +209,12 @@ const validateConfig = (userConfig) => {
177
209
  supportSort: joi_1.default.boolean().strict(),
178
210
  }))),
179
211
  customParams: joi_1.default.object(),
212
+ cache: joi_1.default.object({
213
+ type: joi_1.default.string().valid('redis', 'default'),
214
+ redisUrl: joi_1.default.string().uri({
215
+ scheme: [/rediss?/],
216
+ }),
217
+ }),
180
218
  }).unknown();
181
219
  const { error } = schema.validate(userConfig);
182
220
  // istanbul ignore next
@@ -185,4 +223,4 @@ const validateConfig = (userConfig) => {
185
223
  }
186
224
  };
187
225
  exports.validateConfig = validateConfig;
188
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/utils/config.ts"],"names":[],"mappings":"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"}
226
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/utils/config.ts"],"names":[],"mappings":"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"}
@@ -12,10 +12,10 @@ export declare class SortFilterWithSortedKeywords implements SortedNodeNameFilte
12
12
  filter<T>(nodeList: ReadonlyArray<T & SimpleNodeConfig>): ReadonlyArray<T & SimpleNodeConfig>;
13
13
  }
14
14
  export declare const validateFilter: (filter: any) => boolean;
15
- export declare const applyFilter: <T extends SimpleNodeConfig>(nodeList: readonly T[], filter?: SortedNodeNameFilterType | NodeNameFilterType | undefined) => readonly T[];
16
- export declare const mergeFilters: (filters: ReadonlyArray<NodeNameFilterType>, isStrict?: boolean | undefined) => NodeNameFilterType;
17
- export declare const useKeywords: (keywords: ReadonlyArray<string>, isStrict?: boolean | undefined) => NodeNameFilterType;
18
- export declare const discardKeywords: (keywords: ReadonlyArray<string>, isStrict?: boolean | undefined) => NodeNameFilterType;
15
+ export declare const applyFilter: <T extends SimpleNodeConfig>(nodeList: readonly T[], filter?: NodeNameFilterType | SortedNodeNameFilterType) => readonly T[];
16
+ export declare const mergeFilters: (filters: ReadonlyArray<NodeNameFilterType>, isStrict?: boolean) => NodeNameFilterType;
17
+ export declare const useKeywords: (keywords: ReadonlyArray<string>, isStrict?: boolean) => NodeNameFilterType;
18
+ export declare const discardKeywords: (keywords: ReadonlyArray<string>, isStrict?: boolean) => NodeNameFilterType;
19
19
  export declare const useRegexp: (regexp: RegExp) => NodeNameFilterType;
20
20
  export declare const useProviders: (keywords: ReadonlyArray<string>, isStrict?: boolean) => NodeNameFilterType;
21
21
  export declare const discardProviders: (keywords: ReadonlyArray<string>, isStrict?: boolean) => NodeNameFilterType;
@@ -1,3 +1,3 @@
1
- export declare const getUserAgent: (str?: string | undefined) => string;
1
+ export declare const getUserAgent: (str?: string) => string;
2
2
  declare const httpClient: import("got").Got;
3
3
  export default httpClient;