[Fix]Remove TimerStorage (#873)

Author: ipavlidakis

.swiftlint.yml

@@ -12,11 +12,6 @@ excluded:
 
 # Custom Rules
 custom_rules:
-  discourage_timer_publish:
-    name: "Discouraged Timer.publish usage"
-    regex: '\bTimer\s*(\.\s*)?publish\b'
-    message: "Avoid using Timer.publish. User the TimerStorage instead."
-    severity: error
   discourage_task_init:
     name: "Discouraged Task { usage"
     regex: '\bTask\s*\{'

Sources/StreamVideo/CallKit/CallKitService.swift

@@ -13,7 +13,6 @@ open class CallKitService: NSObject, CXProviderDelegate, @unchecked Sendable {
 
     @Injected(\.callCache) private var callCache
     @Injected(\.uuidFactory) private var uuidFactory
-    @Injected(\.timers) private var timers
     @Injected(\.currentDevice) private var currentDevice
     private let disposableBag = DisposableBag()
 
@@ -613,8 +612,10 @@ open class CallKitService: NSObject, CXProviderDelegate, @unchecked Sendable {
     /// - Parameter callState: The state of the call.
     open func setUpRingingTimer(for callState: GetCallResponse) {
         let timeout = TimeInterval(callState.call.settings.ring.autoCancelTimeoutMs / 1000)
-        ringingTimerCancellable = timers
-            .timer(for: timeout)
+        ringingTimerCancellable = Foundation
+            .Timer
+            .publish(every: timeout, on: .main, in: .default)
+            .autoconnect()
             .sink { [weak self] _ in
                 log.debug(
                     "Detected ringing timeout, hanging up...",

Sources/StreamVideo/CallState.swift

@@ -33,7 +33,6 @@ public struct PermissionRequest: @unchecked Sendable, Identifiable {
 public class CallState: ObservableObject {
 
     @Injected(\.streamVideo) var streamVideo
-    @Injected(\.timers) var timers
 
     /// The id of the current session.
     /// When a call is started, a unique session identifier is assigned to the user in the call.
@@ -507,8 +506,10 @@ public class CallState: ObservableObject {
 
     private func setupDurationTimer() {
         resetTimer()
-        durationCancellable = timers
-            .timer(for: 1.0)
+        durationCancellable = Foundation
+            .Timer
+            .publish(every: 1.0, on: .main, in: .default)
+            .autoconnect()
             .receive(on: DispatchQueue.main)
             .compactMap { [weak self] _ in
                 if let startedAt = self?.startedAt {

Sources/StreamVideo/StreamVideo.swift

@@ -15,7 +15,6 @@ public typealias UserTokenUpdater = @Sendable(UserToken) -> Void
 public class StreamVideo: ObservableObject, @unchecked Sendable {
 
     @Injected(\.callCache) private var callCache
-    @Injected(\.timers) private var timers
     @Injected(\.screenProperties) private var screenProperties
 
     private enum DisposableKey: String { case ringEventReceived }
@@ -532,8 +531,10 @@ public class StreamVideo: ObservableObject, @unchecked Sendable {
         do {
             var cancellable: AnyCancellable?
             log.debug("Listening for WS connection")
-            _ = try await timers
-                .timer(for: 0.1)
+            _ = try await Foundation
+                .Timer
+                .publish(every: 0.1, on: .main, in: .default)
+                .autoconnect()
                 .filter { [weak webSocketClient] _ in webSocketClient?.connectionState.isConnected == true }
                 .nextValue(timeout: 30) { cancellable = $0 }
             cancellable?.cancel()
@@ -585,8 +586,10 @@ public class StreamVideo: ObservableObject, @unchecked Sendable {
 
         var cancellable: AnyCancellable?
         do {
-            let result = try await timers
-                .timer(for: 0.1)
+            let result = try await Foundation
+                .Timer
+                .publish(every: 0.1, on: .main, in: .default)
+                .autoconnect()
                 .log(.debug) { _ in "Waiting for connection id" }
                 .compactMap { [weak self] _ in self?.loadConnectionIdFromHealthcheck() }
                 .nextValue(timeout: 5) { cancellable = $0 }

Sources/StreamVideo/Utils/AudioSession/AudioRecorder/StreamCallAudioRecorder.swift

@@ -16,7 +16,6 @@ open class StreamCallAudioRecorder: @unchecked Sendable {
 
     @Injected(\.activeCallProvider) private var activeCallProvider
     @Injected(\.activeCallAudioSession) private var activeCallAudioSession
-    @Injected(\.timers) private var timers
 
     /// The builder used to create the AVAudioRecorder instance.
     let audioRecorderBuilder: AVAudioRecorderBuilder
@@ -119,8 +118,10 @@ open class StreamCallAudioRecorder: @unchecked Sendable {
 
             updateMetersTimerCancellable?.cancel()
             disposableBag.remove("update-meters")
-            updateMetersTimerCancellable = timers
-                .timer(for: ScreenPropertiesAdapter.currentValue.refreshRate)
+            updateMetersTimerCancellable = Foundation
+                .Timer
+                .publish(every: ScreenPropertiesAdapter.currentValue.refreshRate, on: .main, in: .default)
+                .autoconnect()
                 .sinkTask(storeIn: disposableBag, identifier: "update-meters") { [weak self, audioRecorder] _ in
                     audioRecorder.updateMeters()
                     self?._metersPublisher.send(audioRecorder.averagePower(forChannel: 0))

Sources/StreamVideo/Utils/OrderedCapacityQueue/OrderedCapacityQueue.swift

@@ -8,7 +8,6 @@ import Foundation
 /// A thread-safe queue that maintains a fixed capacity and removes elements after
 /// a specified time interval.
 final class OrderedCapacityQueue<Element> {
-    @Injected(\.timers) private var timers
 
     private let queue = UnfairQueue()
 
@@ -50,8 +49,10 @@ final class OrderedCapacityQueue<Element> {
     init(capacity: Int, removalTime: TimeInterval) {
         self.capacity = capacity
         self.removalTime = removalTime
-        removalTimerCancellable = timers
-            .timer(for: ScreenPropertiesAdapter.currentValue.refreshRate)
+        removalTimerCancellable = Foundation
+            .Timer
+            .publish(every: ScreenPropertiesAdapter.currentValue.refreshRate, on: .main, in: .default)
+            .autoconnect()
             .receive(on: DispatchQueue.global(qos: .userInteractive))
             .sink { [weak self] _ in self?.removeItemsIfRequired() }
     }
@@ -87,8 +88,10 @@ final class OrderedCapacityQueue<Element> {
     ///   should be enabled.
     private func toggleRemovalObservation(_ isEnabled: Bool) {
         if isEnabled, removalTimerCancellable == nil {
-            removalTimerCancellable = timers
-                .timer(for: ScreenPropertiesAdapter.currentValue.refreshRate)
+            removalTimerCancellable = Foundation
+                .Timer
+                .publish(every: ScreenPropertiesAdapter.currentValue.refreshRate, on: .main, in: .default)
+                .autoconnect()
                 .sink { [weak self] _ in self?.removeItemsIfRequired() }
         } else if !isEnabled, removalTimerCancellable != nil {
             removalTimerCancellable?.cancel()

Sources/StreamVideo/Utils/Timers/TimerStorage.swift

@@ -30,7 +30,6 @@ extension WebRTCCoordinator.StateMachine.Stage {
         @unchecked Sendable
     {
         @Injected(\.internetConnectionObserver) private var internetConnectionObserver
-        @Injected(\.timers) private var timers
 
         private var internetObservationCancellable: AnyCancellable?
         private var timeInStageCancellable: AnyCancellable?
@@ -128,8 +127,10 @@ extension WebRTCCoordinator.StateMachine.Stage {
                 /// We add a small delay of 100ms in oder to ensure that the internet connection state
                 /// has been updated, so that when we start observing it will receive the latest and
                 /// updated value.
-                _ = try? await timers
-                    .timer(for: ScreenPropertiesAdapter.currentValue.refreshRate)
+                _ = try? await Foundation
+                    .Timer
+                    .publish(every: ScreenPropertiesAdapter.currentValue.refreshRate, on: .main, in: .default)
+                    .autoconnect()
                     .nextValue { cancellable = $0 }
                 cancellable?.cancel()
                 cancellable = nil
@@ -217,8 +218,10 @@ extension WebRTCCoordinator.StateMachine.Stage {
             guard context.disconnectionTimeout > 0 else {
                 return
             }
-            timeInStageCancellable = timers
-                .timer(for: context.disconnectionTimeout)
+            timeInStageCancellable = Foundation
+                .Timer
+                .publish(every: context.disconnectionTimeout, on: .main, in: .default)
+                .autoconnect()
                 .sink { [weak self] _ in self?.didTimeInStageExpired() }
         }
 

Sources/StreamVideo/WebRTC/v2/StateMachine/Stages/WebRTCCoordinator+Disconnected.swift

@@ -18,8 +18,6 @@ import StreamWebRTC
 /// will start periodic collection upon setting it.
 final class WebRTCStatsCollector: WebRTCStatsCollecting, @unchecked Sendable {
 
-    @Injected(\.timers) private var timers
-
     /// The most recent `CallStatsReport` generated from collected stats.
     ///
     /// Observers can subscribe to this publisher to receive updates.
@@ -78,8 +76,10 @@ final class WebRTCStatsCollector: WebRTCStatsCollecting, @unchecked Sendable {
         }
 
         collectionCancellable?.cancel()
-        collectionCancellable = timers
-            .timer(for: interval)
+        collectionCancellable = Foundation
+            .Timer
+            .publish(every: interval, on: .main, in: .default)
+            .autoconnect()
             .receive(on: DispatchQueue.global(qos: .utility))
             .log(.debug, subsystems: .webRTC) { _ in "Will collect stats." }
             .sink { [weak self] _ in self?.collectStats() }

Sources/StreamVideo/WebRTC/v2/Stats/Collector/WebRTCStatsCollector.swift

@@ -14,7 +14,6 @@ import StreamWebRTC
 final class WebRTCStatsReporter: WebRTCStatsReporting, @unchecked Sendable {
 
     @Injected(\.thermalStateObserver) private var thermalStateObserver
-    @Injected(\.timers) private var timers
 
     struct Input: @unchecked Sendable {
         var sessionID: String
@@ -105,7 +104,10 @@ final class WebRTCStatsReporter: WebRTCStatsReporting, @unchecked Sendable {
             return
         }
 
-        deliveryCancellable = timers.timer(for: interval)
+        deliveryCancellable = Foundation
+            .Timer
+            .publish(every: interval, on: .main, in: .default)
+            .autoconnect()
             .compactMap { [weak self] _ in self?.provider() }
             .sink { [weak self] in self?.deliverStats($0) }
     }