@subsquid/portal-client 0.3.0 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/lib/client.d.ts.map +1 -1
  2. package/lib/client.js +47 -48
  3. package/lib/client.js.map +1 -1
  4. package/lib/query/solana.js +1 -1
  5. package/lib/query/solana.js.map +1 -1
  6. package/package.json +1 -1
  7. package/src/client.ts +49 -50
  8. package/src/query/solana.ts +1 -1
package/lib/client.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
package/lib/client.js CHANGED
@@ -174,54 +174,53 @@ function createPortalStream(query, options, requestStream) {
174
174
  let schema = (0, query_1.getBlockSchema)(query);
175
175
  let { fromBlock = 0, toBlock, parentBlockHash } = query;
176
176
  const ingest = async () => {
177
- if (buffer.signal.aborted)
178
- return;
179
- if (toBlock != null && fromBlock > toBlock)
180
- return;
181
- let res = await requestStream({
182
- ...query,
183
- fromBlock,
184
- parentBlockHash,
185
- }, {
186
- ...request,
187
- abort: buffer.signal,
188
- });
189
- const finalizedHead = res.finalizedHead;
190
- // we are on head
191
- if (!('stream' in res)) {
192
- await buffer.put({ blocks: [], meta: { bytes: 0 }, finalizedHead });
193
- buffer.flush();
194
- if (headPollInterval > 0) {
195
- await (0, util_internal_1.wait)(headPollInterval, buffer.signal);
177
+ while (!buffer.signal.aborted) {
178
+ if (toBlock != null && fromBlock > toBlock)
179
+ break;
180
+ let res = await requestStream({
181
+ ...query,
182
+ fromBlock,
183
+ parentBlockHash,
184
+ }, {
185
+ ...request,
186
+ abort: buffer.signal,
187
+ });
188
+ const finalizedHead = res.finalizedHead;
189
+ // we are on head
190
+ if (!('stream' in res)) {
191
+ await buffer.put({ blocks: [], meta: { bytes: 0 }, finalizedHead });
192
+ buffer.flush();
193
+ if (headPollInterval > 0) {
194
+ await (0, util_internal_1.wait)(headPollInterval, buffer.signal);
195
+ }
196
+ continue;
196
197
  }
197
- return ingest();
198
- }
199
- // no data left on this range
200
- if (res.stream == null)
201
- return;
202
- try {
203
- for await (let data of res.stream) {
204
- buffer.signal.throwIfAborted();
205
- let blocks = [];
206
- let bytes = 0;
207
- for (let line of data) {
208
- let block = (0, util_internal_validation_1.cast)(schema, JSON.parse(line));
209
- blocks.push(block);
210
- bytes += line.length;
211
- fromBlock = block.header.number + 1;
212
- parentBlockHash = block.header.hash;
198
+ // no data left on this range
199
+ if (res.stream == null)
200
+ break;
201
+ try {
202
+ for await (let data of res.stream) {
203
+ buffer.signal.throwIfAborted();
204
+ let blocks = [];
205
+ let bytes = 0;
206
+ for (let line of data) {
207
+ let block = (0, util_internal_validation_1.cast)(schema, JSON.parse(line));
208
+ blocks.push(block);
209
+ bytes += line.length;
210
+ fromBlock = block.header.number + 1;
211
+ parentBlockHash = block.header.hash;
212
+ }
213
+ await buffer.put({ blocks, finalizedHead, meta: { bytes } });
213
214
  }
214
- await buffer.put({ blocks, finalizedHead, meta: { bytes } });
215
215
  }
216
- }
217
- catch (err) {
218
- if (buffer.signal.aborted)
219
- return;
220
- if (!isStreamAbortedError(err)) {
221
- throw err;
216
+ catch (err) {
217
+ if (buffer.signal.aborted)
218
+ return;
219
+ if (!isStreamAbortedError(err)) {
220
+ throw err;
221
+ }
222
222
  }
223
223
  }
224
- return ingest();
225
224
  };
226
225
  ingest().then(() => buffer.close(), (err) => buffer.fail(err));
227
226
  return buffer.iterate();
@@ -243,7 +242,7 @@ class PortalStreamBuffer {
243
242
  }
244
243
  async take() {
245
244
  if (this.state === 'pending') {
246
- this.waitTimeout = setTimeout(() => this._ready(), this.maxWaitTime);
245
+ this.waitTimeout = setTimeout(() => this._ready('wait'), this.maxWaitTime);
247
246
  }
248
247
  await Promise.all([this.readyFuture.promise(), this.putFuture.promise()]);
249
248
  if (this.state === 'failed') {
@@ -280,19 +279,19 @@ class PortalStreamBuffer {
280
279
  this.buffer.meta.bytes += data.meta.bytes;
281
280
  this.putFuture.resolve();
282
281
  if (this.buffer.meta.bytes >= this.minBytes) {
283
- this.readyFuture.resolve();
282
+ this._ready('minBytes');
284
283
  }
285
284
  if (this.buffer.meta.bytes >= this.maxBytes) {
286
285
  await this.takeFuture.promise();
287
286
  }
288
287
  if (this.state === 'pending') {
289
- this.idleTimeout = setTimeout(() => this._ready(), this.maxIdleTime);
288
+ this.idleTimeout = setTimeout(() => this._ready('idle'), this.maxIdleTime);
290
289
  }
291
290
  }
292
291
  flush() {
293
292
  if (this.buffer == null)
294
293
  return;
295
- this._ready();
294
+ this._ready('flush');
296
295
  }
297
296
  close() {
298
297
  if (this.state === 'closed' || this.state === 'failed')
@@ -330,7 +329,7 @@ class PortalStreamBuffer {
330
329
  },
331
330
  };
332
331
  }
333
- _ready() {
332
+ _ready(reason) {
334
333
  if (this.state === 'pending') {
335
334
  this.state = 'ready';
336
335
  this.readyFuture.resolve();
package/lib/client.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
package/lib/query/solana.js CHANGED
@@ -9,9 +9,9 @@ function getBlockSchema(fields) {
9
9
  let instruction = (0, util_internal_validation_1.object)((0, common_1.project)(InstructionShape, fields.instruction));
10
10
  let balance = (0, util_internal_validation_1.object)((0, common_1.project)(BalanceShape, fields.balance));
11
11
  let tokenBalance = (0, util_internal_validation_1.oneOf)({
12
+ prePost: (0, util_internal_validation_1.object)((0, common_1.project)(PrePostTokenBalanceShape, fields.tokenBalance)),
12
13
  pre: (0, util_internal_validation_1.object)((0, common_1.project)(PreTokenBalanceShape, fields.tokenBalance)),
13
14
  post: (0, util_internal_validation_1.object)((0, common_1.project)(PostTokenBalanceShape, fields.tokenBalance)),
14
- prePost: (0, util_internal_validation_1.object)((0, common_1.project)(PrePostTokenBalanceShape, fields.tokenBalance)),
15
15
  });
16
16
  let logMessage = (0, util_internal_validation_1.object)((0, common_1.project)(LogMessageShape, fields.log));
17
17
  let reward = (0, util_internal_validation_1.object)((0, common_1.project)(RewardShape, fields.reward));
package/lib/query/solana.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"solana.js","sourceRoot":"","sources":["../../src/query/solana.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"solana.js","sourceRoot":"","sources":["../../src/query/solana.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@subsquid/portal-client",
3
- "version": "0.3.0",
3
+ "version": "0.3.2",
4
4
  "description": "SQD Portal API",
5
5
  "license": "GPL-3.0-or-later",
6
6
  "repository": "git@github.com:subsquid/squid.git",
package/src/client.ts CHANGED
@@ -300,62 +300,61 @@ function createPortalStream<Q extends Query>(
300
300
  let {fromBlock = 0, toBlock, parentBlockHash} = query
301
301
 
302
302
  const ingest = async () => {
303
- if (buffer.signal.aborted) return
304
- if (toBlock != null && fromBlock > toBlock) return
305
-
306
- let res = await requestStream(
307
- {
308
- ...query,
309
- fromBlock,
310
- parentBlockHash,
311
- },
312
- {
313
- ...request,
314
- abort: buffer.signal,
315
- }
316
- )
303
+ while (!buffer.signal.aborted) {
304
+ if (toBlock != null && fromBlock > toBlock) break
305
+
306
+ let res = await requestStream(
307
+ {
308
+ ...query,
309
+ fromBlock,
310
+ parentBlockHash,
311
+ },
312
+ {
313
+ ...request,
314
+ abort: buffer.signal,
315
+ }
316
+ )
317
317
 
318
- const finalizedHead = res.finalizedHead
318
+ const finalizedHead = res.finalizedHead
319
319
 
320
- // we are on head
321
- if (!('stream' in res)) {
322
- await buffer.put({blocks: [], meta: {bytes: 0}, finalizedHead})
323
- buffer.flush()
324
- if (headPollInterval > 0) {
325
- await wait(headPollInterval, buffer.signal)
320
+ // we are on head
321
+ if (!('stream' in res)) {
322
+ await buffer.put({blocks: [], meta: {bytes: 0}, finalizedHead})
323
+ buffer.flush()
324
+ if (headPollInterval > 0) {
325
+ await wait(headPollInterval, buffer.signal)
326
+ }
327
+ continue
326
328
  }
327
- return ingest()
328
- }
329
329
 
330
- // no data left on this range
331
- if (res.stream == null) return
330
+ // no data left on this range
331
+ if (res.stream == null) break
332
332
 
333
- try {
334
- for await (let data of res.stream) {
335
- buffer.signal.throwIfAborted()
333
+ try {
334
+ for await (let data of res.stream) {
335
+ buffer.signal.throwIfAborted()
336
336
 
337
- let blocks: GetBlock<Q>[] = []
338
- let bytes = 0
337
+ let blocks: GetBlock<Q>[] = []
338
+ let bytes = 0
339
339
 
340
- for (let line of data) {
341
- let block = cast(schema, JSON.parse(line))
342
- blocks.push(block)
343
- bytes += line.length
340
+ for (let line of data) {
341
+ let block = cast(schema, JSON.parse(line))
342
+ blocks.push(block)
343
+ bytes += line.length
344
344
 
345
- fromBlock = block.header.number + 1
346
- parentBlockHash = block.header.hash
347
- }
345
+ fromBlock = block.header.number + 1
346
+ parentBlockHash = block.header.hash
347
+ }
348
348
 
349
- await buffer.put({blocks, finalizedHead, meta: {bytes}})
350
- }
351
- } catch (err) {
352
- if (buffer.signal.aborted) return
353
- if (!isStreamAbortedError(err)) {
354
- throw err
349
+ await buffer.put({blocks, finalizedHead, meta: {bytes}})
350
+ }
351
+ } catch (err) {
352
+ if (buffer.signal.aborted) return
353
+ if (!isStreamAbortedError(err)) {
354
+ throw err
355
+ }
355
356
  }
356
357
  }
357
-
358
- return ingest()
359
358
  }
360
359
 
361
360
  ingest().then(
@@ -398,7 +397,7 @@ class PortalStreamBuffer<B> {
398
397
 
399
398
  async take(): Promise<PortalStreamData<B> | undefined> {
400
399
  if (this.state === 'pending') {
401
- this.waitTimeout = setTimeout(() => this._ready(), this.maxWaitTime)
400
+ this.waitTimeout = setTimeout(() => this._ready('wait'), this.maxWaitTime)
402
401
  }
403
402
 
404
403
  await Promise.all([this.readyFuture.promise(), this.putFuture.promise()])
@@ -449,7 +448,7 @@ class PortalStreamBuffer<B> {
449
448
  this.putFuture.resolve()
450
449
 
451
450
  if (this.buffer.meta.bytes >= this.minBytes) {
452
- this.readyFuture.resolve()
451
+ this._ready('minBytes')
453
452
  }
454
453
 
455
454
  if (this.buffer.meta.bytes >= this.maxBytes) {
@@ -457,13 +456,13 @@ class PortalStreamBuffer<B> {
457
456
  }
458
457
 
459
458
  if (this.state === 'pending') {
460
- this.idleTimeout = setTimeout(() => this._ready(), this.maxIdleTime)
459
+ this.idleTimeout = setTimeout(() => this._ready('idle'), this.maxIdleTime)
461
460
  }
462
461
  }
463
462
 
464
463
  flush() {
465
464
  if (this.buffer == null) return
466
- this._ready()
465
+ this._ready('flush')
467
466
  }
468
467
 
469
468
  close() {
@@ -503,7 +502,7 @@ class PortalStreamBuffer<B> {
503
502
  }
504
503
  }
505
504
 
506
- private _ready() {
505
+ private _ready(reason?: string) {
507
506
  if (this.state === 'pending') {
508
507
  this.state = 'ready'
509
508
  this.readyFuture.resolve()
package/src/query/solana.ts CHANGED
@@ -314,9 +314,9 @@ export function getBlockSchema<F extends FieldSelection>(fields: F): Validator<B
314
314
  let balance = object(project(BalanceShape, fields.balance))
315
315
 
316
316
  let tokenBalance = oneOf({
317
+ prePost: object(project(PrePostTokenBalanceShape, fields.tokenBalance)),
317
318
  pre: object(project(PreTokenBalanceShape, fields.tokenBalance)),
318
319
  post: object(project(PostTokenBalanceShape, fields.tokenBalance)),
319
- prePost: object(project(PrePostTokenBalanceShape, fields.tokenBalance)),
320
320
  })
321
321
 
322
322
  let logMessage = object(project(LogMessageShape, fields.log))