fix: improve iOS stream diagnostics

DjDeveloperr · DjDeveloperr · commit b8baa8f3d6a3 · 2026-05-18T00:48:27.000-04:00
diff --git a/ios/SimDeckStudio.xcodeproj/project.pbxproj b/ios/SimDeckStudio.xcodeproj/project.pbxproj
@@ -363,7 +363,7 @@
 					ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 					CODE_SIGN_ENTITLEMENTS = SimDeckStudio/SimDeckStudio.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202605172332;
+				CURRENT_PROJECT_VERSION = 202605180047;
 				DEVELOPMENT_ASSET_PATHS = "";
 					DEVELOPMENT_TEAM = CS838V553Y;
 				ENABLE_PREVIEWS = YES;
@@ -392,7 +392,7 @@
 					ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 					CODE_SIGN_ENTITLEMENTS = SimDeckStudio/SimDeckStudio.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202605172332;
+				CURRENT_PROJECT_VERSION = 202605180047;
 				DEVELOPMENT_ASSET_PATHS = "";
 					DEVELOPMENT_TEAM = CS838V553Y;
 				ENABLE_PREVIEWS = YES;
diff --git a/ios/SimDeckStudio/App/AppModel.swift b/ios/SimDeckStudio/App/AppModel.swift
@@ -52,6 +52,7 @@ final class AppModel {
     private static let selectedEndpointKey = "selectedEndpoint"
     private static let streamConfigKey = "streamConfig"
     private static let hapticsEnabledKey = "hapticsEnabled"
+    private static let touchOverlayVisibleKey = "touchOverlayVisible"
     private static let lastFrameCacheDirectoryName = "LastStreamFrames"
 
     var endpoint: SimDeckEndpoint?
@@ -70,6 +71,8 @@ final class AppModel {
     var chromeImage: UIImage?
     var chromeScreenMask: UIImage?
     var streamDiagnostics = StreamDiagnostics()
+    var streamReconnects = 0
+    var streamReconnectReason = ""
     var bootingSimulatorID: String?
     var streamDisplayToken = 0
     var hasCurrentStreamFrame = false
@@ -80,6 +83,11 @@ final class AppModel {
             UserDefaults.standard.set(hapticsEnabled, forKey: Self.hapticsEnabledKey)
         }
     }
+    var touchOverlayVisible = AppModel.loadTouchOverlayVisible() {
+        didSet {
+            UserDefaults.standard.set(touchOverlayVisible, forKey: Self.touchOverlayVisibleKey)
+        }
+    }
 
     @ObservationIgnored private var streamClient: WebRTCClient?
     @ObservationIgnored private var hasAutoConnected = false
@@ -449,7 +457,7 @@ final class AppModel {
                     self.scheduleStreamReconnect(reason: reason)
                 }
             }
-            let loadedChromeAssets = await chromeAssets(api: api, endpoint: endpoint, simulatorID: selectedSimulatorID)
+            let loadedChromeAssets = await chromeAssets(api: api, endpoint: endpoint, simulatorID: selectedSimulatorID, forceRefresh: true)
             guard isCurrentStreamRequest(generation, simulatorID: selectedSimulatorID) else {
                 client.disconnect()
                 return false
@@ -502,7 +510,7 @@ final class AppModel {
         status = "Loading device chrome."
 
         let api = SimDeckAPI(endpoint: endpoint)
-        let loadedChromeAssets = await chromeAssets(api: api, endpoint: endpoint, simulatorID: selectedSimulatorID)
+        let loadedChromeAssets = await chromeAssets(api: api, endpoint: endpoint, simulatorID: selectedSimulatorID, forceRefresh: true)
         guard isCurrentStreamRequest(generation, simulatorID: selectedSimulatorID) else { return }
         applyChromeAssets(loadedChromeAssets)
         status = selectedSimulator?.isBooted == true ? "Ready." : "Ready to boot."
@@ -767,6 +775,12 @@ final class AppModel {
         updateStreamConfig { $0.quality = quality }
     }
 
+    func setTouchOverlayVisible(_ isVisible: Bool) {
+        guard touchOverlayVisible != isVisible else { return }
+        touchOverlayVisible = isVisible
+        hapticSelection()
+    }
+
     private func autoConnectIfNeeded(_ endpoint: SimDeckEndpoint) async {
         guard !hasAutoConnected, !isAutoConnecting, self.endpoint == nil, authEndpoint == nil else { return }
         await autoConnectToAvailableEndpointIfNeeded(preferredEndpoint: endpoint)
@@ -843,6 +857,8 @@ final class AppModel {
                   self.selectedSimulatorID != nil,
                   self.selectedSimulator?.isBooted == true {
                 attempt += 1
+                self.streamReconnects += 1
+                self.streamReconnectReason = reason
                 self.lastReconnectStartedAt = Date()
                 self.status = attempt == 1
                     ? (reason == "foreground" ? "Resuming stream." : "Recovering stream.")
@@ -941,17 +957,19 @@ final class AppModel {
     private func chromeAssets(
         api: SimDeckAPI,
         endpoint: SimDeckEndpoint,
-        simulatorID: String
+        simulatorID: String,
+        forceRefresh: Bool = false
     ) async -> ChromeAssets {
-        if let cached = cachedChromeAssets(endpoint: endpoint, simulatorID: simulatorID) {
+        if !forceRefresh, let cached = cachedChromeAssets(endpoint: endpoint, simulatorID: simulatorID) {
             return cached
         }
 
         let loadedProfile = try? await api.chromeProfile(udid: simulatorID)
-        let loadedImage = try? await api.chromeImage(udid: simulatorID)
+        let assetStamp = loadedProfile?.assetStamp
+        let loadedImage = try? await api.chromeImage(udid: simulatorID, stamp: assetStamp)
         let loadedScreenMask: UIImage?
         if loadedProfile?.hasScreenMask == true {
-            loadedScreenMask = try? await api.screenMaskImage(udid: simulatorID)
+            loadedScreenMask = try? await api.screenMaskImage(udid: simulatorID, stamp: assetStamp)
         } else {
             loadedScreenMask = nil
         }
@@ -1406,6 +1424,10 @@ final class AppModel {
         UserDefaults.standard.object(forKey: hapticsEnabledKey) as? Bool ?? true
     }
 
+    private static func loadTouchOverlayVisible() -> Bool {
+        UserDefaults.standard.object(forKey: touchOverlayVisibleKey) as? Bool ?? true
+    }
+
     func hapticSelection() {
         guard hapticsEnabled else { return }
         UISelectionFeedbackGenerator().selectionChanged()
diff --git a/ios/SimDeckStudio/App/Models.swift b/ios/SimDeckStudio/App/Models.swift
@@ -162,27 +162,52 @@ struct PrivateDisplayInfo: Hashable, Decodable, Sendable {
 
 struct StreamDiagnostics: Hashable, Sendable {
     var codec: String = ""
+    var width: UInt64 = 0
+    var height: UInt64 = 0
     var receivedPackets: UInt64 = 0
     var decodedFrames: UInt64 = 0
+    var renderedFrames: UInt64 = 0
+    var decoderDroppedFrames: UInt64 = 0
+    var presentationDroppedFrames: UInt64 = 0
     var droppedFrames: UInt64 = 0
     var packetsLost: UInt64 = 0
+    var latestPacketGapMs: Double = 0
     var latestFrameGapMs: Double = 0
+    var packetFps: Double = 0
     var decodedFps: Double = 0
     var renderedFps: Double = 0
+    var peerConnectionState: String = ""
+    var iceConnectionState: String = ""
+    var iceGatheringState: String = ""
+    var signalingState: String = ""
     var selectedCandidatePair: String = ""
     var timestamp = Date()
 
     init() {}
 
     init(stats: [String: Any]) {
         codec = stats["codec"] as? String ?? ""
+        width = StreamDiagnostics.uintValue(stats["width"])
+        height = StreamDiagnostics.uintValue(stats["height"])
         receivedPackets = StreamDiagnostics.uintValue(stats["receivedPackets"])
         decodedFrames = StreamDiagnostics.uintValue(stats["decodedFrames"])
+        renderedFrames = StreamDiagnostics.uintValue(stats["renderedFrames"])
+        decoderDroppedFrames = StreamDiagnostics.uintValue(stats["decoderDroppedFrames"])
+        presentationDroppedFrames = StreamDiagnostics.uintValue(stats["presentationDroppedFrames"])
         droppedFrames = StreamDiagnostics.uintValue(stats["droppedFrames"])
+        if decoderDroppedFrames == 0 {
+            decoderDroppedFrames = droppedFrames
+        }
         packetsLost = StreamDiagnostics.uintValue(stats["packetsLost"])
+        latestPacketGapMs = StreamDiagnostics.doubleValue(stats["latestPacketGapMs"])
         latestFrameGapMs = StreamDiagnostics.doubleValue(stats["latestFrameGapMs"])
+        packetFps = StreamDiagnostics.doubleValue(stats["packetFps"])
         decodedFps = StreamDiagnostics.doubleValue(stats["decodedFps"])
         renderedFps = StreamDiagnostics.doubleValue(stats["appFps"])
+        peerConnectionState = stats["peerConnectionState"] as? String ?? stats["status"] as? String ?? ""
+        iceConnectionState = stats["iceConnectionState"] as? String ?? ""
+        iceGatheringState = stats["iceGatheringState"] as? String ?? ""
+        signalingState = stats["signalingState"] as? String ?? ""
         selectedCandidatePair = stats["selectedCandidatePair"] as? String ?? ""
         timestamp = Date()
     }
@@ -225,6 +250,22 @@ struct ChromeProfile: Hashable, Decodable, Sendable {
     let chromeStyle: String?
     let hasScreenMask: Bool?
     let buttons: [ChromeButtonProfile]?
+
+    var assetStamp: String {
+        [
+            totalWidth,
+            totalHeight,
+            screenX,
+            screenY,
+            screenWidth,
+            screenHeight,
+            cornerRadius
+        ]
+            .map { value in
+                value.isFinite ? String(Int((value * 1000).rounded())) : "0"
+            }
+            .joined(separator: "x")
+    }
 }
 
 struct ChromeButtonProfile: Hashable, Decodable, Sendable {
diff --git a/ios/SimDeckStudio/Networking/SimDeckAPI.swift b/ios/SimDeckStudio/Networking/SimDeckAPI.swift
@@ -76,12 +76,13 @@ struct SimDeckAPI: Sendable {
         )
     }
 
-    func chromeImage(udid: String) async throws -> UIImage {
+    func chromeImage(udid: String, stamp: String? = nil) async throws -> UIImage {
         let data = try await request(
             path: "/api/simulators/\(udid.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? udid)/chrome.png",
             method: "GET",
             body: Optional<String>.none,
             timeout: 10,
+            queryItems: Self.assetQueryItems(stamp: stamp),
             cachePolicy: .reloadIgnoringLocalAndRemoteCacheData
         )
         guard let image = UIImage(data: data) else {
@@ -90,12 +91,13 @@ struct SimDeckAPI: Sendable {
         return image
     }
 
-    func screenMaskImage(udid: String) async throws -> UIImage {
+    func screenMaskImage(udid: String, stamp: String? = nil) async throws -> UIImage {
         let data = try await request(
             path: "/api/simulators/\(udid.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? udid)/screen-mask.png",
             method: "GET",
             body: Optional<String>.none,
             timeout: 10,
+            queryItems: Self.assetQueryItems(stamp: stamp),
             cachePolicy: .reloadIgnoringLocalAndRemoteCacheData
         )
         guard let image = UIImage(data: data) else {
@@ -113,9 +115,10 @@ struct SimDeckAPI: Sendable {
         method: String = "GET",
         body: (some Encodable)? = Optional<String>.none,
         timeout: TimeInterval = 10,
+        queryItems: [URLQueryItem] = [],
         cachePolicy: URLRequest.CachePolicy = .useProtocolCachePolicy
     ) async throws -> T {
-        let data = try await request(path: path, method: method, body: body, timeout: timeout, cachePolicy: cachePolicy)
+        let data = try await request(path: path, method: method, body: body, timeout: timeout, queryItems: queryItems, cachePolicy: cachePolicy)
         if data.isEmpty, T.self == EmptyResponse.self {
             return EmptyResponse() as! T
         }
@@ -127,13 +130,15 @@ struct SimDeckAPI: Sendable {
         method: String,
         body: (some Encodable)?,
         timeout: TimeInterval,
+        queryItems: [URLQueryItem] = [],
         cachePolicy: URLRequest.CachePolicy = .useProtocolCachePolicy
     ) async throws -> Data {
         let (data, _) = try await requestWithHTTPResponse(
             path: path,
             method: method,
             body: body,
             timeout: timeout,
+            queryItems: queryItems,
             cachePolicy: cachePolicy
         )
         return data
@@ -144,9 +149,10 @@ struct SimDeckAPI: Sendable {
         method: String,
         body: (some Encodable)?,
         timeout: TimeInterval,
+        queryItems: [URLQueryItem] = [],
         cachePolicy: URLRequest.CachePolicy = .useProtocolCachePolicy
     ) async throws -> (Data, HTTPURLResponse) {
-        var request = URLRequest(url: url(for: path), cachePolicy: cachePolicy, timeoutInterval: timeout)
+        var request = URLRequest(url: url(for: path, queryItems: queryItems), cachePolicy: cachePolicy, timeoutInterval: timeout)
         request.httpMethod = method
         request.setValue("application/json", forHTTPHeaderField: "Accept")
         request.setValue(originHeaderValue, forHTTPHeaderField: "Origin")
@@ -194,15 +200,23 @@ struct SimDeckAPI: Sendable {
         return components.url?.absoluteString.trimmingTrailingSlashes() ?? baseURL.absoluteString
     }
 
-    private func url(for path: String) -> URL {
+    private func url(for path: String, queryItems: [URLQueryItem] = []) -> URL {
         guard var components = URLComponents(url: baseURL, resolvingAgainstBaseURL: false) else {
             return baseURL.appendingPathComponent(path)
         }
         let prefix = components.path.trimmingTrailingSlashes()
         let suffix = path.hasPrefix("/") ? path : "/\(path)"
         components.path = "\(prefix)\(suffix)"
+        if !queryItems.isEmpty {
+            components.queryItems = (components.queryItems ?? []) + queryItems
+        }
         return components.url ?? baseURL.appendingPathComponent(path)
     }
+
+    private static func assetQueryItems(stamp: String?) -> [URLQueryItem] {
+        guard let stamp = stamp?.nilIfBlank else { return [] }
+        return [URLQueryItem(name: "stamp", value: stamp)]
+    }
 }
 
 private struct EmptyResponse: Codable {}
diff --git a/ios/SimDeckStudio/Views/ContentView.swift b/ios/SimDeckStudio/Views/ContentView.swift
@@ -190,11 +190,12 @@ private struct ServerTitleButton: View {
             }
             .padding(.leading, 14)
             .padding(.trailing, 12)
-            .padding(.vertical, 8)
+            .padding(.vertical, 5)
             .contentShape(Capsule())
         }
         .buttonStyle(.plain)
         .frame(minWidth: 170, maxWidth: 240)
+        .frame(height: 42)
         .modifier(GlassCapsuleModifier(interactive: true))
     }
 
diff --git a/ios/SimDeckStudio/Views/SimulatorStreamView.swift b/ios/SimDeckStudio/Views/SimulatorStreamView.swift

Original file line number	Diff line number	Diff line change
`@@ -190,11 +190,12 @@ private struct ServerTitleButton: View {`
`190`	`190`	`}`
`191`	`191`	`.padding(.leading, 14)`
`192`	`192`	`.padding(.trailing, 12)`
`193`		`- .padding(.vertical, 8)`
	`193`	`+ .padding(.vertical, 5)`
`194`	`194`	`.contentShape(Capsule())`
`195`	`195`	`}`
`196`	`196`	`.buttonStyle(.plain)`
`197`	`197`	`.frame(minWidth: 170, maxWidth: 240)`
	`198`	`+ .frame(height: 42)`
`198`	`199`	`.modifier(GlassCapsuleModifier(interactive: true))`
`199`	`200`	`}`
`200`	`201`