fix: Android bundling (#105)

.dockerignore

@@ -3,6 +3,7 @@
 /.github
 /bundle
 /node_modules
+/scripts
 /target
 
 /.dockerignore

.github/workflows/rust-check.yaml

@@ -34,9 +34,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: .env symlink creation
-        run: ln -s .env.example .env
+        run: ln -s .env.dev .env
-      - name: npm build
+      - name: Tailwind CSS output creation
-        run: npm install && npm run build
+        run: touch assets/tailwind.css
       - name: rustfmt check
         run: cargo fmt --all --check
       - name: Clippy check

Dioxus.toml

@@ -2,20 +2,5 @@
 
 [web.app]
 
-# HTML title tag content
+# HTML title tag content.
-title = "todo_baggins"
+title = "Todo Baggins"
-
-# include `assets` in web platform
-[web.resource]
-
-# Additional CSS style files
-style = []
-
-# Additional JavaScript files
-script = []
-
-[web.resource.dev]
-
-# Javascript code file
-# serve: [dev-server] only
-script = []

docker-compose-android-bundle.yaml

@@ -0,0 +1,5 @@
+---
+services:
+  app:
+    build:
+      target: builder_android

docker/dev/app/Dockerfile

@@ -1,13 +1,12 @@
 FROM rust:1.92.0-bookworm@sha256:9676d0547a259997add8f5924eb6b959c589ed39055338e23b99aba7958d6d31
 
-RUN useradd -m -u 1000 -s /bin/bash app_user
+RUN useradd -m -u 1000 -s /bin/bash app_user \
-
+ && rustup target add wasm32-unknown-unknown
-RUN rustup target add wasm32-unknown-unknown
 
 USER app_user
 
-RUN cargo install --locked dioxus-cli --version 0.7.2 \
+RUN cargo install --git https://github.com/diesel-rs/diesel --rev 2e85ba060d3d70ea605ea58a79b8a435749a7adc --locked diesel_cli \
- && cargo install --locked diesel_cli --version 2.3.4
+ && cargo install --git https://github.com/DioxusLabs/dioxus --rev 8f8b58ea80ba0ec8057807bcd58fb609f7a5f2b1 --locked dioxus-cli
 
 COPY --chown=app_user . /srv/app
 WORKDIR /srv/app

docker/prod/app/Dockerfile

@@ -1,4 +1,13 @@
-FROM rust:1.92.0-bookworm@sha256:9676d0547a259997add8f5924eb6b959c589ed39055338e23b99aba7958d6d31 AS builder
+FROM rust:1.92.0-bookworm@sha256:9676d0547a259997add8f5924eb6b959c589ed39055338e23b99aba7958d6d31 AS builder_base
+
+RUN cargo install --git https://github.com/diesel-rs/diesel --rev 2e85ba060d3d70ea605ea58a79b8a435749a7adc --locked diesel_cli \
+ && cargo install --git https://github.com/DioxusLabs/dioxus --rev 8f8b58ea80ba0ec8057807bcd58fb609f7a5f2b1 --locked dioxus-cli --features disable-telemetry
+
+COPY . /srv/app
+WORKDIR /srv/app
+
+
+FROM builder_base AS builder_android
 
 ARG ANDROID_NDK_VERSION=26.2.11394342
 ARG ANDROID_COMMAND_LINE_TOOLS_VERSION=13114758
@@ -9,13 +18,12 @@ ARG ANDROID_BUNDLETOOL_VERSION=1.18.3
 ARG ANDROID_BUNDLETOOL_SHA256=a099cfa1543f55593bc2ed16a70a7c67fe54b1747bb7301f37fdfd6d91028e29
 ENV ANDROID_SDK_ROOT=/opt/android-sdk
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 RUN apt-get update && apt-get install -y --no-install-recommends \
     openjdk-17-jdk-headless=17.0.17+10-1~deb12u1 \
- && curl -fsSL -o /tmp/cmdline-tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_COMMAND_LINE_TOOLS_VERSION}_latest.zip" \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/* \
- && cargo install --git https://github.com/diesel-rs/diesel --rev 2e85ba060d3d70ea605ea58a79b8a435749a7adc diesel_cli \
- && cargo install --git https://github.com/DioxusLabs/dioxus --rev 8f8b58ea80ba0ec8057807bcd58fb609f7a5f2b1 dioxus-cli --features disable-telemetry \
  && rustup target add aarch64-linux-android \
  && mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
  && curl -fsSL -o /tmp/cmdline-tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_COMMAND_LINE_TOOLS_VERSION}_latest.zip" \
@@ -23,32 +31,33 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  && export PATH="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$PATH" \
  && mv "$ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools" "$ANDROID_SDK_ROOT/cmdline-tools/latest" \
  && rm /tmp/cmdline-tools.zip \
- && yes | sdkmanager --sdk_root="$ANDROID_SDK_ROOT" --licenses > /dev/null \
+ # `yes` can exit with 141, which is okay, so the `test` is added to ignore it.
+ && yes | sdkmanager --sdk_root="$ANDROID_SDK_ROOT" --licenses > /dev/null; test "${PIPESTATUS[1]}" -eq 0 \
  && sdkmanager --sdk_root="$ANDROID_SDK_ROOT" "platform-tools" "platforms;android-$ANDROID_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" "ndk;$ANDROID_NDK_VERSION" \
  && curl -fsSL -o /tmp/bundletool-all.jar "https://github.com/google/bundletool/releases/download/$ANDROID_BUNDLETOOL_VERSION/bundletool-all-${ANDROID_BUNDLETOOL_VERSION}.jar" \
  && echo "$ANDROID_BUNDLETOOL_SHA256 /tmp/bundletool-all.jar" | sha256sum -c - \
- && keytool -genkeypair -noprompt -keystore /tmp/android_keystore.jks -alias key -keyalg RSA -keysize 2048 -validity 3660 -dname "CN=" -storepass 123456 -keypass 123456
+ && keytool -genkeypair -noprompt -keystore /tmp/android_keystore.jks -alias key -keyalg RSA -keysize 2048 -validity 3660 -dname "CN=" -storepass 123456 -keypass 123456 \
-
+ && export ANDROID_HOME="$ANDROID_SDK_ROOT" \
-COPY . /srv/app
-WORKDIR /srv/app
-
-RUN export ANDROID_HOME="$ANDROID_SDK_ROOT" \
  && export ANDROID_NDK_HOME="$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION" \
- && dx bundle --release \
  && dx bundle --platform android --target aarch64-linux-android --release \
  && java -jar /tmp/bundletool-all.jar build-apks --bundle=/srv/app/target/dx/todo_baggins/release/android/app/app/build/outputs/bundle/release/TodoBaggins-aarch64-linux-android.aab --output=/tmp/todo_baggins.apks --mode=universal --ks=/tmp/android_keystore.jks --ks-key-alias=key --ks-pass=pass:123456 \
- && mkdir -p /srv/app/bundle/android \
+ && mkdir -p /srv/app/bundle \
- && unzip -qp /tmp/todo_baggins.apks universal.apk > /srv/app/bundle/android/todo_baggins.apk
+ && unzip -qp /tmp/todo_baggins.apks universal.apk > /srv/app/bundle/todo_baggins.apk
 
-FROM debian:bookworm@sha256:b877a1a3fdf02469440f1768cf69c9771338a875b7add5e80c45b756c92ac20a AS runner
+
+FROM builder_base AS builder_web
+ 
+RUN dx bundle --release
+
+
+FROM debian:bookworm@sha256:b877a1a3fdf02469440f1768cf69c9771338a875b7add5e80c45b756c92ac20a AS runner_web
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends libpq5=15.10-0+deb12u1 \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
-COPY --from=builder /srv/app/target/dx/todo_baggins/release/web /srv/app/web
+COPY --from=builder_web /srv/app/target/dx/todo_baggins/release/web /srv/app/web
-COPY --from=builder /srv/app/bundle/android /srv/app/android
 
 RUN chown -R 1000:1000 /srv/app/web
 

scripts/export_android_bundle.sh

@@ -1,4 +1,12 @@
 #!/bin/sh
 
-mkdir -p ../bundle \
+echo "Warning: This script needs to stop any currently running Docker compose stacks. Stopping them now..."
-&& docker compose -f docker-compose-prod.yaml cp app:/srv/app/android bundle
+docker compose down
+
+mkdir -p bundle/android bundle/temp \
+&& docker compose -f docker-compose-prod.yaml -f docker-compose-android-bundle.yaml up --build --no-start --no-deps app \
+&& docker compose -f docker-compose-prod.yaml -f docker-compose-android-bundle.yaml cp app:/srv/app/bundle bundle/temp \
+&& mv bundle/temp/bundle/* bundle/android \
+&& rm -r bundle/temp
+
+echo "Warning: If a running Docker compose stack has been stopped by this script, you may want to bring it up again now."

src/server/updates.rs

@@ -46,8 +46,15 @@ mod server_only {
         let mut disconnected_client_ids = HashSet::new();
         let subscribed_clients = SUBSCRIBED_CLIENTS.read().await;
         for (id, client) in subscribed_clients.iter() {
-            if let Err(_) = client.websocket.lock().await.send(UpdateEvent).await {
+            if client
-                disconnected_client_ids.insert(id.clone());
+                .websocket
+                .lock()
+                .await
+                .send(UpdateEvent)
+                .await
+                .is_err()
+            {
+                disconnected_client_ids.insert(*id);
             }
         }
         drop(subscribed_clients);

tailwind.css

@@ -1 +1,2 @@
+/* stylelint-disable-next-line import-notation */
 @import "tailwindcss";