diff --git a/dev_notes.md b/dev_notes.md index 14f11ddbd..1467d2a1e 100644 --- a/dev_notes.md +++ b/dev_notes.md @@ -43,6 +43,12 @@ Quando terminar de importar as traduções: + +verificar o pq heartbeat as vezes é lento + +Random issue diagnostics: +- https://media.discordapp.net/attachments/589106731376836608/932035916812390430/unknown.png + CreateThread(function() local Wait = Wait local id = PlayerId() diff --git a/fxmanifest.lua b/fxmanifest.lua index fcbc40a1a..388bb98cd 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -5,7 +5,7 @@ author 'Tabarra' description 'Remotely Manage & Monitor your GTA5 FiveM Server' repository 'https://github.com/tabarra/txAdmin' -version '4.12.0' +version '4.12.1' 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.' diff --git a/package-lock.json b/package-lock.json index c04ad3115..34a140956 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@tabarra/discord": "^11.6.6", "axios": "^0.24.0", "boxen": "^5.1.2", - "bytes": "^3.1.1", + "bytes": "^3.1.2", "chalk": "^4.1.2", "color-support": "^1.1.3", "dateformat": "^4.5.1", @@ -39,7 +39,7 @@ "lodash": "^4.17.21", "lowdb": "^1.0.0", "mysql2": "^2.3.3", - "nanoid": "^3.1.30", + "nanoid": "^3.2.0", "nanoid-dictionary": "^4.3.0", "node-polyglot": "^2.4.2", "node-stream-zip": "^1.15.0", @@ -52,17 +52,17 @@ "recoil": "^0.5.2", "rotating-file-stream": "^3.0.2", "slash": "^3.0.0", - "slug": "^5.1.1", - "socket.io": "^4.4.0", + "slug": "^5.2.0", + "socket.io": "^4.4.1", "squirrelly": "^8.0.8", "stream-json": "^1.7.3", "string-argv": "^0.3.1", - "systeminformation": "^5.9.17", + "systeminformation": "^5.11.0", "windows-release": "^4.0.0", "xss": "^1.0.10" }, "devDependencies": { - "@commitlint/cli": "^16.0.1", + "@commitlint/cli": "^16.1.0", "@commitlint/config-conventional": "^16.0.0", "@types/node": "^16.11.17", "@types/react": "^17.0.38", @@ -643,14 +643,14 @@ "integrity": "sha512-hFyrWN2U30KFRgYteyqs7PZ+9aXyiH3tsgOQL/vcOp9dGAZAyRSHDotJYZivTEpjRN4dMbgbZ2h9TgoDFRKi9w==" }, "node_modules/@commitlint/cli": { - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-16.0.1.tgz", - "integrity": "sha512-61gGRy65WiVDRsqP0dAR2fAgE3qrTBW3fgz9MySv32y5Ib3ZXXDDq6bGyQqi2dSaPuDYzNCRwwlC7mmQM73T/g==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-16.1.0.tgz", + "integrity": "sha512-x5L1knvA3isRWBRVQx+Q6D45pA9139a2aZQYpxkljMG0dj4UHZkCnsYWpnGalxPxASI7nrI0KedKfS2YeQ55cQ==", "dev": true, "dependencies": { "@commitlint/format": "^16.0.0", "@commitlint/lint": "^16.0.0", - "@commitlint/load": "^16.0.0", + "@commitlint/load": "^16.1.0", "@commitlint/read": "^16.0.0", "@commitlint/types": "^16.0.0", "lodash": "^4.17.19", @@ -678,9 +678,9 @@ } }, "node_modules/@commitlint/config-validator": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-16.0.0.tgz", - "integrity": "sha512-i80DGlo1FeC5jZpuoNV9NIjQN/m2dDV3jYGWg+1Wr+KldptkUHXj+6GY1Akll66lJ3D8s6aUGi3comPLHPtWHg==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-16.1.0.tgz", + "integrity": "sha512-2cHeZPNTuf1JWbMqyA46MkExor5HMSgv8JrdmzEakUbJHUreh35/wN00FJf57qGs134exQW2thiSQ1IJUsVx2Q==", "dev": true, "dependencies": { "@commitlint/types": "^16.0.0", @@ -754,14 +754,14 @@ } }, "node_modules/@commitlint/load": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-16.0.0.tgz", - "integrity": "sha512-7WhrGCkP6K/XfjBBguLkkI2XUdiiIyMGlNsSoSqgRNiD352EiffhFEApMy1/XOU+viwBBm/On0n5p0NC7e9/4A==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-16.1.0.tgz", + "integrity": "sha512-MtlEhKjP8jAF85jjX4mw8DUUwCxKsCgAc865hhpnwxjrfBcmGP7Up2AFE/M3ZMGDmSl1X1TMybQk/zohj8Cqdg==", "dev": true, "dependencies": { - "@commitlint/config-validator": "^16.0.0", + "@commitlint/config-validator": "^16.1.0", "@commitlint/execute-rule": "^16.0.0", - "@commitlint/resolve-extends": "^16.0.0", + "@commitlint/resolve-extends": "^16.1.0", "@commitlint/types": "^16.0.0", "chalk": "^4.0.0", "cosmiconfig": "^7.0.0", @@ -827,12 +827,12 @@ } }, "node_modules/@commitlint/resolve-extends": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-16.0.0.tgz", - "integrity": "sha512-Z/w9MAQUcxeawpCLtjmkVNXAXOmB2nhW+LYmHEZcx9O6UTauF/1+uuZ2/r0MtzTe1qw2JD+1QHVhEWYHVPlkdA==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-16.1.0.tgz", + "integrity": "sha512-8182s6AFoUFX6+FT1PgQDt15nO2ogdR/EN8SYVAdhNXw1rLz8kT5saB/ICw567GuRAUgFTUMGCXy3ctMOXPEDg==", "dev": true, "dependencies": { - "@commitlint/config-validator": "^16.0.0", + "@commitlint/config-validator": "^16.1.0", "@commitlint/types": "^16.0.0", "import-fresh": "^3.0.0", "lodash": "^4.17.19", @@ -2657,9 +2657,9 @@ "dev": true }, "node_modules/bytes": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz", - "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "engines": { "node": ">= 0.8" } @@ -3288,9 +3288,9 @@ } }, "node_modules/cosmiconfig-typescript-loader": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.2.tgz", - "integrity": "sha512-27ZehvijYqAKVzta5xtZBS3PAliC8CmnWkGXN0vgxAZz7yqxpMjf3aG7flxF5rEiu8FAD7nZZXtOI+xUGn+bVg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.4.tgz", + "integrity": "sha512-ulv2dvwurP/MZAIthXm69bO7EzzIUThZ6RJ1qXhdlXM6to3F+IKBL/17EnhYSG52A5N1KcAUu66vSG/3/77KrA==", "dev": true, "dependencies": { "cosmiconfig": "^7", @@ -7382,9 +7382,9 @@ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" }, "node_modules/nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -9930,9 +9930,9 @@ } }, "node_modules/slug": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/slug/-/slug-5.1.1.tgz", - "integrity": "sha512-QPbRRFNK6AMY4ubNCZ/2Wx/JnLO7YQnjEOgA4ptgcyMzL4SjnwkRVp1Kkp7cigF2eP2FNVAhRjBeRkd6wWZzbg==" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/slug/-/slug-5.2.0.tgz", + "integrity": "sha512-jMCvtl7B2iF+2YUNeSo88iVy+wSGX2Jlfj6Hi7RvaQNTPiqJ8BYJAB6XaurEQiiVGN3gIj6u6IZvaG4Ang5brw==" }, "node_modules/snekfetch": { "version": "3.6.4", @@ -9941,9 +9941,9 @@ "deprecated": "use node-fetch instead" }, "node_modules/socket.io": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.0.tgz", - "integrity": "sha512-bnpJxswR9ov0Bw6ilhCvO38/1WPtE3eA2dtxi2Iq4/sFebiDJQzgKNYA7AuVVdGW09nrESXd90NbZqtDd9dzRQ==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz", + "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==", "dependencies": { "accepts": "~1.3.4", "base64id": "~2.0.0", @@ -10355,9 +10355,9 @@ } }, "node_modules/systeminformation": { - "version": "5.9.17", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.17.tgz", - "integrity": "sha512-hbJtPsG63PCst4PLXFq8hycbkeR5oGDquRowfLK0gNX7nJ1qx3tCbsWu83OL4GP1dkcLMKsVooLUn5x2K1Epgg==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.0.tgz", + "integrity": "sha512-mI/5nFK7NUe9Qbmy65WoB5TlCWKAhP4kG0w6uR2mZM8Mpdi8b45b3hTIK3W5+kQYZnYFWeS9/O5nn5rdcSvqfA==", "os": [ "darwin", "linux", @@ -10365,7 +10365,8 @@ "freebsd", "openbsd", "netbsd", - "sunos" + "sunos", + "android" ], "bin": { "systeminformation": "lib/cli.js" @@ -11979,14 +11980,14 @@ "integrity": "sha512-hFyrWN2U30KFRgYteyqs7PZ+9aXyiH3tsgOQL/vcOp9dGAZAyRSHDotJYZivTEpjRN4dMbgbZ2h9TgoDFRKi9w==" }, "@commitlint/cli": { - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-16.0.1.tgz", - "integrity": "sha512-61gGRy65WiVDRsqP0dAR2fAgE3qrTBW3fgz9MySv32y5Ib3ZXXDDq6bGyQqi2dSaPuDYzNCRwwlC7mmQM73T/g==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-16.1.0.tgz", + "integrity": "sha512-x5L1knvA3isRWBRVQx+Q6D45pA9139a2aZQYpxkljMG0dj4UHZkCnsYWpnGalxPxASI7nrI0KedKfS2YeQ55cQ==", "dev": true, "requires": { "@commitlint/format": "^16.0.0", "@commitlint/lint": "^16.0.0", - "@commitlint/load": "^16.0.0", + "@commitlint/load": "^16.1.0", "@commitlint/read": "^16.0.0", "@commitlint/types": "^16.0.0", "lodash": "^4.17.19", @@ -12005,9 +12006,9 @@ } }, "@commitlint/config-validator": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-16.0.0.tgz", - "integrity": "sha512-i80DGlo1FeC5jZpuoNV9NIjQN/m2dDV3jYGWg+1Wr+KldptkUHXj+6GY1Akll66lJ3D8s6aUGi3comPLHPtWHg==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-16.1.0.tgz", + "integrity": "sha512-2cHeZPNTuf1JWbMqyA46MkExor5HMSgv8JrdmzEakUbJHUreh35/wN00FJf57qGs134exQW2thiSQ1IJUsVx2Q==", "dev": true, "requires": { "@commitlint/types": "^16.0.0", @@ -12063,14 +12064,14 @@ } }, "@commitlint/load": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-16.0.0.tgz", - "integrity": "sha512-7WhrGCkP6K/XfjBBguLkkI2XUdiiIyMGlNsSoSqgRNiD352EiffhFEApMy1/XOU+viwBBm/On0n5p0NC7e9/4A==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-16.1.0.tgz", + "integrity": "sha512-MtlEhKjP8jAF85jjX4mw8DUUwCxKsCgAc865hhpnwxjrfBcmGP7Up2AFE/M3ZMGDmSl1X1TMybQk/zohj8Cqdg==", "dev": true, "requires": { - "@commitlint/config-validator": "^16.0.0", + "@commitlint/config-validator": "^16.1.0", "@commitlint/execute-rule": "^16.0.0", - "@commitlint/resolve-extends": "^16.0.0", + "@commitlint/resolve-extends": "^16.1.0", "@commitlint/types": "^16.0.0", "chalk": "^4.0.0", "cosmiconfig": "^7.0.0", @@ -12123,12 +12124,12 @@ } }, "@commitlint/resolve-extends": { - "version": "16.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-16.0.0.tgz", - "integrity": "sha512-Z/w9MAQUcxeawpCLtjmkVNXAXOmB2nhW+LYmHEZcx9O6UTauF/1+uuZ2/r0MtzTe1qw2JD+1QHVhEWYHVPlkdA==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-16.1.0.tgz", + "integrity": "sha512-8182s6AFoUFX6+FT1PgQDt15nO2ogdR/EN8SYVAdhNXw1rLz8kT5saB/ICw567GuRAUgFTUMGCXy3ctMOXPEDg==", "dev": true, "requires": { - "@commitlint/config-validator": "^16.0.0", + "@commitlint/config-validator": "^16.1.0", "@commitlint/types": "^16.0.0", "import-fresh": "^3.0.0", "lodash": "^4.17.19", @@ -13485,9 +13486,9 @@ "dev": true }, "bytes": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz", - "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" }, "cache-content-type": { "version": "1.0.1", @@ -13969,12 +13970,11 @@ } }, "cosmiconfig-typescript-loader": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.2.tgz", - "integrity": "sha512-27ZehvijYqAKVzta5xtZBS3PAliC8CmnWkGXN0vgxAZz7yqxpMjf3aG7flxF5rEiu8FAD7nZZXtOI+xUGn+bVg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.4.tgz", + "integrity": "sha512-ulv2dvwurP/MZAIthXm69bO7EzzIUThZ6RJ1qXhdlXM6to3F+IKBL/17EnhYSG52A5N1KcAUu66vSG/3/77KrA==", "dev": true, "requires": { - "cosmiconfig": "^7", "ts-node": "^10.4.0" } }, @@ -17113,9 +17113,9 @@ } }, "nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==" }, "nanoid-dictionary": { "version": "4.3.0", @@ -19022,9 +19022,9 @@ } }, "slug": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/slug/-/slug-5.1.1.tgz", - "integrity": "sha512-QPbRRFNK6AMY4ubNCZ/2Wx/JnLO7YQnjEOgA4ptgcyMzL4SjnwkRVp1Kkp7cigF2eP2FNVAhRjBeRkd6wWZzbg==" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/slug/-/slug-5.2.0.tgz", + "integrity": "sha512-jMCvtl7B2iF+2YUNeSo88iVy+wSGX2Jlfj6Hi7RvaQNTPiqJ8BYJAB6XaurEQiiVGN3gIj6u6IZvaG4Ang5brw==" }, "snekfetch": { "version": "3.6.4", @@ -19032,9 +19032,9 @@ "integrity": "sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw==" }, "socket.io": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.0.tgz", - "integrity": "sha512-bnpJxswR9ov0Bw6ilhCvO38/1WPtE3eA2dtxi2Iq4/sFebiDJQzgKNYA7AuVVdGW09nrESXd90NbZqtDd9dzRQ==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz", + "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==", "requires": { "accepts": "~1.3.4", "base64id": "~2.0.0", @@ -19352,9 +19352,9 @@ } }, "systeminformation": { - "version": "5.9.17", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.17.tgz", - "integrity": "sha512-hbJtPsG63PCst4PLXFq8hycbkeR5oGDquRowfLK0gNX7nJ1qx3tCbsWu83OL4GP1dkcLMKsVooLUn5x2K1Epgg==" + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.0.tgz", + "integrity": "sha512-mI/5nFK7NUe9Qbmy65WoB5TlCWKAhP4kG0w6uR2mZM8Mpdi8b45b3hTIK3W5+kQYZnYFWeS9/O5nn5rdcSvqfA==" }, "table": { "version": "6.7.1", diff --git a/package.json b/package.json index 48290d036..aef4376d5 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@tabarra/discord": "^11.6.6", "axios": "^0.24.0", "boxen": "^5.1.2", - "bytes": "^3.1.1", + "bytes": "^3.1.2", "chalk": "^4.1.2", "color-support": "^1.1.3", "dateformat": "^4.5.1", @@ -66,7 +66,7 @@ "lodash": "^4.17.21", "lowdb": "^1.0.0", "mysql2": "^2.3.3", - "nanoid": "^3.1.30", + "nanoid": "^3.2.0", "nanoid-dictionary": "^4.3.0", "node-polyglot": "^2.4.2", "node-stream-zip": "^1.15.0", @@ -79,17 +79,17 @@ "recoil": "^0.5.2", "rotating-file-stream": "^3.0.2", "slash": "^3.0.0", - "slug": "^5.1.1", - "socket.io": "^4.4.0", + "slug": "^5.2.0", + "socket.io": "^4.4.1", "squirrelly": "^8.0.8", "stream-json": "^1.7.3", "string-argv": "^0.3.1", - "systeminformation": "^5.9.17", + "systeminformation": "^5.11.0", "windows-release": "^4.0.0", "xss": "^1.0.10" }, "devDependencies": { - "@commitlint/cli": "^16.0.1", + "@commitlint/cli": "^16.1.0", "@commitlint/config-conventional": "^16.0.0", "@types/node": "^16.11.17", "@types/react": "^17.0.38", diff --git a/src/extras/helpers.js b/src/extras/helpers.js index 7da31a3f1..e24eeb297 100644 --- a/src/extras/helpers.js +++ b/src/extras/helpers.js @@ -1,7 +1,7 @@ //Requires const fs = require('fs'); const path = require('path'); -const xss = require('./xss')(); +let xss; //can't be required before the dependency check //const log = (x) => process.stdout.write(JSON.stringify(x, null, 2) + '\n'); @@ -146,6 +146,8 @@ function resolveCFGFilePath(cfgPath, serverDataPath) { * @param {string} rawCfgFile */ function getFXServerPort(rawCfgFile) { + if (!xss) xss = require('./xss')(); + const endpointsRegex = /^\s*endpoint_add_(\w+)\s+["']?([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}):([0-9]{1,5})["']?.*$/gim; const maxClientsRegex = /^\s*sv_maxclients\s+(\d+).*$/gim; const txResCommandsRegex = /^\s*(start|stop|ensure|restart)\s+(monitor|txadmin).*$/gim; @@ -257,7 +259,7 @@ function findLikelyCFGPath(serverDataPath) { try { getCFGFileData(cfgPath); return cfgPath; - } catch (error) {} + } catch (error) { } } return false; } diff --git a/src/index.js b/src/index.js index bf63012a4..52d5bea72 100644 --- a/src/index.js +++ b/src/index.js @@ -204,7 +204,7 @@ if (verbose) dir({isZapHosting, forceInterface, forceFXServerPort, txAdminPort, //NOTE: Only valid if its being very actively maintained. // Use 30d for patch 0, or 45~60d otherwise // Objective is to update every 2~3 weeks, always on monday ~15:00 -const txVerBBLastUpdate = 1641833333; +const txVerBBLastUpdate = 1643646592; const txVerBBDelta = 21 + ((isZapHosting) ? 10 : 0); const txAdminVersionBestBy = txVerBBLastUpdate + (txVerBBDelta * 86400); // dir({