From 75325b00f2b9cdb0a6274aa5b0d408b5a5d282ab Mon Sep 17 00:00:00 2001 From: jld3103 Date: Sun, 5 Nov 2023 16:35:06 +0100 Subject: [PATCH 1/6] feat(nextcloud): Add spreed internal signaling Signed-off-by: jld3103 --- .../nextcloud/lib/src/api/spreed.openapi.dart | 660 ++++- .../lib/src/api/spreed.openapi.g.dart | 2349 ++++++++++++++++- .../nextcloud/lib/src/api/spreed.openapi.json | 346 ++- .../patches/spreed/internal-signaling.json | 342 +++ packages/nextcloud/test/spreed_test.dart | 50 +- 5 files changed, 3459 insertions(+), 288 deletions(-) create mode 100644 packages/nextcloud/lib/src/patches/spreed/internal-signaling.json diff --git a/packages/nextcloud/lib/src/api/spreed.openapi.dart b/packages/nextcloud/lib/src/api/spreed.openapi.dart index 4ac2520c..56f424ba 100644 --- a/packages/nextcloud/lib/src/api/spreed.openapi.dart +++ b/packages/nextcloud/lib/src/api/spreed.openapi.dart @@ -12501,7 +12501,7 @@ class SignalingClient { /// See: /// * [sendMessagesRaw] for an experimental operation that returns a [DynamiteRawResponse] that can be serialized. Future> sendMessages({ - required final String messages, + required final ContentString> messages, required final String token, final SignalingSendMessagesApiVersion apiVersion = SignalingSendMessagesApiVersion.v3, final bool oCSAPIRequest = true, @@ -12537,7 +12537,7 @@ class SignalingClient { /// * [sendMessages] for an operation that returns a [DynamiteResponse] with a stable API. @experimental DynamiteRawResponse sendMessagesRaw({ - required final String messages, + required final ContentString> messages, required final String token, final SignalingSendMessagesApiVersion apiVersion = SignalingSendMessagesApiVersion.v3, final bool oCSAPIRequest = true, @@ -12564,7 +12564,12 @@ class SignalingClient { } // coverage:ignore-end - queryParameters['messages'] = messages; + queryParameters['messages'] = _jsonSerializers.serialize( + messages, + specifiedType: const FullType(ContentString, [ + FullType(BuiltList, [FullType(SignalingSendMessagesMessages)]), + ]), + ); dynamite_utils.checkPattern(token, RegExp(r'^[a-z0-9]{4,30}$'), 'token'); pathParameters['token'] = token; pathParameters['apiVersion'] = apiVersion.name; @@ -23343,26 +23348,352 @@ abstract class SignalingSession implements SignalingSessionInterface, Built? get builtListSignalingSession; - String? get string; +abstract interface class SignalingSessionsInterface { + String get type; + BuiltList get data; +} + +abstract class SignalingSessions + implements SignalingSessionsInterface, Built { + factory SignalingSessions([final void Function(SignalingSessionsBuilder)? b]) = _$SignalingSessions; + + // coverage:ignore-start + const SignalingSessions._(); + // coverage:ignore-end + + // coverage:ignore-start + factory SignalingSessions.fromJson(final Map json) => + _jsonSerializers.deserializeWith(serializer, json)!; + // coverage:ignore-end + + // coverage:ignore-start + Map toJson() => _jsonSerializers.serializeWith(serializer, this)! as Map; + // coverage:ignore-end + + static Serializer get serializer => _$signalingSessionsSerializer; +} + +class SignalingMessageType extends EnumClass { + const SignalingMessageType._(super.name); + + static const SignalingMessageType offer = _$signalingMessageTypeOffer; + + static const SignalingMessageType answer = _$signalingMessageTypeAnswer; + + static const SignalingMessageType candidate = _$signalingMessageTypeCandidate; + + static const SignalingMessageType unshareScreen = _$signalingMessageTypeUnshareScreen; + + @BuiltValueEnumConst(wireName: 'remove-candidates') + static const SignalingMessageType removeCandidates = _$signalingMessageTypeRemoveCandidates; + + static const SignalingMessageType control = _$signalingMessageTypeControl; + + static const SignalingMessageType forceMute = _$signalingMessageTypeForceMute; + + static const SignalingMessageType mute = _$signalingMessageTypeMute; + + static const SignalingMessageType unmute = _$signalingMessageTypeUnmute; + + static const SignalingMessageType nickChanged = _$signalingMessageTypeNickChanged; + + // coverage:ignore-start + static BuiltSet get values => _$signalingMessageTypeValues; + // coverage:ignore-end + + static SignalingMessageType valueOf(final String name) => _$valueOfSignalingMessageType(name); + + static Serializer get serializer => _$signalingMessageTypeSerializer; +} + +class SignalingRoomType extends EnumClass { + const SignalingRoomType._(super.name); + + static const SignalingRoomType video = _$signalingRoomTypeVideo; + + static const SignalingRoomType screen = _$signalingRoomTypeScreen; + + // coverage:ignore-start + static BuiltSet get values => _$signalingRoomTypeValues; + // coverage:ignore-end + + static SignalingRoomType valueOf(final String name) => _$valueOfSignalingRoomType(name); + + static Serializer get serializer => _$signalingRoomTypeSerializer; +} + +class SignalingSessionDescriptionMessage_Payload_Type extends EnumClass { + const SignalingSessionDescriptionMessage_Payload_Type._(super.name); + + static const SignalingSessionDescriptionMessage_Payload_Type offer = + _$signalingSessionDescriptionMessagePayloadTypeOffer; + + static const SignalingSessionDescriptionMessage_Payload_Type answer = + _$signalingSessionDescriptionMessagePayloadTypeAnswer; + + // coverage:ignore-start + static BuiltSet get values => + _$signalingSessionDescriptionMessagePayloadTypeValues; + // coverage:ignore-end + + static SignalingSessionDescriptionMessage_Payload_Type valueOf(final String name) => + _$valueOfSignalingSessionDescriptionMessage_Payload_Type(name); + + static Serializer get serializer => + _$signalingSessionDescriptionMessagePayloadTypeSerializer; +} + +@BuiltValue(instantiable: false) +abstract interface class SignalingSessionDescriptionMessage_PayloadInterface { + SignalingSessionDescriptionMessage_Payload_Type get type; + String get sdp; + String get nick; +} + +abstract class SignalingSessionDescriptionMessage_Payload + implements + SignalingSessionDescriptionMessage_PayloadInterface, + Built { + factory SignalingSessionDescriptionMessage_Payload([ + final void Function(SignalingSessionDescriptionMessage_PayloadBuilder)? b, + ]) = _$SignalingSessionDescriptionMessage_Payload; + + // coverage:ignore-start + const SignalingSessionDescriptionMessage_Payload._(); + // coverage:ignore-end + + // coverage:ignore-start + factory SignalingSessionDescriptionMessage_Payload.fromJson(final Map json) => + _jsonSerializers.deserializeWith(serializer, json)!; + // coverage:ignore-end + + // coverage:ignore-start + Map toJson() => _jsonSerializers.serializeWith(serializer, this)! as Map; + // coverage:ignore-end + + static Serializer get serializer => + _$signalingSessionDescriptionMessagePayloadSerializer; +} + +@BuiltValue(instantiable: false) +abstract interface class SignalingSessionDescriptionMessageInterface { + String get from; + String get to; + SignalingMessageType get type; + SignalingRoomType? get roomType; + String? get sid; + SignalingSessionDescriptionMessage_Payload get payload; +} + +abstract class SignalingSessionDescriptionMessage + implements + SignalingSessionDescriptionMessageInterface, + Built { + factory SignalingSessionDescriptionMessage([final void Function(SignalingSessionDescriptionMessageBuilder)? b]) = + _$SignalingSessionDescriptionMessage; + + // coverage:ignore-start + const SignalingSessionDescriptionMessage._(); + // coverage:ignore-end + + // coverage:ignore-start + factory SignalingSessionDescriptionMessage.fromJson(final Map json) => + _jsonSerializers.deserializeWith(serializer, json)!; + // coverage:ignore-end + + // coverage:ignore-start + Map toJson() => _jsonSerializers.serializeWith(serializer, this)! as Map; + // coverage:ignore-end + + static Serializer get serializer => + _$signalingSessionDescriptionMessageSerializer; +} + +@BuiltValue(instantiable: false) +abstract interface class SignalingICECandidateMessage_Payload_CandidateInterface { + int get sdpMLineIndex; + String get sdpMid; + String get candidate; +} + +abstract class SignalingICECandidateMessage_Payload_Candidate + implements + SignalingICECandidateMessage_Payload_CandidateInterface, + Built { + factory SignalingICECandidateMessage_Payload_Candidate([ + final void Function(SignalingICECandidateMessage_Payload_CandidateBuilder)? b, + ]) = _$SignalingICECandidateMessage_Payload_Candidate; + + // coverage:ignore-start + const SignalingICECandidateMessage_Payload_Candidate._(); + // coverage:ignore-end + + // coverage:ignore-start + factory SignalingICECandidateMessage_Payload_Candidate.fromJson(final Map json) => + _jsonSerializers.deserializeWith(serializer, json)!; + // coverage:ignore-end + + // coverage:ignore-start + Map toJson() => _jsonSerializers.serializeWith(serializer, this)! as Map; + // coverage:ignore-end + + static Serializer get serializer => + _$signalingICECandidateMessagePayloadCandidateSerializer; +} + +@BuiltValue(instantiable: false) +abstract interface class SignalingICECandidateMessage_PayloadInterface { + SignalingICECandidateMessage_Payload_Candidate get candidate; +} + +abstract class SignalingICECandidateMessage_Payload + implements + SignalingICECandidateMessage_PayloadInterface, + Built { + factory SignalingICECandidateMessage_Payload([final void Function(SignalingICECandidateMessage_PayloadBuilder)? b]) = + _$SignalingICECandidateMessage_Payload; + + // coverage:ignore-start + const SignalingICECandidateMessage_Payload._(); + // coverage:ignore-end + + // coverage:ignore-start + factory SignalingICECandidateMessage_Payload.fromJson(final Map json) => + _jsonSerializers.deserializeWith(serializer, json)!; + // coverage:ignore-end + + // coverage:ignore-start + Map toJson() => _jsonSerializers.serializeWith(serializer, this)! as Map; + // coverage:ignore-end + + static Serializer get serializer => + _$signalingICECandidateMessagePayloadSerializer; +} + +@BuiltValue(instantiable: false) +abstract interface class SignalingICECandidateMessageInterface { + String get from; + String get to; + SignalingMessageType get type; + SignalingRoomType? get roomType; + String? get sid; + SignalingICECandidateMessage_Payload get payload; +} + +abstract class SignalingICECandidateMessage + implements + SignalingICECandidateMessageInterface, + Built { + factory SignalingICECandidateMessage([final void Function(SignalingICECandidateMessageBuilder)? b]) = + _$SignalingICECandidateMessage; + + // coverage:ignore-start + const SignalingICECandidateMessage._(); + // coverage:ignore-end + + // coverage:ignore-start + factory SignalingICECandidateMessage.fromJson(final Map json) => + _jsonSerializers.deserializeWith(serializer, json)!; + // coverage:ignore-end + + // coverage:ignore-start + Map toJson() => _jsonSerializers.serializeWith(serializer, this)! as Map; + // coverage:ignore-end + + static Serializer get serializer => _$signalingICECandidateMessageSerializer; +} + +class SignalingMuteMessage_Payload_Name extends EnumClass { + const SignalingMuteMessage_Payload_Name._(super.name); + + static const SignalingMuteMessage_Payload_Name audio = _$signalingMuteMessagePayloadNameAudio; + + static const SignalingMuteMessage_Payload_Name video = _$signalingMuteMessagePayloadNameVideo; + + // coverage:ignore-start + static BuiltSet get values => _$signalingMuteMessagePayloadNameValues; + // coverage:ignore-end + + static SignalingMuteMessage_Payload_Name valueOf(final String name) => + _$valueOfSignalingMuteMessage_Payload_Name(name); + + static Serializer get serializer => _$signalingMuteMessagePayloadNameSerializer; +} + +@BuiltValue(instantiable: false) +abstract interface class SignalingMuteMessage_PayloadInterface { + SignalingMuteMessage_Payload_Name get name; } -abstract class SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data +abstract class SignalingMuteMessage_Payload implements - SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataInterface, - Built { - factory SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data([ - final void Function(SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder)? b, - ]) = _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data; + SignalingMuteMessage_PayloadInterface, + Built { + factory SignalingMuteMessage_Payload([final void Function(SignalingMuteMessage_PayloadBuilder)? b]) = + _$SignalingMuteMessage_Payload; + + // coverage:ignore-start + const SignalingMuteMessage_Payload._(); + // coverage:ignore-end + + // coverage:ignore-start + factory SignalingMuteMessage_Payload.fromJson(final Map json) => + _jsonSerializers.deserializeWith(serializer, json)!; + // coverage:ignore-end + + // coverage:ignore-start + Map toJson() => _jsonSerializers.serializeWith(serializer, this)! as Map; + // coverage:ignore-end + + static Serializer get serializer => _$signalingMuteMessagePayloadSerializer; +} + +@BuiltValue(instantiable: false) +abstract interface class SignalingMuteMessageInterface { + String get from; + String get to; + SignalingMessageType get type; + SignalingRoomType? get roomType; + String? get sid; + SignalingMuteMessage_Payload get payload; +} + +abstract class SignalingMuteMessage + implements SignalingMuteMessageInterface, Built { + factory SignalingMuteMessage([final void Function(SignalingMuteMessageBuilder)? b]) = _$SignalingMuteMessage; // coverage:ignore-start - const SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data._(); + const SignalingMuteMessage._(); // coverage:ignore-end // coverage:ignore-start - factory SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data.fromJson(final Map json) => + factory SignalingMuteMessage.fromJson(final Map json) => + _jsonSerializers.deserializeWith(serializer, json)!; + // coverage:ignore-end + + // coverage:ignore-start + Map toJson() => _jsonSerializers.serializeWith(serializer, this)! as Map; + // coverage:ignore-end + + static Serializer get serializer => _$signalingMuteMessageSerializer; +} + +@BuiltValue(instantiable: false) +abstract interface class SignalingMessageInterface { + SignalingSessionDescriptionMessage? get signalingSessionDescriptionMessage; + SignalingICECandidateMessage? get signalingICECandidateMessage; + SignalingMuteMessage? get signalingMuteMessage; +} + +abstract class SignalingMessage implements SignalingMessageInterface, Built { + factory SignalingMessage([final void Function(SignalingMessageBuilder)? b]) = _$SignalingMessage; + + // coverage:ignore-start + const SignalingMessage._(); + // coverage:ignore-end + + // coverage:ignore-start + factory SignalingMessage.fromJson(final Map json) => _jsonSerializers.deserializeWith(serializer, json)!; // coverage:ignore-end @@ -23371,86 +23702,113 @@ abstract class SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data // coverage:ignore-end @BuiltValueSerializer(custom: true) - static Serializer get serializer => - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataSerializer(); + static Serializer get serializer => _$SignalingMessageSerializer(); JsonObject get data; @BuiltValueHook(finalizeBuilder: true) - static void _validate(final SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder b) { + static void _validate(final SignalingMessageBuilder b) { // When this is rebuild from another builder if (b._data == null) { return; } - final match = [b._builtListSignalingSession, b._string].singleWhereOrNull((final x) => x != null); + final match = [b._signalingSessionDescriptionMessage, b._signalingICECandidateMessage, b._signalingMuteMessage] + .singleWhereOrNull((final x) => x != null); if (match == null) { - throw StateError("Need exactly one of 'builtListSignalingSession', 'string' for ${b._data}"); + throw StateError( + "Need exactly one of 'signalingSessionDescriptionMessage', 'signalingICECandidateMessage', 'signalingMuteMessage' for ${b._data}", + ); } } } -class _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataSerializer - implements PrimitiveSerializer { +class _$SignalingMessageSerializer implements PrimitiveSerializer { @override - final Iterable types = const [ - SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data, - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data, - ]; + final Iterable types = const [SignalingMessage, _$SignalingMessage]; @override - final String wireName = 'SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data'; + final String wireName = 'SignalingMessage'; @override Object serialize( final Serializers serializers, - final SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data object, { + final SignalingMessage object, { final FullType specifiedType = FullType.unspecified, }) => object.data.value; @override - SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data deserialize( + SignalingMessage deserialize( final Serializers serializers, final Object data, { final FullType specifiedType = FullType.unspecified, }) { - final result = SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder()..data = JsonObject(data); - try { - final value = _jsonSerializers.deserialize( - data, - specifiedType: const FullType(BuiltList, [FullType(SignalingSession)]), - )! as BuiltList; - result.builtListSignalingSession.replace(value); - } catch (_) {} - try { - final value = _jsonSerializers.deserialize(data, specifiedType: const FullType(String))! as String; - result.string = value; - } catch (_) {} + final result = SignalingMessageBuilder()..data = JsonObject(data); + if (data is! Iterable) { + throw StateError('Expected an Iterable but got ${data.runtimeType}'); + } + String? discriminator; + final iterator = data.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + if (key == 'type') { + discriminator = value! as String; + break; + } + } + if (discriminator == 'SignalingSessionDescriptionMessage' || + discriminator == 'offer' || + discriminator == 'answer') { + try { + final value = _jsonSerializers.deserialize( + data, + specifiedType: const FullType(SignalingSessionDescriptionMessage), + )! as SignalingSessionDescriptionMessage; + result.signalingSessionDescriptionMessage.replace(value); + } catch (_) { + rethrow; + } + } + if (discriminator == 'SignalingICECandidateMessage' || discriminator == 'candidate') { + try { + final value = _jsonSerializers.deserialize(data, specifiedType: const FullType(SignalingICECandidateMessage))! + as SignalingICECandidateMessage; + result.signalingICECandidateMessage.replace(value); + } catch (_) { + rethrow; + } + } + if (discriminator == 'SignalingMuteMessage' || discriminator == 'mute' || discriminator == 'unmute') { + try { + final value = _jsonSerializers.deserialize(data, specifiedType: const FullType(SignalingMuteMessage))! + as SignalingMuteMessage; + result.signalingMuteMessage.replace(value); + } catch (_) { + rethrow; + } + } return result.build(); } } @BuiltValue(instantiable: false) -abstract interface class SignalingPullMessagesResponseApplicationJson_Ocs_DataInterface { +abstract interface class SignalingMessageWrapperInterface { String get type; - SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data get data; + ContentString get data; } -abstract class SignalingPullMessagesResponseApplicationJson_Ocs_Data - implements - SignalingPullMessagesResponseApplicationJson_Ocs_DataInterface, - Built { - factory SignalingPullMessagesResponseApplicationJson_Ocs_Data([ - final void Function(SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder)? b, - ]) = _$SignalingPullMessagesResponseApplicationJson_Ocs_Data; +abstract class SignalingMessageWrapper + implements SignalingMessageWrapperInterface, Built { + factory SignalingMessageWrapper([final void Function(SignalingMessageWrapperBuilder)? b]) = _$SignalingMessageWrapper; // coverage:ignore-start - const SignalingPullMessagesResponseApplicationJson_Ocs_Data._(); + const SignalingMessageWrapper._(); // coverage:ignore-end // coverage:ignore-start - factory SignalingPullMessagesResponseApplicationJson_Ocs_Data.fromJson(final Map json) => + factory SignalingMessageWrapper.fromJson(final Map json) => _jsonSerializers.deserializeWith(serializer, json)!; // coverage:ignore-end @@ -23458,14 +23816,111 @@ abstract class SignalingPullMessagesResponseApplicationJson_Ocs_Data Map toJson() => _jsonSerializers.serializeWith(serializer, this)! as Map; // coverage:ignore-end - static Serializer get serializer => - _$signalingPullMessagesResponseApplicationJsonOcsDataSerializer; + static Serializer get serializer => _$signalingMessageWrapperSerializer; +} + +@BuiltValue(instantiable: false) +abstract interface class SignalingDataInterface { + SignalingSessions? get signalingSessions; + SignalingMessageWrapper? get signalingMessageWrapper; +} + +abstract class SignalingData implements SignalingDataInterface, Built { + factory SignalingData([final void Function(SignalingDataBuilder)? b]) = _$SignalingData; + + // coverage:ignore-start + const SignalingData._(); + // coverage:ignore-end + + // coverage:ignore-start + factory SignalingData.fromJson(final Map json) => + _jsonSerializers.deserializeWith(serializer, json)!; + // coverage:ignore-end + + // coverage:ignore-start + Map toJson() => _jsonSerializers.serializeWith(serializer, this)! as Map; + // coverage:ignore-end + + @BuiltValueSerializer(custom: true) + static Serializer get serializer => _$SignalingDataSerializer(); + + JsonObject get data; + @BuiltValueHook(finalizeBuilder: true) + static void _validate(final SignalingDataBuilder b) { + // When this is rebuild from another builder + if (b._data == null) { + return; + } + + final match = [b._signalingSessions, b._signalingMessageWrapper].singleWhereOrNull((final x) => x != null); + if (match == null) { + throw StateError("Need exactly one of 'signalingSessions', 'signalingMessageWrapper' for ${b._data}"); + } + } +} + +class _$SignalingDataSerializer implements PrimitiveSerializer { + @override + final Iterable types = const [SignalingData, _$SignalingData]; + + @override + final String wireName = 'SignalingData'; + + @override + Object serialize( + final Serializers serializers, + final SignalingData object, { + final FullType specifiedType = FullType.unspecified, + }) => + object.data.value; + + @override + SignalingData deserialize( + final Serializers serializers, + final Object data, { + final FullType specifiedType = FullType.unspecified, + }) { + final result = SignalingDataBuilder()..data = JsonObject(data); + if (data is! Iterable) { + throw StateError('Expected an Iterable but got ${data.runtimeType}'); + } + String? discriminator; + final iterator = data.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + if (key == 'type') { + discriminator = value! as String; + break; + } + } + if (discriminator == 'SignalingSessions' || discriminator == 'usersInRoom') { + try { + final value = + _jsonSerializers.deserialize(data, specifiedType: const FullType(SignalingSessions))! as SignalingSessions; + result.signalingSessions.replace(value); + } catch (_) { + rethrow; + } + } + if (discriminator == 'SignalingMessageWrapper' || discriminator == 'message') { + try { + final value = _jsonSerializers.deserialize(data, specifiedType: const FullType(SignalingMessageWrapper))! + as SignalingMessageWrapper; + result.signalingMessageWrapper.replace(value); + } catch (_) { + rethrow; + } + } + return result.build(); + } } @BuiltValue(instantiable: false) abstract interface class SignalingPullMessagesResponseApplicationJson_OcsInterface { OCSMeta get meta; - BuiltList get data; + BuiltList get data; } abstract class SignalingPullMessagesResponseApplicationJson_Ocs @@ -23524,6 +23979,39 @@ abstract class SignalingPullMessagesResponseApplicationJson _$signalingPullMessagesResponseApplicationJsonSerializer; } +@BuiltValue(instantiable: false) +abstract interface class SignalingSendMessagesMessagesInterface { + String get ev; + ContentString get fn; + String get sessionId; +} + +abstract class SignalingSendMessagesMessages + implements + SignalingSendMessagesMessagesInterface, + Built { + factory SignalingSendMessagesMessages([final void Function(SignalingSendMessagesMessagesBuilder)? b]) = + _$SignalingSendMessagesMessages; + + // coverage:ignore-start + const SignalingSendMessagesMessages._(); + // coverage:ignore-end + + // coverage:ignore-start + factory SignalingSendMessagesMessages.fromJson(final Map json) => + _jsonSerializers.deserializeWith(serializer, json)!; + // coverage:ignore-end + + // coverage:ignore-start + Map toJson() => _jsonSerializers.serializeWith(serializer, this)! as Map; + // coverage:ignore-end + + static Serializer get serializer => _$signalingSendMessagesMessagesSerializer; + + @BuiltValueHook(initializeBuilder: true) + static void _defaults(final SignalingSendMessagesMessagesBuilder b) => b..ev = 'message'; +} + class SignalingSendMessagesApiVersion extends EnumClass { const SignalingSendMessagesApiVersion._(super.name); @@ -25511,22 +25999,60 @@ final Serializers _serializers = (Serializers().toBuilder() SignalingPullMessagesResponseApplicationJson_Ocs.new, ) ..add(SignalingPullMessagesResponseApplicationJson_Ocs.serializer) + ..addBuilderFactory(const FullType(SignalingData), SignalingData.new) + ..add(SignalingData.serializer) + ..addBuilderFactory(const FullType(SignalingSessions), SignalingSessions.new) + ..add(SignalingSessions.serializer) + ..addBuilderFactory(const FullType(SignalingSession), SignalingSession.new) + ..add(SignalingSession.serializer) + ..addBuilderFactory(const FullType(BuiltList, [FullType(SignalingSession)]), ListBuilder.new) + ..addBuilderFactory(const FullType(SignalingMessageWrapper), SignalingMessageWrapper.new) + ..add(SignalingMessageWrapper.serializer) + ..addBuilderFactory(const FullType(SignalingMessage), SignalingMessage.new) + ..add(SignalingMessage.serializer) + ..addBuilderFactory(const FullType(SignalingSessionDescriptionMessage), SignalingSessionDescriptionMessage.new) + ..add(SignalingSessionDescriptionMessage.serializer) + ..add(SignalingMessageType.serializer) + ..add(SignalingRoomType.serializer) ..addBuilderFactory( - const FullType(SignalingPullMessagesResponseApplicationJson_Ocs_Data), - SignalingPullMessagesResponseApplicationJson_Ocs_Data.new, + const FullType(SignalingSessionDescriptionMessage_Payload), + SignalingSessionDescriptionMessage_Payload.new, ) - ..add(SignalingPullMessagesResponseApplicationJson_Ocs_Data.serializer) + ..add(SignalingSessionDescriptionMessage_Payload.serializer) + ..add(SignalingSessionDescriptionMessage_Payload_Type.serializer) + ..addBuilderFactory(const FullType(SignalingICECandidateMessage), SignalingICECandidateMessage.new) + ..add(SignalingICECandidateMessage.serializer) ..addBuilderFactory( - const FullType(SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data), - SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data.new, + const FullType(SignalingICECandidateMessage_Payload), + SignalingICECandidateMessage_Payload.new, ) - ..add(SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data.serializer) - ..addBuilderFactory(const FullType(SignalingSession), SignalingSession.new) - ..add(SignalingSession.serializer) - ..addBuilderFactory(const FullType(BuiltList, [FullType(SignalingSession)]), ListBuilder.new) + ..add(SignalingICECandidateMessage_Payload.serializer) + ..addBuilderFactory( + const FullType(SignalingICECandidateMessage_Payload_Candidate), + SignalingICECandidateMessage_Payload_Candidate.new, + ) + ..add(SignalingICECandidateMessage_Payload_Candidate.serializer) + ..addBuilderFactory(const FullType(SignalingMuteMessage), SignalingMuteMessage.new) + ..add(SignalingMuteMessage.serializer) + ..addBuilderFactory(const FullType(SignalingMuteMessage_Payload), SignalingMuteMessage_Payload.new) + ..add(SignalingMuteMessage_Payload.serializer) + ..add(SignalingMuteMessage_Payload_Name.serializer) + ..addBuilderFactory( + const FullType(ContentString, [FullType(SignalingMessage)]), + ContentString.new, + ) + ..addBuilderFactory(const FullType(BuiltList, [FullType(SignalingData)]), ListBuilder.new) + ..addBuilderFactory(const FullType(SignalingSendMessagesMessages), SignalingSendMessagesMessages.new) + ..add(SignalingSendMessagesMessages.serializer) ..addBuilderFactory( - const FullType(BuiltList, [FullType(SignalingPullMessagesResponseApplicationJson_Ocs_Data)]), - ListBuilder.new, + const FullType(BuiltList, [FullType(SignalingSendMessagesMessages)]), + ListBuilder.new, + ) + ..addBuilderFactory( + const FullType(ContentString, [ + FullType(BuiltList, [FullType(SignalingSendMessagesMessages)]), + ]), + ContentString>.new, ) ..add(SignalingSendMessagesApiVersion.serializer) ..addBuilderFactory( diff --git a/packages/nextcloud/lib/src/api/spreed.openapi.g.dart b/packages/nextcloud/lib/src/api/spreed.openapi.g.dart index 8ecbe54f..fd937cf2 100644 --- a/packages/nextcloud/lib/src/api/spreed.openapi.g.dart +++ b/packages/nextcloud/lib/src/api/spreed.openapi.g.dart @@ -1821,6 +1821,121 @@ final BuiltSet _$signalingPullMessagesApiVersio _$signalingPullMessagesApiVersionV3, ]); +const SignalingMessageType _$signalingMessageTypeOffer = SignalingMessageType._('offer'); +const SignalingMessageType _$signalingMessageTypeAnswer = SignalingMessageType._('answer'); +const SignalingMessageType _$signalingMessageTypeCandidate = SignalingMessageType._('candidate'); +const SignalingMessageType _$signalingMessageTypeUnshareScreen = SignalingMessageType._('unshareScreen'); +const SignalingMessageType _$signalingMessageTypeRemoveCandidates = SignalingMessageType._('removeCandidates'); +const SignalingMessageType _$signalingMessageTypeControl = SignalingMessageType._('control'); +const SignalingMessageType _$signalingMessageTypeForceMute = SignalingMessageType._('forceMute'); +const SignalingMessageType _$signalingMessageTypeMute = SignalingMessageType._('mute'); +const SignalingMessageType _$signalingMessageTypeUnmute = SignalingMessageType._('unmute'); +const SignalingMessageType _$signalingMessageTypeNickChanged = SignalingMessageType._('nickChanged'); + +SignalingMessageType _$valueOfSignalingMessageType(String name) { + switch (name) { + case 'offer': + return _$signalingMessageTypeOffer; + case 'answer': + return _$signalingMessageTypeAnswer; + case 'candidate': + return _$signalingMessageTypeCandidate; + case 'unshareScreen': + return _$signalingMessageTypeUnshareScreen; + case 'removeCandidates': + return _$signalingMessageTypeRemoveCandidates; + case 'control': + return _$signalingMessageTypeControl; + case 'forceMute': + return _$signalingMessageTypeForceMute; + case 'mute': + return _$signalingMessageTypeMute; + case 'unmute': + return _$signalingMessageTypeUnmute; + case 'nickChanged': + return _$signalingMessageTypeNickChanged; + default: + throw ArgumentError(name); + } +} + +final BuiltSet _$signalingMessageTypeValues = + BuiltSet(const [ + _$signalingMessageTypeOffer, + _$signalingMessageTypeAnswer, + _$signalingMessageTypeCandidate, + _$signalingMessageTypeUnshareScreen, + _$signalingMessageTypeRemoveCandidates, + _$signalingMessageTypeControl, + _$signalingMessageTypeForceMute, + _$signalingMessageTypeMute, + _$signalingMessageTypeUnmute, + _$signalingMessageTypeNickChanged, +]); + +const SignalingRoomType _$signalingRoomTypeVideo = SignalingRoomType._('video'); +const SignalingRoomType _$signalingRoomTypeScreen = SignalingRoomType._('screen'); + +SignalingRoomType _$valueOfSignalingRoomType(String name) { + switch (name) { + case 'video': + return _$signalingRoomTypeVideo; + case 'screen': + return _$signalingRoomTypeScreen; + default: + throw ArgumentError(name); + } +} + +final BuiltSet _$signalingRoomTypeValues = BuiltSet(const [ + _$signalingRoomTypeVideo, + _$signalingRoomTypeScreen, +]); + +const SignalingSessionDescriptionMessage_Payload_Type _$signalingSessionDescriptionMessagePayloadTypeOffer = + SignalingSessionDescriptionMessage_Payload_Type._('offer'); +const SignalingSessionDescriptionMessage_Payload_Type _$signalingSessionDescriptionMessagePayloadTypeAnswer = + SignalingSessionDescriptionMessage_Payload_Type._('answer'); + +SignalingSessionDescriptionMessage_Payload_Type _$valueOfSignalingSessionDescriptionMessage_Payload_Type(String name) { + switch (name) { + case 'offer': + return _$signalingSessionDescriptionMessagePayloadTypeOffer; + case 'answer': + return _$signalingSessionDescriptionMessagePayloadTypeAnswer; + default: + throw ArgumentError(name); + } +} + +final BuiltSet _$signalingSessionDescriptionMessagePayloadTypeValues = + BuiltSet(const [ + _$signalingSessionDescriptionMessagePayloadTypeOffer, + _$signalingSessionDescriptionMessagePayloadTypeAnswer, +]); + +const SignalingMuteMessage_Payload_Name _$signalingMuteMessagePayloadNameAudio = + SignalingMuteMessage_Payload_Name._('audio'); +const SignalingMuteMessage_Payload_Name _$signalingMuteMessagePayloadNameVideo = + SignalingMuteMessage_Payload_Name._('video'); + +SignalingMuteMessage_Payload_Name _$valueOfSignalingMuteMessage_Payload_Name(String name) { + switch (name) { + case 'audio': + return _$signalingMuteMessagePayloadNameAudio; + case 'video': + return _$signalingMuteMessagePayloadNameVideo; + default: + throw ArgumentError(name); + } +} + +final BuiltSet _$signalingMuteMessagePayloadNameValues = + BuiltSet(const [ + _$signalingMuteMessagePayloadNameAudio, + _$signalingMuteMessagePayloadNameVideo, +]); + const SignalingSendMessagesApiVersion _$signalingSendMessagesApiVersionV3 = SignalingSendMessagesApiVersion._('v3'); SignalingSendMessagesApiVersion _$valueOfSignalingSendMessagesApiVersion(String name) { @@ -2591,14 +2706,34 @@ Serializer Serializer _$signalingPullMessagesApiVersionSerializer = _$SignalingPullMessagesApiVersionSerializer(); Serializer _$signalingSessionSerializer = _$SignalingSessionSerializer(); -Serializer - _$signalingPullMessagesResponseApplicationJsonOcsDataSerializer = - _$SignalingPullMessagesResponseApplicationJson_Ocs_DataSerializer(); +Serializer _$signalingSessionsSerializer = _$SignalingSessionsSerializer(); +Serializer _$signalingMessageTypeSerializer = _$SignalingMessageTypeSerializer(); +Serializer _$signalingRoomTypeSerializer = _$SignalingRoomTypeSerializer(); +Serializer _$signalingSessionDescriptionMessagePayloadTypeSerializer = + _$SignalingSessionDescriptionMessage_Payload_TypeSerializer(); +Serializer _$signalingSessionDescriptionMessagePayloadSerializer = + _$SignalingSessionDescriptionMessage_PayloadSerializer(); +Serializer _$signalingSessionDescriptionMessageSerializer = + _$SignalingSessionDescriptionMessageSerializer(); +Serializer _$signalingICECandidateMessagePayloadCandidateSerializer = + _$SignalingICECandidateMessage_Payload_CandidateSerializer(); +Serializer _$signalingICECandidateMessagePayloadSerializer = + _$SignalingICECandidateMessage_PayloadSerializer(); +Serializer _$signalingICECandidateMessageSerializer = + _$SignalingICECandidateMessageSerializer(); +Serializer _$signalingMuteMessagePayloadNameSerializer = + _$SignalingMuteMessage_Payload_NameSerializer(); +Serializer _$signalingMuteMessagePayloadSerializer = + _$SignalingMuteMessage_PayloadSerializer(); +Serializer _$signalingMuteMessageSerializer = _$SignalingMuteMessageSerializer(); +Serializer _$signalingMessageWrapperSerializer = _$SignalingMessageWrapperSerializer(); Serializer _$signalingPullMessagesResponseApplicationJsonOcsSerializer = _$SignalingPullMessagesResponseApplicationJson_OcsSerializer(); Serializer _$signalingPullMessagesResponseApplicationJsonSerializer = _$SignalingPullMessagesResponseApplicationJsonSerializer(); +Serializer _$signalingSendMessagesMessagesSerializer = + _$SignalingSendMessagesMessagesSerializer(); Serializer _$signalingSendMessagesApiVersionSerializer = _$SignalingSendMessagesApiVersionSerializer(); Serializer @@ -16854,35 +16989,562 @@ class _$SignalingSessionSerializer implements StructuredSerializer { +class _$SignalingSessionsSerializer implements StructuredSerializer { + @override + final Iterable types = const [SignalingSessions, _$SignalingSessions]; + @override + final String wireName = 'SignalingSessions'; + + @override + Iterable serialize(Serializers serializers, SignalingSessions object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'type', + serializers.serialize(object.type, specifiedType: const FullType(String)), + 'data', + serializers.serialize(object.data, specifiedType: const FullType(BuiltList, [FullType(SignalingSession)])), + ]; + + return result; + } + + @override + SignalingSessions deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = SignalingSessionsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'type': + result.type = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + case 'data': + result.data.replace(serializers.deserialize(value, + specifiedType: const FullType(BuiltList, [FullType(SignalingSession)]))! as BuiltList); + break; + } + } + + return result.build(); + } +} + +class _$SignalingMessageTypeSerializer implements PrimitiveSerializer { + static const Map _toWire = { + 'removeCandidates': 'remove-candidates', + }; + static const Map _fromWire = { + 'remove-candidates': 'removeCandidates', + }; + + @override + final Iterable types = const [SignalingMessageType]; + @override + final String wireName = 'SignalingMessageType'; + + @override + Object serialize(Serializers serializers, SignalingMessageType object, + {FullType specifiedType = FullType.unspecified}) => + _toWire[object.name] ?? object.name; + + @override + SignalingMessageType deserialize(Serializers serializers, Object serialized, + {FullType specifiedType = FullType.unspecified}) => + SignalingMessageType.valueOf(_fromWire[serialized] ?? (serialized is String ? serialized : '')); +} + +class _$SignalingRoomTypeSerializer implements PrimitiveSerializer { + @override + final Iterable types = const [SignalingRoomType]; + @override + final String wireName = 'SignalingRoomType'; + + @override + Object serialize(Serializers serializers, SignalingRoomType object, + {FullType specifiedType = FullType.unspecified}) => + object.name; + + @override + SignalingRoomType deserialize(Serializers serializers, Object serialized, + {FullType specifiedType = FullType.unspecified}) => + SignalingRoomType.valueOf(serialized as String); +} + +class _$SignalingSessionDescriptionMessage_Payload_TypeSerializer + implements PrimitiveSerializer { + @override + final Iterable types = const [SignalingSessionDescriptionMessage_Payload_Type]; + @override + final String wireName = 'SignalingSessionDescriptionMessage_Payload_Type'; + + @override + Object serialize(Serializers serializers, SignalingSessionDescriptionMessage_Payload_Type object, + {FullType specifiedType = FullType.unspecified}) => + object.name; + + @override + SignalingSessionDescriptionMessage_Payload_Type deserialize(Serializers serializers, Object serialized, + {FullType specifiedType = FullType.unspecified}) => + SignalingSessionDescriptionMessage_Payload_Type.valueOf(serialized as String); +} + +class _$SignalingSessionDescriptionMessage_PayloadSerializer + implements StructuredSerializer { @override final Iterable types = const [ - SignalingPullMessagesResponseApplicationJson_Ocs_Data, - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data + SignalingSessionDescriptionMessage_Payload, + _$SignalingSessionDescriptionMessage_Payload ]; @override - final String wireName = 'SignalingPullMessagesResponseApplicationJson_Ocs_Data'; + final String wireName = 'SignalingSessionDescriptionMessage_Payload'; + + @override + Iterable serialize(Serializers serializers, SignalingSessionDescriptionMessage_Payload object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'type', + serializers.serialize(object.type, + specifiedType: const FullType(SignalingSessionDescriptionMessage_Payload_Type)), + 'sdp', + serializers.serialize(object.sdp, specifiedType: const FullType(String)), + 'nick', + serializers.serialize(object.nick, specifiedType: const FullType(String)), + ]; + + return result; + } + + @override + SignalingSessionDescriptionMessage_Payload deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = SignalingSessionDescriptionMessage_PayloadBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'type': + result.type = serializers.deserialize(value, + specifiedType: const FullType(SignalingSessionDescriptionMessage_Payload_Type))! + as SignalingSessionDescriptionMessage_Payload_Type; + break; + case 'sdp': + result.sdp = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + case 'nick': + result.nick = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + } + } + + return result.build(); + } +} + +class _$SignalingSessionDescriptionMessageSerializer + implements StructuredSerializer { @override - Iterable serialize(Serializers serializers, SignalingPullMessagesResponseApplicationJson_Ocs_Data object, + final Iterable types = const [SignalingSessionDescriptionMessage, _$SignalingSessionDescriptionMessage]; + @override + final String wireName = 'SignalingSessionDescriptionMessage'; + + @override + Iterable serialize(Serializers serializers, SignalingSessionDescriptionMessage object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'from', + serializers.serialize(object.from, specifiedType: const FullType(String)), + 'to', + serializers.serialize(object.to, specifiedType: const FullType(String)), + 'type', + serializers.serialize(object.type, specifiedType: const FullType(SignalingMessageType)), + 'payload', + serializers.serialize(object.payload, specifiedType: const FullType(SignalingSessionDescriptionMessage_Payload)), + ]; + Object? value; + value = object.roomType; + if (value != null) { + result + ..add('roomType') + ..add(serializers.serialize(value, specifiedType: const FullType(SignalingRoomType))); + } + value = object.sid; + if (value != null) { + result + ..add('sid') + ..add(serializers.serialize(value, specifiedType: const FullType(String))); + } + return result; + } + + @override + SignalingSessionDescriptionMessage deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = SignalingSessionDescriptionMessageBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'from': + result.from = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + case 'to': + result.to = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + case 'type': + result.type = serializers.deserialize(value, specifiedType: const FullType(SignalingMessageType))! + as SignalingMessageType; + break; + case 'roomType': + result.roomType = + serializers.deserialize(value, specifiedType: const FullType(SignalingRoomType)) as SignalingRoomType?; + break; + case 'sid': + result.sid = serializers.deserialize(value, specifiedType: const FullType(String)) as String?; + break; + case 'payload': + result.payload.replace( + serializers.deserialize(value, specifiedType: const FullType(SignalingSessionDescriptionMessage_Payload))! + as SignalingSessionDescriptionMessage_Payload); + break; + } + } + + return result.build(); + } +} + +class _$SignalingICECandidateMessage_Payload_CandidateSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + SignalingICECandidateMessage_Payload_Candidate, + _$SignalingICECandidateMessage_Payload_Candidate + ]; + @override + final String wireName = 'SignalingICECandidateMessage_Payload_Candidate'; + + @override + Iterable serialize(Serializers serializers, SignalingICECandidateMessage_Payload_Candidate object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'sdpMLineIndex', + serializers.serialize(object.sdpMLineIndex, specifiedType: const FullType(int)), + 'sdpMid', + serializers.serialize(object.sdpMid, specifiedType: const FullType(String)), + 'candidate', + serializers.serialize(object.candidate, specifiedType: const FullType(String)), + ]; + + return result; + } + + @override + SignalingICECandidateMessage_Payload_Candidate deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = SignalingICECandidateMessage_Payload_CandidateBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'sdpMLineIndex': + result.sdpMLineIndex = serializers.deserialize(value, specifiedType: const FullType(int))! as int; + break; + case 'sdpMid': + result.sdpMid = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + case 'candidate': + result.candidate = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + } + } + + return result.build(); + } +} + +class _$SignalingICECandidateMessage_PayloadSerializer + implements StructuredSerializer { + @override + final Iterable types = const [SignalingICECandidateMessage_Payload, _$SignalingICECandidateMessage_Payload]; + @override + final String wireName = 'SignalingICECandidateMessage_Payload'; + + @override + Iterable serialize(Serializers serializers, SignalingICECandidateMessage_Payload object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'candidate', + serializers.serialize(object.candidate, + specifiedType: const FullType(SignalingICECandidateMessage_Payload_Candidate)), + ]; + + return result; + } + + @override + SignalingICECandidateMessage_Payload deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = SignalingICECandidateMessage_PayloadBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'candidate': + result.candidate.replace(serializers.deserialize(value, + specifiedType: const FullType(SignalingICECandidateMessage_Payload_Candidate))! + as SignalingICECandidateMessage_Payload_Candidate); + break; + } + } + + return result.build(); + } +} + +class _$SignalingICECandidateMessageSerializer implements StructuredSerializer { + @override + final Iterable types = const [SignalingICECandidateMessage, _$SignalingICECandidateMessage]; + @override + final String wireName = 'SignalingICECandidateMessage'; + + @override + Iterable serialize(Serializers serializers, SignalingICECandidateMessage object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'from', + serializers.serialize(object.from, specifiedType: const FullType(String)), + 'to', + serializers.serialize(object.to, specifiedType: const FullType(String)), + 'type', + serializers.serialize(object.type, specifiedType: const FullType(SignalingMessageType)), + 'payload', + serializers.serialize(object.payload, specifiedType: const FullType(SignalingICECandidateMessage_Payload)), + ]; + Object? value; + value = object.roomType; + if (value != null) { + result + ..add('roomType') + ..add(serializers.serialize(value, specifiedType: const FullType(SignalingRoomType))); + } + value = object.sid; + if (value != null) { + result + ..add('sid') + ..add(serializers.serialize(value, specifiedType: const FullType(String))); + } + return result; + } + + @override + SignalingICECandidateMessage deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = SignalingICECandidateMessageBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'from': + result.from = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + case 'to': + result.to = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + case 'type': + result.type = serializers.deserialize(value, specifiedType: const FullType(SignalingMessageType))! + as SignalingMessageType; + break; + case 'roomType': + result.roomType = + serializers.deserialize(value, specifiedType: const FullType(SignalingRoomType)) as SignalingRoomType?; + break; + case 'sid': + result.sid = serializers.deserialize(value, specifiedType: const FullType(String)) as String?; + break; + case 'payload': + result.payload.replace( + serializers.deserialize(value, specifiedType: const FullType(SignalingICECandidateMessage_Payload))! + as SignalingICECandidateMessage_Payload); + break; + } + } + + return result.build(); + } +} + +class _$SignalingMuteMessage_Payload_NameSerializer implements PrimitiveSerializer { + @override + final Iterable types = const [SignalingMuteMessage_Payload_Name]; + @override + final String wireName = 'SignalingMuteMessage_Payload_Name'; + + @override + Object serialize(Serializers serializers, SignalingMuteMessage_Payload_Name object, + {FullType specifiedType = FullType.unspecified}) => + object.name; + + @override + SignalingMuteMessage_Payload_Name deserialize(Serializers serializers, Object serialized, + {FullType specifiedType = FullType.unspecified}) => + SignalingMuteMessage_Payload_Name.valueOf(serialized as String); +} + +class _$SignalingMuteMessage_PayloadSerializer implements StructuredSerializer { + @override + final Iterable types = const [SignalingMuteMessage_Payload, _$SignalingMuteMessage_Payload]; + @override + final String wireName = 'SignalingMuteMessage_Payload'; + + @override + Iterable serialize(Serializers serializers, SignalingMuteMessage_Payload object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'name', + serializers.serialize(object.name, specifiedType: const FullType(SignalingMuteMessage_Payload_Name)), + ]; + + return result; + } + + @override + SignalingMuteMessage_Payload deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = SignalingMuteMessage_PayloadBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'name': + result.name = serializers.deserialize(value, + specifiedType: const FullType(SignalingMuteMessage_Payload_Name))! as SignalingMuteMessage_Payload_Name; + break; + } + } + + return result.build(); + } +} + +class _$SignalingMuteMessageSerializer implements StructuredSerializer { + @override + final Iterable types = const [SignalingMuteMessage, _$SignalingMuteMessage]; + @override + final String wireName = 'SignalingMuteMessage'; + + @override + Iterable serialize(Serializers serializers, SignalingMuteMessage object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'from', + serializers.serialize(object.from, specifiedType: const FullType(String)), + 'to', + serializers.serialize(object.to, specifiedType: const FullType(String)), + 'type', + serializers.serialize(object.type, specifiedType: const FullType(SignalingMessageType)), + 'payload', + serializers.serialize(object.payload, specifiedType: const FullType(SignalingMuteMessage_Payload)), + ]; + Object? value; + value = object.roomType; + if (value != null) { + result + ..add('roomType') + ..add(serializers.serialize(value, specifiedType: const FullType(SignalingRoomType))); + } + value = object.sid; + if (value != null) { + result + ..add('sid') + ..add(serializers.serialize(value, specifiedType: const FullType(String))); + } + return result; + } + + @override + SignalingMuteMessage deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = SignalingMuteMessageBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'from': + result.from = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + case 'to': + result.to = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + case 'type': + result.type = serializers.deserialize(value, specifiedType: const FullType(SignalingMessageType))! + as SignalingMessageType; + break; + case 'roomType': + result.roomType = + serializers.deserialize(value, specifiedType: const FullType(SignalingRoomType)) as SignalingRoomType?; + break; + case 'sid': + result.sid = serializers.deserialize(value, specifiedType: const FullType(String)) as String?; + break; + case 'payload': + result.payload.replace(serializers.deserialize(value, + specifiedType: const FullType(SignalingMuteMessage_Payload))! as SignalingMuteMessage_Payload); + break; + } + } + + return result.build(); + } +} + +class _$SignalingMessageWrapperSerializer implements StructuredSerializer { + @override + final Iterable types = const [SignalingMessageWrapper, _$SignalingMessageWrapper]; + @override + final String wireName = 'SignalingMessageWrapper'; + + @override + Iterable serialize(Serializers serializers, SignalingMessageWrapper object, {FullType specifiedType = FullType.unspecified}) { final result = [ 'type', serializers.serialize(object.type, specifiedType: const FullType(String)), 'data', - serializers.serialize(object.data, - specifiedType: const FullType(SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data)), + serializers.serialize(object.data, specifiedType: const FullType(ContentString, [FullType(SignalingMessage)])), ]; return result; } @override - SignalingPullMessagesResponseApplicationJson_Ocs_Data deserialize( - Serializers serializers, Iterable serialized, + SignalingMessageWrapper deserialize(Serializers serializers, Iterable serialized, {FullType specifiedType = FullType.unspecified}) { - final result = SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder(); + final result = SignalingMessageWrapperBuilder(); final iterator = serialized.iterator; while (iterator.moveNext()) { @@ -16895,8 +17557,8 @@ class _$SignalingPullMessagesResponseApplicationJson_Ocs_DataSerializer break; case 'data': result.data.replace(serializers.deserialize(value, - specifiedType: const FullType(SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data))! - as SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data); + specifiedType: const FullType(ContentString, [FullType(SignalingMessage)]))! + as ContentString); break; } } @@ -16922,8 +17584,7 @@ class _$SignalingPullMessagesResponseApplicationJson_OcsSerializer 'meta', serializers.serialize(object.meta, specifiedType: const FullType(OCSMeta)), 'data', - serializers.serialize(object.data, - specifiedType: const FullType(BuiltList, [FullType(SignalingPullMessagesResponseApplicationJson_Ocs_Data)])), + serializers.serialize(object.data, specifiedType: const FullType(BuiltList, [FullType(SignalingData)])), ]; return result; @@ -16945,9 +17606,7 @@ class _$SignalingPullMessagesResponseApplicationJson_OcsSerializer break; case 'data': result.data.replace(serializers.deserialize(value, - specifiedType: - const FullType(BuiltList, [FullType(SignalingPullMessagesResponseApplicationJson_Ocs_Data)]))! - as BuiltList); + specifiedType: const FullType(BuiltList, [FullType(SignalingData)]))! as BuiltList); break; } } @@ -17001,6 +17660,56 @@ class _$SignalingPullMessagesResponseApplicationJsonSerializer } } +class _$SignalingSendMessagesMessagesSerializer implements StructuredSerializer { + @override + final Iterable types = const [SignalingSendMessagesMessages, _$SignalingSendMessagesMessages]; + @override + final String wireName = 'SignalingSendMessagesMessages'; + + @override + Iterable serialize(Serializers serializers, SignalingSendMessagesMessages object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'ev', + serializers.serialize(object.ev, specifiedType: const FullType(String)), + 'fn', + serializers.serialize(object.fn, specifiedType: const FullType(ContentString, [FullType(SignalingMessage)])), + 'sessionId', + serializers.serialize(object.sessionId, specifiedType: const FullType(String)), + ]; + + return result; + } + + @override + SignalingSendMessagesMessages deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = SignalingSendMessagesMessagesBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'ev': + result.ev = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + case 'fn': + result.fn.replace(serializers.deserialize(value, + specifiedType: const FullType(ContentString, [FullType(SignalingMessage)]))! + as ContentString); + break; + case 'sessionId': + result.sessionId = serializers.deserialize(value, specifiedType: const FullType(String))! as String; + break; + } + } + + return result.build(); + } +} + class _$SignalingSendMessagesApiVersionSerializer implements PrimitiveSerializer { @override final Iterable types = const [SignalingSendMessagesApiVersion]; @@ -50013,139 +50722,1255 @@ class SignalingSessionBuilder } } -abstract mixin class SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataInterfaceBuilder { - void replace(SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataInterface other); - void update(void Function(SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataInterfaceBuilder) updates); - ListBuilder get builtListSignalingSession; - set builtListSignalingSession(ListBuilder? builtListSignalingSession); +abstract mixin class SignalingSessionsInterfaceBuilder { + void replace(SignalingSessionsInterface other); + void update(void Function(SignalingSessionsInterfaceBuilder) updates); + String? get type; + set type(String? type); - String? get string; - set string(String? string); + ListBuilder get data; + set data(ListBuilder? data); } -class _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data - extends SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data { +class _$SignalingSessions extends SignalingSessions { @override - final JsonObject data; + final String type; + @override + final BuiltList data; + + factory _$SignalingSessions([void Function(SignalingSessionsBuilder)? updates]) => + (SignalingSessionsBuilder()..update(updates))._build(); + + _$SignalingSessions._({required this.type, required this.data}) : super._() { + BuiltValueNullFieldError.checkNotNull(type, r'SignalingSessions', 'type'); + BuiltValueNullFieldError.checkNotNull(data, r'SignalingSessions', 'data'); + } + @override - final BuiltList? builtListSignalingSession; + SignalingSessions rebuild(void Function(SignalingSessionsBuilder) updates) => (toBuilder()..update(updates)).build(); + @override - final String? string; + SignalingSessionsBuilder toBuilder() => SignalingSessionsBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is SignalingSessions && type == other.type && data == other.data; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, type.hashCode); + _$hash = $jc(_$hash, data.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'SignalingSessions') + ..add('type', type) + ..add('data', data)) + .toString(); + } +} + +class SignalingSessionsBuilder + implements Builder, SignalingSessionsInterfaceBuilder { + _$SignalingSessions? _$v; + + String? _type; + String? get type => _$this._type; + set type(covariant String? type) => _$this._type = type; + + ListBuilder? _data; + ListBuilder get data => _$this._data ??= ListBuilder(); + set data(covariant ListBuilder? data) => _$this._data = data; + + SignalingSessionsBuilder(); + + SignalingSessionsBuilder get _$this { + final $v = _$v; + if ($v != null) { + _type = $v.type; + _data = $v.data.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(covariant SignalingSessions other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$SignalingSessions; + } + + @override + void update(void Function(SignalingSessionsBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + SignalingSessions build() => _build(); + + _$SignalingSessions _build() { + _$SignalingSessions _$result; + try { + _$result = _$v ?? + _$SignalingSessions._( + type: BuiltValueNullFieldError.checkNotNull(type, r'SignalingSessions', 'type'), data: data.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'data'; + data.build(); + } catch (e) { + throw BuiltValueNestedFieldError(r'SignalingSessions', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +abstract mixin class SignalingSessionDescriptionMessage_PayloadInterfaceBuilder { + void replace(SignalingSessionDescriptionMessage_PayloadInterface other); + void update(void Function(SignalingSessionDescriptionMessage_PayloadInterfaceBuilder) updates); + SignalingSessionDescriptionMessage_Payload_Type? get type; + set type(SignalingSessionDescriptionMessage_Payload_Type? type); + + String? get sdp; + set sdp(String? sdp); + + String? get nick; + set nick(String? nick); +} + +class _$SignalingSessionDescriptionMessage_Payload extends SignalingSessionDescriptionMessage_Payload { + @override + final SignalingSessionDescriptionMessage_Payload_Type type; + @override + final String sdp; + @override + final String nick; + + factory _$SignalingSessionDescriptionMessage_Payload( + [void Function(SignalingSessionDescriptionMessage_PayloadBuilder)? updates]) => + (SignalingSessionDescriptionMessage_PayloadBuilder()..update(updates))._build(); + + _$SignalingSessionDescriptionMessage_Payload._({required this.type, required this.sdp, required this.nick}) + : super._() { + BuiltValueNullFieldError.checkNotNull(type, r'SignalingSessionDescriptionMessage_Payload', 'type'); + BuiltValueNullFieldError.checkNotNull(sdp, r'SignalingSessionDescriptionMessage_Payload', 'sdp'); + BuiltValueNullFieldError.checkNotNull(nick, r'SignalingSessionDescriptionMessage_Payload', 'nick'); + } + + @override + SignalingSessionDescriptionMessage_Payload rebuild( + void Function(SignalingSessionDescriptionMessage_PayloadBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + SignalingSessionDescriptionMessage_PayloadBuilder toBuilder() => + SignalingSessionDescriptionMessage_PayloadBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is SignalingSessionDescriptionMessage_Payload && + type == other.type && + sdp == other.sdp && + nick == other.nick; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, type.hashCode); + _$hash = $jc(_$hash, sdp.hashCode); + _$hash = $jc(_$hash, nick.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'SignalingSessionDescriptionMessage_Payload') + ..add('type', type) + ..add('sdp', sdp) + ..add('nick', nick)) + .toString(); + } +} + +class SignalingSessionDescriptionMessage_PayloadBuilder + implements + Builder, + SignalingSessionDescriptionMessage_PayloadInterfaceBuilder { + _$SignalingSessionDescriptionMessage_Payload? _$v; + + SignalingSessionDescriptionMessage_Payload_Type? _type; + SignalingSessionDescriptionMessage_Payload_Type? get type => _$this._type; + set type(covariant SignalingSessionDescriptionMessage_Payload_Type? type) => _$this._type = type; + + String? _sdp; + String? get sdp => _$this._sdp; + set sdp(covariant String? sdp) => _$this._sdp = sdp; + + String? _nick; + String? get nick => _$this._nick; + set nick(covariant String? nick) => _$this._nick = nick; + + SignalingSessionDescriptionMessage_PayloadBuilder(); + + SignalingSessionDescriptionMessage_PayloadBuilder get _$this { + final $v = _$v; + if ($v != null) { + _type = $v.type; + _sdp = $v.sdp; + _nick = $v.nick; + _$v = null; + } + return this; + } + + @override + void replace(covariant SignalingSessionDescriptionMessage_Payload other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$SignalingSessionDescriptionMessage_Payload; + } + + @override + void update(void Function(SignalingSessionDescriptionMessage_PayloadBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + SignalingSessionDescriptionMessage_Payload build() => _build(); + + _$SignalingSessionDescriptionMessage_Payload _build() { + final _$result = _$v ?? + _$SignalingSessionDescriptionMessage_Payload._( + type: BuiltValueNullFieldError.checkNotNull(type, r'SignalingSessionDescriptionMessage_Payload', 'type'), + sdp: BuiltValueNullFieldError.checkNotNull(sdp, r'SignalingSessionDescriptionMessage_Payload', 'sdp'), + nick: BuiltValueNullFieldError.checkNotNull(nick, r'SignalingSessionDescriptionMessage_Payload', 'nick')); + replace(_$result); + return _$result; + } +} + +abstract mixin class SignalingSessionDescriptionMessageInterfaceBuilder { + void replace(SignalingSessionDescriptionMessageInterface other); + void update(void Function(SignalingSessionDescriptionMessageInterfaceBuilder) updates); + String? get from; + set from(String? from); + + String? get to; + set to(String? to); + + SignalingMessageType? get type; + set type(SignalingMessageType? type); + + SignalingRoomType? get roomType; + set roomType(SignalingRoomType? roomType); + + String? get sid; + set sid(String? sid); + + SignalingSessionDescriptionMessage_PayloadBuilder get payload; + set payload(SignalingSessionDescriptionMessage_PayloadBuilder? payload); +} + +class _$SignalingSessionDescriptionMessage extends SignalingSessionDescriptionMessage { + @override + final String from; + @override + final String to; + @override + final SignalingMessageType type; + @override + final SignalingRoomType? roomType; + @override + final String? sid; + @override + final SignalingSessionDescriptionMessage_Payload payload; + + factory _$SignalingSessionDescriptionMessage([void Function(SignalingSessionDescriptionMessageBuilder)? updates]) => + (SignalingSessionDescriptionMessageBuilder()..update(updates))._build(); + + _$SignalingSessionDescriptionMessage._( + {required this.from, required this.to, required this.type, this.roomType, this.sid, required this.payload}) + : super._() { + BuiltValueNullFieldError.checkNotNull(from, r'SignalingSessionDescriptionMessage', 'from'); + BuiltValueNullFieldError.checkNotNull(to, r'SignalingSessionDescriptionMessage', 'to'); + BuiltValueNullFieldError.checkNotNull(type, r'SignalingSessionDescriptionMessage', 'type'); + BuiltValueNullFieldError.checkNotNull(payload, r'SignalingSessionDescriptionMessage', 'payload'); + } + + @override + SignalingSessionDescriptionMessage rebuild(void Function(SignalingSessionDescriptionMessageBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + SignalingSessionDescriptionMessageBuilder toBuilder() => SignalingSessionDescriptionMessageBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is SignalingSessionDescriptionMessage && + from == other.from && + to == other.to && + type == other.type && + roomType == other.roomType && + sid == other.sid && + payload == other.payload; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, from.hashCode); + _$hash = $jc(_$hash, to.hashCode); + _$hash = $jc(_$hash, type.hashCode); + _$hash = $jc(_$hash, roomType.hashCode); + _$hash = $jc(_$hash, sid.hashCode); + _$hash = $jc(_$hash, payload.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'SignalingSessionDescriptionMessage') + ..add('from', from) + ..add('to', to) + ..add('type', type) + ..add('roomType', roomType) + ..add('sid', sid) + ..add('payload', payload)) + .toString(); + } +} + +class SignalingSessionDescriptionMessageBuilder + implements + Builder, + SignalingSessionDescriptionMessageInterfaceBuilder { + _$SignalingSessionDescriptionMessage? _$v; + + String? _from; + String? get from => _$this._from; + set from(covariant String? from) => _$this._from = from; + + String? _to; + String? get to => _$this._to; + set to(covariant String? to) => _$this._to = to; + + SignalingMessageType? _type; + SignalingMessageType? get type => _$this._type; + set type(covariant SignalingMessageType? type) => _$this._type = type; + + SignalingRoomType? _roomType; + SignalingRoomType? get roomType => _$this._roomType; + set roomType(covariant SignalingRoomType? roomType) => _$this._roomType = roomType; + + String? _sid; + String? get sid => _$this._sid; + set sid(covariant String? sid) => _$this._sid = sid; + + SignalingSessionDescriptionMessage_PayloadBuilder? _payload; + SignalingSessionDescriptionMessage_PayloadBuilder get payload => + _$this._payload ??= SignalingSessionDescriptionMessage_PayloadBuilder(); + set payload(covariant SignalingSessionDescriptionMessage_PayloadBuilder? payload) => _$this._payload = payload; + + SignalingSessionDescriptionMessageBuilder(); + + SignalingSessionDescriptionMessageBuilder get _$this { + final $v = _$v; + if ($v != null) { + _from = $v.from; + _to = $v.to; + _type = $v.type; + _roomType = $v.roomType; + _sid = $v.sid; + _payload = $v.payload.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(covariant SignalingSessionDescriptionMessage other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$SignalingSessionDescriptionMessage; + } + + @override + void update(void Function(SignalingSessionDescriptionMessageBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + SignalingSessionDescriptionMessage build() => _build(); + + _$SignalingSessionDescriptionMessage _build() { + _$SignalingSessionDescriptionMessage _$result; + try { + _$result = _$v ?? + _$SignalingSessionDescriptionMessage._( + from: BuiltValueNullFieldError.checkNotNull(from, r'SignalingSessionDescriptionMessage', 'from'), + to: BuiltValueNullFieldError.checkNotNull(to, r'SignalingSessionDescriptionMessage', 'to'), + type: BuiltValueNullFieldError.checkNotNull(type, r'SignalingSessionDescriptionMessage', 'type'), + roomType: roomType, + sid: sid, + payload: payload.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'payload'; + payload.build(); + } catch (e) { + throw BuiltValueNestedFieldError(r'SignalingSessionDescriptionMessage', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +abstract mixin class SignalingICECandidateMessage_Payload_CandidateInterfaceBuilder { + void replace(SignalingICECandidateMessage_Payload_CandidateInterface other); + void update(void Function(SignalingICECandidateMessage_Payload_CandidateInterfaceBuilder) updates); + int? get sdpMLineIndex; + set sdpMLineIndex(int? sdpMLineIndex); + + String? get sdpMid; + set sdpMid(String? sdpMid); + + String? get candidate; + set candidate(String? candidate); +} + +class _$SignalingICECandidateMessage_Payload_Candidate extends SignalingICECandidateMessage_Payload_Candidate { + @override + final int sdpMLineIndex; + @override + final String sdpMid; + @override + final String candidate; + + factory _$SignalingICECandidateMessage_Payload_Candidate( + [void Function(SignalingICECandidateMessage_Payload_CandidateBuilder)? updates]) => + (SignalingICECandidateMessage_Payload_CandidateBuilder()..update(updates))._build(); + + _$SignalingICECandidateMessage_Payload_Candidate._( + {required this.sdpMLineIndex, required this.sdpMid, required this.candidate}) + : super._() { + BuiltValueNullFieldError.checkNotNull( + sdpMLineIndex, r'SignalingICECandidateMessage_Payload_Candidate', 'sdpMLineIndex'); + BuiltValueNullFieldError.checkNotNull(sdpMid, r'SignalingICECandidateMessage_Payload_Candidate', 'sdpMid'); + BuiltValueNullFieldError.checkNotNull(candidate, r'SignalingICECandidateMessage_Payload_Candidate', 'candidate'); + } + + @override + SignalingICECandidateMessage_Payload_Candidate rebuild( + void Function(SignalingICECandidateMessage_Payload_CandidateBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + SignalingICECandidateMessage_Payload_CandidateBuilder toBuilder() => + SignalingICECandidateMessage_Payload_CandidateBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is SignalingICECandidateMessage_Payload_Candidate && + sdpMLineIndex == other.sdpMLineIndex && + sdpMid == other.sdpMid && + candidate == other.candidate; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, sdpMLineIndex.hashCode); + _$hash = $jc(_$hash, sdpMid.hashCode); + _$hash = $jc(_$hash, candidate.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'SignalingICECandidateMessage_Payload_Candidate') + ..add('sdpMLineIndex', sdpMLineIndex) + ..add('sdpMid', sdpMid) + ..add('candidate', candidate)) + .toString(); + } +} + +class SignalingICECandidateMessage_Payload_CandidateBuilder + implements + Builder, + SignalingICECandidateMessage_Payload_CandidateInterfaceBuilder { + _$SignalingICECandidateMessage_Payload_Candidate? _$v; + + int? _sdpMLineIndex; + int? get sdpMLineIndex => _$this._sdpMLineIndex; + set sdpMLineIndex(covariant int? sdpMLineIndex) => _$this._sdpMLineIndex = sdpMLineIndex; + + String? _sdpMid; + String? get sdpMid => _$this._sdpMid; + set sdpMid(covariant String? sdpMid) => _$this._sdpMid = sdpMid; + + String? _candidate; + String? get candidate => _$this._candidate; + set candidate(covariant String? candidate) => _$this._candidate = candidate; + + SignalingICECandidateMessage_Payload_CandidateBuilder(); + + SignalingICECandidateMessage_Payload_CandidateBuilder get _$this { + final $v = _$v; + if ($v != null) { + _sdpMLineIndex = $v.sdpMLineIndex; + _sdpMid = $v.sdpMid; + _candidate = $v.candidate; + _$v = null; + } + return this; + } + + @override + void replace(covariant SignalingICECandidateMessage_Payload_Candidate other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$SignalingICECandidateMessage_Payload_Candidate; + } + + @override + void update(void Function(SignalingICECandidateMessage_Payload_CandidateBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + SignalingICECandidateMessage_Payload_Candidate build() => _build(); + + _$SignalingICECandidateMessage_Payload_Candidate _build() { + final _$result = _$v ?? + _$SignalingICECandidateMessage_Payload_Candidate._( + sdpMLineIndex: BuiltValueNullFieldError.checkNotNull( + sdpMLineIndex, r'SignalingICECandidateMessage_Payload_Candidate', 'sdpMLineIndex'), + sdpMid: BuiltValueNullFieldError.checkNotNull( + sdpMid, r'SignalingICECandidateMessage_Payload_Candidate', 'sdpMid'), + candidate: BuiltValueNullFieldError.checkNotNull( + candidate, r'SignalingICECandidateMessage_Payload_Candidate', 'candidate')); + replace(_$result); + return _$result; + } +} + +abstract mixin class SignalingICECandidateMessage_PayloadInterfaceBuilder { + void replace(SignalingICECandidateMessage_PayloadInterface other); + void update(void Function(SignalingICECandidateMessage_PayloadInterfaceBuilder) updates); + SignalingICECandidateMessage_Payload_CandidateBuilder get candidate; + set candidate(SignalingICECandidateMessage_Payload_CandidateBuilder? candidate); +} + +class _$SignalingICECandidateMessage_Payload extends SignalingICECandidateMessage_Payload { + @override + final SignalingICECandidateMessage_Payload_Candidate candidate; + + factory _$SignalingICECandidateMessage_Payload( + [void Function(SignalingICECandidateMessage_PayloadBuilder)? updates]) => + (SignalingICECandidateMessage_PayloadBuilder()..update(updates))._build(); + + _$SignalingICECandidateMessage_Payload._({required this.candidate}) : super._() { + BuiltValueNullFieldError.checkNotNull(candidate, r'SignalingICECandidateMessage_Payload', 'candidate'); + } + + @override + SignalingICECandidateMessage_Payload rebuild(void Function(SignalingICECandidateMessage_PayloadBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + SignalingICECandidateMessage_PayloadBuilder toBuilder() => + SignalingICECandidateMessage_PayloadBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is SignalingICECandidateMessage_Payload && candidate == other.candidate; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, candidate.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'SignalingICECandidateMessage_Payload')..add('candidate', candidate)) + .toString(); + } +} + +class SignalingICECandidateMessage_PayloadBuilder + implements + Builder, + SignalingICECandidateMessage_PayloadInterfaceBuilder { + _$SignalingICECandidateMessage_Payload? _$v; + + SignalingICECandidateMessage_Payload_CandidateBuilder? _candidate; + SignalingICECandidateMessage_Payload_CandidateBuilder get candidate => + _$this._candidate ??= SignalingICECandidateMessage_Payload_CandidateBuilder(); + set candidate(covariant SignalingICECandidateMessage_Payload_CandidateBuilder? candidate) => + _$this._candidate = candidate; + + SignalingICECandidateMessage_PayloadBuilder(); + + SignalingICECandidateMessage_PayloadBuilder get _$this { + final $v = _$v; + if ($v != null) { + _candidate = $v.candidate.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(covariant SignalingICECandidateMessage_Payload other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$SignalingICECandidateMessage_Payload; + } + + @override + void update(void Function(SignalingICECandidateMessage_PayloadBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + SignalingICECandidateMessage_Payload build() => _build(); + + _$SignalingICECandidateMessage_Payload _build() { + _$SignalingICECandidateMessage_Payload _$result; + try { + _$result = _$v ?? _$SignalingICECandidateMessage_Payload._(candidate: candidate.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'candidate'; + candidate.build(); + } catch (e) { + throw BuiltValueNestedFieldError(r'SignalingICECandidateMessage_Payload', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +abstract mixin class SignalingICECandidateMessageInterfaceBuilder { + void replace(SignalingICECandidateMessageInterface other); + void update(void Function(SignalingICECandidateMessageInterfaceBuilder) updates); + String? get from; + set from(String? from); + + String? get to; + set to(String? to); + + SignalingMessageType? get type; + set type(SignalingMessageType? type); - factory _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data( - [void Function(SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder)? updates]) => - (SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder()..update(updates))._build(); + SignalingRoomType? get roomType; + set roomType(SignalingRoomType? roomType); - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data._( - {required this.data, this.builtListSignalingSession, this.string}) + String? get sid; + set sid(String? sid); + + SignalingICECandidateMessage_PayloadBuilder get payload; + set payload(SignalingICECandidateMessage_PayloadBuilder? payload); +} + +class _$SignalingICECandidateMessage extends SignalingICECandidateMessage { + @override + final String from; + @override + final String to; + @override + final SignalingMessageType type; + @override + final SignalingRoomType? roomType; + @override + final String? sid; + @override + final SignalingICECandidateMessage_Payload payload; + + factory _$SignalingICECandidateMessage([void Function(SignalingICECandidateMessageBuilder)? updates]) => + (SignalingICECandidateMessageBuilder()..update(updates))._build(); + + _$SignalingICECandidateMessage._( + {required this.from, required this.to, required this.type, this.roomType, this.sid, required this.payload}) + : super._() { + BuiltValueNullFieldError.checkNotNull(from, r'SignalingICECandidateMessage', 'from'); + BuiltValueNullFieldError.checkNotNull(to, r'SignalingICECandidateMessage', 'to'); + BuiltValueNullFieldError.checkNotNull(type, r'SignalingICECandidateMessage', 'type'); + BuiltValueNullFieldError.checkNotNull(payload, r'SignalingICECandidateMessage', 'payload'); + } + + @override + SignalingICECandidateMessage rebuild(void Function(SignalingICECandidateMessageBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + SignalingICECandidateMessageBuilder toBuilder() => SignalingICECandidateMessageBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is SignalingICECandidateMessage && + from == other.from && + to == other.to && + type == other.type && + roomType == other.roomType && + sid == other.sid && + payload == other.payload; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, from.hashCode); + _$hash = $jc(_$hash, to.hashCode); + _$hash = $jc(_$hash, type.hashCode); + _$hash = $jc(_$hash, roomType.hashCode); + _$hash = $jc(_$hash, sid.hashCode); + _$hash = $jc(_$hash, payload.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'SignalingICECandidateMessage') + ..add('from', from) + ..add('to', to) + ..add('type', type) + ..add('roomType', roomType) + ..add('sid', sid) + ..add('payload', payload)) + .toString(); + } +} + +class SignalingICECandidateMessageBuilder + implements + Builder, + SignalingICECandidateMessageInterfaceBuilder { + _$SignalingICECandidateMessage? _$v; + + String? _from; + String? get from => _$this._from; + set from(covariant String? from) => _$this._from = from; + + String? _to; + String? get to => _$this._to; + set to(covariant String? to) => _$this._to = to; + + SignalingMessageType? _type; + SignalingMessageType? get type => _$this._type; + set type(covariant SignalingMessageType? type) => _$this._type = type; + + SignalingRoomType? _roomType; + SignalingRoomType? get roomType => _$this._roomType; + set roomType(covariant SignalingRoomType? roomType) => _$this._roomType = roomType; + + String? _sid; + String? get sid => _$this._sid; + set sid(covariant String? sid) => _$this._sid = sid; + + SignalingICECandidateMessage_PayloadBuilder? _payload; + SignalingICECandidateMessage_PayloadBuilder get payload => + _$this._payload ??= SignalingICECandidateMessage_PayloadBuilder(); + set payload(covariant SignalingICECandidateMessage_PayloadBuilder? payload) => _$this._payload = payload; + + SignalingICECandidateMessageBuilder(); + + SignalingICECandidateMessageBuilder get _$this { + final $v = _$v; + if ($v != null) { + _from = $v.from; + _to = $v.to; + _type = $v.type; + _roomType = $v.roomType; + _sid = $v.sid; + _payload = $v.payload.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(covariant SignalingICECandidateMessage other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$SignalingICECandidateMessage; + } + + @override + void update(void Function(SignalingICECandidateMessageBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + SignalingICECandidateMessage build() => _build(); + + _$SignalingICECandidateMessage _build() { + _$SignalingICECandidateMessage _$result; + try { + _$result = _$v ?? + _$SignalingICECandidateMessage._( + from: BuiltValueNullFieldError.checkNotNull(from, r'SignalingICECandidateMessage', 'from'), + to: BuiltValueNullFieldError.checkNotNull(to, r'SignalingICECandidateMessage', 'to'), + type: BuiltValueNullFieldError.checkNotNull(type, r'SignalingICECandidateMessage', 'type'), + roomType: roomType, + sid: sid, + payload: payload.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'payload'; + payload.build(); + } catch (e) { + throw BuiltValueNestedFieldError(r'SignalingICECandidateMessage', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +abstract mixin class SignalingMuteMessage_PayloadInterfaceBuilder { + void replace(SignalingMuteMessage_PayloadInterface other); + void update(void Function(SignalingMuteMessage_PayloadInterfaceBuilder) updates); + SignalingMuteMessage_Payload_Name? get name; + set name(SignalingMuteMessage_Payload_Name? name); +} + +class _$SignalingMuteMessage_Payload extends SignalingMuteMessage_Payload { + @override + final SignalingMuteMessage_Payload_Name name; + + factory _$SignalingMuteMessage_Payload([void Function(SignalingMuteMessage_PayloadBuilder)? updates]) => + (SignalingMuteMessage_PayloadBuilder()..update(updates))._build(); + + _$SignalingMuteMessage_Payload._({required this.name}) : super._() { + BuiltValueNullFieldError.checkNotNull(name, r'SignalingMuteMessage_Payload', 'name'); + } + + @override + SignalingMuteMessage_Payload rebuild(void Function(SignalingMuteMessage_PayloadBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + SignalingMuteMessage_PayloadBuilder toBuilder() => SignalingMuteMessage_PayloadBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is SignalingMuteMessage_Payload && name == other.name; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'SignalingMuteMessage_Payload')..add('name', name)).toString(); + } +} + +class SignalingMuteMessage_PayloadBuilder + implements + Builder, + SignalingMuteMessage_PayloadInterfaceBuilder { + _$SignalingMuteMessage_Payload? _$v; + + SignalingMuteMessage_Payload_Name? _name; + SignalingMuteMessage_Payload_Name? get name => _$this._name; + set name(covariant SignalingMuteMessage_Payload_Name? name) => _$this._name = name; + + SignalingMuteMessage_PayloadBuilder(); + + SignalingMuteMessage_PayloadBuilder get _$this { + final $v = _$v; + if ($v != null) { + _name = $v.name; + _$v = null; + } + return this; + } + + @override + void replace(covariant SignalingMuteMessage_Payload other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$SignalingMuteMessage_Payload; + } + + @override + void update(void Function(SignalingMuteMessage_PayloadBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + SignalingMuteMessage_Payload build() => _build(); + + _$SignalingMuteMessage_Payload _build() { + final _$result = _$v ?? + _$SignalingMuteMessage_Payload._( + name: BuiltValueNullFieldError.checkNotNull(name, r'SignalingMuteMessage_Payload', 'name')); + replace(_$result); + return _$result; + } +} + +abstract mixin class SignalingMuteMessageInterfaceBuilder { + void replace(SignalingMuteMessageInterface other); + void update(void Function(SignalingMuteMessageInterfaceBuilder) updates); + String? get from; + set from(String? from); + + String? get to; + set to(String? to); + + SignalingMessageType? get type; + set type(SignalingMessageType? type); + + SignalingRoomType? get roomType; + set roomType(SignalingRoomType? roomType); + + String? get sid; + set sid(String? sid); + + SignalingMuteMessage_PayloadBuilder get payload; + set payload(SignalingMuteMessage_PayloadBuilder? payload); +} + +class _$SignalingMuteMessage extends SignalingMuteMessage { + @override + final String from; + @override + final String to; + @override + final SignalingMessageType type; + @override + final SignalingRoomType? roomType; + @override + final String? sid; + @override + final SignalingMuteMessage_Payload payload; + + factory _$SignalingMuteMessage([void Function(SignalingMuteMessageBuilder)? updates]) => + (SignalingMuteMessageBuilder()..update(updates))._build(); + + _$SignalingMuteMessage._( + {required this.from, required this.to, required this.type, this.roomType, this.sid, required this.payload}) : super._() { - BuiltValueNullFieldError.checkNotNull(data, r'SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data', 'data'); + BuiltValueNullFieldError.checkNotNull(from, r'SignalingMuteMessage', 'from'); + BuiltValueNullFieldError.checkNotNull(to, r'SignalingMuteMessage', 'to'); + BuiltValueNullFieldError.checkNotNull(type, r'SignalingMuteMessage', 'type'); + BuiltValueNullFieldError.checkNotNull(payload, r'SignalingMuteMessage', 'payload'); } @override - SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data rebuild( - void Function(SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder) updates) => + SignalingMuteMessage rebuild(void Function(SignalingMuteMessageBuilder) updates) => (toBuilder()..update(updates)).build(); @override - SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder toBuilder() => - SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder()..replace(this); + SignalingMuteMessageBuilder toBuilder() => SignalingMuteMessageBuilder()..replace(this); @override bool operator ==(Object other) { if (identical(other, this)) return true; - return other is SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data && + return other is SignalingMuteMessage && + from == other.from && + to == other.to && + type == other.type && + roomType == other.roomType && + sid == other.sid && + payload == other.payload; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, from.hashCode); + _$hash = $jc(_$hash, to.hashCode); + _$hash = $jc(_$hash, type.hashCode); + _$hash = $jc(_$hash, roomType.hashCode); + _$hash = $jc(_$hash, sid.hashCode); + _$hash = $jc(_$hash, payload.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'SignalingMuteMessage') + ..add('from', from) + ..add('to', to) + ..add('type', type) + ..add('roomType', roomType) + ..add('sid', sid) + ..add('payload', payload)) + .toString(); + } +} + +class SignalingMuteMessageBuilder + implements Builder, SignalingMuteMessageInterfaceBuilder { + _$SignalingMuteMessage? _$v; + + String? _from; + String? get from => _$this._from; + set from(covariant String? from) => _$this._from = from; + + String? _to; + String? get to => _$this._to; + set to(covariant String? to) => _$this._to = to; + + SignalingMessageType? _type; + SignalingMessageType? get type => _$this._type; + set type(covariant SignalingMessageType? type) => _$this._type = type; + + SignalingRoomType? _roomType; + SignalingRoomType? get roomType => _$this._roomType; + set roomType(covariant SignalingRoomType? roomType) => _$this._roomType = roomType; + + String? _sid; + String? get sid => _$this._sid; + set sid(covariant String? sid) => _$this._sid = sid; + + SignalingMuteMessage_PayloadBuilder? _payload; + SignalingMuteMessage_PayloadBuilder get payload => _$this._payload ??= SignalingMuteMessage_PayloadBuilder(); + set payload(covariant SignalingMuteMessage_PayloadBuilder? payload) => _$this._payload = payload; + + SignalingMuteMessageBuilder(); + + SignalingMuteMessageBuilder get _$this { + final $v = _$v; + if ($v != null) { + _from = $v.from; + _to = $v.to; + _type = $v.type; + _roomType = $v.roomType; + _sid = $v.sid; + _payload = $v.payload.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(covariant SignalingMuteMessage other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$SignalingMuteMessage; + } + + @override + void update(void Function(SignalingMuteMessageBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + SignalingMuteMessage build() => _build(); + + _$SignalingMuteMessage _build() { + _$SignalingMuteMessage _$result; + try { + _$result = _$v ?? + _$SignalingMuteMessage._( + from: BuiltValueNullFieldError.checkNotNull(from, r'SignalingMuteMessage', 'from'), + to: BuiltValueNullFieldError.checkNotNull(to, r'SignalingMuteMessage', 'to'), + type: BuiltValueNullFieldError.checkNotNull(type, r'SignalingMuteMessage', 'type'), + roomType: roomType, + sid: sid, + payload: payload.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'payload'; + payload.build(); + } catch (e) { + throw BuiltValueNestedFieldError(r'SignalingMuteMessage', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +abstract mixin class SignalingMessageInterfaceBuilder { + void replace(SignalingMessageInterface other); + void update(void Function(SignalingMessageInterfaceBuilder) updates); + SignalingSessionDescriptionMessageBuilder get signalingSessionDescriptionMessage; + set signalingSessionDescriptionMessage(SignalingSessionDescriptionMessageBuilder? signalingSessionDescriptionMessage); + + SignalingICECandidateMessageBuilder get signalingICECandidateMessage; + set signalingICECandidateMessage(SignalingICECandidateMessageBuilder? signalingICECandidateMessage); + + SignalingMuteMessageBuilder get signalingMuteMessage; + set signalingMuteMessage(SignalingMuteMessageBuilder? signalingMuteMessage); +} + +class _$SignalingMessage extends SignalingMessage { + @override + final JsonObject data; + @override + final SignalingSessionDescriptionMessage? signalingSessionDescriptionMessage; + @override + final SignalingICECandidateMessage? signalingICECandidateMessage; + @override + final SignalingMuteMessage? signalingMuteMessage; + + factory _$SignalingMessage([void Function(SignalingMessageBuilder)? updates]) => + (SignalingMessageBuilder()..update(updates))._build(); + + _$SignalingMessage._( + {required this.data, + this.signalingSessionDescriptionMessage, + this.signalingICECandidateMessage, + this.signalingMuteMessage}) + : super._() { + BuiltValueNullFieldError.checkNotNull(data, r'SignalingMessage', 'data'); + } + + @override + SignalingMessage rebuild(void Function(SignalingMessageBuilder) updates) => (toBuilder()..update(updates)).build(); + + @override + SignalingMessageBuilder toBuilder() => SignalingMessageBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is SignalingMessage && data == other.data && - builtListSignalingSession == other.builtListSignalingSession && - string == other.string; + signalingSessionDescriptionMessage == other.signalingSessionDescriptionMessage && + signalingICECandidateMessage == other.signalingICECandidateMessage && + signalingMuteMessage == other.signalingMuteMessage; } @override int get hashCode { var _$hash = 0; _$hash = $jc(_$hash, data.hashCode); - _$hash = $jc(_$hash, builtListSignalingSession.hashCode); - _$hash = $jc(_$hash, string.hashCode); + _$hash = $jc(_$hash, signalingSessionDescriptionMessage.hashCode); + _$hash = $jc(_$hash, signalingICECandidateMessage.hashCode); + _$hash = $jc(_$hash, signalingMuteMessage.hashCode); _$hash = $jf(_$hash); return _$hash; } @override String toString() { - return (newBuiltValueToStringHelper(r'SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data') + return (newBuiltValueToStringHelper(r'SignalingMessage') ..add('data', data) - ..add('builtListSignalingSession', builtListSignalingSession) - ..add('string', string)) + ..add('signalingSessionDescriptionMessage', signalingSessionDescriptionMessage) + ..add('signalingICECandidateMessage', signalingICECandidateMessage) + ..add('signalingMuteMessage', signalingMuteMessage)) .toString(); } } -class SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder - implements - Builder, - SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataInterfaceBuilder { - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data? _$v; +class SignalingMessageBuilder + implements Builder, SignalingMessageInterfaceBuilder { + _$SignalingMessage? _$v; JsonObject? _data; JsonObject? get data => _$this._data; set data(covariant JsonObject? data) => _$this._data = data; - ListBuilder? _builtListSignalingSession; - ListBuilder get builtListSignalingSession => - _$this._builtListSignalingSession ??= ListBuilder(); - set builtListSignalingSession(covariant ListBuilder? builtListSignalingSession) => - _$this._builtListSignalingSession = builtListSignalingSession; + SignalingSessionDescriptionMessageBuilder? _signalingSessionDescriptionMessage; + SignalingSessionDescriptionMessageBuilder get signalingSessionDescriptionMessage => + _$this._signalingSessionDescriptionMessage ??= SignalingSessionDescriptionMessageBuilder(); + set signalingSessionDescriptionMessage( + covariant SignalingSessionDescriptionMessageBuilder? signalingSessionDescriptionMessage) => + _$this._signalingSessionDescriptionMessage = signalingSessionDescriptionMessage; - String? _string; - String? get string => _$this._string; - set string(covariant String? string) => _$this._string = string; + SignalingICECandidateMessageBuilder? _signalingICECandidateMessage; + SignalingICECandidateMessageBuilder get signalingICECandidateMessage => + _$this._signalingICECandidateMessage ??= SignalingICECandidateMessageBuilder(); + set signalingICECandidateMessage(covariant SignalingICECandidateMessageBuilder? signalingICECandidateMessage) => + _$this._signalingICECandidateMessage = signalingICECandidateMessage; - SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder(); + SignalingMuteMessageBuilder? _signalingMuteMessage; + SignalingMuteMessageBuilder get signalingMuteMessage => + _$this._signalingMuteMessage ??= SignalingMuteMessageBuilder(); + set signalingMuteMessage(covariant SignalingMuteMessageBuilder? signalingMuteMessage) => + _$this._signalingMuteMessage = signalingMuteMessage; - SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder get _$this { + SignalingMessageBuilder(); + + SignalingMessageBuilder get _$this { final $v = _$v; if ($v != null) { _data = $v.data; - _builtListSignalingSession = $v.builtListSignalingSession?.toBuilder(); - _string = $v.string; + _signalingSessionDescriptionMessage = $v.signalingSessionDescriptionMessage?.toBuilder(); + _signalingICECandidateMessage = $v.signalingICECandidateMessage?.toBuilder(); + _signalingMuteMessage = $v.signalingMuteMessage?.toBuilder(); _$v = null; } return this; } @override - void replace(covariant SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data other) { + void replace(covariant SignalingMessage other) { ArgumentError.checkNotNull(other, 'other'); - _$v = other as _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data; + _$v = other as _$SignalingMessage; } @override - void update(void Function(SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder)? updates) { + void update(void Function(SignalingMessageBuilder)? updates) { if (updates != null) updates(this); } @override - SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data build() => _build(); + SignalingMessage build() => _build(); - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data _build() { - SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data._validate(this); - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data _$result; + _$SignalingMessage _build() { + SignalingMessage._validate(this); + _$SignalingMessage _$result; try { _$result = _$v ?? - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data._( - data: BuiltValueNullFieldError.checkNotNull( - data, r'SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data', 'data'), - builtListSignalingSession: _builtListSignalingSession?.build(), - string: string); + _$SignalingMessage._( + data: BuiltValueNullFieldError.checkNotNull(data, r'SignalingMessage', 'data'), + signalingSessionDescriptionMessage: _signalingSessionDescriptionMessage?.build(), + signalingICECandidateMessage: _signalingICECandidateMessage?.build(), + signalingMuteMessage: _signalingMuteMessage?.build()); } catch (_) { late String _$failedField; try { - _$failedField = 'builtListSignalingSession'; - _builtListSignalingSession?.build(); + _$failedField = 'signalingSessionDescriptionMessage'; + _signalingSessionDescriptionMessage?.build(); + _$failedField = 'signalingICECandidateMessage'; + _signalingICECandidateMessage?.build(); + _$failedField = 'signalingMuteMessage'; + _signalingMuteMessage?.build(); } catch (e) { - throw BuiltValueNestedFieldError( - r'SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data', _$failedField, e.toString()); + throw BuiltValueNestedFieldError(r'SignalingMessage', _$failedField, e.toString()); } rethrow; } @@ -50154,45 +51979,41 @@ class SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder } } -abstract mixin class SignalingPullMessagesResponseApplicationJson_Ocs_DataInterfaceBuilder { - void replace(SignalingPullMessagesResponseApplicationJson_Ocs_DataInterface other); - void update(void Function(SignalingPullMessagesResponseApplicationJson_Ocs_DataInterfaceBuilder) updates); +abstract mixin class SignalingMessageWrapperInterfaceBuilder { + void replace(SignalingMessageWrapperInterface other); + void update(void Function(SignalingMessageWrapperInterfaceBuilder) updates); String? get type; set type(String? type); - SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder get data; - set data(SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder? data); + ContentStringBuilder get data; + set data(ContentStringBuilder? data); } -class _$SignalingPullMessagesResponseApplicationJson_Ocs_Data - extends SignalingPullMessagesResponseApplicationJson_Ocs_Data { +class _$SignalingMessageWrapper extends SignalingMessageWrapper { @override final String type; @override - final SignalingPullMessagesResponseApplicationJson_Ocs_Data_Data data; + final ContentString data; - factory _$SignalingPullMessagesResponseApplicationJson_Ocs_Data( - [void Function(SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder)? updates]) => - (SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder()..update(updates))._build(); + factory _$SignalingMessageWrapper([void Function(SignalingMessageWrapperBuilder)? updates]) => + (SignalingMessageWrapperBuilder()..update(updates))._build(); - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data._({required this.type, required this.data}) : super._() { - BuiltValueNullFieldError.checkNotNull(type, r'SignalingPullMessagesResponseApplicationJson_Ocs_Data', 'type'); - BuiltValueNullFieldError.checkNotNull(data, r'SignalingPullMessagesResponseApplicationJson_Ocs_Data', 'data'); + _$SignalingMessageWrapper._({required this.type, required this.data}) : super._() { + BuiltValueNullFieldError.checkNotNull(type, r'SignalingMessageWrapper', 'type'); + BuiltValueNullFieldError.checkNotNull(data, r'SignalingMessageWrapper', 'data'); } @override - SignalingPullMessagesResponseApplicationJson_Ocs_Data rebuild( - void Function(SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder) updates) => + SignalingMessageWrapper rebuild(void Function(SignalingMessageWrapperBuilder) updates) => (toBuilder()..update(updates)).build(); @override - SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder toBuilder() => - SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder()..replace(this); + SignalingMessageWrapperBuilder toBuilder() => SignalingMessageWrapperBuilder()..replace(this); @override bool operator ==(Object other) { if (identical(other, this)) return true; - return other is SignalingPullMessagesResponseApplicationJson_Ocs_Data && type == other.type && data == other.data; + return other is SignalingMessageWrapper && type == other.type && data == other.data; } @override @@ -50206,32 +52027,30 @@ class _$SignalingPullMessagesResponseApplicationJson_Ocs_Data @override String toString() { - return (newBuiltValueToStringHelper(r'SignalingPullMessagesResponseApplicationJson_Ocs_Data') + return (newBuiltValueToStringHelper(r'SignalingMessageWrapper') ..add('type', type) ..add('data', data)) .toString(); } } -class SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder +class SignalingMessageWrapperBuilder implements - Builder, - SignalingPullMessagesResponseApplicationJson_Ocs_DataInterfaceBuilder { - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data? _$v; + Builder, + SignalingMessageWrapperInterfaceBuilder { + _$SignalingMessageWrapper? _$v; String? _type; String? get type => _$this._type; set type(covariant String? type) => _$this._type = type; - SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder? _data; - SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder get data => - _$this._data ??= SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder(); - set data(covariant SignalingPullMessagesResponseApplicationJson_Ocs_Data_DataBuilder? data) => _$this._data = data; + ContentStringBuilder? _data; + ContentStringBuilder get data => _$this._data ??= ContentStringBuilder(); + set data(covariant ContentStringBuilder? data) => _$this._data = data; - SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder(); + SignalingMessageWrapperBuilder(); - SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder get _$this { + SignalingMessageWrapperBuilder get _$this { final $v = _$v; if ($v != null) { _type = $v.type; @@ -50242,26 +52061,25 @@ class SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder } @override - void replace(covariant SignalingPullMessagesResponseApplicationJson_Ocs_Data other) { + void replace(covariant SignalingMessageWrapper other) { ArgumentError.checkNotNull(other, 'other'); - _$v = other as _$SignalingPullMessagesResponseApplicationJson_Ocs_Data; + _$v = other as _$SignalingMessageWrapper; } @override - void update(void Function(SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder)? updates) { + void update(void Function(SignalingMessageWrapperBuilder)? updates) { if (updates != null) updates(this); } @override - SignalingPullMessagesResponseApplicationJson_Ocs_Data build() => _build(); + SignalingMessageWrapper build() => _build(); - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data _build() { - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data _$result; + _$SignalingMessageWrapper _build() { + _$SignalingMessageWrapper _$result; try { _$result = _$v ?? - _$SignalingPullMessagesResponseApplicationJson_Ocs_Data._( - type: BuiltValueNullFieldError.checkNotNull( - type, r'SignalingPullMessagesResponseApplicationJson_Ocs_Data', 'type'), + _$SignalingMessageWrapper._( + type: BuiltValueNullFieldError.checkNotNull(type, r'SignalingMessageWrapper', 'type'), data: data.build()); } catch (_) { late String _$failedField; @@ -50269,8 +52087,138 @@ class SignalingPullMessagesResponseApplicationJson_Ocs_DataBuilder _$failedField = 'data'; data.build(); } catch (e) { - throw BuiltValueNestedFieldError( - r'SignalingPullMessagesResponseApplicationJson_Ocs_Data', _$failedField, e.toString()); + throw BuiltValueNestedFieldError(r'SignalingMessageWrapper', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +abstract mixin class SignalingDataInterfaceBuilder { + void replace(SignalingDataInterface other); + void update(void Function(SignalingDataInterfaceBuilder) updates); + SignalingSessionsBuilder get signalingSessions; + set signalingSessions(SignalingSessionsBuilder? signalingSessions); + + SignalingMessageWrapperBuilder get signalingMessageWrapper; + set signalingMessageWrapper(SignalingMessageWrapperBuilder? signalingMessageWrapper); +} + +class _$SignalingData extends SignalingData { + @override + final JsonObject data; + @override + final SignalingSessions? signalingSessions; + @override + final SignalingMessageWrapper? signalingMessageWrapper; + + factory _$SignalingData([void Function(SignalingDataBuilder)? updates]) => + (SignalingDataBuilder()..update(updates))._build(); + + _$SignalingData._({required this.data, this.signalingSessions, this.signalingMessageWrapper}) : super._() { + BuiltValueNullFieldError.checkNotNull(data, r'SignalingData', 'data'); + } + + @override + SignalingData rebuild(void Function(SignalingDataBuilder) updates) => (toBuilder()..update(updates)).build(); + + @override + SignalingDataBuilder toBuilder() => SignalingDataBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is SignalingData && + data == other.data && + signalingSessions == other.signalingSessions && + signalingMessageWrapper == other.signalingMessageWrapper; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, data.hashCode); + _$hash = $jc(_$hash, signalingSessions.hashCode); + _$hash = $jc(_$hash, signalingMessageWrapper.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'SignalingData') + ..add('data', data) + ..add('signalingSessions', signalingSessions) + ..add('signalingMessageWrapper', signalingMessageWrapper)) + .toString(); + } +} + +class SignalingDataBuilder implements Builder, SignalingDataInterfaceBuilder { + _$SignalingData? _$v; + + JsonObject? _data; + JsonObject? get data => _$this._data; + set data(covariant JsonObject? data) => _$this._data = data; + + SignalingSessionsBuilder? _signalingSessions; + SignalingSessionsBuilder get signalingSessions => _$this._signalingSessions ??= SignalingSessionsBuilder(); + set signalingSessions(covariant SignalingSessionsBuilder? signalingSessions) => + _$this._signalingSessions = signalingSessions; + + SignalingMessageWrapperBuilder? _signalingMessageWrapper; + SignalingMessageWrapperBuilder get signalingMessageWrapper => + _$this._signalingMessageWrapper ??= SignalingMessageWrapperBuilder(); + set signalingMessageWrapper(covariant SignalingMessageWrapperBuilder? signalingMessageWrapper) => + _$this._signalingMessageWrapper = signalingMessageWrapper; + + SignalingDataBuilder(); + + SignalingDataBuilder get _$this { + final $v = _$v; + if ($v != null) { + _data = $v.data; + _signalingSessions = $v.signalingSessions?.toBuilder(); + _signalingMessageWrapper = $v.signalingMessageWrapper?.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(covariant SignalingData other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$SignalingData; + } + + @override + void update(void Function(SignalingDataBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + SignalingData build() => _build(); + + _$SignalingData _build() { + SignalingData._validate(this); + _$SignalingData _$result; + try { + _$result = _$v ?? + _$SignalingData._( + data: BuiltValueNullFieldError.checkNotNull(data, r'SignalingData', 'data'), + signalingSessions: _signalingSessions?.build(), + signalingMessageWrapper: _signalingMessageWrapper?.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'signalingSessions'; + _signalingSessions?.build(); + _$failedField = 'signalingMessageWrapper'; + _signalingMessageWrapper?.build(); + } catch (e) { + throw BuiltValueNestedFieldError(r'SignalingData', _$failedField, e.toString()); } rethrow; } @@ -50285,15 +52233,15 @@ abstract mixin class SignalingPullMessagesResponseApplicationJson_OcsInterfaceBu OCSMetaBuilder get meta; set meta(OCSMetaBuilder? meta); - ListBuilder get data; - set data(ListBuilder? data); + ListBuilder get data; + set data(ListBuilder? data); } class _$SignalingPullMessagesResponseApplicationJson_Ocs extends SignalingPullMessagesResponseApplicationJson_Ocs { @override final OCSMeta meta; @override - final BuiltList data; + final BuiltList data; factory _$SignalingPullMessagesResponseApplicationJson_Ocs( [void Function(SignalingPullMessagesResponseApplicationJson_OcsBuilder)? updates]) => @@ -50348,10 +52296,9 @@ class SignalingPullMessagesResponseApplicationJson_OcsBuilder OCSMetaBuilder get meta => _$this._meta ??= OCSMetaBuilder(); set meta(covariant OCSMetaBuilder? meta) => _$this._meta = meta; - ListBuilder? _data; - ListBuilder get data => - _$this._data ??= ListBuilder(); - set data(covariant ListBuilder? data) => _$this._data = data; + ListBuilder? _data; + ListBuilder get data => _$this._data ??= ListBuilder(); + set data(covariant ListBuilder? data) => _$this._data = data; SignalingPullMessagesResponseApplicationJson_OcsBuilder(); @@ -50504,6 +52451,140 @@ class SignalingPullMessagesResponseApplicationJsonBuilder } } +abstract mixin class SignalingSendMessagesMessagesInterfaceBuilder { + void replace(SignalingSendMessagesMessagesInterface other); + void update(void Function(SignalingSendMessagesMessagesInterfaceBuilder) updates); + String? get ev; + set ev(String? ev); + + ContentStringBuilder get fn; + set fn(ContentStringBuilder? fn); + + String? get sessionId; + set sessionId(String? sessionId); +} + +class _$SignalingSendMessagesMessages extends SignalingSendMessagesMessages { + @override + final String ev; + @override + final ContentString fn; + @override + final String sessionId; + + factory _$SignalingSendMessagesMessages([void Function(SignalingSendMessagesMessagesBuilder)? updates]) => + (SignalingSendMessagesMessagesBuilder()..update(updates))._build(); + + _$SignalingSendMessagesMessages._({required this.ev, required this.fn, required this.sessionId}) : super._() { + BuiltValueNullFieldError.checkNotNull(ev, r'SignalingSendMessagesMessages', 'ev'); + BuiltValueNullFieldError.checkNotNull(fn, r'SignalingSendMessagesMessages', 'fn'); + BuiltValueNullFieldError.checkNotNull(sessionId, r'SignalingSendMessagesMessages', 'sessionId'); + } + + @override + SignalingSendMessagesMessages rebuild(void Function(SignalingSendMessagesMessagesBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + SignalingSendMessagesMessagesBuilder toBuilder() => SignalingSendMessagesMessagesBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is SignalingSendMessagesMessages && ev == other.ev && fn == other.fn && sessionId == other.sessionId; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, ev.hashCode); + _$hash = $jc(_$hash, fn.hashCode); + _$hash = $jc(_$hash, sessionId.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'SignalingSendMessagesMessages') + ..add('ev', ev) + ..add('fn', fn) + ..add('sessionId', sessionId)) + .toString(); + } +} + +class SignalingSendMessagesMessagesBuilder + implements + Builder, + SignalingSendMessagesMessagesInterfaceBuilder { + _$SignalingSendMessagesMessages? _$v; + + String? _ev; + String? get ev => _$this._ev; + set ev(covariant String? ev) => _$this._ev = ev; + + ContentStringBuilder? _fn; + ContentStringBuilder get fn => _$this._fn ??= ContentStringBuilder(); + set fn(covariant ContentStringBuilder? fn) => _$this._fn = fn; + + String? _sessionId; + String? get sessionId => _$this._sessionId; + set sessionId(covariant String? sessionId) => _$this._sessionId = sessionId; + + SignalingSendMessagesMessagesBuilder() { + SignalingSendMessagesMessages._defaults(this); + } + + SignalingSendMessagesMessagesBuilder get _$this { + final $v = _$v; + if ($v != null) { + _ev = $v.ev; + _fn = $v.fn.toBuilder(); + _sessionId = $v.sessionId; + _$v = null; + } + return this; + } + + @override + void replace(covariant SignalingSendMessagesMessages other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$SignalingSendMessagesMessages; + } + + @override + void update(void Function(SignalingSendMessagesMessagesBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + SignalingSendMessagesMessages build() => _build(); + + _$SignalingSendMessagesMessages _build() { + _$SignalingSendMessagesMessages _$result; + try { + _$result = _$v ?? + _$SignalingSendMessagesMessages._( + ev: BuiltValueNullFieldError.checkNotNull(ev, r'SignalingSendMessagesMessages', 'ev'), + fn: fn.build(), + sessionId: + BuiltValueNullFieldError.checkNotNull(sessionId, r'SignalingSendMessagesMessages', 'sessionId')); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'fn'; + fn.build(); + } catch (e) { + throw BuiltValueNestedFieldError(r'SignalingSendMessagesMessages', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + abstract mixin class SignalingSendMessagesResponseApplicationJson_OcsInterfaceBuilder { void replace(SignalingSendMessagesResponseApplicationJson_OcsInterface other); void update(void Function(SignalingSendMessagesResponseApplicationJson_OcsInterfaceBuilder) updates); diff --git a/packages/nextcloud/lib/src/api/spreed.openapi.json b/packages/nextcloud/lib/src/api/spreed.openapi.json index a44111ee..faa586db 100644 --- a/packages/nextcloud/lib/src/api/spreed.openapi.json +++ b/packages/nextcloud/lib/src/api/spreed.openapi.json @@ -1213,6 +1213,248 @@ "nullable": true } } + }, + "SignalingSessions": { + "type": "object", + "required": [ + "type", + "data" + ], + "properties": { + "type": { + "type": "string" + }, + "data": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SignalingSession" + } + } + } + }, + "SignalingData": { + "discriminator": { + "propertyName": "type", + "mapping": { + "usersInRoom": "#/components/schemas/SignalingSessions", + "message": "#/components/schemas/SignalingMessageWrapper" + } + }, + "oneOf": [ + { + "$ref": "#/components/schemas/SignalingSessions" + }, + { + "$ref": "#/components/schemas/SignalingMessageWrapper" + } + ] + }, + "SignalingMessageWrapper": { + "type": "object", + "required": [ + "type", + "data" + ], + "properties": { + "type": { + "type": "string" + }, + "data": { + "type": "string", + "contentMediaType": "application/json", + "contentSchema": { + "$ref": "#/components/schemas/SignalingMessage" + } + } + } + }, + "SignalingMessageType": { + "type": "string", + "enum": [ + "offer", + "answer", + "candidate", + "unshareScreen", + "remove-candidates", + "control", + "forceMute", + "mute", + "unmute", + "nickChanged" + ] + }, + "SignalingMessage": { + "discriminator": { + "propertyName": "type", + "mapping": { + "offer": "#/components/schemas/SignalingSessionDescriptionMessage", + "answer": "#/components/schemas/SignalingSessionDescriptionMessage", + "candidate": "#/components/schemas/SignalingICECandidateMessage", + "mute": "#/components/schemas/SignalingMuteMessage", + "unmute": "#/components/schemas/SignalingMuteMessage" + } + }, + "oneOf": [ + { + "$ref": "#/components/schemas/SignalingSessionDescriptionMessage" + }, + { + "$ref": "#/components/schemas/SignalingICECandidateMessage" + }, + { + "$ref": "#/components/schemas/SignalingMuteMessage" + } + ] + }, + "SignalingRoomType": { + "type": "string", + "enum": [ + "video", + "screen" + ] + }, + "SignalingSessionDescriptionMessage": { + "type": "object", + "required": [ + "from", + "to", + "type", + "payload" + ], + "properties": { + "from": { + "type": "string" + }, + "to": { + "type": "string" + }, + "type": { + "$ref": "#/components/schemas/SignalingMessageType" + }, + "roomType": { + "$ref": "#/components/schemas/SignalingRoomType" + }, + "sid": { + "type": "string" + }, + "payload": { + "type": "object", + "required": [ + "type", + "sdp", + "nick" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "offer", + "answer" + ] + }, + "sdp": { + "type": "string" + }, + "nick": { + "type": "string" + } + } + } + } + }, + "SignalingICECandidateMessage": { + "type": "object", + "required": [ + "from", + "to", + "type", + "payload" + ], + "properties": { + "from": { + "type": "string" + }, + "to": { + "type": "string" + }, + "type": { + "$ref": "#/components/schemas/SignalingMessageType" + }, + "roomType": { + "$ref": "#/components/schemas/SignalingRoomType" + }, + "sid": { + "type": "string" + }, + "payload": { + "type": "object", + "required": [ + "candidate" + ], + "properties": { + "candidate": { + "type": "object", + "required": [ + "sdpMLineIndex", + "sdpMid", + "candidate" + ], + "properties": { + "sdpMLineIndex": { + "type": "integer" + }, + "sdpMid": { + "type": "string" + }, + "candidate": { + "type": "string" + } + } + } + } + } + } + }, + "SignalingMuteMessage": { + "type": "object", + "required": [ + "from", + "to", + "type", + "payload" + ], + "properties": { + "from": { + "type": "string" + }, + "to": { + "type": "string" + }, + "type": { + "$ref": "#/components/schemas/SignalingMessageType" + }, + "roomType": { + "$ref": "#/components/schemas/SignalingRoomType" + }, + "sid": { + "type": "string" + }, + "payload": { + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string", + "enum": [ + "audio", + "video" + ] + } + } + } + } } } }, @@ -16254,8 +16496,36 @@ "in": "query", "description": "JSON encoded messages", "required": true, - "schema": { - "type": "string" + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "type": "object", + "required": [ + "ev", + "fn", + "sessionId" + ], + "properties": { + "ev": { + "type": "string", + "default": "message" + }, + "fn": { + "type": "string", + "contentMediaType": "application/json", + "contentSchema": { + "$ref": "#/components/schemas/SignalingMessage" + } + }, + "sessionId": { + "type": "string" + } + } + } + } + } } }, { @@ -16425,29 +16695,7 @@ "data": { "type": "array", "items": { - "type": "object", - "required": [ - "type", - "data" - ], - "properties": { - "type": { - "type": "string" - }, - "data": { - "oneOf": [ - { - "type": "array", - "items": { - "$ref": "#/components/schemas/SignalingSession" - } - }, - { - "type": "string" - } - ] - } - } + "$ref": "#/components/schemas/SignalingData" } } } @@ -16480,29 +16728,7 @@ "data": { "type": "array", "items": { - "type": "object", - "required": [ - "type", - "data" - ], - "properties": { - "type": { - "type": "string" - }, - "data": { - "oneOf": [ - { - "type": "array", - "items": { - "$ref": "#/components/schemas/SignalingSession" - } - }, - { - "type": "string" - } - ] - } - } + "$ref": "#/components/schemas/SignalingData" } } } @@ -16535,29 +16761,7 @@ "data": { "type": "array", "items": { - "type": "object", - "required": [ - "type", - "data" - ], - "properties": { - "type": { - "type": "string" - }, - "data": { - "oneOf": [ - { - "type": "array", - "items": { - "$ref": "#/components/schemas/SignalingSession" - } - }, - { - "type": "string" - } - ] - } - } + "$ref": "#/components/schemas/SignalingData" } } } diff --git a/packages/nextcloud/lib/src/patches/spreed/internal-signaling.json b/packages/nextcloud/lib/src/patches/spreed/internal-signaling.json new file mode 100644 index 00000000..64fe3d8b --- /dev/null +++ b/packages/nextcloud/lib/src/patches/spreed/internal-signaling.json @@ -0,0 +1,342 @@ +[ + { + "op": "replace", + "path": "/paths/~1ocs~1v2.php~1apps~1spreed~1api~1{apiVersion}~1signaling~1{token}/get/responses/200/content/application~1json/schema/properties/ocs/properties/data/items", + "value": { + "$ref": "#/components/schemas/SignalingData" + } + }, + { + "op": "replace", + "path": "/paths/~1ocs~1v2.php~1apps~1spreed~1api~1{apiVersion}~1signaling~1{token}/get/responses/404/content/application~1json/schema/properties/ocs/properties/data/items", + "value": { + "$ref": "#/components/schemas/SignalingData" + } + }, + { + "op": "replace", + "path": "/paths/~1ocs~1v2.php~1apps~1spreed~1api~1{apiVersion}~1signaling~1{token}/get/responses/409/content/application~1json/schema/properties/ocs/properties/data/items", + "value": { + "$ref": "#/components/schemas/SignalingData" + } + }, + { + "op": "replace", + "path": "/paths/~1ocs~1v2.php~1apps~1spreed~1api~1{apiVersion}~1signaling~1{token}/post/parameters/0", + "value": { + "name": "messages", + "in": "query", + "description": "JSON encoded messages", + "required": true, + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "type": "object", + "required": [ + "ev", + "fn", + "sessionId" + ], + "properties": { + "ev": { + "type": "string", + "default": "message" + }, + "fn": { + "type": "string", + "contentMediaType": "application/json", + "contentSchema": { + "$ref": "#/components/schemas/SignalingMessage" + } + }, + "sessionId": { + "type": "string" + } + } + } + } + } + } + } + }, + { + "op": "add", + "path": "/components/schemas/SignalingSessions", + "value": { + "type": "object", + "required": [ + "type", + "data" + ], + "properties": { + "type": { + "type": "string" + }, + "data": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SignalingSession" + } + } + } + } + }, + { + "op": "add", + "path": "/components/schemas/SignalingData", + "value": { + "discriminator": { + "propertyName": "type", + "mapping": { + "usersInRoom": "#/components/schemas/SignalingSessions", + "message": "#/components/schemas/SignalingMessageWrapper" + } + }, + "oneOf": [ + { + "$ref": "#/components/schemas/SignalingSessions" + }, + { + "$ref": "#/components/schemas/SignalingMessageWrapper" + } + ] + } + }, + { + "op": "add", + "path": "/components/schemas/SignalingMessageWrapper", + "value": { + "type": "object", + "required": [ + "type", + "data" + ], + "properties": { + "type": { + "type": "string" + }, + "data": { + "type": "string", + "contentMediaType": "application/json", + "contentSchema": { + "$ref": "#/components/schemas/SignalingMessage" + } + } + } + } + }, + { + "op": "add", + "path": "/components/schemas/SignalingMessageType", + "value": { + "type": "string", + "enum": [ + "offer", + "answer", + "candidate", + "unshareScreen", + "remove-candidates", + "control", + "forceMute", + "mute", + "unmute", + "nickChanged" + ] + } + }, + { + "op": "add", + "path": "/components/schemas/SignalingMessage", + "value": { + "discriminator": { + "propertyName": "type", + "mapping": { + "offer": "#/components/schemas/SignalingSessionDescriptionMessage", + "answer": "#/components/schemas/SignalingSessionDescriptionMessage", + "candidate": "#/components/schemas/SignalingICECandidateMessage", + "mute": "#/components/schemas/SignalingMuteMessage", + "unmute": "#/components/schemas/SignalingMuteMessage" + } + }, + "oneOf": [ + { + "$ref": "#/components/schemas/SignalingSessionDescriptionMessage" + }, + { + "$ref": "#/components/schemas/SignalingICECandidateMessage" + }, + { + "$ref": "#/components/schemas/SignalingMuteMessage" + } + ] + } + }, + { + "op": "add", + "path": "/components/schemas/SignalingRoomType", + "value": { + "type": "string", + "enum": [ + "video", + "screen" + ] + } + }, + { + "op": "add", + "path": "/components/schemas/SignalingSessionDescriptionMessage", + "value": { + "type": "object", + "required": [ + "from", + "to", + "type", + "payload" + ], + "properties": { + "from": { + "type": "string" + }, + "to": { + "type": "string" + }, + "type": { + "$ref": "#/components/schemas/SignalingMessageType" + }, + "roomType": { + "$ref": "#/components/schemas/SignalingRoomType" + }, + "sid": { + "type": "string" + }, + "payload": { + "type": "object", + "required": [ + "type", + "sdp", + "nick" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "offer", + "answer" + ] + }, + "sdp": { + "type": "string" + }, + "nick": { + "type": "string" + } + } + } + } + } + }, + { + "op": "add", + "path": "/components/schemas/SignalingICECandidateMessage", + "value": { + "type": "object", + "required": [ + "from", + "to", + "type", + "payload" + ], + "properties": { + "from": { + "type": "string" + }, + "to": { + "type": "string" + }, + "type": { + "$ref": "#/components/schemas/SignalingMessageType" + }, + "roomType": { + "$ref": "#/components/schemas/SignalingRoomType" + }, + "sid": { + "type": "string" + }, + "payload": { + "type": "object", + "required": [ + "candidate" + ], + "properties": { + "candidate": { + "type": "object", + "required": [ + "sdpMLineIndex", + "sdpMid", + "candidate" + ], + "properties": { + "sdpMLineIndex": { + "type": "integer" + }, + "sdpMid": { + "type": "string" + }, + "candidate": { + "type": "string" + } + } + } + } + } + } + } + }, + { + "op": "add", + "path": "/components/schemas/SignalingMuteMessage", + "value": { + "type": "object", + "required": [ + "from", + "to", + "type", + "payload" + ], + "properties": { + "from": { + "type": "string" + }, + "to": { + "type": "string" + }, + "type": { + "$ref": "#/components/schemas/SignalingMessageType" + }, + "roomType": { + "$ref": "#/components/schemas/SignalingRoomType" + }, + "sid": { + "type": "string" + }, + "payload": { + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string", + "enum": [ + "audio", + "video" + ] + } + } + } + } + } + } +] diff --git a/packages/nextcloud/test/spreed_test.dart b/packages/nextcloud/test/spreed_test.dart index 84ad5773..82b8f854 100644 --- a/packages/nextcloud/test/spreed_test.dart +++ b/packages/nextcloud/test/spreed_test.dart @@ -1,8 +1,9 @@ import 'dart:async'; -import 'dart:convert'; +import 'package:built_collection/built_collection.dart'; import 'package:built_value/json_object.dart'; import 'package:nextcloud/core.dart' as core; +import 'package:nextcloud/nextcloud.dart'; import 'package:nextcloud/spreed.dart' as spreed; import 'package:test/test.dart'; @@ -385,29 +386,46 @@ void main() { final room2 = (await client2.spreed.room.joinRoom(token: room.token)).body.ocs.data; await client2.spreed.call.joinCall(token: room.token); + final muteMessage = spreed.SignalingMuteMessage( + (final b) => b + ..from = room1.sessionId + ..to = room2.sessionId + ..type = spreed.SignalingMessageType.mute + ..payload.update( + (final b) => b..name = spreed.SignalingMuteMessage_Payload_Name.audio, + ), + ); + final message = spreed.SignalingMessage( + (final b) => b + ..data = JsonObject(muteMessage.toJson()) + ..signalingMuteMessage = muteMessage.toBuilder(), + ); await client1.spreed.signaling.sendMessages( token: room.token, - messages: json.encode([ - { - 'ev': 'message', - 'sessionId': room1.sessionId, - 'fn': json.encode({ - 'to': room2.sessionId, - }), - }, - ]), + messages: ContentString( + (final b) => b + ..content = BuiltList([ + spreed.SignalingSendMessagesMessages( + (final b) => b + ..sessionId = room1.sessionId + ..fn = ContentString( + (final b) => b..content = message, + ).toBuilder(), + ), + ]), + ), ); await Future.delayed(const Duration(seconds: 1)); final messages = (await client2.spreed.signaling.pullMessages(token: room.token)).body.ocs.data; expect(messages, hasLength(2)); - expect(messages[0].type, 'message'); - expect(json.decode(messages[0].data.string!), {'to': room2.sessionId, 'from': room1.sessionId}); - expect(messages[1].type, 'usersInRoom'); - expect(messages[1].data.builtListSignalingSession, hasLength(2)); - expect(messages[1].data.builtListSignalingSession![0].userId, 'user1'); - expect(messages[1].data.builtListSignalingSession![1].userId, 'user2'); + expect(messages[0].signalingMessageWrapper!.type, 'message'); + expect(messages[0].signalingMessageWrapper!.data.content, {'to': room2.sessionId, 'from': room1.sessionId}); + expect(messages[1].signalingSessions!.type, 'usersInRoom'); + expect(messages[1].signalingSessions!.data, hasLength(2)); + expect(messages[1].signalingSessions!.data[0].userId, 'user1'); + expect(messages[1].signalingSessions!.data[1].userId, 'user2'); }); }); }, From 70cd0a6239f91d817b74daadb1024f97ceab9f56 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Wed, 31 May 2023 16:38:10 +0200 Subject: [PATCH 2/6] feat(neon): Implement RichObject Signed-off-by: jld3103 --- packages/app/pubspec.lock | 8 +++ .../neon/lib/src/widgets/rich_object.dart | 50 +++++++++++++++++++ packages/neon/neon/lib/widgets.dart | 1 + packages/neon/neon/pubspec.yaml | 1 + 4 files changed, 60 insertions(+) create mode 100644 packages/neon/neon/lib/src/widgets/rich_object.dart diff --git a/packages/app/pubspec.lock b/packages/app/pubspec.lock index 9c094fbb..9895f3ec 100644 --- a/packages/app/pubspec.lock +++ b/packages/app/pubspec.lock @@ -398,6 +398,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.5" + flutter_parsed_text: + dependency: transitive + description: + name: flutter_parsed_text + sha256: "529cf5793b7acdf16ee0f97b158d0d4ba0bf06e7121ef180abe1a5b59e32c1e2" + url: "https://pub.dev" + source: hosted + version: "2.2.1" flutter_plugin_android_lifecycle: dependency: transitive description: diff --git a/packages/neon/neon/lib/src/widgets/rich_object.dart b/packages/neon/neon/lib/src/widgets/rich_object.dart new file mode 100644 index 00000000..2453caac --- /dev/null +++ b/packages/neon/neon/lib/src/widgets/rich_object.dart @@ -0,0 +1,50 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_parsed_text/flutter_parsed_text.dart'; +import 'package:neon/src/blocs/accounts.dart'; +import 'package:neon/src/widgets/user_avatar.dart'; +import 'package:provider/provider.dart'; + +class NeonRichObject extends MatchText { + NeonRichObject({ + required final Map parameters, + }) : super( + onTap: (final _) {}, + pattern: '{(${parameters.keys.join('|')})}', + renderWidget: ({ + required final pattern, + required final text, + }) => + Builder( + builder: (final context) { + final richObject = parameters[text.substring(1, text.length - 1)] as Map; + switch (richObject['type']! as String) { + case 'user': + case 'call': + final account = Provider.of(context, listen: false).activeAccount.value!; + final id = richObject['id']! as String; + final isOwnUser = id == account.username; + return Chip( + avatar: NeonUserAvatar( + account: account, + username: id, + showStatus: false, + ), + label: Text( + richObject['name']! as String, + style: TextStyle( + color: isOwnUser + ? Theme.of(context).colorScheme.onPrimary + : Theme.of(context).colorScheme.onBackground, + ), + ), + backgroundColor: + isOwnUser ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.background, + ); + default: + debugPrint('Rich message type ${richObject['type']} not implemented yet'); + return Text(text); + } + }, + ), + ); +} diff --git a/packages/neon/neon/lib/widgets.dart b/packages/neon/neon/lib/widgets.dart index a1b6d690..7504b54b 100644 --- a/packages/neon/neon/lib/widgets.dart +++ b/packages/neon/neon/lib/widgets.dart @@ -4,4 +4,5 @@ export 'package:neon/src/widgets/image.dart'; export 'package:neon/src/widgets/linear_progress_indicator.dart'; export 'package:neon/src/widgets/list_view.dart'; export 'package:neon/src/widgets/relative_time.dart'; +export 'package:neon/src/widgets/rich_object.dart'; export 'package:neon/src/widgets/server_icon.dart'; diff --git a/packages/neon/neon/pubspec.yaml b/packages/neon/neon/pubspec.yaml index f6139ab9..a695b252 100644 --- a/packages/neon/neon/pubspec.yaml +++ b/packages/neon/neon/pubspec.yaml @@ -22,6 +22,7 @@ dependencies: sdk: flutter flutter_material_design_icons: ^1.0.0 flutter_native_splash: ^2.0.0 + flutter_parsed_text: ^2.0.0 flutter_svg: ^2.0.0 flutter_zxing: ^1.0.0 go_router: ^12.0.0 From 13ef98ba0faf9df4ccfd5d3ea39de1cfb60d4111 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Wed, 31 May 2023 16:38:52 +0200 Subject: [PATCH 3/6] feat(neon): Implement AutoComplete Signed-off-by: jld3103 --- .../neon/lib/src/widgets/autocomplete.dart | 101 ++++++++++++++++++ .../neon/lib/src/widgets/group_avatar.dart | 26 +++++ packages/neon/neon/lib/widgets.dart | 2 + packages/neon/neon/pubspec.yaml | 2 +- 4 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 packages/neon/neon/lib/src/widgets/autocomplete.dart create mode 100644 packages/neon/neon/lib/src/widgets/group_avatar.dart diff --git a/packages/neon/neon/lib/src/widgets/autocomplete.dart b/packages/neon/neon/lib/src/widgets/autocomplete.dart new file mode 100644 index 00000000..06ea8249 --- /dev/null +++ b/packages/neon/neon/lib/src/widgets/autocomplete.dart @@ -0,0 +1,101 @@ +import 'package:flutter/material.dart'; +import 'package:neon/src/blocs/accounts.dart'; +import 'package:neon/src/models/account.dart'; +import 'package:neon/src/widgets/group_avatar.dart'; +import 'package:neon/src/widgets/user_avatar.dart'; +import 'package:nextcloud/core.dart' as core; +import 'package:provider/provider.dart'; + +class NeonAutocomplete extends StatelessWidget { + const NeonAutocomplete({ + required this.account, + required this.itemType, + required this.itemId, + required this.shareTypes, + required this.onSelected, + this.sorter, + this.limit = 10, + this.validator, + this.decoration, + this.onFieldSubmitted, + super.key, + }); + + final Account account; + + final String itemType; + final String itemId; + final List shareTypes; + final void Function(core.AutocompleteResult entry) onSelected; + final String? sorter; + final int limit; + final FormFieldValidator? validator; + final InputDecoration? decoration; + final ValueChanged? onFieldSubmitted; + + @override + Widget build(final BuildContext context) => Autocomplete( + fieldViewBuilder: ( + final context, + final controller, + final focusNode, + final onFieldSubmitted, + ) => + TextFormField( + controller: controller, + focusNode: focusNode, + validator: validator, + decoration: decoration, + onFieldSubmitted: (final value) { + onFieldSubmitted(); + this.onFieldSubmitted?.call(value); + }, + ), + optionsBuilder: (final text) async { + final result = await account.client.core.autoComplete.$get( + search: text.text, + itemType: itemType, + itemId: itemId, + shareTypes: shareTypes, + ); + return result.body.ocs.data; + }, + displayStringForOption: (final option) => option.id, + optionsViewBuilder: (final context, final onSelected, final options) => Align( + alignment: Alignment.topLeft, + child: Material( + elevation: 4, + child: ConstrainedBox( + constraints: const BoxConstraints(maxHeight: 200), + child: ListView.builder( + padding: EdgeInsets.zero, + shrinkWrap: true, + itemCount: options.length, + itemBuilder: (final context, final index) { + final option = options.elementAt(index); + Widget? icon; + switch (option.source) { + case 'users': + icon = NeonUserAvatar( + username: option.id, + account: Provider.of(context, listen: false).activeAccount.value!, + ); + case 'groups': + icon = const NeonGroupAvatar(); + } + return ListTile( + title: Text(option.label), + subtitle: Text(option.id), + leading: icon, + onTap: () { + onSelected(option); + }, + ); + }, + ), + ), + ), + ), + onSelected: onSelected, + ); +} diff --git a/packages/neon/neon/lib/src/widgets/group_avatar.dart b/packages/neon/neon/lib/src/widgets/group_avatar.dart new file mode 100644 index 00000000..6034381b --- /dev/null +++ b/packages/neon/neon/lib/src/widgets/group_avatar.dart @@ -0,0 +1,26 @@ +import 'package:flutter/material.dart'; +import 'package:neon/src/theme/sizes.dart'; + +class NeonGroupAvatar extends StatelessWidget { + const NeonGroupAvatar({ + this.icon = Icons.group, + this.backgroundColor, + this.foregroundColor, + super.key, + }); + + final IconData icon; + final Color? backgroundColor; + final Color? foregroundColor; + + @override + Widget build(final BuildContext context) => CircleAvatar( + radius: smallIconSize, + backgroundColor: backgroundColor, + child: Icon( + icon, + color: foregroundColor, + size: smallIconSize, + ), + ); +} diff --git a/packages/neon/neon/lib/widgets.dart b/packages/neon/neon/lib/widgets.dart index 7504b54b..94db971f 100644 --- a/packages/neon/neon/lib/widgets.dart +++ b/packages/neon/neon/lib/widgets.dart @@ -1,5 +1,7 @@ +export 'package:neon/src/widgets/autocomplete.dart'; export 'package:neon/src/widgets/dialog.dart'; export 'package:neon/src/widgets/error.dart'; +export 'package:neon/src/widgets/group_avatar.dart'; export 'package:neon/src/widgets/image.dart'; export 'package:neon/src/widgets/linear_progress_indicator.dart'; export 'package:neon/src/widgets/list_view.dart'; diff --git a/packages/neon/neon/pubspec.yaml b/packages/neon/neon/pubspec.yaml index a695b252..a77539c2 100644 --- a/packages/neon/neon/pubspec.yaml +++ b/packages/neon/neon/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: sdk: flutter flutter_material_design_icons: ^1.0.0 flutter_native_splash: ^2.0.0 - flutter_parsed_text: ^2.0.0 + flutter_parsed_text: ^2.1.0 flutter_svg: ^2.0.0 flutter_zxing: ^1.0.0 go_router: ^12.0.0 From adbf49d84a6216269ff258b5ce429da8d3b56a53 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Sat, 15 Jul 2023 18:41:59 +0200 Subject: [PATCH 4/6] feat(neon): Export user avatar widget Signed-off-by: jld3103 --- packages/neon/neon/lib/widgets.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/neon/neon/lib/widgets.dart b/packages/neon/neon/lib/widgets.dart index 94db971f..198154c3 100644 --- a/packages/neon/neon/lib/widgets.dart +++ b/packages/neon/neon/lib/widgets.dart @@ -8,3 +8,4 @@ export 'package:neon/src/widgets/list_view.dart'; export 'package:neon/src/widgets/relative_time.dart'; export 'package:neon/src/widgets/rich_object.dart'; export 'package:neon/src/widgets/server_icon.dart'; +export 'package:neon/src/widgets/user_avatar.dart'; From 6c8c482d2febbaaf5fc1e0e959c776f0e4837d74 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Wed, 31 May 2023 16:21:31 +0200 Subject: [PATCH 5/6] feat(neon_spreed): Init Signed-off-by: jld3103 --- .cspell/dart_flutter.txt | 1 + .cspell/nextcloud.txt | 1 + .cspell/tools.txt | 1 + README.md | 2 +- commitlint.yaml | 1 + docs/architecture.puml | 3 + docs/architecture.svg | 2 +- packages/neon/neon/lib/l10n/en.arb | 2 +- .../neon/neon/lib/l10n/localizations.dart | 2 +- .../neon/neon/lib/l10n/localizations_en.dart | 1 + packages/neon/neon_spreed/.metadata | 10 + packages/neon/neon_spreed/LICENSE | 674 ++++++++++++++++++ .../neon/neon_spreed/analysis_options.yaml | 10 + packages/neon/neon_spreed/assets/app.svg.vec | Bin 0 -> 340 bytes packages/neon/neon_spreed/build.yaml | 0 packages/neon/neon_spreed/l10n.yaml | 7 + packages/neon/neon_spreed/lib/blocs/call.dart | 466 ++++++++++++ packages/neon/neon_spreed/lib/blocs/room.dart | 174 +++++ .../neon/neon_spreed/lib/blocs/spreed.dart | 75 ++ .../neon_spreed/lib/dialogs/create_room.dart | 142 ++++ .../lib/dialogs/select_screen.dart | 97 +++ packages/neon/neon_spreed/lib/l10n/en.arb | 17 + .../neon_spreed/lib/l10n/localizations.dart | 203 ++++++ .../lib/l10n/localizations_en.dart | 48 ++ .../neon/neon_spreed/lib/neon_spreed.dart | 84 +++ packages/neon/neon_spreed/lib/options.dart | 8 + packages/neon/neon_spreed/lib/pages/call.dart | 145 ++++ packages/neon/neon_spreed/lib/pages/main.dart | 113 +++ packages/neon/neon_spreed/lib/pages/room.dart | 324 +++++++++ packages/neon/neon_spreed/lib/routes.dart | 18 + packages/neon/neon_spreed/lib/routes.g.dart | 33 + .../neon_spreed/lib/utils/participants.dart | 110 +++ .../neon/neon_spreed/lib/utils/view_size.dart | 21 + .../neon_spreed/lib/widgets/call_button.dart | 54 ++ .../lib/widgets/call_participant_view.dart | 69 ++ .../neon_spreed/lib/widgets/room_icon.dart | 58 ++ .../lib/widgets/screen_preview.dart | 60 ++ packages/neon/neon_spreed/mono_pkg.yaml | 7 + packages/neon/neon_spreed/pubspec.yaml | 45 ++ .../neon/neon_spreed/pubspec_overrides.yaml | 12 + 40 files changed, 3096 insertions(+), 4 deletions(-) create mode 100644 packages/neon/neon_spreed/.metadata create mode 100644 packages/neon/neon_spreed/LICENSE create mode 100644 packages/neon/neon_spreed/analysis_options.yaml create mode 100644 packages/neon/neon_spreed/assets/app.svg.vec create mode 100644 packages/neon/neon_spreed/build.yaml create mode 100644 packages/neon/neon_spreed/l10n.yaml create mode 100644 packages/neon/neon_spreed/lib/blocs/call.dart create mode 100644 packages/neon/neon_spreed/lib/blocs/room.dart create mode 100644 packages/neon/neon_spreed/lib/blocs/spreed.dart create mode 100644 packages/neon/neon_spreed/lib/dialogs/create_room.dart create mode 100644 packages/neon/neon_spreed/lib/dialogs/select_screen.dart create mode 100644 packages/neon/neon_spreed/lib/l10n/en.arb create mode 100644 packages/neon/neon_spreed/lib/l10n/localizations.dart create mode 100644 packages/neon/neon_spreed/lib/l10n/localizations_en.dart create mode 100644 packages/neon/neon_spreed/lib/neon_spreed.dart create mode 100644 packages/neon/neon_spreed/lib/options.dart create mode 100644 packages/neon/neon_spreed/lib/pages/call.dart create mode 100644 packages/neon/neon_spreed/lib/pages/main.dart create mode 100644 packages/neon/neon_spreed/lib/pages/room.dart create mode 100644 packages/neon/neon_spreed/lib/routes.dart create mode 100644 packages/neon/neon_spreed/lib/routes.g.dart create mode 100644 packages/neon/neon_spreed/lib/utils/participants.dart create mode 100644 packages/neon/neon_spreed/lib/utils/view_size.dart create mode 100644 packages/neon/neon_spreed/lib/widgets/call_button.dart create mode 100644 packages/neon/neon_spreed/lib/widgets/call_participant_view.dart create mode 100644 packages/neon/neon_spreed/lib/widgets/room_icon.dart create mode 100644 packages/neon/neon_spreed/lib/widgets/screen_preview.dart create mode 100644 packages/neon/neon_spreed/mono_pkg.yaml create mode 100644 packages/neon/neon_spreed/pubspec.yaml create mode 100644 packages/neon/neon_spreed/pubspec_overrides.yaml diff --git a/.cspell/dart_flutter.txt b/.cspell/dart_flutter.txt index 15af3041..0f805067 100644 --- a/.cspell/dart_flutter.txt +++ b/.cspell/dart_flutter.txt @@ -10,4 +10,5 @@ sublist todos unawaited unfocus +videocam writeln diff --git a/.cspell/nextcloud.txt b/.cspell/nextcloud.txt index 0328ec99..7c0d3665 100644 --- a/.cspell/nextcloud.txt +++ b/.cspell/nextcloud.txt @@ -67,6 +67,7 @@ trashbin turnservers undelete unifiedpush +unmute unsharing unstar updatenotification diff --git a/.cspell/tools.txt b/.cspell/tools.txt index 42c7fde6..0854cbd3 100644 --- a/.cspell/tools.txt +++ b/.cspell/tools.txt @@ -66,6 +66,7 @@ strfreev subprojects sysroot tsvg +webrtc werror workdir xxxh diff --git a/README.md b/README.md index c1735349..6eafda2b 100644 --- a/README.md +++ b/README.md @@ -54,12 +54,12 @@ See [here](packages/app/README.md) for screenshots. | [News](packages/neon/neon_news) | :heavy_check_mark: | | [Notes](packages/neon/neon_notes) | :heavy_check_mark: | | [Notifications](packages/neon/neon_notifications) | :heavy_check_mark: | +| [Talk](packages/neon/neon_spreed) | :heavy_check_mark: | | Activity | :rocket: | | Calendar | :rocket: | | Contacts | :rocket: | | Cookbook | :rocket: | | Photos | :rocket: | -| Talk | :rocket: | | Tasks | :rocket: | ## Platform support diff --git a/commitlint.yaml b/commitlint.yaml index ee82dc00..f974fd16 100644 --- a/commitlint.yaml +++ b/commitlint.yaml @@ -23,6 +23,7 @@ rules: - neon_news - neon_notes - neon_notifications + - neon_spreed - neon_lints - nextcloud - sort_box diff --git a/docs/architecture.puml b/docs/architecture.puml index 67be1d48..eaa024fe 100644 --- a/docs/architecture.puml +++ b/docs/architecture.puml @@ -13,6 +13,7 @@ package "Clients" { component neon_news component neon_notes component neon_notifications + component neon_spreed } package "OpenAPI" { @@ -27,11 +28,13 @@ app ..> neon_files app ..> neon_news app ..> neon_notes app ..> neon_notifications +app ..> neon_spreed neon_files --> neon neon_news --> neon neon_notes --> neon neon_notifications --> neon +neon_spreed --> neon neon --> nextcloud diff --git a/docs/architecture.svg b/docs/architecture.svg index acf5dffd..e3966745 100644 --- a/docs/architecture.svg +++ b/docs/architecture.svg @@ -1 +1 @@ -Neon frameworkClientsOpenAPIneonnextcloudsort_boxfile_iconsneon_dashboardneon_filesneon_newsneon_notesneon_notificationsdynamitespecificationsapp \ No newline at end of file +Neon frameworkClientsOpenAPIneonnextcloudsort_boxfile_iconsneon_dashboardneon_filesneon_newsneon_notesneon_notificationsneon_spreeddynamitespecificationsapp \ No newline at end of file diff --git a/packages/neon/neon/lib/l10n/en.arb b/packages/neon/neon/lib/l10n/en.arb index cfc0f28e..4b73e259 100644 --- a/packages/neon/neon/lib/l10n/en.arb +++ b/packages/neon/neon/lib/l10n/en.arb @@ -2,7 +2,7 @@ "@@locale": "en", "nextcloud": "Nextcloud", "nextcloudLogo": "Nextcloud logo", - "appImplementationName": "{app, select, nextcloud{Nextcloud} core{Server} dashboard{Dashboard} files{Files} news{News} notes{Notes} notifications{Notifications} other{}}", + "appImplementationName": "{app, select, nextcloud{Nextcloud} core{Server} dashboard{Dashboard} files{Files} news{News} notes{Notes} notifications{Notifications} spreed{Talk} other{}}", "@appImplementationName": { "placeholders": { "app": {} diff --git a/packages/neon/neon/lib/l10n/localizations.dart b/packages/neon/neon/lib/l10n/localizations.dart index b588aaf2..f7b0ac5b 100644 --- a/packages/neon/neon/lib/l10n/localizations.dart +++ b/packages/neon/neon/lib/l10n/localizations.dart @@ -104,7 +104,7 @@ abstract class NeonLocalizations { /// No description provided for @appImplementationName. /// /// In en, this message translates to: - /// **'{app, select, nextcloud{Nextcloud} core{Server} dashboard{Dashboard} files{Files} news{News} notes{Notes} notifications{Notifications} other{}}'** + /// **'{app, select, nextcloud{Nextcloud} core{Server} dashboard{Dashboard} files{Files} news{News} notes{Notes} notifications{Notifications} spreed{Talk} other{}}'** String appImplementationName(String app); /// No description provided for @loginAgain. diff --git a/packages/neon/neon/lib/l10n/localizations_en.dart b/packages/neon/neon/lib/l10n/localizations_en.dart index e8df967a..8e2c2bc1 100644 --- a/packages/neon/neon/lib/l10n/localizations_en.dart +++ b/packages/neon/neon/lib/l10n/localizations_en.dart @@ -24,6 +24,7 @@ class NeonLocalizationsEn extends NeonLocalizations { 'news': 'News', 'notes': 'Notes', 'notifications': 'Notifications', + 'spreed': 'Talk', 'other': '', }, ); diff --git a/packages/neon/neon_spreed/.metadata b/packages/neon/neon_spreed/.metadata new file mode 100644 index 00000000..9d75c7ec --- /dev/null +++ b/packages/neon/neon_spreed/.metadata @@ -0,0 +1,10 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "ead455963c12b453cdb2358cad34969c76daf180" + channel: "stable" + +project_type: package diff --git a/packages/neon/neon_spreed/LICENSE b/packages/neon/neon_spreed/LICENSE new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/packages/neon/neon_spreed/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/packages/neon/neon_spreed/analysis_options.yaml b/packages/neon/neon_spreed/analysis_options.yaml new file mode 100644 index 00000000..6c0ada98 --- /dev/null +++ b/packages/neon/neon_spreed/analysis_options.yaml @@ -0,0 +1,10 @@ +include: package:neon_lints/flutter.yaml + +linter: + rules: + # TODO + public_member_api_docs: false + +analyzer: + exclude: + - lib/l10n/** diff --git a/packages/neon/neon_spreed/assets/app.svg.vec b/packages/neon/neon_spreed/assets/app.svg.vec new file mode 100644 index 0000000000000000000000000000000000000000..5e441a9f6e85a556012e44d7339a11509c74e94a GIT binary patch literal 340 zcmYe&?O+L(f{C8kvXt2M1+17D8P=3nyd`FP_^FTVYM#NF;ZN6jc z6b;8%r!2=R5i7^Wsqv0%H{2c9@uoT!u1RxT=U(b~k15YF*)`Ac;M!8hTc6S#vzbyI z-D+GMW0(^iudOwAWIdkcSh`2eG4*}Eqe_RcqukGYM=qefPk!V();qR1+`MY*Sa`MG zeh$!H!*liaKqotj*k?H$jZ_2EOA1^am-}vZ0MVC#a^Le^9Ydqk9KC?@ATf}75S7 literal 0 HcmV?d00001 diff --git a/packages/neon/neon_spreed/build.yaml b/packages/neon/neon_spreed/build.yaml new file mode 100644 index 00000000..e69de29b diff --git a/packages/neon/neon_spreed/l10n.yaml b/packages/neon/neon_spreed/l10n.yaml new file mode 100644 index 00000000..ce199896 --- /dev/null +++ b/packages/neon/neon_spreed/l10n.yaml @@ -0,0 +1,7 @@ +arb-dir: lib/l10n +template-arb-file: en.arb +output-localization-file: localizations.dart +synthetic-package: false +output-class: SpreedLocalizations +output-dir: lib/l10n +nullable-getter: false diff --git a/packages/neon/neon_spreed/lib/blocs/call.dart b/packages/neon/neon_spreed/lib/blocs/call.dart new file mode 100644 index 00000000..b91414cb --- /dev/null +++ b/packages/neon/neon_spreed/lib/blocs/call.dart @@ -0,0 +1,466 @@ +part of '../../neon_spreed.dart'; + +abstract class SpreedCallBlocEvents { + Future leaveCall(); + + // ignore: avoid_positional_boolean_parameters + void changeAudio(final bool enabled); + + // ignore: avoid_positional_boolean_parameters + void changeVideo(final bool enabled); + + // ignore: avoid_positional_boolean_parameters + void changeScreen(final bool enabled); +} + +abstract class SpreedCallBlocStates { + BehaviorSubject> get remoteParticipants; + + BehaviorSubject get audioEnabled; + + BehaviorSubject get videoEnabled; + + BehaviorSubject get screenEnabled; +} + +class SpreedCallBloc extends InteractiveBloc implements SpreedCallBlocEvents, SpreedCallBlocStates { + SpreedCallBloc( + this._settings, + this._client, + this._roomToken, + this._sessionID, + ) { + unawaited(_setupLocalParticipant().then((final _) => refresh())); + } + + final spreed.SignalingSettings _settings; + final NextcloudClient _client; + final String _roomToken; + final String _sessionID; + + var _listeningSignalingMessages = false; + late SpreedLocalCallParticipant localParticipant; + + @override + void dispose() { + _listeningSignalingMessages = false; + remoteParticipants.valueOrNull?.forEach((final participant) => participant.dispose()); + unawaited(remoteParticipants.close()); + unawaited(audioEnabled.close()); + unawaited(videoEnabled.close()); + unawaited(screenEnabled.close()); + super.dispose(); + } + + @override + BehaviorSubject> remoteParticipants = BehaviorSubject(); + + @override + BehaviorSubject audioEnabled = BehaviorSubject.seeded(false); + + @override + BehaviorSubject videoEnabled = BehaviorSubject.seeded(false); + + @override + BehaviorSubject screenEnabled = BehaviorSubject.seeded(false); + + @override + Future refresh() async { + try { + await _client.spreed.call.joinCall(token: _roomToken); + _listenForSignalingMessages(); + } on Exception catch (e, s) { + debugPrint(e.toString()); + debugPrint(s.toString()); + addError(e); + } + } + + @override + Future leaveCall() async { + try { + await _client.spreed.call.leaveCall(token: _roomToken); + } on Exception catch (e, s) { + debugPrint(e.toString()); + debugPrint(s.toString()); + addError(e); + } + } + + @override + // ignore: avoid_void_async + void changeAudio(final bool enabled) async { + audioEnabled.add(enabled); + await _updateLocalParticipant(); + } + + @override + // ignore: avoid_void_async + void changeVideo(final bool enabled) async { + videoEnabled.add(enabled); + await _updateLocalParticipant(); + } + + @override + void changeScreen(final bool enabled) { + screenEnabled.add(enabled); + } + + Future _setupLocalParticipant() async { + final stream = await navigator.mediaDevices.getUserMedia({ + 'audio': true, + 'video': true, + }); + for (final track in stream.getTracks()) { + track.enabled = false; + } + final renderer = await _getInitializedRenderer(); + renderer.srcObject = stream; + localParticipant = SpreedLocalCallParticipant( + _settings.userId!, + _sessionID, + renderer, + stream, + ); + } + + Future _sendSignalingMessages(final List messages) async { + for (final message in messages) { + // TODO: Send all messages at once, needs to send it over the body and not the URL, because that gets too long + try { + await _client.spreed.signaling.sendMessages( + token: _roomToken, + messages: ContentString( + (final b) => b + ..content = BuiltList([ + spreed.SignalingSendMessagesMessages( + (final b) => b + ..fn = ContentString( + (final b) => b..content = message, + ).toBuilder() + ..sessionId = _sessionID, + ), + ]), + ), + ); + } on Exception catch (e, s) { + debugPrint(e.toString()); + debugPrint(s.toString()); + addError(e); + } + } + } + + SpreedRemoteCallParticipant? _getRemoteParticipant(final String sessionID) { + final remoteParticipantMatches = + remoteParticipants.value.where((final participant) => participant.sessionID == sessionID); + if (remoteParticipantMatches.length == 1) { + return remoteParticipantMatches.single; + } + return null; + } + + Future _updateRemoteParticipant( + final String sessionID, + final Future Function(SpreedRemoteCallParticipant) call, + ) async { + final updatedRemoteParticipants = []; + for (final remoteParticipant in remoteParticipants.value) { + if (remoteParticipant.sessionID == sessionID) { + updatedRemoteParticipants.add(await call(remoteParticipant)); + } else { + updatedRemoteParticipants.add(remoteParticipant); + } + } + remoteParticipants.add(updatedRemoteParticipants); + } + + Stream> _pullSignalingMessages() async* { + while (_listeningSignalingMessages) { + try { + yield (await _client.spreed.signaling.pullMessages(token: _roomToken)).body.ocs.data.toList(); + } on Exception catch (e, s) { + if (e is DynamiteApiException && e.statusCode >= 500) { + continue; + } + debugPrint(e.toString()); + debugPrint(s.toString()); + addError(e); + } + } + } + + Future _updateLocalParticipant() async { + if (localParticipant.stream != null) { + for (final track in localParticipant.stream!.getTracks()) { + switch (track.kind) { + case 'video': + track.enabled = videoEnabled.value; + case 'audio': + track.enabled = audioEnabled.value; + default: + debugPrint('Unknown track kind ${track.kind}'); + } + } + } + + await _sendSignalingMessages(_generateMuteMessages(remoteParticipants.value)); + } + + List _generateMuteMessages(final List participants) => [ + for (final remoteParticipant in participants) ...[ + for (final entry in { + spreed.SignalingMuteMessage_Payload_Name.audio: audioEnabled.value, + spreed.SignalingMuteMessage_Payload_Name.video: videoEnabled.value, + }.entries) ...[ + spreed.SignalingMessage( + (final b) => b + ..signalingMuteMessage = spreed.SignalingMuteMessage( + (final b) => b + ..from = _sessionID + ..to = remoteParticipant.sessionID + ..type = entry.value ? spreed.SignalingMessageType.unmute : spreed.SignalingMessageType.mute + ..payload = spreed.SignalingMuteMessage_Payload( + (final b) => b.name = entry.key, + ).toBuilder(), + ).toBuilder(), + ), + ], + ], + ]; + + bool _isWeakerParticipant(final SpreedRemoteCallParticipant remoteParticipant) => + _sessionID.compareTo(remoteParticipant.sessionID) > 0; + + Future _sendOffer(final SpreedRemoteCallParticipant remoteParticipant) async { + debugPrint('Sending offer to ${remoteParticipant.userID} ${remoteParticipant.sessionID}'); + // TODO: For now this is disabled, because sending long or many signaling messages is broken. + //return; + final connection = await _setupConnection(remoteParticipant); + final localSDP = await connection.createOffer(); + await connection.setLocalDescription(localSDP); + await _sendSignalingMessages([ + spreed.SignalingMessage( + (final b) => b + ..signalingSessionDescriptionMessage = spreed.SignalingSessionDescriptionMessage( + (final b) => b + ..from = _sessionID + ..to = remoteParticipant.sessionID + ..type = spreed.SignalingMessageType.offer + ..payload = spreed.SignalingSessionDescriptionMessage_Payload( + (final b) => b + ..type = spreed.SignalingSessionDescriptionMessage_Payload_Type.offer + ..sdp = localSDP.sdp + ..nick = '', + ).toBuilder(), + ).toBuilder(), + ), + ..._generateMuteMessages([remoteParticipant]), + ]); + } + + Future _setupConnection(final SpreedRemoteCallParticipant remoteParticipant) async { + final connection = await createPeerConnection( + { + 'sdpSemantics': 'unified-plan', + 'iceServers': [ + ..._settings.stunservers.map((final s) => s.toJson()), + ..._settings.turnservers.map((final s) => s.toJson()), + ], + }, + ); + connection + ..onTrack = (final event) async { + if (event.track.kind == 'video') { + final stream = event.streams.first; + final renderer = await _getInitializedRenderer(); + renderer.srcObject = stream; + await _updateRemoteParticipant( + remoteParticipant.sessionID, + (final remoteParticipant) async => remoteParticipant + ..renderer = renderer + ..stream = stream, + ); + } + } + ..onIceCandidate = (final candidate) async { + await _sendSignalingMessages([ + spreed.SignalingMessage( + (final b) => b + ..signalingICECandidateMessage = spreed.SignalingICECandidateMessage( + (final b) => b + ..from = _sessionID + ..to = remoteParticipant.sessionID + ..type = spreed.SignalingMessageType.answer + ..payload = spreed.SignalingICECandidateMessage_Payload( + (final b) => b + ..candidate = spreed.SignalingICECandidateMessage_Payload_Candidate( + (final b) => b + ..candidate = candidate.candidate + ..sdpMid = candidate.sdpMid + ..sdpMLineIndex = candidate.sdpMLineIndex, + ).toBuilder(), + ).toBuilder(), + ).toBuilder(), + ), + ]); + } + ..onIceGatheringState = print + ..onIceConnectionState = print + ..onConnectionState = print; + await remoteParticipant.acceptNewConnection(connection); + await remoteParticipant.acceptNewLocalStream(localParticipant.stream); + + return connection; + } + + void _listenForSignalingMessages() { + if (_listeningSignalingMessages) { + return; + } + _listeningSignalingMessages = true; + _pullSignalingMessages().listen((final messages) async { + for (final message in messages) { + if (!_listeningSignalingMessages) { + return; + } + if (message.signalingSessions != null) { + final users = message.signalingSessions!.data.where( + (final user) => + spreed.ParticipantInCallFlag.values.byBinary(user.inCall).contains(spreed.ParticipantInCallFlag.inCall), + ); + + final currentParticipants = remoteParticipants.valueOrNull ?? []; + final updatedParticipants = []; + + for (final currentParticipant in currentParticipants) { + if (users.where((final user) => user.userId == currentParticipant.userID).isNotEmpty) { + updatedParticipants.add(currentParticipant); + } else { + currentParticipant.dispose(); + } + } + + for (final user in users) { + if (currentParticipants + .where((final currentParticipant) => user.userId == currentParticipant.userID) + .isEmpty && + user.sessionId != _sessionID) { + final remoteParticipant = SpreedRemoteCallParticipant( + user.userId, + user.sessionId, + null, + null, + null, + null, + ); + if (_isWeakerParticipant(remoteParticipant)) { + await _sendOffer(remoteParticipant); + } + updatedParticipants.add(remoteParticipant); + } + } + remoteParticipants.add(updatedParticipants); + + continue; + } + + if (message.signalingMessageWrapper != null) { + final signalingMessage = message.signalingMessageWrapper!.data.content; + + if (signalingMessage.signalingSessionDescriptionMessage != null) { + final remoteSDP = signalingMessage.signalingSessionDescriptionMessage!; + + await _updateRemoteParticipant(remoteSDP.from, (final remoteParticipant) async { + switch (remoteSDP.payload.type) { + case spreed.SignalingSessionDescriptionMessage_Payload_Type.offer: + debugPrint('Received offer from ${remoteParticipant.userID} ${remoteParticipant.sessionID}'); + final connection = await _setupConnection(remoteParticipant); + await connection.setRemoteDescription( + RTCSessionDescription( + remoteSDP.payload.sdp, + 'offer', + ), + ); + final localSDP = await connection.createAnswer(); + await connection.setLocalDescription(localSDP); + await _sendSignalingMessages([ + spreed.SignalingMessage( + (final b) => b + ..signalingSessionDescriptionMessage = spreed.SignalingSessionDescriptionMessage( + (final b) => b + ..from = _sessionID + ..to = remoteParticipant.sessionID + ..type = spreed.SignalingMessageType.answer + ..payload = spreed.SignalingSessionDescriptionMessage_Payload( + (final b) => b + ..type = spreed.SignalingSessionDescriptionMessage_Payload_Type.answer + ..sdp = localSDP.sdp + ..nick = '', + ).toBuilder(), + ).toBuilder(), + ), + ..._generateMuteMessages([remoteParticipant]), + ]); + case spreed.SignalingSessionDescriptionMessage_Payload_Type.answer: + debugPrint('Received answer from ${remoteParticipant.userID} ${remoteParticipant.sessionID}'); + } + + return remoteParticipant; + }); + + continue; + } + + if (signalingMessage.signalingICECandidateMessage != null) { + final iceCandidateMessage = signalingMessage.signalingICECandidateMessage!; + final remoteParticipant = _getRemoteParticipant(iceCandidateMessage.from); + if (remoteParticipant == null) { + continue; + } + + if (iceCandidateMessage.payload.candidate.candidate.isEmpty) { + // TODO: Handle end-of-candidates properly + continue; + } + + await remoteParticipant.addCandidate( + RTCIceCandidate( + iceCandidateMessage.payload.candidate.candidate, + iceCandidateMessage.payload.candidate.sdpMid, + iceCandidateMessage.payload.candidate.sdpMLineIndex, + ), + ); + + continue; + } + + if (signalingMessage.signalingMuteMessage != null) { + final muteMessage = signalingMessage.signalingMuteMessage!; + + await _updateRemoteParticipant(muteMessage.from, (final remoteParticipant) async { + final isUnmute = muteMessage.type == spreed.SignalingMessageType.unmute; + switch (muteMessage.payload.name) { + case spreed.SignalingMuteMessage_Payload_Name.audio: + remoteParticipant.audioEnabled = isUnmute; + case spreed.SignalingMuteMessage_Payload_Name.video: + remoteParticipant.videoEnabled = isUnmute; + } + return remoteParticipant; + }); + + continue; + } + } + + debugPrint('Unknown signaling message ${message.toJson()}'); + } + }); + } +} + +Future _getInitializedRenderer() async { + final renderer = RTCVideoRenderer(); + await renderer.initialize(); + return renderer; +} diff --git a/packages/neon/neon_spreed/lib/blocs/room.dart b/packages/neon/neon_spreed/lib/blocs/room.dart new file mode 100644 index 00000000..b19cbd37 --- /dev/null +++ b/packages/neon/neon_spreed/lib/blocs/room.dart @@ -0,0 +1,174 @@ +part of '../neon_spreed.dart'; + +abstract class SpreedRoomBlocEvents { + void loadMoreMessages(); + + void sendMessage(final String message); + + Future leaveRoom(); +} + +abstract class SpreedRoomBlocStates { + BehaviorSubject> get room; + + BehaviorSubject>> get messages; + + BehaviorSubject get allLoaded; + + BehaviorSubject get sendingMessage; + + BehaviorSubject get lastCommonReadMessageId; +} + +class SpreedRoomBloc extends InteractiveBloc implements SpreedRoomBlocEvents, SpreedRoomBlocStates { + SpreedRoomBloc( + this.options, + this.account, + final spreed.Room r, + ) { + roomToken = r.token; + room.add(Result.success(r)); + + unawaited(refresh()); + } + + final SpreedAppSpecificOptions options; + final Account account; + late final String roomToken; + final _limit = 100; + + int? _lastKnownMessageId; + + @override + void dispose() { + unawaited(room.close()); + unawaited(messages.close()); + unawaited(allLoaded.close()); + unawaited(sendingMessage.close()); + unawaited(lastCommonReadMessageId.close()); + super.dispose(); + } + + @override + BehaviorSubject allLoaded = BehaviorSubject.seeded(false); + + @override + BehaviorSubject lastCommonReadMessageId = BehaviorSubject.seeded(null); + + @override + BehaviorSubject>> messages = BehaviorSubject(); + + @override + BehaviorSubject> room = BehaviorSubject(); + + @override + BehaviorSubject sendingMessage = BehaviorSubject.seeded(null); + + @override + Future refresh() async { + await RequestManager.instance.wrapNextcloud( + account.id, + 'spreed-room-$roomToken', + room, + account.client.spreed.room.joinRoomRaw(token: roomToken), + (final response) => response.body.ocs.data, + ); + await _loadMessages(force: true); + } + + @override + // ignore: avoid_void_async + void sendMessage(final String message) async { + try { + sendingMessage.add(message); + await account.client.spreed.chat.sendMessage( + token: roomToken, + message: message, + ); + await _loadMessages(force: true); + } catch (e, s) { + debugPrint(e.toString()); + debugPrint(s.toString()); + addError(e); + } finally { + sendingMessage.add(null); + } + } + + @override + Future loadMoreMessages() async { + await _loadMessages(force: false); + } + + @override + Future leaveRoom() async { + try { + await account.client.spreed.room.leaveRoom(token: roomToken); + } catch (e, s) { + debugPrint(e.toString()); + debugPrint(s.toString()); + addError(e); + } + } + + Future _loadMessages({required final bool force}) async { + if (!force && (allLoaded.valueOrNull ?? false)) { + return; + } + + final previousData = messages.valueOrNull?.data; + try { + messages.add( + Result( + previousData, + null, + isLoading: true, + isCached: true, + ), + ); + final data = await account.client.spreed.chat.receiveMessages( + token: roomToken, + lookIntoFuture: 0, + includeLastKnown: 1, + limit: _limit, + lastKnownMessageId: (force ? null : _lastKnownMessageId) ?? 0, + lastCommonReadId: lastCommonReadMessageId.valueOrNull ?? 0, + ); + + _lastKnownMessageId = data.headers.xChatLastGiven != null ? int.parse(data.headers.xChatLastGiven!) : null; + lastCommonReadMessageId.add( + data.headers.xChatLastCommonRead != null ? int.parse(data.headers.xChatLastCommonRead!) : null, + ); + + if (data.body.ocs.data.length < _limit) { + allLoaded.add(true); + } + + messages.add( + Result.success( + { + if (previousData != null) ..._messagesToUniqueMap(previousData), + ..._messagesToUniqueMap(data.body.ocs.data.toList()), + }.values.sorted((final a, final b) => b.id.compareTo(a.id)).toList(), + ), + ); + } catch (e, s) { + debugPrint(e.toString()); + debugPrint(s.toString()); + messages.add( + Result( + previousData, + e, + isLoading: false, + isCached: true, + ), + ); + } + } + + Map _messagesToUniqueMap(final List messages) => { + for (final message in messages) ...{ + message.id: message, + }, + }; +} diff --git a/packages/neon/neon_spreed/lib/blocs/spreed.dart b/packages/neon/neon_spreed/lib/blocs/spreed.dart new file mode 100644 index 00000000..98c89306 --- /dev/null +++ b/packages/neon/neon_spreed/lib/blocs/spreed.dart @@ -0,0 +1,75 @@ +part of '../neon_spreed.dart'; + +abstract class SpreedBlocEvents { + void createRoom( + final spreed.RoomType type, + final String? roomName, + final core.AutocompleteResult? invite, + ); +} + +abstract class SpreedBlocStates { + BehaviorSubject>> get rooms; + + BehaviorSubject get unreadCounter; +} + +class SpreedBloc extends InteractiveBloc implements SpreedBlocEvents, SpreedBlocStates { + SpreedBloc( + this.options, + this.account, + ) { + rooms.listen((final result) { + if (result.hasData) { + unreadCounter.add( + [0, ...result.requireData.map((final room) => room.unreadMessages)].reduce((final a, final b) => a + b), + ); + } + }); + + unawaited(refresh()); + } + + final SpreedAppSpecificOptions options; + final Account account; + + @override + void dispose() { + unawaited(rooms.close()); + unawaited(unreadCounter.close()); + super.dispose(); + } + + @override + BehaviorSubject>> rooms = BehaviorSubject(); + + @override + BehaviorSubject unreadCounter = BehaviorSubject(); + + @override + Future refresh() async { + await RequestManager.instance.wrapNextcloud( + account.id, + 'spreed-rooms', + rooms, + account.client.spreed.room.getRoomsRaw(), + (final response) => response.body.ocs.data.toList(), + ); + } + + @override + void createRoom( + final spreed.RoomType type, + final String? roomName, + final core.AutocompleteResult? invite, + ) { + wrapAction( + () async => account.client.spreed.room.createRoom( + roomType: type.value, + roomName: roomName ?? '', + invite: invite?.id ?? '', + source: invite?.source ?? '', + ), + ); + } +} diff --git a/packages/neon/neon_spreed/lib/dialogs/create_room.dart b/packages/neon/neon_spreed/lib/dialogs/create_room.dart new file mode 100644 index 00000000..125a6fb3 --- /dev/null +++ b/packages/neon/neon_spreed/lib/dialogs/create_room.dart @@ -0,0 +1,142 @@ +part of '../neon_spreed.dart'; + +class SpreedCreateRoomDialog extends StatefulWidget { + const SpreedCreateRoomDialog({ + super.key, + }); + + @override + State createState() => _SpreedCreateRoomDialogState(); +} + +class _SpreedCreateRoomDialogState extends State { + late final values = { + spreed.RoomType.oneToOne: SpreedLocalizations.of(context).roomTypeOneToOne, + spreed.RoomType.group: SpreedLocalizations.of(context).roomTypeGroup, + spreed.RoomType.public: SpreedLocalizations.of(context).roomTypePublic, + }; + + final formKey = GlobalKey(); + final controller = TextEditingController(); + final focusNode = FocusNode(); + + spreed.RoomType? selectedType; + core.AutocompleteResult? selectedAutocompleteEntry; + + void changeType(final spreed.RoomType? type) { + controller.clear(); + setState(() { + selectedType = type; + }); + } + + void submit() { + if (formKey.currentState!.validate()) { + Navigator.of(context).pop( + SpreedCreateRoomDetails( + selectedType!, + selectedType! == spreed.RoomType.public ? controller.text : null, + selectedType! != spreed.RoomType.public ? selectedAutocompleteEntry : null, + ), + ); + } + } + + @override + Widget build(final BuildContext context) => NeonDialog( + title: Text(SpreedLocalizations.of(context).roomCreate), + children: [ + Form( + key: formKey, + child: Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + for (final type in values.keys) ...[ + ListTile( + title: Text(values[type]!), + leading: Icon( + type == spreed.RoomType.oneToOne + ? Icons.person + : type == spreed.RoomType.group + ? Icons.group + : Icons.public, + ), + trailing: Radio( + value: type, + groupValue: selectedType, + onChanged: changeType, + ), + onTap: () { + changeType(type); + }, + ), + ], + if (selectedType == spreed.RoomType.oneToOne || selectedType == spreed.RoomType.group) ...[ + NeonAutocomplete( + key: Key(selectedType!.index.toString()), + account: NeonProvider.of(context).activeAccount.value!, + itemType: 'call', + itemId: 'new', + shareTypes: [ + if (selectedType == spreed.RoomType.oneToOne) ...[ + core.ShareType.user.index, + ] else if (selectedType == spreed.RoomType.group) ...[ + core.ShareType.group.index, + ], + ], + validator: (final input) => validateNotEmpty(context, input), + decoration: InputDecoration( + hintText: selectedType == spreed.RoomType.oneToOne + ? SpreedLocalizations.of(context).roomCreateUserName + : SpreedLocalizations.of(context).roomCreateGroupName, + ), + onSelected: (final entry) { + setState(() { + selectedAutocompleteEntry = entry; + }); + }, + onFieldSubmitted: (final _) { + submit(); + }, + ), + ], + if (selectedType == spreed.RoomType.public) ...[ + TextFormField( + controller: controller, + focusNode: focusNode, + validator: (final input) => validateNotEmpty(context, input), + decoration: InputDecoration( + hintText: SpreedLocalizations.of(context).roomCreateRoomName, + ), + onFieldSubmitted: (final _) { + submit(); + }, + ), + ], + const SizedBox( + height: 10, + ), + ElevatedButton( + onPressed: selectedType == null ? null : submit, + child: Text(SpreedLocalizations.of(context).roomCreate), + ), + ], + ), + ), + ], + ); +} + +class SpreedCreateRoomDetails { + SpreedCreateRoomDetails( + this.type, + this.roomName, + this.invite, + ); + + final spreed.RoomType type; + + final String? roomName; + + final core.AutocompleteResult? invite; +} diff --git a/packages/neon/neon_spreed/lib/dialogs/select_screen.dart b/packages/neon/neon_spreed/lib/dialogs/select_screen.dart new file mode 100644 index 00000000..cdb0736c --- /dev/null +++ b/packages/neon/neon_spreed/lib/dialogs/select_screen.dart @@ -0,0 +1,97 @@ +part of '../neon_spreed.dart'; + +class SpreedSelectScreenDialog extends StatefulWidget { + const SpreedSelectScreenDialog({ + super.key, + }); + + @override + State createState() => _SpreedSelectScreenDialogState(); +} + +class _SpreedSelectScreenDialogState extends State { + List? sources; + DesktopCapturerSource? selectedSource; + late Timer timer; + + @override + void initState() { + super.initState(); + + unawaited( + desktopCapturer.getSources(types: SourceType.values).then((final sources) { + setState(() { + this.sources = sources; + }); + }), + ); + timer = Timer.periodic(const Duration(seconds: 1), (final _) async { + await desktopCapturer.updateSources(types: SourceType.values); + }); + } + + @override + void dispose() { + timer.cancel(); + + super.dispose(); + } + + @override + Widget build(final BuildContext context) => NeonDialog( + title: Text(SpreedLocalizations.of(context).screenSharingSelectScreen), + children: [ + if (sources != null) ...[ + for (final sourceType in SourceType.values.reversed) ...[ + Text( + sourceType == SourceType.Screen + ? SpreedLocalizations.of(context).screenSharingSelectScreenScreens + : SpreedLocalizations.of(context).screenSharingSelectScreenWindows, + ), + Wrap( + spacing: 10, + runSpacing: 10, + children: [ + for (final source in sources!.where((final source) => source.type == sourceType)) ...[ + InkWell( + onTap: () { + setState(() { + selectedSource = source; + }); + }, + child: Container( + padding: const EdgeInsets.all(5), + decoration: BoxDecoration( + border: Border.all( + // Transparent to prevent the image from jumping around when changing the selected source + color: + selectedSource == source ? Theme.of(context).colorScheme.primary : Colors.transparent, + width: 2, + ), + ), + width: max(MediaQuery.of(context).size.width, MediaQuery.of(context).size.height) / 5, + child: SpreedScreenPreview( + source: source, + ), + ), + ), + ], + ], + ), + const Divider(), + ], + ], + const SizedBox( + height: 10, + ), + ElevatedButton( + onPressed: selectedSource == null + ? null + : () { + Navigator.of(context).pop(selectedSource); + }, + child: Text(SpreedLocalizations.of(context).screenSharingSelectScreen), + ), + ], + ); +} diff --git a/packages/neon/neon_spreed/lib/l10n/en.arb b/packages/neon/neon_spreed/lib/l10n/en.arb new file mode 100644 index 00000000..9f6fbda1 --- /dev/null +++ b/packages/neon/neon_spreed/lib/l10n/en.arb @@ -0,0 +1,17 @@ +{ + "@@locale": "en", + "roomCreate": "Create room", + "roomCreateUserName": "User name", + "roomCreateGroupName": "Group name", + "roomCreateRoomName": "Room name", + "roomTypeOneToOne": "Private", + "roomTypeGroup": "Group", + "roomTypePublic": "Public", + "messageYou": "You", + "callStart": "Start call", + "callJoin": "Join call", + "callLeave": "Leave call", + "screenSharingSelectScreen": "Select screen", + "screenSharingSelectScreenScreens": "Screens", + "screenSharingSelectScreenWindows": "Windows" +} diff --git a/packages/neon/neon_spreed/lib/l10n/localizations.dart b/packages/neon/neon_spreed/lib/l10n/localizations.dart new file mode 100644 index 00000000..52c93b4a --- /dev/null +++ b/packages/neon/neon_spreed/lib/l10n/localizations.dart @@ -0,0 +1,203 @@ +import 'dart:async'; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:intl/intl.dart' as intl; + +import 'localizations_en.dart'; + +/// Callers can lookup localized strings with an instance of SpreedLocalizations +/// returned by `SpreedLocalizations.of(context)`. +/// +/// Applications need to include `SpreedLocalizations.delegate()` in their app's +/// `localizationDelegates` list, and the locales they support in the app's +/// `supportedLocales` list. For example: +/// +/// ```dart +/// import 'l10n/localizations.dart'; +/// +/// return MaterialApp( +/// localizationsDelegates: SpreedLocalizations.localizationsDelegates, +/// supportedLocales: SpreedLocalizations.supportedLocales, +/// home: MyApplicationHome(), +/// ); +/// ``` +/// +/// ## Update pubspec.yaml +/// +/// Please make sure to update your pubspec.yaml to include the following +/// packages: +/// +/// ```yaml +/// dependencies: +/// # Internationalization support. +/// flutter_localizations: +/// sdk: flutter +/// intl: any # Use the pinned version from flutter_localizations +/// +/// # Rest of dependencies +/// ``` +/// +/// ## iOS Applications +/// +/// iOS applications define key application metadata, including supported +/// locales, in an Info.plist file that is built into the application bundle. +/// To configure the locales supported by your app, you’ll need to edit this +/// file. +/// +/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file. +/// Then, in the Project Navigator, open the Info.plist file under the Runner +/// project’s Runner folder. +/// +/// Next, select the Information Property List item, select Add Item from the +/// Editor menu, then select Localizations from the pop-up menu. +/// +/// Select and expand the newly-created Localizations item then, for each +/// locale your application supports, add a new item and select the locale +/// you wish to add from the pop-up menu in the Value field. This list should +/// be consistent with the languages listed in the SpreedLocalizations.supportedLocales +/// property. +abstract class SpreedLocalizations { + SpreedLocalizations(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString()); + + final String localeName; + + static SpreedLocalizations of(BuildContext context) { + return Localizations.of(context, SpreedLocalizations)!; + } + + static const LocalizationsDelegate delegate = _SpreedLocalizationsDelegate(); + + /// A list of this localizations delegate along with the default localizations + /// delegates. + /// + /// Returns a list of localizations delegates containing this delegate along with + /// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate, + /// and GlobalWidgetsLocalizations.delegate. + /// + /// Additional delegates can be added by appending to this list in + /// MaterialApp. This list does not have to be used at all if a custom list + /// of delegates is preferred or required. + static const List> localizationsDelegates = >[ + delegate, + GlobalMaterialLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + ]; + + /// A list of this localizations delegate's supported locales. + static const List supportedLocales = [Locale('en')]; + + /// No description provided for @roomCreate. + /// + /// In en, this message translates to: + /// **'Create room'** + String get roomCreate; + + /// No description provided for @roomCreateUserName. + /// + /// In en, this message translates to: + /// **'User name'** + String get roomCreateUserName; + + /// No description provided for @roomCreateGroupName. + /// + /// In en, this message translates to: + /// **'Group name'** + String get roomCreateGroupName; + + /// No description provided for @roomCreateRoomName. + /// + /// In en, this message translates to: + /// **'Room name'** + String get roomCreateRoomName; + + /// No description provided for @roomTypeOneToOne. + /// + /// In en, this message translates to: + /// **'Private'** + String get roomTypeOneToOne; + + /// No description provided for @roomTypeGroup. + /// + /// In en, this message translates to: + /// **'Group'** + String get roomTypeGroup; + + /// No description provided for @roomTypePublic. + /// + /// In en, this message translates to: + /// **'Public'** + String get roomTypePublic; + + /// No description provided for @messageYou. + /// + /// In en, this message translates to: + /// **'You'** + String get messageYou; + + /// No description provided for @callStart. + /// + /// In en, this message translates to: + /// **'Start call'** + String get callStart; + + /// No description provided for @callJoin. + /// + /// In en, this message translates to: + /// **'Join call'** + String get callJoin; + + /// No description provided for @callLeave. + /// + /// In en, this message translates to: + /// **'Leave call'** + String get callLeave; + + /// No description provided for @screenSharingSelectScreen. + /// + /// In en, this message translates to: + /// **'Select screen'** + String get screenSharingSelectScreen; + + /// No description provided for @screenSharingSelectScreenScreens. + /// + /// In en, this message translates to: + /// **'Screens'** + String get screenSharingSelectScreenScreens; + + /// No description provided for @screenSharingSelectScreenWindows. + /// + /// In en, this message translates to: + /// **'Windows'** + String get screenSharingSelectScreenWindows; +} + +class _SpreedLocalizationsDelegate extends LocalizationsDelegate { + const _SpreedLocalizationsDelegate(); + + @override + Future load(Locale locale) { + return SynchronousFuture(lookupSpreedLocalizations(locale)); + } + + @override + bool isSupported(Locale locale) => ['en'].contains(locale.languageCode); + + @override + bool shouldReload(_SpreedLocalizationsDelegate old) => false; +} + +SpreedLocalizations lookupSpreedLocalizations(Locale locale) { + // Lookup logic when only language code is specified. + switch (locale.languageCode) { + case 'en': + return SpreedLocalizationsEn(); + } + + throw FlutterError('SpreedLocalizations.delegate failed to load unsupported locale "$locale". This is likely ' + 'an issue with the localizations generation tool. Please file an issue ' + 'on GitHub with a reproducible sample app and the gen-l10n configuration ' + 'that was used.'); +} diff --git a/packages/neon/neon_spreed/lib/l10n/localizations_en.dart b/packages/neon/neon_spreed/lib/l10n/localizations_en.dart new file mode 100644 index 00000000..e3a07b95 --- /dev/null +++ b/packages/neon/neon_spreed/lib/l10n/localizations_en.dart @@ -0,0 +1,48 @@ +import 'localizations.dart'; + +/// The translations for English (`en`). +class SpreedLocalizationsEn extends SpreedLocalizations { + SpreedLocalizationsEn([String locale = 'en']) : super(locale); + + @override + String get roomCreate => 'Create room'; + + @override + String get roomCreateUserName => 'User name'; + + @override + String get roomCreateGroupName => 'Group name'; + + @override + String get roomCreateRoomName => 'Room name'; + + @override + String get roomTypeOneToOne => 'Private'; + + @override + String get roomTypeGroup => 'Group'; + + @override + String get roomTypePublic => 'Public'; + + @override + String get messageYou => 'You'; + + @override + String get callStart => 'Start call'; + + @override + String get callJoin => 'Join call'; + + @override + String get callLeave => 'Leave call'; + + @override + String get screenSharingSelectScreen => 'Select screen'; + + @override + String get screenSharingSelectScreenScreens => 'Screens'; + + @override + String get screenSharingSelectScreenWindows => 'Windows'; +} diff --git a/packages/neon/neon_spreed/lib/neon_spreed.dart b/packages/neon/neon_spreed/lib/neon_spreed.dart new file mode 100644 index 00000000..a8509af7 --- /dev/null +++ b/packages/neon/neon_spreed/lib/neon_spreed.dart @@ -0,0 +1,84 @@ +library files; + +import 'dart:async'; +import 'dart:math'; + +import 'package:built_collection/built_collection.dart'; +import 'package:collection/collection.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_chat_types/flutter_chat_types.dart' as chat_types; +import 'package:flutter_chat_ui/flutter_chat_ui.dart' as chat_ui; +import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; +import 'package:flutter_webrtc/flutter_webrtc.dart'; +import 'package:go_router/go_router.dart'; +import 'package:intersperse/intersperse.dart'; +import 'package:neon/blocs.dart'; +import 'package:neon/models.dart'; +import 'package:neon/settings.dart'; +import 'package:neon/theme.dart'; +import 'package:neon/utils.dart'; +import 'package:neon/widgets.dart'; +import 'package:neon_spreed/l10n/localizations.dart'; +import 'package:neon_spreed/routes.dart'; +import 'package:nextcloud/core.dart' as core; +import 'package:nextcloud/nextcloud.dart'; +import 'package:nextcloud/spreed.dart' as spreed; +import 'package:rxdart/rxdart.dart'; +import 'package:vector_graphics/vector_graphics.dart'; + +part 'blocs/call.dart'; +part 'blocs/room.dart'; +part 'blocs/spreed.dart'; +part 'dialogs/create_room.dart'; +part 'dialogs/select_screen.dart'; +part 'options.dart'; +part 'pages/call.dart'; +part 'pages/main.dart'; +part 'pages/room.dart'; +part 'utils/participants.dart'; +part 'utils/view_size.dart'; +part 'widgets/call_button.dart'; +part 'widgets/call_participant_view.dart'; +part 'widgets/room_icon.dart'; +part 'widgets/screen_preview.dart'; + +@immutable +class SpreedApp extends AppImplementation { + SpreedApp(); + + @override + final String id = appId; + + static const String appId = 'spreed'; + + @override + final LocalizationsDelegate localizationsDelegate = SpreedLocalizations.delegate; + + @override + final List supportedLocales = SpreedLocalizations.supportedLocales; + + @override + late final SpreedAppSpecificOptions options = SpreedAppSpecificOptions(storage); + + @override + SpreedBloc buildBloc(final Account account) => SpreedBloc( + options, + account, + ); + + @override + final Widget page = const SpreedMainPage(); + + @override + final RouteBase route = $spreedAppRoute; + + @override + BehaviorSubject? getUnreadCounter(final SpreedBloc bloc) => bloc.unreadCounter; + + @override + VersionCheck getVersionCheck( + final Account account, + final core.OcsGetCapabilitiesResponseApplicationJson_Ocs_Data capabilities, + ) => + account.client.spreed.getVersionCheck(capabilities); +} diff --git a/packages/neon/neon_spreed/lib/options.dart b/packages/neon/neon_spreed/lib/options.dart new file mode 100644 index 00000000..3c56446b --- /dev/null +++ b/packages/neon/neon_spreed/lib/options.dart @@ -0,0 +1,8 @@ +part of 'neon_spreed.dart'; + +class SpreedAppSpecificOptions extends NextcloudAppOptions { + SpreedAppSpecificOptions(super.storage) { + super.categories = []; + super.options = []; + } +} diff --git a/packages/neon/neon_spreed/lib/pages/call.dart b/packages/neon/neon_spreed/lib/pages/call.dart new file mode 100644 index 00000000..eef90639 --- /dev/null +++ b/packages/neon/neon_spreed/lib/pages/call.dart @@ -0,0 +1,145 @@ +part of '../../neon_spreed.dart'; + +class SpreedCallPage extends StatefulWidget { + const SpreedCallPage({ + required this.bloc, + super.key, + }); + + final SpreedCallBloc bloc; + + @override + State createState() => _SpreedCallPageState(); +} + +class _SpreedCallPageState extends State { + @override + void initState() { + widget.bloc.errors.listen((final error) { + if (!mounted) { + return; + } + NeonError.showSnackbar(context, error); + }); + + super.initState(); + } + + @override + Widget build(final BuildContext context) => StreamBuilder( + stream: widget.bloc.audioEnabled, + builder: (final context, final audioEnabledSnapshot) => StreamBuilder( + stream: widget.bloc.videoEnabled, + builder: (final context, final videoEnabledSnapshot) => StreamBuilder( + stream: widget.bloc.screenEnabled, + builder: (final context, final screenEnabledSnapshot) { + final audioEnabled = audioEnabledSnapshot.data ?? false; + final videoEnabled = videoEnabledSnapshot.data ?? false; + final screenEnabled = screenEnabledSnapshot.data ?? false; + return Scaffold( + appBar: AppBar( + automaticallyImplyLeading: false, + actions: [ + IconButton( + icon: Icon( + audioEnabled ? MdiIcons.microphone : MdiIcons.microphoneOff, + color: !audioEnabled ? Colors.red : null, + ), + onPressed: () { + widget.bloc.changeAudio(!audioEnabled); + }, + ), + IconButton( + icon: Icon( + videoEnabled ? MdiIcons.video : MdiIcons.videoOff, + color: !videoEnabled ? Colors.red : null, + ), + onPressed: () { + widget.bloc.changeVideo(!videoEnabled); + }, + ), + IconButton( + icon: Icon( + screenEnabled ? MdiIcons.monitorShare : MdiIcons.monitorOff, + color: !screenEnabled ? Colors.red : null, + ), + onPressed: () async { + if (!screenEnabled) { + final result = await showDialog( + context: context, + builder: (final context) => const SpreedSelectScreenDialog(), + ); + if (result == null) { + return; + } + } + widget.bloc.changeScreen(!screenEnabled); + }, + ), + SpreedCallButton( + type: SpreedCallButtonType.leaveCall, + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ] + .intersperse( + const SizedBox( + width: 20, + ), + ) + .toList(), + ), + body: StreamBuilder( + stream: widget.bloc.remoteParticipants, + builder: (final context, final remoteParticipantsSnapshot) { + if (remoteParticipantsSnapshot.data == null) { + return Center( + child: LayoutBuilder( + builder: (final context, final constraints) => SizedBox( + width: constraints.maxWidth / 2, + child: const NeonLinearProgressIndicator(), + ), + ), + ); + } + + final participants = [ + ...remoteParticipantsSnapshot.requireData, + widget.bloc.localParticipant, + ]; + + return Center( + child: LayoutBuilder( + builder: (final context, final constraints) { + final viewSize = calculateViewSize(participants.length, constraints.biggest); + return Wrap( + alignment: WrapAlignment.center, + children: [ + for (final participant in participants) ...[ + Container( + constraints: BoxConstraints( + maxWidth: viewSize.width, + maxHeight: viewSize.height, + ), + child: SpreedCallParticipantView( + participant: participant, + localAudioEnabled: audioEnabled, + localVideoEnabled: videoEnabled, + localScreenEnabled: screenEnabled, + ), + ), + ], + ], + ); + }, + ), + ); + }, + ), + ); + }, + ), + ), + ); +} diff --git a/packages/neon/neon_spreed/lib/pages/main.dart b/packages/neon/neon_spreed/lib/pages/main.dart new file mode 100644 index 00000000..e4febc55 --- /dev/null +++ b/packages/neon/neon_spreed/lib/pages/main.dart @@ -0,0 +1,113 @@ +part of '../neon_spreed.dart'; + +class SpreedMainPage extends StatefulWidget { + const SpreedMainPage({ + super.key, + }); + + @override + State createState() => _SpreedMainPageState(); +} + +class _SpreedMainPageState extends State { + late final SpreedBloc bloc; + + @override + void initState() { + super.initState(); + + bloc = NeonProvider.of(context); + + bloc.errors.listen((final error) { + NeonError.showSnackbar(context, error); + }); + } + + @override + Widget build(final BuildContext context) => Scaffold( + resizeToAvoidBottomInset: false, + body: ResultBuilder( + stream: bloc.rooms, + builder: (final context, final rooms) { + final sorted = rooms.data?.sorted((final a, final b) => b.lastActivity.compareTo(a.lastActivity)) ?? []; + return NeonListView( + scrollKey: 'spreed-rooms', + isLoading: rooms.isLoading, + error: rooms.error, + onRefresh: bloc.refresh, + itemCount: sorted.length, + itemBuilder: (final context, final index) => _buildRoom(context, sorted[index]), + ); + }, + ), + floatingActionButton: FloatingActionButton( + child: const Icon(Icons.add), + onPressed: () async { + final result = await showDialog( + context: context, + builder: (final context) => const SpreedCreateRoomDialog(), + ); + if (result == null) { + return; + } + bloc.createRoom( + result.type, + result.roomName, + result.invite, + ); + }, + ), + ); + + Widget _buildRoom( + final BuildContext context, + final spreed.Room room, + ) => + ListTile( + title: Text(room.displayName), + subtitle: Text( + room.lastMessage.chatMessage != null + ? (room.type == spreed.RoomType.changelog.value || + (room.type == spreed.RoomType.oneToOne.value && + room.lastMessage.chatMessage!.actorId != bloc.account.username) + ? room.lastMessage.chatMessage!.message + : '${room.lastMessage.chatMessage!.actorId == bloc.account.username ? SpreedLocalizations.of(context).messageYou : room.lastMessage.chatMessage!.actorDisplayName}: ${room.lastMessage.chatMessage!.message}') + : '', + overflow: TextOverflow.ellipsis, + maxLines: 1, + ), + leading: SpreedRoomIcon( + roomType: spreed.RoomType.values[room.type], + roomName: room.name, + ), + trailing: room.unreadMessages > 0 + ? Chip( + backgroundColor: room.unreadMention ? Theme.of(context).colorScheme.primary : null, + label: Text( + room.unreadMessages.toString(), + style: TextStyle( + color: room.unreadMention + ? Theme.of(context).colorScheme.onPrimary + : Theme.of(context).colorScheme.primary, + ), + ), + ) + : null, + onTap: () async { + final roomBloc = SpreedRoomBloc( + bloc.options, + bloc.account, + room, + ); + await Navigator.of(context).push( + MaterialPageRoute( + builder: (final context) => SpreedRoomPage( + bloc: roomBloc, + ), + ), + ); + await roomBloc.leaveRoom(); + bloc.dispose(); + }, + ); +} diff --git a/packages/neon/neon_spreed/lib/pages/room.dart b/packages/neon/neon_spreed/lib/pages/room.dart new file mode 100644 index 00000000..66237305 --- /dev/null +++ b/packages/neon/neon_spreed/lib/pages/room.dart @@ -0,0 +1,324 @@ +part of '../neon_spreed.dart'; + +class SpreedRoomPage extends StatefulWidget { + const SpreedRoomPage({ + required this.bloc, + super.key, + }); + + final SpreedRoomBloc bloc; + + @override + State createState() => _SpreedRoomPageState(); +} + +class _SpreedRoomPageState extends State { + final defaultChatTheme = const chat_ui.DefaultChatTheme(); + + late final chatTheme = chat_ui.DefaultChatTheme( + backgroundColor: Theme.of(context).colorScheme.background, + primaryColor: Theme.of(context).colorScheme.onBackground, + inputBackgroundColor: Theme.of(context).colorScheme.primary, + inputTextColor: Theme.of(context).colorScheme.onPrimary, + inputTextCursorColor: Theme.of(context).colorScheme.onPrimary, + receivedMessageBodyTextStyle: defaultChatTheme.receivedMessageBodyTextStyle.copyWith( + color: Theme.of(context).colorScheme.onPrimary, + ), + sentMessageBodyTextStyle: defaultChatTheme.sentMessageBodyTextStyle.copyWith( + color: Theme.of(context).colorScheme.onPrimary, + ), + unreadHeaderTheme: chat_ui.UnreadHeaderTheme( + color: Theme.of(context).colorScheme.background, + textStyle: TextStyle( + color: Theme.of(context).colorScheme.primary, + fontWeight: FontWeight.bold, + ), + ), + ); + + final inputOptions = const chat_ui.InputOptions( + sendButtonVisibilityMode: chat_ui.SendButtonVisibilityMode.always, + ); + + late final user = chat_types.User( + id: widget.bloc.account.username, + ); + + void onSendPressed(final chat_types.PartialText partialText) { + widget.bloc.sendMessage(partialText.text); + } + + Future openCall(final spreed.Room room) async { + try { + final client = NeonProvider.of(context).activeAccount.value!.client; + final settings = (await client.spreed.signaling.getSettings(token: widget.bloc.roomToken)).body.ocs.data; + final bloc = SpreedCallBloc( + settings, + client, + widget.bloc.roomToken, + room.sessionId, + ); + if (!mounted) { + return; + } + await Navigator.of(context).push( + MaterialPageRoute( + builder: (final context) => SpreedCallPage( + bloc: bloc, + ), + ), + ); + await bloc.leaveCall(); + bloc.dispose(); + } catch (e, s) { + debugPrint(e.toString()); + debugPrint(s.toString()); + if (mounted) { + NeonError.showSnackbar(context, e); + } + } + } + + @override + void initState() { + super.initState(); + + widget.bloc.errors.listen((final error) { + NeonError.showSnackbar(context, error); + }); + } + + @override + Widget build(final BuildContext context) => StreamBuilder( + stream: widget.bloc.allLoaded, + builder: (final context, final allLoadedSnapshot) => ResultBuilder( + stream: widget.bloc.room, + builder: (final context, final room) => StreamBuilder( + stream: widget.bloc.lastCommonReadMessageId, + builder: (final context, final lastCommonReadMessageIdSnapshot) => StreamBuilder( + stream: widget.bloc.sendingMessage, + builder: (final context, final sendingMessageSnapshot) => ResultBuilder( + stream: widget.bloc.messages, + builder: (final context, final messages) { + final roomType = room.hasData ? spreed.RoomType.fromValue(room.requireData.type) : null; + return Scaffold( + resizeToAvoidBottomInset: false, + appBar: AppBar( + titleSpacing: 0, + title: Row( + children: [ + if (room.hasData) ...[ + if (roomType!.isSingleUser) ...[ + SpreedRoomIcon( + roomType: roomType, + roomName: room.requireData.name, + backgroundColor: Theme.of(context).colorScheme.onPrimary, + foregroundColor: Theme.of(context).colorScheme.primary, + ), + const SizedBox( + width: 10, + ), + ], + Flexible( + child: Text(room.requireData.displayName), + ), + ], + if (room.error != null) ...[ + const SizedBox( + width: 8, + ), + Icon( + Icons.error_outline, + size: 30, + color: Theme.of(context).colorScheme.onPrimary, + ), + ], + if (room.isLoading) ...[ + const SizedBox( + width: 8, + ), + Expanded( + child: NeonLinearProgressIndicator( + color: Theme.of(context).appBarTheme.foregroundColor, + ), + ), + ], + ], + ), + actions: [ + if (room.hasData && room.requireData.readOnly == 0) ...[ + if (room.requireData.hasCall) ...[ + SpreedCallButton( + type: SpreedCallButtonType.joinCall, + onPressed: () async { + await openCall(room.requireData); + }, + ), + ] else if (room.requireData.canStartCall) ...[ + SpreedCallButton( + type: SpreedCallButtonType.startCall, + onPressed: () async { + await openCall(room.requireData); + }, + ), + ], + ], + ], + ), + body: chat_ui.Chat( + useTopSafeAreaInset: false, + showUserNames: true, + showUserAvatars: !(roomType?.isSingleUser ?? true), + theme: chatTheme, + inputOptions: inputOptions, + scrollToUnreadOptions: chat_ui.ScrollToUnreadOptions( + lastReadMessageId: room.data?.lastReadMessage.toString(), + scrollOnOpen: true, + scrollDelay: Duration.zero, + ), + avatarBuilder: (final username) => NeonUserAvatar( + username: username, + account: NeonProvider.of(context).activeAccount.value!, + ), + textMessageBuilder: ( + final message, { + required final messageWidth, + required final showName, + }) { + final matchers = [ + if (message.metadata != null) ...[ + NeonRichObject( + parameters: message.metadata!, + ), + ], + ]; + + return chat_ui.TextMessage( + emojiEnlargementBehavior: chat_ui.EmojiEnlargementBehavior.multi, + hideBackgroundOnEmojiMessages: true, + message: message, + showName: showName, + usePreviewData: true, + options: chat_ui.TextMessageOptions( + matchers: matchers, + ), + ); + }, + systemMessageBuilder: (final message) { + final matchers = [ + if (message.metadata != null) ...[ + NeonRichObject( + parameters: message.metadata!, + ), + ], + ]; + + return chat_ui.SystemMessage( + message: message.text, + options: chat_ui.TextMessageOptions( + matchers: matchers, + ), + ); + }, + customBottomWidget: Column( + children: [ + NeonError( + messages.error, + onRetry: () async { + await widget.bloc.refresh(); + }, + ), + if (messages.isLoading) ...[ + const NeonLinearProgressIndicator( + margin: EdgeInsets.symmetric(horizontal: 10, vertical: 5), + ), + ], + if ((room.data?.readOnly ?? 0) == 0) ...[ + chat_ui.Input( + onSendPressed: onSendPressed, + options: inputOptions, + ), + ], + ], + ), + user: user, + onEndReached: () async { + await widget.bloc.loadMoreMessages(); + }, + onSendPressed: onSendPressed, + isLastPage: allLoadedSnapshot.data ?? false, + messages: [ + if (sendingMessageSnapshot.hasData) ...[ + chat_types.TextMessage( + id: 'sending', + author: user, + text: sendingMessageSnapshot.data!, + showStatus: true, + status: chat_types.Status.sending, + ), + ], + if (messages.hasData) ...[ + ...messages.requireData + .map( + (final message) => _spreedMessageToChatMessage( + message, + lastCommonReadMessageId: lastCommonReadMessageIdSnapshot.data, + ), + ) + .whereNotNull(), + ], + ], + ), + ); + }, + ), + ), + ), + ), + ); + + chat_types.Message? _spreedMessageToChatMessage( + final spreed.ChatMessageInterface message, { + final int? lastCommonReadMessageId, + }) { + final id = message.id.toString(); + final author = chat_types.User( + id: message.actorId, + firstName: message.actorDisplayName, + imageUrl: message.actorId, + ); + final createdAt = message.timestamp * 1000; + // TODO: Doesn't work yet in the UI. See https://github.com/flyerhq/flutter_chat_ui/pull/256 + final repliedMessage = message is spreed.ChatMessageWithParent && message.parent != null + ? _spreedMessageToChatMessage(message.parent!) + : null; + final status = lastCommonReadMessageId != null && lastCommonReadMessageId >= message.id + ? chat_types.Status.seen + : chat_types.Status.sent; + final metadata = message.messageParameters is Map ? message.messageParameters as Map : null; + + switch (spreed.MessageType.values.byName(message.messageType)) { + case spreed.MessageType.comment: + return chat_types.TextMessage( + id: id, + author: author, + createdAt: createdAt, + repliedMessage: repliedMessage, + text: message.message, + showStatus: true, + status: status, + metadata: metadata, + ); + case spreed.MessageType.command: + case spreed.MessageType.system: + return chat_types.SystemMessage( + id: id, + createdAt: createdAt, + text: message.message, + metadata: metadata, + ); + default: + return null; + } + } +} diff --git a/packages/neon/neon_spreed/lib/routes.dart b/packages/neon/neon_spreed/lib/routes.dart new file mode 100644 index 00000000..1b6ecf2a --- /dev/null +++ b/packages/neon/neon_spreed/lib/routes.dart @@ -0,0 +1,18 @@ +import 'package:flutter/widgets.dart'; +import 'package:go_router/go_router.dart'; +import 'package:neon/utils.dart'; +import 'package:neon_spreed/neon_spreed.dart'; + +part 'routes.g.dart'; + +@TypedGoRoute( + path: '$appsBaseRoutePrefix${SpreedApp.appId}', + name: SpreedApp.appId, +) +@immutable +class SpreedAppRoute extends NeonBaseAppRoute { + const SpreedAppRoute(); + + @override + Widget build(final BuildContext context, final GoRouterState state) => const SpreedMainPage(); +} diff --git a/packages/neon/neon_spreed/lib/routes.g.dart b/packages/neon/neon_spreed/lib/routes.g.dart new file mode 100644 index 00000000..8d652de9 --- /dev/null +++ b/packages/neon/neon_spreed/lib/routes.g.dart @@ -0,0 +1,33 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'routes.dart'; + +// ************************************************************************** +// GoRouterGenerator +// ************************************************************************** + +List get $appRoutes => [ + $spreedAppRoute, + ]; + +RouteBase get $spreedAppRoute => GoRouteData.$route( + path: '/apps/spreed', + name: 'spreed', + factory: $SpreedAppRouteExtension._fromState, + ); + +extension $SpreedAppRouteExtension on SpreedAppRoute { + static SpreedAppRoute _fromState(GoRouterState state) => const SpreedAppRoute(); + + String get location => GoRouteData.$location( + '/apps/spreed', + ); + + void go(BuildContext context) => context.go(location); + + Future push(BuildContext context) => context.push(location); + + void pushReplacement(BuildContext context) => context.pushReplacement(location); + + void replace(BuildContext context) => context.replace(location); +} diff --git a/packages/neon/neon_spreed/lib/utils/participants.dart b/packages/neon/neon_spreed/lib/utils/participants.dart new file mode 100644 index 00000000..62e71058 --- /dev/null +++ b/packages/neon/neon_spreed/lib/utils/participants.dart @@ -0,0 +1,110 @@ +part of '../neon_spreed.dart'; + +abstract class SpreedCallParticipant { + SpreedCallParticipant( + this.userID, + this.sessionID, + this.renderer, + this.stream, + ); + + final String userID; + final String sessionID; + RTCVideoRenderer? renderer; + MediaStream? stream; + + void dispose() { + stream?.getTracks().forEach((final track) => unawaited(track.stop())); + unawaited(stream?.dispose()); + renderer?.srcObject = null; + unawaited(renderer?.dispose()); + } +} + +class SpreedLocalCallParticipant extends SpreedCallParticipant { + SpreedLocalCallParticipant( + super.userID, + super.sessionID, + super.renderer, + super.stream, + ); +} + +class SpreedRemoteCallParticipant extends SpreedCallParticipant { + SpreedRemoteCallParticipant( + super.userID, + super.sessionID, + super.renderer, + super.stream, + this._connection, + this._senders, { + this.audioEnabled = false, + this.videoEnabled = false, + }); + + RTCPeerConnection? _connection; + List? _senders; + final List _candidates = []; + bool audioEnabled; + bool videoEnabled; + + RTCPeerConnection? get connection => _connection; + List? get senders => _senders; + + Future _clearSenders() async { + if (_senders != null && _connection != null) { + for (final sender in _senders!) { + await _connection!.removeTrack(sender); + } + } + if (_senders != null) { + for (final sender in _senders!) { + try { + await sender.dispose(); + } catch (_) { + // TODO: Somehow peerConnection is null when calling this on disposing the participant + } + } + _senders = null; + } + } + + Future acceptNewConnection(final RTCPeerConnection? connection) async { + await _clearSenders(); + await _connection?.close(); + _connection = connection; + if (_connection != null) { + for (final candidate in _candidates) { + debugPrint('Loading candidate'); + await _connection!.addCandidate(candidate); + } + _candidates.clear(); + } + } + + Future acceptNewLocalStream(final MediaStream? stream) async { + await _clearSenders(); + if (_connection != null && stream != null) { + _senders = []; + for (final track in stream.getTracks()) { + _senders!.add(await _connection!.addTrack(track, stream)); + } + } + } + + Future addCandidate(final RTCIceCandidate candidate) async { + if (connection != null) { + await connection!.addCandidate(candidate); + } else { + _candidates.add(candidate); + debugPrint('Storing candidate for later use'); + } + } + + @override + void dispose() { + unawaited(_clearSenders()); + unawaited(_connection?.close()); + super.dispose(); + } +} diff --git a/packages/neon/neon_spreed/lib/utils/view_size.dart b/packages/neon/neon_spreed/lib/utils/view_size.dart new file mode 100644 index 00000000..d069a894 --- /dev/null +++ b/packages/neon/neon_spreed/lib/utils/view_size.dart @@ -0,0 +1,21 @@ +part of '../neon_spreed.dart'; + +Size calculateViewSize(final int count, final Size constraints) { + const aspectRatio = 2 / 3; + Size? bestSize; + + for (var i = 1.0; i < min(constraints.width, constraints.height / aspectRatio) + 1; i++) { + final width = i; + final height = i * aspectRatio; + if ((constraints.width ~/ width) * (constraints.height ~/ height) >= count) { + bestSize = Size( + width, + height, + ); + } else { + break; + } + } + + return bestSize ?? Size.zero; +} diff --git a/packages/neon/neon_spreed/lib/widgets/call_button.dart b/packages/neon/neon_spreed/lib/widgets/call_button.dart new file mode 100644 index 00000000..1750e4bb --- /dev/null +++ b/packages/neon/neon_spreed/lib/widgets/call_button.dart @@ -0,0 +1,54 @@ +part of '../neon_spreed.dart'; + +class SpreedCallButton extends StatelessWidget { + const SpreedCallButton({ + required this.type, + required this.onPressed, + super.key, + }); + + final SpreedCallButtonType type; + + final VoidCallback? onPressed; + + @override + Widget build(final BuildContext context) { + late final String label; + late final IconData icon; + late final Color? backgroundColor; + switch (type) { + case SpreedCallButtonType.startCall: + icon = Icons.videocam; + label = SpreedLocalizations.of(context).callStart; + backgroundColor = null; + case SpreedCallButtonType.joinCall: + icon = Icons.phone; + label = SpreedLocalizations.of(context).callJoin; + backgroundColor = Colors.green; + case SpreedCallButtonType.leaveCall: + icon = Icons.videocam_off; + label = SpreedLocalizations.of(context).callLeave; + backgroundColor = Colors.red; + } + return Container( + margin: const EdgeInsets.all(5), + child: ElevatedButton.icon( + onPressed: onPressed, + icon: Icon(icon), + label: Text(label), + style: backgroundColor != null + ? ElevatedButton.styleFrom( + backgroundColor: backgroundColor, + foregroundColor: Theme.of(context).colorScheme.background, + ) + : null, + ), + ); + } +} + +enum SpreedCallButtonType { + startCall, + joinCall, + leaveCall, +} diff --git a/packages/neon/neon_spreed/lib/widgets/call_participant_view.dart b/packages/neon/neon_spreed/lib/widgets/call_participant_view.dart new file mode 100644 index 00000000..28efd7d9 --- /dev/null +++ b/packages/neon/neon_spreed/lib/widgets/call_participant_view.dart @@ -0,0 +1,69 @@ +part of '../neon_spreed.dart'; + +class SpreedCallParticipantView extends StatelessWidget { + const SpreedCallParticipantView({ + required this.participant, + required this.localAudioEnabled, + required this.localVideoEnabled, + required this.localScreenEnabled, + super.key, + }); + + final SpreedCallParticipant participant; + final bool localAudioEnabled; + final bool localVideoEnabled; + final bool localScreenEnabled; + + @override + Widget build(final BuildContext context) { + final hasEnabledVideoTracks = + participant.renderer?.srcObject?.getVideoTracks().where((final track) => track.enabled).isNotEmpty ?? false; + final audioEnabled = participant is SpreedLocalCallParticipant + ? localAudioEnabled + : (participant as SpreedRemoteCallParticipant).audioEnabled; + final videoEnabled = participant is SpreedLocalCallParticipant + ? localVideoEnabled + : (participant as SpreedRemoteCallParticipant).videoEnabled; + return LayoutBuilder( + builder: (final context, final constraints) => Container( + margin: const EdgeInsets.all(5), + child: ClipRRect( + borderRadius: BorderRadius.circular(10), + child: ColoredBox( + color: Theme.of(context).colorScheme.primary, + child: Stack( + children: [ + Center( + child: hasEnabledVideoTracks && videoEnabled + ? RTCVideoView( + participant.renderer!, + objectFit: RTCVideoViewObjectFit.RTCVideoViewObjectFitCover, + ) + : NeonUserAvatar( + account: NeonProvider.of(context).activeAccount.value!, + username: participant.userID, + showStatus: false, + size: min(constraints.maxHeight, constraints.maxWidth) / 2, + ), + ), + if (!audioEnabled) ...[ + Align( + alignment: Alignment.bottomRight, + child: Container( + margin: const EdgeInsets.all(5), + child: Icon( + MdiIcons.microphoneOff, + size: 28, + color: Theme.of(context).colorScheme.onPrimary, + ), + ), + ), + ], + ], + ), + ), + ), + ), + ); + } +} diff --git a/packages/neon/neon_spreed/lib/widgets/room_icon.dart b/packages/neon/neon_spreed/lib/widgets/room_icon.dart new file mode 100644 index 00000000..d7bf23c3 --- /dev/null +++ b/packages/neon/neon_spreed/lib/widgets/room_icon.dart @@ -0,0 +1,58 @@ +part of '../neon_spreed.dart'; + +class SpreedRoomIcon extends StatelessWidget { + const SpreedRoomIcon({ + required this.roomType, + this.roomName, + this.backgroundColor, + this.foregroundColor, + super.key, + }) : assert( + (roomType != spreed.RoomType.oneToOne && roomType != spreed.RoomType.oneToOneFormer) || roomName != null, + 'roomName has to be set when roomType is oneToOne', + ); + + final spreed.RoomType roomType; + final String? roomName; + final Color? backgroundColor; + final Color? foregroundColor; + + @override + Widget build(final BuildContext context) { + if (roomType == spreed.RoomType.oneToOne || roomType == spreed.RoomType.oneToOneFormer) { + return NeonUserAvatar( + username: roomName, + account: NeonProvider.of(context).activeAccount.value!, + backgroundColor: backgroundColor, + foregroundColor: foregroundColor, + ); + } + + if (roomType == spreed.RoomType.changelog) { + return CircleAvatar( + radius: smallIconSize, + backgroundColor: backgroundColor ?? Theme.of(context).colorScheme.primary, + child: VectorGraphic( + width: smallIconSize, + height: smallIconSize, + colorFilter: ColorFilter.mode(foregroundColor ?? Theme.of(context).colorScheme.onPrimary, BlendMode.srcIn), + loader: const AssetBytesLoader( + 'assets/app.svg.vec', + packageName: 'neon_spreed', + ), + semanticsLabel: NeonLocalizations.of(context).nextcloudLogo, + ), + ); + } + + if (roomType == spreed.RoomType.group || roomType == spreed.RoomType.public) { + return NeonGroupAvatar( + icon: roomType == spreed.RoomType.group ? Icons.group : Icons.public, + backgroundColor: backgroundColor, + foregroundColor: foregroundColor, + ); + } + + throw UnimplementedError('Room type $roomType has no implemented icon'); + } +} diff --git a/packages/neon/neon_spreed/lib/widgets/screen_preview.dart b/packages/neon/neon_spreed/lib/widgets/screen_preview.dart new file mode 100644 index 00000000..67a35fbf --- /dev/null +++ b/packages/neon/neon_spreed/lib/widgets/screen_preview.dart @@ -0,0 +1,60 @@ +part of '../neon_spreed.dart'; + +class SpreedScreenPreview extends StatefulWidget { + const SpreedScreenPreview({ + required this.source, + super.key, + }); + + final DesktopCapturerSource source; + + @override + State createState() => _SpreedScreenPreviewState(); +} + +class _SpreedScreenPreviewState extends State { + late final List> subscriptions = []; + + @override + void initState() { + super.initState(); + subscriptions.addAll([ + widget.source.onThumbnailChanged.stream.listen((final _) => setState(() {})), + widget.source.onNameChanged.stream.listen((final _) => setState(() {})), + ]); + } + + @override + void dispose() { + for (final subscription in subscriptions) { + unawaited(subscription.cancel()); + } + + super.dispose(); + } + + @override + Widget build(final BuildContext context) => Column( + children: [ + if (widget.source.thumbnail != null) ...[ + AspectRatio( + aspectRatio: 3 / 2, + child: Image.memory( + widget.source.thumbnail!, + gaplessPlayback: true, + fit: BoxFit.contain, + ), + ), + ], + Text( + widget.source.name, + maxLines: 2, + overflow: TextOverflow.ellipsis, + textAlign: TextAlign.center, + style: const TextStyle( + fontWeight: FontWeight.bold, + ), + ), + ], + ); +} diff --git a/packages/neon/neon_spreed/mono_pkg.yaml b/packages/neon/neon_spreed/mono_pkg.yaml new file mode 100644 index 00000000..60bc3bfd --- /dev/null +++ b/packages/neon/neon_spreed/mono_pkg.yaml @@ -0,0 +1,7 @@ +sdk: + - stable + +stages: + - all: + - analyze: --fatal-infos . + - format: --output=none --set-exit-if-changed --line-length 120 . diff --git a/packages/neon/neon_spreed/pubspec.yaml b/packages/neon/neon_spreed/pubspec.yaml new file mode 100644 index 00000000..f48bc633 --- /dev/null +++ b/packages/neon/neon_spreed/pubspec.yaml @@ -0,0 +1,45 @@ +name: neon_spreed +version: 1.0.0 +publish_to: 'none' + +environment: + sdk: '>=3.1.3 <4.0.0' + flutter: '>=3.13.6' + +dependencies: + built_collection: ^5.0.0 + collection: ^1.0.0 + flutter: + sdk: flutter + flutter_chat_types: ^3.6.2 + flutter_chat_ui: + git: + url: https://github.com/flyerhq/flutter_chat_ui + ref: ab50f411da781a078fc3c5197f14bbf9614d001c + flutter_material_design_icons: ^1.0.0 + flutter_webrtc: ^0.9.3 + go_router: ^12.0.0 + intersperse: ^2.0.0 + neon: + git: + url: https://github.com/nextcloud/neon + path: packages/neon/neon + nextcloud: + git: + url: https://github.com/nextcloud/neon + path: packages/nextcloud + rxdart: ^0.27.0 + vector_graphics: ^1.0.0 + +dev_dependencies: + build_runner: ^2.4.6 + go_router_builder: ^2.3.4 + neon_lints: + git: + url: https://github.com/nextcloud/neon + path: packages/neon_lints + +flutter: + uses-material-design: true + assets: + - assets/ diff --git a/packages/neon/neon_spreed/pubspec_overrides.yaml b/packages/neon/neon_spreed/pubspec_overrides.yaml new file mode 100644 index 00000000..3bec69c6 --- /dev/null +++ b/packages/neon/neon_spreed/pubspec_overrides.yaml @@ -0,0 +1,12 @@ +# melos_managed_dependency_overrides: dynamite_runtime,neon,nextcloud,sort_box,neon_lints +dependency_overrides: + dynamite_runtime: + path: ../../dynamite/dynamite_runtime + neon: + path: ../neon + neon_lints: + path: ../../neon_lints + nextcloud: + path: ../../nextcloud + sort_box: + path: ../../sort_box From ca3f29910dedce078827d8ca4b0698d95fe1719a Mon Sep 17 00:00:00 2001 From: jld3103 Date: Fri, 16 Jun 2023 10:51:49 +0200 Subject: [PATCH 6/6] feat(app): Add spreed Signed-off-by: jld3103 --- packages/app/android/app/build.gradle | 2 +- .../android/app/src/main/AndroidManifest.xml | 9 ++ .../src/main/res/mipmap-hdpi/app_spreed.png | Bin 0 -> 2427 bytes .../src/main/res/mipmap-mdpi/app_spreed.png | Bin 0 -> 1531 bytes .../src/main/res/mipmap-xhdpi/app_spreed.png | Bin 0 -> 3106 bytes .../src/main/res/mipmap-xxhdpi/app_spreed.png | Bin 0 -> 4686 bytes .../main/res/mipmap-xxxhdpi/app_spreed.png | Bin 0 -> 6474 bytes packages/app/lib/apps.dart | 2 + .../flutter/generated_plugin_registrant.cc | 4 + .../app/linux/flutter/generated_plugins.cmake | 1 + packages/app/pubspec.lock | 120 ++++++++++++++++++ packages/app/pubspec.yaml | 4 + packages/app/pubspec_overrides.yaml | 4 +- .../neon/neon_spreed/pubspec_overrides.yaml | 2 +- 14 files changed, 145 insertions(+), 3 deletions(-) create mode 100644 packages/app/android/app/src/main/res/mipmap-hdpi/app_spreed.png create mode 100644 packages/app/android/app/src/main/res/mipmap-mdpi/app_spreed.png create mode 100644 packages/app/android/app/src/main/res/mipmap-xhdpi/app_spreed.png create mode 100644 packages/app/android/app/src/main/res/mipmap-xxhdpi/app_spreed.png create mode 100644 packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_spreed.png diff --git a/packages/app/android/app/build.gradle b/packages/app/android/app/build.gradle index a2e0bbe9..3685eb19 100644 --- a/packages/app/android/app/build.gradle +++ b/packages/app/android/app/build.gradle @@ -46,7 +46,7 @@ android { applicationId "de.provokateurin.neon" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/packages/app/android/app/src/main/AndroidManifest.xml b/packages/app/android/app/src/main/AndroidManifest.xml index 197488d0..13370a0c 100644 --- a/packages/app/android/app/src/main/AndroidManifest.xml +++ b/packages/app/android/app/src/main/AndroidManifest.xml @@ -3,6 +3,15 @@ + + + + + + + + + 3552EP)!v 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 literal 0 HcmV?d00001 diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/app_spreed.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/app_spreed.png new file mode 100644 index 0000000000000000000000000000000000000000..b40dd9bb8706eec760ab27f2e8982e6adbefc137 GIT binary patch literal 3106 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 literal 0 HcmV?d00001 diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_spreed.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_spreed.png new file mode 100644 index 0000000000000000000000000000000000000000..f1db86f9be66b025d8298c859a3848a13b1ea3a4 GIT binary patch literal 4686 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 CrJ*SR literal 0 HcmV?d00001 diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_spreed.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_spreed.png new file mode 100644 index 0000000000000000000000000000000000000000..aeca47d79f92c21c9038819ab2b7da869b9bb04d GIT binary patch literal 6474 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 appImplementations = { @@ -12,4 +13,5 @@ final Set appImplementations = { NewsApp(), NotesApp(), NotificationsApp(), + SpreedApp(), }; diff --git a/packages/app/linux/flutter/generated_plugin_registrant.cc b/packages/app/linux/flutter/generated_plugin_registrant.cc index 9db402be..4e10e193 100644 --- a/packages/app/linux/flutter/generated_plugin_registrant.cc +++ b/packages/app/linux/flutter/generated_plugin_registrant.cc @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -20,6 +21,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); file_selector_plugin_register_with_registrar(file_selector_linux_registrar); + g_autoptr(FlPluginRegistrar) flutter_webrtc_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterWebRTCPlugin"); + flutter_web_r_t_c_plugin_register_with_registrar(flutter_webrtc_registrar); g_autoptr(FlPluginRegistrar) screen_retriever_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin"); screen_retriever_plugin_register_with_registrar(screen_retriever_registrar); diff --git a/packages/app/linux/flutter/generated_plugins.cmake b/packages/app/linux/flutter/generated_plugins.cmake index eb1257c1..a62b6231 100644 --- a/packages/app/linux/flutter/generated_plugins.cmake +++ b/packages/app/linux/flutter/generated_plugins.cmake @@ -5,6 +5,7 @@ list(APPEND FLUTTER_PLUGIN_LIST dynamic_color file_selector_linux + flutter_webrtc screen_retriever tray_manager url_launcher_linux diff --git a/packages/app/pubspec.lock b/packages/app/pubspec.lock index 9895f3ec..6074aff5 100644 --- a/packages/app/pubspec.lock +++ b/packages/app/pubspec.lock @@ -193,6 +193,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.6" + dart_webrtc: + dependency: transitive + description: + name: dart_webrtc + sha256: "5897a3bdd6c7fded07e80e250260ca4c9cd61f9080911aa308b516e1206745a9" + url: "https://pub.dev" + source: hosted + version: "1.1.3" dbus: dependency: transitive description: @@ -209,6 +217,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.2.3" + diffutil_dart: + dependency: transitive + description: + name: diffutil_dart + sha256: e0297e4600b9797edff228ed60f4169a778ea357691ec98408fa3b72994c7d06 + url: "https://pub.dev" + source: hosted + version: "3.0.0" dynamic_color: dependency: transitive description: @@ -224,6 +240,14 @@ packages: relative: true source: path version: "1.0.0" + equatable: + dependency: transitive + description: + name: equatable + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" + source: hosted + version: "2.0.5" fake_async: dependency: transitive description: @@ -324,6 +348,23 @@ packages: url: "https://pub.dev" source: hosted version: "3.3.1" + flutter_chat_types: + dependency: transitive + description: + name: flutter_chat_types + sha256: e285b588f6d19d907feb1f6d912deaf22e223656769c34093b64e1c59b094fb9 + url: "https://pub.dev" + source: hosted + version: "3.6.2" + flutter_chat_ui: + dependency: transitive + description: + path: "." + ref: ab50f411da781a078fc3c5197f14bbf9614d001c + resolved-ref: ab50f411da781a078fc3c5197f14bbf9614d001c + url: "https://github.com/flyerhq/flutter_chat_ui" + source: git + version: "1.6.9" flutter_driver: dependency: transitive description: flutter @@ -345,6 +386,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0-beta.2" + flutter_link_previewer: + dependency: transitive + description: + name: flutter_link_previewer + sha256: "007069e60f42419fb59872beb7a3cc3ea21e9f1bdff5d40239f376fa62ca9f20" + url: "https://pub.dev" + source: hosted + version: "3.2.2" + flutter_linkify: + dependency: transitive + description: + name: flutter_linkify + sha256: "74669e06a8f358fee4512b4320c0b80e51cffc496607931de68d28f099254073" + url: "https://pub.dev" + source: hosted + version: "6.0.0" flutter_local_notifications: dependency: transitive description: @@ -432,6 +489,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_webrtc: + dependency: transitive + description: + name: flutter_webrtc + sha256: "8522e9f347aed9f03ec591d05fc286a698c1b11a1a6d3e994e92727d24c6f352" + url: "https://pub.dev" + source: hosted + version: "0.9.46" flutter_zxing: dependency: transitive description: @@ -602,6 +667,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.1" + linkify: + dependency: transitive + description: + name: linkify + sha256: "4139ea77f4651ab9c315b577da2dd108d9aa0bd84b5d03d33323f1970c645832" + url: "https://pub.dev" + source: hosted + version: "5.0.0" list_counter: dependency: transitive description: @@ -715,6 +788,13 @@ packages: relative: true source: path version: "1.0.0" + neon_spreed: + dependency: "direct main" + description: + path: "../neon/neon_spreed" + relative: true + source: path + version: "1.0.0" nested: dependency: transitive description: @@ -874,6 +954,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.1" + photo_view: + dependency: transitive + description: + name: photo_view + sha256: "8036802a00bae2a78fc197af8a158e3e2f7b500561ed23b4c458107685e645bb" + url: "https://pub.dev" + source: hosted + version: "0.14.0" platform: dependency: transitive description: @@ -882,6 +970,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.2" + platform_detect: + dependency: transitive + description: + name: platform_detect + sha256: "08f4ee79c0e1c4858d37e06b22352a3ebdef5466b613749a3adb03e703d4f5b0" + url: "https://pub.dev" + source: hosted + version: "2.0.11" plugin_platform_interface: dependency: transitive description: @@ -994,6 +1090,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.1.9" + scroll_to_index: + dependency: transitive + description: + name: scroll_to_index + sha256: b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176 + url: "https://pub.dev" + source: hosted + version: "3.0.1" scrollable_positioned_list: dependency: transitive description: @@ -1382,6 +1486,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + visibility_detector: + dependency: transitive + description: + name: visibility_detector + sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420 + url: "https://pub.dev" + source: hosted + version: "0.4.0+2" vm_service: dependency: transitive description: @@ -1422,6 +1534,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + webrtc_interface: + dependency: transitive + description: + name: webrtc_interface + sha256: "2efbd3e4e5ebeb2914253bcc51dafd3053c4b87b43f3076c74835a9deecbae3a" + url: "https://pub.dev" + source: hosted + version: "1.1.2" webview_flutter: dependency: transitive description: diff --git a/packages/app/pubspec.yaml b/packages/app/pubspec.yaml index 0c430432..dc696a5b 100644 --- a/packages/app/pubspec.yaml +++ b/packages/app/pubspec.yaml @@ -33,6 +33,10 @@ dependencies: git: url: https://github.com/nextcloud/neon path: packages/neon/neon_notifications + neon_spreed: + git: + url: https://github.com/nextcloud/neon + path: packages/neon/neon_spreed universal_io: any vector_graphics: any diff --git a/packages/app/pubspec_overrides.yaml b/packages/app/pubspec_overrides.yaml index 98da95b6..2bef6261 100644 --- a/packages/app/pubspec_overrides.yaml +++ b/packages/app/pubspec_overrides.yaml @@ -1,4 +1,4 @@ -# melos_managed_dependency_overrides: dynamite_runtime,file_icons,neon,neon_dashboard,neon_files,neon_lints,neon_news,neon_notes,neon_notifications,nextcloud,sort_box +# melos_managed_dependency_overrides: dynamite_runtime,file_icons,neon,neon_dashboard,neon_files,neon_lints,neon_news,neon_notes,neon_notifications,neon_spreed,nextcloud,sort_box dependency_overrides: dynamite_runtime: path: ../dynamite/dynamite_runtime @@ -18,6 +18,8 @@ dependency_overrides: path: ../neon/neon_notes neon_notifications: path: ../neon/neon_notifications + neon_spreed: + path: ../neon/neon_spreed nextcloud: path: ../nextcloud sort_box: diff --git a/packages/neon/neon_spreed/pubspec_overrides.yaml b/packages/neon/neon_spreed/pubspec_overrides.yaml index 3bec69c6..e247d2d9 100644 --- a/packages/neon/neon_spreed/pubspec_overrides.yaml +++ b/packages/neon/neon_spreed/pubspec_overrides.yaml @@ -1,4 +1,4 @@ -# melos_managed_dependency_overrides: dynamite_runtime,neon,nextcloud,sort_box,neon_lints +# melos_managed_dependency_overrides: dynamite_runtime,neon,neon_lints,nextcloud,sort_box dependency_overrides: dynamite_runtime: path: ../../dynamite/dynamite_runtime