Added subscribe and unsubscribe for notification service

docs/classes/internal.NotificationService.md

@@ -12,6 +12,8 @@ The NotificationService allows inviting participants to a conference.
 
 ### Methods
 
+- [subscribe](internal.NotificationService.md#subscribe)
+- [unsubscribe](internal.NotificationService.md#unsubscribe)
 - [decline](internal.NotificationService.md#decline)
 - [invite](internal.NotificationService.md#invite)
 - [onInvitationReceived](internal.NotificationService.md#oninvitationreceived)
@@ -24,6 +26,42 @@ The NotificationService allows inviting participants to a conference.
 
 ## Methods
 
+### subscribe
+
+▸ **subscribe**(`events`): `Promise`<`void`\>
+
+Subscribes to the specified notifications.
+
+#### Parameters
+
+| Name | Type | Description |
+| :------ | :------ | :------ |
+| `events` | [`Subscription`](../interfaces/internal.Subscription.md)[] | An array of the subscribed subscription types. |
+
+#### Returns
+
+`Promise`<`void`\>
+
+___
+
+### unsubscribe
+
+▸ **unsubscribe**(`events`): `Promise`<`void`\>
+
+Unsubscribes from the specified notifications.
+
+#### Parameters
+
+| Name | Type | Description |
+| :------ | :------ | :------ |
+| `events` | [`Subscription`](../interfaces/internal.Subscription.md)[] | An array of the subscribed subscription types. |
+
+#### Returns
+
+`Promise`<`void`\>
+
+___
+
 ### decline
 
 ▸ **decline**(`conference`): `Promise`<`void`\>

docs/interfaces/internal.Subscription.md

@@ -0,0 +1,28 @@
+# Interface: Subscription
+
+[internal](../modules/internal.md).Subscription
+
+The Subscription model is an interface for all subscription types.
+
+## Table of contents
+
+### Properties
+
+- [type](internal.Subscription.md#type)
+- [conferenceAlias](internal.Subscription.md#conferencealias)
+
+## Properties
+
+### type
+
+• **type**: `string`
+
+The subscription type.
+
+___
+
+### conferenceAlias
+
+• **conferenceAlias**: `string`
+
+The conference alias.

docs/modules/internal.md

@@ -69,6 +69,7 @@
 - [FileConverted](../interfaces/internal.FileConverted.md)
 - [FilePresentation](../interfaces/internal.FilePresentation.md)
 - [InvitationReceivedEventType](../interfaces/internal.InvitationReceivedEventType.md)
+- [Subscription](../interfaces/internal.Subscription.md)
 - [RecordingStatusUpdatedEventType](../interfaces/internal.RecordingStatusUpdatedEventType.md)
 - [Recording](../interfaces/internal.Recording.md)
 - [VideoPresentationEventType](../interfaces/internal.VideoPresentationEventType.md)

example/src/components/DolbyIOProvider/DolbyIOProvider.tsx

@@ -21,6 +21,9 @@ import type {
   Conference,
   Participant,
 } from '../../../../src/services/conference/models';
+import {
+  SubscriptionType
+} from '../../../../src/services/notification/models';
 
 export interface IDolbyIOProvider {
   isInitialized?: Boolean;
@@ -207,6 +210,17 @@ const DolbyIOProvider: React.FC = ({ children }) => {
         '@conference-previous',
         JSON.stringify(joinedConference)
       );
+
+      await CommsAPI.notification.subscribe(
+        [
+          SubscriptionType.ActiveParticipants,
+          SubscriptionType.ConferenceCreated,
+          SubscriptionType.ConferenceEnded,
+          SubscriptionType.InvitationReceived,
+          SubscriptionType.ParticipantJoined,
+          SubscriptionType.ParticipantLeft
+        ].map( (s) => { return { type: s, conferenceAlias: alias } })
+      );
     } catch (e: any) {
       Alert.alert('Conference not joined', e.toString());
     }
@@ -290,6 +304,17 @@ const DolbyIOProvider: React.FC = ({ children }) => {
   };
   const leave = async (leaveRoom: boolean) => {
     try {
+      await CommsAPI.notification.unsubscribe(
+        [
+          SubscriptionType.ActiveParticipants,
+          SubscriptionType.ConferenceCreated,
+          SubscriptionType.ConferenceEnded,
+          SubscriptionType.InvitationReceived,
+          SubscriptionType.ParticipantJoined,
+          SubscriptionType.ParticipantLeft
+        ].map( (s) => { return { type: s, conferenceAlias: conference?.alias ?? "" } })
+      );
+
       const conferenceLeaveOptions = {
         leaveRoom,
       };

ios/Services/Models/SubscriptionDTO.swift

@@ -0,0 +1,60 @@
+import Foundation
+import VoxeetSDK
+
+enum Event: String {
+    case invitationReceived = "SUBSCRIPTION_TYPE_INVITATION_RECEIVED"
+    case activeParticipants = "SUBSCRIPTION_TYPE_ACTIVE_PARTICIPANTS"
+    case conferenceCreated = "SUBSCRIPTION_TYPE_CONFERENCE_CREATED"
+    case conferenceEnded = "SUBSCRIPTION_TYPE_CONFERENCE_ENDED"
+    case participantJoined = "SUBSCRIPTION_TYPE_PARTICIPANT_JOINED"
+    case participantLeft = "SUBSCRIPTION_TYPE_PARTICIPANT_LEFT"
+}
+
+internal struct SubscriptionDTO {
+
+    static func create(with dictionary: [String: Any]) -> SubscriptionDTO? {
+        guard
+            let type: String = dictionary.value(for: Keys.type),
+            let conferenceAlias: String = dictionary.value(for: Keys.conferenceAlias)
+        else { return nil }
+
+        return SubscriptionDTO(type: type, conferenceAlias: conferenceAlias)
+    }
+
+    let type: String
+    let conferenceAlias: String
+
+    func subscription() -> VTSubscribeBase? {
+        switch type {
+        case Event.invitationReceived.rawValue:
+            return VTSubscribeInvitation(conferenceAlias: conferenceAlias)
+        case Event.activeParticipants.rawValue:
+            return VTSubscribeActiveParticipants(conferenceAlias: conferenceAlias)
+        case Event.conferenceCreated.rawValue:
+            return VTSubscribeConferenceCreated(conferenceAlias: conferenceAlias)
+        case Event.conferenceEnded.rawValue:
+            return VTSubscribeConferenceEnded(conferenceAlias: conferenceAlias)
+        case Event.participantJoined.rawValue:
+            return VTSubscribeParticipantJoined(conferenceAlias: conferenceAlias)
+        case Event.participantLeft.rawValue:
+            return VTSubscribeParticipantLeft(conferenceAlias: conferenceAlias)
+        default:
+            return nil
+        }
+    }
+}
+
+// MARK: - ReactModelMappable
+extension SubscriptionDTO: ReactModelMappable {
+    func toReactModel() -> ReactModelType {
+        return [
+            Keys.type: type,
+            Keys.conferenceAlias: conferenceAlias
+        ].mapKeysToRawValue()
+    }
+}
+
+// MARK: - ReactModel Keys
+private enum Keys: String {
+    case type, conferenceAlias
+}

ios/Services/NotificationService/NotificationServiceModule.swift

@@ -26,6 +26,30 @@ public class NotificationServiceModule: ReactEmitter {
 		VoxeetSDK.shared.notification.delegate = nil;
 	}
 
+    /// Subscribes to the specified notifications.
+    /// - Parameters:
+    ///   - events: An array of the subscribed subscription types.
+    ///   - resolve: returns on success
+    ///   - reject: returns error on failure
+    @objc(subscribe:resolver:rejecter:)
+    public func subscribe(events: [[String: Any]],
+                          resolve: @escaping RCTPromiseResolveBlock,
+                          reject: @escaping RCTPromiseRejectBlock) {
+        VoxeetSDK.shared.notification.subscribe(subscriptions: events.compactMap { SubscriptionDTO.create(with:$0)?.subscription() })
+    }
+
+    /// Unsubscribes from the specified notifications.
+    /// - Parameters:
+    ///   - events: An array of the subscribed subscription types.
+    ///   - resolve: returns on success
+    ///   - reject: returns error on failure
+    @objc(unsubscribe:resolver:rejecter:)
+    public func unsubscribe(events: [[String: Any]],
+                            resolve: @escaping RCTPromiseResolveBlock,
+                            reject: @escaping RCTPromiseRejectBlock) {
+        VoxeetSDK.shared.notification.unsubscribe(subscriptions: events.compactMap { SubscriptionDTO.create(with:$0)?.subscription() })
+    }
+
 	/// Notifies conference participants about a conference invitation.
 	/// - Parameters:
 	///   - conference: The conference object.

ios/Services/NotificationService/RNNotificationServiceModuleBridge.m

@@ -3,6 +3,14 @@
 
 @interface RCT_EXTERN_REMAP_MODULE(CommsAPINotificationServiceModule, RNNotificationServiceModule, NSObject)
 
+RCT_EXTERN_METHOD(subscribe:(NSArray<NSDictionary *> * _Nonnull)events
+                  resolver:(RCTPromiseResolveBlock _Nonnull)resolve
+                  rejecter:(RCTPromiseRejectBlock _Nonnull)reject);
+
+RCT_EXTERN_METHOD(unsubscribe:(NSArray<NSDictionary *> * _Nonnull)events
+                  resolver:(RCTPromiseResolveBlock _Nonnull)resolve
+                  rejecter:(RCTPromiseRejectBlock _Nonnull)reject);
+
 RCT_EXTERN_METHOD(invite:(NSDictionary * _Nonnull)conference
 				  participants:(NSArray<NSDictionary *> * _Nonnull)participants
 				  resolver:(RCTPromiseResolveBlock _Nonnull)resolve

src/services/notification/NotificationService.ts

@@ -8,6 +8,7 @@ import type {
 } from '../conference/models';
 import { NotificationServiceEventNames } from './events';
 import type { InvitationReceivedEventType } from './events';
+import type { Subscription } from './models';
 
 const { CommsAPINotificationServiceModule } = NativeModules;
 
@@ -20,6 +21,22 @@ export class NotificationService {
   /** @internal */
   _nativeEvents = new NativeEvents(CommsAPINotificationServiceModule);
 
+  /**
+   * Subscribes to the specified notifications.
+   * @param events An array of the subscribed subscription types.
+   */
+  public async subscribe(events: Subscription[]): Promise<void> {
+    return this._nativeModule.subscribe(events);
+  }
+
+  /**
+   * Unsubscribes from the specified notifications.
+   * @param events An array of the subscribed subscription types.
+   */
+  public async unsubscribe(events: Subscription[]): Promise<void> {
+    return this._nativeModule.unsubscribe(events);
+  }
+
   /**
    * Declines the conference invitation.
    * @param conference The conference object.

src/services/notification/__tests__/index.test.ts

@@ -14,6 +14,28 @@ const testConference: Conference = {
 describe('NotificationService', () => {
   NotificationService._nativeEvents.addListener = jest.fn();
 
+  describe('subscribe()', () => {
+    it('should invoke subscribe method with correct arguments', () => {
+      NotificationService.subscribe([
+        { type: 'event', conferenceAlias: 'alias' },
+      ]);
+      expect(CommsAPINotificationServiceModule.subscribe).toHaveBeenCalledWith([
+        { type: 'event', conferenceAlias: 'alias' },
+      ]);
+    });
+  });
+
+  describe('unsubscribe()', () => {
+    it('should invoke unsubscribe method with correct arguments', () => {
+      NotificationService.unsubscribe([
+        { type: 'event', conferenceAlias: 'alias' },
+      ]);
+      expect(
+        CommsAPINotificationServiceModule.unsubscribe
+      ).toHaveBeenCalledWith([{ type: 'event', conferenceAlias: 'alias' }]);
+    });
+  });
+
   describe('invite()', () => {
     it('should invoke exported invite method with correct arguments', () => {
       NotificationService.invite(testConference, [{ info: {} }]);

src/services/notification/models.ts

@@ -0,0 +1,17 @@
+/** The SubscriptionType model gathers the subscription types.  */
+export enum SubscriptionType {
+  InvitationReceived = 'SUBSCRIPTION_TYPE_INVITATION_RECEIVED',
+  ActiveParticipants = 'SUBSCRIPTION_TYPE_ACTIVE_PARTICIPANTS',
+  ConferenceCreated = 'SUBSCRIPTION_TYPE_CONFERENCE_CREATED',
+  ConferenceEnded = 'SUBSCRIPTION_TYPE_CONFERENCE_ENDED',
+  ParticipantJoined = 'SUBSCRIPTION_TYPE_PARTICIPANT_JOINED',
+  ParticipantLeft = 'SUBSCRIPTION_TYPE_PARTICIPANT_LEFT',
+}
+
+/** The Subscription model is an interface for all subscription types. */
+export interface Subscription {
+  /** The subscription type. */
+  type: string;
+  /** The conference alias. */
+  conferenceAlias: string;
+}

src/setupTest.ts

@@ -48,6 +48,8 @@ jest.mock('react-native', () => {
     getParticipant: jest.fn(),
   };
   RN.NativeModules.CommsAPINotificationServiceModule = {
+    subscribe: jest.fn(),
+    unsubscribe: jest.fn(),
     invite: jest.fn(),
     decline: jest.fn(),
   };