lenix 1.7.25 → 1.8.1

package/client/_init.ts

@@ -1,6 +1,58 @@
+import { asserts, type JsonValue } from '@lenix/lenix'
 import type { Request } from '../shared/types.ts'
 import { onNui } from './nui.ts'
 
+type Resolve = {
+	success: true,
+	returned: JsonValue
+} | {
+	success: false
+}
+
+const DEFAULT_TIMEOUT = 5000
+const pendingResolves: Record<number, (resolve: Resolve) => void> = {}
+const requests: string[] = []
+let requestId = 0
+
+onNui<Request<JsonValue, '__nuiServer', {
+	id: string
+	data: {
+		requestData: JsonValue
+		timeout?: number
+	}
+}>>('__nuiServer', async ({ id, data }) => {
+	const { timeout = DEFAULT_TIMEOUT, requestData } = data
+	
+  const response = await new Promise<Resolve>(resolve => {
+		requestId = requestId + 1
+		const currentRequestId = requestId
+		pendingResolves[currentRequestId] = resolve
+
+		if (!requests.includes(id)) {
+			requests.push(id)
+			onNet(`lenix/nui:${id}`, (selfrequestId: number, response: JsonValue) => {
+				if (!pendingResolves[selfrequestId]) return
+
+				pendingResolves[selfrequestId]({ success: true, returned: response })
+				delete pendingResolves[selfrequestId]
+			})
+		}
+
+		emitNet(`lenix/nui:${id}`, currentRequestId, requestData)
+
+		setTimeout(() => {
+			if (pendingResolves[currentRequestId]) {
+				pendingResolves[currentRequestId]({ success: false })
+				delete pendingResolves[currentRequestId]
+			}
+		}, timeout)
+	})
+	
+	asserts(response.success, `server nui<${id}> timed out after ${timeout}ms, possible slow respose or request does not exist`)
+
+	return response.returned
+})
+
 onNui<Request<true, '__nuiFocus', {
 	keyboard: boolean,
 	cursor: boolean

package/client/client.ts

@@ -1,4 +1,4 @@
-import { JsonValue } from '@lenix/lenix'
+import type { JsonValue } from '@lenix/lenix'
 import { repeat } from '../shared/repeat.ts'
 import type { Vec3, Vec4 } from '../shared/types.ts'
 

package/nui/fetch.ts

@@ -22,3 +22,22 @@ export const fetchNui = async <T extends NuiFetchGeneric>(
 		throw `Error occured while emiting an nui<${id}>.\n${e}`
 	}
 }
+
+export const fetchNuiServer = <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,
+	}
+})

package/nui/focus.ts

@@ -1,4 +1,4 @@
-import { Request } from '../shared/types.ts'
+import type { Request } from '../shared/types.ts'
 import { fetchNui } from './fetch.ts'
 
 /**

package/package.json

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

package/server/index.ts

@@ -5,4 +5,5 @@
  */
 
 export * from './server'
-export * from '../shared/api'
+export * from '../shared/api'
+export * from './nui'

package/server/nui.ts

@@ -0,0 +1,25 @@
+import { asserts } from "@lenix/lenix";
+import type { NuiFetchGeneric } from "../shared/types";
+
+const clientRequests: string[] = []
+
+export const onNuiServer = <T extends NuiFetchGeneric>(
+	id: T[1],
+	cb: (client: number, data: T[2]) => T[0] | Promise<T[0]>
+) => {
+	asserts(!clientRequests.includes(id), `server nui<${id}> is already defined`)
+
+  clientRequests.push(id)
+
+  onNet(`lenix/nui:${id}`, async(requestId: number, parameters: Parameters<typeof cb>[1]) => {
+    const clientSource = source
+
+    try {
+      const result = await cb(clientSource, parameters)
+      emitNet(`lenix/nui:${id}`, clientSource, requestId, result)
+    } catch (error) {
+      emitNet(`lenix/nui:${id}`, clientSource, requestId)
+			throw error
+		}
+  })
+}

package/shared/types.ts

@@ -1,4 +1,4 @@
-import { JsonValue } from "@lenix/lenix"
+import type { JsonValue } from "@lenix/lenix"
 
 /**
  * Three-dimensional coordinates plus heading.
@@ -18,11 +18,14 @@ export type Event<Id extends string, Params extends unknown[] = never> = [Id, Pa
 /**
  * Typed request tuple containing a response type, request id, and object payload.
  */
+interface JsonObject {
+	[key: string]: JsonValue
+}
 export type Request<
 	Response extends JsonValue,
 	Id extends string,
-	Params extends object = { [key: string]: unknown }
+	Params extends JsonObject = JsonObject
 > = Params extends readonly unknown[] ? never
 	: [Response, Id, Params]
 
-export type NuiFetchGeneric = Request<JsonValue, string, object>
+export type NuiFetchGeneric = Request<JsonValue, string, JsonObject>