Merge a54cf759fa into 32341574dc

.github/workflows/docker-bake.hcl

@@ -3,14 +3,14 @@ variable "BASE_IMAGE" {
 }
 
 group "default" {
-  targets = ["runner-base", "runner-builder"]
+  targets = ["runner"]
 }
 
 target "runner-base" {
   dockerfile = "containerfiles/runner-base.Containerfile"
   context    = "."
   args = {
-    BASE_IMAGE = BASE_IMAGE
+    BASE_IMAGE = "${BASE_IMAGE}"
   }
   cache-from = ["type=gha,scope=runner-base-pr"]
   cache-to = ["type=gha,scope=runner-base-pr,mode=max"]
@@ -30,3 +30,19 @@ target "runner-builder" {
     runner-base = "target:runner-base"
   }
 }
+
+target "runner" {
+  dockerfile = "containerfiles/runner.Containerfile"
+  context    = "."
+  args = {
+    RUNNER_BASE_IMAGE    = "runner-base:latest"
+    RUNNER_BUILDER_IMAGE = "runner-builder:latest"
+  }
+  cache-from = ["type=gha,scope=runner-pr"]
+  cache-to = ["type=gha,scope=runner-pr,mode=max"]
+  tags = ["nestri-runner"]
+  contexts = {
+    runner-base    = "target:runner-base"
+    runner-builder = "target:runner-builder"
+  }
+}

.github/workflows/play-standalone.yml

@@ -1,81 +0,0 @@
-name: Build Nestri standalone playsite
-
-on:
-  pull_request:
-    paths:
-      - "containerfiles/playsite.Containerfile"
-      - ".github/workflows/play-standalone.yml"
-      - "packages/play-standalone/**"
-  push:
-    branches: [ dev, production ]
-    paths:
-      - "containerfiles/playsite.Containerfile"
-      - ".github/workflows/play-standalone.yml"
-      - "packages/play-standalone/**"
-    tags:
-      - v*.*.*
-  release:
-    types: [ created ]
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: nestrilabs/nestri
-  BASE_TAG_PREFIX: playsite
-
-jobs:
-  build-docker-pr:
-    name: Build image on PR
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'pull_request' }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build Docker image
-        uses: docker/build-push-action@v5
-        with:
-          file: containerfiles/playsite.Containerfile
-          context: ./
-          push: false
-          load: true
-          tags: nestri:playsite
-
-  build-and-push-docker:
-    name: Build and push image
-    if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/production' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-      - name: Extract Container metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.BASE_TAG_PREFIX }}
-          #
-          #tag on release, and a nightly build for 'dev'
-          tags: |
-            type=raw,value=nightly,enable={{is_default_branch}}
-            type=raw,value={{branch}}
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'production') }}
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-      - name: Build Docker image
-        uses: docker/build-push-action@v5
-        with:
-          file: containerfiles/playsite.Containerfile
-          context: ./
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/relay.yml

@@ -1,5 +1,6 @@
-name: Build Nestri relay
+#Tabs not spaces, you moron :)
 
+name: Build nestri:relay
 on:
     pull_request:
         paths:

.github/workflows/runner-bases.yml

@@ -1,73 +0,0 @@
-name: Build Nestri runner base images
-
-on: [ workflow_call ]
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: nestrilabs/nestri
-  BASE_IMAGE: docker.io/cachyos/cachyos:latest
-
-jobs:
-  build-and-push-bases:
-    name: Build and push images
-    if: ${{ github.ref == 'refs/heads/production' || github.ref == 'refs/heads/dev' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        variant:
-          - { suffix: "v2", base: "docker.io/cachyos/cachyos:latest" }
-          - { suffix: "v3", base: "docker.io/cachyos/cachyos-v3:latest" }
-          #- { suffix: "v4", base: "docker.io/cachyos/cachyos-v4:latest" } # Disabled until GHA has this
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
-        with:
-          swap-size-gb: 20
-      - name: Build and push runner-base image
-        uses: docker/build-push-action@v6
-        with:
-          file: containerfiles/runner-base.Containerfile
-          context: ./
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest-${{ matrix.variant.suffix }}
-          build-args: |
-            BASE_IMAGE=${{ matrix.variant.base }}
-          cache-from: type=gha,scope=runner-base-${{ matrix.variant.suffix }},mode=max
-          cache-to: type=gha,scope=runner-base-${{ matrix.variant.suffix }},mode=max
-          pull: true
-      - name: Build and push runner-builder image
-        uses: docker/build-push-action@v6
-        with:
-          file: containerfiles/runner-builder.Containerfile
-          context: ./
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-builder:latest-${{ matrix.variant.suffix }}
-          build-args: |
-            RUNNER_BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest-${{ matrix.variant.suffix }}
-          cache-from: type=gha,scope=runner-builder-${{ matrix.variant.suffix }},mode=max
-          cache-to: type=gha,scope=runner-builder-${{ matrix.variant.suffix }},mode=max
-      - name: Build and push runner-common image
-        uses: docker/build-push-action@v6
-        with:
-          file: containerfiles/runner-common.Containerfile
-          context: ./
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-common:latest-${{ matrix.variant.suffix }}
-          build-args: |
-            RUNNER_BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest-${{ matrix.variant.suffix }}
-            RUNNER_BUILDER_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-builder:latest-${{ matrix.variant.suffix }}
-          cache-from: type=gha,scope=runner-common-${{ matrix.variant.suffix }},mode=max
-          cache-to: type=gha,scope=runner-common-${{ matrix.variant.suffix }},mode=max

.github/workflows/runner-variants.yml

@@ -1,86 +0,0 @@
-name: Build Nestri runner image variants
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: 7 0 * * 1,3,6  # Nightlies
-  push:
-    branches: [ dev, production ]
-    paths:
-      - "containerfiles/*runner.Containerfile"
-      - ".github/workflows/runner-variants.yml"
-      - "packages/scripts/**"
-      - "packages/configs/**"
-    tags:
-      - v*.*.*
-  release:
-    types: [ created ]
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: nestrilabs/nestri
-
-jobs:
-  bases:
-    uses: ./.github/workflows/runner-bases.yml
-    permissions:
-      contents: read
-      packages: write
-  build-and-push-variants:
-    needs: [ bases ]
-    name: Build and push images
-    if: ${{ github.ref == 'refs/heads/production' || github.ref == 'refs/heads/dev' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        variant:
-          - { suffix: "v2", base: "docker.io/cachyos/cachyos:latest" }
-          - { suffix: "v3", base: "docker.io/cachyos/cachyos-v3:latest" }
-          #- { suffix: "v4", base: "docker.io/cachyos/cachyos-v4:latest" } # Disabled until GHA has this
-        runner:
-          - steam
-          - heroic
-          - minecraft
-          # ADD MORE HERE AS NEEDED #
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-      - name: Extract runner metadata
-        id: meta-runner
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner
-          tags: |
-            type=raw,value=nightly-${{ matrix.runner }}-${{ matrix.variant.suffix }},enable={{is_default_branch}}
-            type=raw,value={{branch}}-${{ matrix.runner }}-${{ matrix.variant.suffix }}
-            type=raw,value=latest-${{ matrix.runner }}-${{ matrix.variant.suffix }},enable=${{ github.ref == format('refs/heads/{0}', 'production') }}
-            type=semver,pattern={{version}}-${{ matrix.runner }}-${{ matrix.variant.suffix }}
-            type=semver,pattern={{major}}.{{minor}}-${{ matrix.runner }}-${{ matrix.variant.suffix }}
-            type=semver,pattern={{major}}-${{ matrix.runner }}-${{ matrix.variant.suffix }}
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
-        with:
-          swap-size-gb: 20
-      - name: Build and push runner image
-        uses: docker/build-push-action@v6
-        with:
-          file: containerfiles/${{ matrix.runner }}-runner.Containerfile
-          context: ./
-          push: true
-          tags: ${{ steps.meta-runner.outputs.tags }}
-          labels: ${{ steps.meta-runner.outputs.labels }}
-          build-args: |
-            RUNNER_COMMON_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-common:latest-${{ matrix.variant.suffix }}
-          cache-from: type=gha,scope=runner-${{ matrix.runner }}-${{ matrix.variant.suffix }},mode=max
-          cache-to: type=gha,scope=runner-${{ matrix.runner }}-${{ matrix.variant.suffix }},mode=max

.github/workflows/runner.yml

@@ -0,0 +1,148 @@
+#Tabs not spaces, you moron :)
+
+name: Build nestri-runner
+
+on:
+    pull_request:
+        paths:
+            - "containerfiles/runner*.Containerfile"
+            - "packages/scripts/**"
+            - "packages/server/**"
+            - ".github/workflows/runner.yml"
+    schedule:
+        - cron: 7 0 * * 1,3,6 # Regularly to keep that build cache warm
+    push:
+        branches: [dev, production]
+        paths:
+            - "containerfiles/runner*.Containerfile"
+            - ".github/workflows/runner.yml"
+            - "packages/scripts/**"
+            - "packages/server/**"
+        tags:
+            - v*.*.*
+    release:
+        types: [created]
+
+env:
+    REGISTRY: ghcr.io
+    IMAGE_NAME: nestrilabs/nestri
+    BASE_IMAGE: docker.io/cachyos/cachyos:latest
+
+# This makes our release ci quit prematurely
+# concurrency:
+#     group: ci-${{ github.ref }}
+#     cancel-in-progress: true
+
+jobs:
+    build-docker-pr:
+        name: Build images on PR
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            packages: write
+        if: ${{ github.event_name == 'pull_request' }}
+        steps:
+            - 
+              name: Setup Docker Buildx
+              uses: docker/setup-buildx-action@v3
+            -
+              name: Set Swap Space
+              uses: pierotofy/set-swap-space@master
+              with:
+                swap-size-gb: 20
+            -
+              name: Build images using bake
+              uses: docker/bake-action@v6
+              env:
+                BASE_IMAGE: ${{ env.BASE_IMAGE }}
+              with:
+                files: |
+                  ./.github/workflows/docker-bake.hcl
+                targets: runner
+                push: false
+                load: true
+
+    build-and-push-docker:
+        name: Build and push images
+        if: ${{ github.ref == 'refs/heads/production' || github.ref == 'refs/heads/dev' }}
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            packages: write
+        strategy:
+            matrix:
+                variant:
+                    - { suffix: "", base: "docker.io/cachyos/cachyos:latest" }
+                    - { suffix: "-v3", base: "docker.io/cachyos/cachyos-v3:latest" }
+                    #- { suffix: "-v4", base: "docker.io/cachyos/cachyos-v4:latest" } # Disabled until GHA has this
+        steps:
+            -
+              name: Checkout repo
+              uses: actions/checkout@v4
+            - 
+              name: Log into registry ${{ env.REGISTRY }}
+              uses: docker/login-action@v3
+              with:
+                registry: ${{ env.REGISTRY }}
+                username: ${{ github.actor }}
+                password: ${{ github.token }}
+            - 
+              name: Extract runner metadata
+              id: meta-runner
+              uses: docker/metadata-action@v5
+              with:
+                images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner
+                tags: |
+                  type=raw,value=nightly${{ matrix.variant.suffix }},enable={{is_default_branch}}
+                  type=raw,value={{branch}}${{ matrix.variant.suffix }}
+                  type=raw,value=latest${{ matrix.variant.suffix }},enable=${{ github.ref == format('refs/heads/{0}', 'production') }}
+                  type=semver,pattern={{version}}${{ matrix.variant.suffix }}
+                  type=semver,pattern={{major}}.{{minor}}${{ matrix.variant.suffix }}
+                  type=semver,pattern={{major}}${{ matrix.variant.suffix }}
+            -
+              name: Setup Docker Buildx
+              uses: docker/setup-buildx-action@v3
+            - 
+              name: Set Swap Space
+              uses: pierotofy/set-swap-space@master
+              with:
+                swap-size-gb: 20
+            - 
+              name: Build and push runner-base image
+              uses: docker/build-push-action@v6
+              with:
+                file: containerfiles/runner-base.Containerfile
+                context: ./
+                push: true
+                tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest${{ matrix.variant.suffix }}
+                build-args: |
+                  BASE_IMAGE=${{ matrix.variant.base }}
+                cache-from: type=gha,scope=runner-base${{ matrix.variant.suffix }},mode=max
+                cache-to: type=gha,scope=runner-base${{ matrix.variant.suffix }},mode=max
+                pull: ${{ github.event_name == 'schedule' }}
+            -
+              name: Build and push runner-builder image
+              uses: docker/build-push-action@v6
+              with:
+                file: containerfiles/runner-builder.Containerfile
+                context: ./
+                push: true
+                tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-builder:latest${{ matrix.variant.suffix }}
+                build-args: |
+                  RUNNER_BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest${{ matrix.variant.suffix }}
+                cache-from: type=gha,scope=runner-builder${{ matrix.variant.suffix }},mode=max
+                cache-to: type=gha,scope=runner-builder${{ matrix.variant.suffix }},mode=max
+            -
+              name: Build and push runner image
+              uses: docker/build-push-action@v6
+              with:
+                file: containerfiles/runner.Containerfile
+                context: ./
+                push: true
+                tags: ${{ steps.meta-runner.outputs.tags }}
+                labels: ${{ steps.meta-runner.outputs.labels }}
+                build-args: |
+                  RUNNER_BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest${{ matrix.variant.suffix }}
+                  RUNNER_BUILDER_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-builder:latest${{ matrix.variant.suffix }}
+                cache-from: type=gha,scope=runner${{ matrix.variant.suffix }},mode=max
+                cache-to: type=gha,scope=runner${{ matrix.variant.suffix }},mode=max

containerfiles/heroic-runner.Containerfile

@@ -1,23 +0,0 @@
-# Container build arguments #
-ARG RUNNER_COMMON_IMAGE=runner-common:latest
-
-#*********************#
-# Final Runtime Stage #
-#*********************#
-FROM ${RUNNER_COMMON_IMAGE}
-
-### FLAVOR/VARIANT CONFIGURATION ###
-## HEROIC LAUNCHER ##
-RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -S --noconfirm heroic-games-launcher-bin && \
-    # Cleanup
-    paccache -rk1 && \
-    rm -rf /usr/share/{info,man,doc}/*
-
-## FLAVOR/VARIANT LAUNCH COMMAND ##
-ENV NESTRI_LAUNCH_CMD="heroic"
-### END OF FLAVOR/VARIANT CONFIGURATION ###
-
-### REQUIRED DEFAULT ENTRYPOINT FOR FLAVOR/VARIANT ###
-USER root
-ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]

containerfiles/minecraft-runner.Containerfile

@@ -1,24 +0,0 @@
-# Container build arguments #
-ARG RUNNER_COMMON_IMAGE=runner-common:latest
-
-#*********************#
-# Final Runtime Stage #
-#*********************#
-FROM ${RUNNER_COMMON_IMAGE}
-
-### FLAVOR/VARIANT CONFIGURATION ###
-## MINECRAFT ##
-RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -S --noconfirm paru && \
-    sudo -H -u ${NESTRI_USER} paru -S --noconfirm aur/minecraft-launcher && \
-    # Cleanup
-    paccache -rk1 && \
-    rm -rf /usr/share/{info,man,doc}/*
-
-## FLAVOR/VARIANT LAUNCH COMMAND ##
-ENV NESTRI_LAUNCH_CMD="minecraft-launcher"
-### END OF FLAVOR/VARIANT CONFIGURATION ###
-
-### REQUIRED DEFAULT ENTRYPOINT FOR FLAVOR/VARIANT ###
-USER root
-ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]

containerfiles/runner-builder.Containerfile

@@ -15,7 +15,7 @@ ENV CARGO_HOME=/usr/local/cargo \
 
 # Install build essentials and caching tools
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -S --noconfirm rustup git base-devel mold \
+    pacman -Sy --noconfirm rustup git base-devel mold \
     meson pkgconf cmake git gcc make
 
 # Override various linker with symlink so mold is forcefully used (ld, ld.lld, lld)
@@ -28,7 +28,7 @@ RUN rustup default stable
 
 # Install cargo-chef with proper caching
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo install cargo-chef --locked
+    cargo install -j $(nproc) cargo-chef --locked
 
 #*******************************#
 # vimputti manager build stages #
@@ -38,10 +38,10 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -S --noconfirm lib32-gcc-libs
+    pacman -Sy --noconfirm lib32-gcc-libs
 
 # Clone repository
-RUN git clone --depth 1 --rev "2fde5376b6b9a38cdbd94ccc6a80c9d29a81a417" https://github.com/DatCaptainHorse/vimputti.git
+RUN git clone --depth 1 --rev "f2f21561ddcb814d74455311969d3e8934b052c6" https://github.com/DatCaptainHorse/vimputti.git
 
 #--------------------------------------------------------------------
 FROM vimputti-manager-deps AS vimputti-manager-planner
@@ -83,7 +83,7 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -S --noconfirm gst-plugins-good gst-plugin-rswebrtc
+    pacman -Sy --noconfirm gst-plugins-good gst-plugin-rswebrtc
 
 #--------------------------------------------------------------------
 FROM nestri-server-deps AS nestri-server-planner
@@ -123,14 +123,14 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -S --noconfirm libxkbcommon wayland \
+    pacman -Sy --noconfirm libxkbcommon wayland \
     gst-plugins-good gst-plugins-bad libinput
 
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
     cargo install cargo-c
 
 # Clone repository
-RUN git clone --depth 1 --rev "e4c70b64dad3cd8bbf5eec011f419386adf737ee" https://github.com/games-on-whales/gst-wayland-display.git
+RUN git clone --depth 1 --rev "a4abcfe2cffe2d33b564d1308b58504a5e3012b1" https://github.com/games-on-whales/gst-wayland-display.git
 
 #--------------------------------------------------------------------
 FROM gst-wayland-deps AS gst-wayland-planner
@@ -148,7 +148,7 @@ COPY --from=gst-wayland-planner /builder/gst-wayland-display/recipe.json .
 
 # Cache dependencies using cargo-chef
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo chef cook --release --recipe-path recipe.json --features cuda
+    cargo chef cook --release --recipe-path recipe.json
 
 
 ENV CARGO_TARGET_DIR=/builder/target
@@ -158,7 +158,7 @@ COPY --from=gst-wayland-planner /builder/gst-wayland-display/ .
 # Build and install directly to artifacts
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
     --mount=type=cache,target=/builder/target \
-    cargo cinstall --prefix=${ARTIFACTS} --release --features cuda
+    cargo cinstall --prefix=${ARTIFACTS} --release
 
 #*********************************#
 # Patched bubblewrap build stages #
@@ -168,7 +168,7 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -S --noconfirm libtool libcap libselinux
+    pacman -Sy --noconfirm libtool libcap libselinux
 
 # Copy patch file from host
 COPY packages/patches/bubblewrap/ /builder/patches/

containerfiles/runner.Containerfile

@@ -2,9 +2,9 @@
 ARG RUNNER_BASE_IMAGE=runner-base:latest
 ARG RUNNER_BUILDER_IMAGE=runner-builder:latest
 
-#**********************#
+#*********************#
-# Runtime Common Stage #
+# Final Runtime Stage #
-#**********************#
+#*********************#
 FROM ${RUNNER_BASE_IMAGE} AS runtime
 FROM ${RUNNER_BUILDER_IMAGE} AS builder
 FROM runtime
@@ -12,11 +12,11 @@ FROM runtime
 ### Package Installation ###
 # Core system components
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -S --needed --noconfirm \
+    pacman -Sy --needed --noconfirm \
         vulkan-intel lib32-vulkan-intel vpl-gpu-rt \
         vulkan-radeon lib32-vulkan-radeon \
         mesa lib32-mesa \
-        gtk3 lib32-gtk3 \
+        steam gtk3 lib32-gtk3 \
         sudo xorg-xwayland seatd libinput gamescope mangohud wlr-randr \
         pipewire pipewire-pulse pipewire-alsa wireplumber \
         noto-fonts-cjk supervisor jq pacman-contrib \
@@ -67,10 +67,10 @@ RUN mkdir -p /etc/pipewire/pipewire.conf.d && \
 COPY packages/configs/wireplumber.conf.d/* /etc/wireplumber/wireplumber.conf.d/
 COPY packages/configs/pipewire.conf.d/* /etc/pipewire/pipewire.conf.d/
 
-## MangoHud Config ##
+## Steam Configs - Proton (Experimental flavor) ##
-RUN mkdir -p "${NESTRI_HOME}/.config/MangoHud"
+RUN mkdir -p "${NESTRI_HOME}/.local/share/Steam/config"
 
-COPY packages/configs/MangoHud/MangoHud.conf "${NESTRI_HOME}/.config/MangoHud/"
+COPY packages/configs/steam/config.vdf "${NESTRI_HOME}/.local/share/Steam/config/"
 
 ### Artifacts from Builder ###
 COPY --from=builder /artifacts/bin/nestri-server /usr/bin/
@@ -88,3 +88,7 @@ RUN chmod +x /etc/nestri/{envs.sh,entrypoint*.sh} && \
     setcap cap_net_admin+ep /usr/bin/vimputti-manager && \
     dbus-uuidgen > /etc/machine-id && \
     LANG=en_US.UTF-8 locale-gen
+
+# Root for most container engines, nestri-user compatible for apptainer without fakeroot
+USER root
+ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]

containerfiles/steam-runner.Containerfile

@@ -1,27 +0,0 @@
-# Container build arguments #
-ARG RUNNER_COMMON_IMAGE=runner-common:latest
-
-#*********************#
-# Final Runtime Stage #
-#*********************#
-FROM ${RUNNER_COMMON_IMAGE}
-
-### FLAVOR/VARIANT CONFIGURATION ###
-## STEAM ##
-RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -S --noconfirm steam && \
-    # Cleanup
-    paccache -rk1 && \
-    rm -rf /usr/share/{info,man,doc}/*
-
-## Steam Configs - Proton (Experimental flavor) ##
-RUN mkdir -p "${NESTRI_HOME}/.local/share/Steam/config"
-COPY packages/configs/steam/config.vdf "${NESTRI_HOME}/.local/share/Steam/config/"
-
-## FLAVOR/VARIANT LAUNCH COMMAND ##
-ENV NESTRI_LAUNCH_CMD="steam -tenfoot -cef-force-gpu"
-### END OF FLAVOR/VARIANT CONFIGURATION ###
-
-### REQUIRED DEFAULT ENTRYPOINT FOR FLAVOR/VARIANT ###
-USER root
-ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]

package.json

@@ -21,7 +21,6 @@
     "core-js-pure",
     "esbuild",
     "protobufjs",
-    "sharp",
     "workerd"
   ],
   "workspaces": {

packages/configs/MangoHud/MangoHud.conf

@@ -1,48 +0,0 @@
-legacy_layout=false
-
-# common
-horizontal
-horizontal_stretch
-hud_no_margin
-no_small_font
-background_alpha=0.66
-round_corners=0
-background_color=000000
-font_size=24
-position=top-left
-engine_short_names
-
-# colors
-text_color=DFDFDF
-gpu_color=FF4E00
-cpu_color=00AA00
-engine_color=00AA00
-vram_color=00AA00
-ram_color=00AA00
-frametime_color=FF4E00
-
-# load colors
-cpu_load_color=DFDFDF,DF964D,DF3D3D
-gpu_load_color=DFDFDF,DF964D,DF3D3D
-
-# GPU and VRAM
-gpu_text=NESTRI
-gpu_stats
-gpu_load_change
-gpu_load_value=70,90
-
-vram
-
-# CPU and RAM
-cpu_text=CPU
-cpu_stats
-cpu_load_change
-cpu_load_value=70,90
-
-ram
-
-# FPS and timing
-fps
-fps_metrics=0.01
-
-frame_timing

packages/input/.containerignore

@@ -1,3 +0,0 @@
-.idea/
-dist/
-node_modules/

packages/input/src/controller.ts

@@ -3,8 +3,10 @@ import { WebRTCStream } from "./webrtc-stream";
 import {
   ProtoControllerAttachSchema,
   ProtoControllerDetachSchema,
-  ProtoControllerStateBatchSchema,
+  ProtoControllerButtonSchema,
-  ProtoControllerStateBatch,
+  ProtoControllerTriggerSchema,
+  ProtoControllerAxisSchema,
+  ProtoControllerStickSchema,
   ProtoControllerRumble,
 } from "./proto/types_pb";
 import { create, toBinary, fromBinary } from "@bufbuild/protobuf";
@@ -17,7 +19,6 @@ interface Props {
 }
 
 interface GamepadState {
-  previousButtonState: Map<number, boolean>;
   buttonState: Map<number, boolean>;
   leftTrigger: number;
   rightTrigger: number;
@@ -29,17 +30,11 @@ interface GamepadState {
   dpadY: number;
 }
 
-enum PollState {
-  IDLE,
-  RUNNING,
-}
-
 export class Controller {
   protected wrtc: WebRTCStream;
   protected connected: boolean = false;
   protected gamepad: Gamepad | null = null;
-  protected state: GamepadState = {
+  protected lastState: GamepadState = {
-    previousButtonState: new Map<number, boolean>(),
     buttonState: new Map<number, boolean>(),
     leftTrigger: 0,
     rightTrigger: 0,
@@ -53,34 +48,22 @@ export class Controller {
   // TODO: As user configurable, set quite low now for decent controllers (not Nintendo ones :P)
   protected stickDeadzone: number = 2048; // 2048 / 32768 = ~0.06 (6% of stick range)
 
-  // Polling configuration
+  private updateInterval = 10.0; // 100 updates per second
-  private readonly FULL_RATE_MS = 10; // 100 UPS
+  private isIdle: boolean = true;
-  private readonly IDLE_THRESHOLD = 100; // ms before considering idle/hands off controller
-  private readonly FULL_INTERVAL = 250; // ms before sending full state occassionally, to verify inputs are synced
-
-  // Polling state
-  private pollingState: PollState = PollState.IDLE;
   private lastInputTime: number = Date.now();
-  private lastFullTime: number = Date.now();
+  private idleUpdateInterval: number = 150.0; // ~6-7 updates per second for keep-alive packets
-  private pollInterval: any = null;
+  private inputDetected: boolean = false;
-
+  private lastFullStateSend: number = Date.now();
-  // Controller batch vars
+  private fullStateSendInterval: number = 500.0; // send full state every 0.5 seconds (helps packet loss)
-  private sequence: number = 0;
+  private forceFullStateSend: boolean = false;
-  private readonly CHANGED_BUTTONS_STATE = 1 << 0;
-  private readonly CHANGED_LEFT_STICK_X = 1 << 1;
-  private readonly CHANGED_LEFT_STICK_Y = 1 << 2;
-  private readonly CHANGED_RIGHT_STICK_X = 1 << 3;
-  private readonly CHANGED_RIGHT_STICK_Y = 1 << 4;
-  private readonly CHANGED_LEFT_TRIGGER = 1 << 5;
-  private readonly CHANGED_RIGHT_TRIGGER = 1 << 6;
-  private readonly CHANGED_DPAD_X = 1 << 7;
-  private readonly CHANGED_DPAD_Y = 1 << 8;
 
   private _dcHandler: ((data: ArrayBuffer) => void) | null = null;
 
   constructor({ webrtc, e }: Props) {
     this.wrtc = webrtc;
 
+    this.updateInterval = 1000 / webrtc.currentFrameRate;
+
     // Get vendor of gamepad from id string (i.e. "... Vendor: 054c Product: 09cc")
     const vendorMatch = e.gamepad.id.match(/Vendor:\s?([0-9a-fA-F]{4})/);
     const vendorId = vendorMatch ? vendorMatch[1].toLowerCase() : "unknown";
@@ -106,7 +89,6 @@ export class Controller {
           console.log(
             `Gamepad connected: ${e.gamepad.id}, local slot ${e.gamepad.index}, msg: ${attachMsg.sessionSlot}`,
           );
-          this.run();
         }
       } catch (err) {
         console.error("Error decoding datachannel message:", err);
@@ -180,70 +162,52 @@ export class Controller {
     return ((value - fromMin) * (toMax - toMin)) / (fromMax - fromMin) + toMin;
   }
 
-  private restartPolling() {
-    // Clear existing interval
-    if (this.pollInterval) {
-      clearInterval(this.pollInterval);
-      this.pollInterval = null;
-    }
-
-    // Restart with active polling
-    this.pollingState = PollState.RUNNING;
-    this.lastInputTime = Date.now();
-
-    // Start interval
-    this.pollInterval = setInterval(
-      () => this.pollGamepad(),
-      this.FULL_RATE_MS,
-    );
-  }
-
   private pollGamepad() {
-    if (!this.connected || !this.gamepad) return;
+    // Get updated gamepad state
-
     const gamepads = navigator.getGamepads();
-    if (!gamepads[this.gamepad.index]) return;
 
-    this.gamepad = gamepads[this.gamepad.index];
+    // Periodically force send full state to clear stuck inputs
-
+    if (Date.now() - this.lastFullStateSend > this.fullStateSendInterval) {
-    // Collect state changes
+      this.forceFullStateSend = true;
-    const changedFields = this.collectStateChanges();
+      this.lastFullStateSend = Date.now();
-
-    // Send batched changes update if there's changes
-    if (changedFields > 0) {
-      let send_type = 1;
-      const timeSinceFull = Date.now() - this.lastFullTime;
-      if (timeSinceFull > this.FULL_INTERVAL) {
-        send_type = 0;
-        this.lastFullTime = Date.now();
     }
 
-      this.sendBatchedState(changedFields, send_type);
+    if (this.gamepad) {
-      this.lastInputTime = Date.now();
+      if (gamepads[this.gamepad.index]) {
-      if (this.pollingState !== PollState.RUNNING) {
+        this.gamepad = gamepads[this.gamepad!.index];
-        this.pollingState = PollState.RUNNING;
+        /* Button handling */
-      }
+        this.gamepad.buttons.forEach((button, index) => {
+          // Ignore d-pad buttons (12-15) as we handle those as axis
+          if (index >= 12 && index <= 15) return;
+          // ignore trigger buttons (6-7) as we handle those as axis
+          if (index === 6 || index === 7) return;
+          // If state differs, send
+          if (button.pressed !== this.lastState.buttonState.get(index) || this.forceFullStateSend) {
+            const linuxCode = this.controllerButtonToVirtualKeyCode(index);
+            if (linuxCode === undefined) {
+              // Skip unmapped button index
+              this.lastState.buttonState.set(index, button.pressed);
+              return;
             }
 
-    const timeSinceInput = Date.now() - this.lastInputTime;
+            const buttonMessage = createMessage(
-    if (timeSinceInput > this.IDLE_THRESHOLD) {
+              create(ProtoControllerButtonSchema, {
-      // Changing from running to idle..
+                sessionSlot: this.gamepad.index,
-      if (this.pollingState === PollState.RUNNING) {
+                sessionId: this.wrtc.getSessionID(),
-        // Send full state on idle assumption
+                button: linuxCode,
-        this.sendBatchedState(0xff, 0);
+                pressed: button.pressed,
-        this.pollingState = PollState.IDLE;
+              }),
-      }
+              "controllerInput",
-    }
-
-    this.state.buttonState.forEach((b, i) =>
-      this.state.previousButtonState.set(i, b),
             );
+            this.wrtc.sendBinary(toBinary(ProtoMessageSchema, buttonMessage));
+            this.inputDetected = true;
+            // Store button state
+            this.lastState.buttonState.set(index, button.pressed);
           }
+        });
 
-  private collectStateChanges(): number {
+        /* Trigger handling */
-    let changedFields = 0;
+        // map trigger value from 0.0 to 1.0 to -32768 to 32767
-
-    // Collect analog values
         const leftTrigger = Math.round(
           this.remapFromTo(
             this.gamepad.buttons[6]?.value ?? 0,
@@ -253,6 +217,21 @@ export class Controller {
             32767,
           ),
         );
+        // If state differs, send
+        if (leftTrigger !== this.lastState.leftTrigger || this.forceFullStateSend) {
+          const triggerMessage = createMessage(
+            create(ProtoControllerTriggerSchema, {
+              sessionSlot: this.gamepad.index,
+              sessionId: this.wrtc.getSessionID(),
+              trigger: 0, // 0 = left, 1 = right
+              value: leftTrigger,
+            }),
+            "controllerInput",
+          );
+          this.wrtc.sendBinary(toBinary(ProtoMessageSchema, triggerMessage));
+          this.inputDetected = true;
+          this.lastState.leftTrigger = leftTrigger;
+        }
         const rightTrigger = Math.round(
           this.remapFromTo(
             this.gamepad.buttons[7]?.value ?? 0,
@@ -262,7 +241,62 @@ export class Controller {
             32767,
           ),
         );
+        // If state differs, send
+        if (rightTrigger !== this.lastState.rightTrigger || this.forceFullStateSend) {
+          const triggerMessage = createMessage(
+            create(ProtoControllerTriggerSchema, {
+              sessionSlot: this.gamepad.index,
+              sessionId: this.wrtc.getSessionID(),
+              trigger: 1, // 0 = left, 1 = right
+              value: rightTrigger,
+            }),
+            "controllerInput",
+          );
+          this.wrtc.sendBinary(toBinary(ProtoMessageSchema, triggerMessage));
+          this.inputDetected = true;
+          this.lastState.rightTrigger = rightTrigger;
+        }
 
+        /* DPad handling */
+        // We send dpad buttons as axis values -1 to 1 for left/up, right/down
+        const dpadLeft = this.gamepad.buttons[14]?.pressed ? 1 : 0;
+        const dpadRight = this.gamepad.buttons[15]?.pressed ? 1 : 0;
+        const dpadX = dpadLeft ? -1 : dpadRight ? 1 : 0;
+        if (dpadX !== this.lastState.dpadX || this.forceFullStateSend) {
+          const dpadMessage = createMessage(
+            create(ProtoControllerAxisSchema, {
+              sessionSlot: this.gamepad.index,
+              sessionId: this.wrtc.getSessionID(),
+              axis: 0, // 0 = dpadX, 1 = dpadY
+              value: dpadX,
+            }),
+            "controllerInput",
+          );
+          this.wrtc.sendBinary(toBinary(ProtoMessageSchema, dpadMessage));
+          this.inputDetected = true;
+          this.lastState.dpadX = dpadX;
+        }
+
+        const dpadUp = this.gamepad.buttons[12]?.pressed ? 1 : 0;
+        const dpadDown = this.gamepad.buttons[13]?.pressed ? 1 : 0;
+        const dpadY = dpadUp ? -1 : dpadDown ? 1 : 0;
+        if (dpadY !== this.lastState.dpadY || this.forceFullStateSend) {
+          const dpadMessage = createMessage(
+            create(ProtoControllerAxisSchema, {
+              sessionSlot: this.gamepad.index,
+              sessionId: this.wrtc.getSessionID(),
+              axis: 1, // 0 = dpadX, 1 = dpadY
+              value: dpadY,
+            }),
+            "controllerInput",
+          );
+          this.wrtc.sendBinary(toBinary(ProtoMessageSchema, dpadMessage));
+          this.inputDetected = true;
+          this.lastState.dpadY = dpadY;
+        }
+
+        /* Stick handling */
+        // stick values need to be mapped from -1.0 to 1.0 to -32768 to 32767
         const leftX = this.remapFromTo(
           this.gamepad.axes[0] ?? 0,
           -1,
@@ -277,10 +311,32 @@ export class Controller {
           -32768,
           32767,
         );
+        // Apply deadzone
         const sendLeftX =
           Math.abs(leftX) > this.stickDeadzone ? Math.round(leftX) : 0;
         const sendLeftY =
           Math.abs(leftY) > this.stickDeadzone ? Math.round(leftY) : 0;
+        // if outside deadzone, send normally if changed
+        // if moves inside deadzone, zero it if not inside deadzone last time
+        if (
+          sendLeftX !== this.lastState.leftX ||
+          sendLeftY !== this.lastState.leftY || this.forceFullStateSend
+        ) {
+          const stickMessage = createMessage(
+            create(ProtoControllerStickSchema, {
+              sessionSlot: this.gamepad.index,
+              sessionId: this.wrtc.getSessionID(),
+              stick: 0, // 0 = left, 1 = right
+              x: sendLeftX,
+              y: sendLeftY,
+            }),
+            "controllerInput",
+          );
+          this.wrtc.sendBinary(toBinary(ProtoMessageSchema, stickMessage));
+          this.inputDetected = true;
+          this.lastState.leftX = sendLeftX;
+          this.lastState.leftY = sendLeftY;
+        }
 
         const rightX = this.remapFromTo(
           this.gamepad.axes[2] ?? 0,
@@ -296,173 +352,76 @@ export class Controller {
           -32768,
           32767,
         );
+        // Apply deadzone
         const sendRightX =
           Math.abs(rightX) > this.stickDeadzone ? Math.round(rightX) : 0;
         const sendRightY =
           Math.abs(rightY) > this.stickDeadzone ? Math.round(rightY) : 0;
-
+        if (
-    const dpadX =
+          sendRightX !== this.lastState.rightX ||
-      (this.gamepad.buttons[14]?.pressed ? -1 : 0) +
+          sendRightY !== this.lastState.rightY || this.forceFullStateSend
-      (this.gamepad.buttons[15]?.pressed ? 1 : 0);
+        ) {
-    const dpadY =
+          const stickMessage = createMessage(
-      (this.gamepad.buttons[12]?.pressed ? -1 : 0) +
+            create(ProtoControllerStickSchema, {
-      (this.gamepad.buttons[13]?.pressed ? 1 : 0);
-
-    // Check what changed
-    for (let i = 0; i < this.gamepad.buttons.length; i++) {
-      if (i >= 6 && i <= 7) continue; // Skip triggers
-      if (i >= 12 && i <= 15) continue; // Skip d-pad
-      if (this.state.buttonState.get(i) !== this.gamepad.buttons[i].pressed) {
-        changedFields |= this.CHANGED_BUTTONS_STATE;
-      }
-      this.state.buttonState.set(i, this.gamepad.buttons[i].pressed);
-    }
-    if (leftTrigger !== this.state.leftTrigger) {
-      changedFields |= this.CHANGED_LEFT_TRIGGER;
-    }
-    this.state.leftTrigger = leftTrigger;
-    if (rightTrigger !== this.state.rightTrigger) {
-      changedFields |= this.CHANGED_RIGHT_TRIGGER;
-    }
-    this.state.rightTrigger = rightTrigger;
-    if (sendLeftX !== this.state.leftX) {
-      changedFields |= this.CHANGED_LEFT_STICK_X;
-    }
-    this.state.leftX = sendLeftX;
-    if (sendLeftY !== this.state.leftY) {
-      changedFields |= this.CHANGED_LEFT_STICK_Y;
-    }
-    this.state.leftY = sendLeftY;
-    if (sendRightX !== this.state.rightX) {
-      changedFields |= this.CHANGED_RIGHT_STICK_X;
-    }
-    this.state.rightX = sendRightX;
-    if (sendRightY !== this.state.rightY) {
-      changedFields |= this.CHANGED_RIGHT_STICK_Y;
-    }
-    this.state.rightY = sendRightY;
-    if (dpadX !== this.state.dpadX) {
-      changedFields |= this.CHANGED_DPAD_X;
-    }
-    this.state.dpadX = dpadX;
-    if (dpadY !== this.state.dpadY) {
-      changedFields |= this.CHANGED_DPAD_Y;
-    }
-    this.state.dpadY = dpadY;
-
-    return changedFields;
-  }
-
-  private sendBatchedState(changedFields: number, updateType: number) {
-    // @ts-ignore
-    let message: ProtoControllerStateBatch = {
               sessionSlot: this.gamepad.index,
               sessionId: this.wrtc.getSessionID(),
-      updateType: updateType,
+              stick: 1, // 0 = left, 1 = right
-      sequence: this.sequence++,
+              x: sendRightX,
-    };
+              y: sendRightY,
-
+            }),
-    // For FULL_STATE, include everything
-    if (updateType === 0) {
-      message.changedFields = 0xff;
-
-      message.buttonChangedMask = Object.fromEntries(
-        Array.from(this.state.buttonState)
-          .map(
-            ([key, value]) =>
-              [this.controllerButtonToVirtualKeyCode(key), value] as const,
-          )
-          .filter(([code]) => code !== undefined),
-      );
-      message.leftStickX = this.state.leftX;
-      message.leftStickY = this.state.leftY;
-      message.rightStickX = this.state.rightX;
-      message.rightStickY = this.state.rightY;
-      message.leftTrigger = this.state.leftTrigger;
-      message.rightTrigger = this.state.rightTrigger;
-      message.dpadX = this.state.dpadX;
-      message.dpadY = this.state.dpadY;
-    }
-    // For DELTA, only include changed fields
-    else {
-      message.changedFields = changedFields;
-
-      if (changedFields & this.CHANGED_BUTTONS_STATE) {
-        const currentStateMap = this.state.buttonState;
-        const previousStateMap = this.state.previousButtonState;
-        const allKeys = new Set([
-          // @ts-ignore
-          ...currentStateMap.keys(),
-          // @ts-ignore
-          ...previousStateMap.keys(),
-        ]);
-        message.buttonChangedMask = Object.fromEntries(
-          Array.from(allKeys)
-            .filter((key) => {
-              const newState = currentStateMap.get(key);
-              const oldState = previousStateMap.get(key);
-              return newState !== oldState;
-            })
-            .map((key) => {
-              const newValue = currentStateMap.get(key) ?? false;
-              return [
-                this.controllerButtonToVirtualKeyCode(key),
-                newValue,
-              ] as const;
-            })
-            .filter(([code]) => code !== undefined),
-        );
-      }
-      if (changedFields & this.CHANGED_LEFT_STICK_X) {
-        message.leftStickX = this.state.leftX;
-      }
-      if (changedFields & this.CHANGED_LEFT_STICK_Y) {
-        message.leftStickY = this.state.leftY;
-      }
-      if (changedFields & this.CHANGED_RIGHT_STICK_X) {
-        message.rightStickX = this.state.rightX;
-      }
-      if (changedFields & this.CHANGED_RIGHT_STICK_Y) {
-        message.rightStickY = this.state.rightY;
-      }
-      if (changedFields & this.CHANGED_LEFT_TRIGGER) {
-        message.leftTrigger = this.state.leftTrigger;
-      }
-      if (changedFields & this.CHANGED_RIGHT_TRIGGER) {
-        message.rightTrigger = this.state.rightTrigger;
-      }
-      if (changedFields & this.CHANGED_DPAD_X) {
-        message.dpadX = this.state.dpadX;
-      }
-      if (changedFields & this.CHANGED_DPAD_Y) {
-        message.dpadY = this.state.dpadY;
-      }
-    }
-
-    // Send message
-    const batchMessage = createMessage(
-      create(
-        ProtoControllerStateBatchSchema,
-        message as ProtoControllerStateBatch,
-      ),
             "controllerInput",
           );
-    this.wrtc.sendBinary(toBinary(ProtoMessageSchema, batchMessage));
+          this.wrtc.sendBinary(toBinary(ProtoMessageSchema, stickMessage));
+          this.inputDetected = true;
+          this.lastState.rightX = sendRightX;
+          this.lastState.rightY = sendRightY;
         }
+      }
+    }
+
+    this.forceFullStateSend = false;
+  }
+
+  private loopInterval: any = null;
 
   public run() {
     if (this.connected) this.stop();
 
     this.connected = true;
+    this.isIdle = true;
+    this.lastInputTime = Date.now();
 
-    // Start with active polling
+    this.loopInterval = setInterval(() => {
-    this.restartPolling();
+      if (this.connected) {
+        this.inputDetected = false; // Reset before poll
+        this.pollGamepad();
+
+        // Switch polling rate based on input
+        if (this.inputDetected) {
+          this.lastInputTime = Date.now();
+          if (this.isIdle) {
+            this.isIdle = false;
+            clearInterval(this.loopInterval);
+            this.loopInterval = setInterval(() => {
+              if (this.connected) this.pollGamepad();
+            }, this.updateInterval);
+          }
+        } else if (!this.isIdle && Date.now() - this.lastInputTime > 200) {
+          // Switch to idle polling after 200ms of no input
+          this.isIdle = true;
+          clearInterval(this.loopInterval);
+          this.loopInterval = setInterval(() => {
+            if (this.connected) this.pollGamepad();
+          }, this.idleUpdateInterval);
+        }
+      }
+    }, this.isIdle ? this.idleUpdateInterval : this.updateInterval);
   }
 
   public stop() {
-    if (this.pollInterval) {
+    if (this.loopInterval) {
-      clearInterval(this.pollInterval);
+      clearInterval(this.loopInterval);
-      this.pollInterval = null;
+      this.loopInterval = null;
     }
     this.connected = false;
   }
@@ -474,7 +433,6 @@ export class Controller {
       this.wrtc.removeDataChannelCallback(this._dcHandler);
       this._dcHandler = null;
     }
-    if (this.gamepad) {
     // Gamepad disconnected
     const detachMsg = createMessage(
       create(ProtoControllerDetachSchema, {
@@ -484,20 +442,18 @@ export class Controller {
     );
     this.wrtc.sendBinary(toBinary(ProtoMessageSchema, detachMsg));
   }
-  }
 
-  private controllerButtonToVirtualKeyCode(code: number): number | undefined {
+  private controllerButtonToVirtualKeyCode(code: number) {
     return controllerButtonToLinuxEventCode[code] || undefined;
   }
 
   private rumbleCallback(rumbleMsg: ProtoControllerRumble) {
-    if (!this.connected || !this.gamepad) return;
+    // If not connected, ignore
+    if (!this.connected) return;
 
-    // Check if this rumble is for us
+    // Check if aimed at this controller slot
-    if (
+    if (rumbleMsg.sessionId !== this.wrtc.getSessionID() &&
-      rumbleMsg.sessionId !== this.wrtc.getSessionID() ||
+        rumbleMsg.sessionSlot !== this.gamepad.index)
-      rumbleMsg.sessionSlot !== this.gamepad.index
-    )
       return;
 
     // Trigger actual rumble

packages/input/src/proto/messages_pb.ts

@@ -4,7 +4,7 @@
 
 import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
 import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
-import type { ProtoClientDisconnected, ProtoClientRequestRoomStream, ProtoControllerAttach, ProtoControllerDetach, ProtoControllerRumble, ProtoControllerStateBatch, ProtoICE, ProtoKeyDown, ProtoKeyUp, ProtoMouseKeyDown, ProtoMouseKeyUp, ProtoMouseMove, ProtoMouseMoveAbs, ProtoMouseWheel, ProtoRaw, ProtoSDP, ProtoServerPushStream } from "./types_pb";
+import type { ProtoClientDisconnected, ProtoClientRequestRoomStream, ProtoControllerAttach, ProtoControllerAxis, ProtoControllerButton, ProtoControllerDetach, ProtoControllerRumble, ProtoControllerStick, ProtoControllerTrigger, ProtoICE, ProtoKeyDown, ProtoKeyUp, ProtoMouseKeyDown, ProtoMouseKeyUp, ProtoMouseMove, ProtoMouseMoveAbs, ProtoMouseWheel, ProtoRaw, ProtoSDP, ProtoServerPushStream } from "./types_pb";
 import { file_types } from "./types_pb";
 import type { ProtoLatencyTracker } from "./latency_tracker_pb";
 import { file_latency_tracker } from "./latency_tracker_pb";
@@ -14,7 +14,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file messages.proto.
  */
 export const file_messages: GenFile = /*@__PURE__*/
-  fileDesc("Cg5tZXNzYWdlcy5wcm90bxIFcHJvdG8iVQoQUHJvdG9NZXNzYWdlQmFzZRIUCgxwYXlsb2FkX3R5cGUYASABKAkSKwoHbGF0ZW5jeRgCIAEoCzIaLnByb3RvLlByb3RvTGF0ZW5jeVRyYWNrZXIipQcKDFByb3RvTWVzc2FnZRItCgxtZXNzYWdlX2Jhc2UYASABKAsyFy5wcm90by5Qcm90b01lc3NhZ2VCYXNlEisKCm1vdXNlX21vdmUYAiABKAsyFS5wcm90by5Qcm90b01vdXNlTW92ZUgAEjIKDm1vdXNlX21vdmVfYWJzGAMgASgLMhgucHJvdG8uUHJvdG9Nb3VzZU1vdmVBYnNIABItCgttb3VzZV93aGVlbBgEIAEoCzIWLnByb3RvLlByb3RvTW91c2VXaGVlbEgAEjIKDm1vdXNlX2tleV9kb3duGAUgASgLMhgucHJvdG8uUHJvdG9Nb3VzZUtleURvd25IABIuCgxtb3VzZV9rZXlfdXAYBiABKAsyFi5wcm90by5Qcm90b01vdXNlS2V5VXBIABInCghrZXlfZG93bhgHIAEoCzITLnByb3RvLlByb3RvS2V5RG93bkgAEiMKBmtleV91cBgIIAEoCzIRLnByb3RvLlByb3RvS2V5VXBIABI5ChFjb250cm9sbGVyX2F0dGFjaBgJIAEoCzIcLnByb3RvLlByb3RvQ29udHJvbGxlckF0dGFjaEgAEjkKEWNvbnRyb2xsZXJfZGV0YWNoGAogASgLMhwucHJvdG8uUHJvdG9Db250cm9sbGVyRGV0YWNoSAASOQoRY29udHJvbGxlcl9ydW1ibGUYCyABKAsyHC5wcm90by5Qcm90b0NvbnRyb2xsZXJSdW1ibGVIABJCChZjb250cm9sbGVyX3N0YXRlX2JhdGNoGAwgASgLMiAucHJvdG8uUHJvdG9Db250cm9sbGVyU3RhdGVCYXRjaEgAEh4KA2ljZRgUIAEoCzIPLnByb3RvLlByb3RvSUNFSAASHgoDc2RwGBUgASgLMg8ucHJvdG8uUHJvdG9TRFBIABIeCgNyYXcYFiABKAsyDy5wcm90by5Qcm90b1Jhd0gAEkkKGmNsaWVudF9yZXF1ZXN0X3Jvb21fc3RyZWFtGBcgASgLMiMucHJvdG8uUHJvdG9DbGllbnRSZXF1ZXN0Um9vbVN0cmVhbUgAEj0KE2NsaWVudF9kaXNjb25uZWN0ZWQYGCABKAsyHi5wcm90by5Qcm90b0NsaWVudERpc2Nvbm5lY3RlZEgAEjoKEnNlcnZlcl9wdXNoX3N0cmVhbRgZIAEoCzIcLnByb3RvLlByb3RvU2VydmVyUHVzaFN0cmVhbUgAQgkKB3BheWxvYWRCFloUcmVsYXkvaW50ZXJuYWwvcHJvdG9iBnByb3RvMw", [file_types, file_latency_tracker]);
+  fileDesc("Cg5tZXNzYWdlcy5wcm90bxIFcHJvdG8iVQoQUHJvdG9NZXNzYWdlQmFzZRIUCgxwYXlsb2FkX3R5cGUYASABKAkSKwoHbGF0ZW5jeRgCIAEoCzIaLnByb3RvLlByb3RvTGF0ZW5jeVRyYWNrZXIiyQgKDFByb3RvTWVzc2FnZRItCgxtZXNzYWdlX2Jhc2UYASABKAsyFy5wcm90by5Qcm90b01lc3NhZ2VCYXNlEisKCm1vdXNlX21vdmUYAiABKAsyFS5wcm90by5Qcm90b01vdXNlTW92ZUgAEjIKDm1vdXNlX21vdmVfYWJzGAMgASgLMhgucHJvdG8uUHJvdG9Nb3VzZU1vdmVBYnNIABItCgttb3VzZV93aGVlbBgEIAEoCzIWLnByb3RvLlByb3RvTW91c2VXaGVlbEgAEjIKDm1vdXNlX2tleV9kb3duGAUgASgLMhgucHJvdG8uUHJvdG9Nb3VzZUtleURvd25IABIuCgxtb3VzZV9rZXlfdXAYBiABKAsyFi5wcm90by5Qcm90b01vdXNlS2V5VXBIABInCghrZXlfZG93bhgHIAEoCzITLnByb3RvLlByb3RvS2V5RG93bkgAEiMKBmtleV91cBgIIAEoCzIRLnByb3RvLlByb3RvS2V5VXBIABI5ChFjb250cm9sbGVyX2F0dGFjaBgJIAEoCzIcLnByb3RvLlByb3RvQ29udHJvbGxlckF0dGFjaEgAEjkKEWNvbnRyb2xsZXJfZGV0YWNoGAogASgLMhwucHJvdG8uUHJvdG9Db250cm9sbGVyRGV0YWNoSAASOQoRY29udHJvbGxlcl9idXR0b24YCyABKAsyHC5wcm90by5Qcm90b0NvbnRyb2xsZXJCdXR0b25IABI7ChJjb250cm9sbGVyX3RyaWdnZXIYDCABKAsyHS5wcm90by5Qcm90b0NvbnRyb2xsZXJUcmlnZ2VySAASNwoQY29udHJvbGxlcl9zdGljaxgNIAEoCzIbLnByb3RvLlByb3RvQ29udHJvbGxlclN0aWNrSAASNQoPY29udHJvbGxlcl9heGlzGA4gASgLMhoucHJvdG8uUHJvdG9Db250cm9sbGVyQXhpc0gAEjkKEWNvbnRyb2xsZXJfcnVtYmxlGA8gASgLMhwucHJvdG8uUHJvdG9Db250cm9sbGVyUnVtYmxlSAASHgoDaWNlGBQgASgLMg8ucHJvdG8uUHJvdG9JQ0VIABIeCgNzZHAYFSABKAsyDy5wcm90by5Qcm90b1NEUEgAEh4KA3JhdxgWIAEoCzIPLnByb3RvLlByb3RvUmF3SAASSQoaY2xpZW50X3JlcXVlc3Rfcm9vbV9zdHJlYW0YFyABKAsyIy5wcm90by5Qcm90b0NsaWVudFJlcXVlc3RSb29tU3RyZWFtSAASPQoTY2xpZW50X2Rpc2Nvbm5lY3RlZBgYIAEoCzIeLnByb3RvLlByb3RvQ2xpZW50RGlzY29ubmVjdGVkSAASOgoSc2VydmVyX3B1c2hfc3RyZWFtGBkgASgLMhwucHJvdG8uUHJvdG9TZXJ2ZXJQdXNoU3RyZWFtSABCCQoHcGF5bG9hZEIWWhRyZWxheS9pbnRlcm5hbC9wcm90b2IGcHJvdG8z", [file_types, file_latency_tracker]);
 
 /**
  * @generated from message proto.ProtoMessageBase
@@ -96,8 +96,6 @@ export type ProtoMessage = Message<"proto.ProtoMessage"> & {
     case: "keyUp";
   } | {
     /**
-     * Controller input types
-     *
      * @generated from field: proto.ProtoControllerAttach controller_attach = 9;
      */
     value: ProtoControllerAttach;
@@ -110,16 +108,34 @@ export type ProtoMessage = Message<"proto.ProtoMessage"> & {
     case: "controllerDetach";
   } | {
     /**
-     * @generated from field: proto.ProtoControllerRumble controller_rumble = 11;
+     * @generated from field: proto.ProtoControllerButton controller_button = 11;
+     */
+    value: ProtoControllerButton;
+    case: "controllerButton";
+  } | {
+    /**
+     * @generated from field: proto.ProtoControllerTrigger controller_trigger = 12;
+     */
+    value: ProtoControllerTrigger;
+    case: "controllerTrigger";
+  } | {
+    /**
+     * @generated from field: proto.ProtoControllerStick controller_stick = 13;
+     */
+    value: ProtoControllerStick;
+    case: "controllerStick";
+  } | {
+    /**
+     * @generated from field: proto.ProtoControllerAxis controller_axis = 14;
+     */
+    value: ProtoControllerAxis;
+    case: "controllerAxis";
+  } | {
+    /**
+     * @generated from field: proto.ProtoControllerRumble controller_rumble = 15;
      */
     value: ProtoControllerRumble;
     case: "controllerRumble";
-  } | {
-    /**
-     * @generated from field: proto.ProtoControllerStateBatch controller_state_batch = 12;
-     */
-    value: ProtoControllerStateBatch;
-    case: "controllerStateBatch";
   } | {
     /**
      * Signaling types

packages/input/src/proto/types_pb.ts

@@ -2,15 +2,15 @@
 // @generated from file types.proto (package proto, syntax proto3)
 /* eslint-disable */
 
-import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
+import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
-import { enumDesc, fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
+import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
 import type { Message } from "@bufbuild/protobuf";
 
 /**
  * Describes the file types.proto.
  */
 export const file_types: GenFile = /*@__PURE__*/
-  fileDesc("Cgt0eXBlcy5wcm90bxIFcHJvdG8iJgoOUHJvdG9Nb3VzZU1vdmUSCQoBeBgBIAEoBRIJCgF5GAIgASgFIikKEVByb3RvTW91c2VNb3ZlQWJzEgkKAXgYASABKAUSCQoBeRgCIAEoBSInCg9Qcm90b01vdXNlV2hlZWwSCQoBeBgBIAEoBRIJCgF5GAIgASgFIiAKEVByb3RvTW91c2VLZXlEb3duEgsKA2tleRgBIAEoBSIeCg9Qcm90b01vdXNlS2V5VXASCwoDa2V5GAEgASgFIhsKDFByb3RvS2V5RG93bhILCgNrZXkYASABKAUiGQoKUHJvdG9LZXlVcBILCgNrZXkYASABKAUiTQoVUHJvdG9Db250cm9sbGVyQXR0YWNoEgoKAmlkGAEgASgJEhQKDHNlc3Npb25fc2xvdBgCIAEoBRISCgpzZXNzaW9uX2lkGAMgASgJIkEKFVByb3RvQ29udHJvbGxlckRldGFjaBIUCgxzZXNzaW9uX3Nsb3QYASABKAUSEgoKc2Vzc2lvbl9pZBgCIAEoCSKCAQoVUHJvdG9Db250cm9sbGVyUnVtYmxlEhQKDHNlc3Npb25fc2xvdBgBIAEoBRISCgpzZXNzaW9uX2lkGAIgASgJEhUKDWxvd19mcmVxdWVuY3kYAyABKAUSFgoOaGlnaF9mcmVxdWVuY3kYBCABKAUSEAoIZHVyYXRpb24YBSABKAUi0AUKGVByb3RvQ29udHJvbGxlclN0YXRlQmF0Y2gSFAoMc2Vzc2lvbl9zbG90GAEgASgFEhIKCnNlc3Npb25faWQYAiABKAkSQAoLdXBkYXRlX3R5cGUYAyABKA4yKy5wcm90by5Qcm90b0NvbnRyb2xsZXJTdGF0ZUJhdGNoLlVwZGF0ZVR5cGUSEAoIc2VxdWVuY2UYBCABKA0SVAoTYnV0dG9uX2NoYW5nZWRfbWFzaxgFIAMoCzI3LnByb3RvLlByb3RvQ29udHJvbGxlclN0YXRlQmF0Y2guQnV0dG9uQ2hhbmdlZE1hc2tFbnRyeRIZCgxsZWZ0X3N0aWNrX3gYBiABKAVIAIgBARIZCgxsZWZ0X3N0aWNrX3kYByABKAVIAYgBARIaCg1yaWdodF9zdGlja194GAggASgFSAKIAQESGgoNcmlnaHRfc3RpY2tfeRgJIAEoBUgDiAEBEhkKDGxlZnRfdHJpZ2dlchgKIAEoBUgEiAEBEhoKDXJpZ2h0X3RyaWdnZXIYCyABKAVIBYgBARITCgZkcGFkX3gYDCABKAVIBogBARITCgZkcGFkX3kYDSABKAVIB4gBARIbCg5jaGFuZ2VkX2ZpZWxkcxgOIAEoDUgIiAEBGjgKFkJ1dHRvbkNoYW5nZWRNYXNrRW50cnkSCwoDa2V5GAEgASgFEg0KBXZhbHVlGAIgASgIOgI4ASInCgpVcGRhdGVUeXBlEg4KCkZVTExfU1RBVEUQABIJCgVERUxUQRABQg8KDV9sZWZ0X3N0aWNrX3hCDwoNX2xlZnRfc3RpY2tfeUIQCg5fcmlnaHRfc3RpY2tfeEIQCg5fcmlnaHRfc3RpY2tfeUIPCg1fbGVmdF90cmlnZ2VyQhAKDl9yaWdodF90cmlnZ2VyQgkKB19kcGFkX3hCCQoHX2RwYWRfeUIRCg9fY2hhbmdlZF9maWVsZHMiqgEKE1JUQ0ljZUNhbmRpZGF0ZUluaXQSEQoJY2FuZGlkYXRlGAEgASgJEhoKDXNkcE1MaW5lSW5kZXgYAiABKA1IAIgBARITCgZzZHBNaWQYAyABKAlIAYgBARIdChB1c2VybmFtZUZyYWdtZW50GAQgASgJSAKIAQFCEAoOX3NkcE1MaW5lSW5kZXhCCQoHX3NkcE1pZEITChFfdXNlcm5hbWVGcmFnbWVudCI2ChlSVENTZXNzaW9uRGVzY3JpcHRpb25Jbml0EgsKA3NkcBgBIAEoCRIMCgR0eXBlGAIgASgJIjkKCFByb3RvSUNFEi0KCWNhbmRpZGF0ZRgBIAEoCzIaLnByb3RvLlJUQ0ljZUNhbmRpZGF0ZUluaXQiOQoIUHJvdG9TRFASLQoDc2RwGAEgASgLMiAucHJvdG8uUlRDU2Vzc2lvbkRlc2NyaXB0aW9uSW5pdCIYCghQcm90b1JhdxIMCgRkYXRhGAEgASgJIkUKHFByb3RvQ2xpZW50UmVxdWVzdFJvb21TdHJlYW0SEQoJcm9vbV9uYW1lGAEgASgJEhIKCnNlc3Npb25faWQYAiABKAkiRwoXUHJvdG9DbGllbnREaXNjb25uZWN0ZWQSEgoKc2Vzc2lvbl9pZBgBIAEoCRIYChBjb250cm9sbGVyX3Nsb3RzGAIgAygFIioKFVByb3RvU2VydmVyUHVzaFN0cmVhbRIRCglyb29tX25hbWUYASABKAlCFloUcmVsYXkvaW50ZXJuYWwvcHJvdG9iBnByb3RvMw");
+  fileDesc("Cgt0eXBlcy5wcm90bxIFcHJvdG8iJgoOUHJvdG9Nb3VzZU1vdmUSCQoBeBgBIAEoBRIJCgF5GAIgASgFIikKEVByb3RvTW91c2VNb3ZlQWJzEgkKAXgYASABKAUSCQoBeRgCIAEoBSInCg9Qcm90b01vdXNlV2hlZWwSCQoBeBgBIAEoBRIJCgF5GAIgASgFIiAKEVByb3RvTW91c2VLZXlEb3duEgsKA2tleRgBIAEoBSIeCg9Qcm90b01vdXNlS2V5VXASCwoDa2V5GAEgASgFIhsKDFByb3RvS2V5RG93bhILCgNrZXkYASABKAUiGQoKUHJvdG9LZXlVcBILCgNrZXkYASABKAUiTQoVUHJvdG9Db250cm9sbGVyQXR0YWNoEgoKAmlkGAEgASgJEhQKDHNlc3Npb25fc2xvdBgCIAEoBRISCgpzZXNzaW9uX2lkGAMgASgJIkEKFVByb3RvQ29udHJvbGxlckRldGFjaBIUCgxzZXNzaW9uX3Nsb3QYASABKAUSEgoKc2Vzc2lvbl9pZBgCIAEoCSJiChVQcm90b0NvbnRyb2xsZXJCdXR0b24SFAoMc2Vzc2lvbl9zbG90GAEgASgFEhIKCnNlc3Npb25faWQYAiABKAkSDgoGYnV0dG9uGAMgASgFEg8KB3ByZXNzZWQYBCABKAgiYgoWUHJvdG9Db250cm9sbGVyVHJpZ2dlchIUCgxzZXNzaW9uX3Nsb3QYASABKAUSEgoKc2Vzc2lvbl9pZBgCIAEoCRIPCgd0cmlnZ2VyGAMgASgFEg0KBXZhbHVlGAQgASgFImUKFFByb3RvQ29udHJvbGxlclN0aWNrEhQKDHNlc3Npb25fc2xvdBgBIAEoBRISCgpzZXNzaW9uX2lkGAIgASgJEg0KBXN0aWNrGAMgASgFEgkKAXgYBCABKAUSCQoBeRgFIAEoBSJcChNQcm90b0NvbnRyb2xsZXJBeGlzEhQKDHNlc3Npb25fc2xvdBgBIAEoBRISCgpzZXNzaW9uX2lkGAIgASgJEgwKBGF4aXMYAyABKAUSDQoFdmFsdWUYBCABKAUiggEKFVByb3RvQ29udHJvbGxlclJ1bWJsZRIUCgxzZXNzaW9uX3Nsb3QYASABKAUSEgoKc2Vzc2lvbl9pZBgCIAEoCRIVCg1sb3dfZnJlcXVlbmN5GAMgASgFEhYKDmhpZ2hfZnJlcXVlbmN5GAQgASgFEhAKCGR1cmF0aW9uGAUgASgFIqoBChNSVENJY2VDYW5kaWRhdGVJbml0EhEKCWNhbmRpZGF0ZRgBIAEoCRIaCg1zZHBNTGluZUluZGV4GAIgASgNSACIAQESEwoGc2RwTWlkGAMgASgJSAGIAQESHQoQdXNlcm5hbWVGcmFnbWVudBgEIAEoCUgCiAEBQhAKDl9zZHBNTGluZUluZGV4QgkKB19zZHBNaWRCEwoRX3VzZXJuYW1lRnJhZ21lbnQiNgoZUlRDU2Vzc2lvbkRlc2NyaXB0aW9uSW5pdBILCgNzZHAYASABKAkSDAoEdHlwZRgCIAEoCSI5CghQcm90b0lDRRItCgljYW5kaWRhdGUYASABKAsyGi5wcm90by5SVENJY2VDYW5kaWRhdGVJbml0IjkKCFByb3RvU0RQEi0KA3NkcBgBIAEoCzIgLnByb3RvLlJUQ1Nlc3Npb25EZXNjcmlwdGlvbkluaXQiGAoIUHJvdG9SYXcSDAoEZGF0YRgBIAEoCSJFChxQcm90b0NsaWVudFJlcXVlc3RSb29tU3RyZWFtEhEKCXJvb21fbmFtZRgBIAEoCRISCgpzZXNzaW9uX2lkGAIgASgJIkcKF1Byb3RvQ2xpZW50RGlzY29ubmVjdGVkEhIKCnNlc3Npb25faWQYASABKAkSGAoQY29udHJvbGxlcl9zbG90cxgCIAMoBSIqChVQcm90b1NlcnZlclB1c2hTdHJlYW0SEQoJcm9vbV9uYW1lGAEgASgJQhZaFHJlbGF5L2ludGVybmFsL3Byb3RvYgZwcm90bzM");
 
 /**
  * MouseMove message
@@ -223,6 +223,181 @@ export type ProtoControllerDetach = Message<"proto.ProtoControllerDetach"> & {
 export const ProtoControllerDetachSchema: GenMessage<ProtoControllerDetach> = /*@__PURE__*/
   messageDesc(file_types, 8);
 
+/**
+ * ControllerButton message
+ *
+ * @generated from message proto.ProtoControllerButton
+ */
+export type ProtoControllerButton = Message<"proto.ProtoControllerButton"> & {
+  /**
+   * Session specific slot number (0-3)
+   *
+   * @generated from field: int32 session_slot = 1;
+   */
+  sessionSlot: number;
+
+  /**
+   * Session ID of the client
+   *
+   * @generated from field: string session_id = 2;
+   */
+  sessionId: string;
+
+  /**
+   * Button code (linux input event code)
+   *
+   * @generated from field: int32 button = 3;
+   */
+  button: number;
+
+  /**
+   * true if pressed, false if released
+   *
+   * @generated from field: bool pressed = 4;
+   */
+  pressed: boolean;
+};
+
+/**
+ * Describes the message proto.ProtoControllerButton.
+ * Use `create(ProtoControllerButtonSchema)` to create a new message.
+ */
+export const ProtoControllerButtonSchema: GenMessage<ProtoControllerButton> = /*@__PURE__*/
+  messageDesc(file_types, 9);
+
+/**
+ * ControllerTriggers message
+ *
+ * @generated from message proto.ProtoControllerTrigger
+ */
+export type ProtoControllerTrigger = Message<"proto.ProtoControllerTrigger"> & {
+  /**
+   * Session specific slot number (0-3)
+   *
+   * @generated from field: int32 session_slot = 1;
+   */
+  sessionSlot: number;
+
+  /**
+   * Session ID of the client
+   *
+   * @generated from field: string session_id = 2;
+   */
+  sessionId: string;
+
+  /**
+   * Trigger number (0 for left, 1 for right)
+   *
+   * @generated from field: int32 trigger = 3;
+   */
+  trigger: number;
+
+  /**
+   * trigger value (-32768 to 32767)
+   *
+   * @generated from field: int32 value = 4;
+   */
+  value: number;
+};
+
+/**
+ * Describes the message proto.ProtoControllerTrigger.
+ * Use `create(ProtoControllerTriggerSchema)` to create a new message.
+ */
+export const ProtoControllerTriggerSchema: GenMessage<ProtoControllerTrigger> = /*@__PURE__*/
+  messageDesc(file_types, 10);
+
+/**
+ * ControllerSticks message
+ *
+ * @generated from message proto.ProtoControllerStick
+ */
+export type ProtoControllerStick = Message<"proto.ProtoControllerStick"> & {
+  /**
+   * Session specific slot number (0-3)
+   *
+   * @generated from field: int32 session_slot = 1;
+   */
+  sessionSlot: number;
+
+  /**
+   * Session ID of the client
+   *
+   * @generated from field: string session_id = 2;
+   */
+  sessionId: string;
+
+  /**
+   * Stick number (0 for left, 1 for right)
+   *
+   * @generated from field: int32 stick = 3;
+   */
+  stick: number;
+
+  /**
+   * X axis value (-32768 to 32767)
+   *
+   * @generated from field: int32 x = 4;
+   */
+  x: number;
+
+  /**
+   * Y axis value (-32768 to 32767)
+   *
+   * @generated from field: int32 y = 5;
+   */
+  y: number;
+};
+
+/**
+ * Describes the message proto.ProtoControllerStick.
+ * Use `create(ProtoControllerStickSchema)` to create a new message.
+ */
+export const ProtoControllerStickSchema: GenMessage<ProtoControllerStick> = /*@__PURE__*/
+  messageDesc(file_types, 11);
+
+/**
+ * ControllerAxis message
+ *
+ * @generated from message proto.ProtoControllerAxis
+ */
+export type ProtoControllerAxis = Message<"proto.ProtoControllerAxis"> & {
+  /**
+   * Session specific slot number (0-3)
+   *
+   * @generated from field: int32 session_slot = 1;
+   */
+  sessionSlot: number;
+
+  /**
+   * Session ID of the client
+   *
+   * @generated from field: string session_id = 2;
+   */
+  sessionId: string;
+
+  /**
+   * Axis number (0 for d-pad horizontal, 1 for d-pad vertical)
+   *
+   * @generated from field: int32 axis = 3;
+   */
+  axis: number;
+
+  /**
+   * axis value (-1 to 1)
+   *
+   * @generated from field: int32 value = 4;
+   */
+  value: number;
+};
+
+/**
+ * Describes the message proto.ProtoControllerAxis.
+ * Use `create(ProtoControllerAxisSchema)` to create a new message.
+ */
+export const ProtoControllerAxisSchema: GenMessage<ProtoControllerAxis> = /*@__PURE__*/
+  messageDesc(file_types, 12);
+
 /**
  * ControllerRumble message
  *
@@ -270,145 +445,7 @@ export type ProtoControllerRumble = Message<"proto.ProtoControllerRumble"> & {
  * Use `create(ProtoControllerRumbleSchema)` to create a new message.
  */
 export const ProtoControllerRumbleSchema: GenMessage<ProtoControllerRumble> = /*@__PURE__*/
-  messageDesc(file_types, 9);
+  messageDesc(file_types, 13);
-
-/**
- * ControllerStateBatch - single message containing full or partial controller state
- *
- * @generated from message proto.ProtoControllerStateBatch
- */
-export type ProtoControllerStateBatch = Message<"proto.ProtoControllerStateBatch"> & {
-  /**
-   * Session specific slot number (0-3)
-   *
-   * @generated from field: int32 session_slot = 1;
-   */
-  sessionSlot: number;
-
-  /**
-   * Session ID of the client
-   *
-   * @generated from field: string session_id = 2;
-   */
-  sessionId: string;
-
-  /**
-   * @generated from field: proto.ProtoControllerStateBatch.UpdateType update_type = 3;
-   */
-  updateType: ProtoControllerStateBatch_UpdateType;
-
-  /**
-   * Sequence number for packet loss detection
-   *
-   * @generated from field: uint32 sequence = 4;
-   */
-  sequence: number;
-
-  /**
-   * Button state map (Linux event codes)
-   *
-   * @generated from field: map<int32, bool> button_changed_mask = 5;
-   */
-  buttonChangedMask: { [key: number]: boolean };
-
-  /**
-   * Analog inputs
-   *
-   * -32768 to 32767
-   *
-   * @generated from field: optional int32 left_stick_x = 6;
-   */
-  leftStickX?: number;
-
-  /**
-   * -32768 to 32767
-   *
-   * @generated from field: optional int32 left_stick_y = 7;
-   */
-  leftStickY?: number;
-
-  /**
-   * -32768 to 32767
-   *
-   * @generated from field: optional int32 right_stick_x = 8;
-   */
-  rightStickX?: number;
-
-  /**
-   * -32768 to 32767
-   *
-   * @generated from field: optional int32 right_stick_y = 9;
-   */
-  rightStickY?: number;
-
-  /**
-   * -32768 to 32767
-   *
-   * @generated from field: optional int32 left_trigger = 10;
-   */
-  leftTrigger?: number;
-
-  /**
-   * -32768 to 32767
-   *
-   * @generated from field: optional int32 right_trigger = 11;
-   */
-  rightTrigger?: number;
-
-  /**
-   * -1, 0, or 1
-   *
-   * @generated from field: optional int32 dpad_x = 12;
-   */
-  dpadX?: number;
-
-  /**
-   * -1, 0, or 1
-   *
-   * @generated from field: optional int32 dpad_y = 13;
-   */
-  dpadY?: number;
-
-  /**
-   * Bitmask indicating which fields have changed
-   * Bit 0: button_changed_mask, Bit 1: left_stick_x, Bit 2: left_stick_y, etc.
-   *
-   * @generated from field: optional uint32 changed_fields = 14;
-   */
-  changedFields?: number;
-};
-
-/**
- * Describes the message proto.ProtoControllerStateBatch.
- * Use `create(ProtoControllerStateBatchSchema)` to create a new message.
- */
-export const ProtoControllerStateBatchSchema: GenMessage<ProtoControllerStateBatch> = /*@__PURE__*/
-  messageDesc(file_types, 10);
-
-/**
- * @generated from enum proto.ProtoControllerStateBatch.UpdateType
- */
-export enum ProtoControllerStateBatch_UpdateType {
-  /**
-   * Complete controller state
-   *
-   * @generated from enum value: FULL_STATE = 0;
-   */
-  FULL_STATE = 0,
-
-  /**
-   * Only changed fields
-   *
-   * @generated from enum value: DELTA = 1;
-   */
-  DELTA = 1,
-}
-
-/**
- * Describes the enum proto.ProtoControllerStateBatch.UpdateType.
- */
-export const ProtoControllerStateBatch_UpdateTypeSchema: GenEnum<ProtoControllerStateBatch_UpdateType> = /*@__PURE__*/
-  enumDesc(file_types, 10, 0);
 
 /**
  * @generated from message proto.RTCIceCandidateInit
@@ -440,7 +477,7 @@ export type RTCIceCandidateInit = Message<"proto.RTCIceCandidateInit"> & {
  * Use `create(RTCIceCandidateInitSchema)` to create a new message.
  */
 export const RTCIceCandidateInitSchema: GenMessage<RTCIceCandidateInit> = /*@__PURE__*/
-  messageDesc(file_types, 11);
+  messageDesc(file_types, 14);
 
 /**
  * @generated from message proto.RTCSessionDescriptionInit
@@ -462,7 +499,7 @@ export type RTCSessionDescriptionInit = Message<"proto.RTCSessionDescriptionInit
  * Use `create(RTCSessionDescriptionInitSchema)` to create a new message.
  */
 export const RTCSessionDescriptionInitSchema: GenMessage<RTCSessionDescriptionInit> = /*@__PURE__*/
-  messageDesc(file_types, 12);
+  messageDesc(file_types, 15);
 
 /**
  * ProtoICE message
@@ -481,7 +518,7 @@ export type ProtoICE = Message<"proto.ProtoICE"> & {
  * Use `create(ProtoICESchema)` to create a new message.
  */
 export const ProtoICESchema: GenMessage<ProtoICE> = /*@__PURE__*/
-  messageDesc(file_types, 13);
+  messageDesc(file_types, 16);
 
 /**
  * ProtoSDP message
@@ -500,7 +537,7 @@ export type ProtoSDP = Message<"proto.ProtoSDP"> & {
  * Use `create(ProtoSDPSchema)` to create a new message.
  */
 export const ProtoSDPSchema: GenMessage<ProtoSDP> = /*@__PURE__*/
-  messageDesc(file_types, 14);
+  messageDesc(file_types, 17);
 
 /**
  * ProtoRaw message
@@ -519,7 +556,7 @@ export type ProtoRaw = Message<"proto.ProtoRaw"> & {
  * Use `create(ProtoRawSchema)` to create a new message.
  */
 export const ProtoRawSchema: GenMessage<ProtoRaw> = /*@__PURE__*/
-  messageDesc(file_types, 15);
+  messageDesc(file_types, 18);
 
 /**
  * ProtoClientRequestRoomStream message
@@ -543,7 +580,7 @@ export type ProtoClientRequestRoomStream = Message<"proto.ProtoClientRequestRoom
  * Use `create(ProtoClientRequestRoomStreamSchema)` to create a new message.
  */
 export const ProtoClientRequestRoomStreamSchema: GenMessage<ProtoClientRequestRoomStream> = /*@__PURE__*/
-  messageDesc(file_types, 16);
+  messageDesc(file_types, 19);
 
 /**
  * ProtoClientDisconnected message
@@ -567,7 +604,7 @@ export type ProtoClientDisconnected = Message<"proto.ProtoClientDisconnected"> &
  * Use `create(ProtoClientDisconnectedSchema)` to create a new message.
  */
 export const ProtoClientDisconnectedSchema: GenMessage<ProtoClientDisconnected> = /*@__PURE__*/
-  messageDesc(file_types, 17);
+  messageDesc(file_types, 20);
 
 /**
  * ProtoServerPushStream message
@@ -586,5 +623,5 @@ export type ProtoServerPushStream = Message<"proto.ProtoServerPushStream"> & {
  * Use `create(ProtoServerPushStreamSchema)` to create a new message.
  */
 export const ProtoServerPushStreamSchema: GenMessage<ProtoServerPushStream> = /*@__PURE__*/
-  messageDesc(file_types, 18);
+  messageDesc(file_types, 21);
 

packages/input/src/webrtc-stream.ts

@@ -123,6 +123,8 @@ export class WebRTCStream {
             } else {
               iceHolder.push(cand);
             }
+          } else {
+            iceHolder.push(cand);
           }
         });
 
@@ -141,14 +143,6 @@ export class WebRTCStream {
             sdp: data.sdp.sdp,
             type: data.sdp.type as RTCSdpType,
           });
-          // Add held candidates
-          iceHolder.forEach((candidate) => {
-            this._pc!.addIceCandidate(candidate).catch((err) => {
-              console.error("Error adding held ICE candidate:", err);
-            });
-          });
-          iceHolder = [];
-
           // Create our answer
           const answer = await this._pc!.createAnswer();
           // Force stereo in Chromium browsers
@@ -178,7 +172,7 @@ export class WebRTCStream {
         const requestMsg = createMessage(
           create(ProtoClientRequestRoomStreamSchema, {
             roomName: roomName,
-            sessionId: clientId ?? "",
+            sessionId: clientId,
           }),
           "request-stream-room",
         );

packages/native-app/.expo/README.md

@@ -1,13 +0,0 @@
-> Why do I have a folder named ".expo" in my project?
-
-The ".expo" folder is created when an Expo project is started using "expo start" command.
-
-> What do the files contain?
-
-- "devices.json": contains information about devices that have recently opened this project. This is used to populate the "Development sessions" list in your development builds.
-- "settings.json": contains the server configuration that is used to serve the application manifest.
-
-> Should I commit the ".expo" folder?
-
-No, you should not share the ".expo" folder. It does not contain any information that is relevant for other developers working on the project, it is specific to your machine.
-Upon project creation, the ".expo" folder is already added to your ".gitignore" file.

packages/native-app/.expo/devices.json

@@ -1,3 +0,0 @@
-{
-  "devices": []
-}

packages/play-standalone/android/.gitignore

@@ -1,101 +0,0 @@
-# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
-
-# Built application files
-*.apk
-*.aar
-*.ap_
-*.aab
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-#  Uncomment the following line in case you need and you don't have the release build type files in your app
-# release/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# IntelliJ
-*.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-# Android Studio 3 in .gitignore file.
-.idea/caches
-.idea/modules.xml
-# Comment next line if keeping position of elements in Navigation Editor is relevant for you
-.idea/navEditor.xml
-
-# Keystore files
-# Uncomment the following lines if you do not want to check your keystore files in.
-#*.jks
-#*.keystore
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-.cxx/
-
-# Google Services (e.g. APIs or Firebase)
-# google-services.json
-
-# Freeline
-freeline.py
-freeline/
-freeline_project_description.json
-
-# fastlane
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
-fastlane/readme.md
-
-# Version control
-vcs.xml
-
-# lint
-lint/intermediates/
-lint/generated/
-lint/outputs/
-lint/tmp/
-# lint/reports/
-
-# Android Profiling
-*.hprof
-
-# Cordova plugins for Capacitor
-capacitor-cordova-android-plugins
-
-# Copied web assets
-app/src/main/assets/public
-
-# Generated Config files
-app/src/main/assets/capacitor.config.json
-app/src/main/assets/capacitor.plugins.json
-app/src/main/res/xml/config.xml

packages/play-standalone/android/app/.gitignore

@@ -1,2 +0,0 @@
-/build/*
-!/build/.npmkeep

packages/play-standalone/android/app/build.gradle

@@ -1,54 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    namespace "com.nestri.play"
-    compileSdk rootProject.ext.compileSdkVersion
-    defaultConfig {
-        applicationId "com.nestri.play"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        aaptOptions {
-             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
-             // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
-            ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
-        }
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-repositories {
-    flatDir{
-        dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
-    }
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
-    implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
-    implementation project(':capacitor-android')
-    testImplementation "junit:junit:$junitVersion"
-    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-    implementation project(':capacitor-cordova-android-plugins')
-}
-
-apply from: 'capacitor.build.gradle'
-
-try {
-    def servicesJSON = file('google-services.json')
-    if (servicesJSON.text) {
-        apply plugin: 'com.google.gms.google-services'
-    }
-} catch(Exception e) {
-    logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
-}

packages/play-standalone/android/app/capacitor.build.gradle

@@ -1,19 +0,0 @@
-// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
-
-android {
-  compileOptions {
-      sourceCompatibility JavaVersion.VERSION_21
-      targetCompatibility JavaVersion.VERSION_21
-  }
-}
-
-apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
-dependencies {
-    implementation project(':capacitor-screen-orientation')
-
-}
-
-
-if (hasProperty('postBuildExtras')) {
-  postBuildExtras()
-}

packages/play-standalone/android/app/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

packages/play-standalone/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.getcapacitor.myapp;
-
-import static org.junit.Assert.*;
-
-import android.content.Context;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-
-        assertEquals("com.getcapacitor.app", appContext.getPackageName());
-    }
-}

packages/play-standalone/android/app/src/main/AndroidManifest.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
-            android:name=".MainActivity"
-            android:label="@string/title_activity_main"
-            android:theme="@style/AppTheme.NoActionBarLaunch"
-            android:launchMode="singleTask"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
-        </provider>
-    </application>
-
-    <uses-feature
-        android:name="android.software.leanback"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
-
-    <!-- Permissions -->
-
-    <uses-permission android:name="android.permission.INTERNET" />
-</manifest>

packages/play-standalone/android/app/src/main/java/com/nestri/play/MainActivity.java

@@ -1,5 +0,0 @@
-package com.nestri.play;
-
-import com.getcapacitor.BridgeActivity;
-
-public class MainActivity extends BridgeActivity {}

packages/play-standalone/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>

packages/play-standalone/android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>

packages/play-standalone/android/app/src/main/res/layout/activity_main.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <WebView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

packages/play-standalone/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background>
-        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
-    </background>
-    <foreground>
-        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
-    </foreground>
-</adaptive-icon>

packages/play-standalone/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background>
-        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
-    </background>
-    <foreground>
-        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
-    </foreground>
-</adaptive-icon>

packages/play-standalone/android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
-</resources>

packages/play-standalone/android/app/src/main/res/values/strings.xml

@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="app_name">Nestri Play</string>
-    <string name="title_activity_main">Nestri Play</string>
-    <string name="package_name">com.nestri.play</string>
-    <string name="custom_url_scheme">com.nestri.play</string>
-</resources>

packages/play-standalone/android/app/src/main/res/values/styles.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:background">@null</item>
-    </style>
-
-
-    <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
-        <item name="android:background">@drawable/splash</item>
-    </style>
-</resources>

packages/play-standalone/android/app/src/main/res/xml/file_paths.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <external-path name="my_images" path="." />
-    <cache-path name="my_cache_images" path="." />
-</paths>

packages/play-standalone/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java

@@ -1,18 +0,0 @@
-package com.getcapacitor.myapp;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}

packages/play-standalone/android/build.gradle

@@ -1,29 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.2'
-        classpath 'com.google.gms:google-services:4.4.2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-apply from: "variables.gradle"
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}

packages/play-standalone/android/capacitor.settings.gradle

@@ -1,6 +0,0 @@
-// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
-include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../../../node_modules/@capacitor/android/capacitor')
-
-include ':capacitor-screen-orientation'
-project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/@capacitor/screen-orientation/android')

packages/play-standalone/android/gradle.properties

@@ -1,22 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true

packages/play-standalone/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

packages/play-standalone/android/gradlew

@@ -1,252 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"

packages/play-standalone/android/gradlew.bat

@@ -1,94 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

packages/play-standalone/android/settings.gradle

@@ -1,5 +0,0 @@
-include ':app'
-include ':capacitor-cordova-android-plugins'
-project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')
-
-apply from: 'capacitor.settings.gradle'

packages/play-standalone/android/variables.gradle

@@ -1,16 +0,0 @@
-ext {
-    minSdkVersion = 23
-    compileSdkVersion = 35
-    targetSdkVersion = 35
-    androidxActivityVersion = '1.9.2'
-    androidxAppCompatVersion = '1.7.0'
-    androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.15.0'
-    androidxFragmentVersion = '1.8.4'
-    coreSplashScreenVersion = '1.0.1'
-    androidxWebkitVersion = '1.12.1'
-    junitVersion = '4.13.2'
-    androidxJunitVersion = '1.2.1'
-    androidxEspressoCoreVersion = '3.6.1'
-    cordovaAndroidVersion = '10.1.1'
-}

packages/play-standalone/assets/icon.svg

@@ -1,20 +0,0 @@
-<svg
-    width="512"
-    height="512"
-    viewBox="0 0 26.458333 26.458333"
-    version="1.1"
-    xmlns="http://www.w3.org/2000/svg"
->
-    <rect x="0" y="0" width="26.458333" height="26.458333" fill="#09090b"/>
-    <g transform="translate(13.2291665, 13.2291665) scale(0.60) translate(-13.2291665, -13.2291665)">
-        <path
-            d="M 1.5344249,1.5344211 V 9.2976453 C 10.141372,9.3506226 17.107729,16.31697 17.160697,24.923917 h 7.763224 V 1.5344211 H 17.26052 V 7.6582313 L 17.095435,7.5123325 C 12.813137,3.6822243 7.2773806,1.558425 1.5344327,1.5344191 Z"
-            fill="#FFFFFF"></path>
-        <path
-            d="m 1.5344249,10.321451 v 7.472042 c 3.9146312,0.04963 7.080792,3.215792 7.1304217,7.130424 H 16.136889 C 16.086774,16.878739 9.5796027,10.37157 1.5344249,10.321451 Z"
-            fill="#FFFFFF"></path>
-        <path
-            d="m 1.5344249,18.699055 v 6.224862 H 7.7592875 C 7.7148345,21.504871 4.9534705,18.743512 1.5344249,18.699055 Z"
-            fill="#FFFFFF"></path>
-    </g>
-</svg>