Skip to content

Commit 48691d3

Browse files
committed
Specify nonisolation in PacketTunnelActor
1 parent 2b37ca7 commit 48691d3

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift

+2-6
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ extension PacketTunnelActor {
1515
`NEPacketTunnelProvider` provides the corresponding lifecycle method.
1616
*/
1717
public nonisolated func onWake() {
18-
Task {
19-
await tunnelMonitor.onWake()
20-
}
18+
tunnelMonitor.onWake()
2119
}
2220

2321
/**
@@ -26,8 +24,6 @@ extension PacketTunnelActor {
2624
`NEPacketTunnelProvider` provides the corresponding lifecycle method.
2725
*/
2826
public nonisolated func onSleep() {
29-
Task {
30-
await tunnelMonitor.onSleep()
31-
}
27+
tunnelMonitor.onSleep()
3228
}
3329
}

ios/PacketTunnelCore/Actor/PacketTunnelActor.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public actor PacketTunnelActor {
3737

3838
@Published internal(set) public var observedState: ObservedState = .initial
3939

40-
let logger = Logger(label: "PacketTunnelActor")
40+
nonisolated let logger = Logger(label: "PacketTunnelActor")
4141

4242
let timings: PacketTunnelActorTimings
4343
let tunnelAdapter: TunnelAdapterProtocol
44-
let tunnelMonitor: TunnelMonitorProtocol
44+
nonisolated let tunnelMonitor: TunnelMonitorProtocol
4545
let defaultPathObserver: DefaultPathObserverProtocol
4646
let blockedStateErrorMapper: BlockedStateErrorMapperProtocol
4747
public let relaySelector: RelaySelectorProtocol
@@ -87,7 +87,7 @@ public actor PacketTunnelActor {
8787
for await event in channel {
8888
guard let self else { return }
8989

90-
await self.logger.debug("Received event: \(event.logFormat())")
90+
self.logger.debug("Received event: \(event.logFormat())")
9191

9292
let effects = await self.runReducer(event)
9393

0 commit comments

Comments
 (0)