@dedot/api 0.9.3 → 0.9.5-next.11b0ca8e.3

package/cjs/json-rpc/group/ChainHead/ChainHead.js

@@ -80,11 +80,18 @@ class ChainHead extends JsonRpcGroup_js_1.JsonRpcGroup {
         const defer = (0, utils_1.deferred)();
         try {
             this.#unsub && this.#unsub().catch(utils_1.noop); // ensure unfollowed
+            let signals = 0;
             this.#unsub = await this.send('follow', true, (event, subscription) => {
                 this.#followResponseQueue
                     .enqueue(async () => {
                     await this.#onFollowEvent(event, subscription);
-                    if (event.event == 'initialized') {
+                    if (signals >= 2)
+                        return;
+                    signals += 1;
+                    // Sometime smoldot send a `stop` event right after `initialized`
+                    // So requests sending between `initialized` and `stop` will be on pruned hashes -> throwing out errors
+                    // Here we make sure to receive at least the first 2 signals to resolve
+                    if (signals >= 2) {
                         defer.resolve();
                     }
                 })
@@ -167,28 +174,18 @@ class ChainHead extends JsonRpcGroup_js_1.JsonRpcGroup {
                         return;
                     this.#finalizedQueue.push(hash);
                 });
-                this.emit('finalizedBlock', this.findBlock(this.#finalizedHash));
-                // TODO should we find all descendants of the pruned blocks and unpin them as well?
-                //      that's probably a premature optimization
-                const finalizedBlockHeights = finalizedBlockHashes.map((hash) => this.findBlock(hash).number);
-                const pinnedHashes = Object.keys(this.#pinnedBlocks);
-                const hashesToUnpin = new Set([
-                    ...prunedBlockHashes.filter((hash) => pinnedHashes.includes(hash)),
-                    // Since we have the current finalized blocks,
-                    // we can mark all the other blocks at the same height as pruned and unpin all together with the reported pruned blocks
-                    ...Object.values(this.#pinnedBlocks)
-                        .filter((b) => finalizedBlockHeights.includes(b.number))
-                        .filter((b) => !finalizedBlockHashes.includes(b.hash))
-                        .map((b) => b.hash),
-                ]);
+                const currentFinalizedBlock = this.findBlock(this.#finalizedHash);
+                this.emit('finalizedBlock', currentFinalizedBlock);
                 // TODO account for operations that haven't received its operationId yet
                 Object.values(this.#handlers).forEach(({ defer, hash, operationId }) => {
-                    if (hashesToUnpin.has(hash)) {
+                    if (prunedBlockHashes.includes(hash)) {
                         defer.reject(new error_js_1.ChainHeadBlockPrunedError());
                         this.stopOperation(operationId).catch(utils_1.noop);
                         delete this.#handlers[operationId];
                     }
                 });
+                const pinnedHashes = Object.keys(this.#pinnedBlocks);
+                const hashesToUnpin = new Set(prunedBlockHashes.filter((hash) => pinnedHashes.includes(hash)));
                 // Unpin the oldest finalized pinned blocks to maintain the queue size
                 if (this.#finalizedQueue.length > exports.MIN_FINALIZED_QUEUE_SIZE) {
                     const finalizedQueue = this.#finalizedQueue.slice();
@@ -206,6 +203,17 @@ class ChainHead extends JsonRpcGroup_js_1.JsonRpcGroup {
                     });
                     this.#finalizedQueue = finalizedQueue;
                 }
+                // Unpin all obsolete blocks with blockNumber < the latest finalized block number
+                // & not a finalized block & is not in use
+                pinnedHashes.forEach((hash) => {
+                    if (this.#blockUsage.usage(hash) > 0)
+                        return;
+                    if (this.#finalizedQueue.includes(hash))
+                        return;
+                    if (this.findBlock(hash).number > currentFinalizedBlock.number)
+                        return;
+                    hashesToUnpin.add(hash);
+                });
                 hashesToUnpin.forEach((hash) => {
                     if (!this.isPinned(hash))
                         return;
@@ -421,17 +429,15 @@ class ChainHead extends JsonRpcGroup_js_1.JsonRpcGroup {
     async #retryOperation(strategy, retry) {
         try {
             return await new Promise((resolve, reject) => {
-                setTimeout(() => {
-                    if (strategy === error_js_1.RetryStrategy.NOW) {
-                        retry().then(resolve).catch(reject);
-                    }
-                    else if (strategy === error_js_1.RetryStrategy.QUEUED) {
-                        this.#retryQueue.enqueue(retry).then(resolve).catch(reject);
-                    }
-                    else {
-                        throw new Error('Invalid retry strategy');
-                    }
-                }); // retry again in the next tick
+                if (strategy === error_js_1.RetryStrategy.NOW) {
+                    retry().then(resolve).catch(reject);
+                }
+                else if (strategy === error_js_1.RetryStrategy.QUEUED) {
+                    this.#retryQueue.enqueue(retry).then(resolve).catch(reject);
+                }
+                else {
+                    throw new Error('Invalid retry strategy');
+                }
             });
         }
         catch (e) {
@@ -555,16 +561,13 @@ class ChainHead extends JsonRpcGroup_js_1.JsonRpcGroup {
             const isSmoldot = typeof this.client.provider['chain'] === 'function';
             if (isSmoldot) {
                 const fetchItem = async (item) => {
-                    const [newBatch, newDiscardedItems] = await this.#getStorage([item], childTrie ?? null, hash);
+                    const [batch, newDiscardedItems] = await this.#getStorage([item], childTrie ?? null, hash);
                     if (newDiscardedItems.length > 0) {
                         return fetchItem(item);
                     }
-                    if (newBatch.length === 0) {
-                        return { key: item.key, value: undefined };
-                    }
-                    return newBatch[0];
+                    return batch;
                 };
-                results = await Promise.all(items.map((one) => fetchItem(one)));
+                results = (await Promise.all(items.map((one) => fetchItem(one)))).flat();
             }
             else {
                 let queryItems = items;

package/json-rpc/group/ChainHead/ChainHead.js

@@ -77,11 +77,18 @@ export class ChainHead extends JsonRpcGroup {
         const defer = deferred();
         try {
             this.#unsub && this.#unsub().catch(noop); // ensure unfollowed
+            let signals = 0;
             this.#unsub = await this.send('follow', true, (event, subscription) => {
                 this.#followResponseQueue
                     .enqueue(async () => {
                     await this.#onFollowEvent(event, subscription);
-                    if (event.event == 'initialized') {
+                    if (signals >= 2)
+                        return;
+                    signals += 1;
+                    // Sometime smoldot send a `stop` event right after `initialized`
+                    // So requests sending between `initialized` and `stop` will be on pruned hashes -> throwing out errors
+                    // Here we make sure to receive at least the first 2 signals to resolve
+                    if (signals >= 2) {
                         defer.resolve();
                     }
                 })
@@ -164,28 +171,18 @@ export class ChainHead extends JsonRpcGroup {
                         return;
                     this.#finalizedQueue.push(hash);
                 });
-                this.emit('finalizedBlock', this.findBlock(this.#finalizedHash));
-                // TODO should we find all descendants of the pruned blocks and unpin them as well?
-                //      that's probably a premature optimization
-                const finalizedBlockHeights = finalizedBlockHashes.map((hash) => this.findBlock(hash).number);
-                const pinnedHashes = Object.keys(this.#pinnedBlocks);
-                const hashesToUnpin = new Set([
-                    ...prunedBlockHashes.filter((hash) => pinnedHashes.includes(hash)),
-                    // Since we have the current finalized blocks,
-                    // we can mark all the other blocks at the same height as pruned and unpin all together with the reported pruned blocks
-                    ...Object.values(this.#pinnedBlocks)
-                        .filter((b) => finalizedBlockHeights.includes(b.number))
-                        .filter((b) => !finalizedBlockHashes.includes(b.hash))
-                        .map((b) => b.hash),
-                ]);
+                const currentFinalizedBlock = this.findBlock(this.#finalizedHash);
+                this.emit('finalizedBlock', currentFinalizedBlock);
                 // TODO account for operations that haven't received its operationId yet
                 Object.values(this.#handlers).forEach(({ defer, hash, operationId }) => {
-                    if (hashesToUnpin.has(hash)) {
+                    if (prunedBlockHashes.includes(hash)) {
                         defer.reject(new ChainHeadBlockPrunedError());
                         this.stopOperation(operationId).catch(noop);
                         delete this.#handlers[operationId];
                     }
                 });
+                const pinnedHashes = Object.keys(this.#pinnedBlocks);
+                const hashesToUnpin = new Set(prunedBlockHashes.filter((hash) => pinnedHashes.includes(hash)));
                 // Unpin the oldest finalized pinned blocks to maintain the queue size
                 if (this.#finalizedQueue.length > MIN_FINALIZED_QUEUE_SIZE) {
                     const finalizedQueue = this.#finalizedQueue.slice();
@@ -203,6 +200,17 @@ export class ChainHead extends JsonRpcGroup {
                     });
                     this.#finalizedQueue = finalizedQueue;
                 }
+                // Unpin all obsolete blocks with blockNumber < the latest finalized block number
+                // & not a finalized block & is not in use
+                pinnedHashes.forEach((hash) => {
+                    if (this.#blockUsage.usage(hash) > 0)
+                        return;
+                    if (this.#finalizedQueue.includes(hash))
+                        return;
+                    if (this.findBlock(hash).number > currentFinalizedBlock.number)
+                        return;
+                    hashesToUnpin.add(hash);
+                });
                 hashesToUnpin.forEach((hash) => {
                     if (!this.isPinned(hash))
                         return;
@@ -418,17 +426,15 @@ export class ChainHead extends JsonRpcGroup {
     async #retryOperation(strategy, retry) {
         try {
             return await new Promise((resolve, reject) => {
-                setTimeout(() => {
-                    if (strategy === RetryStrategy.NOW) {
-                        retry().then(resolve).catch(reject);
-                    }
-                    else if (strategy === RetryStrategy.QUEUED) {
-                        this.#retryQueue.enqueue(retry).then(resolve).catch(reject);
-                    }
-                    else {
-                        throw new Error('Invalid retry strategy');
-                    }
-                }); // retry again in the next tick
+                if (strategy === RetryStrategy.NOW) {
+                    retry().then(resolve).catch(reject);
+                }
+                else if (strategy === RetryStrategy.QUEUED) {
+                    this.#retryQueue.enqueue(retry).then(resolve).catch(reject);
+                }
+                else {
+                    throw new Error('Invalid retry strategy');
+                }
             });
         }
         catch (e) {
@@ -552,16 +558,13 @@ export class ChainHead extends JsonRpcGroup {
             const isSmoldot = typeof this.client.provider['chain'] === 'function';
             if (isSmoldot) {
                 const fetchItem = async (item) => {
-                    const [newBatch, newDiscardedItems] = await this.#getStorage([item], childTrie ?? null, hash);
+                    const [batch, newDiscardedItems] = await this.#getStorage([item], childTrie ?? null, hash);
                     if (newDiscardedItems.length > 0) {
                         return fetchItem(item);
                     }
-                    if (newBatch.length === 0) {
-                        return { key: item.key, value: undefined };
-                    }
-                    return newBatch[0];
+                    return batch;
                 };
-                results = await Promise.all(items.map((one) => fetchItem(one)));
+                results = (await Promise.all(items.map((one) => fetchItem(one)))).flat();
             }
             else {
                 let queryItems = items;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/api",
-  "version": "0.9.3",
+  "version": "0.9.5-next.11b0ca8e.3+11b0ca8",
   "description": "A delightful JavaScript/TypeScript client for Polkadot & Substrate",
   "author": "Thang X. Vu <thang@dedot.dev>",
   "homepage": "https://dedot.dev",
@@ -13,13 +13,13 @@
   "type": "module",
   "sideEffects": false,
   "dependencies": {
-    "@dedot/codecs": "0.9.3",
-    "@dedot/providers": "0.9.3",
-    "@dedot/runtime-specs": "0.9.3",
-    "@dedot/shape": "0.9.3",
-    "@dedot/storage": "0.9.3",
-    "@dedot/types": "0.9.3",
-    "@dedot/utils": "0.9.3"
+    "@dedot/codecs": "0.9.5-next.11b0ca8e.3+11b0ca8",
+    "@dedot/providers": "0.9.5-next.11b0ca8e.3+11b0ca8",
+    "@dedot/runtime-specs": "0.9.5-next.11b0ca8e.3+11b0ca8",
+    "@dedot/shape": "0.9.5-next.11b0ca8e.3+11b0ca8",
+    "@dedot/storage": "0.9.5-next.11b0ca8e.3+11b0ca8",
+    "@dedot/types": "0.9.5-next.11b0ca8e.3+11b0ca8",
+    "@dedot/utils": "0.9.5-next.11b0ca8e.3+11b0ca8"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json",
@@ -48,7 +48,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "206c4999865cddbd1078bf5b059c7b49822e20d0",
+  "gitHead": "11b0ca8e2df2c59e12259dc2ba0c61ec91e181cf",
   "module": "./index.js",
   "types": "./index.d.ts"
 }