@peerbit/rpc 6.0.31 → 6.0.33

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 (5) hide show
  1. package/dist/src/controller.d.ts.map +1 -1
  2. package/dist/src/controller.js +37 -24
  3. package/dist/src/controller.js.map +1 -1
  4. package/package.json +5 -5
  5. package/src/controller.ts +49 -29
package/dist/src/controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/controller.ts"],"names":[],"mappings":"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"}
package/dist/src/controller.js CHANGED
@@ -322,21 +322,34 @@ let RPC = (() => {
322
322
  const requestBytes = serialize(requestMessage);
323
323
  const allResults = [];
324
324
  const deferredPromise = pDefer();
325
+ const publishAbortController = new AbortController();
326
+ const abortPublish = (reason) => {
327
+ if (!publishAbortController.signal.aborted) {
328
+ publishAbortController.abort(reason);
329
+ }
330
+ };
325
331
  if (this.closed) {
326
332
  throw new AbortError("Closed");
327
333
  }
328
334
  const timeoutFn = setTimeout(() => {
335
+ abortPublish(new AbortError("RPC request timeout"));
329
336
  deferredPromise.resolve();
330
337
  }, options?.timeout || 10 * 1000);
331
338
  const abortListener = (err) => {
332
- deferredPromise.reject(err.target?.["reason"] || new AbortError());
339
+ const reason = err.target?.["reason"] || new AbortError();
340
+ abortPublish(reason);
341
+ deferredPromise.reject(reason);
333
342
  };
334
343
  options?.signal?.addEventListener("abort", abortListener);
335
344
  const closeListener = () => {
336
- deferredPromise.reject(new AbortError("Closed"));
345
+ const reason = new AbortError("Closed");
346
+ abortPublish(reason);
347
+ deferredPromise.reject(reason);
337
348
  };
338
349
  const dropListener = () => {
339
- deferredPromise.reject(new AbortError("Dropped"));
350
+ const reason = new AbortError("Dropped");
351
+ abortPublish(reason);
352
+ deferredPromise.reject(reason);
340
353
  };
341
354
  this.events.addEventListener("close", closeListener);
342
355
  this.events.addEventListener("drop", dropListener);
@@ -346,40 +359,40 @@ let RPC = (() => {
346
359
  const id = toBase64(messageId);
347
360
  const responseHandler = this.createResponseHandler(deferredPromise, keypair, allResults, responders, expectedResponders, options);
348
361
  this._responseResolver.set(id, responseHandler);
349
- let publishSignal = undefined;
350
- let publishAbortReason = undefined;
362
+ void deferredPromise.promise
363
+ .finally(() => {
364
+ abortPublish(new AbortError("Resolved early"));
365
+ })
366
+ .catch(() => { });
351
367
  if (options?.responseInterceptor) {
352
- const abortController = new AbortController();
353
- void deferredPromise.promise
354
- .finally(() => {
355
- publishAbortReason = new AbortError("Resolved early");
356
- abortController.abort(publishAbortReason);
357
- })
358
- .catch(() => { });
359
- publishSignal = abortController.signal;
360
368
  options.responseInterceptor((response) => {
361
369
  return this.handleDecodedResponse(response, deferredPromise, allResults, responders, expectedResponders, options);
362
370
  });
363
371
  }
364
372
  try {
365
- await this.node.services.pubsub.publish(requestBytes, this.getPublishOptions(messageId, options, publishSignal));
373
+ const publishPromise = Promise.resolve(this.node.services.pubsub.publish(requestBytes, this.getPublishOptions(messageId, options, publishAbortController.signal)))
374
+ .catch((error) => {
375
+ if (publishAbortController.signal.aborted &&
376
+ (error instanceof AbortError ||
377
+ error === publishAbortController.signal.reason)) {
378
+ return;
379
+ }
380
+ if (error instanceof TimeoutError) {
381
+ // Ignore publish timeouts
382
+ return;
383
+ }
384
+ throw error;
385
+ });
386
+ await Promise.race([publishPromise, deferredPromise.promise]);
366
387
  await deferredPromise.promise;
367
388
  }
368
389
  catch (error) {
369
- if (error instanceof TimeoutError) {
370
- // Ignore publish timeouts
371
- }
372
- else if (publishAbortReason &&
373
- (error === publishAbortReason ||
374
- (error instanceof AbortError &&
375
- error.message === publishAbortReason.message))) {
376
- // Response interceptor resolved early; canceling publish is expected
377
- }
378
- else {
390
+ if (!(error instanceof TimeoutError)) {
379
391
  throw error;
380
392
  }
381
393
  }
382
394
  finally {
395
+ abortPublish(new AbortError("RPC request finished"));
383
396
  clearTimeout(timeoutFn);
384
397
  this.events.removeEventListener("close", closeListener);
385
398
  this.events.removeEventListener("drop", dropListener);
package/dist/src/controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAEN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,GACP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,WAAW,EACX,cAAc,EACd,cAAc,EACd,aAAa,EACb,aAAa,EACb,eAAe,EACf,WAAW,EACX,QAAQ,GACR,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAsB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACN,SAAS,GAET,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACN,6BAA6B,EAC7B,WAAW,EAGX,cAAc,GAEd,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,MAAM,EAAE,EAAwB,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAKN,MAAM,GACN,MAAM,SAAS,CAAC;AAkBjB,MAAM,mBAAmB,GAAG,CAC3B,IAAkC,EACY,EAAE;IAChD,IAAK,IAAY,KAAK,UAAU,EAAE,CAAC;QAClC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAU,CAAC;IAC5C,CAAC;SAAM,CAAC;QACP,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAuB,CAAC,CAAC;IACnE,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC7B,IAA8C,EACpB,EAAE;IAC5B,MAAM,EAAE,GAAI,IAAqC,EAAE,EAAE,CAAC;IACtD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,UAAU,GAAG,EAAE,CAAC,MAAM,CAC3B,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CACrD,CAAC;IACF,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAChE,CAAC,CAAC;IAoBW,GAAG;4BADf,OAAO,CAAC,KAAK,CAAC;;;;sBACgB,OAAO;mBAAf,SAAQ,WAA+C;;;;YAA9E,6KA6dC;;;YA7dY,uDAAG;;QACP,WAAW,GAAG,KAAK,CAAC;QACpB,gBAAgB,CAA2C;QAC3D,iBAAiB,CAGvB;QACM,YAAY,CAA2C;QACvD,wBAAwB,CAAW;QACnC,aAAa,CAAmB;QAChC,SAAS,CAAU;QACnB,gBAAgB,GAAoC,SAAS,CAAC;QAC9D,QAAQ,CAAiB;QACzB,mBAAmB,CAAuC;QAC1D,kBAAkB,CAAuC;QAEjE,KAAK,CAAC,IAAI,CAAC,IAA2B;YACrC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC;YAC9C,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC;YAC7C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC;YACnC,IAAI,CAAC,wBAAwB,GAAI,IAAI,CAAC,YAAoB,KAAK,UAAU,CAAC;YAC1E,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;YACvC,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;YACnC,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACnE,IAAI,CAAC,kBAAkB,GAAG,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAEjE,IAAI,CAAC,QAAQ,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC;YAC7C,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACxB,CAAC;QAEO,KAAK,CAAC,MAAM,CAAC,IAAc;YAClC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACtB,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACxD,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAClD,MAAM,EACN,IAAI,CAAC,gBAAgB,CACrB,CAAC;YACH,CAAC;YACD,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QAC1B,CAAC;QACM,KAAK,CAAC,KAAK,CAAC,IAAc;YAChC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACxB,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAEM,KAAK,CAAC,IAAI,CAAC,IAAc;YAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACxB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QAEO,YAAY,CAAmC;QACvD,KAAK,CAAC,SAAS;YACd,MAAM,IAAI,CAAC,YAAY,CAAC;YACxB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACtB,OAAO;YACR,CAAC;YAED,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YAExB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE5E,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAiB,CAAC,CAAC;YAE3E,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEpE,MAAM,IAAI,CAAC,YAAY,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,0CAA0C,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QACvE,CAAC;QAEO,KAAK,CAAC,UAAU,CAAC,GAA2B;YACnD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YAErC,IAAI,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;gBACxD,IAAI,CAAC;oBACJ,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;oBACtD,IAAI,UAAU,YAAY,SAAS,EAAE,CAAC;wBACrC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;4BAC3B,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC;4BAC1C,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,OAAO,CAC7C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAC3B,CAAC;4BACF,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;4BACnD,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,UAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;4BAEpD,IAAI,CAAC,MAAM,CAAC,aAAa,CACxB,IAAI,WAAW,CAAC,SAAS,EAAE;gCAC1B,4EAA4E;gCAC5E,MAAM,EAAE;oCACP,OAAO;oCACP,OAAO,EAAE,OAAO;oCAChB,IAAI,EAAE,IAAI;iCACV;6BACD,CAAC,CACF,CAAC;4BAEF,MAAM,SAAS,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;4BACzD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;gCACrD,IAAI;gCACJ,OAAO,EAAE,OAAO;gCAChB,SAAS;6BACT,CAAC,CAAC;4BAEH,IAAI,QAAQ,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;gCACtC,gEAAgE;gCAChE,MAAM,kBAAkB,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;gCAE/C,+FAA+F;gCAC/F,iGAAiG;gCACjG,2FAA2F;gCAC3F,qCAAqC;gCAErC,MAAM,gBAAgB,GAAG,IAAI,cAAc,CAAa;oCACvD,IAAI,EAAE,kBAAkB;iCACxB,CAAC,CAAC;gCACH,IAAI,qBAAqB,GACxB,gBAAgB,CAAC;gCAElB,qBAAqB,GAAG,MAAM,gBAAgB,CAAC,OAAO,CACrD,IAAI,CAAC,QAAQ,EACb,CAAC,UAAU,CAAC,SAAS,CAAC,CACtB,CAAC;gCAEF,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CACtC,SAAS,CACR,IAAI,UAAU,CAAC;oCACd,QAAQ,EAAE,qBAAqB;oCAC/B,SAAS,EAAE,OAAO,CAAC,EAAE;iCACrB,CAAC,CACF,EACD,SAAS,CAAC,mBAAmB,CAAC;oCAC7B,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;oCAEpB,gDAAgD;oCAChD,IAAI,EAAE,IAAI,cAAc,CAAC;wCACxB,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,UAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;wCAC9C,UAAU,EAAE,CAAC;qCACb,CAAC;iCACF,CAAC,CACF,CAAC;4BACH,CAAC;wBACF,CAAC;oBACF,CAAC;yBAAM,IAAI,UAAU,YAAY,UAAU,EAAE,CAAC;wBAC7C,MAAM,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;wBAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBAC/C,oDAAoD;wBACpD,OAAO,EAAE,CAAC;4BACT,OAAO;4BACP,QAAQ,EAAE,UAAU;yBACpB,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC;gBAAC,OAAO,KAAU,EAAE,CAAC;oBACrB,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;wBAClC,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;wBAChD,OAAO;oBACR,CAAC;oBAED,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;wBACjC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;wBACtD,OAAO;oBACR,CAAC;oBAED,MAAM,CAAC,KAAK,CACX,wBAAwB;wBACvB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CACtD,CAAC;gBACH,CAAC;YACF,CAAC;QACF,CAAC;QAEO,KAAK,CAAC,IAAI,CACjB,OAAU,EACV,SAA2B,EAC3B,OAA2B;YAE3B,MAAM,WAAW,GAAG,IAAI,CAAC,wBAAwB;gBAChD,CAAC,CAAE,OAAsB;gBACzB,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAEtB,MAAM,gBAAgB,GAAG,IAAI,cAAc,CAAa;gBACvD,IAAI,EAAE,WAAW;aACjB,CAAC,CAAC;YAEH,IAAI,qBAAqB,GAA+B,gBAAgB,CAAC;YAEzE,IACC,OAAO,EAAE,UAAU,EAAE,UAAU;gBAC/B,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,EACzC,CAAC;gBACF,qBAAqB,GAAG,MAAM,gBAAgB,CAAC,OAAO,CACrD,OAAO,CAAC,UAAU,CAAC,GAAG,EACtB,OAAO,CAAC,UAAU,CAAC,UAAU,CAC7B,CAAC;YACH,CAAC;YAED,MAAM,cAAc,GAAG,IAAI,SAAS,CAAC;gBACpC,OAAO,EAAE,qBAAqB;gBAC9B,SAAS;aACT,CAAC,CAAC;YAEH,OAAO,cAAc,CAAC;QACvB,CAAC;QAEO,iBAAiB,CACxB,EAAe,EACf,OAAwB,EACxB,MAAoB;YAEpB,MAAM,YAAY,GACjB,OAAO,IAAI,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACzD,MAAM,UAAU,GAAG,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACvE,MAAM,cAAc,GACnB,YAAY;gBACZ,CAAC,UAAU,IAAI,IAAI;oBAClB,CAAC,CAAC,IAAI,cAAc,CAAC;wBACnB,EAAE,EAAE,UAAU;wBACd,UAAU,EAAE,CAAC;qBACb,CAAC;oBACH,CAAC,CAAC,SAAS,CAAC,CAAC;YACf,OAAO;gBACN,EAAE;gBACF,QAAQ,EAAE,OAAO,EAAE,QAAQ;gBAC3B,gBAAgB,EAAE,OAAO,EAAE,gBAAgB;gBAC3C,SAAS,EAAE,OAAO,EAAE,SAAS;gBAC7B,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBACpB,YAAY,EAAE,OAAO,EAAE,YAAY;gBACnC,MAAM;aACN,CAAC;QACH,CAAC;QAED;;;;WAIG;QACI,KAAK,CAAC,IAAI,CAChB,OAAU,EACV,OAAwB;YAExB,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CACtC,SAAS,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,EACvD,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAC3D,CAAC;QACH,CAAC;QAEO,qBAAqB,CAC5B,QAIC,EACD,OAA6B,EAC7B,UAA4B,EAC5B,UAAuB,EACvB,kBAAgC,EAChC,OAA8B;YAE9B,MAAM,oBAAoB,GACzB,kBAAkB,IAAI,QAAQ,CAAC,IAAI;gBAClC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAC1B,CAAC,CAAC,SAAS,CAAC;YACd,IACC,oBAAoB;gBACpB,kBAAkB,CAAC,GAAG,CAAC,oBAAoB,CAAC;gBAC5C,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC,EACnC,CAAC;gBACF,OAAO;YACR,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,aAAa,CACxB,IAAI,WAAW,CAAC,UAAU,EAAE;gBAC3B,MAAM,EAAE,QAAQ;aAChB,CAAC,CACF,CAAC;YAEF,IAAI,kBAAkB,EAAE,CAAC;gBACxB,IAAI,QAAQ,CAAC,IAAI,IAAI,kBAAkB,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;oBACxE,OAAO,EAAE,UAAU;wBAClB,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACvD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAE1B,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACzC,IAAI,UAAU,CAAC,IAAI,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;wBACjD,OAAO,CAAC,OAAO,EAAE,CAAC;oBACnB,CAAC;gBACF,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,OAAO,EAAE,UAAU;oBAClB,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACvD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC1B,IACC,OAAO,EAAE,MAAM,IAAI,IAAI;oBACvB,UAAU,CAAC,MAAM,IAAK,OAAO,EAAE,MAAiB,EAC/C,CAAC;oBACF,OAAO,CAAC,OAAO,EAAE,CAAC;gBACnB,CAAC;YACF,CAAC;QACF,CAAC;QACO,qBAAqB,CAC5B,OAA6B,EAC7B,OAAsB,EACtB,UAA4B,EAC5B,UAAuB,EACvB,kBAAgC,EAChC,OAA8B;YAE9B,OAAO,KAAK,EAAE,UAGb,EAAE,EAAE;gBACJ,IAAI,CAAC;oBACJ,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;oBACzC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,UAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;oBAEtD,IAAI,OAAO,EAAE,SAAS,IAAI,CAAC,CAAC,MAAM,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;wBAC7D,OAAO;oBACR,CAAC;oBAED,MAAM,cAAc,GAAG,QAAQ,CAAC,QAAQ,CAAC;oBACzC,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBACxD,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;oBAEvD,IAAI,CAAC,qBAAqB,CACzB;wBACC,QAAQ,EAAE,UAAU;wBACpB,OAAO,EAAE,OAAO;wBAChB,IAAI,EAAE,IAAI;qBACV,EACD,OAAO,EACP,UAAU,EACV,UAAU,EACV,kBAAkB,EAClB,OAAO,CACP,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAU,EAAE,CAAC;oBACrB,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;wBAClC,OAAO,CAAC,gCAAgC;oBACzC,CAAC;oBAED,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;wBACjC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;wBAChC,OAAO,CAAC,kCAAkC;oBAC3C,CAAC;oBAED,MAAM,CAAC,KAAK,CAAC,wCAAwC,GAAG,KAAK,EAAE,OAAO,CAAC,CAAC;oBACxE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC;YACF,CAAC,CAAC;QACH,CAAC;QAED;;;;;WAKG;QACI,KAAK,CAAC,OAAO,CACnB,OAAU,EACV,OAA8B;YAE9B,iKAAiK;YACjK,wGAAwG;YACxG,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC;YAE7C,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5E,MAAM,YAAY,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;YAE/C,MAAM,UAAU,GAAqB,EAAE,CAAC;YAExC,MAAM,eAAe,GAAG,MAAM,EAAQ,CAAC;YAEvC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,MAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;YAChC,CAAC;YACD,MAAM,SAAS,GAAG,UAAU,CAC3B,GAAG,EAAE;gBACJ,eAAe,CAAC,OAAO,EAAE,CAAC;YAC3B,CAAC,EACD,OAAO,EAAE,OAAO,IAAI,EAAE,GAAG,IAAI,CAC7B,CAAC;YAEF,MAAM,aAAa,GAAG,CAAC,GAAU,EAAE,EAAE;gBACpC,eAAe,CAAC,MAAM,CACpB,GAAG,CAAC,MAAc,EAAE,CAAC,QAAQ,CAAC,IAAI,IAAI,UAAU,EAAE,CACnD,CAAC;YACH,CAAC,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YAE1D,MAAM,aAAa,GAAG,GAAG,EAAE;gBAC1B,eAAe,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClD,CAAC,CAAC;YACF,MAAM,YAAY,GAAG,GAAG,EAAE;gBACzB,eAAe,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;YACnD,CAAC,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACrD,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAEnD,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAEhE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;YAErC,MAAM,SAAS,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;YAClC,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;YAE/B,MAAM,eAAe,GAAG,IAAI,CAAC,qBAAqB,CACjD,eAAe,EACf,OAAO,EACP,UAAU,EACV,UAAU,EACV,kBAAkB,EAClB,OAAO,CACP,CAAC;YACF,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;YAChD,IAAI,aAAa,GAA4B,SAAS,CAAC;YACvD,IAAI,kBAAkB,GAAwB,SAAS,CAAC;YACxD,IAAI,OAAO,EAAE,mBAAmB,EAAE,CAAC;gBAClC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;gBAC9C,KAAK,eAAe,CAAC,OAAO;qBAC1B,OAAO,CAAC,GAAG,EAAE;oBACb,kBAAkB,GAAG,IAAI,UAAU,CAAC,gBAAgB,CAAC,CAAC;oBACtD,eAAe,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBAC3C,CAAC,CAAC;qBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBAClB,aAAa,GAAG,eAAe,CAAC,MAAM,CAAC;gBACvC,OAAO,CAAC,mBAAmB,CAAC,CAAC,QAAwB,EAAE,EAAE;oBACxD,OAAO,IAAI,CAAC,qBAAqB,CAChC,QAAQ,EACR,eAAe,EACf,UAAU,EACV,UAAU,EACV,kBAAkB,EAClB,OAAO,CACP,CAAC;gBACH,CAAC,CAAC,CAAC;YACJ,CAAC;YAED,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CACtC,YAAY,EACZ,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,OAAO,EAAE,aAAa,CAAC,CACzD,CAAC;gBACF,MAAM,eAAe,CAAC,OAAO,CAAC;YAC/B,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACrB,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;oBACnC,0BAA0B;gBAC3B,CAAC;qBAAM,IACN,kBAAkB;oBAClB,CAAC,KAAK,KAAK,kBAAkB;wBAC5B,CAAC,KAAK,YAAY,UAAU;4BAC3B,KAAK,CAAC,OAAO,KAAM,kBAAiC,CAAC,OAAO,CAAC,CAAC,EAC/D,CAAC;oBACF,qEAAqE;gBACtE,CAAC;qBAAM,CAAC;oBACP,MAAM,KAAK,CAAC;gBACb,CAAC;YACF,CAAC;oBAAS,CAAC;gBACV,YAAY,CAAC,SAAS,CAAC,CAAC;gBACxB,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;gBACxD,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;gBACtD,OAAO,EAAE,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;gBAC7D,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACnC,CAAC;YAED,OAAO,UAAU,CAAC;QACnB,CAAC;QAED,IAAW,KAAK;YACf,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACrB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACpC,CAAC;YACD,OAAO,IAAI,CAAC,SAAS,CAAC;QACvB,CAAC;QAED,SAAS;YACR,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;;;;SA5dW,GAAG"}
1
+ {"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/controller.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@peerbit/rpc",
3
- "version": "6.0.31",
3
+ "version": "6.0.33",
4
4
  "description": "RPC calls for peers",
5
5
  "sideEffects": false,
6
6
  "type": "module",
@@ -54,16 +54,16 @@
54
54
  "dependencies": {
55
55
  "@dao-xyz/borsh": "^6.0.0",
56
56
  "p-defer": "^4.0.0",
57
- "@peerbit/crypto": "3.1.1",
58
57
  "@peerbit/logger": "2.0.1",
58
+ "@peerbit/program": "6.0.29",
59
+ "@peerbit/pubsub": "5.2.10",
60
+ "@peerbit/crypto": "3.1.1",
59
61
  "@peerbit/time": "3.0.0",
60
- "@peerbit/program": "6.0.27",
61
- "@peerbit/pubsub": "5.2.8",
62
62
  "@peerbit/pubsub-interface": "5.1.3",
63
63
  "@peerbit/stream-interface": "6.0.9"
64
64
  },
65
65
  "devDependencies": {
66
- "@peerbit/test-utils": "3.0.31"
66
+ "@peerbit/test-utils": "3.0.33"
67
67
  },
68
68
  "scripts": {
69
69
  "clean": "aegir clean",
package/src/controller.ts CHANGED
@@ -466,29 +466,40 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
466
466
  const allResults: RPCResponse<R>[] = [];
467
467
 
468
468
  const deferredPromise = pDefer<void>();
469
+ const publishAbortController = new AbortController();
470
+ const abortPublish = (reason: unknown) => {
471
+ if (!publishAbortController.signal.aborted) {
472
+ publishAbortController.abort(reason);
473
+ }
474
+ };
469
475
 
470
476
  if (this.closed) {
471
477
  throw new AbortError("Closed");
472
478
  }
473
479
  const timeoutFn = setTimeout(
474
480
  () => {
481
+ abortPublish(new AbortError("RPC request timeout"));
475
482
  deferredPromise.resolve();
476
483
  },
477
484
  options?.timeout || 10 * 1000,
478
485
  );
479
486
 
480
487
  const abortListener = (err: Event) => {
481
- deferredPromise.reject(
482
- (err.target as any)?.["reason"] || new AbortError(),
483
- );
488
+ const reason = (err.target as any)?.["reason"] || new AbortError();
489
+ abortPublish(reason);
490
+ deferredPromise.reject(reason);
484
491
  };
485
492
  options?.signal?.addEventListener("abort", abortListener);
486
493
 
487
494
  const closeListener = () => {
488
- deferredPromise.reject(new AbortError("Closed"));
495
+ const reason = new AbortError("Closed");
496
+ abortPublish(reason);
497
+ deferredPromise.reject(reason);
489
498
  };
490
499
  const dropListener = () => {
491
- deferredPromise.reject(new AbortError("Dropped"));
500
+ const reason = new AbortError("Dropped");
501
+ abortPublish(reason);
502
+ deferredPromise.reject(reason);
492
503
  };
493
504
 
494
505
  this.events.addEventListener("close", closeListener);
@@ -510,17 +521,13 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
510
521
  options,
511
522
  );
512
523
  this._responseResolver.set(id, responseHandler);
513
- let publishSignal: AbortSignal | undefined = undefined;
514
- let publishAbortReason: unknown | undefined = undefined;
524
+ void deferredPromise.promise
525
+ .finally(() => {
526
+ abortPublish(new AbortError("Resolved early"));
527
+ })
528
+ .catch(() => {});
529
+
515
530
  if (options?.responseInterceptor) {
516
- const abortController = new AbortController();
517
- void deferredPromise.promise
518
- .finally(() => {
519
- publishAbortReason = new AbortError("Resolved early");
520
- abortController.abort(publishAbortReason);
521
- })
522
- .catch(() => {});
523
- publishSignal = abortController.signal;
524
531
  options.responseInterceptor((response: RPCResponse<R>) => {
525
532
  return this.handleDecodedResponse(
526
533
  response,
@@ -534,25 +541,38 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>, RPCEvents<Q, R>> {
534
541
  }
535
542
 
536
543
  try {
537
- await this.node.services.pubsub.publish(
538
- requestBytes,
539
- this.getPublishOptions(messageId, options, publishSignal),
540
- );
544
+ const publishPromise = Promise.resolve(
545
+ this.node.services.pubsub.publish(
546
+ requestBytes,
547
+ this.getPublishOptions(
548
+ messageId,
549
+ options,
550
+ publishAbortController.signal,
551
+ ),
552
+ ),
553
+ )
554
+ .catch((error: any) => {
555
+ if (
556
+ publishAbortController.signal.aborted &&
557
+ (error instanceof AbortError ||
558
+ error === publishAbortController.signal.reason)
559
+ ) {
560
+ return;
561
+ }
562
+ if (error instanceof TimeoutError) {
563
+ // Ignore publish timeouts
564
+ return;
565
+ }
566
+ throw error;
567
+ });
568
+ await Promise.race([publishPromise, deferredPromise.promise]);
541
569
  await deferredPromise.promise;
542
570
  } catch (error: any) {
543
- if (error instanceof TimeoutError) {
544
- // Ignore publish timeouts
545
- } else if (
546
- publishAbortReason &&
547
- (error === publishAbortReason ||
548
- (error instanceof AbortError &&
549
- error.message === (publishAbortReason as AbortError).message))
550
- ) {
551
- // Response interceptor resolved early; canceling publish is expected
552
- } else {
571
+ if (!(error instanceof TimeoutError)) {
553
572
  throw error;
554
573
  }
555
574
  } finally {
575
+ abortPublish(new AbortError("RPC request finished"));
556
576
  clearTimeout(timeoutFn);
557
577
  this.events.removeEventListener("close", closeListener);
558
578
  this.events.removeEventListener("drop", dropListener);