chore: updated mysql2 and got

plus esbuild, but that didn't take any test
citizenfx · Jun 25, 2023 · 2ed6a3b · 2ed6a3b
1 parent 6f4789d
commit 2ed6a3b
Show file tree

Hide file tree

Showing 10 changed files with 424 additions and 525 deletions.
diff --git a/core/components/HealthMonitor/index.js b/core/components/HealthMonitor/index.js
@@ -124,9 +124,13 @@ export default class HealthMonitor {
         let dynamicResp;
         const requestOptions = {
             url: `http://${globals.fxRunner.fxServerHost}/dynamic.json`,
-            timeout: this.hardConfigs.timeout,
             maxRedirects: 0,
-            retry: { limit: 0 },
+            timeout: {
+                request: this.hardConfigs.timeout
+            },
+            retry: {
+                limit: 0
+            },
         };
         try {
             const data = await got.get(requestOptions).json();

diff --git a/core/extras/banner.js b/core/extras/banner.js
@@ -10,7 +10,9 @@ const console = consoleFactory();
 
 
 const getIPs = async () => {
-    const reqOptions = { timeout: 2500 };
+    const reqOptions = {
+        timeout: { request: 2500 }
+    };
     const allOps = await Promise.allSettled([
         // op.value.ip
         got('https://ip.seeip.org/json', reqOptions).json(),

diff --git a/core/extras/got.js b/core/extras/got.js
@@ -2,7 +2,9 @@ import { convars, txEnv } from '@core/globalData';
 import got from 'got';
 
 export default got.extend({
-    timeout: 5000,
+    timeout: {
+        request: 5000
+    },
     headers: {
         'User-Agent': `txAdmin ${txEnv.txAdminVersion}`,
     },

diff --git a/core/extras/recipeEngine.js b/core/extras/recipeEngine.js
@@ -109,7 +109,12 @@ const taskDownloadGithub = async (options, basePath, deployerCtx) => {
     if (options.ref) {
         reference = options.ref;
     } else {
-        const data = await got.get(`https://api.github.com/repos/${repoOwner}/${repoName}`, { timeout: 15e3 }).json();
+        const data = await got.get(
+            `https://api.github.com/repos/${repoOwner}/${repoName}`,
+            {
+                timeout: { request: 15e3 }
+            }
+        ).json();
         if (typeof data !== 'object' || !data.default_branch) {
             throw new Error('reference not set, and wasn ot able to detect using github\'s api');
         }

diff --git a/core/webroutes/adminManager/actions.js b/core/webroutes/adminManager/actions.js
@@ -14,7 +14,9 @@ const discordIDRegex = /^\d{17,20}$/;
 const nameRegex = citizenfxIDRegex;
 const nameRegexDesc = 'up to 18 characters containing only letters, numbers and the characters \`_.-\`';
 const dangerousPerms = ['all_permissions', 'manage.admins', 'console.write', 'settings.write'];
-
+const cfxHttpReqOptions = {
+    timeout: { request: 6000 }
+}
 
 /**
  * Returns the output page containing the admins.
@@ -87,7 +89,7 @@ async function handleAdd(ctx) {
         try {
             if (consts.validIdentifiers.fivem.test(citizenfxID)) {
                 const id = citizenfxID.split(':')[1];
-                const res = await got(`https://policy-live.fivem.net/api/getUserInfo/${id}`, {timeout: 6000}).json();
+                const res = await got(`https://policy-live.fivem.net/api/getUserInfo/${id}`, cfxHttpReqOptions).json();
                 if (!res.username || !res.username.length) {
                     return ctx.send({type: 'danger', message: 'Invalid CitizenFX ID1'});
                 }
@@ -96,7 +98,7 @@ async function handleAdd(ctx) {
                     identifier: citizenfxID,
                 };
             } else if (citizenfxIDRegex.test(citizenfxID)) {
-                const res = await got(`https://forum.cfx.re/u/${citizenfxID}.json`, {timeout: 6000}).json();
+                const res = await got(`https://forum.cfx.re/u/${citizenfxID}.json`, cfxHttpReqOptions).json();
                 if (!res.user || typeof res.user.id !== 'number') {
                     return ctx.send({type: 'danger', message: 'Invalid CitizenFX ID2'});
                 }
@@ -182,7 +184,7 @@ async function handleEdit(ctx) {
         try {
             if (consts.validIdentifiers.fivem.test(citizenfxID)) {
                 const id = citizenfxID.split(':')[1];
-                const res = await got(`https://policy-live.fivem.net/api/getUserInfo/${id}`, {timeout: 6000}).json();
+                const res = await got(`https://policy-live.fivem.net/api/getUserInfo/${id}`, cfxHttpReqOptions).json();
                 if (!res.username || !res.username.length) {
                     return ctx.send({type: 'danger', message: '(ERR1) Invalid CitizenFX ID'});
                 }
@@ -191,7 +193,7 @@ async function handleEdit(ctx) {
                     identifier: citizenfxID,
                 };
             } else if (citizenfxIDRegex.test(citizenfxID)) {
-                const res = await got(`https://forum.cfx.re/u/${citizenfxID}.json`, {timeout: 6000}).json();
+                const res = await got(`https://forum.cfx.re/u/${citizenfxID}.json`, cfxHttpReqOptions).json();
                 if (!res.user || typeof res.user.id !== 'number') {
                     return ctx.send({type: 'danger', message: '(ERR2) Invalid CitizenFX ID'});
                 }

diff --git a/core/webroutes/diagnostics/diagnosticsFuncs.ts b/core/webroutes/diagnostics/diagnosticsFuncs.ts
@@ -128,7 +128,9 @@ export const getFXServerData = async () => {
     const requestOptions = {
         url: `http://${fxRunner.fxServerHost}/info.json`,
         maxRedirects: 0,
-        timeout: healthMonitor.hardConfigs.timeout,
+        timeout: {
+            request: healthMonitor.hardConfigs.timeout
+        },
         retry: { limit: 0 },
     };
 

diff --git a/core/webroutes/setup/post.js b/core/webroutes/setup/post.js
@@ -111,7 +111,7 @@ async function handleValidateRecipeURL(ctx) {
     try {
         const recipeText = await got.get({
             url: recipeURL,
-            timeout: 4500,
+            timeout: { request: 4500 }
         }).text();
         if (typeof recipeText !== 'string') throw new Error('This URL did not return a string.');
         const recipe = parseValidateRecipe(recipeText);
@@ -330,7 +330,7 @@ async function handleSaveDeployerImport(ctx) {
     try {
         recipeText = await got.get({
             url: recipeURL,
-            timeout: 4500,
+            timeout: { request: 4500 }
         }).text();
         if (typeof recipeText !== 'string') throw new Error('This URL did not return a string.');
     } catch (error) {

diff --git a/docs/dev_notes.md b/docs/dev_notes.md
@@ -2,7 +2,7 @@
 - [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
-- [ ] attempt to update mysql2 and got
+- [x] attempt to update mysql2 and got
 - [ ] merge PRs
 - [ ] disable whitelist page when server is not on license whitelist mode