surgio 3.2.1 → 3.2.3

package/build/base-command.d.ts

@@ -15,5 +15,6 @@ declare abstract class BaseCommand<T extends typeof Command> extends Command {
     protected catch(err: Error & {
         exitCode?: number;
     }): Promise<any>;
+    protected cleanup(): Promise<void>;
 }
 export default BaseCommand;

package/build/base-command.js

@@ -8,6 +8,7 @@ const core_1 = require("@oclif/core");
 const logger_1 = require("@surgio/logger");
 const ora_1 = __importDefault(require("ora"));
 const path_1 = require("path");
+const redis_1 = __importDefault(require("./redis"));
 const config_1 = require("./config");
 const error_helper_1 = require("./utils/error-helper");
 class BaseCommand extends core_1.Command {
@@ -39,7 +40,7 @@ class BaseCommand extends core_1.Command {
             flags.project = (0, path_1.resolve)(process.cwd(), flags.project);
         }
         this.projectDir = flags.project;
-        this.surgioConfig = await (0, config_1.loadConfig)(this.projectDir);
+        this.surgioConfig = (0, config_1.loadConfig)(this.projectDir);
     }
     async catch(err) {
         if (this.ora.isSpinning) {
@@ -48,6 +49,12 @@ class BaseCommand extends core_1.Command {
         await error_helper_1.errorHandler.call(this, err);
         this.exit(err.exitCode || 1);
     }
+    async cleanup() {
+        await redis_1.default.destroyRedis();
+        if (this.ora.isSpinning) {
+            this.ora.succeed();
+        }
+    }
 }
 BaseCommand.enableJsonFlag = true;
 BaseCommand.baseFlags = {

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;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"}
+{"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,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,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,OAAO,CAAA;QAC/B,IAAI,CAAC,YAAY,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACjD,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;IAES,KAAK,CAAC,OAAO;QACrB,MAAM,eAAK,CAAC,YAAY,EAAE,CAAA;QAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE;YACvB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;SACnB;IACH,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/commands/check.js

@@ -32,7 +32,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const base_command_1 = __importDefault(require("../base-command"));
-const redis_1 = __importDefault(require("../redis"));
 const config_1 = require("../config");
 const provider_1 = require("../provider");
 class CheckCommand extends base_command_1.default {
@@ -66,7 +65,7 @@ class CheckCommand extends base_command_1.default {
             },
         ]);
         console.log(JSON.stringify(answers.node, null, 2));
-        await redis_1.default.destroyRedis();
+        await this.cleanup();
     }
     async getNodeList(providerName) {
         core_1.ux.action.start('正在获取 Provider 信息');

package/build/commands/check.js.map

@@ -1 +1 @@
-{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uBAAuB;AACvB,sCAAsC;AACtC,wDAAyB;AACzB,gDAAuB;AACvB,wDAA+B;AAE/B,mEAAyC;AACzC,qDAA4B;AAC5B,sCAAqC;AACrC,0CAAyC;AAEzC,MAAM,YAAa,SAAQ,sBAAgC;IACzD,MAAM,CAAC,WAAW,GAAG,aAAa,CAAA;IAElC,MAAM,CAAC,IAAI,GAAG;QACZ,QAAQ,EAAE,WAAI,CAAC,MAAM,CAAC;YACpB,WAAW,EAAE,gBAAgB;YAC7B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAE3D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;YAC9C,OAAM;SACP;QAED,MAAM,OAAO,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YACpC;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBAC7B,MAAM,IAAI,GACR,UAAU,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI;wBAClC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,MAAM,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE;wBACpD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAA;oBAEnB,OAAO;wBACL,IAAI;wBACJ,KAAK,EAAE,IAAI;qBACZ,CAAA;gBACH,CAAC,CAAC;aACH;SACF,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;QAElD,MAAM,eAAK,CAAC,YAAY,EAAE,CAAA;IAC5B,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,YAAoB;QAC5C,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QAEnC,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAA;QAC1B,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,YAAY,KAAK,CAAC,CAAA;QACzE,MAAM,IAAI,GAAgB,kBAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;YAC/C,CAAC,CAAC,yBAAa,QAAQ,uCAAC;YACxB,CAAC,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;QAE9B,IAAI,IAAI,YAAY,KAAK,EAAE;YACzB,MAAM,IAAI,CAAA;SACX;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,sBAAW,EAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAC9D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAA;QAE7C,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAEhB,OAAO,QAAQ,CAAA;IACjB,CAAC;;AAGH,kBAAe,YAAY,CAAA"}
+{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uBAAuB;AACvB,sCAAsC;AACtC,wDAAyB;AACzB,gDAAuB;AACvB,wDAA+B;AAE/B,mEAAyC;AACzC,sCAAqC;AACrC,0CAAyC;AAEzC,MAAM,YAAa,SAAQ,sBAAgC;IACzD,MAAM,CAAC,WAAW,GAAG,aAAa,CAAA;IAElC,MAAM,CAAC,IAAI,GAAG;QACZ,QAAQ,EAAE,WAAI,CAAC,MAAM,CAAC;YACpB,WAAW,EAAE,gBAAgB;YAC7B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAE3D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;YAC9C,OAAM;SACP;QAED,MAAM,OAAO,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YACpC;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBAC7B,MAAM,IAAI,GACR,UAAU,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI;wBAClC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,MAAM,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE;wBACpD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAA;oBAEnB,OAAO;wBACL,IAAI;wBACJ,KAAK,EAAE,IAAI;qBACZ,CAAA;gBACH,CAAC,CAAC;aACH;SACF,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;QAElD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,YAAoB;QAC5C,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QAEnC,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAA;QAC1B,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,YAAY,KAAK,CAAC,CAAA;QACzE,MAAM,IAAI,GAAgB,kBAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;YAC/C,CAAC,CAAC,yBAAa,QAAQ,uCAAC;YACxB,CAAC,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;QAE9B,IAAI,IAAI,YAAY,KAAK,EAAE;YACzB,MAAM,IAAI,CAAA;SACX;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,sBAAW,EAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAC9D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAA;QAE7C,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAEhB,OAAO,QAAQ,CAAA;IACjB,CAAC;;AAGH,kBAAe,YAAY,CAAA"}

package/build/commands/clean-cache.js

@@ -10,7 +10,6 @@ const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const base_command_1 = __importDefault(require("../base-command"));
 const constant_1 = require("../constant");
-const redis_1 = __importDefault(require("../redis"));
 const cache_1 = require("../utils/cache");
 class CleanCacheCommand extends base_command_1.default {
     static description = '清除缓存';
@@ -22,7 +21,7 @@ class CleanCacheCommand extends base_command_1.default {
         }
         await (0, cache_1.cleanCaches)();
         core_1.ux.action.stop();
-        await redis_1.default.destroyRedis();
+        await this.cleanup();
     }
 }
 exports.default = CleanCacheCommand;

package/build/commands/clean-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"clean-cache.js","sourceRoot":"","sources":["../../src/commands/clean-cache.ts"],"names":[],"mappings":";;;;;AAAA,uBAAuB;AACvB,sCAAgC;AAChC,4CAAmB;AACnB,gDAAuB;AACvB,wDAAyB;AAEzB,mEAAyC;AACzC,0CAA6C;AAC7C,qDAA4B;AAC5B,0CAA4C;AAE5C,MAAM,iBAAkB,SAAQ,sBAAqC;IACnE,MAAM,CAAC,WAAW,GAAG,MAAM,CAAA;IAEpB,KAAK,CAAC,GAAG;QACd,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,0BAAe,CAAC,CAAA;QAEtD,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAEzB,IAAI,kBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACzB,MAAM,kBAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;SACxB;QAED,MAAM,IAAA,mBAAW,GAAE,CAAA;QAEnB,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAEhB,MAAM,eAAK,CAAC,YAAY,EAAE,CAAA;IAC5B,CAAC;;AAGH,kBAAe,iBAAiB,CAAA"}
+{"version":3,"file":"clean-cache.js","sourceRoot":"","sources":["../../src/commands/clean-cache.ts"],"names":[],"mappings":";;;;;AAAA,uBAAuB;AACvB,sCAAgC;AAChC,4CAAmB;AACnB,gDAAuB;AACvB,wDAAyB;AAEzB,mEAAyC;AACzC,0CAA6C;AAC7C,0CAA4C;AAE5C,MAAM,iBAAkB,SAAQ,sBAAqC;IACnE,MAAM,CAAC,WAAW,GAAG,MAAM,CAAA;IAEpB,KAAK,CAAC,GAAG;QACd,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,0BAAe,CAAC,CAAA;QAEtD,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAEzB,IAAI,kBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACzB,MAAM,kBAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;SACxB;QAED,MAAM,IAAA,mBAAW,GAAE,CAAA;QAEnB,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAEhB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;;AAGH,kBAAe,iBAAiB,CAAA"}

package/build/commands/doctor.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 // istanbul ignore file
 const base_command_1 = __importDefault(require("../base-command"));
-const redis_1 = __importDefault(require("../redis"));
 const doctor_1 = require("../utils/doctor");
 class DoctorCommand extends base_command_1.default {
     static description = '检查运行环境';
@@ -14,7 +13,7 @@ class DoctorCommand extends base_command_1.default {
         doctorInfo.forEach((item) => {
             console.log(item);
         });
-        await redis_1.default.destroyRedis();
+        await this.cleanup();
     }
 }
 exports.default = DoctorCommand;

package/build/commands/doctor.js.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":";;;;;AAAA,uBAAuB;AACvB,mEAAyC;AACzC,qDAA4B;AAC5B,4CAAoD;AAEpD,MAAM,aAAc,SAAQ,sBAAiC;IAC3D,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;IAEtB,KAAK,CAAC,GAAG;QACd,MAAM,UAAU,GAAG,MAAM,IAAA,2BAAkB,EACzC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAClB,CAAA;QAED,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACnB,CAAC,CAAC,CAAA;QAEF,MAAM,eAAK,CAAC,YAAY,EAAE,CAAA;IAC5B,CAAC;;AAGH,kBAAe,aAAa,CAAA"}
+{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":";;;;;AAAA,uBAAuB;AACvB,mEAAyC;AACzC,4CAAoD;AAEpD,MAAM,aAAc,SAAQ,sBAAiC;IAC3D,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;IAEtB,KAAK,CAAC,GAAG;QACd,MAAM,UAAU,GAAG,MAAM,IAAA,2BAAkB,EACzC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAClB,CAAA;QAED,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACnB,CAAC,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;;AAGH,kBAAe,aAAa,CAAA"}

package/build/commands/generate.js

@@ -8,7 +8,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const base_command_1 = __importDefault(require("../base-command"));
 const generator_1 = require("../generator");
-const redis_1 = __importDefault(require("../redis"));
 const config_1 = require("../config");
 const linter_1 = require("../utils/linter");
 const utils_1 = require("../utils");
@@ -25,7 +24,7 @@ class GenerateCommand extends base_command_1.default {
             (0, config_1.setConfig)('output', this.flags.output);
         }
         await this.generate(this.flags['skip-fail'], this.flags['cache-snippet']);
-        await redis_1.default.destroyRedis();
+        await this.cleanup();
     }
     async generate(skipFail, cacheSnippet) {
         this.ora.info('开始生成规则');

package/build/commands/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":";;;;;AAAA,sCAAmC;AACnC,wDAAyB;AACzB,gDAAuB;AAEvB,mEAAyC;AACzC,4CAAkD;AAElD,sCAAqC;AACrC,4CAA6C;AAC7C,oCAAgD;AAEhD,MAAM,eAAgB,SAAQ,sBAAmC;IAC/D,MAAM,CAAC,WAAW,GAAG,MAAM,CAAA;IAEpB,KAAK,CAAC,GAAG;QACd,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YAC5B,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAEjD,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CACb,sDAAsD,CACvD,CAAA;aACF;SACF;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACrB,IAAA,kBAAS,EAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;SACvC;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAA;QAEzE,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,QAAQ,CACpB,QAAkB,EAClB,YAAsB;QAEtB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAEvB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAA;QAChC,MAAM,YAAY,GAAkC,MAAM,CAAC,SAAS,CAAA;QACpE,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAA;QAC9B,MAAM,oBAAoB,GAAG,MAAM,CAAC,cAAc,IAAI,EAAE,CAAA;QACxD,MAAM,iBAAiB,GAAG,MAAM,IAAA,6BAAqB,EACnD,oBAAoB,EACpB,YAAY,CACb,CAAA;QACD,MAAM,cAAc,GAAG,IAAA,qBAAS,EAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAEpD,MAAM,kBAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAEzB,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE;YACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;YAEzC,IAAI;gBACF,MAAM,gBAAgB,GAAG,IAAI,oBAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE;oBACtD,iBAAiB;iBAClB,CAAC,CAAA;gBAEF,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;oBAC7C,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,gBAAgB,gBAAgB,CAAC,YAAY,IAAI,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAA;gBAChH,CAAC,CAAC,CAAA;gBAEF,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAA;gBAE7B,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;gBACtD,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAE5D,IAAI,QAAQ,CAAC,OAAO,EAAE;oBACpB,kBAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;oBAClD,MAAM,kBAAE,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;iBACvE;qBAAM;oBACL,MAAM,kBAAE,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;iBACzC;gBAED,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,OAAO,CAAC,CAAA;aAC7C;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,IAAI,OAAO,CAAC,CAAA;gBAEzC,uBAAuB;gBACvB,IAAI,QAAQ,IAAI,GAAG,YAAY,KAAK,EAAE;oBACpC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,CAAA;iBAChC;qBAAM;oBACL,MAAM,GAAG,CAAA;iBACV;aACF;SACF;QAED,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC5B,CAAC;;AAGH,eAAe,CAAC,KAAK,GAAG;IACtB,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,SAAS;KACvB,CAAC;IACF,eAAe,EAAE,YAAK,CAAC,OAAO,CAAC;QAC7B,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,QAAQ;KACtB,CAAC;IACF,WAAW,EAAE,YAAK,CAAC,OAAO,CAAC;QACzB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,kBAAkB;KAChC,CAAC;IACF,WAAW,EAAE,YAAK,CAAC,OAAO,CAAC;QACzB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,QAAQ;KACtB,CAAC;CACH,CAAA;AAED,kBAAe,eAAe,CAAA"}

package/build/commands/lint.js

@@ -24,6 +24,7 @@ class LintCommand extends base_command_1.default {
         else {
             console.log('✅  JS 语法检查通过');
         }
+        await this.cleanup();
     }
 }
 LintCommand.flags = {

package/build/commands/lint.js.map

@@ -1 +1 @@
-{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":";;;;;AAAA,uBAAuB;AACvB,sCAAmC;AAEnC,mEAAyC;AACzC,4CAAoD;AAEpD,MAAM,WAAY,SAAQ,sBAA+B;IACvD,MAAM,CAAC,WAAW,GAAG,YAAY,CAAA;IAE1B,KAAK,CAAC,GAAG;QACd,IAAI,MAAM,CAAA;QAEV,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;YAClB,MAAM,GAAG,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;SAC5C;aAAM;YACL,MAAM,GAAG,MAAM,IAAA,cAAK,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;SACtC;QAED,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,CAAC,IAAI,CACV,gFAAgF,CACjF,CAAA;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAChB;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;SAC5B;IACH,CAAC;;AAGH,WAAW,CAAC,KAAK,GAAG;IAClB,GAAG,EAAE,YAAK,CAAC,OAAO,CAAC;QACjB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,gBAAgB;KAC9B,CAAC;CACH,CAAA;AAED,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":";;;;;AAAA,uBAAuB;AACvB,sCAAmC;AAEnC,mEAAyC;AACzC,4CAAoD;AAEpD,MAAM,WAAY,SAAQ,sBAA+B;IACvD,MAAM,CAAC,WAAW,GAAG,YAAY,CAAA;IAE1B,KAAK,CAAC,GAAG;QACd,IAAI,MAAM,CAAA;QAEV,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;YAClB,MAAM,GAAG,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;SAC5C;aAAM;YACL,MAAM,GAAG,MAAM,IAAA,cAAK,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;SACtC;QAED,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,CAAC,IAAI,CACV,gFAAgF,CACjF,CAAA;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAChB;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;SAC5B;QAED,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;;AAGH,WAAW,CAAC,KAAK,GAAG;IAClB,GAAG,EAAE,YAAK,CAAC,OAAO,CAAC;QACjB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,gBAAgB;KAC9B,CAAC;CACH,CAAA;AAED,kBAAe,WAAW,CAAA"}

package/build/commands/new.js

@@ -18,11 +18,12 @@ class NewCommand extends base_command_1.default {
             cwd: this.projectDir,
             logger: new hygen_1.Logger(console.log.bind(console)),
             createPrompter: () => require('inquirer'),
-            exec: (action, body) => {
+            exec: async (action, body) => {
                 const opts = body && body.length > 0 ? { input: body } : {};
-                return require('execa').shell(action, opts);
+                await require('execa')(action, opts);
             },
         });
+        await this.cleanup();
     }
 }
 NewCommand.args = {

package/build/commands/new.js.map

@@ -1 +1 @@
-{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":";;;;;AAAA,uBAAuB;AACvB,sCAAkC;AAClC,+BAA2B;AAC3B,wCAA6C;AAE7C,mEAAyC;AACzC,MAAM,gBAAgB,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,sBAAsB,CAAC,CAAA;AAEhE,MAAM,UAAW,SAAQ,sBAA8B;IACrD,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;IAEtB,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,GAAa,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,iBAAiB;QAErE,MAAM,IAAA,cAAM,EAAC,IAAI,EAAE;YACjB,SAAS,EAAE,gBAAgB;YAC3B,GAAG,EAAE,IAAI,CAAC,UAAU;YACpB,MAAM,EAAE,IAAI,cAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,cAAc,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;YACzC,IAAI,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;gBACrB,MAAM,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;gBAC3D,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YAC7C,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;;AAGH,UAAU,CAAC,IAAI,GAAG;IAChB,IAAI,EAAE,WAAI,CAAC,MAAM,CAAC;QAChB,WAAW,EAAE,MAAM;QACnB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC;KAC9C,CAAC,EAAE;CACL,CAAA;AAED,kBAAe,UAAU,CAAA"}
+{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":";;;;;AAAA,uBAAuB;AACvB,sCAAkC;AAClC,+BAA2B;AAC3B,wCAA6C;AAE7C,mEAAyC;AACzC,MAAM,gBAAgB,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,sBAAsB,CAAC,CAAA;AAEhE,MAAM,UAAW,SAAQ,sBAA8B;IACrD,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;IAEtB,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,GAAa,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,iBAAiB;QAErE,MAAM,IAAA,cAAM,EAAC,IAAI,EAAE;YACjB,SAAS,EAAE,gBAAgB;YAC3B,GAAG,EAAE,IAAI,CAAC,UAAU;YACpB,MAAM,EAAE,IAAI,cAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,cAAc,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;YACzC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;gBAC3B,MAAM,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;gBAC3D,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YACtC,CAAC;SACF,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;;AAGH,UAAU,CAAC,IAAI,GAAG;IAChB,IAAI,EAAE,WAAI,CAAC,MAAM,CAAC;QAChB,WAAW,EAAE,MAAM;QACnB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC;KAC9C,CAAC,EAAE;CACL,CAAA;AAED,kBAAe,UAAU,CAAA"}

package/build/commands/subscriptions.js

@@ -31,7 +31,6 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const logger_1 = require("@surgio/logger");
 const base_command_1 = __importDefault(require("../base-command"));
-const redis_1 = __importDefault(require("../redis"));
 const provider_1 = require("../provider");
 const utils_1 = require("../utils");
 const logger = (0, logger_1.createLogger)({
@@ -56,7 +55,7 @@ class SubscriptionsCommand extends base_command_1.default {
                 console.log('⚠️  无法查询 %s 的流量信息', provider.name);
             }
         }
-        await redis_1.default.destroyRedis();
+        await this.cleanup();
     }
     async listProviders() {
         const files = await fs_1.promises.readdir(this.surgioConfig.providerDir, {

package/build/commands/subscriptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions.js","sourceRoot":"","sources":["../../src/commands/subscriptions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uBAAuB;AACvB,2BAAoC;AACpC,+BAAqC;AACrC,2CAA6C;AAE7C,mEAAyC;AACzC,qDAA4B;AAC5B,0CAA+D;AAC/D,oCAAqD;AAErD,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC;IAC1B,OAAO,EAAE,6BAA6B;CACvC,CAAC,CAAA;AAEF,MAAM,oBAAqB,SAAQ,sBAAwC;IACzE,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;IAEtB,KAAK,CAAC,GAAG;QACd,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAE/C,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE;YACnC,IAAI,QAAQ,CAAC,8BAA8B,EAAE;gBAC3C,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,uBAAuB,EAAE,CAAA;gBAEzD,IAAI,QAAQ,EAAE;oBACZ,MAAM,MAAM,GAAG,IAAA,kCAA0B,EAAC,QAAQ,CAAC,CAAA;oBACnD,OAAO,CAAC,GAAG,CACT,+BAA+B,EAC/B,QAAQ,CAAC,IAAI,EACb,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,MAAM,CACd,CAAA;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;iBAChD;aACF;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;aAChD;SACF;QAED,MAAM,eAAK,CAAC,YAAY,EAAE,CAAA;IAC5B,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,MAAM,KAAK,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE;YAC7D,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAA;QACF,MAAM,YAAY,GAA2B,EAAE,CAAA;QAE/C,KAAK,UAAU,YAAY,CACzB,IAAY;YAEZ,IAAI,QAAQ,CAAA;YAEZ,IAAI;gBACF,MAAM,YAAY,GAAG,IAAA,eAAQ,EAAC,IAAI,EAAE,KAAK,CAAC,CAAA;gBAC1C,MAAM,MAAM,GAAG,yBAAa,IAAI,uCAAC,CAAA;gBAEjC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,CAAA;gBAE9C,wCAAwC;gBACxC,QAAQ,GAAG,MAAM,IAAA,sBAAW,EAAC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;aAC3D;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,YAAY,CAAC,CAAA;gBACjC,OAAO,SAAS,CAAA;aACjB;YAED,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE;gBACnB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,gBAAgB,CAAC,CAAA;gBACrC,OAAO,SAAS,CAAA;aACjB;YAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAA;YACzC,OAAO,QAAQ,CAAA;QACjB,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,IAAA,WAAI,EAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAC1C,CAAA;YACD,IAAI,MAAM,EAAE;gBACV,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;aAC1B;SACF;QAED,OAAO,YAAY,CAAA;IACrB,CAAC;;AAGH,kBAAe,oBAAoB,CAAA"}
+{"version":3,"file":"subscriptions.js","sourceRoot":"","sources":["../../src/commands/subscriptions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uBAAuB;AACvB,2BAAoC;AACpC,+BAAqC;AACrC,2CAA6C;AAE7C,mEAAyC;AACzC,0CAA+D;AAC/D,oCAAqD;AAErD,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC;IAC1B,OAAO,EAAE,6BAA6B;CACvC,CAAC,CAAA;AAEF,MAAM,oBAAqB,SAAQ,sBAAwC;IACzE,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;IAEtB,KAAK,CAAC,GAAG;QACd,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAE/C,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE;YACnC,IAAI,QAAQ,CAAC,8BAA8B,EAAE;gBAC3C,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,uBAAuB,EAAE,CAAA;gBAEzD,IAAI,QAAQ,EAAE;oBACZ,MAAM,MAAM,GAAG,IAAA,kCAA0B,EAAC,QAAQ,CAAC,CAAA;oBACnD,OAAO,CAAC,GAAG,CACT,+BAA+B,EAC/B,QAAQ,CAAC,IAAI,EACb,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,MAAM,CACd,CAAA;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;iBAChD;aACF;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;aAChD;SACF;QAED,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,MAAM,KAAK,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE;YAC7D,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAA;QACF,MAAM,YAAY,GAA2B,EAAE,CAAA;QAE/C,KAAK,UAAU,YAAY,CACzB,IAAY;YAEZ,IAAI,QAAQ,CAAA;YAEZ,IAAI;gBACF,MAAM,YAAY,GAAG,IAAA,eAAQ,EAAC,IAAI,EAAE,KAAK,CAAC,CAAA;gBAC1C,MAAM,MAAM,GAAG,yBAAa,IAAI,uCAAC,CAAA;gBAEjC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,CAAA;gBAE9C,wCAAwC;gBACxC,QAAQ,GAAG,MAAM,IAAA,sBAAW,EAAC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;aAC3D;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,YAAY,CAAC,CAAA;gBACjC,OAAO,SAAS,CAAA;aACjB;YAED,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE;gBACnB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,gBAAgB,CAAC,CAAA;gBACrC,OAAO,SAAS,CAAA;aACjB;YAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAA;YACzC,OAAO,QAAQ,CAAA;QACjB,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,IAAA,WAAI,EAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAC1C,CAAA;YACD,IAAI,MAAM,EAAE;gBACV,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;aAC1B;SACF;QAED,OAAO,YAAY,CAAA;IACrB,CAAC;;AAGH,kBAAe,oBAAoB,CAAA"}

package/build/commands/upload.js

@@ -10,7 +10,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const node_dir_1 = __importDefault(require("node-dir"));
 const path_1 = __importDefault(require("path"));
 const base_command_1 = __importDefault(require("../base-command"));
-const redis_1 = __importDefault(require("../redis"));
 const config_1 = require("../config");
 class UploadCommand extends base_command_1.default {
     static description = '上传规则到阿里云 OSS';
@@ -79,8 +78,7 @@ class UploadCommand extends base_command_1.default {
         this.ora.start('开始上传到阿里云 OSS');
         await upload();
         await deleteUnwanted();
-        await redis_1.default.destroyRedis();
-        this.ora.succeed();
+        await this.cleanup();
     }
 }
 UploadCommand.flags = {

package/build/commands/upload.js.map

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

package/build/configurables.d.ts

@@ -67,7 +67,7 @@ export declare const defineSurgioConfig: (config: CommandConfigBeforeNormalize)
     customParams?: Record<string, any> | undefined;
     analytics?: boolean | undefined;
     cache?: {
-        type?: "redis" | "default" | undefined;
+        type?: "default" | "redis" | undefined;
         redisUrl?: string | undefined;
     } | undefined;
 };

package/build/utils/cache.d.ts

@@ -5,7 +5,7 @@ type StoreType = MemoryStore | RedisStore;
 export declare class UnifiedCache {
     #private;
     prepare(): Promise<CacheType>;
-    getType(): Promise<"redis" | "default">;
+    getType(): Promise<"default" | "redis">;
     getBackend(): Promise<CacheType>;
     get: CacheType['get'];
     set: CacheType['set'];

package/build/utils/loon.js

@@ -107,6 +107,12 @@ const getLoonNodes = function (list, filter) {
                         }
                     }
                 }
+                if (nodeConfig.tfo) {
+                    config.push('fast-open=true');
+                }
+                if (nodeConfig.udpRelay) {
+                    config.push('udp=true');
+                }
                 return config.join(',');
             }
             case types_1.NodeTypeEnum.HTTPS: {

package/build/utils/loon.js.map

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

package/build/utils/remote-snippet.js

@@ -95,6 +95,7 @@ const addProxyToSurgeRuleSet = (str, proxyName) => {
                 return `${item},${proxyName}`;
             case 'IP-CIDR':
             case 'IP-CIDR6':
+            case 'IP-ASN':
             case 'GEOIP':
                 rule.splice(2, 0, proxyName);
                 return rule.join(',');

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

@@ -340,9 +340,6 @@ function nodeListMapper(nodeConfig) {
                     ...(0, _1.pickAndFormatStringList)(nodeConfig, ['password', 'downloadBandwidth'], {
                         keyFormat: 'kebabCase',
                     }),
-                    ...(Array.isArray(nodeConfig.alpn)
-                        ? [`alpn=${nodeConfig.alpn.join(',')}`]
-                        : []),
                 ].join(', '),
             ];
         case types_1.NodeTypeEnum.Wireguard:
@@ -376,10 +373,12 @@ function appendCommonConfig(original, nodeConfig) {
             keyFormat: 'kebabCase',
         }),
         ...parseShadowTlsConfig(nodeConfig),
-        ...('alpn' in nodeConfig && Array.isArray(nodeConfig.alpn)
-            ? [`alpn=${nodeConfig.alpn.join(',')}`]
-            : []),
     ];
+    if (nodeConfig.type === types_1.NodeTypeEnum.Tuic) {
+        appendConfig.push(...('alpn' in nodeConfig && Array.isArray(nodeConfig.alpn)
+            ? [`alpn=${nodeConfig.alpn.join(',')}`]
+            : []));
+    }
     if (!appendConfig.length) {
         return original;
     }

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":";;;;;;AAAA,2CAA6C;AAC7C,oDAAsB;AAEtB,0CAAqC;AACrC,oCAKiB;AACjB,yBAAkD;AAClD,wCAAwC;AAExC,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAA;AAEvD,MAAM,qBAAqB,GAAG,CACnC,SAAiC,EACzB,EAAE;IACV,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;SAC1B,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,WAAW,EAAE,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;SACxE,IAAI,CAAC,GAAG,CAAC,CAAA;AACd,CAAC,CAAA;AANY,QAAA,qBAAqB,yBAMjC;AAED;;GAEG;AACI,MAAM,aAAa,GAAG,UAC3B,QAA+C,EAC/C,MAA8C;IAE9C,MAAM,MAAM,GAAa,IAAA,qBAAW,EAAC,QAAQ,EAAE,MAAM,CAAC;SACnD,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClB,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,CAAA;QAEzC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,SAAS,CAAA;SACjB;QAED,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC,GAAG,MAAM,CAAA;QAE3C,OAAO,CAAC,QAAQ,EAAE,kBAAkB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC,CAAA;IACrE,CAAC,CAAC;SACD,MAAM,CACL,CAAC,IAAI,EAA0D,EAAE,CAC/D,IAAI,KAAK,SAAS,CACrB;SACA,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAEzB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC,CAAA;AAvBY,QAAA,aAAa,iBAuBzB;AAEM,MAAM,sBAAsB,GAAG,CACpC,QAA+C,EACvC,EAAE;IACV,MAAM,MAAM,GAAG,QAAQ;SACpB,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClB,IACE,UAAU,CAAC,IAAI,KAAK,oBAAY,CAAC,SAAS;YAC1C,UAAU,CAAC,MAAM,KAAK,KAAK,EAC3B;YACA,OAAO,SAAS,CAAA;SACjB;QAED,MAAM,iBAAiB,GAAa;YAClC,cAAc,UAAU,CAAC,QAAQ,GAAG;YACpC,WAAW,UAAU,CAAC,MAAM,EAAE;YAC9B,eAAe,UAAU,CAAC,UAAU,EAAE;SACvC,CAAA;QACD,MAAM,YAAY,GAAmC;YACnD,KAAK;YACL,YAAY;YACZ,UAAU;SACX,CAAA;QAED,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;YAC9B,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;gBACjC,iBAAiB,CAAC,IAAI,CACpB,GAAG,IAAA,0BAAuB,EAAC,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE;oBAC5C,SAAS,EAAE,WAAW;iBACvB,CAAC,CACH,CAAA;aACF;SACF;QAED,IAAI,UAAU,CAAC,UAAU,EAAE;YACzB,iBAAiB,CAAC,IAAI,CACpB,cAAc,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CACjE,CAAA;SACF;QAED,MAAM,QAAQ,GAAa,EAAE,CAAA;QAE7B,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,KAAK,EAAE;YACnC,MAAM,UAAU,GAAa;gBAC3B,YAAY,IAAI,CAAC,QAAQ,EAAE;gBAC3B,cAAc,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;aAC/C,CAAA;YACD,MAAM,sBAAsB,GAA6B;gBACvD,cAAc;gBACd,YAAY;gBACZ,WAAW;aACZ,CAAA;YAED,KAAK,MAAM,GAAG,IAAI,sBAAsB,EAAE;gBACxC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;oBAC3B,UAAU,CAAC,IAAI,CACb,GAAG,IAAA,0BAAuB,EAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE;wBACtC,SAAS,EAAE,WAAW;wBACtB,cAAc,EAAE,IAAI;qBACrB,CAAC,CACH,CAAA;iBACF;aACF;YAED,uBAAuB;YACvB,IAAI,IAAI,CAAC,YAAY,EAAE;gBACrB,UAAU,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;aAC5D;YAED,QAAQ,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SAC5C;QAED,iBAAiB,CAAC,IAAI,CAAC,QAAQ,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAErD,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;IAEvD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AAC5B,CAAC,CAAA;AA9EY,QAAA,sBAAsB,0BA8ElC;AAEM,MAAM,iBAAiB,GAAG,UAC/B,QAA+C,EAC/C,MAA8C;IAE9C,MAAM,MAAM,GAAa,IAAA,qBAAW,EAAC,QAAQ,EAAE,MAAM,CAAC;SACnD,GAAG,CAAC,cAAc,CAAC;SACnB,MAAM,CACL,CAAC,IAAI,EAA0D,EAAE,CAC/D,IAAI,KAAK,SAAS,CACrB;SACA,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAEzB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC,CAAA;AAbY,QAAA,iBAAiB,qBAa7B;AAED,SAAS,cAAc,CACrB,UAAkC;IAElC,QAAQ,UAAU,CAAC,IAAI,EAAE;QACvB,KAAK,oBAAY,CAAC,WAAW,CAAC,CAAC;YAC7B,IAAI,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBAC9D,MAAM,CAAC,IAAI,CACT,kDAAkD,UAAU,CAAC,QAAQ,OAAO,CAC7E,CAAA;gBACD,OAAO,KAAK,CAAC,CAAA;aACd;YAED,OAAO;gBACL,UAAU,CAAC,QAAQ;gBACnB;oBACE,UAAU,CAAC,QAAQ;oBACnB;wBACE,IAAI;wBACJ,UAAU,CAAC,QAAQ;wBACnB,UAAU,CAAC,IAAI;wBACf,iBAAiB,GAAG,UAAU,CAAC,MAAM;wBACrC,GAAG,IAAA,0BAAuB,EACxB,UAAU,EACV,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAC5C;4BACE,SAAS,EAAE,WAAW;yBACvB,CACF;qBACF,CAAC,IAAI,CAAC,IAAI,CAAC;iBACb,CAAC,IAAI,CAAC,KAAK,CAAC;aACd,CAAA;SACF;QAED,KAAK,oBAAY,CAAC,KAAK,CAAC,CAAC;YACvB,OAAO;gBACL,UAAU,CAAC,QAAQ;gBACnB;oBACE,UAAU,CAAC,QAAQ;oBACnB;wBACE,OAAO;wBACP,UAAU,CAAC,QAAQ;wBACnB,UAAU,CAAC,IAAI;wBACf,UAAU,CAAC,QAAQ;wBACnB,UAAU,CAAC,QAAQ;qBACpB,CAAC,IAAI,CAAC,IAAI,CAAC;iBACb,CAAC,IAAI,CAAC,KAAK,CAAC;aACd,CAAA;SACF;QAED,KAAK,oBAAY,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO;gBACL,UAAU,CAAC,QAAQ;gBACnB;oBACE,UAAU,CAAC,QAAQ;oBACnB;wBACE,MAAM;wBACN,UAAU,CAAC,QAAQ;wBACnB,UAAU,CAAC,IAAI;wBACf,UAAU,CAAC,QAAQ;wBACnB,UAAU,CAAC,QAAQ;qBACpB,CAAC,IAAI,CAAC,IAAI,CAAC;iBACb,CAAC,IAAI,CAAC,KAAK,CAAC;aACd,CAAA;SACF;QAED,KAAK,oBAAY,CAAC,KAAK,CAAC,CAAC;YACvB,OAAO;gBACL,UAAU,CAAC,QAAQ;gBACnB;oBACE,UAAU,CAAC,QAAQ;oBACnB;wBACE,OAAO;wBACP,UAAU,CAAC,QAAQ;wBACnB,UAAU,CAAC,IAAI;wBACf,GAAG,IAAA,0BAAuB,EACxB,UAAU,EACV,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,EAC/C;4BACE,SAAS,EAAE,WAAW;yBACvB,CACF;qBACF,CAAC,IAAI,CAAC,IAAI,CAAC;iBACb,CAAC,IAAI,CAAC,KAAK,CAAC;aACd,CAAA;SACF;QAED,KAAK,oBAAY,CAAC,YAAY,CAAC,CAAC;YAC9B,uBAAuB;YACvB,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;gBACvB,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAA;aACF;YAED,MAAM,IAAI,GAAG;gBACX,IAAI;gBACJ,UAAU,CAAC,QAAQ;gBACnB,IAAI;gBACJ,GAAG,UAAU,CAAC,IAAI,EAAE;gBACpB,IAAI;gBACJ,UAAU,CAAC,MAAM;gBACjB,IAAI;gBACJ,UAAU,CAAC,IAAI;gBACf,IAAI;gBACJ,UAAU,CAAC,QAAQ;gBACnB,IAAI;gBACJ,UAAU,CAAC,QAAQ;gBACnB,IAAI;gBACJ,GAAG,UAAU,CAAC,SAAS,EAAE;gBACzB,IAAI;gBACJ,WAAW;aACZ,CAAA;YAED,IAAI,UAAU,CAAC,UAAU,EAAE;gBACzB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,CAAA;aACvC;YACD,IAAI,UAAU,CAAC,SAAS,EAAE;gBACxB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,CAAA;aACtC;YAED,MAAM,gBAAgB,GAAG;gBACvB,UAAU;gBACV,UAAU,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBAC9C,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrD,gBAAgB,UAAU,CAAC,SAAS,EAAE;aACvC,CAAA;YAED,IAAI,UAAU,CAAC,SAAS,KAAK,CAAC,EAAE;gBAC9B,MAAM,IAAI,KAAK,CACb,kCAAkC,UAAU,CAAC,QAAQ,EAAE,IAAI,8CAA8C,CAC1G,CAAA;aACF;YAED,IAAI,UAAU,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE;gBACzD,gBAAgB,CAAC,IAAI,CACnB,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,EAAE,CAAC,CAC9D,CAAA;aACF;YAED,IAAI,IAAA,OAAI,EAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;gBAC7B,gBAAgB,CAAC,IAAI,CAAC,eAAe,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;aAC5D;YAED,OAAO;gBACL,UAAU,CAAC,QAAQ;gBACnB,CAAC,UAAU,CAAC,QAAQ,EAAE,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;aAC/D,CAAA;SACF;QAED,KAAK,oBAAY,CAAC,KAAK,CAAC,CAAC;YACvB,MAAM,MAAM,GAAG;gBACb,OAAO;gBACP,UAAU,CAAC,QAAQ;gBACnB,UAAU,CAAC,IAAI;gBACf,YAAY,UAAU,CAAC,IAAI,EAAE;aAC9B,CAAA;YAED,IACE,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EACrE;gBACA,MAAM,CAAC,IAAI,CAAC,kBAAkB,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;aACnD;YAED,IAAI,UAAU,CAAC,OAAO,KAAK,IAAI,EAAE;gBAC/B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBACtB,MAAM,CAAC,IAAI,CAAC,WAAW,UAAU,CAAC,IAAI,EAAE,CAAC,CAAA;gBACzC,MAAM,CAAC,IAAI,CACT,aAAa;oBACX,IAAI,CAAC,SAAS,CACZ,IAAA,6BAAqB,EAAC;wBACpB,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,QAAQ;wBAC5C,YAAY,EAAE,kBAAO;wBACrB,GAAG,gBAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,0CAA0C;qBACtF,CAAC,CACH,CACJ,CAAA;aACF;YAED,IAAI,UAAU,CAAC,GAAG,EAAE;gBAClB,MAAM,CAAC,IAAI,CACT,UAAU,EACV,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACvD,CAAA;aACF;YAED,IAAI,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE;gBACtC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;aAC/B;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;aAChC;YAED,OAAO;gBACL,UAAU,CAAC,QAAQ;gBACnB,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;aACrD,CAAA;SACF;QAED,KAAK,oBAAY,CAAC,MAAM,CAAC,CAAC;YACxB,MAAM,MAAM,GAAa;gBACvB,QAAQ;gBACR,UAAU,CAAC,QAAQ;gBACnB,GAAG,UAAU,CAAC,IAAI,EAAE;gBACpB,YAAY,UAAU,CAAC,QAAQ,EAAE;aAClC,CAAA;YAED,IAAI,UAAU,CAAC,OAAO,KAAK,IAAI,EAAE;gBAC/B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBACtB,MAAM,CAAC,IAAI,CAAC,WAAW,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;gBAE3C,IAAI,UAAU,CAAC,SAAS,EAAE;oBACxB,MAAM,CAAC,IAAI,CACT,aAAa;wBACX,IAAI,CAAC,SAAS,CAAC,IAAA,6BAAqB,EAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAC9D,CAAA;iBACF;aACF;YAED,OAAO;gBACL,UAAU,CAAC,QAAQ;gBACnB,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;aACrD,CAAA;SACF;QAED,KAAK,oBAAY,CAAC,MAAM,CAAC,CAAC;YACxB,MAAM,MAAM,GAAG;gBACb,UAAU,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ;gBACjD,UAAU,CAAC,QAAQ;gBACnB,UAAU,CAAC,IAAI;gBACf,GAAG,IAAA,0BAAuB,EACxB,UAAU,EACV,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,EACpC;oBACE,SAAS,EAAE,WAAW;iBACvB,CACF;aACF,CAAA;YAED,IAAI,UAAU,CAAC,GAAG,KAAK,IAAI,EAAE;gBAC3B,MAAM,CAAC,IAAI,CACT,GAAG,CAAC,OAAO,UAAU,CAAC,UAAU,KAAK,QAAQ;oBAC3C,CAAC,CAAC,CAAC,eAAe,UAAU,CAAC,UAAU,EAAE,CAAC;oBAC1C,CAAC,CAAC,EAAE,CAAC,CACR,CAAA;aACF;YAED,OAAO;gBACL,UAAU,CAAC,QAAQ;gBACnB,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;aACrD,CAAA;SACF;QAED,KAAK,oBAAY,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,SAAS,IAAI,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC/D,MAAM,MAAM,GAAG;oBACb,SAAS;oBACT,UAAU,CAAC,QAAQ;oBACnB,UAAU,CAAC,IAAI;oBACf,GAAG,IAAA,0BAAuB,EAAC,UAAU,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE;wBAC3D,SAAS,EAAE,WAAW;qBACvB,CAAC;iBACH,CAAA;gBAED,OAAO;oBACL,UAAU,CAAC,QAAQ;oBACnB,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;iBACrD,CAAA;aACF;YAED,MAAM,MAAM,GAAG;gBACb,MAAM;gBACN,UAAU,CAAC,QAAQ;gBACnB,UAAU,CAAC,IAAI;gBACf,GAAG,IAAA,0BAAuB,EAAC,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE;oBAChD,SAAS,EAAE,WAAW;iBACvB,CAAC;aACH,CAAA;YAED,OAAO;gBACL,UAAU,CAAC,QAAQ;gBACnB,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;aACrD,CAAA;SACF;QAED,KAAK,oBAAY,CAAC,SAAS;YACzB,uBAAuB;YACvB,IAAI,UAAU,CAAC,eAAe,EAAE;gBAC9B,MAAM,CAAC,IAAI,CACT,gDAAgD,UAAU,CAAC,QAAQ,UAAU,CAC9E,CAAA;aACF;YACD,uBAAuB;YACvB,IAAI,UAAU,CAAC,IAAI,EAAE;gBACnB,MAAM,CAAC,IAAI,CACT,qCAAqC,UAAU,CAAC,QAAQ,OAAO,CAChE,CAAA;gBACD,OAAO,SAAS,CAAA;aACjB;YAED,OAAO;gBACL,UAAU,CAAC,QAAQ;gBACnB;oBACE,GAAG,UAAU,CAAC,QAAQ,cAAc;oBACpC,UAAU,CAAC,QAAQ;oBACnB,UAAU,CAAC,IAAI;oBACf,GAAG,IAAA,0BAAuB,EACxB,UAAU,EACV,CAAC,UAAU,EAAE,mBAAmB,CAAC,EACjC;wBACE,SAAS,EAAE,WAAW;qBACvB,CACF;iBACF,CAAC,IAAI,CAAC,IAAI,CAAC;aACb,CAAA;QAEH,KAAK,oBAAY,CAAC,SAAS;YACzB,MAAM,CAAC,IAAI,CACT,mCAAmC,UAAU,CAAC,QAAQ,OAAO,CAC9D,CAAA;YAED,OAAO;gBACL,UAAU,CAAC,QAAQ;gBACnB;oBACE,GAAG,UAAU,CAAC,QAAQ,cAAc;oBACpC,kBAAkB,UAAU,CAAC,QAAQ,EAAE;iBACxC,CAAC,IAAI,CAAC,IAAI,CAAC;aACb,CAAA;QAEH,uBAAuB;QACvB;YACE,MAAM,CAAC,IAAI,CACT,iBAAkB,UAAkB,CAAC,IAAI,WACtC,UAAkB,CAAC,QACtB,OAAO,CACR,CAAA;YACD,OAAO,SAAS,CAAA;KACnB;AACH,CAAC;AAED,SAAS,kBAAkB,CACzB,QAAgB,EAChB,UAAkC;IAElC,MAAM,YAAY,GAAG;QACnB,GAAG,IAAA,0BAAuB,EACxB,UAAU,EACV;YACE,KAAK;YACL,OAAO;YACP,KAAK;YACL,iBAAiB;YACjB,SAAS;YACT,OAAO;YACP,gBAAgB;YAChB,KAAK;YACL,6BAA6B;SAC9B,EACD;YACE,SAAS,EAAE,WAAW;SACvB,CACF;QACD,GAAG,oBAAoB,CAAC,UAAU,CAAC;KACpC,CAAA;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,oBAAY,CAAC,IAAI,EAAE;QACzC,YAAY,CAAC,IAAI,CACf,GAAG,CAAC,MAAM,IAAI,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;YACxD,CAAC,CAAC,CAAC,QAAQ,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,CAAC,CAAC,EAAE,CAAC,CACR,CAAA;KACF;IAED,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACxB,OAAO,QAAQ,CAAA;KAChB;IAED,OAAO,QAAQ,GAAG,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAClD,CAAC;AAED,SAAS,oBAAoB,CAAC,UAAkC;IAC9D,MAAM,MAAM,GAAa,EAAE,CAAA;IAE3B,IAAI,UAAU,CAAC,SAAS,EAAE;QACxB,MAAM,CAAC,IAAI,CACT,uBAAuB,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,EACtD,kBAAkB,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAC7C,CAAA;QAED,IAAI,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE;YAChC,MAAM,CAAC,IAAI,CAAC,sBAAsB,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAA;SAClE;KACF;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}