Page MenuHomePhabricator
Files F7313441

No OneTemporary
Actions

View Options

diff --git a/sylk/applications/webrtcgateway/models/sylkrtc.py b/sylk/applications/webrtcgateway/models/sylkrtc.py
index 3ef018b..24d21de 100644
--- a/sylk/applications/webrtcgateway/models/sylkrtc.py
+++ b/sylk/applications/webrtcgateway/models/sylkrtc.py
@@ -1,224 +1,234 @@
+from collections import OrderedDict
from jsonmodels import models, fields, errors, validators
from sipsimple.core import SIPURI, SIPCoreError
__all__ = ('AccountAddRequest', 'AccountRemoveRequest', 'AccountRegisterRequest', 'AccountUnregisterRequest',
'SessionCreateRequest', 'SessionAnswerRequest', 'SessionTrickleRequest', 'SessionTerminateRequest',
'AckResponse', 'ErrorResponse',
'ReadyEvent', 'VideoRoomConfigurationEvent')
# Validators
class URIValidator(object):
@staticmethod
def validate(value):
if value.startswith(('sip:', 'sips:')):
uri = value
else:
uri = 'sip:' + value
try:
SIPURI.parse(uri)
except SIPCoreError:
raise errors.ValidationError('invalid URI: %s' % value)
class URIListValidator(object):
@staticmethod
def validate(values):
for item in values:
URIValidator.validate(item)
# Custom fields
class FixedValueField(fields.BaseField):
def __init__(self, value):
super(FixedValueField, self).__init__(required=True)
self.value = value
def validate(self, value):
if value != self.value:
raise errors.ValidationError('field value should be {!r}'.format(self.value))
# noinspection PyMethodOverriding
def get_default_value(self):
return self.value
class LimitedChoiceField(fields.BaseField):
def __init__(self, values):
super(LimitedChoiceField, self).__init__(required=True)
self.values = set(values)
def validate(self, value):
if value not in self.values:
raise errors.ValidationError('field value should be one of: {!s}'.format(', '.join(repr(item) for item in sorted(self.values))))
+class UniqueStringListField(fields.ListField):
+ def __init__(self, *args, **kw):
+ super(UniqueStringListField, self).__init__(items_types=[str, unicode], *args, **kw)
+
+ def parse_value(self, value):
+ # remove duplicate entries while preserving order
+ return OrderedDict.fromkeys(value).keys() if isinstance(value, self.types) else value
+
+
# Miscellaneous models
class ICECandidate(models.Base):
candidate = fields.StringField(required=True)
sdpMLineIndex = fields.IntField(required=True)
sdpMid = fields.StringField(required=True)
class ReadyEvent(models.Base):
sylkrtc = FixedValueField('event')
event = FixedValueField('ready')
class VideoRoomConfigurationEvent(models.Base):
sylkrtc = FixedValueField('videoroom_event') # todo: rename with dashes or underscores?
event = FixedValueField('configure-room')
session = fields.StringField(required=True)
originator = fields.StringField(required=True)
active_participants = fields.ListField([str, unicode], required=True, validators=[validators.Length(minimum_value=0, maximum_value=2)])
# Base models
class SylkRTCRequestBase(models.Base):
transaction = fields.StringField(required=True)
class SylkRTCResponseBase(models.Base):
transaction = fields.StringField(required=True)
class AccountRequestBase(SylkRTCRequestBase):
account = fields.StringField(required=True, validators=[URIValidator])
class SessionRequestBase(SylkRTCRequestBase):
session = fields.StringField(required=True)
class VideoRoomRequestBase(SylkRTCRequestBase):
session = fields.StringField(required=True)
# Response models
class AckResponse(SylkRTCResponseBase):
sylkrtc = FixedValueField('ack')
class ErrorResponse(SylkRTCResponseBase):
sylkrtc = FixedValueField('error')
error = fields.StringField(required=True)
# Account models
class AccountAddRequest(AccountRequestBase):
sylkrtc = FixedValueField('account-add')
password = fields.StringField(required=True, validators=[validators.Length(minimum_value=1, maximum_value=9999)])
display_name = fields.StringField(required=False)
user_agent = fields.StringField(required=False)
class AccountRemoveRequest(AccountRequestBase):
sylkrtc = FixedValueField('account-remove')
class AccountRegisterRequest(AccountRequestBase):
sylkrtc = FixedValueField('account-register')
class AccountUnregisterRequest(AccountRequestBase):
sylkrtc = FixedValueField('account-unregister')
class AccountDeviceTokenRequest(AccountRequestBase):
sylkrtc = FixedValueField('account-devicetoken')
old_token = fields.StringField(required=False)
new_token = fields.StringField(required=False)
# Session models
class SessionCreateRequest(SessionRequestBase):
sylkrtc = FixedValueField('session-create')
account = fields.StringField(required=True, validators=[URIValidator])
uri = fields.StringField(required=True, validators=[URIValidator])
sdp = fields.StringField(required=True)
class SessionAnswerRequest(SessionRequestBase):
sylkrtc = FixedValueField('session-answer')
sdp = fields.StringField(required=True)
class SessionTrickleRequest(SessionRequestBase):
sylkrtc = FixedValueField('session-trickle')
candidates = fields.ListField([ICECandidate])
class SessionTerminateRequest(SessionRequestBase):
sylkrtc = FixedValueField('session-terminate')
# VideoRoomControlRequest embedded models
class VideoRoomControlConfigureRoomOptions(models.Base):
active_participants = fields.ListField([str, unicode], validators=[validators.Length(minimum_value=0, maximum_value=2)])
class VideoRoomControlFeedAttachOptions(models.Base):
session = fields.StringField(required=True)
publisher = fields.StringField(required=True)
class VideoRoomControlFeedAnswerOptions(models.Base):
session = fields.StringField(required=True)
sdp = fields.StringField(required=True)
class VideoRoomControlFeedDetachOptions(models.Base):
session = fields.StringField(required=True)
class VideoRoomControlInviteParticipantsOptions(models.Base):
participants = fields.ListField([str, unicode], validators=[URIListValidator])
class VideoRoomControlTrickleOptions(models.Base):
# ID for the subscriber session, if specified, otherwise the publisher is considered
session = fields.StringField(required=False)
candidates = fields.ListField([ICECandidate])
class VideoRoomControlUpdateOptions(models.Base):
audio = fields.BoolField(required=False)
video = fields.BoolField(required=False)
bitrate = fields.IntField(required=False)
# VideoRoom models
class VideoRoomJoinRequest(VideoRoomRequestBase):
sylkrtc = FixedValueField('videoroom-join')
account = fields.StringField(required=True, validators=[URIValidator])
uri = fields.StringField(required=True, validators=[URIValidator])
sdp = fields.StringField(required=True)
class VideoRoomControlRequest(VideoRoomRequestBase):
sylkrtc = FixedValueField('videoroom-ctl')
option = LimitedChoiceField({'configure-room', 'feed-attach', 'feed-answer', 'feed-detach', 'invite-participants', 'trickle', 'update'})
# all other options should have optional fields below, and the application needs to do a little validation
configure_room = fields.EmbeddedField(VideoRoomControlConfigureRoomOptions, required=False)
feed_attach = fields.EmbeddedField(VideoRoomControlFeedAttachOptions, required=False)
feed_answer = fields.EmbeddedField(VideoRoomControlFeedAnswerOptions, required=False)
feed_detach = fields.EmbeddedField(VideoRoomControlFeedDetachOptions, required=False)
invite_participants = fields.EmbeddedField(VideoRoomControlInviteParticipantsOptions, required=False)
trickle = fields.EmbeddedField(VideoRoomControlTrickleOptions, required=False)
update = fields.EmbeddedField(VideoRoomControlUpdateOptions, required=False)
class VideoRoomTerminateRequest(VideoRoomRequestBase):
sylkrtc = FixedValueField('videoroom-terminate')

File Metadata

Mime Type
text/x-diff
Expires
Sat, Feb 1, 1:48 PM (1 d, 9 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3489370
Default Alt Text
(8 KB)

Event Timeline