Fix passing parameters

Author: simolus3

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

@@ -17,18 +17,22 @@ import com.powersync.db.schema.Schema
 import com.powersync.testutils.UserRow
 import com.powersync.testutils.databaseTest
 import com.powersync.testutils.waitFor
+import com.powersync.utils.JsonParam
 import com.powersync.utils.JsonUtil
 import dev.mokkery.answering.returns
 import dev.mokkery.every
 import dev.mokkery.verify
 import dev.mokkery.verifyNoMoreCalls
 import dev.mokkery.verifySuspend
+import io.kotest.matchers.collections.shouldHaveSingleElement
 import io.kotest.matchers.collections.shouldHaveSize
 import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
@@ -60,6 +64,26 @@ abstract class BaseSyncIntegrationTest(
             }
         }
 
+    @Test
+    fun useParameters() =
+        databaseTest {
+            database.connect(connector, options = options, params = mapOf("foo" to JsonParam.String("bar")))
+            turbineScope(timeout = 10.0.seconds) {
+                val turbine = database.currentStatus.asFlow().testIn(this)
+                turbine.waitFor { it.connected }
+                turbine.cancel()
+            }
+
+            requestedSyncStreams shouldHaveSingleElement {
+                val params = it.jsonObject["parameters"]!!.jsonObject
+                params.keys shouldHaveSingleElement "foo"
+                params.values
+                    .first()
+                    .jsonPrimitive.content shouldBe "bar"
+                true
+            }
+        }
+
     @Test
     @OptIn(DelicateCoroutinesApi::class)
     fun closesResponseStreamOnDatabaseClose() =

core/src/commonIntegrationTest/kotlin/com/powersync/testutils/TestUtils.kt

@@ -18,15 +18,18 @@ import com.powersync.db.PowerSyncDatabaseImpl
 import com.powersync.db.schema.Schema
 import com.powersync.sync.LegacySyncImplementation
 import com.powersync.sync.SyncLine
+import com.powersync.utils.JsonUtil
 import dev.mokkery.answering.returns
 import dev.mokkery.everySuspend
 import dev.mokkery.mock
 import io.ktor.client.HttpClient
 import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.mock.toByteArray
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import kotlinx.io.files.Path
+import kotlinx.serialization.json.JsonElement
 
 expect val factory: DatabaseDriverFactory
 
@@ -87,6 +90,7 @@ internal class ActiveDatabaseTest(
 
     @OptIn(LegacySyncImplementation::class)
     var syncLines = Channel<SyncLine>()
+    var requestedSyncStreams = mutableListOf<JsonElement>()
     var checkpointResponse: () -> WriteCheckpointResponse = {
         WriteCheckpointResponse(WriteCheckpointData("1000"))
     }
@@ -129,7 +133,15 @@ internal class ActiveDatabaseTest(
     suspend fun openDatabaseAndInitialize(): PowerSyncDatabaseImpl = openDatabase().also { it.readLock { } }
 
     private fun createClient(config: HttpClientConfig<*>.() -> Unit): HttpClient {
-        val engine = MockSyncService(syncLines) { checkpointResponse() }
+        val engine =
+            MockSyncService(
+                lines = syncLines,
+                generateCheckpoint = { checkpointResponse() },
+                trackSyncRequest = {
+                    val parsed = JsonUtil.json.parseToJsonElement(it.body.toByteArray().decodeToString())
+                    requestedSyncStreams.add(parsed)
+                },
+            )
 
         return HttpClient(engine) {
             config()

core/src/commonMain/kotlin/com/powersync/sync/SyncStream.kt

@@ -48,6 +48,7 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.datetime.Clock
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
@@ -300,7 +301,12 @@ internal class SyncStream(
         var credentialsInvalidation: Job? = null,
     ) {
         suspend fun start() {
-            control("start", JsonUtil.json.encodeToString(params))
+            @Serializable
+            class StartParameters(
+                val parameters: JsonObject,
+            )
+
+            control("start", JsonUtil.json.encodeToString(StartParameters(params)))
             fetchLinesJob?.join()
         }
 

core/src/commonTest/kotlin/com/powersync/testutils/MockSyncService.kt

@@ -37,6 +37,7 @@ import kotlinx.serialization.encodeToString
 internal class MockSyncService(
     private val lines: ReceiveChannel<SyncLine>,
     private val generateCheckpoint: () -> WriteCheckpointResponse,
+    private val trackSyncRequest: suspend (HttpRequestData) -> Unit,
 ) : HttpClientEngineBase("sync-service") {
     override val config: HttpClientEngineConfig
         get() = Config
@@ -52,6 +53,7 @@ internal class MockSyncService(
         val scope = CoroutineScope(context)
 
         return if (data.url.encodedPath == "/sync/stream") {
+            trackSyncRequest(data)
             val job =
                 scope.writer {
                     lines.consume {

gradle.properties

@@ -2,6 +2,7 @@ kotlin.code.style=official
 # Gradle
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 org.gradle.caching=true
+org.gradle.configuration-cache=true
 # Compose
 org.jetbrains.compose.experimental.uikit.enabled=true
 # Android