Handle reconnection

ndPPPhz · ndPPPhz · commit 34bd482d5157 · 2021-04-19T00:39:50.000+01:00
diff --git a/PlaneTalk/ChatViewController.swift b/PlaneTalk/ChatViewController.swift
@@ -13,7 +13,7 @@ final class ChatViewController: UIViewController {
 		static let navigatioBarBackgroundColor = UIColor(white: 0.96, alpha: 1)
 		static let keyboardGap: CGFloat = 38
 		static let viewBackgroundColor = UIColor(r: 246, g: 245, b: 246)
-		static let cornerRadiusRatio: CGFloat = 0.08
+		static let cornerRadiusRatio: CGFloat = 0.02
 	}
 
 	@IBOutlet private var tableView: UIChatTableView!
@@ -157,6 +157,11 @@ final class ChatViewController: UIViewController {
 		view.backgroundColor = Constant.viewBackgroundColor
 		navigationController?.navigationBar.backgroundColor = Constant.navigatioBarBackgroundColor
 
+		setupOverlay(title: "Welcome to PlaneTalk")
+		showOverlay()
+	}
+
+	private func setupOverlay(title: String) {
 		let searchButtonViewData = ConnectView.ViewData.ButtonViewData(
 			title: "Search server",
 			color: .white,
@@ -179,12 +184,20 @@ final class ChatViewController: UIViewController {
 
 		connectView.configure(
 			with: .init(
+				title: title,
 				searchButtonViewData: searchButtonViewData,
 				serverButtonViewData: serverButtonViewData
 			)
 		)
 	}
 
+	private func showOverlay() {
+		overlayView.alpha = 1
+		connectViewContainerView.alpha = 1
+		overlayView.isHidden = false
+		connectViewContainerView.isHidden = false
+	}
+
 	private func hideOverlay() {
 		UIView.animate(withDuration: 0.35, animations: {
 			self.overlayView.alpha = 0
@@ -224,6 +237,13 @@ extension ChatViewController: UITableViewDelegate, UITableViewDataSource {
 }
 
 extension ChatViewController: ChatViewModelDelegate {
+	func clientDidLeave() {
+		showOverlay()
+
+		setupOverlay(title: "You disconnected")
+		viewModel?.enableCommunication()
+	}
+
 	func didFindServer() {
 		connectView.showActivityIndicator(false)
 		hideOverlay()
diff --git a/PlaneTalk/ChatViewModel.swift b/PlaneTalk/ChatViewModel.swift
@@ -22,6 +22,7 @@ protocol MessagePresenter: AnyObject {
 
 protocol ChatViewModelDelegate: AnyObject {
 	func didFindServer()
+	func clientDidLeave()
 }
 
 final class ChatViewModel: ChatViewModelInterface {
@@ -71,6 +72,10 @@ extension ChatViewModel: ManagerDelegate {
 	func managerDidFindServer(_ serverIP: String) {
 		delegate?.didFindServer()
 	}
+
+	func clientDidLeave() {
+		delegate?.clientDidLeave()
+	}
 }
 
 // MARK: - ServerCommunicationDelegate
diff --git a/PlaneTalk/Communication/CommunicationManager.swift b/PlaneTalk/Communication/CommunicationManager.swift
@@ -21,6 +21,7 @@ protocol ManagerInterface {
 
 protocol ManagerDelegate: AnyObject {
 	func managerDidFindServer(_ serverIP: String)
+	func clientDidLeave()
 }
 
 final class CommunicationManager: ManagerInterface {
@@ -137,6 +138,11 @@ extension CommunicationManager: BroadcastMessagingDelegate {
 		}
 	}
 
+	func deviceDidCloseBroadcastSocket() {
+		broadcastManager?.closeUDPSockets()
+		broadcastManager = nil
+	}
+
 	// Server has received a client message
 	private func serverHasReceivedBroadcastText(_ text: String, serverIP: String, senderIP: String) {
 		guard let broadcastMessagesInterpreter = broadcastMessagesInterpreter else {
@@ -168,7 +174,7 @@ extension CommunicationManager: BroadcastMessagingDelegate {
 			let broadcastMessageType = type(of: broadcastMessagesInterpreter).isValidBroadcastText(text),
 			broadcastMessageType == .serverResponse
 		else {
-			print("Server has received an unknown message \(text) from: \(senderIP)")
+			print("Client has received an unknown message \(text) from: \(senderIP)")
 			return
 		}
 
@@ -187,17 +193,12 @@ extension CommunicationManager: BroadcastMessagingDelegate {
 // MARK: - ClientCommunicationDelegate
 extension CommunicationManager: ClientConnectionDelegate {
 	func clientDidLoseConnectionWithServer() {
+		clientCommunicationManager?.closeCommunication()
 		clientCommunicationManager = nil
 		broadcastManager = nil
 		serverIP = nil
 		currentDevice = nil
-		
-		do {
-			print("Retrying start communication")
-			try enableCommunication()
-		} catch {
-			print("Unable to re-establish a connection. Error: \(error.localizedDescription)")
-		}
+		delegate?.clientDidLeave()
 	}
 }
 
diff --git a/PlaneTalk/Communication/TransmissionManager/BroadcastManager.swift b/PlaneTalk/Communication/TransmissionManager/BroadcastManager.swift
@@ -109,6 +109,7 @@ final class BroadcastManager: BroadcastInterface {
 					for i in 0..<status {
 						if (events[Int(i)].flags & UInt16(EV_EOF)) == EV_EOF {
 							print("The socket (\(_self.udp_reception_message_socket)) has been closed.")
+							_self.broadcastMessagingDelegate?.deviceDidCloseBroadcastSocket()
 							return
 						}
 
@@ -139,7 +140,7 @@ final class BroadcastManager: BroadcastInterface {
 					}
 				} else {
 					print("Kqueue error: \(String(cString: strerror(errno)))")
-					break
+					return
 				}
 			}
 		}
diff --git a/PlaneTalk/Communication/TransmissionManager/ClientCommunicationManager.swift b/PlaneTalk/Communication/TransmissionManager/ClientCommunicationManager.swift
@@ -126,7 +126,7 @@ final class ClientCommunicationManager: ClientCommunicationInterface {
 						print("Kevent error")
 					}
 
-					print("Server disconnected. Starting a new search again ...")
+					print("Connection lost ...")
 					propagationQueue.async { [weak self] in
 						self?.clientConnectionDelegate?.clientDidLoseConnectionWithServer()
 					}
@@ -136,9 +136,8 @@ final class ClientCommunicationManager: ClientCommunicationInterface {
 				}
 			}
 		default:
-			print("Error reading kevent")
-			close(socketKQueue)
-			exit(EXIT_FAILURE)
+			print("Kqueue error: \(String(cString: strerror(errno)))")
+			return
 		}
 	}
 
diff --git a/PlaneTalk/Model/Delegate/BroadcastMessagingDelegate.swift b/PlaneTalk/Model/Delegate/BroadcastMessagingDelegate.swift
@@ -10,4 +10,5 @@ import Foundation
 
 protocol BroadcastMessagingDelegate: AnyObject {
 	func deviceDidReceiveBroadcastMessage(_ text: String, from sender: String)
+	func deviceDidCloseBroadcastSocket()
 }
diff --git a/PlaneTalk/Supporting Files/Base.lproj/Main.storyboard b/PlaneTalk/Supporting Files/Base.lproj/Main.storyboard
@@ -36,10 +36,10 @@
                                 <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lnw-Yw-Iod">
-                                <rect key="frame" x="62" y="308.5" width="290" height="282"/>
+                                <rect key="frame" x="62" y="304.5" width="290" height="290"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" secondItem="lnw-Yw-Iod" secondAttribute="height" multiplier="35:34" id="YJc-zj-7pd"/>
+                                    <constraint firstAttribute="width" secondItem="lnw-Yw-Iod" secondAttribute="height" multiplier="34:34" id="YJc-zj-7pd"/>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" placeholderIntrinsicWidth="414" placeholderIntrinsicHeight="50" translatesAutoresizingMaskIntoConstraints="NO" id="TvX-CB-EWj">
diff --git a/PlaneTalk/UI/ConnectView.swift b/PlaneTalk/UI/ConnectView.swift
@@ -25,10 +25,12 @@ final class ConnectView: UIView, ViewDataConfigurable, NibLoadable {
 			var tapHanlder: (() -> Void)?
 		}
 
+		var title: String
 		var searchButtonViewData: ButtonViewData
 		var serverButtonViewData: ButtonViewData
 	}
 
+	@IBOutlet private var mainLabel: UILabel!
 	@IBOutlet private var searchServerButton: UIButton!
 	@IBOutlet private var activityIndicator: UIActivityIndicatorView!
 	@IBOutlet private var becomeServerButton: UIButton!
@@ -50,6 +52,8 @@ final class ConnectView: UIView, ViewDataConfigurable, NibLoadable {
 		becomeServerButton.setTitleColor(serverButtonViewData.color, for: .normal)
 		becomeServerButton.addTarget(self, action: #selector(didTapServerButton), for: .primaryActionTriggered)
 		serverActionHandler = serverButtonViewData.tapHanlder
+
+		mainLabel.text = viewData.title
 	}
 
 	override func layoutSubviews() {
diff --git a/PlaneTalk/UI/ConnectView.xib b/PlaneTalk/UI/ConnectView.xib
@@ -14,33 +14,33 @@
             <rect key="frame" x="0.0" y="0.0" width="257" height="247"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Welcome to PlaneTalk" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LbD-R8-DIk">
-                    <rect key="frame" x="54" y="12" width="149" height="18"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Welcome to PlaneTalk" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LbD-R8-DIk">
+                    <rect key="frame" x="52.5" y="18" width="152.5" height="18"/>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NVo-YW-7py">
-                    <rect key="frame" x="25.5" y="193" width="206" height="36"/>
+                    <rect key="frame" x="18" y="193" width="221" height="36"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="36" id="SxT-0i-Ude"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                     <state key="normal" title="Become server"/>
                 </button>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="C0S-Q9-Vb0">
-                    <rect key="frame" x="25.5" y="145" width="206" height="36"/>
+                    <rect key="frame" x="18" y="139" width="221" height="36"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="36" id="ABl-Zo-9Bp"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                     <state key="normal" title="Search Server"/>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zT4-Rl-rXR">
-                    <rect key="frame" x="118.5" y="36" width="20" height="103"/>
+                    <rect key="frame" x="118.5" y="42" width="20" height="91"/>
                     <subviews>
                         <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="GgV-Yg-heg">
-                            <rect key="frame" x="0.0" y="41.5" width="20" height="20"/>
+                            <rect key="frame" x="0.0" y="35.5" width="20" height="20"/>
                         </activityIndicatorView>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -53,14 +53,17 @@
             </subviews>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
+                <constraint firstItem="NVo-YW-7py" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="18" id="4pO-25-39X"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="LbD-R8-DIk" secondAttribute="trailing" constant="18" id="7wz-QA-Kdv"/>
                 <constraint firstAttribute="bottom" secondItem="NVo-YW-7py" secondAttribute="bottom" constant="18" id="K6U-HY-VwC"/>
-                <constraint firstItem="LbD-R8-DIk" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="12" id="RDk-CQ-vbB"/>
+                <constraint firstAttribute="trailing" secondItem="NVo-YW-7py" secondAttribute="trailing" constant="18" id="KWL-WC-XOV"/>
+                <constraint firstItem="LbD-R8-DIk" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="18" id="RDk-CQ-vbB"/>
                 <constraint firstItem="NVo-YW-7py" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="VPR-ef-Ka7"/>
                 <constraint firstItem="zT4-Rl-rXR" firstAttribute="top" secondItem="LbD-R8-DIk" secondAttribute="bottom" constant="6" id="Vn5-SN-GeA"/>
-                <constraint firstItem="NVo-YW-7py" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" multiplier="0.8" id="WVp-4L-bTI"/>
                 <constraint firstItem="LbD-R8-DIk" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="cMn-Ru-Ra4"/>
                 <constraint firstItem="C0S-Q9-Vb0" firstAttribute="centerX" secondItem="NVo-YW-7py" secondAttribute="centerX" id="sPy-Sn-krz"/>
-                <constraint firstItem="NVo-YW-7py" firstAttribute="top" secondItem="C0S-Q9-Vb0" secondAttribute="bottom" constant="12" id="u2E-MZ-jdc"/>
+                <constraint firstItem="LbD-R8-DIk" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="leading" constant="18" id="sif-jD-MCB"/>
+                <constraint firstItem="NVo-YW-7py" firstAttribute="top" secondItem="C0S-Q9-Vb0" secondAttribute="bottom" constant="18" id="u2E-MZ-jdc"/>
                 <constraint firstItem="zT4-Rl-rXR" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="w4h-fx-jU6"/>
                 <constraint firstItem="C0S-Q9-Vb0" firstAttribute="width" secondItem="NVo-YW-7py" secondAttribute="width" id="xFs-7r-Zam"/>
                 <constraint firstItem="C0S-Q9-Vb0" firstAttribute="top" secondItem="zT4-Rl-rXR" secondAttribute="bottom" constant="6" id="xJN-5q-bPG"/>
@@ -71,6 +74,7 @@
             <connections>
                 <outlet property="activityIndicator" destination="GgV-Yg-heg" id="FYL-tW-Kks"/>
                 <outlet property="becomeServerButton" destination="NVo-YW-7py" id="PyB-M1-md5"/>
+                <outlet property="mainLabel" destination="LbD-R8-DIk" id="1eE-qb-VRw"/>
                 <outlet property="searchServerButton" destination="C0S-Q9-Vb0" id="hpe-SX-kPX"/>
             </connections>
             <point key="canvasLocation" x="-55.797101449275367" y="-129.57589285714286"/>

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ protocol MessagePresenter: AnyObject {`
`22`	`22`
`23`	`23`	`protocol ChatViewModelDelegate: AnyObject {`
`24`	`24`	`func didFindServer()`
	`25`	`+ func clientDidLeave()`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`final class ChatViewModel: ChatViewModelInterface {`
`@@ -71,6 +72,10 @@ extension ChatViewModel: ManagerDelegate {`
`71`	`72`	`func managerDidFindServer(_ serverIP: String) {`
`72`	`73`	`delegate?.didFindServer()`
`73`	`74`	`}`
	`75`	`+`
	`76`	`+ func clientDidLeave() {`
	`77`	`+ delegate?.clientDidLeave()`
	`78`	`+ }`
`74`	`79`	`}`
`75`	`80`
`76`	`81`	`// MARK: - ServerCommunicationDelegate`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ final class BroadcastManager: BroadcastInterface {`
`109`	`109`	`for i in 0..<status {`
`110`	`110`	`if (events[Int(i)].flags & UInt16(EV_EOF)) == EV_EOF {`
`111`	`111`	`print("The socket (\(_self.udp_reception_message_socket)) has been closed.")`
	`112`	`+ _self.broadcastMessagingDelegate?.deviceDidCloseBroadcastSocket()`
`112`	`113`	`return`
`113`	`114`	`}`
`114`	`115`
`@@ -139,7 +140,7 @@ final class BroadcastManager: BroadcastInterface {`
`139`	`140`	`}`
`140`	`141`	`} else {`
`141`	`142`	`print("Kqueue error: \(String(cString: strerror(errno)))")`
`142`		`- break`
	`143`	`+ return`
`143`	`144`	`}`
`144`	`145`	`}`
`145`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ final class ClientCommunicationManager: ClientCommunicationInterface {`
`126`	`126`	`print("Kevent error")`
`127`	`127`	`}`
`128`	`128`
`129`		`- print("Server disconnected. Starting a new search again ...")`
	`129`	`+ print("Connection lost ...")`
`130`	`130`	`propagationQueue.async { [weak self] in`
`131`	`131`	`self?.clientConnectionDelegate?.clientDidLoseConnectionWithServer()`
`132`	`132`	`}`
`@@ -136,9 +136,8 @@ final class ClientCommunicationManager: ClientCommunicationInterface {`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`default:`
`139`		`- print("Error reading kevent")`
`140`		`- close(socketKQueue)`
`141`		`- exit(EXIT_FAILURE)`
	`139`	`+ print("Kqueue error: \(String(cString: strerror(errno)))")`
	`140`	`+ return`
`142`	`141`	`}`
`143`	`142`	`}`
`144`	`143`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,5 @@ import Foundation`
`10`	`10`
`11`	`11`	`protocol BroadcastMessagingDelegate: AnyObject {`
`12`	`12`	`func deviceDidReceiveBroadcastMessage(_ text: String, from sender: String)`
	`13`	`+ func deviceDidCloseBroadcastSocket()`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,12 @@ final class ConnectView: UIView, ViewDataConfigurable, NibLoadable {`
`25`	`25`	`var tapHanlder: (() -> Void)?`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ var title: String`
`28`	`29`	`var searchButtonViewData: ButtonViewData`
`29`	`30`	`var serverButtonViewData: ButtonViewData`
`30`	`31`	`}`
`31`	`32`
	`33`	`+ @IBOutlet private var mainLabel: UILabel!`
`32`	`34`	`@IBOutlet private var searchServerButton: UIButton!`
`33`	`35`	`@IBOutlet private var activityIndicator: UIActivityIndicatorView!`
`34`	`36`	`@IBOutlet private var becomeServerButton: UIButton!`
`@@ -50,6 +52,8 @@ final class ConnectView: UIView, ViewDataConfigurable, NibLoadable {`
`50`	`52`	`becomeServerButton.setTitleColor(serverButtonViewData.color, for: .normal)`
`51`	`53`	`becomeServerButton.addTarget(self, action: #selector(didTapServerButton), for: .primaryActionTriggered)`
`52`	`54`	`serverActionHandler = serverButtonViewData.tapHanlder`
	`55`	`+`
	`56`	`+ mainLabel.text = viewData.title`
`53`	`57`	`}`
`54`	`58`
`55`	`59`	`override func layoutSubviews() {`