@leofcoin/peernet 1.1.15 → 1.1.17

package/exports/browser/{client-61db7724.js → client-04e72306.js}

@@ -1,4 +1,4 @@
-import { g as getDefaultExportFromCjs, c as commonjsGlobal } from './peernet-abdf9d7d.js';
+import { g as getDefaultExportFromCjs, c as commonjsGlobal } from './peernet-1eabb5ba.js';
 import './value-157ab062.js';
 
 function commonjsRequire(path) {
@@ -40906,6 +40906,14 @@ class P2PTPeer {
     return this.#connection.connected
   }
 
+  get connectionStats() {
+    return {
+      family: this.#connection.remoteFamily || this.#connection.localFamily || 'ipv4',
+      address: this.#connection.remoteAddress || this.#connection.localAddress || '127.0.0.1',
+      port: this.#connection.remotePort || this.#connection.localPort || '0000',
+    }
+  }
+
   constructor(peer, p2pt, options = {}) {
     this.#connection = peer;
     this.p2pt = p2pt;

package/exports/browser/{index-674a33f1.js → index-06f8d69a.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-abdf9d7d.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-1eabb5ba.js';
 import './value-157ab062.js';
 
 /**

package/exports/browser/{messages-b6d79e10.js → messages-43b935b0.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './peernet-abdf9d7d.js';
+import { F as FormatInterface } from './peernet-1eabb5ba.js';
 import './value-157ab062.js';
 
 var proto$b = {

package/exports/browser/{peernet-abdf9d7d.js → peernet-1eabb5ba.js}

@@ -2123,7 +2123,7 @@ class DhtEarth {
         const address = await getAddress();
         const peerLoc = await this.getCoordinates(address);
         for (const provider of providers) {
-            if (provider.address === '127.0.0.1')
+            if (provider.address === '127.0.0.1' || provider.address === '::1')
                 all.push({ provider, distance: 0 });
             else
                 all.push(this.getDistance(peerLoc, provider));
@@ -16086,7 +16086,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-674a33f1.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-06f8d69a.js');
             const { identity, accounts } = await importee.default(password, this.network);
             await globalThis.accountStore.put('public', JSON.stringify({ walletId: identity.walletId }));
             await globalThis.walletStore.put('version', String(1));
@@ -16257,7 +16257,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-b6d79e10.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-43b935b0.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -16328,7 +16328,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-61db7724.js');
+        const importee = await import('./client-04e72306.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -16420,33 +16420,24 @@ class Peernet {
         if (!hash)
             throw new Error('hash expected, received undefined');
         const data = await new globalThis.peernet.protos['peernet-dht']({ hash });
-        this.client.id;
-        const walk = async (peer) => {
+        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);
-            // TODO: give ip and port (just used for location)
-            if (!peer.connection.remoteAddress || !peer.connection.localAddress) {
-                peer.connection.remoteFamily = 'ipv4';
-                peer.connection.remoteAddress = '127.0.0.1';
-                peer.connection.remotePort = '0000';
-            }
             const peerInfo = {
-                family: peer.connection.remoteFamily || peer.connection.localFamily,
-                address: peer.connection.remoteAddress || peer.connection.localAddress,
-                port: peer.connection.remotePort || peer.connection.localPort,
-                id: peer.peerId,
+                ...peer.connectionStats,
+                id: peerId,
             };
             if (proto.decoded.has)
                 this.dht.addProvider(peerInfo, proto.decoded.hash);
         };
         let walks = [];
-        for (const peer of this.connections) {
-            if (peer.peerId !== this.id) {
-                walks.push(walk(peer));
+        for (const [peerId, peer] of Object.entries(this.#connections)) {
+            if (peerId !== this.id) {
+                walks.push(walk(peer, peerId));
             }
         }
         return Promise.all(walks);
@@ -16456,7 +16447,7 @@ class Peernet {
      *
      * @param {String} hash
      */
-    async providersFor(hash) {
+    async providersFor(hash, store) {
         let providers = await this.dht.providersFor(hash);
         // walk the network to find a provider
         if (!providers || providers.length === 0) {
@@ -16519,23 +16510,25 @@ class Peernet {
         if (!closestPeer || !closestPeer.id)
             return this.requestData(hash, store?.name || store);
         const id = closestPeer.id;
-        if (this.connections) {
-            let closest = this.connections.filter((peer) => {
-                if (peer.peerId === id)
-                    return peer;
-            });
+        if (this.#connections[id]) {
+            const peer = this.#connections[id];
             let data = await new globalThis.peernet.protos['peernet-data']({ hash, store: store?.name || store });
             const node = await this.prepareMessage(data);
-            if (closest[0])
-                data = await closest[0].request(node.encoded);
+            if (peer)
+                data = await peer.request(node.encoded);
             else {
-                closest = this.connections.filter((peer) => {
-                    if (peer.peerId === id)
-                        return peer;
-                });
-                if (closest[0])
-                    data = await closest[0].request(node.encoded);
+                // fallback and try every provider found
+                const promises = [];
+                const providers = await this.providersFor(hash, store);
+                for (const provider of providers) {
+                    const peer = this.#connections[provider.id];
+                    if (peer)
+                        promises.push(peer.request(node.encoded));
+                }
+                data = await Promise.race(promises);
             }
+            if (data)
+                data = new Uint8Array(Object.values(data));
             const proto = await protoFor(data);
             // TODO: store data automaticly or not
             return BufferToUint8Array(proto.decoded.data);
@@ -16736,8 +16729,8 @@ class Peernet {
         // globalSub.publish(topic, data)
         const id = Math.random().toString(36).slice(-12);
         data = await new globalThis.peernet.protos['peernet-ps']({ data, topic });
-        for (const peer of this.connections) {
-            if (peer.peerId !== this.peerId) {
+        for (const [peerId, peer] of this.#connections) {
+            if (peerId !== this.id) {
                 const node = await this.prepareMessage(data);
                 this.sendMessage(peer, id, node.encoded);
             }

package/exports/browser/peernet.js

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

package/exports/peernet.js

@@ -223,7 +223,7 @@ class DhtEarth {
         const address = await getAddress();
         const peerLoc = await this.getCoordinates(address);
         for (const provider of providers) {
-            if (provider.address === '127.0.0.1')
+            if (provider.address === '127.0.0.1' || provider.address === '::1')
                 all.push({ provider, distance: 0 });
             else
                 all.push(this.getDistance(peerLoc, provider));
@@ -674,33 +674,24 @@ class Peernet {
         if (!hash)
             throw new Error('hash expected, received undefined');
         const data = await new globalThis.peernet.protos['peernet-dht']({ hash });
-        this.client.id;
-        const walk = async (peer) => {
+        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);
-            // TODO: give ip and port (just used for location)
-            if (!peer.connection.remoteAddress || !peer.connection.localAddress) {
-                peer.connection.remoteFamily = 'ipv4';
-                peer.connection.remoteAddress = '127.0.0.1';
-                peer.connection.remotePort = '0000';
-            }
             const peerInfo = {
-                family: peer.connection.remoteFamily || peer.connection.localFamily,
-                address: peer.connection.remoteAddress || peer.connection.localAddress,
-                port: peer.connection.remotePort || peer.connection.localPort,
-                id: peer.peerId,
+                ...peer.connectionStats,
+                id: peerId,
             };
             if (proto.decoded.has)
                 this.dht.addProvider(peerInfo, proto.decoded.hash);
         };
         let walks = [];
-        for (const peer of this.connections) {
-            if (peer.peerId !== this.id) {
-                walks.push(walk(peer));
+        for (const [peerId, peer] of Object.entries(this.#connections)) {
+            if (peerId !== this.id) {
+                walks.push(walk(peer, peerId));
             }
         }
         return Promise.all(walks);
@@ -710,7 +701,7 @@ class Peernet {
      *
      * @param {String} hash
      */
-    async providersFor(hash) {
+    async providersFor(hash, store) {
         let providers = await this.dht.providersFor(hash);
         // walk the network to find a provider
         if (!providers || providers.length === 0) {
@@ -773,23 +764,25 @@ class Peernet {
         if (!closestPeer || !closestPeer.id)
             return this.requestData(hash, store?.name || store);
         const id = closestPeer.id;
-        if (this.connections) {
-            let closest = this.connections.filter((peer) => {
-                if (peer.peerId === id)
-                    return peer;
-            });
+        if (this.#connections[id]) {
+            const peer = this.#connections[id];
             let data = await new globalThis.peernet.protos['peernet-data']({ hash, store: store?.name || store });
             const node = await this.prepareMessage(data);
-            if (closest[0])
-                data = await closest[0].request(node.encoded);
+            if (peer)
+                data = await peer.request(node.encoded);
             else {
-                closest = this.connections.filter((peer) => {
-                    if (peer.peerId === id)
-                        return peer;
-                });
-                if (closest[0])
-                    data = await closest[0].request(node.encoded);
+                // fallback and try every provider found
+                const promises = [];
+                const providers = await this.providersFor(hash, store);
+                for (const provider of providers) {
+                    const peer = this.#connections[provider.id];
+                    if (peer)
+                        promises.push(peer.request(node.encoded));
+                }
+                data = await Promise.race(promises);
             }
+            if (data)
+                data = new Uint8Array(Object.values(data));
             const proto = await protoFor(data);
             // TODO: store data automaticly or not
             return BufferToUint8Array(proto.decoded.data);
@@ -990,8 +983,8 @@ class Peernet {
         // globalSub.publish(topic, data)
         const id = Math.random().toString(36).slice(-12);
         data = await new globalThis.peernet.protos['peernet-ps']({ data, topic });
-        for (const peer of this.connections) {
-            if (peer.peerId !== this.peerId) {
+        for (const [peerId, peer] of this.#connections) {
+            if (peerId !== this.id) {
                 const node = await this.prepareMessage(data);
                 this.sendMessage(peer, id, node.encoded);
             }

package/package.json

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

package/src/dht/dht.js

@@ -84,9 +84,8 @@ export default class DhtEarth {
     let all = []
     const address = await getAddress();
     const peerLoc = await this.getCoordinates(address)
-
     for (const provider of providers) {
-      if (provider.address === '127.0.0.1') all.push({provider, distance: 0})
+      if (provider.address === '127.0.0.1' || provider.address === '::1') all.push({provider, distance: 0})
       else all.push(this.getDistance(peerLoc, provider))
     }
 

package/src/peernet.ts

@@ -373,34 +373,24 @@ export default class Peernet {
   async walk(hash) {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = await new globalThis.peernet.protos['peernet-dht']({hash})
-    const clientId = this.client.id
-    const walk = async peer => {
+    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)
 
-      // TODO: give ip and port (just used for location)
-      if (!peer.connection.remoteAddress || !peer.connection.localAddress) {
-        peer.connection.remoteFamily = 'ipv4'
-        peer.connection.remoteAddress = '127.0.0.1'
-        peer.connection.remotePort = '0000'
-      }
-
       const peerInfo = {
-        family: peer.connection.remoteFamily || peer.connection.localFamily,
-        address: peer.connection.remoteAddress || peer.connection.localAddress,
-        port: peer.connection.remotePort || peer.connection.localPort,
-        id: peer.peerId,
+        ...peer.connectionStats,
+        id: peerId,
       }
 
       if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash)
     }
     let walks = []
-    for (const peer of this.connections) {
-      if (peer.peerId !== this.id) {
-        walks.push(walk(peer))
+    for (const [peerId, peer] of Object.entries(this.#connections)) {
+      if (peerId !== this.id) {
+        walks.push(walk(peer, peerId))
       }
     }
     return Promise.all(walks)
@@ -411,7 +401,7 @@ export default class Peernet {
    *
    * @param {String} hash
    */
-  async providersFor(hash) {
+  async providersFor(hash: string, store?: undefined) {
     let providers = await this.dht.providersFor(hash)
     // walk the network to find a provider
     if (!providers || providers.length === 0) {
@@ -472,21 +462,29 @@ export default class Peernet {
     if (!closestPeer || !closestPeer.id) return this.requestData(hash, store?.name || store)
 
     const id = closestPeer.id
-    if (this.connections) {
-      let closest = this.connections.filter((peer) => {
-        if (peer.peerId === id) return peer
-      })
+    
+    if (this.#connections[id]) {
+      const peer = this.#connections[id]
 
       let data = await new globalThis.peernet.protos['peernet-data']({hash, store: store?.name || store});
 
       const node = await this.prepareMessage(data)
-      if (closest[0]) data = await closest[0].request(node.encoded)
+      
+      if (peer) data = await peer.request(node.encoded)
       else {
-        closest = this.connections.filter((peer) => {
-          if (peer.peerId === id) return peer
-        })
-        if (closest[0]) data = await closest[0].request(node.encoded)
+        // fallback and try every provider found
+        const promises = []
+        const providers = await this.providersFor(hash, store)
+        for (const provider of providers) {
+          
+          const peer = this.#connections[provider.id]
+        
+          if (peer) promises.push(peer.request(node.encoded))
+        }
+        data = await Promise.race(promises)
       }
+      if (data) data = new Uint8Array(Object.values(data))
+      
       const proto = await protoFor(data)
       // TODO: store data automaticly or not
       return BufferToUint8Array(proto.decoded.data)
@@ -690,8 +688,8 @@ export default class Peernet {
     // globalSub.publish(topic, data)
     const id = Math.random().toString(36).slice(-12)
     data = await new globalThis.peernet.protos['peernet-ps']({data, topic})
-    for (const peer of this.connections) {
-      if (peer.peerId !== this.peerId) {
+    for (const [peerId, peer] of this.#connections) {
+      if (peerId !== this.id) {
         const node = await this.prepareMessage(data)
         this.sendMessage(peer, id, node.encoded)
       }

package/test/client.js

@@ -1,7 +1,15 @@
 const Client = require('./../client.js')
 
-const client = new Client({id: Buffer.from('testtesttesttesttesttesttesttest')})
+const client = new Client()
 
-pubsub.subscribe('peer:connected', async peer => setInterval(async () => {
-    console.log(await peer.request({type: 'block', index: 0}));
-  }, 5000))
+console.log(pubsub.subscribers);
+pubsub.subscribe('peer:connected', (data) => {
+  console.log(data);
+})
+pubsub.subscribe('peer:data', (data) => {
+  console.log(data);
+})
+
+// pubsub.subscribe('peer:connected', async peer => setInterval(async () => {
+//     // console.log(await peer.request({type: 'block', index: 0}));
+//   }, 5000))

package/test.js

@@ -2,8 +2,16 @@ import Client from './exports/peernet.js'
 
 
 
-  const client = await new Client({root: '.peernet/test', network: 'leofcoin:peach', networkVersion: 'peach', stars: ['wss://peach.leofcoin.org']})
-
+  const client = await new Client({
+    network: 'leofcoin:peach', networkVersion: 'peach', stars: ['wss://peach.leofcoin.org']
+  })
+  console.log(pubsub.subscribers);
+  pubsub.subscribe('peer:connected', (data) => {
+    console.log(data);
+  })
+  pubsub.subscribe('peer:data', (data) => {
+    console.log(data);
+  })
   // peernet.addFolder([{
   //   path: 'assets/asset.png',
   //   content: Buffer.from('png')