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
|
@@ -50,12 +50,9 @@ const api_1 = __importDefault(require("./api"));
|
|
|
50
50
|
const database_1 = __importDefault(require("./database"));
|
|
51
51
|
const metrics_1 = __importDefault(require("./metrics"));
|
|
52
52
|
const util = __importStar(require("./util"));
|
|
53
|
-
// path to
|
|
54
|
-
const FRONTEND_PATH = path_1.default.join(__dirname, '../../../frontend');
|
|
55
|
-
// path to assets folder
|
|
56
|
-
const ASSET_PATH = path_1.default.join(FRONTEND_PATH, 'assets');
|
|
57
|
-
// path to webpacked data
|
|
53
|
+
// path to vite-built data
|
|
58
54
|
const PUBLIC_PATH = path_1.default.join(__dirname, '../../../public');
|
|
55
|
+
const ASSETS_PATH = path_1.default.join(__dirname, '../../../public/assets');
|
|
59
56
|
const log = (...args) => logger_1.default.log(...args);
|
|
60
57
|
const error = (...args) => logger_1.default.error(...args);
|
|
61
58
|
// the webserver servers an authenticated
|
|
@@ -152,8 +149,7 @@ class Webserver {
|
|
|
152
149
|
});
|
|
153
150
|
});
|
|
154
151
|
// provide assets in the /public path
|
|
155
|
-
this.app.use('/
|
|
156
|
-
this.app.use('/public', express_1.default.static(ASSET_PATH));
|
|
152
|
+
this.app.use('/assets', express_1.default.static(ASSETS_PATH));
|
|
157
153
|
this.app.use(body_parser_1.default.json());
|
|
158
154
|
this.rooms = ['chat', 'status', 'plugins', 'server'];
|
|
159
155
|
// setup the api
|
|
@@ -165,10 +161,10 @@ class Webserver {
|
|
|
165
161
|
const user = await this.database.findUserById(req.session.userId);
|
|
166
162
|
const isAuth = user && !user.isBanned;
|
|
167
163
|
if (isAuth) {
|
|
168
|
-
res.sendFile(path_1.default.join(
|
|
164
|
+
res.sendFile(path_1.default.join(PUBLIC_PATH, 'app.html'));
|
|
169
165
|
}
|
|
170
166
|
else {
|
|
171
|
-
res.sendFile(path_1.default.join(
|
|
167
|
+
res.sendFile(path_1.default.join(PUBLIC_PATH, 'auth.html'));
|
|
172
168
|
}
|
|
173
169
|
});
|
|
174
170
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/webserver/backend/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA8B;AAC9B,kEAAgC;AAIhC,8DAAqC;AACrC,sDAA8B;AAC9B,sEAA6C;AAC7C,gDAAwB;AACxB,kDAA0B;AAC1B,8FAAoD;AACpD,gDAAwB;AACxB,yCAA+C;AAC/C,gDAA6B;AAC7B,0DAAkC;AAClC,wDAAqC;AAErC,6CAA+B;AAE/B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/webserver/backend/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.default = default_1;
|
|
7
7
|
const logger_1 = __importDefault(require("../../logger"));
|
|
8
8
|
const softconfig_1 = __importDefault(require("../../softconfig"));
|
|
9
|
+
const steam_1 = require("../../updater/steam");
|
|
9
10
|
const error = (...args) => logger_1.default.error(...args);
|
|
10
11
|
let lastRestart = 0;
|
|
11
12
|
const sleep = t => new Promise(resolve => setTimeout(resolve, t));
|
|
@@ -23,22 +24,22 @@ function default_1(server, io) {
|
|
|
23
24
|
if (omegga.stopping || !omegga.started)
|
|
24
25
|
throw new Error('Omegga is already closing');
|
|
25
26
|
};
|
|
26
|
-
async function restartServer(config) {
|
|
27
|
+
async function restartServer(config, update) {
|
|
28
|
+
var _a, _b;
|
|
27
29
|
lastRestart = Date.now();
|
|
28
30
|
const iconfig = {
|
|
29
31
|
players: config.playersEnabled,
|
|
30
|
-
bricks: config.bricksEnabled,
|
|
31
32
|
announcement: config.announcementEnabled,
|
|
32
|
-
|
|
33
|
-
environment: config.environmentEnabled,
|
|
33
|
+
saveWorld: config.saveWorld,
|
|
34
34
|
};
|
|
35
35
|
omegga.emit('autorestart', iconfig);
|
|
36
36
|
await sleep(1000);
|
|
37
37
|
exitOnStop();
|
|
38
|
+
const action = update ? 'Updating' : 'Restarting';
|
|
38
39
|
if (config.announcementEnabled) {
|
|
39
|
-
database.addChatLog('server', {}, '
|
|
40
|
-
logger_1.default.logp('
|
|
41
|
-
const announce = (t) => omegga.broadcast(`<size="20"
|
|
40
|
+
database.addChatLog('server', {}, action + ' in 30 seconds...');
|
|
41
|
+
logger_1.default.logp(action + ' in 30 seconds...');
|
|
42
|
+
const announce = (t) => omegga.broadcast(`<size="20">${action} in <b><color="ffffbb">${t} second${t !== 1 ? 's' : ''}</></></>`);
|
|
42
43
|
announce(30);
|
|
43
44
|
await sleep(15000);
|
|
44
45
|
announce(15);
|
|
@@ -56,24 +57,44 @@ function default_1(server, io) {
|
|
|
56
57
|
}
|
|
57
58
|
exitOnStop();
|
|
58
59
|
await omegga.saveServer(iconfig);
|
|
59
|
-
logger_1.default.logp('
|
|
60
|
-
database.addChatLog('server', {}, '
|
|
60
|
+
logger_1.default.logp(action + '...');
|
|
61
|
+
database.addChatLog('server', {}, action + ' server...');
|
|
61
62
|
omegga.once('mapchange', () => {
|
|
62
63
|
omegga.restoreServer();
|
|
63
64
|
});
|
|
64
|
-
|
|
65
|
+
if (update &&
|
|
66
|
+
omegga.config.__STEAM &&
|
|
67
|
+
!((_a = omegga.config.server) === null || _a === void 0 ? void 0 : _a.steambetaPassword)) {
|
|
68
|
+
logger_1.default.logp('Stopping server for auto-update...');
|
|
69
|
+
await omegga.stop();
|
|
70
|
+
logger_1.default.logp('Downloading update...');
|
|
71
|
+
try {
|
|
72
|
+
(0, steam_1.steamcmdDownloadGame)({
|
|
73
|
+
steambeta: (_b = omegga.config.server) === null || _b === void 0 ? void 0 : _b.steambeta,
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
catch (e) {
|
|
77
|
+
error('An error occurred while downloading the update:', e);
|
|
78
|
+
}
|
|
79
|
+
logger_1.default.logp('Starting server after update...');
|
|
80
|
+
await omegga.start();
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
await omegga.restartServer();
|
|
84
|
+
}
|
|
65
85
|
}
|
|
66
86
|
async function checkAutoRestart(status) {
|
|
87
|
+
var _a, _b;
|
|
67
88
|
const now = new Date();
|
|
68
89
|
const currHour = now.getHours();
|
|
69
90
|
const currMinute = now.getMinutes();
|
|
70
|
-
logger_1.default.verbose('Autorestart check');
|
|
71
91
|
/// skip restart check if we sent restart command within 5 minutes
|
|
72
92
|
if (lastRestart > now.getTime() - 5 * 60 * 1000) {
|
|
73
93
|
logger_1.default.verbose('Skipping autorestart');
|
|
74
94
|
return;
|
|
75
95
|
}
|
|
76
96
|
const config = await database.getAutoRestartConfig();
|
|
97
|
+
logger_1.default.verbose('Autorestart check', config);
|
|
77
98
|
const uptimeMinutes = Math.floor(status.time / 1000 / 60);
|
|
78
99
|
const uptimeHours = Math.floor(uptimeMinutes / 60);
|
|
79
100
|
if (config.maxUptimeEnabled && uptimeHours >= config.maxUptime) {
|
|
@@ -92,6 +113,29 @@ function default_1(server, io) {
|
|
|
92
113
|
logger_1.default.verbose('Restarting due to daily schedule');
|
|
93
114
|
return await restartServer(config);
|
|
94
115
|
}
|
|
116
|
+
// Cannot auto-update on steam betas with passwords
|
|
117
|
+
const lastCheck = (0, steam_1.getLastSteamUpdateCheck)();
|
|
118
|
+
if (omegga.config.__STEAM &&
|
|
119
|
+
config.autoUpdateEnabled &&
|
|
120
|
+
!((_a = omegga.config.server) === null || _a === void 0 ? void 0 : _a.steambetaPassword)) {
|
|
121
|
+
const now = Date.now();
|
|
122
|
+
if (
|
|
123
|
+
// If there is no update
|
|
124
|
+
!lastCheck.available &&
|
|
125
|
+
// And the last update was too recent
|
|
126
|
+
now - lastCheck.attempt < config.autoUpdateIntervalMins * 60 * 1000) {
|
|
127
|
+
// Skip this check
|
|
128
|
+
logger_1.default.verbose(`Skipping auto update check, last check was ${Math.floor((now - lastCheck.attempt) / 1000 / 60)} minutes ago`);
|
|
129
|
+
return;
|
|
130
|
+
}
|
|
131
|
+
logger_1.default.verbose('Checking for steam update');
|
|
132
|
+
const hasUpdate = await (0, steam_1.hasSteamUpdate)((_b = omegga.config.server) === null || _b === void 0 ? void 0 : _b.steambeta);
|
|
133
|
+
if (hasUpdate) {
|
|
134
|
+
(0, steam_1.clearLastSteamUpdateCheck)();
|
|
135
|
+
return await restartServer(config, true);
|
|
136
|
+
}
|
|
137
|
+
logger_1.default.verbose('No steam update found');
|
|
138
|
+
}
|
|
95
139
|
}
|
|
96
140
|
server.lastReportedStatus = null;
|
|
97
141
|
server.serverStatusInterval = setInterval(async () => {
|
|
@@ -196,6 +240,9 @@ function default_1(server, io) {
|
|
|
196
240
|
omegga.on('server:starting', () => io
|
|
197
241
|
.to('server')
|
|
198
242
|
.emit('status', { started: false, starting: true, stopping: false }));
|
|
243
|
+
omegga.on('mapchange', () => io
|
|
244
|
+
.to('server')
|
|
245
|
+
.emit('status', { started: true, starting: false, stopping: false }));
|
|
199
246
|
omegga.on('server:stopped', () => io
|
|
200
247
|
.to('server')
|
|
201
248
|
.emit('status', { started: false, starting: false, stopping: false }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/webserver/backend/metrics.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/webserver/backend/metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import PluginTypescript from '@typescript-eslint/eslint-plugin';
|
|
2
|
+
import ParserTypescriptEslint from '@typescript-eslint/parser';
|
|
3
|
+
import PluginPrettier from 'eslint-plugin-prettier';
|
|
4
|
+
import PluginReact from 'eslint-plugin-react';
|
|
5
|
+
import PluginReactHooks from 'eslint-plugin-react-hooks';
|
|
6
|
+
import { defineConfig } from 'eslint/config';
|
|
7
|
+
import globals from 'globals';
|
|
8
|
+
import path from 'node:path';
|
|
9
|
+
|
|
10
|
+
export default defineConfig({
|
|
11
|
+
files: [
|
|
12
|
+
'frontend/src**/*.ts',
|
|
13
|
+
'frontend/src**/*.tsx',
|
|
14
|
+
'frontend/src**/*.js',
|
|
15
|
+
'frontend/src**/*.jsx',
|
|
16
|
+
],
|
|
17
|
+
languageOptions: {
|
|
18
|
+
ecmaVersion: 'latest',
|
|
19
|
+
sourceType: 'module',
|
|
20
|
+
globals: {
|
|
21
|
+
...globals.browser,
|
|
22
|
+
...globals.es2021,
|
|
23
|
+
},
|
|
24
|
+
parser: ParserTypescriptEslint,
|
|
25
|
+
parserOptions: {
|
|
26
|
+
project: ['./tsconfig.json'],
|
|
27
|
+
tsconfigRootDir: path.join(import.meta.dirname, 'frontend'),
|
|
28
|
+
},
|
|
29
|
+
},
|
|
30
|
+
plugins: {
|
|
31
|
+
react: PluginReact,
|
|
32
|
+
reactHooks: PluginReactHooks,
|
|
33
|
+
typescript: PluginTypescript,
|
|
34
|
+
prettier: PluginPrettier,
|
|
35
|
+
},
|
|
36
|
+
rules: {
|
|
37
|
+
'react/react-in-jsx-scope': 'off',
|
|
38
|
+
'react/prop-types': 'off',
|
|
39
|
+
'prettier/prettier': 'error',
|
|
40
|
+
'typescript/no-unused-vars': [
|
|
41
|
+
'warn',
|
|
42
|
+
{
|
|
43
|
+
argsIgnorePattern: '^_',
|
|
44
|
+
varsIgnorePattern: '^_',
|
|
45
|
+
},
|
|
46
|
+
],
|
|
47
|
+
},
|
|
48
|
+
settings: {
|
|
49
|
+
react: {
|
|
50
|
+
version: 'detect',
|
|
51
|
+
},
|
|
52
|
+
},
|
|
53
|
+
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "omegga",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.0",
|
|
4
4
|
"description": "Brickadia server installer, manager, wrapper, configurator, and automator",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=20.0.0"
|
|
@@ -35,17 +35,19 @@
|
|
|
35
35
|
"rimraf": "^3.0.2",
|
|
36
36
|
"semver": "^7.3.4",
|
|
37
37
|
"simple-git": "^3.6.0",
|
|
38
|
-
"socket.io": "^4.
|
|
38
|
+
"socket.io": "^4.8.1",
|
|
39
39
|
"source-map-support": "^0.5.21",
|
|
40
|
+
"steam-acf2json": "^0.1.1",
|
|
40
41
|
"strip-ansi": "^6.0.1",
|
|
41
42
|
"swc-loader": "^0.2.0",
|
|
42
43
|
"update-notifier-cjs": "^5.1.6",
|
|
43
|
-
"vm2": "3.9.2 || >3.9.4"
|
|
44
|
+
"vm2": "3.9.2 || >3.9.4",
|
|
45
|
+
"webpack": "^5.80.0"
|
|
44
46
|
},
|
|
45
47
|
"types": "./dist/lib.d.ts",
|
|
46
48
|
"devDependencies": {
|
|
47
|
-
"@
|
|
48
|
-
"@tabler/icons": "^
|
|
49
|
+
"@nanostores/react": "^1.0.0",
|
|
50
|
+
"@tabler/icons-react": "^3.34.0",
|
|
49
51
|
"@types/bcryptjs": "^2.4.2",
|
|
50
52
|
"@types/body-parser": "^1.19.2",
|
|
51
53
|
"@types/configstore": "^5.0.1",
|
|
@@ -58,47 +60,53 @@
|
|
|
58
60
|
"@types/node": "^24.0.13",
|
|
59
61
|
"@types/pem": "^1.9.6",
|
|
60
62
|
"@types/prompts": "^2.0.14",
|
|
63
|
+
"@types/react": "^19.1.8",
|
|
64
|
+
"@types/react-dom": "^19.1.6",
|
|
65
|
+
"@types/react-grid-layout": "^1.3.5",
|
|
61
66
|
"@types/rimraf": "^3.0.2",
|
|
62
67
|
"@types/semver": "^7.3.9",
|
|
63
68
|
"@types/source-map-support": "^0.5.4",
|
|
64
69
|
"@types/update-notifier": "^5.1.0",
|
|
65
70
|
"@types/webpack": "^5.28.0",
|
|
66
|
-
"@
|
|
71
|
+
"@typescript-eslint/eslint-plugin": "^8.37.0",
|
|
72
|
+
"@typescript-eslint/parser": "^8.37.0",
|
|
73
|
+
"@vitejs/plugin-react-swc": "^3.10.2",
|
|
67
74
|
"bufferutil": "^4.0.1",
|
|
68
|
-
"css-loader": "^4.3.0",
|
|
69
75
|
"dts-bundle-generator": "^9.5.1",
|
|
70
|
-
"
|
|
76
|
+
"eslint": "^9.31.0",
|
|
77
|
+
"eslint-config-prettier": "^10.1.5",
|
|
78
|
+
"eslint-plugin-prettier": "^5.5.1",
|
|
79
|
+
"eslint-plugin-react": "^7.37.5",
|
|
80
|
+
"eslint-plugin-react-hooks": "^5.2.0",
|
|
71
81
|
"jsdoc-to-markdown": "^7.0.1",
|
|
72
|
-
"
|
|
73
|
-
"
|
|
74
|
-
"
|
|
82
|
+
"linkify-react": "^4.3.1",
|
|
83
|
+
"linkifyjs": "^4.3.1",
|
|
84
|
+
"nanostores": "^1.0.1",
|
|
85
|
+
"react-grid-layout": "^1.5.2",
|
|
86
|
+
"sass": "^1.89.2",
|
|
87
|
+
"socket.io-client": "^4.8.1",
|
|
75
88
|
"ts-patch": "^3.3.0",
|
|
76
89
|
"typescript": "^5.8.3",
|
|
77
90
|
"typescript-transform-paths": "^3.5.5",
|
|
78
|
-
"url-loader": "^4.1.1",
|
|
79
91
|
"utf-8-validate": "^5.0.2",
|
|
80
|
-
"
|
|
81
|
-
"
|
|
82
|
-
"
|
|
83
|
-
"
|
|
84
|
-
"
|
|
85
|
-
"
|
|
86
|
-
"vue-style-loader": "^4.1.2",
|
|
87
|
-
"vue-tabler-icons": "^1.5.0",
|
|
88
|
-
"vue-template-compiler": "^2.6.14",
|
|
89
|
-
"webpack": "^5.80.0",
|
|
90
|
-
"webpack-cli": "^5.0.2"
|
|
92
|
+
"vite": "^7.0.4",
|
|
93
|
+
"vite-plugin-module-alias": "^1.3.5",
|
|
94
|
+
"vite-plugin-native-import-maps": "^0.0.4",
|
|
95
|
+
"vite-plugin-sass": "^0.1.0",
|
|
96
|
+
"webpack-cli": "^5.0.2",
|
|
97
|
+
"wouter": "^3.7.1"
|
|
91
98
|
},
|
|
92
99
|
"scripts": {
|
|
93
100
|
"prepare": "ts-patch install",
|
|
94
101
|
"start": "node index.js",
|
|
95
|
-
"lint": "npx prettier --check \"src/\"",
|
|
96
|
-
"lint:fix": "npx prettier \"src/\"",
|
|
97
|
-
"watch": "npx
|
|
98
|
-
"dist": "
|
|
99
|
-
"build:frontend": "npx
|
|
102
|
+
"lint": "npx prettier --check \"src/\" \"frontend/src\"",
|
|
103
|
+
"lint:fix": "npx prettier --write \"src/\" \"frontend/src/\"",
|
|
104
|
+
"watch": "npx vite build --watch",
|
|
105
|
+
"dist": "npx vite build && npm run build && npm run dts",
|
|
106
|
+
"build:frontend": "npx vite build",
|
|
100
107
|
"build": "npx tspc --build \"src/\"",
|
|
101
|
-
"dts": "npx dts-bundle-generator --inline-declare-global --no-banner --no-check --external-inlines brs-js -o templates/safe-ts/omegga.d.ts -- ./src/plugin.ts"
|
|
108
|
+
"dts": "npx dts-bundle-generator --inline-declare-global --no-banner --no-check --external-inlines brs-js -o templates/safe-ts/omegga.d.ts -- ./src/plugin.ts",
|
|
109
|
+
"check": "eslint"
|
|
102
110
|
},
|
|
103
111
|
"author": "Meshiest",
|
|
104
112
|
"license": "ISC",
|