Fix tvOS bundle ID and update VPN integration docs

kp-diego-trevisan · kp-diego-trevisan · commit ef641fd9b5f4 · 2026-07-21T16:10:01.000+02:00
diff --git a/ADRs/0003-swiftui-feature-modules-as-swift-packages.md b/ADRs/0003-swiftui-feature-modules-as-swift-packages.md
@@ -1,4 +1,4 @@
-# ADR-0002: SwiftUI Feature Modules as Swift Packages
+# ADR-0003: SwiftUI Feature Modules as Swift Packages
 
 **Status:** Accepted
 **Date:** 2026-03-13
diff --git a/ADRs/0004-feature-flags-development.md b/ADRs/0004-feature-flags-development.md
@@ -1,4 +1,4 @@
-# 0003: Development with feature flags
+# 0004: Development with feature flags
 
 Date: 2026-03-20
 
diff --git a/ADRs/0005-native-swift-account-api.md b/ADRs/0005-native-swift-account-api.md
@@ -1,4 +1,4 @@
-# 0004: Replace KMP PIAAccount with a native Swift implementation
+# 0005: Replace KMP PIAAccount with a native Swift implementation
 
 Date: 2026-03-30
 
diff --git a/ADRs/0006-replace-csi-sdk-with-internal-implementation.md b/ADRs/0006-replace-csi-sdk-with-internal-implementation.md
@@ -1,4 +1,4 @@
-# 0004: Replace CSI SDK with internal implementation
+# 0006: Replace CSI SDK with internal implementation
 
 Date: 2026-04-02
 
diff --git a/ADRs/0007-ios-coordinator-navigation-pattern.md b/ADRs/0007-ios-coordinator-navigation-pattern.md
@@ -1,4 +1,4 @@
-# 0005: iOS Navigation Architecture — Coordinator Pattern
+# 0007: iOS Navigation Architecture — Coordinator Pattern
 
 Date: 2026-06-05
 
@@ -245,4 +245,4 @@ Adoption is incremental. No existing screen needs to change until it is wrapped
 
 - `PIA VPN/Core/RootCoordinator.swift` — existing root coordinator; starting point for `AppCoordinator` evolution
 - `PIA VPN/UI/` — existing ViewControllers; candidates for closure output adoption per flow
-- [ADR 0002](0002-swiftui-feature-modules-as-swift-packages.md) — SwiftUI feature modules as Swift packages (complementary to coordinator-owned SwiftUI flows)
+- [ADR 0003](0003-swiftui-feature-modules-as-swift-packages.md) — SwiftUI feature modules as Swift packages (complementary to coordinator-owned SwiftUI flows)
diff --git a/ADRs/0008-integrate-kape-platform-sdk-vpn-engine.md b/ADRs/0008-integrate-kape-platform-sdk-vpn-engine.md
@@ -1,4 +1,4 @@
-# 0005: Integrate the Kape Platform SDK VPN engine
+# 0008: Integrate the Kape Platform SDK VPN engine
 
 Date: 2026-06-25
 
@@ -61,7 +61,7 @@ The same sources are built by two platform targets — `PlatformSDK-Tunnel-iOS`
 `PlatformSDK-Tunnel-tvOS.appex`. The app-side profile
 `KapePlatformSDKTunnelProfile: NetworkExtensionProfile` (in `PIALibrary`) configures it.
 
-**App ↔ extension IPC — bidirectional shared state plus a provider message.** State flows in
+**App ↔ extension IPC — bidirectional shared state plus provider messages.** State flows in
 both directions through `PIATunnelSharedState` (a namespace whose payload is a nested `State`),
 persisted as `pia_platformsdk_state.json` in the shared app group (on tvOS under
 `Library/Caches`). Every write posts a Darwin notification so the other side observes the change
@@ -83,6 +83,11 @@ rather than polling.
   `PIAPacketTunnelRequest.switchLocation` message via `sendProviderMessage()`; the extension
   re-resolves its endpoints from shared state in place. This replaced an earlier client-side
   server-switch marker.
+- **Provider message (`dataUsage`).** The app queries the active session's cumulative byte counters
+  with `PIAPacketTunnelRequest.dataUsage`. The extension reads them from the SDK session controller
+  and returns a `PIADataUsage`-compatible JSON payload, which `KapePlatformSDKTunnelProfile` maps to
+  PIALibrary's existing `Usage` model. The profile also exposes the Network Extension connection's
+  `connectedDate`, preserving the existing dashboard duration and usage features.
 
 **Three protocol modes, automatic by default.** Protocol selection is mapped through
 `KapePlatformSDKVPNType`, which centralises the persisted identifiers — `"PIA"` (OpenVPN),
diff --git a/ADRs/0009-unidirectional-mvi-architecture.md b/ADRs/0009-unidirectional-mvi-architecture.md
@@ -1,4 +1,4 @@
-# 0007: Unidirectional Data Flow (MVI) Architecture
+# 0009: Unidirectional Data Flow (MVI) Architecture
 
 Date: 2026-07-07
 
@@ -8,7 +8,7 @@ PIA iOS adopts a **lightweight, hand-rolled unidirectional data flow (MVI) archi
 
 ### Starting position
 
-The navigation layer is already governed by ADR 0006 (Coordinator pattern). The codebase has more SwiftUI Views than ViewControllers and has a developed reactive substrate with `ObservableObject` and `@Published` in use. However, PIA shares a class of state and testability problems that unidirectional data flow is designed to solve.
+The navigation layer is already governed by ADR 0007 (Coordinator pattern). The codebase has more SwiftUI Views than ViewControllers and has a developed reactive substrate with `ObservableObject` and `@Published` in use. However, PIA shares a class of state and testability problems that unidirectional data flow is designed to solve.
 
 ### Current pain points
 
@@ -114,9 +114,9 @@ extension VPNFeatureDependencies {
 }
 ```
 
-### Relationship to ADR 0006 (Coordinator pattern)
+### Relationship to ADR 0007 (Coordinator pattern)
 
-ADR 0006 defines the navigation layer. This ADR defines the state and business logic layer. A coordinator starts a feature by creating its `Store` and handing it to the feature view — the two are complementary.
+ADR 0007 defines the navigation layer. This ADR defines the state and business logic layer. A coordinator starts a feature by creating its `Store` and handing it to the feature view — the two are complementary.
 
 ### Shared Apple-platform standard
 
@@ -154,7 +154,7 @@ The `State` / `Action` / `Reducer` / `Dependencies` layer is UI-agnostic. Featur
 
 ## References
 
-- ADR 0006 — iOS Coordinator navigation pattern; the complementary navigation layer.
+- ADR 0007 — iOS Coordinator navigation pattern; the complementary navigation layer.
 - `LocalPackages/PIALibrary/Sources/PIALibrary/VPN/DefaultVPNProvider.swift` — primary first migration target.
 - `LocalPackages/PIALibrary/Sources/PIALibrary/Account/DefaultAccountProvider.swift` — second migration target.
 - [pointfreeco/swift-composable-architecture](https://github.com/pointfreeco/swift-composable-architecture) — the reference framework this pattern mirrors; the intended upgrade path if the hand-rolled design is outgrown.
diff --git a/LocalPackages/PIALocalizations/README.md b/LocalPackages/PIALocalizations/README.md
@@ -4,7 +4,7 @@ Swift Package containing all localizable strings for the PIA VPN iOS and tvOS ap
 
 ## Overview
 
-This package is the single source of truth for all user-facing strings, per [ADR-0002](../../ADRs/0002-swiftui-feature-modules-as-swift-packages.md). Feature packages and the main app targets do not bundle their own `.strings` files.
+This package is the single source of truth for all user-facing strings, per [ADR-0003](../../ADRs/0003-swiftui-feature-modules-as-swift-packages.md). Feature packages and the main app targets do not bundle their own `.strings` files.
 
 The `L10n` enum is generated by SwiftGen from `Localizable.strings` and provides type-safe access to all strings at compile time.
 
diff --git a/LocalPackages/PIAVPN/README.md b/LocalPackages/PIAVPN/README.md
@@ -33,13 +33,17 @@ class PacketTunnelProvider: PIAPacketTunnelProvider, @unchecked Sendable {}
 
 - **WireGuard, OpenVPN, and Automatic.** `PIAPacketTunnelProvider` registers both a WireGuard and an
   OpenVPN `ConnectionController`; `PIAEndpointRepository` emits configurations per the selected
-  protocol (`wireGuard`, `openVPN`, or `automatic` — WireGuard first, then OpenVPN), and the session
-  controller routes each configuration to the matching controller by type.
+  protocol. Automatic mode uses a protocol-major pecking order — WireGuard, OpenVPN-UDP, then
+  OpenVPN-TCP — with a fixed number of fastest-first distinct endpoints per step. The order dictates
+  the transport, port, and OpenVPN crypto rather than using the saved OpenVPN settings.
 - **No app-side manager.** PIA's app side keeps using `KapePlatformSDKTunnelProfile` and
   `PIATunnelSharedState` (in `PIALibrary`); this package is the extension-side engine glue only.
-- The app ↔ extension hand-off (selected location / DIP server, cached server list, protocol,
-  latencies, DNS, MTU, token) flows through `PIATunnelSharedState` (file-based shared state in the
-  App Group), read here by `PIAEndpointRepository` / `PIAPacketTunnelProvider`.
+- **Persistent shared state.** Connection inputs (selected location / DIP server, cached server list,
+  protocol, latencies, DNS, MTU, token) and extension write-back (`activeConnection`, `tunnelStatus`)
+  flow through `PIATunnelSharedState`, a file-based snapshot in the App Group.
+- **Live provider messages.** `PIAPacketTunnelRequest.switchLocation` asks the running session to
+  re-resolve endpoints after the app changes shared state. `PIAPacketTunnelRequest.dataUsage` queries
+  the SDK's cumulative byte counters and returns a `PIADataUsage`-compatible response to the app.
 
 ## Custom DNS
 
diff --git a/PIA VPN.xcodeproj/project.pbxproj b/PIA VPN.xcodeproj/project.pbxproj
@@ -2957,7 +2957,7 @@
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.PIA-VPN";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# ADR-0002: SwiftUI Feature Modules as Swift Packages`
	`1`	`+# ADR-0003: SwiftUI Feature Modules as Swift Packages`
`2`	`2`
`3`	`3`	`Status: Accepted`
`4`	`4`	`Date: 2026-03-13`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# 0003: Development with feature flags`
	`1`	`+# 0004: Development with feature flags`
`2`	`2`
`3`	`3`	`Date: 2026-03-20`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# 0004: Replace KMP PIAAccount with a native Swift implementation`
	`1`	`+# 0005: Replace KMP PIAAccount with a native Swift implementation`
`2`	`2`
`3`	`3`	`Date: 2026-03-30`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# 0004: Replace CSI SDK with internal implementation`
	`1`	`+# 0006: Replace CSI SDK with internal implementation`
`2`	`2`
`3`	`3`	`Date: 2026-04-02`
`4`	`4`