@dxos/network-manager 0.2.3 → 0.2.4-main.cc5efc5

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

@@ -16,6 +16,7 @@ export declare class SimplePeerTransport implements Transport {
     private readonly params;
     private readonly _peer;
     private _closed;
+    private _piped;
     readonly closed: Event<void>;
     readonly connected: Event<void>;
     readonly errors: ErrorStream;

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

@@ -1 +1 @@
-{"version":3,"file":"simplepeer-transport.d.ts","sourceRoot":"","sources":["../../../../src/transport/simplepeer-transport.ts"],"names":[],"mappings":";AAQA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAS,MAAM,aAAa,CAAC;AAIjD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG1D,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAoB,YAAW,SAAS;IAUvC,OAAO,CAAC,QAAQ,CAAC,MAAM;IATnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,OAAO,CAAS;IAExB,QAAQ,CAAC,MAAM,cAAe;IAC9B,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,MAAM,cAAqB;IAEpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAE7B,MAAM,EAAE,yBAAyB;IAqFxD,OAAO;IASb,MAAM,CAAC,MAAM,EAAE,MAAM;YASP,kBAAkB;CAIjC;AAED,eAAO,MAAM,gCAAgC,kBAAmB,GAAG,KAAG,gBAMpE,CAAC"}
+{"version":3,"file":"simplepeer-transport.d.ts","sourceRoot":"","sources":["../../../../src/transport/simplepeer-transport.ts"],"names":[],"mappings":";AAQA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAS,MAAM,aAAa,CAAC;AAIjD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG1D,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAoB,YAAW,SAAS;IAWvC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAS;IAEvB,QAAQ,CAAC,MAAM,cAAe;IAC9B,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,MAAM,cAAqB;IAEpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAE7B,MAAM,EAAE,yBAAyB;IAqFxD,OAAO;IAYb,MAAM,CAAC,MAAM,EAAE,MAAM;IASrB,OAAO,CAAC,kBAAkB;CAM3B;AAED,eAAO,MAAM,gCAAgC,kBAAmB,GAAG,KAAG,gBAMpE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.2.3",
+  "version": "0.2.4-main.cc5efc5",
   "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.2.3",
-    "@dxos/codec-protobuf": "0.2.3",
-    "@dxos/context": "0.2.3",
-    "@dxos/credentials": "0.2.3",
-    "@dxos/crypto": "0.2.3",
-    "@dxos/debug": "0.2.3",
-    "@dxos/invariant": "0.2.3",
-    "@dxos/keys": "0.2.3",
-    "@dxos/log": "0.2.3",
-    "@dxos/messaging": "0.2.3",
-    "@dxos/node-std": "0.2.3",
-    "@dxos/protocols": "0.2.3",
-    "@dxos/rpc": "0.2.3",
-    "@dxos/teleport": "0.2.3",
-    "@dxos/util": "0.2.3"
+    "@dxos/async": "0.2.4-main.cc5efc5",
+    "@dxos/codec-protobuf": "0.2.4-main.cc5efc5",
+    "@dxos/context": "0.2.4-main.cc5efc5",
+    "@dxos/credentials": "0.2.4-main.cc5efc5",
+    "@dxos/crypto": "0.2.4-main.cc5efc5",
+    "@dxos/debug": "0.2.4-main.cc5efc5",
+    "@dxos/invariant": "0.2.4-main.cc5efc5",
+    "@dxos/keys": "0.2.4-main.cc5efc5",
+    "@dxos/log": "0.2.4-main.cc5efc5",
+    "@dxos/messaging": "0.2.4-main.cc5efc5",
+    "@dxos/node-std": "0.2.4-main.cc5efc5",
+    "@dxos/protocols": "0.2.4-main.cc5efc5",
+    "@dxos/rpc": "0.2.4-main.cc5efc5",
+    "@dxos/teleport": "0.2.4-main.cc5efc5",
+    "@dxos/util": "0.2.4-main.cc5efc5"
   },
   "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.2.3"
+    "@dxos/signal": "0.2.4-main.cc5efc5"
   },
   "publishConfig": {
     "access": "public"

package/src/transport/simplepeer-transport.ts

@@ -29,6 +29,7 @@ export type SimplePeerTransportParams = {
 export class SimplePeerTransport implements Transport {
   private readonly _peer: SimplePeer;
   private _closed = false;
+  private _piped = false;
 
   readonly closed = new Event();
   readonly connected = new Event();
@@ -54,13 +55,13 @@ export class SimplePeerTransport implements Transport {
     this._peer.on('connect', () => {
       log('connected');
       this.params.stream.pipe(this._peer!).pipe(this.params.stream);
+      this._piped = true;
       this.connected.emit();
     });
 
     this._peer.on('close', async () => {
       log('closed');
-      await this._disconnectStreams();
-      this.closed.emit();
+      await this.destroy();
     });
 
     this._peer.on('error', async (err) => {
@@ -123,8 +124,11 @@ export class SimplePeerTransport implements Transport {
 
   async destroy() {
     log('closing...');
+    if (this._closed) {
+      return;
+    }
     this._closed = true;
-    await this._disconnectStreams();
+    this._disconnectStreams();
     this._peer!.destroy();
     this.closed.emit();
     log('closed');
@@ -139,9 +143,11 @@ export class SimplePeerTransport implements Transport {
     this._peer.signal(signal.payload.data);
   }
 
-  private async _disconnectStreams() {
+  private _disconnectStreams() {
     // TODO(rzadp): Find a way of unpiping this?
-    this.params.stream.unpipe?.(this._peer)?.unpipe?.(this.params.stream);
+    if (this._piped) {
+      this.params.stream.unpipe?.(this._peer)?.unpipe?.(this.params.stream);
+    }
   }
 }