@leofcoin/peernet 1.1.94 → 1.1.96

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

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

package/exports/browser/dht/dht.d.ts

@@ -16,12 +16,9 @@ declare type Coordinates = {
     longitude: number;
     latitude: number;
 };
+export declare const getAddress: () => Promise<any>;
 export default class DhtEarth {
     providerMap: Map<string, DHTProviderMapValue>;
-    /**
-     *
-     */
-    constructor();
     getCoordinates(address: string): Promise<Coordinates>;
     /**
      * @param {Object} peer

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

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

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

@@ -7991,12 +7991,6 @@ const distanceInKmBetweenEarthCoordinates = (lat1, lon1, lat2, lon2) => {
 };
 class DhtEarth {
     providerMap = new Map();
-    /**
-     *
-     */
-    constructor() {
-        this.providerMap = new Map();
-    }
     async getCoordinates(address) {
         if (!fetchedCoordinates[address]) {
             const request = `https://whereis.leofcoin.org/?ip=${address}`;
@@ -8368,11 +8362,12 @@ class Peernet {
      * @return {Promise} instance of Peernet
      */
     async _init(options, password) {
+        await getAddress();
         this.storePrefix = options.storePrefix;
         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-Y4l0mXGt.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -8466,7 +8461,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-BmW52yUu.js');
+        const importee = await import('./client-BlYwNU8G.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -8614,7 +8609,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 +8683,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 +8728,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-BXonj_o8.js';
 import './identity-Cn0iQbY3.js';
 import './value-C3vAp-wb.js';

package/exports/peernet.js

@@ -182,12 +182,6 @@ const distanceInKmBetweenEarthCoordinates = (lat1, lon1, lat2, lon2) => {
 };
 class DhtEarth {
     providerMap = new Map();
-    /**
-     *
-     */
-    constructor() {
-        this.providerMap = new Map();
-    }
     async getCoordinates(address) {
         if (!fetchedCoordinates[address]) {
             const request = `https://whereis.leofcoin.org/?ip=${address}`;
@@ -449,6 +443,7 @@ class Peernet {
      * @return {Promise} instance of Peernet
      */
     async _init(options, password) {
+        await getAddress();
         this.storePrefix = options.storePrefix;
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
@@ -695,7 +690,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 +764,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 +809,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/dht/dht.d.ts

@@ -16,12 +16,9 @@ declare type Coordinates = {
     longitude: number;
     latitude: number;
 };
+export declare const getAddress: () => Promise<any>;
 export default class DhtEarth {
     providerMap: Map<string, DHTProviderMapValue>;
-    /**
-     *
-     */
-    constructor();
     getCoordinates(address: string): Promise<Coordinates>;
     /**
      * @param {Object} peer

package/package.json

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

package/src/dht/dht.ts

@@ -36,7 +36,7 @@ const lastFetched = {
 
 const fetchedCoordinates = {}
 
-const getAddress = async () => {
+export const getAddress = async () => {
   const { address } = lastFetched
   if (address) {
     address.value = await fetch('https://icanhazip.com/')
@@ -67,14 +67,7 @@ const distanceInKmBetweenEarthCoordinates = (lat1, lon1, lat2, lon2) => {
 }
 
 export default class DhtEarth {
-  providerMap = new Map<string, DHTProviderMapValue>()
-
-  /**
-   *
-   */
-  constructor() {
-    this.providerMap = new Map()
-  }
+  providerMap: Map<string, DHTProviderMapValue> = new Map()
 
   async getCoordinates(address: string): Promise<Coordinates> {
     if (!fetchedCoordinates[address]) {

package/src/peernet.ts

@@ -1,7 +1,7 @@
 import '@vandeurenglenn/debug'
 import PubSub from '@vandeurenglenn/little-pubsub'
 import PeerDiscovery from './discovery/peer-discovery.js'
-import DHT, { DHTProvider, DHTProviderDistanceResult } from './dht/dht.js'
+import DHT, { DHTProvider, DHTProviderDistanceResult, getAddress } from './dht/dht.js'
 import { BufferToUint8Array, protoFor, target } from './utils/utils.js'
 import MessageHandler from './handlers/message.js'
 import dataHandler from './handlers/data.js'
@@ -188,6 +188,7 @@ export default class Peernet {
    * @return {Promise} instance of Peernet
    */
   async _init(options: { storePrefix?: string; root?: string }, password: string): Promise<Peernet> {
+    await getAddress()
     this.storePrefix = options.storePrefix
     this.root = options.root
 
@@ -475,7 +476,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 +548,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 +593,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
         }