fix: polishing signaling server communication and room membership api

Author: ivelin

cli.py

@@ -17,9 +17,9 @@
 
 peer = None
 myPeerId = None
-AMBIANIC_PNP_HOST = 'ambianic-pnp.herokuapp.com'
-AMBIANIC_PNP_PORT = 443
-AMBIANIC_PNP_SECURE = True
+AMBIANIC_PNP_HOST = 'localhost' # 'ambianic-pnp.herokuapp.com'
+AMBIANIC_PNP_PORT = 9779 # 443
+AMBIANIC_PNP_SECURE = False # True
 time_start = None
 peerConnectionStatus = None
 discoveryLoop = None
@@ -44,7 +44,6 @@
 async def join_peer_room(peer=None):
  """Join a peer room with other local peers."""
  # first try to find the remote peer ID in the same room
- assert peer
  myRoom = PeerRoom(peer)
  log.info('Fetching room members...')
  peerIds = await myRoom.getRoomMembers()
@@ -168,7 +167,15 @@ async def make_discoverable(peer=None):
  while True:
  log.info('Making peer discoverable.')
  try:
- await join_peer_room(peer=peer)
+ # check if the websocket connection
+ # to the signaling server is alive
+ if peer.open:
+ await join_peer_room(peer=peer)
+ else:
+ log.info('Peer not connected to signaling server. '
+ 'Will retry in a bit.')
+ if peer.disconnected:
+ await peer.reconnect()
  except Exception as e:
  log.exception('Unable to join room. '
  'Will retry in a few moments. '

src/peerjs/peer.py

@@ -204,11 +204,11 @@ def on_error(error: str):
  self._abort(PeerErrorType.SocketError, error)
 
  @socket.on(SocketEventType.Disconnected)
- def on_disconnected():
+ async def on_disconnected():
  if self.disconnected:
  return
  self.emitError(PeerErrorType.Network, "Lost connection to server.")
- self.disconnect()
+ await self.disconnect()
 
  @socket.on(SocketEventType.Close)
  def on_close():
@@ -516,13 +516,14 @@ async def disconnect(self) -> None:
  self._id = None
  self.emit(PeerEventType.Disconnected, currentId)
 
- def reconnect(self) -> None:
+ async def reconnect(self) -> None:
  """Attempt to reconnect with the same ID."""
  if self.disconnected and not self.destroyed:
  log.debug("Attempting reconnection "
  f"to server with ID {self._lastServerId}")
  self._disconnected = False
- self._initialize(self._lastServerId)
+ self._id = self._lastServerId
+ await self.start()
  elif self.destroyed:
  raise RuntimeError("This peer cannot reconnect to the server. "
  "It has already been destroyed.")

src/peerjs/socket.py

@@ -42,7 +42,7 @@ async def _connect(self, wss_url=None):
  """Connect to WebSockets server."""
  assert wss_url
  # connect to websocket
- websocket = await websockets.connect(wss_url, ssl=True)
+ websocket = await websockets.connect(wss_url, ping_interval=5)
  self._sendQueuedMessages()
  log.debug("WebSockets open")
  await websocket.send(

src/peerjs/util.py

@@ -64,7 +64,7 @@ def __init__(self):
  def validateId(self, id: str = None) -> bool:
  """Ensure alphanumeric ids."""
  # Allow empty ids
- valid = not id or re.match('^[A-Za-z0-9]+(?:[ _-][A-Za-z0-9]+)*$', str)
+ valid = not id or re.match('^[A-Za-z0-9]+(?:[ _-][A-Za-z0-9]+)*$', id)
  log.debug('ID %s is %s valid', id, "" if valid else "not")
  return valid