chore: version bump + minor stuff

core/components/ConfigVault.js

@@ -247,7 +247,7 @@ export default class ConfigVault {
             //FXRunner
             cfg.fxRunner.logPath = cfg.fxRunner.logPath || `${this.serverProfilePath}/logs/fxserver.log`; //not in template
             cfg.fxRunner.autostart = (cfg.fxRunner.autostart === 'true' || cfg.fxRunner.autostart === true);
-            cfg.fxRunner.restartDelay = parseInt(cfg.fxRunner.restartDelay) || 1250; //not in template
+            cfg.fxRunner.restartDelay = parseInt(cfg.fxRunner.restartDelay) || 750; //not in template
             cfg.fxRunner.shutdownNoticeDelay = parseInt(cfg.fxRunner.shutdownNoticeDelay) || 5; //not in template
             cfg.fxRunner.quiet = (cfg.fxRunner.quiet === 'true' || cfg.fxRunner.quiet === true);
         } catch (error) {

core/components/HealthMonitor/index.js

@@ -22,7 +22,6 @@ export default class HealthMonitor {
         //NOTE: done mainly because the timeout/limit was never useful, and makes things more complicated
         this.hardConfigs = {
             timeout: 1500,
-            defaultWarningTimes: [30, 15, 10, 5, 4, 3, 2, 1],
 
             //HTTP GET /dynamic.json from txAdmin to sv_main.lua
             healthCheck: {

docs/dev_notes.md

@@ -1,13 +1,5 @@
 # TODO:
-- [x] improve timeout handling of discord bot save
-- [x] fix handling of disallowed intents
-- [x] improve the bot with dangerous permissions and missing access messages
-- [x] attempt to update mysql2 and got
-- [x] discord bot: improve handling of checkJoin api fetches
-- [x] add txAdmin:events:adminAuth
-- [x] merge PRs
-- [x] add warning to whitelist page when server is not on license whitelist mode
-- [x] deprecate globals.databus
+- [ ] xxx
 
 > next up
 - [ ] Add a tracking for % of redm/fivem/libertym servers to txTracker
@@ -173,7 +165,10 @@ CFG Editor:
 
 
 ## New config
-- 2023 acho que os defaults deveriam existir dentro dos components
+- july 2023: consider that some vars will be used in more than one component, so making them live in one or another might not be good
+- the modules should be the ones to decide when they need to refreshConfig, so inside the module constructor maybe subscribe to change of specific variables, (in or outside of module). Maybe use event dispatchers?!
+
+- early 2023: acho que os defaults deveriam existir dentro dos components
 e sempre que outro componente precisar saber uma config, deve passar pelo componente
 - need to have a version and have migration, like the database
 

docs/events.md

@@ -6,7 +6,7 @@ The event name will be `txAdmin:events:<name>` and the first (and only) paramete
 
 
 ## txAdmin:events:scheduledRestart (v3.2)
-Broadcasted automatically `[30, 15, 10, 5, 4, 3, 2, 1]` minutes before a scheduled restart, as well as the times configured in the settings page.  
+Broadcasted automatically `[30, 15, 10, 5, 4, 3, 2, 1]` minutes before a scheduled restart.  
 Can be used with the convar `txAdmin-hideDefaultScheduledRestartWarning` to display a custom warning notification.  
 Event Data:
 - `secondsRemaining`: The number of seconds before the scheduled restart.  

fxmanifest.lua

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

resource/menu/vendor/freecam/main.lua

@@ -149,7 +149,7 @@ end
 
 -- When the resource is stopped, make sure to return the camera to the player.
 AddEventHandler('onResourceStop', function (resourceName)
-  if resourceName == GetCurrentResourceName() then
+  if resourceName == "monitor" then
     SetFreecamActive(false)
   end
 end)