surgio 3.0.0-alpha.4 → 3.0.0-alpha.6

package/bin/dev

@@ -2,9 +2,16 @@
 
 const oclif = require('@oclif/core');
 const path = require('path');
+const dotenv = require('dotenv');
+const fs = require('fs-extra');
 
+const envPath = path.resolve(process.cwd(), './.env')
 const project = path.join(__dirname, '..', 'tsconfig.json');
 
+if (fs.existsSync(envPath)) {
+  dotenv.config({ path: envPath })
+}
+
 // In dev mode -> use ts-node and dev plugins
 process.env.NODE_ENV = 'development';
 

package/bin/run

@@ -1,6 +1,15 @@
 #!/usr/bin/env node
 
 const oclif = require('@oclif/core');
+const dotenv = require('dotenv');
+const { resolve } = require('path');
+const fs = require('fs-extra');
+
+const envPath = resolve(process.cwd(), './.env')
+
+if (fs.existsSync(envPath)) {
+  dotenv.config({ path: envPath })
+}
 
 oclif
   .run()

package/build/base-command.js

@@ -8,8 +8,6 @@ const core_1 = require("@oclif/core");
 const logger_1 = require("@surgio/logger");
 const ora_1 = __importDefault(require("ora"));
 const path_1 = require("path");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const dotenv_1 = __importDefault(require("dotenv"));
 const config_1 = require("./config");
 const error_helper_1 = require("./utils/error-helper");
 class BaseCommand extends core_1.Command {
@@ -40,11 +38,6 @@ class BaseCommand extends core_1.Command {
         if (flags.project.startsWith('.')) {
             flags.project = (0, path_1.resolve)(process.cwd(), flags.project);
         }
-        const envPath = (0, path_1.resolve)(flags.project, './.env');
-        // istanbul ignore next
-        if (fs_extra_1.default.existsSync(envPath)) {
-            dotenv_1.default.config({ path: envPath });
-        }
         this.projectDir = flags.project;
         this.surgioConfig = await (0, config_1.loadConfig)(this.projectDir);
     }

package/build/base-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../src/base-command.ts"],"names":[],"mappings":";;;;;AAAA,uCAAoC;AACpC,sCAAgE;AAChE,2CAA2C;AAC3C,8CAAqB;AACrB,+BAA8B;AAC9B,wDAAyB;AACzB,oDAA2B;AAG3B,qCAAqC;AACrC,uDAAmD;AAOnD,MAAe,WAAsC,SAAQ,cAAO;IACxD,KAAK,CAAW;IAChB,IAAI,CAAU;IACd,YAAY,CAAgB;IAC/B,GAAG,GAAG,IAAA,aAAG,EAAC;QACf,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAA;IACK,UAAU,CAAS;IAE1B,YAAY,IAAc,EAAE,MAAc;QACxC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACrB,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YACvC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YACtB,SAAS,EAAG,KAAK,CAAC,IAA2B,CAAC,SAAS;YACvD,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACpB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;SACzB,CAAC,CAAA;QAEF,IAAI,CAAC,KAAK,GAAG,KAAiB,CAAA;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAe,CAAA;QAE3B,uBAAuB;QACvB,IAAI,KAAK,CAAC,OAAO,EAAE;YACjB,mBAAU,CAAC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAA;SACnC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACjC,KAAK,CAAC,OAAO,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;SACtD;QAED,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAEhD,uBAAuB;QACvB,IAAI,kBAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YAC1B,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;SACjC;QAED,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,OAAO,CAAA;QAC/B,IAAI,CAAC,YAAY,GAAG,MAAM,IAAA,mBAAU,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACvD,CAAC;IAES,KAAK,CAAC,KAAK,CAAC,GAAkC;QACtD,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE;YACvB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;SAChB;QACD,MAAM,2BAAY,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAClC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAA;IAC9B,CAAC;CACF;AAED,WAAW,CAAC,cAAc,GAAG,IAAI,CAAA;AACjC,WAAW,CAAC,SAAS,GAAG;IACtB,OAAO,EAAE,YAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,QAAQ;KACpB,CAAC;IACF,OAAO,EAAE,YAAK,CAAC,OAAO,CAAC;QACrB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ;QACrB,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,QAAQ;KACpB,CAAC;CACH,CAAA;AAED,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../src/base-command.ts"],"names":[],"mappings":";;;;;AAAA,uCAAoC;AACpC,sCAAgE;AAChE,2CAA2C;AAC3C,8CAAqB;AACrB,+BAA8B;AAG9B,qCAAqC;AACrC,uDAAmD;AAOnD,MAAe,WAAsC,SAAQ,cAAO;IACxD,KAAK,CAAW;IAChB,IAAI,CAAU;IACd,YAAY,CAAgB;IAC/B,GAAG,GAAG,IAAA,aAAG,EAAC;QACf,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAA;IACK,UAAU,CAAS;IAE1B,YAAY,IAAc,EAAE,MAAc;QACxC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACrB,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YACvC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YACtB,SAAS,EAAG,KAAK,CAAC,IAA2B,CAAC,SAAS;YACvD,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACpB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;SACzB,CAAC,CAAA;QAEF,IAAI,CAAC,KAAK,GAAG,KAAiB,CAAA;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAe,CAAA;QAE3B,uBAAuB;QACvB,IAAI,KAAK,CAAC,OAAO,EAAE;YACjB,mBAAU,CAAC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAA;SACnC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACjC,KAAK,CAAC,OAAO,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;SACtD;QAED,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,OAAO,CAAA;QAC/B,IAAI,CAAC,YAAY,GAAG,MAAM,IAAA,mBAAU,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACvD,CAAC;IAES,KAAK,CAAC,KAAK,CAAC,GAAkC;QACtD,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE;YACvB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;SAChB;QACD,MAAM,2BAAY,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAClC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAA;IAC9B,CAAC;CACF;AAED,WAAW,CAAC,cAAc,GAAG,IAAI,CAAA;AACjC,WAAW,CAAC,SAAS,GAAG;IACtB,OAAO,EAAE,YAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,QAAQ;KACpB,CAAC;IACF,OAAO,EAAE,YAAK,CAAC,OAAO,CAAC;QACrB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ;QACrB,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,QAAQ;KACpB,CAAC;CACH,CAAA;AAED,kBAAe,WAAW,CAAA"}

package/build/index.d.ts

@@ -1,6 +1,8 @@
 import * as filter from './utils/filter';
 export type { CommandConfigBeforeNormalize as SurgioConfig } from './types';
 export * from './configurables';
+export { default as httpClient } from './utils/http-client';
+export { unifiedCache as cache } from './utils/cache';
 export declare const utils: {
     readonly isHeroku: () => boolean;
     readonly isNow: () => boolean;

package/build/index.js

@@ -25,12 +25,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.categories = exports.utils = void 0;
+exports.categories = exports.utils = exports.cache = exports.httpClient = void 0;
 const utils_1 = require("./utils");
 const filter = __importStar(require("./utils/filter"));
 const constant_1 = require("./constant");
 __exportStar(require("./configurables"), exports);
+var http_client_1 = require("./utils/http-client");
+Object.defineProperty(exports, "httpClient", { enumerable: true, get: function () { return __importDefault(http_client_1).default; } });
+var cache_1 = require("./utils/cache");
+Object.defineProperty(exports, "cache", { enumerable: true, get: function () { return cache_1.unifiedCache; } });
 exports.utils = {
     ...filter,
     isHeroku: utils_1.isHeroku,

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAWgB;AAChB,uDAAwC;AACxC,yCAAuC;AAGvC,kDAA+B;AAElB,QAAA,KAAK,GAAG;IACnB,GAAG,MAAM;IACT,QAAQ,EAAR,gBAAQ;IACR,KAAK,EAAL,aAAK;IACL,QAAQ,EAAR,gBAAQ;IACR,eAAe,EAAf,uBAAe;IACf,UAAU,EAAV,kBAAU;IACV,SAAS,EAAT,iBAAS;IACT,SAAS,EAAT,iBAAS;IACT,KAAK,EAAL,aAAK;IACL,OAAO,EAAP,eAAO;IACP,WAAW,EAAX,mBAAW;CACH,CAAA;AAEG,QAAA,UAAU,GAAG,qBAAU,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAWgB;AAChB,uDAAwC;AACxC,yCAAuC;AAGvC,kDAA+B;AAC/B,mDAA2D;AAAlD,0HAAA,OAAO,OAAc;AAC9B,uCAAqD;AAA5C,8FAAA,YAAY,OAAS;AAEjB,QAAA,KAAK,GAAG;IACnB,GAAG,MAAM;IACT,QAAQ,EAAR,gBAAQ;IACR,KAAK,EAAL,aAAK;IACL,QAAQ,EAAR,gBAAQ;IACR,eAAe,EAAf,uBAAe;IACf,UAAU,EAAV,kBAAU;IACV,SAAS,EAAT,iBAAS;IACT,SAAS,EAAT,iBAAS;IACT,KAAK,EAAL,aAAK;IACL,OAAO,EAAP,eAAO;IACP,WAAW,EAAX,mBAAW;CACH,CAAA;AAEG,QAAA,UAAU,GAAG,qBAAU,CAAA"}

package/build/provider/BlackSSLProvider.js

@@ -9,6 +9,7 @@ const assert_1 = __importDefault(require("assert"));
 const types_1 = require("../types");
 const utils_1 = require("../utils");
 const cache_1 = require("../utils/cache");
+const env_flag_1 = require("../utils/env-flag");
 const http_client_1 = __importDefault(require("../utils/http-client"));
 const Provider_1 = __importDefault(require("./Provider"));
 class BlackSSLProvider extends Provider_1.default {
@@ -54,8 +55,9 @@ class BlackSSLProvider extends Provider_1.default {
         (0, assert_1.default)(username, '未指定 BlackSSL username.');
         (0, assert_1.default)(password, '未指定 BlackSSL password.');
         const key = `blackssl_${username}`;
-        const response = cache_1.ConfigCache.has(key)
-            ? JSON.parse(cache_1.ConfigCache.get(key))
+        const cachedConfig = await cache_1.unifiedCache.get(key);
+        const response = cachedConfig
+            ? JSON.parse(cachedConfig)
             : await (async () => {
                 const res = await http_client_1.default.get('https://api.darkssl.com/v1/service/ssl_info', {
                     searchParams: {
@@ -66,7 +68,7 @@ class BlackSSLProvider extends Provider_1.default {
                         'user-agent': 'GoAgentX/774 CFNetwork/901.1 Darwin/17.6.0 (x86_64)',
                     },
                 });
-                cache_1.ConfigCache.set(key, res.body);
+                await cache_1.unifiedCache.set(key, res.body, (0, env_flag_1.getProviderCacheMaxage)());
                 return JSON.parse(res.body);
             })();
         return {

package/build/provider/BlackSSLProvider.js.map

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

package/build/provider/Provider.d.ts

@@ -1,5 +1,4 @@
-import { ProviderConfig, SupportProviderEnum } from '../types';
-import { SubsciptionCacheItem } from '../utils/cache';
+import { ProviderConfig, SubsciptionCacheItem, SupportProviderEnum } from '../types';
 import { GetNodeListFunction, GetSubscriptionUserInfoFunction } from './types';
 export default abstract class Provider {
     name: string;

package/build/provider/Provider.js

@@ -59,7 +59,6 @@ class Provider {
             (0, config_1.getConfig)()?.gateway?.passRequestUserAgent ?? false;
     }
     static async requestCacheableResource(url, options = {}) {
-        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 = {};
@@ -79,28 +78,14 @@ class Provider {
             }
             return subsciptionCacheItem;
         };
-        if (cacheType === 'default') {
-            return cache_1.SubscriptionCache.has(cacheKey)
-                ? cache_1.SubscriptionCache.get(cacheKey)
-                : await (async () => {
-                    const subsciptionCacheItem = await requestResource();
-                    cache_1.SubscriptionCache.set(cacheKey, subsciptionCacheItem);
-                    return subsciptionCacheItem;
-                })();
-        }
-        else {
-            const redisCache = new cache_1.RedisCache();
-            const cachedValue = await redisCache.getCache(cacheKey);
-            return cachedValue
-                ? cachedValue
-                : await (async () => {
-                    const subsciptionCacheItem = await requestResource();
-                    await redisCache.setCache(cacheKey, subsciptionCacheItem, {
-                        ttl: (0, utils_1.msToSeconds)((0, env_flag_1.getProviderCacheMaxage)()),
-                    });
-                    return subsciptionCacheItem;
-                })();
-        }
+        const cachedValue = await cache_1.unifiedCache.get(cacheKey);
+        return cachedValue
+            ? cachedValue
+            : await (async () => {
+                const subsciptionCacheItem = await requestResource();
+                await cache_1.unifiedCache.set(cacheKey, subsciptionCacheItem, (0, env_flag_1.getProviderCacheMaxage)());
+                return subsciptionCacheItem;
+            })();
     }
     determineRequestUserAgent(requestUserAgent) {
         return this.passGatewayRequestUserAgent

package/build/provider/Provider.js.map

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

package/build/types.d.ts

@@ -116,6 +116,10 @@ export interface SubscriptionUserinfo {
     readonly total: number;
     readonly expire: number;
 }
+export interface SubsciptionCacheItem {
+    readonly body: string;
+    subscriptionUserinfo?: SubscriptionUserinfo;
+}
 export type NodeFilterType = z.infer<typeof NodeFilterTypeValidator>;
 export type SortedNodeFilterType = z.infer<typeof SortedNodeFilterTypeValidator>;
 export type PossibleNodeConfigType = HttpsNodeConfig | HttpNodeConfig | ShadowsocksNodeConfig | ShadowsocksrNodeConfig | SnellNodeConfig | VmessNodeConfig | TrojanNodeConfig | Socks5NodeConfig | TuicNodeConfig | WireguardNodeConfig;

package/build/utils/cache.d.ts

@@ -1,21 +1,23 @@
-import NodeCache from 'node-cache';
-import { SubscriptionUserinfo } from '../types';
-export interface SubsciptionCacheItem {
-    readonly body: string;
-    subscriptionUserinfo?: SubscriptionUserinfo;
-}
-export declare const ConfigCache: NodeCache;
-export declare const SubscriptionCache: NodeCache;
-export declare class RedisCache {
-    namespace?: string | undefined;
-    private redisClient;
-    constructor(namespace?: string | undefined);
-    getCacheKey(key: string): string;
-    setCache: (key: string, value: unknown, { ttl }?: {
-        ttl?: number | undefined;
-    }) => Promise<void>;
-    getCache: <T>(key: string) => Promise<T | undefined>;
-    hasCache: (key: string) => Promise<boolean>;
-    deleteCache: (key: string) => Promise<void>;
+import { MemoryCache, MemoryStore } from 'cache-manager';
+import { RedisCache, RedisStore } from 'cache-manager-ioredis-yet';
+type CacheType = MemoryCache | RedisCache;
+type StoreType = MemoryStore | RedisStore;
+export declare class UnifiedCache {
+    #private;
+    prepare(): Promise<CacheType>;
+    getType(): Promise<"redis" | "default">;
+    getBackend(): Promise<CacheType>;
+    get: CacheType['get'];
+    set: CacheType['set'];
+    del: CacheType['del'];
+    reset: CacheType['reset'];
+    wrap: CacheType['wrap'];
+    keys: StoreType['keys'];
+    mset: StoreType['mset'];
+    mget: StoreType['mget'];
+    mdel: StoreType['mdel'];
+    has(key: string): Promise<boolean>;
 }
+export declare const unifiedCache: UnifiedCache;
 export declare const cleanCaches: () => Promise<void>;
+export {};

package/build/utils/cache.js

@@ -3,63 +3,96 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanCaches = exports.RedisCache = exports.SubscriptionCache = exports.ConfigCache = void 0;
-const node_cache_1 = __importDefault(require("node-cache"));
-const env_flag_1 = require("./env-flag");
+exports.cleanCaches = exports.unifiedCache = exports.UnifiedCache = void 0;
+const ms_1 = __importDefault(require("ms"));
+const cache_manager_1 = require("cache-manager");
+const cache_manager_ioredis_yet_1 = require("cache-manager-ioredis-yet");
+const config_1 = require("../config");
 const redis_1 = __importDefault(require("../redis"));
-const time_1 = require("./time");
-exports.ConfigCache = new node_cache_1.default({
-    stdTTL: (0, time_1.msToSeconds)((0, env_flag_1.getProviderCacheMaxage)()),
-    maxKeys: 300,
-    useClones: false,
-});
-exports.SubscriptionCache = new node_cache_1.default({
-    stdTTL: (0, time_1.msToSeconds)((0, env_flag_1.getProviderCacheMaxage)()),
-    maxKeys: 300,
-    useClones: false,
-});
-class RedisCache {
-    namespace;
-    redisClient;
-    constructor(namespace) {
-        this.namespace = namespace;
-        this.redisClient = redis_1.default.getRedis();
-    }
-    getCacheKey(key) {
-        return this.namespace ? `${this.namespace}:${key}` : key;
-    }
-    setCache = async (key, value, { ttl } = {}) => {
-        const storeValue = JSON.stringify(value);
-        if (typeof ttl === 'undefined') {
-            await this.redisClient.set(this.getCacheKey(key), storeValue);
+class UnifiedCache {
+    #type;
+    #backend;
+    async prepare() {
+        if (!this.#type) {
+            this.#type = (0, config_1.getConfig)()?.cache?.type || 'default';
+        }
+        if (this.#backend) {
+            return this.#backend;
         }
         else {
-            await this.redisClient.set(this.getCacheKey(key), storeValue, 'EX', ttl);
+            switch (this.#type) {
+                case 'redis':
+                    this.#backend = (0, cache_manager_1.caching)((0, cache_manager_ioredis_yet_1.redisInsStore)(redis_1.default.getRedis()));
+                    break;
+                default:
+                    this.#backend = (0, cache_manager_1.caching)('memory', {
+                        ttl: (0, ms_1.default)('1d'),
+                    });
+            }
+            return this.#backend;
         }
+    }
+    async getType() {
+        await this.prepare();
+        return this.#type;
+    }
+    async getBackend() {
+        return this.prepare();
+    }
+    get = async (...args) => {
+        const cache = await this.prepare();
+        return cache.get(...args);
     };
-    getCache = async (key) => {
-        const value = await this.redisClient.get(this.getCacheKey(key));
-        if (!value) {
-            return undefined;
-        }
-        return JSON.parse(value);
+    set = async (...args) => {
+        const cache = await this.prepare();
+        return cache.set(...args);
+    };
+    del = async (...args) => {
+        const cache = await this.prepare();
+        return cache.del(...args);
+    };
+    reset = async (...args) => {
+        const cache = await this.prepare();
+        return cache.reset(...args);
     };
-    hasCache = async (key) => {
-        const value = await this.redisClient.exists(this.getCacheKey(key));
-        return !!value;
+    wrap = async (...args) => {
+        const cache = await this.prepare();
+        return cache.wrap(...args);
     };
-    deleteCache = async (key) => {
-        await this.redisClient.del(this.getCacheKey(key));
+    keys = async (...args) => {
+        const cache = await this.prepare();
+        return cache.store.keys(...args);
     };
+    mset = async (...args) => {
+        const cache = await this.prepare();
+        return cache.store.mset(...args);
+    };
+    mget = async (...args) => {
+        const cache = await this.prepare();
+        return cache.store.mget(...args);
+    };
+    mdel = async (...args) => {
+        const cache = await this.prepare();
+        return cache.store.mdel(...args);
+    };
+    async has(key) {
+        await this.prepare();
+        if (this.#type === 'redis') {
+            const keys = await this.keys();
+            return keys.includes(key);
+        }
+        else {
+            const redisClient = redis_1.default.getRedis();
+            const value = await redisClient.exists(key);
+            return value === 1;
+        }
+    }
 }
-exports.RedisCache = RedisCache;
+exports.UnifiedCache = UnifiedCache;
+exports.unifiedCache = new UnifiedCache();
 // istanbul ignore next
 const cleanCaches = async () => {
-    exports.ConfigCache.flushAll();
-    exports.SubscriptionCache.flushAll();
-    if (redis_1.default.hasRedis()) {
-        await redis_1.default.cleanCache();
-    }
+    await exports.unifiedCache.reset();
 };
 exports.cleanCaches = cleanCaches;
 //# sourceMappingURL=cache.js.map

package/build/utils/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/utils/cache.ts"],"names":[],"mappings":";;;;;;AACA,4DAAkC;AAGlC,yCAAmD;AACnD,qDAA4B;AAC5B,iCAAoC;AAOvB,QAAA,WAAW,GAAG,IAAI,oBAAS,CAAC;IACvC,MAAM,EAAE,IAAA,kBAAW,EAAC,IAAA,iCAAsB,GAAE,CAAC;IAC7C,OAAO,EAAE,GAAG;IACZ,SAAS,EAAE,KAAK;CACjB,CAAC,CAAA;AAEW,QAAA,iBAAiB,GAAG,IAAI,oBAAS,CAAC;IAC7C,MAAM,EAAE,IAAA,kBAAW,EAAC,IAAA,iCAAsB,GAAE,CAAC;IAC7C,OAAO,EAAE,GAAG;IACZ,SAAS,EAAE,KAAK;CACjB,CAAC,CAAA;AAEF,MAAa,UAAU;IAGF;IAFX,WAAW,CAAO;IAE1B,YAAmB,SAAkB;QAAlB,cAAS,GAAT,SAAS,CAAS;QACnC,IAAI,CAAC,WAAW,GAAG,eAAK,CAAC,QAAQ,EAAE,CAAA;IACrC,CAAC;IAED,WAAW,CAAC,GAAW;QACrB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA;IAC1D,CAAC;IAED,QAAQ,GAAG,KAAK,EACd,GAAW,EACX,KAAc,EACd,EAAE,GAAG,KAAuB,EAAE,EAC9B,EAAE;QACF,MAAM,UAAU,GAAW,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAEhD,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE;YAC9B,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAA;SAC9D;aAAM;YACL,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;SACzE;IACH,CAAC,CAAA;IAED,QAAQ,GAAG,KAAK,EAAK,GAAW,EAA0B,EAAE;QAC1D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAA;QAE/D,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,SAAS,CAAA;SACjB;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAM,CAAA;IAC/B,CAAC,CAAA;IAED,QAAQ,GAAG,KAAK,EAAE,GAAW,EAAoB,EAAE;QACjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAA;QAElE,OAAO,CAAC,CAAC,KAAK,CAAA;IAChB,CAAC,CAAA;IAED,WAAW,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;QAClC,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAA;IACnD,CAAC,CAAA;CACF;AA5CD,gCA4CC;AAED,uBAAuB;AAChB,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;IACpC,mBAAW,CAAC,QAAQ,EAAE,CAAA;IACtB,yBAAiB,CAAC,QAAQ,EAAE,CAAA;IAE5B,IAAI,eAAK,CAAC,QAAQ,EAAE,EAAE;QACpB,MAAM,eAAK,CAAC,UAAU,EAAE,CAAA;KACzB;AACH,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/utils/cache.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,iDAAiE;AACjE,yEAIkC;AAClC,sCAAqC;AAErC,qDAA4B;AAK5B,MAAa,YAAY;IACvB,KAAK,CAAiC;IACtC,QAAQ,CAAgC;IAExC,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,IAAI,CAAC,KAAK,GAAG,IAAA,kBAAS,GAAE,EAAE,KAAK,EAAE,IAAI,IAAI,SAAS,CAAA;SACnD;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO,IAAI,CAAC,QAAQ,CAAA;SACrB;aAAM;YACL,QAAQ,IAAI,CAAC,KAAK,EAAE;gBAClB,KAAK,OAAO;oBACV,IAAI,CAAC,QAAQ,GAAG,IAAA,uBAAO,EAAC,IAAA,yCAAa,EAAC,eAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;oBACxD,MAAK;gBACP;oBACE,IAAI,CAAC,QAAQ,GAAG,IAAA,uBAAO,EAAC,QAAQ,EAAE;wBAChC,GAAG,EAAE,IAAA,YAAE,EAAC,IAAI,CAAC;qBACd,CAAC,CAAA;aACL;YACD,OAAO,IAAI,CAAC,QAAQ,CAAA;SACrB;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QACpB,OAAO,IAAI,CAAC,KAA4B,CAAA;IAC1C,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,OAAO,EAAE,CAAA;IACvB,CAAC;IAED,GAAG,GAAqB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QAClC,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;IAC3B,CAAC,CAAA;IAED,GAAG,GAAqB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QAClC,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;IAC3B,CAAC,CAAA;IAED,GAAG,GAAqB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QAClC,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;IAC3B,CAAC,CAAA;IAED,KAAK,GAAuB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QAC5C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QAClC,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;IAC7B,CAAC,CAAA;IAED,IAAI,GAAsB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QAClC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;IAC5B,CAAC,CAAA;IAED,IAAI,GAAsB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QAClC,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;IAClC,CAAC,CAAA;IAED,IAAI,GAAsB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QAClC,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;IAClC,CAAC,CAAA;IAED,IAAI,GAAsB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QAClC,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;IAClC,CAAC,CAAA;IAED,IAAI,GAAsB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QAClC,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;IAClC,CAAC,CAAA;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACnB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QAEpB,IAAI,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE;YAC1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;SAC1B;aAAM;YACL,MAAM,WAAW,GAAG,eAAK,CAAC,QAAQ,EAAE,CAAA;YACpC,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAC3C,OAAO,KAAK,KAAK,CAAC,CAAA;SACnB;IACH,CAAC;CACF;AA3FD,oCA2FC;AAEY,QAAA,YAAY,GAAG,IAAI,YAAY,EAAE,CAAA;AAE9C,uBAAuB;AAChB,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;IACpC,MAAM,oBAAY,CAAC,KAAK,EAAE,CAAA;AAC5B,CAAC,CAAA;AAFY,QAAA,WAAW,eAEvB"}

package/build/utils/clash.js

@@ -277,7 +277,7 @@ function nodeListMapper(nodeConfig) {
                 ...(nodeConfig.dnsServers ? { dns: nodeConfig.dnsServers } : null),
                 udp: true,
                 // Peer
-                server: nodeConfig.peers[0].endpoint,
+                server: (0, index_1.getHostnameFromHost)(nodeConfig.peers[0].endpoint),
                 port: (0, index_1.getPortFromHost)(nodeConfig.peers[0].endpoint),
                 'public-key': nodeConfig.peers[0].publicKey,
                 ...(nodeConfig.peers[0].presharedKey

package/build/utils/clash.js.map

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

package/build/utils/dns.js

@@ -7,15 +7,18 @@ exports.resolve4And6 = exports.resolveDomain = void 0;
 const dns_1 = require("dns");
 const logger_1 = require("@surgio/logger");
 const bluebird_1 = __importDefault(require("bluebird"));
-const node_cache_1 = __importDefault(require("node-cache"));
+const cache_manager_1 = require("cache-manager");
+const ms_1 = __importDefault(require("ms"));
 const env_flag_1 = require("./env-flag");
-const DomainCache = new node_cache_1.default({
-    useClones: false,
+const domainCache = (0, cache_manager_1.caching)('memory', {
+    ttl: (0, ms_1.default)('1d'),
+    max: 1000,
 });
 const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:dns' });
 const resolveDomain = async (domain, timeout = (0, env_flag_1.getNetworkResolveTimeout)()) => {
-    if (DomainCache.has(domain)) {
-        return DomainCache.get(domain);
+    const cached = await (await domainCache).get(domain);
+    if (cached) {
+        return cached;
     }
     logger.debug(`try to resolve domain ${domain}`);
     const now = Date.now();
@@ -26,7 +29,7 @@ const resolveDomain = async (domain, timeout = (0, env_flag_1.getNetworkResolveT
     logger.debug(`resolved domain ${domain}: ${JSON.stringify(records)} ${Date.now() - now}ms`);
     if (records.length) {
         const address = records.map((item) => item.address);
-        DomainCache.set(domain, address, records[0].ttl); // ttl is in seconds
+        await (await domainCache).set(domain, address, records[0].ttl); // ttl is in seconds
         return address;
     }
     // istanbul ignore next

package/build/utils/dns.js.map

@@ -1 +1 @@
-{"version":3,"file":"dns.js","sourceRoot":"","sources":["../../src/utils/dns.ts"],"names":[],"mappings":";;;;;;AAAA,6BAAoD;AACpD,2CAA6C;AAC7C,wDAA+B;AAC/B,4DAAkC;AAElC,yCAAqD;AAErD,MAAM,WAAW,GAAG,IAAI,oBAAS,CAAC;IAChC,SAAS,EAAE,KAAK;CACjB,CAAC,CAAA;AACF,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAA;AAErD,MAAM,aAAa,GAAG,KAAK,EAChC,MAAc,EACd,UAAkB,IAAA,mCAAwB,GAAE,EACZ,EAAE;IAClC,IAAI,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC3B,OAAO,WAAW,CAAC,GAAG,CAAC,MAAM,CAA0B,CAAA;KACxD;IAED,MAAM,CAAC,KAAK,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAA;IAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IACtB,MAAM,OAAO,GAAG,MAAM,kBAAQ,CAAC,IAAI,CAA+B;QAChE,IAAA,oBAAY,EAAC,MAAM,CAAC;QACpB,kBAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;KACvC,CAAC,CAAA;IACF,MAAM,CAAC,KAAK,CACV,mBAAmB,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IACnD,IAAI,CAAC,GAAG,EAAE,GAAG,GACf,IAAI,CACL,CAAA;IAED,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACnD,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA,CAAC,oBAAoB;QACrE,OAAO,OAAO,CAAA;KACf;IAED,uBAAuB;IACvB,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AA5BY,QAAA,aAAa,iBA4BzB;AAEM,MAAM,YAAY,GAAG,KAAK,EAC/B,MAAc,EACyB,EAAE;IACzC,uBAAuB;IACvB,SAAS,KAAK;QACZ,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrC,cAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;QAChD,cAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;KACjD,CAAC,CAAA;IAEF,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,CAAA;AAC3B,CAAC,CAAA;AAdY,QAAA,YAAY,gBAcxB"}
+{"version":3,"file":"dns.js","sourceRoot":"","sources":["../../src/utils/dns.ts"],"names":[],"mappings":";;;;;;AAAA,6BAAoD;AACpD,2CAA6C;AAC7C,wDAA+B;AAC/B,iDAAuC;AACvC,4CAAmB;AAEnB,yCAAqD;AAErD,MAAM,WAAW,GAAG,IAAA,uBAAO,EAAC,QAAQ,EAAE;IACpC,GAAG,EAAE,IAAA,YAAE,EAAC,IAAI,CAAC;IACb,GAAG,EAAE,IAAI;CACV,CAAC,CAAA;AACF,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAA;AAErD,MAAM,aAAa,GAAG,KAAK,EAChC,MAAc,EACd,UAAkB,IAAA,mCAAwB,GAAE,EACZ,EAAE;IAClC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,WAAW,CAAC,CAAC,GAAG,CAAW,MAAM,CAAC,CAAA;IAE9D,IAAI,MAAM,EAAE;QACV,OAAO,MAAM,CAAA;KACd;IAED,MAAM,CAAC,KAAK,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAA;IAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IACtB,MAAM,OAAO,GAAG,MAAM,kBAAQ,CAAC,IAAI,CAA+B;QAChE,IAAA,oBAAY,EAAC,MAAM,CAAC;QACpB,kBAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;KACvC,CAAC,CAAA;IACF,MAAM,CAAC,KAAK,CACV,mBAAmB,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IACnD,IAAI,CAAC,GAAG,EAAE,GAAG,GACf,IAAI,CACL,CAAA;IAED,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACnD,MAAM,CAAC,MAAM,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA,CAAC,oBAAoB;QACnF,OAAO,OAAO,CAAA;KACf;IAED,uBAAuB;IACvB,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AA9BY,QAAA,aAAa,iBA8BzB;AAEM,MAAM,YAAY,GAAG,KAAK,EAC/B,MAAc,EACyB,EAAE;IACzC,uBAAuB;IACvB,SAAS,KAAK;QACZ,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrC,cAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;QAChD,cAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;KACjD,CAAC,CAAA;IAEF,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,CAAA;AAC3B,CAAC,CAAA;AAdY,QAAA,YAAY,gBAcxB"}

package/build/utils/index.d.ts

@@ -28,6 +28,7 @@ export declare const getNodeNames: (list: ReadonlyArray<PossibleNodeConfigType>,
 export declare const changeCase: (str: string, format: 'camelCase' | 'snakeCase' | 'kebabCase') => string;
 export declare const pickAndFormatStringList: (obj: Record<string, any>, keyList: readonly string[], options?: {
     keyFormat?: 'camelCase' | 'snakeCase' | 'kebabCase';
+    stringifyValue?: boolean;
 }) => readonly string[];
 export declare const pickAndFormatKeys: (obj: Record<string, any>, keyList: readonly string[], options?: {
     keyFormat?: 'camelCase' | 'snakeCase' | 'kebabCase';
@@ -51,3 +52,4 @@ export declare const isGFWFree: () => boolean;
 export declare const assertNever: (x: never) => never;
 export declare const checkNotNullish: (val: unknown) => boolean;
 export declare const getPortFromHost: (host: string) => number;
+export declare const getHostnameFromHost: (host: string) => string;

package/build/utils/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPortFromHost = exports.checkNotNullish = exports.assertNever = exports.isGFWFree = exports.isFlyIO = exports.isAWS = exports.isAWSLambda = exports.isNetlify = exports.isRailway = exports.isGitLabCI = exports.isGitHubActions = exports.isHeroku = exports.isVercel = exports.isNow = exports.isIp = exports.lowercaseHeaderKeys = exports.formatV2rayConfig = exports.ensureConfigFolder = exports.decodeStringList = exports.pickAndFormatKeys = exports.pickAndFormatStringList = exports.changeCase = exports.getNodeNames = exports.getShadowsocksNodesJSON = exports.getV2rayNNodes = exports.getShadowsocksrNodes = exports.getShadowsocksNodes = exports.toMD5 = exports.fromBase64 = exports.toBase64 = exports.fromUrlSafeBase64 = exports.toUrlSafeBase64 = exports.getUrl = exports.getDownloadUrl = exports.httpClient = void 0;
+exports.getHostnameFromHost = exports.getPortFromHost = exports.checkNotNullish = exports.assertNever = exports.isGFWFree = exports.isFlyIO = exports.isAWS = exports.isAWSLambda = exports.isNetlify = exports.isRailway = exports.isGitLabCI = exports.isGitHubActions = exports.isHeroku = exports.isVercel = exports.isNow = exports.isIp = exports.lowercaseHeaderKeys = exports.formatV2rayConfig = exports.ensureConfigFolder = exports.decodeStringList = exports.pickAndFormatKeys = exports.pickAndFormatStringList = exports.changeCase = exports.getNodeNames = exports.getShadowsocksNodesJSON = exports.getV2rayNNodes = exports.getShadowsocksrNodes = exports.getShadowsocksNodes = exports.toMD5 = exports.fromBase64 = exports.toBase64 = exports.fromUrlSafeBase64 = exports.toUrlSafeBase64 = exports.getUrl = exports.getDownloadUrl = exports.httpClient = void 0;
 const logger_1 = require("@surgio/logger");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
@@ -281,17 +281,18 @@ const changeCase = (str, format) => {
 exports.changeCase = changeCase;
 const pickAndFormatStringList = (obj, keyList, options = {}) => {
     const result = [];
+    const { keyFormat, stringifyValue } = options;
     keyList.forEach((key) => {
         if (obj.hasOwnProperty(key)) {
-            const propertyKey = options.keyFormat
-                ? (0, exports.changeCase)(key, options.keyFormat)
-                : key;
+            const propertyKey = keyFormat ? (0, exports.changeCase)(key, keyFormat) : key;
             const propertyValue = obj[key];
             if (Array.isArray(propertyValue)) {
-                result.push(`${propertyKey}=${propertyValue.join(',')}`);
+                result.push(`${propertyKey}=${stringifyValue
+                    ? JSON.stringify(propertyValue.join(','))
+                    : propertyValue.join(',')}`);
             }
             else {
-                result.push(`${propertyKey}=${propertyValue}`);
+                result.push(`${propertyKey}=${stringifyValue ? JSON.stringify(propertyValue) : propertyValue}`);
             }
         }
     });
@@ -487,4 +488,12 @@ const getPortFromHost = (host) => {
     throw new Error(`Invalid host: ${host}`);
 };
 exports.getPortFromHost = getPortFromHost;
+const getHostnameFromHost = (host) => {
+    const match = host.match(/^(.*?):/);
+    if (match) {
+        return match[1];
+    }
+    throw new Error(`Invalid host: ${host}`);
+};
+exports.getHostnameFromHost = getHostnameFromHost;
 //# sourceMappingURL=index.js.map

package/build/utils/index.js.map

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

package/build/utils/remote-snippet.js

@@ -30,13 +30,13 @@ exports.loadRemoteSnippetList = exports.renderSurgioSnippet = exports.addProxyTo
 const bluebird_1 = __importDefault(require("bluebird"));
 const logger_1 = require("@surgio/logger");
 const detect_newline_1 = __importDefault(require("detect-newline"));
+const ms_1 = __importDefault(require("ms"));
 const nunjucks_1 = __importDefault(require("nunjucks"));
-const parser = __importStar(require("@typescript-eslint/parser"));
+const babelParser = __importStar(require("@babel/parser"));
 const constant_1 = require("../constant");
 const cache_1 = require("./cache");
 const env_flag_1 = require("./env-flag");
 const http_client_1 = __importDefault(require("./http-client"));
-const config_1 = require("../config");
 const index_1 = require("./index");
 const tmp_helper_1 = require("./tmp-helper");
 const parseMacro = (snippet) => {
@@ -45,9 +45,12 @@ const parseMacro = (snippet) => {
     if (!match) {
         throw new Error('该片段不包含可用的宏');
     }
-    const ast = parser.parse(match[1], { ecmaVersion: 6 });
+    const ast = babelParser.parse(match[1], {});
     let statement;
-    for (const node of ast.body) {
+    if (ast.errors.length) {
+        throw new Error('该片段不包含可用的宏');
+    }
+    for (const node of ast.program.body) {
         if (node.type === 'ExpressionStatement') {
             statement = node;
             break;
@@ -59,7 +62,14 @@ const parseMacro = (snippet) => {
         statement.expression.callee.name === 'main') {
         return {
             functionName: statement.expression.callee.name,
-            arguments: statement.expression.arguments.map((item) => item.name),
+            arguments: statement.expression.arguments.map((item) => {
+                if (item.type === 'Identifier') {
+                    return item.name;
+                }
+                else {
+                    throw new Error('该片段不包含可用的宏');
+                }
+            }),
         };
     }
     throw new Error('该片段不包含可用的宏');
@@ -118,9 +128,9 @@ const renderSurgioSnippet = (str, args) => {
     return nunjucks_1.default.renderString(template, {}).trim();
 };
 exports.renderSurgioSnippet = renderSurgioSnippet;
-const loadRemoteSnippetList = (remoteSnippetList, cacheSnippet = true) => {
-    const cacheType = (0, config_1.getConfig)()?.cache?.type || 'default';
-    const tmpFactory = (0, tmp_helper_1.createTmpFactory)(constant_1.CACHE_KEYS.RemoteSnippets, cacheType);
+const loadRemoteSnippetList = async (remoteSnippetList, cacheSnippet = true) => {
+    const cacheType = await cache_1.unifiedCache.getType();
+    const useLocalFile = cacheSnippet && cacheType === 'default';
     function load(url) {
         return http_client_1.default
             .get(url)
@@ -133,47 +143,52 @@ const loadRemoteSnippetList = (remoteSnippetList, cacheSnippet = true) => {
             throw err;
         });
     }
-    return bluebird_1.default.map(remoteSnippetList, (item) => {
+    return bluebird_1.default.map(remoteSnippetList, async (item) => {
         const fileMd5 = (0, index_1.toMD5)(item.url);
         const isSurgioSnippet = item.surgioSnippet;
-        return (async () => {
-            if (cacheSnippet) {
-                const tmp = tmpFactory(fileMd5, (0, env_flag_1.getRemoteSnippetCacheMaxage)());
-                const tmpContent = await tmp.getContent();
-                let snippet;
-                if (tmpContent) {
-                    snippet = tmpContent;
-                }
-                else {
-                    snippet = await load(item.url);
-                    await tmp.setContent(snippet);
-                }
-                return {
-                    main: (...args) => isSurgioSnippet
-                        ? (0, exports.renderSurgioSnippet)(snippet, args)
-                        : (0, exports.addProxyToSurgeRuleSet)(snippet, args[0]),
-                    name: item.name,
-                    url: item.url,
-                    text: snippet, // 原始内容
-                };
+        if (useLocalFile) {
+            const tmpFactory = (0, tmp_helper_1.createTmpFactory)(constant_1.CACHE_KEYS.RemoteSnippets, 'default');
+            const tmp = tmpFactory(fileMd5, (0, env_flag_1.getRemoteSnippetCacheMaxage)());
+            const tmpContent = await tmp.getContent();
+            let snippet;
+            if (tmpContent) {
+                snippet = tmpContent;
             }
             else {
-                const snippet = cache_1.ConfigCache.has(item.url)
-                    ? cache_1.ConfigCache.get(item.url)
-                    : await load(item.url).then((res) => {
-                        cache_1.ConfigCache.set(item.url, res, (0, env_flag_1.getRemoteSnippetCacheMaxage)());
-                        return res;
-                    });
-                return {
-                    main: (...args) => isSurgioSnippet
-                        ? (0, exports.renderSurgioSnippet)(snippet, args)
-                        : (0, exports.addProxyToSurgeRuleSet)(snippet, args[0]),
-                    name: item.name,
-                    url: item.url,
-                    text: snippet, // 原始内容
-                };
+                snippet = await load(item.url);
+                await tmp.setContent(snippet);
             }
-        })();
+            return {
+                main: (...args) => isSurgioSnippet
+                    ? (0, exports.renderSurgioSnippet)(snippet, args)
+                    : (0, exports.addProxyToSurgeRuleSet)(snippet, args[0]),
+                name: item.name,
+                url: item.url,
+                text: snippet, // 原始内容
+            };
+        }
+        else {
+            const cacheKey = `${constant_1.CACHE_KEYS.RemoteSnippets}:${fileMd5}`;
+            const cachedSnippet = await cache_1.unifiedCache.get(cacheKey);
+            const snippet = cachedSnippet
+                ? cachedSnippet
+                : await load(item.url)
+                    .then((res) => {
+                    return Promise.all([
+                        cache_1.unifiedCache.set(cacheKey, res, cacheSnippet ? (0, env_flag_1.getRemoteSnippetCacheMaxage)() : (0, ms_1.default)('1m')),
+                        res,
+                    ]);
+                })
+                    .then(([, res]) => res);
+            return {
+                main: (...args) => isSurgioSnippet
+                    ? (0, exports.renderSurgioSnippet)(snippet, args)
+                    : (0, exports.addProxyToSurgeRuleSet)(snippet, args[0]),
+                name: item.name,
+                url: item.url,
+                text: snippet, // 原始内容
+            };
+        }
     }, {
         concurrency: (0, env_flag_1.getNetworkConcurrency)(),
     });

package/build/utils/remote-snippet.js.map

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

package/build/utils/surge.js

@@ -53,12 +53,13 @@ const getSurgeWireguardNodes = (nodeList) => {
             }
         }
         if (nodeConfig.dnsServers) {
-            nodeConfigSection.push(`dns-server=${nodeConfig.dnsServers.join(', ')}`);
+            nodeConfigSection.push(`dns-server=${JSON.stringify(nodeConfig.dnsServers.join(', '))}`);
         }
+        const peerList = [];
         for (const peer of nodeConfig.peers) {
             const peerConfig = [
                 `endpoint=${peer.endpoint}`,
-                `public-key=${peer.publicKey}`,
+                `public-key=${JSON.stringify(peer.publicKey)}`,
             ];
             const optionalPeerConfigKeys = [
                 'presharedKey',
@@ -69,14 +70,17 @@ const getSurgeWireguardNodes = (nodeList) => {
                 if (peer[key] !== undefined) {
                     peerConfig.push(...(0, _1.pickAndFormatStringList)(peer, [key], {
                         keyFormat: 'kebabCase',
+                        stringifyValue: true,
                     }));
                 }
             }
+            // istanbul ignore next
             if (peer.reservedBits) {
                 peerConfig.push(`client-id=${peer.reservedBits.join('/')}`);
             }
-            nodeConfigSection.push(`peer=(${peerConfig.join(', ')})`);
+            peerList.push(`(${peerConfig.join(', ')})`);
         }
+        nodeConfigSection.push(`peer=${peerList.join(', ')}`);
         return nodeConfigSection.join('\n');
     })
         .filter((item) => item !== undefined);

package/build/utils/surge.js.map

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

package/build/utils/tmp-helper.js

@@ -10,7 +10,6 @@ const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const constant_1 = require("../constant");
 const redis_1 = __importDefault(require("../redis"));
-const index_1 = require("./index");
 const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:tmp-helper' });
 const tmpDir = path_1.default.join(os_1.default.tmpdir(), constant_1.TMP_FOLDER_NAME);
 class TmpHelper {
@@ -77,7 +76,7 @@ class TmpRedis {
     }
     async setContent(content) {
         if (this.maxAge) {
-            await this.redisClient.set(this.cacheKey, content, 'EX', (0, index_1.msToSeconds)(this.maxAge));
+            await this.redisClient.set(this.cacheKey, content, 'PX', this.maxAge);
         }
         else {
             await this.redisClient.set(this.cacheKey, content);

package/build/utils/tmp-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"tmp-helper.js","sourceRoot":"","sources":["../../src/utils/tmp-helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tmp-helper.js","sourceRoot":"","sources":["../../src/utils/tmp-helper.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA6C;AAC7C,4CAAmB;AACnB,gDAAuB;AACvB,wDAAyB;AAGzB,0CAA6C;AAC7C,qDAA4B;AAE5B,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAA;AACnE,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,0BAAe,CAAC,CAAA;AAEtD,MAAe,SAAS;IACO;IAAyB;IAAtD,YAA6B,QAAgB,EAAS,MAAe;QAAxC,aAAQ,GAAR,QAAQ,CAAQ;QAAS,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;CAK1E;AAED,MAAa,OAAO;IACC;IAAyB;IAA5C,YAAmB,QAAgB,EAAS,MAAe;QAAxC,aAAQ,GAAR,QAAQ,CAAQ;QAAS,WAAM,GAAN,MAAM,CAAS;QACzD,kBAAE,CAAC,UAAU,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC/D,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,OAAe;QACrC,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChC,OAAO;YACP,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;SACnC,CAAC,CAAA;IACJ,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAA;QAC/C,IAAI,UAAU,EAAE;YACd,OAAO,UAAU,CAAC,OAAO,CAAA;SAC1B;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,OAAO,SAAS,CAAA;SACjB;QAED,MAAM,UAAU,GAAe,MAAM,kBAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAEtB,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACtB,OAAO,UAAU,CAAA;SAClB;aAAM,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,GAAG,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE;YACrE,OAAO,UAAU,CAAA;SAClB;aAAM,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,EAAE;YAC5C,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;SAChC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;CACF;AAvCD,0BAuCC;AAED,MAAa,QAAQ;IAGA;IAAyB;IAFpC,WAAW,CAAO;IAE1B,YAAmB,QAAgB,EAAS,MAAe;QAAxC,aAAQ,GAAR,QAAQ,CAAQ;QAAS,WAAM,GAAN,MAAM,CAAS;QACzD,IAAI,CAAC,WAAW,GAAG,eAAK,CAAC,QAAQ,EAAE,CAAA;IACrC,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAEvD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;IAClC,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,OAAe;QACrC,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;SACtE;aAAM;YACL,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;SACnD;IACH,CAAC;CACF;AApBD,4BAoBC;AAQM,MAAM,gBAAgB,GAAG,CAC9B,OAAe,EACf,YAAiC,SAAS,EACmB,EAAE;IAC/D,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACnC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAA;IAEhD,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAE7C,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC9B,kBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;SAC1B;QAED,OAAO,CAAC,YAAoB,EAAE,MAAe,EAAE,EAAE,CAC/C,IAAI,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CAAA;KAC3D;SAAM;QACL,OAAO,CAAC,YAAoB,EAAE,MAAe,EAAE,EAAE,CAC/C,IAAI,QAAQ,CAAC,GAAG,OAAO,IAAI,YAAY,EAAE,EAAE,MAAM,CAAC,CAAA;KACrD;AACH,CAAC,CAAA;AApBY,QAAA,gBAAgB,oBAoB5B"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "surgio",
   "description": "Generating rules for Surge, Clash, Quantumult like a PRO",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.6",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "bin": {
@@ -47,7 +47,9 @@
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
     "prepare": "husky install",
     "docs:dev": "NODE_ENV=development vuepress dev docs",
-    "docs:build": "NODE_ENV=production vuepress build docs"
+    "docs:build": "NODE_ENV=production vuepress build docs",
+    "release": "bumpp && npm publish",
+    "release:alpha": "bumpp --preid alpha --no-push && npm publish"
   },
   "oclif": {
     "bin": "surgio",
@@ -68,27 +70,29 @@
     "topics": {}
   },
   "dependencies": {
+    "@babel/parser": "^7.22.5",
     "@brillout/import": "^0.2.3",
-    "@oclif/core": "^2.8.5",
-    "@oclif/plugin-help": "^5.2.9",
-    "@oclif/plugin-plugins": "^2.4.7",
+    "@oclif/core": "^2.8.7",
+    "@oclif/plugin-help": "^5.2.10",
+    "@oclif/plugin-plugins": "^3.1.3",
     "@royli/hygen": "^6.2.0",
-    "@surgio/eslint-config-surgio": "^1.0.5",
-    "@surgio/logger": "^1.2.1",
-    "@types/eslint": "^8.40.0",
-    "@typescript-eslint/parser": "^5.59.8",
+    "@surgio/eslint-config-surgio": "^1.0.6",
+    "@surgio/logger": "^1.3.0",
+    "@types/eslint": "^8.40.2",
     "agentkeepalive": "^4.3.0",
     "ali-oss": "^6.17.1",
     "bluebird": "^3.7.2",
     "bytes": "^3.1.2",
+    "cache-manager": "^5.2.3",
+    "cache-manager-ioredis-yet": "^1.2.2",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
     "check-node-version": "^4.2.1",
     "date-fns": "^2.30.0",
     "detect-newline": "^3.1.0",
-    "dotenv": "^16.1.2",
+    "dotenv": "^16.3.0",
     "emoji-regex": "^10.2.1",
-    "eslint": "^8.41.0",
+    "eslint": "^8.43.0",
     "execa": "^4.1.0",
     "filesize": "^10.0.7",
     "fs-extra": "^11.1.1",
@@ -99,15 +103,13 @@
     "lodash": "^4.17.21",
     "micromatch": "^4.0.5",
     "ms": "^2.1.3",
-    "node-cache": "^5.1.2",
     "node-dir": "^0.1.17",
     "nunjucks": "^3.2.4",
     "ora": "^5.4.1",
     "query-string": "^7.1.3",
     "rimraf": "^4.4.1",
     "source-map-support": "^0.5.21",
-    "type-fest": "^3.11.1",
-    "typescript": "^5.0.4",
+    "type-fest": "^3.12.0",
     "update-notifier": "^5.1.0",
     "urlsafe-base64": "^1.0.0",
     "yaml": "^2.3.1",
@@ -115,11 +117,11 @@
     "zod-validation-error": "^1.3.0"
   },
   "devDependencies": {
-    "@algolia/client-search": "^4.17.1",
+    "@algolia/client-search": "^4.17.2",
     "@commitlint/cli": "^17.6.5",
     "@commitlint/config-angular": "^17.6.5",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@oclif/test": "^2.3.21",
+    "@oclif/test": "^2.3.22",
     "@types/bluebird": "^3.5.38",
     "@types/bytes": "^3.1.1",
     "@types/chai": "^4.3.5",
@@ -132,20 +134,21 @@
     "@types/micromatch": "^4.0.2",
     "@types/mocha": "^10.0.1",
     "@types/ms": "^0.7.31",
-    "@types/node": "^18",
+    "@types/node": "^18.16.18",
     "@types/nunjucks": "^3.2.2",
     "@types/sinon": "^10.0.15",
     "@types/urlsafe-base64": "^1.0.28",
-    "@typescript-eslint/eslint-plugin": "^5.59.8",
+    "@typescript-eslint/eslint-plugin": "^5.59.11",
+    "@typescript-eslint/parser": "^5.59.11",
     "@vuepress/client": "2.0.0-beta.62",
     "@vuepress/plugin-docsearch": "2.0.0-beta.62",
     "@vuepress/plugin-google-analytics": "2.0.0-beta.62",
     "@vuepress/plugin-register-components": "2.0.0-beta.62",
     "@vuepress/theme-default": "2.0.0-beta.62",
     "@vuepress/utils": "2.0.0-beta.62",
-    "ava": "^5.3.0",
+    "ava": "^5.3.1",
     "benchmark": "^2.1.4",
-    "bumpp": "^9.1.0",
+    "bumpp": "^9.1.1",
     "chai": "^4.3.7",
     "chai-jest-snapshot": "^2.0.0",
     "conventional-changelog-cli": "^2.2.2",
@@ -162,9 +165,10 @@
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "prettier": "^2.8.8",
-    "sass": "^1.62.1",
-    "sinon": "^15.1.0",
+    "sass": "^1.63.4",
+    "sinon": "^15.1.2",
     "ts-node": "^10.9.1",
+    "typescript": "~5.0.4",
     "vue": "^3.3.4",
     "vuepress": "2.0.0-beta.62",
     "vuepress-plugin-sitemap2": "2.0.0-beta.205",