surgio 3.2.2 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/build/base-command.d.ts +1 -0
  2. package/build/base-command.js +8 -1
  3. package/build/base-command.js.map +1 -1
  4. package/build/commands/check.js +1 -2
  5. package/build/commands/check.js.map +1 -1
  6. package/build/commands/clean-cache.js +1 -2
  7. package/build/commands/clean-cache.js.map +1 -1
  8. package/build/commands/doctor.js +1 -2
  9. package/build/commands/doctor.js.map +1 -1
  10. package/build/commands/generate.js +1 -2
  11. package/build/commands/generate.js.map +1 -1
  12. package/build/commands/lint.js +1 -0
  13. package/build/commands/lint.js.map +1 -1
  14. package/build/commands/new.js +3 -2
  15. package/build/commands/new.js.map +1 -1
  16. package/build/commands/subscriptions.js +1 -2
  17. package/build/commands/subscriptions.js.map +1 -1
  18. package/build/commands/upload.js +1 -3
  19. package/build/commands/upload.js.map +1 -1
  20. package/build/configurables.d.ts +1 -1
  21. package/build/generator/artifact.d.ts +1 -1
  22. package/build/utils/cache.d.ts +1 -1
  23. package/build/utils/clash.d.ts +1 -1
  24. package/build/utils/clash.js +4 -1
  25. package/build/utils/clash.js.map +1 -1
  26. package/build/utils/loon.js +6 -0
  27. package/build/utils/loon.js.map +1 -1
  28. package/build/utils/remote-snippet.js +1 -0
  29. package/build/utils/remote-snippet.js.map +1 -1
  30. package/build/utils/surge.js +5 -6
  31. package/build/utils/surge.js.map +1 -1
  32. package/build/validators/common.d.ts +2 -2
  33. package/build/validators/http.d.ts +5 -5
  34. package/build/validators/hysteria2.d.ts +3 -3
  35. package/build/validators/shadowsocks.d.ts +2 -2
  36. package/build/validators/shadowsocksr.d.ts +2 -2
  37. package/build/validators/snell.d.ts +2 -2
  38. package/build/validators/socks5.d.ts +2 -2
  39. package/build/validators/surgio-config.d.ts +4 -4
  40. package/build/validators/trojan.d.ts +3 -3
  41. package/build/validators/tuic.d.ts +12 -12
  42. package/build/validators/vmess.d.ts +2 -2
  43. package/hygen-template/artifact/new/index.js +2 -2
  44. package/hygen-template/provider/new/index.js +10 -5
  45. package/hygen-template/provider/new/template.ejs.t +2 -2
  46. package/package.json +1 -1
package/build/base-command.d.ts CHANGED
@@ -15,5 +15,6 @@ declare abstract class BaseCommand<T extends typeof Command> extends Command {
15
15
  protected catch(err: Error & {
16
16
  exitCode?: number;
17
17
  }): Promise<any>;
18
+ protected cleanup(): Promise<void>;
18
19
  }
19
20
  export default BaseCommand;
package/build/base-command.js CHANGED
@@ -8,6 +8,7 @@ const core_1 = require("@oclif/core");
8
8
  const logger_1 = require("@surgio/logger");
9
9
  const ora_1 = __importDefault(require("ora"));
10
10
  const path_1 = require("path");
11
+ const redis_1 = __importDefault(require("./redis"));
11
12
  const config_1 = require("./config");
12
13
  const error_helper_1 = require("./utils/error-helper");
13
14
  class BaseCommand extends core_1.Command {
@@ -39,7 +40,7 @@ class BaseCommand extends core_1.Command {
39
40
  flags.project = (0, path_1.resolve)(process.cwd(), flags.project);
40
41
  }
41
42
  this.projectDir = flags.project;
42
- this.surgioConfig = await (0, config_1.loadConfig)(this.projectDir);
43
+ this.surgioConfig = (0, config_1.loadConfig)(this.projectDir);
43
44
  }
44
45
  async catch(err) {
45
46
  if (this.ora.isSpinning) {
@@ -48,6 +49,12 @@ class BaseCommand extends core_1.Command {
48
49
  await error_helper_1.errorHandler.call(this, err);
49
50
  this.exit(err.exitCode || 1);
50
51
  }
52
+ async cleanup() {
53
+ await redis_1.default.destroyRedis();
54
+ if (this.ora.isSpinning) {
55
+ this.ora.succeed();
56
+ }
57
+ }
51
58
  }
52
59
  BaseCommand.enableJsonFlag = true;
53
60
  BaseCommand.baseFlags = {
package/build/base-command.js.map CHANGED
@@ -1 +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"}
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,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 CHANGED
@@ -32,7 +32,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
32
32
  const path_1 = __importDefault(require("path"));
33
33
  const inquirer_1 = __importDefault(require("inquirer"));
34
34
  const base_command_1 = __importDefault(require("../base-command"));
35
- const redis_1 = __importDefault(require("../redis"));
36
35
  const config_1 = require("../config");
37
36
  const provider_1 = require("../provider");
38
37
  class CheckCommand extends base_command_1.default {
@@ -66,7 +65,7 @@ class CheckCommand extends base_command_1.default {
66
65
  },
67
66
  ]);
68
67
  console.log(JSON.stringify(answers.node, null, 2));
69
- await redis_1.default.destroyRedis();
68
+ await this.cleanup();
70
69
  }
71
70
  async getNodeList(providerName) {
72
71
  core_1.ux.action.start('正在获取 Provider 信息');
package/build/commands/check.js.map CHANGED
@@ -1 +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"}
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,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 CHANGED
@@ -10,7 +10,6 @@ const path_1 = __importDefault(require("path"));
10
10
  const fs_extra_1 = __importDefault(require("fs-extra"));
11
11
  const base_command_1 = __importDefault(require("../base-command"));
12
12
  const constant_1 = require("../constant");
13
- const redis_1 = __importDefault(require("../redis"));
14
13
  const cache_1 = require("../utils/cache");
15
14
  class CleanCacheCommand extends base_command_1.default {
16
15
  static description = '清除缓存';
@@ -22,7 +21,7 @@ class CleanCacheCommand extends base_command_1.default {
22
21
  }
23
22
  await (0, cache_1.cleanCaches)();
24
23
  core_1.ux.action.stop();
25
- await redis_1.default.destroyRedis();
24
+ await this.cleanup();
26
25
  }
27
26
  }
28
27
  exports.default = CleanCacheCommand;
package/build/commands/clean-cache.js.map CHANGED
@@ -1 +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"}
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,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 CHANGED
@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  // istanbul ignore file
7
7
  const base_command_1 = __importDefault(require("../base-command"));
8
- const redis_1 = __importDefault(require("../redis"));
9
8
  const doctor_1 = require("../utils/doctor");
10
9
  class DoctorCommand extends base_command_1.default {
11
10
  static description = '检查运行环境';
@@ -14,7 +13,7 @@ class DoctorCommand extends base_command_1.default {
14
13
  doctorInfo.forEach((item) => {
15
14
  console.log(item);
16
15
  });
17
- await redis_1.default.destroyRedis();
16
+ await this.cleanup();
18
17
  }
19
18
  }
20
19
  exports.default = DoctorCommand;
package/build/commands/doctor.js.map CHANGED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -8,7 +8,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
8
8
  const path_1 = __importDefault(require("path"));
9
9
  const base_command_1 = __importDefault(require("../base-command"));
10
10
  const generator_1 = require("../generator");
11
- const redis_1 = __importDefault(require("../redis"));
12
11
  const config_1 = require("../config");
13
12
  const linter_1 = require("../utils/linter");
14
13
  const utils_1 = require("../utils");
@@ -25,7 +24,7 @@ class GenerateCommand extends base_command_1.default {
25
24
  (0, config_1.setConfig)('output', this.flags.output);
26
25
  }
27
26
  await this.generate(this.flags['skip-fail'], this.flags['cache-snippet']);
28
- await redis_1.default.destroyRedis();
27
+ await this.cleanup();
29
28
  }
30
29
  async generate(skipFail, cacheSnippet) {
31
30
  this.ora.info('开始生成规则');
package/build/commands/generate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
package/build/commands/lint.js CHANGED
@@ -24,6 +24,7 @@ class LintCommand extends base_command_1.default {
24
24
  else {
25
25
  console.log('✅ JS 语法检查通过');
26
26
  }
27
+ await this.cleanup();
27
28
  }
28
29
  }
29
30
  LintCommand.flags = {
package/build/commands/lint.js.map CHANGED
@@ -1 +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"}
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;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 CHANGED
@@ -18,11 +18,12 @@ class NewCommand extends base_command_1.default {
18
18
  cwd: this.projectDir,
19
19
  logger: new hygen_1.Logger(console.log.bind(console)),
20
20
  createPrompter: () => require('inquirer'),
21
- exec: (action, body) => {
21
+ exec: async (action, body) => {
22
22
  const opts = body && body.length > 0 ? { input: body } : {};
23
- return require('execa').shell(action, opts);
23
+ await require('execa')(action, opts);
24
24
  },
25
25
  });
26
+ await this.cleanup();
26
27
  }
27
28
  }
28
29
  NewCommand.args = {
package/build/commands/new.js.map CHANGED
@@ -1 +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"}
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,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 CHANGED
@@ -31,7 +31,6 @@ const fs_1 = require("fs");
31
31
  const path_1 = require("path");
32
32
  const logger_1 = require("@surgio/logger");
33
33
  const base_command_1 = __importDefault(require("../base-command"));
34
- const redis_1 = __importDefault(require("../redis"));
35
34
  const provider_1 = require("../provider");
36
35
  const utils_1 = require("../utils");
37
36
  const logger = (0, logger_1.createLogger)({
@@ -56,7 +55,7 @@ class SubscriptionsCommand extends base_command_1.default {
56
55
  console.log('⚠️ 无法查询 %s 的流量信息', provider.name);
57
56
  }
58
57
  }
59
- await redis_1.default.destroyRedis();
58
+ await this.cleanup();
60
59
  }
61
60
  async listProviders() {
62
61
  const files = await fs_1.promises.readdir(this.surgioConfig.providerDir, {
package/build/commands/subscriptions.js.map CHANGED
@@ -1 +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"}
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,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 CHANGED
@@ -10,7 +10,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
10
10
  const node_dir_1 = __importDefault(require("node-dir"));
11
11
  const path_1 = __importDefault(require("path"));
12
12
  const base_command_1 = __importDefault(require("../base-command"));
13
- const redis_1 = __importDefault(require("../redis"));
14
13
  const config_1 = require("../config");
15
14
  class UploadCommand extends base_command_1.default {
16
15
  static description = '上传规则到阿里云 OSS';
@@ -79,8 +78,7 @@ class UploadCommand extends base_command_1.default {
79
78
  this.ora.start('开始上传到阿里云 OSS');
80
79
  await upload();
81
80
  await deleteUnwanted();
82
- await redis_1.default.destroyRedis();
83
- this.ora.succeed();
81
+ await this.cleanup();
84
82
  }
85
83
  }
86
84
  UploadCommand.flags = {
package/build/commands/upload.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/commands/upload.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/commands/upload.ts"],"names":[],"mappings":"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"}
package/build/configurables.d.ts CHANGED
@@ -67,7 +67,7 @@ export declare const defineSurgioConfig: (config: CommandConfigBeforeNormalize)
67
67
  customParams?: Record<string, any> | undefined;
68
68
  analytics?: boolean | undefined;
69
69
  cache?: {
70
- type?: "redis" | "default" | undefined;
70
+ type?: "default" | "redis" | undefined;
71
71
  redisUrl?: string | undefined;
72
72
  } | undefined;
73
73
  };
package/build/generator/artifact.d.ts CHANGED
@@ -298,7 +298,7 @@ export declare class Artifact extends EventEmitter {
298
298
  readonly getClashNodeNames: (list: readonly PossibleNodeConfigType[], filter?: ((nodeConfig: PossibleNodeConfigType) => boolean) | {
299
299
  readonly filter: <T extends PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
300
300
  readonly supportSort: true;
301
- } | undefined, prependNodeNames?: readonly string[] | undefined) => readonly string[];
301
+ } | undefined, prependNodeNames?: readonly string[] | undefined, defaultNodeNames?: readonly string[] | undefined) => readonly string[];
302
302
  readonly getSurgeNodes: (nodeList: readonly PossibleNodeConfigType[], filter?: ((nodeConfig: PossibleNodeConfigType) => boolean) | {
303
303
  readonly filter: <T extends PossibleNodeConfigType>(nodeList: readonly T[]) => readonly T[];
304
304
  readonly supportSort: true;
package/build/utils/cache.d.ts CHANGED
@@ -5,7 +5,7 @@ type StoreType = MemoryStore | RedisStore;
5
5
  export declare class UnifiedCache {
6
6
  #private;
7
7
  prepare(): Promise<CacheType>;
8
- getType(): Promise<"redis" | "default">;
8
+ getType(): Promise<"default" | "redis">;
9
9
  getBackend(): Promise<CacheType>;
10
10
  get: CacheType['get'];
11
11
  set: CacheType['set'];
package/build/utils/clash.d.ts CHANGED
@@ -219,4 +219,4 @@ export declare const getClashNodes: (list: ReadonlyArray<PossibleNodeConfigType>
219
219
  readonly tls?: undefined;
220
220
  readonly 'skip-cert-verify'?: undefined;
221
221
  } | null>[];
222
- export declare const getClashNodeNames: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeFilterType, prependNodeNames?: ReadonlyArray<string>) => ReadonlyArray<string>;
222
+ export declare const getClashNodeNames: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeFilterType, prependNodeNames?: ReadonlyArray<string>, defaultNodeNames?: ReadonlyArray<string>) => ReadonlyArray<string>;
package/build/utils/clash.js CHANGED
@@ -17,7 +17,7 @@ const getClashNodes = function (list, filter) {
17
17
  .filter((item) => (0, index_1.checkNotNullish)(item));
18
18
  };
19
19
  exports.getClashNodes = getClashNodes;
20
- const getClashNodeNames = function (list, filter, prependNodeNames) {
20
+ const getClashNodeNames = function (list, filter, prependNodeNames, defaultNodeNames) {
21
21
  // istanbul ignore next
22
22
  if (arguments.length === 2 && typeof filter === 'undefined') {
23
23
  throw new Error(constant_1.ERR_INVALID_FILTER);
@@ -27,6 +27,9 @@ const getClashNodeNames = function (list, filter, prependNodeNames) {
27
27
  result = result.concat(prependNodeNames);
28
28
  }
29
29
  result = result.concat((0, exports.getClashNodes)(list, filter).map((item) => item.name));
30
+ if (result.length === 0 && defaultNodeNames) {
31
+ result = result.concat(defaultNodeNames);
32
+ }
30
33
  return result;
31
34
  };
32
35
  exports.getClashNodeNames = getClashNodeNames;
package/build/utils/clash.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"clash.js","sourceRoot":"","sources":["../../src/utils/clash.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clash.js","sourceRoot":"","sources":["../../src/utils/clash.ts"],"names":[],"mappings":"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"}
package/build/utils/loon.js CHANGED
@@ -107,6 +107,12 @@ const getLoonNodes = function (list, filter) {
107
107
  }
108
108
  }
109
109
  }
110
+ if (nodeConfig.tfo) {
111
+ config.push('fast-open=true');
112
+ }
113
+ if (nodeConfig.udpRelay) {
114
+ config.push('udp=true');
115
+ }
110
116
  return config.join(',');
111
117
  }
112
118
  case types_1.NodeTypeEnum.HTTPS: {
package/build/utils/loon.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"loon.js","sourceRoot":"","sources":["../../src/utils/loon.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loon.js","sourceRoot":"","sources":["../../src/utils/loon.ts"],"names":[],"mappings":"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"}
package/build/utils/remote-snippet.js CHANGED
@@ -95,6 +95,7 @@ const addProxyToSurgeRuleSet = (str, proxyName) => {
95
95
  return `${item},${proxyName}`;
96
96
  case 'IP-CIDR':
97
97
  case 'IP-CIDR6':
98
+ case 'IP-ASN':
98
99
  case 'GEOIP':
99
100
  rule.splice(2, 0, proxyName);
100
101
  return rule.join(',');
package/build/utils/remote-snippet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"remote-snippet.js","sourceRoot":"","sources":["../../src/utils/remote-snippet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"remote-snippet.js","sourceRoot":"","sources":["../../src/utils/remote-snippet.ts"],"names":[],"mappings":"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"}
package/build/utils/surge.js CHANGED
@@ -340,9 +340,6 @@ function nodeListMapper(nodeConfig) {
340
340
  ...(0, _1.pickAndFormatStringList)(nodeConfig, ['password', 'downloadBandwidth'], {
341
341
  keyFormat: 'kebabCase',
342
342
  }),
343
- ...(Array.isArray(nodeConfig.alpn)
344
- ? [`alpn=${nodeConfig.alpn.join(',')}`]
345
- : []),
346
343
  ].join(', '),
347
344
  ];
348
345
  case types_1.NodeTypeEnum.Wireguard:
@@ -376,10 +373,12 @@ function appendCommonConfig(original, nodeConfig) {
376
373
  keyFormat: 'kebabCase',
377
374
  }),
378
375
  ...parseShadowTlsConfig(nodeConfig),
379
- ...('alpn' in nodeConfig && Array.isArray(nodeConfig.alpn)
380
- ? [`alpn=${nodeConfig.alpn.join(',')}`]
381
- : []),
382
376
  ];
377
+ if (nodeConfig.type === types_1.NodeTypeEnum.Tuic) {
378
+ appendConfig.push(...('alpn' in nodeConfig && Array.isArray(nodeConfig.alpn)
379
+ ? [`alpn=${nodeConfig.alpn.join(',')}`]
380
+ : []));
381
+ }
383
382
  if (!appendConfig.length) {
384
383
  return original;
385
384
  }
package/build/utils/surge.js.map CHANGED
@@ -1 +1 @@
1
- {"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;oBACD,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;wBAChC,CAAC,CAAC,CAAC,QAAQ,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;wBACvC,CAAC,CAAC,EAAE,CAAC;iBACR,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;QACnC,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;KACR,CAAA;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"}
1
+ {"version":3,"file":"surge.js","sourceRoot":"","sources":["../../src/utils/surge.ts"],"names":[],"mappings":"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"}
package/build/validators/common.d.ts CHANGED
@@ -197,10 +197,10 @@ export declare const TlsNodeConfigValidator: z.ZodObject<{
197
197
  alpn: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
198
198
  serverCertFingerprintSha256: z.ZodOptional<z.ZodString>;
199
199
  }, "strip", z.ZodTypeAny, {
200
+ port: string | number;
200
201
  type: NodeTypeEnum;
201
202
  nodeName: string;
202
203
  hostname: string;
203
- port: string | number;
204
204
  surgeConfig?: {
205
205
  resolveHostname?: boolean | undefined;
206
206
  vmessAEAD?: boolean | undefined;
@@ -234,10 +234,10 @@ export declare const TlsNodeConfigValidator: z.ZodObject<{
234
234
  alpn?: [string, ...string[]] | undefined;
235
235
  serverCertFingerprintSha256?: string | undefined;
236
236
  }, {
237
+ port: string | number;
237
238
  type: NodeTypeEnum;
238
239
  nodeName: string;
239
240
  hostname: string;
240
- port: string | number;
241
241
  surgeConfig?: {
242
242
  resolveHostname?: boolean | undefined;
243
243
  vmessAEAD?: boolean | undefined;
package/build/validators/http.d.ts CHANGED
@@ -67,12 +67,12 @@ export declare const HttpNodeConfigValidator: z.ZodObject<{
67
67
  username: z.ZodString;
68
68
  password: z.ZodString;
69
69
  }, "strip", z.ZodTypeAny, {
70
+ port: string | number;
70
71
  type: NodeTypeEnum.HTTP;
71
72
  username: string;
72
73
  password: string;
73
74
  nodeName: string;
74
75
  hostname: string;
75
- port: string | number;
76
76
  surgeConfig?: {
77
77
  resolveHostname?: boolean | undefined;
78
78
  vmessAEAD?: boolean | undefined;
@@ -101,12 +101,12 @@ export declare const HttpNodeConfigValidator: z.ZodObject<{
101
101
  } | undefined;
102
102
  testUrl?: string | undefined;
103
103
  }, {
104
+ port: string | number;
104
105
  type: NodeTypeEnum.HTTP;
105
106
  username: string;
106
107
  password: string;
107
108
  nodeName: string;
108
109
  hostname: string;
109
- port: string | number;
110
110
  surgeConfig?: {
111
111
  resolveHostname?: boolean | undefined;
112
112
  vmessAEAD?: boolean | undefined;
@@ -136,6 +136,7 @@ export declare const HttpNodeConfigValidator: z.ZodObject<{
136
136
  testUrl?: string | undefined;
137
137
  }>;
138
138
  export declare const HttpsNodeConfigValidator: z.ZodObject<{
139
+ port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
139
140
  surgeConfig: z.ZodOptional<z.ZodObject<{
140
141
  resolveHostname: z.ZodOptional<z.ZodBoolean>;
141
142
  vmessAEAD: z.ZodOptional<z.ZodBoolean>;
@@ -199,7 +200,6 @@ export declare const HttpsNodeConfigValidator: z.ZodObject<{
199
200
  }>>;
200
201
  testUrl: z.ZodOptional<z.ZodString>;
201
202
  hostname: z.ZodString;
202
- port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
203
203
  skipCertVerify: z.ZodOptional<z.ZodBoolean>;
204
204
  alpn: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
205
205
  serverCertFingerprintSha256: z.ZodOptional<z.ZodString>;
@@ -207,12 +207,12 @@ export declare const HttpsNodeConfigValidator: z.ZodObject<{
207
207
  username: z.ZodString;
208
208
  password: z.ZodString;
209
209
  }, "strip", z.ZodTypeAny, {
210
+ port: string | number;
210
211
  type: NodeTypeEnum.HTTPS;
211
212
  username: string;
212
213
  password: string;
213
214
  nodeName: string;
214
215
  hostname: string;
215
- port: string | number;
216
216
  surgeConfig?: {
217
217
  resolveHostname?: boolean | undefined;
218
218
  vmessAEAD?: boolean | undefined;
@@ -246,12 +246,12 @@ export declare const HttpsNodeConfigValidator: z.ZodObject<{
246
246
  alpn?: [string, ...string[]] | undefined;
247
247
  serverCertFingerprintSha256?: string | undefined;
248
248
  }, {
249
+ port: string | number;
249
250
  type: NodeTypeEnum.HTTPS;
250
251
  username: string;
251
252
  password: string;
252
253
  nodeName: string;
253
254
  hostname: string;
254
- port: string | number;
255
255
  surgeConfig?: {
256
256
  resolveHostname?: boolean | undefined;
257
257
  vmessAEAD?: boolean | undefined;
package/build/validators/hysteria2.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { z } from 'zod';
2
2
  import { NodeTypeEnum } from '../types';
3
3
  export declare const Hysteria2NodeConfigValidator: z.ZodObject<{
4
+ port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
4
5
  surgeConfig: z.ZodOptional<z.ZodObject<{
5
6
  resolveHostname: z.ZodOptional<z.ZodBoolean>;
6
7
  vmessAEAD: z.ZodOptional<z.ZodBoolean>;
@@ -64,7 +65,6 @@ export declare const Hysteria2NodeConfigValidator: z.ZodObject<{
64
65
  }>>;
65
66
  testUrl: z.ZodOptional<z.ZodString>;
66
67
  hostname: z.ZodString;
67
- port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
68
68
  skipCertVerify: z.ZodOptional<z.ZodBoolean>;
69
69
  alpn: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
70
70
  serverCertFingerprintSha256: z.ZodOptional<z.ZodString>;
@@ -75,11 +75,11 @@ export declare const Hysteria2NodeConfigValidator: z.ZodObject<{
75
75
  obfs: z.ZodOptional<z.ZodLiteral<"salamander">>;
76
76
  obfsPassword: z.ZodOptional<z.ZodString>;
77
77
  }, "strip", z.ZodTypeAny, {
78
+ port: string | number;
78
79
  type: NodeTypeEnum.Hysteria2;
79
80
  password: string;
80
81
  nodeName: string;
81
82
  hostname: string;
82
- port: string | number;
83
83
  surgeConfig?: {
84
84
  resolveHostname?: boolean | undefined;
85
85
  vmessAEAD?: boolean | undefined;
@@ -117,11 +117,11 @@ export declare const Hysteria2NodeConfigValidator: z.ZodObject<{
117
117
  obfs?: "salamander" | undefined;
118
118
  obfsPassword?: string | undefined;
119
119
  }, {
120
+ port: string | number;
120
121
  type: NodeTypeEnum.Hysteria2;
121
122
  password: string;
122
123
  nodeName: string;
123
124
  hostname: string;
124
- port: string | number;
125
125
  surgeConfig?: {
126
126
  resolveHostname?: boolean | undefined;
127
127
  vmessAEAD?: boolean | undefined;
package/build/validators/shadowsocks.d.ts CHANGED
@@ -75,11 +75,11 @@ export declare const ShadowsocksNodeConfigValidator: z.ZodObject<{
75
75
  tls13: z.ZodOptional<z.ZodBoolean>;
76
76
  mux: z.ZodOptional<z.ZodBoolean>;
77
77
  }, "strip", z.ZodTypeAny, {
78
+ port: string | number;
78
79
  type: NodeTypeEnum.Shadowsocks;
79
80
  password: string;
80
81
  nodeName: string;
81
82
  hostname: string;
82
- port: string | number;
83
83
  method: string;
84
84
  surgeConfig?: {
85
85
  resolveHostname?: boolean | undefined;
@@ -117,11 +117,11 @@ export declare const ShadowsocksNodeConfigValidator: z.ZodObject<{
117
117
  tls13?: boolean | undefined;
118
118
  mux?: boolean | undefined;
119
119
  }, {
120
+ port: string | number;
120
121
  type: NodeTypeEnum.Shadowsocks;
121
122
  password: string;
122
123
  nodeName: string;
123
124
  hostname: string;
124
- port: string | number;
125
125
  method: string;
126
126
  surgeConfig?: {
127
127
  resolveHostname?: boolean | undefined;
package/build/validators/shadowsocksr.d.ts CHANGED
@@ -72,11 +72,11 @@ export declare const ShadowsocksrNodeConfigValidator: z.ZodObject<{
72
72
  protoparam: z.ZodString;
73
73
  udpRelay: z.ZodOptional<z.ZodBoolean>;
74
74
  }, "strip", z.ZodTypeAny, {
75
+ port: string | number;
75
76
  type: NodeTypeEnum.Shadowsocksr;
76
77
  password: string;
77
78
  nodeName: string;
78
79
  hostname: string;
79
- port: string | number;
80
80
  method: string;
81
81
  obfs: string;
82
82
  obfsparam: string;
@@ -111,11 +111,11 @@ export declare const ShadowsocksrNodeConfigValidator: z.ZodObject<{
111
111
  testUrl?: string | undefined;
112
112
  udpRelay?: boolean | undefined;
113
113
  }, {
114
+ port: string | number;
114
115
  type: NodeTypeEnum.Shadowsocksr;
115
116
  password: string;
116
117
  nodeName: string;
117
118
  hostname: string;
118
- port: string | number;
119
119
  method: string;
120
120
  obfs: string;
121
121
  obfsparam: string;
package/build/validators/snell.d.ts CHANGED
@@ -70,10 +70,10 @@ export declare const SnellNodeConfigValidator: z.ZodObject<{
70
70
  reuse: z.ZodOptional<z.ZodBoolean>;
71
71
  version: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>>;
72
72
  }, "strip", z.ZodTypeAny, {
73
+ port: string | number;
73
74
  type: NodeTypeEnum.Snell;
74
75
  nodeName: string;
75
76
  hostname: string;
76
- port: string | number;
77
77
  psk: string;
78
78
  surgeConfig?: {
79
79
  resolveHostname?: boolean | undefined;
@@ -107,10 +107,10 @@ export declare const SnellNodeConfigValidator: z.ZodObject<{
107
107
  reuse?: boolean | undefined;
108
108
  version?: string | number | undefined;
109
109
  }, {
110
+ port: string | number;
110
111
  type: NodeTypeEnum.Snell;
111
112
  nodeName: string;
112
113
  hostname: string;
113
- port: string | number;
114
114
  psk: string;
115
115
  surgeConfig?: {
116
116
  resolveHostname?: boolean | undefined;
package/build/validators/socks5.d.ts CHANGED
@@ -72,10 +72,10 @@ export declare const Socks5NodeConfigValidator: z.ZodObject<{
72
72
  sni: z.ZodOptional<z.ZodString>;
73
73
  clientCert: z.ZodOptional<z.ZodString>;
74
74
  }, "strip", z.ZodTypeAny, {
75
+ port: string | number;
75
76
  type: NodeTypeEnum.Socks5;
76
77
  nodeName: string;
77
78
  hostname: string;
78
- port: string | number;
79
79
  surgeConfig?: {
80
80
  resolveHostname?: boolean | undefined;
81
81
  vmessAEAD?: boolean | undefined;
@@ -111,10 +111,10 @@ export declare const Socks5NodeConfigValidator: z.ZodObject<{
111
111
  sni?: string | undefined;
112
112
  clientCert?: string | undefined;
113
113
  }, {
114
+ port: string | number;
114
115
  type: NodeTypeEnum.Socks5;
115
116
  nodeName: string;
116
117
  hostname: string;
117
- port: string | number;
118
118
  surgeConfig?: {
119
119
  resolveHostname?: boolean | undefined;
120
120
  vmessAEAD?: boolean | undefined;
package/build/validators/surgio-config.d.ts CHANGED
@@ -211,10 +211,10 @@ export declare const SurgioConfigValidator: z.ZodObject<{
211
211
  type: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"redis">, z.ZodLiteral<"default">]>>;
212
212
  redisUrl: z.ZodOptional<z.ZodString>;
213
213
  }, "strip", z.ZodTypeAny, {
214
- type?: "redis" | "default" | undefined;
214
+ type?: "default" | "redis" | undefined;
215
215
  redisUrl?: string | undefined;
216
216
  }, {
217
- type?: "redis" | "default" | undefined;
217
+ type?: "default" | "redis" | undefined;
218
218
  redisUrl?: string | undefined;
219
219
  }>>;
220
220
  }, "strip", z.ZodTypeAny, {
@@ -284,7 +284,7 @@ export declare const SurgioConfigValidator: z.ZodObject<{
284
284
  customParams?: Record<string, any> | undefined;
285
285
  analytics?: boolean | undefined;
286
286
  cache?: {
287
- type?: "redis" | "default" | undefined;
287
+ type?: "default" | "redis" | undefined;
288
288
  redisUrl?: string | undefined;
289
289
  } | undefined;
290
290
  }, {
@@ -354,7 +354,7 @@ export declare const SurgioConfigValidator: z.ZodObject<{
354
354
  customParams?: Record<string, any> | undefined;
355
355
  analytics?: boolean | undefined;
356
356
  cache?: {
357
- type?: "redis" | "default" | undefined;
357
+ type?: "default" | "redis" | undefined;
358
358
  redisUrl?: string | undefined;
359
359
  } | undefined;
360
360
  }>;
package/build/validators/trojan.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { z } from 'zod';
2
2
  import { NodeTypeEnum } from '../types';
3
3
  export declare const TrojanNodeConfigValidator: z.ZodObject<{
4
+ port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
4
5
  surgeConfig: z.ZodOptional<z.ZodObject<{
5
6
  resolveHostname: z.ZodOptional<z.ZodBoolean>;
6
7
  vmessAEAD: z.ZodOptional<z.ZodBoolean>;
@@ -64,7 +65,6 @@ export declare const TrojanNodeConfigValidator: z.ZodObject<{
64
65
  }>>;
65
66
  testUrl: z.ZodOptional<z.ZodString>;
66
67
  hostname: z.ZodString;
67
- port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
68
68
  skipCertVerify: z.ZodOptional<z.ZodBoolean>;
69
69
  alpn: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
70
70
  serverCertFingerprintSha256: z.ZodOptional<z.ZodString>;
@@ -75,11 +75,11 @@ export declare const TrojanNodeConfigValidator: z.ZodObject<{
75
75
  wsPath: z.ZodOptional<z.ZodString>;
76
76
  wsHeaders: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
77
77
  }, "strip", z.ZodTypeAny, {
78
+ port: string | number;
78
79
  type: NodeTypeEnum.Trojan;
79
80
  password: string;
80
81
  nodeName: string;
81
82
  hostname: string;
82
- port: string | number;
83
83
  surgeConfig?: {
84
84
  resolveHostname?: boolean | undefined;
85
85
  vmessAEAD?: boolean | undefined;
@@ -117,11 +117,11 @@ export declare const TrojanNodeConfigValidator: z.ZodObject<{
117
117
  wsPath?: string | undefined;
118
118
  wsHeaders?: Record<string, string> | undefined;
119
119
  }, {
120
+ port: string | number;
120
121
  type: NodeTypeEnum.Trojan;
121
122
  password: string;
122
123
  nodeName: string;
123
124
  hostname: string;
124
- port: string | number;
125
125
  surgeConfig?: {
126
126
  resolveHostname?: boolean | undefined;
127
127
  vmessAEAD?: boolean | undefined;
package/build/validators/tuic.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { z } from 'zod';
2
2
  import { NodeTypeEnum } from '../types';
3
3
  export declare const TuicNodeV5ConfigValidator: z.ZodObject<{
4
+ port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
4
5
  surgeConfig: z.ZodOptional<z.ZodObject<{
5
6
  resolveHostname: z.ZodOptional<z.ZodBoolean>;
6
7
  vmessAEAD: z.ZodOptional<z.ZodBoolean>;
@@ -64,7 +65,6 @@ export declare const TuicNodeV5ConfigValidator: z.ZodObject<{
64
65
  }>>;
65
66
  testUrl: z.ZodOptional<z.ZodString>;
66
67
  hostname: z.ZodString;
67
- port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
68
68
  skipCertVerify: z.ZodOptional<z.ZodBoolean>;
69
69
  alpn: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
70
70
  serverCertFingerprintSha256: z.ZodOptional<z.ZodString>;
@@ -73,12 +73,12 @@ export declare const TuicNodeV5ConfigValidator: z.ZodObject<{
73
73
  uuid: z.ZodString;
74
74
  version: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
75
75
  }, "strip", z.ZodTypeAny, {
76
+ port: string | number;
76
77
  type: NodeTypeEnum.Tuic;
77
78
  password: string;
78
79
  nodeName: string;
79
80
  version: string | number;
80
81
  hostname: string;
81
- port: string | number;
82
82
  uuid: string;
83
83
  surgeConfig?: {
84
84
  resolveHostname?: boolean | undefined;
@@ -113,12 +113,12 @@ export declare const TuicNodeV5ConfigValidator: z.ZodObject<{
113
113
  alpn?: [string, ...string[]] | undefined;
114
114
  serverCertFingerprintSha256?: string | undefined;
115
115
  }, {
116
+ port: string | number;
116
117
  type: NodeTypeEnum.Tuic;
117
118
  password: string;
118
119
  nodeName: string;
119
120
  version: string | number;
120
121
  hostname: string;
121
- port: string | number;
122
122
  uuid: string;
123
123
  surgeConfig?: {
124
124
  resolveHostname?: boolean | undefined;
@@ -154,6 +154,7 @@ export declare const TuicNodeV5ConfigValidator: z.ZodObject<{
154
154
  serverCertFingerprintSha256?: string | undefined;
155
155
  }>;
156
156
  export declare const TuicNodeV4ConfigValidator: z.ZodObject<{
157
+ port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
157
158
  surgeConfig: z.ZodOptional<z.ZodObject<{
158
159
  resolveHostname: z.ZodOptional<z.ZodBoolean>;
159
160
  vmessAEAD: z.ZodOptional<z.ZodBoolean>;
@@ -217,17 +218,16 @@ export declare const TuicNodeV4ConfigValidator: z.ZodObject<{
217
218
  }>>;
218
219
  testUrl: z.ZodOptional<z.ZodString>;
219
220
  hostname: z.ZodString;
220
- port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
221
221
  skipCertVerify: z.ZodOptional<z.ZodBoolean>;
222
222
  alpn: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
223
223
  serverCertFingerprintSha256: z.ZodOptional<z.ZodString>;
224
224
  type: z.ZodLiteral<NodeTypeEnum.Tuic>;
225
225
  token: z.ZodString;
226
226
  }, "strip", z.ZodTypeAny, {
227
+ port: string | number;
227
228
  type: NodeTypeEnum.Tuic;
228
229
  nodeName: string;
229
230
  hostname: string;
230
- port: string | number;
231
231
  token: string;
232
232
  surgeConfig?: {
233
233
  resolveHostname?: boolean | undefined;
@@ -262,10 +262,10 @@ export declare const TuicNodeV4ConfigValidator: z.ZodObject<{
262
262
  alpn?: [string, ...string[]] | undefined;
263
263
  serverCertFingerprintSha256?: string | undefined;
264
264
  }, {
265
+ port: string | number;
265
266
  type: NodeTypeEnum.Tuic;
266
267
  nodeName: string;
267
268
  hostname: string;
268
- port: string | number;
269
269
  token: string;
270
270
  surgeConfig?: {
271
271
  resolveHostname?: boolean | undefined;
@@ -301,6 +301,7 @@ export declare const TuicNodeV4ConfigValidator: z.ZodObject<{
301
301
  serverCertFingerprintSha256?: string | undefined;
302
302
  }>;
303
303
  export declare const TuicNodeConfigValidator: z.ZodUnion<[z.ZodObject<{
304
+ port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
304
305
  surgeConfig: z.ZodOptional<z.ZodObject<{
305
306
  resolveHostname: z.ZodOptional<z.ZodBoolean>;
306
307
  vmessAEAD: z.ZodOptional<z.ZodBoolean>;
@@ -364,17 +365,16 @@ export declare const TuicNodeConfigValidator: z.ZodUnion<[z.ZodObject<{
364
365
  }>>;
365
366
  testUrl: z.ZodOptional<z.ZodString>;
366
367
  hostname: z.ZodString;
367
- port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
368
368
  skipCertVerify: z.ZodOptional<z.ZodBoolean>;
369
369
  alpn: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
370
370
  serverCertFingerprintSha256: z.ZodOptional<z.ZodString>;
371
371
  type: z.ZodLiteral<NodeTypeEnum.Tuic>;
372
372
  token: z.ZodString;
373
373
  }, "strip", z.ZodTypeAny, {
374
+ port: string | number;
374
375
  type: NodeTypeEnum.Tuic;
375
376
  nodeName: string;
376
377
  hostname: string;
377
- port: string | number;
378
378
  token: string;
379
379
  surgeConfig?: {
380
380
  resolveHostname?: boolean | undefined;
@@ -409,10 +409,10 @@ export declare const TuicNodeConfigValidator: z.ZodUnion<[z.ZodObject<{
409
409
  alpn?: [string, ...string[]] | undefined;
410
410
  serverCertFingerprintSha256?: string | undefined;
411
411
  }, {
412
+ port: string | number;
412
413
  type: NodeTypeEnum.Tuic;
413
414
  nodeName: string;
414
415
  hostname: string;
415
- port: string | number;
416
416
  token: string;
417
417
  surgeConfig?: {
418
418
  resolveHostname?: boolean | undefined;
@@ -447,6 +447,7 @@ export declare const TuicNodeConfigValidator: z.ZodUnion<[z.ZodObject<{
447
447
  alpn?: [string, ...string[]] | undefined;
448
448
  serverCertFingerprintSha256?: string | undefined;
449
449
  }>, z.ZodObject<{
450
+ port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
450
451
  surgeConfig: z.ZodOptional<z.ZodObject<{
451
452
  resolveHostname: z.ZodOptional<z.ZodBoolean>;
452
453
  vmessAEAD: z.ZodOptional<z.ZodBoolean>;
@@ -510,7 +511,6 @@ export declare const TuicNodeConfigValidator: z.ZodUnion<[z.ZodObject<{
510
511
  }>>;
511
512
  testUrl: z.ZodOptional<z.ZodString>;
512
513
  hostname: z.ZodString;
513
- port: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
514
514
  skipCertVerify: z.ZodOptional<z.ZodBoolean>;
515
515
  alpn: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
516
516
  serverCertFingerprintSha256: z.ZodOptional<z.ZodString>;
@@ -519,12 +519,12 @@ export declare const TuicNodeConfigValidator: z.ZodUnion<[z.ZodObject<{
519
519
  uuid: z.ZodString;
520
520
  version: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, string | number, string | number>;
521
521
  }, "strip", z.ZodTypeAny, {
522
+ port: string | number;
522
523
  type: NodeTypeEnum.Tuic;
523
524
  password: string;
524
525
  nodeName: string;
525
526
  version: string | number;
526
527
  hostname: string;
527
- port: string | number;
528
528
  uuid: string;
529
529
  surgeConfig?: {
530
530
  resolveHostname?: boolean | undefined;
@@ -559,12 +559,12 @@ export declare const TuicNodeConfigValidator: z.ZodUnion<[z.ZodObject<{
559
559
  alpn?: [string, ...string[]] | undefined;
560
560
  serverCertFingerprintSha256?: string | undefined;
561
561
  }, {
562
+ port: string | number;
562
563
  type: NodeTypeEnum.Tuic;
563
564
  password: string;
564
565
  nodeName: string;
565
566
  version: string | number;
566
567
  hostname: string;
567
- port: string | number;
568
568
  uuid: string;
569
569
  surgeConfig?: {
570
570
  resolveHostname?: boolean | undefined;
package/build/validators/vmess.d.ts CHANGED
@@ -77,10 +77,10 @@ export declare const VmessNodeConfigValidator: z.ZodObject<{
77
77
  wsHeaders: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
78
78
  serverCertFingerprintSha256: z.ZodOptional<z.ZodString>;
79
79
  }, "strip", z.ZodTypeAny, {
80
+ port: string | number;
80
81
  type: NodeTypeEnum.Vmess;
81
82
  nodeName: string;
82
83
  hostname: string;
83
- port: string | number;
84
84
  method: "none" | "aes-128-gcm" | "chacha20-ietf-poly1305" | "auto";
85
85
  tls: boolean;
86
86
  uuid: string;
@@ -121,10 +121,10 @@ export declare const VmessNodeConfigValidator: z.ZodObject<{
121
121
  wsHeaders?: Record<string, string> | undefined;
122
122
  serverCertFingerprintSha256?: string | undefined;
123
123
  }, {
124
+ port: string | number;
124
125
  type: NodeTypeEnum.Vmess;
125
126
  nodeName: string;
126
127
  hostname: string;
127
- port: string | number;
128
128
  method: "none" | "aes-128-gcm" | "chacha20-ietf-poly1305" | "auto";
129
129
  tls: boolean;
130
130
  uuid: string;
package/hygen-template/artifact/new/index.js CHANGED
@@ -4,11 +4,11 @@ const { basename } = require('path')
4
4
  const { promises: fsp } = require('fs')
5
5
  const _ = require('lodash')
6
6
 
7
- const internal = require('../../../build/internal')
7
+ const { loadConfig } = require('../../../build/config')
8
8
 
9
9
  module.exports = {
10
10
  prompt: ({ prompter: inquirer }) => {
11
- const config = internal.config.loadConfig(process.cwd())
11
+ const config = loadConfig(process.cwd())
12
12
 
13
13
  return inquirer.prompt([
14
14
  {
package/hygen-template/provider/new/index.js CHANGED
@@ -1,7 +1,6 @@
1
1
  'use strict'
2
2
 
3
- const { types } = require('../../../build/internal')
4
- const { SupportProviderEnum } = types
3
+ const { SupportProviderEnum } = require('../../../build/internal')
5
4
 
6
5
  module.exports = {
7
6
  prompt: ({ prompter: inquirer }) => {
@@ -57,9 +56,8 @@ module.exports = {
57
56
  },
58
57
  {
59
58
  type: 'confirm',
60
- name: 'relayUrl',
61
- message:
62
- '是否开启订阅转发，推荐使用了封锁 now.sh IP 的机场开启（默认关闭）',
59
+ name: 'isRelayUrlEnabled',
60
+ message: '是否开启订阅转发（默认关闭）',
63
61
  default: false,
64
62
  when: (results) => {
65
63
  return [
@@ -71,6 +69,13 @@ module.exports = {
71
69
  ].includes(results.type)
72
70
  },
73
71
  },
72
+ {
73
+ type: 'input',
74
+ name: 'relayUrl',
75
+ message: '输入订阅转发地址',
76
+ when: (results) => results.isRelayUrlEnabled,
77
+ validate: (str) => /^https?:\/{2}/.test(str),
78
+ },
74
79
  ])
75
80
  },
76
81
  }
package/hygen-template/provider/new/template.ejs.t CHANGED
@@ -20,8 +20,8 @@ module.exports = {
20
20
  <% if (typeof udpRelay !== 'undefined' && udpRelay === true) { -%>
21
21
  udpRelay: true,
22
22
  <% } -%>
23
- <% if (typeof relayUrl !== 'undefined' && relayUrl === true) { -%>
24
- relayUrl: true,
23
+ <% if (typeof relayUrl === 'string') { -%>
24
+ relayUrl: '<%= relayUrl %>',
25
25
  <% } -%>
26
26
  };
27
27
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "surgio",
3
3
  "description": "Generating rules for Surge, Clash, Quantumult like a PRO",
4
- "version": "3.2.2",
4
+ "version": "3.3.0",
5
5
  "main": "./build/index.js",
6
6
  "types": "./build/index.d.ts",
7
7
  "bin": {