@nativewrappers/common 0.0.52 → 0.0.53

package/Kvp.d.ts

@@ -1,58 +1,50 @@
-interface Schema {
-    [key: string]: "string" | "number" | "float" | object;
-}
-export declare class Kvp<T extends Schema> {
-    private schema;
-    constructor(schema: T);
-    /**
-     * Returns the type associated with a schema key.
-     */
-    getType(key: keyof T): "string" | "number" | "float" | "object";
+type KvpSchema = Record<string, string | number | object>;
+type KvpObject<T> = T extends `${infer Prefix}.${infer Rest}` ? Rest extends `${string}.${string}` ? never : Prefix : never;
+type ValidJsonKey<Schema> = {
+    [K in keyof Schema]: K extends string ? `${K}.${string}` : never;
+}[keyof Schema];
+export declare class Kvp<Schema extends KvpSchema> {
     /**
      * Returns the value associated with a key as a number.
      */
-    getNumber(key: string): number;
+    getNumber<K extends string & keyof Schema>(key: K): number;
     /**
      * Returns the value associated with a key as a float.
      */
-    getFloat(key: string): number;
+    getFloat<K extends string & keyof Schema>(key: K): number;
     /**
      * Returns the value associated with a key as a string.
      */
-    getString(key: string): string | null;
+    getString<K extends string & keyof Schema>(key: K): string | null;
     /**
      * Returns the value associated with a key as a parsed JSON string.
      */
-    getJson<T>(key: string): T | null;
+    getJson<K extends string, O = KvpObject<K>>(key: K extends ValidJsonKey<O> ? K : never): O extends string ? Schema[O] : null;
     /**
      * Sets the value associated with a key as a number.
      * @param async set the value using an async operation.
      */
-    setNumber(key: string, value: number, async?: boolean): void;
+    setNumber<K extends string & keyof Schema>(key: K, value: number, async?: boolean): void;
     /**
      * Sets the value associated with a key as a float.
      * @param async set the value using an async operation.
      */
-    setFloat(key: string, value: number, async?: boolean): void;
+    setFloat<K extends string & keyof Schema>(key: K, value: number, async?: boolean): void;
     /**
      * Sets the value associated with a key as a string.
      * @param async set the value using an async operation.
      */
-    setString(key: string, value: string, async?: boolean): void;
+    setString<K extends string & keyof Schema>(key: K, value: string, async?: boolean): void;
     /**
      * Sets the value associated with a key as a JSON string.
      * @param async set the value using an async operation.
      */
-    setJson(key: string, value: object, async?: boolean): void;
+    setJson<K extends string, O = KvpObject<K>>(key: K extends ValidJsonKey<O> ? K : never, value: O extends string ? Schema[O] : never, async?: boolean): void;
     /**
-     * Returns the value associated with a key, determining the type using the declared Kvp schema.
-     */
-    get<K extends keyof T>(key: K): T[K] extends "number" | "float" ? number : T[K] extends object ? T[K] | null : string | null;
-    /**
-     * Sets the value associated with a key as a value, using its type from the declared Kvp stricture.
+     * Sets the value associated with a key as a JSON string.
      * @param async set the value using an async operation.
      */
-    set<K extends string>(key: K extends keyof T ? K : never, value: T[K] extends "number" | "float" ? number : T[K] extends object ? T[K] | null : string | null, async?: boolean): void;
+    set<K extends string, O = KvpObject<K>>(key: K extends keyof Schema ? K : O extends string ? K : never, value: K extends keyof Schema ? Schema[K] : O extends string ? Schema[O] : never, async?: boolean): void;
     /**
      * Deletes the specified value for key.
      * @param async remove the value using an async operation
@@ -64,14 +56,14 @@ export declare class Kvp<T extends Schema> {
      * Should be called after calling set methods using the async flag.
      */
     flush(): void;
-    private getAllKeys;
+    getAllKeys(prefix: string): (keyof Schema)[];
     /**
      * Returns an array of keys which match or contain the given keys.
      */
-    getKeys(prefix: string | string[]): string[];
+    getKeys<K extends (string & keyof Schema) | string[]>(prefix: K): (keyof Schema)[];
     /**
      * Get all values from keys in an array as the specified type.
      */
-    getValuesAsType(prefix: string[], type: "string" | "number" | "float" | "object"): unknown[];
+    getValuesAsType<K extends (string & keyof Schema) | (string & keyof Schema)[]>(prefix: K, type: any): (string | number | Schema[string] | null)[];
 }
 export {};

package/Kvp.js

@@ -1,18 +1,4 @@
 export class Kvp {
-    schema;
-    constructor(schema) {
-        this.schema = { ...schema };
-        for (const key in this.schema) {
-            if (typeof this.schema[key] === "object")
-                this.schema[key] = Object;
-        }
-    }
-    /**
-     * Returns the type associated with a schema key.
-     */
-    getType(key) {
-        return typeof this.schema[key] === "object" ? "object" : this.schema[key];
-    }
     /**
      * Returns the value associated with a key as a number.
      */
@@ -74,38 +60,26 @@ export class Kvp {
         return async ? SetResourceKvpNoSync(key, str) : SetResourceKvp(key, str);
     }
     /**
-     * Returns the value associated with a key, determining the type using the declared Kvp schema.
-     */
-    get(key) {
-        const type = this.getType(key);
-        switch (type) {
-            case "number":
-                return this.getNumber(key);
-            case "float":
-                return this.getFloat(key);
-            case "object":
-                return this.getJson(key);
-            default:
-                return this.getString(key);
-        }
-    }
-    /**
-     * Sets the value associated with a key as a value, using its type from the declared Kvp stricture.
+     * Sets the value associated with a key as a JSON string.
      * @param async set the value using an async operation.
      */
     set(key, value, async = false) {
-        const type = this.getType(key);
-        const valueType = typeof value;
-        if (valueType !== type && type !== "float" && valueType === "number")
-            throw new Error(`Expected '${key}' to be type '${type}' but received '${valueType}'`);
-        switch (type) {
-            case "number":
-                return this.setNumber(key, value, async);
-            case "float":
-                return this.setFloat(key, value, async);
+        switch (typeof value) {
+            case "function":
+            case "symbol":
+                throw new Error(`Failed to set Kvp for invalid type '${typeof value}'`);
+            case "undefined":
+                return this.delete(key, async);
             case "object":
                 return this.setJson(key, value, async);
+            case "boolean":
+                value = value ? 1 : 0;
+            case "number":
+                return Number.isInteger(value)
+                    ? this.setNumber(key, value, async)
+                    : this.setFloat(key, value, async);
             default:
+                value = String(value);
                 return this.setString(key, value, async);
         }
     }
@@ -157,10 +131,10 @@ export class Kvp {
                     return this.getNumber(key);
                 case "float":
                     return this.getFloat(key);
-                case "object":
-                    return this.getJson(key);
-                default:
+                case "string":
                     return this.getString(key);
+                default:
+                    return this.getJson(key);
             }
         });
     }

package/decors/Events.js

@@ -34,7 +34,18 @@ export function Event(eventName) {
         context.addInitializer(function () {
             const t = this;
             on(eventName, (...args) => {
-                return originalMethod.call(t, ...args);
+                try {
+                    return originalMethod.call(t, ...args);
+                }
+                catch (e) {
+                    REMOVE_EVENT_LOG: {
+                        console.error(`------- EVENT ERROR --------`);
+                        console.error(`Call to ${eventName} errored`);
+                        console.error(`Data: ${JSON.stringify(args)}`);
+                        console.error(`Error: ${e}`);
+                        console.error(`------- END EVENT ERROR --------`);
+                    }
+                }
             });
         });
     };
@@ -50,12 +61,25 @@ export function NetEvent(eventName, remoteOnly = false) {
         context.addInitializer(function () {
             const t = this;
             onNet(eventName, (...args) => {
-                CLIENT: {
-                    if (remoteOnly && source !== 65535) {
-                        return;
+                const src = source;
+                try {
+                    CLIENT: {
+                        if (remoteOnly && source !== 65535) {
+                            return;
+                        }
+                    }
+                    return originalMethod.call(t, ...args);
+                }
+                catch (e) {
+                    REMOVE_NET_EVENT_LOG: {
+                        console.error(`------- NET EVENT ERROR --------`);
+                        console.error(`Call to ${eventName} errored`);
+                        console.error(`Caller: ${src}`);
+                        console.error(`Data: ${JSON.stringify(args)}`);
+                        console.error(`Error: ${e}`);
+                        console.error(`------- END NET EVENT ERROR --------`);
                     }
                 }
-                return originalMethod.call(t, ...args);
             });
         });
     };

package/package.json

@@ -4,13 +4,13 @@
   "author": "Remco Troost <d0p3t>",
   "license": "MIT",
   "type": "module",
-  "version": "0.0.52",
+  "version": "0.0.53",
   "repository": {
     "type": "git",
-    "url": "https://github.com/nativewrappers/fivem.git"
+    "url": "https://github.com/nativewrappers/nativewrappers.git"
   },
   "bugs": {
-    "url": "https://github.com/nativewrappers/fivem/issues"
+    "url": "https://github.com/nativewrappers/nativewrappers/issues"
   },
   "homepage": "https://fivemjs.avarian.dev/",
   "keywords": [