Re-add liveview-channels feature flag (#101)

simlay · web-flow · commit 4b7d303f98be · 2024-05-03T21:26:12.000-04:00
* Initial parts for re-adding phoenix-channels-client in
* Add PhoenixChannelClient to swift release
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,6 +43,16 @@ jobs:
             target
           key: ${{ github.workflow }}-${{ github.job }}-toolchain-${{ env.TOOLCHAIN }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Set up Elixir
+        run: brew install elixir
+
+      - name: Install test server dependencies, compile and run in background
+        working-directory: ./tests/support/test_server
+        run: |
+          mix deps.get
+          mix compile
+          mix phx.server &
+
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -97,6 +107,16 @@ jobs:
             target
           key: ${{ github.workflow }}-${{ github.job }}-toolchain-${{ env.TOOLCHAIN }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Set up Elixir
+        run: brew install elixir
+
+      - name: Install test server dependencies, compile and run in background
+        working-directory: ./tests/support/test_server
+        run: |
+          mix deps.get
+          mix compile
+          mix phx.server &
+
       - name: Build swift package
         run: cargo make uniffi-swift-package
 
@@ -122,6 +142,16 @@ jobs:
             target
           key: ${{ github.workflow }}-${{ github.job }}-toolchain-${{ env.TOOLCHAIN }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Set up Elixir
+        run: brew install elixir
+
+      - name: Install test server dependencies, compile and run in background
+        working-directory: ./tests/support/test_server
+        run: |
+          mix deps.get
+          mix compile
+          mix phx.server &
+
       - name: Get the JNA jar for testing kotlin.
         run: wget 'https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar'
       - name: Test
@@ -169,19 +199,6 @@ jobs:
         with:
           os: ${{ matrix.apple-sim }}
 
-      - name: Build tests
-        run: |
-          cargo -Zbuild-std test --target ${{ matrix.rust-target }} --no-run
-
-      - name: Run Rust tests on simulator for ${{ matrix.rust-target }}
-        env:
-          DINGHY_LOG: debug
-        timeout-minutes: 20
-        run: |
-          cargo dinghy all-platforms
-          cargo dinghy all-devices
-          cargo -Zbuild-std test --target ${{ matrix.rust-target }}
-
       - name: Set up Elixir
         run: brew install elixir
 
@@ -192,25 +209,15 @@ jobs:
           mix compile
           mix phx.server &
 
-      - name: Build tests with liveview-channels
-        run: cargo -Zbuild-std test --target ${{ matrix.rust-target }} --features liveview-channels --no-run
-
-      - name: Run Rust tests on simulator for ${{ matrix.rust-target }} with liveview-channels
-        env:
-          DINGHY_LOG: debug
-        timeout-minutes: 20
-        run: |
-          cargo -Zbuild-std test --target ${{ matrix.rust-target }} --features liveview-channels -- --test-threads 1
-
       - name: Build tests with liveview-channels-tls
-        run: cargo -Zbuild-std test --target ${{ matrix.rust-target }} --features liveview-channels-tls --no-run
+        run: cargo -Zbuild-std test --target ${{ matrix.rust-target }} --no-run
 
-      - name: Run Rust tests on simulator for ${{ matrix.rust-target }} with liveview-channels-tls
+      - name: Run Rust tests on simulator for ${{ matrix.rust-target }}
         env:
           DINGHY_LOG: debug
         timeout-minutes: 20
         run: |
-          cargo -Zbuild-std test --target ${{ matrix.rust-target }} --features liveview-channels-tls -- --test-threads 1
+          cargo -Zbuild-std test --target ${{ matrix.rust-target }} -- --test-threads 1
 
   android_simulator_tests:
     # rust cross-compilation
@@ -238,36 +245,17 @@ jobs:
         with:
           tool: cargo-dinghy@0.7.1
 
-# TODO: Fix this when enabling live-channels feature flag.
-#      - name: Cache deps
-#        id: cache-deps
-#        uses: actions/cache@v4
-#        env:
-#          cache-name: cache-elixir-deps
-#        with:
-#          path: tests/support/test_server/deps
-#          key: ${{ runner.os }}-mix-${{ env.cache-name }}-deps-${{ hashFiles('**/mix.lock') }}
-#
-#      - name: Cache compiled build
-#        id: cache-build
-#        uses: actions/cache@v4
-#        env:
-#          cache-name: cache-compiled-build
-#        with:
-#          path: tests/support/test_server/_build
-#          key: ${{ runner.os }}-mix-${{ env.cache-name }}-build-${{ hashFiles('**/mix.lock') }}
-#
-#      - uses: erlef/setup-beam@v1
-#        with:
-#          elixir-version:  1.15
-#          otp-version: 25
-#
-#      - name: Install test server dependencies, compile and run in background
-#        working-directory: ./tests/support/test_server
-#        run: |
-#          mix deps.get
-#          mix compile
-#          mix phx.server &
+      - uses: erlef/setup-beam@v1
+        with:
+          elixir-version:  1.15
+          otp-version: 25
+
+      - name: Install test server dependencies, compile and run in background
+        working-directory: ./tests/support/test_server
+        run: |
+          mix deps.get
+          mix compile
+          mix phx.server &
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -89,14 +89,14 @@ jobs:
           sed -i "" -E "s/(let releaseChecksum = \")[^\"]+(\")/\1$checksum\2/g" Package.swift
           sed -i "" -E "s/let useLocalFramework = true/let useLocalFramework = false/g" Package.swift
           git add Package.swift
-          git add -f ./crates/core/liveview-native-core-swift/Sources/LiveViewNativeCore/LiveViewNativeCore.swift
+          git add -f ./crates/core/liveview-native-core-swift/Sources/LiveViewNativeCore/*.swift
           git diff --staged
 
       - name: Commit, tag and push swift package
         if: github.event_name == 'release'
         run: |
           git add Package.swift
-          git add ./crates/core/liveview-native-core-swift/Sources/LiveViewNativeCore/LiveViewNativeCore.swift
+          git add ./crates/core/liveview-native-core-swift/Sources/LiveViewNativeCore/*.swift
           git commit -m "Update Package.swift and add generated LiveViewNativeCore.swift to tracking"
           git tag -fa ${{ github.event.release.tag_name }} -m "Swift Package Release ${{ github.event.release.tag_name }}"
           git push origin ${{ github.event.release.tag_name }} --force
diff --git a/Makefile.toml b/Makefile.toml
@@ -296,18 +296,17 @@ description = ""
 script_runner = "@shell"
 script = '''
 cat ${CARGO_TARGET_DIR}/uniffi/swift/generated/LiveViewNativeCoreFFI.modulemap \
+    ${CARGO_TARGET_DIR}/uniffi/swift/generated/PhoenixChannelsClientFFI.modulemap \
     > \
     ${CARGO_TARGET_DIR}/uniffi/swift/generated/module.modulemap
 '''
-# TODO: Put this back in the cat statment
-#${CARGO_TARGET_DIR}/uniffi/swift/generated/PhoenixChannelsClientFFI.modulemap \
 dependencies = ["uniffi-swift-generate"]
 
 [tasks.uniffi-swift-package]
 workspace = false
 category = "Packaging"
 description = "Generates the swift package from the liveview native core and phoenix-channels-clients bindings"
-dependencies = ["uniffi-swift-modulemap", "uniffi-swift-package-lvn"]# TODO add this back when adding channels clients, "uniffi-swift-package-phoenix"
+dependencies = ["uniffi-swift-modulemap", "uniffi-swift-package-lvn", "uniffi-swift-package-phoenix"]
 
 [tasks.uniffi-swift-package-lvn]
 workspace = false
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -23,7 +23,7 @@ crate-type = [
 name = "liveview_native_core"
 
 [features]
-default = []
+default = ["liveview-channels-tls"]
 liveview-channels = [
     "phoenix_channels_client",
     "reqwest",
@@ -33,6 +33,7 @@ liveview-channels = [
 ]
 liveview-channels-tls = [
     "liveview-channels",
+    "reqwest/native-tls-vendored",
     "phoenix_channels_client/native-tls",
 ]
 
@@ -43,19 +44,18 @@ cranelift-entity = { version = "0.107" }
 fixedbitset = { version = "0.4" }
 fxhash = { version = "0.2" }
 html5gum = { git = "https://github.com/liveviewnative/html5gum", branch = "lvn" }
-indexmap = { version = "2.1", features = ["std"] }
 petgraph = { version = "0.6", default-features = false, features = ["graphmap"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 smallstr = { version = "0.3", features = ["union"] }
 smallvec = { version = "1.10", features = ["union", "const_generics", "specialization"] }
 thiserror = "1.0"
 log = "0.4"
-reqwest = { version = "0.12.3", features = ["native-tls-vendored"], optional = true }
+reqwest = { version = "0.12.3", default-features = false, optional = true }
 uniffi = { version = "0.27" }
-phoenix_channels_client = { git = "https://github.com/liveview-native/phoenix-channels-client", branch = "simlay/fix-native-tls-feature-flag", optional = true }
 async-compat = { version = "0.2.3", optional = true }
 futures = { version = "0.3.29", optional = true }
+phoenix_channels_client = { git = "https://github.com/liveview-native/phoenix-channels-client", branch = "main", optional = true }
 
 [build-dependencies]
 Inflector = "0.11"
diff --git a/crates/core/liveview-native-core-jetpack/core/src/test/java/org/phoenixframework/liveview_jetpack/DocumentTest.kt b/crates/core/liveview-native-core-jetpack/core/src/test/java/org/phoenixframework/liveview_jetpack/DocumentTest.kt
@@ -15,7 +15,6 @@ import kotlinx.coroutines.test.runTest;
 import kotlin.system.*;
 import java.util.Base64;
 
-/*
 import org.phoenixframework.liveviewnative.core.LiveSocket;
 import org.phoenixframework.liveviewnative.core.LiveFile;
 class SocketTest {
@@ -32,7 +31,6 @@ class SocketTest {
         live_channel.uploadFile(live_file)
     }
 }
-*/
 
 class SimpleChangeHandler: DocumentChangeHandler {
     constructor() {
diff --git a/crates/core/liveview-native-core-swift/Tests/LiveViewNativeCoreTests/LiveViewNativeCoreSocketTests.swift b/crates/core/liveview-native-core-swift/Tests/LiveViewNativeCoreTests/LiveViewNativeCoreSocketTests.swift
@@ -4,19 +4,18 @@ import XCTest
     import SystemConfiguration
 #endif
 
-/*
 let url = "http://127.0.0.1:4001/upload?_lvn[format]=swiftui";
 let timeout = TimeInterval(10.0)
 
 
 final class LiveViewNativeCoreSocketTests: XCTestCase {
     func testConnect() async throws {
-        let live_socket = try LiveSocket(url, timeout)
+        let live_socket = try await LiveSocket(url, timeout)
         let _lvn_channel = try await live_socket.joinLiveviewChannel()
     }
 
     func testStatus() async throws {
-        let live_socket = try LiveSocket(url, timeout)
+        let live_socket = try await LiveSocket(url, timeout)
         let _lvn_channel = try await live_socket.joinLiveviewChannel()
         let socket = live_socket.socket()
 
@@ -38,7 +37,7 @@ let base64TileImg = "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD
 
 final class LiveViewNativeCoreUploadTests: XCTestCase {
     func testConnect() async throws {
-        let live_socket = try LiveSocket(url, timeout)
+        let live_socket = try await LiveSocket(url, timeout)
         let live_channel = try await live_socket.joinLiveviewChannel()
 
         let phx_id = try live_channel.getPhxRefFromUploadJoinPayload()
@@ -48,4 +47,3 @@ final class LiveViewNativeCoreUploadTests: XCTestCase {
         try await live_channel.uploadFile(live_file)
     }
 }
-*/
diff --git a/crates/core/src/live_socket/mod.rs b/crates/core/src/live_socket/mod.rs
@@ -395,6 +395,7 @@ impl LiveSocket {
     #[uniffi::constructor]
     pub fn new(url: String, timeout: Duration) -> Result<Self, LiveSocketError> {
         let url = url.parse::<Url>()?;
+        //let resp = reqwest::get(url.clone()).await?;
         let resp = futures::executor::block_on(async_compat::Compat::new(async {
             reqwest::get(url.clone()).await
         }))?;
@@ -407,6 +408,7 @@ impl LiveSocket {
         let resp_text = futures::executor::block_on(async_compat::Compat::new(async {
             resp.text().await
         }))?;
+        //let resp_text = resp.text().await?;
 
         let document = parse(&resp_text)?;
         debug!("document: {document}\n\n\n");
@@ -484,6 +486,7 @@ impl LiveSocket {
         debug!("websocket url: {websocket_url}");
 
         let websocket_url = websocket_url.parse::<Url>()?;
+        //let socket = Socket::spawn(websocket_url.clone(), Some(cookies))?;
         let socket = futures::executor::block_on(async_compat::Compat::new(async {
             Socket::spawn(websocket_url.clone(), Some(cookies))
         }))?;
diff --git a/crates/core/tests/bindings/simple.kts b/crates/core/tests/bindings/simple.kts
@@ -1,3 +1,2 @@
 import org.phoenixframework.liveviewnative.core.*;
-// TODO: Uncomment this when adding live-channel support.
-//import org.phoenixframework.liveviewnative.channel.*;
+import org.phoenixframework.liveviewnative.channel.*;

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ import kotlinx.coroutines.test.runTest;`
`15`	`15`	`import kotlin.system.*;`
`16`	`16`	`import java.util.Base64;`
`17`	`17`
`18`		`-/*`
`19`	`18`	`import org.phoenixframework.liveviewnative.core.LiveSocket;`
`20`	`19`	`import org.phoenixframework.liveviewnative.core.LiveFile;`
`21`	`20`	`class SocketTest {`
`@@ -32,7 +31,6 @@ class SocketTest {`
`32`	`31`	`live_channel.uploadFile(live_file)`
`33`	`32`	`}`
`34`	`33`	`}`
`35`		`-*/`
`36`	`34`
`37`	`35`	`class SimpleChangeHandler: DocumentChangeHandler {`
`38`	`36`	`constructor() {`