omegga 1.1.1 → 1.2.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.
- package/README.md +10 -1
- package/bin/omegga +1 -19
- package/dist/brickadia/server.d.ts +17 -0
- package/dist/brickadia/server.js +81 -4
- package/dist/brickadia/server.js.map +1 -1
- package/dist/cli/auth.js +1 -1
- package/dist/cli/auth.js.map +1 -1
- package/dist/cli/installer.d.ts +1 -1
- package/dist/cli/installer.js +5 -8
- package/dist/cli/installer.js.map +1 -1
- package/dist/cli/terminal.js +102 -8
- package/dist/cli/terminal.js.map +1 -1
- package/dist/config/reader.js.map +1 -1
- package/dist/config/types.d.ts +5 -0
- package/dist/main.js +76 -69
- package/dist/main.js.map +1 -1
- package/dist/omegga/player.js +34 -13
- package/dist/omegga/player.js.map +1 -1
- package/dist/omegga/plugin/plugin_jsonrpc_stdio.js.map +1 -1
- package/dist/omegga/plugin/plugin_node_safe/proxyOmegga.d.ts +5 -5
- package/dist/omegga/plugin.d.ts +2 -2
- package/dist/omegga/plugin.js +3 -2
- package/dist/omegga/plugin.js.map +1 -1
- package/dist/omegga/server.d.ts +6 -5
- package/dist/omegga/server.js +128 -84
- package/dist/omegga/server.js.map +1 -1
- package/dist/omegga/wrapper.d.ts +11 -0
- package/dist/omegga/wrapper.js +16 -0
- package/dist/omegga/wrapper.js.map +1 -1
- package/dist/plugin.d.ts +7 -9
- package/dist/plugin.js.map +1 -1
- package/dist/softconfig.d.ts +1 -0
- package/dist/softconfig.js +2 -1
- package/dist/softconfig.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/updater/index.d.ts +1 -0
- package/dist/updater/index.js +10 -0
- package/dist/updater/index.js.map +1 -0
- package/dist/updater/steam.d.ts +52 -0
- package/dist/updater/steam.js +139 -0
- package/dist/updater/steam.js.map +1 -0
- package/dist/util/color.js +7 -7
- package/dist/util/color.js.map +1 -1
- package/dist/util/time.js +1 -1
- package/dist/util/time.js.map +1 -1
- package/dist/webserver/backend/api.d.ts +83 -1
- package/dist/webserver/backend/api.js +174 -15
- package/dist/webserver/backend/api.js.map +1 -1
- package/dist/webserver/backend/database.js +10 -3
- package/dist/webserver/backend/database.js.map +1 -1
- package/dist/webserver/backend/index.js +5 -9
- package/dist/webserver/backend/index.js.map +1 -1
- package/dist/webserver/backend/metrics.js +58 -11
- package/dist/webserver/backend/metrics.js.map +1 -1
- package/eslint.config.mjs +53 -0
- package/package.json +37 -29
- package/public/app.html +1865 -0
- package/public/assets/IconArrowRight-CA5_cccJ.js +7 -0
- package/public/assets/IconArrowRight-CA5_cccJ.js.map +1 -0
- package/public/assets/IconCheck-Dyq5qyY1.js +17 -0
- package/public/assets/IconCheck-Dyq5qyY1.js.map +1 -0
- package/public/assets/IconLockOpen-D95XLORK.js +7 -0
- package/public/assets/IconLockOpen-D95XLORK.js.map +1 -0
- package/public/assets/IconWorld-DtARpBKX.js +72 -0
- package/public/assets/IconWorld-DtARpBKX.js.map +1 -0
- package/public/assets/IconWorldPlus-CMeE6oOX.js +182 -0
- package/public/assets/IconWorldPlus-CMeE6oOX.js.map +1 -0
- package/public/assets/IconX-SYtbnYKI.js +12 -0
- package/public/assets/IconX-SYtbnYKI.js.map +1 -0
- package/public/assets/_commonjsHelpers-CE1G-McA.js +2 -0
- package/public/assets/_commonjsHelpers-CE1G-McA.js.map +1 -0
- package/public/assets/app-CRu25Om6.js +6 -0
- package/public/assets/app-CRu25Om6.js.map +1 -0
- package/public/assets/auth-DdQ5DJ5h.js +2 -0
- package/public/assets/auth-DdQ5DJ5h.js.map +1 -0
- package/public/assets/client-C5T7_OK9.js +26 -0
- package/public/assets/client-C5T7_OK9.js.map +1 -0
- package/public/assets/index-CJ4e7_2M.js +2 -0
- package/public/assets/index-CJ4e7_2M.js.map +1 -0
- package/public/assets/index-CRRRLlCc.js +10 -0
- package/public/assets/index-CRRRLlCc.js.map +1 -0
- package/public/assets/index-CSV4ZXsq.js +2 -0
- package/public/assets/index-CSV4ZXsq.js.map +1 -0
- package/public/assets/index-CtY8r8rg.js +9 -0
- package/public/assets/index-CtY8r8rg.js.map +1 -0
- package/public/assets/index-DaWNRjkx.js +2 -0
- package/public/assets/index-DaWNRjkx.js.map +1 -0
- package/public/assets/index-DqHVrEeL.js +10 -0
- package/public/assets/index-DqHVrEeL.js.map +1 -0
- package/public/assets/index-c0qeY2gs.js +10 -0
- package/public/assets/index-c0qeY2gs.js.map +1 -0
- package/public/assets/index-i4mjW0og.js +2 -0
- package/public/assets/index-i4mjW0og.js.map +1 -0
- package/public/assets/jsx-runtime-Bw5QeaCk.js +10 -0
- package/public/assets/jsx-runtime-Bw5QeaCk.js.map +1 -0
- package/public/assets/jsx-runtime-DoEZbXM1.js +2 -0
- package/public/assets/jsx-runtime-DoEZbXM1.js.map +1 -0
- package/public/assets/shared/@components-BiaBe0jO.js +2 -0
- package/public/assets/shared/@components-BiaBe0jO.js.map +1 -0
- package/public/assets/shared/@hooks-DfTzYBIL.js +2 -0
- package/public/assets/shared/@hooks-DfTzYBIL.js.map +1 -0
- package/public/assets/shared/@nanostores_react-HTG3s0lp.js +2 -0
- package/public/assets/shared/@nanostores_react-HTG3s0lp.js.map +1 -0
- package/public/assets/shared/@tabler_icons-react-DwfGvIVr.js +29458 -0
- package/public/assets/shared/@tabler_icons-react-DwfGvIVr.js.map +1 -0
- package/public/assets/shared/@utils-BQyGUOvP.js +2 -0
- package/public/assets/shared/@utils-BQyGUOvP.js.map +1 -0
- package/public/assets/shared/nanostores-BFqqIY_c.js +2 -0
- package/public/assets/shared/nanostores-BFqqIY_c.js.map +1 -0
- package/public/assets/shared/react-CR6vSpIu.js +2 -0
- package/public/assets/shared/react-CR6vSpIu.js.map +1 -0
- package/public/assets/shared/react-dom-BznoGTRX.js +2 -0
- package/public/assets/shared/react-dom-BznoGTRX.js.map +1 -0
- package/public/assets/shared/react_jsx-runtime-C15Zu6_p.js +2 -0
- package/public/assets/shared/react_jsx-runtime-C15Zu6_p.js.map +1 -0
- package/public/assets/shared/wouter-DbmGxXTo.js +2 -0
- package/public/assets/shared/wouter-DbmGxXTo.js.map +1 -0
- package/public/auth.html +1206 -0
- package/templates/rust/src/main.rs +25 -0
- package/templates/safe-ts/omegga.d.ts +7 -9
- package/tools/brickadia.sh +1 -0
- package/tools/install_steamcmd.sh +1 -1
- package/.prettierignore +0 -6
- package/frontend/app.html +0 -14
- package/frontend/auth.html +0 -14
- package/omegga-config.yml +0 -7
- package/public/app.bundle.js +0 -54537
- package/public/app.bundle.js.map +0 -1
- package/public/app.css +0 -6345
- package/public/app.css.map +0 -1
- package/public/auth.bundle.js +0 -17789
- package/public/auth.bundle.js.map +0 -1
- package/public/auth.css +0 -3313
- package/public/auth.css.map +0 -1
- /package/{frontend/assets/fonts/GlacialIndifferenceBold.ttf → public/assets/GlacialIndifferenceBold-DhenBmgZ.ttf} +0 -0
- /package/{frontend/assets/fonts/GlacialIndifferenceItalic.otf → public/assets/GlacialIndifferenceItalic-BApAEtVA.otf} +0 -0
- /package/{frontend/assets/fonts/GlacialIndifferenceMedium.otf → public/assets/GlacialIndifferenceMedium-CALcoUYm.otf} +0 -0
- /package/{frontend/assets/fonts/GlacialIndifferenceRegular.ttf → public/assets/GlacialIndifferenceRegular-DynFsoUc.ttf} +0 -0
- /package/{frontend/assets/fonts/RobotoBold.ttf → public/assets/RobotoBold-DB1hqCFM.ttf} +0 -0
- /package/{frontend/assets/fonts/RobotoItalic.ttf → public/assets/RobotoItalic-DIrf6xfk.ttf} +0 -0
- /package/{frontend/assets/fonts/RobotoRegular.ttf → public/assets/RobotoRegular-CGSfnFoJ.ttf} +0 -0
- /package/{frontend/assets/img/auth_bg.webp → public/assets/auth_bg-DJZN1T-H.webp} +0 -0
- /package/{frontend/assets/img/dark_bg.webp → public/assets/dark_bg-uu5tZDxN.webp} +0 -0
- /package/{frontend/assets/img/turkey.webp → public/assets/turkey-BW4gu-4u.webp} +0 -0
package/README.md
CHANGED
|
@@ -4,9 +4,18 @@ Read the README first before asking questions! [Join the discord](https://discor
|
|
|
4
4
|
|
|
5
5
|
Omegga wraps brickadia's server console to provide interactivity and utility via plugins.
|
|
6
6
|
|
|
7
|
+
Omegga can do things like:
|
|
8
|
+
|
|
9
|
+
- Automatically update/restart your server
|
|
10
|
+
- Manage your worlds from a web interface and load a world on startup/restart
|
|
11
|
+
- Chat with players while not on the server
|
|
12
|
+
- Read chat history with timestamps
|
|
13
|
+
- See kick and ban history
|
|
14
|
+
- Configure plugins from a web interface
|
|
15
|
+
|
|
7
16
|
Omegga plugins can do things like:
|
|
8
17
|
|
|
9
|
-
- Add custom chat commands
|
|
18
|
+
- Add custom chat !commands and /commands
|
|
10
19
|
- Respond to and send chat messages
|
|
11
20
|
- Load bricks to player's clipboards
|
|
12
21
|
- Load/Clear regions of bricks
|
package/bin/omegga
CHANGED
|
@@ -1,21 +1,3 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
// check if a local brickadia is installed
|
|
6
|
-
const isLocal =
|
|
7
|
-
!isBrickInstalled &&
|
|
8
|
-
require('fs').existsSync(require('../dist/softconfig.js').LOCAL_LAUNCHER);
|
|
9
|
-
|
|
10
|
-
if (!isBrickInstalled && !isLocal) {
|
|
11
|
-
require('colors');
|
|
12
|
-
console.error(
|
|
13
|
-
'!>'.red,
|
|
14
|
-
'brickadia launcher'.yellow.underline,
|
|
15
|
-
'must be installed for omegga to run'
|
|
16
|
-
);
|
|
17
|
-
|
|
18
|
-
require('../dist/cli/installer.js');
|
|
19
|
-
} else {
|
|
20
|
-
require('../dist/main.js');
|
|
21
|
-
}
|
|
3
|
+
require('../dist/main.js');
|
|
@@ -1,11 +1,28 @@
|
|
|
1
1
|
import { IConfig } from "../config/types";
|
|
2
2
|
import 'colors';
|
|
3
3
|
import EventEmitter from 'events';
|
|
4
|
+
/** Start a brickadia server */
|
|
4
5
|
export default class BrickadiaServer extends EventEmitter {
|
|
5
6
|
#private;
|
|
6
7
|
config: IConfig;
|
|
7
8
|
path: string;
|
|
8
9
|
constructor(dataPath: string, config: IConfig);
|
|
10
|
+
getActiveWorldFile(): string;
|
|
11
|
+
/** A world specified by the active world file */
|
|
12
|
+
getActiveWorld(): string | null;
|
|
13
|
+
/** Set the world to use next startup */
|
|
14
|
+
setActiveWorld(world: string | null): boolean;
|
|
15
|
+
/** A world specified by the config */
|
|
16
|
+
getConfigWorld(): string | null;
|
|
17
|
+
/** A world specified by the BRICKADIA_WORLD env variable */
|
|
18
|
+
getEnvWorld(): string | null;
|
|
19
|
+
/** Check if a world exists */
|
|
20
|
+
worldExists(world: string): boolean;
|
|
21
|
+
/** Get the world that will be used next startup */
|
|
22
|
+
getNextWorld(): {
|
|
23
|
+
source: string;
|
|
24
|
+
file: string;
|
|
25
|
+
};
|
|
9
26
|
start(): void;
|
|
10
27
|
write(line: string): void;
|
|
11
28
|
writeln(line: string): void;
|
package/dist/brickadia/server.js
CHANGED
|
@@ -27,6 +27,7 @@ require("colors");
|
|
|
27
27
|
const events_1 = __importDefault(require("events"));
|
|
28
28
|
const fs_1 = require("fs");
|
|
29
29
|
const path_1 = __importDefault(require("path"));
|
|
30
|
+
const process_1 = require("process");
|
|
30
31
|
const readline_1 = __importDefault(require("readline"));
|
|
31
32
|
const strip_ansi_1 = __importDefault(require("strip-ansi"));
|
|
32
33
|
// list of errors that can be solved by yelling at the user
|
|
@@ -42,7 +43,7 @@ const knownErrors = [
|
|
|
42
43
|
match: /error while loading shared libraries: libgthread-2\.0\.so\.0: cannot open shared object file/,
|
|
43
44
|
},
|
|
44
45
|
];
|
|
45
|
-
|
|
46
|
+
/** Start a brickadia server */
|
|
46
47
|
class BrickadiaServer extends events_1.default {
|
|
47
48
|
constructor(dataPath, config) {
|
|
48
49
|
super();
|
|
@@ -59,6 +60,73 @@ class BrickadiaServer extends events_1.default {
|
|
|
59
60
|
this.errorListener = this.errorListener.bind(this);
|
|
60
61
|
this.exitListener = this.exitListener.bind(this);
|
|
61
62
|
}
|
|
63
|
+
getActiveWorldFile() {
|
|
64
|
+
return path_1.default.join(this.path, softconfig_1.ACTIVE_WORLD_FILE);
|
|
65
|
+
}
|
|
66
|
+
/** A world specified by the active world file */
|
|
67
|
+
getActiveWorld() {
|
|
68
|
+
const activeWorldFile = this.getActiveWorldFile();
|
|
69
|
+
if ((0, fs_1.existsSync)(activeWorldFile)) {
|
|
70
|
+
try {
|
|
71
|
+
return (0, fs_1.readFileSync)(activeWorldFile, 'utf8').trim();
|
|
72
|
+
}
|
|
73
|
+
catch (err) {
|
|
74
|
+
logger_1.default.errorp('Failed to read active world file', activeWorldFile.yellow, err);
|
|
75
|
+
return null;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
/** Set the world to use next startup */
|
|
81
|
+
setActiveWorld(world) {
|
|
82
|
+
const activeWorldFile = this.getActiveWorldFile();
|
|
83
|
+
if (!world || world === null) {
|
|
84
|
+
if ((0, fs_1.existsSync)(activeWorldFile)) {
|
|
85
|
+
logger_1.default.verbose('Removing active world file', activeWorldFile.yellow);
|
|
86
|
+
(0, fs_1.unlinkSync)(activeWorldFile);
|
|
87
|
+
}
|
|
88
|
+
return true;
|
|
89
|
+
}
|
|
90
|
+
if (!this.worldExists(world)) {
|
|
91
|
+
logger_1.default.verbose('Cannot set active world to', world.yellow, 'as it does not exist');
|
|
92
|
+
return false;
|
|
93
|
+
}
|
|
94
|
+
logger_1.default.verbose('Setting active world to', world.yellow);
|
|
95
|
+
try {
|
|
96
|
+
(0, fs_1.writeFileSync)(activeWorldFile, world, 'utf8');
|
|
97
|
+
return true;
|
|
98
|
+
}
|
|
99
|
+
catch (err) {
|
|
100
|
+
logger_1.default.errorp('Failed to write active world file', activeWorldFile.yellow, err);
|
|
101
|
+
return false;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
/** A world specified by the config */
|
|
105
|
+
getConfigWorld() {
|
|
106
|
+
var _a, _b, _c;
|
|
107
|
+
return (_c = (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.server) === null || _b === void 0 ? void 0 : _b.world) !== null && _c !== void 0 ? _c : null;
|
|
108
|
+
}
|
|
109
|
+
/** A world specified by the BRICKADIA_WORLD env variable */
|
|
110
|
+
getEnvWorld() {
|
|
111
|
+
return process_1.env.BRICKADIA_WORLD || null;
|
|
112
|
+
}
|
|
113
|
+
/** Check if a world exists */
|
|
114
|
+
worldExists(world) {
|
|
115
|
+
var _a, _b, _c;
|
|
116
|
+
const savedDir = (_c = (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.server) === null || _b === void 0 ? void 0 : _b.savedDir) !== null && _c !== void 0 ? _c : softconfig_1.CONFIG_SAVED_DIR;
|
|
117
|
+
const worldPath = path_1.default.join(this.path, savedDir, 'Worlds', world + '.brdb');
|
|
118
|
+
return (0, fs_1.existsSync)(worldPath);
|
|
119
|
+
}
|
|
120
|
+
/** Get the world that will be used next startup */
|
|
121
|
+
getNextWorld() {
|
|
122
|
+
var _a;
|
|
123
|
+
const candidates = [
|
|
124
|
+
{ source: 'file', file: this.getActiveWorld() },
|
|
125
|
+
{ source: 'config', file: this.getConfigWorld() },
|
|
126
|
+
{ source: 'env', file: this.getEnvWorld() },
|
|
127
|
+
];
|
|
128
|
+
return ((_a = candidates.find(({ file }) => file && this.worldExists(file))) !== null && _a !== void 0 ? _a : null);
|
|
129
|
+
}
|
|
62
130
|
// start the server child process
|
|
63
131
|
start() {
|
|
64
132
|
var _a;
|
|
@@ -79,8 +147,7 @@ class BrickadiaServer extends events_1.default {
|
|
|
79
147
|
const steamBinary = path_1.default.join(softconfig_1.GAME_INSTALL_DIR, // steam install directory
|
|
80
148
|
steamBeta, // steam beta branch (or main)
|
|
81
149
|
softconfig_1.GAME_DIRNAME, // Brickadia
|
|
82
|
-
softconfig_1.GAME_BIN_PATH
|
|
83
|
-
);
|
|
150
|
+
softconfig_1.GAME_BIN_PATH);
|
|
84
151
|
let gameBinary = steamBinary;
|
|
85
152
|
if (overrideBinary) {
|
|
86
153
|
if (!(0, fs_1.existsSync)(overrideBinary)) {
|
|
@@ -111,11 +178,21 @@ class BrickadiaServer extends events_1.default {
|
|
|
111
178
|
'--server',
|
|
112
179
|
'--',
|
|
113
180
|
];
|
|
181
|
+
const world = this.getNextWorld();
|
|
182
|
+
if (world) {
|
|
183
|
+
logger_1.default.verbose('Using world', world.file.yellow, 'from', world.source.yellow);
|
|
184
|
+
}
|
|
185
|
+
else if (this.config.server.map) {
|
|
186
|
+
logger_1.default.verbose('Using map', this.config.server.map.yellow, 'from config');
|
|
187
|
+
}
|
|
114
188
|
const params = [
|
|
115
189
|
'--output=L',
|
|
116
190
|
'--',
|
|
117
191
|
...launchArgs,
|
|
118
|
-
|
|
192
|
+
!world &&
|
|
193
|
+
this.config.server.map &&
|
|
194
|
+
`-Environment="${this.config.server.map}"`,
|
|
195
|
+
world && `-World="${world.file}"`,
|
|
119
196
|
'-NotInstalled',
|
|
120
197
|
'-log',
|
|
121
198
|
require('../util/wsl') === 1 ? '-OneThread' : null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/brickadia/server.ts"],"names":[],"mappings":";AAAA;;;EAGE;;;;;;;;;;;;;;;;;AAEF,uDAA8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/brickadia/server.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/auth.js
CHANGED
|
@@ -72,8 +72,8 @@ async function authFromPrompt({ email, password, debug = false, isSteam, branch,
|
|
|
72
72
|
name: 'authType',
|
|
73
73
|
message: 'Select authentication method',
|
|
74
74
|
choices: [
|
|
75
|
-
{ title: 'Username/Password', value: 'credentials' },
|
|
76
75
|
{ title: 'Hosting Token', value: 'token' },
|
|
76
|
+
{ title: 'Username/Password', value: 'credentials' },
|
|
77
77
|
],
|
|
78
78
|
});
|
|
79
79
|
if (!authType) {
|
package/dist/cli/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/cli/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+LA,wCAGC;AAlMD,+DAAgC;AAChC,yCAA4D;AAC5D,mDAAmC;AACnC,kBAAgB;AAChB,yCAAoC;AACpC,gDAAwB;AACxB,sDAA8B;AAEjB,QAAA,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,oBAAI,CAAC,WAAW,EAAE,oBAAI,CAAC,eAAe,CAAC,CAAC;AAE3E,2CAA2C;AAC3C,KAAK,UAAU,gBAAgB;IAC7B,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,KAAK,EACV,OAAO,EACP,WAAW,CAAC,KAAK,CAAC,SAAS,EAC3B,0BAA0B,CAC3B,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,iBAAO,EAAC;QAC7B;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,OAAO;SACjB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,UAAU;SACpB;KACF,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC7C,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,EAC5B,KAAK,EACL,QAAQ,EACR,KAAK,GAAG,KAAK,EACb,OAAO,EACP,MAAM,EACN,OAAO,EACP,QAAQ,EACR,UAAU,GAUX;IACC,IAAI,KAA6B,CAAC;IAElC,IAAI,OAAO,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnC,gEAAgE;QAChE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iBAAO,EAAC;YACjC,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,8BAA8B;YACvC,OAAO,EAAE;gBACP,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/cli/auth.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/installer.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
export declare function installLauncher(): Promise<void>;
|
package/dist/cli/installer.js
CHANGED
|
@@ -3,13 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.installLauncher = installLauncher;
|
|
6
7
|
// DEPRECATED
|
|
8
|
+
const logger_1 = __importDefault(require("../logger"));
|
|
7
9
|
const child_process_1 = require("child_process");
|
|
8
|
-
require("colors");
|
|
9
10
|
const path_1 = __importDefault(require("path"));
|
|
10
11
|
const readline_1 = __importDefault(require("readline"));
|
|
11
|
-
const err = (...args) => console.error('!>'.red, ...args);
|
|
12
|
-
const log = (...args) => console.log('>>'.green, ...args);
|
|
13
12
|
const INSTALLER_PATH = path_1.default.join(__dirname, '../../tools/install_launcher.sh');
|
|
14
13
|
// wait for user response
|
|
15
14
|
function prompt() {
|
|
@@ -39,17 +38,15 @@ function runInstaller() {
|
|
|
39
38
|
async function installLauncher() {
|
|
40
39
|
const ok = await prompt();
|
|
41
40
|
if (!ok) {
|
|
42
|
-
|
|
41
|
+
logger_1.default.errorp('Omegga could not be started - missing dependencies. Visit ' +
|
|
43
42
|
'https://www.brickadia.com'.yellow.underline +
|
|
44
43
|
' to download the launcher.');
|
|
45
44
|
process.exit(1);
|
|
46
45
|
}
|
|
47
|
-
|
|
46
|
+
logger_1.default.logp('Running launcher installer...');
|
|
48
47
|
const res = await runInstaller();
|
|
49
48
|
if (res === 0) {
|
|
50
|
-
|
|
51
|
-
require("../main");
|
|
49
|
+
logger_1.default.logp('Success!');
|
|
52
50
|
}
|
|
53
51
|
}
|
|
54
|
-
installLauncher();
|
|
55
52
|
//# sourceMappingURL=installer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installer.js","sourceRoot":"","sources":["../../src/cli/installer.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"installer.js","sourceRoot":"","sources":["../../src/cli/installer.ts"],"names":[],"mappings":";;;;;AAwCA,0CAiBC;AAzDD,aAAa;AACb,uDAA8B;AAC9B,iDAAsC;AACtC,gDAAwB;AACxB,wDAAgC;AAEhC,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;AAEM,KAAK,UAAU,eAAe;IACnC,MAAM,EAAE,GAAG,MAAM,MAAM,EAAE,CAAC;IAE1B,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,gBAAM,CAAC,MAAM,CACX,4DAA4D;YAC1D,2BAA2B,CAAC,MAAM,CAAC,SAAS;YAC5C,4BAA4B,CAC/B,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,gBAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAC7C,MAAM,GAAG,GAAG,MAAM,YAAY,EAAE,CAAC;IACjC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;QACd,gBAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC"}
|
package/dist/cli/terminal.js
CHANGED
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const updater_1 = require("../updater");
|
|
6
7
|
const chat_1 = require("../util/chat");
|
|
7
8
|
const readline_1 = __importDefault(require("readline"));
|
|
8
9
|
const plugin_1 = require("./plugin");
|
|
@@ -63,6 +64,49 @@ const COMMANDS = [
|
|
|
63
64
|
process.exit();
|
|
64
65
|
},
|
|
65
66
|
},
|
|
67
|
+
{
|
|
68
|
+
aliases: ['restart'],
|
|
69
|
+
desc: 'trigger a server restart (without announcement or saving)',
|
|
70
|
+
async fn() {
|
|
71
|
+
log('Restarting server...');
|
|
72
|
+
await this.omegga.restartServer();
|
|
73
|
+
},
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
aliases: ['update'],
|
|
77
|
+
desc: 'try to update the server and restart if started (without announcement or saving',
|
|
78
|
+
async fn() {
|
|
79
|
+
var _a, _b;
|
|
80
|
+
if (!this.omegga.config.__STEAM) {
|
|
81
|
+
err('This command is only available when the server is installed via SteamCMD');
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
if (this.omegga.stopping || this.omegga.starting) {
|
|
85
|
+
err('The server is currently starting or stopping. Please wait a moment');
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
const wasStarted = this.omegga.started;
|
|
89
|
+
if (wasStarted) {
|
|
90
|
+
log('Stopping server to update...');
|
|
91
|
+
await this.omegga.stop();
|
|
92
|
+
}
|
|
93
|
+
log('Updating server...');
|
|
94
|
+
try {
|
|
95
|
+
(0, updater_1.steamcmdDownloadGame)({
|
|
96
|
+
steambeta: (_a = this.omegga.config.server) === null || _a === void 0 ? void 0 : _a.steambeta,
|
|
97
|
+
steambetaPassword: (_b = this.omegga.config.server) === null || _b === void 0 ? void 0 : _b.steambetaPassword,
|
|
98
|
+
});
|
|
99
|
+
log('Server updated successfully.');
|
|
100
|
+
}
|
|
101
|
+
catch (e) {
|
|
102
|
+
err('Error updating server:', e);
|
|
103
|
+
}
|
|
104
|
+
if (wasStarted) {
|
|
105
|
+
log('Starting server...');
|
|
106
|
+
await this.omegga.start();
|
|
107
|
+
}
|
|
108
|
+
},
|
|
109
|
+
},
|
|
66
110
|
{
|
|
67
111
|
aliases: ['kill'],
|
|
68
112
|
desc: 'forcefully kill brickadia server process without closing omegga',
|
|
@@ -314,9 +358,15 @@ Players: ${status.players.length === 0 ? 'none'.grey : ''}
|
|
|
314
358
|
desc: 'Manage worlds on the server',
|
|
315
359
|
descLines: () => ['Type /worlds load a world'],
|
|
316
360
|
async fn(subcommand, ...args) {
|
|
361
|
+
var _a, _b, _c;
|
|
317
362
|
switch (subcommand) {
|
|
318
363
|
default:
|
|
319
364
|
const commands = [
|
|
365
|
+
{
|
|
366
|
+
command: '/worlds use [world]',
|
|
367
|
+
desc: 'set or remove a world as the default world for startup',
|
|
368
|
+
short: '/w u [world]',
|
|
369
|
+
},
|
|
320
370
|
{
|
|
321
371
|
command: '/worlds load <world> [rev]',
|
|
322
372
|
desc: 'load a world',
|
|
@@ -343,15 +393,35 @@ Players: ${status.players.length === 0 ? 'none'.grey : ''}
|
|
|
343
393
|
short: '/w new <name> [Plate|Space|Studio|Peaks]',
|
|
344
394
|
},
|
|
345
395
|
];
|
|
396
|
+
log('Default world is', ((_b = (_a = this.omegga.getNextWorld()) === null || _a === void 0 ? void 0 : _a.file) === null || _b === void 0 ? void 0 : _b.yellow) || 'none'.grey);
|
|
346
397
|
log('Available world commands:');
|
|
347
398
|
for (const { command, desc, short } of commands) {
|
|
348
399
|
this.log(' ', command.yellow, '-', desc, `(${short.yellow})`);
|
|
349
400
|
}
|
|
350
401
|
return;
|
|
402
|
+
case 'use':
|
|
403
|
+
case 'u':
|
|
404
|
+
const world = (_c = args[0]) === null || _c === void 0 ? void 0 : _c.replace(/\.brdb$/, '');
|
|
405
|
+
if (world && !this.omegga.worldExists(world)) {
|
|
406
|
+
err(`World "${world}" does not exist`);
|
|
407
|
+
return;
|
|
408
|
+
}
|
|
409
|
+
if (this.omegga.setActiveWorld(world || null)) {
|
|
410
|
+
if (world) {
|
|
411
|
+
log(`Default world set to ${world.yellow}. It will be loaded next startup.`);
|
|
412
|
+
}
|
|
413
|
+
else {
|
|
414
|
+
log('Default world cleared. No world will be loaded on next startup.');
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
else {
|
|
418
|
+
err(`Failed to set default world to ${world.yellow}.`);
|
|
419
|
+
}
|
|
420
|
+
return;
|
|
351
421
|
case 'list':
|
|
352
422
|
case 'ls':
|
|
353
423
|
// list worlds
|
|
354
|
-
const worlds =
|
|
424
|
+
const worlds = this.omegga.getWorlds();
|
|
355
425
|
if (worlds.length === 0) {
|
|
356
426
|
log('No worlds found. Create one with', '/worlds saveas <world>'.yellow);
|
|
357
427
|
}
|
|
@@ -387,13 +457,20 @@ Players: ${status.players.length === 0 ? 'none'.grey : ''}
|
|
|
387
457
|
return;
|
|
388
458
|
}
|
|
389
459
|
}
|
|
460
|
+
let loadRes = false;
|
|
390
461
|
if (revision) {
|
|
391
462
|
log(`Loading world ${worldName.yellow} at revision ${revision}...`);
|
|
392
|
-
this.omegga.loadWorldRevision(worldName, revision);
|
|
463
|
+
loadRes = await this.omegga.loadWorldRevision(worldName, revision);
|
|
393
464
|
}
|
|
394
465
|
else {
|
|
395
466
|
log(`Loading world ${worldName.yellow}...`);
|
|
396
|
-
this.omegga.loadWorld(worldName);
|
|
467
|
+
loadRes = await this.omegga.loadWorld(worldName);
|
|
468
|
+
}
|
|
469
|
+
if (loadRes) {
|
|
470
|
+
log(`World ${worldName.yellow} loaded successfully.`);
|
|
471
|
+
}
|
|
472
|
+
else {
|
|
473
|
+
err(`Failed to load world ${worldName.yellow}`);
|
|
397
474
|
}
|
|
398
475
|
return;
|
|
399
476
|
case 'saveas':
|
|
@@ -413,7 +490,13 @@ Players: ${status.players.length === 0 ? 'none'.grey : ''}
|
|
|
413
490
|
return;
|
|
414
491
|
}
|
|
415
492
|
log(`Saving current world as ${saveWorldName.yellow}...`);
|
|
416
|
-
this.omegga.saveWorldAs(saveWorldName);
|
|
493
|
+
const saveAsRes = await this.omegga.saveWorldAs(saveWorldName);
|
|
494
|
+
if (saveAsRes) {
|
|
495
|
+
log(`Current world saved as ${saveWorldName.yellow} successfully.`);
|
|
496
|
+
}
|
|
497
|
+
else {
|
|
498
|
+
err(`Failed to save current world as ${saveWorldName.yellow}`);
|
|
499
|
+
}
|
|
417
500
|
return;
|
|
418
501
|
case 'save':
|
|
419
502
|
case 's':
|
|
@@ -423,7 +506,13 @@ Players: ${status.players.length === 0 ? 'none'.grey : ''}
|
|
|
423
506
|
}
|
|
424
507
|
// save the current world
|
|
425
508
|
log('Saving current world...');
|
|
426
|
-
this.omegga.saveWorld();
|
|
509
|
+
const res = await this.omegga.saveWorld();
|
|
510
|
+
if (res) {
|
|
511
|
+
log('Current world saved successfully.');
|
|
512
|
+
}
|
|
513
|
+
else {
|
|
514
|
+
err('Failed to save the current world');
|
|
515
|
+
}
|
|
427
516
|
return;
|
|
428
517
|
case 'revisions':
|
|
429
518
|
case 'r':
|
|
@@ -557,8 +646,12 @@ class Terminal {
|
|
|
557
646
|
omegga.on('leave', (p) => this.log(`${p.name.underline} (${p.displayName.underline}) left.`.brightBlue));
|
|
558
647
|
omegga.on('chat', (name, message) => this.log(`${name.brightYellow.underline}: ${message}`));
|
|
559
648
|
omegga.on('start', () => {
|
|
560
|
-
const
|
|
649
|
+
const { checkWsl } = require('../util/wsl');
|
|
650
|
+
const wsl = checkWsl();
|
|
561
651
|
log(`Server has started${wsl === 1 ? ' in single thread mode due to WSL1' : ''}. Type ${'/help'.yellow} for more commands`);
|
|
652
|
+
if (!this.omegga.getNextWorld()) {
|
|
653
|
+
info('No', 'default world'.yellow, 'is configured. Run', '/worlds use <world>'.yellow, 'to load one on startup.');
|
|
654
|
+
}
|
|
562
655
|
// check if this is WSL2 and wsl2binds is installed
|
|
563
656
|
if (wsl === 2 &&
|
|
564
657
|
this.omegga.pluginLoader &&
|
|
@@ -575,7 +668,7 @@ class Terminal {
|
|
|
575
668
|
omegga.on('unauthorized', () => {
|
|
576
669
|
err('Server failed authentication check');
|
|
577
670
|
info('You can clear auth tokens with', 'omegga auth -gl'.green);
|
|
578
|
-
info('This will require you to sign-in again');
|
|
671
|
+
info('This will require you to paste a new hosting token or sign-in again');
|
|
579
672
|
process.exit();
|
|
580
673
|
});
|
|
581
674
|
omegga.on('error', e => err('Server caught unhandled exception:\n' + e));
|
|
@@ -590,7 +683,8 @@ class Terminal {
|
|
|
590
683
|
const [cmd, ...args] = line.slice(1).split(' ');
|
|
591
684
|
const c = COMMANDS.find(c => c.aliases.includes(cmd));
|
|
592
685
|
if (!c) {
|
|
593
|
-
err(`unrecognized command /${cmd.underline}. Type /help for more info
|
|
686
|
+
err(`unrecognized command /${cmd.underline}. Type /help for more info`
|
|
687
|
+
.red);
|
|
594
688
|
}
|
|
595
689
|
else {
|
|
596
690
|
try {
|