Merge branch 'master' into dir-lock

automerge · Nov 22, 2019 · cb070cb · cb070cb
2 parents 1aa38b1 + e4c6115
commit cb070cb
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/dist/MessageRouter.d.ts b/dist/MessageRouter.d.ts
diff --git a/dist/MessageRouter.js b/dist/MessageRouter.js
diff --git a/dist/MessageRouter.js.map b/dist/MessageRouter.js.map
diff --git a/dist/Network.js b/dist/Network.js
diff --git a/dist/Network.js.map b/dist/Network.js.map
diff --git a/dist/PeerConnection.d.ts b/dist/PeerConnection.d.ts
diff --git a/src/MessageRouter.ts b/src/MessageRouter.ts
@@ -33,14 +33,14 @@ export default class MessageRouter<Msg> {
 
   sendToPeer(peer: NetworkPeer, msg: Msg): void {
     const bus = this.getBus(peer)
-    bus.send(msg)
+    bus?.send(msg)
   }
 
-  getBus(peer: NetworkPeer): MessageBus<Msg> {
-    if (!peer.connection) throw new Error('peer has no connection')
+  getBus(peer: NetworkPeer): MessageBus<Msg> | undefined {
+    if (!peer.connection) return
 
     return getOrCreate(this.buses, peer.connection, (conn) => {
-      const bus = new MessageBus<Msg>(conn.openChannel(this.channelName))
+      const bus = conn.openBus<Msg>(this.channelName)
 
       bus.receiveQ.subscribe((msg) => {
         this.inboxQ.push({

diff --git a/src/Network.ts b/src/Network.ts
@@ -144,10 +144,10 @@ export default class Network {
 
     networkBus.close()
 
-    if (firstMsg.type !== 'Info') throw new Error('First message must be Info.')
+    if (firstMsg.type !== 'Info') return conn.close('error')
 
     const { peerId } = firstMsg
-    if (peerId === this.selfId) throw new Error('Connected to self.')
+    if (peerId === this.selfId) return conn.close('self-connection')
 
     this.getOrCreatePeer(peerId).addConnection(conn)
   }

diff --git a/src/PeerConnection.ts b/src/PeerConnection.ts
@@ -11,7 +11,7 @@ import Heartbeat from './Heartbeat'
 const log = Debug('PeerConnection')
 const VERSION_PREFIX = Buffer.from('hypermerge.v2')
 
-type CloseReason = 'outdated' | 'timeout' | 'error' | 'shutdown' | 'unknown'
+type CloseReason = 'outdated' | 'timeout' | 'error' | 'shutdown' | 'self-connection' | 'unknown'
 
 export interface SocketInfo {
   type: string