lenix 1.7.10 → 1.7.12

package/client/_init.ts

@@ -1,4 +1,3 @@
-// deno-lint-ignore-file no-undef
 import type { _InternalRequests } from '../shared/types.ts'
 import { onNui } from './nui.ts'
 

package/client/blip.ts

@@ -1,5 +1,3 @@
-// deno-lint-ignore-file no-undef
-
 import type { Vec4 } from '../shared/types.ts'
 
 export interface Blip {

package/client/cam.ts

@@ -1,5 +1,3 @@
-// deno-lint-ignore-file no-undef
-
 import type { Vec4 } from '../shared/types.ts'
 
 const cams = new Set<number>()

package/client/client.ts

@@ -138,8 +138,15 @@ export const client = {
 		},
 
 		/*  */
-		coords(excludeH?: true, isAlive?: boolean) {
-			return client.entity.coords(this.entity(), excludeH, isAlive)
+		coords<T extends true | undefined = undefined>(
+			excludeH?: T,
+			isAlive?: boolean
+		): T extends true ? Vec3 : Vec4 {
+			return (
+				excludeH === true
+					? client.entity.coords(this.entity(), true, isAlive)
+					: client.entity.coords(this.entity(), false, isAlive)
+			) as T extends true ? Vec3 : Vec4;
 		},
 
 		/*  */

package/client/control/binds.json

@@ -0,0 +1,87 @@
+{
+  "V": [0, 236, 320, 325],
+  "MOUSE RIGHT": [1, 6, 13, 66, 98, 220, 270, 271, 282, 283, 286, 287, 290, 333],
+  "MOUSE DOWN": [2, 4, 12, 67, 95, 112, 198, 221, 273, 291, 293, 332],
+  "S": [8, 33, 60, 72, 88, 126, 139, 149, 151, 196, 219, 233, 268, 269, 302],
+  "D": [9, 30, 35, 59, 64, 90, 195, 218, 235, 267, 278, 279, 342],
+  "PAGEUP": [10],
+  "PAGEDOWN": [11],
+  "SCROLLWHEEL DOWN": [14, 16, 50, 97, 180, 198, 242, 262, 334, 336],
+  "SCROLLWHEEL UP": [17, 96, 99, 115, 181, 241, 261, 335],
+  "ENTER": [18, 176, 191, 201, 215],
+  "LEFT MOUSE BUTTON": [18, 24, 122, 135, 142, 144, 176, 223, 229, 237, 257, 329, 346],
+  "SPACEBAR": [18, 22, 55, 76, 102, 143, 179, 203, 216, 255, 298, 321, 328, 353],
+  "LEFT ALT": [19],
+  "Z": [20, 48],
+  "LEFT SHIFT": [21, 61, 131, 137, 155, 209, 254, 340, 352],
+  "F": [23, 49, 56, 75, 144, 145, 251],
+  "E": [23, 38, 46, 51, 54, 86, 103, 119, 184, 206, 350, 351, 355, 356],
+  "RIGHT MOUSE BUTTON": [25, 68, 70, 91, 114, 177, 222, 225, 238, 330, 331, 347],
+  "C": [26, 79, 253, 319, 324],
+  "ARROW UP": [27, 172, 188, 300, 303],
+  "B": [29, 170, 305],
+  "W": [32, 61, 71, 77, 87, 111, 129, 136, 150, 232],
+  "A": [34, 63, 89, 124, 133, 147, 234, 338],
+  "LEFT CTRL": [36, 60, 62, 132, 210, 224, 280, 281, 326, 341, 343],
+  "TAB": [37, 192, 204, 211, 349],
+  "[": [39, 41, 43, 100, 116, 274, 275, 276, 277, 312],
+  "]": [40, 42, 197, 313],
+  "Q": [44, 52, 85, 138, 141, 152, 205, 264],
+  "R": [45, 80, 140, 250, 263, 310],
+  "G": [47, 58, 113, 183],
+  "F9": [56],
+  "F10": [57],
+  "X": [73, 105, 120, 131, 154, 186, 203, 214, 224, 252, 256, 296, 323, 337, 345, 349, 354, 357],
+  "H": [74, 101, 104, 304],
+  ".": [81],
+  ",": [82],
+  "=": [83],
+  "-": [84],
+  "NUMPAD-": [96],
+  "NUMPAD+": [97, 314],
+  "NUMPAD 6": [107, 109, 123, 125],
+  "NUMPAD 4": [108, 124],
+  "NUMPAD 5": [110, 112, 126, 128],
+  "NUMPAD 8": [111, 127],
+  "NUMPAD 7": [117],
+  "NUMPAD 9": [118],
+  "INSERT": [121],
+  "1": [157],
+  "2": [158],
+  "6": [159],
+  "3": [160],
+  "7": [161],
+  "8": [162],
+  "9": [163],
+  "4": [164],
+  "5": [165],
+  "F5": [166, 318, 327],
+  "F6": [167],
+  "F7": [168],
+  "F8": [169],
+  "F3": [170],
+  "CAPSLOCK": [137, 171, 217],
+  "ARROW DOWN": [173, 187, 233, 299],
+  "ARROW LEFT": [174, 189, 308],
+  "ARROW RIGHT": [175, 190, 307],
+  "BACKSPACE": [177, 194, 202],
+  "DELETE": [178, 214, 256, 296],
+  "Y": [178, 204, 246, 348],
+  "ESC": [177, 200, 202, 322],
+  "P": [199],
+  "NUMPAD ENTER": [201],
+  "PAGE DOWN": [207, 317],
+  "PAGE UP": [208, 316],
+  "HOME": [212, 213],
+  "T": [245, 309],
+  "M": [244, 301],
+  "N": [249, 306],
+  "~": [243],
+  "`": [243],
+  "K": [311],
+  "U": [303],
+  "F1": [288],
+  "F2": [289],
+  "F11": [344],
+  "SCROLLWHEEL BUTTON (PRESS)": [27, 348]
+}

package/client/control/disable/index.ts

@@ -0,0 +1,12 @@
+import { Bind, isInvalidKey, noop, onKey } from ".."
+
+export default (key: Bind) => {
+  if (isInvalidKey(key)) return false
+
+  try {
+    setTick(() => onKey(DisableControlAction, key, noop, true) )
+  } catch (error) {
+    console.error(error)
+  }
+  return true
+}

package/client/control/index.ts

@@ -0,0 +1,42 @@
+import { trace } from '../../../tr_lib/package/src/shared'
+import binds from './binds.json'
+
+export type Bind = keyof typeof binds
+export const noop = () => {}
+
+export const onKey = (Function: Function, key: Bind, callback: Function, ...parameters: any) => {
+  for (const index of binds[key]) {
+    if (Function(0, index, ...parameters)) {
+      if (callback) {
+        callback()
+      }
+      break
+    }
+  }
+}
+
+export const isInvalidKey = (key: Bind) => {
+  if (!binds[key]) {
+    trace(`Invalid control key passed: ${key}`)
+    return true
+  }
+}
+
+export const getKeyByIndex = (index: number) => {
+  for (const key of Object.keys(binds)) {
+    for (const value of binds[key as Bind]) {
+      if (value == index) {
+        return key
+      }
+    }
+  }
+}
+
+import disable from './disable'
+import onDisabled from './onDisabled'
+import onHold from './onHold'
+import onPress from './onPress'
+import onRelease from './onRelease'
+import onReleased from './onReleased'
+
+export default { disable, onDisabled, onHold, onPress, onRelease, onReleased }

package/client/control/onDisabled/index.ts

@@ -0,0 +1,15 @@
+import { Bind, isInvalidKey, noop, onKey } from ".."
+
+export default (key: Bind, callback: Function) => {
+  if (isInvalidKey(key)) return false
+
+  try {
+    setTick(() => {
+      onKey(DisableControlAction, key, noop, true)
+      onKey(IsDisabledControlJustPressed, key, callback)
+    })
+  } catch (error) {
+    console.error(error)
+  }
+  return true
+}

package/client/control/onHold/index.ts

@@ -0,0 +1,12 @@
+import { Bind, isInvalidKey, onKey } from ".."
+
+export default (key: Bind, callback: Function) => {
+  if (isInvalidKey(key)) return false
+
+  try {
+    setTick(() => onKey(IsControlPressed, key, callback))
+  } catch (error) {
+    console.error(error)
+  }
+  return true
+}

package/client/control/onPress/index.ts

@@ -0,0 +1,12 @@
+import { Bind, isInvalidKey, onKey } from ".."
+
+export default (key: Bind, callback: Function) => {
+  if (isInvalidKey(key)) return false
+
+  try {
+    setTick(() => onKey(IsControlJustPressed, key, callback))
+  } catch (error) {
+    console.error(error)
+  }
+  return true
+}

package/client/control/onRelease/index.ts

@@ -0,0 +1,12 @@
+import { Bind, isInvalidKey, onKey } from ".."
+
+export default (key: Bind, callback: Function) => {
+  if (isInvalidKey(key)) return false
+
+  try {
+    setTick(() => onKey(IsControlJustReleased, key, callback))
+  } catch (error) {
+    console.error(error)
+  }
+  return true
+}

package/client/control/onReleased/index.ts

@@ -0,0 +1,11 @@
+import { Bind, isInvalidKey, onKey } from ".."
+
+export default (key: Bind, callback: Function) => {
+  if (isInvalidKey(key)) return false
+  try {
+    setTick(() => onKey(IsControlReleased, key, callback))
+  } catch (error) {
+    console.error(error)
+  }
+  return true
+}

package/client/nearest.ts

@@ -1,4 +1,3 @@
-// deno-lint-ignore-file no-undef
 import type { Vec3 } from '../shared/types.ts'
 import { client } from './client.ts'
 

package/client/nui.ts

@@ -1,4 +1,3 @@
-// deno-lint-ignore-file no-undef
 import type { Request } from '../shared/types.ts'
 
 /**

package/client/pool.ts

@@ -1,4 +1,3 @@
-// deno-lint-ignore-file no-undef
 const tasks = new Set<() => void>()
 let running = false
 

package/client/timer.ts

@@ -1,5 +1,3 @@
-// deno-lint-ignore-file no-undef
-
 /**
  * Starts a client timer using FiveM game time.
  */

package/nui/on.ts

@@ -1,17 +1,24 @@
 import type { Event } from '../shared/types.ts'
 
-const events = new Map<string, Set<(...params: unknown[]) => void>>()
+interface Listener<T extends unknown[]> {
+	callback: (...params: T) => void
+	log?: true
+}
+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)
-	if (!callbacks) return console.error(`Event<${id}> does not exist yet`)
+	if (!callbacks) return
 
-	try {
-		callbacks.forEach(callback => callback(...(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}`)
+		}
 	}
 }
 
@@ -22,19 +29,30 @@ export const onEvent = <
 	T extends Event<string, unknown[]>
 >(
 	id: T[0],
-	cb: (...params: T[1]) => void
+	cb: (...params: T[1]) => void,
+	listen?: true
 ): () => void => {
-	if (events.size === 0) window.addEventListener('message', handler)
+	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<(...params: T[1]) => void>()
-	callbacks.add(cb)
+	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 () => {
-		callbacks.delete(cb)
-		if (callbacks.size === 0) events.delete(id)
+		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.10",
+  "version": "1.7.12",
   "description": "Typed FiveM utilities for client, server, shared, and NUI scripts",
   "author": "Lenix",
   "license": "MIT",
@@ -9,13 +9,13 @@
     "lenix",
     "modules",
     "typescript",
+    "fivem",
     "lua",
     "luarocks",
     "oop",
-    "fivem",
-    "fxmanifest",
     "api",
     "class",
+    "fxmanifest",
     "eslint",
     "linter"
   ],
@@ -36,13 +36,17 @@
     "nui"
   ],
   "scripts": {
-    "prepare": "rm -rf ./client ./server ./shared ./nui && cp -R ../modules/client ./client && cp -R ../modules/server ./server && cp -R ../modules/shared ./shared && cp -R ../modules/nui ./nui && cp -R ../LICENSE ./",
-    "packpreview": "rm -rf ./package-preview && mkdir -p ./package-preview && bun pm pack --destination ./package-preview && tar -xzf ./package-preview/*.tgz -C ./package-preview && find ./package-preview/package -type f | sort"
+    "packprev": "rm -rf ./package-preview && mkdir -p ./package-preview && bun pm pack --destination ./package-preview && tar -xzf ./package-preview/*.tgz -C ./package-preview && find ./package-preview/package -type f | sort"
   },
   "devDependencies": {
+    "@citizenfx/client": "^2.0.33230-1",
+    "@citizenfx/server": "^2.0.32561-1",
     "@types/bun": "latest"
   },
   "peerDependencies": {
     "typescript": "^5"
+  },
+  "dependencies": {
+    "@lenix/lenix": "npm:@jsr/lenix__lenix"
   }
 }

package/shared/api.ts

@@ -0,0 +1,34 @@
+import { asserts } from "@lenix/lenix"
+import type { Fn } from "./types"
+
+interface Api {
+	[resource: number]: never
+	[resource: string]: {
+		[method: number]: never
+		[method: string]: <T extends Fn<unknown, any[]>>(...args: Parameters<T>) => ReturnType<T>
+	}
+}
+
+export const api: Api = new Proxy(globalThis.exports, {
+	get(target, resource: string) {
+		const value = target[resource]
+		
+		asserts(
+			GetResourceState(resource) === 'started' && value,
+			`<${resource}> is not started yet to be invoked`
+		)
+
+		return new Proxy(value, {
+			get(target, method: string) {
+				const value = target[method]
+
+				asserts(
+					value,
+					`Could not find <${method}> export in ${resource}`
+				)
+
+				return value
+			},
+		})
+	},
+}) as unknown as Api

package/shared/index.ts

@@ -4,6 +4,6 @@
  * Shared helpers that can be used from both client and server contexts.
  */
 
-export * from './assert.ts'
+export * from './api.ts'
 export * from './types.ts'
 export * from './repeat.ts'

package/shared/types.ts

@@ -33,3 +33,5 @@ export interface _InternalRequests {
 		cursor: boolean
 	}>
 }
+
+export type Fn<Return, Args extends unknown[] = []> = (...args: Args) => Return

package/shared/assert.ts

@@ -1,11 +0,0 @@
-/**
- * Asserts that a condition is true and narrows its type.
- */
-export const asserts = <T extends boolean>(
-	condition: T,
-	errorMessage = 'assertion did not passed successfuly'
-): asserts condition => {
-	if (condition) return
-
-	throw new Error(errorMessage)
-}