@leofcoin/peernet 1.1.86 → 1.1.88

package/exports/browser/{client-Db0RyH-f.js → client-D7CuvpPv.js}

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

package/exports/browser/{messages-CT983-_h.js → messages-D9OyBKBu.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './peernet-CIHG3A1i.js';
+import { F as FormatInterface } from './peernet-CZhvkXXp.js';
 import './identity-Cn0iQbY3.js';
 import './value-C3vAp-wb.js';
 

package/exports/browser/{peernet-CIHG3A1i.js → peernet-CZhvkXXp.js}

@@ -8371,7 +8371,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-CT983-_h.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-D9OyBKBu.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -8465,7 +8465,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-Db0RyH-f.js');
+        const importee = await import('./client-D7CuvpPv.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -8506,6 +8506,11 @@ class Peernet {
                 };
                 peer.once('error', onError);
                 peer.once('connect', async () => {
+                    if (!peer.connected) {
+                        peer.removeListener('error', onError);
+                        debug('Peer not connected');
+                        return;
+                    }
                     await peer.send(data, id);
                     this.bw.up += data.length;
                     peer.removeListener('error', onError);
@@ -8601,21 +8606,26 @@ class Peernet {
         const data = await new globalThis.peernet.protos['peernet-dht']({ hash });
         const walk = async (peer, peerId) => {
             const node = await this.prepareMessage(data);
-            let result = await peer.request(node.encoded);
-            result = new Uint8Array(Object.values(result));
-            const proto = await protoFor(result);
-            if (proto.name !== 'peernet-dht-response')
-                throw dhtError(proto.name);
-            const peerInfo = {
-                ...peer.connectionStats,
-                id: peerId
-            };
-            if (proto.decoded.has)
-                this.dht.addProvider(peerInfo, proto.decoded.hash);
+            try {
+                let result = await peer.request(node.encoded);
+                result = new Uint8Array(Object.values(result));
+                const proto = await protoFor(result);
+                if (proto.name !== 'peernet-dht-response')
+                    throw dhtError(proto.name);
+                const peerInfo = {
+                    ...peer.connectionStats,
+                    id: peerId
+                };
+                if (proto.decoded.has)
+                    this.dht.addProvider(peerInfo, proto.decoded.hash);
+            }
+            catch (error) {
+                console.error(`Error while walking ${peerId}`, error);
+            }
         };
         let walks = [];
         for (const [peerId, peer] of Object.entries(this.connections)) {
-            if (peerId !== this.id) {
+            if (peerId !== this.id && peer.connected) {
                 walks.push(walk(peer, peerId));
             }
         }
@@ -8688,24 +8698,35 @@ class Peernet {
                 store: store?.name || store
             });
             const node = await this.prepareMessage(data);
-            if (peer)
-                data = await peer.request(node.encoded);
-            else {
-                // fallback and try every provider found
-                const promises = [];
-                const providers = await this.providersFor(hash, store);
-                for (const provider of Object.values(providers)) {
-                    const peer = this.connections[provider.id];
-                    if (peer)
-                        promises.push(peer.request(node.encoded));
+            try {
+                if (peer)
+                    data = await peer.request(node.encoded);
+                else {
+                    // fallback and try every provider found
+                    const promises = [];
+                    const providers = await this.providersFor(hash, store);
+                    for (const provider of Object.values(providers)) {
+                        const peer = this.connections[provider.id];
+                        if (peer)
+                            promises.push(peer.request(node.encoded));
+                    }
+                    data = await Promise.race(promises);
                 }
-                data = await Promise.race(promises);
+                if (data)
+                    data = new Uint8Array(Object.values(data));
+                if (!data || data.length === 0)
+                    throw nothingFoundError(hash);
+                const proto = await protoFor(data);
+                // TODO: store data automaticly or not
+                return BufferToUint8Array(proto.decoded.data);
+            }
+            catch (error) {
+                debug(`Error while requesting data from ${id}`, error);
+                // if error, remove provider
+                this.dht.removeProvider(id, hash);
+                // and try again
+                return this.requestData(hash, store?.name || store);
             }
-            if (data)
-                data = new Uint8Array(Object.values(data));
-            const proto = await protoFor(data);
-            // TODO: store data automaticly or not
-            return BufferToUint8Array(proto.decoded.data);
             // this.put(hash, proto.decoded.data)
         }
         else {

package/exports/browser/peernet.js

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

package/exports/peernet.js

@@ -587,6 +587,11 @@ class Peernet {
                 };
                 peer.once('error', onError);
                 peer.once('connect', async () => {
+                    if (!peer.connected) {
+                        peer.removeListener('error', onError);
+                        debug('Peer not connected');
+                        return;
+                    }
                     await peer.send(data, id);
                     this.bw.up += data.length;
                     peer.removeListener('error', onError);
@@ -682,21 +687,26 @@ class Peernet {
         const data = await new globalThis.peernet.protos['peernet-dht']({ hash });
         const walk = async (peer, peerId) => {
             const node = await this.prepareMessage(data);
-            let result = await peer.request(node.encoded);
-            result = new Uint8Array(Object.values(result));
-            const proto = await protoFor(result);
-            if (proto.name !== 'peernet-dht-response')
-                throw dhtError(proto.name);
-            const peerInfo = {
-                ...peer.connectionStats,
-                id: peerId
-            };
-            if (proto.decoded.has)
-                this.dht.addProvider(peerInfo, proto.decoded.hash);
+            try {
+                let result = await peer.request(node.encoded);
+                result = new Uint8Array(Object.values(result));
+                const proto = await protoFor(result);
+                if (proto.name !== 'peernet-dht-response')
+                    throw dhtError(proto.name);
+                const peerInfo = {
+                    ...peer.connectionStats,
+                    id: peerId
+                };
+                if (proto.decoded.has)
+                    this.dht.addProvider(peerInfo, proto.decoded.hash);
+            }
+            catch (error) {
+                console.error(`Error while walking ${peerId}`, error);
+            }
         };
         let walks = [];
         for (const [peerId, peer] of Object.entries(this.connections)) {
-            if (peerId !== this.id) {
+            if (peerId !== this.id && peer.connected) {
                 walks.push(walk(peer, peerId));
             }
         }
@@ -769,24 +779,35 @@ class Peernet {
                 store: store?.name || store
             });
             const node = await this.prepareMessage(data);
-            if (peer)
-                data = await peer.request(node.encoded);
-            else {
-                // fallback and try every provider found
-                const promises = [];
-                const providers = await this.providersFor(hash, store);
-                for (const provider of Object.values(providers)) {
-                    const peer = this.connections[provider.id];
-                    if (peer)
-                        promises.push(peer.request(node.encoded));
+            try {
+                if (peer)
+                    data = await peer.request(node.encoded);
+                else {
+                    // fallback and try every provider found
+                    const promises = [];
+                    const providers = await this.providersFor(hash, store);
+                    for (const provider of Object.values(providers)) {
+                        const peer = this.connections[provider.id];
+                        if (peer)
+                            promises.push(peer.request(node.encoded));
+                    }
+                    data = await Promise.race(promises);
                 }
-                data = await Promise.race(promises);
+                if (data)
+                    data = new Uint8Array(Object.values(data));
+                if (!data || data.length === 0)
+                    throw nothingFoundError(hash);
+                const proto = await protoFor(data);
+                // TODO: store data automaticly or not
+                return BufferToUint8Array(proto.decoded.data);
+            }
+            catch (error) {
+                debug(`Error while requesting data from ${id}`, error);
+                // if error, remove provider
+                this.dht.removeProvider(id, hash);
+                // and try again
+                return this.requestData(hash, store?.name || store);
             }
-            if (data)
-                data = new Uint8Array(Object.values(data));
-            const proto = await protoFor(data);
-            // TODO: store data automaticly or not
-            return BufferToUint8Array(proto.decoded.data);
             // this.put(hash, proto.decoded.data)
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.1.86",
+  "version": "1.1.88",
   "description": "",
   "browser": "./exports/browser/peernet.js",
   "exports": {
@@ -37,7 +37,7 @@
     "@leofcoin/identity-utils": "^1.0.2",
     "@leofcoin/multi-wallet": "^3.1.8",
     "@leofcoin/storage": "^3.5.38",
-    "@netpeer/swarm": "^0.8.19",
+    "@netpeer/swarm": "^0.8.20",
     "@vandeurenglenn/base32": "^1.2.4",
     "@vandeurenglenn/base58": "^1.1.9",
     "@vandeurenglenn/debug": "^1.2.6",

package/src/peernet.ts

@@ -358,6 +358,11 @@ export default class Peernet {
         }
         peer.once('error', onError)
         peer.once('connect', async () => {
+          if (!peer.connected) {
+            peer.removeListener('error', onError)
+            debug('Peer not connected')
+            return
+          }
           await peer.send(data, id)
           this.bw.up += data.length
           peer.removeListener('error', onError)
@@ -462,21 +467,25 @@ export default class Peernet {
     const data = await new globalThis.peernet.protos['peernet-dht']({ hash })
     const walk = async (peer, peerId) => {
       const node = await this.prepareMessage(data)
-      let result = await peer.request(node.encoded)
-      result = new Uint8Array(Object.values(result))
-      const proto = await protoFor(result)
-      if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
-
-      const peerInfo = {
-        ...peer.connectionStats,
-        id: peerId
-      }
+      try {
+        let result = await peer.request(node.encoded)
+        result = new Uint8Array(Object.values(result))
+        const proto = await protoFor(result)
+        if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
+
+        const peerInfo = {
+          ...peer.connectionStats,
+          id: peerId
+        }
 
-      if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash)
+        if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash)
+      } catch (error) {
+        console.error(`Error while walking ${peerId}`, error)
+      }
     }
     let walks = []
     for (const [peerId, peer] of Object.entries(this.connections)) {
-      if (peerId !== this.id) {
+      if (peerId !== this.id && peer.connected) {
         walks.push(walk(peer, peerId))
       }
     }
@@ -552,23 +561,31 @@ export default class Peernet {
 
       const node = await this.prepareMessage(data)
 
-      if (peer) data = await peer.request(node.encoded)
-      else {
-        // fallback and try every provider found
-        const promises = []
-        const providers = await this.providersFor(hash, store)
-        for (const provider of Object.values(providers)) {
-          const peer = this.connections[provider.id]
-
-          if (peer) promises.push(peer.request(node.encoded))
+      try {
+        if (peer) data = await peer.request(node.encoded)
+        else {
+          // fallback and try every provider found
+          const promises = []
+          const providers = await this.providersFor(hash, store)
+          for (const provider of Object.values(providers)) {
+            const peer = this.connections[provider.id]
+
+            if (peer) promises.push(peer.request(node.encoded))
+          }
+          data = await Promise.race(promises)
         }
-        data = await Promise.race(promises)
+        if (data) data = new Uint8Array(Object.values(data))
+        if (!data || data.length === 0) throw nothingFoundError(hash)
+        const proto = await protoFor(data)
+        // TODO: store data automaticly or not
+        return BufferToUint8Array(proto.decoded.data)
+      } catch (error) {
+        debug(`Error while requesting data from ${id}`, error)
+        // if error, remove provider
+        this.dht.removeProvider(id, hash)
+        // and try again
+        return this.requestData(hash, store?.name || store)
       }
-      if (data) data = new Uint8Array(Object.values(data))
-
-      const proto = await protoFor(data)
-      // TODO: store data automaticly or not
-      return BufferToUint8Array(proto.decoded.data)
 
       // this.put(hash, proto.decoded.data)
     } else {