Fix .sink retain cycles (#345)

Passepartout/App/Context/AppContext.swift

@@ -79,19 +79,19 @@ private extension AppContext {
         coreContext.vpnManager.currentState.$vpnStatus
             .removeDuplicates()
             .receive(on: DispatchQueue.main)
-            .sink {
+            .sink { [weak self] in
                 if $0 == .connected {
                     pp_log.info("VPN successful connection, report to Reviewer")
-                    self.reviewer.reportEvent()
+                    self?.reviewer.reportEvent()
                 }
             }.store(in: &cancellables)
 
         productManager.didRefundProducts
             .receive(on: DispatchQueue.main)
-            .sink {
+            .sink { [weak self] in
                 Task {
                     pp_log.info("Refunds detected, uninstalling VPN profile")
-                    await self.coreContext.vpnManager.uninstall()
+                    await self?.coreContext.vpnManager.uninstall()
                 }
             }.store(in: &cancellables)
     }

Passepartout/App/Mac/Managers/DefaultLightProfileManager.swift

@@ -62,8 +62,8 @@ final class DefaultLightProfileManager: LightProfileManager {
     init() {
         profileManager.didUpdateProfiles
             .receive(on: DispatchQueue.main)
-            .sink {
+            .sink { [weak self] in
-                self.delegate?.didUpdateProfiles()
+                self?.delegate?.didUpdateProfiles()
             }.store(in: &subscriptions)
     }
 

Passepartout/App/Mac/Managers/DefaultLightProviderManager.swift

@@ -89,8 +89,8 @@ final class DefaultLightProviderManager: LightProviderManager {
     init() {
         providerManager.didUpdateProviders
             .receive(on: DispatchQueue.main)
-            .sink {
+            .sink { [weak self] in
-                self.delegate?.didUpdateProviders()
+                self?.delegate?.didUpdateProviders()
             }.store(in: &subscriptions)
     }
 

Passepartout/App/Mac/Managers/DefaultLightVPNManager.swift

@@ -47,7 +47,10 @@ final class DefaultLightVPNManager: LightVPNManager {
         vpnManager.currentState.$isEnabled
             .removeDuplicates()
             .receive(on: DispatchQueue.main)
-            .sink {
+            .sink { [weak self] in
+                guard let self else {
+                    return
+                }
                 self.didUpdateState(
                     isEnabled: $0,
                     vpnStatus: self.vpnManager.currentState.vpnStatus.asLightVPNStatus
@@ -57,7 +60,10 @@ final class DefaultLightVPNManager: LightVPNManager {
         vpnManager.currentState.$vpnStatus
             .removeDuplicates()
             .receive(on: DispatchQueue.main)
-            .sink {
+            .sink { [weak self] in
+                guard let self else {
+                    return
+                }
                 self.didUpdateState(
                     isEnabled: self.vpnManager.currentState.isEnabled,
                     vpnStatus: $0.asLightVPNStatus

Passepartout/Mac/Views/LaunchOnLoginItem+ViewModel.swift

@@ -70,7 +70,10 @@ extension LaunchOnLoginItem {
 
         func subscribe(_ block: @escaping (Bool) -> Void) {
             objectWillChange
-                .sink {
+                .sink { [weak self] in
+                    guard let self else {
+                        return
+                    }
                     block(self.persistentlyLaunchesOnLogin)
                 }.store(in: &subscriptions)
         }

PassepartoutLibrary/Sources/PassepartoutVPN/Managers/ProfileManager.swift

@@ -348,14 +348,14 @@ extension ProfileManager {
 extension ProfileManager {
     public func observeUpdates() {
         $internalActiveProfileId
-            .sink {
+            .sink { [weak self] in
-                self.didUpdateActiveProfile.send($0)
+                self?.didUpdateActiveProfile.send($0)
             }.store(in: &cancellables)
 
         profileRepository.willUpdateProfiles()
             .dropFirst()
-            .sink {
+            .sink { [weak self] in
-                self.willUpdateProfiles($0)
+                self?.willUpdateProfiles($0)
             }.store(in: &cancellables)
     }
 

PassepartoutLibrary/Sources/PassepartoutVPN/Managers/VPNManager.swift

@@ -156,19 +156,19 @@ extension VPNManager {
         profileManager.didUpdateActiveProfile
             .dropFirst()
             .removeDuplicates()
-            .sink { newId in
+            .sink { [weak self] newId in
                 Task {
-                    await self.willUpdateActiveId(newId)
+                    await self?.willUpdateActiveId(newId)
                 }
             }.store(in: &cancellables)
 
         profileManager.currentProfile.$value
             .dropFirst()
             .removeDuplicates()
-            .sink { newProfile in
+            .sink { [weak self] newProfile in
                 Task {
                     do {
-                        try await self.willUpdateCurrentProfile(newProfile)
+                        try await self?.willUpdateCurrentProfile(newProfile)
                     } catch {
                         pp_log.error("Unable to apply profile update: \(error)")
                     }

PassepartoutLibrary/Sources/PassepartoutVPNImpl/Strategies/TunnelKitVPNManagerStrategy.swift

@@ -126,9 +126,9 @@ extension TunnelKitVPNManagerStrategy {
         vpnState
             .removeDuplicates()
             .receive(on: DispatchQueue.main)
-            .sink {
+            .sink { [weak self] in
-                self.currentState?.isEnabled = $0.isEnabled
+                self?.currentState?.isEnabled = $0.isEnabled
-                self.currentState?.vpnStatus = $0.vpnStatus
+                self?.currentState?.vpnStatus = $0.vpnStatus
             }.store(in: &cancellables)
     }
 
@@ -285,8 +285,8 @@ private extension TunnelKitVPNManagerStrategy {
         }
         dataCountTimer = Timer.TimerPublisher(interval: dataCountInterval, runLoop: .main, mode: .common)
             .autoconnect()
-            .sink {
+            .sink { [weak self] in
-                self.onDataCount($0)
+                self?.onDataCount($0)
             }
     }