lenix 1.7.20 → 1.7.22

package/client/_init.ts

@@ -1,7 +1,10 @@
-import type { _InternalRequests } from '../shared/types.ts'
+import type { Request } from '../shared/types.ts'
 import { onNui } from './nui.ts'
 
-onNui<_InternalRequests['focus']>('__nuiFocus', ({
+onNui<Request<true, '__nuiFocus', {
+	keyboard: boolean,
+	cursor: boolean
+}>>('__nuiFocus', ({
 	keyboard,
 	cursor
 }) => {

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/client.ts

@@ -1,8 +1,7 @@
+import { JsonValue } from '@lenix/lenix'
 import { repeat } from '../shared/repeat.ts'
 import type { Vec3, Vec4 } from '../shared/types.ts'
 
-type JsonPrimitive = string | number | boolean | null
-type JsonValue = JsonPrimitive | JsonValue[] | { [key: string]: JsonValue }
 
 export const client = {
 	entity: {

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/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/{trigger.ts → fetch.ts}

@@ -1,11 +1,12 @@
+import { JsonValue } from '@lenix/lenix'
 import type { Request } from '../shared/types.ts'
 
 declare function GetParentResourceName(): string
 
 /**
- * Sends a typed request from the NUI browser to the game client.
+ * Fetchs a typed request from the NUI browser to the game client.
  */
-export const triggerNui = async <T extends Request<unknown, string, object>>(
+export const fetchNui = async <T extends Request<JsonValue, string, object>>(
 	id: T[1],
 	data: T[2]
 ): Promise<T[0]> => {
@@ -19,6 +20,6 @@ export const triggerNui = async <T extends Request<unknown, string, object>>(
 		})
 		return await response.json()
 	} catch (e) {
-		throw new Error(`Error occured while emiting an nui<${id}>.\n${e}`)
+		throw `Error occured while emiting an nui<${id}>.\n${e}`
 	}
 }

package/nui/focus.ts

@@ -1,10 +1,27 @@
-import type { _InternalRequests } from '../shared/types.ts'
-import { triggerNui } from './trigger.ts'
+import { Request } from '../shared/types.ts'
+import { fetchNui } from './fetch.ts'
 
 /**
  * Requests keyboard and cursor focus for the NUI browser.
  */
-export const focus = (
-	keyboard = true,
-	cursor = true
-): Promise<true> => triggerNui<_InternalRequests['focus']>('__nuiFocus', { keyboard, cursor })
+export const focus = (exclude?: 'keyboard' | 'cursor'): Promise<true> => {
+	return fetchNui<Request<true, '__nuiFocus', {
+		keyboard: boolean,
+		cursor: boolean
+	}>>('__nuiFocus', { keyboard: exclude === 'keyboard' ? false : true, cursor: exclude === 'cursor' ? false : true })
+}
+
+export const unFocus = (
+	key: KeyboardEvent['key'],
+	onEvent: () => void
+) => {
+	
+	const handler = (e: KeyboardEvent) => {
+	 if (e.key !== key) return
+
+	 onEvent()
+	}
+	
+	window.addEventListener('keydown', handler)
+	return () => window.removeEventListener('keydown', handler)
+}

package/nui/index.ts

@@ -6,5 +6,5 @@
  */
 
 export * from './on.ts'
-export * from './trigger.ts'
+export * from './fetch.ts'
 export * from './focus.ts'

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lenix",
-  "version": "1.7.20",
+  "version": "1.7.22",
   "description": "Typed FiveM utilities for client, server, shared, and NUI scripts",
   "author": "Lenix",
   "license": "MIT",
@@ -47,6 +47,6 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "@lenix/lenix": "npm:@jsr/lenix__lenix"
+    "@lenix/lenix": "npm:@jsr/lenix__lenix@1.8.16"
   }
 }

package/shared/index.ts

@@ -7,3 +7,4 @@
 export * from './types.ts'
 export * from './repeat.ts'
 export * from './palette.ts'
+export * from './timer.ts'

package/{client → shared}/timer.ts

@@ -1,12 +1,17 @@
 /**
  * Starts a client timer using FiveM game time.
  */
-export const useTimer = (
+export const useTimer = ({
+	duration,
+	updateInterval,
+	onTick,
+	onEnd
+}: {
 	duration: number,
 	updateInterval: number,
 	onTick: (timeLeft: number) => void,
 	onEnd: () => void
-): () => void => {
+}): () => void => {
 	const start = GetGameTimer()
 
 	const interval = setInterval(() => {

package/shared/types.ts

@@ -1,3 +1,5 @@
+import { JsonValue } from "@lenix/lenix"
+
 /**
  * Three-dimensional coordinates plus heading.
  */
@@ -17,19 +19,8 @@ export type Event<Id extends string, Params extends unknown[] = never> = [Id, Pa
  * Typed request tuple containing a response type, request id, and object payload.
  */
 export type Request<
-	Response,
+	Response extends JsonValue,
 	Id extends string,
 	Params extends object = { [key: string]: unknown }
 > = Params extends readonly unknown[] ? never
 	: [Response, Id, Params]
-
-	
-/**
- * Internal NUI requests used by Lenix helpers. DO NOT USE
- */
-export interface _InternalRequests {
-	focus: Request<true, '__nuiFocus', {
-		keyboard: boolean,
-		cursor: boolean
-	}>
-}