build: version bump + minor stuff

fxmanifest.lua

@@ -5,7 +5,7 @@
 author 'Tabarra'
 description 'Remotely Manage & Monitor your GTA5 FiveM Server'
 repository 'https://github.com/tabarra/txAdmin'
-version '4.0.0-dev'
+version '4.0.0'
 
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
 fx_version 'cerulean'

src/index.js

@@ -195,7 +195,7 @@ if (verbose) dir({isZapHosting, forceInterface, forceFXServerPort, txAdminPort,
 //Check if this version of txAdmin is too outdated to be considered safe to use in prod
 //NOTE: Only valid if its being very actively maintained.
 //          Use 30d for patch 0, or 45~60d otherwise
-const txVerBBLastUpdate = 1621233333;
+const txVerBBLastUpdate = 1622456789;
 const txVerBBDelta = 21 + ((isZapHosting) ? 10 : 0);
 const txAdminVersionBestBy = txVerBBLastUpdate + (txVerBBDelta * 86400);
 // dir({
@@ -205,6 +205,7 @@ const txAdminVersionBestBy = txVerBBLastUpdate + (txVerBBDelta * 86400);
 //     nextUpdateTS: txAdminVersionBestBy,
 //     timeLeft: require('humanize-duration')(((now() - txAdminVersionBestBy) * 1000)),
 // });
+// process.exit();
 if (now() > txAdminVersionBestBy) {
     logError('This version of txAdmin is outdated.');
     logError('Please update as soon as possible.');

src/webroutes/authentication/verifyNuiAuth.js

@@ -55,7 +55,7 @@ module.exports = async function VerifyNuiAuth(ctx) {
         });
 
         // FIXME: tabarra
-        globals.databus.txStatsData.login.origins[ctx.txVars.webpipe]++;
+        globals.databus.txStatsData.login.origins.webpipe++;
         globals.databus.txStatsData.login.methods.nui++;
     } catch (error) {
         logWarn(`Failed to authenticate NUI user with error: ${error.message}`);

src/webroutes/diagnostics.js

@@ -268,6 +268,7 @@ async function gettxAdminData() {
         //Settings
         cooldown: globals.monitor.config.cooldown,
         schedule: globals.monitor.config.restarterSchedule.join(', ') || '--',
+        commandLine: globals.fxRunner.config.commandLine,
         fxServerPath: GlobalData.fxServerPath,
         serverDataPath: globals.fxRunner.config.serverDataPath,
         cfgPath: globals.fxRunner.config.cfgPath,

web/diagnostics.html

@@ -50,6 +50,7 @@ <h5>Stats:</h5>
                 <h5>Settings:</h5>
                 <strong>Schedule:</strong> <code>{{it.txadmin.schedule}}</code> <br>
                 <strong>Cooldown:</strong> <code>{{it.txadmin.cooldown}}</code> <br>
+                <strong>Additional Arguments:</strong> <code>{{it.txadmin.commandLine}}</code> <br>
                 <strong>FXServer Path:</strong> <code>{{it.txadmin.fxServerPath}}</code> <br>
                 <strong>Server Data Path:</strong> <code>{{it.txadmin.serverDataPath}}</code><br>
                 <strong>CFG Path:</strong> <code>{{it.txadmin.cfgPath}}</code>

web/settings.html

@@ -145,6 +145,9 @@ <h2>Settings</h2>
                             <div class="col-sm-9">
                                 <input type="text" class="form-control" id="frmFXServer-commandLine" value="{{it.fxserver.commandLine|undef}}"
                                     placeholder="+set sv_enforceGameBuild 2060" {{it.readOnly|isDisabled}}>
+                                <span class="form-text text-primary">
+                                    To enable the Beta In-game, add <code>+set txEnableMenuBeta true</code> above.
+                                </span>
                                 <span class="form-text text-muted">
                                     Additional command-line arguments to pass to the FXServer instance. <br>
                                     For example, you can add <code>+set</code> and <code>+exec</code> commands. <br>