fix: refactor signaler; fix logic for local watcher

2023-09-21 21:50:13 -07:00
parent 9bbe917e59
commit 7fbd4fff69
8 changed files with 920 additions and 1076 deletions
@@ -83,6 +83,19 @@ final $typed_data.Uint8List createSessionRequestDescriptor = $convert.base64Deco
    'ChRDcmVhdGVTZXNzaW9uUmVxdWVzdBIrCgdzZXNzaW9uGAEgASgLMhEuc2lnbmFsZXIuU2Vzc2'
    'lvblIHc2Vzc2lvbhImCg93YWl0X2Zvcl91cGRhdGUYAiABKAhSDXdhaXRGb3JVcGRhdGU=');

+@$core.Deprecated('Use popSessionRequestDescriptor instead')
+const PopSessionRequest$json = {
+  '1': 'PopSessionRequest',
+  '2': [
+    {'1': 'session', '3': 1, '4': 1, '5': 11, '6': '.signaler.Session', '10': 'session'},
+  ],
+};
+
+/// Descriptor for `PopSessionRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List popSessionRequestDescriptor = $convert.base64Decode(
+    'ChFQb3BTZXNzaW9uUmVxdWVzdBIrCgdzZXNzaW9uGAEgASgLMhEuc2lnbmFsZXIuU2Vzc2lvbl'
+    'IHc2Vzc2lvbg==');
+
@$core.Deprecated('Use updateSessionRequestDescriptor instead')
 const UpdateSessionRequest$json = {
  '1': 'UpdateSessionRequest',
@@ -119,62 +132,33 @@ final $typed_data.Uint8List listSessionsResponseDescriptor = $convert.base64Deco
    'ChRMaXN0U2Vzc2lvbnNSZXNwb25zZRItCghzZXNzaW9ucxgBIAMoCzIRLnNpZ25hbGVyLlNlc3'
    'Npb25SCHNlc3Npb25z');

-@$core.Deprecated('Use createIceCandidateRequestDescriptor instead')
-const CreateIceCandidateRequest$json = {
-  '1': 'CreateIceCandidateRequest',
+@$core.Deprecated('Use createIceMessageRequestDescriptor instead')
+const CreateIceMessageRequest$json = {
+  '1': 'CreateIceMessageRequest',
  '2': [
    {'1': 'session_identifier', '3': 1, '4': 1, '5': 11, '6': '.signaler.Session.Identifier', '10': 'sessionIdentifier'},
-    {'1': 'candidate', '3': 2, '4': 1, '5': 11, '6': '.signaler.IceCandidate', '10': 'candidate'},
+    {'1': 'ice_message', '3': 2, '4': 1, '5': 11, '6': '.signaler.IceMessage', '10': 'iceMessage'},
  ],
 };

-/// Descriptor for `CreateIceCandidateRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List createIceCandidateRequestDescriptor = $convert.base64Decode(
-    'ChlDcmVhdGVJY2VDYW5kaWRhdGVSZXF1ZXN0EksKEnNlc3Npb25faWRlbnRpZmllchgBIAEoCz'
-    'IcLnNpZ25hbGVyLlNlc3Npb24uSWRlbnRpZmllclIRc2Vzc2lvbklkZW50aWZpZXISNAoJY2Fu'
-    'ZGlkYXRlGAIgASgLMhYuc2lnbmFsZXIuSWNlQ2FuZGlkYXRlUgljYW5kaWRhdGU=');
+/// Descriptor for `CreateIceMessageRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List createIceMessageRequestDescriptor = $convert.base64Decode(
+    'ChdDcmVhdGVJY2VNZXNzYWdlUmVxdWVzdBJLChJzZXNzaW9uX2lkZW50aWZpZXIYASABKAsyHC'
+    '5zaWduYWxlci5TZXNzaW9uLklkZW50aWZpZXJSEXNlc3Npb25JZGVudGlmaWVyEjUKC2ljZV9t'
+    'ZXNzYWdlGAIgASgLMhQuc2lnbmFsZXIuSWNlTWVzc2FnZVIKaWNlTWVzc2FnZQ==');

-@$core.Deprecated('Use popIceCandidateRequestDescriptor instead')
-const PopIceCandidateRequest$json = {
-  '1': 'PopIceCandidateRequest',
+@$core.Deprecated('Use popIceMessageRequestDescriptor instead')
+const PopIceMessageRequest$json = {
+  '1': 'PopIceMessageRequest',
  '2': [
    {'1': 'session_identifier', '3': 1, '4': 1, '5': 11, '6': '.signaler.Session.Identifier', '10': 'sessionIdentifier'},
  ],
 };

-/// Descriptor for `PopIceCandidateRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List popIceCandidateRequestDescriptor = $convert.base64Decode(
-    'ChZQb3BJY2VDYW5kaWRhdGVSZXF1ZXN0EksKEnNlc3Npb25faWRlbnRpZmllchgBIAEoCzIcLn'
-    'NpZ25hbGVyLlNlc3Npb24uSWRlbnRpZmllclIRc2Vzc2lvbklkZW50aWZpZXI=');
-
-@$core.Deprecated('Use createIceSessionDescriptionRequestDescriptor instead')
-const CreateIceSessionDescriptionRequest$json = {
-  '1': 'CreateIceSessionDescriptionRequest',
-  '2': [
-    {'1': 'session_identifier', '3': 1, '4': 1, '5': 11, '6': '.signaler.Session.Identifier', '10': 'sessionIdentifier'},
-    {'1': 'description', '3': 2, '4': 1, '5': 11, '6': '.signaler.IceSessionDescription', '10': 'description'},
-  ],
-};
-
-/// Descriptor for `CreateIceSessionDescriptionRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List createIceSessionDescriptionRequestDescriptor = $convert.base64Decode(
-    'CiJDcmVhdGVJY2VTZXNzaW9uRGVzY3JpcHRpb25SZXF1ZXN0EksKEnNlc3Npb25faWRlbnRpZm'
-    'llchgBIAEoCzIcLnNpZ25hbGVyLlNlc3Npb24uSWRlbnRpZmllclIRc2Vzc2lvbklkZW50aWZp'
-    'ZXISQQoLZGVzY3JpcHRpb24YAiABKAsyHy5zaWduYWxlci5JY2VTZXNzaW9uRGVzY3JpcHRpb2'
-    '5SC2Rlc2NyaXB0aW9u');
-
-@$core.Deprecated('Use popIceSessionDescriptionRequestDescriptor instead')
-const PopIceSessionDescriptionRequest$json = {
-  '1': 'PopIceSessionDescriptionRequest',
-  '2': [
-    {'1': 'session_identifier', '3': 1, '4': 1, '5': 11, '6': '.signaler.Session.Identifier', '10': 'sessionIdentifier'},
-  ],
-};
-
-/// Descriptor for `PopIceSessionDescriptionRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List popIceSessionDescriptionRequestDescriptor = $convert.base64Decode(
-    'Ch9Qb3BJY2VTZXNzaW9uRGVzY3JpcHRpb25SZXF1ZXN0EksKEnNlc3Npb25faWRlbnRpZmllch'
-    'gBIAEoCzIcLnNpZ25hbGVyLlNlc3Npb24uSWRlbnRpZmllclIRc2Vzc2lvbklkZW50aWZpZXI=');
+/// Descriptor for `PopIceMessageRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List popIceMessageRequestDescriptor = $convert.base64Decode(
+    'ChRQb3BJY2VNZXNzYWdlUmVxdWVzdBJLChJzZXNzaW9uX2lkZW50aWZpZXIYASABKAsyHC5zaW'
+    'duYWxlci5TZXNzaW9uLklkZW50aWZpZXJSEXNlc3Npb25JZGVudGlmaWVy');

@$core.Deprecated('Use cameraDescriptor instead')
 const Camera$json = {
@@ -198,6 +182,24 @@ final $typed_data.Uint8List cameraDescriptor = $convert.base64Decode(
    'CgZDYW1lcmESOwoKaWRlbnRpZmllchgBIAEoCzIbLnNpZ25hbGVyLkNhbWVyYS5JZGVudGlmaW'
    'VyUgppZGVudGlmaWVyGhwKCklkZW50aWZpZXISDgoCaWQYASABKAlSAmlk');

+@$core.Deprecated('Use iceMessageDescriptor instead')
+const IceMessage$json = {
+  '1': 'IceMessage',
+  '2': [
+    {'1': 'candidate', '3': 1, '4': 1, '5': 11, '6': '.signaler.IceCandidate', '9': 0, '10': 'candidate'},
+    {'1': 'session', '3': 2, '4': 1, '5': 11, '6': '.signaler.IceSessionDescription', '9': 0, '10': 'session'},
+  ],
+  '8': [
+    {'1': 'type'},
+  ],
+};
+
+/// Descriptor for `IceMessage`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List iceMessageDescriptor = $convert.base64Decode(
+    'CgpJY2VNZXNzYWdlEjYKCWNhbmRpZGF0ZRgBIAEoCzIWLnNpZ25hbGVyLkljZUNhbmRpZGF0ZU'
+    'gAUgljYW5kaWRhdGUSOwoHc2Vzc2lvbhgCIAEoCzIfLnNpZ25hbGVyLkljZVNlc3Npb25EZXNj'
+    'cmlwdGlvbkgAUgdzZXNzaW9uQgYKBHR5cGU=');
+
@$core.Deprecated('Use iceCandidateDescriptor instead')
 const IceCandidate$json = {
  '1': 'IceCandidate',
@@ -241,10 +243,6 @@ const Session$json = {
  '2': [
    {'1': 'id', '3': 1, '4': 1, '5': 11, '6': '.signaler.Session.Identifier', '10': 'id'},
    {'1': 'camera', '3': 2, '4': 1, '5': 11, '6': '.signaler.Camera.Identifier', '10': 'camera'},
-    {'1': 'client_ice_candidates', '3': 3, '4': 3, '5': 11, '6': '.signaler.IceCandidate', '10': 'clientIceCandidates'},
-    {'1': 'camera_ice_candidates', '3': 4, '4': 3, '5': 11, '6': '.signaler.IceCandidate', '10': 'cameraIceCandidates'},
-    {'1': 'camera_offer', '3': 5, '4': 1, '5': 11, '6': '.signaler.IceSessionDescription', '10': 'cameraOffer'},
-    {'1': 'client_answer', '3': 6, '4': 1, '5': 11, '6': '.signaler.IceSessionDescription', '10': 'clientAnswer'},
  ],
  '3': [Session_Identifier$json],
 };
@@ -260,13 +258,8 @@ const Session_Identifier$json = {
 /// Descriptor for `Session`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List sessionDescriptor = $convert.base64Decode(
    'CgdTZXNzaW9uEiwKAmlkGAEgASgLMhwuc2lnbmFsZXIuU2Vzc2lvbi5JZGVudGlmaWVyUgJpZB'
-    'IzCgZjYW1lcmEYAiABKAsyGy5zaWduYWxlci5DYW1lcmEuSWRlbnRpZmllclIGY2FtZXJhEkoK'
-    'FWNsaWVudF9pY2VfY2FuZGlkYXRlcxgDIAMoCzIWLnNpZ25hbGVyLkljZUNhbmRpZGF0ZVITY2'
-    'xpZW50SWNlQ2FuZGlkYXRlcxJKChVjYW1lcmFfaWNlX2NhbmRpZGF0ZXMYBCADKAsyFi5zaWdu'
-    'YWxlci5JY2VDYW5kaWRhdGVSE2NhbWVyYUljZUNhbmRpZGF0ZXMSQgoMY2FtZXJhX29mZmVyGA'
-    'UgASgLMh8uc2lnbmFsZXIuSWNlU2Vzc2lvbkRlc2NyaXB0aW9uUgtjYW1lcmFPZmZlchJECg1j'
-    'bGllbnRfYW5zd2VyGAYgASgLMh8uc2lnbmFsZXIuSWNlU2Vzc2lvbkRlc2NyaXB0aW9uUgxjbG'
-    'llbnRBbnN3ZXIaHAoKSWRlbnRpZmllchIOCgJpZBgBIAEoCVICaWQ=');
+    'IzCgZjYW1lcmEYAiABKAsyGy5zaWduYWxlci5DYW1lcmEuSWRlbnRpZmllclIGY2FtZXJhGhwK'
+    'CklkZW50aWZpZXISDgoCaWQYASABKAlSAmlk');

@$core.Deprecated('Use authTokenDescriptor instead')
 const AuthToken$json = {
@@ -286,12 +279,9 @@ const $core.Map<$core.String, $core.dynamic> SignalerServiceBase$json = {
    {'1': 'CreateAuthToken', '2': '.signaler.CreateAuthTokenRequest', '3': '.signaler.AuthToken'},
    {'1': 'ListCameras', '2': '.signaler.ListCamerasRequest', '3': '.signaler.ListCamerasResponse'},
    {'1': 'CreateSession', '2': '.signaler.CreateSessionRequest', '3': '.signaler.Session'},
-    {'1': 'UpdateSession', '2': '.signaler.UpdateSessionRequest', '3': '.signaler.Session'},
-    {'1': 'ListSessions', '2': '.signaler.ListSessionsRequest', '3': '.signaler.ListSessionsResponse'},
-    {'1': 'CreateIceCandidate', '2': '.signaler.CreateIceCandidateRequest', '3': '.signaler.IceCandidate'},
-    {'1': 'PopIceCandidate', '2': '.signaler.PopIceCandidateRequest', '3': '.signaler.IceCandidate'},
-    {'1': 'CreateIceSessionDescription', '2': '.signaler.CreateIceSessionDescriptionRequest', '3': '.signaler.IceSessionDescription'},
-    {'1': 'PopIceSessionDescription', '2': '.signaler.PopIceSessionDescriptionRequest', '3': '.signaler.IceSessionDescription'},
+    {'1': 'PopSession', '2': '.signaler.PopSessionRequest', '3': '.signaler.Session'},
+    {'1': 'CreateIceMessage', '2': '.signaler.CreateIceMessageRequest', '3': '.signaler.IceMessage'},
+    {'1': 'PopIceMessage', '2': '.signaler.PopIceMessageRequest', '3': '.signaler.IceMessage'},
  ],
 };

@@ -308,15 +298,12 @@ const $core.Map<$core.String, $core.Map<$core.String, $core.dynamic>> SignalerSe
  '.signaler.CreateSessionRequest': CreateSessionRequest$json,
  '.signaler.Session': Session$json,
  '.signaler.Session.Identifier': Session_Identifier$json,
+  '.signaler.PopSessionRequest': PopSessionRequest$json,
+  '.signaler.CreateIceMessageRequest': CreateIceMessageRequest$json,
+  '.signaler.IceMessage': IceMessage$json,
  '.signaler.IceCandidate': IceCandidate$json,
  '.signaler.IceSessionDescription': IceSessionDescription$json,
-  '.signaler.UpdateSessionRequest': UpdateSessionRequest$json,
-  '.signaler.ListSessionsRequest': ListSessionsRequest$json,
-  '.signaler.ListSessionsResponse': ListSessionsResponse$json,
-  '.signaler.CreateIceCandidateRequest': CreateIceCandidateRequest$json,
-  '.signaler.PopIceCandidateRequest': PopIceCandidateRequest$json,
-  '.signaler.CreateIceSessionDescriptionRequest': CreateIceSessionDescriptionRequest$json,
-  '.signaler.PopIceSessionDescriptionRequest': PopIceSessionDescriptionRequest$json,
+  '.signaler.PopIceMessageRequest': PopIceMessageRequest$json,
 };

 /// Descriptor for `SignalerService`. Decode as a `google.protobuf.ServiceDescriptorProto`.
@@ -325,14 +312,9 @@ final $typed_data.Uint8List signalerServiceDescriptor = $convert.base64Decode(
    'V0aFRva2VuUmVxdWVzdBoTLnNpZ25hbGVyLkF1dGhUb2tlbhJKCgtMaXN0Q2FtZXJhcxIcLnNp'
    'Z25hbGVyLkxpc3RDYW1lcmFzUmVxdWVzdBodLnNpZ25hbGVyLkxpc3RDYW1lcmFzUmVzcG9uc2'
    'USQgoNQ3JlYXRlU2Vzc2lvbhIeLnNpZ25hbGVyLkNyZWF0ZVNlc3Npb25SZXF1ZXN0GhEuc2ln'
-    'bmFsZXIuU2Vzc2lvbhJCCg1VcGRhdGVTZXNzaW9uEh4uc2lnbmFsZXIuVXBkYXRlU2Vzc2lvbl'
-    'JlcXVlc3QaES5zaWduYWxlci5TZXNzaW9uEk0KDExpc3RTZXNzaW9ucxIdLnNpZ25hbGVyLkxp'
-    'c3RTZXNzaW9uc1JlcXVlc3QaHi5zaWduYWxlci5MaXN0U2Vzc2lvbnNSZXNwb25zZRJRChJDcm'
-    'VhdGVJY2VDYW5kaWRhdGUSIy5zaWduYWxlci5DcmVhdGVJY2VDYW5kaWRhdGVSZXF1ZXN0GhYu'
-    'c2lnbmFsZXIuSWNlQ2FuZGlkYXRlEksKD1BvcEljZUNhbmRpZGF0ZRIgLnNpZ25hbGVyLlBvcE'
-    'ljZUNhbmRpZGF0ZVJlcXVlc3QaFi5zaWduYWxlci5JY2VDYW5kaWRhdGUSbAobQ3JlYXRlSWNl'
-    'U2Vzc2lvbkRlc2NyaXB0aW9uEiwuc2lnbmFsZXIuQ3JlYXRlSWNlU2Vzc2lvbkRlc2NyaXB0aW'
-    '9uUmVxdWVzdBofLnNpZ25hbGVyLkljZVNlc3Npb25EZXNjcmlwdGlvbhJmChhQb3BJY2VTZXNz'
-    'aW9uRGVzY3JpcHRpb24SKS5zaWduYWxlci5Qb3BJY2VTZXNzaW9uRGVzY3JpcHRpb25SZXF1ZX'
-    'N0Gh8uc2lnbmFsZXIuSWNlU2Vzc2lvbkRlc2NyaXB0aW9u');
+    'bmFsZXIuU2Vzc2lvbhI8CgpQb3BTZXNzaW9uEhsuc2lnbmFsZXIuUG9wU2Vzc2lvblJlcXVlc3'
+    'QaES5zaWduYWxlci5TZXNzaW9uEksKEENyZWF0ZUljZU1lc3NhZ2USIS5zaWduYWxlci5DcmVh'
+    'dGVJY2VNZXNzYWdlUmVxdWVzdBoULnNpZ25hbGVyLkljZU1lc3NhZ2USRQoNUG9wSWNlTWVzc2'
+    'FnZRIeLnNpZ25hbGVyLlBvcEljZU1lc3NhZ2VSZXF1ZXN0GhQuc2lnbmFsZXIuSWNlTWVzc2Fn'
+    'ZQ==');