@subsquid/portal-client 0.2.0 → 0.3.2

package/lib/client.d.ts

@@ -90,10 +90,10 @@ export declare class PortalClient {
     private request;
 }
 export declare class ForkException extends Error {
-    readonly lastBlocks: BlockRef[];
+    readonly previousBlocks: BlockRef[];
     readonly head: BlockRef;
     readonly name = "ForkError";
-    constructor(lastBlocks: BlockRef[], head: BlockRef);
+    constructor(previousBlocks: BlockRef[], head: BlockRef);
 }
 export declare function isForkException(err: unknown): err is ForkException;
 //# sourceMappingURL=client.d.ts.map

package/lib/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

package/lib/client.js

@@ -138,7 +138,7 @@ class PortalClient {
         }
         catch (e) {
             if (isForkHttpError(e) && query.fromBlock != null && query.parentBlockHash != null) {
-                e = new ForkException(e.response.body.lastBlocks, {
+                e = new ForkException(e.response.body.previousBlocks, {
                     number: query.fromBlock - 1,
                     hash: query.parentBlockHash,
                 });
@@ -164,7 +164,7 @@ function isForkHttpError(err) {
         return false;
     if (err.response.status !== 409)
         return false;
-    if (err.response.body.lastBlocks == null)
+    if (!Array.isArray(err.response.body.previousBlocks))
         return false;
     return true;
 }
@@ -174,61 +174,53 @@ function createPortalStream(query, options, requestStream) {
     let schema = (0, query_1.getBlockSchema)(query);
     let { fromBlock = 0, toBlock, parentBlockHash } = query;
     const ingest = async () => {
-        if (buffer.signal.aborted)
-            return;
-        if (toBlock != null && fromBlock > toBlock)
-            return;
-        let res = await requestStream({
-            ...query,
-            fromBlock,
-            parentBlockHash,
-        }, {
-            ...request,
-            abort: buffer.signal,
-        });
-        const finalizedHead = res.finalizedHead;
-        // we are on head
-        if (!('stream' in res)) {
-            await buffer.put({ blocks: [], meta: { bytes: 0 }, finalizedHead });
-            buffer.flush();
-            if (headPollInterval > 0) {
-                await (0, util_internal_1.wait)(headPollInterval, buffer.signal);
-            }
-            return ingest();
-        }
-        // no data left on this range
-        if (res.stream == null)
-            return;
-        let iterator = res.stream[Symbol.asyncIterator]();
-        try {
-            while (true) {
-                let data = await iterator.next();
-                if (data.done)
-                    break;
-                let blocks = [];
-                let bytes = 0;
-                for (let line of data.value) {
-                    let block = (0, util_internal_validation_1.cast)(schema, JSON.parse(line));
-                    blocks.push(block);
-                    bytes += line.length;
-                    fromBlock = block.header.number + 1;
-                    parentBlockHash = block.header.hash;
+        while (!buffer.signal.aborted) {
+            if (toBlock != null && fromBlock > toBlock)
+                break;
+            let res = await requestStream({
+                ...query,
+                fromBlock,
+                parentBlockHash,
+            }, {
+                ...request,
+                abort: buffer.signal,
+            });
+            const finalizedHead = res.finalizedHead;
+            // we are on head
+            if (!('stream' in res)) {
+                await buffer.put({ blocks: [], meta: { bytes: 0 }, finalizedHead });
+                buffer.flush();
+                if (headPollInterval > 0) {
+                    await (0, util_internal_1.wait)(headPollInterval, buffer.signal);
                 }
-                await buffer.put({ blocks, finalizedHead, meta: { bytes } });
+                continue;
             }
-        }
-        catch (err) {
-            if (buffer.signal.aborted || isStreamAbortedError(err)) {
-                // ignore
+            // no data left on this range
+            if (res.stream == null)
+                break;
+            try {
+                for await (let data of res.stream) {
+                    buffer.signal.throwIfAborted();
+                    let blocks = [];
+                    let bytes = 0;
+                    for (let line of data) {
+                        let block = (0, util_internal_validation_1.cast)(schema, JSON.parse(line));
+                        blocks.push(block);
+                        bytes += line.length;
+                        fromBlock = block.header.number + 1;
+                        parentBlockHash = block.header.hash;
+                    }
+                    await buffer.put({ blocks, finalizedHead, meta: { bytes } });
+                }
             }
-            else {
-                throw err;
+            catch (err) {
+                if (buffer.signal.aborted)
+                    return;
+                if (!isStreamAbortedError(err)) {
+                    throw err;
+                }
             }
         }
-        finally {
-            await iterator?.return?.().catch(() => { });
-        }
-        return ingest();
     };
     ingest().then(() => buffer.close(), (err) => buffer.fail(err));
     return buffer.iterate();
@@ -250,7 +242,7 @@ class PortalStreamBuffer {
     }
     async take() {
         if (this.state === 'pending') {
-            this.waitTimeout = setTimeout(() => this._ready(), this.maxWaitTime);
+            this.waitTimeout = setTimeout(() => this._ready('wait'), this.maxWaitTime);
         }
         await Promise.all([this.readyFuture.promise(), this.putFuture.promise()]);
         if (this.state === 'failed') {
@@ -287,19 +279,19 @@ class PortalStreamBuffer {
         this.buffer.meta.bytes += data.meta.bytes;
         this.putFuture.resolve();
         if (this.buffer.meta.bytes >= this.minBytes) {
-            this.readyFuture.resolve();
+            this._ready('minBytes');
         }
         if (this.buffer.meta.bytes >= this.maxBytes) {
             await this.takeFuture.promise();
         }
         if (this.state === 'pending') {
-            this.idleTimeout = setTimeout(() => this._ready(), this.maxIdleTime);
+            this.idleTimeout = setTimeout(() => this._ready('idle'), this.maxIdleTime);
         }
     }
     flush() {
         if (this.buffer == null)
             return;
-        this._ready();
+        this._ready('flush');
     }
     close() {
         if (this.state === 'closed' || this.state === 'failed')
@@ -337,7 +329,7 @@ class PortalStreamBuffer {
             },
         };
     }
-    _ready() {
+    _ready(reason) {
         if (this.state === 'pending') {
             this.state = 'ready';
             this.readyFuture.resolve();
@@ -410,10 +402,10 @@ class LineSplitter {
     }
 }
 class ForkException extends Error {
-    constructor(lastBlocks, head) {
-        let parent = (0, util_internal_1.last)(lastBlocks);
+    constructor(previousBlocks, head) {
+        let parent = (0, util_internal_1.last)(previousBlocks);
         super(`expected ${head.number + 1} to have parent ${parent.number}#${parent.hash}, but got ${head.number}#${head.hash}`);
-        this.lastBlocks = lastBlocks;
+        this.previousBlocks = previousBlocks;
         this.head = head;
         this.name = 'ForkError';
     }

package/lib/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

package/lib/query/solana.js

@@ -9,9 +9,9 @@ function getBlockSchema(fields) {
     let instruction = (0, util_internal_validation_1.object)((0, common_1.project)(InstructionShape, fields.instruction));
     let balance = (0, util_internal_validation_1.object)((0, common_1.project)(BalanceShape, fields.balance));
     let tokenBalance = (0, util_internal_validation_1.oneOf)({
+        prePost: (0, util_internal_validation_1.object)((0, common_1.project)(PrePostTokenBalanceShape, fields.tokenBalance)),
         pre: (0, util_internal_validation_1.object)((0, common_1.project)(PreTokenBalanceShape, fields.tokenBalance)),
         post: (0, util_internal_validation_1.object)((0, common_1.project)(PostTokenBalanceShape, fields.tokenBalance)),
-        prePost: (0, util_internal_validation_1.object)((0, common_1.project)(PrePostTokenBalanceShape, fields.tokenBalance)),
     });
     let logMessage = (0, util_internal_validation_1.object)((0, common_1.project)(LogMessageShape, fields.log));
     let reward = (0, util_internal_validation_1.object)((0, common_1.project)(RewardShape, fields.reward));

package/lib/query/solana.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../src/query/solana.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../src/query/solana.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@subsquid/portal-client",
-  "version": "0.2.0",
+  "version": "0.3.2",
   "description": "SQD Portal API",
   "license": "GPL-3.0-or-later",
   "repository": "git@github.com:subsquid/squid.git",
@@ -21,11 +21,11 @@
     "@subsquid/util-internal-validation": "^0.8.0"
   },
   "peerDependencies": {
-    "@subsquid/http-client": "^1.6.1"
+    "@subsquid/http-client": "^1.7.0"
   },
   "peerDependenciesMeta": {},
   "devDependencies": {
-    "@subsquid/http-client": "^1.6.1",
+    "@subsquid/http-client": "^1.7.0",
     "@types/node": "^18.18.14",
     "typescript": "5.5.4"
   },

package/src/client.ts

@@ -252,15 +252,15 @@ export class PortalClient {
                 default:
                     throw unexpectedCase(res.status)
             }
-        } catch (e: unknown) {
+        } catch (e: any) {
             if (isForkHttpError(e) && query.fromBlock != null && query.parentBlockHash != null) {
-                e = new ForkException(e.response.body.lastBlocks, {
+                e = new ForkException(e.response.body.previousBlocks, {
                     number: query.fromBlock - 1,
                     hash: query.parentBlockHash,
                 })
             }
 
-            throw addErrorContext(e as any, {
+            throw addErrorContext(e, {
                 query,
             })
         }
@@ -277,10 +277,10 @@ export class PortalClient {
     }
 }
 
-function isForkHttpError(err: unknown): err is HttpError {
+function isForkHttpError(err: unknown): err is HttpError<{previousBlocks: BlockRef[]}> {
     if (!(err instanceof HttpError)) return false
     if (err.response.status !== 409) return false
-    if (err.response.body.lastBlocks == null) return false
+    if (!Array.isArray(err.response.body.previousBlocks)) return false
     return true
 }
 
@@ -300,67 +300,61 @@ function createPortalStream<Q extends Query>(
     let {fromBlock = 0, toBlock, parentBlockHash} = query
 
     const ingest = async () => {
-        if (buffer.signal.aborted) return
-        if (toBlock != null && fromBlock > toBlock) return
-
-        let res = await requestStream(
-            {
-                ...query,
-                fromBlock,
-                parentBlockHash,
-            },
-            {
-                ...request,
-                abort: buffer.signal,
-            }
-        )
+        while (!buffer.signal.aborted) {
+            if (toBlock != null && fromBlock > toBlock) break
+
+            let res = await requestStream(
+                {
+                    ...query,
+                    fromBlock,
+                    parentBlockHash,
+                },
+                {
+                    ...request,
+                    abort: buffer.signal,
+                }
+            )
 
-        const finalizedHead = res.finalizedHead
+            const finalizedHead = res.finalizedHead
 
-        // we are on head
-        if (!('stream' in res)) {
-            await buffer.put({blocks: [], meta: {bytes: 0}, finalizedHead})
-            buffer.flush()
-            if (headPollInterval > 0) {
-                await wait(headPollInterval, buffer.signal)
+            // we are on head
+            if (!('stream' in res)) {
+                await buffer.put({blocks: [], meta: {bytes: 0}, finalizedHead})
+                buffer.flush()
+                if (headPollInterval > 0) {
+                    await wait(headPollInterval, buffer.signal)
+                }
+                continue
             }
-            return ingest()
-        }
 
-        // no data left on this range
-        if (res.stream == null) return
+            // no data left on this range
+            if (res.stream == null) break
 
-        let iterator = res.stream[Symbol.asyncIterator]()
-        try {
-            while (true) {
-                let data = await iterator.next()
-                if (data.done) break
+            try {
+                for await (let data of res.stream) {
+                    buffer.signal.throwIfAborted()
 
-                let blocks: GetBlock<Q>[] = []
-                let bytes = 0
+                    let blocks: GetBlock<Q>[] = []
+                    let bytes = 0
 
-                for (let line of data.value) {
-                    let block = cast(schema, JSON.parse(line))
-                    blocks.push(block)
-                    bytes += line.length
+                    for (let line of data) {
+                        let block = cast(schema, JSON.parse(line))
+                        blocks.push(block)
+                        bytes += line.length
 
-                    fromBlock = block.header.number + 1
-                    parentBlockHash = block.header.hash
-                }
+                        fromBlock = block.header.number + 1
+                        parentBlockHash = block.header.hash
+                    }
 
-                await buffer.put({blocks, finalizedHead, meta: {bytes}})
-            }
-        } catch (err) {
-            if (buffer.signal.aborted || isStreamAbortedError(err)) {
-                // ignore
-            } else {
-                throw err
+                    await buffer.put({blocks, finalizedHead, meta: {bytes}})
+                }
+            } catch (err) {
+                if (buffer.signal.aborted) return
+                if (!isStreamAbortedError(err)) {
+                    throw err
+                }
             }
-        } finally {
-            await iterator?.return?.().catch(() => {})
         }
-
-        return ingest()
     }
 
     ingest().then(
@@ -403,7 +397,7 @@ class PortalStreamBuffer<B> {
 
     async take(): Promise<PortalStreamData<B> | undefined> {
         if (this.state === 'pending') {
-            this.waitTimeout = setTimeout(() => this._ready(), this.maxWaitTime)
+            this.waitTimeout = setTimeout(() => this._ready('wait'), this.maxWaitTime)
         }
 
         await Promise.all([this.readyFuture.promise(), this.putFuture.promise()])
@@ -454,7 +448,7 @@ class PortalStreamBuffer<B> {
         this.putFuture.resolve()
 
         if (this.buffer.meta.bytes >= this.minBytes) {
-            this.readyFuture.resolve()
+            this._ready('minBytes')
         }
 
         if (this.buffer.meta.bytes >= this.maxBytes) {
@@ -462,13 +456,13 @@ class PortalStreamBuffer<B> {
         }
 
         if (this.state === 'pending') {
-            this.idleTimeout = setTimeout(() => this._ready(), this.maxIdleTime)
+            this.idleTimeout = setTimeout(() => this._ready('idle'), this.maxIdleTime)
         }
     }
 
     flush() {
         if (this.buffer == null) return
-        this._ready()
+        this._ready('flush')
     }
 
     close() {
@@ -508,7 +502,7 @@ class PortalStreamBuffer<B> {
         }
     }
 
-    private _ready() {
+    private _ready(reason?: string) {
         if (this.state === 'pending') {
             this.state = 'ready'
             this.readyFuture.resolve()
@@ -581,8 +575,8 @@ class LineSplitter {
 export class ForkException extends Error {
     readonly name = 'ForkError'
 
-    constructor(readonly lastBlocks: BlockRef[], readonly head: BlockRef) {
-        let parent = last(lastBlocks)
+    constructor(readonly previousBlocks: BlockRef[], readonly head: BlockRef) {
+        let parent = last(previousBlocks)
         super(
             `expected ${head.number + 1} to have parent ${parent.number}#${parent.hash}, but got ${head.number}#${
                 head.hash

package/src/query/solana.ts

@@ -314,9 +314,9 @@ export function getBlockSchema<F extends FieldSelection>(fields: F): Validator<B
     let balance = object(project(BalanceShape, fields.balance))
 
     let tokenBalance = oneOf({
+        prePost: object(project(PrePostTokenBalanceShape, fields.tokenBalance)),
         pre: object(project(PreTokenBalanceShape, fields.tokenBalance)),
         post: object(project(PostTokenBalanceShape, fields.tokenBalance)),
-        prePost: object(project(PrePostTokenBalanceShape, fields.tokenBalance)),
     })
 
     let logMessage = object(project(LogMessageShape, fields.log))