diff --git a/CHANGES.rst b/CHANGES.rst
index e602ad6f85..d3beea3ede 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -17,6 +17,9 @@ Webclient:
* Add glare support for VoIP.
* Improvements to initial startup speed.
* Don't display duplicate join events.
+ * Local echo of messages.
+ * Differentiate sending and sent of local echo.
+ * Various minor bug fixes.
Changes in synapse 0.2.2 (2014-09-06)
=====================================
diff --git a/docs/specification.rst b/docs/specification.rst
index aad200c04d..ab16a0bb68 100644
--- a/docs/specification.rst
+++ b/docs/specification.rst
@@ -1182,16 +1182,16 @@ This event is sent by the caller when they wish to establish a call.
- ``type`` : "string" - The type of session description, in this case 'offer'
- ``sdp`` : "string" - The SDP text of the session description
-``m.call.candidate``
+``m.call.candidates``
This event is sent by callers after sending an invite and by the callee after answering.
-Its purpose is to give the other party an additional ICE candidate to try using to
+Its purpose is to give the other party additional ICE candidates to try using to
communicate.
Required keys:
- ``call_id`` : "string" - The ID of the call this event relates to
- ``version`` : "integer" - The version of the VoIP specification this messages
adheres to. his specification is version 0.
- - ``candidate`` : "candidate object" - Object describing the candidate.
+ - ``candidates`` : "array of candidate objects" - Array of object describing the candidates.
``Candidate Object``
diff --git a/tests/api/test_ratelimiting.py b/tests/api/test_ratelimiting.py
index dc2f83c7eb..dd0bc19ecf 100644
--- a/tests/api/test_ratelimiting.py
+++ b/tests/api/test_ratelimiting.py
@@ -1,6 +1,6 @@
from synapse.api.ratelimiting import Ratelimiter
-import unittest
+from tests import unittest
class TestRatelimiter(unittest.TestCase):
diff --git a/tests/events/test_events.py b/tests/events/test_events.py
index 93d5c15c6f..a4b6cb3afd 100644
--- a/tests/events/test_events.py
+++ b/tests/events/test_events.py
@@ -15,7 +15,7 @@
from synapse.api.events import SynapseEvent
-import unittest
+from tests import unittest
class SynapseTemplateCheckTestCase(unittest.TestCase):
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index 0b105fe723..954ccac2a4 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -14,11 +14,10 @@
# trial imports
from twisted.internet import defer
-from twisted.trial import unittest
+from tests import unittest
# python imports
from mock import Mock
-import logging
from ..utils import MockHttpResource, MockClock
@@ -28,9 +27,6 @@ from synapse.federation.units import Pdu
from synapse.storage.pdu import PduTuple, PduEntry
-logging.getLogger().addHandler(logging.NullHandler())
-
-
def make_pdu(prev_pdus=[], **kwargs):
"""Provide some default fields for making a PduTuple."""
pdu_fields = {
diff --git a/tests/federation/test_pdu_codec.py b/tests/federation/test_pdu_codec.py
index 9f74ba119f..344e1baf60 100644
--- a/tests/federation/test_pdu_codec.py
+++ b/tests/federation/test_pdu_codec.py
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from twisted.trial import unittest
+from tests import unittest
from synapse.federation.pdu_codec import (
PduCodec, encode_event_id, decode_event_id
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py
index 72a2b1443a..54d6e51f97 100644
--- a/tests/handlers/test_directory.py
+++ b/tests/handlers/test_directory.py
@@ -14,11 +14,10 @@
# limitations under the License.
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer
from mock import Mock
-import logging
from synapse.server import HomeServer
from synapse.http.client import HttpClient
@@ -26,9 +25,6 @@ from synapse.handlers.directory import DirectoryHandler
from synapse.storage.directory import RoomAliasMapping
-logging.getLogger().addHandler(logging.NullHandler())
-
-
class DirectoryHandlers(object):
def __init__(self, hs):
self.directory_handler = DirectoryHandler(hs)
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index 6fc3d8f7fd..f0308a29d3 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -14,7 +14,7 @@
from twisted.internet import defer
-from twisted.trial import unittest
+from tests import unittest
from synapse.api.events.room import (
InviteJoinEvent, MessageEvent, RoomMemberEvent
@@ -26,12 +26,8 @@ from synapse.federation.units import Pdu
from mock import NonCallableMock, ANY
-import logging
-
from ..utils import get_mock_call_args
-logging.getLogger().addHandler(logging.NullHandler())
-
class FederationTestCase(unittest.TestCase):
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 9eb8b6909f..06f5f9c2ba 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -14,11 +14,10 @@
# limitations under the License.
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer, reactor
from mock import Mock, call, ANY
-import logging
import json
from ..utils import MockHttpResource, MockClock, DeferredMockCallable
@@ -34,9 +33,6 @@ UNAVAILABLE = PresenceState.UNAVAILABLE
ONLINE = PresenceState.ONLINE
-logging.getLogger().addHandler(logging.NullHandler())
-
-
def _expect_edu(destination, edu_type, content, origin="test"):
return {
"origin": origin,
@@ -92,7 +88,6 @@ class PresenceStateTestCase(unittest.TestCase):
# Mock the RoomMemberHandler
room_member_handler = Mock(spec=[])
hs.handlers.room_member_handler = room_member_handler
- logging.getLogger().debug("Mocking room_member_handler=%r", room_member_handler)
# Some local users to test with
self.u_apple = hs.parse_userid("@apple:test")
diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py
index b35980d948..72c55b3667 100644
--- a/tests/handlers/test_presencelike.py
+++ b/tests/handlers/test_presencelike.py
@@ -16,11 +16,10 @@
"""This file contains tests of the "presence-like" data that is shared between
presence and profiles; namely, the displayname and avatar_url."""
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer
from mock import Mock, call, ANY
-import logging
from ..utils import MockClock
@@ -35,9 +34,6 @@ UNAVAILABLE = PresenceState.UNAVAILABLE
ONLINE = PresenceState.ONLINE
-logging.getLogger().addHandler(logging.NullHandler())
-
-
class MockReplication(object):
def __init__(self):
self.edu_handlers = {}
diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py
index 8e7a89b479..0a5cebb4cc 100644
--- a/tests/handlers/test_profile.py
+++ b/tests/handlers/test_profile.py
@@ -14,20 +14,16 @@
# limitations under the License.
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer
from mock import Mock
-import logging
from synapse.api.errors import AuthError
from synapse.server import HomeServer
from synapse.handlers.profile import ProfileHandler
-logging.getLogger().addHandler(logging.NullHandler())
-
-
class ProfileHandlers(object):
def __init__(self, hs):
self.profile_handler = ProfileHandler(hs)
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index 5687bbea0b..a1a2e80492 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -15,7 +15,7 @@
from twisted.internet import defer
-from twisted.trial import unittest
+from tests import unittest
from synapse.api.events.room import (
InviteJoinEvent, RoomMemberEvent, RoomConfigEvent
@@ -27,10 +27,6 @@ from synapse.server import HomeServer
from mock import Mock, NonCallableMock
-import logging
-
-logging.getLogger().addHandler(logging.NullHandler())
-
class RoomMemberHandlerTestCase(unittest.TestCase):
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index 6532ac94a3..ab908cdfc1 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -14,12 +14,11 @@
# limitations under the License.
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer
from mock import Mock, call, ANY
import json
-import logging
from ..utils import MockHttpResource, MockClock, DeferredMockCallable
@@ -27,9 +26,6 @@ from synapse.server import HomeServer
from synapse.handlers.typing import TypingNotificationHandler
-logging.getLogger().addHandler(logging.NullHandler())
-
-
def _expect_edu(destination, edu_type, content, origin="test"):
return {
"origin": origin,
diff --git a/tests/rest/test_events.py b/tests/rest/test_events.py
index fd2224f55f..79b371c04d 100644
--- a/tests/rest/test_events.py
+++ b/tests/rest/test_events.py
@@ -14,7 +14,7 @@
# limitations under the License.
""" Tests REST events for /events paths."""
-from twisted.trial import unittest
+from tests import unittest
# twisted imports
from twisted.internet import defer
@@ -27,14 +27,12 @@ from synapse.server import HomeServer
# python imports
import json
-import logging
from ..utils import MockHttpResource, MemoryDataStore
from .utils import RestTestCase
from mock import Mock, NonCallableMock
-logging.getLogger().addHandler(logging.NullHandler())
PATH_PREFIX = "/_matrix/client/api/v1"
diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py
index a1db0fbcf3..ea3478ac5d 100644
--- a/tests/rest/test_presence.py
+++ b/tests/rest/test_presence.py
@@ -15,11 +15,10 @@
"""Tests REST events for /presence paths."""
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer
from mock import Mock
-import logging
from ..utils import MockHttpResource
@@ -28,9 +27,6 @@ from synapse.handlers.presence import PresenceHandler
from synapse.server import HomeServer
-logging.getLogger().addHandler(logging.NullHandler())
-
-
OFFLINE = PresenceState.OFFLINE
UNAVAILABLE = PresenceState.UNAVAILABLE
ONLINE = PresenceState.ONLINE
diff --git a/tests/rest/test_profile.py b/tests/rest/test_profile.py
index f41810df1f..e6e51f6dd0 100644
--- a/tests/rest/test_profile.py
+++ b/tests/rest/test_profile.py
@@ -15,7 +15,7 @@
"""Tests REST events for /profile paths."""
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer
from mock import Mock
@@ -28,6 +28,7 @@ from synapse.server import HomeServer
myid = "@1234ABCD:test"
PATH_PREFIX = "/_matrix/client/api/v1"
+
class ProfileTestCase(unittest.TestCase):
""" Tests profile management. """
diff --git a/tests/rest/utils.py b/tests/rest/utils.py
index 77f5ecf0df..ce2e8fd98a 100644
--- a/tests/rest/utils.py
+++ b/tests/rest/utils.py
@@ -17,7 +17,7 @@
from twisted.internet import defer
# trial imports
-from twisted.trial import unittest
+from tests import unittest
from synapse.api.constants import Membership
diff --git a/tests/storage/test_base.py b/tests/storage/test_base.py
index 330311448d..3ad9a4b0c0 100644
--- a/tests/storage/test_base.py
+++ b/tests/storage/test_base.py
@@ -14,7 +14,7 @@
# limitations under the License.
-from twisted.trial import unittest
+from tests import unittest
from twisted.internet import defer
from mock import Mock, call
diff --git a/tests/test_distributor.py b/tests/test_distributor.py
index 04933f0ecf..39c5b8dff2 100644
--- a/tests/test_distributor.py
+++ b/tests/test_distributor.py
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from tests import unittest
from twisted.internet import defer
-from twisted.trial import unittest
from mock import Mock, patch
diff --git a/tests/test_state.py b/tests/test_state.py
index 16af95b7bc..b1624f0b25 100644
--- a/tests/test_state.py
+++ b/tests/test_state.py
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from tests import unittest
from twisted.internet import defer
-from twisted.trial import unittest
from twisted.python.log import PythonLoggingObserver
from synapse.state import StateHandler
@@ -26,7 +26,6 @@ from collections import namedtuple
from mock import Mock
-import logging
import mock
diff --git a/tests/test_types.py b/tests/test_types.py
index 571938356c..276ecc91fd 100644
--- a/tests/test_types.py
+++ b/tests/test_types.py
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import unittest
+from tests import unittest
from synapse.server import BaseHomeServer
from synapse.types import UserID, RoomAlias
diff --git a/tests/unittest.py b/tests/unittest.py
new file mode 100644
index 0000000000..fb97fb1148
--- /dev/null
+++ b/tests/unittest.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+# Copyright 2014 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from twisted.trial import unittest
+
+import logging
+
+
+# logging doesn't have a "don't log anything at all EVARRRR setting,
+# but since the highest value is 50, 1000000 should do ;)
+NEVER = 1000000
+
+logging.getLogger().addHandler(logging.StreamHandler())
+logging.getLogger().setLevel(NEVER)
+
+
+def around(target):
+ """A CLOS-style 'around' modifier, which wraps the original method of the
+ given instance with another piece of code.
+
+ @around(self)
+ def method_name(orig, *args, **kwargs):
+ return orig(*args, **kwargs)
+ """
+ def _around(code):
+ name = code.__name__
+ orig = getattr(target, name)
+ def new(*args, **kwargs):
+ return code(orig, *args, **kwargs)
+ setattr(target, name, new)
+ return _around
+
+
+class TestCase(unittest.TestCase):
+ """A subclass of twisted.trial's TestCase which looks for 'loglevel'
+ attributes on both itself and its individual test methods, to override the
+ root logger's logging level while that test (case|method) runs."""
+
+ def __init__(self, methodName, *args, **kwargs):
+ super(TestCase, self).__init__(methodName, *args, **kwargs)
+
+ method = getattr(self, methodName)
+
+ level = getattr(method, "loglevel",
+ getattr(self, "loglevel",
+ NEVER))
+
+ @around(self)
+ def setUp(orig):
+ old_level = logging.getLogger().level
+
+ if old_level != level:
+ @around(self)
+ def tearDown(orig):
+ ret = orig()
+ logging.getLogger().setLevel(old_level)
+ return ret
+
+ logging.getLogger().setLevel(level)
+ return orig()
+
+
+def DEBUG(target):
+ """A decorator to set the .loglevel attribute to logging.DEBUG.
+ Can apply to either a TestCase or an individual test method."""
+ target.loglevel = logging.DEBUG
+ return target
diff --git a/tests/util/test_lock.py b/tests/util/test_lock.py
index 5623d78423..6a1e521b1e 100644
--- a/tests/util/test_lock.py
+++ b/tests/util/test_lock.py
@@ -15,7 +15,7 @@
from twisted.internet import defer
-from twisted.trial import unittest
+from tests import unittest
from synapse.util.lockutils import LockManager
@@ -105,4 +105,4 @@ class LockManagerTestCase(unittest.TestCase):
pass
with (yield self.lock_manager.lock(key)):
- pass
\ No newline at end of file
+ pass
diff --git a/webclient/components/matrix/matrix-call.js b/webclient/components/matrix/matrix-call.js
index 2e3e2b0967..fd21198d24 100644
--- a/webclient/components/matrix/matrix-call.js
+++ b/webclient/components/matrix/matrix-call.js
@@ -47,6 +47,10 @@ angular.module('MatrixCall', [])
this.call_id = "c" + new Date().getTime();
this.state = 'fledgling';
this.didConnect = false;
+
+ // a queue for candidates waiting to go out. We try to amalgamate candidates into a single candidate message where possible
+ this.candidateSendQueue = [];
+ this.candidateSendTries = 0;
}
MatrixCall.prototype.createPeerConnection = function() {
@@ -174,12 +178,7 @@ angular.module('MatrixCall', [])
MatrixCall.prototype.gotLocalIceCandidate = function(event) {
console.log(event);
if (event.candidate) {
- var content = {
- version: 0,
- call_id: this.call_id,
- candidate: event.candidate
- };
- this.sendEventWithRetry('m.call.candidate', content);
+ this.sendCandidate(event.candidate);
}
}
@@ -370,5 +369,53 @@ angular.module('MatrixCall', [])
}, delayMs);
};
+ // Sends candidates with are sent in a special way because we try to amalgamate them into one message
+ MatrixCall.prototype.sendCandidate = function(content) {
+ this.candidateSendQueue.push(content);
+ var self = this;
+ if (this.candidateSendTries == 0) $timeout(function() { self.sendCandidateQueue(); }, 100);
+ };
+
+ MatrixCall.prototype.sendCandidateQueue = function(content) {
+ if (this.candidateSendQueue.length == 0) return;
+
+ var cands = this.candidateSendQueue;
+ this.candidateSendQueue = [];
+ ++this.candidateSendTries;
+ var content = {
+ version: 0,
+ call_id: this.call_id,
+ candidates: cands
+ };
+ var self = this;
+ console.log("Attempting to send "+cands.length+" candidates");
+ matrixService.sendEvent(self.room_id, 'm.call.candidates', undefined, content).then(function() { self.candsSent(); }, function(error) { self.candsSendFailed(cands, error); } );
+ };
+
+ MatrixCall.prototype.candsSent = function() {
+ this.candidateSendTries = 0;
+ this.sendCandidateQueue();
+ };
+
+ MatrixCall.prototype.candsSendFailed = function(cands, error) {
+ for (var i = 0; i < cands.length; ++i) {
+ this.candidateSendQueue.push(cands[i]);
+ }
+
+ if (this.candidateSendTries > 5) {
+ console.log("Failed to send candidates on attempt "+ev.tries+". Giving up for now.");
+ this.candidateSendTries = 0;
+ return;
+ }
+
+ var delayMs = 500 * Math.pow(2, this.candidateSendTries);
+ ++this.candidateSendTries;
+ console.log("Failed to send candidates. Retrying in "+delayMs+"ms");
+ var self = this;
+ $timeout(function() {
+ self.sendCandidateQueue();
+ }, delayMs);
+ };
+
return MatrixCall;
}]);
diff --git a/webclient/components/matrix/matrix-phone-service.js b/webclient/components/matrix/matrix-phone-service.js
index b0dcf19100..2d0732a8da 100644
--- a/webclient/components/matrix/matrix-phone-service.js
+++ b/webclient/components/matrix/matrix-phone-service.js
@@ -77,13 +77,15 @@ angular.module('matrixPhoneService', [])
return;
}
call.receivedAnswer(msg);
- } else if (event.type == 'm.call.candidate') {
+ } else if (event.type == 'm.call.candidates') {
var call = matrixPhoneService.allCalls[msg.call_id];
if (!call) {
- console.log("Got candidate for unknown call ID "+msg.call_id);
+ console.log("Got candidates for unknown call ID "+msg.call_id);
return;
}
- call.gotRemoteIceCandidate(msg.candidate);
+ for (var i = 0; i < msg.candidates.length; ++i) {
+ call.gotRemoteIceCandidate(msg.candidates[i]);
+ }
} else if (event.type == 'm.call.hangup') {
var call = matrixPhoneService.allCalls[msg.call_id];
if (!call) {
|
