Use remote address instead of local for peers

Author: samuelmaddock

packages/metastream-app/package.json

@@ -40,7 +40,7 @@
     "@types/request": "^2.0.6",
     "@types/semver": "^5.5.0",
     "@types/shortid": "^0.0.29",
-    "@types/simple-peer": "^6.1.4",
+    "@types/simple-peer": "^6.1.6",
     "autoprefixer": "^9.6.0",
     "awesome-typescript-loader": "^5.2.1",
     "chalk": "^1.1.3",

packages/metastream-app/src/network/rtc.ts

@@ -67,10 +67,10 @@ export class RTCPeerConn extends NetConnection {
   }
 
   getIP(): string {
-    return this.peer.address().address
+    return (this.peer as any).remoteAddress
   }
 
   getPort(): string {
-    return this.peer.address().port
+    return (this.peer as any).remotePort
   }
 }

packages/metastream-app/src/platform/web/rtc-coordinator.ts

@@ -1,12 +1,11 @@
-import SimplePeer, { SimplePeerData } from 'simple-peer'
+import SimplePeer from 'simple-peer'
 import createClient, { SignalClient } from '@metastream/signal-server/lib/client'
 import { SignalErrorCode } from '@metastream/signal-server/lib/types'
 
-import shortid from 'shortid'
 import sodium from 'libsodium-wrappers'
 import { backOff } from 'exponential-backoff'
 
-import { NetUniqueId, localUserId, localUser } from 'network'
+import { NetUniqueId, localUser } from 'network'
 import { PeerCoordinator } from 'network/server'
 import { RTCPeerConn } from 'network/rtc'
 import { mutualHandshake } from './authenticate'
@@ -202,7 +201,7 @@ export class WebRTCPeerCoordinator extends PeerCoordinator {
     const userPublicKey = await mutualHandshake(peer, localUser().id, peerPublicKey)
 
     if (!userPublicKey) {
-      const addr = peer.address()
+      const addr = `${(peer as any).remoteAddress}:${(peer as any).remotePort}`
       peer.destroy()
       throw new NetworkError(
         NetworkErrorCode.PeerAuthenticationFailure,

yarn.lock

@@ -611,13 +611,20 @@
   resolved "https://registry.yarnpkg.com/@types/shortid/-/shortid-0.0.29.tgz#8093ee0416a6e2bf2aa6338109114b3fbffa0e9b"
   integrity sha1-gJPuBBam4r8qpjOBCRFLP7/6Dps=
 
-"@types/simple-peer@^6.1.4", "@types/simple-peer@^6.1.5":
+"@types/simple-peer@^6.1.5":
   version "6.1.5"
   resolved "https://registry.yarnpkg.com/@types/simple-peer/-/simple-peer-6.1.5.tgz#9353f84cefd052a9684b9a5662c983fc2bcfab41"
   integrity sha512-huXri3g0rQpIO5jkG630a2sBrh1WXgsd2Gsoc9MqWTRZ0AWqyMEcMCfLXmw5i8AvrZbjAT6BIxW2gEqvpqSYwA==
   dependencies:
     "@types/node" "*"
 
+"@types/simple-peer@^6.1.6":
+  version "6.1.6"
+  resolved "https://registry.yarnpkg.com/@types/simple-peer/-/simple-peer-6.1.6.tgz#a1a1f4793f6a3f7ec17df2056fe3a036a1bc2313"
+  integrity sha512-jnktVe4nDkNAIf/5brRQ4VqMP845dtRCrFMRagOxiTdC9gZ3rpnidt8EGR89b55Wtol+otYEJveFkEy3IpxA0Q==
+  dependencies:
+    "@types/node" "*"
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"