Merge branch 'develop'

# Conflicts:
#	fxmanifest.lua

core/components/ConfigVault.js

@@ -144,7 +144,7 @@ export default class ConfigVault {
                 enabled: toDefault(cfg.discordBot.enabled, null),
                 token: toDefault(cfg.discordBot.token, null),
                 announceChannel: toDefault(cfg.discordBot.announceChannel, null),
-                prefix: toDefault(cfg.discordBot.prefix, '/'),
+                prefix: toDefault(cfg.discordBot.prefix, '!'),
                 statusMessage: toDefault(
                     cfg.discordBot.statusMessage,
                     '**IP:** `change-me:<port>`\n**Players:** <players>\n**Uptime:** <uptime>',
@@ -222,7 +222,7 @@ export default class ConfigVault {
 
             //DiscordBot
             cfg.discordBot.enabled = (cfg.discordBot.enabled === 'true' || cfg.discordBot.enabled === true);
-            cfg.discordBot.prefix = cfg.discordBot.prefix || '/';
+            cfg.discordBot.prefix = cfg.discordBot.prefix || '!';
             cfg.discordBot.statusMessage = cfg.discordBot.statusMessage || '**Join:** `change-me:<port>`\n**Players:** <players>\n**Uptime:** <uptime>';
             cfg.discordBot.commandCooldown = parseInt(cfg.discordBot.commandCooldown) || 30; //not in template
 

core/components/DiscordBot/index.js

@@ -1,5 +1,5 @@
 const modulename = 'DiscordBot';
-import Discord from '@citizenfx/discord.js'
+import Discord, { Intents } from '@citizenfx/discord.js'
 import logger from '@core/extras/console.js';
 import { verbose } from '@core/globalData.js';
 import commands from './commands';
@@ -96,8 +96,13 @@ export default class DiscordBot {
         }
 
         //Setup client
+        const clientIntents = new Intents([
+            Discord.Intents.FLAGS.GUILDS,
+            Discord.Intents.FLAGS.GUILD_MESSAGES,
+        ]);
+        clientIntents.add(15); //equivalent to MESSAGE_CONTENT, but our client is outdated.
         this.client = new Discord.Client({
-            intents: [Discord.Intents.FLAGS.GUILDS, Discord.Intents.FLAGS.GUILD_MESSAGES],
+            intents: clientIntents,
             autoReconnect: true,
         });
 

core/webroutes/diagnostics.js

@@ -34,7 +34,7 @@ export default async function Diagnostics(ctx) {
         getHostData(),
         gettxAdminData(),
         getFXServerData(),
-        getProcessesData(),
+        // getProcessesData(), FIXME: pidusageTree is bugged
     ]);
 
     const timeElapsed = Date.now() - timeStart;

docs/dev_notes.md

@@ -7,13 +7,10 @@ v4.18.0:
 - [x] fix HealthMonitor resource boot time limit
 - [x] prevent external modifications of admins.json
 - [x] update some packages
-
-somehow backup the stashes
-add newDatabase to the docs folder (don't i have it anywhere else?!)
-re-clone folder
-merge dev into master, try to release rc again
-pagar contas
-check discord intent
+- [x] create beta release action
+- [x] temp disable process info
+- [x] fix perf chart labels (closes #661)
+- [x] fix discord message intent
 
 Optional:
 - [ ] fix cfx.re login match by admin id
@@ -22,7 +19,6 @@ Optional:
 - [ ] stats: add recipe name + if ptero + random collisions + how many scheduled restart times + drop zap/discord as login methods
 - [ ] stats: jwe
 - [ ] playerlist remove rtl characters
-- [ ] create beta release action
 - [ ] set nui/vite.config.ts > target > chrome103
 
 The Big Things before ts+react rewrite:

fxmanifest.lua

@@ -5,7 +5,7 @@
 author 'Tabarra'
 description 'Remotely Manage & Monitor your GTA5 FiveM Server'
 repository 'https://github.com/tabarra/txAdmin'
-version '4.18.0-rc2'
+version '4.18.0'
 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.'

web/main/diagnostics.ejs

@@ -95,18 +95,10 @@
         <div class="card card-accent-info">
             <div class="card-header font-weight-bold">Processes:</div>
             <div class="card-body">
-                <% if (!proccesses.length) { %>
-                    Failed to retrieve processed data. <br>
-                    Check the terminal for more information (if verbosity is enabled)
-                <% } else { %>
-                    <% for (const process of proccesses) { %>
-                        <strong>Process:</strong> (<%= process.pid %>) <%= process.name %> <br>
-                        <strong>Parent:</strong> <%= process.ppid %> <br>
-                        <strong>Memory:</strong> <%= process.memory %> <br>
-                        <strong>CPU:</strong> <%= process.cpu %> <br>
-                        <br>
-                    <% } %>
-                <% } %>
+                <div class="text-center">
+                    This card has been temporarily disabled due to a bug in an underlying library. <br>
+                    A fix is expected to be released for txAdmin v4.20. 
+                </div>
             </div>
         </div>
 

web/public/js/txadmin/chart.js

@@ -2,25 +2,21 @@ const translate = (x, y) => {
     return `translate(${x}, ${y})`;
 };
 
+const clientsToMargin = (maxClients) => {
+    //each char is about 5px
+    return 12 + (maxClients.toString().length * 5);
+};
+
 const yLabels = ['5 ms', '10 ms', '25 ms', '50 ms', '75 ms', '100 ms', '250 ms', '500 ms', '750 ms', '1.0 s', '2.5 s', '5.0 s', '7.5 s', '10 s', '+Inf'];
 
 
 const drawHeatmap = (d3Container, perfData, options = {}) => {
-    //Options
-    if (typeof options.margin == 'undefined') options.margin = {}
-    const margin = {
-        top: options.margin.top || 5,
-        right: options.margin.right || 45,
-        bottom: options.margin.bottom || 20,
-        left: options.margin.left || 27
-    };
-    const height = options.height || 340;
-    const colorScheme = options.colorScheme || d3.interpolateViridis;
-
-    //TODO: make it responsive with screen size
-    const tickIntervalMod = Math.min(
+    //Dynamic label interval size
+    // got the points manually, plotted to https://www.geogebra.org/graphing
+    // then made a function with a slider to help me match the best fitting one
+    const tickIntervalMod = Math.max(
         15,
-        Math.ceil(perfData.length / 20)
+        Math.ceil(55 - (d3Container.offsetWidth * 0.051))
     );
 
     //Flatten data
@@ -34,7 +30,7 @@ const drawHeatmap = (d3Container, perfData, options = {}) => {
         snapAvgTickTimes.push(snap.avgTime);
         snapClients.push({
             x: snapIndex,
-            c: snap.clients
+            c: snap.clients,
         });
 
         //Process skips
@@ -63,6 +59,18 @@ const drawHeatmap = (d3Container, perfData, options = {}) => {
             })
         }
     }
+    const maxClients = d3.max(snapClients.map(t => t.c));
+
+    //Options
+    if (typeof options.margin == 'undefined') options.margin = {}
+    const margin = {
+        top: options.margin.top || 5,
+        right: options.margin.right || 45,
+        bottom: options.margin.bottom || 20,
+        left: options.margin.left || clientsToMargin(maxClients)
+    };
+    const height = options.height || 340;
+    const colorScheme = options.colorScheme || d3.interpolateViridis;
 
 
     //Macro drawing stuff
@@ -130,7 +138,6 @@ const drawHeatmap = (d3Container, perfData, options = {}) => {
 
     // Y2 Axis - Player count
     const y2Padding = Math.round(tickBucketsScale.bandwidth() / 2);
-    const maxClients = d3.max(snapClients.map(t => t.c));
     const clientsScale = d3.scaleLinear()
         .domain([0, maxClients])
         .range([height - margin.bottom - y2Padding, margin.top + y2Padding]);