@dxos/network-manager 0.10.0 → 0.11.0

package/dist/lib/transport/tcp/tcp-transport.mjs

@@ -0,0 +1,140 @@
+import { Event } from "@dxos/async";
+import { ErrorStream } from "@dxos/debug";
+import { log } from "@dxos/log";
+import { Socket } from "node:net";
+//#region src/transport/tcp/tcp-transport.ts
+var __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/transport/tcp/tcp-transport.ts";
+var TcpTransportFactory = { createTransport: (options) => new TcpTransport(options) };
+/**
+* Fake transport.
+*/
+var TcpTransport = class {
+	options;
+	_server = void 0;
+	_socket = void 0;
+	_connected = false;
+	_closed = false;
+	closed = new Event();
+	connected = new Event();
+	errors = new ErrorStream();
+	constructor(options) {
+		this.options = options;
+	}
+	get isOpen() {
+		return this._connected && !this._closed;
+	}
+	async open() {
+		log("opening", void 0, {
+			"~LogMeta": "~LogMeta",
+			F: __dxlog_file,
+			L: 39,
+			S: this
+		});
+		if (this.options.initiator) setTimeout(async () => {
+			const { Server } = await import("node:net");
+			this._server = new Server((socket) => {
+				log("new connection", void 0, {
+					"~LogMeta": "~LogMeta",
+					F: __dxlog_file,
+					L: 47,
+					S: this
+				});
+				if (this._connected) socket.destroy();
+				this._handleSocket(socket);
+			});
+			this._server.on("listening", () => {
+				const { port } = this._server.address();
+				log("listening", { port }, {
+					"~LogMeta": "~LogMeta",
+					F: __dxlog_file,
+					L: 56,
+					S: this
+				});
+				this.options.sendSignal({ payload: { port } }).catch((err) => {
+					if (!this._closed) this.errors.raise(err);
+				});
+			});
+			this._server.on("error", (err) => {
+				this.errors.raise(err);
+			});
+			this._server.listen(0);
+		});
+		return this;
+	}
+	async close() {
+		log("closing", void 0, {
+			"~LogMeta": "~LogMeta",
+			F: __dxlog_file,
+			L: 79,
+			S: this
+		});
+		this._socket?.destroy();
+		this._server?.close();
+		this._closed = true;
+		return this;
+	}
+	async onSignal({ payload }) {
+		log("received signal", { payload }, {
+			"~LogMeta": "~LogMeta",
+			F: __dxlog_file,
+			L: 87,
+			S: this
+		});
+		if (this.options.initiator || this._connected) return;
+		const socket = new Socket();
+		this._handleSocket(socket);
+		socket.connect({
+			port: payload.port,
+			host: "localhost"
+		});
+	}
+	async getDetails() {
+		if (this.options.initiator) {
+			const { port, address } = this._server?.address();
+			return `LISTEN ${address}:${port}`;
+		}
+		const { port, address } = this._socket?.address();
+		return `ACCEPT ${address}:${port}`;
+	}
+	async getStats() {
+		return {
+			bytesSent: 0,
+			bytesReceived: 0,
+			packetsSent: 0,
+			packetsReceived: 0
+		};
+	}
+	_handleSocket(socket) {
+		log("handling socket", {
+			remotePort: socket.remotePort,
+			localPort: socket.localPort
+		}, {
+			"~LogMeta": "~LogMeta",
+			F: __dxlog_file,
+			L: 117,
+			S: this
+		});
+		this._socket = socket;
+		this._socket.on("connect", () => {
+			log("connected to", { port: this._socket?.remotePort }, {
+				"~LogMeta": "~LogMeta",
+				F: __dxlog_file,
+				L: 121,
+				S: this
+			});
+			this._connected = true;
+		});
+		this._socket.on("error", (err) => {
+			this.errors.raise(err);
+		});
+		this._socket.on("close", () => {
+			this.closed.emit();
+		});
+		this.connected.emit();
+		this.options.stream.pipe(this._socket).pipe(this.options.stream);
+	}
+};
+//#endregion
+export { TcpTransport, TcpTransportFactory };
+
+//# sourceMappingURL=tcp-transport.mjs.map

package/dist/lib/transport/tcp/tcp-transport.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"tcp-transport.mjs","names":[],"sources":["../../../../src/transport/tcp/tcp-transport.ts"],"sourcesContent":["//\n// Copyright 2020 DXOS.org\n//\n\nimport { type AddressInfo, type Server, Socket } from 'node:net';\n\nimport { Event } from '@dxos/async';\nimport { ErrorStream } from '@dxos/debug';\nimport { log } from '@dxos/log';\nimport { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';\n\nimport { type Transport, type TransportFactory, type TransportOptions, type TransportStats } from '../transport';\n\nexport const TcpTransportFactory: TransportFactory = {\n  createTransport: (options) => new TcpTransport(options),\n};\n\n/**\n * Fake transport.\n */\nexport class TcpTransport implements Transport {\n  private _server?: Server = undefined;\n  private _socket?: Socket = undefined;\n\n  private _connected = false;\n  private _closed = false;\n\n  public readonly closed = new Event<void>();\n  public readonly connected = new Event<void>();\n  public readonly errors = new ErrorStream();\n\n  constructor(private readonly options: TransportOptions) {}\n\n  get isOpen() {\n    return this._connected && !this._closed;\n  }\n\n  async open(): Promise<this> {\n    log('opening');\n\n    // Initiator will send a signal, the receiver will receive the unique ID and connect the streams.\n    if (this.options.initiator) {\n      // TODO(burdon): Why timeout?\n      setTimeout(async () => {\n        const { Server } = await import('node:net');\n        this._server = new Server((socket) => {\n          log('new connection');\n          if (this._connected) {\n            socket.destroy();\n          }\n          this._handleSocket(socket);\n        });\n\n        this._server.on('listening', () => {\n          const { port } = this._server!.address() as AddressInfo;\n          log('listening', { port });\n          void this.options\n            .sendSignal({\n              payload: { port },\n            })\n            .catch((err) => {\n              if (!this._closed) {\n                this.errors.raise(err);\n              }\n            });\n        });\n\n        this._server.on('error', (err) => {\n          this.errors.raise(err);\n        });\n\n        this._server.listen(0);\n      });\n    }\n    return this;\n  }\n\n  async close(): Promise<this> {\n    log('closing');\n    this._socket?.destroy();\n    this._server?.close();\n    this._closed = true;\n    return this;\n  }\n\n  async onSignal({ payload }: Signal): Promise<void> {\n    log('received signal', { payload });\n    if (this.options.initiator || this._connected) {\n      return;\n    }\n\n    const socket = new Socket();\n    this._handleSocket(socket);\n    socket.connect({ port: payload.port, host: 'localhost' });\n  }\n\n  async getDetails(): Promise<string> {\n    if (this.options.initiator) {\n      const { port, address } = this._server?.address() as AddressInfo;\n      return `LISTEN ${address}:${port}`;\n    }\n\n    const { port, address } = this._socket?.address() as AddressInfo;\n    return `ACCEPT ${address}:${port}`;\n  }\n\n  async getStats(): Promise<TransportStats> {\n    return {\n      bytesSent: 0,\n      bytesReceived: 0,\n      packetsSent: 0,\n      packetsReceived: 0,\n    };\n  }\n\n  private _handleSocket(socket: Socket): void {\n    log('handling socket', { remotePort: socket.remotePort, localPort: socket.localPort });\n    this._socket = socket;\n\n    this._socket.on('connect', () => {\n      log('connected to', { port: this._socket?.remotePort });\n      this._connected = true;\n    });\n\n    this._socket.on('error', (err) => {\n      this.errors.raise(err);\n    });\n\n    this._socket.on('close', () => {\n      this.closed.emit();\n    });\n\n    this.connected.emit();\n    this.options.stream.pipe(this._socket!).pipe(this.options.stream);\n  }\n}\n"],"mappings":"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"}

package/dist/lib/transport/tcp.mjs

@@ -0,0 +1 @@
+export * from "#tcp-transport-impl";

package/dist/types/src/network-manager.d.ts

@@ -1,3 +1,4 @@
+import * as EffectContext from 'effect/Context';
 import { Event } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
@@ -43,6 +44,12 @@ export type SwarmNetworkManagerOptions = {
     enableDevtoolsLogging?: boolean;
     peerInfo?: PeerInfo;
 };
+declare const SwarmNetworkManagerService_base: EffectContext.TagClass<SwarmNetworkManagerService, "@dxos/network-manager/SwarmNetworkManager", SwarmNetworkManager>;
+/**
+ * Effect service tag for {@link SwarmNetworkManager}.
+ */
+export declare class SwarmNetworkManagerService extends SwarmNetworkManagerService_base {
+}
 /**
  * Manages p2p connection to the swarm.
  */
@@ -65,6 +72,7 @@ export declare class SwarmNetworkManager {
     getSwarmMap(topic: PublicKey): SwarmMapper | undefined;
     getSwarm(topic: PublicKey): Swarm | undefined;
     setPeerInfo(peerInfo: PeerInfo): void;
+    getPeerInfo(): PeerInfo | undefined;
     open(): Promise<void>;
     close(ctx: Context): Promise<void>;
     /**
@@ -78,4 +86,5 @@ export declare class SwarmNetworkManager {
     leaveSwarm(ctx: Context, topic: PublicKey): Promise<void>;
     setConnectionState(state: ConnectionState): Promise<void>;
 }
+export {};
 //# sourceMappingURL=network-manager.d.ts.map

package/dist/types/src/network-manager.d.ts.map

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

package/dist/types/src/signal/swarm-messenger.d.ts

@@ -1,7 +1,6 @@
-import { type Any } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
-import { type Message, type PeerInfo } from '@dxos/messaging';
+import { type Message } from '@dxos/messaging';
 import { type Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { type OfferMessage, type SignalMessage, type SignalMessenger } from './signal-messenger';
 export type SwarmMessengerOptions = {
@@ -20,11 +19,7 @@ export declare class SwarmMessenger implements SignalMessenger {
     private readonly _topic;
     private readonly _offerRecords;
     constructor({ sendMessage, onSignal, onOffer, topic }: SwarmMessengerOptions);
-    receiveMessage(ctx: Context, { author, recipient, payload }: {
-        author: PeerInfo;
-        recipient: PeerInfo;
-        payload: Any;
-    }): Promise<void>;
+    receiveMessage(ctx: Context, { author, recipient, payload }: Message): Promise<void>;
     signal(ctx: Context, message: SignalMessage): Promise<void>;
     offer(ctx: Context, message: OfferMessage): Promise<Answer>;
     private _sendReliableMessage;

package/dist/types/src/signal/swarm-messenger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swarm-messenger.d.ts","sourceRoot":"","sources":["../../../../src/signal/swarm-messenger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG9D,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,uCAAuC,CAAC;AAGvF,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMjG,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClE,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClE,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAIF;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IACpD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuC;IACpE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAC9D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAC5D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IAEnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4E;IAE1G,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB,EAK3E;IAEK,cAAc,CAClB,GAAG,EAAE,OAAO,EACZ,EACE,MAAM,EACN,SAAS,EACT,OAAO,EACR,EAAE;QACD,MAAM,EAAE,QAAQ,CAAC;QACjB,SAAS,EAAE,QAAQ,CAAC;QACpB,OAAO,EAAE,GAAG,CAAC;KACd,GACA,OAAO,CAAC,IAAI,CAAC,CAyBf;IAEK,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAOhE;IAEK,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAahE;YAEa,oBAAoB;YA6BpB,eAAe;YAWf,YAAY;YAwCZ,aAAa;CA0B5B"}
+{"version":3,"file":"swarm-messenger.d.ts","sourceRoot":"","sources":["../../../../src/signal/swarm-messenger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,OAAO,EAAiB,MAAM,iBAAiB,CAAC;AAG9D,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,uCAAuC,CAAC;AAGvF,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMjG,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClE,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClE,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAIF;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IACpD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuC;IACpE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAC9D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAC5D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IAEnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4E;IAE1G,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB,EAK3E;IAEK,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BzF;IAEK,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAOhE;IAEK,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAahE;YAEa,oBAAoB;YA6BpB,eAAe;YAWf,YAAY;YAwCZ,aAAa;CA0B5B"}

package/dist/types/src/testing/test-builder.d.ts

@@ -1,14 +1,10 @@
 import { PublicKey } from '@dxos/keys';
-import { MemorySignalManager, WebsocketSignalManager } from '@dxos/messaging';
-import { type Runtime } from '@dxos/protocols/proto/dxos/config';
+import { MemorySignalManager } from '@dxos/messaging';
 import { SwarmNetworkManager } from '../network-manager';
 import { FullyConnectedTopology } from '../topology';
 import { TransportKind } from '../transport';
 import { type TestTeleportExtensionFactory, TestWireProtocol } from './test-wire-protocol';
-export declare const TEST_SIGNAL_HOSTS: Runtime.Services.Signal[];
 export type TestBuilderOptions = {
-    signalHosts?: Runtime.Services.Signal[];
-    bridge?: boolean;
     transport?: TransportKind;
 };
 /**
@@ -18,7 +14,7 @@ export declare class TestBuilder {
     readonly options: TestBuilderOptions;
     private _signalContext;
     constructor(options?: TestBuilderOptions);
-    createSignalManager(): WebsocketSignalManager | MemorySignalManager;
+    createSignalManager(): MemorySignalManager;
     createPeer(peerId?: PublicKey): TestPeer;
 }
 /**

package/dist/types/src/testing/test-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-builder.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EACL,mBAAmB,EAGnB,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAMjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAKL,aAAa,EAEd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,4BAA4B,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAI3F,eAAO,MAAM,iBAAiB,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAEtD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IACxC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,aAAa,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAW;aAGM,OAAO,EAAE,kBAAkB;IAFvD,OAAO,CAAC,cAAc,CAAoC;IAE1D,YAA4B,OAAO,GAAE,kBAAuB,EAAI;IAEhE,mBAAmB,IAAI,sBAAsB,GAAG,mBAAmB,CAMlE;IAED,UAAU,CAAC,MAAM,GAAE,SAA8B,GAAG,QAAQ,CAE3D;CACF;AAED;;GAEG;AACH,qBAAa,QAAQ;IAiBjB,OAAO,CAAC,QAAQ,CAAC,WAAW;aACZ,MAAM,EAAE,SAAS;aACjB,SAAS,EAAE,aAAa;IAlB1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkE;IAY1F,OAAO,CAAC,MAAM,CAAC,CAAoB;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAoB;IAErC,YACmB,WAAW,EAAE,WAAW,EACzB,MAAM,EAAE,SAAS,EACjB,SAAS,GAAE,aAEH,EAKzB;IAGD,oBAAoB,CAAC,SAAS,EAAE,aAAa,GAAG,mBAAmB,CA2DlE;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAI1B;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAO3B;IAED,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,mBAAmB,CAO9C;IAED,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,gBAAgB,GAAE,4BAAuC,GAAG,mBAAmB,CAS5G;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAE/B;IAEK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAE9B;CACF;AAGD,qBAAa,mBAAmB;IAI5B,QAAQ,CAAC,IAAI,EAAE,QAAQ;IACvB,QAAQ,CAAC,KAAK,EAAE,SAAS;IACzB,QAAQ,CAAC,gBAAgB,EAAE,4BAA4B;IALzD,QAAQ,EAAE,gBAAgB,CAAC;IAE3B,YACW,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,SAAS,EAChB,gBAAgB,EAAE,4BAA4B,EAKxD;IAIK,IAAI,CAAC,QAAQ,yBAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CASjE;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAG3B;CACF"}
+{"version":3,"file":"test-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-builder.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAkD,MAAM,iBAAiB,CAAC;AAQtG,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAKL,aAAa,EAEd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,4BAA4B,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE3F,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,CAAC,EAAE,aAAa,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAW;aAGM,OAAO,EAAE,kBAAkB;IAFvD,OAAO,CAAC,cAAc,CAAoC;IAE1D,YAA4B,OAAO,GAAE,kBAAuB,EAAI;IAEhE,mBAAmB,IAAI,mBAAmB,CAIzC;IAED,UAAU,CAAC,MAAM,GAAE,SAA8B,GAAG,QAAQ,CAE3D;CACF;AAED;;GAEG;AACH,qBAAa,QAAQ;IAiBjB,OAAO,CAAC,QAAQ,CAAC,WAAW;aACZ,MAAM,EAAE,SAAS;aACjB,SAAS,EAAE,aAAa;IAlB1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkE;IAY1F,OAAO,CAAC,MAAM,CAAC,CAAoB;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAoB;IAErC,YACmB,WAAW,EAAE,WAAW,EACzB,MAAM,EAAE,SAAS,EACjB,SAAS,GAAE,aAAoC,EAKhE;IAGD,oBAAoB,CAAC,SAAS,EAAE,aAAa,GAAG,mBAAmB,CAmDlE;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAI1B;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAO3B;IAED,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,mBAAmB,CAO9C;IAED,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,gBAAgB,GAAE,4BAAuC,GAAG,mBAAmB,CAS5G;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAE/B;IAEK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAE9B;CACF;AAGD,qBAAa,mBAAmB;IAI5B,QAAQ,CAAC,IAAI,EAAE,QAAQ;IACvB,QAAQ,CAAC,KAAK,EAAE,SAAS;IACzB,QAAQ,CAAC,gBAAgB,EAAE,4BAA4B;IALzD,QAAQ,EAAE,gBAAgB,CAAC;IAE3B,YACW,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,SAAS,EAChB,gBAAgB,EAAE,4BAA4B,EAKxD;IAIK,IAAI,CAAC,QAAQ,yBAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CASjE;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAG3B;CACF"}

package/dist/types/src/transport/webrtc/rtc-peer-connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rtc-peer-connection.d.ts","sourceRoot":"","sources":["../../../../../src/transport/webrtc/rtc-peer-connection.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D,MAAM,MAAM,4BAA4B,GAAG;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAG9C,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF;;;;GAIG;AACH,qBACa,iBAAiB;IAsB1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IArB3B,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA6C;IAEtF,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA0C;IAC7E,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqC;IAEnE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAiB;IAErD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAe;IAErD;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IAErC,OAAO,CAAC,WAAW,CAAC,CAAoB;IAExC,YACmB,QAAQ,EAAE,oBAAoB,EAC9B,QAAQ,EAAE,4BAA4B,EAGxD;IAED,IAAW,qBAAqB,WAE/B;IAED,IAAW,iBAAiB,IAAI,iBAAiB,GAAG,SAAS,CAE5D;IAEY,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAsBrE;IAEM,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,mBAAmB,CAU5E;YAGa,eAAe;YA6Hf,aAAa;IAI3B,OAAO,CAAC,gBAAgB;YAoBV,uBAAuB;IASxB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+DnD;YAEa,oBAAoB;IAalC,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,+BAA+B;IAQvC,OAAO,CAAC,oBAAoB;YAmBd,qBAAqB;YAarB,iBAAiB;YAoBjB,gBAAgB;IAW9B,SAAS,KAAK,eAAe;;;;;;;;;;;MAgB5B;IAGD,OAAO,KAAK,cAAc,GAOzB;CACF"}
+{"version":3,"file":"rtc-peer-connection.d.ts","sourceRoot":"","sources":["../../../../../src/transport/webrtc/rtc-peer-connection.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D,MAAM,MAAM,4BAA4B,GAAG;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAG9C,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF;;;;GAIG;AACH,qBAAa,iBAAiB;IAsB1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IArB3B,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA6C;IAEtF,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA0C;IAC7E,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqC;IAEnE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAiB;IAErD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAe;IAErD;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IAErC,OAAO,CAAC,WAAW,CAAC,CAAoB;IAExC,YACmB,QAAQ,EAAE,oBAAoB,EAC9B,QAAQ,EAAE,4BAA4B,EAGxD;IAED,IAAW,qBAAqB,WAE/B;IAED,IAAW,iBAAiB,IAAI,iBAAiB,GAAG,SAAS,CAE5D;IAEY,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAsBrE;IAEM,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,GAAG,mBAAmB,CAU5E;YAGa,eAAe;YA6Hf,aAAa;IAI3B,OAAO,CAAC,gBAAgB;YAoBV,uBAAuB;IASxB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+DnD;YAEa,oBAAoB;IAalC,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,+BAA+B;IAQvC,OAAO,CAAC,oBAAoB;YAmBd,qBAAqB;YAarB,iBAAiB;YAoBjB,gBAAgB;IAU9B,SAAS,KAAK,eAAe;;;;;;;;;;;MAgB5B;IAGD,OAAO,KAAK,cAAc,GAOzB;CACF"}