Remove fixme. Add unit test.

Author: stevensJourney

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 
-## 1.10.0
-- Add `appMetadata` parameter to `PowerSyncDatabase.connect()` to include application metadata in sync requests. This metadata is merged into sync requests and displayed in PowerSync service logs.
+## 1.10.0 (unreleased)
+
+- Add `appMetadata` parameter to `PowerSyncDatabase.connect()` to include application metadata in
+  sync requests. This metadata is merged into sync requests and displayed in PowerSync service logs.
+
+Note: This requires a PowerSync service version `>=1.17.0` in order for logs to display metadata.
 
 ```kotlin
 database.connect(
@@ -15,10 +19,12 @@ database.connect(
 
 ## 1.9.0
 
-- Updated user agent string formats to allow viewing version distributions in the new PowerSync dashboard.
+- Updated user agent string formats to allow viewing version distributions in the new PowerSync
+  dashboard.
 - Sync options: `newClientImplementation` is now the default.
 - Make `androidx.sqlite:sqlite-bundled` an API dependency of `:core` to avoid toolchain warnings.
-- On Apple platforms, use a websocket protocol as a workaround to clients not supporting backpressure in HTTP response
+- On Apple platforms, use a websocket protocol as a workaround to clients not supporting
+  backpressure in HTTP response
   streams.
 
 ## 1.8.1
@@ -27,15 +33,19 @@ database.connect(
 
 ## 1.8.0
 
-- Refactor SDK: `com.powersync:powersync-core` has an identical API, but now depends on 
+- Refactor SDK: `com.powersync:powersync-core` has an identical API, but now depends on
   `com.powersync:powersync-common` where most logic is implemented.
-  - __POTENTIALLY BREAKING CHANGE__: If you were injecting a `DatabaseDriverFactory` into Koin or Dagger, note that the
-    `PowerSyncDatabase()` factory method now takes a more generic `PersistentConnectionFactory`.
-  - If you're using `PowerSyncDatabase.inMemory`, you explicitly have to import `com.powersync.inMemory` now.
+    - __POTENTIALLY BREAKING CHANGE__: If you were injecting a `DatabaseDriverFactory` into Koin or
+      Dagger, note that the
+      `PowerSyncDatabase()` factory method now takes a more generic `PersistentConnectionFactory`.
+    - If you're using `PowerSyncDatabase.inMemory`, you explicitly have to import
+      `com.powersync.inMemory` now.
 - Update the PowerSync core extension to version 0.4.8.
-- Add the `soft` flag to `disconnectAndClear()` which keeps an internal copy of synced data in the database, allowing
+- Add the `soft` flag to `disconnectAndClear()` which keeps an internal copy of synced data in the
+  database, allowing
   faster re-sync if a compatible token is used in the next `connect()` call.
-- Add the `clear` parameter to `RawTable` to run a statement helping the core extension clear raw tables.
+- Add the `clear` parameter to `RawTable` to run a statement helping the core extension clear raw
+  tables.
 
 ## 1.7.0
 

common/src/commonIntegrationTest/kotlin/com/powersync/sync/SyncIntegrationTest.kt

@@ -95,6 +95,33 @@ abstract class BaseSyncIntegrationTest(
             }
         }
 
+    @Test
+    fun useAppMetadata() =
+        databaseTest {
+            database.connect(
+                connector,
+                options = getOptions(),
+                appMetadata =
+                    mapOf(
+                        "app_version" to "1.0.0",
+                    ),
+            )
+            turbineScope(timeout = 10.0.seconds) {
+                val turbine = database.currentStatus.asFlow().testIn(this)
+                turbine.waitFor { it.connected }
+                turbine.cancel()
+            }
+
+            requestedSyncStreams shouldHaveSingleElement {
+                val meta = it.jsonObject["app_metadata"]!!.jsonObject
+                meta.keys shouldHaveSingleElement "app_version"
+                meta.values
+                    .first()
+                    .jsonPrimitive.content shouldBe "1.0.0"
+                true
+            }
+        }
+
     @Test
     @OptIn(DelicateCoroutinesApi::class)
     fun closesResponseStreamOnDatabaseClose() =

common/src/commonMain/kotlin/com/powersync/sync/StreamingSync.kt

@@ -94,6 +94,7 @@ internal class StreamingSyncClient(
                     configureSyncHttpClient(options.userAgent)
                     config.block(this)
                 }
+
             is SyncClientConfiguration.ExistingClient -> config.client
         }
 
@@ -305,7 +306,8 @@ internal class StreamingSyncClient(
         } else {
             // Use RSocket as a fallback to ensure we have backpressure on platforms that don't support it natively.
             flow {
-                val credentials = requireNotNull(connector.getCredentialsCached()) { "Not logged in" }
+                val credentials =
+                    requireNotNull(connector.getCredentialsCached()) { "Not logged in" }
 
                 emitAll(
                     httpClient.rSocketSyncStream(
@@ -506,52 +508,10 @@ internal class StreamingSyncClient(
         }
 
         private suspend fun connect(start: Instruction.EstablishSyncStream) {
-            // Merge local appMetadata from StreamingSyncClient into the request before sending
-            val mergedRequest = mergeAppMetadata(start.request)
-            receiveTextOrBinaryLines(mergedRequest).collect {
+            receiveTextOrBinaryLines(start.request).collect {
                 controlInvocations.send(it)
             }
         }
-
-        /**
-         * FIXME, the Rust implementation does not yet pass app_metadata to the sync instruction
-         *
-         * Merges local appMetadata into the request JsonObject.
-         * If the request already has app_metadata, the local appMetadata will be merged into it
-         * (with local values taking precedence for duplicate keys).
-         */
-        private fun mergeAppMetadata(request: JsonObject): JsonObject {
-            if (appMetadata.isEmpty()) {
-                return request
-            }
-
-            // Convert local appMetadata to JsonObject
-            val localAppMetadataJson =
-                JsonObject(
-                    appMetadata.mapValues { (_, value) -> JsonPrimitive(value) },
-                )
-
-            // Get existing app_metadata from request, if any
-            val existingAppMetadata =
-                request["app_metadata"] as? JsonObject ?: JsonObject(emptyMap())
-
-            // Merge: existing first, then local (local takes precedence)
-            val mergedAppMetadata =
-                JsonObject(
-                    buildMap {
-                        putAll(existingAppMetadata)
-                        putAll(localAppMetadataJson)
-                    },
-                )
-
-            // Create new request with merged app_metadata
-            return JsonObject(
-                buildMap {
-                    putAll(request)
-                    put("app_metadata", mergedAppMetadata)
-                },
-            )
-        }
     }
 
     @LegacySyncImplementation