Merge branch 'pr-62'

Author: hugeBlack

OpenParsec.xcodeproj/project.pbxproj

@@ -39,6 +39,8 @@
 		27E61AAA2929B92200FF6563 /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27E61AA92929B92200FF6563 /* MainView.swift */; };
 		27ED36FF292D4F9800B1BE3D /* NetworkHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27ED36FE292D4F9800B1BE3D /* NetworkHandler.swift */; };
 		84480EBE2ADC4FDA007DE5F1 /* GameController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84480EBD2ADC4FDA007DE5F1 /* GameController.swift */; };
+		E76224A12F8C017F00A2F86F /* ParsecBackgroundManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E76224A02F8C017700A2F86F /* ParsecBackgroundManager.swift */; };
+		E762250B2F8D0A0100A2F86F /* PictureInPictureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E762250A2F8D0A0000A2F86F /* PictureInPictureManager.swift */; };
 		FC16A7AD29A97BDA00BB70A7 /* Shared.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC16A7AC29A97BDA00BB70A7 /* Shared.swift */; };
 /* End PBXBuildFile section */
 
@@ -92,6 +94,8 @@
 		27E61AA92929B92200FF6563 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
 		27ED36FE292D4F9800B1BE3D /* NetworkHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkHandler.swift; sourceTree = "<group>"; };
 		84480EBD2ADC4FDA007DE5F1 /* GameController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameController.swift; sourceTree = "<group>"; };
+		E76224A02F8C017700A2F86F /* ParsecBackgroundManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParsecBackgroundManager.swift; sourceTree = "<group>"; };
+		E762250A2F8D0A0000A2F86F /* PictureInPictureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PictureInPictureManager.swift; sourceTree = "<group>"; };
 		FC16A7AC29A97BDA00BB70A7 /* Shared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shared.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -136,6 +140,8 @@
 		27E61A90292965FC00FF6563 /* OpenParsec */ = {
 			isa = PBXGroup;
 			children = (
+				E76224A02F8C017700A2F86F /* ParsecBackgroundManager.swift */,
+				E762250A2F8D0A0000A2F86F /* PictureInPictureManager.swift */,
 				17374D402CB8E35500EDCEE7 /* KeyCodeTranslators.swift */,
 				17840D1C2CB6394D0097374B /* ParsecUserData.swift */,
 				27E61AA7292994B500FF6563 /* ActivityIndicator.swift */,
@@ -283,6 +289,8 @@
 				84480EBE2ADC4FDA007DE5F1 /* GameController.swift in Sources */,
 				27AC751829EA339B00E8CAF7 /* URLImage.swift in Sources */,
 				27B23A242B1B98EF00B52F14 /* ParsecMetalViewController.swift in Sources */,
+				E76224A12F8C017F00A2F86F /* ParsecBackgroundManager.swift in Sources */,
+				E762250B2F8D0A0100A2F86F /* PictureInPictureManager.swift in Sources */,
 				27A923E029E8E53000F54BDA /* TouchHandlingView.swift in Sources */,
 				27E61A92292965FC00FF6563 /* AppDelegate.swift in Sources */,
 				27E61AAA2929B92200FF6563 /* MainView.swift in Sources */,

OpenParsec/Info.plist

@@ -58,6 +58,10 @@
 	</dict>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>

OpenParsec/MainView.swift

@@ -397,6 +397,14 @@ struct MainView: View
 		refreshHosts()
 		refreshSelf()
 		refreshFriends()
+
+		ParsecBackgroundManager.shared.onShouldReconnect = { peerId in			
+			if let host = hosts.first(where: { $0.id == peerId }) {
+				connectTo(host)
+			} else {
+				refreshHosts()
+			}
+		}
 	}
 
 	func refreshHosts()

OpenParsec/ParsecBackgroundManager.swift

@@ -0,0 +1,77 @@
+import UIKit
+import AVFoundation
+
+class ParsecBackgroundManager {
+	static let shared = ParsecBackgroundManager()
+
+	private(set) var hasActiveConnection = false
+	private var lastPeerId: String?
+	private var didDisconnectDueToBackground = false
+	private(set) var isReconnecting = false
+
+	var onShouldReconnect: ((String) -> Void)?
+	var onShouldDisconnect: (() -> Void)?
+
+	var isMarkedForReconnect: Bool {
+		return didDisconnectDueToBackground || isReconnecting
+	}
+
+	var isPiPActive: Bool {
+		if #available(iOS 15.0, *) {
+			return PictureInPictureManager.shared.isPiPActive
+		}
+		return false
+	}
+
+	private init() {
+	}
+
+	func connectionDidStart(peerId: String) {
+		hasActiveConnection = true
+		lastPeerId = peerId
+		didDisconnectDueToBackground = false
+		isReconnecting = false
+	}
+
+	func connectionDidEnd() {
+		hasActiveConnection = false
+	}
+
+	func sceneWillResignActive() {
+	}
+
+	func sceneDidBecomeActive() {
+		// Takes priority over isPiPActive check because stopPiP() is async
+		if didDisconnectDueToBackground, let peerId = lastPeerId {
+			didDisconnectDueToBackground = false
+			isReconnecting = true
+
+			DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
+				self?.onShouldReconnect?(peerId)
+			}
+		}
+	}
+
+	func sceneDidEnterBackground() {
+		if hasActiveConnection {
+			var pipAttempted = false
+			if #available(iOS 15.0, *) {
+				pipAttempted = isPiPActive || PictureInPictureManager.shared.isStarting
+			}
+			if !pipAttempted {
+				didDisconnectDueToBackground = true
+			}
+		}
+	}
+
+	func markForReconnect() {
+		guard lastPeerId != nil else { return }
+		didDisconnectDueToBackground = true
+	}
+
+	func disableAutoReconnect() {
+		didDisconnectDueToBackground = false
+		isReconnecting = false
+		lastPeerId = nil
+	}
+}

OpenParsec/ParsecGLKRenderer.swift

@@ -48,6 +48,15 @@ class ParsecGLKRenderer:NSObject, GLKViewDelegate, GLKViewControllerDelegate
 
 		CParsec.renderGLFrame(timeout: timeout)
 
+		if #available(iOS 15.0, *) {
+			PictureInPictureManager.shared.captureFrame(
+				viewWidth: GLsizei(view.drawableWidth),
+				viewHeight: GLsizei(view.drawableHeight),
+				streamWidth: GLsizei(CParsec.hostWidth),
+				streamHeight: GLsizei(CParsec.hostHeight)
+			)
+		}
+
 		updateImage()
 
 //		glFinish()

OpenParsec/ParsecGLKViewController.swift

@@ -67,8 +67,12 @@ class ParsecGLKViewController : ParsecPlayground {
 		self.glkViewController.didMove(toParent: self.viewController)
 	}
 
+	var eaglContext: EAGLContext? {
+		return glkView?.context
+	}
+
 	func cleanUp() {
-		
+
 	}
 
 	func updateSize(width: CGFloat, height: CGFloat) {

OpenParsec/ParsecSDKBridge.swift

@@ -113,15 +113,23 @@ class ParsecSDKBridge: ParsecService
 		parsecClientCfg.pngCursor = false
 
 		self.startBackgroundTask()
+		
+		let status = ParsecClientConnect(_parsec, &parsecClientCfg, NetworkHandler.clinfo?.session_id, peerID)
+		
+		if status == PARSEC_OK || status == PARSEC_CONNECTING {
+			ParsecBackgroundManager.shared.connectionDidStart(peerId: peerID)
+		}
 
-		return ParsecClientConnect(_parsec, &parsecClientCfg, NetworkHandler.clinfo?.session_id, peerID)
+		return status
 	}
 
 	func disconnect() {
 
 		audio_clear(&_audio)
 		ParsecClientDisconnect(_parsec)
 		backgroundTaskRunning = false
+		
+		ParsecBackgroundManager.shared.connectionDidEnd()
 	}
 
 	func getStatus() -> ParsecStatus {