@nativewrappers/fivem 0.0.145 → 0.0.147

package/common/decors/Proto.d.ts

@@ -6,8 +6,8 @@ export type MessageTypeEncoder<T> = {
     encode: (message: T) => any;
     name: string;
 };
-type ProtoCallback<Message> = (message: Message) => Promise<void>;
-type NetProtoCallback<Message> = (source: number, message: Message) => Promise<void>;
+type ProtoCallback<Message> = (message: Message) => Promise<void> | void;
+type NetProtoCallback<Message> = (source: number, message: Message) => Promise<void> | void;
 /**
  * PMA uses ts-proto to define our types, you can see that here: https://github.com/stephenh/ts-proto
  * You will have to modify the generator to add `name` or just use {@param eventName}

package/common/decors/Proto.js

@@ -7,7 +7,7 @@ function parseSource(source) {
 }
 __name(parseSource, "parseSource");
 function OnProto(messageType, eventName) {
-  const event = eventName ?? `pb:${messageType.name}`;
+  const event = eventName ?? `${messageType.name}`;
   return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
     if (context.private) {
       throw new Error("OnProto does not work on private methods");
@@ -26,7 +26,7 @@ function OnProto(messageType, eventName) {
 }
 __name(OnProto, "OnProto");
 function OnProtoNet(messageType, eventName) {
-  const event = eventName ?? `pb:${messageType.name}`;
+  const event = eventName ?? `${messageType.name}`;
   return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
     if (context.private) {
       throw new Error("OnProto does not work on private methods");

package/common/net/Net.js

@@ -18,8 +18,8 @@ class Net {
     addRawEventListener(eventName, cb);
   }
   static onRawNet(eventName, cb) {
-    RegisterNetEvent(eventName);
     Net.onRaw(eventName, cb);
+    RegisterNetEvent(eventName);
   }
 }
 class NetServer extends Net {

package/common-game/utils/StateBagWaits.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @param stateBag the state bag name to try to get the entity from
+ * @param [timeoutInMs=5000] the timeout we should wait before giving up.
+ */
+export declare function WaitForEntityFromStateBagToExist(stateBag: string, timeoutInMs?: number): Promise<number | undefined>;
+/**
+ * @param stateBag the state bag name to try to get the entity from
+ * @param [timeoutInMs=5000] the timeout we should wait before giving up.
+ */
+export declare function WaitForPlayerFromStateBagToExist(stateBag: string, timeoutInMs?: number): Promise<number | undefined>;

package/common-game/utils/StateBagWaits.js

@@ -0,0 +1,29 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { Delay } from "../../common/utils/Delay";
+async function WaitForEntityFromStateBagToExist(stateBag, timeoutInMs = 5e3) {
+  const timeout = GetGameTimer() + timeoutInMs;
+  let ent = GetEntityFromStateBagName(stateBag);
+  while (ent === 0) {
+    if (timeout < GetGameTimer()) break;
+    ent = GetEntityFromStateBagName(stateBag);
+    await Delay(150);
+  }
+  return ent !== 0 ? ent : void 0;
+}
+__name(WaitForEntityFromStateBagToExist, "WaitForEntityFromStateBagToExist");
+async function WaitForPlayerFromStateBagToExist(stateBag, timeoutInMs = 5e3) {
+  const timeout = GetGameTimer() + timeoutInMs;
+  let ply = GetPlayerFromStateBagName(stateBag);
+  while (ply === 0) {
+    if (timeout < GetGameTimer()) break;
+    ply = GetPlayerFromStateBagName(stateBag);
+    await Delay(150);
+  }
+  return ply !== 0 ? ply : void 0;
+}
+__name(WaitForPlayerFromStateBagToExist, "WaitForPlayerFromStateBagToExist");
+export {
+  WaitForEntityFromStateBagToExist,
+  WaitForPlayerFromStateBagToExist
+};

package/index.d.ts

@@ -152,6 +152,7 @@ export * from "./common-game/CommonGameConstants";
 export * from "./common-game/CommonModel";
 export * from "./common-game/CommonTasks";
 export * from "./common-game/utils/Animations";
+export * from "./common-game/utils/StateBagWaits";
 export * from "./common-game/interfaces/Dimension";
 export * from "./common-game/enums/VehicleSeat";
 export * from "./common-game/entities/CommonBaseEntity";
@@ -172,7 +173,6 @@ 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

@@ -152,6 +152,7 @@ export * from "./common-game/CommonGameConstants";
 export * from "./common-game/CommonModel";
 export * from "./common-game/CommonTasks";
 export * from "./common-game/utils/Animations";
+export * from "./common-game/utils/StateBagWaits";
 export * from "./common-game/interfaces/Dimension";
 export * from "./common-game/enums/VehicleSeat";
 export * from "./common-game/entities/CommonBaseEntity";
@@ -172,7 +173,6 @@ 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.145",
+  "version": "0.0.147",
   "repository": {
     "type": "git",
     "url": "https://github.com/nativewrappers/nativewrappers.git"

package/common/BaseScript.d.ts

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

package/common/BaseScript.js

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