omegga 1.0.40 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (151) hide show
  1. package/README.md +16 -8
  2. package/dist/brickadia/config.js +23 -12
  3. package/dist/brickadia/config.js.map +1 -1
  4. package/dist/brickadia/presets.d.ts +2 -2
  5. package/dist/brickadia/server.d.ts +0 -1
  6. package/dist/brickadia/server.js +68 -23
  7. package/dist/brickadia/server.js.map +1 -1
  8. package/dist/cli/auth.d.ts +8 -2
  9. package/dist/cli/auth.js +97 -16
  10. package/dist/cli/auth.js.map +1 -1
  11. package/dist/cli/config.d.ts +1 -1
  12. package/dist/cli/config.js.map +1 -1
  13. package/dist/cli/index.d.ts +10 -5
  14. package/dist/cli/installer.js.map +1 -1
  15. package/dist/cli/plugin.js +22 -24
  16. package/dist/cli/plugin.js.map +1 -1
  17. package/dist/cli/terminal.d.ts +0 -1
  18. package/dist/cli/terminal.js +185 -4
  19. package/dist/cli/terminal.js.map +1 -1
  20. package/dist/config/authorizer.js.map +1 -1
  21. package/dist/config/index.js +0 -1
  22. package/dist/config/index.js.map +1 -1
  23. package/dist/config/types.d.ts +12 -4
  24. package/dist/config/validator.js +5 -2
  25. package/dist/config/validator.js.map +1 -1
  26. package/dist/index.js +17 -7
  27. package/dist/index.js.map +1 -1
  28. package/dist/info/default_commands.json +20 -19
  29. package/dist/logger.js +1 -5
  30. package/dist/logger.js.map +1 -1
  31. package/dist/main.js +194 -51
  32. package/dist/main.js.map +1 -1
  33. package/dist/omegga/auth.d.ts +5 -3
  34. package/dist/omegga/auth.js +39 -16
  35. package/dist/omegga/auth.js.map +1 -1
  36. package/dist/omegga/commandInjector.d.ts +1 -1
  37. package/dist/omegga/commandInjector.js +4 -4
  38. package/dist/omegga/commandInjector.js.map +1 -1
  39. package/dist/omegga/index.js +17 -7
  40. package/dist/omegga/index.js.map +1 -1
  41. package/dist/omegga/logWrangler.d.ts +1 -1
  42. package/dist/omegga/logWrangler.js +19 -12
  43. package/dist/omegga/logWrangler.js.map +1 -1
  44. package/dist/omegga/matchers/auth.d.ts +1 -0
  45. package/dist/omegga/matchers/auth.js +5 -5
  46. package/dist/omegga/matchers/auth.js.map +1 -1
  47. package/dist/omegga/matchers/chat.d.ts +1 -0
  48. package/dist/omegga/matchers/chat.js +13 -7
  49. package/dist/omegga/matchers/chat.js.map +1 -1
  50. package/dist/omegga/matchers/command.js +1 -1
  51. package/dist/omegga/matchers/command.js.map +1 -1
  52. package/dist/omegga/matchers/init.js.map +1 -1
  53. package/dist/omegga/matchers/interact.js.map +1 -1
  54. package/dist/omegga/matchers/join.js +12 -10
  55. package/dist/omegga/matchers/join.js.map +1 -1
  56. package/dist/omegga/matchers/leave.js.map +1 -1
  57. package/dist/omegga/matchers/mapChange.js.map +1 -1
  58. package/dist/omegga/matchers/minigameJoin.js.map +1 -1
  59. package/dist/omegga/matchers/types.d.ts +1 -1
  60. package/dist/omegga/matchers/types.js +0 -4
  61. package/dist/omegga/matchers/types.js.map +1 -1
  62. package/dist/omegga/matchers/version.js +36 -30
  63. package/dist/omegga/matchers/version.js.map +1 -1
  64. package/dist/omegga/player.d.ts +4 -2
  65. package/dist/omegga/player.js +50 -66
  66. package/dist/omegga/player.js.map +1 -1
  67. package/dist/omegga/plugin/plugin_jsonrpc_stdio.js +15 -16
  68. package/dist/omegga/plugin/plugin_jsonrpc_stdio.js.map +1 -1
  69. package/dist/omegga/plugin/plugin_node_safe/proxyOmegga.d.ts +13 -1
  70. package/dist/omegga/plugin/plugin_node_safe/proxyOmegga.js +34 -1
  71. package/dist/omegga/plugin/plugin_node_safe/proxyOmegga.js.map +1 -1
  72. package/dist/omegga/plugin/plugin_node_safe/worker.js +3 -4
  73. package/dist/omegga/plugin/plugin_node_safe/worker.js.map +1 -1
  74. package/dist/omegga/plugin/plugin_node_safe.d.ts +0 -1
  75. package/dist/omegga/plugin/plugin_node_safe.js +15 -16
  76. package/dist/omegga/plugin/plugin_node_safe.js.map +1 -1
  77. package/dist/omegga/plugin/plugin_node_unsafe.js +17 -8
  78. package/dist/omegga/plugin/plugin_node_unsafe.js.map +1 -1
  79. package/dist/omegga/plugin.d.ts +1 -1
  80. package/dist/omegga/plugin.js +14 -10
  81. package/dist/omegga/plugin.js.map +1 -1
  82. package/dist/omegga/server.d.ts +13 -0
  83. package/dist/omegga/server.js +103 -11
  84. package/dist/omegga/server.js.map +1 -1
  85. package/dist/omegga/types.d.ts +3 -3
  86. package/dist/omegga/wrapper.d.ts +0 -1
  87. package/dist/omegga/wrapper.js +2 -1
  88. package/dist/omegga/wrapper.js.map +1 -1
  89. package/dist/plugin.d.ts +61 -16
  90. package/dist/plugin.js.map +1 -1
  91. package/dist/softconfig.d.ts +15 -0
  92. package/dist/softconfig.js +23 -1
  93. package/dist/softconfig.js.map +1 -1
  94. package/dist/tsconfig.tsbuildinfo +1 -0
  95. package/dist/util/brick/checkBounds.js +1 -2
  96. package/dist/util/brick/checkBounds.js.map +1 -1
  97. package/dist/util/brick/constants.js +1 -0
  98. package/dist/util/brick/constants.js.map +1 -1
  99. package/dist/util/brick/displayName.d.ts +1 -1
  100. package/dist/util/brick/displayName.js +2 -2
  101. package/dist/util/brick/displayName.js.map +1 -1
  102. package/dist/util/brick/getBounds.js +2 -3
  103. package/dist/util/brick/getBounds.js.map +1 -1
  104. package/dist/util/brick/getBrickSize.js +1 -2
  105. package/dist/util/brick/getBrickSize.js.map +1 -1
  106. package/dist/util/brick/getScaleAxis.js +1 -2
  107. package/dist/util/brick/getScaleAxis.js.map +1 -1
  108. package/dist/util/brick/rotate.js +6 -6
  109. package/dist/util/brick/rotate.js.map +1 -1
  110. package/dist/util/brick/setOwnership.js +5 -3
  111. package/dist/util/brick/setOwnership.js.map +1 -1
  112. package/dist/util/chat.d.ts +1 -1
  113. package/dist/util/color.js +2 -2
  114. package/dist/util/color.js.map +1 -1
  115. package/dist/util/file.js +5 -6
  116. package/dist/util/file.js.map +1 -1
  117. package/dist/util/index.d.ts +6 -7
  118. package/dist/util/index.js +19 -8
  119. package/dist/util/index.js.map +1 -1
  120. package/dist/util/map.js +3 -3
  121. package/dist/util/map.js.map +1 -1
  122. package/dist/util/time.js +8 -8
  123. package/dist/util/time.js.map +1 -1
  124. package/dist/util/wsl.d.ts +1 -1
  125. package/dist/util/wsl.js +8 -6
  126. package/dist/util/wsl.js.map +1 -1
  127. package/dist/webserver/backend/api.js +51 -22
  128. package/dist/webserver/backend/api.js.map +1 -1
  129. package/dist/webserver/backend/database.d.ts +0 -1
  130. package/dist/webserver/backend/database.js +67 -32
  131. package/dist/webserver/backend/database.js.map +1 -1
  132. package/dist/webserver/backend/index.d.ts +0 -1
  133. package/dist/webserver/backend/index.js +17 -8
  134. package/dist/webserver/backend/index.js.map +1 -1
  135. package/dist/webserver/backend/metrics.js +6 -3
  136. package/dist/webserver/backend/metrics.js.map +1 -1
  137. package/dist/webserver/backend/types.d.ts +2 -3
  138. package/dist/webserver/backend/util.js +2 -3
  139. package/dist/webserver/backend/util.js.map +1 -1
  140. package/omegga-config.yml +7 -0
  141. package/package.json +12 -11
  142. package/public/app.bundle.js +31209 -25722
  143. package/public/app.bundle.js.map +1 -1
  144. package/public/app.css +2 -2
  145. package/public/auth.bundle.js +12762 -13651
  146. package/public/auth.bundle.js.map +1 -1
  147. package/public/auth.css +2 -2
  148. package/templates/safe-ts/omegga.d.ts +109 -25
  149. package/tools/install_launcher.sh +0 -5
  150. package/tools/install_steamcmd.sh +88 -0
  151. package/templates/rust/src/main.rs +0 -25
package/README.md CHANGED
@@ -52,13 +52,13 @@ If you need to run omegga as root, make sure your branch is `main-server` or `un
52
52
 
53
53
  ```sh
54
54
  # download nvm
55
- curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
55
+ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
56
56
 
57
57
  # activate nvm
58
58
  . ~/.nvm/nvm.sh
59
59
 
60
- # install node version 20
61
- nvm install 20
60
+ # install node version 24
61
+ nvm install 24
62
62
 
63
63
  # install omegga
64
64
  npm i -g omegga
@@ -74,7 +74,7 @@ If you are having issues running omegga, see the [troubleshooting](#troubleshoot
74
74
  ```sh
75
75
  sudo apt purge nodejs # uninstall old version of nodejs
76
76
  # restart install instructions from this point
77
- nvm install 20 # install node version 20 via nvm
77
+ nvm install 24 # install node version 24 via nvm
78
78
  ```
79
79
 
80
80
  - If you get an error like "`sh: 28: cd: can't cd to .`", you need to be in `bash` (and probably type `cd` to navigate out of root directory):
@@ -105,7 +105,7 @@ If you are having issues running omegga, see the [troubleshooting](#troubleshoot
105
105
  - If you are having trouble installing with nvm and are running **Ubuntu/Debian**, run the following commands (installs node, installs omegga) instead or install node&npm from [NodeSource Binary Distributions](https://github.com/nodesource/distributions/blob/master/README.md).
106
106
 
107
107
  ```sh
108
- curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
108
+ curl -fsSL https://deb.nodesource.com/setup_24.x | sudo -E bash -
109
109
  sudo apt-get install -y nodejs
110
110
  npm i -g omegga
111
111
  ```
@@ -117,7 +117,7 @@ Omegga depends on:
117
117
  - linux
118
118
  - [Windows Install](https://docs.microsoft.com/en-us/windows/wsl/install-win10#manual-installation-steps) (WSL 1 or WSL 2)
119
119
  - [Windows Ubuntu](https://www.microsoft.com/en-us/p/ubuntu/9nblggh4msv6)
120
- - Node v20+ ([ubuntu/deb](https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions), but `nvm` from Quick Setup is better)
120
+ - Node v23+ ([ubuntu/deb](https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions), but `nvm` from Quick Setup is better)
121
121
  - One of:
122
122
  - `tar` (most linuxes come with this, though you can `sudo apt install tar`)
123
123
  - [Brickadia linux launcher](https://brickadia.com/download)
@@ -237,6 +237,14 @@ server:
237
237
 
238
238
  Note: `BRANCH-server` branches download only server data
239
239
 
240
+ ### Environment Variables
241
+
242
+ Not all of them are listed here but here are a few:
243
+
244
+ - `BRICKADIA_TOKEN` - Specify hosting token instead of using config
245
+ - `BRICKADIA_DIR` - Override the need to use steamcmd and point to a brickadia install directory (eg. `/home/<USER>/.config/omegga/steam_installs/main/Brickadia`)
246
+ - `STEAM_INSTALLS_DIR` - Set where omegga installs brickadia via steamcmd (default to `~/.config/omegga/steam_installs`)
247
+
240
248
  ## Troubleshooting
241
249
 
242
250
  Narrow down where the issue might be with the following options:
@@ -251,7 +259,7 @@ Narrow down where the issue might be with the following options:
251
259
  - If a plugin is crashing, message the plugin developer
252
260
  - discord: #plugin-bugs
253
261
  - If you are on Ubuntu and the output of `which npm` is `/bin/npm`
254
- - terminal: `sudo apt purge nodejs` and restart install instructions from `nvm install 20`.
262
+ - terminal: `sudo apt purge nodejs` and restart install instructions from `nvm install 24`.
255
263
  - If you're getting an `EACCES` error when running `npm i -g omegga`:
256
264
  1. First, try [this](https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally).
257
265
  2. If that doesn't work, try this horrible bodge method for WSL:
@@ -802,7 +810,7 @@ Register custom `/commands` by returning `{registeredCommands: ['foo', 'bar']}`
802
810
  | `init` | config object | Returns a start result, called on plugin start | &#9745; |
803
811
  | `stop` | _none_ | Returns _something_, called on plugin stop | &#9745; |
804
812
  | `bootstrap` | [{ omegga info (`host`, `version`, etc) }] | Run when plugin is started for base data | |
805
- | `plugin:players:raw` | [[... [player `name`, `id`, `controller`, `state`]]] | Lists players on the server | |
813
+ | `plugin:players:raw` | [[... [player `username`, `displayName`, `id`, `controller`, `state`]]] | Lists players on the server | |
806
814
  | `plugin:emit` | [event, from, ...args] | Fired when another plugin sends an event | |
807
815
  | `line` | [brickadiaLog string] | A brickadia console log | |
808
816
  | `start` | [{map}] | On brickadia server start | |
@@ -15,26 +15,39 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
26
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
37
  };
28
38
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.read = exports.write = void 0;
39
+ exports.write = write;
40
+ exports.read = read;
30
41
  const fs_1 = __importDefault(require("fs"));
31
42
  const path_1 = __importDefault(require("path"));
32
43
  const file = __importStar(require("../util/file"));
33
- const CONFIG_PATH = 'Saved/Config/LinuxServer';
44
+ const softconfig_1 = require("../softconfig");
45
+ const CONFIG_PATH = 'Config/LinuxServer';
34
46
  const SERVER_SETTINGS = '/ServerSettings.ini';
35
47
  // Function that writes config
36
48
  function write(serverPath, config) {
37
- const configPath = path_1.default.join(serverPath, CONFIG_PATH);
49
+ var _a;
50
+ const configPath = path_1.default.join(serverPath, (_a = config.server.savedDir) !== null && _a !== void 0 ? _a : softconfig_1.CONFIG_SAVED_DIR, CONFIG_PATH);
38
51
  const settingsPath = path_1.default.join(configPath, SERVER_SETTINGS);
39
52
  file.mkdir(configPath);
40
53
  fs_1.default.writeFileSync(settingsPath, `[Server__BP_ServerSettings_General_C BP_ServerSettings_General_C]
@@ -53,9 +66,7 @@ WelcomeMessage="${config.server.welcomeMessage || ''}"
53
66
  bGlobalRulesetSelfDamage=True
54
67
  bGlobalRulesetPhysicsDamage=False`);
55
68
  }
56
- exports.write = write;
57
69
  function read() {
58
70
  // TODO: Implement server config reading
59
71
  }
60
- exports.read = read;
61
72
  //# sourceMappingURL=config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/brickadia/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4CAAoB;AACpB,gDAAwB;AAExB,mDAAqC;AAErC,MAAM,WAAW,GAAG,0BAA0B,CAAC;AAC/C,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAE9C,8BAA8B;AAC9B,SAAgB,KAAK,CAAC,UAAkB,EAAE,MAAe;IACvD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IAE5D,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAEvB,YAAE,CAAC,aAAa,CACd,YAAY,EACZ;;;;;aAKS,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE;oBACjB,MAAM,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE;iBAClC,MAAM,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE;aAChC,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE;kBAElC,gBAAgB,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc;QAC/D,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,OACN;kBACc,MAAM,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE;;kCAElB,CAC/B,CAAC;AACJ,CAAC;AA1BD,sBA0BC;AAED,SAAgB,IAAI;IAClB,wCAAwC;AAC1C,CAAC;AAFD,oBAEC"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/brickadia/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,sBA8BC;AAED,oBAEC;AA5CD,4CAAoB;AACpB,gDAAwB;AAExB,mDAAqC;AAErC,8CAAgD;AAChD,MAAM,WAAW,GAAG,oBAAoB,CAAC;AACzC,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAE9C,8BAA8B;AAC9B,SAAgB,KAAK,CAAC,UAAkB,EAAE,MAAe;;IACvD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAC1B,UAAU,EACV,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,mCAAI,6BAAgB,EAC1C,WAAW,CACZ,CAAC;IACF,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IAE5D,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAEvB,YAAE,CAAC,aAAa,CACd,YAAY,EACZ;;;;;aAKS,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE;oBACjB,MAAM,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE;iBAClC,MAAM,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE;aAChC,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE;kBAElC,gBAAgB,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc;QAC/D,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,OACN;kBACc,MAAM,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE;;kCAElB,CAC/B,CAAC;AACJ,CAAC;AAED,SAAgB,IAAI;IAClB,wCAAwC;AAC1C,CAAC"}
@@ -1,11 +1,11 @@
1
1
  import { BRColor, BRVector } from './types';
2
- export declare type Preset<T extends string, D> = {
2
+ export type Preset<T extends string, D> = {
3
3
  formatVersion?: '1';
4
4
  presetVersion?: '1';
5
5
  type?: T;
6
6
  data?: D;
7
7
  };
8
- export declare type EnvironmentPreset = Preset<'Environment', {
8
+ export type EnvironmentPreset = Preset<'Environment', {
9
9
  groups?: {
10
10
  Sky?: {
11
11
  timeOfDay?: number;
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import { IConfig } from "../config/types";
3
2
  import 'colors';
4
3
  import EventEmitter from 'events';
@@ -20,9 +20,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
20
20
  var _BrickadiaServer_child, _BrickadiaServer_errInterface, _BrickadiaServer_outInterface;
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
22
  const logger_1 = __importDefault(require("../logger"));
23
+ const softconfig_1 = require("../softconfig");
24
+ const auth_1 = require("../cli/auth");
23
25
  const child_process_1 = require("child_process");
24
26
  require("colors");
25
27
  const events_1 = __importDefault(require("events"));
28
+ const fs_1 = require("fs");
26
29
  const path_1 = __importDefault(require("path"));
27
30
  const readline_1 = __importDefault(require("readline"));
28
31
  const strip_ansi_1 = __importDefault(require("strip-ansi"));
@@ -58,26 +61,57 @@ class BrickadiaServer extends events_1.default {
58
61
  }
59
62
  // start the server child process
60
63
  start() {
61
- const { email, password } = this.config.credentials || {};
62
- logger_1.default.verbose('Starting server', (!email && !password ? 'without' : 'with').yellow, 'credentials');
63
- logger_1.default.verbose('Running', (this.config.server.__LOCAL
64
- ? path_1.default.join(__dirname, '../../tools/brickadia.sh')
65
- : 'brickadia launcher').yellow);
66
- if (typeof this.config.server.branch === 'string')
67
- logger_1.default.verbose('Using branch', this.config.server.branch.yellow);
68
- // handle local launcher support
69
- const launchArgs = [
70
- this.config.server.__LOCAL
64
+ var _a;
65
+ const { email, password, token: confToken, } = this.config
66
+ .credentials || {};
67
+ const token = confToken || process.env.BRICKADIA_TOKEN || (0, auth_1.getGlobalToken)();
68
+ if (token) {
69
+ logger_1.default.verbose('Starting server with hosting token');
70
+ }
71
+ else {
72
+ logger_1.default.verbose('Starting server', (!email && !password ? 'without' : 'with').yellow, 'credentials');
73
+ }
74
+ const isSteam = !this.config.server.branch;
75
+ const steamBeta = (_a = this.config.server.steambeta) !== null && _a !== void 0 ? _a : 'main';
76
+ const overrideBinary = softconfig_1.OVERRIDE_GAME_DIR &&
77
+ path_1.default.join(softconfig_1.OVERRIDE_GAME_DIR, // from BRICKADIA_DIR env
78
+ softconfig_1.GAME_BIN_PATH);
79
+ const steamBinary = path_1.default.join(softconfig_1.GAME_INSTALL_DIR, // steam install directory
80
+ steamBeta, // steam beta branch (or main)
81
+ softconfig_1.GAME_DIRNAME, // Brickadia
82
+ softconfig_1.GAME_BIN_PATH // path to binary
83
+ );
84
+ let gameBinary = steamBinary;
85
+ if (overrideBinary) {
86
+ if (!(0, fs_1.existsSync)(overrideBinary)) {
87
+ logger_1.default.error('Override binary', overrideBinary.yellow, 'does not exist!');
88
+ throw new Error(`Override binary ${overrideBinary} does not exist!`);
89
+ }
90
+ logger_1.default.verbose('Using override binary', overrideBinary.yellow, 'instead of', steamBinary.yellow);
91
+ gameBinary = overrideBinary;
92
+ }
93
+ else if (isSteam) {
94
+ logger_1.default.verbose('Using steam binary', steamBeta.yellow);
95
+ }
96
+ else {
97
+ logger_1.default.verbose('Running', (this.config.server.__LOCAL
71
98
  ? path_1.default.join(__dirname, '../../tools/brickadia.sh')
72
- : 'brickadia',
73
- this.config.server.branch && `--branch=${this.config.server.branch}`,
74
- '--server',
75
- '--',
76
- ];
77
- // Either unbuffer or stdbuf must be used because brickadia's output is buffered
78
- // this means that multiple lines can be bundled together if the output buffer is not full
79
- // unfortunately without stdbuf or unbuffer, the output would not happen immediately
80
- __classPrivateFieldSet(this, _BrickadiaServer_child, (0, child_process_1.spawn)('stdbuf', [
99
+ : 'brickadia launcher').yellow);
100
+ if (typeof this.config.server.branch === 'string')
101
+ logger_1.default.verbose('Using branch', this.config.server.branch.yellow);
102
+ }
103
+ // handle local launcher support
104
+ const launchArgs = isSteam
105
+ ? [gameBinary]
106
+ : [
107
+ this.config.server.__LOCAL
108
+ ? path_1.default.join(__dirname, '../../tools/brickadia.sh')
109
+ : 'brickadia',
110
+ this.config.server.branch && `--branch=${this.config.server.branch}`,
111
+ '--server',
112
+ '--',
113
+ ];
114
+ const params = [
81
115
  '--output=L',
82
116
  '--',
83
117
  ...launchArgs,
@@ -86,10 +120,21 @@ class BrickadiaServer extends events_1.default {
86
120
  '-log',
87
121
  require('../util/wsl') === 1 ? '-OneThread' : null,
88
122
  this.path ? `-UserDir="${this.path}"` : null,
89
- email ? `-User="${email}"` : null,
90
- password ? `-Password="${password}"` : null,
123
+ token ? `-Token="${token}"` : null, // remove token argument if not provided
124
+ !token && email ? `-User="${email}"` : null, // remove email argument if not provided or token is provided
125
+ !token && password ? `-Password="${password}"` : null, // remove password argument if not provided or token is provided
91
126
  `-port="${this.config.server.port}"`,
92
- ].filter(Boolean)), "f"); // remove unused arguments
127
+ this.config.server.launchArgs,
128
+ ].filter(Boolean); // remove unused arguments
129
+ logger_1.default.verbose('Params for spawn', params
130
+ .join(' ')
131
+ .replace(/-User=".*?"/, '-User="<hidden>"')
132
+ .replace(/-Password=".*?"/, '-Password="<hidden>"')
133
+ .replace(/-Token=".*?"/, '-Token="<hidden>"'));
134
+ // Either unbuffer or stdbuf must be used because brickadia's output is buffered
135
+ // this means that multiple lines can be bundled together if the output buffer is not full
136
+ // unfortunately without stdbuf or unbuffer, the output would not happen immediately
137
+ __classPrivateFieldSet(this, _BrickadiaServer_child, (0, child_process_1.spawn)('stdbuf', params), "f");
93
138
  logger_1.default.verbose('Spawn process', __classPrivateFieldGet(this, _BrickadiaServer_child, "f") ? __classPrivateFieldGet(this, _BrickadiaServer_child, "f").pid : 'failed'.red);
94
139
  __classPrivateFieldGet(this, _BrickadiaServer_child, "f").stdin.setDefaultEncoding('utf8');
95
140
  __classPrivateFieldSet(this, _BrickadiaServer_outInterface, readline_1.default.createInterface({
@@ -183,6 +228,6 @@ class BrickadiaServer extends events_1.default {
183
228
  this.emit('line', (0, strip_ansi_1.default)(line));
184
229
  }
185
230
  }
186
- exports.default = BrickadiaServer;
187
231
  _BrickadiaServer_child = new WeakMap(), _BrickadiaServer_errInterface = new WeakMap(), _BrickadiaServer_outInterface = new WeakMap();
232
+ exports.default = BrickadiaServer;
188
233
  //# sourceMappingURL=server.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/brickadia/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/brickadia/server.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,18 @@
1
1
  import 'colors';
2
2
  export declare const AUTH_PATH: string;
3
- declare function authFromPrompt({ email, password, debug, branch, }: {
3
+ declare function authFromPrompt({ email, password, debug, isSteam, branch, authDir, savedDir, launchArgs, }: {
4
4
  email?: string | null;
5
5
  password?: string | null;
6
6
  debug?: boolean;
7
+ isSteam?: boolean;
7
8
  branch?: string;
9
+ authDir?: string;
10
+ savedDir?: string;
11
+ launchArgs?: string;
8
12
  }): Promise<boolean>;
9
13
  declare function authExists(dir?: string): boolean;
10
- declare function deleteAuthFiles(): void;
14
+ declare function deleteAuthFiles(dir?: string): void;
15
+ export declare function getGlobalToken(): string;
11
16
  export declare const prompt: typeof authFromPrompt;
12
17
  export declare const exists: typeof authExists;
13
18
  export declare const clean: typeof deleteAuthFiles;
@@ -16,5 +21,6 @@ declare const _default: {
16
21
  prompt: typeof authFromPrompt;
17
22
  exists: typeof authExists;
18
23
  clean: typeof deleteAuthFiles;
24
+ getGlobalToken: typeof getGlobalToken;
19
25
  };
20
26
  export default _default;
package/dist/cli/auth.js CHANGED
@@ -15,23 +15,34 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
26
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
37
  };
28
38
  Object.defineProperty(exports, "__esModule", { value: true });
29
39
  exports.clean = exports.exists = exports.prompt = exports.AUTH_PATH = void 0;
40
+ exports.getGlobalToken = getGlobalToken;
30
41
  const softconfig_1 = __importDefault(require("../softconfig"));
31
42
  const auth_1 = require("../omegga/auth");
32
43
  const file = __importStar(require("../util/file"));
33
44
  require("colors");
34
- const fs_1 = __importDefault(require("fs"));
45
+ const fs_1 = __importStar(require("fs"));
35
46
  const path_1 = __importDefault(require("path"));
36
47
  const prompts_1 = __importDefault(require("prompts"));
37
48
  exports.AUTH_PATH = path_1.default.join(softconfig_1.default.CONFIG_HOME, softconfig_1.default.CONFIG_AUTH_DIR);
@@ -52,9 +63,53 @@ async function credentialPrompt() {
52
63
  ]);
53
64
  return [response.email, response.password];
54
65
  }
55
- async function authFromPrompt({ email, password, debug = false, branch, }) {
66
+ async function authFromPrompt({ email, password, debug = false, isSteam, branch, authDir, savedDir, launchArgs, }) {
56
67
  let files;
57
- if (!email || !password) {
68
+ if (isSteam || !email || !password) {
69
+ // Prompt user to pick to select username/password or Auth Token
70
+ const { authType } = await (0, prompts_1.default)({
71
+ type: 'select',
72
+ name: 'authType',
73
+ message: 'Select authentication method',
74
+ choices: [
75
+ { title: 'Username/Password', value: 'credentials' },
76
+ { title: 'Hosting Token', value: 'token' },
77
+ ],
78
+ });
79
+ if (!authType) {
80
+ console.error('!>'.red, 'No authentication method selected');
81
+ return false;
82
+ }
83
+ if (authType === 'token') {
84
+ // Prompt for hosting token
85
+ const { token } = await (0, prompts_1.default)({
86
+ type: 'password',
87
+ name: 'token',
88
+ message: 'Paste your server hosting token (from https://brickadia.com/account)',
89
+ validate: value => (value ? true : 'Token is required'),
90
+ });
91
+ if (!token) {
92
+ console.error('!>'.red, 'Hosting token is required');
93
+ return false;
94
+ }
95
+ // Write to global token file
96
+ try {
97
+ console.log('>>'.green, 'Storing hosting token...');
98
+ fs_1.default.writeFileSync(softconfig_1.default.GLOBAL_TOKEN, token.trim());
99
+ }
100
+ catch (err) {
101
+ console.error('!>'.red, 'Error writing hosting token to config\n', err);
102
+ return false;
103
+ }
104
+ return true;
105
+ }
106
+ if (isSteam) {
107
+ console.error('!>'.red, 'Launching with steam requires a hosting token right now.');
108
+ return false;
109
+ }
110
+ // Non-steam password auth is handled below
111
+ }
112
+ if (!email || !password || !isSteam) {
58
113
  // prompt for user credentials
59
114
  try {
60
115
  [email, password] = await credentialPrompt();
@@ -64,13 +119,23 @@ async function authFromPrompt({ email, password, debug = false, branch, }) {
64
119
  return false;
65
120
  }
66
121
  }
122
+ if (!email || !password) {
123
+ console.error('!>'.red, 'Email and password are required');
124
+ return false;
125
+ }
67
126
  // generate auth tokens
68
127
  console.log('>>'.green, 'Generating auth tokens...');
69
128
  const timeout = setTimeout(() => {
70
129
  console.log('>>'.green, 'Probably also installing the game...');
71
130
  }, 10000);
72
131
  try {
73
- files = await (0, auth_1.genAuthFiles)(email, password, { debug, branch });
132
+ files = await (0, auth_1.genAuthFiles)(email, password, {
133
+ debug,
134
+ branch,
135
+ authDir,
136
+ savedDir,
137
+ launchArgs,
138
+ });
74
139
  clearTimeout(timeout);
75
140
  }
76
141
  catch (err) {
@@ -85,8 +150,9 @@ async function authFromPrompt({ email, password, debug = false, branch, }) {
85
150
  // save the tokens to the config path (will be copied when omegga starts)
86
151
  try {
87
152
  console.log('>>'.green, 'Storing auth tokens...');
88
- file.mkdir(exports.AUTH_PATH);
89
- (0, auth_1.writeAuthFiles)(exports.AUTH_PATH, files);
153
+ const authPath = path_1.default.join(softconfig_1.default.CONFIG_HOME, savedDir !== softconfig_1.default.CONFIG_SAVED_DIR ? savedDir : '', authDir !== null && authDir !== void 0 ? authDir : softconfig_1.default.CONFIG_AUTH_DIR);
154
+ file.mkdir(authPath);
155
+ (0, auth_1.writeAuthFiles)(authPath, files);
90
156
  }
91
157
  catch (err) {
92
158
  console.error('!>'.red, 'Error writing tokens to config\n', err);
@@ -97,11 +163,25 @@ async function authFromPrompt({ email, password, debug = false, branch, }) {
97
163
  }
98
164
  // check if auth files exist
99
165
  function authExists(dir) {
100
- return softconfig_1.default.BRICKADIA_AUTH_FILES.every(f => fs_1.default.existsSync(path_1.default.join(dir || exports.AUTH_PATH, f)));
166
+ return softconfig_1.default.BRICKADIA_AUTH_FILES.every(f => fs_1.default.existsSync(path_1.default.join(dir !== null && dir !== void 0 ? dir : exports.AUTH_PATH, f)));
101
167
  }
102
168
  // delete auth files stored in config
103
- function deleteAuthFiles() {
104
- file.rmdir(exports.AUTH_PATH);
169
+ // delete auth files stored in config
170
+ function deleteAuthFiles(dir) {
171
+ const isConfigHome = dir && dir.startsWith(softconfig_1.default.CONFIG_HOME);
172
+ // will not delete files outside of the config home
173
+ if (dir && !isConfigHome)
174
+ return;
175
+ file.rmdir(dir !== null && dir !== void 0 ? dir : exports.AUTH_PATH);
176
+ // Remove the global auth token
177
+ if ((0, fs_1.existsSync)(softconfig_1.default.GLOBAL_TOKEN)) {
178
+ fs_1.default.unlinkSync(softconfig_1.default.GLOBAL_TOKEN);
179
+ }
180
+ }
181
+ function getGlobalToken() {
182
+ if (!fs_1.default.existsSync(softconfig_1.default.GLOBAL_TOKEN))
183
+ return null;
184
+ return fs_1.default.readFileSync(softconfig_1.default.GLOBAL_TOKEN, 'utf-8').trim();
105
185
  }
106
186
  exports.prompt = authFromPrompt;
107
187
  exports.exists = authExists;
@@ -111,5 +191,6 @@ exports.default = {
111
191
  prompt: exports.prompt,
112
192
  exists: exports.exists,
113
193
  clean: exports.clean,
194
+ getGlobalToken,
114
195
  };
115
196
  //# sourceMappingURL=auth.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/cli/auth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/cli/auth.ts"],"names":[],"mappings":"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"}
@@ -6,5 +6,5 @@ interface IConfigField {
6
6
  set(value: string): void;
7
7
  }
8
8
  declare const fields: Record<string, IConfigField>;
9
- declare const _default: (field: keyof typeof fields | 'list', value: string, _opts?: {}) => void;
9
+ declare const _default: (field: keyof typeof fields | "list", value: string, _opts?: {}) => void;
10
10
  export default _default;
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":";;;;;AAAA,uCAAgC;AAChC,4CAAoB;AACpB,gDAAwB;AAExB,MAAM,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;AACjE,MAAM,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;AAUjE,MAAM,MAAM,GAAiC;IAC3C,OAAO,EAAE;QACP,IAAI,EAAE,iFAAiF;QACvF,OAAO,EAAE,8BAA8B;QACvC,OAAO,EAAE,GAAG;QACZ,GAAG;YACD,IAAI,GAAG,GAAG,eAAK,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC;YAC5C,IAAI,GAAG,KAAK,GAAG;gBAAE,GAAG,IAAI,wBAAwB,CAAC,IAAI,CAAC;YACtD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,GAAG,CAAC,GAAW;YACb,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,GAAG,GAAG,GAAG,CAAC;YACZ,CAAC;YAED,6BAA6B;YAC7B,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzC,GAAG,CAAC,yCAAyC,CAAC,CAAC;gBAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAChB,OAAO;YACT,CAAC;YACD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxB,GAAG,CAAC,2BAA2B,CAAC,CAAC;gBACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAChB,OAAO;YACT,CAAC;YACD,IAAI,CAAC,YAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBAClC,GAAG,CAAC,mCAAmC,CAAC,CAAC;gBACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAChB,OAAO;YACT,CAAC;YAED,qBAAqB;YACrB,eAAK,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YAChC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;KACF;CACF,CAAC;AAEF,kBAAe,CACb,KAAmC,EACnC,KAAa,EACb,KAAK,GAAG,EAAE,EACV,EAAE;IACF,kEAAkE;IAClE,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;QACrB,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1B,OAAO,CAAC,GAAG,CACT,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,EAC7B,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,EACrC,KAAK,CAAC,IAAI,CACX,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,WAAW,GAAG,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YAC1D,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3C,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,GAAG,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,CAAC,GAAG,EAAE,CAAC;IAChB,CAAC;SAAM,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,kDAAkD;QAClD,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;SAAM,CAAC;QACN,6BAA6B;QAC7B,GAAG,CACD,oBAAoB,EACpB,oBAAoB,CAAC,MAAM,CAAC,SAAS,EACrC,gCAAgC,CACjC,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC"}
@@ -1,16 +1,21 @@
1
1
  import _Terminal from './terminal';
2
2
  export declare const auth: {
3
3
  AUTH_PATH: string;
4
- prompt: ({ email, password, debug, branch, }: {
5
- email?: string;
6
- password?: string;
4
+ prompt: ({ email, password, debug, isSteam, branch, authDir, savedDir, launchArgs, }: {
5
+ email?: string | null;
6
+ password?: string | null;
7
7
  debug?: boolean;
8
+ isSteam?: boolean;
8
9
  branch?: string;
10
+ authDir?: string;
11
+ savedDir?: string;
12
+ launchArgs?: string;
9
13
  }) => Promise<boolean>;
10
14
  exists: (dir?: string) => boolean;
11
- clean: () => void;
15
+ clean: (dir?: string) => void;
16
+ getGlobalToken: typeof import("./auth").getGlobalToken;
12
17
  };
13
- export declare const config: (field: string, value: string, _opts?: {}) => void;
18
+ export declare const config: (field: string | "list", value: string, _opts?: {}) => void;
14
19
  export declare const pluginUtil: {
15
20
  install: typeof import("./plugin").install;
16
21
  update: typeof import("./plugin").update;
@@ -1 +1 @@
1
- {"version":3,"file":"installer.js","sourceRoot":"","sources":["../../src/cli/installer.ts"],"names":[],"mappings":";;;;;AAAA,aAAa;AACb,iDAAsC;AACtC,kBAAgB;AAChB,gDAAwB;AACxB,wDAAgC;AAEhC,MAAM,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;AACjE,MAAM,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;AAEjE,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iCAAiC,CAAC,CAAC;AAE/E,yBAAyB;AACzB,SAAS,MAAM;IACb,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,MAAM,EAAE,GAAG,kBAAQ,CAAC,eAAe,CAAC;YAClC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAC;QAEH,EAAE,CAAC,QAAQ,CACT,IAAI,CAAC,KAAK;YACR,8BAA8B;YAC9B,wBAAwB,CAAC,MAAM,CAAC,SAAS;YACzC,WAAW,EACb,IAAI,CAAC,EAAE;YACL,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACrD,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,2BAA2B;AAC3B,SAAS,YAAY;IACnB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,MAAM,KAAK,GAAG,IAAA,qBAAK,EAAC,cAAc,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAEjE,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE;YACvB,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,eAAe;IAC5B,MAAM,EAAE,GAAG,MAAM,MAAM,EAAE,CAAC;IAE1B,IAAI,CAAC,EAAE,EAAE;QACP,GAAG,CACD,4DAA4D;YAC1D,2BAA2B,CAAC,MAAM,CAAC,SAAS;YAC5C,4BAA4B,CAC/B,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,GAAG,CAAC,+BAA+B,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,MAAM,YAAY,EAAE,CAAC;IACjC,IAAI,GAAG,KAAK,CAAC,EAAE;QACb,GAAG,CAAC,UAAU,CAAC,CAAC;QAChB,OAAO,WAAU,CAAC;KACnB;AACH,CAAC;AAED,eAAe,EAAE,CAAC"}
1
+ {"version":3,"file":"installer.js","sourceRoot":"","sources":["../../src/cli/installer.ts"],"names":[],"mappings":";;;;;AAAA,aAAa;AACb,iDAAsC;AACtC,kBAAgB;AAChB,gDAAwB;AACxB,wDAAgC;AAEhC,MAAM,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;AACjE,MAAM,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;AAEjE,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iCAAiC,CAAC,CAAC;AAE/E,yBAAyB;AACzB,SAAS,MAAM;IACb,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,MAAM,EAAE,GAAG,kBAAQ,CAAC,eAAe,CAAC;YAClC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAC;QAEH,EAAE,CAAC,QAAQ,CACT,IAAI,CAAC,KAAK;YACR,8BAA8B;YAC9B,wBAAwB,CAAC,MAAM,CAAC,SAAS;YACzC,WAAW,EACb,IAAI,CAAC,EAAE;YACL,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACrD,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,2BAA2B;AAC3B,SAAS,YAAY;IACnB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,MAAM,KAAK,GAAG,IAAA,qBAAK,EAAC,cAAc,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAEjE,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE;YACvB,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,eAAe;IAC5B,MAAM,EAAE,GAAG,MAAM,MAAM,EAAE,CAAC;IAE1B,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,GAAG,CACD,4DAA4D;YAC1D,2BAA2B,CAAC,MAAM,CAAC,SAAS;YAC5C,4BAA4B,CAC/B,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,GAAG,CAAC,+BAA+B,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,MAAM,YAAY,EAAE,CAAC;IACjC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;QACd,GAAG,CAAC,UAAU,CAAC,CAAC;QAChB,OAAO,WAAU,CAAC;IACpB,CAAC;AACH,CAAC;AAED,eAAe,EAAE,CAAC"}