Merging develop into master

.github/workflows/locale-pull-request.yml

@@ -12,23 +12,6 @@ jobs:
       pull-requests: write
 
     steps:
-      - name: Enforce base branch
-        uses: actions/github-script@v7
-        with:
-          script: |
-            // Get the pull request
-            const pull_request = await github.rest.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: context.payload.pull_request.number
-            });
-
-            // Check if the base branch is 'main' or 'master'
-            if (pull_request.data.base.ref === 'main' || pull_request.data.base.ref === 'master') {
-              console.error('Pull request is targeting the main branch. Please target the develop branch instead.');
-              process.exit(1);
-            }
-
       - name: Use Node.js 22
         uses: actions/setup-node@v4
         with:

.husky/pre-push

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -euo pipefail
+exec bun run "$(dirname "$0")/pre-push.ts" "$@"

.husky/pre-push.ts

@@ -0,0 +1,51 @@
+#!/usr/bin/env bun
+import { readFileSync } from 'node:fs';
+
+//MARK: Configs
+const protectedBranchPrefixRegex = /^(experiments?|mock(up)?s?|private)\//;
+const allowedRemoteName = 'git.fivem.net';
+
+//MARK: Parsing push data
+const remoteName = process.argv[2] ?? '';
+const remoteUrl = process.argv[3] ?? '';
+
+//No restrictions on the allowed remote
+if (remoteName === allowedRemoteName) {
+    process.exit(0);
+}
+
+// Read refs being pushed from stdin.
+const stdin = readFileSync(0, 'utf8');
+const lines = stdin.split('\n').map((l) => l.trim()).filter(Boolean);
+
+const blocked: string[] = [];
+for (const line of lines) {
+    //Parse line
+    const parts = line.split(/\s+/);
+    if (parts.length < 4) continue;
+    const [localRef, localSha, remoteRef, remoteSha] = parts;
+
+    // Check branches
+    if (!localRef.startsWith('refs/heads/')) continue;
+    const branch = localRef.slice('refs/heads/'.length);
+    if (protectedBranchPrefixRegex.test(branch)) {
+        blocked.push(branch);
+    }
+}
+
+//MARK: Output
+if (!blocked.length) {
+    process.exit(0);
+}
+
+//Oh noooo :(
+const msg = [
+    `❌ Push blocked: these branches may only be pushed to ${allowedRemoteName}.`,
+    `Remote: ${remoteName} (${remoteUrl})`,
+    `Blocked branches:`,
+    ...blocked.map((b) => `  - ${b}`),
+    ``,
+    `Fix: push to ${allowedRemoteName}.`
+].join('\n');
+process.stderr.write(msg);
+process.exit(1);

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2025 André Tabarra <maintainer@txadmin.gg>
+Copyright (c) 2019-2025 Take-Two Interactive Software, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

commitlint.config.cjs

@@ -21,5 +21,6 @@ module.exports = {
     extends: ['@commitlint/config-conventional'],
     rules: {
         'type-enum': [2, 'always', types],
+        // 'body-max-line-length': [0, 'always', 100],
     },
 };

core/boot/startReadyWatcher.ts

@@ -13,7 +13,7 @@ import { chalkInversePad } from '@lib/misc';
 const console = consoleFactory();
 
 
-const getPublicIp = async () => {
+export const getPublicIp = async () => {
     const zIpValidator = z.string().ip();
     const reqOptions = {
         timeout: { request: 2000 },
@@ -41,16 +41,13 @@ const getPublicIp = async () => {
 const getOSMessage = async () => {
     const serverMessage = [
         `To be able to access txAdmin from the internet open port ${txHostConfig.txaPort}`,
-        'on your OS Firewall as well as in the hosting company.',
+        'on your OS Firewall as well as in the hosting provider.',
     ];
     const winWorkstationMessage = [
         '[!] Home-hosting fxserver is not recommended [!]',
         'You need to open the fxserver port (usually 30120) on Windows Firewall',
         'and set up port forwarding on your router so other players can access it.',
     ];
-    if (txEnv.displayAds) {
-        winWorkstationMessage.push('We recommend renting a server from ' + chalk.inverse(' https://zap-hosting.com/txAdmin ') + '.');
-    }
 
     //FIXME: use si.osInfo() instead
     const distro = await getOsDistro();

core/globalData.ts

@@ -14,8 +14,8 @@ import { getHostVars, hostEnvVarSchemas } from './boot/getHostVars';
 import { getZapVars } from './boot/getZapVars';
 import { z, ZodSchema } from 'zod';
 import { fromZodError } from 'zod-validation-error';
-import defaultAds from '../dynamicAds2.json';
 import consts from '@shared/consts';
+import chalk from 'chalk';
 const console = consoleFactory();
 
 
@@ -209,15 +209,18 @@ if (dataPathVar) {
 //NOTE: Non-ASCII in one of those paths (don't know which) will make NodeJS crash due to a bug in v8 (or something)
 //      when running localization methods like Date.toLocaleString().
 //      There was also an issue with the slash() lib and with the +exec on FXServer
-const nonASCIIRegex = /[^\x00-\x80]+/;
+const nonASCIIRegex = /[^\x00-\x80]+/g;
+const colorNonAscii = (x: string) => chalk.black.bgGreenBright(
+    x.replaceAll(nonASCIIRegex, (m) => chalk.bgRedBright(m))
+);
 if (nonASCIIRegex.test(fxsPath) || nonASCIIRegex.test(dataPath)) {
     fatalError.GlobalData(7, [
         'Due to environmental restrictions, your paths CANNOT contain non-ASCII characters.',
         'Example of non-ASCII characters: çâýå, ρέθ, ñäé, ēļæ, глж, เซิร์, 警告.',
         'Please make sure FXServer is not in a path contaning those characters.',
         `If on windows, we suggest you moving the artifact to "C:/fivemserver/${fxsVersion}/".`,
-        ['FXServer path', fxsPath],
-        ['txData path', dataPath],
+        'FXServer path: ' + colorNonAscii(fxsPath),
+        'txData path: ' + colorNonAscii(dataPath),
     ]);
 }
 
@@ -471,36 +474,33 @@ if (ignoreDeprecatedConfigs) {
 
 const isPterodactyl = !isWindows && process.env?.TXADMIN_ENABLE === '1';
 const isZapHosting = providerName === 'ZAP-Hosting';
+const setConsoleTitle = !(isPterodactyl || isZapHosting || providerName); //assume not a terminal
 
-//Quick config to disable ads
-const displayAds = process.env?.TXHOST_TMP_HIDE_ADS !== 'true' || isPterodactyl || isZapHosting;
-const adSchema = z.object({
-    img: z.string(),
-    url: z.string(),
-}).nullable();
-const adsDataSchema = z.object({
-    login: adSchema,
-    main: adSchema,
-});
-let adsData: z.infer<typeof adsDataSchema> = {
-    login: null,
-    main: null,
-};
-if (displayAds) {
-    try {
-        adsData = adsDataSchema.parse(defaultAds);
-    } catch (error) {
-        console.error('Failed to load ads data.', error);
-    }
-}
 
 //FXServer Display Version
 let fxsVersionTag = fxsVersion.toString();
 if (fxsVerParsed.branch && fxsVerParsed.branch !== 'master') {
     fxsVersionTag += '-ft';
 }
-if (isZapHosting) {
-    fxsVersionTag += '/ZAP';
+
+let providerTag = '';
+const partnerPrefixes = {
+    'gportal': 'GPor',
+    'nitrado': 'Nitr',
+    'nodecraft': 'NoCr',
+    'shockbyte': 'ShBy',
+    'xrealm': 'XRea',
+    'zaphosting': 'ZapH',
+} as { [key: string]: string };
+if (providerName) {
+    const cleanName = providerName.toLowerCase().replace(/[^a-z0-9]+/g, '');
+    if (cleanName in partnerPrefixes) {
+        providerTag = partnerPrefixes[cleanName];
+    }
+}
+
+if (providerTag) {
+    fxsVersionTag += `/${providerTag}`;
 } else if (isPterodactyl) {
     fxsVersionTag += '/Ptero';
 } else if (isWindows && fxsVerParsed.platform === 'windows') {
@@ -520,10 +520,11 @@ export const txDevEnv = Object.freeze(_txDevEnv);
 export const txEnv = Object.freeze({
     //Calculated
     isWindows,
-    isPterodactyl, //TODO: remove, used only in HB Data
-    isZapHosting, //TODO: remove, used only in HB Data and authLogic to disable src check
-    displayAds,
-    adsData,
+    setConsoleTitle,
+
+    //TODO: remove, used only in diagnostics (HB Data + page)
+    isPterodactyl,
+    isZapHosting, //NOTE: This one is also used in authLogic to disable src check
 
     //Natives
     fxsVersionTag,

core/index.ts

@@ -1,6 +1,6 @@
 //NOTE: must be imported first to setup the environment
 import { txEnv, txHostConfig } from './globalData';
-import consoleFactory, { setTTYTitle } from '@lib/console';
+import consoleFactory from '@lib/console';
 
 //Can be imported after
 import fs from 'node:fs';
@@ -16,7 +16,6 @@ const console = consoleFactory();
 try {
     process.title = 'txAdmin'; //doesn't work for now
     setupProcessHandlers();
-    setTTYTitle();
     checkPreRelease();
 } catch (error) {
     fatalError.Boot(0, 'Failed early process setup.', error);