@leofcoin/chain 1.7.151 → 1.7.153

package/exports/browser/chain.js

@@ -4189,7 +4189,7 @@ class Machine {
                 break;
             }
             case 'debug': {
-                debug$2(data.message);
+                // debug(data.message)
                 if (data.message.includes('loaded transactions for block:')) {
                     pubsub.publish('block-loaded', data.message.replace('loaded transactions for block: ', '').split(' @')[0]);
                 }
@@ -4598,6 +4598,36 @@ class Machine {
     }
 }
 
+class Jobber {
+    constructor(timeout) {
+        this.busy = false;
+        this.timeout = timeout;
+    }
+    add(fn) {
+        this.busy = true;
+        return new Promise(async (resolve, reject) => {
+            const timeout = setTimeout(() => {
+                reject('timeout');
+            }, this.timeout);
+            this.destroy = () => {
+                clearTimeout(timeout);
+                this.busy = false;
+                resolve('stopped');
+            };
+            try {
+                const result = await fn();
+                clearTimeout(timeout);
+                this.busy = false;
+                resolve(result);
+            }
+            catch (error) {
+                clearTimeout(timeout);
+                reject(error);
+            }
+        });
+    }
+}
+
 const debug$1 = createDebugger('leofcoin/state');
 class State extends Contract {
     #blockHashMap;
@@ -4611,6 +4641,10 @@ class State extends Contract {
     #resolvingBlocks;
     #maxConcurrentResolves;
     #totalSize;
+    #lastResolved;
+    #lastResolvedTime;
+    #blockResolveQueue;
+    #chainState;
     /**
      * contains transactions we need before we can successfully load
      */
@@ -4739,6 +4773,8 @@ class State extends Contract {
     #lastBlockHandler;
     #knownBlocksHandler;
     async init() {
+        // Initialize jobber for timed, cancelable tasks
+        this.jobber = new Jobber(this.resolveTimeout);
         // Register request handlers
         await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
         await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler.bind(this));
@@ -4920,7 +4956,11 @@ class State extends Contract {
             const blockChain = await this.#buildBlockChain(hash);
             debug$1(`Built chain of ${blockChain.length} blocks`);
             if (blockChain.length > 0) {
-                await this.#resolveBlocksInParallel(blockChain);
+                // If a previous resolve job is still running, cancel it
+                if (this.jobber?.busy && this.jobber.destroy)
+                    await this.jobber.destroy();
+                // Run the parallel resolution inside a timed jobber task
+                await this.jobber.add(() => this.#resolveBlocksInParallel(blockChain));
             }
         }
         catch (error) {
@@ -4938,7 +4978,17 @@ class State extends Contract {
             const localBlock = await globalThis.chainStore.get('lastBlock');
             const hash = new TextDecoder().decode(localBlock);
             if (hash && hash !== '0x0') {
-                await this.resolveBlock(hash);
+                // Cancel any in-flight job before starting a new one
+                if (this.jobber?.busy && this.jobber.destroy)
+                    await this.jobber.destroy();
+                // Build chain and resolve in parallel under jobber control
+                const run = async () => {
+                    const chain = await this.#buildBlockChain(hash);
+                    if (chain.length > 0) {
+                        await this.#resolveBlocksInParallel(chain);
+                    }
+                };
+                await this.jobber.add(run);
             }
         }
         catch (error) {

package/exports/chain.js

@@ -330,7 +330,7 @@ class Machine {
                 break;
             }
             case 'debug': {
-                debug$2(data.message);
+                // debug(data.message)
                 if (data.message.includes('loaded transactions for block:')) {
                     pubsub.publish('block-loaded', data.message.replace('loaded transactions for block: ', '').split(' @')[0]);
                 }
@@ -739,6 +739,36 @@ class Machine {
     }
 }
 
+class Jobber {
+    constructor(timeout) {
+        this.busy = false;
+        this.timeout = timeout;
+    }
+    add(fn) {
+        this.busy = true;
+        return new Promise(async (resolve, reject) => {
+            const timeout = setTimeout(() => {
+                reject('timeout');
+            }, this.timeout);
+            this.destroy = () => {
+                clearTimeout(timeout);
+                this.busy = false;
+                resolve('stopped');
+            };
+            try {
+                const result = await fn();
+                clearTimeout(timeout);
+                this.busy = false;
+                resolve(result);
+            }
+            catch (error) {
+                clearTimeout(timeout);
+                reject(error);
+            }
+        });
+    }
+}
+
 const debug$1 = createDebugger('leofcoin/state');
 class State extends Contract {
     #blockHashMap;
@@ -752,6 +782,10 @@ class State extends Contract {
     #resolvingBlocks;
     #maxConcurrentResolves;
     #totalSize;
+    #lastResolved;
+    #lastResolvedTime;
+    #blockResolveQueue;
+    #chainState;
     /**
      * contains transactions we need before we can successfully load
      */
@@ -880,6 +914,8 @@ class State extends Contract {
     #lastBlockHandler;
     #knownBlocksHandler;
     async init() {
+        // Initialize jobber for timed, cancelable tasks
+        this.jobber = new Jobber(this.resolveTimeout);
         // Register request handlers
         await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
         await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler.bind(this));
@@ -1061,7 +1097,11 @@ class State extends Contract {
             const blockChain = await this.#buildBlockChain(hash);
             debug$1(`Built chain of ${blockChain.length} blocks`);
             if (blockChain.length > 0) {
-                await this.#resolveBlocksInParallel(blockChain);
+                // If a previous resolve job is still running, cancel it
+                if (this.jobber?.busy && this.jobber.destroy)
+                    await this.jobber.destroy();
+                // Run the parallel resolution inside a timed jobber task
+                await this.jobber.add(() => this.#resolveBlocksInParallel(blockChain));
             }
         }
         catch (error) {
@@ -1079,7 +1119,17 @@ class State extends Contract {
             const localBlock = await globalThis.chainStore.get('lastBlock');
             const hash = new TextDecoder().decode(localBlock);
             if (hash && hash !== '0x0') {
-                await this.resolveBlock(hash);
+                // Cancel any in-flight job before starting a new one
+                if (this.jobber?.busy && this.jobber.destroy)
+                    await this.jobber.destroy();
+                // Build chain and resolve in parallel under jobber control
+                const run = async () => {
+                    const chain = await this.#buildBlockChain(hash);
+                    if (chain.length > 0) {
+                        await this.#resolveBlocksInParallel(chain);
+                    }
+                };
+                await this.jobber.add(run);
             }
         }
         catch (error) {

package/exports/state.d.ts

@@ -1,9 +1,11 @@
 import { BlockMessage } from '@leofcoin/messages';
 import Contract from './contract.js';
 import Machine from './machine.js';
+import Jobber from './jobs/jobber.js';
 import { BlockHash } from './types.js';
 export default class State extends Contract {
     #private;
+    jobber: Jobber;
     knownBlocks: BlockHash[];
     _wantList: any[];
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.7.151",
+  "version": "1.7.153",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {