Add support for WASM-JS and migrate to Ktor 3.0.0

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3.1.0
+        uses: gradle/actions/setup-gradle@v4.0.1
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           cache-read-only: false

.github/workflows/detekt.yml

@@ -20,7 +20,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3.1.0
+        uses: gradle/actions/setup-gradle@v4.0.1
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           cache-read-only: ${{ github.ref != 'refs/heads/master' }}

.github/workflows/dokka.yml

@@ -38,7 +38,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3.1.0
+        uses: gradle/actions/setup-gradle@v4.0.1
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           cache-read-only: true

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3.1.0
+        uses: gradle/actions/setup-gradle@v4.0.1
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           cache-read-only: true

.github/workflows/samples.yml

@@ -27,7 +27,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3.1.0
+        uses: gradle/actions/setup-gradle@v4.0.1
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           cache-read-only: ${{ github.ref != 'refs/heads/master' }}

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         command: [
           'jvmTest testDebugUnitTest testReleaseUnitTest',
-          'jsTest',
+          'jsTest wasmJsTest',
           'iosX64Test iosSimulatorArm64Test',
           'macosArm64Test macosX64Test',
           'tvosX64Test tvosSimulatorArm64Test',
@@ -31,7 +31,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3.1.0
+        uses: gradle/actions/setup-gradle@v4.0.1
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           cache-read-only: ${{ github.ref != 'refs/heads/master' }}

Functions/README.md

@@ -4,23 +4,27 @@ Extends Supabase-kt with a multiplatform Functions client.
 
 Supported targets:
 
-| Target | **JVM** | **Android** | **JS** | **iOS** | **tvOS** | **watchOS** | **macOS** | **Windows** | **Linux** |
-|--------|---------|-------------|--------|---------|----------|-------------|-----------|-------------|-----------|
-|        | ✅       | ✅           | ✅      | ✅       | 	✅       | 	 ✅         | 	 ✅       | ✅           | ✅         |
+| Target | **JVM** | **Android** | **JS** | **Wasm** | **Apple** | **Windows** | **Linux** |
+|--------|---------|-------------|--------|----------|-----------|-------------|-----------|
+| Status | ✅       | ✅           | ✅      | ✅        | ✅         | ✅           | ✅         |
 
 <details>
 
 <summary>In-depth Kotlin targets</summary>
 
-**iOS:** iosArm64, iosSimulatorArm64, iosX64
-
 **JS**: Browser, NodeJS
 
-**tvOS**: tvosArm64, tvosX64, tvosSimulatorArm64
+**Wasm**: wasm-js
+
+**Apple:**
+
+- iOS: iosArm64, iosSimulatorArm64, iosX64
+
+- tvOS: tvosArm64, tvosX64, tvosSimulatorArm64
 
-**watchOS**: watchosArm64, watchosX64, watchosSimulatorArm64
+- watchOS: watchosArm64, watchosX64, watchosSimulatorArm64
 
-**MacOS**: macosX64, macosArm64
+- MacOS: macosX64, macosArm64
 
 **Windows**: mingwX64
 

GoTrue/README.md

@@ -4,27 +4,31 @@ Extends Supabase-kt with a multiplatform GoTrue client.
 
 Supported targets:
 
-| Target | **JVM** | **Android** | **JS** | **iOS** | **tvOS** | **watchOS** | **macOS** | **Windows** | **Linux** |
-| ------ | ------- | ----------- | ------ | ------- | -------- | ----------- | --------- | ----------- | --------- |
-|        | ✅      | ✅          | ✅     | ✅      | ☑️       | ☑️          | ✅        | ☑️          | ☑️        |
+| Target | **JVM** | **Android** | **JS** | **Wasm** | **Apple** | **Windows** | **Linux** |
+|--------|---------|-------------|--------|----------|-----------|-------------|-----------|
+| Status | ✅       | ✅           | ✅      | ✅        | ☑️*       | ☑️          | ☑️        |
 
-> Native support is experimental and needs feedback
->
 > ☑️ = No built-in OAuth support. Linux has no support for persistent session storage.
 
+\* **iOS and macOS are fully supported**
+
 <details>
 
 <summary>In-depth Kotlin targets</summary>
 
-**iOS:** iosArm64, iosSimulatorArm64, iosX64
-
 **JS**: Browser, NodeJS
 
-**tvOS**: tvosArm64, tvosX64, tvosSimulatorArm64
+**Wasm**: wasm-js
+
+**Apple:**
+
+- iOS: iosArm64, iosSimulatorArm64, iosX64
+
+- tvOS: tvosArm64, tvosX64, tvosSimulatorArm64
 
-**watchOS**: watchosArm64, watchosX64, watchosSimulatorArm64
+- watchOS: watchosArm64, watchosX64, watchosSimulatorArm64
 
-**MacOS**: macosX64, macosArm64
+- MacOS: macosX64, macosArm64
 
 **Windows**: mingwX64
 

GoTrue/build.gradle.kts

@@ -29,6 +29,7 @@ kotlin {
                 withWatchos()
                 withMingw()
                 withJs()
+                withWasmJs()
             }
         }
     }

GoTrue/src/desktopMain/kotlin/io/github/jan/supabase/gotrue/server/HttpCallbackRoutes.kt

@@ -5,7 +5,6 @@ import io.github.jan.supabase.gotrue.user.UserSession
 import io.github.jan.supabase.logging.d
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
 import io.ktor.server.response.respondText
 import io.ktor.server.routing.Routing
 import io.ktor.server.routing.get

GoTrue/src/desktopMain/kotlin/io/github/jan/supabase/gotrue/server/HttpCallbackServer.kt

@@ -1,6 +1,5 @@
 package io.github.jan.supabase.gotrue.server
 
-import io.github.jan.supabase.annotations.SupabaseExperimental
 import io.github.jan.supabase.gotrue.Auth
 import io.github.jan.supabase.gotrue.AuthImpl
 import io.github.jan.supabase.gotrue.openExternalUrl
@@ -11,7 +10,6 @@ import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.ApplicationCall
 import io.ktor.server.application.ApplicationStopPreparing
 import io.ktor.server.cio.CIO
-import io.ktor.server.engine.ApplicationEngineEnvironment
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.response.respondText
 import io.ktor.server.routing.routing
@@ -23,7 +21,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
 
-@OptIn(SupabaseExperimental::class)
 internal suspend fun createServer(
     url: suspend (redirect: String) -> String,
     auth: Auth,
@@ -41,7 +38,7 @@ internal suspend fun createServer(
     }
     coroutineScope {
         val timeoutScope = launch {
-            val port = server.resolvedConnectors().first().port
+            val port = server.engine.resolvedConnectors().first().port
             Auth.logger.d {
                 "Started OAuth callback server on port $port. Opening url in browser..."
             }
@@ -64,7 +61,7 @@ internal suspend fun createServer(
         }
         launch {
             suspendCancellableCoroutine {
-                server.environment.monitor.subscribe(ApplicationStopPreparing) { _ ->
+                server.monitor.subscribe(ApplicationStopPreparing) { _ ->
                     it.resume(Unit)
                     timeoutScope.cancel()
                 }
@@ -84,14 +81,9 @@ internal suspend fun shutdown(call: ApplicationCall, message: String) {
 
     val latch = CompletableDeferred<Nothing>()
     call.application.launch {
+        application.monitor.raise(ApplicationStopPreparing, environment)
         latch.join()
-
-        environment.monitor.raise(ApplicationStopPreparing, environment)
-        if (environment is ApplicationEngineEnvironment) {
-            environment.stop()
-        } else {
-            application.dispose()
-        }
+        application.dispose()
     }
 
     try {

GoTrue/src/jsMain/kotlin/io/github/jan/supabase/gotrue/providers/ExternalAuthConfig.kt

@@ -1,17 +1,6 @@
 package io.github.jan.supabase.gotrue.providers
 
-import kotlinx.browser.window
-
 /**
  * Configuration for external authentication providers like Google, Twitter, etc.
  */
-actual class ExternalAuthConfig: ExternalAuthConfigDefaults() {
-
-    /**
-     * The URL to redirect to after a successful login.
-     *
-     * Defaults to `Window.location.origin`
-     */
-    var redirectUrl: String = window.location.origin
-
-}
+actual class ExternalAuthConfig: ExternalAuthConfigDefaults()

GoTrue/src/wasmJsMain/kotlin/io/github/jan/supabase/gotrue/AuthConfig.kt

@@ -0,0 +1,8 @@
+package io.github.jan.supabase.gotrue
+
+import io.github.jan.supabase.plugins.CustomSerializationConfig
+
+/**
+ * The configuration for [Auth]
+ */
+actual class AuthConfig: CustomSerializationConfig, AuthConfigDefaults()

GoTrue/src/wasmJsMain/kotlin/io/github/jan/supabase/gotrue/RedirectUrl.kt

@@ -0,0 +1,7 @@
+package io.github.jan.supabase.gotrue
+
+import io.github.jan.supabase.annotations.SupabaseInternal
+import kotlinx.browser.window
+
+@SupabaseInternal
+actual fun Auth.defaultPlatformRedirectUrl(): String? = window.location.origin

GoTrue/src/wasmJsMain/kotlin/io/github/jan/supabase/gotrue/Utils.wasmJs.kt

@@ -0,0 +1,8 @@
+package io.github.jan.supabase.gotrue
+
+import io.github.jan.supabase.SupabaseClient
+import kotlinx.browser.window
+
+internal actual suspend fun SupabaseClient.openExternalUrl(url: String) {
+    window.location.href = url
+}

GoTrue/src/wasmJsMain/kotlin/io/github/jan/supabase/gotrue/providers/ExternalAuthConfig.kt

@@ -0,0 +1,6 @@
+package io.github.jan.supabase.gotrue.providers
+
+/**
+ * Configuration for external authentication providers like Google, Twitter, etc.
+ */
+actual class ExternalAuthConfig: ExternalAuthConfigDefaults()

GoTrue/src/wasmJsMain/kotlin/io/github/jan/supabase/gotrue/setupPlatform.kt

@@ -0,0 +1,47 @@
+package io.github.jan.supabase.gotrue
+
+import io.github.jan.supabase.annotations.SupabaseInternal
+import io.ktor.util.PlatformUtils.IS_BROWSER
+import kotlinx.browser.window
+import kotlinx.coroutines.launch
+import org.w3c.dom.url.URL
+
+@SupabaseInternal
+actual fun Auth.setupPlatform() {
+    this as AuthImpl
+
+    fun checkForHash() {
+        if(window.location.hash.isBlank()) return
+        val afterHash = window.location.hash.substring(1)
+
+        if(!afterHash.contains('=')) {
+            // No params after hash, no need to continue
+            return
+        }
+        parseFragmentAndImportSession(afterHash) {
+            val newURL = window.location.href.split("?")[0];
+            window.history.replaceState(null, window.document.title, newURL);
+        }
+    }
+
+    fun checkForPCKECode() {
+        val url = URL(window.location.href)
+        val code = url.searchParams.get("code") ?: return
+        authScope.launch {
+            val session = exchangeCodeForSession(code)
+            importSession(session)
+        }
+        val newURL = window.location.href.split("?")[0];
+        window.history.replaceState(null, window.document.title, newURL);
+    }
+
+    if(IS_BROWSER) {
+        window.onhashchange = {
+            checkForHash()
+        }
+        window.onload = {
+            checkForHash()
+            checkForPCKECode()
+        }
+    }
+}

GoTrue/src/wasmJsTest/kotlin/platformSettings.kt

@@ -0,0 +1,3 @@
+import io.github.jan.supabase.gotrue.AuthConfig
+
+actual fun AuthConfig.platformSettings() = Unit

Postgrest/README.md

@@ -4,23 +4,27 @@ Extends Supabase-kt with a multiplatform Postgrest client.
 
 Supported targets:
 
-| Target | **JVM** | **Android** | **JS** | **iOS** | **tvOS** | **watchOS** | **macOS** | **Windows** | **Linux** |
-| ------ | ------- | ----------- | ------ | ------- | -------- | ----------- | --------- | ----------- | --------- |
-|        | ✅      | ✅          | ✅     | ✅      | ✅       | ✅          | ✅        | ✅          | ✅        |
+| Target | **JVM** | **Android** | **JS** | **Wasm** | **Apple** | **Windows** | **Linux** |
+|--------|---------|-------------|--------|----------|-----------|-------------|-----------|
+| Status | ✅       | ✅           | ✅      | ✅        | ✅         | ✅           | ✅         |
 
 <details>
 
 <summary>In-depth Kotlin targets</summary>
 
-**iOS:** iosArm64, iosSimulatorArm64, iosX64
-
 **JS**: Browser, NodeJS
 
-**tvOS**: tvosArm64, tvosX64, tvosSimulatorArm64
+**Wasm**: wasm-js
+
+**Apple:**
+
+- iOS: iosArm64, iosSimulatorArm64, iosX64
+
+- tvOS: tvosArm64, tvosX64, tvosSimulatorArm64
 
-**watchOS**: watchosArm64, watchosX64, watchosSimulatorArm64
+- watchOS: watchosArm64, watchosX64, watchosSimulatorArm64
 
-**MacOS**: macosX64, macosArm64
+- MacOS: macosX64, macosArm64
 
 **Windows**: mingwX64
 

Postgrest/src/wasmJsMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt

@@ -0,0 +1,7 @@
+package io.github.jan.supabase.postgrest
+
+import io.github.jan.supabase.annotations.SupabaseInternal
+import kotlin.reflect.KProperty1
+
+@SupabaseInternal
+actual fun <T, V> getSerialName(property: KProperty1<T, V>) = property.name

README.md

@@ -6,12 +6,12 @@ For information about supported Kotlin targets, see the corresponding module REA
 
 [Migrating from version 1.4.X to 2.0.0](/MIGRATION.md)
 
-*Note: [WASM](https://github.com/supabase-community/supabase-kt/issues/86) build available: [2.5.4-wasm0](https://github.com/supabase-community/supabase-kt/releases/tag/2.5.4-wasm0)*
+*Note: The `WASM-JS` target for supported modules is only available for version 2.7.0 and above*
 
 [![](https://img.shields.io/github/release/supabase-community/supabase-kt?label=stable)](https://github.com/supabase-community/supabase-kt/releases) 
 [![](https://badgen.net/github/release/supabase-community/supabase-kt?label=prerelease)](https://central.sonatype.com/search?q=io.github.jan.supabase&smo=true) 
-[![Kotlin](https://img.shields.io/badge/kotlin-2.0.10-blue.svg?logo=kotlin)](http://kotlinlang.org) 
-![https://img.shields.io/badge/ktor-2.3.12-blue](https://img.shields.io/badge/ktor-2.3.12-blue)
+[![Kotlin](https://img.shields.io/badge/kotlin-2.0.20-blue.svg?logo=kotlin)](http://kotlinlang.org) 
+[![Ktor](https://img.shields.io/badge/ktor-3.0.0--rc--1-blue)](https://ktor.io/)
 [![slack](https://img.shields.io/badge/slack-%23supabase--kt-purple.svg?logo=slack)](https://kotlinlang.slack.com/archives/C06QXPC7064)
 
 ### Links
@@ -96,7 +96,11 @@ val iosMain by getting {
 
 **Note:** It is recommended to use the same Ktor version as supabase-kt:
 
-![https://img.shields.io/badge/ktor-2.3.12-blue](https://img.shields.io/badge/ktor-2.3.12-blue)
+__For 2.7.0 and above:__
+[![Ktor](https://img.shields.io/badge/ktor-3.0.0--rc--1-blue)](https://ktor.io/)
+
+__For versions below 2.7.0:__
+[![Ktor](https://img.shields.io/badge/ktor-2.3.12-blue)](https://ktor.io/)
 
 ## Main Modules