Updating user agent formatting (#95)

* Updating user agent formatting.

* Added watchOS tracking.

* Added `CurrentVersion.swift` that tracks a libraryVersion variable.

* Sourcing os version for watchOS/tvOs from UIDevice. Dropping operatingSystemVersionString which is localised.

* Moved watchOS to AppKit.

* Added changelog entry.

Author: Chriztiaan

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.9.0 (unreleased)
 
+* Fixed user agent strings not following expected format.
 * Added Alpha `PowerSyncGRDB` product which supports sharing GRDB `DatabasePool`s with PowerSync and application logic.
 * Add `appMetadata` parameter to `PowerSyncDatabase.connect()` (via `ConnectOptions`) to include application metadata in sync requests. This metadata is merged into sync requests and displayed in PowerSync service logs.
 

Sources/PowerSync/CurrentVersion.swift

@@ -0,0 +1,3 @@
+// The current version of the PowerSync Swift SDK. This should be updated to the latest version in `CHANGELOG.md` when a new version is released.
+let libraryVersion = "1.9.0"
+

Sources/PowerSync/Kotlin/KotlinPowerSyncDatabaseImpl.swift

@@ -60,7 +60,7 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol,
             params: resolvedOptions.params.mapValues { $0.toKotlinMap() },
             options: createSyncOptions(
                 newClient: resolvedOptions.newClientImplementation,
-                userAgent: "PowerSync Swift SDK",
+                userAgent: userAgent(),
                 loggingConfig: resolvedOptions.clientConfiguration?.requestLogger?.toKotlinConfig()
             ),
             appMetadata: resolvedOptions.appMetadata

Sources/PowerSync/Kotlin/sync/UserAgent.swift

@@ -0,0 +1,29 @@
+import Foundation
+
+#if os(iOS) || os(tvOS)
+import UIKit
+#endif
+
+func userAgent() -> String {
+    #if os(macOS)
+    let osName = "macOS"
+    let version = ProcessInfo.processInfo.operatingSystemVersion
+    let osVersion = "\(version.majorVersion).\(version.minorVersion)"
+    #elseif os(watchOS)
+    let osName = "watchOS"
+    let version = ProcessInfo.processInfo.operatingSystemVersion
+    let osVersion = "\(version.majorVersion).\(version.minorVersion)"
+    #elseif os(iOS)
+    let osName = "iOS"
+    let osVersion = UIDevice.current.systemVersion
+    #elseif os(tvOS)
+    let osName = "tvOS"
+    let osVersion = UIDevice.current.systemVersion
+    #else
+    let osName = "unknown"
+    let version = ProcessInfo.processInfo.operatingSystemVersion
+    let osVersion = "\(version.majorVersion).\(version.minorVersion)"
+    #endif
+    
+    return "powersync-swift/\(libraryVersion) \(osName)/\(osVersion)"
+}

docs/Release.md

@@ -4,6 +4,7 @@
 
 * Confirm every PR you want in the release has been merged into `main`.
 * Update `CHANGELOG.md` with the changes.
++ Update `libraryVersion` variable in `Sources/PowerSync/CurrentVersion.swift` with the latest version in `CHANGELOG.md` (if a new version is being specified).
 * In GitHub actions on GitHub manually run the `Release PowerSync` action. You will be required to update the version and add release notes.
   The version string should have the form `1.0.0`, there should not be a `v` prefix on the tag name.
 * If the release notes are complicated and don't fit on a single line it is easier to rather update those after the release is completed by updating the release notes in the new release.