@nativewrappers/redm 0.0.77 → 0.0.79

package/index.d.ts

@@ -8,4 +8,4 @@ export * from "./world";
 export * from "./GameConstants";
 export * from "./RelationshipGroup";
 export * from "./Attribute";
-export { Convar, Kvp, Resource, Command } from "./common/index";
+export * from "./common/index";

package/index.js

@@ -589,6 +589,65 @@ var Vector4 = class _Vector4 extends Vector {
   }
 };
 
+// src/common/utils/PointF.ts
+var PointF = class _PointF {
+  constructor(x, y, z) {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+  }
+  static {
+    __name(this, "PointF");
+  }
+  static empty() {
+    return new _PointF(0, 0, 0);
+  }
+};
+
+// src/common/utils/Maths.ts
+var Maths = class {
+  static {
+    __name(this, "Maths");
+  }
+  static clamp(num, min, max) {
+    return num <= min ? min : num >= max ? max : num;
+  }
+  static getRandomInt(min, max) {
+    min = Math.ceil(min);
+    max = Math.floor(max);
+    return Math.floor(Math.random() * (max - min)) + min;
+  }
+};
+
+// src/common/utils/Quaternion.ts
+var Quaternion = class {
+  static {
+    __name(this, "Quaternion");
+  }
+  x;
+  y;
+  z;
+  w;
+  constructor(valueXOrVector, yOrW, z, w) {
+    if (valueXOrVector instanceof Vector3) {
+      this.x = valueXOrVector.x;
+      this.y = valueXOrVector.y;
+      this.z = valueXOrVector.z;
+      this.w = yOrW ?? 0;
+    } else if (yOrW === void 0) {
+      this.x = valueXOrVector;
+      this.y = valueXOrVector;
+      this.z = valueXOrVector;
+      this.w = valueXOrVector;
+    } else {
+      this.x = valueXOrVector;
+      this.y = yOrW;
+      this.z = z ?? 0;
+      this.w = w ?? 0;
+    }
+  }
+};
+
 // src/common/utils/Color.ts
 var Color = class _Color {
   static {
@@ -619,6 +678,46 @@ var Color = class _Color {
   }
 };
 
+// src/common/utils/cleanPlayerName.ts
+var cleanPlayerName = /* @__PURE__ */ __name((original) => {
+  let displayName = original.substring(0, 75).replace(
+    // biome-ignore lint/suspicious/noMisleadingCharacterClass: <explanation>
+    /[\u0000-\u001F\u007F-\u009F\u200B-\u200D\uFEFF\u200E\uA9C1-\uA9C5\u239B-\u23AD]/g,
+    ""
+  ).replace(
+    /~(HUD_\S+|HC_\S+|[a-z]|[a1]_\d+|bold|italic|ws|wanted_star|nrt|EX_R\*|BLIP_\S+|ACCEPT|CANCEL|PAD_\S+|INPUT_\S+|INPUTGROUP_\S+)~/gi,
+    ""
+  ).replace(/\^\d/gi, "").replace(/\p{Mark}{2,}/gu, "").replace(/\s+/g, " ").trim();
+  if (!displayName.length) displayName = "empty name";
+  return displayName;
+}, "cleanPlayerName");
+
+// src/common/utils/enumValues.ts
+function* enumValues(enumObj) {
+  let isStringEnum = true;
+  for (const property in enumObj) {
+    if (typeof enumObj[property] === "number") {
+      isStringEnum = false;
+      break;
+    }
+  }
+  for (const property in enumObj) {
+    if (isStringEnum || typeof enumObj[property] === "number") {
+      yield enumObj[property];
+    }
+  }
+}
+__name(enumValues, "enumValues");
+
+// src/common/utils/getStringFromUInt8Array.ts
+var getStringFromUInt8Array = /* @__PURE__ */ __name((buffer, start, end) => String.fromCharCode(...buffer.slice(start, end)).replace(/\u0000/g, ""), "getStringFromUInt8Array");
+
+// src/common/utils/getUInt32FromUint8Array.ts
+var getUInt32FromUint8Array = /* @__PURE__ */ __name((buffer, start, end) => new Uint32Array(buffer.slice(start, end).buffer)[0], "getUInt32FromUint8Array");
+
+// src/common/utils/index.ts
+var Delay = /* @__PURE__ */ __name((milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds)), "Delay");
+
 // src/redm/entities/BaseEntity.ts
 var BaseEntity = class {
   static {
@@ -2810,6 +2909,332 @@ var NetworkedMapEventManager = class {
   }
 };
 var netManager = new NetworkedMapEventManager();
+var NetworkedMap = class extends Map {
+  static {
+    __name(this, "NetworkedMap");
+  }
+  #syncName;
+  #queuedChanges = [];
+  #changeListeners = /* @__PURE__ */ new Map();
+  #subscribers = /* @__PURE__ */ new Set();
+  constructor(syncName, initialValue) {
+    super(initialValue);
+    this.#syncName = syncName;
+    GlobalData.NetworkedTicks.push(this);
+    netManager.addNetworkedMap(this);
+  }
+  get SyncName() {
+    return this.#syncName;
+  }
+  // handles removing the player from the map whenever they're dropped
+  onPlayerDropped() {
+    this.removeSubscriber(source);
+  }
+  /*
+   * Resyncs the entire map to the client, useful for if there's a mismatch in the clients map (when multiple players change things, in cases like inventories)
+   *
+   * NOTE: This doesn't check that the player is already subscribed to the map, you should do your own due-diligence to only call this for players already subscribed
+   */
+  resync(source2) {
+    const packed_data = msgpack_pack([this.#syncName, [[4 /* Init */, this.size === 0 ? [] : Array.from(this)]]]);
+    TriggerClientEventInternal(
+      `${GlobalData.CurrentResource}:syncChanges`,
+      source2,
+      packed_data,
+      packed_data.length
+    );
+  }
+  /*
+   * Adds a new subscriber to the map
+   */
+  addSubscriber(source2) {
+    this.#subscribers.add(source2);
+    this.resync(source2);
+  }
+  removeSubscriber(sub) {
+    return this.#subscribers.delete(sub);
+  }
+  hasSubscriber(sub) {
+    return this.#subscribers.has(sub);
+  }
+  subscriberCount() {
+    return this.#subscribers.size;
+  }
+  handleSync(data) {
+    for (const [change_type, key, value, possibly_undefined_subvalue] of data) {
+      switch (change_type) {
+        case 1 /* Add */: {
+          this.set(key, value);
+          continue;
+        }
+        case 2 /* Remove */: {
+          super.delete(key);
+          continue;
+        }
+        case 3 /* Reset */: {
+          super.clear();
+          continue;
+        }
+        case 4 /* Init */: {
+          super.clear();
+          const key_value = key;
+          for (const [k, v] of key_value) {
+            this.set(k, v);
+          }
+          continue;
+        }
+        case 0 /* SubValueChanged */: {
+          const data2 = this.get(key);
+          data2[value] = possibly_undefined_subvalue;
+          continue;
+        }
+      }
+    }
+  }
+  /*
+   * Listens for the change on the specified key, it will get the resulting
+   * value on the change
+   */
+  listenForChange(key, fn) {
+    const listener = this.#changeListeners.get(key);
+    listener ? listener.push(fn) : this.#changeListeners.set(key, [fn]);
+  }
+  #triggerEventForSubscribers(data) {
+    const packed_data = msgpack_pack([this.#syncName, data]);
+    for (const sub of this.#subscribers) {
+      TriggerClientEventInternal(
+        `${GlobalData.CurrentResource}:syncChanges`,
+        sub,
+        packed_data,
+        packed_data.length
+      );
+    }
+  }
+  #pushChangeForListener(key, value) {
+    const listener = this.#changeListeners.get(key);
+    if (!listener) return;
+    for (const ln of listener) {
+      ln(value);
+    }
+  }
+  set(key, value) {
+    let v = value;
+    if (value instanceof Object) {
+      const curMap = this;
+      const objectChangeHandler = {
+        get(target, prop, reciever) {
+          return Reflect.get(target, prop, reciever);
+        },
+        set(target, p, newValue, receiver) {
+          const success = Reflect.set(target, p, newValue, receiver);
+          if (success) {
+            curMap.#pushChangeForListener(key, target);
+          }
+          return success;
+        }
+      };
+      v = new Proxy(v, objectChangeHandler);
+    }
+    super.set(key, v);
+    this.#pushChangeForListener(key, v);
+    return this;
+  }
+  /*
+   * Resets the map to its default state
+   */
+  clear() {
+    $CLIENT: if (GlobalData.IS_CLIENT) throw new Error(`Cannot call 'clear' on client`);
+    this.#queuedChanges = [];
+    this.#queuedChanges.push([3 /* Reset */]);
+    super.clear();
+  }
+  delete(key) {
+    $CLIENT: if (GlobalData.IS_CLIENT) throw new Error(`Cannot call 'delete' on client`);
+    this.#queuedChanges.push([2 /* Remove */, key]);
+    return super.delete(key);
+  }
+  networkTick() {
+    if (this.#queuedChanges.length !== 0) {
+      this.#triggerEventForSubscribers(this.#queuedChanges);
+      this.#queuedChanges = [];
+    }
+  }
+  [Symbol.dispose]() {
+    this.#subscribers.clear();
+    this.#changeListeners.clear();
+    this.#queuedChanges = [];
+    netManager.removeNetworkedMap(this.#syncName);
+    GlobalData.NetworkedTicks.filter((v) => v !== this);
+  }
+  /**
+   * Unregisters from the tick handler and removes the event listener
+   */
+  dispose() {
+    this[Symbol.dispose]();
+  }
+  get [Symbol.toStringTag]() {
+    return "NetworkedMap";
+  }
+};
+
+// src/common/decors/Events.ts
+var ConVarType = /* @__PURE__ */ ((ConVarType2) => {
+  ConVarType2[ConVarType2["String"] = 0] = "String";
+  ConVarType2[ConVarType2["Integer"] = 1] = "Integer";
+  ConVarType2[ConVarType2["Float"] = 2] = "Float";
+  ConVarType2[ConVarType2["Boolean"] = 3] = "Boolean";
+  return ConVarType2;
+})(ConVarType || {});
+var DisablePrettyPrint = /* @__PURE__ */ __name(() => GlobalData.EnablePrettyPrint = false, "DisablePrettyPrint");
+function Exports(exportName) {
+  return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
+    if (context.private) {
+      throw new Error("Exports does not work on private methods, please mark the method as public");
+    }
+    context.addInitializer(function() {
+      exports(exportName, (...args) => {
+        return originalMethod.call(this, ...args);
+      });
+    });
+  }, "actualDecorator");
+}
+__name(Exports, "Exports");
+function Event(eventName) {
+  return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
+    if (context.private) {
+      throw new Error("Event does not work on private methods, please mark the method as public");
+    }
+    context.addInitializer(function() {
+      on(eventName, (...args) => {
+        try {
+          return originalMethod.call(this, ...args);
+        } catch (e) {
+          REMOVE_EVENT_LOG: {
+            if (!GlobalData.EnablePrettyPrint) return;
+            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 --------");
+          }
+        }
+      });
+    });
+  }, "actualDecorator");
+}
+__name(Event, "Event");
+function NetEvent(eventName, remoteOnly = true) {
+  return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
+    if (context.private) {
+      throw new Error("NetEvent does not work on private methods, please mark the method as public");
+    }
+    context.addInitializer(function() {
+      onNet(eventName, (...args) => {
+        const src = source;
+        try {
+          $CLIENT: {
+            if (GlobalData.IS_CLIENT && remoteOnly && source !== 65535) {
+              return;
+            }
+          }
+          return originalMethod.call(this, ...args);
+        } catch (e) {
+          REMOVE_NET_EVENT_LOG: {
+            if (!GlobalData.EnablePrettyPrint) return;
+            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 --------");
+          }
+        }
+      });
+    });
+  }, "actualDecorator");
+}
+__name(NetEvent, "NetEvent");
+function NuiEvent(eventName) {
+  return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
+    if (context.private) {
+      throw new Error("NuiEvent does not work on private methods, please mark the method as public");
+    }
+    context.addInitializer(function() {
+      RegisterNuiCallback(eventName, (...args) => {
+        return originalMethod.call(this, ...args);
+      });
+    });
+  }, "actualDecorator");
+}
+__name(NuiEvent, "NuiEvent");
+var get_convar_fn = /* @__PURE__ */ __name((con_var_type) => {
+  switch (con_var_type) {
+    case 0 /* String */:
+      return GetConvar;
+    case 1 /* Integer */:
+      return GetConvarInt;
+    case 2 /* Float */:
+      return GetConvarFloat;
+    case 3 /* Boolean */:
+      return GetConvarBool;
+    // needed so typescript wont complain about "unreachable code" for the error below
+    default:
+  }
+  throw new Error("Got invalid ConVarType");
+}, "get_convar_fn");
+function ConVar(name, is_floating_point, deserialize) {
+  return /* @__PURE__ */ __name(function actualDecorator(_initialValue, context, ..._args) {
+    if (context.private) {
+      throw new Error("ConVar does not work on private types, please mark the field as public");
+    }
+    context.addInitializer(function() {
+      const t = this;
+      const default_value = Reflect.get(t, context.name);
+      const default_type = typeof default_value;
+      let con_var_type = null;
+      if (default_type === "number") {
+        if (is_floating_point || !Number.isInteger(default_value)) {
+          con_var_type = 2 /* Float */;
+        } else {
+          con_var_type = 1 /* Integer */;
+        }
+      } else if (default_type === "boolean") {
+        con_var_type = 3 /* Boolean */;
+      } else if (default_value === "string") {
+        con_var_type = 0 /* String */;
+      }
+      if (!deserialize && con_var_type === null) {
+        throw new Error("You should provide a deserialize function if you want to convert this to an object type");
+      }
+      if (con_var_type === null) {
+        con_var_type = 0 /* String */;
+      }
+      const con_var_fn = get_convar_fn(con_var_type);
+      const get_convar_value = /* @__PURE__ */ __name(() => {
+        const data = con_var_fn(name, default_value);
+        return deserialize ? deserialize(data) : data;
+      }, "get_convar_value");
+      Reflect.set(t, context.name, get_convar_value());
+      AddConvarChangeListener(name, () => {
+        Reflect.set(t, context.name, get_convar_value());
+      });
+    });
+  }, "actualDecorator");
+}
+__name(ConVar, "ConVar");
+function SetTick() {
+  return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
+    if (context.private) {
+      throw new Error("SetTick does not work on private types, please mark the field as public");
+    }
+    context.addInitializer(function() {
+      setTick(async () => {
+        await originalMethod.call(this);
+      });
+    });
+  }, "actualDecorator");
+}
+__name(SetTick, "SetTick");
 
 // src/common/Convar.ts
 var Convar = class {
@@ -3134,28 +3559,46 @@ var Resource = class {
 };
 export {
   Attributes,
+  Color,
   Command,
+  ConVar,
+  ConVarType,
   Controls,
   Convar,
   CoreAttribute,
+  Delay,
+  DisablePrettyPrint,
   Entity,
+  Event,
+  Exports,
   Game,
   GameConstants,
   KeyHash,
   KnockOffVehicle,
   Kvp,
+  Maths,
+  NetEvent,
+  NetworkedMap,
+  NuiEvent,
   Ped,
   PedAttribute,
   Player,
+  PointF,
+  Quaternion,
   RawControls,
   RawKeys,
   Relationship,
   RelationshipGroup,
   Resource,
+  SetTick,
   TamingState,
+  Vector2,
+  Vector3,
+  Vector4,
   Vehicle,
   VehicleSeat,
   Volume,
+  cleanPlayerName,
   createDraftVehicle,
   createPed,
   createProp,
@@ -3163,5 +3606,8 @@ export {
   eAttributeCore,
   eDamageCleanliness,
   eHudStatusEffect,
-  ePedAttribute
+  ePedAttribute,
+  enumValues,
+  getStringFromUInt8Array,
+  getUInt32FromUint8Array
 };

package/package.json

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