From 8e0edc4bcd789b9b731a7a4fd33d0216873aeab3 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Wed, 15 Mar 2023 08:14:29 -0400 Subject: [PATCH] *Update dist --- dist/peer.d.ts | 4 +++- dist/peer.js | 29 ++++++++++++++++++----------- dist/proxy.d.ts | 2 +- dist/proxy.js | 3 ++- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dist/peer.d.ts b/dist/peer.d.ts index fc503ae..d06e3d4 100644 --- a/dist/peer.d.ts +++ b/dist/peer.d.ts @@ -27,6 +27,7 @@ export interface DataSocketOptions { onclose?: OnClose; onchannel?: OnChannel; emulateWebsocket?: boolean; + createDefaultMessage?: boolean; } export interface PeerOptions { peer: any; @@ -45,7 +46,8 @@ export default class Peer { private _onclose; private _onchannel; private _emulateWebsocket; - constructor({ proxy, peer, muxer, onopen, onreceive, onsend, onclose, onchannel, emulateWebsocket, }: PeerOptionsWithProxy & DataSocketOptions); + private _createDefaultMessage; + constructor({ proxy, peer, muxer, onopen, onreceive, onsend, onclose, onchannel, emulateWebsocket, createDefaultMessage, }: PeerOptionsWithProxy & DataSocketOptions); private _socket?; get socket(): Socket; private _channel?; diff --git a/dist/peer.js b/dist/peer.js index edef850..99829d2 100644 --- a/dist/peer.js +++ b/dist/peer.js @@ -15,7 +15,8 @@ class Peer { _onclose; _onchannel; _emulateWebsocket; - constructor({ proxy, peer, muxer, onopen, onreceive, onsend, onclose, onchannel, emulateWebsocket = false, }) { + _createDefaultMessage; + constructor({ proxy, peer, muxer, onopen, onreceive, onsend, onclose, onchannel, emulateWebsocket = false, createDefaultMessage = true, }) { this._proxy = proxy; this._peer = peer; this._muxer = muxer; @@ -25,6 +26,7 @@ class Peer { this._onclose = onclose?.bind(undefined, this); this._onchannel = onchannel?.bind(undefined, this); this._emulateWebsocket = emulateWebsocket; + this._createDefaultMessage = createDefaultMessage; } _socket; get socket() { @@ -36,12 +38,15 @@ class Peer { } async init() { const self = this; + let pipe; this._socket = new socket_js_1.default({ remoteAddress: self._peer.rawStream.remoteHost, remotePort: self._peer.rawStream.remotePort, remotePublicKey: self._peer.remotePublicKey, async write(data, cb) { - pipe.send(data); + if (pipe) { + pipe.send(data); + } await self._onsend?.(data); cb(); }, @@ -69,15 +74,17 @@ class Peer { await self._onclose?.(self._socket); }, }); - const pipe = this._channel.addMessage({ - async onmessage(m) { - if (m instanceof Uint8Array) { - m = buffer_1.Buffer.from(m); - } - self._socket.emit("data", m); - await self._onreceive?.(m); - }, - }); + if (this._createDefaultMessage) { + pipe = this._channel.addMessage({ + async onmessage(m) { + if (m instanceof Uint8Array) { + m = buffer_1.Buffer.from(m); + } + self._socket.emit("data", m); + await self._onreceive?.(m); + }, + }); + } await this._onchannel?.(this._channel); await this._channel.open(); } diff --git a/dist/proxy.d.ts b/dist/proxy.d.ts index b5e1b40..4496e9f 100644 --- a/dist/proxy.d.ts +++ b/dist/proxy.d.ts @@ -9,7 +9,7 @@ export default class Proxy { private _listen; private _socketOptions; private _autostart; - constructor({ swarm, protocol, onopen, onreceive, onsend, onclose, onchannel, listen, autostart, emulateWebsocket, }: ProxyOptions); + constructor({ swarm, protocol, onopen, onreceive, onsend, onclose, onchannel, listen, autostart, emulateWebsocket, createDefaultMessage, }: ProxyOptions); private _swarm; get swarm(): any; private _protocol; diff --git a/dist/proxy.js b/dist/proxy.js index f21045f..3a50c6c 100644 --- a/dist/proxy.js +++ b/dist/proxy.js @@ -9,7 +9,7 @@ class Proxy { _listen; _socketOptions; _autostart; - constructor({ swarm, protocol, onopen, onreceive, onsend, onclose, onchannel, listen = false, autostart = false, emulateWebsocket = false, }) { + constructor({ swarm, protocol, onopen, onreceive, onsend, onclose, onchannel, listen = false, autostart = false, emulateWebsocket = false, createDefaultMessage = true, }) { this._swarm = swarm; this._protocol = protocol; this._listen = listen; @@ -21,6 +21,7 @@ class Proxy { onclose, onchannel, emulateWebsocket, + createDefaultMessage, }; this.init(); }