@leofcoin/peernet 1.1.94 → 1.1.95

package/exports/browser/{client-BmW52yUu.js → client-BGaLaHk2.js}

@@ -1,4 +1,4 @@
-import { L as LittlePubSub } from './peernet-CG0sdKM4.js';
+import { L as LittlePubSub } from './peernet-BWKdRXeW.js';
 import './identity-Cn0iQbY3.js';
 import './value-C3vAp-wb.js';
 

package/exports/browser/messages/dht-response.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @extends typeof {FormatInterface}
+ */
+export default class DHTMessageResponse {
+    constructor(data: any);
+    get messageName(): string;
+}

package/exports/browser/{messages-CaxCm2Mx.js → messages-BqTna7yM.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './peernet-CG0sdKM4.js';
+import { F as FormatInterface } from './peernet-BWKdRXeW.js';
 import './identity-Cn0iQbY3.js';
 import './value-C3vAp-wb.js';
 
@@ -50,6 +50,9 @@ var proto$9 = {
   has: Boolean()
 };
 
+/**
+ * @extends typeof {FormatInterface}
+ */
 class DHTMessageResponse extends FormatInterface {
   get messageName() {
     return 'PeernetDHTMessageResponse'

package/exports/browser/{peernet-CG0sdKM4.js → peernet-BWKdRXeW.js}

@@ -8372,7 +8372,7 @@ class Peernet {
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
         // FolderMessageResponse
-         } = await import(/* webpackChunkName: "messages" */ './messages-CaxCm2Mx.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-BqTna7yM.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -8466,7 +8466,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-BmW52yUu.js');
+        const importee = await import('./client-BGaLaHk2.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -8614,7 +8614,7 @@ class Peernet {
                 if (proto.name !== 'peernet-dht-response')
                     throw dhtError(proto.name);
                 const peerInfo = {
-                    ...peer.connectionStats,
+                    address: peer.remoteAddress,
                     id: peerId
                 };
                 if (proto.decoded.has)
@@ -8688,18 +8688,26 @@ class Peernet {
             throw nothingFoundError(hash);
         debug(`found ${Object.keys(providers).length} provider(s) for ${hash}`);
         // get closest peer on earth
-        const closestPeer = Object.values(providers)[0];
+        let closestPeer = await this.dht.closestPeer(Object.values(providers));
+        // fallback to first provider if no closest peer found
+        if (!closestPeer || !closestPeer.id)
+            closestPeer = Object.values(providers)[0];
+        debug(`closest peer for ${hash} is ${closestPeer?.address}`);
         // get peer instance by id
         if (!closestPeer || !closestPeer.id)
             return this.requestData(hash, store?.name || store);
         const id = closestPeer.id;
         const peer = this.connections[id];
+        if (!peer || !peer?.connected) {
+            this.dht.removeProvider(id, hash);
+            return this.requestData(hash, store?.name || store);
+        }
+        let data = await new globalThis.peernet.protos['peernet-data']({
+            hash,
+            store: store?.name || store
+        });
+        const node = await this.prepareMessage(data);
         if (peer?.connected) {
-            let data = await new globalThis.peernet.protos['peernet-data']({
-                hash,
-                store: store?.name || store
-            });
-            const node = await this.prepareMessage(data);
             try {
                 if (peer)
                     data = await peer.request(node.encoded);
@@ -8725,10 +8733,10 @@ class Peernet {
             catch (error) {
                 debug(`Error while requesting data from ${id}`, error);
                 // if error, remove provider
-                this.dht.removeProvider(id, hash);
                 if (this.#peerAttempts[id] > 1) {
                     this.#peerAttempts[id] = 0;
                     debug(`Removed provider ${id} for ${hash} after 3 attempts`);
+                    this.dht.removeProvider(id, hash);
                     console.error(nothingFoundError(hash));
                     return undefined;
                 }

package/exports/browser/peernet.js

@@ -1,3 +1,3 @@
-export { P as default } from './peernet-CG0sdKM4.js';
+export { P as default } from './peernet-BWKdRXeW.js';
 import './identity-Cn0iQbY3.js';
 import './value-C3vAp-wb.js';

package/exports/{messages-BmpgEM4y.js → messages-DFPp9HMC.js}

@@ -48,6 +48,9 @@ var proto$9 = {
   has: Boolean()
 };
 
+/**
+ * @extends typeof {FormatInterface}
+ */
 class DHTMessageResponse extends FormatInterface {
   get messageName() {
     return 'PeernetDHTMessageResponse'

package/exports/peernet.js

@@ -453,7 +453,7 @@ class Peernet {
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
         // FolderMessageResponse
-         } = await import(/* webpackChunkName: "messages" */ './messages-BmpgEM4y.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-DFPp9HMC.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -695,7 +695,7 @@ class Peernet {
                 if (proto.name !== 'peernet-dht-response')
                     throw dhtError(proto.name);
                 const peerInfo = {
-                    ...peer.connectionStats,
+                    address: peer.remoteAddress,
                     id: peerId
                 };
                 if (proto.decoded.has)
@@ -769,18 +769,26 @@ class Peernet {
             throw nothingFoundError(hash);
         debug(`found ${Object.keys(providers).length} provider(s) for ${hash}`);
         // get closest peer on earth
-        const closestPeer = Object.values(providers)[0];
+        let closestPeer = await this.dht.closestPeer(Object.values(providers));
+        // fallback to first provider if no closest peer found
+        if (!closestPeer || !closestPeer.id)
+            closestPeer = Object.values(providers)[0];
+        debug(`closest peer for ${hash} is ${closestPeer?.address}`);
         // get peer instance by id
         if (!closestPeer || !closestPeer.id)
             return this.requestData(hash, store?.name || store);
         const id = closestPeer.id;
         const peer = this.connections[id];
+        if (!peer || !peer?.connected) {
+            this.dht.removeProvider(id, hash);
+            return this.requestData(hash, store?.name || store);
+        }
+        let data = await new globalThis.peernet.protos['peernet-data']({
+            hash,
+            store: store?.name || store
+        });
+        const node = await this.prepareMessage(data);
         if (peer?.connected) {
-            let data = await new globalThis.peernet.protos['peernet-data']({
-                hash,
-                store: store?.name || store
-            });
-            const node = await this.prepareMessage(data);
             try {
                 if (peer)
                     data = await peer.request(node.encoded);
@@ -806,10 +814,10 @@ class Peernet {
             catch (error) {
                 debug(`Error while requesting data from ${id}`, error);
                 // if error, remove provider
-                this.dht.removeProvider(id, hash);
                 if (this.#peerAttempts[id] > 1) {
                     this.#peerAttempts[id] = 0;
                     debug(`Removed provider ${id} for ${hash} after 3 attempts`);
+                    this.dht.removeProvider(id, hash);
                     console.error(nothingFoundError(hash));
                     return undefined;
                 }

package/exports/types/messages/dht-response.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @extends typeof {FormatInterface}
+ */
+export default class DHTMessageResponse {
+    constructor(data: any);
+    get messageName(): string;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.1.94",
+  "version": "1.1.95",
   "description": "",
   "browser": "./exports/browser/peernet.js",
   "exports": {

package/src/peernet.ts

@@ -475,7 +475,7 @@ export default class Peernet {
         if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
 
         const peerInfo = {
-          ...peer.connectionStats,
+          address: peer.remoteAddress,
           id: peerId
         }
 
@@ -547,22 +547,30 @@ export default class Peernet {
     if (!providers || (providers && Object.keys(providers).length === 0)) throw nothingFoundError(hash)
     debug(`found ${Object.keys(providers).length} provider(s) for ${hash}`)
     // get closest peer on earth
-    const closestPeer: DHTProvider = Object.values(providers)[0]
+    let closestPeer: DHTProvider = await this.dht.closestPeer(Object.values(providers))
+    // fallback to first provider if no closest peer found
+    if (!closestPeer || !closestPeer.id) closestPeer = Object.values(providers)[0]
 
+    debug(`closest peer for ${hash} is ${closestPeer?.address}`)
     // get peer instance by id
     if (!closestPeer || !closestPeer.id) return this.requestData(hash, store?.name || store)
 
     const id = closestPeer.id
     const peer = this.connections[id]
 
-    if (peer?.connected) {
-      let data = await new globalThis.peernet.protos['peernet-data']({
-        hash,
-        store: store?.name || store
-      })
+    if (!peer || !peer?.connected) {
+      this.dht.removeProvider(id, hash)
+      return this.requestData(hash, store?.name || store)
+    }
 
-      const node = await this.prepareMessage(data)
+    let data = await new globalThis.peernet.protos['peernet-data']({
+      hash,
+      store: store?.name || store
+    })
+
+    const node = await this.prepareMessage(data)
 
+    if (peer?.connected) {
       try {
         if (peer) data = await peer.request(node.encoded)
         else {
@@ -584,10 +592,11 @@ export default class Peernet {
       } catch (error) {
         debug(`Error while requesting data from ${id}`, error)
         // if error, remove provider
-        this.dht.removeProvider(id, hash)
         if (this.#peerAttempts[id] > 1) {
           this.#peerAttempts[id] = 0
           debug(`Removed provider ${id} for ${hash} after 3 attempts`)
+
+          this.dht.removeProvider(id, hash)
           console.error(nothingFoundError(hash))
           return undefined
         }