Attachments package

CHANGELOG.md

@@ -9,6 +9,7 @@
 Sqlite operation failure database is locked attempted to run migration and failed. closing connection
 ```
 * Fix race condition causing data received during uploads not to be applied.
+* Added Attachment helpers
 
 ## 1.0.0-BETA28
 

connectors/supabase/build.gradle.kts

@@ -36,6 +36,7 @@ kotlin {
             implementation(libs.kotlinx.coroutines.core)
             implementation(libs.supabase.client)
             api(libs.supabase.auth)
+            api(libs.supabase.storage)
         }
     }
 }

connectors/supabase/src/commonMain/kotlin/com/powersync/connector/supabase/SupabaseConnector.kt

@@ -17,6 +17,9 @@ import io.github.jan.supabase.auth.user.UserSession
 import io.github.jan.supabase.createSupabaseClient
 import io.github.jan.supabase.postgrest.Postgrest
 import io.github.jan.supabase.postgrest.from
+import io.github.jan.supabase.storage.BucketApi
+import io.github.jan.supabase.storage.Storage
+import io.github.jan.supabase.storage.storage
 import io.ktor.client.plugins.HttpSend
 import io.ktor.client.plugins.plugin
 import io.ktor.client.statement.bodyAsText
@@ -31,6 +34,7 @@ import kotlinx.serialization.json.Json
 public class SupabaseConnector(
     public val supabaseClient: SupabaseClient,
     public val powerSyncEndpoint: String,
+    private val storageBucket: String? = null,
 ) : PowerSyncBackendConnector() {
     private var errorCode: String? = null
 
@@ -52,17 +56,29 @@ public class SupabaseConnector(
             }
     }
 
+    public fun storageBucket(): BucketApi {
+        if (storageBucket == null) {
+            throw Exception("No bucket has been specified")
+        }
+        return supabaseClient.storage[storageBucket]
+    }
+
     public constructor(
         supabaseUrl: String,
         supabaseKey: String,
         powerSyncEndpoint: String,
+        storageBucket: String? = null,
     ) : this(
         supabaseClient =
             createSupabaseClient(supabaseUrl, supabaseKey) {
                 install(Auth)
                 install(Postgrest)
+                if (storageBucket != null) {
+                    install(Storage)
+                }
             },
         powerSyncEndpoint = powerSyncEndpoint,
+        storageBucket = storageBucket,
     )
 
     init {
@@ -81,7 +97,10 @@ public class SupabaseConnector(
                 val responseText = response.bodyAsText()
 
                 try {
-                    val error = Json { coerceInputValues = true }.decodeFromString<Map<String, String?>>(responseText)
+                    val error =
+                        Json { coerceInputValues = true }.decodeFromString<Map<String, String?>>(
+                            responseText,
+                        )
                     errorCode = error["code"]
                 } catch (e: Exception) {
                     Logger.e("Failed to parse error response: $e")
@@ -139,7 +158,9 @@ public class SupabaseConnector(
             check(supabaseClient.auth.sessionStatus.value is SessionStatus.Authenticated) { "Supabase client is not authenticated" }
 
             // Use Supabase token for PowerSync
-            val session = supabaseClient.auth.currentSessionOrNull() ?: error("Could not fetch Supabase credentials")
+            val session =
+                supabaseClient.auth.currentSessionOrNull()
+                    ?: error("Could not fetch Supabase credentials")
 
             check(session.user != null) { "No user data" }
 

core/README.md

@@ -24,8 +24,14 @@ structure:
 ## Note on SQLDelight
 
 The PowerSync core module, internally makes use
-of [SQLDelight](https://sqldelight.github.io/sqldelight/latest/) for it database API and typesafe database
+of [SQLDelight](https://sqldelight.github.io/sqldelight/latest/) for it database API and typesafe
+database
 query generation.
 
 The PowerSync core module does not currently support integrating with SQLDelight from client
 applications.
+
+## Attachment Helpers
+
+This module contains attachment helpers under the `com.powersync.attachments` package. See
+the [Attachment Helpers README](./src/commonMain/kotlin/com/powersync/attachments/README.md)

core/build.gradle.kts

@@ -5,10 +5,8 @@ import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-import org.jetbrains.kotlin.gradle.plugin.mpp.TestExecutable
 import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
 import org.jetbrains.kotlin.gradle.tasks.KotlinTest
-import org.jetbrains.kotlin.konan.target.Family
 
 
 plugins {
@@ -19,6 +17,7 @@ plugins {
     alias(libs.plugins.downloadPlugin)
     alias(libs.plugins.kotlinter)
     id("com.powersync.plugins.sonatype")
+    id("com.powersync.plugins.sharedbuild")
     alias(libs.plugins.mokkery)
     alias(libs.plugins.kotlin.atomicfu)
 }
@@ -72,29 +71,6 @@ val downloadPowersyncDesktopBinaries by tasks.registering(Download::class) {
     onlyIfModified(true)
 }
 
-val downloadPowersyncFramework by tasks.registering(Download::class) {
-    val coreVersion =
-        libs.versions.powersync.core
-            .get()
-    val framework =
-        "https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v$coreVersion/powersync-sqlite-core.xcframework.zip"
-
-    src(framework)
-    dest(binariesFolder.map { it.file("framework/powersync-sqlite-core.xcframework.zip") })
-    onlyIfModified(true)
-}
-
-val unzipPowersyncFramework by tasks.registering(Copy::class) {
-    dependsOn(downloadPowersyncFramework)
-
-    from(
-        zipTree(downloadPowersyncFramework.get().dest).matching {
-            include("powersync-sqlite-core.xcframework/**")
-        },
-    )
-    into(binariesFolder.map { it.dir("framework") })
-}
-
 val sqliteJDBCFolder =
     project.layout.buildDirectory
         .dir("jdbc")
@@ -178,20 +154,6 @@ kotlin {
             }
         }
 
-        if (konanTarget.family == Family.IOS && konanTarget.name.contains("simulator")) {
-            binaries.withType<TestExecutable>().configureEach {
-                linkTaskProvider.configure { dependsOn(unzipPowersyncFramework) }
-                linkerOpts("-framework", "powersync-sqlite-core")
-                val frameworkRoot =
-                    binariesFolder
-                        .map { it.dir("framework/powersync-sqlite-core.xcframework/ios-arm64_x86_64-simulator") }
-                        .get()
-                        .asFile.path
-
-                linkerOpts("-F", frameworkRoot)
-                linkerOpts("-rpath", frameworkRoot)
-            }
-        }
         /*
         If we ever need macOS support:
         {
@@ -316,8 +278,8 @@ android {
 }
 
 androidComponents.onVariants {
-        tasks.named("preBuild") {
-            dependsOn(moveJDBCJNIFiles)
+    tasks.named("preBuild") {
+        dependsOn(moveJDBCJNIFiles)
     }
 }