Merge pull request #151 from thaliproject/cle_fixes

Cle fixes

Author: tobybrad

src/ios/MultipeerConnectivity/THEMultipeerClient.h

@@ -34,7 +34,8 @@
 
 // Service type here is what we're looking for, not what we may be advertising 
 // (although they'll usually be the same)
-- (id)initWithPeerId:(MCPeerID *)peerId 
+- (id)initWithPeerId:(MCPeerID *)peerId
+  withPeerIdentifier:(NSString *)peerIdentifier
      withServiceType:(NSString *)serviceType 
     withPeerNetworkingDelegate:(id<THEMultipeerSessionDelegate>)multipeerSessionDelegate;
 

src/ios/MultipeerConnectivity/THEMultipeerClient.m

@@ -38,6 +38,9 @@ @implementation THEMultipeerClient
   // sessions (MCSessions) with this id and never the remote one
   MCPeerID * _localPeerId;
 
+  // App-level peer identifier
+  NSString * _localPeerIdentifier;
+
   // The multipeer browser
   MCNearbyServiceBrowser * _nearbyServiceBrowser;
 
@@ -52,6 +55,7 @@ @implementation THEMultipeerClient
 }
 
 - (id)initWithPeerId:(MCPeerID *)peerId 
+                     withPeerIdentifier:(NSString *)peerIdentifier
                         withServiceType:(NSString *)serviceType 
              withPeerNetworkingDelegate:(id<THEMultipeerSessionDelegate>)multipeerSessionDelegate
 {
@@ -65,6 +69,7 @@ - (id)initWithPeerId:(MCPeerID *)peerId
 
   _localPeerId = peerId;
   _serviceType = serviceType;
+  _localPeerIdentifier = peerIdentifier;
 
   _multipeerSessionDelegate = multipeerSessionDelegate;
 
@@ -108,20 +113,21 @@ - (BOOL)connectToPeerWithPeerIdentifier:(NSString *)peerIdentifier
       if (![clientSession visible])
       {
         success = NO;
+        NSLog(@"client: connect: unreachable %@", peerIdentifier);
         connectCallback(@"Peer unreachable", 0);
       }
       else
       {
         // Start connection process from the top
         if ([clientSession connectionState] == THEPeerSessionStateNotConnected)
         {
-
           // connect will create the networking resources required to establish the session
           [clientSession connectWithConnectCallback:(ConnectCallback)connectCallback];
 
           [_nearbyServiceBrowser invitePeer:[clientSession remotePeerID]
                                   toSession:[clientSession session]
-                                withContext:[peerIdentifier dataUsingEncoding:NSUTF8StringEncoding]
+                                withContext:
+                                  [_localPeerIdentifier dataUsingEncoding:NSUTF8StringEncoding]
                                     timeout:30];
 
           success = YES;
@@ -140,7 +146,7 @@ - (BOOL)connectToPeerWithPeerIdentifier:(NSString *)peerIdentifier
 
   if (!clientSession)
   {
-    NSLog(@"Unknown peer %@", peerIdentifier);
+    NSLog(@"client: unknown peer %@", peerIdentifier);
     connectCallback(@"Unknown peer", 0);
   }
 
@@ -253,6 +259,7 @@ - (void)browser:(MCNearbyServiceBrowser *)browser
 
     clientSession = (THEMultipeerClientSession *)p;
     assert([[clientSession remotePeerID] hash] == [peerID hash]);
+    NSLog(@"client: lost peer: %@", [clientSession remotePeerIdentifier]);
 
     previouslyVisible = clientSession.visible;
 

src/ios/MultipeerConnectivity/THEMultipeerClientSession.m

@@ -29,6 +29,10 @@
 #import "THEMultipeerClientSession.h"
 #import "THEMultipeerClientSocketRelay.h"
 
+#include "jx.h"
+#import "JXcore.h"
+#import "THEThreading.h"
+
 @implementation THEMultipeerClientSession
 {
   // Callback to fire when a connection completes (in fact when the relay
@@ -74,6 +78,7 @@ - (void)disconnect
     {
       if (prevState == THEPeerSessionStateConnecting)
       {
+        NSLog(@"client session: disconnected: %@", [self remotePeerIdentifier]);
         _connectCallback(@"Peer disconnected", 0);
       }
       _connectCallback = nil;
@@ -120,4 +125,34 @@ - (void)didNotListenWithErrorMessage:(NSString *)errorMsg
   }
 }
 
+- (void)didDisconnectFromPeer:(NSString *)peerIdentifier
+{
+  NSString * const kPeerConnectionError   = @"connectionError";
+  NSString * const kEventValueStringPeerId = @"peerIdentifier";
+
+  // Socket disconnecting currently requires we tear down the entire p2p conection
+  NSLog(@"client session: disconnecting due to socket close: %@", [self remotePeerIdentifier]);
+  [self disconnect];
+
+  NSDictionary *connectionError = @{
+    kEventValueStringPeerId : peerIdentifier
+  };
+
+  NSError *error = nil;
+  NSData *jsonData = [NSJSONSerialization dataWithJSONObject:connectionError
+                                                      options:NSJSONWritingPrettyPrinted 
+                                                        error:&error];
+  if (error != nil) {
+    // Will never happen in practice
+    NSLog(@"WARNING: Could not generate jsonString for disconnect message");
+    return;
+  }
+
+  NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+
+  OnMainThread(^{
+    [JXcore callEventCallback:kPeerConnectionError withJSON:jsonString];
+  });
+}
+
 @end

src/ios/MultipeerConnectivity/THEMultipeerClientSocketRelay.h

@@ -12,4 +12,6 @@
 - (instancetype)initWithPeerIdentifier:(NSString *)peerIdentifier 
                           withDelegate:(id<THEMultipeerClientSocketRelayDelegate>)delegate;
 
+- (void)socketDidDisconnect:(GCDAsyncSocket *)sock withError:(NSError *)err;
+
 @end

src/ios/MultipeerConnectivity/THEMultipeerClientSocketRelay.m

@@ -74,4 +74,12 @@ -(void)socket:(GCDAsyncSocket *)sock didAcceptNewSocket:(GCDAsyncSocket *)accept
   [self didCreateSocket: acceptedSocket];
 }
 
+- (void)socketDidDisconnect:(GCDAsyncSocket *)sock withError:(NSError *)err
+{
+  // The upper layer has closed the client socket
+  NSLog(@"client: socket closed");
+  [super socketDidDisconnect:sock withError:err];
+  [_delegate didDisconnectFromPeer:_peerIdentifier];
+}
+
 @end

src/ios/MultipeerConnectivity/THEMultipeerClientSocketRelayDelegate.h

@@ -25,8 +25,7 @@
 //  THEMultipeerClientSocketRelayDelegate.m
 //
 
-// Protocol implemented by classes wishing to know which port the client relay
-// is listening on
+// Protocol implemented by classes wishing to know about socket related events
 @protocol THEMultipeerClientSocketRelayDelegate <NSObject>
 
 // Called when the client relay succesfully established it's listening port
@@ -35,4 +34,8 @@
 // Called when the client relay fails to listen
 - (void)didNotListenWithErrorMessage:(NSString *)errorMsg 
                   withPeerIdentifier:(NSString*)peerIdentifier;
+
+// Called when the socket is disconnected (usually by the app)
+- (void)didDisconnectFromPeer:(NSString *)peerIdentifier;
+
 @end

src/ios/MultipeerConnectivity/THEMultipeerPeerSession.m

@@ -118,7 +118,6 @@ -(void)connect
     _session = [[MCSession alloc] initWithPeer:_localPeerID 
                               securityIdentity:nil 
                           encryptionPreference:MCEncryptionNone];
-    NSLog(@"Created session: %p", _session);
     _session.delegate = self;
   }
 }
@@ -139,8 +138,6 @@ -(void)disconnect
 
     if (_session != nil)
     {
-      NSLog(@"Destroying session: %p", _session);
-      NSLog(@"%@",[NSThread callStackSymbols]);
       _session.delegate = nil;
       [_session disconnect];
       _session = nil;

src/ios/MultipeerConnectivity/THEMultipeerServer.m

@@ -134,6 +134,7 @@ - (void)advertiser:(MCNearbyServiceAdvertiser *)advertiser
       assert([[serverSession remotePeerIdentifier] isEqualToString:peerIdentifier]);
 
       // Disconnect any existing session, see note below
+      NSLog(@"server: disconnecting to refresh session (%@)", peerIdentifier);
       [serverSession disconnect];
     }
     else
@@ -154,6 +155,7 @@ - (void)advertiser:(MCNearbyServiceAdvertiser *)advertiser
     return serverSession;
   }];
 
+  NSLog(@"server: accepting invitation %@", peerIdentifier);
   invitationHandler(YES, [_serverSession session]);
 }
 

src/ios/MultipeerConnectivity/THEMultipeerSession.m

@@ -94,8 +94,10 @@ - (void)start
   ];
 
   _client = [[THEMultipeerClient alloc] 
-    initWithPeerId: _peerID withServiceType: _serviceType withPeerNetworkingDelegate: _delegate
-  ];
+              initWithPeerId:_peerID 
+          withPeerIdentifier:_peerIdentifier 
+             withServiceType:_serviceType 
+  withPeerNetworkingDelegate:_delegate];
 
   [_server start];
   [_client start];