@nativewrappers/fivem 0.0.137 → 0.0.138

package/common/BaseScript.d.ts

@@ -0,0 +1,2 @@
+export declare abstract class BaseScript {
+}

package/common/BaseScript.js

@@ -0,0 +1,10 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+class BaseScript {
+  static {
+    __name(this, "BaseScript");
+  }
+}
+export {
+  BaseScript
+};

package/common/Command.js

@@ -14,6 +14,9 @@ function registerCommand(name, commandHandler, restricted = true) {
   }
   RegisterCommand(name, commandHandler, GlobalData.IS_CLIENT ? false : !!restricted);
   $SERVER: {
+    $CLIENT: {
+      if (GlobalData.IS_CLIENT) return;
+    }
     const ace = `command.${name}`;
     if (typeof restricted === "string") {
       if (IsPrincipalAceAllowed(restricted, ace)) return;
@@ -59,13 +62,12 @@ class Command {
       const names = Array.isArray(name) ? name : [name];
       for (const name2 of names) {
         const commandObj = { ...this, name: `/${name2}` };
-        $SERVER: {
+        if (GlobalData.IS_CLIENT) {
+          emit("chat:addSuggestion", commandObj);
+        } else {
           commands.push(commandObj);
           emitNet("chat:addSuggestions", -1, commandObj);
         }
-        $CLIENT: {
-          emit("chat:addSuggestion", commandObj);
-        }
       }
     }, 100);
   }

package/common/GlobalData.d.ts

@@ -6,6 +6,7 @@ export declare enum ErrorType {
     Tick = 4,
     Immediate = 5
 }
+export type NativeWrapperErrorType = (type: ErrorType, err: Error) => void;
 export declare class GlobalData {
     static CurrentResource: string;
     static GameName: string;

package/common/GlobalData.js

@@ -9,6 +9,8 @@ var ErrorType = /* @__PURE__ */ ((ErrorType2) => {
   ErrorType2[ErrorType2["Immediate"] = 5] = "Immediate";
   return ErrorType2;
 })(ErrorType || {});
+globalThis.OnError = (type, err) => {
+};
 class GlobalData {
   static {
     __name(this, "GlobalData");
@@ -27,6 +29,7 @@ class GlobalData {
    * Called when one of the decors errors
    */
   static OnError = /* @__PURE__ */ __name((type, err) => {
+    globalThis.OnError(type, err);
   }, "OnError");
 }
 export {

package/common/decors/Events.js

@@ -20,7 +20,7 @@ function OnEvent(eventName) {
             console.error("------- EVENT ERROR --------");
             console.error(`Call to ${eventName} errored`);
             console.error(`Data: ${JSON.stringify(args)}`);
-            console.error(`Error: ${e}`);
+            globalThis.printError("event", e);
             console.error("------- END EVENT ERROR --------");
           }
         }
@@ -70,7 +70,7 @@ function OnNetEvent(eventName, remoteOnly = true) {
             console.error(`Call to ${eventName} errored`);
             console.error(`Caller: ${src}`);
             console.error(`Data: ${JSON.stringify(args)}`);
-            console.error(`Error: ${e}`);
+            globalThis.printError("net event", e);
             console.error("------- END NET EVENT ERROR --------");
           }
         }

package/common/decors/Resources.d.ts

@@ -1,8 +1,16 @@
+type ResourceName = string;
+type ResourceOrGlobal = ResourceName | "global";
+export declare const EnsureResourceWrapperInit: () => void;
 /**
  * Called whenever the specified resource is started, this will be called once on once on resource start if the resource is started.
+ * NOTE: If you want to listen to *all* resource start/stop events you should send
+ * {@link resource} as "global"
  */
-export declare function OnResourceStart(resource?: string): (originalMethod: any, context: ClassMethodDecoratorContext) => void;
+export declare function OnResourceStart(resource?: ResourceOrGlobal): (originalMethod: any, context: ClassMethodDecoratorContext) => void;
 /**
  * Called whenever the specified resource is stopped.
+ * NOTE: If you want to listen to *all* resource start/stop events you should send
+ * {@link resource} as "global"
  */
-export declare function OnResourceStop(resource?: string): (originalMethod: any, context: ClassMethodDecoratorContext) => void;
+export declare function OnResourceStop(resource?: ResourceOrGlobal): (originalMethod: any, context: ClassMethodDecoratorContext) => void;
+export {};

package/common/decors/Resources.js

@@ -7,6 +7,10 @@ class ResourceWrapper {
   }
   #on_resource_start = /* @__PURE__ */ new Map();
   #on_resource_stop = /* @__PURE__ */ new Map();
+  // used for global resource/start/stops, callers have to define their listener
+  // as "global"
+  #global_on_resource_start = [];
+  #global_on_resource_stop = [];
   #add_or_init(resource_fn_map, resource_name, fn) {
     const fn_array = resource_fn_map.get(resource_name);
     if (fn_array) {
@@ -21,7 +25,11 @@ class ResourceWrapper {
    * @param fn The function to call
    */
   add_to_resource_start(resource_name, fn) {
-    this.#add_or_init(this.#on_resource_start, resource_name, fn);
+    if (resource_name === "global") {
+      this.#global_on_resource_start.push(fn);
+    } else {
+      this.#add_or_init(this.#on_resource_start, resource_name, fn);
+    }
   }
   /**
    * Adds a function to get called whenever a resource is stopped
@@ -29,31 +37,47 @@ class ResourceWrapper {
    * @param fn The function to call
    */
   add_to_resource_stop(resource_name, fn) {
-    this.#add_or_init(this.#on_resource_stop, resource_name, fn);
+    if (resource_name === "global") {
+      this.#global_on_resource_stop.push(fn);
+    } else {
+      this.#add_or_init(this.#on_resource_stop, resource_name, fn);
+    }
   }
-  #call_for_resource(resource_fn_map, resource_name) {
+  #call_for_resource(resource_fn_map, global_array, resource_name) {
     const functions = resource_fn_map.get(resource_name);
     if (functions) {
       for (const fn of functions) {
-        fn();
+        try {
+          fn(resource_name);
+        } catch (e) {
+        }
+      }
+    }
+    for (const fn of global_array) {
+      try {
+        fn(resource_name);
+      } catch (e) {
       }
     }
   }
   @Event("onResourceStart")
   on_resource_start(resource_name) {
-    this.#call_for_resource(this.#on_resource_start, resource_name);
+    this.#call_for_resource(this.#on_resource_start, this.#global_on_resource_start, resource_name);
   }
   @Event("onResourceStop")
   on_resource_stop(resource_name) {
-    this.#call_for_resource(this.#on_resource_stop, resource_name);
+    this.#call_for_resource(this.#on_resource_stop, this.#global_on_resource_stop, resource_name);
   }
 }
-if (!globalThis.RESOURCE_WRAPPER) {
-  globalThis.RESOURCE_WRAPPER = new ResourceWrapper();
-}
+const EnsureResourceWrapperInit = /* @__PURE__ */ __name(() => {
+  if (!globalThis.RESOURCE_WRAPPER) {
+    globalThis.RESOURCE_WRAPPER = new ResourceWrapper();
+  }
+}, "EnsureResourceWrapperInit");
+EnsureResourceWrapperInit();
 const RESOURCE_WRAPPER = globalThis.RESOURCE_WRAPPER;
 const onResourceStart = /* @__PURE__ */ __name((resource, originalMethod) => {
-  if (GetResourceState(resource) === "started") {
+  if (resource !== "global" && GetResourceState(resource) === "started") {
     setImmediate(() => originalMethod.call());
   }
   RESOURCE_WRAPPER.add_to_resource_start(resource, originalMethod);
@@ -89,6 +113,7 @@ function OnResourceStop(resource = GetCurrentResourceName()) {
 }
 __name(OnResourceStop, "OnResourceStop");
 export {
+  EnsureResourceWrapperInit,
   OnResourceStart,
   OnResourceStop
 };

package/common/net/NetworkedMap.d.ts

@@ -1,4 +1,4 @@
-type ChangeListener<V> = (value: V) => void;
+type ChangeListener<V> = (value: V | undefined) => void;
 /**
  * not ready to be used just thoughts right now
  */
@@ -13,7 +13,7 @@ export declare class NetworkedMap<K, V> extends Map<K, V> {
     hasSubscriber(sub: number): boolean;
     subscriberCount(): number;
     private handleSync;
-    listenForChange(key: K, fn: ChangeListener<V>): void;
+    listenForChange(key: K, fn: ChangeListener<V | undefined>): void;
     set(key: K, value: V): this;
     clear(): void;
     delete(key: K): boolean;

package/common/net/NetworkedMap.js

@@ -76,7 +76,10 @@ class NetworkedMap extends Map {
       console.error(`[NetworkedMap:resync] Tried to call resync on a source that wasn't already subscribed`);
       return;
     }
-    const packed_data = msgpack_pack([this.#syncName, [[4 /* Init */, this.size === 0 ? [] : Array.from(this)]]]);
+    const packed_data = msgpack_pack([
+      this.#syncName,
+      [[5 /* Resync */, this.size === 0 ? [] : Array.from(this)]]
+    ]);
     TriggerClientEventInternal(
       `${GlobalData.CurrentResource}:syncChanges`,
       source2,
@@ -115,6 +118,13 @@ class NetworkedMap extends Map {
           super.clear();
           continue;
         }
+        case 5 /* Resync */: {
+          for (const [, v] of this.#changeListeners) {
+            for (const fn of v) {
+              fn(void 0);
+            }
+          }
+        }
         case 4 /* Init */: {
           super.clear();
           const key_value = key;
@@ -134,6 +144,8 @@ class NetworkedMap extends Map {
   /*
    * Listens for the change on the specified key, it will get the resulting
    * value on the change
+   * NOTE: When the server calls `resync` this will get ran with `undefined` for
+   * every change listener.
    */
   listenForChange(key, fn) {
     const listener = this.#changeListeners.get(key);

package/common-game/entities/CommonBaseEntityBone.d.ts

@@ -1,9 +1,9 @@
 import { Vector3 } from "../../common/utils/Vector";
-import type { IHandle } from "./IHandle";
-export declare abstract class CommonBaseEntityBone {
+import { IHandle } from "./IHandle";
+export declare abstract class CommonBaseEntityBone extends IHandle {
     protected readonly owner: IHandle;
-    protected readonly index: number;
-    constructor(owner: IHandle, boneIndex?: number, boneName?: string);
+    constructor(owner: IHandle, boneInfo: number | string);
+    exists(): boolean;
     get Index(): number;
     get Owner(): IHandle;
     get Position(): Vector3;

package/common-game/entities/CommonBaseEntityBone.js

@@ -1,30 +1,34 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { Vector3 } from "../../common/utils/Vector";
-class CommonBaseEntityBone {
+import { IHandle } from "./IHandle";
+class CommonBaseEntityBone extends IHandle {
   static {
     __name(this, "CommonBaseEntityBone");
   }
   owner;
-  index;
-  constructor(owner, boneIndex, boneName) {
+  constructor(owner, boneInfo) {
+    super(typeof boneInfo === "number" ? boneInfo : GetEntityBoneIndexByName(owner.Handle, boneInfo));
     this.owner = owner;
-    this.index = boneIndex ? boneIndex : GetEntityBoneIndexByName(this.owner.Handle, boneName ?? "");
+  }
+  // overwrite the `IHandle` exists function call
+  exists() {
+    return this.handle !== -1;
   }
   get Index() {
-    return this.index;
+    return this.handle;
   }
   get Owner() {
     return this.owner;
   }
   get Position() {
-    return Vector3.fromArray(GetWorldPositionOfEntityBone(this.owner.Handle, this.index));
+    return Vector3.fromArray(GetWorldPositionOfEntityBone(this.owner.Handle, this.handle));
   }
   // public get Rotation(): Vector3 {
   //   return Vector3.fromArray(GetEntityBoneRotation(this.owner.Handle, this.index));
   // }
   get IsValid() {
-    return this.owner.exists() && this.index !== -1;
+    return this.owner.exists() && this.handle !== -1;
   }
 }
 export {

package/common-game/entities/CommonEntityBone.d.ts

@@ -1,5 +1,5 @@
 import { CommonBaseEntityBone } from "./CommonBaseEntityBone";
 import type { IHandle } from "./IHandle";
 export declare class CommonEntityBone extends CommonBaseEntityBone {
-    constructor(owner: IHandle, boneIndex?: number, boneName?: string);
+    constructor(owner: IHandle, boneIndexOrBoneName: number | string);
 }

package/common-game/entities/CommonEntityBone.js

@@ -5,8 +5,8 @@ class CommonEntityBone extends CommonBaseEntityBone {
   static {
     __name(this, "CommonEntityBone");
   }
-  constructor(owner, boneIndex, boneName) {
-    super(owner, boneIndex, boneName);
+  constructor(owner, boneIndexOrBoneName) {
+    super(owner, boneIndexOrBoneName);
   }
 }
 export {

package/common-game/entities/CommonPedBone.d.ts

@@ -1,6 +1,6 @@
 import { CommonBaseEntityBone } from "./CommonBaseEntityBone";
 import type { IHandle } from "./IHandle";
 export declare class CommonPedBone extends CommonBaseEntityBone {
-    constructor(owner: IHandle, boneId: number);
+    constructor(owner: IHandle, boneIndex: number);
     get IsValid(): boolean;
 }

package/common-game/entities/CommonPedBone.js

@@ -5,8 +5,8 @@ class CommonPedBone extends CommonBaseEntityBone {
   static {
     __name(this, "CommonPedBone");
   }
-  constructor(owner, boneId) {
-    super(owner, GetPedBoneIndex(owner.Handle, Number(boneId)));
+  constructor(owner, boneIndex) {
+    super(owner, boneIndex);
   }
   get IsValid() {
     return this.Owner.exists() && this.Index !== -1;

package/index.d.ts

@@ -172,6 +172,7 @@ export * from "./common-game/definitions/index.d";
 export * from "./common-game/definitions/redm.d";
 export * from "./common-game/cfx/StateBagChangeHandler";
 export * from "./common-game/cfx/cfx";
+export * from "./common/BaseScript";
 export * from "./common/Command";
 export * from "./common/Convar";
 export * from "./common/GlobalData";

package/index.js

@@ -172,6 +172,7 @@ export * from "./common-game/definitions/index.d";
 export * from "./common-game/definitions/redm.d";
 export * from "./common-game/cfx/StateBagChangeHandler";
 export * from "./common-game/cfx/cfx";
+export * from "./common/BaseScript";
 export * from "./common/Command";
 export * from "./common/Convar";
 export * from "./common/GlobalData";

package/package.json

@@ -8,7 +8,7 @@
   ],
   "license": "MIT",
   "type": "module",
-  "version": "0.0.137",
+  "version": "0.0.138",
   "repository": {
     "type": "git",
     "url": "https://github.com/nativewrappers/nativewrappers.git"