lenix 1.7.8 → 1.7.10

package/client/cam.ts

@@ -2,6 +2,8 @@
 
 import type { Vec4 } from '../shared/types.ts'
 
+const cams = new Set<number>()
+
 export interface BaseCamDetails {
 	/**
 	 * Fade-out duration in milliseconds.
@@ -102,6 +104,7 @@ const create = ({
 		false,
 		rotationOrder
 	)
+	cams.add(cam)
 
 	toggleCam({
 		cam,
@@ -132,10 +135,16 @@ const destroy = ({
 		fadeIn,
 		fadeOut
 	})
+	cams.delete(cam)
 }
 
-// TODO: delete cams on resource stop
 export const cam = {
 	create,
 	destroy
 }
+
+on('onResourceStop', (resource: string) => {
+	if (resource !== GetCurrentResourceName()) return
+
+	cams.forEach(cam => destroy({ cam }))
+})

package/client/client.ts

@@ -1,6 +1,9 @@
 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: {
 		/**
@@ -154,24 +157,31 @@ export const client = {
 		},
 
 		/*  */
-		/* TODO: support booleans and numbers, and maybe even json */
 		storage: {
 			set: <Storage>(
 				...[key, value]: {
-					[K in keyof Storage]: [key: Extract<K, string>, value: Storage[K] extends string ? Storage[K] : string]
+					[K in keyof Storage]: Storage[K] extends JsonValue
+						? [key: Extract<K, string>, value: Storage[K]]
+						: never
 				}[keyof Storage]
-			) => SetResourceKvp(key, value),
+			) => SetResourceKvp(key, JSON.stringify(value)),
 
 			get: <Storage, K extends Extract<keyof Storage, string>>(
 				key: K,
-				init?: Extract<Storage[K], string>
-			): Storage[K] extends string ? Storage[K] : string => {
-				const get = GetResourceKvpString
-				if (get(key) === null) {
-					if (init === undefined || init === null) throw new Error(`Failed to get Storage<${key}> value, reason: The key was never assigned before and you did not provided an initiate value`)
-					client.player.storage.set<Storage>(key, init)
+				init?: Storage[K] extends JsonValue ? Storage[K] : never
+			): Storage[K] extends JsonValue ? Storage[K] : never => {
+				const value = GetResourceKvpString(key)
+
+				if (value === null) {
+					if (init === undefined) {
+						throw new Error(`Storage<${key}> was never assigned`)
+					}
+
+					SetResourceKvp(key, JSON.stringify(init))
+					return init as Storage[K] extends JsonValue ? Storage[K] : never
 				}
-				return get(key) as Storage[K] extends string ? Storage[K] : string
+
+				return JSON.parse(value) as Storage[K] extends JsonValue ? Storage[K] : never
 			},
 
 			delete: <Storage>(

package/nui/on.ts

@@ -1,20 +1,19 @@
 import type { Event } from '../shared/types.ts'
 
-const cbs = new Map<string, (...params: unknown[]) => void>()
+const events = new Map<string, Set<(...params: unknown[]) => void>>()
 
-// TODO: remove the event
 // deno-lint-ignore no-window no-window-prefix no-unused-vars
-const handler = window.addEventListener('message', (event: MessageEvent) => {
+const handler = (event: MessageEvent) => {
 	const { id, params } = event.data
-	const cb = cbs.get(id)
-	if (!cb) throw new Error(`Callback<${id}> does not exist yet`)
+	const callbacks = events.get(id)
+	if (!callbacks) return console.error(`Event<${id}> does not exist yet`)
 
 	try {
-		cb(...(params ?? []))
+		callbacks.forEach(callback => callback(...(params ?? [])))
 	} catch (e) {
 		throw new Error(`Error occured while receiving event<${id}>. \n${e}`)
 	}
-})
+}
 
 /**
  * Registers a typed browser-side handler for events sent from the game client.
@@ -24,6 +23,18 @@ export const onEvent = <
 >(
 	id: T[0],
 	cb: (...params: T[1]) => void
-): void => {
-	cbs.set(id, cb)
-}
+): () => void => {
+	if (events.size === 0) window.addEventListener('message', handler)
+
+	const callbacks = events.get(id) ?? new Set<(...params: T[1]) => void>()
+	callbacks.add(cb)
+	events.set(id, callbacks)
+
+	return () => {
+		callbacks.delete(cb)
+		if (callbacks.size === 0) events.delete(id)
+		if (events.size === 0) {
+			window.removeEventListener('message', handler)
+		}
+	}
+}

package/package.json

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