@leofcoin/peernet 1.1.18 → 1.1.20

package/exports/browser/peernet.js

@@ -1,2 +1,2 @@
-export { P as default } from './peernet-ea3ab655.js';
+export { P as default } from './peernet-b366d9d4.js';
 import './value-157ab062.js';

package/exports/peernet.js

@@ -483,7 +483,7 @@ class Peernet {
      * @return {Array} peerId
      */
     get peers() {
-        return Object.values(this.#connections);
+        return Object.entries(this.#connections);
     }
     get connections() {
         return Object.values(this.#connections);
@@ -559,18 +559,19 @@ class Peernet {
             pubsub.publish('peer:connected', peer);
             // todo: cleanup discovered
         });
+        pubsub.subscribe('peer:left', this.#peerLeft.bind(this));
         /**
          * converts data -> message -> proto
          * @see DataHandler
          */
         pubsub.subscribe('peer:data', dataHandler);
         if (globalThis.navigator) {
-            globalThis.addEventListener('beforeunload', async () => this.client.close());
+            globalThis.addEventListener('beforeunload', async () => this.client.destroy());
         }
         else {
             process.on('SIGTERM', async () => {
                 process.stdin.resume();
-                await this.client.close();
+                await this.client.destroy();
                 process.exit();
             });
         }
@@ -591,16 +592,25 @@ class Peernet {
         this.#started = true;
         this.#starting = false;
     }
+    #peerLeft(peer) {
+        for (const [id, _peer] of Object.entries(this.#connections)) {
+            if (peer.id === peer.id) {
+                delete this.#connections[id];
+                this.removePeer(_peer);
+            }
+        }
+    }
     addRequestHandler(name, method) {
         this.requestProtos[name] = method;
     }
     async sendMessage(peer, id, data) {
-        // if (peer.readyState === 'open') {
-        await peer.send(data, id);
-        this.bw.up += data.length;
-        // } else if (peer.readyState === 'closed') {
-        // this.removePeer(peer)
-        // }
+        if (peer.readyState === 'open') {
+            await peer.send(data, id);
+            this.bw.up += data.length;
+        }
+        else if (peer.readyState === 'closed') {
+            this.removePeer(peer);
+        }
     }
     async handleDHT(peer, id, proto) {
         let { hash, store } = proto.decoded;
@@ -1004,7 +1014,7 @@ class Peernet {
         globalSub.subscribe(topic, callback);
     }
     async removePeer(peer) {
-        return this.client.removePeer(peer);
+        return this.client._removePeer(peer);
     }
     get Buffer() {
         return Buffer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "",
   "main": "src/peernet.js",
   "exports": {

package/src/peernet.ts

@@ -136,7 +136,7 @@ export default class Peernet {
    * @return {Array} peerId
    */
   get peers() {
-    return Object.values(this.#connections)
+    return Object.entries(this.#connections)
   }
 
   get connections() {
@@ -242,6 +242,8 @@ export default class Peernet {
       // todo: cleanup discovered
     })
 
+    pubsub.subscribe('peer:left', this.#peerLeft.bind(this))
+
     /**
      * converts data -> message -> proto
      * @see DataHandler
@@ -249,11 +251,11 @@ export default class Peernet {
     pubsub.subscribe('peer:data', dataHandler)
 
     if (globalThis.navigator) {
-      globalThis.addEventListener('beforeunload', async () => this.client.close());
+      globalThis.addEventListener('beforeunload', async () => this.client.destroy());
     } else {
       process.on('SIGTERM', async () => {
         process.stdin.resume();
-        await this.client.close()
+        await this.client.destroy()
         process.exit()
       });
     }
@@ -275,18 +277,28 @@ export default class Peernet {
     this.#starting = false
   }
 
+  #peerLeft(peer) {
+    for (const [id, _peer] of Object.entries(this.#connections)) {
+      if (peer.id === peer.id) {
+        delete this.#connections[id]
+        this.removePeer(_peer)
+      }
+    }
+    
+  }
+
   addRequestHandler(name, method) {
     this.requestProtos[name] = method
   }
 
   async sendMessage(peer, id, data) {
     
-    // if (peer.readyState === 'open') {
+    if (peer.readyState === 'open') {
       await peer.send(data, id)
       this.bw.up += data.length
-    // } else if (peer.readyState === 'closed') {
-      // this.removePeer(peer)
-    // }
+    } else if (peer.readyState === 'closed') {
+      this.removePeer(peer)
+    }
 
   }
 
@@ -712,7 +724,7 @@ export default class Peernet {
   }
 
   async removePeer(peer) {
-    return this.client.removePeer(peer)
+    return this.client._removePeer(peer)
   }
 
   get Buffer() {