lenix 1.7.9 → 1.7.11

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/nui/on.ts

@@ -1,20 +1,26 @@
 import type { Event } from '../shared/types.ts'
 
-const cbs = new Map<string, (...params: unknown[]) => void>()
+interface Listener<T extends unknown[]> {
+	callback: (...params: T) => void
+	log?: true
+}
+const events = new Map<string, Set<Listener<unknown[]>>>()
 
-// 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
 
-	try {
-		cb(...(params ?? []))
-	} catch (e) {
-		throw new Error(`Error occured while receiving event<${id}>. \n${e}`)
+	for (const { callback, log } of callbacks) {
+		try {
+			callback(...(params ?? []))
+			log && console.info(`Callback from event<${id}> was called`)
+		} catch (e) {
+			console.error(`Error occured while receiving event<${id}>. \n${e}`)
+		}
 	}
-})
+}
 
 /**
  * Registers a typed browser-side handler for events sent from the game client.
@@ -23,7 +29,30 @@ export const onEvent = <
 	T extends Event<string, unknown[]>
 >(
 	id: T[0],
-	cb: (...params: T[1]) => void
-): void => {
-	cbs.set(id, cb)
+	cb: (...params: T[1]) => void,
+	listen?: true
+): () => void => {
+	if (events.size === 0) {
+		window.addEventListener('message', handler)
+		listen && console.info(`Event<${id}> is the first on the window`)
+	}
+
+	const callbacks = events.get(id) ?? new Set<Listener<unknown[]>>()
+	const listenerCb = { callback: cb, log: listen }
+	callbacks.add(listenerCb)
+	events.set(id, callbacks)
+	listen && console.info(`Event<${id}> was registered`)
+
+	return () => {
+		listen && console.info(`Event<${id}> was unregistered`)
+		callbacks.delete(listenerCb)
+		if (callbacks.size === 0) {
+			events.delete(id)
+			listen && console.info(`Event<${id}> got no callbacks left, memory cleared successfully`)
+		}
+		if (events.size === 0) {
+			window.removeEventListener('message', handler)
+			listen && console.info(`No events left, this event<${id}> was the last, opting out the listen...`)
+		}
+	}
 }

package/package.json

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