Feat/in game menu

.gitignore

@@ -10,6 +10,11 @@ node_modules
 .env.test.local
 .env.production.local
 
+# AI coding agents
+.freebuff
+.agents
+skills-lock.json
+
 # Testing
 coverage
 

apps/core/src/modules/game/manager.test.ts

@@ -660,11 +660,25 @@ describe('GameManager', () => {
 						Application: 'json/application',
 						'x-resource-token': 'mock-token',
 					},
+					signal: AbortSignal.timeout(8000),
 				},
 			);
 			expect(response).toEqual({ success: true, data: null });
 		});
 
+		it('includes the selected license so a reused server ID cannot disconnect another player', async () => {
+			global.fetch = mock(
+				async () =>
+					({ ok: true, json: async () => ({ success: true }) }) as Response,
+			) as any;
+			await gameManager.dropPlayer(2, 'Reason', 'license:selected');
+			const options = (global.fetch as any).mock.calls[0][1];
+			expect(JSON.parse(options.body)).toMatchObject({
+				serverId: 2,
+				license: 'license:selected',
+			});
+		});
+
 		it('should catch validation error flags gracefully if target router gates declare response failures', async () => {
 			global.fetch = mock(async () => {
 				return {

apps/core/src/modules/game/manager.ts

@@ -253,15 +253,21 @@ export class GameManager {
 
 	// region emitting actions
 
-	async dropPlayer(serverId: number, reason: string): Promise<ApiResponse> {
+	async dropPlayer(
+		serverId: number,
+		reason: string,
+		license?: string,
+	): Promise<ApiResponse> {
 		try {
 			const resourceToken = await this.getApiToken();
 			const endpoint = await getServerNetEndpoint();
 			const response = await fetch(`http://${endpoint}/fxManager/drop`, {
+				signal: AbortSignal.timeout(8000),
 				method: 'POST',
 				body: JSON.stringify({
 					serverId,
 					reason,
+					license,
 				}),
 				headers: {
 					Application: 'json/application',

apps/core/src/routes/internal/ingame.integration.test.ts

@@ -385,6 +385,16 @@ describe('ingame API integration (HTTP)', () => {
 		expect(dropPlayer).not.toHaveBeenCalled();
 	});
 
+	it('does not report a successful kick when the disconnect fails', async () => {
+		dropPlayer.mockResolvedValueOnce({ success: false });
+		const result = await call('POST', '/kick', { target: 2, reason: 'afk' });
+		expect(result.statusCode).toBe(409);
+		expect(mockEmit).not.toHaveBeenCalledWith(
+			'playerKicked',
+			expect.anything(),
+		);
+	});
+
 	it('409s when a longer active ban already exists', async () => {
 		mockAddBan.mockResolvedValueOnce(false as any);
 		const res = await call('POST', '/bans', { target: 2, reason: 'x' });

apps/core/src/routes/internal/ingame.ts

@@ -250,7 +250,12 @@ const IngameEndpoints: RouteModule['handler'] = async (fastify, options) => {
 			const expiryDate = expiresAt ? expiresAt.toLocaleString() : 'Permanent';
 			const kickMessage = `You have been banned from the server. Reason: ${body.reason}. Expires: ${expiryDate}`;
 
-			if (online) await gm.dropPlayer(online.serverId, kickMessage);
+			if (online)
+				await gm.dropPlayer(
+					online.serverId,
+					kickMessage,
+					online.identifiers.license,
+				);
 
 			const profile =
 				online ?? (await repo.players.findById(resolved.playerId));
@@ -420,8 +425,19 @@ const IngameEndpoints: RouteModule['handler'] = async (fastify, options) => {
 			});
 
 			const kickMessage = `You have been kicked from the server. Reason: ${body.reason}`;
-			await gm.dropPlayer(online.serverId, kickMessage);
+			const dropped = await gm.dropPlayer(
+				online.serverId,
+				kickMessage,
+				online.identifiers.license,
+			);
 
+			if (!dropped.success)
+				return reply
+					.code(409)
+					.send({
+						message:
+							'Player could not be disconnected. Refresh the player list and retry.',
+					});
 			void txAdminCompat.emit('playerKicked', {
 				target: online.serverId,
 				author,

apps/core/src/routes/internal/server.ts

@@ -8,6 +8,7 @@ const ServerEndpoints: RouteModule['handler'] = async (fastify, options) => {
 
 	fastify.post('/ready', () => {
 		pm.setFxServerReady();
+		return { ok: true };
 	});
 };
 

apps/resource/README.md

@@ -1,62 +1,28 @@
-# fivem-typescript-boilerplate
+# fxManager in-game resource
 
-A boilerplate for creating FiveM resources with TypeScript.
+F6 opens the quick menu. F7 opens the panel. Staff sections follow the configured ACE permissions.
 
-## Getting Started
+## Reports
 
-### Node.js v18+
+The Reports page is a UI scaffold. Backend integration is deferred while its design is under discussion; submitting reports and replies is unavailable in this branch.
 
-Install any LTS release of [`Node.js`](https://nodejs.org/) from v18.
+## Player monitoring
 
-### pnpm
+**F6 → Player tags / Player blips** exposes tags and blips. Monitoring requires `fxmanager.game.players`.
 
-Install the [`pnpm`](https://pnpm.io/installation) package manager globally.
+Tags appear above other streamed players within 150 metres, not your own character. They show a server ID, name, armour value, health bar, and speaking indicator. Blips distinguish on-foot, vehicle, and dead players in your routing bucket.
 
-```
-npm install -g pnpm
-```
-
-### Setup
-
-Initialise your own repository by using one of the options below.
 
-- [Create a new repository](https://github.com/new?template_name=fivem-typescript-boilerplate&template_owner=communityox) using this template.
-- [Download](https://github.com/communityox/fivem-typescript-boilerplate/archive/refs/heads/main.zip) the template directly.
-- Use the [GitHub CLI](https://cli.github.com/).
-  - `gh repo create <name> --template=communityox/fivem-typescript-boilerplate`
-
-Navigate to your new directory and execute the following command to install dependencies.
-
-```
-pnpm install
-```
+Displayed health subtracts GTA’s 100-point offset and clamps at zero (200 → 100, 150 → 50). The player roster includes health, armour, vehicle state, ping, and routing bucket. The Players page defaults to Online. All players includes online players and up to 50 recent database matches by name or identifier, with online/offline status and last-seen times for offline players. Offline players can be warned or banned; kicks require an online player. Moderation actions still require their individual kick, ban, or warn permissions.
 
 ## Development
 
-Use `pnpm watch` to actively rebuild modified files while developing the resource.
+From the repository root:
 
-During web development, use `pnpm web:dev` to start vite's webserver and watch for changes.
-
-## Build
-
-Use `pnpm build` to build all project files in production mode.
-
-To build and create GitHub releases, tag your commit (e.g. `v1.0.0`) and push it.
-
-## Events
-
-Custom events follow the naming convention described in [EVENTS.md](EVENTS.md). All
-event names are declared as constants in `EVENT_NAMES` (`src/common/types/callbacks.ts`).
-
-## Layout
+```powershell
+bun install
+bun run --cwd apps/resource build
+bun run --cwd apps/resource web:dev
+```
 
-- [/dist/](dist)
-  - Compiled project files.
-- [/locales/](locales)
-  - JSON files used for translations with [ox_lib](https://coxdocs.dev/ox_lib/Modules/Locale/Shared).
-- [/scripts/](scripts)
-  - Scripts used in the development process, but not part of the compiled resource.
-- [/src/](src)
-  - Project source code.
-- [/static/](static)
-  - Files to include with the resource that aren't compiled or loaded (e.g. config).
+The resource build uses the installed `@overextended/fx-utils`. The core supplies the resource API token and API port. Restart through the manager so those runtime settings are restored correctly.

apps/resource/package.json

@@ -5,6 +5,7 @@
 	"description": "",
 	"type": "module",
 	"scripts": {
+		"typecheck": "tsc --noEmit -p src/client/tsconfig.json && tsc --noEmit -p src/server/tsconfig.json && tsc --noEmit -p web/tsconfig.json",
 		"web:dev": "cd web && vite dev",
 		"build": "bun scripts/build.js",
 		"deploy": "bun scripts/deploy.js",

apps/resource/scripts/build.js

@@ -1,7 +1,7 @@
 //@ts-check
 
 import { exists, exec, getFiles } from './utils.js';
-import { createBuilder, createFxmanifest } from '@communityox/fx-utils';
+import { createBuilder, createFxmanifest } from '@overextended/fx-utils';
 
 const watch = process.argv.includes('--watch');
 const web = await exists('./web');

apps/resource/src/client/modules/moderation/blips.test.ts

@@ -0,0 +1,49 @@
+import { expect, mock, test } from 'bun:test';
+const removed: number[] = [];
+const sprites: number[] = [];
+let handle = 0;
+mock.module('../../utils/nui-callbacks', () => ({ NuiCallback: () => {} }));
+mock.module('../../utils/permissions', () => ({
+	permissions: { has: () => true },
+}));
+mock.module('../../utils/callbacks', () => ({ ClientCallbacks: {} }));
+mock.module('../nui/quickmenu', () => ({ updateMenuStore: () => {} }));
+Object.assign(globalThis, {
+	onNet: () => {},
+	on: () => {},
+	PlayerId: () => 0,
+	GetPlayerServerId: () => 1,
+	AddBlipForCoord: () => ++handle,
+	RemoveBlip: (id: number) => removed.push(id),
+	DoesBlipExist: () => true,
+	SetBlipSprite: (_id: number, sprite: number) => sprites.push(sprite),
+});
+for (const name of [
+	'SetBlipScale',
+	'SetBlipCategory',
+	'SetBlipCoords',
+	'SetBlipColour',
+	'SetBlipRotation',
+	'ShowHeadingIndicatorOnBlip',
+	'BeginTextCommandSetBlipName',
+	'AddTextComponentSubstringPlayerName',
+	'EndTextCommandSetBlipName',
+])
+	Object.assign(globalThis, { [name]: () => {} });
+const { blipManager } = await import('./blips');
+test('vehicle and dead states update, disconnected players and disabled blips are removed', () => {
+	blipManager.enabled = true;
+	blipManager.syncBlips({
+		'2': { username: 'Player', coords: [1, 2, 3], inVehicle: true },
+	});
+	expect(sprites.at(-1)).toBe(225);
+	blipManager.syncBlips({
+		'2': { username: 'Player', coords: [1, 2, 3], dead: true },
+	});
+	expect(sprites.at(-1)).toBe(274);
+	blipManager.syncBlips({});
+	expect(removed).toEqual([1]);
+	blipManager.syncBlips({ '3': { username: 'Other', coords: [1, 2, 3] } });
+	blipManager.clearBlips();
+	expect(removed).toEqual([1, 2]);
+});