better UI + AppIcon

## Description

Next step would be having full DE environment variant I guess? I'll see
later if it's doable in this PR or if I'll do separate one for keeping
things small and manageable for once 😅

- Added easily doable variants for runners, with simple CI build matrix.
- Added playsite in CI builds finally.
- Some CI formatting and naming fixes.
- Removed PR full runner builds as they kept failing due to lack of disk
space on GH runner.


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **New Features**
* New dedicated runner images for Steam, Heroic, and Minecraft plus a
common runtime and builder images.
* **Chores**
* CI/workflow reorganization to build and publish more runner variants
and base images.
* Installer and package tweaks (package manager flags, CUDA enablement)
and updated build tooling.
* Unified startup to use a constructed launch command; removed two
default environment exports.
  * Added container ignore patterns.

<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: DatCaptainHorse <DatCaptainHorse@users.noreply.github.com>

.github/CODEOWNERS

@@ -3,13 +3,13 @@
 /apps/ @victorpahuus @AquaWolf
 /packages/ui/ @wanjohiryan @victorpahuus @AquaWolf
 
-/protobuf/ @AquaWolf
+/protobufs/ @AquaWolf @DatCaptainHorse
 
 /infra/ @wanjohiryan
 /packages/core/ @wanjohiryan
 /packages/functions/ @wanjohiryan
 
-/containers/ @DatCaptainHorse
+/containerfiles/ @DatCaptainHorse
 /packages/server/ @DatCaptainHorse
 /packages/relay/ @DatCaptainHorse
 /packages/scripts/ @DatCaptainHorse

.github/workflows/docker-bake.hcl

@@ -0,0 +1,32 @@
+variable "BASE_IMAGE" {
+  default = "docker.io/cachyos/cachyos:latest"
+}
+
+group "default" {
+  targets = ["runner-base", "runner-builder"]
+}
+
+target "runner-base" {
+  dockerfile = "containerfiles/runner-base.Containerfile"
+  context    = "."
+  args = {
+    BASE_IMAGE = BASE_IMAGE
+  }
+  cache-from = ["type=gha,scope=runner-base-pr"]
+  cache-to = ["type=gha,scope=runner-base-pr,mode=max"]
+  tags = ["runner-base:latest"]
+}
+
+target "runner-builder" {
+  dockerfile = "containerfiles/runner-builder.Containerfile"
+  context    = "."
+  args = {
+    RUNNER_BASE_IMAGE = "runner-base:latest"
+  }
+  cache-from = ["type=gha,scope=runner-builder-pr"]
+  cache-to = ["type=gha,scope=runner-builder-pr,mode=max"]
+  tags = ["runner-builder:latest"]
+  contexts = {
+    runner-base = "target:runner-base"
+  }
+}

.github/workflows/play-standalone.yml

@@ -0,0 +1,81 @@
+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,6 +1,5 @@
-#Tabs not spaces, you moron :)
+name: Build Nestri relay
 
-name: Build nestri:relay
 on:
     pull_request:
         paths:

.github/workflows/runner-bases.yml

@@ -0,0 +1,73 @@
+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

@@ -0,0 +1,86 @@
+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

@@ -1,121 +0,0 @@
-#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_TAG_PREFIX: runner
-    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 image on PR
-        runs-on: ubuntu-latest
-        permissions:
-            contents: read
-            packages: write
-        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: Set Swap Space
-              uses: pierotofy/set-swap-space@master
-              with:
-                swap-size-gb: 20
-            - 
-              name: Build Docker image
-              uses: docker/build-push-action@v6
-              with:
-                file: containerfiles/runner.Containerfile
-                context: ./
-                push: false
-                load: true
-                tags: nestri:runner
-                cache-from: type=gha,mode=max
-                cache-to: type=gha,mode=max
-
-    build-and-push-docker:
-        name: Build and push image
-        if: ${{ github.ref == 'refs/heads/production' || github.ref == 'refs/heads/dev' }}
-        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: 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 Docker image
-              uses: docker/build-push-action@v6
-              with:
-                file:  containerfiles/runner.Containerfile
-                context: ./
-                push: true
-                tags: ${{ steps.meta.outputs.tags }}
-                labels: ${{ steps.meta.outputs.labels }}
-                cache-from: type=gha,mode=max
-                cache-to: type=gha,mode=max
-                pull: ${{ github.event_name == 'schedule' }} # Pull base image for scheduled builds

containerfiles/heroic-runner.Containerfile

@@ -0,0 +1,23 @@
+# 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

@@ -0,0 +1,24 @@
+# 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/playsite.Containerfile

@@ -3,7 +3,6 @@ FROM docker.io/node:24-alpine AS base
 FROM base AS build
 WORKDIR /usr/src/app
 COPY package.json ./
-COPY patches ./patches
 COPY packages/input ./packages/input
 COPY packages/play-standalone ./packages/play-standalone
 RUN cd packages/play-standalone && npm install && npm run build

containerfiles/relay.Containerfile

@@ -1,9 +1,9 @@
-FROM docker.io/golang:1.24-alpine AS go-build
+FROM docker.io/golang:1.25-alpine AS go-build
 WORKDIR /builder
 COPY packages/relay/ /builder/
 RUN go build
 
-FROM docker.io/golang:1.24-alpine
+FROM docker.io/golang:1.25-alpine
 COPY --from=go-build /builder/relay /relay/relay
 WORKDIR /relay
 
@@ -22,8 +22,4 @@ ENV WEBRTC_NAT_IPS=""
 ENV AUTO_ADD_LOCAL_IP=true
 ENV PERSIST_DIR="./persist-data"
 
-EXPOSE $ENDPOINT_PORT
-EXPOSE $WEBRTC_UDP_START-$WEBRTC_UDP_END/udp
-EXPOSE $WEBRTC_UDP_MUX/udp
-
 ENTRYPOINT ["/relay/relay"]

containerfiles/runner-base.Containerfile

@@ -0,0 +1,13 @@
+# Container build arguments #
+ARG BASE_IMAGE=docker.io/cachyos/cachyos:latest
+
+#*******************************************#
+# Base Stage - Simple with light essentials #
+#*******************************************#
+FROM ${BASE_IMAGE} AS bases
+
+# Only lightweight stuff needed by both builder and runtime
+RUN --mount=type=cache,target=/var/cache/pacman/pkg \
+    pacman -Sy --noconfirm \
+        libssh2 curl wget libevdev libc++abi \
+        gstreamer gst-plugins-base

containerfiles/runner-builder.Containerfile

@@ -0,0 +1,202 @@
+# Container build arguments #
+ARG RUNNER_BASE_IMAGE=runner-base:latest
+
+#**************#
+# builder base #
+#**************#
+FROM ${RUNNER_BASE_IMAGE} AS base-builder
+
+ENV ARTIFACTS=/artifacts
+RUN mkdir -p "${ARTIFACTS}"
+
+# Environment setup for Rust and Cargo
+ENV CARGO_HOME=/usr/local/cargo \
+    PATH="${CARGO_HOME}/bin:${PATH}"
+
+# Install build essentials and caching tools
+RUN --mount=type=cache,target=/var/cache/pacman/pkg \
+    pacman -S --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)
+RUN ln -sf /usr/bin/mold /usr/bin/ld && \
+    ln -sf /usr/bin/mold /usr/bin/ld.lld && \
+    ln -sf /usr/bin/mold /usr/bin/lld
+
+# Install latest Rust using rustup
+RUN rustup default stable
+
+# Install cargo-chef with proper caching
+RUN --mount=type=cache,target=${CARGO_HOME}/registry \
+    cargo install cargo-chef --locked
+
+#*******************************#
+# vimputti manager build stages #
+#*******************************#
+FROM base-builder AS vimputti-manager-deps
+WORKDIR /builder
+
+# Install build dependencies
+RUN --mount=type=cache,target=/var/cache/pacman/pkg \
+    pacman -S --noconfirm lib32-gcc-libs
+
+# Clone repository
+RUN git clone --depth 1 --rev "2fde5376b6b9a38cdbd94ccc6a80c9d29a81a417" https://github.com/DatCaptainHorse/vimputti.git
+
+#--------------------------------------------------------------------
+FROM vimputti-manager-deps AS vimputti-manager-planner
+WORKDIR /builder/vimputti
+
+# Prepare recipe for dependency caching
+RUN --mount=type=cache,target=${CARGO_HOME}/registry \
+    cargo chef prepare --recipe-path recipe.json
+
+#--------------------------------------------------------------------
+FROM vimputti-manager-deps AS vimputti-manager-cached-builder
+WORKDIR /builder/vimputti
+
+COPY --from=vimputti-manager-planner /builder/vimputti/recipe.json .
+
+# Cache dependencies using cargo-chef
+RUN --mount=type=cache,target=${CARGO_HOME}/registry \
+    cargo chef cook --release --recipe-path recipe.json
+
+ENV CARGO_TARGET_DIR=/builder/target
+COPY --from=vimputti-manager-planner /builder/vimputti/ .
+
+# Build and install directly to artifacts
+RUN --mount=type=cache,target=${CARGO_HOME}/registry \
+    --mount=type=cache,target=/builder/target \
+    cargo build --release --package vimputti-manager && \
+    cargo build --release --package vimputti-shim && \
+    rustup target add i686-unknown-linux-gnu && \
+    cargo build --release --package vimputti-shim --target i686-unknown-linux-gnu && \
+    cp "${CARGO_TARGET_DIR}/release/vimputti-manager" "${ARTIFACTS}" && \
+    cp "${CARGO_TARGET_DIR}/release/libvimputti_shim.so" "${ARTIFACTS}/libvimputti_shim_64.so" && \
+    cp "${CARGO_TARGET_DIR}/i686-unknown-linux-gnu/release/libvimputti_shim.so" "${ARTIFACTS}/libvimputti_shim_32.so"
+
+#****************************#
+# nestri-server build stages #
+#****************************#
+FROM base-builder AS nestri-server-deps
+WORKDIR /builder
+
+# Install build dependencies
+RUN --mount=type=cache,target=/var/cache/pacman/pkg \
+    pacman -S --noconfirm gst-plugins-good gst-plugin-rswebrtc
+
+#--------------------------------------------------------------------
+FROM nestri-server-deps AS nestri-server-planner
+WORKDIR /builder/nestri
+
+COPY packages/server/Cargo.toml packages/server/Cargo.lock ./
+
+# Prepare recipe for dependency caching
+RUN --mount=type=cache,target=${CARGO_HOME}/registry \
+    cargo chef prepare --recipe-path recipe.json
+
+#--------------------------------------------------------------------
+FROM nestri-server-deps AS nestri-server-cached-builder
+WORKDIR /builder/nestri
+
+COPY --from=nestri-server-planner /builder/nestri/recipe.json .
+
+# Cache dependencies using cargo-chef
+RUN --mount=type=cache,target=${CARGO_HOME}/registry \
+    cargo chef cook --release --recipe-path recipe.json
+
+
+ENV CARGO_TARGET_DIR=/builder/target
+COPY packages/server/ ./
+
+# Build and install directly to artifacts
+RUN --mount=type=cache,target=${CARGO_HOME}/registry \
+    --mount=type=cache,target=/builder/target \
+    cargo build --release && \
+    cp "${CARGO_TARGET_DIR}/release/nestri-server" "${ARTIFACTS}"
+
+#**********************************#
+# gst-wayland-display build stages #
+#**********************************#
+FROM base-builder AS gst-wayland-deps
+WORKDIR /builder
+
+# Install build dependencies
+RUN --mount=type=cache,target=/var/cache/pacman/pkg \
+    pacman -S --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
+
+#--------------------------------------------------------------------
+FROM gst-wayland-deps AS gst-wayland-planner
+WORKDIR /builder/gst-wayland-display
+
+# Prepare recipe for dependency caching
+RUN --mount=type=cache,target=${CARGO_HOME}/registry \
+    cargo chef prepare --recipe-path recipe.json
+
+#--------------------------------------------------------------------
+FROM gst-wayland-deps AS gst-wayland-cached-builder
+WORKDIR /builder/gst-wayland-display
+
+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
+
+
+ENV CARGO_TARGET_DIR=/builder/target
+
+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
+
+#*********************************#
+# Patched bubblewrap build stages #
+#*********************************#
+FROM base-builder AS bubblewrap-deps
+WORKDIR /builder
+
+# Install build dependencies
+RUN --mount=type=cache,target=/var/cache/pacman/pkg \
+    pacman -S --noconfirm libtool libcap libselinux
+
+# Copy patch file from host
+COPY packages/patches/bubblewrap/ /builder/patches/
+
+# Clone repository
+RUN git clone --depth 1 --rev "9ca3b05ec787acfb4b17bed37db5719fa777834f" https://github.com/containers/bubblewrap.git && \
+    cd bubblewrap && \
+    # Apply patch to fix user namespace issue
+    git apply ../patches/bubbleunheck.patch
+
+#--------------------------------------------------------------------
+FROM bubblewrap-deps AS bubblewrap-builder
+WORKDIR /builder/bubblewrap
+
+# Build and install directly to artifacts
+RUN meson setup build --prefix=${ARTIFACTS} && \
+    meson compile -C build && \
+    meson install -C build
+
+#*********************************************#
+# Final Export Stage - Collects all artifacts #
+#*********************************************#
+FROM scratch AS artifacts
+
+COPY --from=nestri-server-cached-builder /artifacts/nestri-server /artifacts/bin/
+COPY --from=gst-wayland-cached-builder /artifacts/lib/ /artifacts/lib/
+COPY --from=gst-wayland-cached-builder /artifacts/include/ /artifacts/include/
+COPY --from=vimputti-manager-cached-builder /artifacts/vimputti-manager /artifacts/bin/
+COPY --from=vimputti-manager-cached-builder /artifacts/libvimputti_shim_64.so /artifacts/lib64/libvimputti_shim.so
+COPY --from=vimputti-manager-cached-builder /artifacts/libvimputti_shim_32.so /artifacts/lib32/libvimputti_shim.so
+COPY --from=bubblewrap-builder /artifacts/bin/bwrap /artifacts/bin/

containerfiles/runner-common.Containerfile

@@ -0,0 +1,90 @@
+# Container build arguments #
+ARG RUNNER_BASE_IMAGE=runner-base:latest
+ARG RUNNER_BUILDER_IMAGE=runner-builder:latest
+
+#**********************#
+# Runtime Common Stage #
+#**********************#
+FROM ${RUNNER_BASE_IMAGE} AS runtime
+FROM ${RUNNER_BUILDER_IMAGE} AS builder
+FROM runtime
+
+### Package Installation ###
+# Core system components
+RUN --mount=type=cache,target=/var/cache/pacman/pkg \
+    pacman -S --needed --noconfirm \
+        vulkan-intel lib32-vulkan-intel vpl-gpu-rt \
+        vulkan-radeon lib32-vulkan-radeon \
+        mesa lib32-mesa \
+        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 \
+        hwdata openssh \
+    # GStreamer stack
+        gst-plugins-good \
+        gst-plugins-bad gst-plugin-pipewire \
+        gst-plugin-webrtchttp gst-plugin-rswebrtc gst-plugin-rsrtp \
+        gst-plugin-va gst-plugin-qsv && \
+    # Cleanup
+    paccache -rk1 && \
+    rm -rf /usr/share/{info,man,doc}/*
+
+### User Configuration ###
+ARG NESTRI_USER_PWD=""
+ENV NESTRI_USER="nestri" \
+    NESTRI_UID=1000 \
+    NESTRI_GID=1000 \
+    NESTRI_LANG=en_US.UTF-8 \
+    NESTRI_XDG_RUNTIME_DIR=/run/user/1000 \
+    NESTRI_HOME=/home/nestri \
+    NESTRI_VIMPUTTI_PATH=/tmp/vimputti-1000 \
+    NVIDIA_DRIVER_CAPABILITIES=all
+
+RUN mkdir -p "/home/${NESTRI_USER}" && \
+    groupadd -g "${NESTRI_GID}" "${NESTRI_USER}" && \
+    useradd -d "/home/${NESTRI_USER}" -u "${NESTRI_UID}" -g "${NESTRI_GID}" -s /bin/bash "${NESTRI_USER}" && \
+    echo "${NESTRI_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
+    NESTRI_USER_PWD="${NESTRI_USER_PWD:-$(openssl rand -base64 12)}" && \
+    echo "Setting password for ${NESTRI_USER} as: ${NESTRI_USER_PWD}" && \
+    echo "${NESTRI_USER}:${NESTRI_USER_PWD}" | chpasswd && \
+    mkdir -p "${NESTRI_XDG_RUNTIME_DIR}" && \
+    chown "${NESTRI_USER}:${NESTRI_USER}" "${NESTRI_XDG_RUNTIME_DIR}" && \
+    usermod -aG input,video,render,seat "${NESTRI_USER}"
+
+### System Services Configuration ###
+RUN mkdir -p /run/dbus && \
+    # Wireplumber suspend disable
+    sed -i -z \
+        -e 's/{[[:space:]]*name = node\/suspend-node\.lua,[[:space:]]*type = script\/lua[[:space:]]*provides = hooks\.node\.suspend[[:space:]]*}[[:space:]]*//g' \
+        -e '/wants = \[/{s/hooks\.node\.suspend\s*//; s/,\s*\]/]/}' \
+        /usr/share/wireplumber/wireplumber.conf
+
+## Audio Systems Configs - Latency optimizations + Loopback ##
+RUN mkdir -p /etc/pipewire/pipewire.conf.d && \
+    mkdir -p /etc/wireplumber/wireplumber.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 ##
+RUN mkdir -p "${NESTRI_HOME}/.config/MangoHud"
+
+COPY packages/configs/MangoHud/MangoHud.conf "${NESTRI_HOME}/.config/MangoHud/"
+
+### Artifacts from Builder ###
+COPY --from=builder /artifacts/bin/nestri-server /usr/bin/
+COPY --from=builder /artifacts/bin/bwrap /usr/bin/
+COPY --from=builder /artifacts/lib/ /usr/lib/
+COPY --from=builder /artifacts/lib32/ /usr/lib32/
+COPY --from=builder /artifacts/lib64/ /usr/lib64/
+COPY --from=builder /artifacts/bin/vimputti-manager /usr/bin/
+
+### Scripts and Final Configuration ###
+COPY packages/scripts/ /etc/nestri/
+RUN chmod +x /etc/nestri/{envs.sh,entrypoint*.sh} && \
+    chown -R "${NESTRI_USER}:${NESTRI_USER}" "${NESTRI_HOME}" && \
+    sed -i 's/^#\(en_US\.UTF-8\)/\1/' /etc/locale.gen && \
+    setcap cap_net_admin+ep /usr/bin/vimputti-manager && \
+    dbus-uuidgen > /etc/machine-id && \
+    LANG=en_US.UTF-8 locale-gen

containerfiles/runner.Containerfile

@@ -1,204 +0,0 @@
-# Container build arguments #
-ARG BASE_IMAGE=docker.io/cachyos/cachyos:latest
-
-#******************************************************************************
-# Base Stage - Updates system packages
-#******************************************************************************
-FROM ${BASE_IMAGE} AS base
-
-RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman --noconfirm -Syu
-
-#******************************************************************************
-# Base Builder Stage - Prepares core build environment
-#******************************************************************************
-FROM base AS base-builder
-
-# Environment setup for Rust and Cargo
-ENV CARGO_HOME=/usr/local/cargo \
-    ARTIFACTS=/artifacts \
-    PATH="${CARGO_HOME}/bin:${PATH}" \
-    RUSTFLAGS="-C link-arg=-fuse-ld=mold"
-
-# Install build essentials and caching tools
-RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm mold rustup && \
-    mkdir -p "${ARTIFACTS}"
-
-# Install latest Rust using rustup
-RUN rustup default stable
-
-# Install cargo-chef with proper caching
-RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo install -j $(nproc) cargo-chef cargo-c --locked
-
-#******************************************************************************
-# Nestri Server Build Stages
-#******************************************************************************
-FROM base-builder AS nestri-server-deps
-WORKDIR /builder
-
-# Install build dependencies
-RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm meson pkgconf cmake git gcc make \
-    gstreamer gst-plugins-base gst-plugins-good gst-plugin-rswebrtc
-
-#--------------------------------------------------------------------
-FROM nestri-server-deps AS nestri-server-planner
-WORKDIR /builder/nestri
-
-COPY packages/server/Cargo.toml packages/server/Cargo.lock ./
-
-# Prepare recipe for dependency caching
-RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo chef prepare --recipe-path recipe.json
-
-#--------------------------------------------------------------------
-FROM nestri-server-deps AS nestri-server-cached-builder
-WORKDIR /builder/nestri
-
-COPY --from=nestri-server-planner /builder/nestri/recipe.json .
-
-# Cache dependencies using cargo-chef
-RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo chef cook --release --recipe-path recipe.json
-
-
-ENV CARGO_TARGET_DIR=/builder/target
-
-COPY packages/server/ ./
-
-# Build and install directly to artifacts
-RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    --mount=type=cache,target=/builder/target \
-    cargo build --release && \
-    cp "${CARGO_TARGET_DIR}/release/nestri-server" "${ARTIFACTS}"
-
-#******************************************************************************
-# GST-Wayland Plugin Build Stages
-#******************************************************************************
-FROM base-builder AS gst-wayland-deps
-WORKDIR /builder
-
-# Install build dependencies
-RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm meson pkgconf cmake git gcc make \
-    libxkbcommon wayland gstreamer gst-plugins-base gst-plugins-good libinput
-
-# Clone repository
-RUN git clone --depth 1 --rev "dfeebb19b48f32207469e166a3955f5d65b5e6c6" https://github.com/games-on-whales/gst-wayland-display.git
-
-#--------------------------------------------------------------------
-FROM gst-wayland-deps AS gst-wayland-planner
-WORKDIR /builder/gst-wayland-display
-
-# Prepare recipe for dependency caching
-RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo chef prepare --recipe-path recipe.json
-
-#--------------------------------------------------------------------
-FROM gst-wayland-deps AS gst-wayland-cached-builder
-WORKDIR /builder/gst-wayland-display
-
-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
-
-
-ENV CARGO_TARGET_DIR=/builder/target
-
-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
-
-#******************************************************************************
-# Final Runtime Stage
-#******************************************************************************
-FROM base AS runtime
-
-### Package Installation ###
-# Core system components
-RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --needed --noconfirm \
-        vulkan-intel lib32-vulkan-intel vpl-gpu-rt \
-        vulkan-radeon lib32-vulkan-radeon \
-        mesa steam-native-runtime proton-cachyos lib32-mesa \
-        steam gtk3 lib32-gtk3 \
-        sudo xorg-xwayland seatd libinput gamescope mangohud wlr-randr \
-        libssh2 curl wget \
-        pipewire pipewire-pulse pipewire-alsa wireplumber \
-        noto-fonts-cjk supervisor jq chwd lshw pacman-contrib \
-        hwdata openssh \
-    # GStreamer stack
-        gstreamer gst-plugins-base gst-plugins-good \
-        gst-plugins-bad gst-plugin-pipewire \
-        gst-plugin-webrtchttp gst-plugin-rswebrtc gst-plugin-rsrtp \
-        gst-plugin-va gst-plugin-qsv \
-    # lib32 GStreamer stack to fix some games with videos
-        lib32-gstreamer lib32-gst-plugins-base lib32-gst-plugins-good && \
-    # Cleanup
-    paccache -rk1 && \
-    rm -rf /usr/share/{info,man,doc}/*
-
-### User Configuration ###
-ARG NESTRI_USER_PWD=""
-ENV NESTRI_USER="nestri" \
-    NESTRI_UID=1000 \
-    NESTRI_GID=1000 \
-    NESTRI_LANG=en_US.UTF-8 \
-    NESTRI_XDG_RUNTIME_DIR=/run/user/1000 \
-    NESTRI_HOME=/home/nestri \
-    NVIDIA_DRIVER_CAPABILITIES=all
-
-RUN mkdir -p "/home/${NESTRI_USER}" && \
-    groupadd -g "${NESTRI_GID}" "${NESTRI_USER}" && \
-    useradd -d "/home/${NESTRI_USER}" -u "${NESTRI_UID}" -g "${NESTRI_GID}" -s /bin/bash "${NESTRI_USER}" && \
-    echo "${NESTRI_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
-    NESTRI_USER_PWD="${NESTRI_USER_PWD:-$(openssl rand -base64 12)}" && \
-    echo "Setting password for ${NESTRI_USER} as: ${NESTRI_USER_PWD}" && \
-    echo "${NESTRI_USER}:${NESTRI_USER_PWD}" | chpasswd && \
-    mkdir -p "${NESTRI_XDG_RUNTIME_DIR}" && \
-    chown "${NESTRI_USER}:${NESTRI_USER}" "${NESTRI_XDG_RUNTIME_DIR}" && \
-    usermod -aG input,video,render,seat "${NESTRI_USER}"
-
-### System Services Configuration ###
-RUN mkdir -p /run/dbus && \
-    # Wireplumber suspend disable
-    sed -i -z \
-        -e 's/{[[:space:]]*name = node\/suspend-node\.lua,[[:space:]]*type = script\/lua[[:space:]]*provides = hooks\.node\.suspend[[:space:]]*}[[:space:]]*//g' \
-        -e '/wants = \[/{s/hooks\.node\.suspend\s*//; s/,\s*\]/]/}' \
-        /usr/share/wireplumber/wireplumber.conf
-
-### Audio Systems Configs - Latency optimizations + Loopback ###
-RUN mkdir -p /etc/pipewire/pipewire.conf.d && \
-    mkdir -p /etc/wireplumber/wireplumber.conf.d
-
-COPY packages/configs/wireplumber.conf.d/* /etc/wireplumber/wireplumber.conf.d/
-COPY packages/configs/pipewire.conf.d/* /etc/pipewire/pipewire.conf.d/
-
-## Steam Configs - Proton (CachyOS flavor) ##
-RUN mkdir -p "${NESTRI_HOME}/.local/share/Steam/config"
-
-COPY packages/configs/steam/config.vdf "${NESTRI_HOME}/.local/share/Steam/config/"
-
-### Artifacts and Verification ###
-COPY --from=nestri-server-cached-builder /artifacts/nestri-server /usr/bin/
-COPY --from=gst-wayland-cached-builder /artifacts/lib/ /usr/lib/
-COPY --from=gst-wayland-cached-builder /artifacts/include/ /usr/include/
-RUN which nestri-server && ls -la /usr/lib/ | grep 'gstwaylanddisplay'
-
-### Scripts and Final Configuration ###
-COPY packages/scripts/ /etc/nestri/
-RUN chmod +x /etc/nestri/{envs.sh,entrypoint*.sh} && \
-    chown -R "${NESTRI_USER}:${NESTRI_USER}" "${NESTRI_HOME}" && \
-    sed -i 's/^#\(en_US\.UTF-8\)/\1/' /etc/locale.gen && \
-    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

@@ -0,0 +1,27 @@
+# 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,6 +21,7 @@
     "core-js-pure",
     "esbuild",
     "protobufjs",
+    "sharp",
     "workerd"
   ],
   "workspaces": {

packages/configs/MangoHud/MangoHud.conf

@@ -0,0 +1,48 @@
+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/configs/steam/config.vdf

@@ -10,7 +10,7 @@
                                 {
                                         "0"
                                         {
-                                                "name"          "proton-cachyos"
+                                                "name"          "proton_experimental"
                                                 "config"                ""
                                                 "priority"              "75"
                                         }

packages/input/.containerignore

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

packages/input/package.json

@@ -7,22 +7,22 @@
         ".": "./src/index.ts"
     },
     "devDependencies": {
-        "@bufbuild/buf": "^1.50.0",
+        "@bufbuild/buf": "^1.59.0",
-        "@bufbuild/protoc-gen-es": "^2.2.3"
+        "@bufbuild/protoc-gen-es": "^2.10.0"
     },
     "dependencies": {
-        "@bufbuild/protobuf": "^2.2.3",
+        "@bufbuild/protobuf": "^2.10.0",
-        "@chainsafe/libp2p-noise": "^16.1.3",
+        "@chainsafe/libp2p-noise": "^17.0.0",
-        "@chainsafe/libp2p-yamux": "^7.0.1",
+        "@chainsafe/libp2p-quic": "^1.1.3",
-        "@libp2p/identify": "^3.0.32",
+        "@chainsafe/libp2p-yamux": "^8.0.1",
-        "@libp2p/interface": "^2.10.2",
+        "@libp2p/identify": "^4.0.5",
-        "@libp2p/ping": "^2.0.32",
+        "@libp2p/interface": "^3.0.2",
-        "@libp2p/websockets": "^9.2.13",
+        "@libp2p/ping": "^3.0.5",
-        "@multiformats/multiaddr": "^12.4.0",
+        "@libp2p/websockets": "^10.0.6",
-        "it-length-prefixed": "^10.0.1",
+        "@libp2p/webtransport": "^6.0.7",
-        "it-pipe": "^3.0.1",
+        "@libp2p/utils": "^7.0.5",
-        "libp2p": "^2.8.8",
+        "@multiformats/multiaddr": "^13.0.1",
-        "uint8arraylist": "^2.4.8",
+        "libp2p": "^3.0.6",
-        "uint8arrays": "^5.1.0"
+        "uint8arraylist": "^2.4.8"
     }
 }

packages/input/src/codes.ts

@@ -1,107 +1,107 @@
 export const keyCodeToLinuxEventCode: { [key: string]: number } = {
-    'KeyA': 30,
+  KeyA: 30,
-    'KeyB': 48,
+  KeyB: 48,
-    'KeyC': 46,
+  KeyC: 46,
-    'KeyD': 32,
+  KeyD: 32,
-    'KeyE': 18,
+  KeyE: 18,
-    'KeyF': 33,
+  KeyF: 33,
-    'KeyG': 34,
+  KeyG: 34,
-    'KeyH': 35,
+  KeyH: 35,
-    'KeyI': 23,
+  KeyI: 23,
-    'KeyJ': 36,
+  KeyJ: 36,
-    'KeyK': 37,
+  KeyK: 37,
-    'KeyL': 38,
+  KeyL: 38,
-    'KeyM': 50,
+  KeyM: 50,
-    'KeyN': 49,
+  KeyN: 49,
-    'KeyO': 24,
+  KeyO: 24,
-    'KeyP': 25,
+  KeyP: 25,
-    'KeyQ': 16,
+  KeyQ: 16,
-    'KeyR': 19,
+  KeyR: 19,
-    'KeyS': 31,
+  KeyS: 31,
-    'KeyT': 20,
+  KeyT: 20,
-    'KeyU': 22,
+  KeyU: 22,
-    'KeyV': 47,
+  KeyV: 47,
-    'KeyW': 17,
+  KeyW: 17,
-    'KeyX': 45,
+  KeyX: 45,
-    'KeyY': 21,
+  KeyY: 21,
-    'KeyZ': 44,
+  KeyZ: 44,
-    'Digit1': 2,
+  Digit1: 2,
-    'Digit2': 3,
+  Digit2: 3,
-    'Digit3': 4,
+  Digit3: 4,
-    'Digit4': 5,
+  Digit4: 5,
-    'Digit5': 6,
+  Digit5: 6,
-    'Digit6': 7,
+  Digit6: 7,
-    'Digit7': 8,
+  Digit7: 8,
-    'Digit8': 9,
+  Digit8: 9,
-    'Digit9': 10,
+  Digit9: 10,
-    'Digit0': 11,
+  Digit0: 11,
-    'Enter': 28,
+  Enter: 28,
-    'Escape': 1,
+  Escape: 1,
-    'Backspace': 14,
+  Backspace: 14,
-    'Tab': 15,
+  Tab: 15,
-    'Space': 57,
+  Space: 57,
-    'Minus': 12,
+  Minus: 12,
-    'Equal': 13,
+  Equal: 13,
-    'BracketLeft': 26,
+  BracketLeft: 26,
-    'BracketRight': 27,
+  BracketRight: 27,
-    'Backslash': 43,
+  Backslash: 43,
-    'Semicolon': 39,
+  Semicolon: 39,
-    'Quote': 40,
+  Quote: 40,
-    'Backquote': 41,
+  Backquote: 41,
-    'Comma': 51,
+  Comma: 51,
-    'Period': 52,
+  Period: 52,
-    'Slash': 53,
+  Slash: 53,
-    'CapsLock': 58,
+  CapsLock: 58,
-    'F1': 59,
+  F1: 59,
-    'F2': 60,
+  F2: 60,
-    'F3': 61,
+  F3: 61,
-    'F4': 62,
+  F4: 62,
-    'F5': 63,
+  F5: 63,
-    'F6': 64,
+  F6: 64,
-    'F7': 65,
+  F7: 65,
-    'F8': 66,
+  F8: 66,
-    'F9': 67,
+  F9: 67,
-    'F10': 68,
+  F10: 68,
-    'F11': 87,
+  F11: 87,
-    'F12': 88,
+  F12: 88,
-    'Insert': 110,
+  Insert: 110,
-    'Delete': 111,
+  Delete: 111,
-    'ArrowUp': 103,
+  ArrowUp: 103,
-    'ArrowDown': 108,
+  ArrowDown: 108,
-    'ArrowLeft': 105,
+  ArrowLeft: 105,
-    'ArrowRight': 106,
+  ArrowRight: 106,
-    'Home': 102,
+  Home: 102,
-    'End': 107,
+  End: 107,
-    'PageUp': 104,
+  PageUp: 104,
-    'PageDown': 109,
+  PageDown: 109,
-    'NumLock': 69,
+  NumLock: 69,
-    'ScrollLock': 70,
+  ScrollLock: 70,
-    'Pause': 119,
+  Pause: 119,
-    'Numpad0': 82,
+  Numpad0: 82,
-    'Numpad1': 79,
+  Numpad1: 79,
-    'Numpad2': 80,
+  Numpad2: 80,
-    'Numpad3': 81,
+  Numpad3: 81,
-    'Numpad4': 75,
+  Numpad4: 75,
-    'Numpad5': 76,
+  Numpad5: 76,
-    'Numpad6': 77,
+  Numpad6: 77,
-    'Numpad7': 71,
+  Numpad7: 71,
-    'Numpad8': 72,
+  Numpad8: 72,
-    'Numpad9': 73,
+  Numpad9: 73,
-    'NumpadDivide': 98,
+  NumpadDivide: 98,
-    'NumpadMultiply': 55,
+  NumpadMultiply: 55,
-    'NumpadSubtract': 74,
+  NumpadSubtract: 74,
-    'NumpadAdd': 78,
+  NumpadAdd: 78,
-    'NumpadEnter': 96,
+  NumpadEnter: 96,
-    'NumpadDecimal': 83,
+  NumpadDecimal: 83,
-    'ControlLeft': 29,
+  ControlLeft: 29,
-    'ControlRight': 97,
+  ControlRight: 97,
-    'ShiftLeft': 42,
+  ShiftLeft: 42,
-    'ShiftRight': 54,
+  ShiftRight: 54,
-    'AltLeft': 56,
+  AltLeft: 56,
-    'AltRight': 100,
+  AltRight: 100,
   //'MetaLeft': 125, // Disabled as will break input
   //'MetaRight': 126, // Disabled as will break input
-    'ContextMenu': 127,
+  ContextMenu: 127,
 };
 
 export const mouseButtonToLinuxEventCode: { [button: number]: number } = {
@@ -109,5 +109,25 @@ export const mouseButtonToLinuxEventCode: { [button: number]: number } = {
   2: 273,
   1: 274,
   3: 275,
-    4: 276
+  4: 276,
+};
+
+export const controllerButtonToLinuxEventCode: { [button: number]: number } = {
+  0: 0x130,
+  1: 0x131,
+  2: 0x134,
+  3: 0x133,
+  4: 0x136,
+  5: 0x137,
+  6: 0x138,
+  7: 0x139,
+  8: 0x13a,
+  9: 0x13b,
+  10: 0x13d,
+  11: 0x13e,
+  12: 0x220,
+  13: 0x221,
+  14: 0x222,
+  15: 0x223,
+  16: 0x13c,
 };

packages/input/src/controller.ts

@@ -0,0 +1,531 @@
+import { controllerButtonToLinuxEventCode } from "./codes";
+import { WebRTCStream } from "./webrtc-stream";
+import {
+  ProtoControllerAttachSchema,
+  ProtoControllerDetachSchema,
+  ProtoControllerStateBatchSchema,
+  ProtoControllerStateBatch,
+  ProtoControllerRumble,
+} from "./proto/types_pb";
+import { create, toBinary, fromBinary } from "@bufbuild/protobuf";
+import { createMessage } from "./utils";
+import { ProtoMessageSchema } from "./proto/messages_pb";
+
+interface Props {
+  webrtc: WebRTCStream;
+  e: GamepadEvent;
+}
+
+interface GamepadState {
+  previousButtonState: Map<number, boolean>;
+  buttonState: Map<number, boolean>;
+  leftTrigger: number;
+  rightTrigger: number;
+  leftX: number;
+  leftY: number;
+  rightX: number;
+  rightY: number;
+  dpadX: number;
+  dpadY: number;
+}
+
+enum PollState {
+  IDLE,
+  RUNNING,
+}
+
+export class Controller {
+  protected wrtc: WebRTCStream;
+  protected connected: boolean = false;
+  protected gamepad: Gamepad | null = null;
+  protected state: GamepadState = {
+    previousButtonState: new Map<number, boolean>(),
+    buttonState: new Map<number, boolean>(),
+    leftTrigger: 0,
+    rightTrigger: 0,
+    leftX: 0,
+    leftY: 0,
+    rightX: 0,
+    rightY: 0,
+    dpadX: 0,
+    dpadY: 0,
+  };
+  // 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 readonly FULL_RATE_MS = 10; // 100 UPS
+  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 pollInterval: any = null;
+
+  // Controller batch vars
+  private sequence: number = 0;
+  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;
+
+    // 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";
+    // Get product id of gamepad from id string
+    const productMatch = e.gamepad.id.match(/Product:\s?([0-9a-fA-F]{4})/);
+    const productId = productMatch ? productMatch[1].toLowerCase() : "unknown";
+
+    // Listen to datachannel events from server
+    this._dcHandler = (data: ArrayBuffer) => {
+      if (!this.connected) return;
+      try {
+        // First decode the wrapper message
+        const uint8Data = new Uint8Array(data);
+        const messageWrapper = fromBinary(ProtoMessageSchema, uint8Data);
+
+        if (messageWrapper.payload.case === "controllerRumble") {
+          this.rumbleCallback(messageWrapper.payload.value);
+        } else if (messageWrapper.payload.case === "controllerAttach") {
+          if (this.gamepad) return; // already attached
+          const attachMsg = messageWrapper.payload.value;
+          // Gamepad connected succesfully
+          this.gamepad = e.gamepad;
+          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);
+      }
+    };
+    this.wrtc.addDataChannelCallback(this._dcHandler);
+
+    const attachMsg = createMessage(
+      create(ProtoControllerAttachSchema, {
+        id: this.vendor_id_to_controller(vendorId, productId),
+        sessionSlot: e.gamepad.index,
+        sessionId: this.wrtc.getSessionID(),
+      }),
+      "controllerInput",
+    );
+    this.wrtc.sendBinary(toBinary(ProtoMessageSchema, attachMsg));
+
+    this.run();
+  }
+
+  public getSlot(): number {
+    return this.gamepad.index;
+  }
+
+  // Maps vendor id and product id to supported controller type
+  // Currently supported: Sony (ps4, ps5), Microsoft (xbox360, xboxone), Nintendo (switchpro)
+  // Default fallback to xbox360
+  private vendor_id_to_controller(vendorId: string, productId: string): string {
+    switch (vendorId) {
+      case "054c": // Sony
+        switch (productId) {
+          case "0ce6":
+            return "ps5";
+          case "05c4":
+          case "09cc":
+            return "ps4";
+          default:
+            return "ps4"; // default to ps4
+        }
+      case "045e": // Microsoft
+        switch (productId) {
+          case "02d1":
+          case "02dd":
+            return "xboxone";
+          case "028e":
+            return "xbox360";
+          default:
+            return "xbox360"; // default to xbox360
+        }
+      case "057e": // Nintendo
+        switch (productId) {
+          case "2009":
+          case "200e":
+            return "switchpro";
+          default:
+            return "switchpro"; // default to switchpro
+        }
+      default: {
+        return "xbox360";
+      }
+    }
+  }
+
+  private remapFromTo(
+    value: number,
+    fromMin: number,
+    fromMax: number,
+    toMin: number,
+    toMax: number,
+  ) {
+    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;
+
+    const gamepads = navigator.getGamepads();
+    if (!gamepads[this.gamepad.index]) return;
+
+    this.gamepad = gamepads[this.gamepad.index];
+
+    // Collect state changes
+    const changedFields = this.collectStateChanges();
+
+    // 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);
+      this.lastInputTime = Date.now();
+      if (this.pollingState !== PollState.RUNNING) {
+        this.pollingState = PollState.RUNNING;
+      }
+    }
+
+    const timeSinceInput = Date.now() - this.lastInputTime;
+    if (timeSinceInput > this.IDLE_THRESHOLD) {
+      // Changing from running to idle..
+      if (this.pollingState === PollState.RUNNING) {
+        // Send full state on idle assumption
+        this.sendBatchedState(0xff, 0);
+        this.pollingState = PollState.IDLE;
+      }
+    }
+
+    this.state.buttonState.forEach((b, i) =>
+      this.state.previousButtonState.set(i, b),
+    );
+  }
+
+  private collectStateChanges(): number {
+    let changedFields = 0;
+
+    // Collect analog values
+    const leftTrigger = Math.round(
+      this.remapFromTo(
+        this.gamepad.buttons[6]?.value ?? 0,
+        0,
+        1,
+        -32768,
+        32767,
+      ),
+    );
+    const rightTrigger = Math.round(
+      this.remapFromTo(
+        this.gamepad.buttons[7]?.value ?? 0,
+        0,
+        1,
+        -32768,
+        32767,
+      ),
+    );
+
+    const leftX = this.remapFromTo(
+      this.gamepad.axes[0] ?? 0,
+      -1,
+      1,
+      -32768,
+      32767,
+    );
+    const leftY = this.remapFromTo(
+      this.gamepad.axes[1] ?? 0,
+      -1,
+      1,
+      -32768,
+      32767,
+    );
+    const sendLeftX =
+      Math.abs(leftX) > this.stickDeadzone ? Math.round(leftX) : 0;
+    const sendLeftY =
+      Math.abs(leftY) > this.stickDeadzone ? Math.round(leftY) : 0;
+
+    const rightX = this.remapFromTo(
+      this.gamepad.axes[2] ?? 0,
+      -1,
+      1,
+      -32768,
+      32767,
+    );
+    const rightY = this.remapFromTo(
+      this.gamepad.axes[3] ?? 0,
+      -1,
+      1,
+      -32768,
+      32767,
+    );
+    const sendRightX =
+      Math.abs(rightX) > this.stickDeadzone ? Math.round(rightX) : 0;
+    const sendRightY =
+      Math.abs(rightY) > this.stickDeadzone ? Math.round(rightY) : 0;
+
+    const dpadX =
+      (this.gamepad.buttons[14]?.pressed ? -1 : 0) +
+      (this.gamepad.buttons[15]?.pressed ? 1 : 0);
+    const dpadY =
+      (this.gamepad.buttons[12]?.pressed ? -1 : 0) +
+      (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,
+      sequence: this.sequence++,
+    };
+
+    // 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));
+  }
+
+  public run() {
+    if (this.connected) this.stop();
+
+    this.connected = true;
+
+    // Start with active polling
+    this.restartPolling();
+  }
+
+  public stop() {
+    if (this.pollInterval) {
+      clearInterval(this.pollInterval);
+      this.pollInterval = null;
+    }
+    this.connected = false;
+  }
+
+  public dispose() {
+    this.stop();
+    // Remove callback
+    if (this._dcHandler !== null) {
+      this.wrtc.removeDataChannelCallback(this._dcHandler);
+      this._dcHandler = null;
+    }
+    if (this.gamepad) {
+      // Gamepad disconnected
+      const detachMsg = createMessage(
+        create(ProtoControllerDetachSchema, {
+          sessionSlot: this.gamepad.index,
+        }),
+        "controllerInput",
+      );
+      this.wrtc.sendBinary(toBinary(ProtoMessageSchema, detachMsg));
+    }
+  }
+
+  private controllerButtonToVirtualKeyCode(code: number): number | undefined {
+    return controllerButtonToLinuxEventCode[code] || undefined;
+  }
+
+  private rumbleCallback(rumbleMsg: ProtoControllerRumble) {
+    if (!this.connected || !this.gamepad) return;
+
+    // Check if this rumble is for us
+    if (
+      rumbleMsg.sessionId !== this.wrtc.getSessionID() ||
+      rumbleMsg.sessionSlot !== this.gamepad.index
+    )
+      return;
+
+    // Trigger actual rumble
+    // Need to remap from 0-65535 to 0.0-1.0 ranges
+    const clampedLowFreq = Math.max(0, Math.min(65535, rumbleMsg.lowFrequency));
+    const rumbleLowFreq = this.remapFromTo(clampedLowFreq, 0, 65535, 0.0, 1.0);
+    const clampedHighFreq = Math.max(
+      0,
+      Math.min(65535, rumbleMsg.highFrequency),
+    );
+    const rumbleHighFreq = this.remapFromTo(
+      clampedHighFreq,
+      0,
+      65535,
+      0.0,
+      1.0,
+    );
+    // Cap to valid range (max 5000)
+    const rumbleDuration = Math.max(0, Math.min(5000, rumbleMsg.duration));
+    if (this.gamepad.vibrationActuator) {
+      this.gamepad.vibrationActuator
+        .playEffect("dual-rumble", {
+          startDelay: 0,
+          duration: rumbleDuration,
+          weakMagnitude: rumbleLowFreq,
+          strongMagnitude: rumbleHighFreq,
+        })
+        .catch(console.error);
+    }
+  }
+}

packages/input/src/index.ts

@@ -1,3 +1,4 @@
 export * from "./keyboard"
 export * from "./mouse"
+export * from "./controller"
 export * from "./webrtc-stream"

packages/input/src/keyboard.ts

@@ -1,76 +1,45 @@
-import {keyCodeToLinuxEventCode} from "./codes"
+import { keyCodeToLinuxEventCode } from "./codes";
-import {WebRTCStream} from "./webrtc-stream";
+import { WebRTCStream } from "./webrtc-stream";
-import {LatencyTracker} from "./latency";
+import { ProtoKeyDownSchema, ProtoKeyUpSchema } from "./proto/types_pb";
-import {ProtoLatencyTracker, ProtoTimestampEntry} from "./proto/latency_tracker_pb";
+import { create, toBinary } from "@bufbuild/protobuf";
-import {timestampFromDate} from "@bufbuild/protobuf/wkt";
+import { createMessage } from "./utils";
-import {ProtoMessageBase, ProtoMessageInput, ProtoMessageInputSchema} from "./proto/messages_pb";
+import { ProtoMessageSchema } from "./proto/messages_pb";
-import {
-  ProtoInput,
-  ProtoInputSchema,
-  ProtoKeyDownSchema,
-  ProtoKeyUpSchema,
-  ProtoMouseMoveSchema
-} from "./proto/types_pb";
-import {create, toBinary} from "@bufbuild/protobuf";
 
 interface Props {
   webrtc: WebRTCStream;
-  canvas: HTMLCanvasElement;
 }
 
 export class Keyboard {
   protected wrtc: WebRTCStream;
-  protected canvas: HTMLCanvasElement;
   protected connected!: boolean;
 
   // Store references to event listeners
   private readonly keydownListener: (e: KeyboardEvent) => void;
   private readonly keyupListener: (e: KeyboardEvent) => void;
 
-  constructor({webrtc, canvas}: Props) {
+  constructor({ webrtc }: Props) {
     this.wrtc = webrtc;
-    this.canvas = canvas;
+    this.keydownListener = this.createKeyboardListener((e: any) =>
-    this.keydownListener = this.createKeyboardListener((e: any) => create(ProtoInputSchema, {
+      create(ProtoKeyDownSchema, {
-      $typeName: "proto.ProtoInput",
+        key: this.keyToVirtualKeyCode(e.code),
-      inputType: {
-        case: "keyDown",
-        value: create(ProtoKeyDownSchema, {
-          type: "KeyDown",
-          key: this.keyToVirtualKeyCode(e.code)
       }),
-      }
+    );
-    }));
+    this.keyupListener = this.createKeyboardListener((e: any) =>
-    this.keyupListener = this.createKeyboardListener((e: any) => create(ProtoInputSchema, {
+      create(ProtoKeyUpSchema, {
-      $typeName: "proto.ProtoInput",
+        key: this.keyToVirtualKeyCode(e.code),
-      inputType: {
-        case: "keyUp",
-        value: create(ProtoKeyUpSchema, {
-          type: "KeyUp",
-          key: this.keyToVirtualKeyCode(e.code)
       }),
-      }
+    );
-    }));
+    this.run();
-    this.run()
   }
 
   private run() {
-    //calls all the other functions
+    if (this.connected) this.stop();
-    if (!document.pointerLockElement) {
-      if (this.connected) {
-        this.stop()
-      }
-      return;
-    }
 
-    if (document.pointerLockElement == this.canvas) {
+    this.connected = true;
-      this.connected = true
+    document.addEventListener("keydown", this.keydownListener, {
-      document.addEventListener("keydown", this.keydownListener, {passive: false});
+      passive: false,
-      document.addEventListener("keyup", this.keyupListener, {passive: false});
+    });
-    } else {
+    document.addEventListener("keyup", this.keyupListener, { passive: false });
-      if (this.connected) {
-        this.stop()
-      }
-    }
   }
 
   private stop() {
@@ -80,47 +49,23 @@ export class Keyboard {
   }
 
   // Helper function to create and return mouse listeners
-  private createKeyboardListener(dataCreator: (e: Event) => ProtoInput): (e: Event) => void {
+  private createKeyboardListener(
+    dataCreator: (e: Event) => any,
+  ): (e: Event) => void {
     return (e: Event) => {
       e.preventDefault();
       e.stopPropagation();
       // Prevent repeated key events from being sent (important for games)
-      if ((e as any).repeat)
+      if ((e as any).repeat) return;
-        return;
 
       const data = dataCreator(e as any);
 
-      // Latency tracking
+      const message = createMessage(data, "input");
-      const tracker = new LatencyTracker("input-keyboard");
+      this.wrtc.sendBinary(toBinary(ProtoMessageSchema, message));
-      tracker.addTimestamp("client_send");
-      const protoTracker: ProtoLatencyTracker = {
-        $typeName: "proto.ProtoLatencyTracker",
-        sequenceId: tracker.sequence_id,
-        timestamps: [],
-      };
-      for (const t of tracker.timestamps) {
-        protoTracker.timestamps.push({
-          $typeName: "proto.ProtoTimestampEntry",
-          stage: t.stage,
-          time: timestampFromDate(t.time),
-        } as ProtoTimestampEntry);
-      }
-
-      const message: ProtoMessageInput = {
-        $typeName: "proto.ProtoMessageInput",
-        messageBase: {
-          $typeName: "proto.ProtoMessageBase",
-          payloadType: "input",
-          latency: protoTracker,
-        } as ProtoMessageBase,
-        data: data,
-      };
-      this.wrtc.sendBinary(toBinary(ProtoMessageInputSchema, message));
     };
   }
 
   public dispose() {
-    document.exitPointerLock();
     this.stop();
     this.connected = false;
   }

packages/input/src/messages.ts

@@ -1,305 +0,0 @@
-import { LatencyTracker } from "./latency";
-import { Uint8ArrayList } from "uint8arraylist";
-import { allocUnsafe } from "uint8arrays/alloc";
-import { pipe } from "it-pipe";
-import { decode, encode } from "it-length-prefixed";
-import { Stream } from "@libp2p/interface";
-
-export interface MessageBase {
-  payload_type: string;
-  latency?: LatencyTracker;
-}
-
-export interface MessageRaw extends MessageBase {
-  data: any;
-}
-
-export function NewMessageRaw(type: string, data: any): Uint8Array {
-  const msg = {
-    payload_type: type,
-    data: data,
-  };
-  return new TextEncoder().encode(JSON.stringify(msg));
-}
-
-export interface MessageICE extends MessageBase {
-  candidate: RTCIceCandidateInit;
-}
-
-export function NewMessageICE(
-  type: string,
-  candidate: RTCIceCandidateInit,
-): Uint8Array {
-  const msg = {
-    payload_type: type,
-    candidate: candidate,
-  };
-  return new TextEncoder().encode(JSON.stringify(msg));
-}
-
-export interface MessageSDP extends MessageBase {
-  sdp: RTCSessionDescriptionInit;
-}
-
-export function NewMessageSDP(
-  type: string,
-  sdp: RTCSessionDescriptionInit,
-): Uint8Array {
-  const msg = {
-    payload_type: type,
-    sdp: sdp,
-  };
-  return new TextEncoder().encode(JSON.stringify(msg));
-}
-
-const MAX_SIZE = 1024 * 1024; // 1MB
-const MAX_QUEUE_SIZE = 1000; // Maximum number of messages in the queue
-
-// Custom 4-byte length encoder
-export const length4ByteEncoder = (length: number) => {
-  const buf = allocUnsafe(4);
-
-  // Write the length as a 32-bit unsigned integer (4 bytes)
-  buf[0] = length >>> 24;
-  buf[1] = (length >>> 16) & 0xff;
-  buf[2] = (length >>> 8) & 0xff;
-  buf[3] = length & 0xff;
-
-  // Set the bytes property to 4
-  length4ByteEncoder.bytes = 4;
-
-  return buf;
-};
-length4ByteEncoder.bytes = 4;
-
-// Custom 4-byte length decoder
-export const length4ByteDecoder = (data: Uint8ArrayList) => {
-  if (data.byteLength < 4) {
-    // Not enough bytes to read the length
-    return -1;
-  }
-
-  // Read the length from the first 4 bytes
-  let length = 0;
-  length =
-    (data.subarray(0, 1)[0] >>> 0) * 0x1000000 +
-    (data.subarray(1, 2)[0] >>> 0) * 0x10000 +
-    (data.subarray(2, 3)[0] >>> 0) * 0x100 +
-    (data.subarray(3, 4)[0] >>> 0);
-
-  // Set bytes read to 4
-  length4ByteDecoder.bytes = 4;
-
-  return length;
-};
-length4ByteDecoder.bytes = 4;
-
-interface PromiseMessage {
-  data: Uint8Array;
-  resolve: () => void;
-  reject: (error: Error) => void;
-}
-
-export class SafeStream {
-  private stream: Stream;
-  private callbacks: Map<string, ((data: any) => void)[]> = new Map();
-  private isReading: boolean = false;
-  private isWriting: boolean = false;
-  private closed: boolean = false;
-  private messageQueue: PromiseMessage[] = [];
-  private writeLock = false;
-  private readRetries = 0;
-  private writeRetries = 0;
-  private readonly MAX_RETRIES = 5;
-
-  constructor(stream: Stream) {
-    this.stream = stream;
-    this.startReading();
-    this.startWriting();
-  }
-
-  private async startReading(): Promise<void> {
-    if (this.isReading || this.closed) return;
-
-    this.isReading = true;
-
-    try {
-      const source = this.stream.source;
-      const decodedSource = decode(source, {
-        maxDataLength: MAX_SIZE,
-        lengthDecoder: length4ByteDecoder,
-      });
-
-      for await (const chunk of decodedSource) {
-        if (this.closed) break;
-
-        this.readRetries = 0;
-
-        try {
-          const data = chunk.slice();
-          const message = JSON.parse(
-            new TextDecoder().decode(data),
-          ) as MessageBase;
-          const msgType = message.payload_type;
-
-          if (this.callbacks.has(msgType)) {
-            const handlers = this.callbacks.get(msgType)!;
-            for (const handler of handlers) {
-              try {
-                handler(message);
-              } catch (err) {
-                console.error(`Error in message handler for ${msgType}:`, err);
-              }
-            }
-          }
-        } catch (err) {
-          console.error("Error processing message:", err);
-        }
-      }
-    } catch (err) {
-      console.error("Stream reading error:", err);
-    } finally {
-      this.isReading = false;
-      this.readRetries++;
-
-      // If not closed, try to restart reading
-      if (!this.closed && this.readRetries < this.MAX_RETRIES)
-        setTimeout(() => this.startReading(), 100);
-      else if (this.readRetries >= this.MAX_RETRIES)
-        console.error(
-          "Max retries reached for reading stream, stopping attempts",
-        );
-    }
-  }
-
-  public registerCallback(
-    msgType: string,
-    callback: (data: any) => void,
-  ): void {
-    if (!this.callbacks.has(msgType)) {
-      this.callbacks.set(msgType, []);
-    }
-
-    this.callbacks.get(msgType)!.push(callback);
-  }
-
-  public removeCallback(msgType: string, callback: (data: any) => void): void {
-    if (this.callbacks.has(msgType)) {
-      const callbacks = this.callbacks.get(msgType)!;
-      const index = callbacks.indexOf(callback);
-
-      if (index !== -1) {
-        callbacks.splice(index, 1);
-      }
-
-      if (callbacks.length === 0) {
-        this.callbacks.delete(msgType);
-      }
-    }
-  }
-
-  private async startWriting(): Promise<void> {
-    if (this.isWriting || this.closed) return;
-
-    this.isWriting = true;
-
-    try {
-      // Create an async generator for real-time message processing
-      const messageSource = async function* (this: SafeStream) {
-        while (!this.closed) {
-          // Check if we have messages to send
-          if (this.messageQueue.length > 0) {
-            this.writeLock = true;
-
-            try {
-              const message = this.messageQueue[0];
-
-              // Encode the message
-              const encoded = encode([message.data], {
-                maxDataLength: MAX_SIZE,
-                lengthEncoder: length4ByteEncoder,
-              });
-
-              for await (const chunk of encoded) {
-                yield chunk;
-              }
-
-              // Remove message after successful sending
-              this.writeRetries = 0;
-              const sentMessage = this.messageQueue.shift();
-              if (sentMessage)
-                sentMessage.resolve();
-            } catch (err) {
-              console.error("Error encoding or sending message:", err);
-              const failedMessage = this.messageQueue.shift();
-              if (failedMessage)
-                failedMessage.reject(new Error(`Failed to send message: ${err}`));
-            } finally {
-              this.writeLock = false;
-            }
-          } else {
-            // No messages to send, wait for a short period
-            await new Promise((resolve) => setTimeout(resolve, 100));
-          }
-        }
-      }.bind(this);
-
-      await pipe(messageSource(), this.stream.sink).catch((err) => {
-        console.error("Sink error:", err);
-        this.isWriting = false;
-        this.writeRetries++;
-
-        // Try to restart if not closed
-        if (!this.closed && this.writeRetries < this.MAX_RETRIES) {
-          setTimeout(() => this.startWriting(), 1000);
-        } else if (this.writeRetries >= this.MAX_RETRIES) {
-          console.error("Max retries reached for writing to stream sink, stopping attempts");
-        }
-      });
-    } catch (err) {
-      console.error("Stream writing error:", err);
-      this.isWriting = false;
-      this.writeRetries++;
-
-      // Try to restart if not closed
-      if (!this.closed && this.writeRetries < this.MAX_RETRIES) {
-        setTimeout(() => this.startWriting(), 1000);
-      } else if (this.writeRetries >= this.MAX_RETRIES) {
-        console.error("Max retries reached for writing stream, stopping attempts");
-      }
-    }
-  }
-
-  public async writeMessage(message: Uint8Array): Promise<void> {
-    if (this.closed) {
-      throw new Error("Cannot write to closed stream");
-    }
-
-    // Validate message size before queuing
-    if (message.length > MAX_SIZE) {
-      throw new Error("Message size exceeds maximum size limit");
-    }
-
-    // Check if the message queue is too large
-    if (this.messageQueue.length >= MAX_QUEUE_SIZE) {
-      throw new Error("Message queue is full, cannot write message");
-    }
-
-    // Create a promise to resolve when the message is sent
-    return new Promise((resolve, reject) => {
-      this.messageQueue.push({ data: message, resolve, reject } as PromiseMessage);
-    });
-  }
-
-  public close(): void {
-    this.closed = true;
-    this.callbacks.clear();
-    // Reject pending messages
-    for (const msg of this.messageQueue)
-      msg.reject(new Error("Stream closed"));
-
-    this.messageQueue = [];
-    this.readRetries = 0;
-    this.writeRetries = 0;
-  }
-}

packages/input/src/mouse.ts

@@ -1,18 +1,14 @@
-import {WebRTCStream} from "./webrtc-stream";
+import { WebRTCStream } from "./webrtc-stream";
-import {LatencyTracker} from "./latency";
-import {ProtoMessageInput, ProtoMessageBase, ProtoMessageInputSchema} from "./proto/messages_pb";
 import {
-  ProtoInput, ProtoInputSchema,
+  ProtoMouseKeyDownSchema,
-  ProtoMouseKeyDown, ProtoMouseKeyDownSchema,
+  ProtoMouseKeyUpSchema,
-  ProtoMouseKeyUp, ProtoMouseKeyUpSchema,
-  ProtoMouseMove,
   ProtoMouseMoveSchema,
-  ProtoMouseWheel, ProtoMouseWheelSchema
+  ProtoMouseWheelSchema,
 } from "./proto/types_pb";
-import {mouseButtonToLinuxEventCode} from "./codes";
+import { mouseButtonToLinuxEventCode } from "./codes";
-import {ProtoLatencyTracker, ProtoTimestampEntry} from "./proto/latency_tracker_pb";
+import { create, toBinary } from "@bufbuild/protobuf";
-import {create, toBinary} from "@bufbuild/protobuf";
+import { createMessage } from "./utils";
-import {timestampFromDate} from "@bufbuild/protobuf/wkt";
+import { ProtoMessageSchema } from "./proto/messages_pb";
 
 interface Props {
   webrtc: WebRTCStream;
@@ -24,23 +20,22 @@ export class Mouse {
   protected canvas: HTMLCanvasElement;
   protected connected!: boolean;
 
-  // Store references to event listeners
+  private sendInterval = 10; // 100 updates per second
-  private sendInterval = 16 //60fps
 
+  // Store references to event listeners
   private readonly mousemoveListener: (e: MouseEvent) => void;
   private movementX: number = 0;
   private movementY: number = 0;
-  private isProcessing: boolean = false;
 
   private readonly mousedownListener: (e: MouseEvent) => void;
   private readonly mouseupListener: (e: MouseEvent) => void;
   private readonly mousewheelListener: (e: WheelEvent) => void;
 
-  constructor({webrtc, canvas}: Props) {
+  constructor({ webrtc, canvas }: Props) {
     this.wrtc = webrtc;
     this.canvas = canvas;
 
-    this.sendInterval = 1000 / webrtc.currentFrameRate
+    this.sendInterval = 1000 / webrtc.currentFrameRate;
 
     this.mousemoveListener = (e: MouseEvent) => {
       e.preventDefault();
@@ -49,65 +44,56 @@ export class Mouse {
       this.movementY += e.movementY;
     };
 
-    this.mousedownListener = this.createMouseListener((e: any) => create(ProtoInputSchema, {
+    this.mousedownListener = this.createMouseListener((e: any) =>
-      $typeName: "proto.ProtoInput",
+      create(ProtoMouseKeyDownSchema, {
-      inputType: {
+        key: this.keyToVirtualKeyCode(e.button),
-        case: "mouseKeyDown",
-        value: create(ProtoMouseKeyDownSchema, {
-          type: "MouseKeyDown",
-          key: this.keyToVirtualKeyCode(e.button)
       }),
-      }
+    );
-    }));
+    this.mouseupListener = this.createMouseListener((e: any) =>
-    this.mouseupListener = this.createMouseListener((e: any) => create(ProtoInputSchema, {
+      create(ProtoMouseKeyUpSchema, {
-      $typeName: "proto.ProtoInput",
+        key: this.keyToVirtualKeyCode(e.button),
-      inputType: {
-        case: "mouseKeyUp",
-        value: create(ProtoMouseKeyUpSchema, {
-          type: "MouseKeyUp",
-          key: this.keyToVirtualKeyCode(e.button)
       }),
-      }
+    );
-    }));
+    this.mousewheelListener = this.createMouseListener((e: any) =>
-    this.mousewheelListener = this.createMouseListener((e: any) => create(ProtoInputSchema, {
+      create(ProtoMouseWheelSchema, {
-      $typeName: "proto.ProtoInput",
+        x: Math.round(e.deltaX),
-      inputType: {
+        y: Math.round(e.deltaY),
-        case: "mouseWheel",
-        value: create(ProtoMouseWheelSchema, {
-          type: "MouseWheel",
-          x: e.deltaX,
-          y: e.deltaY
       }),
-      }
+    );
-    }));
 
-    this.run()
+    this.run();
     this.startProcessing();
   }
 
   private run() {
     //calls all the other functions
     if (!document.pointerLockElement) {
-      console.log("no pointerlock")
+      console.log("no pointerlock");
       if (this.connected) {
-        this.stop()
+        this.stop();
       }
       return;
     }
 
     if (document.pointerLockElement == this.canvas) {
-      this.connected = true
+      this.connected = true;
-      this.canvas.addEventListener("mousemove", this.mousemoveListener, {passive: false});
+      this.canvas.addEventListener("mousemove", this.mousemoveListener, {
-      this.canvas.addEventListener("mousedown", this.mousedownListener, {passive: false});
+        passive: false,
-      this.canvas.addEventListener("mouseup", this.mouseupListener, {passive: false});
+      });
-      this.canvas.addEventListener("wheel", this.mousewheelListener, {passive: false});
+      this.canvas.addEventListener("mousedown", this.mousedownListener, {
-
+        passive: false,
+      });
+      this.canvas.addEventListener("mouseup", this.mouseupListener, {
+        passive: false,
+      });
+      this.canvas.addEventListener("wheel", this.mousewheelListener, {
+        passive: false,
+      });
     } else {
       if (this.connected) {
-        this.stop()
+        this.stop();
       }
     }
-
   }
 
   private stop() {
@@ -129,79 +115,26 @@ export class Mouse {
   }
 
   private sendAggregatedMouseMove() {
-    const data = create(ProtoInputSchema, {
+    const data = create(ProtoMouseMoveSchema, {
-      $typeName: "proto.ProtoInput",
+      x: Math.round(this.movementX),
-      inputType: {
+      y: Math.round(this.movementY),
-        case: "mouseMove",
-        value: create(ProtoMouseMoveSchema, {
-          type: "MouseMove",
-          x: this.movementX,
-          y: this.movementY,
-        }),
-      },
     });
 
-    // Latency tracking
+    const message = createMessage(data, "input");
-    const tracker = new LatencyTracker("input-mouse");
+    this.wrtc.sendBinary(toBinary(ProtoMessageSchema, message));
-    tracker.addTimestamp("client_send");
-    const protoTracker: ProtoLatencyTracker = {
-      $typeName: "proto.ProtoLatencyTracker",
-      sequenceId: tracker.sequence_id,
-      timestamps: [],
-    };
-    for (const t of tracker.timestamps) {
-      protoTracker.timestamps.push({
-        $typeName: "proto.ProtoTimestampEntry",
-        stage: t.stage,
-        time: timestampFromDate(t.time),
-      } as ProtoTimestampEntry);
-    }
-
-    const message: ProtoMessageInput = {
-      $typeName: "proto.ProtoMessageInput",
-      messageBase: {
-        $typeName: "proto.ProtoMessageBase",
-        payloadType: "input",
-        latency: protoTracker,
-      } as ProtoMessageBase,
-      data: data,
-    };
-    this.wrtc.sendBinary(toBinary(ProtoMessageInputSchema, message));
   }
 
   // Helper function to create and return mouse listeners
-  private createMouseListener(dataCreator: (e: Event) => ProtoInput): (e: Event) => void {
+  private createMouseListener(
+    dataCreator: (e: Event) => any,
+  ): (e: Event) => void {
     return (e: Event) => {
       e.preventDefault();
       e.stopPropagation();
       const data = dataCreator(e as any);
 
-      // Latency tracking
+      const message = createMessage(data, "input");
-      const tracker = new LatencyTracker("input-mouse");
+      this.wrtc.sendBinary(toBinary(ProtoMessageSchema, message));
-      tracker.addTimestamp("client_send");
-      const protoTracker: ProtoLatencyTracker = {
-        $typeName: "proto.ProtoLatencyTracker",
-        sequenceId: tracker.sequence_id,
-        timestamps: [],
-      };
-      for (const t of tracker.timestamps) {
-        protoTracker.timestamps.push({
-          $typeName: "proto.ProtoTimestampEntry",
-          stage: t.stage,
-          time: timestampFromDate(t.time),
-        } as ProtoTimestampEntry);
-      }
-
-      const message: ProtoMessageInput = {
-        $typeName: "proto.ProtoMessageInput",
-        messageBase: {
-          $typeName: "proto.ProtoMessageBase",
-          payloadType: "input",
-          latency: protoTracker,
-        } as ProtoMessageBase,
-        data: data,
-      };
-      this.wrtc.sendBinary(toBinary(ProtoMessageInputSchema, message));
     };
   }
 

packages/input/src/proto/latency_tracker_pb.ts

@@ -1,9 +1,9 @@
-// @generated by protoc-gen-es v2.2.3 with parameter "target=ts"
+// @generated by protoc-gen-es v2.10.0 with parameter "target=ts"
 // @generated from file latency_tracker.proto (package proto, syntax proto3)
 /* eslint-disable */
 
-import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
+import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
-import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1";
+import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
 import type { Timestamp } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
 import type { Message } from "@bufbuild/protobuf";

packages/input/src/proto/messages_pb.ts

@@ -1,10 +1,10 @@
-// @generated by protoc-gen-es v2.2.3 with parameter "target=ts"
+// @generated by protoc-gen-es v2.10.0 with parameter "target=ts"
 // @generated from file messages.proto (package proto, syntax proto3)
 /* eslint-disable */
 
-import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
+import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
-import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1";
+import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
-import type { ProtoInput } from "./types_pb";
+import type { ProtoClientDisconnected, ProtoClientRequestRoomStream, ProtoControllerAttach, ProtoControllerDetach, ProtoControllerRumble, ProtoControllerStateBatch, 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("Cg5tZXNzYWdlcy5wcm90bxIFcHJvdG8iVQoQUHJvdG9NZXNzYWdlQmFzZRIUCgxwYXlsb2FkX3R5cGUYASABKAkSKwoHbGF0ZW5jeRgCIAEoCzIaLnByb3RvLlByb3RvTGF0ZW5jeVRyYWNrZXIiYwoRUHJvdG9NZXNzYWdlSW5wdXQSLQoMbWVzc2FnZV9iYXNlGAEgASgLMhcucHJvdG8uUHJvdG9NZXNzYWdlQmFzZRIfCgRkYXRhGAIgASgLMhEucHJvdG8uUHJvdG9JbnB1dEIWWhRyZWxheS9pbnRlcm5hbC9wcm90b2IGcHJvdG8z", [file_types, file_latency_tracker]);
+  fileDesc("Cg5tZXNzYWdlcy5wcm90bxIFcHJvdG8iVQoQUHJvdG9NZXNzYWdlQmFzZRIUCgxwYXlsb2FkX3R5cGUYASABKAkSKwoHbGF0ZW5jeRgCIAEoCzIaLnByb3RvLlByb3RvTGF0ZW5jeVRyYWNrZXIipQcKDFByb3RvTWVzc2FnZRItCgxtZXNzYWdlX2Jhc2UYASABKAsyFy5wcm90by5Qcm90b01lc3NhZ2VCYXNlEisKCm1vdXNlX21vdmUYAiABKAsyFS5wcm90by5Qcm90b01vdXNlTW92ZUgAEjIKDm1vdXNlX21vdmVfYWJzGAMgASgLMhgucHJvdG8uUHJvdG9Nb3VzZU1vdmVBYnNIABItCgttb3VzZV93aGVlbBgEIAEoCzIWLnByb3RvLlByb3RvTW91c2VXaGVlbEgAEjIKDm1vdXNlX2tleV9kb3duGAUgASgLMhgucHJvdG8uUHJvdG9Nb3VzZUtleURvd25IABIuCgxtb3VzZV9rZXlfdXAYBiABKAsyFi5wcm90by5Qcm90b01vdXNlS2V5VXBIABInCghrZXlfZG93bhgHIAEoCzITLnByb3RvLlByb3RvS2V5RG93bkgAEiMKBmtleV91cBgIIAEoCzIRLnByb3RvLlByb3RvS2V5VXBIABI5ChFjb250cm9sbGVyX2F0dGFjaBgJIAEoCzIcLnByb3RvLlByb3RvQ29udHJvbGxlckF0dGFjaEgAEjkKEWNvbnRyb2xsZXJfZGV0YWNoGAogASgLMhwucHJvdG8uUHJvdG9Db250cm9sbGVyRGV0YWNoSAASOQoRY29udHJvbGxlcl9ydW1ibGUYCyABKAsyHC5wcm90by5Qcm90b0NvbnRyb2xsZXJSdW1ibGVIABJCChZjb250cm9sbGVyX3N0YXRlX2JhdGNoGAwgASgLMiAucHJvdG8uUHJvdG9Db250cm9sbGVyU3RhdGVCYXRjaEgAEh4KA2ljZRgUIAEoCzIPLnByb3RvLlByb3RvSUNFSAASHgoDc2RwGBUgASgLMg8ucHJvdG8uUHJvdG9TRFBIABIeCgNyYXcYFiABKAsyDy5wcm90by5Qcm90b1Jhd0gAEkkKGmNsaWVudF9yZXF1ZXN0X3Jvb21fc3RyZWFtGBcgASgLMiMucHJvdG8uUHJvdG9DbGllbnRSZXF1ZXN0Um9vbVN0cmVhbUgAEj0KE2NsaWVudF9kaXNjb25uZWN0ZWQYGCABKAsyHi5wcm90by5Qcm90b0NsaWVudERpc2Nvbm5lY3RlZEgAEjoKEnNlcnZlcl9wdXNoX3N0cmVhbRgZIAEoCzIcLnByb3RvLlByb3RvU2VydmVyUHVzaFN0cmVhbUgAQgkKB3BheWxvYWRCFloUcmVsYXkvaW50ZXJuYWwvcHJvdG9iBnByb3RvMw", [file_types, file_latency_tracker]);
 
 /**
  * @generated from message proto.ProtoMessageBase
@@ -39,24 +39,132 @@ export const ProtoMessageBaseSchema: GenMessage<ProtoMessageBase> = /*@__PURE__*
   messageDesc(file_messages, 0);
 
 /**
- * @generated from message proto.ProtoMessageInput
+ * @generated from message proto.ProtoMessage
  */
-export type ProtoMessageInput = Message<"proto.ProtoMessageInput"> & {
+export type ProtoMessage = Message<"proto.ProtoMessage"> & {
   /**
    * @generated from field: proto.ProtoMessageBase message_base = 1;
    */
   messageBase?: ProtoMessageBase;
 
   /**
-   * @generated from field: proto.ProtoInput data = 2;
+   * @generated from oneof proto.ProtoMessage.payload
    */
-  data?: ProtoInput;
+  payload: {
+    /**
+     * Input types
+     *
+     * @generated from field: proto.ProtoMouseMove mouse_move = 2;
+     */
+    value: ProtoMouseMove;
+    case: "mouseMove";
+  } | {
+    /**
+     * @generated from field: proto.ProtoMouseMoveAbs mouse_move_abs = 3;
+     */
+    value: ProtoMouseMoveAbs;
+    case: "mouseMoveAbs";
+  } | {
+    /**
+     * @generated from field: proto.ProtoMouseWheel mouse_wheel = 4;
+     */
+    value: ProtoMouseWheel;
+    case: "mouseWheel";
+  } | {
+    /**
+     * @generated from field: proto.ProtoMouseKeyDown mouse_key_down = 5;
+     */
+    value: ProtoMouseKeyDown;
+    case: "mouseKeyDown";
+  } | {
+    /**
+     * @generated from field: proto.ProtoMouseKeyUp mouse_key_up = 6;
+     */
+    value: ProtoMouseKeyUp;
+    case: "mouseKeyUp";
+  } | {
+    /**
+     * @generated from field: proto.ProtoKeyDown key_down = 7;
+     */
+    value: ProtoKeyDown;
+    case: "keyDown";
+  } | {
+    /**
+     * @generated from field: proto.ProtoKeyUp key_up = 8;
+     */
+    value: ProtoKeyUp;
+    case: "keyUp";
+  } | {
+    /**
+     * Controller input types
+     *
+     * @generated from field: proto.ProtoControllerAttach controller_attach = 9;
+     */
+    value: ProtoControllerAttach;
+    case: "controllerAttach";
+  } | {
+    /**
+     * @generated from field: proto.ProtoControllerDetach controller_detach = 10;
+     */
+    value: ProtoControllerDetach;
+    case: "controllerDetach";
+  } | {
+    /**
+     * @generated from field: proto.ProtoControllerRumble controller_rumble = 11;
+     */
+    value: ProtoControllerRumble;
+    case: "controllerRumble";
+  } | {
+    /**
+     * @generated from field: proto.ProtoControllerStateBatch controller_state_batch = 12;
+     */
+    value: ProtoControllerStateBatch;
+    case: "controllerStateBatch";
+  } | {
+    /**
+     * Signaling types
+     *
+     * @generated from field: proto.ProtoICE ice = 20;
+     */
+    value: ProtoICE;
+    case: "ice";
+  } | {
+    /**
+     * @generated from field: proto.ProtoSDP sdp = 21;
+     */
+    value: ProtoSDP;
+    case: "sdp";
+  } | {
+    /**
+     * @generated from field: proto.ProtoRaw raw = 22;
+     */
+    value: ProtoRaw;
+    case: "raw";
+  } | {
+    /**
+     * @generated from field: proto.ProtoClientRequestRoomStream client_request_room_stream = 23;
+     */
+    value: ProtoClientRequestRoomStream;
+    case: "clientRequestRoomStream";
+  } | {
+    /**
+     * @generated from field: proto.ProtoClientDisconnected client_disconnected = 24;
+     */
+    value: ProtoClientDisconnected;
+    case: "clientDisconnected";
+  } | {
+    /**
+     * @generated from field: proto.ProtoServerPushStream server_push_stream = 25;
+     */
+    value: ProtoServerPushStream;
+    case: "serverPushStream";
+  } | { case: undefined; value?: undefined };
 };
 
 /**
- * Describes the message proto.ProtoMessageInput.
+ * Describes the message proto.ProtoMessage.
- * Use `create(ProtoMessageInputSchema)` to create a new message.
+ * Use `create(ProtoMessageSchema)` to create a new message.
  */
-export const ProtoMessageInputSchema: GenMessage<ProtoMessageInput> = /*@__PURE__*/
+export const ProtoMessageSchema: GenMessage<ProtoMessage> = /*@__PURE__*/
   messageDesc(file_messages, 1);
 

packages/input/src/proto/types_pb.ts

@@ -1,16 +1,16 @@
-// @generated by protoc-gen-es v2.2.3 with parameter "target=ts"
+// @generated by protoc-gen-es v2.10.0 with parameter "target=ts"
 // @generated from file types.proto (package proto, syntax proto3)
 /* eslint-disable */
 
-import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
+import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
-import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1";
+import { enumDesc, fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
 import type { Message } from "@bufbuild/protobuf";
 
 /**
  * Describes the file types.proto.
  */
 export const file_types: GenFile = /*@__PURE__*/
-  fileDesc("Cgt0eXBlcy5wcm90bxIFcHJvdG8iNAoOUHJvdG9Nb3VzZU1vdmUSDAoEdHlwZRgBIAEoCRIJCgF4GAIgASgFEgkKAXkYAyABKAUiNwoRUHJvdG9Nb3VzZU1vdmVBYnMSDAoEdHlwZRgBIAEoCRIJCgF4GAIgASgFEgkKAXkYAyABKAUiNQoPUHJvdG9Nb3VzZVdoZWVsEgwKBHR5cGUYASABKAkSCQoBeBgCIAEoBRIJCgF5GAMgASgFIi4KEVByb3RvTW91c2VLZXlEb3duEgwKBHR5cGUYASABKAkSCwoDa2V5GAIgASgFIiwKD1Byb3RvTW91c2VLZXlVcBIMCgR0eXBlGAEgASgJEgsKA2tleRgCIAEoBSIpCgxQcm90b0tleURvd24SDAoEdHlwZRgBIAEoCRILCgNrZXkYAiABKAUiJwoKUHJvdG9LZXlVcBIMCgR0eXBlGAEgASgJEgsKA2tleRgCIAEoBSLcAgoKUHJvdG9JbnB1dBIrCgptb3VzZV9tb3ZlGAEgASgLMhUucHJvdG8uUHJvdG9Nb3VzZU1vdmVIABIyCg5tb3VzZV9tb3ZlX2FicxgCIAEoCzIYLnByb3RvLlByb3RvTW91c2VNb3ZlQWJzSAASLQoLbW91c2Vfd2hlZWwYAyABKAsyFi5wcm90by5Qcm90b01vdXNlV2hlZWxIABIyCg5tb3VzZV9rZXlfZG93bhgEIAEoCzIYLnByb3RvLlByb3RvTW91c2VLZXlEb3duSAASLgoMbW91c2Vfa2V5X3VwGAUgASgLMhYucHJvdG8uUHJvdG9Nb3VzZUtleVVwSAASJwoIa2V5X2Rvd24YBiABKAsyEy5wcm90by5Qcm90b0tleURvd25IABIjCgZrZXlfdXAYByABKAsyES5wcm90by5Qcm90b0tleVVwSABCDAoKaW5wdXRfdHlwZUIWWhRyZWxheS9pbnRlcm5hbC9wcm90b2IGcHJvdG8z");
+  fileDesc("Cgt0eXBlcy5wcm90bxIFcHJvdG8iJgoOUHJvdG9Nb3VzZU1vdmUSCQoBeBgBIAEoBRIJCgF5GAIgASgFIikKEVByb3RvTW91c2VNb3ZlQWJzEgkKAXgYASABKAUSCQoBeRgCIAEoBSInCg9Qcm90b01vdXNlV2hlZWwSCQoBeBgBIAEoBRIJCgF5GAIgASgFIiAKEVByb3RvTW91c2VLZXlEb3duEgsKA2tleRgBIAEoBSIeCg9Qcm90b01vdXNlS2V5VXASCwoDa2V5GAEgASgFIhsKDFByb3RvS2V5RG93bhILCgNrZXkYASABKAUiGQoKUHJvdG9LZXlVcBILCgNrZXkYASABKAUiTQoVUHJvdG9Db250cm9sbGVyQXR0YWNoEgoKAmlkGAEgASgJEhQKDHNlc3Npb25fc2xvdBgCIAEoBRISCgpzZXNzaW9uX2lkGAMgASgJIkEKFVByb3RvQ29udHJvbGxlckRldGFjaBIUCgxzZXNzaW9uX3Nsb3QYASABKAUSEgoKc2Vzc2lvbl9pZBgCIAEoCSKCAQoVUHJvdG9Db250cm9sbGVyUnVtYmxlEhQKDHNlc3Npb25fc2xvdBgBIAEoBRISCgpzZXNzaW9uX2lkGAIgASgJEhUKDWxvd19mcmVxdWVuY3kYAyABKAUSFgoOaGlnaF9mcmVxdWVuY3kYBCABKAUSEAoIZHVyYXRpb24YBSABKAUi0AUKGVByb3RvQ29udHJvbGxlclN0YXRlQmF0Y2gSFAoMc2Vzc2lvbl9zbG90GAEgASgFEhIKCnNlc3Npb25faWQYAiABKAkSQAoLdXBkYXRlX3R5cGUYAyABKA4yKy5wcm90by5Qcm90b0NvbnRyb2xsZXJTdGF0ZUJhdGNoLlVwZGF0ZVR5cGUSEAoIc2VxdWVuY2UYBCABKA0SVAoTYnV0dG9uX2NoYW5nZWRfbWFzaxgFIAMoCzI3LnByb3RvLlByb3RvQ29udHJvbGxlclN0YXRlQmF0Y2guQnV0dG9uQ2hhbmdlZE1hc2tFbnRyeRIZCgxsZWZ0X3N0aWNrX3gYBiABKAVIAIgBARIZCgxsZWZ0X3N0aWNrX3kYByABKAVIAYgBARIaCg1yaWdodF9zdGlja194GAggASgFSAKIAQESGgoNcmlnaHRfc3RpY2tfeRgJIAEoBUgDiAEBEhkKDGxlZnRfdHJpZ2dlchgKIAEoBUgEiAEBEhoKDXJpZ2h0X3RyaWdnZXIYCyABKAVIBYgBARITCgZkcGFkX3gYDCABKAVIBogBARITCgZkcGFkX3kYDSABKAVIB4gBARIbCg5jaGFuZ2VkX2ZpZWxkcxgOIAEoDUgIiAEBGjgKFkJ1dHRvbkNoYW5nZWRNYXNrRW50cnkSCwoDa2V5GAEgASgFEg0KBXZhbHVlGAIgASgIOgI4ASInCgpVcGRhdGVUeXBlEg4KCkZVTExfU1RBVEUQABIJCgVERUxUQRABQg8KDV9sZWZ0X3N0aWNrX3hCDwoNX2xlZnRfc3RpY2tfeUIQCg5fcmlnaHRfc3RpY2tfeEIQCg5fcmlnaHRfc3RpY2tfeUIPCg1fbGVmdF90cmlnZ2VyQhAKDl9yaWdodF90cmlnZ2VyQgkKB19kcGFkX3hCCQoHX2RwYWRfeUIRCg9fY2hhbmdlZF9maWVsZHMiqgEKE1JUQ0ljZUNhbmRpZGF0ZUluaXQSEQoJY2FuZGlkYXRlGAEgASgJEhoKDXNkcE1MaW5lSW5kZXgYAiABKA1IAIgBARITCgZzZHBNaWQYAyABKAlIAYgBARIdChB1c2VybmFtZUZyYWdtZW50GAQgASgJSAKIAQFCEAoOX3NkcE1MaW5lSW5kZXhCCQoHX3NkcE1pZEITChFfdXNlcm5hbWVGcmFnbWVudCI2ChlSVENTZXNzaW9uRGVzY3JpcHRpb25Jbml0EgsKA3NkcBgBIAEoCRIMCgR0eXBlGAIgASgJIjkKCFByb3RvSUNFEi0KCWNhbmRpZGF0ZRgBIAEoCzIaLnByb3RvLlJUQ0ljZUNhbmRpZGF0ZUluaXQiOQoIUHJvdG9TRFASLQoDc2RwGAEgASgLMiAucHJvdG8uUlRDU2Vzc2lvbkRlc2NyaXB0aW9uSW5pdCIYCghQcm90b1JhdxIMCgRkYXRhGAEgASgJIkUKHFByb3RvQ2xpZW50UmVxdWVzdFJvb21TdHJlYW0SEQoJcm9vbV9uYW1lGAEgASgJEhIKCnNlc3Npb25faWQYAiABKAkiRwoXUHJvdG9DbGllbnREaXNjb25uZWN0ZWQSEgoKc2Vzc2lvbl9pZBgBIAEoCRIYChBjb250cm9sbGVyX3Nsb3RzGAIgAygFIioKFVByb3RvU2VydmVyUHVzaFN0cmVhbRIRCglyb29tX25hbWUYASABKAlCFloUcmVsYXkvaW50ZXJuYWwvcHJvdG9iBnByb3RvMw");
 
 /**
  * MouseMove message
@@ -19,19 +19,12 @@ export const file_types: GenFile = /*@__PURE__*/
  */
 export type ProtoMouseMove = Message<"proto.ProtoMouseMove"> & {
   /**
-   * Fixed value "MouseMove"
+   * @generated from field: int32 x = 1;
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 x = 2;
    */
   x: number;
 
   /**
-   * @generated from field: int32 y = 3;
+   * @generated from field: int32 y = 2;
    */
   y: number;
 };
@@ -50,19 +43,12 @@ export const ProtoMouseMoveSchema: GenMessage<ProtoMouseMove> = /*@__PURE__*/
  */
 export type ProtoMouseMoveAbs = Message<"proto.ProtoMouseMoveAbs"> & {
   /**
-   * Fixed value "MouseMoveAbs"
+   * @generated from field: int32 x = 1;
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 x = 2;
    */
   x: number;
 
   /**
-   * @generated from field: int32 y = 3;
+   * @generated from field: int32 y = 2;
    */
   y: number;
 };
@@ -81,19 +67,12 @@ export const ProtoMouseMoveAbsSchema: GenMessage<ProtoMouseMoveAbs> = /*@__PURE_
  */
 export type ProtoMouseWheel = Message<"proto.ProtoMouseWheel"> & {
   /**
-   * Fixed value "MouseWheel"
+   * @generated from field: int32 x = 1;
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 x = 2;
    */
   x: number;
 
   /**
-   * @generated from field: int32 y = 3;
+   * @generated from field: int32 y = 2;
    */
   y: number;
 };
@@ -112,14 +91,7 @@ export const ProtoMouseWheelSchema: GenMessage<ProtoMouseWheel> = /*@__PURE__*/
  */
 export type ProtoMouseKeyDown = Message<"proto.ProtoMouseKeyDown"> & {
   /**
-   * Fixed value "MouseKeyDown"
+   * @generated from field: int32 key = 1;
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 key = 2;
    */
   key: number;
 };
@@ -138,14 +110,7 @@ export const ProtoMouseKeyDownSchema: GenMessage<ProtoMouseKeyDown> = /*@__PURE_
  */
 export type ProtoMouseKeyUp = Message<"proto.ProtoMouseKeyUp"> & {
   /**
-   * Fixed value "MouseKeyUp"
+   * @generated from field: int32 key = 1;
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 key = 2;
    */
   key: number;
 };
@@ -164,14 +129,7 @@ export const ProtoMouseKeyUpSchema: GenMessage<ProtoMouseKeyUp> = /*@__PURE__*/
  */
 export type ProtoKeyDown = Message<"proto.ProtoKeyDown"> & {
   /**
-   * Fixed value "KeyDown"
+   * @generated from field: int32 key = 1;
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 key = 2;
    */
   key: number;
 };
@@ -190,14 +148,7 @@ export const ProtoKeyDownSchema: GenMessage<ProtoKeyDown> = /*@__PURE__*/
  */
 export type ProtoKeyUp = Message<"proto.ProtoKeyUp"> & {
   /**
-   * Fixed value "KeyUp"
+   * @generated from field: int32 key = 1;
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 key = 2;
    */
   key: number;
 };
@@ -210,63 +161,430 @@ export const ProtoKeyUpSchema: GenMessage<ProtoKeyUp> = /*@__PURE__*/
   messageDesc(file_types, 6);
 
 /**
- * Union of all Input types
+ * ControllerAttach message
  *
- * @generated from message proto.ProtoInput
+ * @generated from message proto.ProtoControllerAttach
  */
-export type ProtoInput = Message<"proto.ProtoInput"> & {
+export type ProtoControllerAttach = Message<"proto.ProtoControllerAttach"> & {
   /**
-   * @generated from oneof proto.ProtoInput.input_type
+   * One of the following enums: "ps", "xbox" or "switch"
+   *
+   * @generated from field: string id = 1;
    */
-  inputType: {
+  id: string;
+
   /**
-     * @generated from field: proto.ProtoMouseMove mouse_move = 1;
+   * Session specific slot number (0-3)
+   *
+   * @generated from field: int32 session_slot = 2;
    */
-    value: ProtoMouseMove;
+  sessionSlot: number;
-    case: "mouseMove";
+
-  } | {
   /**
-     * @generated from field: proto.ProtoMouseMoveAbs mouse_move_abs = 2;
+   * Session ID of the client
+   *
+   * @generated from field: string session_id = 3;
    */
-    value: ProtoMouseMoveAbs;
+  sessionId: string;
-    case: "mouseMoveAbs";
-  } | {
-    /**
-     * @generated from field: proto.ProtoMouseWheel mouse_wheel = 3;
-     */
-    value: ProtoMouseWheel;
-    case: "mouseWheel";
-  } | {
-    /**
-     * @generated from field: proto.ProtoMouseKeyDown mouse_key_down = 4;
-     */
-    value: ProtoMouseKeyDown;
-    case: "mouseKeyDown";
-  } | {
-    /**
-     * @generated from field: proto.ProtoMouseKeyUp mouse_key_up = 5;
-     */
-    value: ProtoMouseKeyUp;
-    case: "mouseKeyUp";
-  } | {
-    /**
-     * @generated from field: proto.ProtoKeyDown key_down = 6;
-     */
-    value: ProtoKeyDown;
-    case: "keyDown";
-  } | {
-    /**
-     * @generated from field: proto.ProtoKeyUp key_up = 7;
-     */
-    value: ProtoKeyUp;
-    case: "keyUp";
-  } | { case: undefined; value?: undefined };
 };
 
 /**
- * Describes the message proto.ProtoInput.
+ * Describes the message proto.ProtoControllerAttach.
- * Use `create(ProtoInputSchema)` to create a new message.
+ * Use `create(ProtoControllerAttachSchema)` to create a new message.
  */
-export const ProtoInputSchema: GenMessage<ProtoInput> = /*@__PURE__*/
+export const ProtoControllerAttachSchema: GenMessage<ProtoControllerAttach> = /*@__PURE__*/
   messageDesc(file_types, 7);
 
+/**
+ * ControllerDetach message
+ *
+ * @generated from message proto.ProtoControllerDetach
+ */
+export type ProtoControllerDetach = Message<"proto.ProtoControllerDetach"> & {
+  /**
+   * 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;
+};
+
+/**
+ * Describes the message proto.ProtoControllerDetach.
+ * Use `create(ProtoControllerDetachSchema)` to create a new message.
+ */
+export const ProtoControllerDetachSchema: GenMessage<ProtoControllerDetach> = /*@__PURE__*/
+  messageDesc(file_types, 8);
+
+/**
+ * ControllerRumble message
+ *
+ * @generated from message proto.ProtoControllerRumble
+ */
+export type ProtoControllerRumble = Message<"proto.ProtoControllerRumble"> & {
+  /**
+   * 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;
+
+  /**
+   * Low frequency rumble (0-65535)
+   *
+   * @generated from field: int32 low_frequency = 3;
+   */
+  lowFrequency: number;
+
+  /**
+   * High frequency rumble (0-65535)
+   *
+   * @generated from field: int32 high_frequency = 4;
+   */
+  highFrequency: number;
+
+  /**
+   * Duration in milliseconds
+   *
+   * @generated from field: int32 duration = 5;
+   */
+  duration: number;
+};
+
+/**
+ * Describes the message proto.ProtoControllerRumble.
+ * Use `create(ProtoControllerRumbleSchema)` to create a new message.
+ */
+export const ProtoControllerRumbleSchema: GenMessage<ProtoControllerRumble> = /*@__PURE__*/
+  messageDesc(file_types, 9);
+
+/**
+ * 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
+ */
+export type RTCIceCandidateInit = Message<"proto.RTCIceCandidateInit"> & {
+  /**
+   * @generated from field: string candidate = 1;
+   */
+  candidate: string;
+
+  /**
+   * @generated from field: optional uint32 sdpMLineIndex = 2;
+   */
+  sdpMLineIndex?: number;
+
+  /**
+   * @generated from field: optional string sdpMid = 3;
+   */
+  sdpMid?: string;
+
+  /**
+   * @generated from field: optional string usernameFragment = 4;
+   */
+  usernameFragment?: string;
+};
+
+/**
+ * Describes the message proto.RTCIceCandidateInit.
+ * Use `create(RTCIceCandidateInitSchema)` to create a new message.
+ */
+export const RTCIceCandidateInitSchema: GenMessage<RTCIceCandidateInit> = /*@__PURE__*/
+  messageDesc(file_types, 11);
+
+/**
+ * @generated from message proto.RTCSessionDescriptionInit
+ */
+export type RTCSessionDescriptionInit = Message<"proto.RTCSessionDescriptionInit"> & {
+  /**
+   * @generated from field: string sdp = 1;
+   */
+  sdp: string;
+
+  /**
+   * @generated from field: string type = 2;
+   */
+  type: string;
+};
+
+/**
+ * Describes the message proto.RTCSessionDescriptionInit.
+ * Use `create(RTCSessionDescriptionInitSchema)` to create a new message.
+ */
+export const RTCSessionDescriptionInitSchema: GenMessage<RTCSessionDescriptionInit> = /*@__PURE__*/
+  messageDesc(file_types, 12);
+
+/**
+ * ProtoICE message
+ *
+ * @generated from message proto.ProtoICE
+ */
+export type ProtoICE = Message<"proto.ProtoICE"> & {
+  /**
+   * @generated from field: proto.RTCIceCandidateInit candidate = 1;
+   */
+  candidate?: RTCIceCandidateInit;
+};
+
+/**
+ * Describes the message proto.ProtoICE.
+ * Use `create(ProtoICESchema)` to create a new message.
+ */
+export const ProtoICESchema: GenMessage<ProtoICE> = /*@__PURE__*/
+  messageDesc(file_types, 13);
+
+/**
+ * ProtoSDP message
+ *
+ * @generated from message proto.ProtoSDP
+ */
+export type ProtoSDP = Message<"proto.ProtoSDP"> & {
+  /**
+   * @generated from field: proto.RTCSessionDescriptionInit sdp = 1;
+   */
+  sdp?: RTCSessionDescriptionInit;
+};
+
+/**
+ * Describes the message proto.ProtoSDP.
+ * Use `create(ProtoSDPSchema)` to create a new message.
+ */
+export const ProtoSDPSchema: GenMessage<ProtoSDP> = /*@__PURE__*/
+  messageDesc(file_types, 14);
+
+/**
+ * ProtoRaw message
+ *
+ * @generated from message proto.ProtoRaw
+ */
+export type ProtoRaw = Message<"proto.ProtoRaw"> & {
+  /**
+   * @generated from field: string data = 1;
+   */
+  data: string;
+};
+
+/**
+ * Describes the message proto.ProtoRaw.
+ * Use `create(ProtoRawSchema)` to create a new message.
+ */
+export const ProtoRawSchema: GenMessage<ProtoRaw> = /*@__PURE__*/
+  messageDesc(file_types, 15);
+
+/**
+ * ProtoClientRequestRoomStream message
+ *
+ * @generated from message proto.ProtoClientRequestRoomStream
+ */
+export type ProtoClientRequestRoomStream = Message<"proto.ProtoClientRequestRoomStream"> & {
+  /**
+   * @generated from field: string room_name = 1;
+   */
+  roomName: string;
+
+  /**
+   * @generated from field: string session_id = 2;
+   */
+  sessionId: string;
+};
+
+/**
+ * Describes the message proto.ProtoClientRequestRoomStream.
+ * Use `create(ProtoClientRequestRoomStreamSchema)` to create a new message.
+ */
+export const ProtoClientRequestRoomStreamSchema: GenMessage<ProtoClientRequestRoomStream> = /*@__PURE__*/
+  messageDesc(file_types, 16);
+
+/**
+ * ProtoClientDisconnected message
+ *
+ * @generated from message proto.ProtoClientDisconnected
+ */
+export type ProtoClientDisconnected = Message<"proto.ProtoClientDisconnected"> & {
+  /**
+   * @generated from field: string session_id = 1;
+   */
+  sessionId: string;
+
+  /**
+   * @generated from field: repeated int32 controller_slots = 2;
+   */
+  controllerSlots: number[];
+};
+
+/**
+ * Describes the message proto.ProtoClientDisconnected.
+ * Use `create(ProtoClientDisconnectedSchema)` to create a new message.
+ */
+export const ProtoClientDisconnectedSchema: GenMessage<ProtoClientDisconnected> = /*@__PURE__*/
+  messageDesc(file_types, 17);
+
+/**
+ * ProtoServerPushStream message
+ *
+ * @generated from message proto.ProtoServerPushStream
+ */
+export type ProtoServerPushStream = Message<"proto.ProtoServerPushStream"> & {
+  /**
+   * @generated from field: string room_name = 1;
+   */
+  roomName: string;
+};
+
+/**
+ * Describes the message proto.ProtoServerPushStream.
+ * Use `create(ProtoServerPushStreamSchema)` to create a new message.
+ */
+export const ProtoServerPushStreamSchema: GenMessage<ProtoServerPushStream> = /*@__PURE__*/
+  messageDesc(file_types, 18);
+

packages/input/src/streamwrapper.ts

@@ -0,0 +1,81 @@
+import { pbStream, type ProtobufStream } from "@libp2p/utils";
+import type { Stream } from "@libp2p/interface";
+import { bufbuildAdapter } from "./utils";
+import {
+  ProtoMessage,
+  ProtoMessageSchema,
+  ProtoMessageBase,
+} from "./proto/messages_pb";
+
+type MessageHandler = (
+  data: any,
+  base: ProtoMessageBase,
+) => void | Promise<void>;
+
+export class P2PMessageStream {
+  private pb: ProtobufStream;
+  private handlers = new Map<string, MessageHandler[]>();
+  private closed = false;
+  private readLoopRunning = false;
+
+  constructor(stream: Stream) {
+    this.pb = pbStream(stream);
+  }
+
+  public on(payloadType: string, handler: MessageHandler): void {
+    if (!this.handlers.has(payloadType)) {
+      this.handlers.set(payloadType, []);
+    }
+    this.handlers.get(payloadType)!.push(handler);
+
+    if (!this.readLoopRunning) this.startReading().catch(console.error);
+  }
+
+  private async startReading(): Promise<void> {
+    if (this.readLoopRunning || this.closed) return;
+    this.readLoopRunning = true;
+
+    while (!this.closed) {
+      try {
+        const msg: ProtoMessage = await this.pb.read(
+          bufbuildAdapter(ProtoMessageSchema),
+        );
+
+        const payloadType = msg.messageBase?.payloadType;
+        if (payloadType && this.handlers.has(payloadType)) {
+          const handlers = this.handlers.get(payloadType)!;
+          if (msg.payload.value) {
+            for (const handler of handlers) {
+              try {
+                await handler(msg.payload.value, msg.messageBase);
+              } catch (err) {
+                console.error(`Error in handler for ${payloadType}:`, err);
+              }
+            }
+          }
+        }
+      } catch (err) {
+        if (this.closed) break;
+        console.error("Stream read error:", err);
+        this.close();
+      }
+    }
+
+    this.readLoopRunning = false;
+  }
+
+  public async write(
+    message: ProtoMessage,
+    options?: { signal?: AbortSignal },
+  ): Promise<void> {
+    if (this.closed)
+      throw new Error("Cannot write to closed stream");
+
+    await this.pb.write(message, bufbuildAdapter(ProtoMessageSchema), options);
+  }
+
+  public close(): void {
+    this.closed = true;
+    this.handlers.clear();
+  }
+}

packages/input/src/utils.ts

@@ -0,0 +1,95 @@
+import { create, toBinary, fromBinary } from "@bufbuild/protobuf";
+import type { Message } from "@bufbuild/protobuf";
+import { Uint8ArrayList } from "uint8arraylist";
+import type { GenMessage } from "@bufbuild/protobuf/codegenv2";
+import { timestampFromDate } from "@bufbuild/protobuf/wkt";
+import {
+  ProtoLatencyTracker,
+  ProtoLatencyTrackerSchema,
+  ProtoTimestampEntrySchema,
+} from "./proto/latency_tracker_pb";
+import {
+  ProtoMessage,
+  ProtoMessageSchema,
+  ProtoMessageBaseSchema,
+} from "./proto/messages_pb";
+
+export function bufbuildAdapter<T extends Message>(schema: GenMessage<T>) {
+  return {
+    encode: (data: T): Uint8Array => {
+      return toBinary(schema, data);
+    },
+    decode: (data: Uint8Array | Uint8ArrayList): T => {
+      // Convert Uint8ArrayList to Uint8Array if needed
+      const bytes = data instanceof Uint8ArrayList ? data.subarray() : data;
+      return fromBinary(schema, bytes);
+    },
+  };
+}
+
+// Latency tracker helpers
+export function createLatencyTracker(sequenceId?: string): ProtoLatencyTracker {
+  return create(ProtoLatencyTrackerSchema, {
+    sequenceId: sequenceId || crypto.randomUUID(),
+    timestamps: [],
+  });
+}
+
+export function addLatencyTimestamp(
+  tracker: ProtoLatencyTracker,
+  stage: string,
+): ProtoLatencyTracker {
+  const entry = create(ProtoTimestampEntrySchema, {
+    stage,
+    time: timestampFromDate(new Date()),
+  });
+
+  return {
+    ...tracker,
+    timestamps: [...tracker.timestamps, entry],
+  };
+}
+
+interface CreateMessageOptions {
+  sequenceId?: string;
+}
+
+function derivePayloadCase(data: Message): string {
+  // Extract case from $typeName: "proto.ProtoICE" -> "ice"
+  // "proto.ProtoControllerAttach" -> "controllerAttach"
+  const typeName = data.$typeName;
+  if (!typeName)
+    throw new Error("Message has no $typeName");
+
+  // Remove "proto.Proto" prefix and convert first char to lowercase
+  const caseName = typeName.replace(/^proto\.Proto/, "");
+
+  // Convert PascalCase to camelCase
+  // If it's all caps (like SDP, ICE), lowercase everything
+  // Otherwise, just lowercase the first character
+  if (caseName === caseName.toUpperCase()) {
+    return caseName.toLowerCase();
+  }
+  return caseName.charAt(0).toLowerCase() + caseName.slice(1);
+}
+
+export function createMessage(
+  data: Message,
+  payloadType: string,
+  options?: CreateMessageOptions,
+): ProtoMessage {
+  const payloadCase = derivePayloadCase(data);
+
+  return create(ProtoMessageSchema, {
+    messageBase: create(ProtoMessageBaseSchema, {
+      payloadType,
+      latency: options?.sequenceId
+        ? createLatencyTracker(options.sequenceId)
+        : undefined,
+    }),
+    payload: {
+      case: payloadCase,
+      value: data,
+    } as any, // Type assertion needed for dynamic case
+  });
+}

packages/input/src/webrtc-stream.ts

@@ -1,10 +1,5 @@
-import {
-  NewMessageRaw,
-  NewMessageSDP,
-  NewMessageICE,
-  SafeStream,
-} from "./messages";
 import { webSockets } from "@libp2p/websockets";
+import { webTransport } from "@libp2p/webtransport";
 import { createLibp2p, Libp2p } from "libp2p";
 import { noise } from "@chainsafe/libp2p-noise";
 import { yamux } from "@chainsafe/libp2p-yamux";
@@ -12,26 +7,38 @@ import { identify } from "@libp2p/identify";
 import { multiaddr } from "@multiformats/multiaddr";
 import { Connection } from "@libp2p/interface";
 import { ping } from "@libp2p/ping";
-
+import { createMessage } from "./utils";
-//FIXME: Sometimes the room will wait to say offline, then appear to be online after retrying :D
+import { create } from "@bufbuild/protobuf";
-// This works for me, with my trashy internet, does it work for you as well?
+import {
+  ProtoClientRequestRoomStream,
+  ProtoClientRequestRoomStreamSchema,
+  ProtoICE,
+  ProtoICESchema, ProtoRaw,
+  ProtoSDP,
+  ProtoSDPSchema
+} from "./proto/types_pb";
+import { P2PMessageStream } from "./streamwrapper";
 
 const NESTRI_PROTOCOL_STREAM_REQUEST = "/nestri-relay/stream-request/1.0.0";
 
 export class WebRTCStream {
+  private _sessionId: string | null = null;
   private _p2p: Libp2p | undefined = undefined;
   private _p2pConn: Connection | undefined = undefined;
-  private _p2pSafeStream: SafeStream | undefined = undefined;
+  private _msgStream: P2PMessageStream | undefined = undefined;
   private _pc: RTCPeerConnection | undefined = undefined;
   private _audioTrack: MediaStreamTrack | undefined = undefined;
   private _videoTrack: MediaStreamTrack | undefined = undefined;
   private _dataChannel: RTCDataChannel | undefined = undefined;
-  private _onConnected: ((stream: MediaStream | null) => void) | undefined = undefined;
+  private _onConnected: ((stream: MediaStream | null) => void) | undefined =
-  private _connectionTimer: NodeJS.Timeout | NodeJS.Timer | undefined = undefined;
+    undefined;
+  private _connectionTimer: NodeJS.Timeout | NodeJS.Timer | undefined =
+    undefined;
   private _serverURL: string | undefined = undefined;
   private _roomName: string | undefined = undefined;
-  private _isConnected: boolean = false; // Add flag to track connection state
+  private _isConnected: boolean = false;
-  currentFrameRate: number = 60;
+  private _dataChannelCallbacks: Array<(data: any) => void> = [];
+  currentFrameRate: number = 100;
 
   constructor(
     serverURL: string,
@@ -59,7 +66,7 @@ export class WebRTCStream {
     console.log("Setting up libp2p");
 
     this._p2p = await createLibp2p({
-      transports: [webSockets()],
+      transports: [webSockets(), webTransport()],
       connectionEncrypters: [noise()],
       streamMuxers: [yamux()],
       connectionGater: {
@@ -90,14 +97,20 @@ export class WebRTCStream {
         .newStream(NESTRI_PROTOCOL_STREAM_REQUEST)
         .catch(console.error);
       if (stream) {
-        this._p2pSafeStream = new SafeStream(stream);
+        this._msgStream = new P2PMessageStream(stream);
         console.log("Stream opened with peer");
 
         let iceHolder: RTCIceCandidateInit[] = [];
-        this._p2pSafeStream.registerCallback("ice-candidate", (data) => {
+        this._msgStream.on("ice-candidate", (data: ProtoICE) => {
+          const cand: RTCIceCandidateInit = {
+            candidate: data.candidate.candidate,
+            sdpMLineIndex: data.candidate.sdpMLineIndex,
+            sdpMid: data.candidate.sdpMid,
+            usernameFragment: data.candidate.usernameFragment,
+          };
           if (this._pc) {
             if (this._pc.remoteDescription) {
-              this._pc.addIceCandidate(data.candidate).catch((err) => {
+              this._pc.addIceCandidate(cand).catch((err) => {
                 console.error("Error adding ICE candidate:", err);
               });
               // Add held candidates
@@ -108,45 +121,78 @@ export class WebRTCStream {
               });
               iceHolder = [];
             } else {
-              iceHolder.push(data.candidate);
+              iceHolder.push(cand);
             }
-          } else {
-            iceHolder.push(data.candidate);
           }
         });
 
-        this._p2pSafeStream.registerCallback("offer", async (data) => {
+        this._msgStream.on("session-assigned", (data: ProtoClientRequestRoomStream) => {
+          this._sessionId = data.sessionId;
+          localStorage.setItem("nestri-session-id", this._sessionId);
+          console.log("Session ID assigned:", this._sessionId, "for room:", data.roomName);
+        });
+
+        this._msgStream.on("offer", async (data: ProtoSDP) => {
           if (!this._pc) {
             // Setup peer connection now
             this._setupPeerConnection();
           }
-          await this._pc!.setRemoteDescription(data.sdp);
+          await this._pc!.setRemoteDescription({
+            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
           answer.sdp = this.forceOpusStereo(answer.sdp!);
           await this._pc!.setLocalDescription(answer);
           // Send answer back
-          const answerMsg = NewMessageSDP("answer", answer);
+          const answerMsg = createMessage(
-          await this._p2pSafeStream?.writeMessage(answerMsg);
+            create(ProtoSDPSchema, {
+              sdp: answer,
+            }),
+            "answer",
+          );
+          await this._msgStream?.write(answerMsg);
         });
 
-        this._p2pSafeStream.registerCallback("request-stream-offline", (data) => {
+        this._msgStream.on("request-stream-offline", (msg: ProtoRaw) => {
-          console.warn("Stream is offline for room:", data.roomName);
+          console.warn("Stream is offline for room:", msg.data);
           this._onConnected?.(null);
         });
 
+        const clientId = this.getSessionID();
+        if (clientId) {
+          console.debug("Using existing session ID:", clientId);
+        }
+
         // Send stream request
-        // marshal room name into json
+        const requestMsg = createMessage(
-        const request = NewMessageRaw(
+          create(ProtoClientRequestRoomStreamSchema, {
+            roomName: roomName,
+            sessionId: clientId ?? "",
+          }),
           "request-stream-room",
-          roomName,
         );
-        await this._p2pSafeStream.writeMessage(request);
+        await this._msgStream.write(requestMsg);
       }
     }
   }
 
+  public getSessionID(): string | null {
+    if (this._sessionId === null)
+      this._sessionId = localStorage.getItem("nestri-session-id");
+    return this._sessionId;
+  }
+
   // Forces opus to stereo in Chromium browsers, because of course
   private forceOpusStereo(SDP: string): string {
     // Look for "minptime=10;useinbandfec=1" and replace with "minptime=10;useinbandfec=1;stereo=1;sprop-stereo=1;"
@@ -201,11 +247,16 @@ export class WebRTCStream {
 
     this._pc.onicecandidate = (e) => {
       if (e.candidate) {
-        const iceMsg = NewMessageICE("ice-candidate", e.candidate);
+        const iceMsg = createMessage(
-        if (this._p2pSafeStream) {
+          create(ProtoICESchema, {
-          this._p2pSafeStream.writeMessage(iceMsg).catch((err) =>
+            candidate: e.candidate,
-            console.error("Error sending ICE candidate:", err),
+          }),
+          "ice-candidate",
         );
+        if (this._msgStream) {
+          this._msgStream
+            .write(iceMsg)
+            .catch((err) => console.error("Error sending ICE candidate:", err));
         } else {
           console.warn("P2P stream not established, cannot send ICE candidate");
         }
@@ -219,7 +270,7 @@ export class WebRTCStream {
   }
 
   private _checkConnectionState() {
-    if (!this._pc) return;
+    if (!this._pc || !this._p2p || !this._p2pConn) return;
 
     console.debug("Checking connection state:", {
       connectionState: this._pc.connectionState,
@@ -256,7 +307,7 @@ export class WebRTCStream {
                 // @ts-ignore
                 receiver.jitterBufferTarget = receiver.jitterBufferDelayHint = receiver.playoutDelayHint = 0;
               }
-            }, 15);
+            }, 50);
           });
         }
       }
@@ -267,9 +318,9 @@ export class WebRTCStream {
       this._pc.connectionState === "closed" ||
       this._pc.iceConnectionState === "failed"
     ) {
-      console.log("Connection failed or closed, attempting reconnect");
+      console.log("PeerConnection failed or closed");
-      this._isConnected = false; // Reset connected state
+      //this._isConnected = false; // Reset connected state
-      this._handleConnectionFailure();
+      //this._handleConnectionFailure();
     }
   }
 
@@ -286,7 +337,9 @@ export class WebRTCStream {
 
     // Attempt to reconnect only if not already connected
     if (!this._isConnected && this._serverURL && this._roomName) {
-      this._setup(this._serverURL, this._roomName).catch((err) => console.error("Reconnection failed:", err));
+      this._setup(this._serverURL, this._roomName).catch((err) =>
+        console.error("Reconnection failed:", err),
+      );
     }
   }
 
@@ -318,6 +371,7 @@ export class WebRTCStream {
         console.error("Error closing data channel:", err);
       }
       this._dataChannel = undefined;
+      this._dataChannelCallbacks = [];
     }
     this._isConnected = false; // Reset connected state during cleanup
   }
@@ -329,15 +383,33 @@ export class WebRTCStream {
     }
   }
 
+  public addDataChannelCallback(callback: (data: any) => void) {
+    this._dataChannelCallbacks.push(callback);
+  }
+
+  public removeDataChannelCallback(callback: (data: any) => void) {
+    this._dataChannelCallbacks = this._dataChannelCallbacks.filter(
+      (cb) => cb !== callback,
+    );
+  }
+
   private _setupDataChannelEvents() {
     if (!this._dataChannel) return;
 
     this._dataChannel.onclose = () => console.log("sendChannel has closed");
     this._dataChannel.onopen = () => console.log("sendChannel has opened");
-    this._dataChannel.onmessage = (e) =>
+    this._dataChannel.onmessage = (event) => {
-      console.log(
+      // Parse as ProtoBuf message
-        `Message from DataChannel '${this._dataChannel?.label}' payload '${e.data}'`,
+      const data = event.data;
-      );
+      // Call registered callback if exists
+      this._dataChannelCallbacks.forEach((callback) => {
+        try {
+          callback(data);
+        } catch (err) {
+          console.error("Error in data channel callback:", err);
+        }
+      });
+    };
   }
 
   private _gatherFrameRate() {

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

@@ -0,0 +1,13 @@
+> 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

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

packages/patches/bubblewrap/bubbleunheck.patch

@@ -0,0 +1,18 @@
+diff --git a/bubblewrap.c b/bubblewrap.c
+index f8728c7..42cfe2e 100644
+--- a/bubblewrap.c
++++ b/bubblewrap.c
+@@ -876,13 +876,6 @@ acquire_privs (void)
+       /* Keep only the required capabilities for setup */
+       set_required_caps ();
+     }
+-  else if (real_uid != 0 && has_caps ())
+-    {
+-      /* We have some capabilities in the non-setuid case, which should not happen.
+-         Probably caused by the binary being setcap instead of setuid which we
+-         don't support anymore */
+-      die ("Unexpected capabilities but not setuid, old file caps config?");
+-    }
+   else if (real_uid == 0)
+     {
+       /* If our uid is 0, default to inheriting all caps; the caller

packages/play-standalone/android/.gitignore

@@ -0,0 +1,101 @@
+# 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

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

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

@@ -0,0 +1,54 @@
+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

@@ -0,0 +1,19 @@
+// 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

@@ -0,0 +1,21 @@
+# 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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,44 @@
+<?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

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,34 @@
+<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

@@ -0,0 +1,170 @@
+<?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

@@ -0,0 +1,12 @@
+<?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

@@ -0,0 +1,9 @@
+<?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

@@ -0,0 +1,9 @@
+<?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>