@nativewrappers/common 0.0.58 → 0.0.60

package/net/NetworkedMap.d.ts

@@ -7,9 +7,11 @@ export declare class NetworkedMap<K, V> extends Map<K, V> {
     constructor(syncName: string, initialValue?: [K, V][]);
     get SyncName(): string;
     private onPlayerDropped;
-    addSubscriber(sub: number): void;
+    resync(source: number): void;
+    addSubscriber(source: number): void;
     removeSubscriber(sub: number): boolean;
     hasSubscriber(sub: number): boolean;
+    subscriberCount(): number;
     private handleSync;
     listenForChange(key: K, fn: ChangeListener<V>): void;
     set(key: K, value: V): this;

package/net/NetworkedMap.js

@@ -15,13 +15,13 @@ var MapChangeType;
 // Used to not make a bunch of on/raw events, we just reuse the same one and look up the data in the map
 class NetworkedMapEventManager {
     #syncedCalls = new Map();
-    #playerDropped = new Map();
     constructor() {
         SERVER: if (GlobalData.IS_SERVER) {
             on("playerDropped", () => {
+                const src = source;
                 // call the player dropped for each call
-                for (const [_k, fn] of this.#playerDropped) {
-                    fn();
+                for (const [_k, map] of this.#syncedCalls) {
+                    map.removeSubscriber(src);
                 }
             });
             return;
@@ -45,12 +45,9 @@ class NetworkedMapEventManager {
         // abuse typescript, we don't want the end user to use these calls but we still want it to be accessible internally.
         // @ts-ignore
         this.#syncedCalls.set(map.SyncName, map);
-        // @ts-ignore
-        this.#playerDropped.set(map.SyncName, map.onPlayerDropped);
     }
     removeNetworkedMap(syncName) {
         this.#syncedCalls.delete(syncName);
-        this.#playerDropped.delete(syncName);
     }
 }
 const netManager = new NetworkedMapEventManager();
@@ -86,15 +83,23 @@ export class NetworkedMap extends Map {
         this.removeSubscriber(source);
     }
     /*
-     * Adds a new subscriber to the map, if the
+     * 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
      */
-    addSubscriber(sub) {
-        this.#subscribers.add(sub);
+    resync(source) {
         const packed_data = msgpack_pack([
             this.#syncName,
             [[MapChangeType.Init, this.size === 0 ? [] : Array.from(this)]],
         ]);
-        TriggerClientEventInternal(`${GlobalData.CurrentResource}:syncChanges`, sub, packed_data, packed_data.length);
+        TriggerClientEventInternal(`${GlobalData.CurrentResource}:syncChanges`, source, packed_data, packed_data.length);
+    }
+    /*
+     * Adds a new subscriber to the map
+     */
+    addSubscriber(source) {
+        this.#subscribers.add(source);
+        this.resync(source);
     }
     removeSubscriber(sub) {
         return this.#subscribers.delete(sub);
@@ -102,6 +107,9 @@ export class NetworkedMap extends Map {
     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) {
@@ -118,6 +126,8 @@ export class NetworkedMap extends Map {
                     continue;
                 }
                 case MapChangeType.Init: {
+                    // We also use this for whenever we want to resync a table
+                    super.clear();
                     const key_value = key;
                     for (const [k, v] of key_value) {
                         this.set(k, v);
@@ -192,6 +202,9 @@ export class NetworkedMap extends Map {
         }
         return this;
     }
+    /*
+     * Resets the map to its default state
+     */
     clear() {
         CLIENT: throw new Error(`Cannot call 'clear' on client`);
         // if we're clearing our map then we want to remove all queued changes and

package/package.json

@@ -4,7 +4,7 @@
   "author": "Remco Troost <d0p3t>",
   "license": "MIT",
   "type": "module",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "repository": {
     "type": "git",
     "url": "https://github.com/nativewrappers/nativewrappers.git"