More error handling

Makefile

@@ -48,6 +48,13 @@ test_twisted:
 	USE_TWISTED=1 trial autobahn
 	#WAMP_ROUTER_URL="ws://127.0.0.1:8080/ws" USE_TWISTED=1 trial autobahn
 
+test_twisted_coverage:
+	-rm .coverage
+	USE_TWISTED=1 coverage run --omit=*/test/* --source=autobahn `which trial` autobahn
+#	coverage -a -d annotated_coverage
+	coverage html
+	coverage report --show-missing
+
 # test under asyncio
 test_asyncio:
 	USE_ASYNCIO=1 python -m pytest -rsx

autobahn/asyncio/wamp.py

@@ -26,6 +26,8 @@
 
 from __future__ import absolute_import
 
+import sys
+
 from autobahn.wamp import protocol
 from autobahn.wamp.types import ComponentConfig
 from autobahn.websocket.protocol import parseWsUrl
@@ -102,9 +104,12 @@ def _add_future_callbacks(future, callback, errback):
         def done(f):
             try:
                 res = f.result()
-                callback(res)
-            except Exception as e:
-                errback(e)
+                if callback:
+                    callback(res)
+            except:
+                typ, exc, tb = sys.exc_info()
+                if errback:
+                    errback(typ, exc, tb)
         return future.add_done_callback(done)
 
     @staticmethod

autobahn/twisted/wamp.py

@@ -30,6 +30,7 @@
 import inspect
 
 from twisted.python import log
+from twisted.python.failure import Failure
 from twisted.application import service
 from twisted.internet.defer import Deferred, \
     maybeDeferred, \
@@ -84,7 +85,29 @@ def _reject_future(future, error):
 
     @staticmethod
     def _add_future_callbacks(future, callback, errback):
-        return future.addCallbacks(callback, errback)
+        # callback and/or errback may be None
+
+        # Note that errback takes 3 args: type, exception, tb our
+        # errbacks can be consistent between Twisted and asyncio.
+
+        # alternatively: what if we made a dummy Failure-like thing
+        # for asyncio so our "standard" errback in protocol.py could
+        # use the Failure API, or at least the bits we need...like
+        # collecting the traceback frames.
+
+        def _errback(fail):
+            # converting to common API between asyncio/Twisted
+            return errback(fail.type, fail.value, fail.tb)
+
+        if callback is None:
+            assert errback is not None
+            future.addErrback(_errback)
+        elif errback is None:
+            future.addCallback(callback)
+        else:
+            future.addCallbacks(callback, _errback)
+
+        return future
 
     @staticmethod
     def _gather_futures(futures, consume_exceptions=True):
@@ -96,15 +119,14 @@ class ApplicationSession(FutureMixin, protocol.ApplicationSession):
     WAMP application session for Twisted-based applications.
     """
 
-    def onUserError(self, e, msg):
+    def onUserError(self, typ, exc, tb, msg=None):
         """
         Override of wamp.ApplicationSession
         """
-        # see docs; will print currently-active exception to the logs,
-        # which is just what we want.
-        log.err()
-        # also log the framework-provided error-message
-        log.err(msg)
+        if msg:
+            log.err(Failure(exc, typ, tb), msg)
+        else:
+            log.err(Failure(exc, typ, tb))
 
 
 class ApplicationSessionFactory(FutureMixin, protocol.ApplicationSessionFactory):

autobahn/wamp/interfaces.py

@@ -262,7 +262,10 @@ class ISession(object):
     @abc.abstractmethod
     def onConnect(self):
         """
-        Callback fired when the transport this session will run over has been established.
+        Callback fired when the transport this session will run over has
+        been established.
+
+        May return a Deferred/Future.
         """
 
     @abc.abstractmethod
@@ -276,6 +279,8 @@ def onChallenge(self, challenge):
         """
         Callback fired when the peer demands authentication.
 
+        May return a Deferred/Future.
+
         :param challenge: The authentication challenge.
         :type challenge: Instance of :class:`autobahn.wamp.types.Challenge`.
         """
@@ -285,6 +290,8 @@ def onJoin(self, details):
         """
         Callback fired when WAMP session has been established.
 
+        May return a Deferred/Future.
+
         :param details: Session information.
         :type details: Instance of :class:`autobahn.wamp.types.SessionDetails`.
         """
@@ -306,6 +313,8 @@ def onLeave(self, details):
         """
         Callback fired when WAMP session has is closed
 
+        May return a Deferred/Future.
+
         :param details: Close information.
         :type details: Instance of :class:`autobahn.wamp.types.CloseDetails`.
         """
@@ -320,6 +329,9 @@ def disconnect(self):
     def onDisconnect(self):
         """
         Callback fired when underlying transport has been closed.
+
+        May return a Deferred/Future (but note that the underlying
+        transport is already gone).
         """
 
     @abc.abstractmethod