lenix 1.7.19 → 1.7.21

package/client/blip.ts

@@ -1,10 +1,10 @@
-import type { Vec4 } from '../shared/types.ts'
+import type { Vec3 } from '../shared/types.ts'
 
 export interface Blip {
 	/**
 	 * Blip world coordinates and heading.
 	 */
-	coords: Vec4
+	coords: Vec3
 	/**
 	 * FiveM blip sprite id.
 	 */

package/client/cam.ts

@@ -64,7 +64,6 @@ const toggleCam = ({
 }) => {
 	setTimeout(() => {
 		SetCamActive(cam, state)
-		// deno-lint-ignore no-boolean-literal-for-arguments
 		RenderScriptCams(state, state, delay, true, state)
 		DoScreenFadeIn(fadeIn)
 	}, delay)
@@ -89,7 +88,6 @@ const create = ({
 		rotationOrder = details?.rotationOrder ?? 0
 
 	DoScreenFadeOut(fadeOut)
-	// deno-lint-ignore no-boolean-literal-for-arguments
 	const cam = CreateCamWithParams(
 		'DEFAULT_SCRIPTED_CAMERA',
 		coords[0],

package/client/control.ts

@@ -4,7 +4,7 @@ import { pool } from './pool'
 export interface Bind {
 	event: keyof typeof EVENTS,
 	key: keyof typeof CONTROLS,
-	cb: () => void,
+	onEvent: () => void,
 	type: keyof typeof TYPES,
 }
 
@@ -115,7 +115,7 @@ const binds = new Set<Bind>()
 const on = ({
 	event,
 	key,
-	cb,
+	onEvent: cb,
 	type = 'player',
 }: Omit<Bind, 'event' | 'type'> & {
 	type?: Bind['type']
@@ -125,7 +125,7 @@ const on = ({
 	asserts(CONTROLS[key], `Could not find key<${key}>`)
 
 	binds.add({
-		event, key, cb, type
+		event, key, onEvent: cb, type
 	})
 }
 const disable = ({
@@ -137,7 +137,7 @@ const disable = ({
 	asserts(CONTROLS[key], `Could not find key<${key}>`)
 
 	binds.add({
-		event: 'disable', key, cb: () => {}, type
+		event: 'disable', key, onEvent: () => {}, type
 	})
 }
 const enable = ({
@@ -149,11 +149,11 @@ const enable = ({
 	asserts(CONTROLS[key], `Could not find key<${key}>`)
 
 	binds.add({
-		event: 'enable', key, cb: () => {}, type
+		event: 'enable', key, onEvent: () => {}, type
 	})
 }
 
-pool(() => binds.forEach(({ event, key, cb, type }) => {
+pool(() => binds.forEach(({ event, key, onEvent: cb, type }) => {
 	for (const index of CONTROLS[key]) {
 		if (!EVENTS[event](TYPES[type], index, true)) continue
 		cb()

package/client/index.ts

@@ -11,7 +11,6 @@ export * from './blip.ts'
 export * from './cam.ts'
 export * from './nearest.ts'
 export * from './pool.ts'
-export * from './timer.ts'
 export * from './client.ts'
 export * from './control.ts'
 export * from '../shared/api'

package/client/nearest.ts

@@ -48,10 +48,9 @@ const player = (
 
 		if (playerId !== PlayerPedId() || includePlayer) {
 			const playerPed = GetPlayerPed(playerId)
-			// deno-lint-ignore no-boolean-literal-for-arguments
 			const vehicle = GetVehiclePedIsIn(playerPed, false)
 			const playerCoords: Vec3 = vehicle === 0
-				? client.entity.coords(true, playerPed)
+				? client.entity.coords(playerPed, true)
 				: GetWorldPositionOfEntityBone(playerPed, 0) as Vec3
 
 			const distance = Vdist(
@@ -85,14 +84,14 @@ const player = (
  * Finds the nearest vehicle around an entity.
  */
 const vehicle = (entity: number, radialSpace: number): number | undefined => {
-	const coords: Vec3 = client.entity.coords(true, entity)
+	const coords: Vec3 = client.entity.coords(entity, true)
 	const vehicles = GetGamePool('CVehicle') as number[]
 
 	let closest: number | undefined
 	let closestDistance = radialSpace
 
 	for (const vehicle of vehicles) {
-		const vehCoords: Vec3 = client.entity.coords(true, vehicle)
+		const vehCoords: Vec3 = client.entity.coords(vehicle, true)
 		const x = coords[0] - vehCoords[0]
 		const y = coords[1] - vehCoords[1]
 		const z = coords[2] - vehCoords[2]

package/client/nui.ts

@@ -23,10 +23,14 @@ export const onNui = <T extends Request<unknown, string, object>>(
 	id: T[1],
 	cb: (data: T[2]) => T[0] | Promise<T[0]>
 ): void => {
-	RegisterNuiCallback(id, (
+	RegisterNuiCallback(id, async (
 		data: T[2],
 		reply: (_: unknown) => void
 	) => {
-		reply(cb(data))
+		try {
+			reply(await cb(data))
+		} catch(e) {
+			throw e
+		}
 	})
 }

package/client/pool.ts

@@ -21,7 +21,6 @@ export const pool = (func: () => void): void => {
 				task()
 			} catch (e) {
 				tasks.delete(task)
-				// deno-lint-ignore no-console
 				console.warn(e)
 			}
 		}

package/nui/on.ts

@@ -6,7 +6,6 @@ interface Listener<T extends unknown[]> {
 }
 const events = new Map<string, Set<Listener<unknown[]>>>()
 
-// deno-lint-ignore no-window no-window-prefix no-unused-vars
 const handler = (event: MessageEvent) => {
 	const { id, params } = event.data
 	const callbacks = events.get(id)

package/nui/trigger.ts

@@ -15,7 +15,7 @@ export const triggerNui = async <T extends Request<unknown, string, object>>(
 			headers: {
 				'Content-Type': 'application/json; charset=UTF-8'
 			},
-			body: JSON.stringify(data ?? {})
+			body: JSON.stringify(data)
 		})
 		return await response.json()
 	} catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lenix",
-  "version": "1.7.19",
+  "version": "1.7.21",
   "description": "Typed FiveM utilities for client, server, shared, and NUI scripts",
   "author": "Lenix",
   "license": "MIT",