fix: various port fixes

Author: ivelin

cli.py

@@ -152,7 +152,7 @@ async def pnp_service_connect() -> Peer:
  await peer.start()
  log.info('pnpService: peer activated')
  _setPnPServiceConnectionHandlers(peer)
- make_discoverable(peer=peer)
+ await make_discoverable(peer=peer)
  return peer
 
 
@@ -163,7 +163,7 @@ async def make_discoverable(peer=None):
  async def periodic():
  while True:
  log.info('Making peer discoverable.')
- join_peer_room(peer=peer)
+ await join_peer_room(peer=peer)
  await asyncio.sleep(5)
 
  def stop():

grep

@@ -0,0 +1,13 @@
+/Users/ivelin/ambianic.co/peerjs-python
+3.8.1 (v3.8.1:1b293b6006, Dec 18 2019, 14:08:53) 
+[Clang 6.0 (clang-600.0.57)]
+DEBUG:__main__:Log level set to debug
+DEBUG:asyncio:Using selector: KqueueSelector
+INFO:__main__:pnpService: creating peer
+DEBUG:peerjs.api:API options: PeerOptions(debug=2, host='ambianic-pnp.herokuapp.com', port=80, path='/', key='peerjs', token=None, config=RTCConfiguration(iceServers=[RTCIceServer(urls=['stun:stun.l.google.com:19302'], username=None, credential=None, credentialType='password'), RTCIceServer(urls=['turn:0.peerjs.com:3478'], username='peerjs', credential='peerjsp', credentialType='password')]), secure=True, pingInterval=5)
+INFO:__main__:pnpService: peer created
+DEBUG:peerjs.api:built url: https://ambianic-pnp.herokuapp.com:?ts=0.4432262820.9929900131672725
+INFO:__main__:pnpService: peer activated
+INFO:__main__:Making peer discoverable.
+DEBUG:peerjs.api:API options: PeerOptions(debug=2, host='ambianic-pnp.herokuapp.com', port=80, path='/', key='peerjs', token=None, config=RTCConfiguration(iceServers=[RTCIceServer(urls=['stun:stun.l.google.com:19302'], username=None, credential=None, credentialType='password'), RTCIceServer(urls=['turn:0.peerjs.com:3478'], username='peerjs', credential='peerjsp', credentialType='password')]), secure=True, pingInterval=5)
+DEBUG:peerjs.api:built url: https://ambianic-pnp.herokuapp.com:?ts=0.7002259830.8773265258372509

src/peerjs/api.py

@@ -1,7 +1,7 @@
 """Client side abstraction for commonly used REST APIs."""
 
 import logging
-import math
+import random
 import time
 from typing import Any
 
@@ -13,21 +13,6 @@
 log = logging.getLogger(__name__)
 
 
-async def fetch(url=None, method=None, body=None):
- """Similar to web browser JavaScript fetch."""
- if not method:
- method = HttpMethod.GET
- async with aiohttp.ClientSession() as session:
- if method == HttpMethod.GET:
- async with session.get(url) as response:
- return await response
- elif method == HttpMethod.POST:
- async with session.post(url, data=body) as response:
- return await response
- else:
- raise NotImplementedError(
- f"HTTP requst method {method} not implemented yet. "
- "Contributions welcome!")
 
 
 class API:
@@ -36,27 +21,40 @@ class API:
  def __init__(self, options: Any = None):
  """Create API instance."""
  self._options = options
+ log.debug('API options: %s', options)
 
  def _buildUrl(self, method: str = None) -> str:
  protocol = "https://" if self._options.secure else "http://"
- url = \
- protocol + \
- self._options.host + \
- ":" + \
- self._options.port + \
- self._options.path + \
- self._options.key + \
- "/" + \
- method
- queryString = "?ts=" + time.monotonous() + "" + math.random()
+ url = f'{protocol}{self._options.host}:'
+ f'{self._options.port}{self._options.path}{self._options.key}'
+ f'/method'
+ queryString = f'?ts={time.monotonic()}{random.random()}'
  url += queryString
+ log.debug('built url: %s', url)
  return url
 
+ @staticmethod
+ async def fetch(url=None, method=None, body=None):
+ """Similar to web browser JavaScript fetch."""
+ if not method:
+ method = HttpMethod.GET
+ async with aiohttp.ClientSession() as session:
+ if method == HttpMethod.GET:
+ async with session.get(url) as response:
+ return await response
+ elif method == HttpMethod.POST:
+ async with session.post(url, data=body) as response:
+ return await response
+ else:
+ raise NotImplementedError(
+ f"HTTP requst method {method} not implemented yet. "
+ "Contributions welcome!")
+
  async def retrieveId(self):
  """Get a unique ID from the server and initialize with it."""
  url = self._buildUrl("id")
  try:
- response = await fetch(url)
+ response = await API.fetch(url)
  if response.status != 200:
  raise ConnectionError(f'Error. Status:{response.status}')
  return response.text()

src/peerjs/peer.py

@@ -7,7 +7,6 @@
 from dataclasses import dataclass
 from typing import Any, List
 
-import attr
 from pyee import AsyncIOEventEmitter, BaseEventEmitter
 
 from .api import API
@@ -45,13 +44,14 @@ class PeerOptions:
  """Peer configuration options."""
 
  debug: int = 0 # 1: Errors, 2: Warnings, 3: All logs
- host: str = attr.ib(default=util.CLOUD_HOST)
+ host: str = util.CLOUD_HOST
  port: int = util.CLOUD_PORT
  path: str = "/"
  key: str = PEER_DEFAULT_KEY
  token: str = util.randomToken()
  config: Any = util.defaultConfig
  secure: bool = False
+ pingInterval: int = 5 # ping to signaling server in seconds
 
 
 # 0: None, 1: Errors, 2: Warnings, 3: All logs
@@ -205,7 +205,6 @@ def disconnected(self, ):
  """Return True if peer is disconnected from signaling server."""
  return self._disconnected
 
- @property
  def _createServerConnection(self) -> Socket:
  socket = Socket(
  self._options.secure,
@@ -486,7 +485,7 @@ def emitError(self, type: PeerErrorType, err: str) -> None:
  error.type = type
  self.emit(PeerEventType.Error, error)
 
- def destroy(self) -> None:
+ async def destroy(self) -> None:
  """Destroy Peer and close all active connections.
 
  Close all active peer connections and the active server connection.

src/peerjs/peerroom.py

@@ -3,9 +3,10 @@
 Same room defined as shared WiFi/LAN and Public IP Address.
 """
 
-from .peer import Peer
 import logging
+
 from .api import API
+from .peer import Peer
 
 log = logging.getLogger(__name__)
 
@@ -23,15 +24,17 @@ def __init__(self, peer: Peer):
  async def _restCall(self, http_method=None, rest_method=None):
  log.debug('REST Call {} {}', http_method, rest_method)
  url = self._api._buildUrl(method=rest_method)
+ response = None
  try:
- response = await self._api._fetch(url=url, method=http_method)
+ response = await API.fetch(url=url, method=http_method)
  if response.status != 200:
  raise ConnectionError()
  return response.json()
  except Exception as error:
  msg = f"REST Error for {http_method} {url}."
- f" HTTP Response Status:{response.status}"
  log.error(msg, error)
+ if response is not None:
+ log.error(f'HTTP Response Status %s', response.status)
  raise ConnectionError(msg, error)
 
  async def _getRoomId(self):
@@ -51,7 +54,7 @@ async def _joinRoom(self):
  log.debug('Joined room %s, Members: %s', self._roomId, members)
  return members
 
- async def getRoomMembers(self, roomId):
+ async def getRoomMembers(self):
  """Get the list of peers in a room."""
  if not self._roomId:
  members = await self.join()

src/peerjs/util.py

@@ -1,8 +1,9 @@
 """Helper utility structures and methods."""
 import logging
+import math
 import random
+from dataclasses import dataclass
 
-from aiortc import RTCDataChannel, RTCPeerConnection
 from aiortc.rtcconfiguration import RTCConfiguration, RTCIceServer
 
 # import asyncio
@@ -21,6 +22,18 @@
  )
 
 
+@dataclass
+class UtilSupports:
+ """WebRTC parameters supported by this library."""
+
+ webRTC: bool = True
+ browser: str = 'aiortc'
+ audioVideo: bool = True
+ data: bool = True
+ binaryBlob: bool = False
+ reliable: bool = True
+
+
 class Util:
  """Various helper methods."""
 
@@ -43,48 +56,19 @@ def __init__(self):
  self.browser = "peerjs-python" # Supports.getBrowser()
  self.browserVersion = "0.1" # Supports.getVersion()
  # Lists which features are supported
- self.supports = self._supported()
  # Binary stuff
  self._dataCount: int = 1
+ self._supports = UtilSupports()
 
  def validateId(self, id: str) -> bool:
  """Ensure alphanumeric ids."""
  # Allow empty ids
  return not id or id.isalnum()
 
- def _supported(self):
- supported = {
- 'browser': 'aiortc',
- 'webRTC': True,
- 'audioVideo': False,
- 'data': False,
- 'binaryBlob': False,
- 'reliable': False,
- }
- if not supported['webRTC']:
- return supported
- pc: RTCPeerConnection = None
- try:
- pc = RTCPeerConnection(DEFAULT_CONFIG)
- supported['audioVideo'] = True
- dc: RTCDataChannel = None
- try:
- dc = pc.createDataChannel(label="_PEERJSTEST", ordered=True)
- supported['data'] = True
- supported['reliable'] = True if dc.ordered else False
- # Test for Binary mode support
- try:
- dc.binaryType = "blob"
- supported.binaryBlob = False
- except Exception:
- pass
- finally:
- if dc:
- dc.close()
- finally:
- if pc:
- pc.close()
- return supported
+ @property
+ def supports(self):
+ """Return dict of supported WebRTC features."""
+ return self._supports
 
  def chunk(self, blob):
  """Break up a blob into a list of smaller chunks for the wire."""