@leofcoin/peernet 1.1.31 → 1.1.32

package/exports/browser/{client-d1c29e20.js → client-e2df99cf.js}

@@ -1,4 +1,4 @@
-import { g as getDefaultExportFromCjs, c as commonjsGlobal } from './peernet-ad3ca002.js';
+import { g as getDefaultExportFromCjs, c as commonjsGlobal } from './peernet-4c63c3a2.js';
 import './value-157ab062.js';
 
 function commonjsRequire(path) {

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

@@ -1,30 +1,23 @@
 export default class DhtEarth {
-    providerMap: Map<any, any>;
+    providerMap: Map<string, Set<string>>;
+    /**
+     *
+     */
+    constructor();
     /**
      * @param {Object} address
      * @return {Object} {latitude: lat, longitude: lon}
      */
-    getCoordinates(address: any): any;
+    getCoordinates(address: object): object;
     /**
      * @param {Object} peer
      * @param {Object} provider
      * @return {Object} {provider, distance}
      */
-    getDistance(peer: any, provider: any): any;
-    /**
-     * @param {Array} providers
-     * @return {Object} closestPeer
-     */
-    closestPeer(providers: any[]): any;
-    /**
-     * @param {String} hash
-     * @return {Array} providers
-     */
-    providersFor(hash: string): any[];
-    /**
-     * @param {String} address
-     * @param {String} hash
-     * @return {Array} providers
-     */
-    addProvider(address: string, hash: string): any[];
+    getDistance(peer: object, provider: object): object;
+    closestPeer(providers: Array<any>): object;
+    hasProvider(hash: string): boolean;
+    providersFor(hash: string): string[];
+    addProvider(address: string, hash: string): string[];
+    removeProvider(address: string, hash: string): true | undefined;
 }

package/exports/browser/{index-904b9f85.js → index-da3c0bea.js}

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

package/exports/browser/{messages-de2c5670.js → messages-b4ab65f6.js}

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

package/exports/browser/{peernet-ad3ca002.js → peernet-4c63c3a2.js}

@@ -6226,6 +6226,7 @@ const distanceInKmBetweenEarthCoordinates = (lat1, lon1, lat2, lon2) => {
     return earthRadiusKm * c;
 };
 class DhtEarth {
+    providerMap = new Map;
     /**
      *
      */
@@ -6255,10 +6256,6 @@ class DhtEarth {
         const { latitude, longitude } = await this.getCoordinates(provider.address);
         return { provider, distance: distanceInKmBetweenEarthCoordinates(peer.latitude, peer.longitude, latitude, longitude) };
     }
-    /**
-     * @param {Array} providers
-     * @return {Object} closestPeer
-     */
     async closestPeer(providers) {
         let all = [];
         const address = await getAddress();
@@ -6273,25 +6270,31 @@ class DhtEarth {
         all = all.sort((previous, current) => previous.distance - current.distance);
         return all[0].provider;
     }
-    /**
-     * @param {String} hash
-     * @return {Array} providers
-     */
-    providersFor(hash) {
-        return this.providerMap.get(hash);
+    hasProvider(hash) {
+        return this.providerMap.has(hash);
     }
-    /**
-     * @param {String} address
-     * @param {String} hash
-     * @return {Array} providers
-     */
-    async addProvider(address, hash) {
+    providersFor(hash) {
         let providers = [];
         if (this.providerMap.has(hash))
+            providers = [...this.providerMap.get(hash)];
+        return providers;
+    }
+    addProvider(address, hash) {
+        let providers = new Set();
+        if (this.providerMap.has(hash)) {
             providers = this.providerMap.get(hash);
-        providers = new Set([...providers, address]);
+        }
+        providers.add(address);
         this.providerMap.set(hash, providers);
-        return providers;
+    }
+    removeProvider(address, hash) {
+        let deleted = undefined;
+        if (this.providerMap.has(hash)) {
+            const providers = this.providerMap.get(hash);
+            deleted = providers.delete(address);
+            deleted && this.providerMap.set(hash, providers);
+        }
+        return deleted;
     }
 }
 
@@ -20184,7 +20187,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-904b9f85.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-da3c0bea.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));
@@ -20355,7 +20358,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-de2c5670.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-b4ab65f6.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -20434,7 +20437,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-d1c29e20.js');
+        const importee = await import('./client-e2df99cf.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -20624,8 +20627,8 @@ class Peernet {
         if (!closestPeer || !closestPeer.id)
             return this.requestData(hash, store?.name || store);
         const id = closestPeer.id;
-        if (this.#connections[id]) {
-            const peer = this.#connections[id];
+        const peer = this.#connections[id];
+        if (peer?.connected) {
             let data = await new globalThis.peernet.protos['peernet-data']({ hash, store: store?.name || store });
             const node = await this.prepareMessage(data);
             if (peer)
@@ -20648,6 +20651,9 @@ class Peernet {
             return BufferToUint8Array(proto.decoded.data);
             // this.put(hash, proto.decoded.data)
         }
+        else {
+            this.dht.removeProvider(id, hash);
+        }
         return;
     }
     get message() {

package/exports/browser/peernet.js

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

package/exports/dht/dht.d.ts

@@ -1,30 +1,23 @@
 export default class DhtEarth {
-    providerMap: Map<any, any>;
+    providerMap: Map<string, Set<string>>;
+    /**
+     *
+     */
+    constructor();
     /**
      * @param {Object} address
      * @return {Object} {latitude: lat, longitude: lon}
      */
-    getCoordinates(address: any): any;
+    getCoordinates(address: object): object;
     /**
      * @param {Object} peer
      * @param {Object} provider
      * @return {Object} {provider, distance}
      */
-    getDistance(peer: any, provider: any): any;
-    /**
-     * @param {Array} providers
-     * @return {Object} closestPeer
-     */
-    closestPeer(providers: any[]): any;
-    /**
-     * @param {String} hash
-     * @return {Array} providers
-     */
-    providersFor(hash: string): any[];
-    /**
-     * @param {String} address
-     * @param {String} hash
-     * @return {Array} providers
-     */
-    addProvider(address: string, hash: string): any[];
+    getDistance(peer: object, provider: object): object;
+    closestPeer(providers: Array<any>): object;
+    hasProvider(hash: string): boolean;
+    providersFor(hash: string): string[];
+    addProvider(address: string, hash: string): string[];
+    removeProvider(address: string, hash: string): true | undefined;
 }

package/exports/peernet.js

@@ -187,6 +187,7 @@ const distanceInKmBetweenEarthCoordinates = (lat1, lon1, lat2, lon2) => {
     return earthRadiusKm * c;
 };
 class DhtEarth {
+    providerMap = new Map;
     /**
      *
      */
@@ -216,10 +217,6 @@ class DhtEarth {
         const { latitude, longitude } = await this.getCoordinates(provider.address);
         return { provider, distance: distanceInKmBetweenEarthCoordinates(peer.latitude, peer.longitude, latitude, longitude) };
     }
-    /**
-     * @param {Array} providers
-     * @return {Object} closestPeer
-     */
     async closestPeer(providers) {
         let all = [];
         const address = await getAddress();
@@ -234,25 +231,31 @@ class DhtEarth {
         all = all.sort((previous, current) => previous.distance - current.distance);
         return all[0].provider;
     }
-    /**
-     * @param {String} hash
-     * @return {Array} providers
-     */
-    providersFor(hash) {
-        return this.providerMap.get(hash);
+    hasProvider(hash) {
+        return this.providerMap.has(hash);
     }
-    /**
-     * @param {String} address
-     * @param {String} hash
-     * @return {Array} providers
-     */
-    async addProvider(address, hash) {
+    providersFor(hash) {
         let providers = [];
         if (this.providerMap.has(hash))
+            providers = [...this.providerMap.get(hash)];
+        return providers;
+    }
+    addProvider(address, hash) {
+        let providers = new Set();
+        if (this.providerMap.has(hash)) {
             providers = this.providerMap.get(hash);
-        providers = new Set([...providers, address]);
+        }
+        providers.add(address);
         this.providerMap.set(hash, providers);
-        return providers;
+    }
+    removeProvider(address, hash) {
+        let deleted = undefined;
+        if (this.providerMap.has(hash)) {
+            const providers = this.providerMap.get(hash);
+            deleted = providers.delete(address);
+            deleted && this.providerMap.set(hash, providers);
+        }
+        return deleted;
     }
 }
 
@@ -782,8 +785,8 @@ class Peernet {
         if (!closestPeer || !closestPeer.id)
             return this.requestData(hash, store?.name || store);
         const id = closestPeer.id;
-        if (this.#connections[id]) {
-            const peer = this.#connections[id];
+        const peer = this.#connections[id];
+        if (peer?.connected) {
             let data = await new globalThis.peernet.protos['peernet-data']({ hash, store: store?.name || store });
             const node = await this.prepareMessage(data);
             if (peer)
@@ -806,6 +809,9 @@ class Peernet {
             return BufferToUint8Array(proto.decoded.data);
             // this.put(hash, proto.decoded.data)
         }
+        else {
+            this.dht.removeProvider(id, hash);
+        }
         return;
     }
     get message() {

package/package.json

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

package/src/dht/{dht.js → dht.ts}

@@ -47,18 +47,15 @@ const distanceInKmBetweenEarthCoordinates = (lat1, lon1, lat2, lon2) => {
 }
 
 export default class DhtEarth {
+  providerMap = new Map<string, Set<string>>
+
   /**
    *
    */
   constructor() {
     this.providerMap = new Map();
   }
-
-  /**
-   * @param {Object} address
-   * @return {Object} {latitude: lat, longitude: lon}
-   */
-  async getCoordinates(address) {
+  async getCoordinates(address: string): Promise<object> {
     if (!fetchedCoordinates[address]) {
       const request = `https://whereis.leofcoin.org/?ip=${address}`
       let response = await fetch(request)
@@ -74,16 +71,12 @@ export default class DhtEarth {
    * @param {Object} provider
    * @return {Object} {provider, distance}
    */
-  async getDistance(peer, provider) {
+  async getDistance(peer: object, provider: object): object {
     const {latitude, longitude} = await this.getCoordinates(provider.address)
     return {provider, distance: distanceInKmBetweenEarthCoordinates(peer.latitude, peer.longitude, latitude, longitude)}
   }
 
-  /**
-   * @param {Array} providers
-   * @return {Object} closestPeer
-   */
-  async closestPeer(providers) {
+  async closestPeer(providers: Array<any>): object {
     let all = []
     const address = await getAddress();
     const peerLoc = await this.getCoordinates(address)
@@ -97,25 +90,32 @@ export default class DhtEarth {
     return all[0].provider;
   }
 
-  /**
-   * @param {String} hash
-   * @return {Array} providers
-   */
-  providersFor(hash) {
-    return this.providerMap.get(hash);
+  hasProvider(hash: string): boolean {
+    return this.providerMap.has(hash)
   }
 
-  /**
-   * @param {String} address
-   * @param {String} hash
-   * @return {Array} providers
-   */
-  async addProvider(address, hash) {
-    let providers = [];
-    if (this.providerMap.has(hash)) providers = this.providerMap.get(hash)
+  providersFor(hash: string): string[] {
+    let providers = []
+    if (this.providerMap.has(hash)) providers = [...this.providerMap.get(hash)]
+    return providers
+  }
 
-    providers = new Set([...providers, address])
+  addProvider(address: string, hash: string): string[] {
+    let providers:Set<string> = new Set()
+    if (this.providerMap.has(hash)) {
+      providers = this.providerMap.get(hash)
+    }
+    providers.add(address)
     this.providerMap.set(hash, providers)
-    return providers;
+  }
+
+  removeProvider(address: string, hash: string): true | undefined {
+    let deleted = undefined
+    if (this.providerMap.has(hash)) {
+      const providers = this.providerMap.get(hash)
+      deleted = providers.delete(address) 
+      deleted && this.providerMap.set(hash, providers)
+    }
+    return deleted;
   }
 }

package/src/peernet.ts

@@ -480,9 +480,9 @@ export default class Peernet {
     if (!closestPeer || !closestPeer.id) return this.requestData(hash, store?.name || store)
 
     const id = closestPeer.id
-    
-    if (this.#connections[id]) {
-      const peer = this.#connections[id]
+    const peer = this.#connections[id]
+
+    if (peer?.connected) {
 
       let data = await new globalThis.peernet.protos['peernet-data']({hash, store: store?.name || store});
 
@@ -508,6 +508,8 @@ export default class Peernet {
       return BufferToUint8Array(proto.decoded.data)
 
       // this.put(hash, proto.decoded.data)
+    } else {
+      this.dht.removeProvider(id, hash)
     }
     return
   }