surgio 2.18.4 → 2.19.0

package/build/utils/tmp-helper.js

@@ -3,29 +3,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTmpFactory = exports.TmpFile = void 0;
+exports.createTmpFactory = exports.TmpRedis = exports.TmpFile = void 0;
 const logger_1 = require("@surgio/logger");
 const os_1 = __importDefault(require("os"));
 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 {
+    constructor(cacheKey, maxAge) {
+        this.cacheKey = cacheKey;
+        this.maxAge = maxAge;
+    }
+}
 class TmpFile {
-    constructor(filePath, maxAge) {
-        this.filePath = filePath;
+    constructor(cacheKey, maxAge) {
+        this.cacheKey = cacheKey;
         this.maxAge = maxAge;
-        this.filename = path_1.default.basename(filePath);
-        this.extname = path_1.default.extname(filePath);
-        fs_extra_1.default.accessSync(path_1.default.dirname(this.filePath), fs_extra_1.default.constants.W_OK);
+        fs_extra_1.default.accessSync(path_1.default.dirname(this.cacheKey), fs_extra_1.default.constants.W_OK);
     }
     async setContent(content) {
-        await fs_extra_1.default.writeJson(this.filePath, {
+        await fs_extra_1.default.writeJson(this.cacheKey, {
             content,
             maxAge: this.maxAge,
             lastEditTime: new Date().getTime(),
         });
-        return this;
     }
     async getContent() {
         const tmpContent = await this.validateContent();
@@ -35,10 +40,10 @@ class TmpFile {
         return undefined;
     }
     async validateContent() {
-        if (!fs_extra_1.default.existsSync(this.filePath)) {
+        if (!fs_extra_1.default.existsSync(this.cacheKey)) {
             return undefined;
         }
-        const tmpContent = await fs_extra_1.default.readJson(this.filePath);
+        const tmpContent = await fs_extra_1.default.readJson(this.cacheKey);
         const now = Date.now();
         if (!tmpContent.maxAge) {
             return tmpContent;
@@ -53,13 +58,39 @@ class TmpFile {
     }
 }
 exports.TmpFile = TmpFile;
-const createTmpFactory = (baseDir) => {
-    baseDir = path_1.default.join(tmpDir, baseDir);
+class TmpRedis {
+    constructor(cacheKey, maxAge) {
+        this.cacheKey = cacheKey;
+        this.maxAge = maxAge;
+        this.redisClient = redis_1.default.getRedis();
+    }
+    async getContent() {
+        const value = await this.redisClient.get(this.cacheKey);
+        return value ? value : undefined;
+    }
+    async setContent(content) {
+        if (this.maxAge) {
+            await this.redisClient.set(this.cacheKey, content, 'EX', (0, index_1.msToSeconds)(this.maxAge));
+        }
+        else {
+            await this.redisClient.set(this.cacheKey, content);
+        }
+    }
+}
+exports.TmpRedis = TmpRedis;
+const createTmpFactory = (baseDir, cacheType = 'default') => {
     logger.debug('tmpDir: %s', baseDir);
-    if (!fs_extra_1.default.existsSync(baseDir)) {
-        fs_extra_1.default.mkdirpSync(baseDir);
+    logger.debug('tmpDir cache type: %s', cacheType);
+    if (cacheType === 'default') {
+        const fullTmpDir = path_1.default.join(tmpDir, baseDir);
+        if (!fs_extra_1.default.existsSync(fullTmpDir)) {
+            fs_extra_1.default.mkdirpSync(fullTmpDir);
+        }
+        return (fileCacheKey, maxAge) => new TmpFile(path_1.default.join(fullTmpDir, fileCacheKey), maxAge);
+    }
+    else {
+        return (fileCacheKey, maxAge) => new TmpRedis(`${baseDir}:${fileCacheKey}`, maxAge);
     }
-    return (filePath, maxAge) => new TmpFile(path_1.default.join(baseDir, filePath), maxAge);
 };
 exports.createTmpFactory = createTmpFactory;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG1wLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi91dGlscy90bXAtaGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDJDQUE4QztBQUM5Qyw0Q0FBb0I7QUFDcEIsZ0RBQXdCO0FBQ3hCLHdEQUEwQjtBQUUxQiwwQ0FBOEM7QUFFOUMsTUFBTSxNQUFNLEdBQUcsSUFBQSxxQkFBWSxFQUFDLEVBQUUsT0FBTyxFQUFFLHlCQUF5QixFQUFFLENBQUMsQ0FBQztBQUNwRSxNQUFNLE1BQU0sR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLFlBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSwwQkFBZSxDQUFDLENBQUM7QUFFdkQsTUFBYSxPQUFPO0lBSWxCLFlBQW1CLFFBQWdCLEVBQVMsTUFBZTtRQUF4QyxhQUFRLEdBQVIsUUFBUSxDQUFRO1FBQVMsV0FBTSxHQUFOLE1BQU0sQ0FBUztRQUN6RCxJQUFJLENBQUMsUUFBUSxHQUFHLGNBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDeEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxjQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBRXRDLGtCQUFFLENBQUMsVUFBVSxDQUFDLGNBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLGtCQUFFLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2hFLENBQUM7SUFFTSxLQUFLLENBQUMsVUFBVSxDQUFDLE9BQWU7UUFDckMsTUFBTSxrQkFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2hDLE9BQU87WUFDUCxNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07WUFDbkIsWUFBWSxFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsT0FBTyxFQUFFO1NBQ25DLENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVNLEtBQUssQ0FBQyxVQUFVO1FBQ3JCLE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1FBQ2hELElBQUksVUFBVSxFQUFFO1lBQ2QsT0FBTyxVQUFVLENBQUMsT0FBTyxDQUFDO1NBQzNCO1FBQ0QsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVPLEtBQUssQ0FBQyxlQUFlO1FBQzNCLElBQUksQ0FBQyxrQkFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDakMsT0FBTyxTQUFTLENBQUM7U0FDbEI7UUFFRCxNQUFNLFVBQVUsR0FBZSxNQUFNLGtCQUFFLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNoRSxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7UUFFdkIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUU7WUFDdEIsT0FBTyxVQUFVLENBQUM7U0FDbkI7YUFBTSxJQUFJLElBQUksQ0FBQyxNQUFNLElBQUksR0FBRyxHQUFHLFVBQVUsQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRTtZQUNyRSxPQUFPLFVBQVUsQ0FBQztTQUNuQjthQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxJQUFJLFVBQVUsQ0FBQyxNQUFNLEVBQUU7WUFDNUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDO1NBQ2pDO1FBRUQsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztDQUNGO0FBL0NELDBCQStDQztBQVFNLE1BQU0sZ0JBQWdCLEdBQUcsQ0FDOUIsT0FBZSxFQUNtQyxFQUFFO0lBQ3BELE9BQU8sR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztJQUVyQyxNQUFNLENBQUMsS0FBSyxDQUFDLFlBQVksRUFBRSxPQUFPLENBQUMsQ0FBQztJQUVwQyxJQUFJLENBQUMsa0JBQUUsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLEVBQUU7UUFDM0Isa0JBQUUsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7S0FDeEI7SUFFRCxPQUFPLENBQUMsUUFBZ0IsRUFBRSxNQUFlLEVBQUUsRUFBRSxDQUMzQyxJQUFJLE9BQU8sQ0FBQyxjQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztBQUN0RCxDQUFDLENBQUM7QUFiVyxRQUFBLGdCQUFnQixvQkFhM0IifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG1wLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi91dGlscy90bXAtaGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDJDQUE4QztBQUM5Qyw0Q0FBb0I7QUFDcEIsZ0RBQXdCO0FBQ3hCLHdEQUEwQjtBQUcxQiwwQ0FBOEM7QUFDOUMscURBQTZCO0FBQzdCLG1DQUFzQztBQUV0QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUseUJBQXlCLEVBQUUsQ0FBQyxDQUFDO0FBQ3BFLE1BQU0sTUFBTSxHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsWUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFFLDBCQUFlLENBQUMsQ0FBQztBQUV2RCxNQUFlLFNBQVM7SUFDdEIsWUFBNkIsUUFBZ0IsRUFBUyxNQUFlO1FBQXhDLGFBQVEsR0FBUixRQUFRLENBQVE7UUFBUyxXQUFNLEdBQU4sTUFBTSxDQUFTO0lBQUcsQ0FBQztDQUsxRTtBQUVELE1BQWEsT0FBTztJQUNsQixZQUFtQixRQUFnQixFQUFTLE1BQWU7UUFBeEMsYUFBUSxHQUFSLFFBQVEsQ0FBUTtRQUFTLFdBQU0sR0FBTixNQUFNLENBQVM7UUFDekQsa0JBQUUsQ0FBQyxVQUFVLENBQUMsY0FBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsa0JBQUUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDaEUsQ0FBQztJQUVNLEtBQUssQ0FBQyxVQUFVLENBQUMsT0FBZTtRQUNyQyxNQUFNLGtCQUFFLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDaEMsT0FBTztZQUNQLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixZQUFZLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQyxPQUFPLEVBQUU7U0FDbkMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVNLEtBQUss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

package/build/utils/trojan.js

@@ -1,15 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTrojanUri = void 0;
-const debug_1 = __importDefault(require("debug"));
+const logger_1 = require("@surgio/logger");
 const url_1 = require("url");
 const types_1 = require("../types");
-const debug = (0, debug_1.default)('surgio:utils:trojan');
+const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:trojan' });
 const parseTrojanUri = (str) => {
-    debug('Trojan URI', str);
+    logger.debug('Trojan URI', str);
     const scheme = new url_1.URL(str);
     if (scheme.protocol !== 'trojan:') {
         throw new Error('Invalid Trojan URI.');
@@ -30,4 +27,4 @@ const parseTrojanUri = (str) => {
         : null));
 };
 exports.parseTrojanUri = parseTrojanUri;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJvamFuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL3Ryb2phbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxrREFBMEI7QUFDMUIsNkJBQTBCO0FBRTFCLG9DQUEwRDtBQUUxRCxNQUFNLEtBQUssR0FBRyxJQUFBLGVBQUssRUFBQyxxQkFBcUIsQ0FBQyxDQUFDO0FBRXBDLE1BQU0sY0FBYyxHQUFHLENBQUMsR0FBVyxFQUFvQixFQUFFO0lBQzlELEtBQUssQ0FBQyxZQUFZLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFFekIsTUFBTSxNQUFNLEdBQUcsSUFBSSxTQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7SUFFNUIsSUFBSSxNQUFNLENBQUMsUUFBUSxLQUFLLFNBQVMsRUFBRTtRQUNqQyxNQUFNLElBQUksS0FBSyxDQUFDLHFCQUFxQixDQUFDLENBQUM7S0FDeEM7SUFFRCxNQUFNLGFBQWEsR0FDakIsTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLEtBQUssR0FBRztRQUNoRCxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsS0FBSyxNQUFNLENBQUM7SUFDdEQsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLElBQUksTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFOUUscUNBQ0UsSUFBSSxFQUFFLG9CQUFZLENBQUMsTUFBTSxFQUN6QixRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFDekIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJLEVBQ2pCLFFBQVEsRUFBRSxNQUFNLENBQUMsUUFBUSxFQUN6QixRQUFRLEVBQUUsTUFBTSxDQUFDLElBQUk7WUFDbkIsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzFDLENBQUMsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxRQUFRLElBQUksTUFBTSxDQUFDLElBQUksRUFBRSxJQUNwQyxDQUFDLGFBQWE7UUFDZixDQUFDLENBQUM7WUFDRSxjQUFjLEVBQUUsSUFBSTtTQUNyQjtRQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FDTixDQUFDLEdBQUc7UUFDTCxDQUFDLENBQUM7WUFDRSxHQUFHO1NBQ0o7UUFDSCxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQ1Q7QUFDSixDQUFDLENBQUM7QUFqQ1csUUFBQSxjQUFjLGtCQWlDekIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJvamFuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL3Ryb2phbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBOEM7QUFDOUMsNkJBQTBCO0FBRTFCLG9DQUEwRDtBQUUxRCxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsQ0FBQyxDQUFDO0FBRXpELE1BQU0sY0FBYyxHQUFHLENBQUMsR0FBVyxFQUFvQixFQUFFO0lBQzlELE1BQU0sQ0FBQyxLQUFLLENBQUMsWUFBWSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBRWhDLE1BQU0sTUFBTSxHQUFHLElBQUksU0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBRTVCLElBQUksTUFBTSxDQUFDLFFBQVEsS0FBSyxTQUFTLEVBQUU7UUFDakMsTUFBTSxJQUFJLEtBQUssQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0tBQ3hDO0lBRUQsTUFBTSxhQUFhLEdBQ2pCLE1BQU0sQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxLQUFLLEdBQUc7UUFDaEQsTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLEtBQUssTUFBTSxDQUFDO0lBQ3RELE1BQU0sR0FBRyxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxJQUFJLE1BQU0sQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRTlFLHFDQUNFLElBQUksRUFBRSxvQkFBWSxDQUFDLE1BQU0sRUFDekIsUUFBUSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQ3pCLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSSxFQUNqQixRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFDekIsUUFBUSxFQUFFLE1BQU0sQ0FBQyxJQUFJO1lBQ25CLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMxQyxDQUFDLENBQUMsR0FBRyxNQUFNLENBQUMsUUFBUSxJQUFJLE1BQU0sQ0FBQyxJQUFJLEVBQUUsSUFDcEMsQ0FBQyxhQUFhO1FBQ2YsQ0FBQyxDQUFDO1lBQ0UsY0FBYyxFQUFFLElBQUk7U0FDckI7UUFDSCxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQ04sQ0FBQyxHQUFHO1FBQ0wsQ0FBQyxDQUFDO1lBQ0UsR0FBRztTQUNKO1FBQ0gsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUNUO0FBQ0osQ0FBQyxDQUFDO0FBakNXLFFBQUEsY0FBYyxrQkFpQ3pCIn0=

package/build/utils/v2ray.d.ts

@@ -1,4 +1,4 @@
 import { VmessNodeConfig } from '../types';
 export declare const formatVmessUri: (nodeConfig: VmessNodeConfig, options?: {
     readonly isMellow: boolean;
-} | undefined) => string;
+}) => string;

package/build/utils/v2ray.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatVmessUri = void 0;
-const query_string_1 = __importDefault(require("query-string"));
+const url_1 = require("url");
 // https://github.com/v2ray/v2ray-core/issues/1569
 const formatVmessUri = (nodeConfig, options) => {
     const uri = [
@@ -15,10 +12,10 @@ const formatVmessUri = (nodeConfig, options) => {
     ];
     const queries = {
         network: nodeConfig.network,
-        tls: nodeConfig.tls,
+        tls: nodeConfig.tls ? 'true' : 'false',
     };
     if (nodeConfig.skipCertVerify) {
-        queries['tls.allowInsecure'] = true;
+        queries['tls.allowInsecure'] = 'true';
     }
     if (nodeConfig.network === 'ws') {
         if (typeof nodeConfig.wsHeaders !== 'undefined') {
@@ -37,7 +34,8 @@ const formatVmessUri = (nodeConfig, options) => {
             }
         }
     }
-    return `vmess://${uri.join('')}?${query_string_1.default.stringify(queries)}`;
+    const queryObject = new url_1.URLSearchParams(queries);
+    return `vmess://${uri.join('')}?${queryObject.toString()}`;
 };
 exports.formatVmessUri = formatVmessUri;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjJyYXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvdjJyYXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EsZ0VBQXVDO0FBRXZDLGtEQUFrRDtBQUMzQyxNQUFNLGNBQWMsR0FBRyxDQUM1QixVQUEyQixFQUMzQixPQUF3QyxFQUNoQyxFQUFFO0lBQ1YsTUFBTSxHQUFHLEdBQWE7UUFDcEIsVUFBVSxDQUFDLElBQUk7UUFDZixHQUFHO1FBQ0gsR0FBRyxVQUFVLENBQUMsUUFBUSxJQUFJLFVBQVUsQ0FBQyxJQUFJLEVBQUU7UUFDM0MsVUFBVSxDQUFDLElBQUksSUFBSSxHQUFHO0tBQ3ZCLENBQUM7SUFDRixNQUFNLE9BQU8sR0FBUTtRQUNuQixPQUFPLEVBQUUsVUFBVSxDQUFDLE9BQU87UUFDM0IsR0FBRyxFQUFFLFVBQVUsQ0FBQyxHQUFHO0tBQ3BCLENBQUM7SUFFRixJQUFJLFVBQVUsQ0FBQyxjQUFjLEVBQUU7UUFDN0IsT0FBTyxDQUFDLG1CQUFtQixDQUFDLEdBQUcsSUFBSSxDQUFDO0tBQ3JDO0lBRUQsSUFBSSxVQUFVLENBQUMsT0FBTyxLQUFLLElBQUksRUFBRTtRQUMvQixJQUFJLE9BQU8sVUFBVSxDQUFDLFNBQVMsS0FBSyxXQUFXLEVBQUU7WUFDL0MsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7Z0JBQ2hELElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFO29CQUN0QixPQUFPLENBQUMsY0FBYyxHQUFHLEVBQUUsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxTQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7aUJBQzNEO1lBQ0gsQ0FBQyxDQUFDLENBQUM7U0FDSjtRQUNELElBQUksVUFBVSxDQUFDLElBQUksRUFBRTtZQUNuQixJQUFJLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxRQUFRLEVBQUU7Z0JBQ3JCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO2FBQ3RDO2lCQUFNO2dCQUNMLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7YUFDOUM7U0FDRjtLQUNGO0lBRUQsT0FBTyxXQUFXLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksc0JBQVcsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztBQUNyRSxDQUFDLENBQUM7QUFyQ1csUUFBQSxjQUFjLGtCQXFDekIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjJyYXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvdjJyYXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQXNDO0FBR3RDLGtEQUFrRDtBQUMzQyxNQUFNLGNBQWMsR0FBRyxDQUM1QixVQUEyQixFQUMzQixPQUF3QyxFQUNoQyxFQUFFO0lBQ1YsTUFBTSxHQUFHLEdBQWE7UUFDcEIsVUFBVSxDQUFDLElBQUk7UUFDZixHQUFHO1FBQ0gsR0FBRyxVQUFVLENBQUMsUUFBUSxJQUFJLFVBQVUsQ0FBQyxJQUFJLEVBQUU7UUFDM0MsVUFBVSxDQUFDLElBQUksSUFBSSxHQUFHO0tBQ3ZCLENBQUM7SUFDRixNQUFNLE9BQU8sR0FBMkI7UUFDdEMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxPQUFPO1FBQzNCLEdBQUcsRUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLE9BQU87S0FDdkMsQ0FBQztJQUVGLElBQUksVUFBVSxDQUFDLGNBQWMsRUFBRTtRQUM3QixPQUFPLENBQUMsbUJBQW1CLENBQUMsR0FBRyxNQUFNLENBQUM7S0FDdkM7SUFFRCxJQUFJLFVBQVUsQ0FBQyxPQUFPLEtBQUssSUFBSSxFQUFFO1FBQy9CLElBQUksT0FBTyxVQUFVLENBQUMsU0FBUyxLQUFLLFdBQVcsRUFBRTtZQUMvQyxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtnQkFDaEQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUU7b0JBQ3RCLE9BQU8sQ0FBQyxjQUFjLEdBQUcsRUFBRSxDQUFDLEdBQUcsVUFBVSxDQUFDLFNBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztpQkFDM0Q7WUFDSCxDQUFDLENBQUMsQ0FBQztTQUNKO1FBQ0QsSUFBSSxVQUFVLENBQUMsSUFBSSxFQUFFO1lBQ25CLElBQUksT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLFFBQVEsRUFBRTtnQkFDckIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7YUFDdEM7aUJBQU07Z0JBQ0wsT0FBTyxDQUFDLGlCQUFpQixDQUFDLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQzthQUM5QztTQUNGO0tBQ0Y7SUFFRCxNQUFNLFdBQVcsR0FBRyxJQUFJLHFCQUFlLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFakQsT0FBTyxXQUFXLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksV0FBVyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUM7QUFDN0QsQ0FBQyxDQUFDO0FBdkNXLFFBQUEsY0FBYyxrQkF1Q3pCIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "surgio",
   "description": "Generating rules for Surge, Clash, Quantumult like a PRO",
-  "version": "2.18.4",
+  "version": "2.19.0",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
   "bin": {
@@ -27,7 +27,6 @@
     "coverage": "cross-env TS_NODE_FILES=true nyc ava",
     "clean": "rimraf build",
     "build": "run-s clean && tsc -p tsconfig.json",
-    "build:binary": "pkg --target node12-macos,node12-win,node12-linux,node12-alpine --out-path ./binary-build .",
     "prepublish": "run-s build",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
     "pub": "np",
@@ -36,7 +35,7 @@
     "docs:build": "vuepress build docs"
   },
   "dependencies": {
-    "@royli/hygen": "^5.0.4",
+    "@royli/hygen": "^6.2.0",
     "@surgio/eslint-config-surgio": "^1.0.3",
     "@surgio/logger": "^1.1.0",
     "@types/eslint": "^7.2.0",
@@ -49,35 +48,33 @@
     "common-bin": "^2.8.3",
     "cross-env": "^7.0.2",
     "date-fns": "^2.16.1",
-    "debug": "^4.1.1",
     "detect-newline": "^3.1.0",
-    "emoji-regex": "^9.0.0",
+    "emoji-regex": "^10.1.0",
     "env2": "^2.2.2",
     "eslint": "^7.8.1",
     "espree": "^7.3.0",
     "execa": "^4.0.3",
-    "filesize": "^6.1.0",
+    "filesize": "^9.0.0",
     "fs-extra": "^9.0.0",
     "get-port": "^5.1.0",
-    "global-agent": "^2.1.7",
+    "global-agent": "^3.0.0",
     "got": "^11.6.1",
     "inquirer": "^7.1.0",
+    "ioredis": "^5.0.5",
     "joi": "^17.1.1",
     "listr": "^0.14.3",
     "lodash": "^4.17.19",
-    "merge-stream": "^2.0.0",
+    "micromatch": "^4.0.5",
     "ms": "^2.1.3",
     "node-cache": "^5.1.2",
     "node-dir": "^0.1.17",
     "nunjucks": "^3.2.1",
     "ora": "^5.1.0",
-    "query-string": "^6.12.1",
+    "query-string": "^7.1.1",
     "rimraf": "^3.0.0",
-    "shelljs": "^0.8.5",
     "source-map-support": "^0.5.19",
     "update-notifier": "^5.0.0",
     "urlsafe-base64": "^1.0.0",
-    "winston": "^3.2.1",
     "yaml": "^1.9.2"
   },
   "devDependencies": {
@@ -112,21 +109,20 @@
     "eslint-plugin-prettier": "^4.0.0",
     "husky": "^4.3.0",
     "ini": "^1.3.5",
-    "jsdom": "^16.2.2",
+    "ioredis-mock": "^8.2.2",
     "lint-staged": "^12.1.7",
     "nock": "^13.0.0-beta.3",
     "np": "^6.3.1",
     "npm-debug-log-cleaner": "^1.0.3",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.1",
-    "pkg": "^4.4.8",
     "prettier": "^2.4.1",
     "sinon": "^12.0.1",
-    "sitemap": "^3.0.0",
     "ts-node": "^10.4.0",
     "type-fest": "^2.3.4",
     "typescript": "^4.4.3",
-    "vuepress": "^2.0.0-beta.26"
+    "vuepress": "^2.0.0-beta.26",
+    "vuepress-plugin-sitemap2": "^2.0.0-beta.82"
   },
   "ava": {
     "failFast": false,
@@ -165,16 +161,11 @@
       "pre-commit": "npm-debug-log-cleaner && lint-staged"
     }
   },
-  "pkg": {
-    "scripts": "build/**/*.js",
-    "assets": [
-      "hygen-template/**/*"
-    ]
-  },
   "keywords": [
     "surgio",
     "surge",
     "quantumult",
-    "clash"
+    "clash",
+    "shadowrocket"
   ]
 }