@leofcoin/chain 1.4.57 → 1.4.59

package/exports/browser/chain.js

@@ -7883,6 +7883,8 @@ class Contract extends Transaction {
 globalThis.BigNumber = BigNumber;
 // check if browser or local
 class Chain extends Contract {
+    #lastBlockInQue;
+    #syncErrorCount = 0;
     version;
     #resolveErrored;
     #state;
@@ -8179,24 +8181,50 @@ class Chain extends Contract {
         if (this.#chainSyncing)
             return 'already syncing';
         const latest = await this.#getLatestBlock();
-        await this.#syncChain(latest);
+        await this.syncChain(latest);
         return 'synced';
     }
-    async #syncChain(lastBlock) {
-        let current;
-        const timeout = () => current = setTimeout(() => {
-            if (this.#chainSyncing) {
-                if (this.#lastResolved + this.syncTimeout > Date.now())
-                    timeout();
-                else {
-                    this.#chainSyncing = false;
-                    console.log('resyncing');
-                    this.#syncChain(lastBlock);
-                }
+    async syncChain(lastBlock) {
+        if (!lastBlock)
+            lastBlock = await this.#getLatestBlock();
+        if (this.#chainSyncing) {
+            if (!this.#lastBlockInQue || lastBlock.index > this.#lastBlockInQue.index)
+                this.#lastBlockInQue = lastBlock;
+            return 'syncing';
+        }
+        this.#chainSyncing = true;
+        const syncPromise = (lastBlock) => new Promise(async (resolve, reject) => {
+            setTimeout(() => {
+                reject('timedOut');
+            }, 10000);
+            try {
+                await this.#syncChain(lastBlock);
+                resolve(true);
             }
-        }, this.syncTimeout);
-        timeout();
-        if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.hash)
+            catch (error) {
+                reject(error);
+            }
+        });
+        if (globalThis.peernet.connections.length === 0)
+            return 'connectionless';
+        try {
+            await syncPromise(lastBlock);
+        }
+        catch (error) {
+            console.log(error);
+            this.#syncErrorCount += 1;
+            if (this.#syncErrorCount <= 3)
+                return this.syncChain(this.#lastBlockInQue);
+            return 'errored';
+        }
+        this.#syncErrorCount = 0;
+        if (this.#lastBlockInQue)
+            return this.syncChain(this.#lastBlockInQue);
+        this.#chainSyncing = false;
+        return 'synced';
+    }
+    async #syncChain(lastBlock) {
+        if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.index)
             return;
         this.#chainSyncing = true;
         if (this.#knownBlocks?.length === Number(lastBlock.index) + 1) {
@@ -8242,7 +8270,7 @@ class Chain extends Contract {
             console.log(lastBlock);
             this.#resolveErrored = false;
             if (lastBlock)
-                await this.#syncChain(lastBlock);
+                await this.syncChain(lastBlock);
             if (await this.hasTransactionToHandle() && !this.#resolveErrored && this.#participating)
                 this.#runEpoch();
         }

package/exports/browser/{client-d1c29e20-c5d45b87.js → client-4d80940e-a63ca03c.js}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-3d505e1f.js';
+import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-79442920.js';
 import './index-640d9f36.js';
 
 function commonjsRequire(path) {

package/exports/browser/{index-904b9f85-2d6175c2.js → index-4464b87e-d39e42fc.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-3d505e1f.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-79442920.js';
 import './index-640d9f36.js';
 
 /**

package/exports/browser/{messages-de2c5670-d99ad896.js → messages-27279443-8ccccaf2.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-3d505e1f.js';
+import { F as FormatInterface } from './node-browser-79442920.js';
 import './index-640d9f36.js';
 
 var proto$b = {

package/exports/browser/{node-browser-3d505e1f.js → node-browser-79442920.js}

@@ -6309,16 +6309,13 @@ const distanceInKmBetweenEarthCoordinates = (lat1, lon1, lat2, lon2) => {
     return earthRadiusKm * c;
 };
 class DhtEarth {
+    providerMap = new Map;
     /**
      *
      */
     constructor() {
         this.providerMap = new Map();
     }
-    /**
-     * @param {Object} address
-     * @return {Object} {latitude: lat, longitude: lon}
-     */
     async getCoordinates(address) {
         if (!fetchedCoordinates[address]) {
             const request = `https://whereis.leofcoin.org/?ip=${address}`;
@@ -6338,10 +6335,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();
@@ -6356,26 +6349,32 @@ 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) {
-        let providers = [];
+    providersFor(hash) {
+        let providers;
         if (this.providerMap.has(hash))
             providers = this.providerMap.get(hash);
-        providers = new Set([...providers, address]);
-        this.providerMap.set(hash, providers);
         return providers;
     }
+    addProvider(address, hash) {
+        let providers = new Set();
+        if (this.providerMap.has(hash)) {
+            providers = this.providerMap.get(hash);
+        }
+        providers.add(address);
+        this.providerMap.set(hash, 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;
+    }
 }
 
 class MessageHandler {
@@ -20267,7 +20266,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-904b9f85-2d6175c2.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-4464b87e-d39e42fc.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));
@@ -20438,7 +20437,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-d99ad896.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-27279443-8ccccaf2.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -20517,7 +20516,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-d1c29e20-c5d45b87.js');
+        const importee = await import('./client-4d80940e-a63ca03c.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -20707,8 +20706,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)
@@ -20731,6 +20730,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/node-browser.js

@@ -1,2 +1,2 @@
-export { N as default } from './node-browser-3d505e1f.js';
+export { N as default } from './node-browser-79442920.js';
 import './index-640d9f36.js';

package/exports/chain.js

@@ -469,6 +469,8 @@ class Contract extends Transaction {
 globalThis.BigNumber = BigNumber;
 // check if browser or local
 class Chain extends Contract {
+    #lastBlockInQue;
+    #syncErrorCount = 0;
     version;
     #resolveErrored;
     #state;
@@ -765,24 +767,50 @@ class Chain extends Contract {
         if (this.#chainSyncing)
             return 'already syncing';
         const latest = await this.#getLatestBlock();
-        await this.#syncChain(latest);
+        await this.syncChain(latest);
         return 'synced';
     }
-    async #syncChain(lastBlock) {
-        let current;
-        const timeout = () => current = setTimeout(() => {
-            if (this.#chainSyncing) {
-                if (this.#lastResolved + this.syncTimeout > Date.now())
-                    timeout();
-                else {
-                    this.#chainSyncing = false;
-                    console.log('resyncing');
-                    this.#syncChain(lastBlock);
-                }
+    async syncChain(lastBlock) {
+        if (!lastBlock)
+            lastBlock = await this.#getLatestBlock();
+        if (this.#chainSyncing) {
+            if (!this.#lastBlockInQue || lastBlock.index > this.#lastBlockInQue.index)
+                this.#lastBlockInQue = lastBlock;
+            return 'syncing';
+        }
+        this.#chainSyncing = true;
+        const syncPromise = (lastBlock) => new Promise(async (resolve, reject) => {
+            setTimeout(() => {
+                reject('timedOut');
+            }, 10000);
+            try {
+                await this.#syncChain(lastBlock);
+                resolve(true);
+            }
+            catch (error) {
+                reject(error);
             }
-        }, this.syncTimeout);
-        timeout();
-        if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.hash)
+        });
+        if (globalThis.peernet.connections.length === 0)
+            return 'connectionless';
+        try {
+            await syncPromise(lastBlock);
+        }
+        catch (error) {
+            console.log(error);
+            this.#syncErrorCount += 1;
+            if (this.#syncErrorCount <= 3)
+                return this.syncChain(this.#lastBlockInQue);
+            return 'errored';
+        }
+        this.#syncErrorCount = 0;
+        if (this.#lastBlockInQue)
+            return this.syncChain(this.#lastBlockInQue);
+        this.#chainSyncing = false;
+        return 'synced';
+    }
+    async #syncChain(lastBlock) {
+        if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.index)
             return;
         this.#chainSyncing = true;
         if (this.#knownBlocks?.length === Number(lastBlock.index) + 1) {
@@ -828,7 +856,7 @@ class Chain extends Contract {
             console.log(lastBlock);
             this.#resolveErrored = false;
             if (lastBlock)
-                await this.#syncChain(lastBlock);
+                await this.syncChain(lastBlock);
             if (await this.hasTransactionToHandle() && !this.#resolveErrored && this.#participating)
                 this.#runEpoch();
         }

package/exports/typings/chain.d.ts

@@ -1,6 +1,7 @@
 import { BlockMessage } from '@leofcoin/messages';
 import Contract from './contract.js';
 import { BigNumberish } from '@ethersproject/bignumber';
+declare type chainSyncState = 'syncing' | 'synced' | 'errored' | 'connectionless';
 export default class Chain extends Contract {
     #private;
     version: String;
@@ -29,7 +30,8 @@ export default class Chain extends Contract {
         hash: string;
         previousHash: string;
     }>;
-    triggerSync(): Promise<"already syncing" | "synced">;
+    triggerSync(): Promise<"synced" | "already syncing">;
+    syncChain(lastBlock: any): Promise<chainSyncState>;
     getAndPutBlock(hash: string): BlockMessage;
     resolveBlock(hash: any): any;
     resolveBlocks(): any;
@@ -94,3 +96,4 @@ export default class Chain extends Contract {
         address: string;
     };
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.4.57",
+  "version": "1.4.59",
   "description": "Official javascript implementation",
   "exports": {
     "./node": "./exports/node.js",