@leofcoin/chain 1.4.58 → 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/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.58",
+  "version": "1.4.59",
   "description": "Official javascript implementation",
   "exports": {
     "./node": "./exports/node.js",