Merge pull request #88 from MetaMask/update-analytics

Update analytics

Author: elefantel

Sources/metamask-ios-sdk/Classes/Analytics/Event.swift

@@ -4,6 +4,7 @@
 
 public enum Event: String {
     case connectionRequest = "sdk_connect_request_started"
+    case reconnectionRequest = "sdk_reconnect_request_started"
     case connected = "sdk_connection_established"
     case connectionAuthorised = "sdk_connection_authorized"
     case connectionRejected = "sdk_connection_rejected"

Sources/metamask-ios-sdk/Classes/Communication/SocketClient.swift

@@ -71,6 +71,7 @@ class SocketClient: CommunicationClient {
     }
 
     var isConnected: Bool = false
+    private var isReconnection = false
     var tearDownConnection: (() -> Void)?
     var onClientsTerminated: (() -> Void)?
 
@@ -111,7 +112,11 @@ class SocketClient: CommunicationClient {
         guard !channel.isConnected else { return }
 
         setupClient()
-        trackEvent(.connectionRequest)
+        if isReconnection {
+            trackEvent(.reconnectionRequest)
+        } else {
+            trackEvent(.connectionRequest)
+        }
         channel.connect()
     }
 
@@ -129,6 +134,7 @@ class SocketClient: CommunicationClient {
     private func configureSession() {
         if let config = fetchSessionConfig(), config.isValid {
             channelId = config.sessionId
+            isReconnection = true
         } else {
             // purge any existing session info
             store.deleteData(for: SESSION_KEY)
@@ -185,12 +191,9 @@ private extension SocketClient {
 
         // MARK: Clients connected event
 
-        channel.on(ClientEvent.clientsConnected(on: channelId)) { [weak self] data in
-            guard let self = self else { return }
+        channel.on(ClientEvent.clientsConnected(on: channelId)) { data in
             Logging.log("Clients connected: \(data)")
 
-            self.trackEvent(.connected)
-
             // for debug purposes only
             NotificationCenter.default.post(
                 name: NSNotification.Name("connection"),
@@ -303,7 +306,10 @@ private extension SocketClient {
         guard
             let keyExchangeMessage = Message<KeyExchangeMessage>.message(from: message),
             let nextKeyExchangeMessage = keyExchange.nextMessage(keyExchangeMessage.message)
-        else { return }
+        else {
+            trackEvent(.connected)
+            return
+        }
 
         sendMessage(nextKeyExchangeMessage, encrypt: false)
 
@@ -470,6 +476,7 @@ extension SocketClient {
         switch event {
         case .connected,
                 .disconnected,
+                .reconnectionRequest,
                 .connectionAuthorised,
                 .connectionRejected:
             break

Sources/metamask-ios-sdk/Classes/Ethereum/Ethereum.swift

@@ -87,7 +87,10 @@ public extension Ethereum {
     }
 
     func terminateConnection() {
-        delegate?.trackEvent(.connectionRejected)
+        if connected {
+            delegate?.trackEvent(.connectionRejected)
+        }
+        
         let error = RequestError(from: ["message": "The connection request has been rejected"])
         submittedRequests.forEach { key, value in
             submittedRequests[key]?.error(error)