lenix 1.8.3 → 1.8.5

package/client/client.ts

@@ -63,12 +63,11 @@ export const client = {
 			y: number,
 			z: number,
 			h?: number,
-			clearArea = false,
-			alive = true,
-			deadDisable = false,
-			ragdol = false
+			keepTasks = false,
+			keepIK = false,
+			doWarp = false
 		) => {
-			SetEntityCoords(entity, x, y, z, alive, deadDisable, ragdol, clearArea)
+			SetEntityCoordsNoOffset(entity, x, y, z, keepTasks, keepIK, doWarp)
 			h && SetEntityHeading(entity, h)
 		},
 
@@ -154,12 +153,11 @@ export const client = {
 			y: number,
 			z: number,
 			h?: number,
-			clearArea?: boolean,
-			alive?: boolean,
-			deadDisable?: boolean,
-			ragdol?: boolean
+			keepTasks = false,
+			keepIK = false,
+			doWarp = false
 		) {
-			return client.entity.teleport(this.entity(), x, y, z, h, clearArea, alive, deadDisable, ragdol)
+			return client.entity.teleport(this.entity(), x, y, z, h, keepTasks, keepIK, doWarp)
 		},
 
 		/*  */

package/nui/fetch.ts

@@ -1,4 +1,5 @@
 import type { NuiFetchGeneric, Request } from '../shared/types.ts'
+import { palette } from '../shared/palette.ts'
 
 declare function GetParentResourceName(): string
 
@@ -23,21 +24,37 @@ export const fetchNui = async <T extends NuiFetchGeneric>(
 	}
 }
 
-export const fetchNuiServer = <T extends NuiFetchGeneric>(
+export const fetchNuiServer = async <T extends NuiFetchGeneric>(
 	id: T[1],
 	requestData: T[2],
 	timeout?: number,
-): Promise<T[0]> => fetchNui<Request<T[0], '__nuiServer', {
-	id: T[1]
-	data: {
-		timeout?: number
-		requestData: T[2]
-	}
-}>>(
-	'__nuiServer', {
-	id,
-	data: {
-		timeout,
-		requestData,
+): Promise<T[0]> => {
+	const { data, error } = await fetchNui<Request<{
+		data: T[0]
+		error: null
+	} | {
+		data: null
+		error: string
+	}, '__nuiServer', {
+		id: T[1]
+		data: {
+			timeout?: number
+			requestData: T[2]
+		}
+	}>>(
+		'__nuiServer', {
+		id,
+		data: {
+			timeout,
+			requestData,
+		}
+	})
+	if (error !== null) {
+		const typeofError = typeof error
+		if (typeofError === 'string') throw error
+		
+		throw `Expected 'error' typeof 'string', got ${error} typeof ${typeofError}`
 	}
-})
+
+	return data
+}

package/package.json

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

package/server/nui.ts

@@ -15,10 +15,16 @@ export const onNuiServer = <T extends NuiFetchGeneric>(
     const clientSource = source
 
     try {
-      const result = await cb(clientSource, parameters)
-      emitNet(`lenix/nui:${id}`, clientSource, requestId, result)
+      const data = await cb(clientSource, parameters)
+      emitNet(`lenix/nui:${id}`, clientSource, requestId, {
+				data,
+				error: null
+			})
     } catch (error) {
-      emitNet(`lenix/nui:${id}`, clientSource, requestId)
+      emitNet(`lenix/nui:${id}`, clientSource, requestId, {
+				data: null,
+				error
+			})
 			throw error
 		}
   })

package/shared/repeat.ts

@@ -23,7 +23,7 @@ export function repeat <T>(
 				return
 			}
 
-			if (!result !== equal) return
+			if (result !== equal) return
 
 			resolve(equal ?? result)
 			clearInterval(interval)