Move the LiveSocket and LiveChannel api into one central object.

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.CARGO_MAKE_TOOLCHAIN }}
+          toolchain: nightly
           components: rustfmt
 
       - name: Cargo fmt

.gitignore

@@ -31,3 +31,6 @@ Package.resolved
 crates/wasm/phoenix_live_view
 crates/wasm/liveview-native-core-wasm-*
 crates/wasm/liveview-native-core-wasm-*.tgz
+
+### When vendoring in as a swift package
+.swiftpm

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/core", "crates/uniffi-bindgen", "crates/wasm"]
 
 [workspace.package]
-version = "0.4.0-rc-4"
+version = "0.4.0"
 rust-version = "1.64"
 authors = [
     "Paul Schoenfelder <[email protected]>",
@@ -23,7 +23,7 @@ edition = "2021"
 publish = false
 
 [workspace.dependencies]
-uniffi = "0.28.0"
+uniffi = "0.28.3"
 
 [profile.dev]
 split-debuginfo = "unpacked"

crates/core/Cargo.toml

@@ -20,7 +20,14 @@ name = "liveview_native_core"
 
 [features]
 default = ["liveview-channels-tls"]
-liveview-channels = ["phoenix_channels_client", "reqwest", "uniffi/tokio"]
+liveview-channels = [
+    "phoenix_channels_client",
+    "reqwest",
+    "uniffi/tokio",
+    "cookie_store",
+    "reqwest_cookie_store",
+    "tokio",
+]
 liveview-channels-tls = [
     "liveview-channels",
     "reqwest/native-tls-vendored",
@@ -35,8 +42,15 @@ browser = [
 ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+#
+[target.'cfg(target_os = "android")'.dependencies]
+android_logger = "0.13"
+
+[target.'cfg(target_vendor = "apple")'.dependencies]
+oslog = "0.2.0"
 
 [dependencies]
+serde_urlencoded = "0.7.1"
 cranelift-entity = { version = "0.116" }
 fixedbitset = { version = "0.5" }
 fxhash = { version = "0.2" }
@@ -54,7 +68,13 @@ log = "0.4"
 reqwest = { version = "0.12.3", default-features = false, optional = true, features = [
     "cookies",
 ] }
+
+cookie_store = { version = "0.21.1", default-features = false, optional = true }
+reqwest_cookie_store = { version = "0.8.0", default-features = false, optional = true }
+env_logger = "0.11.1"
 uniffi = { workspace = true }
+
+tokio = { version = "1.43", features = ["full"], optional = true }
 phoenix_channels_client = { git = "https://github.com/liveview-native/phoenix-channels-client.git", branch = "main", optional = true, default-features = false }
 # This is for wasm support on phoenix-channels-client
 #phoenix_channels_client = { git = "https://github.com/liveview-native/phoenix-channels-client.git", branch = "simlay/webassembly-support", optional = true, default-features = false }
@@ -67,8 +87,6 @@ paste = { version = "1.0" }
 pretty_assertions = { version = "1.4.0" }
 text-diff = { version = "0.4.0" }
 uniffi = { workspace = true, features = ["bindgen-tests", "tokio"] }
-tokio = { version = "1.43", features = ["full"] }
-env_logger = "0.11.1"
 
 # For image generation for tests
 image = "0.25.1"

crates/core/liveview-native-core-jetpack/core/src/test/java/org/phoenixframework/liveview_jetpack/DocumentTest.kt

@@ -7,10 +7,8 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.phoenixframework.liveviewnative.core.ChangeType
 import org.phoenixframework.liveviewnative.core.ConnectOpts
-import org.phoenixframework.liveviewnative.core.ControlFlow
 import org.phoenixframework.liveviewnative.core.Document
 import org.phoenixframework.liveviewnative.core.DocumentChangeHandler
-import org.phoenixframework.liveviewnative.core.LiveChannelStatus
 import org.phoenixframework.liveviewnative.core.LiveFile
 import org.phoenixframework.liveviewnative.core.LiveSocket
 import org.phoenixframework.liveviewnative.core.NavOptions
@@ -62,10 +60,6 @@ class SimpleChangeHandler : DocumentChangeHandler {
     ) {
         println("${changeType}")
     }
-
-    override fun `handleChannelStatus`(`channelStatus`: LiveChannelStatus): ControlFlow {
-        return ControlFlow.ContinueListening
-    }
 }
 
 class DocumentTest {