@nativewrappers/redm 0.0.128 → 0.0.130

package/common/net/NetworkedMap.js

@@ -70,10 +70,12 @@ class NetworkedMap extends Map {
   }
   /*
    * 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) {
+    if (!this.#subscribers.has(source2)) {
+      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)]]]);
     TriggerClientEventInternal(
       `${GlobalData.CurrentResource}:syncChanges`,
@@ -83,7 +85,7 @@ class NetworkedMap extends Map {
     );
   }
   /*
-   * Adds a new subscriber to the map
+   * Adds a new subscriber to the map, this will automatically call resync on the client.
    */
   addSubscriber(source2) {
     this.#subscribers.add(source2);
@@ -155,10 +157,45 @@ class NetworkedMap extends Map {
       ln(value);
     }
   }
+  /*
+   * Adds {@param value} to the map under {@param key}, {@param value} will automatically be turned into a proxy
+   * object and the NetworkedMap will automatically send events on SubValue changes.
+   * ```ts
+   *
+   *  const map = new NetworkedMap<number, { name:string , quantity: number, obj: { nested_obj_description: string }}>("someUniqueName");
+   *
+   *  const item = {
+   *    name: "magic_item",
+   *    quantity: 1,
+   *    obj: {
+   *      something_description: "Will never be updated after init"
+   *    }
+   *  }
+   *
+   *  // automatically converts `item` into a proxy object
+   *  map.set(1, item)
+   *
+   *  // if you immediately change the value this will not be recognized, you have to get the object again from the map
+   *  item.quantity = 2;
+   *
+   *  // reactive object
+   *  const proxy_object = map.get(1)!;
+   *
+   *  // sub value change will be sent to the client on the next network tick.
+   *  proxy_object.quantity = 2;
+   *
+   *  // NOTE: this doesn't work on deeply nested objects, it will only work on anything assigned to the first object
+   *  // This update will never be sent to the client, similar to how state bags work.
+   *  proxy_object.obj.nested_obj_description = "Some new value"
+   * ```
+   * i.e. if you have { name: "magic_item", quantity: 1}
+   * if you change the item.quantity field this will automatically be sync'd to the client, is only one depth deep
+   * so if you have { obj: { some_quantity: 1 } } setting item.obj.some_quantity will not update the client.
+   */
   set(key, value) {
     let v = value;
     if (value instanceof Object) {
-      const curMap = this;
+      const curThis = this;
       const objectChangeHandler = {
         get(target, prop, reciever) {
           return Reflect.get(target, prop, reciever);
@@ -166,9 +203,9 @@ class NetworkedMap extends Map {
         set(target, p, newValue, receiver) {
           const success = Reflect.set(target, p, newValue, receiver);
           if (success) {
-            curMap.#pushChangeForListener(key, target);
+            curThis.#pushChangeForListener(key, target);
             $SERVER: {
-              curMap.#queuedChanges.push([0 /* SubValueChanged */, key, p, newValue]);
+              curThis.#queuedChanges.push([0 /* SubValueChanged */, key, p, newValue]);
             }
           }
           return success;

package/entities/Ped.d.ts

@@ -212,7 +212,7 @@ export declare class Ped extends BaseEntity {
     get HasPistol(): boolean;
     get HasRepeater(): boolean;
     get CurrentWeapon(): WeaponModel;
-    giveWeapon(weapon: WeaponModel, ammoCount: number, forceInHand?: boolean, forceInHolster?: boolean, attachPoint?: WeaponAttachPoints | undefined, allowMultipleCopies?: boolean, p7?: number, p8?: number, addReason?: ItemAddReason, ignoreUnlocks?: boolean, permanentDegradation?: number, p12?: boolean): Promise<void>;
+    giveWeapon(weapon: WeaponModel, ammoCount: number, forceInHand?: boolean, forceInHolster?: boolean, attachPoint?: WeaponAttachPoints | undefined, allowMultipleCopies?: boolean, p7?: number, p8?: number, addReason?: ItemAddReason, ignoreUnlocks?: boolean, permanentDegradation?: number, p12?: boolean): Promise<boolean>;
     setCurrentWeapon(weapon: WeaponModel, equipNow?: boolean, attachPoint?: WeaponAttachPoints, p4?: boolean, p5?: boolean): void;
     holsterWeapon(): void;
     setWeaponOnBack(disableAnim?: boolean): void;

package/entities/Ped.js

@@ -454,7 +454,9 @@ class Ped extends BaseEntity {
     return new WeaponModel(weapon);
   }
   async giveWeapon(weapon, ammoCount, forceInHand = true, forceInHolster = false, attachPoint = void 0, allowMultipleCopies = false, p7 = 0.5, p8 = 1, addReason = ItemAddReason.Default, ignoreUnlocks = true, permanentDegradation = 0.5, p12 = false) {
-    await weapon.request();
+    if (!await weapon.request()) {
+      return false;
+    }
     attachPoint = attachPoint ?? weapon.DefaultAttachPoint;
     Citizen.invokeNative(
       "0x5E3BDDBCB83F3D84",
@@ -472,6 +474,7 @@ class Ped extends BaseEntity {
       permanentDegradation,
       p12
     );
+    return true;
   }
   setCurrentWeapon(weapon, equipNow = true, attachPoint = WeaponAttachPoints.HandPrimary, p4 = false, p5 = false) {
     Citizen.invokeNative("0xADF692B254977C0C", this.handle, weapon.Hash, equipNow, attachPoint, p4, p5);

package/package.json

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