@dxos/network-manager 0.3.4 → 0.3.5-main.1429e83

package/dist/types/src/transport/memory-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory-transport.d.ts","sourceRoot":"","sources":["../../../../src/transport/memory-transport.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGpE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAkB3F,eAAO,MAAM,sBAAsB,EAAE,gBAEpC,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAuBnC,OAAO,CAAC,QAAQ,CAAC,OAAO;IArBpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAA8D;IAElG,SAAgB,MAAM,cAAqB;IAC3C,SAAgB,SAAS,cAAqB;IAC9C,SAAgB,MAAM,cAAqB;IAG3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsB;IAElD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA4B;IAEpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAE5E,OAAO,CAAC,UAAU,CAAS;IAG3B,OAAO,CAAC,iBAAiB,CAAa;IAEtC,OAAO,CAAC,iBAAiB,CAAC,CAAkB;gBAEf,OAAO,EAAE,gBAAgB;IA4DhD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA+B9B,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM;CAY3B"}
+{"version":3,"file":"memory-transport.d.ts","sourceRoot":"","sources":["../../../../src/transport/memory-transport.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGpE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAkB3F,eAAO,MAAM,sBAAsB,EAAE,gBAEpC,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAuBnC,OAAO,CAAC,QAAQ,CAAC,OAAO;IArBpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAA8D;IAElG,SAAgB,MAAM,cAAqB;IAC3C,SAAgB,SAAS,cAAqB;IAC9C,SAAgB,MAAM,cAAqB;IAG3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsB;IAElD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA4B;IAEpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAE5E,OAAO,CAAC,UAAU,CAAS;IAG3B,OAAO,CAAC,iBAAiB,CAAa;IAEtC,OAAO,CAAC,iBAAiB,CAAC,CAAkB;gBAEf,OAAO,EAAE,gBAAgB;IA4DhD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAkC9B,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM;CAY3B"}

package/dist/types/src/transport/simplepeer-transport-proxy.d.ts

@@ -14,6 +14,7 @@ export declare class SimplePeerTransportProxy implements Transport {
     private readonly _params;
     private readonly _proxyId;
     private readonly _ctx;
+    private _timeoutCount;
     readonly closed: Event<void>;
     readonly connected: Event<void>;
     readonly errors: ErrorStream;

package/dist/types/src/transport/simplepeer-transport-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simplepeer-transport-proxy.d.ts","sourceRoot":"","sources":["../../../../src/transport/simplepeer-transport-proxy.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAW1C,OAAO,EAAqC,KAAK,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC/G,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGpE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE3F,MAAM,MAAM,8BAA8B,GAAG;IAC3C,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAE7B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF,qBAAa,wBAAyB,YAAW,SAAS;IAW5C,OAAO,CAAC,QAAQ,CAAC,OAAO;IAVpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEtC,QAAQ,CAAC,MAAM,cAAe;IAC9B,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,MAAM,cAAqB;IAEpC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAuB;gBAEhB,OAAO,EAAE,8BAA8B;YAyCtD,iBAAiB;IAiB/B,OAAO,CAAC,WAAW;YAKL,aAAa;IAI3B,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAUtB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB9B;;OAEG;IAEH,UAAU;CAKX;AAGD,qBAAa,+BAAgC,YAAW,gBAAgB;IACtE,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,YAAY,CAAuC;IAE3D;;;OAGG;IACH,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;IAShE,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS;CAatD"}
+{"version":3,"file":"simplepeer-transport-proxy.d.ts","sourceRoot":"","sources":["../../../../src/transport/simplepeer-transport-proxy.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAGlD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAW1C,OAAO,EAAqC,KAAK,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC/G,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGpE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAK3F,MAAM,MAAM,8BAA8B,GAAG;IAC3C,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAE7B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF,qBAAa,wBAAyB,YAAW,SAAS;IAY5C,OAAO,CAAC,QAAQ,CAAC,OAAO;IAXpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,aAAa,CAAK;IAE1B,QAAQ,CAAC,MAAM,cAAe;IAC9B,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,MAAM,cAAqB;IAEpC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAuB;gBAEhB,OAAO,EAAE,8BAA8B;YA+DtD,iBAAiB;IAiB/B,OAAO,CAAC,WAAW;YAKL,aAAa;IAI3B,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAUtB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB9B;;OAEG;IAEH,UAAU;CAKX;AAGD,qBAAa,+BAAgC,YAAW,gBAAgB;IACtE,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,YAAY,CAAuC;IAE3D;;;OAGG;IACH,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;IAShE,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS;CAatD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.3.4",
+  "version": "0.3.5-main.1429e83",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -31,21 +31,21 @@
     "tiny-invariant": "^1.3.1",
     "ws": "^7.4.4",
     "xor-distance": "^2.0.0",
-    "@dxos/async": "0.3.4",
-    "@dxos/codec-protobuf": "0.3.4",
-    "@dxos/context": "0.3.4",
-    "@dxos/credentials": "0.3.4",
-    "@dxos/crypto": "0.3.4",
-    "@dxos/debug": "0.3.4",
-    "@dxos/invariant": "0.3.4",
-    "@dxos/keys": "0.3.4",
-    "@dxos/log": "0.3.4",
-    "@dxos/messaging": "0.3.4",
-    "@dxos/node-std": "0.3.4",
-    "@dxos/protocols": "0.3.4",
-    "@dxos/rpc": "0.3.4",
-    "@dxos/teleport": "0.3.4",
-    "@dxos/util": "0.3.4"
+    "@dxos/async": "0.3.5-main.1429e83",
+    "@dxos/codec-protobuf": "0.3.5-main.1429e83",
+    "@dxos/context": "0.3.5-main.1429e83",
+    "@dxos/credentials": "0.3.5-main.1429e83",
+    "@dxos/crypto": "0.3.5-main.1429e83",
+    "@dxos/debug": "0.3.5-main.1429e83",
+    "@dxos/invariant": "0.3.5-main.1429e83",
+    "@dxos/keys": "0.3.5-main.1429e83",
+    "@dxos/log": "0.3.5-main.1429e83",
+    "@dxos/messaging": "0.3.5-main.1429e83",
+    "@dxos/node-std": "0.3.5-main.1429e83",
+    "@dxos/protocols": "0.3.5-main.1429e83",
+    "@dxos/rpc": "0.3.5-main.1429e83",
+    "@dxos/teleport": "0.3.5-main.1429e83",
+    "@dxos/util": "0.3.5-main.1429e83"
   },
   "devDependencies": {
     "@swc-node/register": "1.5.4",
@@ -55,7 +55,7 @@
     "earljs": "~0.1.10",
     "fast-check": "~3.3.0",
     "typescript": "^5.2.2",
-    "@dxos/signal": "0.3.4"
+    "@dxos/signal": "0.3.5-main.1429e83"
   },
   "publishConfig": {
     "access": "public"

package/src/swarm/connection.ts

@@ -353,7 +353,7 @@ export class Connection {
 
       // If signal fails treat connection as failed
       log.info('signal message failed to deliver', { err });
-      await this.close();
+      await this.close(new ConnectivityError('signal message failed to deliver', err));
     }
   }
 

package/src/transport/memory-transport.ts

@@ -138,8 +138,11 @@ export class MemoryTransport implements Transport {
       // code   .unpipe(this._incomingDelay)
       // code   .unpipe(this._stream);
 
-      this._outgoingDelay.unpipe();
-      this._incomingDelay.unpipe();
+      this.options.stream.unpipe(this._incomingDelay);
+      this._incomingDelay.unpipe(this._remoteConnection.options.stream);
+      this._remoteConnection.options.stream.unpipe(this._outgoingDelay);
+      this._outgoingDelay.unpipe(this.options.stream);
+      this.options.stream.unpipe(this._outgoingDelay);
 
       this._remoteConnection.closed.emit();
       this._remoteConnection._remoteConnection = undefined;

package/src/transport/simplepeer-transport-proxy.ts

@@ -4,7 +4,7 @@
 
 import { Writable } from 'node:stream';
 
-import { Event } from '@dxos/async';
+import { Event, scheduleTask } from '@dxos/async';
 import { type Stream } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
 import { ErrorStream } from '@dxos/debug';
@@ -24,6 +24,9 @@ import { arrayToBuffer } from '@dxos/util';
 
 import { type Transport, type TransportFactory, type TransportOptions } from './transport';
 
+const RESP_MIN_THRESHOLD = 500;
+const TIMEOUT_THRESHOLD = 10;
+
 export type SimplePeerTransportProxyParams = {
   initiator: boolean;
   stream: NodeJS.ReadWriteStream;
@@ -35,6 +38,7 @@ export type SimplePeerTransportProxyParams = {
 export class SimplePeerTransportProxy implements Transport {
   private readonly _proxyId = PublicKey.random();
   private readonly _ctx = new Context();
+  private _timeoutCount = 0;
 
   readonly closed = new Event();
   readonly connected = new Event();
@@ -62,23 +66,45 @@ export class SimplePeerTransportProxy implements Transport {
           }
         });
 
-        this._params.stream.pipe(
-          new Writable({
-            write: (chunk, _, callback) => {
-              this._params.bridgeService
-                .sendData({
-                  proxyId: this._proxyId,
-                  payload: chunk,
-                })
-                .then(
-                  () => callback(),
-                  (err: any) => {
+        const proxyStream = new Writable({
+          write: (chunk, _, callback) => {
+            const then = performance.now();
+            this._params.bridgeService
+              .sendData({
+                proxyId: this._proxyId,
+                payload: chunk,
+              })
+              .then(
+                () => {
+                  if (performance.now() - then > RESP_MIN_THRESHOLD) {
+                    log('slow response, delaying callback');
+                    scheduleTask(this._ctx, () => callback(), RESP_MIN_THRESHOLD);
+                  } else {
+                    callback();
+                  }
+                  this._timeoutCount = 0;
+                },
+                (err: any) => {
+                  if (err instanceof TimeoutError || err.constructor.name === 'TimeoutError') {
+                    if (this._timeoutCount++ > TIMEOUT_THRESHOLD) {
+                      throw new TimeoutError(`too many timeoutes (${this._timeoutCount} > ${TIMEOUT_THRESHOLD}`);
+                    } else {
+                      log('timeout error, but still invoking callback');
+                      callback();
+                    }
+                  } else {
                     log.catch(err);
-                  },
-                );
-            },
-          }),
-        );
+                  }
+                },
+              );
+          },
+        });
+
+        proxyStream.on('error', (err) => {
+          log('proxystream error', { err });
+        });
+
+        this._params.stream.pipe(proxyStream);
       },
       (error) => log.catch(error),
     );