Add room sid to various room-related events (#162)

* Add room sid to various room-related events Fixes #137 * Fix circle.yml * Start migrating circle.yml * One step closer

Author: slycoder

android/src/main/java/com/twiliorn/library/CustomTwilioVideoView.java

@@ -585,7 +585,8 @@ private Room.Listener roomListener() {
  public void onConnected(Room room) {
  localParticipant = room.getLocalParticipant();
  WritableMap event = new WritableNativeMap();
- event.putString("room", room.getName());
+ event.putString("roomName", room.getName());
+ event.putString("roomSid", room.getSid());
  List<RemoteParticipant> participants = room.getRemoteParticipants();
 
  WritableArray participantsArray = new WritableNativeArray();
@@ -597,20 +598,24 @@ public void onConnected(Room room) {
  pushEvent(CustomTwilioVideoView.this, ON_CONNECTED, event);
 
  for (RemoteParticipant participant : participants) {
- addParticipant(participant);
+ addParticipant(room, participant);
  }
  }
 
  @Override
  public void onConnectFailure(Room room, TwilioException e) {
  WritableMap event = new WritableNativeMap();
+ event.putString("roomName", room.getName());
+ event.putString("roomSid", room.getSid());
  event.putString("reason", e.getExplanation());
  pushEvent(CustomTwilioVideoView.this, ON_CONNECT_FAILURE, event);
  }
 
  @Override
  public void onDisconnected(Room room, TwilioException e) {
  WritableMap event = new WritableNativeMap();
+ event.putString("roomName", room.getName());
+ event.putString("roomSid", room.getSid());
  event.putString("participant", localParticipant.getIdentity());
  pushEvent(CustomTwilioVideoView.this, ON_DISCONNECTED, event);
 
@@ -628,12 +633,12 @@ public void onDisconnected(Room room, TwilioException e) {
 
  @Override
  public void onParticipantConnected(Room room, RemoteParticipant participant) {
- addParticipant(participant);
+ addParticipant(room, participant);
  }
 
  @Override
  public void onParticipantDisconnected(Room room, RemoteParticipant participant) {
- removeParticipant(participant);
+ removeParticipant(room, participant);
  }
 
  @Override
@@ -649,10 +654,12 @@ public void onRecordingStopped(Room room) {
  /*
  * Called when participant joins the room
  */
- private void addParticipant(RemoteParticipant participant) {
+ private void addParticipant(Room room, RemoteParticipant participant) {
  Log.i("CustomTwilioVideoView", "ADD PARTICIPANT ");
 
  WritableMap event = new WritableNativeMap();
+ event.putString("roomName", room.getName());
+ event.putString("roomSid", room.getSid());
  event.putMap("participant", buildParticipant(participant));
 
  pushEvent(this, ON_PARTICIPANT_CONNECTED, event);
@@ -675,8 +682,10 @@ private void addParticipant(RemoteParticipant participant) {
  /*
  * Called when participant leaves the room
  */
- private void removeParticipant(RemoteParticipant participant) {
+ private void removeParticipant(Room room, RemoteParticipant participant) {
  WritableMap event = new WritableNativeMap();
+ event.putString("roomName", room.getName());
+ event.putString("roomSid", room.getSid());
  event.putMap("participant", buildParticipant(participant));
  pushEvent(this, ON_PARTICIPANT_DISCONNECTED, event);
  //something about this breaking.

circle.yml

@@ -1,23 +1,43 @@
-machine:
- node:
- version: 7.8.0
- environment:
- PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
+attach_workspace: &attach_workspace
+ attach_workspace:
+ at: ~/react-native-twilio-video-webrtc
 
-dependencies:
- pre:
- - rm -rf ~/.yarn
- - npm i -g yarn
- - yarn -v
- override:
- - yarn
- cache_directories:
- - ~/.cache/yarn
-
-test:
- override:
- - yarn run ci
-
-test:
- override:
- - yarn run ci
+docker_defaults: &docker_defaults
+ docker:
+ - image: circleci/python:3.6.4-stretch-node-browsers
+ working_directory: ~/react-native-twilio-video-webrtc
+ 
+jobs:
+ build:
+ <<: *docker_defaults
+ steps:
+ - checkout
+ - restore_cache:
+ name: Restore node_modules cache
+ keys:
+ - v1-npm-deps-{{ checksum "yarn.lock" }}
+ - run:
+ name: Node Dependencies
+ command: yarn install
+ - save_cache:
+ name: Save node_modules cache
+ key: v1-npm-deps-{{ checksum "yarn.lock" }}
+ paths:
+ - node_modules
+ - ~/.cache/yarn
+ - persist_to_workspace:
+ root: ~/react-native-twilio-video-webrtc
+ paths:
+ - node_modules
+ test:
+ machine:
+ node:
+ version: 7.8.0
+ environment:
+ PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
+ steps:
+ - checkout
+ - *attach_workspace
+ - run:
+ name: Run tests
+ command: yarn run ci

ios/RCTTWVideoModule.m

@@ -352,13 +352,13 @@ - (void)didConnectToRoom:(TVIRoom *)room {
  TVILocalParticipant *localParticipant = room.localParticipant;
  [participants addObject:[localParticipant toJSON]];
 
- [self sendEventWithName:roomDidConnect body:@{ @"roomName" : room.name , @"participants" : participants }];
+ [self sendEventWithName:roomDidConnect body:@{ @"roomName" : room.name , @"roomSid": room.sid, @"participants" : participants }];
 }
 
 - (void)room:(TVIRoom *)room didDisconnectWithError:(nullable NSError *)error {
  self.room = nil;
 
- NSMutableDictionary *body = [@{ @"roomName": room.name } mutableCopy];
+ NSMutableDictionary *body = [@{ @"roomName": room.name, @"roomSid": room.sid } mutableCopy];
 
  if (error) {
  [body addEntriesFromDictionary:@{ @"error" : error.localizedDescription }];
@@ -370,7 +370,7 @@ - (void)room:(TVIRoom *)room didDisconnectWithError:(nullable NSError *)error {
 - (void)room:(TVIRoom *)room didFailToConnectWithError:(nonnull NSError *)error{
  self.room = nil;
 
- NSMutableDictionary *body = [@{ @"roomName": room.name } mutableCopy];
+ NSMutableDictionary *body = [@{ @"roomName": room.name, @"roomSid": room.sid } mutableCopy];
 
  if (error) {
  [body addEntriesFromDictionary:@{ @"error" : error.localizedDescription }];
@@ -383,11 +383,11 @@ - (void)room:(TVIRoom *)room didFailToConnectWithError:(nonnull NSError *)error{
 - (void)room:(TVIRoom *)room participantDidConnect:(TVIRemoteParticipant *)participant {
  participant.delegate = self;
 
- [self sendEventWithName:roomParticipantDidConnect body:@{ @"roomName": room.name, @"participant": [participant toJSON] }];
+ [self sendEventWithName:roomParticipantDidConnect body:@{ @"roomName": room.name, @"roomSid": room.sid, @"participant": [participant toJSON] }];
 }
 
 - (void)room:(TVIRoom *)room participantDidDisconnect:(TVIRemoteParticipant *)participant {
- [self sendEventWithName:roomParticipantDidDisconnect body:@{ @"roomName": room.name, @"participant": [participant toJSON] }];
+ [self sendEventWithName:roomParticipantDidDisconnect body:@{ @"roomName": room.name, @"roomSid": room.sid, @"participant": [participant toJSON] }];
 }
 
 # pragma mark - TVIRemoteParticipantDelegate