lots of fixes after testing

Package.resolved

@@ -1,5 +1,4 @@
 {
-  "originHash" : "8ef972f340bf89ccd4a56e634f9243c952510d9d3b7f8a894414454b4618f0ec",
   "pins" : [
     {
       "identity" : "combine-schedulers",

Package.swift

@@ -39,7 +39,7 @@ let package = Package(
             name: "KlaviyoSwift",
             dependencies: [
                 "KlaviyoCore",
-                "ComposableArchitecture",
+                "KComposableArchitecture",
                 "AnyCodable"
             ],
             path: "Sources/KlaviyoSwift",
@@ -52,7 +52,7 @@ let package = Package(
                 "KCustomDump",
                 .product(name: "CombineSchedulers", package: "combine-schedulers"),
                 "KlaviyoCore",
-                "ComposableArchitecture",
+                "KComposableArchitecture",
                 "KIssueReporting",
                 "KCasePaths",
                 .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay")
@@ -80,26 +80,26 @@ let package = Package(
 
         // Vendorized Things
         .target(
-            name: "ComposableArchitecture",
+            name: "KComposableArchitecture",
             dependencies: [
                 "KCustomDump",
-                "IdentifiedCollections",
+                "KIdentifiedCollections",
                 "KConcurrencyExtras",
                 "KPerception",
                 "KCasePaths"
             ],
             path: "Sources/ComposableArchitecture"),
         .target(
-            name: "OrderedCollections",
-            dependencies: ["InternalCollectionsUtilities"],
+            name: "KOrderedCollections",
+            dependencies: ["KInternalCollectionsUtilities"],
             path: "Sources/OrderedCollections"),
         .target(
-            name: "InternalCollectionsUtilities",
+            name: "KInternalCollectionsUtilities",
             dependencies: [],
             path: "Sources/InternalCollectionsUtilities"),
         .target(
-            name: "IdentifiedCollections",
-            dependencies: ["OrderedCollections"],
+            name: "KIdentifiedCollections",
+            dependencies: ["KOrderedCollections"],
             path: "Sources/IdentifiedCollections"),
         .target(
             name: "AnyCodable",

Package@swift-6.0.swift

@@ -39,7 +39,7 @@ let package = Package(
             dependencies: [
                 "AnyCodable",
                 "KlaviyoCore",
-                "ComposableArchitecture"
+                "KComposableArchitecture"
             ],
             path: "Sources/KlaviyoSwift",
             resources: [.copy("PrivacyInfo.xcprivacy")]),
@@ -51,7 +51,7 @@ let package = Package(
                 "KCustomDump",
                 .product(name: "CombineSchedulers", package: "combine-schedulers"),
                 "KlaviyoCore",
-                "ComposableArchitecture",
+                "KComposableArchitecture",
                 "KIssueReporting",
                 "KCasePaths",
                 .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay")
@@ -79,26 +79,26 @@ let package = Package(
 
         // Vendorized Things
         .target(
-            name: "ComposableArchitecture",
+            name: "KComposableArchitecture",
             dependencies: [
                 "KCustomDump",
-                "IdentifiedCollections",
+                "KIdentifiedCollections",
                 "KConcurrencyExtras",
                 "KPerception",
                 "KCasePaths"
             ],
             path: "Sources/ComposableArchitecture"),
         .target(
-            name: "OrderedCollections",
-            dependencies: ["InternalCollectionsUtilities"],
+            name: "KOrderedCollections",
+            dependencies: ["KInternalCollectionsUtilities"],
             path: "Sources/OrderedCollections"),
         .target(
-            name: "InternalCollectionsUtilities",
+            name: "KInternalCollectionsUtilities",
             dependencies: [],
             path: "Sources/InternalCollectionsUtilities"),
         .target(
-            name: "IdentifiedCollections",
-            dependencies: ["OrderedCollections"],
+            name: "KIdentifiedCollections",
+            dependencies: ["KOrderedCollections"],
             path: "Sources/IdentifiedCollections"),
         .target(
             name: "AnyCodable",

Sources/ComposableArchitecture/Internal/AreOrderedSetsDuplicates.swift

@@ -1,5 +1,5 @@
 import Foundation
-import OrderedCollections
+import KOrderedCollections
 
 @inlinable
 func areOrderedSetsDuplicates<T>(_ lhs: OrderedSet<T>, _ rhs: OrderedSet<T>) -> Bool {

Sources/ComposableArchitecture/Observation/ObservableState.swift

@@ -1,5 +1,5 @@
 import Foundation
-import IdentifiedCollections
+import KIdentifiedCollections
 import KPerception
 
 /// A type that emits notifications to observers when underlying data changes.

Sources/IdentifiedCollections/IdentifiedArray/IdentifiedArray+Codable.swift

@@ -1,4 +1,4 @@
-import OrderedCollections
+import KOrderedCollections
 
 extension IdentifiedArray: Encodable where Element: Encodable {
     @inlinable

Sources/IdentifiedCollections/IdentifiedArray/IdentifiedArray+Collection.swift

@@ -1,4 +1,4 @@
-import OrderedCollections
+import KOrderedCollections
 
 extension IdentifiedArray: Collection {
     @inlinable

Sources/IdentifiedCollections/IdentifiedArray/IdentifiedArray+IdentifiedCollection.swift

@@ -1,4 +1,4 @@
-import OrderedCollections
+import KOrderedCollections
 
 extension IdentifiedArray: _IdentifiedCollection {
     /// A read-only collection view for the ids contained in this array, as an `OrderedSet`.

Sources/IdentifiedCollections/IdentifiedArray/IdentifiedArray+Initializers.swift

@@ -1,4 +1,4 @@
-import OrderedCollections
+import KOrderedCollections
 
 extension IdentifiedArray {
     /// Creates a new array from the elements in the given sequence, which must not contain duplicate

Sources/IdentifiedCollections/IdentifiedArray/IdentifiedArray+Insertions.swift

@@ -1,4 +1,4 @@
-import OrderedCollections
+import KOrderedCollections
 
 extension IdentifiedArray {
     /// Append a new member to the end of the array, if the array doesn't already contain it.

Sources/IdentifiedCollections/IdentifiedArray/IdentifiedArray+MutableCollection.swift

@@ -1,4 +1,4 @@
-import OrderedCollections
+import KOrderedCollections
 
 extension IdentifiedArray: MutableCollection {
     @inlinable

Sources/IdentifiedCollections/IdentifiedArray/IdentifiedArray+RangeReplaceableCollection.swift

@@ -1,4 +1,4 @@
-import OrderedCollections
+import KOrderedCollections
 
 @available(iOS 13, macOS 10.15, tvOS 13, watchOS 6, *)
 extension IdentifiedArray: RangeReplaceableCollection

Sources/IdentifiedCollections/IdentifiedArray/IdentifiedArray.swift

@@ -1,4 +1,4 @@
-import OrderedCollections
+import KOrderedCollections
 
 /// An ordered collection of identifiable elements.
 ///

Sources/KlaviyoCore/AppLifeCycleEvents.swift

@@ -7,6 +7,7 @@
 
 import Combine
 import Foundation
+import KComposableArchitecture
 import UIKit
 
 public enum LifeCycleErrors: Error {
@@ -54,6 +55,7 @@ public struct AppLifeCycleEvents {
             .map { _ in LifeCycleEvents.backgrounded }
         // The below is a bit convoluted since network status can be nil.
         let reachability = notificationPublisher(ReachabilityChangedNotification)
+            .receive(on: UIScheduler.shared)
             .compactMap { _ in
                 let status = reachabilityStatus() ?? .reachableViaWWAN
                 return LifeCycleEvents.reachabilityChanged(status: status)

Sources/KlaviyoCore/KlaviyoEnvironment.swift

@@ -142,8 +142,8 @@ public struct KlaviyoEnvironment: Sendable {
         timeZone: { TimeZone.autoupdatingCurrent.identifier },
         klaviyoAPI: KlaviyoAPI(),
         timer: { interval in
-            let timerActor = TimerActor()
-            return AsyncStream { continuation in
+            AsyncStream { continuation in
+                let timerActor = TimerActor()
                 Task {
                     // Start the timer via the TimerActor
                     #if swift(>=6)
@@ -201,21 +201,26 @@ public struct DataDecoder: Sendable {
 }
 
 actor TimerActor {
-    private var timer: Timer?
+    private var timer: DispatchSourceTimer?
 
     func startTimer(interval: TimeInterval, continuation: AsyncStream<Date>.Continuation) {
         // Ensure any previous timer is invalidated
         stopTimer()
 
         // Create a new Timer and fire it
-        timer = Timer.scheduledTimer(withTimeInterval: interval, repeats: true) { _ in
+        // Create a new DispatchSourceTimer and start it
+        let newTimer = DispatchSource.makeTimerSource(queue: .global())
+        newTimer.schedule(deadline: .now(), repeating: interval)
+        newTimer.setEventHandler {
             continuation.yield(Date())
         }
+        newTimer.resume()
+        timer = newTimer
     }
 
     func stopTimer() {
         // Invalidate the existing timer if there is one
-        timer?.invalidate()
+        timer?.cancel()
         timer = nil
     }
 }

Sources/KlaviyoSwift/Klaviyo.swift

@@ -25,7 +25,8 @@ func dispatchStoreAction(action: KlaviyoAction) async {
 ///
 /// From there you can you can call the additional methods below to track events and profile.
 @MainActor
-public final class KlaviyoSDK {
+public struct KlaviyoSDK {
+    public init() {}
     private var state: KlaviyoState {
         klaviyoSwiftEnvironment.state()
     }

Sources/KlaviyoSwift/KlaviyoSwiftEnvironment.swift

@@ -7,7 +7,7 @@
 
 import Combine
 import Foundation
-@_spi(Internals) import ComposableArchitecture // to access internal state
+@_spi(Internals) import KComposableArchitecture // to access internal state
 import KlaviyoCore
 import UIKit
 
@@ -19,7 +19,7 @@ struct KlaviyoSwiftEnvironment: Sendable {
     var send: @MainActor (KlaviyoAction) async -> StoreTask
     var state: @MainActor () -> KlaviyoState
     var statePublisher: @MainActor () -> AnyPublisher<KlaviyoState, Never>
-    var stateChangePublisher: @MainActor () -> AsyncStream<KlaviyoAction>
+    var stateChangePublisher: @MainActor () -> AsyncStream<Never>
     var lifeCyclePublisher: @MainActor () -> AsyncStream<KlaviyoAction>
     var getBackgroundSetting: @MainActor () -> PushBackground
     var networkSession: @MainActor () -> NetworkSession
@@ -37,34 +37,7 @@ struct KlaviyoSwiftEnvironment: Sendable {
             store.publisher.eraseToAnyPublisher()
         },
         stateChangePublisher: {
-            let publisher = StateChangePublisher().publisher()
-            return AsyncStream<KlaviyoAction> { continuation in
-
-                Task {
-                    let cancellableStore = CancellableStore()
-                    let cancellable = publisher.sink { value in
-                        continuation.yield(value)
-                    }
-                    Task {
-                        #if swift(>=6)
-                        cancellableStore.store(cancellable)
-                        #else
-                        await cancellableStore.store(cancellable)
-                        #endif
-                    }
-
-                    // Handle cancellation
-                    continuation.onTermination = { @Sendable _ in
-                        Task {
-                            #if swift(>=6)
-                            cancellableStore.cancel()
-                            #else
-                            await cancellableStore.cancel()
-                            #endif
-                        }
-                    }
-                }
-            }
+            StateChangePublisher().publisher()
         }, lifeCyclePublisher: {
             let publisher = AppLifeCycleEvents.production.lifeCycleEvents(environment.notificationCenterPublisher, environment.startReachability, environment.stopReachability, environment.reachabilityStatus).map(\.transformToKlaviyoAction).eraseToAnyPublisher()
             return AsyncStream<KlaviyoAction> { continuation in

Sources/KlaviyoSwift/StateManagement/StateChangePublisher.swift

@@ -11,7 +11,7 @@ import UIKit
 
 @_spi(KlaviyoPrivate)
 @MainActor
-public struct StateChangePublisher {
+public struct StateChangePublisher: Sendable {
     static var debouncedPublisher: (AnyPublisher<KlaviyoState, Never>) -> AnyPublisher<KlaviyoState, Never> = { publisher in
         publisher
             .debounce(for: .seconds(1), scheduler: DispatchQueue.global())
@@ -26,18 +26,19 @@ public struct StateChangePublisher {
     }
 
     // publisher to listen for state and persist them on an interval.
-    // does not emit action but mapped that way so it can be used in the store.
-    var publisher: @MainActor () -> AnyPublisher<KlaviyoAction, Never> = {
-        debouncedPublisher(createStatePublisher())
-            .flatMap { state -> Empty<KlaviyoAction, Never> in
-                saveKlaviyoState(state: state)
-                return Empty<KlaviyoAction, Never>()
+    // does not emit anything
+    var publisher: @MainActor () -> AsyncStream<Never> = {
+        AsyncStream { _ in
+            Task {
+                for await state in debouncedPublisher(createStatePublisher()).values {
+                    saveKlaviyoState(state: state)
+                }
             }
-            .eraseToAnyPublisher()
+        }
     }
 
     @_spi(KlaviyoPrivate)
-    public struct PrivateState {
+    public struct PrivateState: Sendable {
         public var email: String?
         public var anonymousId: String?
         public var phoneNumber: String?
@@ -46,16 +47,21 @@ public struct StateChangePublisher {
     }
 
     @_spi(KlaviyoPrivate)
-    public static func internalStatePublisher() -> AnyPublisher<PrivateState, Never> {
-        createStatePublisher()
-            .map { state in
-                PrivateState(
-                    email: state.email,
-                    anonymousId: state.anonymousId,
-                    phoneNumber: state.phoneNumber,
-                    externalId: state.externalId,
-                    pushToken: state.pushTokenData?.pushToken)
+    @MainActor
+    public static func internalStatePublisher() -> AsyncStream<PrivateState> {
+        let publisher = StateChangePublisher.createStatePublisher()
+        return AsyncStream { continuation in
+            Task {
+                for await state in publisher
+                    .subscribe(on: DispatchQueue.main).values {
+                    continuation.yield(PrivateState(
+                        email: state.email,
+                        anonymousId: state.anonymousId,
+                        phoneNumber: state.phoneNumber,
+                        externalId: state.externalId,
+                        pushToken: state.pushTokenData?.pushToken))
+                }
             }
-            .eraseToAnyPublisher()
+        }
     }
 }

Sources/KlaviyoSwift/StateManagement/StateManagement.swift

@@ -12,8 +12,8 @@
 //
 
 import AnyCodable
-import ComposableArchitecture
 import Foundation
+import KComposableArchitecture
 import KlaviyoCore
 
 enum StateManagementConstants {
@@ -201,14 +201,16 @@ struct KlaviyoReducer: Reducer {
                 await send(.start)
             }
             .merge(with: .run { send in
-                for await action in await klaviyoSwiftEnvironment.lifeCyclePublisher() {
+                let lifeCyclePublisher = await MainActor.run { klaviyoSwiftEnvironment.lifeCyclePublisher()
+                }
+                for await action in lifeCyclePublisher {
                     await send(action)
                 }
             })
-            .merge(with: .run { send in
-                for await action in await klaviyoSwiftEnvironment.stateChangePublisher() {
-                    await send(action)
+            .merge(with: .run { _ in
+                let publisher = await MainActor.run { klaviyoSwiftEnvironment.stateChangePublisher()
                 }
+                for await _ in publisher {}
             })
 
         case let .setEmail(email, appContextInfo):