fix: Fix good chunk of packet loss and frame drop issues

- Also added new latency control parameter, not super visible differences, but it's cool :)

.github/workflows/docker-bake.hcl

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

.github/workflows/play-standalone.yml

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

buf.gen.yaml

@@ -15,3 +15,4 @@ plugins:
   # Rust (nestri-server)
   - remote: buf.build/community/neoeinstein-prost
     out: packages/server/src/proto
+    opt: flat_output_dir=true

bun.lock

@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "nestri",
@@ -88,23 +89,23 @@
       "name": "@nestri/input",
       "version": "0.0.0",
       "dependencies": {
-        "@bufbuild/protobuf": "^2.2.3",
-        "@chainsafe/libp2p-noise": "^16.1.3",
-        "@chainsafe/libp2p-yamux": "^7.0.1",
-        "@libp2p/identify": "^3.0.32",
-        "@libp2p/interface": "^2.10.2",
-        "@libp2p/ping": "^2.0.32",
-        "@libp2p/websockets": "^9.2.13",
-        "@multiformats/multiaddr": "^12.4.0",
-        "it-length-prefixed": "^10.0.1",
-        "it-pipe": "^3.0.1",
-        "libp2p": "^2.8.8",
+        "@bufbuild/protobuf": "^2.10.0",
+        "@chainsafe/libp2p-noise": "^17.0.0",
+        "@chainsafe/libp2p-quic": "^1.1.3",
+        "@chainsafe/libp2p-yamux": "^8.0.1",
+        "@libp2p/identify": "^4.0.5",
+        "@libp2p/interface": "^3.0.2",
+        "@libp2p/ping": "^3.0.5",
+        "@libp2p/utils": "^7.0.5",
+        "@libp2p/websockets": "^10.0.6",
+        "@libp2p/webtransport": "^6.0.7",
+        "@multiformats/multiaddr": "^13.0.1",
+        "libp2p": "^3.0.6",
         "uint8arraylist": "^2.4.8",
-        "uint8arrays": "^5.1.0",
       },
       "devDependencies": {
-        "@bufbuild/buf": "^1.50.0",
-        "@bufbuild/protoc-gen-es": "^2.2.3",
+        "@bufbuild/buf": "^1.59.0",
+        "@bufbuild/protoc-gen-es": "^2.10.0",
       },
     },
     "packages/moq": {
@@ -122,9 +123,9 @@
       "name": "play-standalone",
       "version": "0.0.1",
       "dependencies": {
-        "@astrojs/node": "^9.4.2",
+        "@astrojs/node": "9.5.0",
         "@nestri/input": "*",
-        "astro": "5.13.2",
+        "astro": "5.15.1",
       },
     },
     "packages/www": {
@@ -203,11 +204,11 @@
 
     "@astrojs/compiler": ["@astrojs/compiler@2.12.2", "", {}, "sha512-w2zfvhjNCkNMmMMOn5b0J8+OmUaBL1o40ipMvqcG6NRpdC+lKxmTi48DT8Xw0SzJ3AfmeFLB45zXZXtmbsjcgw=="],
 
-    "@astrojs/internal-helpers": ["@astrojs/internal-helpers@0.7.2", "", {}, "sha512-KCkCqR3Goym79soqEtbtLzJfqhTWMyVaizUi35FLzgGSzBotSw8DB1qwsu7U96ihOJgYhDk2nVPz+3LnXPeX6g=="],
+    "@astrojs/internal-helpers": ["@astrojs/internal-helpers@0.7.4", "", {}, "sha512-lDA9MqE8WGi7T/t2BMi+EAXhs4Vcvr94Gqx3q15cFEz8oFZMO4/SFBqYr/UcmNlvW+35alowkVj+w9VhLvs5Cw=="],
 
-    "@astrojs/markdown-remark": ["@astrojs/markdown-remark@6.3.6", "", { "dependencies": { "@astrojs/internal-helpers": "0.7.2", "@astrojs/prism": "3.3.0", "github-slugger": "^2.0.0", "hast-util-from-html": "^2.0.3", "hast-util-to-text": "^4.0.2", "import-meta-resolve": "^4.1.0", "js-yaml": "^4.1.0", "mdast-util-definitions": "^6.0.0", "rehype-raw": "^7.0.0", "rehype-stringify": "^10.0.1", "remark-gfm": "^4.0.1", "remark-parse": "^11.0.0", "remark-rehype": "^11.1.2", "remark-smartypants": "^3.0.2", "shiki": "^3.2.1", "smol-toml": "^1.3.4", "unified": "^11.0.5", "unist-util-remove-position": "^5.0.0", "unist-util-visit": "^5.0.0", "unist-util-visit-parents": "^6.0.1", "vfile": "^6.0.3" } }, "sha512-bwylYktCTsLMVoCOEHbn2GSUA3c5KT/qilekBKA3CBng0bo1TYjNZPr761vxumRk9kJGqTOtU+fgCAp5Vwokug=="],
+    "@astrojs/markdown-remark": ["@astrojs/markdown-remark@6.3.8", "", { "dependencies": { "@astrojs/internal-helpers": "0.7.4", "@astrojs/prism": "3.3.0", "github-slugger": "^2.0.0", "hast-util-from-html": "^2.0.3", "hast-util-to-text": "^4.0.2", "import-meta-resolve": "^4.2.0", "js-yaml": "^4.1.0", "mdast-util-definitions": "^6.0.0", "rehype-raw": "^7.0.0", "rehype-stringify": "^10.0.1", "remark-gfm": "^4.0.1", "remark-parse": "^11.0.0", "remark-rehype": "^11.1.2", "remark-smartypants": "^3.0.2", "shiki": "^3.13.0", "smol-toml": "^1.4.2", "unified": "^11.0.5", "unist-util-remove-position": "^5.0.0", "unist-util-visit": "^5.0.0", "unist-util-visit-parents": "^6.0.1", "vfile": "^6.0.3" } }, "sha512-uFNyFWadnULWK2cOw4n0hLKeu+xaVWeuECdP10cQ3K2fkybtTlhb7J7TcScdjmS8Yps7oje9S/ehYMfZrhrgCg=="],
 
-    "@astrojs/node": ["@astrojs/node@9.4.3", "", { "dependencies": { "@astrojs/internal-helpers": "0.7.2", "send": "^1.2.0", "server-destroy": "^1.0.1" }, "peerDependencies": { "astro": "^5.7.0" } }, "sha512-P9BQHY8wQU1y9obknXzxV5SS3EpdaRnuDuHKr3RFC7t+2AzcMXeVmMJprQGijnQ8VdijJ8aS7+12tx325TURMQ=="],
+    "@astrojs/node": ["@astrojs/node@9.5.0", "", { "dependencies": { "@astrojs/internal-helpers": "0.7.4", "send": "^1.2.0", "server-destroy": "^1.0.1" }, "peerDependencies": { "astro": "^5.14.3" } }, "sha512-x1whLIatmCefaqJA8FjfI+P6FStF+bqmmrib0OUGM1M3cZhAXKLgPx6UF2AzQ3JgpXgCWYM24MHtraPvZhhyLQ=="],
 
     "@astrojs/prism": ["@astrojs/prism@3.3.0", "", { "dependencies": { "prismjs": "^1.30.0" } }, "sha512-q8VwfU/fDZNoDOf+r7jUnMC2//H2l0TuQ6FkGJL8vD8nw/q5KiL3DS1KKBI3QhI9UQhpJ5dc7AtqfbXWuOgLCQ=="],
 
@@ -361,29 +362,29 @@
 
     "@badrap/valita": ["@badrap/valita@0.3.11", "", {}, "sha512-oak0W8bycFjnrLeVCVvZqkOWTGh74wCPKUxGLJyhRukRs+V/hQdfZp1eDcQE4Gf3UrtJWfR/Ou4Xe0DZqJZ2FA=="],
 
-    "@bufbuild/buf": ["@bufbuild/buf@1.50.0", "", { "optionalDependencies": { "@bufbuild/buf-darwin-arm64": "1.50.0", "@bufbuild/buf-darwin-x64": "1.50.0", "@bufbuild/buf-linux-aarch64": "1.50.0", "@bufbuild/buf-linux-armv7": "1.50.0", "@bufbuild/buf-linux-x64": "1.50.0", "@bufbuild/buf-win32-arm64": "1.50.0", "@bufbuild/buf-win32-x64": "1.50.0" }, "bin": { "buf": "bin/buf", "protoc-gen-buf-breaking": "bin/protoc-gen-buf-breaking", "protoc-gen-buf-lint": "bin/protoc-gen-buf-lint" } }, "sha512-XcdB5/Ls8k1eVcgNwUsRZEhCqiHgsnN+uEk/aDh0urGeiWc/dN6c89ZnAnI9/v0AZWzp6/rowoZhThlTl+D0bw=="],
+    "@bufbuild/buf": ["@bufbuild/buf@1.59.0", "", { "optionalDependencies": { "@bufbuild/buf-darwin-arm64": "1.59.0", "@bufbuild/buf-darwin-x64": "1.59.0", "@bufbuild/buf-linux-aarch64": "1.59.0", "@bufbuild/buf-linux-armv7": "1.59.0", "@bufbuild/buf-linux-x64": "1.59.0", "@bufbuild/buf-win32-arm64": "1.59.0", "@bufbuild/buf-win32-x64": "1.59.0" }, "bin": { "buf": "bin/buf", "protoc-gen-buf-breaking": "bin/protoc-gen-buf-breaking", "protoc-gen-buf-lint": "bin/protoc-gen-buf-lint" } }, "sha512-VdLuGnFp1OKJaiMevlLow6Jcvv9omOyM02Qa1zexl8dBB4Ac2ggz6bpT3Zb06tmCnqd8tFrI/Im1fbom3CznlQ=="],
 
-    "@bufbuild/buf-darwin-arm64": ["@bufbuild/buf-darwin-arm64@1.50.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-ldj1s0hMhZlz0N4+fqs9jGqC7jKAcsfLNp8kM+G+6XTPh8GWA/U1sYRdHhAlv1+3STfWhGxAhrNGRRVvvimALQ=="],
+    "@bufbuild/buf-darwin-arm64": ["@bufbuild/buf-darwin-arm64@1.59.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-d3JTxBCibC+C94JU0jwLMgo/WBhaAHBIRzZXaZ3Y8KREjTj3jhzAlelGZmCtQJyyE0l6DFSm3lQgMblJ5qlq/w=="],
 
-    "@bufbuild/buf-darwin-x64": ["@bufbuild/buf-darwin-x64@1.50.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-0ODFAnDVr0UOIUHGrI3vA3Cycec186BP5PFOuW6bALxBVN52Lqjjj+/+bVhvbBQlYo3rkxOtxEdoWGHZJrHhHA=="],
+    "@bufbuild/buf-darwin-x64": ["@bufbuild/buf-darwin-x64@1.59.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-eFnFB96GM6KjP5S8QFqjufjlMF41CVnXjkR8cIfR5jUXdwl1vf5S82Zv+cK1+Uogqhmt7AVBntd5Z+xmz4NKaw=="],
 
-    "@bufbuild/buf-linux-aarch64": ["@bufbuild/buf-linux-aarch64@1.50.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-Dp0YzLOW7O+C8bAm6/Q2HSrTYpDs2SxQXx+dBNxUotMpzx+uaUvqXb3EGr7s07ro+FsT0sFjzKTBcuCwkj+guQ=="],
+    "@bufbuild/buf-linux-aarch64": ["@bufbuild/buf-linux-aarch64@1.59.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-g6DxTcJM29SBvqe42ll7HpkmTfecuG+PZYTysaxON9Y59fwtflhuLDpNqGhxWehHMkH11bFfpNeCGKjpGbVvkw=="],
 
-    "@bufbuild/buf-linux-armv7": ["@bufbuild/buf-linux-armv7@1.50.0", "", { "os": "linux", "cpu": "arm" }, "sha512-EMYRKSJ4kZo+OiHvMTYM+O27lf/okaf+bk1agRUTmBccp+qoGEC0R3DB/powFf/FURkUF7vKUS4T0GC/4n8OVA=="],
+    "@bufbuild/buf-linux-armv7": ["@bufbuild/buf-linux-armv7@1.59.0", "", { "os": "linux", "cpu": "arm" }, "sha512-C92s+gmKnAyCzN7MdbtukRXOiW7e0hkeQrOie17vF6qWXPk2r9ix0WXZvg5gZr9R4zD8pOYwRVwYiB9zFXZOaA=="],
 
-    "@bufbuild/buf-linux-x64": ["@bufbuild/buf-linux-x64@1.50.0", "", { "os": "linux", "cpu": "x64" }, "sha512-1G6ZQLXYoCXl8ZmCivUuknc6BiMz2bMtfpzYurFhj9wCIQTZsgepTBoiXHTcEdu2fjYAFxRGo4o+ZALU1umY0g=="],
+    "@bufbuild/buf-linux-x64": ["@bufbuild/buf-linux-x64@1.59.0", "", { "os": "linux", "cpu": "x64" }, "sha512-Pzc3TFm1t2fZ5uT7jkYBjyuLNKo5ji/wRl/lLLvOlTFRyqsSZBkFNQcJGHoHSej1yDWau16VMrAh0GN1rZfvAg=="],
 
-    "@bufbuild/buf-win32-arm64": ["@bufbuild/buf-win32-arm64@1.50.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-KpbI+f0TnGaa4KlPQXCLx8ZWKfO2pMD1kvVjAaktmm9OUoP9HrvZJ11tDEiFEFbrKbapCIhCCC3XWaldEDJWcA=="],
+    "@bufbuild/buf-win32-arm64": ["@bufbuild/buf-win32-arm64@1.59.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-hS5VThgYNqbMFgY9SibDA/RXBdegw12jgrT2H+Tzaa2rvlSADck9ZAq9rwf2H0IvFJOqtR75Lejb+5Fx2rThpQ=="],
 
-    "@bufbuild/buf-win32-x64": ["@bufbuild/buf-win32-x64@1.50.0", "", { "os": "win32", "cpu": "x64" }, "sha512-gA9aVuZYfh3pmWNYxmnK6thlcqyu2ht8haFhdB0w14Rtj200FAsMmzF7CPWvXQrV5g0pqXPwoMjZigT4OJHOXg=="],
+    "@bufbuild/buf-win32-x64": ["@bufbuild/buf-win32-x64@1.59.0", "", { "os": "win32", "cpu": "x64" }, "sha512-JAGSF3oaKC2L/TelqvjB1N7oB5pTiviVr8mxiaxHyv4HpvcxCVdiO+iw0goRhZb4QHhYYswk2gLMezWHBxtR/g=="],
 
-    "@bufbuild/protobuf": ["@bufbuild/protobuf@2.2.3", "", {}, "sha512-tFQoXHJdkEOSwj5tRIZSPNUuXK3RaR7T1nUrPgbYX1pUbvqqaaZAsfo+NXBPsz5rZMSKVFrgK1WL8Q/MSLvprg=="],
+    "@bufbuild/protobuf": ["@bufbuild/protobuf@2.10.0", "", {}, "sha512-fdRs9PSrBF7QUntpZpq6BTw58fhgGJojgg39m9oFOJGZT+nip9b0so5cYY1oWl5pvemDLr0cPPsH46vwThEbpQ=="],
 
-    "@bufbuild/protoc-gen-es": ["@bufbuild/protoc-gen-es@2.2.3", "", { "dependencies": { "@bufbuild/protobuf": "^2.2.3", "@bufbuild/protoplugin": "2.2.3" }, "bin": { "protoc-gen-es": "bin/protoc-gen-es" } }, "sha512-hdhIV9NmwXXy24DcbnArauv6L5Dv2PjkO9gz2DUhiZ9HPRpP+rmpT8zo5LohjJiuA7YIQGGKKWSKpRg+xcdLSQ=="],
+    "@bufbuild/protoc-gen-es": ["@bufbuild/protoc-gen-es@2.10.0", "", { "dependencies": { "@bufbuild/protobuf": "2.10.0", "@bufbuild/protoplugin": "2.10.0" }, "bin": { "protoc-gen-es": "bin/protoc-gen-es" } }, "sha512-g3xtuxeMkbacn8/qWQ8NbHBA8unLAvGD7sjcXV1/lfO4iCfd6hYL1Z+rn2yLQZE/JEkG+GPZoIs7m5KI5VYaMw=="],
 
-    "@bufbuild/protoplugin": ["@bufbuild/protoplugin@2.2.3", "", { "dependencies": { "@bufbuild/protobuf": "2.2.3", "@typescript/vfs": "^1.5.2", "typescript": "5.4.5" } }, "sha512-UsV7mj6NJTZrqIYJK+jNFnnj5tOS7wgNXKyMjebFEpf+OX6pfXE+nx+QPjumOfu4GxdVPfEDnKuwISgqlXSQqw=="],
+    "@bufbuild/protoplugin": ["@bufbuild/protoplugin@2.10.0", "", { "dependencies": { "@bufbuild/protobuf": "2.10.0", "@typescript/vfs": "^1.5.2", "typescript": "5.4.5" } }, "sha512-GPJOZ1Gp9/Ci3MXP3yI7+q4G7IhB5cSpbLjsfnBILxtNx69I9+ix3r9P7JfewHvqMjtPe6L+YWX1LPBGNfZMGw=="],
 
-    "@capsizecss/unpack": ["@capsizecss/unpack@2.4.0", "", { "dependencies": { "blob-to-buffer": "^1.2.8", "cross-fetch": "^3.0.4", "fontkit": "^2.0.2" } }, "sha512-GrSU71meACqcmIUxPYOJvGKF0yryjN/L1aCuE9DViCTJI7bfkjgYDPD1zbNDcINJwSSP6UaBZY9GAbYDO7re0Q=="],
+    "@capsizecss/unpack": ["@capsizecss/unpack@3.0.0", "", { "dependencies": { "fontkit": "^2.0.2" } }, "sha512-+ntATQe1AlL7nTOYjwjj6w3299CgRot48wL761TUGYpYgAou3AaONZazp0PKZyCyWhudWsjhq1nvRHOvbMzhTA=="],
 
     "@cbor-extract/cbor-extract-darwin-arm64": ["@cbor-extract/cbor-extract-darwin-arm64@2.2.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-P7swiOAdF7aSi0H+tHtHtr6zrpF3aAq/W9FXx5HektRvLTM2O89xCyXF3pk7pLc7QpaY7AoaE8UowVf9QBdh3w=="],
 
@@ -403,9 +404,25 @@
 
     "@chainsafe/is-ip": ["@chainsafe/is-ip@2.1.0", "", {}, "sha512-KIjt+6IfysQ4GCv66xihEitBjvhU/bixbbbFxdJ1sqCp4uJ0wuZiYBPhksZoy4lfaF0k9cwNzY5upEW/VWdw3w=="],
 
-    "@chainsafe/libp2p-noise": ["@chainsafe/libp2p-noise@16.1.4", "", { "dependencies": { "@chainsafe/as-chacha20poly1305": "^0.1.0", "@chainsafe/as-sha256": "^1.0.0", "@libp2p/crypto": "^5.0.0", "@libp2p/interface": "^2.9.0", "@libp2p/peer-id": "^5.0.0", "@noble/ciphers": "^1.1.3", "@noble/curves": "^1.1.0", "@noble/hashes": "^1.3.1", "it-length-prefixed": "^10.0.1", "it-length-prefixed-stream": "^2.0.1", "it-pair": "^2.0.6", "it-pipe": "^3.0.1", "it-stream-types": "^2.0.1", "protons-runtime": "^5.5.0", "uint8arraylist": "^2.4.3", "uint8arrays": "^5.0.0", "wherearewe": "^2.0.1" } }, "sha512-f4FlyRVndcs4PoioOIZWrFc6wfO/mrAj7H63o0+eA0O2xhcoRkxHh6zna4W+WtScaF/Ua/UULgiNGuKNpLvLlQ=="],
+    "@chainsafe/libp2p-noise": ["@chainsafe/libp2p-noise@17.0.0", "", { "dependencies": { "@chainsafe/as-chacha20poly1305": "^0.1.0", "@chainsafe/as-sha256": "^1.2.0", "@libp2p/crypto": "^5.1.9", "@libp2p/interface": "^3.0.0", "@libp2p/peer-id": "^6.0.0", "@libp2p/utils": "^7.0.0", "@noble/ciphers": "^2.0.1", "@noble/curves": "^2.0.1", "@noble/hashes": "^2.0.1", "protons-runtime": "^5.6.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0", "wherearewe": "^2.0.1" } }, "sha512-vwrmY2Y+L1xYhIDiEpl61KHxwrLCZoXzTpwhyk34u+3+6zCAZPL3GxH3i2cs+u5IYNoyLptORdH17RKFXy7upA=="],
 
-    "@chainsafe/libp2p-yamux": ["@chainsafe/libp2p-yamux@7.0.4", "", { "dependencies": { "@libp2p/interface": "^2.0.0", "@libp2p/utils": "^6.0.0", "get-iterator": "^2.0.1", "it-foreach": "^2.0.6", "it-pushable": "^3.2.3", "it-stream-types": "^2.0.1", "race-signal": "^1.1.3", "uint8arraylist": "^2.4.8" } }, "sha512-Qw+EB9ew/9hRCq9V702gkm5xXThFHQ3Bdvh01M+enI1RScriSDWFGod02dwNHUxsYRc743i49sLlHp0edC7hSQ=="],
+    "@chainsafe/libp2p-quic": ["@chainsafe/libp2p-quic@1.1.3", "", { "dependencies": { "@libp2p/crypto": "^5.1.7", "@libp2p/interface": "^2.10.5", "@libp2p/utils": "^6.7.1", "@multiformats/multiaddr": "^12.4.0", "@multiformats/multiaddr-matcher": "^2.0.1", "it-stream-types": "^2.0.2", "race-signal": "^1.1.3", "uint8arraylist": "^2.4.8" }, "optionalDependencies": { "@chainsafe/libp2p-quic-darwin-arm64": "1.1.3", "@chainsafe/libp2p-quic-darwin-x64": "1.1.3", "@chainsafe/libp2p-quic-linux-arm64-gnu": "1.1.3", "@chainsafe/libp2p-quic-linux-arm64-musl": "1.1.3", "@chainsafe/libp2p-quic-linux-x64-gnu": "1.1.3", "@chainsafe/libp2p-quic-linux-x64-musl": "1.1.3", "@chainsafe/libp2p-quic-win32-x64-msvc": "1.1.3" } }, "sha512-Y9F2vGPW5ZhvYYAcDC4dF6i92h+pch+BAXC1yfO2AX2KLyg8rVlECOkEffeStp06DL4knPZLN+Qi10EgOVfwwA=="],
+
+    "@chainsafe/libp2p-quic-darwin-arm64": ["@chainsafe/libp2p-quic-darwin-arm64@1.1.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-L9Ta/CalkCiKC910thxR6GfqD0Tmm8QfSbZ5eTY7sGUuYYeE5/73UOlNzVHZxEWid7uceYHBYETTAUkdSsy+RQ=="],
+
+    "@chainsafe/libp2p-quic-darwin-x64": ["@chainsafe/libp2p-quic-darwin-x64@1.1.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-hxE4wL/PQop/r6OLpzeJJ3c4WDtfk7zWBKhX2Zjul0jHc5v04a1DRTEmugooaqeU7UNnBQkBsqiHcA8efuhNqg=="],
+
+    "@chainsafe/libp2p-quic-linux-arm64-gnu": ["@chainsafe/libp2p-quic-linux-arm64-gnu@1.1.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-XUyafb32UHdkuhgNYATnoBj81YfRlVl1MDW+OPHD3XPsIYkloUHlPD9Y2cBH9m17K0lvhe/3KndeQ3WLZ2syNA=="],
+
+    "@chainsafe/libp2p-quic-linux-arm64-musl": ["@chainsafe/libp2p-quic-linux-arm64-musl@1.1.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-cmYfa3heaSUN/ts4P1Y1N72Oi7frQdufDC8KzBOgD5WVSLnpXw4Nq8mVt6kf7WU1FLC6FUffKuz3mRWse1gGVg=="],
+
+    "@chainsafe/libp2p-quic-linux-x64-gnu": ["@chainsafe/libp2p-quic-linux-x64-gnu@1.1.3", "", { "os": "linux", "cpu": "x64" }, "sha512-ZS4CtINANQeBvqVHAoWqW9SRfxZ9R5xbM1bQUPjjPsNWdIgu0vCjiIkRYqkaL9cJvVHJPguNhu/NwC6whkdWww=="],
+
+    "@chainsafe/libp2p-quic-linux-x64-musl": ["@chainsafe/libp2p-quic-linux-x64-musl@1.1.3", "", { "os": "linux", "cpu": "x64" }, "sha512-LRi33YOHa/s/KSVRV4iCK+Cz8VBg2J8j3KrUEPtUp3aQvxYYvA/YkbRBcRNOyvEz6natzYA8LOycQsJTrVt4MA=="],
+
+    "@chainsafe/libp2p-quic-win32-x64-msvc": ["@chainsafe/libp2p-quic-win32-x64-msvc@1.1.3", "", { "os": "win32", "cpu": "x64" }, "sha512-zm2h1lYkhHEcVrzO/D0NyPwf5yj0/4zWwltaHXl4fdQMy8kqJCm8zcyZmBRfniDX8/03a2svbYPZdTDtb7FSTw=="],
+
+    "@chainsafe/libp2p-yamux": ["@chainsafe/libp2p-yamux@8.0.1", "", { "dependencies": { "@libp2p/interface": "^3.0.0", "@libp2p/utils": "^7.0.0", "race-signal": "^2.0.0", "uint8arraylist": "^2.4.8" } }, "sha512-pJsqmUg1cZRJZn/luAtQaq0uLcVfExo51Rg7iRtAEceNYtsKUi/exfegnvTBzTnF1CGmTzVEV3MCLsRhqiNyoA=="],
 
     "@chainsafe/netmask": ["@chainsafe/netmask@2.0.0", "", { "dependencies": { "@chainsafe/is-ip": "^2.0.1" } }, "sha512-I3Z+6SWUoaljh3TBzCnCxjlUyN8tA+NAk5L6m9IxvCf1BENQTePzPMis97CoN/iMW1St3WN+AWCCRp+TTBRiDg=="],
 
@@ -597,31 +614,33 @@
 
     "@leichtgewicht/ip-codec": ["@leichtgewicht/ip-codec@2.0.5", "", {}, "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw=="],
 
-    "@libp2p/crypto": ["@libp2p/crypto@5.1.7", "", { "dependencies": { "@libp2p/interface": "^2.10.5", "@noble/curves": "^1.9.1", "@noble/hashes": "^1.8.0", "multiformats": "^13.3.6", "protons-runtime": "^5.5.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-7DO0piidLEKfCuNfS420BlHG0e2tH7W/zugdsPSiC/1Apa/s1B1dBkaIEgfDkGjrRP4S/8Or86Rtq7zXeEu67g=="],
+    "@libp2p/crypto": ["@libp2p/crypto@5.1.10", "", { "dependencies": { "@libp2p/interface": "^3.0.0", "@noble/curves": "^2.0.1", "@noble/hashes": "^2.0.1", "multiformats": "^13.4.0", "protons-runtime": "^5.6.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-kfQwQUV4iLV9tE7C6IjUd61XWEIrg4WBqGIDjeMoUhRPDGQ3z+eIIuIEaBRDEXr8nWd0YZuCprN1AunajHmbfg=="],
 
-    "@libp2p/identify": ["@libp2p/identify@3.0.37", "", { "dependencies": { "@libp2p/crypto": "^5.1.7", "@libp2p/interface": "^2.10.5", "@libp2p/interface-internal": "^2.3.18", "@libp2p/peer-id": "^5.1.8", "@libp2p/peer-record": "^8.0.34", "@libp2p/utils": "^6.7.1", "@multiformats/multiaddr": "^12.4.4", "@multiformats/multiaddr-matcher": "^1.7.2", "it-drain": "^3.0.9", "it-parallel": "^3.0.11", "it-protobuf-stream": "^2.0.2", "main-event": "^1.0.1", "protons-runtime": "^5.5.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-oDdNZaP6a0eH3UIXBee4gOeOT4U4krfOAbqfqe/pM6exQqTyvzv21lOuFvC5EKgOYw63NoNPw1Iwnk36hDBpTg=="],
+    "@libp2p/identify": ["@libp2p/identify@4.0.5", "", { "dependencies": { "@libp2p/crypto": "^5.1.12", "@libp2p/interface": "^3.0.2", "@libp2p/interface-internal": "^3.0.5", "@libp2p/peer-id": "^6.0.3", "@libp2p/peer-record": "^9.0.3", "@libp2p/utils": "^7.0.5", "@multiformats/multiaddr": "^13.0.1", "@multiformats/multiaddr-matcher": "^3.0.1", "it-drain": "^3.0.10", "it-parallel": "^3.0.13", "main-event": "^1.0.1", "protons-runtime": "^5.6.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-p25fw5+w0OjsAgxJWWZhUY25hYGyfFlA1ifycE6DFnPuhYHosZx69/2Q30rq4kZgSEBCepGcj32cKRhWCn0L9A=="],
 
-    "@libp2p/interface": ["@libp2p/interface@2.10.5", "", { "dependencies": { "@multiformats/dns": "^1.0.6", "@multiformats/multiaddr": "^12.4.4", "it-pushable": "^3.2.3", "it-stream-types": "^2.0.2", "main-event": "^1.0.1", "multiformats": "^13.3.6", "progress-events": "^1.0.1", "uint8arraylist": "^2.4.8" } }, "sha512-Z52n04Mph/myGdwyExbFi5S/HqrmZ9JOmfLc2v4r2Cik3GRdw98vrGH19PFvvwjLwAjaqsweCtlGaBzAz09YDw=="],
+    "@libp2p/interface": ["@libp2p/interface@3.0.2", "", { "dependencies": { "@multiformats/dns": "^1.0.6", "@multiformats/multiaddr": "^13.0.1", "main-event": "^1.0.1", "multiformats": "^13.4.0", "progress-events": "^1.0.1", "uint8arraylist": "^2.4.8" } }, "sha512-nb3H0eu9RPCBjwWUCafSL3TpFmt1Jhe4zgWlV98VrrWhtxg8xaunbEWzfVnU+R2TvV8IAljGw80OcqSst3gBlw=="],
 
-    "@libp2p/interface-internal": ["@libp2p/interface-internal@2.3.18", "", { "dependencies": { "@libp2p/interface": "^2.10.5", "@libp2p/peer-collections": "^6.0.34", "@multiformats/multiaddr": "^12.4.4", "progress-events": "^1.0.1" } }, "sha512-tnZ20IFASXLbDc2JxeUPZNIXDuN5Ge7be6BU458WLvmquf93NlSqZkWs6xFdi+0yXUrw7GGTgzIP5v+1LnDUmA=="],
+    "@libp2p/interface-internal": ["@libp2p/interface-internal@3.0.5", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@libp2p/peer-collections": "^7.0.5", "@multiformats/multiaddr": "^13.0.1", "progress-events": "^1.0.1" } }, "sha512-gaarewSLKpH5iMkXPmUctDk8SoBf/fXL/wNkpfHqHXtzP6Z4Hhm6eFc/DpL8NfCe+tLf1Cdmg3jOsxfdBS3IoA=="],
 
-    "@libp2p/logger": ["@libp2p/logger@5.1.21", "", { "dependencies": { "@libp2p/interface": "^2.10.5", "@multiformats/multiaddr": "^12.4.4", "interface-datastore": "^8.3.1", "multiformats": "^13.3.6", "weald": "^1.0.4" } }, "sha512-V1TWlZM5BuKkiGQ7En4qOnseVP82JwDIpIfNjceUZz1ArL32A5HXJjLQnJchkZ3VW8PVciJzUos/vP6slhPY6Q=="],
+    "@libp2p/logger": ["@libp2p/logger@6.0.5", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@multiformats/multiaddr": "^13.0.1", "interface-datastore": "^9.0.1", "multiformats": "^13.4.0", "weald": "^1.0.6" } }, "sha512-4HdUwusPh57KKSY0v0YMYw6T2wl93svOLFNJuosy2xLto9zty1KWkrjaEFyF6jF0a7zBd1k5trjJsDXo8OKDxw=="],
 
-    "@libp2p/multistream-select": ["@libp2p/multistream-select@6.0.28", "", { "dependencies": { "@libp2p/interface": "^2.10.5", "it-length-prefixed": "^10.0.1", "it-length-prefixed-stream": "^2.0.2", "it-stream-types": "^2.0.2", "p-defer": "^4.0.1", "race-signal": "^1.1.3", "uint8-varint": "^2.0.4", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-ILu65FAX2Hak7x40DXb0gYptF6BmlGGW2kNgGeKIcNeseuvsAkBPO8k0CHwr8MU5mnHamTiweLJh5jD0iVZJ1A=="],
+    "@libp2p/multistream-select": ["@libp2p/multistream-select@7.0.5", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@libp2p/utils": "^7.0.5", "it-length-prefixed": "^10.0.1", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-OXAv32VtxGYk88VX4jmUgD6Xo58xGgm1oKTNC1ieJ7PbNITfyr/LqOnruuw+/JwQ2LsE806ddOMM8aMV24RMIg=="],
 
-    "@libp2p/peer-collections": ["@libp2p/peer-collections@6.0.34", "", { "dependencies": { "@libp2p/interface": "^2.10.5", "@libp2p/peer-id": "^5.1.8", "@libp2p/utils": "^6.7.1", "multiformats": "^13.3.6" } }, "sha512-rw8gDGhou4sF6W6i9ntmRARFePX19Dw9MMVpZHr6Kx9q2kvBJq91IXUzsXP06roexEOu1CUlZwxtUAqOBy+Eww=="],
+    "@libp2p/peer-collections": ["@libp2p/peer-collections@7.0.5", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@libp2p/peer-id": "^6.0.3", "@libp2p/utils": "^7.0.5", "multiformats": "^13.4.0" } }, "sha512-mUkVDAHyxGr8fAI+aa+kf6izP4BI3qqIvuMQQpppYRG3feptmiRqSulbt/UpXoIepLp/1hIlAeZ+QyAMBZ7EpA=="],
 
-    "@libp2p/peer-id": ["@libp2p/peer-id@5.1.8", "", { "dependencies": { "@libp2p/crypto": "^5.1.7", "@libp2p/interface": "^2.10.5", "multiformats": "^13.3.6", "uint8arrays": "^5.1.0" } }, "sha512-pGaM4BwjnXdGtAtd84L4/wuABpsnFYE+AQ+h3GxNFme0IsTaTVKWd1jBBE5YFeKHBHGUOhF3TlHsdjFfjQA7TA=="],
+    "@libp2p/peer-id": ["@libp2p/peer-id@6.0.3", "", { "dependencies": { "@libp2p/crypto": "^5.1.12", "@libp2p/interface": "^3.0.2", "multiformats": "^13.4.0", "uint8arrays": "^5.1.0" } }, "sha512-kNecI7YYeh55Jrx+ra0AxEx5CfpKB4/i+4rBJ8jRyLaMgJvwhTC055mZrKv+rUWEEfp/9VqCnDKQ8cVoDbDydA=="],
 
-    "@libp2p/peer-record": ["@libp2p/peer-record@8.0.34", "", { "dependencies": { "@libp2p/crypto": "^5.1.7", "@libp2p/interface": "^2.10.5", "@libp2p/peer-id": "^5.1.8", "@libp2p/utils": "^6.7.1", "@multiformats/multiaddr": "^12.4.4", "multiformats": "^13.3.6", "protons-runtime": "^5.5.0", "uint8-varint": "^2.0.4", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-GqvRBpvclscoKuF0JUfLyZTv+BwzICBBe50LFiAKio8LijZMBr43b+AcEaSEwFWDwlWmaKU73q8EQLrCb/e67Q=="],
+    "@libp2p/peer-record": ["@libp2p/peer-record@9.0.3", "", { "dependencies": { "@libp2p/crypto": "^5.1.12", "@libp2p/interface": "^3.0.2", "@libp2p/peer-id": "^6.0.3", "@multiformats/multiaddr": "^13.0.1", "multiformats": "^13.4.0", "protons-runtime": "^5.6.0", "uint8-varint": "^2.0.4", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-W1K/fdyLDZpxEEcS08JafyNyDUAKHhdjxdt2M7ZwDtBbRrM9RFseZaGHufpMEgPZxne6RriLpJp1NLeFPF9bZA=="],
 
-    "@libp2p/peer-store": ["@libp2p/peer-store@11.2.6", "", { "dependencies": { "@libp2p/crypto": "^5.1.7", "@libp2p/interface": "^2.10.5", "@libp2p/peer-collections": "^6.0.34", "@libp2p/peer-id": "^5.1.8", "@libp2p/peer-record": "^8.0.34", "@multiformats/multiaddr": "^12.4.4", "interface-datastore": "^8.3.1", "it-all": "^3.0.8", "main-event": "^1.0.1", "mortice": "^3.2.1", "multiformats": "^13.3.6", "protons-runtime": "^5.5.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-3Lc982/7drqlXa51s9l1/DFHD48zzIjMMYajxFM2KbobyStH+lztYnFc3kNGB9sZijULaW1480PvbTMm9WaJ0g=="],
+    "@libp2p/peer-store": ["@libp2p/peer-store@12.0.5", "", { "dependencies": { "@libp2p/crypto": "^5.1.12", "@libp2p/interface": "^3.0.2", "@libp2p/peer-collections": "^7.0.5", "@libp2p/peer-id": "^6.0.3", "@libp2p/peer-record": "^9.0.3", "@multiformats/multiaddr": "^13.0.1", "interface-datastore": "^9.0.1", "it-all": "^3.0.9", "main-event": "^1.0.1", "mortice": "^3.3.1", "multiformats": "^13.4.0", "protons-runtime": "^5.6.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-hRv3SQZTpB6XFl+suyl0aD2OiLYQIA+UZ4SvCuXCYfIQd8TCSSUbcj1dICrK8aorDVus3ycyMqHAMmbts/5ndA=="],
 
-    "@libp2p/ping": ["@libp2p/ping@2.0.36", "", { "dependencies": { "@libp2p/crypto": "^5.1.7", "@libp2p/interface": "^2.10.5", "@libp2p/interface-internal": "^2.3.18", "@multiformats/multiaddr": "^12.4.4", "it-byte-stream": "^2.0.2", "main-event": "^1.0.1", "uint8arrays": "^5.1.0" } }, "sha512-susC5yMBZhMDz+jIjX7RvQ7NXNL5L4fkRzPhwu+1eLbwNXTYZtDd7fJ53p40I5Ur/A+DgtCpIk03X2nrHPc5Jg=="],
+    "@libp2p/ping": ["@libp2p/ping@3.0.5", "", { "dependencies": { "@libp2p/crypto": "^5.1.12", "@libp2p/interface": "^3.0.2", "@libp2p/interface-internal": "^3.0.5", "@multiformats/multiaddr": "^13.0.1", "p-event": "^7.0.0", "race-signal": "^2.0.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-/1WPyBtKg8yzM2iZ+XylH88S6Z964dggiFgBLtnAEU4kqF1gGFWI/GHOVXltSWKUulnooxpEBf7F8x1jn80MVQ=="],
 
-    "@libp2p/utils": ["@libp2p/utils@6.7.1", "", { "dependencies": { "@chainsafe/is-ip": "^2.1.0", "@chainsafe/netmask": "^2.0.0", "@libp2p/crypto": "^5.1.7", "@libp2p/interface": "^2.10.5", "@libp2p/logger": "^5.1.21", "@multiformats/multiaddr": "^12.4.4", "@sindresorhus/fnv1a": "^3.1.0", "any-signal": "^4.1.1", "delay": "^6.0.0", "get-iterator": "^2.0.1", "is-loopback-addr": "^2.0.2", "is-plain-obj": "^4.1.0", "it-foreach": "^2.1.3", "it-pipe": "^3.0.1", "it-pushable": "^3.2.3", "it-stream-types": "^2.0.2", "main-event": "^1.0.1", "netmask": "^2.0.2", "p-defer": "^4.0.1", "race-event": "^1.3.0", "race-signal": "^1.1.3", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-x3WImvw4unmx1ZeAedj8AkRe4UImUlkw0ZItYAiKiekElMNUXwv+Yt48dI/LmB38JIof8sng29XvUeCVU3F6OA=="],
+    "@libp2p/utils": ["@libp2p/utils@7.0.5", "", { "dependencies": { "@chainsafe/is-ip": "^2.1.0", "@chainsafe/netmask": "^2.0.0", "@libp2p/crypto": "^5.1.12", "@libp2p/interface": "^3.0.2", "@libp2p/logger": "^6.0.5", "@multiformats/multiaddr": "^13.0.1", "@sindresorhus/fnv1a": "^3.1.0", "any-signal": "^4.1.1", "cborg": "^4.2.14", "delay": "^6.0.0", "is-loopback-addr": "^2.0.2", "it-length-prefixed": "^10.0.1", "it-pipe": "^3.0.1", "it-pushable": "^3.2.3", "it-stream-types": "^2.0.2", "main-event": "^1.0.1", "netmask": "^2.0.2", "p-defer": "^4.0.1", "p-event": "^7.0.0", "race-signal": "^2.0.0", "uint8-varint": "^2.0.4", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-SmefnIdRXjLh9SdJ8nIL0LFvBqVuti3kujzk0/4Xj8mvAEzYl7h/Ge5VU6PHpzat9CZMplGQGGfr/vxX1WuckQ=="],
 
-    "@libp2p/websockets": ["@libp2p/websockets@9.2.17", "", { "dependencies": { "@libp2p/interface": "^2.10.5", "@libp2p/utils": "^6.7.1", "@multiformats/multiaddr": "^12.4.4", "@multiformats/multiaddr-matcher": "^1.7.2", "@multiformats/multiaddr-to-uri": "^11.0.0", "@types/ws": "^8.18.1", "it-ws": "^6.1.5", "main-event": "^1.0.1", "p-defer": "^4.0.1", "p-event": "^6.0.1", "progress-events": "^1.0.1", "race-signal": "^1.1.3", "ws": "^8.18.2" } }, "sha512-PNhLFZA+DyV8xynCphrl4H4a1mVRIe6ZPKqLt9UwWr9Ye0ecjgVcL38uDo0XAZkx+NO3S+YspCx8yquJnDyi2A=="],
+    "@libp2p/websockets": ["@libp2p/websockets@10.0.6", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@libp2p/utils": "^7.0.5", "@multiformats/multiaddr": "^13.0.1", "@multiformats/multiaddr-matcher": "^3.0.1", "@multiformats/multiaddr-to-uri": "^12.0.0", "main-event": "^1.0.1", "p-event": "^7.0.0", "progress-events": "^1.0.1", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0", "ws": "^8.18.3" } }, "sha512-rHsV3IR9fTsKUV/dexzmA1CIsIzkqgc5npwgUepXdrejTHhCZfmDSo52fdEsN4kfoWlOK4RmDxXrgQxxkrQeSw=="],
+
+    "@libp2p/webtransport": ["@libp2p/webtransport@6.0.7", "", { "dependencies": { "@chainsafe/libp2p-noise": "^17.0.0", "@libp2p/interface": "^3.0.2", "@libp2p/peer-id": "^6.0.3", "@libp2p/utils": "^7.0.5", "@multiformats/multiaddr": "^13.0.1", "@multiformats/multiaddr-matcher": "^3.0.1", "multiformats": "^13.3.6", "progress-events": "^1.0.1", "race-signal": "^2.0.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-N9w2RXygo93Bg1PaQJTsjPmx+itMhUXhvJrRvBWqvzDoNbjCEZ8ofJKjPGzWr0eNIXsF57rHrCHF1devBDjE4g=="],
 
     "@logdna/tail-file": ["@logdna/tail-file@2.2.0", "", {}, "sha512-XGSsWDweP80Fks16lwkAUIr54ICyBs6PsI4mpfTLQaWgEJRtY9xEV+PeyDpJ+sJEGZxqINlpmAwe/6tS1pP8Ng=="],
 
@@ -641,11 +660,11 @@
 
     "@multiformats/dns": ["@multiformats/dns@1.0.6", "", { "dependencies": { "@types/dns-packet": "^5.6.5", "buffer": "^6.0.3", "dns-packet": "^5.6.1", "hashlru": "^2.3.0", "p-queue": "^8.0.1", "progress-events": "^1.0.0", "uint8arrays": "^5.0.2" } }, "sha512-nt/5UqjMPtyvkG9BQYdJ4GfLK3nMqGpFZOzf4hAmIa0sJh2LlS9YKXZ4FgwBDsaHvzZqR/rUFIywIc7pkHNNuw=="],
 
-    "@multiformats/multiaddr": ["@multiformats/multiaddr@12.5.1", "", { "dependencies": { "@chainsafe/is-ip": "^2.0.1", "@chainsafe/netmask": "^2.0.0", "@multiformats/dns": "^1.0.3", "abort-error": "^1.0.1", "multiformats": "^13.0.0", "uint8-varint": "^2.0.1", "uint8arrays": "^5.0.0" } }, "sha512-+DDlr9LIRUS8KncI1TX/FfUn8F2dl6BIxJgshS/yFQCNB5IAF0OGzcwB39g5NLE22s4qqDePv0Qof6HdpJ/4aQ=="],
+    "@multiformats/multiaddr": ["@multiformats/multiaddr@13.0.1", "", { "dependencies": { "@chainsafe/is-ip": "^2.0.1", "multiformats": "^13.0.0", "uint8-varint": "^2.0.1", "uint8arrays": "^5.0.0" } }, "sha512-XToN915cnfr6Lr9EdGWakGJbPT0ghpg/850HvdC+zFX8XvpLZElwa8synCiwa8TuvKNnny6m8j8NVBNCxhIO3g=="],
 
-    "@multiformats/multiaddr-matcher": ["@multiformats/multiaddr-matcher@1.7.2", "", { "dependencies": { "@chainsafe/is-ip": "^2.0.1", "@multiformats/multiaddr": "^12.0.0", "multiformats": "^13.0.0" } }, "sha512-BJzHOBAAxGZKw+FY/MzeIKGKERAW/1XOrpj61wgzZVvR/iksyGTQhliyTgmuakpBJPSsCxlrk3eLemVhZuJIFQ=="],
+    "@multiformats/multiaddr-matcher": ["@multiformats/multiaddr-matcher@2.0.2", "", { "dependencies": { "@multiformats/multiaddr": "^12.0.0" } }, "sha512-si7EZCI93mfBJKKRkh+u2bB9W6W5APVN3XfdwuseEJ0OS7ysg0Jno9SuAi0bRzsl5OEFESoF71SjsRqgp8PXAA=="],
 
-    "@multiformats/multiaddr-to-uri": ["@multiformats/multiaddr-to-uri@11.0.2", "", { "dependencies": { "@multiformats/multiaddr": "^12.3.0" } }, "sha512-SiLFD54zeOJ0qMgo9xv1Tl9O5YktDKAVDP4q4hL16mSq4O4sfFNagNADz8eAofxd6TfQUzGQ3TkRRG9IY2uHRg=="],
+    "@multiformats/multiaddr-to-uri": ["@multiformats/multiaddr-to-uri@12.0.0", "", { "dependencies": { "@multiformats/multiaddr": "^13.0.0" } }, "sha512-3uIEBCiy8tfzxYYBl81x1tISiNBQ7mHU4pGjippbJRoQYHzy/ZdZM/7JvTldr8pc/dzpkaNJxnsuxxlhsPOJsA=="],
 
     "@neondatabase/serverless": ["@neondatabase/serverless@1.0.1", "", { "dependencies": { "@types/node": "^22.15.30", "@types/pg": "^8.8.0" } }, "sha512-O6yC5TT0jbw86VZVkmnzCZJB0hfxBl0JJz6f+3KHoZabjb/X08r9eFA+vuY06z1/qaovykvdkrXYq3SPUuvogA=="],
 
@@ -663,11 +682,11 @@
 
     "@nestri/zero": ["@nestri/zero@workspace:packages/zero"],
 
-    "@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+    "@noble/ciphers": ["@noble/ciphers@2.0.1", "", {}, "sha512-xHK3XHPUW8DTAobU+G0XT+/w+JLM7/8k1UFdB5xg/zTFPnFCobhftzw8wl4Lw2aq/Rvir5pxfZV5fEazmeCJ2g=="],
 
-    "@noble/curves": ["@noble/curves@1.9.0", "", { "dependencies": { "@noble/hashes": "1.8.0" } }, "sha512-7YDlXiNMdO1YZeH6t/kvopHHbIZzlxrCV9WLqCY6QhcXOoXiNCMDqJIglZ9Yjx5+w7Dz30TITFrlTjnRg7sKEg=="],
+    "@noble/curves": ["@noble/curves@2.0.1", "", { "dependencies": { "@noble/hashes": "2.0.1" } }, "sha512-vs1Az2OOTBiP4q0pwjW5aF0xp9n4MxVrmkFBxc6EKZc6ddYx5gaZiAsZoq0uRRXWbi3AT/sBqn05eRPtn1JCPw=="],
 
-    "@noble/hashes": ["@noble/hashes@1.8.0", "", {}, "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A=="],
+    "@noble/hashes": ["@noble/hashes@2.0.1", "", {}, "sha512-XlOlEbQcE9fmuXxrVTXCTlG2nlRXa9Rj3rr5Ue/+tX+nmkgbX720YHh0VR3hBF9xDvwnb8D2shVGOwNx+ulArw=="],
 
     "@npmcli/agent": ["@npmcli/agent@2.2.2", "", { "dependencies": { "agent-base": "^7.1.0", "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.1", "lru-cache": "^10.0.1", "socks-proxy-agent": "^8.0.3" } }, "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og=="],
 
@@ -909,7 +928,7 @@
 
     "@rocicorp/zero-sqlite3": ["@rocicorp/zero-sqlite3@1.0.4", "", { "dependencies": { "bindings": "^1.5.0", "prebuild-install": "^7.1.1" }, "bin": { "zero-sqlite3": "shell.ps1" } }, "sha512-bm+VUdF4CnKVjUj/dSCmVu0hjcyXaF/nKkw2rNhZUjGeBOMRy/hh8z/32h311es4dxCVvcZ3+QHQHMxF2YG5Kw=="],
 
-    "@rollup/pluginutils": ["@rollup/pluginutils@5.1.4", "", { "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", "picomatch": "^4.0.2" }, "peerDependencies": { "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" }, "optionalPeers": ["rollup"] }, "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ=="],
+    "@rollup/pluginutils": ["@rollup/pluginutils@5.3.0", "", { "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", "picomatch": "^4.0.2" }, "peerDependencies": { "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" }, "optionalPeers": ["rollup"] }, "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q=="],
 
     "@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.38.0", "", { "os": "android", "cpu": "arm" }, "sha512-ldomqc4/jDZu/xpYU+aRxo3V4mGCV9HeTgUBANI3oIQMOL+SsxB+S2lxMpkFp5UamSS3XuTMQVbsS24R4J4Qjg=="],
 
@@ -951,17 +970,17 @@
 
     "@rollup/rollup-win32-x64-msvc": ["@rollup/rollup-win32-x64-msvc@4.38.0", "", { "os": "win32", "cpu": "x64" }, "sha512-jjqy3uWlecfB98Psxb5cD6Fny9Fupv9LrDSPTQZUROqjvZmcCqNu4UMl7qqhlUUGpwiAkotj6GYu4SZdcr/nLw=="],
 
-    "@shikijs/core": ["@shikijs/core@3.12.2", "", { "dependencies": { "@shikijs/types": "3.12.2", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-L1Safnhra3tX/oJK5kYHaWmLEBJi1irASwewzY3taX5ibyXyMkkSDZlq01qigjryOBwrXSdFgTiZ3ryzSNeu7Q=="],
+    "@shikijs/core": ["@shikijs/core@3.13.0", "", { "dependencies": { "@shikijs/types": "3.13.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-3P8rGsg2Eh2qIHekwuQjzWhKI4jV97PhvYjYUzGqjvJfqdQPz+nMlfWahU24GZAyW1FxFI1sYjyhfh5CoLmIUA=="],
 
-    "@shikijs/engine-javascript": ["@shikijs/engine-javascript@3.12.2", "", { "dependencies": { "@shikijs/types": "3.12.2", "@shikijs/vscode-textmate": "^10.0.2", "oniguruma-to-es": "^4.3.3" } }, "sha512-Nm3/azSsaVS7hk6EwtHEnTythjQfwvrO5tKqMlaH9TwG1P+PNaR8M0EAKZ+GaH2DFwvcr4iSfTveyxMIvXEHMw=="],
+    "@shikijs/engine-javascript": ["@shikijs/engine-javascript@3.13.0", "", { "dependencies": { "@shikijs/types": "3.13.0", "@shikijs/vscode-textmate": "^10.0.2", "oniguruma-to-es": "^4.3.3" } }, "sha512-Ty7xv32XCp8u0eQt8rItpMs6rU9Ki6LJ1dQOW3V/56PKDcpvfHPnYFbsx5FFUP2Yim34m/UkazidamMNVR4vKg=="],
 
-    "@shikijs/engine-oniguruma": ["@shikijs/engine-oniguruma@3.12.2", "", { "dependencies": { "@shikijs/types": "3.12.2", "@shikijs/vscode-textmate": "^10.0.2" } }, "sha512-hozwnFHsLvujK4/CPVHNo3Bcg2EsnG8krI/ZQ2FlBlCRpPZW4XAEQmEwqegJsypsTAN9ehu2tEYe30lYKSZW/w=="],
+    "@shikijs/engine-oniguruma": ["@shikijs/engine-oniguruma@3.13.0", "", { "dependencies": { "@shikijs/types": "3.13.0", "@shikijs/vscode-textmate": "^10.0.2" } }, "sha512-O42rBGr4UDSlhT2ZFMxqM7QzIU+IcpoTMzb3W7AlziI1ZF7R8eS2M0yt5Ry35nnnTX/LTLXFPUjRFCIW+Operg=="],
 
-    "@shikijs/langs": ["@shikijs/langs@3.12.2", "", { "dependencies": { "@shikijs/types": "3.12.2" } }, "sha512-bVx5PfuZHDSHoBal+KzJZGheFuyH4qwwcwG/n+MsWno5cTlKmaNtTsGzJpHYQ8YPbB5BdEdKU1rga5/6JGY8ww=="],
+    "@shikijs/langs": ["@shikijs/langs@3.13.0", "", { "dependencies": { "@shikijs/types": "3.13.0" } }, "sha512-672c3WAETDYHwrRP0yLy3W1QYB89Hbpj+pO4KhxK6FzIrDI2FoEXNiNCut6BQmEApYLfuYfpgOZaqbY+E9b8wQ=="],
 
-    "@shikijs/themes": ["@shikijs/themes@3.12.2", "", { "dependencies": { "@shikijs/types": "3.12.2" } }, "sha512-fTR3QAgnwYpfGczpIbzPjlRnxyONJOerguQv1iwpyQZ9QXX4qy/XFQqXlf17XTsorxnHoJGbH/LXBvwtqDsF5A=="],
+    "@shikijs/themes": ["@shikijs/themes@3.13.0", "", { "dependencies": { "@shikijs/types": "3.13.0" } }, "sha512-Vxw1Nm1/Od8jyA7QuAenaV78BG2nSr3/gCGdBkLpfLscddCkzkL36Q5b67SrLLfvAJTOUzW39x4FHVCFriPVgg=="],
 
-    "@shikijs/types": ["@shikijs/types@3.12.2", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-K5UIBzxCyv0YoxN3LMrKB9zuhp1bV+LgewxuVwHdl4Gz5oePoUFrr9EfgJlGlDeXCU1b/yhdnXeuRvAnz8HN8Q=="],
+    "@shikijs/types": ["@shikijs/types@3.13.0", "", { "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-oM9P+NCFri/mmQ8LoFGVfVyemm5Hi27330zuOBp0annwJdKH1kOLndw3zCtAVDehPLg9fKqoEx3Ht/wNZxolfw=="],
 
     "@shikijs/vscode-textmate": ["@shikijs/vscode-textmate@10.0.2", "", {}, "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg=="],
 
@@ -1131,7 +1150,7 @@
 
     "@types/basic-auth": ["@types/basic-auth@1.1.8", "", { "dependencies": { "@types/node": "*" } }, "sha512-dKcUeixGuZn8pBjcUrf1N7x5K6lWuKuwHHitM2IZ4vwZUDWEhhNtwCWiba8jTA9zn0GQQ+fTFkWpKx8pOU/enw=="],
 
-    "@types/bun": ["@types/bun@1.2.22", "", { "dependencies": { "bun-types": "1.2.22" } }, "sha512-5A/KrKos2ZcN0c6ljRSOa1fYIyCKhZfIVYeuyb4snnvomnpFqC0tTsEkdqNxbAgExV384OETQ//WAjl3XbYqQA=="],
+    "@types/bun": ["@types/bun@1.3.3", "", { "dependencies": { "bun-types": "1.3.3" } }, "sha512-ogrKbJ2X5N0kWLLFKeytG0eHDleBYtngtlbu9cyBKFtNL3cnpDZkNdQj8flVf6WTZUX5ulI9AY1oa7ljhSrp+g=="],
 
     "@types/bunyan": ["@types/bunyan@1.8.11", "", { "dependencies": { "@types/node": "*" } }, "sha512-758fRH7umIMk5qt5ELmRMff4mLDlN+xyYzC+dkPTdKwbSkJFvz6xwyScrytPU0QIBbRRwbiE8/BIg8bpajerNQ=="],
 
@@ -1181,12 +1200,8 @@
 
     "@types/pngjs": ["@types/pngjs@6.0.5", "", { "dependencies": { "@types/node": "*" } }, "sha512-0k5eKfrA83JOZPppLtS2C7OUtyNAl2wKNxfyYl9Q5g9lPkgBl/9hNyAu6HuEH2J4XmIv2znEpkDd0SaZVxW6iQ=="],
 
-    "@types/prop-types": ["@types/prop-types@15.7.14", "", {}, "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ=="],
-
     "@types/qrcode": ["@types/qrcode@1.5.5", "", { "dependencies": { "@types/node": "*" } }, "sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg=="],
 
-    "@types/react": ["@types/react@18.3.18", "", { "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" } }, "sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ=="],
-
     "@types/readable-stream": ["@types/readable-stream@4.0.18", "", { "dependencies": { "@types/node": "*", "safe-buffer": "~5.1.1" } }, "sha512-21jK/1j+Wg+7jVw1xnSwy/2Q1VgVjWuFssbYGTREPUBeZ+rqVFl2udq0IkxzPC0ZhOzVceUbyIACFZKLqKEBlA=="],
 
     "@types/request": ["@types/request@2.48.12", "", { "dependencies": { "@types/caseless": "*", "@types/node": "*", "@types/tough-cookie": "*", "form-data": "^2.5.0" } }, "sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw=="],
@@ -1293,7 +1308,7 @@
 
     "assert-plus": ["assert-plus@1.0.0", "", {}, "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="],
 
-    "astro": ["astro@5.13.2", "", { "dependencies": { "@astrojs/compiler": "^2.12.2", "@astrojs/internal-helpers": "0.7.2", "@astrojs/markdown-remark": "6.3.6", "@astrojs/telemetry": "3.3.0", "@capsizecss/unpack": "^2.4.0", "@oslojs/encoding": "^1.1.0", "@rollup/pluginutils": "^5.1.4", "acorn": "^8.14.1", "aria-query": "^5.3.2", "axobject-query": "^4.1.0", "boxen": "8.0.1", "ci-info": "^4.2.0", "clsx": "^2.1.1", "common-ancestor-path": "^1.0.1", "cookie": "^1.0.2", "cssesc": "^3.0.0", "debug": "^4.4.0", "deterministic-object-hash": "^2.0.2", "devalue": "^5.1.1", "diff": "^5.2.0", "dlv": "^1.1.3", "dset": "^3.1.4", "es-module-lexer": "^1.6.0", "esbuild": "^0.25.0", "estree-walker": "^3.0.3", "flattie": "^1.1.1", "fontace": "~0.3.0", "github-slugger": "^2.0.0", "html-escaper": "3.0.3", "http-cache-semantics": "^4.1.1", "import-meta-resolve": "^4.1.0", "js-yaml": "^4.1.0", "kleur": "^4.1.5", "magic-string": "^0.30.17", "magicast": "^0.3.5", "mrmime": "^2.0.1", "neotraverse": "^0.6.18", "p-limit": "^6.2.0", "p-queue": "^8.1.0", "package-manager-detector": "^1.1.0", "picomatch": "^4.0.2", "prompts": "^2.4.2", "rehype": "^13.0.2", "semver": "^7.7.1", "shiki": "^3.2.1", "smol-toml": "^1.3.4", "tinyexec": "^0.3.2", "tinyglobby": "^0.2.12", "tsconfck": "^3.1.5", "ultrahtml": "^1.6.0", "unifont": "~0.5.0", "unist-util-visit": "^5.0.0", "unstorage": "^1.15.0", "vfile": "^6.0.3", "vite": "^6.3.4", "vitefu": "^1.0.6", "xxhash-wasm": "^1.1.0", "yargs-parser": "^21.1.1", "yocto-spinner": "^0.2.1", "zod": "^3.24.4", "zod-to-json-schema": "^3.24.5", "zod-to-ts": "^1.2.0" }, "optionalDependencies": { "sharp": "^0.33.3" }, "bin": { "astro": "astro.js" } }, "sha512-yjcXY0Ua3EwjpVd3GoUXa65HQ6qgmURBptA+M9GzE0oYvgfuyM7bIbH8IR/TWIbdefVUJR5b7nZ0oVnMytmyfQ=="],
+    "astro": ["astro@5.15.1", "", { "dependencies": { "@astrojs/compiler": "^2.12.2", "@astrojs/internal-helpers": "0.7.4", "@astrojs/markdown-remark": "6.3.8", "@astrojs/telemetry": "3.3.0", "@capsizecss/unpack": "^3.0.0", "@oslojs/encoding": "^1.1.0", "@rollup/pluginutils": "^5.2.0", "acorn": "^8.15.0", "aria-query": "^5.3.2", "axobject-query": "^4.1.0", "boxen": "8.0.1", "ci-info": "^4.3.0", "clsx": "^2.1.1", "common-ancestor-path": "^1.0.1", "cookie": "^1.0.2", "cssesc": "^3.0.0", "debug": "^4.4.1", "deterministic-object-hash": "^2.0.2", "devalue": "^5.3.2", "diff": "^5.2.0", "dlv": "^1.1.3", "dset": "^3.1.4", "es-module-lexer": "^1.7.0", "esbuild": "^0.25.0", "estree-walker": "^3.0.3", "flattie": "^1.1.1", "fontace": "~0.3.0", "github-slugger": "^2.0.0", "html-escaper": "3.0.3", "http-cache-semantics": "^4.2.0", "import-meta-resolve": "^4.2.0", "js-yaml": "^4.1.0", "magic-string": "^0.30.18", "magicast": "^0.3.5", "mrmime": "^2.0.1", "neotraverse": "^0.6.18", "p-limit": "^6.2.0", "p-queue": "^8.1.0", "package-manager-detector": "^1.3.0", "picocolors": "^1.1.1", "picomatch": "^4.0.3", "prompts": "^2.4.2", "rehype": "^13.0.2", "semver": "^7.7.2", "shiki": "^3.12.0", "smol-toml": "^1.4.2", "tinyexec": "^1.0.1", "tinyglobby": "^0.2.14", "tsconfck": "^3.1.6", "ultrahtml": "^1.6.0", "unifont": "~0.6.0", "unist-util-visit": "^5.0.0", "unstorage": "^1.17.0", "vfile": "^6.0.3", "vite": "^6.3.6", "vitefu": "^1.1.1", "xxhash-wasm": "^1.1.0", "yargs-parser": "^21.1.1", "yocto-spinner": "^0.2.3", "zod": "^3.25.76", "zod-to-json-schema": "^3.24.6", "zod-to-ts": "^1.2.0" }, "optionalDependencies": { "sharp": "^0.34.0" }, "bin": { "astro": "astro.js" } }, "sha512-VM679M1qxOjGo6q3vKYDNDddkALGgMopG93IwbEXd3Buc2xVLuuPj4HNziNugSbPQx5S6UReMp5uzw10EJN81A=="],
 
     "async": ["async@2.6.4", "", { "dependencies": { "lodash": "^4.17.14" } }, "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="],
 
@@ -1345,8 +1360,6 @@
 
     "bl": ["bl@6.0.20", "", { "dependencies": { "@types/readable-stream": "^4.0.0", "buffer": "^6.0.3", "inherits": "^2.0.4", "readable-stream": "^4.2.0" } }, "sha512-JMP0loH6ApbpT4Aa9oU5NqAkdDvcyc8koeuK8i5mYoBCVj3XCXG0uweGNN2m6DqaCO2yRHdm+MjCeTsR5VsmcA=="],
 
-    "blob-to-buffer": ["blob-to-buffer@1.2.9", "", {}, "sha512-BF033y5fN6OCofD3vgHmNtwZWRcq9NLyyxyILx9hfMy1sXYy4ojFl765hJ2lP0YaN2fuxPaLO2Vzzoxy0FLFFA=="],
-
     "body-parser": ["body-parser@2.1.0", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", "debug": "^4.4.0", "http-errors": "^2.0.0", "iconv-lite": "^0.5.2", "on-finished": "^2.4.1", "qs": "^6.14.0", "raw-body": "^3.0.0", "type-is": "^2.0.0" } }, "sha512-/hPxh61E+ll0Ujp24Ilm64cykicul1ypfwjVttduAiEdtnJFvLePSrIPk+HMImtNv5270wOGCb1Tns2rybMkoQ=="],
 
     "body-scroll-lock-upgrade": ["body-scroll-lock-upgrade@1.1.0", "", {}, "sha512-nnfVAS+tB7CS9RaksuHVTpgHWHF7fE/ptIBJnwZrMqImIvWJF1OGcLnMpBhC6qhkx9oelvyxmWXwmIJXCV98Sw=="],
@@ -1397,6 +1410,8 @@
 
     "cbor-x": ["cbor-x@1.6.0", "", { "optionalDependencies": { "cbor-extract": "^2.2.0" } }, "sha512-0kareyRwHSkL6ws5VXHEf8uY1liitysCVJjlmhaLG+IXLqhSaOO+t63coaso7yjwEzWZzLy8fJo06gZDVQM9Qg=="],
 
+    "cborg": ["cborg@4.2.18", "", { "bin": { "cborg": "lib/bin.js" } }, "sha512-uzhkd5HOaLccokqeZa5B0Qz7/aa9C12pmUq5yU3vcy6I6OhTKdPHSzOuBPZfcoQHdcx8Emz/dWZbPNNfF/puvg=="],
+
     "ccount": ["ccount@2.0.1", "", {}, "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="],
 
     "chalk": ["chalk@5.4.1", "", {}, "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w=="],
@@ -1415,7 +1430,7 @@
 
     "chownr": ["chownr@2.0.0", "", {}, "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="],
 
-    "ci-info": ["ci-info@4.2.0", "", {}, "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg=="],
+    "ci-info": ["ci-info@4.3.1", "", {}, "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA=="],
 
     "cjs-module-lexer": ["cjs-module-lexer@1.4.3", "", {}, "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q=="],
 
@@ -1483,8 +1498,6 @@
 
     "create-require": ["create-require@1.1.1", "", {}, "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="],
 
-    "cross-fetch": ["cross-fetch@3.2.0", "", { "dependencies": { "node-fetch": "^2.7.0" } }, "sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q=="],
-
     "cross-spawn": ["cross-spawn@7.0.6", "", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="],
 
     "crossws": ["crossws@0.3.5", "", { "dependencies": { "uncrypto": "^0.1.3" } }, "sha512-ojKiDvcmByhwa8YYqbQI/hg7MEU0NC03+pSdEq4ZUnZR9xXpwk7E43SMNGkn+JxJGPFtNvQ48+vV2p+P1ml5PA=="],
@@ -1505,7 +1518,7 @@
 
     "dashdash": ["dashdash@1.14.1", "", { "dependencies": { "assert-plus": "^1.0.0" } }, "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="],
 
-    "datastore-core": ["datastore-core@10.0.4", "", { "dependencies": { "@libp2p/logger": "^5.1.18", "interface-datastore": "^8.0.0", "interface-store": "^6.0.0", "it-drain": "^3.0.9", "it-filter": "^3.1.3", "it-map": "^3.1.3", "it-merge": "^3.0.11", "it-pipe": "^3.0.1", "it-sort": "^3.0.8", "it-take": "^3.0.8" } }, "sha512-IctgCO0GA7GHG7aRm3JRruibCsfvN4EXNnNIlLCZMKIv0TPkdAL5UFV3/xTYFYrrZ1jRNrXZNZRvfcVf/R+rAw=="],
+    "datastore-core": ["datastore-core@11.0.2", "", { "dependencies": { "@libp2p/logger": "^6.0.0", "interface-datastore": "^9.0.0", "interface-store": "^7.0.0", "it-drain": "^3.0.9", "it-filter": "^3.1.3", "it-map": "^3.1.3", "it-merge": "^3.0.11", "it-pipe": "^3.0.1", "it-sort": "^3.0.8", "it-take": "^3.0.8" } }, "sha512-0pN4hMcaCWcnUBo5OL/8j14Lt1l/p1v2VvzryRYeJAKRLqnFrzy2FhAQ7y0yTA63ki760ImQHfm2XlZrfIdFpQ=="],
 
     "db0": ["db0@0.3.1", "", { "peerDependencies": { "@electric-sql/pglite": "*", "@libsql/client": "*", "better-sqlite3": "*", "drizzle-orm": "*", "mysql2": "*", "sqlite3": "*" }, "optionalPeers": ["@electric-sql/pglite", "@libsql/client", "better-sqlite3", "drizzle-orm", "mysql2", "sqlite3"] }, "sha512-3RogPLE2LLq6t4YiFCREyl572aBjkfMvfwPyN51df00TbPbryL3XqBYuJ/j6mgPssPK8AKfYdLxizaO5UG10sA=="],
 
@@ -1549,7 +1562,7 @@
 
     "deterministic-object-hash": ["deterministic-object-hash@2.0.2", "", { "dependencies": { "base-64": "^1.0.0" } }, "sha512-KxektNH63SrbfUyDiwXqRb1rLwKt33AmMv+5Nhsw1kqZ13SJBRTgZHtGbE+hH3a1mVW1cz+4pqSWVPAtLVXTzQ=="],
 
-    "devalue": ["devalue@5.1.1", "", {}, "sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw=="],
+    "devalue": ["devalue@5.4.1", "", {}, "sha512-YtoaOfsqjbZQKGIMRYDWKjUmSB4VJ/RElB+bXZawQAQYAo4xu08GKTMVlsZDTF6R2MbAgjcAQRPI5eIyRAT2OQ=="],
 
     "devlop": ["devlop@1.1.0", "", { "dependencies": { "dequal": "^2.0.0" } }, "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA=="],
 
@@ -1615,7 +1628,7 @@
 
     "es-errors": ["es-errors@1.3.0", "", {}, "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="],
 
-    "es-module-lexer": ["es-module-lexer@1.6.0", "", {}, "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ=="],
+    "es-module-lexer": ["es-module-lexer@1.7.0", "", {}, "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA=="],
 
     "es-object-atoms": ["es-object-atoms@1.1.1", "", { "dependencies": { "es-errors": "^1.3.0" } }, "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA=="],
 
@@ -1679,8 +1692,6 @@
 
     "eval": ["eval@0.1.8", "", { "dependencies": { "@types/node": "*", "require-like": ">= 0.1.1" } }, "sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw=="],
 
-    "event-iterator": ["event-iterator@2.0.0", "", {}, "sha512-KGft0ldl31BZVV//jj+IAIGCxkvvUkkON+ScH6zfoX+l+omX6001ggyRSpI0Io2Hlro0ThXotswCtfzS8UkIiQ=="],
-
     "event-target-shim": ["event-target-shim@5.0.1", "", {}, "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="],
 
     "eventemitter3": ["eventemitter3@5.0.1", "", {}, "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="],
@@ -1879,7 +1890,7 @@
 
     "htmlparser2": ["htmlparser2@8.0.2", "", { "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", "domutils": "^3.0.1", "entities": "^4.4.0" } }, "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA=="],
 
-    "http-cache-semantics": ["http-cache-semantics@4.1.1", "", {}, "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="],
+    "http-cache-semantics": ["http-cache-semantics@4.2.0", "", {}, "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ=="],
 
     "http-errors": ["http-errors@2.0.0", "", { "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", "setprototypeof": "1.2.0", "statuses": "2.0.1", "toidentifier": "1.0.1" } }, "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="],
 
@@ -1917,9 +1928,9 @@
 
     "ini": ["ini@2.0.0", "", {}, "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="],
 
-    "interface-datastore": ["interface-datastore@8.3.2", "", { "dependencies": { "interface-store": "^6.0.0", "uint8arrays": "^5.1.0" } }, "sha512-R3NLts7pRbJKc3qFdQf+u40hK8XWc0w4Qkx3OFEstC80VoaDUABY/dXA2EJPhtNC+bsrf41Ehvqb6+pnIclyRA=="],
+    "interface-datastore": ["interface-datastore@9.0.2", "", { "dependencies": { "interface-store": "^7.0.0", "uint8arrays": "^5.1.0" } }, "sha512-jebn+GV/5LTDDoyicNIB4D9O0QszpPqT09Z/MpEWvf3RekjVKpXJCDguM5Au2fwIFxFDAQMZe5bSla0jMamCNg=="],
 
-    "interface-store": ["interface-store@6.0.3", "", {}, "sha512-+WvfEZnFUhRwFxgz+QCQi7UC6o9AM0EHM9bpIe2Nhqb100NHCsTvNAn4eJgvgV2/tmLo1MP9nGxQKEcZTAueLA=="],
+    "interface-store": ["interface-store@7.0.1", "", {}, "sha512-OPRRUO3Cs6Jr/t98BrJLQp1jUTPgrRH0PqFfuNoPAqd+J7ABN1tjFVjQdaOBiybYJTS/AyBSZnZVWLPvp3dW3w=="],
 
     "invariant": ["invariant@2.2.4", "", { "dependencies": { "loose-envify": "^1.0.0" } }, "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="],
 
@@ -1983,8 +1994,6 @@
 
     "it-all": ["it-all@3.0.9", "", {}, "sha512-fz1oJJ36ciGnu2LntAlE6SA97bFZpW7Rnt0uEc1yazzR2nKokZLr8lIRtgnpex4NsmaBcvHF+Z9krljWFy/mmg=="],
 
-    "it-byte-stream": ["it-byte-stream@2.0.3", "", { "dependencies": { "abort-error": "^1.0.1", "it-queueless-pushable": "^2.0.0", "it-stream-types": "^2.0.2", "race-signal": "^1.1.3", "uint8arraylist": "^2.4.8" } }, "sha512-h7FFcn4DWiWsJw1dCJhuPdiY8cGi1z8g4aLAfFspTaJbwQxvEMlEBFG/f8lIVGwM8YK26ClM4/9lxLVhF33b8g=="],
-
     "it-drain": ["it-drain@3.0.10", "", {}, "sha512-0w/bXzudlyKIyD1+rl0xUKTI7k4cshcS43LTlBiGFxI8K1eyLydNPxGcsVLsFVtKh1/ieS8AnVWt6KwmozxyEA=="],
 
     "it-filter": ["it-filter@3.1.4", "", { "dependencies": { "it-peekable": "^3.0.0" } }, "sha512-80kWEKgiFEa4fEYD3mwf2uygo1dTQ5Y5midKtL89iXyjinruA/sNXl6iFkTcdNedydjvIsFhWLiqRPQP4fAwWQ=="],
@@ -1993,22 +2002,16 @@
 
     "it-length-prefixed": ["it-length-prefixed@10.0.1", "", { "dependencies": { "it-reader": "^6.0.1", "it-stream-types": "^2.0.1", "uint8-varint": "^2.0.1", "uint8arraylist": "^2.0.0", "uint8arrays": "^5.0.1" } }, "sha512-BhyluvGps26u9a7eQIpOI1YN7mFgi8lFwmiPi07whewbBARKAG9LE09Odc8s1Wtbt2MB6rNUrl7j9vvfXTJwdQ=="],
 
-    "it-length-prefixed-stream": ["it-length-prefixed-stream@2.0.3", "", { "dependencies": { "abort-error": "^1.0.1", "it-byte-stream": "^2.0.0", "it-stream-types": "^2.0.2", "uint8-varint": "^2.0.4", "uint8arraylist": "^2.4.8" } }, "sha512-Ns3jNFy2mcFnV59llCYitJnFHapg8wIcOsWkEaAwOkG9v4HBCk24nze/zGDQjiJdDTyFXTT5GOY3M/uaksot3w=="],
-
     "it-map": ["it-map@3.1.4", "", { "dependencies": { "it-peekable": "^3.0.0" } }, "sha512-QB9PYQdE9fUfpVFYfSxBIyvKynUCgblb143c+ktTK6ZuKSKkp7iH58uYFzagqcJ5HcqIfn1xbfaralHWam+3fg=="],
 
     "it-merge": ["it-merge@3.0.12", "", { "dependencies": { "it-queueless-pushable": "^2.0.0" } }, "sha512-nnnFSUxKlkZVZD7c0jYw6rDxCcAQYcMsFj27thf7KkDhpj0EA0g9KHPxbFzHuDoc6US2EPS/MtplkNj8sbCx4Q=="],
 
-    "it-pair": ["it-pair@2.0.6", "", { "dependencies": { "it-stream-types": "^2.0.1", "p-defer": "^4.0.0" } }, "sha512-5M0t5RAcYEQYNG5BV7d7cqbdwbCAp5yLdzvkxsZmkuZsLbTdZzah6MQySYfaAQjNDCq6PUnDt0hqBZ4NwMfW6g=="],
-
     "it-parallel": ["it-parallel@3.0.13", "", { "dependencies": { "p-defer": "^4.0.1" } }, "sha512-85PPJ/O8q97Vj9wmDTSBBXEkattwfQGruXitIzrh0RLPso6RHfiVqkuTqBNufYYtB1x6PSkh0cwvjmMIkFEPHA=="],
 
     "it-peekable": ["it-peekable@3.0.8", "", {}, "sha512-7IDBQKSp/dtBxXV3Fj0v3qM1jftJ9y9XrWLRIuU1X6RdKqWiN60syNwP0fiDxZD97b8SYM58dD3uklIk1TTQAw=="],
 
     "it-pipe": ["it-pipe@3.0.1", "", { "dependencies": { "it-merge": "^3.0.0", "it-pushable": "^3.1.2", "it-stream-types": "^2.0.1" } }, "sha512-sIoNrQl1qSRg2seYSBH/3QxWhJFn9PKYvOf/bHdtCBF0bnghey44VyASsWzn5dAx0DCDDABq1hZIuzKmtBZmKA=="],
 
-    "it-protobuf-stream": ["it-protobuf-stream@2.0.3", "", { "dependencies": { "abort-error": "^1.0.1", "it-length-prefixed-stream": "^2.0.0", "it-stream-types": "^2.0.2", "uint8arraylist": "^2.4.8" } }, "sha512-Dus9qyylOSnC7l75/3qs6j3Fe9MCM2K5luXi9o175DYijFRne5FPucdOGIYdwaDBDQ4Oy34dNCuFobOpcusvEQ=="],
-
     "it-pushable": ["it-pushable@3.2.3", "", { "dependencies": { "p-defer": "^4.0.0" } }, "sha512-gzYnXYK8Y5t5b/BnJUr7glfQLO4U5vyb05gPx/TyTw+4Bv1zM9gFk4YsOrnulWefMewlphCjKkakFvj1y99Tcg=="],
 
     "it-queue": ["it-queue@1.1.0", "", { "dependencies": { "abort-error": "^1.0.1", "it-pushable": "^3.2.3", "main-event": "^1.0.0", "race-event": "^1.3.0", "race-signal": "^1.1.3" } }, "sha512-aK9unJRIaJc9qiv53LByhF7/I2AuD7Ro4oLfLieVLL9QXNvRx++ANMpv8yCp2UO0KAtBuf70GOxSYb6ElFVRpQ=="],
@@ -2023,8 +2026,6 @@
 
     "it-take": ["it-take@3.0.9", "", {}, "sha512-XMeUbnjOcgrhFXPUqa7H0VIjYSV/BvyxxjCp76QHVAFDJw2LmR1SHxUFiqyGeobgzJr7P2ZwSRRJQGn4D2BVlA=="],
 
-    "it-ws": ["it-ws@6.1.5", "", { "dependencies": { "@types/ws": "^8.2.2", "event-iterator": "^2.0.0", "it-stream-types": "^2.0.1", "uint8arrays": "^5.0.0", "ws": "^8.4.0" } }, "sha512-uWjMtpy5HqhSd/LlrlP3fhYrr7rUfJFFMABv0F5d6n13Q+0glhZthwUKpEAVhDrXY95Tb1RB5lLqqef+QbVNaw=="],
-
     "jackspeak": ["jackspeak@3.4.3", "", { "dependencies": { "@isaacs/cliui": "^8.0.2" }, "optionalDependencies": { "@pkgjs/parseargs": "^0.11.0" } }, "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="],
 
     "javascript-stringify": ["javascript-stringify@2.1.0", "", {}, "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg=="],
@@ -2081,13 +2082,13 @@
 
     "keyv": ["keyv@4.5.4", "", { "dependencies": { "json-buffer": "3.0.1" } }, "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw=="],
 
-    "kleur": ["kleur@4.1.5", "", {}, "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ=="],
+    "kleur": ["kleur@3.0.3", "", {}, "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="],
 
     "kvparser": ["kvparser@1.0.2", "", {}, "sha512-5P/5qpTAHjVYWqcI55B3yQwSY2FUrYYrJj5i65V1Wmg7/4W4OnBcaodaEvLyVuugeOnS+BAaKm9LbPazGJcRyA=="],
 
     "leven": ["leven@2.1.0", "", {}, "sha512-nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA=="],
 
-    "libp2p": ["libp2p@2.8.12", "", { "dependencies": { "@chainsafe/is-ip": "^2.1.0", "@chainsafe/netmask": "^2.0.0", "@libp2p/crypto": "^5.1.7", "@libp2p/interface": "^2.10.5", "@libp2p/interface-internal": "^2.3.18", "@libp2p/logger": "^5.1.21", "@libp2p/multistream-select": "^6.0.28", "@libp2p/peer-collections": "^6.0.34", "@libp2p/peer-id": "^5.1.8", "@libp2p/peer-store": "^11.2.6", "@libp2p/utils": "^6.7.1", "@multiformats/dns": "^1.0.6", "@multiformats/multiaddr": "^12.4.4", "@multiformats/multiaddr-matcher": "^1.7.2", "any-signal": "^4.1.1", "datastore-core": "^10.0.2", "interface-datastore": "^8.3.1", "it-byte-stream": "^2.0.2", "it-merge": "^3.0.11", "it-parallel": "^3.0.11", "main-event": "^1.0.1", "multiformats": "^13.3.6", "p-defer": "^4.0.1", "p-retry": "^6.2.1", "progress-events": "^1.0.1", "race-event": "^1.3.0", "race-signal": "^1.1.3", "uint8arrays": "^5.1.0" } }, "sha512-wWknf2YsfHwnNK0XyFxCkVVNrckCrY+lwCdp4bpHScb5ALcWmzpgWP8+h/b66sEJ3IUJjhgjMkN1W9sS53KTPQ=="],
+    "libp2p": ["libp2p@3.0.6", "", { "dependencies": { "@chainsafe/is-ip": "^2.1.0", "@chainsafe/netmask": "^2.0.0", "@libp2p/crypto": "^5.1.12", "@libp2p/interface": "^3.0.2", "@libp2p/interface-internal": "^3.0.5", "@libp2p/logger": "^6.0.5", "@libp2p/multistream-select": "^7.0.5", "@libp2p/peer-collections": "^7.0.5", "@libp2p/peer-id": "^6.0.3", "@libp2p/peer-store": "^12.0.5", "@libp2p/utils": "^7.0.5", "@multiformats/dns": "^1.0.6", "@multiformats/multiaddr": "^13.0.1", "@multiformats/multiaddr-matcher": "^3.0.1", "any-signal": "^4.1.1", "datastore-core": "^11.0.1", "interface-datastore": "^9.0.1", "it-merge": "^3.0.12", "it-parallel": "^3.0.13", "main-event": "^1.0.1", "multiformats": "^13.4.0", "p-defer": "^4.0.1", "p-event": "^7.0.0", "p-retry": "^7.0.0", "progress-events": "^1.0.1", "race-signal": "^2.0.0", "uint8arrays": "^5.1.0" } }, "sha512-QtEbPVTjsHNy0B503ZXRwhoMawEdy+HOHaywJHTB3yHduzgJq+dN7gJFChnyFE8t45UhGZK50bO/+Q0q+5xXhw=="],
 
     "light-my-request": ["light-my-request@6.6.0", "", { "dependencies": { "cookie": "^1.0.1", "process-warning": "^4.0.0", "set-cookie-parser": "^2.6.0" } }, "sha512-CHYbu8RtboSIoVsHZ6Ye4cj4Aw/yg2oAFimlF7mNvfDV192LR7nDiKtSIfCuLT7KokPSTn/9kfVLm5OGN0A28A=="],
 
@@ -2309,7 +2310,7 @@
 
     "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
 
-    "multiformats": ["multiformats@13.3.7", "", {}, "sha512-meL9DERHj+fFVWoOX9fXqfcYcSpUfSYJPcFvDPKrxitICbwAoWR+Ut4j5NO9zAT917HUHLQmqzQbAsGNHlDcxQ=="],
+    "multiformats": ["multiformats@13.4.1", "", {}, "sha512-VqO6OSvLrFVAYYjgsr8tyv62/rCQhPgsZUXLTqoFLSgdkgiUYKYeArbt1uWLlEpkjxQe+P0+sHlbPEte1Bi06Q=="],
 
     "nanoid": ["nanoid@5.1.3", "", { "bin": { "nanoid": "bin/nanoid.js" } }, "sha512-zAbEOEr7u2CbxwoMRlz/pNSpRP0FdAU4pRaYunCdEezWohXFs+a0Xw7RfkKaezMsmSM1vttcLthJtwRnVtOfHQ=="],
 
@@ -2411,7 +2412,7 @@
 
     "p-defer": ["p-defer@4.0.1", "", {}, "sha512-Mr5KC5efvAK5VUptYEIopP1bakB85k2IWXaRC0rsh1uwn1L6M0LVml8OIQ4Gudg4oyZakf7FmeRLkMMtZW1i5A=="],
 
-    "p-event": ["p-event@6.0.1", "", { "dependencies": { "p-timeout": "^6.1.2" } }, "sha512-Q6Bekk5wpzW5qIyUP4gdMEujObYstZl6DMMOSenwBvV0BlE5LkDwkjs5yHbZmdCEq2o4RJx4tE1vwxFVf2FG1w=="],
+    "p-event": ["p-event@7.0.0", "", { "dependencies": { "p-timeout": "^6.1.4" } }, "sha512-z4Xv/ieHhi6Dx3A5xbZI8WWTn+eSRo6buGTvA8Yv2iLyX+61SUIMKcBszZRHA6e2Apld6QEDSclAuha2iUntyA=="],
 
     "p-limit": ["p-limit@6.2.0", "", { "dependencies": { "yocto-queue": "^1.1.1" } }, "sha512-kuUqqHNUqoIWp/c467RI4X6mmyuojY5jGutNU0wVTmEOOfcuwLqyMVoAi9MKi2Ak+5i9+nhmrK4ufZE8069kHA=="],
 
@@ -2429,7 +2430,7 @@
 
     "package-json-from-dist": ["package-json-from-dist@1.0.1", "", {}, "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="],
 
-    "package-manager-detector": ["package-manager-detector@1.1.0", "", {}, "sha512-Y8f9qUlBzW8qauJjd/eu6jlpJZsuPJm2ZAV0cDVd420o4EdpH5RPdoCv+60/TdJflGatr4sDfpAL6ArWZbM5tA=="],
+    "package-manager-detector": ["package-manager-detector@1.4.1", "", {}, "sha512-dSMiVLBEA4XaNJ0PRb4N5cV/SEP4BWrWZKBmfF+OUm2pQTiZ6DDkKeWaltwu3JRhLoy59ayIkJ00cx9K9CaYTg=="],
 
     "pacote": ["pacote@18.0.6", "", { "dependencies": { "@npmcli/git": "^5.0.0", "@npmcli/installed-package-contents": "^2.0.1", "@npmcli/package-json": "^5.1.0", "@npmcli/promise-spawn": "^7.0.0", "@npmcli/run-script": "^8.0.0", "cacache": "^18.0.0", "fs-minipass": "^3.0.0", "minipass": "^7.0.2", "npm-package-arg": "^11.0.0", "npm-packlist": "^8.0.0", "npm-pick-manifest": "^9.0.0", "npm-registry-fetch": "^17.0.0", "proc-log": "^4.0.0", "promise-retry": "^2.0.1", "sigstore": "^2.2.0", "ssri": "^10.0.0", "tar": "^6.1.11" }, "bin": { "pacote": "bin/index.js" } }, "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A=="],
 
@@ -2733,7 +2734,7 @@
 
     "shell-quote": ["shell-quote@1.8.2", "", {}, "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA=="],
 
-    "shiki": ["shiki@3.12.2", "", { "dependencies": { "@shikijs/core": "3.12.2", "@shikijs/engine-javascript": "3.12.2", "@shikijs/engine-oniguruma": "3.12.2", "@shikijs/langs": "3.12.2", "@shikijs/themes": "3.12.2", "@shikijs/types": "3.12.2", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-uIrKI+f9IPz1zDT+GMz+0RjzKJiijVr6WDWm9Pe3NNY6QigKCfifCEv9v9R2mDASKKjzjQ2QpFLcxaR3iHSnMA=="],
+    "shiki": ["shiki@3.13.0", "", { "dependencies": { "@shikijs/core": "3.13.0", "@shikijs/engine-javascript": "3.13.0", "@shikijs/engine-oniguruma": "3.13.0", "@shikijs/langs": "3.13.0", "@shikijs/themes": "3.13.0", "@shikijs/types": "3.13.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-aZW4l8Og16CokuCLf8CF8kq+KK2yOygapU5m3+hoGw0Mdosc6fPitjM+ujYarppj5ZIKGyPDPP1vqmQhr+5/0g=="],
 
     "shimmer": ["shimmer@1.2.1", "", {}, "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="],
 
@@ -2847,7 +2848,7 @@
 
     "strnum": ["strnum@1.1.2", "", {}, "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA=="],
 
-    "supports-color": ["supports-color@9.4.0", "", {}, "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw=="],
+    "supports-color": ["supports-color@10.2.2", "", {}, "sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g=="],
 
     "supports-preserve-symlinks-flag": ["supports-preserve-symlinks-flag@1.0.0", "", {}, "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="],
 
@@ -2869,7 +2870,7 @@
 
     "tiny-typed-emitter": ["tiny-typed-emitter@2.1.0", "", {}, "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA=="],
 
-    "tinyexec": ["tinyexec@0.3.2", "", {}, "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA=="],
+    "tinyexec": ["tinyexec@1.0.1", "", {}, "sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw=="],
 
     "tinyglobby": ["tinyglobby@0.2.14", "", { "dependencies": { "fdir": "^6.4.4", "picomatch": "^4.0.2" } }, "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ=="],
 
@@ -2891,7 +2892,7 @@
 
     "ts-node": ["ts-node@10.9.2", "", { "dependencies": { "@cspotcode/source-map-support": "^0.8.0", "@tsconfig/node10": "^1.0.7", "@tsconfig/node12": "^1.0.7", "@tsconfig/node14": "^1.0.0", "@tsconfig/node16": "^1.0.2", "acorn": "^8.4.1", "acorn-walk": "^8.1.1", "arg": "^4.1.0", "create-require": "^1.1.0", "diff": "^4.0.1", "make-error": "^1.1.1", "v8-compile-cache-lib": "^3.0.1", "yn": "3.1.1" }, "peerDependencies": { "@swc/core": ">=1.2.50", "@swc/wasm": ">=1.2.50", "@types/node": "*", "typescript": ">=2.7" }, "optionalPeers": ["@swc/core", "@swc/wasm"], "bin": { "ts-node": "dist/bin.js", "ts-script": "dist/bin-script-deprecated.js", "ts-node-cwd": "dist/bin-cwd.js", "ts-node-esm": "dist/bin-esm.js", "ts-node-script": "dist/bin-script.js", "ts-node-transpile-only": "dist/bin-transpile.js" } }, "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ=="],
 
-    "tsconfck": ["tsconfck@3.1.5", "", { "peerDependencies": { "typescript": "^5.0.0" }, "optionalPeers": ["typescript"], "bin": { "tsconfck": "bin/tsconfck.js" } }, "sha512-CLDfGgUp7XPswWnezWwsCRxNmgQjhYq3VXHM0/XIRxhVrKw0M1if9agzryh1QS3nxjCROvV+xWxoJO1YctzzWg=="],
+    "tsconfck": ["tsconfck@3.1.6", "", { "peerDependencies": { "typescript": "^5.0.0" }, "optionalPeers": ["typescript"], "bin": { "tsconfck": "bin/tsconfck.js" } }, "sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w=="],
 
     "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
@@ -2941,7 +2942,7 @@
 
     "unified": ["unified@11.0.5", "", { "dependencies": { "@types/unist": "^3.0.0", "bail": "^2.0.0", "devlop": "^1.0.0", "extend": "^3.0.0", "is-plain-obj": "^4.0.0", "trough": "^2.0.0", "vfile": "^6.0.0" } }, "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA=="],
 
-    "unifont": ["unifont@0.5.2", "", { "dependencies": { "css-tree": "^3.0.0", "ofetch": "^1.4.1", "ohash": "^2.0.0" } }, "sha512-LzR4WUqzH9ILFvjLAUU7dK3Lnou/qd5kD+IakBtBK4S15/+x2y9VX+DcWQv6s551R6W+vzwgVS6tFg3XggGBgg=="],
+    "unifont": ["unifont@0.6.0", "", { "dependencies": { "css-tree": "^3.0.0", "ofetch": "^1.4.1", "ohash": "^2.0.0" } }, "sha512-5Fx50fFQMQL5aeHyWnZX9122sSLckcDvcfFiBf3QYeHa7a1MKJooUy52b67moi2MJYkrfo/TWY+CoLdr/w0tTA=="],
 
     "unique-filename": ["unique-filename@3.0.0", "", { "dependencies": { "unique-slug": "^4.0.0" } }, "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g=="],
 
@@ -3017,7 +3018,7 @@
 
     "walk-up-path": ["walk-up-path@3.0.1", "", {}, "sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA=="],
 
-    "weald": ["weald@1.0.4", "", { "dependencies": { "ms": "^3.0.0-canary.1", "supports-color": "^9.4.0" } }, "sha512-+kYTuHonJBwmFhP1Z4YQK/dGi3jAnJGCYhyODFpHK73rbxnp9lnZQj7a2m+WVgn8fXr5bJaxUpF6l8qZpPeNWQ=="],
+    "weald": ["weald@1.0.6", "", { "dependencies": { "ms": "^3.0.0-canary.1", "supports-color": "^10.0.0" } }, "sha512-sX1PzkcMJZUJ848JbFzB6aKHHglTxqACEnq2KgI75b7vWYvfXFBNbOuDKqFKwCT44CrP6c5r+L4+5GmPnb5/SQ=="],
 
     "web-namespaces": ["web-namespaces@2.0.1", "", {}, "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ=="],
 
@@ -3105,6 +3106,8 @@
 
     "@astrojs/markdown-remark/js-yaml": ["js-yaml@4.1.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="],
 
+    "@astrojs/telemetry/ci-info": ["ci-info@4.2.0", "", {}, "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg=="],
+
     "@aws-crypto/crc32/@aws-sdk/types": ["@aws-sdk/types@3.804.0", "", { "dependencies": { "@smithy/types": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-A9qnsy9zQ8G89vrPPlNG9d1d8QcKRGqJKqwyGgS0dclJpwy6d1EWgQLIolKPl6vcFpLoe6avLOLxr+h8ur5wpg=="],
 
     "@aws-crypto/crc32c/@aws-sdk/types": ["@aws-sdk/types@3.804.0", "", { "dependencies": { "@smithy/types": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-A9qnsy9zQ8G89vrPPlNG9d1d8QcKRGqJKqwyGgS0dclJpwy6d1EWgQLIolKPl6vcFpLoe6avLOLxr+h8ur5wpg=="],
@@ -3465,10 +3468,20 @@
 
     "@bufbuild/protoplugin/typescript": ["typescript@5.4.5", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ=="],
 
+    "@chainsafe/libp2p-quic/@libp2p/interface": ["@libp2p/interface@2.11.0", "", { "dependencies": { "@multiformats/dns": "^1.0.6", "@multiformats/multiaddr": "^12.4.4", "it-pushable": "^3.2.3", "it-stream-types": "^2.0.2", "main-event": "^1.0.1", "multiformats": "^13.3.6", "progress-events": "^1.0.1", "uint8arraylist": "^2.4.8" } }, "sha512-0MUFKoXWHTQW3oWIgSHApmYMUKWO/Y02+7Hpyp+n3z+geD4Xo2Rku2gYWmxcq+Pyjkz6Q9YjDWz3Yb2SoV2E8Q=="],
+
+    "@chainsafe/libp2p-quic/@libp2p/utils": ["@libp2p/utils@6.7.2", "", { "dependencies": { "@chainsafe/is-ip": "^2.1.0", "@chainsafe/netmask": "^2.0.0", "@libp2p/crypto": "^5.1.8", "@libp2p/interface": "^2.11.0", "@libp2p/logger": "^5.2.0", "@multiformats/multiaddr": "^12.4.4", "@sindresorhus/fnv1a": "^3.1.0", "any-signal": "^4.1.1", "delay": "^6.0.0", "get-iterator": "^2.0.1", "is-loopback-addr": "^2.0.2", "is-plain-obj": "^4.1.0", "it-foreach": "^2.1.3", "it-pipe": "^3.0.1", "it-pushable": "^3.2.3", "it-stream-types": "^2.0.2", "main-event": "^1.0.1", "netmask": "^2.0.2", "p-defer": "^4.0.1", "race-event": "^1.3.0", "race-signal": "^1.1.3", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-yglVPcYErb4al3MMTdedVLLsdUvr5KaqrrxohxTl/FXMFBvBs0o3w8lo29nfnTUpnNSHFhWZ9at0ZGNnpT/C/w=="],
+
+    "@chainsafe/libp2p-quic/@multiformats/multiaddr": ["@multiformats/multiaddr@12.5.1", "", { "dependencies": { "@chainsafe/is-ip": "^2.0.1", "@chainsafe/netmask": "^2.0.0", "@multiformats/dns": "^1.0.3", "abort-error": "^1.0.1", "multiformats": "^13.0.0", "uint8-varint": "^2.0.1", "uint8arrays": "^5.0.0" } }, "sha512-+DDlr9LIRUS8KncI1TX/FfUn8F2dl6BIxJgshS/yFQCNB5IAF0OGzcwB39g5NLE22s4qqDePv0Qof6HdpJ/4aQ=="],
+
+    "@chainsafe/libp2p-yamux/race-signal": ["race-signal@2.0.0", "", {}, "sha512-P31bLhE4ByBX/70QDXMutxnqgwrF1WUXea1O8DXuviAgkdbQ1iQMQotNgzJIBC9yUSn08u/acZrMUhgw7w6GpA=="],
+
     "@dotenvx/dotenvx/commander": ["commander@11.1.0", "", {}, "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ=="],
 
     "@dotenvx/dotenvx/picomatch": ["picomatch@4.0.2", "", {}, "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="],
 
+    "@ecies/ciphers/@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
     "@esbuild-kit/core-utils/esbuild": ["esbuild@0.18.20", "", { "optionalDependencies": { "@esbuild/android-arm": "0.18.20", "@esbuild/android-arm64": "0.18.20", "@esbuild/android-x64": "0.18.20", "@esbuild/darwin-arm64": "0.18.20", "@esbuild/darwin-x64": "0.18.20", "@esbuild/freebsd-arm64": "0.18.20", "@esbuild/freebsd-x64": "0.18.20", "@esbuild/linux-arm": "0.18.20", "@esbuild/linux-arm64": "0.18.20", "@esbuild/linux-ia32": "0.18.20", "@esbuild/linux-loong64": "0.18.20", "@esbuild/linux-mips64el": "0.18.20", "@esbuild/linux-ppc64": "0.18.20", "@esbuild/linux-riscv64": "0.18.20", "@esbuild/linux-s390x": "0.18.20", "@esbuild/linux-x64": "0.18.20", "@esbuild/netbsd-x64": "0.18.20", "@esbuild/openbsd-x64": "0.18.20", "@esbuild/sunos-x64": "0.18.20", "@esbuild/win32-arm64": "0.18.20", "@esbuild/win32-ia32": "0.18.20", "@esbuild/win32-x64": "0.18.20" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="],
 
     "@fastify/ajv-compiler/ajv": ["ajv@8.17.1", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="],
@@ -3505,9 +3518,31 @@
 
     "@jridgewell/trace-mapping/@jridgewell/sourcemap-codec": ["@jridgewell/sourcemap-codec@1.5.0", "", {}, "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="],
 
-    "@libp2p/crypto/@noble/curves": ["@noble/curves@1.9.2", "", { "dependencies": { "@noble/hashes": "1.8.0" } }, "sha512-HxngEd2XUcg9xi20JkwlLCtYwfoFw4JGkuZpT+WlsPD4gB/cxkvTD8fSsoAnphGZhFdZYKeQIPCuFlWPm1uE0g=="],
+    "@libp2p/crypto/@libp2p/interface": ["@libp2p/interface@3.0.0", "", { "dependencies": { "@multiformats/dns": "^1.0.6", "@multiformats/multiaddr": "^13.0.1", "main-event": "^1.0.1", "multiformats": "^13.4.0", "progress-events": "^1.0.1", "uint8arraylist": "^2.4.8" } }, "sha512-fiHoXGUDiaZeksSm+Chf4/tuUynQuDWtadrbqDFxq0nJ5Q7aHPgsmJba7xSfELcqfQCTp00a31FQvXWSk7Oigg=="],
 
-    "@libp2p/websockets/@types/ws": ["@types/ws@8.18.1", "", { "dependencies": { "@types/node": "*" } }, "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg=="],
+    "@libp2p/identify/@libp2p/crypto": ["@libp2p/crypto@5.1.12", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@noble/curves": "^2.0.1", "@noble/hashes": "^2.0.1", "multiformats": "^13.4.0", "protons-runtime": "^5.6.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-1yJS0BZj+HF4M3Uv/92y3oIbMcCar218accFBcX+nKVhBlwDbx6fkUURhs5GilIhMgDtir+qQ8Un1hwF4CgGzw=="],
+
+    "@libp2p/identify/@multiformats/multiaddr-matcher": ["@multiformats/multiaddr-matcher@3.0.1", "", { "dependencies": { "@multiformats/multiaddr": "^13.0.0" } }, "sha512-jvjwzCPysVTQ53F4KqwmcqZw73BqHMk0UUZrMP9P4OtJ/YHrfs122ikTqhVA2upe0P/Qz9l8HVlhEifVYB2q9A=="],
+
+    "@libp2p/peer-id/@libp2p/crypto": ["@libp2p/crypto@5.1.12", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@noble/curves": "^2.0.1", "@noble/hashes": "^2.0.1", "multiformats": "^13.4.0", "protons-runtime": "^5.6.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-1yJS0BZj+HF4M3Uv/92y3oIbMcCar218accFBcX+nKVhBlwDbx6fkUURhs5GilIhMgDtir+qQ8Un1hwF4CgGzw=="],
+
+    "@libp2p/peer-record/@libp2p/crypto": ["@libp2p/crypto@5.1.12", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@noble/curves": "^2.0.1", "@noble/hashes": "^2.0.1", "multiformats": "^13.4.0", "protons-runtime": "^5.6.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-1yJS0BZj+HF4M3Uv/92y3oIbMcCar218accFBcX+nKVhBlwDbx6fkUURhs5GilIhMgDtir+qQ8Un1hwF4CgGzw=="],
+
+    "@libp2p/peer-store/@libp2p/crypto": ["@libp2p/crypto@5.1.12", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@noble/curves": "^2.0.1", "@noble/hashes": "^2.0.1", "multiformats": "^13.4.0", "protons-runtime": "^5.6.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-1yJS0BZj+HF4M3Uv/92y3oIbMcCar218accFBcX+nKVhBlwDbx6fkUURhs5GilIhMgDtir+qQ8Un1hwF4CgGzw=="],
+
+    "@libp2p/ping/@libp2p/crypto": ["@libp2p/crypto@5.1.12", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@noble/curves": "^2.0.1", "@noble/hashes": "^2.0.1", "multiformats": "^13.4.0", "protons-runtime": "^5.6.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-1yJS0BZj+HF4M3Uv/92y3oIbMcCar218accFBcX+nKVhBlwDbx6fkUURhs5GilIhMgDtir+qQ8Un1hwF4CgGzw=="],
+
+    "@libp2p/ping/race-signal": ["race-signal@2.0.0", "", {}, "sha512-P31bLhE4ByBX/70QDXMutxnqgwrF1WUXea1O8DXuviAgkdbQ1iQMQotNgzJIBC9yUSn08u/acZrMUhgw7w6GpA=="],
+
+    "@libp2p/utils/@libp2p/crypto": ["@libp2p/crypto@5.1.12", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@noble/curves": "^2.0.1", "@noble/hashes": "^2.0.1", "multiformats": "^13.4.0", "protons-runtime": "^5.6.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-1yJS0BZj+HF4M3Uv/92y3oIbMcCar218accFBcX+nKVhBlwDbx6fkUURhs5GilIhMgDtir+qQ8Un1hwF4CgGzw=="],
+
+    "@libp2p/utils/race-signal": ["race-signal@2.0.0", "", {}, "sha512-P31bLhE4ByBX/70QDXMutxnqgwrF1WUXea1O8DXuviAgkdbQ1iQMQotNgzJIBC9yUSn08u/acZrMUhgw7w6GpA=="],
+
+    "@libp2p/websockets/@multiformats/multiaddr-matcher": ["@multiformats/multiaddr-matcher@3.0.1", "", { "dependencies": { "@multiformats/multiaddr": "^13.0.0" } }, "sha512-jvjwzCPysVTQ53F4KqwmcqZw73BqHMk0UUZrMP9P4OtJ/YHrfs122ikTqhVA2upe0P/Qz9l8HVlhEifVYB2q9A=="],
+
+    "@libp2p/webtransport/@multiformats/multiaddr-matcher": ["@multiformats/multiaddr-matcher@3.0.1", "", { "dependencies": { "@multiformats/multiaddr": "^13.0.0" } }, "sha512-jvjwzCPysVTQ53F4KqwmcqZw73BqHMk0UUZrMP9P4OtJ/YHrfs122ikTqhVA2upe0P/Qz9l8HVlhEifVYB2q9A=="],
+
+    "@libp2p/webtransport/race-signal": ["race-signal@2.0.0", "", {}, "sha512-P31bLhE4ByBX/70QDXMutxnqgwrF1WUXea1O8DXuviAgkdbQ1iQMQotNgzJIBC9yUSn08u/acZrMUhgw7w6GpA=="],
 
     "@macaron-css/babel/@emotion/hash": ["@emotion/hash@0.8.0", "", {}, "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="],
 
@@ -3525,6 +3560,10 @@
 
     "@multiformats/dns/buffer": ["buffer@6.0.3", "", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" } }, "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="],
 
+    "@multiformats/multiaddr/multiformats": ["multiformats@13.3.7", "", {}, "sha512-meL9DERHj+fFVWoOX9fXqfcYcSpUfSYJPcFvDPKrxitICbwAoWR+Ut4j5NO9zAT917HUHLQmqzQbAsGNHlDcxQ=="],
+
+    "@multiformats/multiaddr-matcher/@multiformats/multiaddr": ["@multiformats/multiaddr@12.5.1", "", { "dependencies": { "@chainsafe/is-ip": "^2.0.1", "@chainsafe/netmask": "^2.0.0", "@multiformats/dns": "^1.0.3", "abort-error": "^1.0.1", "multiformats": "^13.0.0", "uint8-varint": "^2.0.1", "uint8arrays": "^5.0.0" } }, "sha512-+DDlr9LIRUS8KncI1TX/FfUn8F2dl6BIxJgshS/yFQCNB5IAF0OGzcwB39g5NLE22s4qqDePv0Qof6HdpJ/4aQ=="],
+
     "@neondatabase/serverless/@types/node": ["@types/node@22.18.6", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-r8uszLPpeIWbNKtvWRt/DbVi5zbqZyj1PTmhRMqBMvDnaz1QpmSKujUtJLrqGZeoM8v72MfYggDceY4K1itzWQ=="],
 
     "@nestri/functions/@cloudflare/workers-types": ["@cloudflare/workers-types@4.20250522.0", "", {}, "sha512-9RIffHobc35JWeddzBguGgPa4wLDr5x5F94+0/qy7LiV6pTBQ/M5qGEN9VA16IDT3EUpYI0WKh6VpcmeVEtVtw=="],
@@ -3847,11 +3886,9 @@
 
     "@rocicorp/zero/ws": ["ws@8.18.1", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w=="],
 
-    "@rollup/pluginutils/@types/estree": ["@types/estree@1.0.6", "", {}, "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="],
-
     "@rollup/pluginutils/estree-walker": ["estree-walker@2.0.2", "", {}, "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="],
 
-    "@rollup/pluginutils/picomatch": ["picomatch@4.0.2", "", {}, "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="],
+    "@rollup/pluginutils/picomatch": ["picomatch@4.0.3", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="],
 
     "@smithy/eventstream-codec/@smithy/types": ["@smithy/types@4.3.1", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA=="],
 
@@ -3869,7 +3906,7 @@
 
     "@smithy/util-waiter/@smithy/types": ["@smithy/types@4.3.1", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA=="],
 
-    "@types/bun/bun-types": ["bun-types@1.2.22", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-hwaAu8tct/Zn6Zft4U9BsZcXkYomzpHJX28ofvx7k0Zz2HNz54n1n+tDgxoWFGB4PcFvJXJQloPhaV2eP3Q6EA=="],
+    "@types/bun/bun-types": ["bun-types@1.3.3", "", { "dependencies": { "@types/node": "*" } }, "sha512-z3Xwlg7j2l9JY27x5Qn3Wlyos8YAp0kKRlrePAOjgjMGS5IG6E7Jnlx736vH9UVI4wUICwwhC9anYL++XeOgTQ=="],
 
     "@types/pg/@types/node": ["@types/node@22.18.6", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-r8uszLPpeIWbNKtvWRt/DbVi5zbqZyj1PTmhRMqBMvDnaz1QpmSKujUtJLrqGZeoM8v72MfYggDceY4K1itzWQ=="],
 
@@ -3893,6 +3930,8 @@
 
     "anymatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
 
+    "astro/debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="],
+
     "astro/esbuild": ["esbuild@0.25.1", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.1", "@esbuild/android-arm": "0.25.1", "@esbuild/android-arm64": "0.25.1", "@esbuild/android-x64": "0.25.1", "@esbuild/darwin-arm64": "0.25.1", "@esbuild/darwin-x64": "0.25.1", "@esbuild/freebsd-arm64": "0.25.1", "@esbuild/freebsd-x64": "0.25.1", "@esbuild/linux-arm": "0.25.1", "@esbuild/linux-arm64": "0.25.1", "@esbuild/linux-ia32": "0.25.1", "@esbuild/linux-loong64": "0.25.1", "@esbuild/linux-mips64el": "0.25.1", "@esbuild/linux-ppc64": "0.25.1", "@esbuild/linux-riscv64": "0.25.1", "@esbuild/linux-s390x": "0.25.1", "@esbuild/linux-x64": "0.25.1", "@esbuild/netbsd-arm64": "0.25.1", "@esbuild/netbsd-x64": "0.25.1", "@esbuild/openbsd-arm64": "0.25.1", "@esbuild/openbsd-x64": "0.25.1", "@esbuild/sunos-x64": "0.25.1", "@esbuild/win32-arm64": "0.25.1", "@esbuild/win32-ia32": "0.25.1", "@esbuild/win32-x64": "0.25.1" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ=="],
 
     "astro/js-yaml": ["js-yaml@4.1.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="],
@@ -3901,9 +3940,9 @@
 
     "astro/semver": ["semver@7.7.2", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],
 
-    "astro/sharp": ["sharp@0.33.5", "", { "dependencies": { "color": "^4.2.3", "detect-libc": "^2.0.3", "semver": "^7.6.3" }, "optionalDependencies": { "@img/sharp-darwin-arm64": "0.33.5", "@img/sharp-darwin-x64": "0.33.5", "@img/sharp-libvips-darwin-arm64": "1.0.4", "@img/sharp-libvips-darwin-x64": "1.0.4", "@img/sharp-libvips-linux-arm": "1.0.5", "@img/sharp-libvips-linux-arm64": "1.0.4", "@img/sharp-libvips-linux-s390x": "1.0.4", "@img/sharp-libvips-linux-x64": "1.0.4", "@img/sharp-libvips-linuxmusl-arm64": "1.0.4", "@img/sharp-libvips-linuxmusl-x64": "1.0.4", "@img/sharp-linux-arm": "0.33.5", "@img/sharp-linux-arm64": "0.33.5", "@img/sharp-linux-s390x": "0.33.5", "@img/sharp-linux-x64": "0.33.5", "@img/sharp-linuxmusl-arm64": "0.33.5", "@img/sharp-linuxmusl-x64": "0.33.5", "@img/sharp-wasm32": "0.33.5", "@img/sharp-win32-ia32": "0.33.5", "@img/sharp-win32-x64": "0.33.5" } }, "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw=="],
+    "astro/vite": ["vite@6.4.0", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", "picomatch": "^4.0.2", "postcss": "^8.5.3", "rollup": "^4.34.9", "tinyglobby": "^0.2.13" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-oLnWs9Hak/LOlKjeSpOwD6JMks8BeICEdYMJBf6P4Lac/pO9tKiv/XhXnAM7nNfSkZahjlCZu9sS50zL8fSnsw=="],
 
-    "astro/vite": ["vite@6.3.5", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", "picomatch": "^4.0.2", "postcss": "^8.5.3", "rollup": "^4.34.9", "tinyglobby": "^0.2.13" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ=="],
+    "astro/vitefu": ["vitefu@1.1.1", "", { "peerDependencies": { "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0" }, "optionalPeers": ["vite"] }, "sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ=="],
 
     "aws-crt/buffer": ["buffer@6.0.3", "", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" } }, "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="],
 
@@ -3931,6 +3970,8 @@
 
     "cacheable-request/get-stream": ["get-stream@5.2.0", "", { "dependencies": { "pump": "^3.0.0" } }, "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="],
 
+    "cacheable-request/http-cache-semantics": ["http-cache-semantics@4.1.1", "", {}, "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="],
+
     "cheerio/entities": ["entities@1.1.2", "", {}, "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="],
 
     "cheerio/htmlparser2": ["htmlparser2@3.10.1", "", { "dependencies": { "domelementtype": "^1.3.1", "domhandler": "^2.3.0", "domutils": "^1.5.1", "entities": "^1.1.1", "inherits": "^2.0.1", "readable-stream": "^3.1.1" } }, "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="],
@@ -3961,6 +4002,12 @@
 
     "ecc-jsbn/jsbn": ["jsbn@0.1.1", "", {}, "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="],
 
+    "eciesjs/@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
+    "eciesjs/@noble/curves": ["@noble/curves@1.9.0", "", { "dependencies": { "@noble/hashes": "1.8.0" } }, "sha512-7YDlXiNMdO1YZeH6t/kvopHHbIZzlxrCV9WLqCY6QhcXOoXiNCMDqJIglZ9Yjx5+w7Dz30TITFrlTjnRg7sKEg=="],
+
+    "eciesjs/@noble/hashes": ["@noble/hashes@1.8.0", "", {}, "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A=="],
+
     "effect/@standard-schema/spec": ["@standard-schema/spec@1.0.0", "", {}, "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA=="],
 
     "estree-walker/@types/estree": ["@types/estree@1.0.6", "", {}, "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="],
@@ -3997,7 +4044,15 @@
 
     "ip-address/sprintf-js": ["sprintf-js@1.1.3", "", {}, "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="],
 
-    "it-ws/@types/ws": ["@types/ws@8.18.1", "", { "dependencies": { "@types/node": "*" } }, "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg=="],
+    "libp2p/@libp2p/crypto": ["@libp2p/crypto@5.1.12", "", { "dependencies": { "@libp2p/interface": "^3.0.2", "@noble/curves": "^2.0.1", "@noble/hashes": "^2.0.1", "multiformats": "^13.4.0", "protons-runtime": "^5.6.0", "uint8arraylist": "^2.4.8", "uint8arrays": "^5.1.0" } }, "sha512-1yJS0BZj+HF4M3Uv/92y3oIbMcCar218accFBcX+nKVhBlwDbx6fkUURhs5GilIhMgDtir+qQ8Un1hwF4CgGzw=="],
+
+    "libp2p/@multiformats/multiaddr-matcher": ["@multiformats/multiaddr-matcher@3.0.1", "", { "dependencies": { "@multiformats/multiaddr": "^13.0.0" } }, "sha512-jvjwzCPysVTQ53F4KqwmcqZw73BqHMk0UUZrMP9P4OtJ/YHrfs122ikTqhVA2upe0P/Qz9l8HVlhEifVYB2q9A=="],
+
+    "libp2p/p-retry": ["p-retry@7.1.0", "", { "dependencies": { "is-network-error": "^1.1.0" } }, "sha512-xL4PiFRQa/f9L9ZvR4/gUCRNus4N8YX80ku8kv9Jqz+ZokkiZLM0bcvX0gm1F3PDi9SPRsww1BDsTWgE6Y1GLQ=="],
+
+    "libp2p/race-signal": ["race-signal@2.0.0", "", {}, "sha512-P31bLhE4ByBX/70QDXMutxnqgwrF1WUXea1O8DXuviAgkdbQ1iQMQotNgzJIBC9yUSn08u/acZrMUhgw7w6GpA=="],
+
+    "make-fetch-happen/http-cache-semantics": ["http-cache-semantics@4.1.1", "", {}, "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="],
 
     "markdown-it/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],
 
@@ -4047,8 +4102,6 @@
 
     "promise-retry/retry": ["retry@0.12.0", "", {}, "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="],
 
-    "prompts/kleur": ["kleur@3.0.3", "", {}, "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="],
-
     "proxy-addr/ipaddr.js": ["ipaddr.js@1.9.1", "", {}, "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="],
 
     "psl/punycode": ["punycode@2.3.1", "", {}, "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="],
@@ -4109,6 +4162,8 @@
 
     "typedoc/yaml": ["yaml@2.7.1", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ=="],
 
+    "uint8arrays/multiformats": ["multiformats@13.3.7", "", {}, "sha512-meL9DERHj+fFVWoOX9fXqfcYcSpUfSYJPcFvDPKrxitICbwAoWR+Ut4j5NO9zAT917HUHLQmqzQbAsGNHlDcxQ=="],
+
     "unified/vfile": ["vfile@6.0.2", "", { "dependencies": { "@types/unist": "^3.0.0", "unist-util-stringify-position": "^4.0.0", "vfile-message": "^4.0.0" } }, "sha512-zND7NlS8rJYb/sPqkb13ZvbbUoExdbi4w3SfRrMq6R3FvnLQmmfpajJNITuuYm6AZ5uao9vy4BAos3EXBPf2rg=="],
 
     "unstorage/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="],
@@ -4395,6 +4450,12 @@
 
     "@babel/helper-compilation-targets/lru-cache/yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="],
 
+    "@chainsafe/libp2p-quic/@libp2p/interface/multiformats": ["multiformats@13.3.7", "", {}, "sha512-meL9DERHj+fFVWoOX9fXqfcYcSpUfSYJPcFvDPKrxitICbwAoWR+Ut4j5NO9zAT917HUHLQmqzQbAsGNHlDcxQ=="],
+
+    "@chainsafe/libp2p-quic/@libp2p/utils/@libp2p/logger": ["@libp2p/logger@5.2.0", "", { "dependencies": { "@libp2p/interface": "^2.11.0", "@multiformats/multiaddr": "^12.4.4", "interface-datastore": "^8.3.1", "multiformats": "^13.3.6", "weald": "^1.0.4" } }, "sha512-OEFS529CnIKfbWEHmuCNESw9q0D0hL8cQ8klQfjIVPur15RcgAEgc1buQ7Y6l0B6tCYg120bp55+e9tGvn8c0g=="],
+
+    "@chainsafe/libp2p-quic/@multiformats/multiaddr/multiformats": ["multiformats@13.3.7", "", {}, "sha512-meL9DERHj+fFVWoOX9fXqfcYcSpUfSYJPcFvDPKrxitICbwAoWR+Ut4j5NO9zAT917HUHLQmqzQbAsGNHlDcxQ=="],
+
     "@esbuild-kit/core-utils/esbuild/@esbuild/android-arm": ["@esbuild/android-arm@0.18.20", "", { "os": "android", "cpu": "arm" }, "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw=="],
 
     "@esbuild-kit/core-utils/esbuild/@esbuild/android-arm64": ["@esbuild/android-arm64@0.18.20", "", { "os": "android", "cpu": "arm64" }, "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ=="],
@@ -4459,6 +4520,8 @@
 
     "@multiformats/dns/buffer/ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],
 
+    "@multiformats/multiaddr-matcher/@multiformats/multiaddr/multiformats": ["multiformats@13.3.7", "", {}, "sha512-meL9DERHj+fFVWoOX9fXqfcYcSpUfSYJPcFvDPKrxitICbwAoWR+Ut4j5NO9zAT917HUHLQmqzQbAsGNHlDcxQ=="],
+
     "@neondatabase/serverless/@types/node/undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
 
     "@nestri/functions/@openauthjs/openauth/jose": ["jose@5.9.6", "", {}, "sha512-AMlnetc9+CV9asI19zHmrgS/WYsWUwCn2R7RzlbJWD7F9eWYUTGyBmU9o6PxngtLGOiDGPRu+Uc4fhKzbpteZQ=="],
@@ -4553,6 +4616,8 @@
 
     "@rocicorp/zero/@opentelemetry/sdk-trace-node/@opentelemetry/sdk-trace-base": ["@opentelemetry/sdk-trace-base@2.0.0", "", { "dependencies": { "@opentelemetry/core": "2.0.0", "@opentelemetry/resources": "2.0.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-qQnYdX+ZCkonM7tA5iU4fSRsVxbFGml8jbxOgipRGMFHKaXKHQ30js03rTobYjKjIfnOsZSbHKWF0/0v0OQGfw=="],
 
+    "@types/bun/bun-types/@types/node": ["@types/node@22.18.6", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-r8uszLPpeIWbNKtvWRt/DbVi5zbqZyj1PTmhRMqBMvDnaz1QpmSKujUtJLrqGZeoM8v72MfYggDceY4K1itzWQ=="],
+
     "@types/pg/@types/node/undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
 
     "@vanilla-extract/integration/find-up/locate-path": ["locate-path@6.0.0", "", { "dependencies": { "p-locate": "^5.0.0" } }, "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="],
@@ -4621,46 +4686,6 @@
 
     "astro/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],
 
-    "astro/sharp/@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.0.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ=="],
-
-    "astro/sharp/@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.0.4" }, "os": "darwin", "cpu": "x64" }, "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q=="],
-
-    "astro/sharp/@img/sharp-libvips-darwin-arm64": ["@img/sharp-libvips-darwin-arm64@1.0.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg=="],
-
-    "astro/sharp/@img/sharp-libvips-darwin-x64": ["@img/sharp-libvips-darwin-x64@1.0.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ=="],
-
-    "astro/sharp/@img/sharp-libvips-linux-arm": ["@img/sharp-libvips-linux-arm@1.0.5", "", { "os": "linux", "cpu": "arm" }, "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g=="],
-
-    "astro/sharp/@img/sharp-libvips-linux-arm64": ["@img/sharp-libvips-linux-arm64@1.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA=="],
-
-    "astro/sharp/@img/sharp-libvips-linux-s390x": ["@img/sharp-libvips-linux-s390x@1.0.4", "", { "os": "linux", "cpu": "s390x" }, "sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA=="],
-
-    "astro/sharp/@img/sharp-libvips-linux-x64": ["@img/sharp-libvips-linux-x64@1.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw=="],
-
-    "astro/sharp/@img/sharp-libvips-linuxmusl-arm64": ["@img/sharp-libvips-linuxmusl-arm64@1.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA=="],
-
-    "astro/sharp/@img/sharp-libvips-linuxmusl-x64": ["@img/sharp-libvips-linuxmusl-x64@1.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw=="],
-
-    "astro/sharp/@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.0.5" }, "os": "linux", "cpu": "arm" }, "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ=="],
-
-    "astro/sharp/@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.0.4" }, "os": "linux", "cpu": "arm64" }, "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA=="],
-
-    "astro/sharp/@img/sharp-linux-s390x": ["@img/sharp-linux-s390x@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-s390x": "1.0.4" }, "os": "linux", "cpu": "s390x" }, "sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q=="],
-
-    "astro/sharp/@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.0.4" }, "os": "linux", "cpu": "x64" }, "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA=="],
-
-    "astro/sharp/@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.0.4" }, "os": "linux", "cpu": "arm64" }, "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g=="],
-
-    "astro/sharp/@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.0.4" }, "os": "linux", "cpu": "x64" }, "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw=="],
-
-    "astro/sharp/@img/sharp-wasm32": ["@img/sharp-wasm32@0.33.5", "", { "dependencies": { "@emnapi/runtime": "^1.2.0" }, "cpu": "none" }, "sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg=="],
-
-    "astro/sharp/@img/sharp-win32-ia32": ["@img/sharp-win32-ia32@0.33.5", "", { "os": "win32", "cpu": "ia32" }, "sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ=="],
-
-    "astro/sharp/@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.33.5", "", { "os": "win32", "cpu": "x64" }, "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg=="],
-
-    "astro/sharp/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
-
     "astro/vite/fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="],
 
     "aws-crt/buffer/ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],
@@ -4913,12 +4938,20 @@
 
     "@aws-sdk/signature-v4-multi-region/@aws-sdk/middleware-sdk-s3/@smithy/util-stream/@smithy/node-http-handler": ["@smithy/node-http-handler@4.0.3", "", { "dependencies": { "@smithy/abort-controller": "^4.0.1", "@smithy/protocol-http": "^5.0.1", "@smithy/querystring-builder": "^4.0.1", "@smithy/types": "^4.1.0", "tslib": "^2.6.2" } }, "sha512-dYCLeINNbYdvmMLtW0VdhW1biXt+PPCGazzT5ZjKw46mOtdgToQEwjqZSS9/EN8+tNs/RO0cEWG044+YZs97aA=="],
 
+    "@chainsafe/libp2p-quic/@libp2p/utils/@libp2p/logger/interface-datastore": ["interface-datastore@8.3.2", "", { "dependencies": { "interface-store": "^6.0.0", "uint8arrays": "^5.1.0" } }, "sha512-R3NLts7pRbJKc3qFdQf+u40hK8XWc0w4Qkx3OFEstC80VoaDUABY/dXA2EJPhtNC+bsrf41Ehvqb6+pnIclyRA=="],
+
+    "@chainsafe/libp2p-quic/@libp2p/utils/@libp2p/logger/multiformats": ["multiformats@13.3.7", "", {}, "sha512-meL9DERHj+fFVWoOX9fXqfcYcSpUfSYJPcFvDPKrxitICbwAoWR+Ut4j5NO9zAT917HUHLQmqzQbAsGNHlDcxQ=="],
+
+    "@chainsafe/libp2p-quic/@libp2p/utils/@libp2p/logger/weald": ["weald@1.0.4", "", { "dependencies": { "ms": "^3.0.0-canary.1", "supports-color": "^9.4.0" } }, "sha512-+kYTuHonJBwmFhP1Z4YQK/dGi3jAnJGCYhyODFpHK73rbxnp9lnZQj7a2m+WVgn8fXr5bJaxUpF6l8qZpPeNWQ=="],
+
     "@grpc/proto-loader/yargs/cliui/wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="],
 
     "@rocicorp/zero/@opentelemetry/sdk-trace-node/@opentelemetry/core/@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.33.0", "", {}, "sha512-TIpZvE8fiEILFfTlfPnltpBaD3d9/+uQHVCyC3vfdh6WfCXKhNFzoP5RyDDIndfvZC5GrA4pyEDNyjPloJud+w=="],
 
     "@rocicorp/zero/@opentelemetry/sdk-trace-node/@opentelemetry/sdk-trace-base/@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.33.0", "", {}, "sha512-TIpZvE8fiEILFfTlfPnltpBaD3d9/+uQHVCyC3vfdh6WfCXKhNFzoP5RyDDIndfvZC5GrA4pyEDNyjPloJud+w=="],
 
+    "@types/bun/bun-types/@types/node/undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
+
     "@vanilla-extract/integration/find-up/locate-path/p-locate": ["p-locate@5.0.0", "", { "dependencies": { "p-limit": "^3.0.2" } }, "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="],
 
     "@vanilla-extract/integration/vite/esbuild/@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.21.5", "", { "os": "aix", "cpu": "ppc64" }, "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ=="],
@@ -5053,8 +5086,6 @@
 
     "@vanilla-extract/vite-plugin/vite/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.21.5", "", { "os": "win32", "cpu": "x64" }, "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw=="],
 
-    "astro/sharp/@img/sharp-wasm32/@emnapi/runtime": ["@emnapi/runtime@1.3.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw=="],
-
     "aws-crt/mqtt/help-me/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
 
     "aws-crt/mqtt/mqtt-packet/bl": ["bl@4.1.0", "", { "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", "readable-stream": "^3.4.0" } }, "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="],
@@ -5179,6 +5210,12 @@
 
     "@aws-sdk/signature-v4-multi-region/@aws-sdk/middleware-sdk-s3/@smithy/util-stream/@smithy/node-http-handler/@smithy/querystring-builder": ["@smithy/querystring-builder@4.0.1", "", { "dependencies": { "@smithy/types": "^4.1.0", "@smithy/util-uri-escape": "^4.0.0", "tslib": "^2.6.2" } }, "sha512-wU87iWZoCbcqrwszsOewEIuq+SU2mSoBE2CcsLwE0I19m0B2gOJr1MVjxWcDQYOzHbR1xCk7AcOBbGFUYOKvdg=="],
 
+    "@chainsafe/libp2p-quic/@libp2p/utils/@libp2p/logger/interface-datastore/interface-store": ["interface-store@6.0.3", "", {}, "sha512-+WvfEZnFUhRwFxgz+QCQi7UC6o9AM0EHM9bpIe2Nhqb100NHCsTvNAn4eJgvgV2/tmLo1MP9nGxQKEcZTAueLA=="],
+
+    "@chainsafe/libp2p-quic/@libp2p/utils/@libp2p/logger/weald/ms": ["ms@3.0.0-canary.1", "", {}, "sha512-kh8ARjh8rMN7Du2igDRO9QJnqCb2xYTJxyQYK7vJJS4TvLLmsbyhiKpSW+t+y26gyOyMd0riphX0GeWKU3ky5g=="],
+
+    "@chainsafe/libp2p-quic/@libp2p/utils/@libp2p/logger/weald/supports-color": ["supports-color@9.4.0", "", {}, "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw=="],
+
     "@grpc/proto-loader/yargs/cliui/wrap-ansi/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
 
     "@vanilla-extract/integration/find-up/locate-path/p-locate/p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="],

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/runner-builder.Containerfile

@@ -15,7 +15,7 @@ ENV CARGO_HOME=/usr/local/cargo \
 
 # Install build essentials and caching tools
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm rustup git base-devel mold \
+    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)
@@ -28,7 +28,7 @@ RUN rustup default stable
 
 # Install cargo-chef with proper caching
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo install -j $(nproc) cargo-chef --locked
+    cargo install cargo-chef --locked
 
 #*******************************#
 # vimputti manager build stages #
@@ -38,10 +38,10 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm lib32-gcc-libs
+    pacman -S --noconfirm lib32-gcc-libs
 
 # Clone repository
-RUN git clone --depth 1 --rev "9e8bfd0217eeab011c5afc368d3ea67a4c239e81" https://github.com/DatCaptainHorse/vimputti.git
+RUN git clone --depth 1 --rev "2fde5376b6b9a38cdbd94ccc6a80c9d29a81a417" https://github.com/DatCaptainHorse/vimputti.git
 
 #--------------------------------------------------------------------
 FROM vimputti-manager-deps AS vimputti-manager-planner
@@ -83,7 +83,7 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm gst-plugins-good gst-plugin-rswebrtc
+    pacman -S --noconfirm gst-plugins-good gst-plugin-rswebrtc
 
 #--------------------------------------------------------------------
 FROM nestri-server-deps AS nestri-server-planner
@@ -123,29 +123,14 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm libxkbcommon wayland \
+    pacman -S --noconfirm libxkbcommon wayland \
     gst-plugins-good gst-plugins-bad libinput
 
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
     cargo install cargo-c
 
-# Grab cudart from NVIDIA..
-RUN wget https://developer.download.nvidia.com/compute/cuda/redist/cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-13.0.96-archive.tar.xz -O cuda_cudart.tar.xz && \
-    mkdir cuda_cudart && tar -xf cuda_cudart.tar.xz -C cuda_cudart --strip-components=1 && \
-    cp cuda_cudart/lib/libcudart.so cuda_cudart/lib/libcudart.so.* /usr/lib/ && \
-    rm -r cuda_cudart && \
-    rm cuda_cudart.tar.xz
-
-# Grab cuda lib from NVIDIA (it's in driver package of all things..)
-RUN wget https://developer.download.nvidia.com/compute/cuda/redist/nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-580.95.05-archive.tar.xz -O nvidia_driver.tar.xz && \
-    mkdir nvidia_driver && tar -xf nvidia_driver.tar.xz -C nvidia_driver --strip-components=1 && \
-    cp nvidia_driver/lib/libcuda.so.* /usr/lib/libcuda.so && \
-    ln -s /usr/lib/libcuda.so /usr/lib/libcuda.so.1 && \
-    rm -r nvidia_driver && \
-    rm nvidia_driver.tar.xz
-
 # Clone repository
-RUN git clone --depth 1 --rev "afa853fa03e8403c83bbb3bc0cf39147ad46c266" https://github.com/games-on-whales/gst-wayland-display.git
+RUN git clone --depth 1 --rev "67b1183997fd7aaf57398e4b01bd64c4d2433c45" https://github.com/games-on-whales/gst-wayland-display.git
 
 #--------------------------------------------------------------------
 FROM gst-wayland-deps AS gst-wayland-planner
@@ -163,7 +148,7 @@ COPY --from=gst-wayland-planner /builder/gst-wayland-display/recipe.json .
 
 # Cache dependencies using cargo-chef
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo chef cook --release --recipe-path recipe.json
+    cargo chef cook --release --recipe-path recipe.json --features cuda
 
 
 ENV CARGO_TARGET_DIR=/builder/target
@@ -173,7 +158,7 @@ COPY --from=gst-wayland-planner /builder/gst-wayland-display/ .
 # Build and install directly to artifacts
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
     --mount=type=cache,target=/builder/target \
-    cargo cinstall --prefix=${ARTIFACTS} --release
+    cargo cinstall --prefix=${ARTIFACTS} --release --features cuda
 
 #*********************************#
 # Patched bubblewrap build stages #
@@ -183,7 +168,7 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm libtool libcap libselinux
+    pacman -S --noconfirm libtool libcap libselinux
 
 # Copy patch file from host
 COPY packages/patches/bubblewrap/ /builder/patches/
@@ -214,5 +199,4 @@ 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=gst-wayland-deps /usr/lib/libcuda.so /usr/lib/libcuda.so.* /artifacts/lib/
 COPY --from=bubblewrap-builder /artifacts/bin/bwrap /artifacts/bin/

containerfiles/runner-common.Containerfile

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

containerfiles/steam-runner.Containerfile

@@ -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"]

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/pipewire.conf.d/nestri-low-latency.conf

@@ -2,6 +2,6 @@ context.properties = {
     default.clock.rate = 48000
     default.clock.allowed-rates = [48000]
     default.clock.min-quantum = 128
-    default.clock.max-quantum = 256
-    default.clock.quantum = 128
+    default.clock.max-quantum = 1024
+    default.clock.quantum = 512
 }

packages/configs/wireplumber.conf.d/nestri-low-latency.conf

@@ -22,7 +22,7 @@
       ],
       "apply_properties": {
         "pulse.min.req": 128,
-        "pulse.max.req": 256,
+        "pulse.max.req": 1024,
         "pulse.idle.timeout": 0
       }
     }

packages/input/.containerignore

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

packages/input/package.json

@@ -7,24 +7,22 @@
         ".": "./src/index.ts"
     },
     "devDependencies": {
-        "@bufbuild/buf": "^1.57.2",
-        "@bufbuild/protoc-gen-es": "^2.9.0"
+        "@bufbuild/buf": "^1.59.0",
+        "@bufbuild/protoc-gen-es": "^2.10.0"
     },
     "dependencies": {
-        "@bufbuild/protobuf": "^2.9.0",
-        "@chainsafe/libp2p-noise": "^16.1.4",
+        "@bufbuild/protobuf": "^2.10.0",
+        "@chainsafe/libp2p-noise": "^17.0.0",
         "@chainsafe/libp2p-quic": "^1.1.3",
-        "@chainsafe/libp2p-yamux": "^7.0.4",
-        "@libp2p/identify": "^3.0.39",
-        "@libp2p/interface": "^2.11.0",
-        "@libp2p/ping": "^2.0.37",
-        "@libp2p/websockets": "^9.2.19",
-        "@libp2p/webtransport": "^5.0.51",
-        "@multiformats/multiaddr": "^12.5.1",
-        "it-length-prefixed": "^10.0.1",
-        "it-pipe": "^3.0.1",
-        "libp2p": "^2.10.0",
-        "uint8arraylist": "^2.4.8",
-        "uint8arrays": "^5.1.0"
+        "@chainsafe/libp2p-yamux": "^8.0.1",
+        "@libp2p/identify": "^4.0.5",
+        "@libp2p/interface": "^3.0.2",
+        "@libp2p/ping": "^3.0.5",
+        "@libp2p/websockets": "^10.0.6",
+        "@libp2p/webtransport": "^6.0.7",
+        "@libp2p/utils": "^7.0.5",
+        "@multiformats/multiaddr": "^13.0.1",
+        "libp2p": "^3.0.6",
+        "uint8arraylist": "^2.4.8"
     }
 }

packages/input/src/controller.ts

@@ -1,21 +1,15 @@
 import { controllerButtonToLinuxEventCode } from "./codes";
 import { WebRTCStream } from "./webrtc-stream";
 import {
-  ProtoMessageBase,
-  ProtoMessageInput,
-  ProtoMessageInputSchema,
-} from "./proto/messages_pb";
-import {
-  ProtoInputSchema,
   ProtoControllerAttachSchema,
   ProtoControllerDetachSchema,
-  ProtoControllerButtonSchema,
-  ProtoControllerTriggerSchema,
-  ProtoControllerAxisSchema,
-  ProtoControllerStickSchema,
+  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;
@@ -23,6 +17,7 @@ interface Props {
 }
 
 interface GamepadState {
+  previousButtonState: Map<number, boolean>;
   buttonState: Map<number, boolean>;
   leftTrigger: number;
   rightTrigger: number;
@@ -34,12 +29,17 @@ interface GamepadState {
   dpadY: number;
 }
 
+enum PollState {
+  IDLE,
+  RUNNING,
+}
+
 export class Controller {
   protected wrtc: WebRTCStream;
-  protected slot: number;
   protected connected: boolean = false;
   protected gamepad: Gamepad | null = null;
-  protected lastState: GamepadState = {
+  protected state: GamepadState = {
+    previousButtonState: new Map<number, boolean>(),
     buttonState: new Map<number, boolean>(),
     leftTrigger: 0,
     rightTrigger: 0,
@@ -53,17 +53,33 @@ export class Controller {
   // TODO: As user configurable, set quite low now for decent controllers (not Nintendo ones :P)
   protected stickDeadzone: number = 2048; // 2048 / 32768 = ~0.06 (6% of stick range)
 
-  private updateInterval = 10.0; // 100 updates per second
-  private _dcRumbleHandler: ((data: ArrayBuffer) => void) | null = null;
+  // 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;
-    this.slot = e.gamepad.index;
-
-    this.updateInterval = 1000 / webrtc.currentFrameRate;
-
-    // Gamepad connected
-    this.gamepad = e.gamepad;
 
     // 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})/);
@@ -72,34 +88,49 @@ export class Controller {
     const productMatch = e.gamepad.id.match(/Product:\s?([0-9a-fA-F]{4})/);
     const productId = productMatch ? productMatch[1].toLowerCase() : "unknown";
 
-    const attachMsg = create(ProtoInputSchema, {
-      $typeName: "proto.ProtoInput",
-      inputType: {
-        case: "controllerAttach",
-        value: create(ProtoControllerAttachSchema, {
-          type: "ControllerAttach",
-          id: this.vendor_id_to_controller(vendorId, productId),
-          slot: this.slot,
-        }),
-      },
-    });
-    const message: ProtoMessageInput = {
-      $typeName: "proto.ProtoMessageInput",
-      messageBase: {
-        $typeName: "proto.ProtoMessageBase",
-        payloadType: "controllerInput",
-      } as ProtoMessageBase,
-      data: attachMsg,
-    };
-    this.wrtc.sendBinary(toBinary(ProtoMessageInputSchema, message));
+    // 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);
 
-    // Listen to feedback rumble events from server
-    this._dcRumbleHandler = (data: any) => this.rumbleCallback(data as ArrayBuffer);
-    this.wrtc.addDataChannelCallback(this._dcRumbleHandler);
+        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
@@ -149,361 +180,352 @@ export class Controller {
     return ((value - fromMin) * (toMax - toMin)) / (fromMax - fromMin) + toMin;
   }
 
-  private pollGamepad() {
-    const gamepads = navigator.getGamepads();
-    if (this.slot < gamepads.length) {
-      const gamepad = gamepads[this.slot];
-      if (gamepad) {
-        /* Button handling */
-        gamepad.buttons.forEach((button, index) => {
-          // Ignore d-pad buttons (12-15) as we handle those as axis
-          if (index >= 12 && index <= 15) return;
-          // ignore trigger buttons (6-7) as we handle those as axis
-          if (index === 6 || index === 7) return;
-          // If state differs, send
-          if (button.pressed !== this.lastState.buttonState.get(index)) {
-            const linuxCode = this.controllerButtonToVirtualKeyCode(index);
-            if (linuxCode === undefined) {
-              // Skip unmapped button index
-              this.lastState.buttonState.set(index, button.pressed);
-              return;
-            }
-
-            const buttonProto = create(ProtoInputSchema, {
-              $typeName: "proto.ProtoInput",
-              inputType: {
-                case: "controllerButton",
-                value: create(ProtoControllerButtonSchema, {
-                  type: "ControllerButton",
-                  slot: this.slot,
-                  button: linuxCode,
-                  pressed: button.pressed,
-                }),
-              },
-            });
-            const buttonMessage: ProtoMessageInput = {
-              $typeName: "proto.ProtoMessageInput",
-              messageBase: {
-                $typeName: "proto.ProtoMessageBase",
-                payloadType: "controllerInput",
-              } as ProtoMessageBase,
-              data: buttonProto,
-            };
-            this.wrtc.sendBinary(
-              toBinary(ProtoMessageInputSchema, buttonMessage),
-            );
-            // Store button state
-            this.lastState.buttonState.set(index, button.pressed);
-          }
-        });
-
-        /* Trigger handling */
-        // map trigger value from 0.0 to 1.0 to -32768 to 32767
-        const leftTrigger = Math.round(
-          this.remapFromTo(gamepad.buttons[6]?.value ?? 0, 0, 1, -32768, 32767),
-        );
-        // If state differs, send
-        if (leftTrigger !== this.lastState.leftTrigger) {
-          const triggerProto = create(ProtoInputSchema, {
-            $typeName: "proto.ProtoInput",
-            inputType: {
-              case: "controllerTrigger",
-              value: create(ProtoControllerTriggerSchema, {
-                type: "ControllerTrigger",
-                slot: this.slot,
-                trigger: 0, // 0 = left, 1 = right
-                value: leftTrigger,
-              }),
-            },
-          });
-          const triggerMessage: ProtoMessageInput = {
-            $typeName: "proto.ProtoMessageInput",
-            messageBase: {
-              $typeName: "proto.ProtoMessageBase",
-              payloadType: "controllerInput",
-            } as ProtoMessageBase,
-            data: triggerProto,
-          };
-          this.lastState.leftTrigger = leftTrigger;
-          this.wrtc.sendBinary(
-            toBinary(ProtoMessageInputSchema, triggerMessage),
-          );
-        }
-        const rightTrigger = Math.round(
-          this.remapFromTo(gamepad.buttons[7]?.value ?? 0, 0, 1, -32768, 32767),
-        );
-        // If state differs, send
-        if (rightTrigger !== this.lastState.rightTrigger) {
-          const triggerProto = create(ProtoInputSchema, {
-            $typeName: "proto.ProtoInput",
-            inputType: {
-              case: "controllerTrigger",
-              value: create(ProtoControllerTriggerSchema, {
-                type: "ControllerTrigger",
-                slot: this.slot,
-                trigger: 1, // 0 = left, 1 = right
-                value: rightTrigger,
-              }),
-            },
-          });
-          const triggerMessage: ProtoMessageInput = {
-            $typeName: "proto.ProtoMessageInput",
-            messageBase: {
-              $typeName: "proto.ProtoMessageBase",
-              payloadType: "controllerInput",
-            } as ProtoMessageBase,
-            data: triggerProto,
-          };
-          this.lastState.rightTrigger = rightTrigger;
-          this.wrtc.sendBinary(
-            toBinary(ProtoMessageInputSchema, triggerMessage),
-          );
-        }
-
-        /* DPad handling */
-        // We send dpad buttons as axis values -1 to 1 for left/up, right/down
-        const dpadLeft = gamepad.buttons[14]?.pressed ? 1 : 0;
-        const dpadRight = gamepad.buttons[15]?.pressed ? 1 : 0;
-        const dpadX = dpadLeft ? -1 : dpadRight ? 1 : 0;
-        if (dpadX !== this.lastState.dpadX) {
-          const dpadProto = create(ProtoInputSchema, {
-            $typeName: "proto.ProtoInput",
-            inputType: {
-              case: "controllerAxis",
-              value: create(ProtoControllerAxisSchema, {
-                type: "ControllerAxis",
-                slot: this.slot,
-                axis: 0, // 0 = dpadX, 1 = dpadY
-                value: dpadX,
-              }),
-            },
-          });
-          const dpadMessage: ProtoMessageInput = {
-            $typeName: "proto.ProtoMessageInput",
-            messageBase: {
-              $typeName: "proto.ProtoMessageBase",
-              payloadType: "controllerInput",
-            } as ProtoMessageBase,
-            data: dpadProto,
-          };
-          this.lastState.dpadX = dpadX;
-          this.wrtc.sendBinary(toBinary(ProtoMessageInputSchema, dpadMessage));
-        }
-
-        const dpadUp = gamepad.buttons[12]?.pressed ? 1 : 0;
-        const dpadDown = gamepad.buttons[13]?.pressed ? 1 : 0;
-        const dpadY = dpadUp ? -1 : dpadDown ? 1 : 0;
-        if (dpadY !== this.lastState.dpadY) {
-          const dpadProto = create(ProtoInputSchema, {
-            $typeName: "proto.ProtoInput",
-            inputType: {
-              case: "controllerAxis",
-              value: create(ProtoControllerAxisSchema, {
-                type: "ControllerAxis",
-                slot: this.slot,
-                axis: 1, // 0 = dpadX, 1 = dpadY
-                value: dpadY,
-              }),
-            },
-          });
-          const dpadMessage: ProtoMessageInput = {
-            $typeName: "proto.ProtoMessageInput",
-            messageBase: {
-              $typeName: "proto.ProtoMessageBase",
-              payloadType: "controllerInput",
-            } as ProtoMessageBase,
-            data: dpadProto,
-          };
-          this.lastState.dpadY = dpadY;
-          this.wrtc.sendBinary(toBinary(ProtoMessageInputSchema, dpadMessage));
-        }
-
-        /* Stick handling */
-        // stick values need to be mapped from -1.0 to 1.0 to -32768 to 32767
-        const leftX = this.remapFromTo(gamepad.axes[0] ?? 0, -1, 1, -32768, 32767);
-        const leftY = this.remapFromTo(gamepad.axes[1] ?? 0, -1, 1, -32768, 32767);
-        // Apply deadzone
-        const sendLeftX =
-          Math.abs(leftX) > this.stickDeadzone ? Math.round(leftX) : 0;
-        const sendLeftY =
-          Math.abs(leftY) > this.stickDeadzone ? Math.round(leftY) : 0;
-        // if outside deadzone, send normally if changed
-        // if moves inside deadzone, zero it if not inside deadzone last time
-        if (
-          sendLeftX !== this.lastState.leftX ||
-          sendLeftY !== this.lastState.leftY
-        ) {
-          // console.log("Sticks: ", sendLeftX, sendLeftY, sendRightX, sendRightY);
-          const stickProto = create(ProtoInputSchema, {
-            $typeName: "proto.ProtoInput",
-            inputType: {
-              case: "controllerStick",
-              value: create(ProtoControllerStickSchema, {
-                type: "ControllerStick",
-                slot: this.slot,
-                stick: 0, // 0 = left, 1 = right
-                x: sendLeftX,
-                y: sendLeftY,
-              }),
-            },
-          });
-          const stickMessage: ProtoMessageInput = {
-            $typeName: "proto.ProtoMessageInput",
-            messageBase: {
-              $typeName: "proto.ProtoMessageBase",
-              payloadType: "controllerInput",
-            } as ProtoMessageBase,
-            data: stickProto,
-          };
-          this.lastState.leftX = sendLeftX;
-          this.lastState.leftY = sendLeftY;
-          this.wrtc.sendBinary(toBinary(ProtoMessageInputSchema, stickMessage));
-        }
-
-        const rightX = this.remapFromTo(gamepad.axes[2] ?? 0, -1, 1, -32768, 32767);
-        const rightY = this.remapFromTo(gamepad.axes[3] ?? 0, -1, 1, -32768, 32767);
-        // Apply deadzone
-        const sendRightX =
-          Math.abs(rightX) > this.stickDeadzone ? Math.round(rightX) : 0;
-        const sendRightY =
-          Math.abs(rightY) > this.stickDeadzone ? Math.round(rightY) : 0;
-        if (
-          sendRightX !== this.lastState.rightX ||
-          sendRightY !== this.lastState.rightY
-        ) {
-          const stickProto = create(ProtoInputSchema, {
-            $typeName: "proto.ProtoInput",
-            inputType: {
-              case: "controllerStick",
-              value: create(ProtoControllerStickSchema, {
-                type: "ControllerStick",
-                slot: this.slot,
-                stick: 1, // 0 = left, 1 = right
-                x: sendRightX,
-                y: sendRightY,
-              }),
-            },
-          });
-          const stickMessage: ProtoMessageInput = {
-            $typeName: "proto.ProtoMessageInput",
-            messageBase: {
-              $typeName: "proto.ProtoMessageBase",
-              payloadType: "controllerInput",
-            } as ProtoMessageBase,
-            data: stickProto,
-          };
-          this.lastState.rightX = sendRightX;
-          this.lastState.rightY = sendRightY;
-          this.wrtc.sendBinary(toBinary(ProtoMessageInputSchema, stickMessage));
-        }
-      }
+  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 loopInterval: any = null;
+  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();
+    if (this.connected) this.stop();
 
     this.connected = true;
-    // Poll gamepads in setInterval loop
-    this.loopInterval = setInterval(() => {
-      if (this.connected) this.pollGamepad();
-    }, this.updateInterval);
+
+    // Start with active polling
+    this.restartPolling();
   }
 
   public stop() {
-    if (this.loopInterval) {
-      clearInterval(this.loopInterval);
-      this.loopInterval = null;
+    if (this.pollInterval) {
+      clearInterval(this.pollInterval);
+      this.pollInterval = null;
     }
     this.connected = false;
   }
 
-  public getSlot() {
-    return this.slot;
-  }
-
   public dispose() {
     this.stop();
     // Remove callback
-    if (this._dcRumbleHandler !== null) {
-      this.wrtc.removeDataChannelCallback(this._dcRumbleHandler);
-      this._dcRumbleHandler = null;
+    if (this._dcHandler !== null) {
+      this.wrtc.removeDataChannelCallback(this._dcHandler);
+      this._dcHandler = null;
     }
-    // Gamepad disconnected
-    const detachMsg = create(ProtoInputSchema, {
-      $typeName: "proto.ProtoInput",
-      inputType: {
-        case: "controllerDetach",
-        value: create(ProtoControllerDetachSchema, {
-          type: "ControllerDetach",
-          slot: this.slot,
+    if (this.gamepad) {
+      // Gamepad disconnected
+      const detachMsg = createMessage(
+        create(ProtoControllerDetachSchema, {
+          sessionSlot: this.gamepad.index,
         }),
-      },
-    });
-    const message: ProtoMessageInput = {
-      $typeName: "proto.ProtoMessageInput",
-      messageBase: {
-        $typeName: "proto.ProtoMessageBase",
-        payloadType: "controllerInput",
-      } as ProtoMessageBase,
-      data: detachMsg,
-    };
-    this.wrtc.sendBinary(toBinary(ProtoMessageInputSchema, message));
+        "controllerInput",
+      );
+      this.wrtc.sendBinary(toBinary(ProtoMessageSchema, detachMsg));
+    }
   }
 
-  private controllerButtonToVirtualKeyCode(code: number) {
+  private controllerButtonToVirtualKeyCode(code: number): number | undefined {
     return controllerButtonToLinuxEventCode[code] || undefined;
   }
 
-  private rumbleCallback(data: ArrayBuffer) {
-    // If not connected, ignore
-    if (!this.connected) return;
-    try {
-      // First decode the wrapper message
-      const uint8Data = new Uint8Array(data);
-      const messageWrapper = fromBinary(ProtoMessageInputSchema, uint8Data);
+  private rumbleCallback(rumbleMsg: ProtoControllerRumble) {
+    if (!this.connected || !this.gamepad) return;
 
-      // Check if it contains controller rumble data
-      if (messageWrapper.data?.inputType?.case === "controllerRumble") {
-        const rumbleMsg = messageWrapper.data.inputType.value as ProtoControllerRumble;
+    // Check if this rumble is for us
+    if (
+      rumbleMsg.sessionId !== this.wrtc.getSessionID() ||
+      rumbleMsg.sessionSlot !== this.gamepad.index
+    )
+      return;
 
-        // Check if aimed at this controller slot
-        if (rumbleMsg.slot !== this.slot) 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);
-        }
-      }
-    } catch (error) {
-      console.error("Failed to decode rumble message:", error);
+    // 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/keyboard.ts

@@ -1,16 +1,9 @@
-import {keyCodeToLinuxEventCode} from "./codes"
-import {WebRTCStream} from "./webrtc-stream";
-import {LatencyTracker} from "./latency";
-import {ProtoLatencyTracker, ProtoTimestampEntry} from "./proto/latency_tracker_pb";
-import {timestampFromDate} from "@bufbuild/protobuf/wkt";
-import {ProtoMessageBase, ProtoMessageInput, ProtoMessageInputSchema} from "./proto/messages_pb";
-import {
-  ProtoInput,
-  ProtoInputSchema,
-  ProtoKeyDownSchema,
-  ProtoKeyUpSchema,
-} from "./proto/types_pb";
-import {create, toBinary} from "@bufbuild/protobuf";
+import { keyCodeToLinuxEventCode } from "./codes";
+import { WebRTCStream } from "./webrtc-stream";
+import { ProtoKeyDownSchema, ProtoKeyUpSchema } from "./proto/types_pb";
+import { create, toBinary } from "@bufbuild/protobuf";
+import { createMessage } from "./utils";
+import { ProtoMessageSchema } from "./proto/messages_pb";
 
 interface Props {
   webrtc: WebRTCStream;
@@ -24,38 +17,27 @@ export class Keyboard {
   private readonly keydownListener: (e: KeyboardEvent) => void;
   private readonly keyupListener: (e: KeyboardEvent) => void;
 
-  constructor({webrtc}: Props) {
+  constructor({ webrtc }: Props) {
     this.wrtc = webrtc;
-    this.keydownListener = this.createKeyboardListener((e: any) => create(ProtoInputSchema, {
-      $typeName: "proto.ProtoInput",
-      inputType: {
-        case: "keyDown",
-        value: create(ProtoKeyDownSchema, {
-          type: "KeyDown",
-          key: this.keyToVirtualKeyCode(e.code)
-        }),
-      }
-    }));
-    this.keyupListener = this.createKeyboardListener((e: any) => create(ProtoInputSchema, {
-      $typeName: "proto.ProtoInput",
-      inputType: {
-        case: "keyUp",
-        value: create(ProtoKeyUpSchema, {
-          type: "KeyUp",
-          key: this.keyToVirtualKeyCode(e.code)
-        }),
-      }
-    }));
-    this.run()
+    this.keydownListener = this.createKeyboardListener((e: any) =>
+      create(ProtoKeyDownSchema, {
+        key: this.keyToVirtualKeyCode(e.code),
+      }),
+    );
+    this.keyupListener = this.createKeyboardListener((e: any) =>
+      create(ProtoKeyUpSchema, {
+        key: this.keyToVirtualKeyCode(e.code),
+      }),
+    );
+    this.run();
   }
 
   private run() {
-    if (this.connected)
-      this.stop()
+    if (this.connected) this.stop();
 
-    this.connected = true
-    document.addEventListener("keydown", this.keydownListener, {passive: false});
-    document.addEventListener("keyup", this.keyupListener, {passive: false});
+    this.connected = true;
+    document.addEventListener("keydown", this.keydownListener);
+    document.addEventListener("keyup", this.keyupListener);
   }
 
   private stop() {
@@ -65,42 +47,19 @@ 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)
-        return;
+      if ((e as any).repeat) return;
 
       const data = dataCreator(e as any);
 
-      // Latency tracking
-      const tracker = new LatencyTracker("input-keyboard");
-      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));
+      const message = createMessage(data, "input");
+      this.wrtc.sendBinary(toBinary(ProtoMessageSchema, message));
     };
   }
 
@@ -112,6 +71,6 @@ export class Keyboard {
   private keyToVirtualKeyCode(code: string) {
     // Treat Home key as Escape - TODO: Make user-configurable
     if (code === "Home") return 1;
-    return keyCodeToLinuxEventCode[code] || undefined;
+    return keyCodeToLinuxEventCode[code] || 0;
   }
-}
+}

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 {LatencyTracker} from "./latency";
-import {ProtoMessageInput, ProtoMessageBase, ProtoMessageInputSchema} from "./proto/messages_pb";
+import { WebRTCStream } from "./webrtc-stream";
 import {
-  ProtoInput, ProtoInputSchema,
-  ProtoMouseKeyDown, ProtoMouseKeyDownSchema,
-  ProtoMouseKeyUp, ProtoMouseKeyUpSchema,
-  ProtoMouseMove,
+  ProtoMouseKeyDownSchema,
+  ProtoMouseKeyUpSchema,
   ProtoMouseMoveSchema,
-  ProtoMouseWheel, ProtoMouseWheelSchema
+  ProtoMouseWheelSchema,
 } from "./proto/types_pb";
-import {mouseButtonToLinuxEventCode} from "./codes";
-import {ProtoLatencyTracker, ProtoTimestampEntry} from "./proto/latency_tracker_pb";
-import {create, toBinary} from "@bufbuild/protobuf";
-import {timestampFromDate} from "@bufbuild/protobuf/wkt";
+import { mouseButtonToLinuxEventCode } from "./codes";
+import { create, toBinary } from "@bufbuild/protobuf";
+import { createMessage } from "./utils";
+import { ProtoMessageSchema } from "./proto/messages_pb";
 
 interface Props {
   webrtc: WebRTCStream;
@@ -24,7 +20,7 @@ export class Mouse {
   protected canvas: HTMLCanvasElement;
   protected connected!: boolean;
 
-  private sendInterval = 10 // 100 updates per second
+  private sendInterval = 10; // 100 updates per second
 
   // Store references to event listeners
   private readonly mousemoveListener: (e: MouseEvent) => void;
@@ -35,12 +31,10 @@ export class Mouse {
   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.mousemoveListener = (e: MouseEvent) => {
       e.preventDefault();
       e.stopPropagation();
@@ -48,65 +42,48 @@ export class Mouse {
       this.movementY += e.movementY;
     };
 
-    this.mousedownListener = this.createMouseListener((e: any) => create(ProtoInputSchema, {
-      $typeName: "proto.ProtoInput",
-      inputType: {
-        case: "mouseKeyDown",
-        value: create(ProtoMouseKeyDownSchema, {
-          type: "MouseKeyDown",
-          key: this.keyToVirtualKeyCode(e.button)
-        }),
-      }
-    }));
-    this.mouseupListener = this.createMouseListener((e: any) => create(ProtoInputSchema, {
-      $typeName: "proto.ProtoInput",
-      inputType: {
-        case: "mouseKeyUp",
-        value: create(ProtoMouseKeyUpSchema, {
-          type: "MouseKeyUp",
-          key: this.keyToVirtualKeyCode(e.button)
-        }),
-      }
-    }));
-    this.mousewheelListener = this.createMouseListener((e: any) => create(ProtoInputSchema, {
-      $typeName: "proto.ProtoInput",
-      inputType: {
-        case: "mouseWheel",
-        value: create(ProtoMouseWheelSchema, {
-          type: "MouseWheel",
-          x: Math.round(e.deltaX),
-          y: Math.round(e.deltaY),
-        }),
-      }
-    }));
+    this.mousedownListener = this.createMouseListener((e: any) =>
+      create(ProtoMouseKeyDownSchema, {
+        key: this.keyToVirtualKeyCode(e.button),
+      }),
+    );
+    this.mouseupListener = this.createMouseListener((e: any) =>
+      create(ProtoMouseKeyUpSchema, {
+        key: this.keyToVirtualKeyCode(e.button),
+      }),
+    );
+    this.mousewheelListener = this.createMouseListener((e: any) =>
+      create(ProtoMouseWheelSchema, {
+        x: Math.round(e.deltaX),
+        y: Math.round(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.canvas.addEventListener("mousemove", this.mousemoveListener, {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});
-
+      this.connected = true;
+      this.canvas.addEventListener("mousemove", this.mousemoveListener);
+      this.canvas.addEventListener("mousedown", this.mousedownListener);
+      this.canvas.addEventListener("mouseup", this.mouseupListener);
+      this.canvas.addEventListener("wheel", this.mousewheelListener);
     } else {
       if (this.connected) {
-        this.stop()
+        this.stop();
       }
     }
-
   }
 
   private stop() {
@@ -119,7 +96,7 @@ export class Mouse {
 
   private startProcessing() {
     setInterval(() => {
-      if (this.connected && (this.movementX !== 0 || this.movementY !== 0)) {
+      if (this.connected) {
         this.sendAggregatedMouseMove();
         this.movementX = 0;
         this.movementY = 0;
@@ -128,79 +105,26 @@ export class Mouse {
   }
 
   private sendAggregatedMouseMove() {
-    const data = create(ProtoInputSchema, {
-      $typeName: "proto.ProtoInput",
-      inputType: {
-        case: "mouseMove",
-        value: create(ProtoMouseMoveSchema, {
-          type: "MouseMove",
-          x: Math.round(this.movementX),
-          y: Math.round(this.movementY),
-        }),
-      },
+    const data = create(ProtoMouseMoveSchema, {
+      x: Math.round(this.movementX),
+      y: Math.round(this.movementY),
     });
 
-    // Latency tracking
-    const tracker = new LatencyTracker("input-mouse");
-    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));
+    const message = createMessage(data, "input");
+    this.wrtc.sendBinary(toBinary(ProtoMessageSchema, 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 tracker = new LatencyTracker("input-mouse");
-      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));
+      const message = createMessage(data, "input");
+      this.wrtc.sendBinary(toBinary(ProtoMessageSchema, message));
     };
   }
 
@@ -213,4 +137,4 @@ export class Mouse {
   private keyToVirtualKeyCode(code: number) {
     return mouseButtonToLinuxEventCode[code] || undefined;
   }
-}
+}

packages/input/src/proto/latency_tracker_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.9.0 with parameter "target=ts"
+// @generated by protoc-gen-es v2.10.1 with parameter "target=ts"
 // @generated from file latency_tracker.proto (package proto, syntax proto3)
 /* eslint-disable */
 

packages/input/src/proto/messages_pb.ts

@@ -1,10 +1,10 @@
-// @generated by protoc-gen-es v2.9.0 with parameter "target=ts"
+// @generated by protoc-gen-es v2.10.1 with parameter "target=ts"
 // @generated from file messages.proto (package proto, syntax proto3)
 /* eslint-disable */
 
 import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
 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,134 @@ 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";
+  } | {
+    /**
+     * ProtoClipboard clipboard = 9;
+     *
+     * @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.
- * Use `create(ProtoMessageInputSchema)` to create a new message.
+ * Describes the message proto.ProtoMessage.
+ * 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.9.0 with parameter "target=ts"
+// @generated by protoc-gen-es v2.10.1 with parameter "target=ts"
 // @generated from file types.proto (package proto, syntax proto3)
 /* eslint-disable */
 
-import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
-import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
+import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
+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("Cgt0eXBlcy5wcm90bxIFcHJvdG8iNAoOUHJvdG9Nb3VzZU1vdmUSDAoEdHlwZRgBIAEoCRIJCgF4GAIgASgFEgkKAXkYAyABKAUiNwoRUHJvdG9Nb3VzZU1vdmVBYnMSDAoEdHlwZRgBIAEoCRIJCgF4GAIgASgFEgkKAXkYAyABKAUiNQoPUHJvdG9Nb3VzZVdoZWVsEgwKBHR5cGUYASABKAkSCQoBeBgCIAEoBRIJCgF5GAMgASgFIi4KEVByb3RvTW91c2VLZXlEb3duEgwKBHR5cGUYASABKAkSCwoDa2V5GAIgASgFIiwKD1Byb3RvTW91c2VLZXlVcBIMCgR0eXBlGAEgASgJEgsKA2tleRgCIAEoBSIpCgxQcm90b0tleURvd24SDAoEdHlwZRgBIAEoCRILCgNrZXkYAiABKAUiJwoKUHJvdG9LZXlVcBIMCgR0eXBlGAEgASgJEgsKA2tleRgCIAEoBSI/ChVQcm90b0NvbnRyb2xsZXJBdHRhY2gSDAoEdHlwZRgBIAEoCRIKCgJpZBgCIAEoCRIMCgRzbG90GAMgASgFIjMKFVByb3RvQ29udHJvbGxlckRldGFjaBIMCgR0eXBlGAEgASgJEgwKBHNsb3QYAiABKAUiVAoVUHJvdG9Db250cm9sbGVyQnV0dG9uEgwKBHR5cGUYASABKAkSDAoEc2xvdBgCIAEoBRIOCgZidXR0b24YAyABKAUSDwoHcHJlc3NlZBgEIAEoCCJUChZQcm90b0NvbnRyb2xsZXJUcmlnZ2VyEgwKBHR5cGUYASABKAkSDAoEc2xvdBgCIAEoBRIPCgd0cmlnZ2VyGAMgASgFEg0KBXZhbHVlGAQgASgFIlcKFFByb3RvQ29udHJvbGxlclN0aWNrEgwKBHR5cGUYASABKAkSDAoEc2xvdBgCIAEoBRINCgVzdGljaxgDIAEoBRIJCgF4GAQgASgFEgkKAXkYBSABKAUiTgoTUHJvdG9Db250cm9sbGVyQXhpcxIMCgR0eXBlGAEgASgJEgwKBHNsb3QYAiABKAUSDAoEYXhpcxgDIAEoBRINCgV2YWx1ZRgEIAEoBSJ0ChVQcm90b0NvbnRyb2xsZXJSdW1ibGUSDAoEdHlwZRgBIAEoCRIMCgRzbG90GAIgASgFEhUKDWxvd19mcmVxdWVuY3kYAyABKAUSFgoOaGlnaF9mcmVxdWVuY3kYBCABKAUSEAoIZHVyYXRpb24YBSABKAUi9QUKClByb3RvSW5wdXQSKwoKbW91c2VfbW92ZRgBIAEoCzIVLnByb3RvLlByb3RvTW91c2VNb3ZlSAASMgoObW91c2VfbW92ZV9hYnMYAiABKAsyGC5wcm90by5Qcm90b01vdXNlTW92ZUFic0gAEi0KC21vdXNlX3doZWVsGAMgASgLMhYucHJvdG8uUHJvdG9Nb3VzZVdoZWVsSAASMgoObW91c2Vfa2V5X2Rvd24YBCABKAsyGC5wcm90by5Qcm90b01vdXNlS2V5RG93bkgAEi4KDG1vdXNlX2tleV91cBgFIAEoCzIWLnByb3RvLlByb3RvTW91c2VLZXlVcEgAEicKCGtleV9kb3duGAYgASgLMhMucHJvdG8uUHJvdG9LZXlEb3duSAASIwoGa2V5X3VwGAcgASgLMhEucHJvdG8uUHJvdG9LZXlVcEgAEjkKEWNvbnRyb2xsZXJfYXR0YWNoGAggASgLMhwucHJvdG8uUHJvdG9Db250cm9sbGVyQXR0YWNoSAASOQoRY29udHJvbGxlcl9kZXRhY2gYCSABKAsyHC5wcm90by5Qcm90b0NvbnRyb2xsZXJEZXRhY2hIABI5ChFjb250cm9sbGVyX2J1dHRvbhgKIAEoCzIcLnByb3RvLlByb3RvQ29udHJvbGxlckJ1dHRvbkgAEjsKEmNvbnRyb2xsZXJfdHJpZ2dlchgLIAEoCzIdLnByb3RvLlByb3RvQ29udHJvbGxlclRyaWdnZXJIABI3ChBjb250cm9sbGVyX3N0aWNrGAwgASgLMhsucHJvdG8uUHJvdG9Db250cm9sbGVyU3RpY2tIABI1Cg9jb250cm9sbGVyX2F4aXMYDSABKAsyGi5wcm90by5Qcm90b0NvbnRyb2xsZXJBeGlzSAASOQoRY29udHJvbGxlcl9ydW1ibGUYDiABKAsyHC5wcm90by5Qcm90b0NvbnRyb2xsZXJSdW1ibGVIAEIMCgppbnB1dF90eXBlQhZaFHJlbGF5L2ludGVybmFsL3Byb3RvYgZwcm90bzM");
+  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: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 x = 2;
+   * @generated from field: int32 x = 1;
    */
   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: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 x = 2;
+   * @generated from field: int32 x = 1;
    */
   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: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 x = 2;
+   * @generated from field: int32 x = 1;
    */
   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: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 key = 2;
+   * @generated from field: int32 key = 1;
    */
   key: number;
 };
@@ -138,14 +110,7 @@ export const ProtoMouseKeyDownSchema: GenMessage<ProtoMouseKeyDown> = /*@__PURE_
  */
 export type ProtoMouseKeyUp = Message<"proto.ProtoMouseKeyUp"> & {
   /**
-   * Fixed value "MouseKeyUp"
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 key = 2;
+   * @generated from field: int32 key = 1;
    */
   key: number;
 };
@@ -164,14 +129,7 @@ export const ProtoMouseKeyUpSchema: GenMessage<ProtoMouseKeyUp> = /*@__PURE__*/
  */
 export type ProtoKeyDown = Message<"proto.ProtoKeyDown"> & {
   /**
-   * Fixed value "KeyDown"
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 key = 2;
+   * @generated from field: int32 key = 1;
    */
   key: number;
 };
@@ -190,14 +148,7 @@ export const ProtoKeyDownSchema: GenMessage<ProtoKeyDown> = /*@__PURE__*/
  */
 export type ProtoKeyUp = Message<"proto.ProtoKeyUp"> & {
   /**
-   * Fixed value "KeyUp"
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * @generated from field: int32 key = 2;
+   * @generated from field: int32 key = 1;
    */
   key: number;
 };
@@ -215,26 +166,26 @@ export const ProtoKeyUpSchema: GenMessage<ProtoKeyUp> = /*@__PURE__*/
  * @generated from message proto.ProtoControllerAttach
  */
 export type ProtoControllerAttach = Message<"proto.ProtoControllerAttach"> & {
-  /**
-   * Fixed value "ControllerAttach"
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
   /**
    * One of the following enums: "ps", "xbox" or "switch"
    *
-   * @generated from field: string id = 2;
+   * @generated from field: string id = 1;
    */
   id: string;
 
   /**
-   * Slot number (0-3)
+   * Session specific slot number (0-3)
    *
-   * @generated from field: int32 slot = 3;
+   * @generated from field: int32 session_slot = 2;
    */
-  slot: number;
+  sessionSlot: number;
+
+  /**
+   * Session ID of the client
+   *
+   * @generated from field: string session_id = 3;
+   */
+  sessionId: string;
 };
 
 /**
@@ -251,18 +202,18 @@ export const ProtoControllerAttachSchema: GenMessage<ProtoControllerAttach> = /*
  */
 export type ProtoControllerDetach = Message<"proto.ProtoControllerDetach"> & {
   /**
-   * Fixed value "ControllerDetach"
+   * Session specific slot number (0-3)
    *
-   * @generated from field: string type = 1;
+   * @generated from field: int32 session_slot = 1;
    */
-  type: string;
+  sessionSlot: number;
 
   /**
-   * Slot number (0-3)
+   * Session ID of the client
    *
-   * @generated from field: int32 slot = 2;
+   * @generated from field: string session_id = 2;
    */
-  slot: number;
+  sessionId: string;
 };
 
 /**
@@ -272,181 +223,6 @@ export type ProtoControllerDetach = Message<"proto.ProtoControllerDetach"> & {
 export const ProtoControllerDetachSchema: GenMessage<ProtoControllerDetach> = /*@__PURE__*/
   messageDesc(file_types, 8);
 
-/**
- * ControllerButton message
- *
- * @generated from message proto.ProtoControllerButton
- */
-export type ProtoControllerButton = Message<"proto.ProtoControllerButton"> & {
-  /**
-   * Fixed value "ControllerButtons"
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * Slot number (0-3)
-   *
-   * @generated from field: int32 slot = 2;
-   */
-  slot: number;
-
-  /**
-   * Button code (linux input event code)
-   *
-   * @generated from field: int32 button = 3;
-   */
-  button: number;
-
-  /**
-   * true if pressed, false if released
-   *
-   * @generated from field: bool pressed = 4;
-   */
-  pressed: boolean;
-};
-
-/**
- * Describes the message proto.ProtoControllerButton.
- * Use `create(ProtoControllerButtonSchema)` to create a new message.
- */
-export const ProtoControllerButtonSchema: GenMessage<ProtoControllerButton> = /*@__PURE__*/
-  messageDesc(file_types, 9);
-
-/**
- * ControllerTriggers message
- *
- * @generated from message proto.ProtoControllerTrigger
- */
-export type ProtoControllerTrigger = Message<"proto.ProtoControllerTrigger"> & {
-  /**
-   * Fixed value "ControllerTriggers"
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * Slot number (0-3)
-   *
-   * @generated from field: int32 slot = 2;
-   */
-  slot: number;
-
-  /**
-   * Trigger number (0 for left, 1 for right)
-   *
-   * @generated from field: int32 trigger = 3;
-   */
-  trigger: number;
-
-  /**
-   * trigger value (-32768 to 32767)
-   *
-   * @generated from field: int32 value = 4;
-   */
-  value: number;
-};
-
-/**
- * Describes the message proto.ProtoControllerTrigger.
- * Use `create(ProtoControllerTriggerSchema)` to create a new message.
- */
-export const ProtoControllerTriggerSchema: GenMessage<ProtoControllerTrigger> = /*@__PURE__*/
-  messageDesc(file_types, 10);
-
-/**
- * ControllerSticks message
- *
- * @generated from message proto.ProtoControllerStick
- */
-export type ProtoControllerStick = Message<"proto.ProtoControllerStick"> & {
-  /**
-   * Fixed value "ControllerStick"
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * Slot number (0-3)
-   *
-   * @generated from field: int32 slot = 2;
-   */
-  slot: number;
-
-  /**
-   * Stick number (0 for left, 1 for right)
-   *
-   * @generated from field: int32 stick = 3;
-   */
-  stick: number;
-
-  /**
-   * X axis value (-32768 to 32767)
-   *
-   * @generated from field: int32 x = 4;
-   */
-  x: number;
-
-  /**
-   * Y axis value (-32768 to 32767)
-   *
-   * @generated from field: int32 y = 5;
-   */
-  y: number;
-};
-
-/**
- * Describes the message proto.ProtoControllerStick.
- * Use `create(ProtoControllerStickSchema)` to create a new message.
- */
-export const ProtoControllerStickSchema: GenMessage<ProtoControllerStick> = /*@__PURE__*/
-  messageDesc(file_types, 11);
-
-/**
- * ControllerAxis message
- *
- * @generated from message proto.ProtoControllerAxis
- */
-export type ProtoControllerAxis = Message<"proto.ProtoControllerAxis"> & {
-  /**
-   * Fixed value "ControllerAxis"
-   *
-   * @generated from field: string type = 1;
-   */
-  type: string;
-
-  /**
-   * Slot number (0-3)
-   *
-   * @generated from field: int32 slot = 2;
-   */
-  slot: number;
-
-  /**
-   * Axis number (0 for d-pad horizontal, 1 for d-pad vertical)
-   *
-   * @generated from field: int32 axis = 3;
-   */
-  axis: number;
-
-  /**
-   * axis value (-1 to 1)
-   *
-   * @generated from field: int32 value = 4;
-   */
-  value: number;
-};
-
-/**
- * Describes the message proto.ProtoControllerAxis.
- * Use `create(ProtoControllerAxisSchema)` to create a new message.
- */
-export const ProtoControllerAxisSchema: GenMessage<ProtoControllerAxis> = /*@__PURE__*/
-  messageDesc(file_types, 12);
-
 /**
  * ControllerRumble message
  *
@@ -454,18 +230,18 @@ export const ProtoControllerAxisSchema: GenMessage<ProtoControllerAxis> = /*@__P
  */
 export type ProtoControllerRumble = Message<"proto.ProtoControllerRumble"> & {
   /**
-   * Fixed value "ControllerRumble"
+   * Session specific slot number (0-3)
    *
-   * @generated from field: string type = 1;
+   * @generated from field: int32 session_slot = 1;
    */
-  type: string;
+  sessionSlot: number;
 
   /**
-   * Slot number (0-3)
+   * Session ID of the client
    *
-   * @generated from field: int32 slot = 2;
+   * @generated from field: string session_id = 2;
    */
-  slot: number;
+  sessionId: string;
 
   /**
    * Low frequency rumble (0-65535)
@@ -494,108 +270,321 @@ export type ProtoControllerRumble = Message<"proto.ProtoControllerRumble"> & {
  * Use `create(ProtoControllerRumbleSchema)` to create a new message.
  */
 export const ProtoControllerRumbleSchema: GenMessage<ProtoControllerRumble> = /*@__PURE__*/
-  messageDesc(file_types, 13);
+  messageDesc(file_types, 9);
 
 /**
- * Union of all Input types
+ * ControllerStateBatch - single message containing full or partial controller state
  *
- * @generated from message proto.ProtoInput
+ * @generated from message proto.ProtoControllerStateBatch
  */
-export type ProtoInput = Message<"proto.ProtoInput"> & {
+export type ProtoControllerStateBatch = Message<"proto.ProtoControllerStateBatch"> & {
   /**
-   * @generated from oneof proto.ProtoInput.input_type
+   * Session specific slot number (0-3)
+   *
+   * @generated from field: int32 session_slot = 1;
    */
-  inputType: {
-    /**
-     * @generated from field: proto.ProtoMouseMove mouse_move = 1;
-     */
-    value: ProtoMouseMove;
-    case: "mouseMove";
-  } | {
-    /**
-     * @generated from field: proto.ProtoMouseMoveAbs mouse_move_abs = 2;
-     */
-    value: ProtoMouseMoveAbs;
-    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";
-  } | {
-    /**
-     * @generated from field: proto.ProtoControllerAttach controller_attach = 8;
-     */
-    value: ProtoControllerAttach;
-    case: "controllerAttach";
-  } | {
-    /**
-     * @generated from field: proto.ProtoControllerDetach controller_detach = 9;
-     */
-    value: ProtoControllerDetach;
-    case: "controllerDetach";
-  } | {
-    /**
-     * @generated from field: proto.ProtoControllerButton controller_button = 10;
-     */
-    value: ProtoControllerButton;
-    case: "controllerButton";
-  } | {
-    /**
-     * @generated from field: proto.ProtoControllerTrigger controller_trigger = 11;
-     */
-    value: ProtoControllerTrigger;
-    case: "controllerTrigger";
-  } | {
-    /**
-     * @generated from field: proto.ProtoControllerStick controller_stick = 12;
-     */
-    value: ProtoControllerStick;
-    case: "controllerStick";
-  } | {
-    /**
-     * @generated from field: proto.ProtoControllerAxis controller_axis = 13;
-     */
-    value: ProtoControllerAxis;
-    case: "controllerAxis";
-  } | {
-    /**
-     * @generated from field: proto.ProtoControllerRumble controller_rumble = 14;
-     */
-    value: ProtoControllerRumble;
-    case: "controllerRumble";
-  } | { case: undefined; value?: undefined };
+  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.ProtoInput.
- * Use `create(ProtoInputSchema)` to create a new message.
+ * Describes the message proto.ProtoControllerStateBatch.
+ * Use `create(ProtoControllerStateBatchSchema)` to create a new message.
  */
-export const ProtoInputSchema: GenMessage<ProtoInput> = /*@__PURE__*/
+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,9 +1,3 @@
-import {
-  NewMessageRaw,
-  NewMessageSDP,
-  NewMessageICE,
-  SafeStream,
-} from "./messages";
 import { webSockets } from "@libp2p/websockets";
 import { webTransport } from "@libp2p/webtransport";
 import { createLibp2p, Libp2p } from "libp2p";
@@ -13,24 +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";
+import { create } from "@bufbuild/protobuf";
+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 _connectionTimer: NodeJS.Timeout | NodeJS.Timer | undefined = undefined;
+  private _onConnected: ((stream: MediaStream | null) => void) | undefined =
+    undefined;
+  private _connectionTimer: NodeJS.Timeout | NodeJS.Timer | undefined =
+    undefined;
   private _serverURL: string | undefined = undefined;
   private _roomName: string | undefined = undefined;
   private _isConnected: boolean = false;
   private _dataChannelCallbacks: Array<(data: any) => void> = [];
-  currentFrameRate: number = 100;
 
   constructor(
     serverURL: string,
@@ -89,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
@@ -107,45 +121,86 @@ 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);
-          await this._p2pSafeStream?.writeMessage(answerMsg);
+          const answerMsg = createMessage(
+            create(ProtoSDPSchema, {
+              sdp: answer,
+            }),
+            "answer",
+          );
+          await this._msgStream?.write(answerMsg);
         });
 
-        this._p2pSafeStream.registerCallback("request-stream-offline", (data) => {
-          console.warn("Stream is offline for room:", data.roomName);
+        this._msgStream.on("request-stream-offline", (msg: ProtoRaw) => {
+          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 request = NewMessageRaw(
+        const requestMsg = createMessage(
+          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;"
@@ -200,11 +255,16 @@ export class WebRTCStream {
 
     this._pc.onicecandidate = (e) => {
       if (e.candidate) {
-        const iceMsg = NewMessageICE("ice-candidate", e.candidate);
-        if (this._p2pSafeStream) {
-          this._p2pSafeStream.writeMessage(iceMsg).catch((err) =>
-            console.error("Error sending ICE candidate:", err),
-          );
+        const iceMsg = createMessage(
+          create(ProtoICESchema, {
+            candidate: e.candidate,
+          }),
+          "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");
         }
@@ -218,8 +278,7 @@ export class WebRTCStream {
   }
 
   private _checkConnectionState() {
-    if (!this._pc || !this._p2p || !this._p2pConn)
-      return;
+    if (!this._pc || !this._p2p || !this._p2pConn) return;
 
     console.debug("Checking connection state:", {
       connectionState: this._pc.connectionState,
@@ -242,26 +301,8 @@ export class WebRTCStream {
           this._onConnected(
             new MediaStream([this._audioTrack, this._videoTrack]),
           );
-
-          // Continuously set low-latency target
-          this._pc.getReceivers().forEach((receiver: RTCRtpReceiver) => {
-            let intervalLoop = setInterval(async () => {
-              if (
-                receiver.track.readyState !== "live" ||
-                (receiver.transport && receiver.transport.state !== "connected")
-              ) {
-                clearInterval(intervalLoop);
-                return;
-              } else {
-                // @ts-ignore
-                receiver.jitterBufferTarget = receiver.jitterBufferDelayHint = receiver.playoutDelayHint = 0;
-              }
-            }, 15);
-          });
         }
       }
-
-      this._gatherFrameRate();
     } else if (
       this._pc.connectionState === "failed" ||
       this._pc.connectionState === "closed" ||
@@ -286,7 +327,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),
+      );
     }
   }
 
@@ -335,7 +378,9 @@ export class WebRTCStream {
   }
 
   public removeDataChannelCallback(callback: (data: any) => void) {
-    this._dataChannelCallbacks = this._dataChannelCallbacks.filter(cb => cb !== callback);
+    this._dataChannelCallbacks = this._dataChannelCallbacks.filter(
+      (cb) => cb !== callback,
+    );
   }
 
   private _setupDataChannelEvents() {
@@ -343,7 +388,7 @@ export class WebRTCStream {
 
     this._dataChannel.onclose = () => console.log("sendChannel has closed");
     this._dataChannel.onopen = () => console.log("sendChannel has opened");
-    this._dataChannel.onmessage = (event => {
+    this._dataChannel.onmessage = (event) => {
       // Parse as ProtoBuf message
       const data = event.data;
       // Call registered callback if exists
@@ -354,14 +399,19 @@ export class WebRTCStream {
           console.error("Error in data channel callback:", err);
         }
       });
-    });
+    };
   }
 
-  private _gatherFrameRate() {
-    if (this._pc === undefined || this._videoTrack === undefined) return;
+  private async _gatherStats(): Promise<any> {
+    if (
+      this._pc === undefined ||
+      this._videoTrack === undefined ||
+      !this._isConnected
+    )
+      return null;
 
-    const videoInfoPromise = new Promise<{ fps: number }>((resolve) => {
-      // Keep trying to get fps until it's found
+    return new Promise<any>((resolve) => {
+      // Keep trying to get stats until gotten
       const interval = setInterval(async () => {
         if (this._pc === undefined) {
           clearInterval(interval);
@@ -373,15 +423,11 @@ export class WebRTCStream {
           if (report.type === "inbound-rtp") {
             clearInterval(interval);
 
-            resolve({ fps: report.framesPerSecond });
+            resolve({ pli: report.pliCount, nack: report.nackCount });
           }
         });
       }, 250);
     });
-
-    videoInfoPromise.then((value) => {
-      this.currentFrameRate = value.fps;
-    });
   }
 
   // Send binary message through the data channel

packages/play-standalone/package.json

@@ -9,8 +9,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^9.4.2",
+    "@astrojs/node": "9.5.0",
     "@nestri/input": "*",
-    "astro": "5.14.5"
+    "astro": "5.15.1"
   }
 }

packages/play-standalone/src/pages/[room].astro

@@ -90,11 +90,7 @@ if (envs_map.size > 0) {
   let nestriControllers: Controller[] = [];
 
   window.addEventListener("gamepadconnected", (e) => {
-    // Ignore gamepads with id including "nestri"
     console.log("Gamepad connected:", e.gamepad);
-    if (e.gamepad.id.toLowerCase().includes("nestri"))
-      return;
-
     const controller = new Controller({
       webrtc: stream,
       e: e,
@@ -103,9 +99,6 @@ if (envs_map.size > 0) {
   });
   window.addEventListener("gamepaddisconnected", (e) => {
     console.log("Gamepad disconnected:", e.gamepad);
-    if (e.gamepad.id.toLowerCase().includes("nestri"))
-      return;
-
     let disconnected = nestriControllers.find((c) => c.getSlot() === e.gamepad.index);
     if (disconnected) {
       disconnected.dispose();

packages/relay/go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/oklog/ulid/v2 v2.1.1
 	github.com/pion/ice/v4 v4.0.10
 	github.com/pion/interceptor v0.1.41
-	github.com/pion/rtp v1.8.24
+	github.com/pion/rtp v1.8.25
 	github.com/pion/webrtc/v4 v4.1.6
 	github.com/prometheus/client_golang v1.23.2
 	google.golang.org/protobuf v1.36.10
@@ -30,17 +30,17 @@ require (
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect
-	github.com/ipfs/go-cid v0.5.0 // indirect
+	github.com/ipfs/go-cid v0.6.0 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/compress v1.18.1 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/koron/go-ssdp v0.1.0 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
 	github.com/libp2p/go-flow-metrics v0.3.0 // indirect
 	github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
 	github.com/libp2p/go-msgio v0.3.0 // indirect
-	github.com/libp2p/go-netroute v0.3.0 // indirect
+	github.com/libp2p/go-netroute v0.4.0 // indirect
 	github.com/libp2p/go-yamux/v5 v5.1.0 // indirect
 	github.com/libp2p/zeroconf/v2 v2.2.0 // indirect
 	github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
@@ -71,13 +71,13 @@ require (
 	github.com/pion/sdp/v3 v3.0.16 // indirect
 	github.com/pion/srtp/v3 v3.0.8 // indirect
 	github.com/pion/stun v0.6.1 // indirect
-	github.com/pion/stun/v3 v3.0.0 // indirect
+	github.com/pion/stun/v3 v3.0.1 // indirect
 	github.com/pion/transport/v2 v2.2.10 // indirect
 	github.com/pion/transport/v3 v3.0.8 // indirect
-	github.com/pion/turn/v4 v4.1.1 // indirect
+	github.com/pion/turn/v4 v4.1.2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.67.1 // indirect
-	github.com/prometheus/procfs v0.17.0 // indirect
+	github.com/prometheus/common v0.67.2 // indirect
+	github.com/prometheus/procfs v0.19.2 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
 	github.com/quic-go/quic-go v0.55.0 // indirect
 	github.com/quic-go/webtransport-go v0.9.0 // indirect
@@ -91,12 +91,12 @@ require (
 	go.uber.org/zap v1.27.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	golang.org/x/crypto v0.43.0 // indirect
-	golang.org/x/exp v0.0.0-20251017212417-90e834f514db // indirect
+	golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
 	golang.org/x/mod v0.29.0 // indirect
 	golang.org/x/net v0.46.0 // indirect
 	golang.org/x/sync v0.17.0 // indirect
 	golang.org/x/sys v0.37.0 // indirect
-	golang.org/x/telemetry v0.0.0-20251014153721-24f779f6aaef // indirect
+	golang.org/x/telemetry v0.0.0-20251028164327-d7a2859f34e8 // indirect
 	golang.org/x/text v0.30.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
 	golang.org/x/tools v0.38.0 // indirect

packages/relay/go.sum

@@ -71,8 +71,8 @@ github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
 github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
-github.com/ipfs/go-cid v0.5.0 h1:goEKKhaGm0ul11IHA7I6p1GmKz8kEYniqFopaB5Otwg=
-github.com/ipfs/go-cid v0.5.0/go.mod h1:0L7vmeNXpQpUS9vt+yEARkJ8rOg43DF3iPgn4GIN0mk=
+github.com/ipfs/go-cid v0.6.0 h1:DlOReBV1xhHBhhfy/gBNNTSyfOM6rLiIx9J7A4DGf30=
+github.com/ipfs/go-cid v0.6.0/go.mod h1:NC4kS1LZjzfhK40UGmpXv5/qD2kcMzACYJNntCUiDhQ=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
@@ -82,8 +82,8 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co=
+github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/koron/go-ssdp v0.1.0 h1:ckl5x5H6qSNFmi+wCuROvvGUu2FQnMbQrU95IHCcv3Y=
@@ -113,8 +113,8 @@ github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUI
 github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg=
 github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
 github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM=
-github.com/libp2p/go-netroute v0.3.0 h1:nqPCXHmeNmgTJnktosJ/sIef9hvwYCrsLxXmfNks/oc=
-github.com/libp2p/go-netroute v0.3.0/go.mod h1:Nkd5ShYgSMS5MUKy/MU2T57xFoOKvvLR92Lic48LEyA=
+github.com/libp2p/go-netroute v0.4.0 h1:sZZx9hyANYUx9PZyqcgE/E1GUG3iEtTZHUEvdtXT7/Q=
+github.com/libp2p/go-netroute v0.4.0/go.mod h1:Nkd5ShYgSMS5MUKy/MU2T57xFoOKvvLR92Lic48LEyA=
 github.com/libp2p/go-reuseport v0.4.0 h1:nR5KU7hD0WxXCJbmw7r2rhRYruNRl2koHw8fQscQm2s=
 github.com/libp2p/go-reuseport v0.4.0/go.mod h1:ZtI03j/wO5hZVDFo2jKywN6bYKWLOy8Se6DrI2E1cLU=
 github.com/libp2p/go-yamux/v5 v5.1.0 h1:8Qlxj4E9JGJAQVW6+uj2o7mqkqsIVlSUGmTWhlXzoHE=
@@ -199,8 +199,8 @@ github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
 github.com/pion/rtcp v1.2.16 h1:fk1B1dNW4hsI78XUCljZJlC4kZOPk67mNRuQ0fcEkSo=
 github.com/pion/rtcp v1.2.16/go.mod h1:/as7VKfYbs5NIb4h6muQ35kQF/J0ZVNz2Z3xKoCBYOo=
-github.com/pion/rtp v1.8.24 h1:+ICyZXUQDv95EsHN70RrA4XKJf5MGWyC6QQc1u6/ynI=
-github.com/pion/rtp v1.8.24/go.mod h1:rF5nS1GqbR7H/TCpKwylzeq6yDM+MM6k+On5EgeThEM=
+github.com/pion/rtp v1.8.25 h1:b8+y44GNbwOJTYWuVan7SglX/hMlicVCAtL50ztyZHw=
+github.com/pion/rtp v1.8.25/go.mod h1:rF5nS1GqbR7H/TCpKwylzeq6yDM+MM6k+On5EgeThEM=
 github.com/pion/sctp v1.8.40 h1:bqbgWYOrUhsYItEnRObUYZuzvOMsVplS3oNgzedBlG8=
 github.com/pion/sctp v1.8.40/go.mod h1:SPBBUENXE6ThkEksN5ZavfAhFYll+h+66ZiG6IZQuzo=
 github.com/pion/sdp/v3 v3.0.16 h1:0dKzYO6gTAvuLaAKQkC02eCPjMIi4NuAr/ibAwrGDCo=
@@ -209,16 +209,16 @@ github.com/pion/srtp/v3 v3.0.8 h1:RjRrjcIeQsilPzxvdaElN0CpuQZdMvcl9VZ5UY9suUM=
 github.com/pion/srtp/v3 v3.0.8/go.mod h1:2Sq6YnDH7/UDCvkSoHSDNDeyBcFgWL0sAVycVbAsXFg=
 github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4=
 github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8=
-github.com/pion/stun/v3 v3.0.0 h1:4h1gwhWLWuZWOJIJR9s2ferRO+W3zA/b6ijOI6mKzUw=
-github.com/pion/stun/v3 v3.0.0/go.mod h1:HvCN8txt8mwi4FBvS3EmDghW6aQJ24T+y+1TKjB5jyU=
+github.com/pion/stun/v3 v3.0.1 h1:jx1uUq6BdPihF0yF33Jj2mh+C9p0atY94IkdnW174kA=
+github.com/pion/stun/v3 v3.0.1/go.mod h1:RHnvlKFg+qHgoKIqtQWMOJF52wsImCAf/Jh5GjX+4Tw=
 github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g=
 github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0=
 github.com/pion/transport/v2 v2.2.10 h1:ucLBLE8nuxiHfvkFKnkDQRYWYfp8ejf4YBOPfaQpw6Q=
 github.com/pion/transport/v2 v2.2.10/go.mod h1:sq1kSLWs+cHW9E+2fJP95QudkzbK7wscs8yYgQToO5E=
 github.com/pion/transport/v3 v3.0.8 h1:oI3myyYnTKUSTthu/NZZ8eu2I5sHbxbUNNFW62olaYc=
 github.com/pion/transport/v3 v3.0.8/go.mod h1:+c2eewC5WJQHiAA46fkMMzoYZSuGzA/7E2FPrOYHctQ=
-github.com/pion/turn/v4 v4.1.1 h1:9UnY2HB99tpDyz3cVVZguSxcqkJ1DsTSZ+8TGruh4fc=
-github.com/pion/turn/v4 v4.1.1/go.mod h1:2123tHk1O++vmjI5VSD0awT50NywDAq5A2NNNU4Jjs8=
+github.com/pion/turn/v4 v4.1.2 h1:Em2svpl6aBFa88dLhxypMUzaLjC79kWZWx8FIov01cc=
+github.com/pion/turn/v4 v4.1.2/go.mod h1:ISYWfZYy0Z3tXzRpyYZHTL+U23yFQIspfxogdQ8pn9Y=
 github.com/pion/webrtc/v4 v4.1.6 h1:srHH2HwvCGwPba25EYJgUzgLqCQoXl1VCUnrGQMSzUw=
 github.com/pion/webrtc/v4 v4.1.6/go.mod h1:wKecGRlkl3ox/As/MYghJL+b/cVXMEhoPMJWPuGQFhU=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -231,11 +231,11 @@ github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.67.1 h1:OTSON1P4DNxzTg4hmKCc37o4ZAZDv0cfXLkOt0oEowI=
-github.com/prometheus/common v0.67.1/go.mod h1:RpmT9v35q2Y+lsieQsdOh5sXZ6ajUGC8NjZAmr8vb0Q=
+github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8=
+github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
-github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
+github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
+github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
 github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
 github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
 github.com/quic-go/quic-go v0.55.0 h1:zccPQIqYCXDt5NmcEabyYvOnomjs8Tlwl7tISjJh9Mk=
@@ -323,8 +323,8 @@ golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1m
 golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
 golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20251017212417-90e834f514db h1:by6IehL4BH5k3e3SJmcoNbOobMey2SLpAF79iPOEBvw=
-golang.org/x/exp v0.0.0-20251017212417-90e834f514db/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
+golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
+golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -396,8 +396,8 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
 golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/telemetry v0.0.0-20251014153721-24f779f6aaef h1:5xFtU4tmJMJSxSeDlr1dgBff2tDXrq0laLdS1EA3LYw=
-golang.org/x/telemetry v0.0.0-20251014153721-24f779f6aaef/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE=
+golang.org/x/telemetry v0.0.0-20251028164327-d7a2859f34e8 h1:DwMAzqwLj2rVin75cRFh1kfhwQY3hyHrU1oCEDZXPmQ=
+golang.org/x/telemetry v0.0.0-20251028164327-d7a2859f34e8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=

packages/relay/internal/common/common.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"fmt"
+	"github.com/pion/interceptor/pkg/nack"
 	"log/slog"
 	"strconv"
 
@@ -26,24 +27,125 @@ func InitWebRTCAPI() error {
 	mediaEngine := &webrtc.MediaEngine{}
 
 	// Register our extensions
-	if err := RegisterExtensions(mediaEngine); err != nil {
+	if err = RegisterExtensions(mediaEngine); err != nil {
 		return fmt.Errorf("failed to register extensions: %w", err)
 	}
 
-	// Default codecs cover our needs
-	err = mediaEngine.RegisterDefaultCodecs()
-	if err != nil {
-		return err
+	// Register codecs
+	for _, codec := range []webrtc.RTPCodecParameters{
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1"},
+			PayloadType:        111,
+		},
+	} {
+		if err = mediaEngine.RegisterCodec(codec, webrtc.RTPCodecTypeAudio); err != nil {
+			return err
+		}
+	}
+
+	videoRTCPFeedback := []webrtc.RTCPFeedback{{"nack", ""}, {"nack", "pli"}}
+	for _, codec := range []webrtc.RTPCodecParameters{
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{
+				MimeType: webrtc.MimeTypeH264, ClockRate: 90000,
+				SDPFmtpLine:  "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f",
+				RTCPFeedback: videoRTCPFeedback,
+			},
+			PayloadType: 102,
+		},
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{
+				MimeType: webrtc.MimeTypeH264, ClockRate: 90000,
+				SDPFmtpLine:  "level-asymmetry-allowed=1;packetization-mode=0;profile-level-id=42001f",
+				RTCPFeedback: videoRTCPFeedback,
+			},
+			PayloadType: 104,
+		},
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{
+				MimeType: webrtc.MimeTypeH264, ClockRate: 90000,
+				SDPFmtpLine:  "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42e01f",
+				RTCPFeedback: videoRTCPFeedback,
+			},
+			PayloadType: 106,
+		},
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{
+				MimeType: webrtc.MimeTypeH264, ClockRate: 90000,
+				SDPFmtpLine:  "level-asymmetry-allowed=1;packetization-mode=0;profile-level-id=42e01f",
+				RTCPFeedback: videoRTCPFeedback,
+			},
+			PayloadType: 108,
+		},
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{
+				MimeType: webrtc.MimeTypeH264, ClockRate: 90000,
+				SDPFmtpLine:  "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=4d001f",
+				RTCPFeedback: videoRTCPFeedback,
+			},
+			PayloadType: 127,
+		},
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{
+				MimeType:     webrtc.MimeTypeH264,
+				ClockRate:    90000,
+				SDPFmtpLine:  "level-asymmetry-allowed=1;packetization-mode=0;profile-level-id=4d001f",
+				RTCPFeedback: videoRTCPFeedback,
+			},
+			PayloadType: 39,
+		},
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{
+				MimeType:     webrtc.MimeTypeH265,
+				ClockRate:    90000,
+				RTCPFeedback: videoRTCPFeedback,
+			},
+			PayloadType: 116,
+		},
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypeAV1, ClockRate: 90000, RTCPFeedback: videoRTCPFeedback},
+			PayloadType:        45,
+		},
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypeVP9, ClockRate: 90000, SDPFmtpLine: "profile-id=0", RTCPFeedback: videoRTCPFeedback},
+			PayloadType:        98,
+		},
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypeVP9, ClockRate: 90000, SDPFmtpLine: "profile-id=2", RTCPFeedback: videoRTCPFeedback},
+			PayloadType:        100,
+		},
+		{
+			RTPCodecCapability: webrtc.RTPCodecCapability{
+				MimeType: webrtc.MimeTypeH264, ClockRate: 90000,
+				SDPFmtpLine:  "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=64001f",
+				RTCPFeedback: videoRTCPFeedback,
+			},
+			PayloadType: 112,
+		},
+	} {
+		if err = mediaEngine.RegisterCodec(codec, webrtc.RTPCodecTypeVideo); err != nil {
+			return err
+		}
 	}
 
 	// Interceptor registry
 	interceptorRegistry := &interceptor.Registry{}
 
-	// Use default set
-	err = webrtc.RegisterDefaultInterceptors(mediaEngine, interceptorRegistry)
+	// Register our interceptors..
+	nackGenFactory, err := nack.NewGeneratorInterceptor()
 	if err != nil {
 		return err
 	}
+	interceptorRegistry.Add(nackGenFactory)
+	nackRespFactory, err := nack.NewResponderInterceptor()
+	if err != nil {
+		return err
+	}
+	interceptorRegistry.Add(nackRespFactory)
+
+	if err = webrtc.ConfigureRTCPReports(interceptorRegistry); err != nil {
+		return err
+	}
 
 	// Setting engine
 	settingEngine := webrtc.SettingEngine{}
@@ -53,7 +155,7 @@ func InitWebRTCAPI() error {
 
 	nat11IP := GetFlags().NAT11IP
 	if len(nat11IP) > 0 {
-		settingEngine.SetNAT1To1IPs([]string{nat11IP}, webrtc.ICECandidateTypeSrflx)
+		settingEngine.SetNAT1To1IPs([]string{nat11IP}, webrtc.ICECandidateTypeHost)
 		slog.Info("Using NAT 1:1 IP for WebRTC", "nat11_ip", nat11IP)
 	}
 

packages/relay/internal/common/flags.go

@@ -125,7 +125,7 @@ func getLocalIP() string {
 		return ""
 	}
 	for _, address := range addrs {
-		if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+		if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() && !ipnet.IP.IsPrivate() && !ipnet.IP.IsUnspecified() {
 			if ipnet.IP.To4() != nil || ipnet.IP != nil {
 				return ipnet.IP.String()
 			}

packages/relay/internal/common/ice_helper.go

@@ -0,0 +1,53 @@
+package common
+
+import (
+	"log/slog"
+
+	"github.com/pion/webrtc/v4"
+)
+
+// ICEHelper holds webrtc.ICECandidateInit(s) until remote candidate is set for given webrtc.PeerConnection
+// Held candidates should be flushed at the end of negotiation to ensure all are available for connection
+type ICEHelper struct {
+	candidates []webrtc.ICECandidateInit
+	pc         *webrtc.PeerConnection
+}
+
+func NewICEHelper(pc *webrtc.PeerConnection) *ICEHelper {
+	return &ICEHelper{
+		pc:         pc,
+		candidates: make([]webrtc.ICECandidateInit, 0),
+	}
+}
+
+func (ice *ICEHelper) SetPeerConnection(pc *webrtc.PeerConnection) {
+	ice.pc = pc
+}
+
+func (ice *ICEHelper) AddCandidate(c webrtc.ICECandidateInit) {
+	if ice.pc != nil {
+		if ice.pc.RemoteDescription() != nil {
+			// Add immediately if remote is set
+			if err := ice.pc.AddICECandidate(c); err != nil {
+				slog.Error("Failed to add ICE candidate", "err", err)
+			}
+			// Also flush held candidates automatically
+			ice.FlushHeldCandidates()
+		} else {
+			// Hold in slice until remote is set
+			ice.candidates = append(ice.candidates, c)
+		}
+	}
+}
+
+func (ice *ICEHelper) FlushHeldCandidates() {
+	if ice.pc != nil && len(ice.candidates) > 0 {
+		for _, heldCandidate := range ice.candidates {
+			if err := ice.pc.AddICECandidate(heldCandidate); err != nil {
+				slog.Error("Failed to add held ICE candidate", "err", err)
+			}
+		}
+		// Clear the held candidates
+		ice.candidates = make([]webrtc.ICECandidateInit, 0)
+	}
+}

packages/relay/internal/common/safebufio.go

@@ -3,16 +3,28 @@ package common
 import (
 	"bufio"
 	"encoding/binary"
-	"encoding/json"
 	"errors"
 	"io"
+	gen "relay/internal/proto"
 	"sync"
 
 	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
-// MaxSize is the maximum allowed data size (1MB)
-const MaxSize = 1024 * 1024
+// readUvarint reads an unsigned varint from the reader
+func readUvarint(r io.ByteReader) (uint64, error) {
+	return binary.ReadUvarint(r)
+}
+
+// writeUvarint writes an unsigned varint to the writer
+func writeUvarint(w io.Writer, x uint64) error {
+	buf := make([]byte, binary.MaxVarintLen64)
+	n := binary.PutUvarint(buf, x)
+	_, err := w.Write(buf[:n])
+	return err
+}
 
 // SafeBufioRW wraps a bufio.ReadWriter for sending and receiving JSON and protobufs safely
 type SafeBufioRW struct {
@@ -24,83 +36,6 @@ func NewSafeBufioRW(brw *bufio.ReadWriter) *SafeBufioRW {
 	return &SafeBufioRW{brw: brw}
 }
 
-// SendJSON serializes the given data as JSON and sends it with a 4-byte length prefix
-func (bu *SafeBufioRW) SendJSON(data interface{}) error {
-	bu.mutex.Lock()
-	defer bu.mutex.Unlock()
-
-	jsonData, err := json.Marshal(data)
-	if err != nil {
-		return err
-	}
-
-	if len(jsonData) > MaxSize {
-		return errors.New("JSON data exceeds maximum size")
-	}
-
-	// Write the 4-byte length prefix
-	if err = binary.Write(bu.brw, binary.BigEndian, uint32(len(jsonData))); err != nil {
-		return err
-	}
-
-	// Write the JSON data
-	if _, err = bu.brw.Write(jsonData); err != nil {
-		return err
-	}
-
-	// Flush the writer to ensure data is sent
-	return bu.brw.Flush()
-}
-
-// ReceiveJSON reads a 4-byte length prefix, then reads and unmarshals the JSON
-func (bu *SafeBufioRW) ReceiveJSON(dest interface{}) error {
-	bu.mutex.RLock()
-	defer bu.mutex.RUnlock()
-
-	// Read the 4-byte length prefix
-	var length uint32
-	if err := binary.Read(bu.brw, binary.BigEndian, &length); err != nil {
-		return err
-	}
-
-	if length > MaxSize {
-		return errors.New("received JSON data exceeds maximum size")
-	}
-
-	// Read the JSON data
-	data := make([]byte, length)
-	if _, err := io.ReadFull(bu.brw, data); err != nil {
-		return err
-	}
-
-	return json.Unmarshal(data, dest)
-}
-
-// Receive reads a 4-byte length prefix, then reads the raw data
-func (bu *SafeBufioRW) Receive() ([]byte, error) {
-	bu.mutex.RLock()
-	defer bu.mutex.RUnlock()
-
-	// Read the 4-byte length prefix
-	var length uint32
-	if err := binary.Read(bu.brw, binary.BigEndian, &length); err != nil {
-		return nil, err
-	}
-
-	if length > MaxSize {
-		return nil, errors.New("received data exceeds maximum size")
-	}
-
-	// Read the raw data
-	data := make([]byte, length)
-	if _, err := io.ReadFull(bu.brw, data); err != nil {
-		return nil, err
-	}
-
-	return data, nil
-}
-
-// SendProto serializes the given protobuf message and sends it with a 4-byte length prefix
 func (bu *SafeBufioRW) SendProto(msg proto.Message) error {
 	bu.mutex.Lock()
 	defer bu.mutex.Unlock()
@@ -110,12 +45,8 @@ func (bu *SafeBufioRW) SendProto(msg proto.Message) error {
 		return err
 	}
 
-	if len(protoData) > MaxSize {
-		return errors.New("protobuf data exceeds maximum size")
-	}
-
-	// Write the 4-byte length prefix
-	if err = binary.Write(bu.brw, binary.BigEndian, uint32(len(protoData))); err != nil {
+	// Write varint length prefix
+	if err := writeUvarint(bu.brw, uint64(len(protoData))); err != nil {
 		return err
 	}
 
@@ -124,25 +55,19 @@ func (bu *SafeBufioRW) SendProto(msg proto.Message) error {
 		return err
 	}
 
-	// Flush the writer to ensure data is sent
 	return bu.brw.Flush()
 }
 
-// ReceiveProto reads a 4-byte length prefix, then reads and unmarshals the protobuf
 func (bu *SafeBufioRW) ReceiveProto(msg proto.Message) error {
 	bu.mutex.RLock()
 	defer bu.mutex.RUnlock()
 
-	// Read the 4-byte length prefix
-	var length uint32
-	if err := binary.Read(bu.brw, binary.BigEndian, &length); err != nil {
+	// Read varint length prefix
+	length, err := readUvarint(bu.brw)
+	if err != nil {
 		return err
 	}
 
-	if length > MaxSize {
-		return errors.New("received Protobuf data exceeds maximum size")
-	}
-
 	// Read the Protobuf data
 	data := make([]byte, length)
 	if _, err := io.ReadFull(bu.brw, data); err != nil {
@@ -152,24 +77,51 @@ func (bu *SafeBufioRW) ReceiveProto(msg proto.Message) error {
 	return proto.Unmarshal(data, msg)
 }
 
-// Write writes raw data to the underlying buffer
-func (bu *SafeBufioRW) Write(data []byte) (int, error) {
-	bu.mutex.Lock()
-	defer bu.mutex.Unlock()
-
-	if len(data) > MaxSize {
-		return 0, errors.New("data exceeds maximum size")
-	}
-
-	n, err := bu.brw.Write(data)
-	if err != nil {
-		return n, err
-	}
-
-	// Flush the writer to ensure data is sent
-	if err = bu.brw.Flush(); err != nil {
-		return n, err
-	}
-
-	return n, nil
+type CreateMessageOptions struct {
+	SequenceID string
+	Latency    *gen.ProtoLatencyTracker
+}
+
+func CreateMessage(payload proto.Message, payloadType string, opts *CreateMessageOptions) (*gen.ProtoMessage, error) {
+	msg := &gen.ProtoMessage{
+		MessageBase: &gen.ProtoMessageBase{
+			PayloadType: payloadType,
+		},
+	}
+
+	if opts != nil {
+		if opts.Latency != nil {
+			msg.MessageBase.Latency = opts.Latency
+		} else if opts.SequenceID != "" {
+			msg.MessageBase.Latency = &gen.ProtoLatencyTracker{
+				SequenceId: opts.SequenceID,
+				Timestamps: []*gen.ProtoTimestampEntry{
+					{
+						Stage: "created",
+						Time:  timestamppb.Now(),
+					},
+				},
+			}
+		}
+	}
+
+	// Use reflection to set the oneof field automatically
+	msgReflect := msg.ProtoReflect()
+	payloadReflect := payload.ProtoReflect()
+
+	oneofDesc := msgReflect.Descriptor().Oneofs().ByName("payload")
+	if oneofDesc == nil {
+		return nil, errors.New("payload oneof not found")
+	}
+
+	fields := oneofDesc.Fields()
+	for i := 0; i < fields.Len(); i++ {
+		field := fields.Get(i)
+		if field.Message() != nil && field.Message().FullName() == payloadReflect.Descriptor().FullName() {
+			msgReflect.Set(field, protoreflect.ValueOfMessage(payloadReflect))
+			return msg, nil
+		}
+	}
+
+	return nil, errors.New("payload type not found in oneof")
 }

packages/relay/internal/connections/datachannel.go

@@ -31,16 +31,18 @@ func NewNestriDataChannel(dc *webrtc.DataChannel) *NestriDataChannel {
 		}
 
 		// Decode message
-		var base gen.ProtoMessageInput
+		var base gen.ProtoMessage
 		if err := proto.Unmarshal(msg.Data, &base); err != nil {
 			slog.Error("failed to decode binary DataChannel message", "err", err)
 			return
 		}
 
-		// Handle message type callback
-		if callback, ok := ndc.callbacks["input"]; ok {
-			go callback(msg.Data)
-		} // We don't care about unhandled messages
+		// Route based on PayloadType
+		if base.MessageBase != nil && len(base.MessageBase.PayloadType) > 0 {
+			if callback, ok := ndc.callbacks[base.MessageBase.PayloadType]; ok {
+				go callback(msg.Data)
+			}
+		}
 	})
 
 	return ndc

packages/relay/internal/connections/messages.go

@@ -1,94 +0,0 @@
-package connections
-
-import (
-	"encoding/json"
-	"relay/internal/common"
-
-	"github.com/pion/webrtc/v4"
-)
-
-// MessageBase is the base type for any JSON message
-type MessageBase struct {
-	Type    string                 `json:"payload_type"`
-	Latency *common.LatencyTracker `json:"latency,omitempty"`
-}
-
-type MessageRaw struct {
-	MessageBase
-	Data json.RawMessage `json:"data"`
-}
-
-func NewMessageRaw(t string, data json.RawMessage) *MessageRaw {
-	return &MessageRaw{
-		MessageBase: MessageBase{
-			Type: t,
-		},
-		Data: data,
-	}
-}
-
-type MessageLog struct {
-	MessageBase
-	Level   string `json:"level"`
-	Message string `json:"message"`
-	Time    string `json:"time"`
-}
-
-func NewMessageLog(t string, level, message, time string) *MessageLog {
-	return &MessageLog{
-		MessageBase: MessageBase{
-			Type: t,
-		},
-		Level:   level,
-		Message: message,
-		Time:    time,
-	}
-}
-
-type MessageMetrics struct {
-	MessageBase
-	UsageCPU        float64 `json:"usage_cpu"`
-	UsageMemory     float64 `json:"usage_memory"`
-	Uptime          uint64  `json:"uptime"`
-	PipelineLatency float64 `json:"pipeline_latency"`
-}
-
-func NewMessageMetrics(t string, usageCPU, usageMemory float64, uptime uint64, pipelineLatency float64) *MessageMetrics {
-	return &MessageMetrics{
-		MessageBase: MessageBase{
-			Type: t,
-		},
-		UsageCPU:        usageCPU,
-		UsageMemory:     usageMemory,
-		Uptime:          uptime,
-		PipelineLatency: pipelineLatency,
-	}
-}
-
-type MessageICE struct {
-	MessageBase
-	Candidate webrtc.ICECandidateInit `json:"candidate"`
-}
-
-func NewMessageICE(t string, candidate webrtc.ICECandidateInit) *MessageICE {
-	return &MessageICE{
-		MessageBase: MessageBase{
-			Type: t,
-		},
-		Candidate: candidate,
-	}
-}
-
-type MessageSDP struct {
-	MessageBase
-	SDP webrtc.SessionDescription `json:"sdp"`
-}
-
-func NewMessageSDP(t string, sdp webrtc.SessionDescription) *MessageSDP {
-	return &MessageSDP{
-		MessageBase: MessageBase{
-			Type: t,
-		},
-		SDP: sdp,
-	}
-}

packages/relay/internal/core/core.go

@@ -20,9 +20,9 @@ import (
 	rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
 	"github.com/libp2p/go-libp2p/p2p/protocol/ping"
 	"github.com/libp2p/go-libp2p/p2p/security/noise"
+	p2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic"
 	"github.com/libp2p/go-libp2p/p2p/transport/quicreuse"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
-	ws "github.com/libp2p/go-libp2p/p2p/transport/websocket"
 	webtransport "github.com/libp2p/go-libp2p/p2p/transport/webtransport"
 	"github.com/multiformats/go-multiaddr"
 	"github.com/oklog/ulid/v2"
@@ -91,10 +91,10 @@ func NewRelay(ctx context.Context, port int, identityKey crypto.PrivKey) (*Relay
 	listenAddrs := []string{
 		fmt.Sprintf("/ip4/0.0.0.0/tcp/%d", port),                      // IPv4 - Raw TCP
 		fmt.Sprintf("/ip6/::/tcp/%d", port),                           // IPv6 - Raw TCP
-		fmt.Sprintf("/ip4/0.0.0.0/tcp/%d/ws", port),                   // IPv4 - TCP WebSocket
-		fmt.Sprintf("/ip6/::/tcp/%d/ws", port),                        // IPv6 - TCP WebSocket
 		fmt.Sprintf("/ip4/0.0.0.0/udp/%d/quic-v1/webtransport", port), // IPv4 - UDP QUIC WebTransport
 		fmt.Sprintf("/ip6/::/udp/%d/quic-v1/webtransport", port),      // IPv6 - UDP QUIC WebTransport
+		fmt.Sprintf("/ip4/0.0.0.0/udp/%d/quic-v1", port),              // IPv4 - UDP Raw QUIC
+		fmt.Sprintf("/ip6/::/udp/%d/quic-v1", port),                   // IPv6 - UDP Raw QUIC
 	}
 
 	var muAddrs []multiaddr.Multiaddr
@@ -112,8 +112,8 @@ func NewRelay(ctx context.Context, port int, identityKey crypto.PrivKey) (*Relay
 		libp2p.Identity(identityKey),
 		// Enable required transports
 		libp2p.Transport(tcp.NewTCPTransport),
-		libp2p.Transport(ws.New),
 		libp2p.Transport(webtransport.New),
+		libp2p.Transport(p2pquic.NewTransport),
 		// Other options
 		libp2p.ListenAddrs(muAddrs...),
 		libp2p.Security(noise.ID, noise.New),

packages/relay/internal/core/room.go

@@ -45,7 +45,7 @@ func (r *Relay) DeleteRoomIfEmpty(room *shared.Room) {
 	if room == nil {
 		return
 	}
-	if room.Participants.Len() == 0 && r.LocalRooms.Has(room.ID) {
+	if len(room.Participants) <= 0 && r.LocalRooms.Has(room.ID) {
 		slog.Debug("Deleting empty room without participants", "room", room.Name)
 		r.LocalRooms.Delete(room.ID)
 		err := room.PeerConnection.Close()

packages/relay/internal/core/state.go

@@ -129,12 +129,11 @@ func (r *Relay) onPeerConnected(peerID peer.ID) {
 
 // onPeerDisconnected marks a peer as disconnected in our status view and removes latency info
 func (r *Relay) onPeerDisconnected(peerID peer.ID) {
+	// Relay peer disconnect handling
 	slog.Info("Mesh peer disconnected, deleting from local peer map", "peer", peerID)
-	// Remove peer from local mesh peers
 	if r.Peers.Has(peerID) {
 		r.Peers.Delete(peerID)
 	}
-	// Remove any rooms associated with this peer
 	if r.Rooms.Has(peerID.String()) {
 		r.Rooms.Delete(peerID.String())
 	}
@@ -151,18 +150,18 @@ func (r *Relay) updateMeshRoomStates(peerID peer.ID, states []shared.RoomInfo) {
 		}
 
 		// If previously did not exist, but does now, request a connection if participants exist for our room
-		existed := r.Rooms.Has(state.ID.String())
+		/*existed := r.Rooms.Has(state.ID.String())
 		if !existed {
 			// Request connection to this peer if we have participants in our local room
 			if room, ok := r.LocalRooms.Get(state.ID); ok {
-				if room.Participants.Len() > 0 {
+				if len(room.Participants) > 0 {
 					slog.Debug("Got new remote room state, we locally have participants for, requesting stream", "room_name", room.Name, "peer", peerID)
 					if err := r.StreamProtocol.RequestStream(context.Background(), room, peerID); err != nil {
 						slog.Error("Failed to request stream for new remote room state", "room_name", room.Name, "peer", peerID, "err", err)
 					}
 				}
 			}
-		}
+		}*/
 
 		r.Rooms.Set(state.ID.String(), state)
 	}

packages/relay/internal/proto/messages.pb.go

@@ -73,28 +73,47 @@ func (x *ProtoMessageBase) GetLatency() *ProtoLatencyTracker {
 	return nil
 }
 
-type ProtoMessageInput struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	MessageBase   *ProtoMessageBase      `protobuf:"bytes,1,opt,name=message_base,json=messageBase,proto3" json:"message_base,omitempty"`
-	Data          *ProtoInput            `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+type ProtoMessage struct {
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	MessageBase *ProtoMessageBase      `protobuf:"bytes,1,opt,name=message_base,json=messageBase,proto3" json:"message_base,omitempty"`
+	// Types that are valid to be assigned to Payload:
+	//
+	//	*ProtoMessage_MouseMove
+	//	*ProtoMessage_MouseMoveAbs
+	//	*ProtoMessage_MouseWheel
+	//	*ProtoMessage_MouseKeyDown
+	//	*ProtoMessage_MouseKeyUp
+	//	*ProtoMessage_KeyDown
+	//	*ProtoMessage_KeyUp
+	//	*ProtoMessage_ControllerAttach
+	//	*ProtoMessage_ControllerDetach
+	//	*ProtoMessage_ControllerRumble
+	//	*ProtoMessage_ControllerStateBatch
+	//	*ProtoMessage_Ice
+	//	*ProtoMessage_Sdp
+	//	*ProtoMessage_Raw
+	//	*ProtoMessage_ClientRequestRoomStream
+	//	*ProtoMessage_ClientDisconnected
+	//	*ProtoMessage_ServerPushStream
+	Payload       isProtoMessage_Payload `protobuf_oneof:"payload"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 
-func (x *ProtoMessageInput) Reset() {
-	*x = ProtoMessageInput{}
+func (x *ProtoMessage) Reset() {
+	*x = ProtoMessage{}
 	mi := &file_messages_proto_msgTypes[1]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 
-func (x *ProtoMessageInput) String() string {
+func (x *ProtoMessage) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*ProtoMessageInput) ProtoMessage() {}
+func (*ProtoMessage) ProtoMessage() {}
 
-func (x *ProtoMessageInput) ProtoReflect() protoreflect.Message {
+func (x *ProtoMessage) ProtoReflect() protoreflect.Message {
 	mi := &file_messages_proto_msgTypes[1]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -106,25 +125,287 @@ func (x *ProtoMessageInput) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ProtoMessageInput.ProtoReflect.Descriptor instead.
-func (*ProtoMessageInput) Descriptor() ([]byte, []int) {
+// Deprecated: Use ProtoMessage.ProtoReflect.Descriptor instead.
+func (*ProtoMessage) Descriptor() ([]byte, []int) {
 	return file_messages_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *ProtoMessageInput) GetMessageBase() *ProtoMessageBase {
+func (x *ProtoMessage) GetMessageBase() *ProtoMessageBase {
 	if x != nil {
 		return x.MessageBase
 	}
 	return nil
 }
 
-func (x *ProtoMessageInput) GetData() *ProtoInput {
+func (x *ProtoMessage) GetPayload() isProtoMessage_Payload {
 	if x != nil {
-		return x.Data
+		return x.Payload
 	}
 	return nil
 }
 
+func (x *ProtoMessage) GetMouseMove() *ProtoMouseMove {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_MouseMove); ok {
+			return x.MouseMove
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetMouseMoveAbs() *ProtoMouseMoveAbs {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_MouseMoveAbs); ok {
+			return x.MouseMoveAbs
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetMouseWheel() *ProtoMouseWheel {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_MouseWheel); ok {
+			return x.MouseWheel
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetMouseKeyDown() *ProtoMouseKeyDown {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_MouseKeyDown); ok {
+			return x.MouseKeyDown
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetMouseKeyUp() *ProtoMouseKeyUp {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_MouseKeyUp); ok {
+			return x.MouseKeyUp
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetKeyDown() *ProtoKeyDown {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_KeyDown); ok {
+			return x.KeyDown
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetKeyUp() *ProtoKeyUp {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_KeyUp); ok {
+			return x.KeyUp
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetControllerAttach() *ProtoControllerAttach {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_ControllerAttach); ok {
+			return x.ControllerAttach
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetControllerDetach() *ProtoControllerDetach {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_ControllerDetach); ok {
+			return x.ControllerDetach
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetControllerRumble() *ProtoControllerRumble {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_ControllerRumble); ok {
+			return x.ControllerRumble
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetControllerStateBatch() *ProtoControllerStateBatch {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_ControllerStateBatch); ok {
+			return x.ControllerStateBatch
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetIce() *ProtoICE {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_Ice); ok {
+			return x.Ice
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetSdp() *ProtoSDP {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_Sdp); ok {
+			return x.Sdp
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetRaw() *ProtoRaw {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_Raw); ok {
+			return x.Raw
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetClientRequestRoomStream() *ProtoClientRequestRoomStream {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_ClientRequestRoomStream); ok {
+			return x.ClientRequestRoomStream
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetClientDisconnected() *ProtoClientDisconnected {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_ClientDisconnected); ok {
+			return x.ClientDisconnected
+		}
+	}
+	return nil
+}
+
+func (x *ProtoMessage) GetServerPushStream() *ProtoServerPushStream {
+	if x != nil {
+		if x, ok := x.Payload.(*ProtoMessage_ServerPushStream); ok {
+			return x.ServerPushStream
+		}
+	}
+	return nil
+}
+
+type isProtoMessage_Payload interface {
+	isProtoMessage_Payload()
+}
+
+type ProtoMessage_MouseMove struct {
+	// Input types
+	MouseMove *ProtoMouseMove `protobuf:"bytes,2,opt,name=mouse_move,json=mouseMove,proto3,oneof"`
+}
+
+type ProtoMessage_MouseMoveAbs struct {
+	MouseMoveAbs *ProtoMouseMoveAbs `protobuf:"bytes,3,opt,name=mouse_move_abs,json=mouseMoveAbs,proto3,oneof"`
+}
+
+type ProtoMessage_MouseWheel struct {
+	MouseWheel *ProtoMouseWheel `protobuf:"bytes,4,opt,name=mouse_wheel,json=mouseWheel,proto3,oneof"`
+}
+
+type ProtoMessage_MouseKeyDown struct {
+	MouseKeyDown *ProtoMouseKeyDown `protobuf:"bytes,5,opt,name=mouse_key_down,json=mouseKeyDown,proto3,oneof"`
+}
+
+type ProtoMessage_MouseKeyUp struct {
+	MouseKeyUp *ProtoMouseKeyUp `protobuf:"bytes,6,opt,name=mouse_key_up,json=mouseKeyUp,proto3,oneof"`
+}
+
+type ProtoMessage_KeyDown struct {
+	KeyDown *ProtoKeyDown `protobuf:"bytes,7,opt,name=key_down,json=keyDown,proto3,oneof"`
+}
+
+type ProtoMessage_KeyUp struct {
+	KeyUp *ProtoKeyUp `protobuf:"bytes,8,opt,name=key_up,json=keyUp,proto3,oneof"`
+}
+
+type ProtoMessage_ControllerAttach struct {
+	// Controller input types
+	ControllerAttach *ProtoControllerAttach `protobuf:"bytes,9,opt,name=controller_attach,json=controllerAttach,proto3,oneof"`
+}
+
+type ProtoMessage_ControllerDetach struct {
+	ControllerDetach *ProtoControllerDetach `protobuf:"bytes,10,opt,name=controller_detach,json=controllerDetach,proto3,oneof"`
+}
+
+type ProtoMessage_ControllerRumble struct {
+	ControllerRumble *ProtoControllerRumble `protobuf:"bytes,11,opt,name=controller_rumble,json=controllerRumble,proto3,oneof"`
+}
+
+type ProtoMessage_ControllerStateBatch struct {
+	ControllerStateBatch *ProtoControllerStateBatch `protobuf:"bytes,12,opt,name=controller_state_batch,json=controllerStateBatch,proto3,oneof"`
+}
+
+type ProtoMessage_Ice struct {
+	// Signaling types
+	Ice *ProtoICE `protobuf:"bytes,20,opt,name=ice,proto3,oneof"`
+}
+
+type ProtoMessage_Sdp struct {
+	Sdp *ProtoSDP `protobuf:"bytes,21,opt,name=sdp,proto3,oneof"`
+}
+
+type ProtoMessage_Raw struct {
+	Raw *ProtoRaw `protobuf:"bytes,22,opt,name=raw,proto3,oneof"`
+}
+
+type ProtoMessage_ClientRequestRoomStream struct {
+	ClientRequestRoomStream *ProtoClientRequestRoomStream `protobuf:"bytes,23,opt,name=client_request_room_stream,json=clientRequestRoomStream,proto3,oneof"`
+}
+
+type ProtoMessage_ClientDisconnected struct {
+	ClientDisconnected *ProtoClientDisconnected `protobuf:"bytes,24,opt,name=client_disconnected,json=clientDisconnected,proto3,oneof"`
+}
+
+type ProtoMessage_ServerPushStream struct {
+	ServerPushStream *ProtoServerPushStream `protobuf:"bytes,25,opt,name=server_push_stream,json=serverPushStream,proto3,oneof"`
+}
+
+func (*ProtoMessage_MouseMove) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_MouseMoveAbs) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_MouseWheel) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_MouseKeyDown) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_MouseKeyUp) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_KeyDown) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_KeyUp) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_ControllerAttach) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_ControllerDetach) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_ControllerRumble) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_ControllerStateBatch) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_Ice) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_Sdp) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_Raw) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_ClientRequestRoomStream) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_ClientDisconnected) isProtoMessage_Payload() {}
+
+func (*ProtoMessage_ServerPushStream) isProtoMessage_Payload() {}
+
 var File_messages_proto protoreflect.FileDescriptor
 
 const file_messages_proto_rawDesc = "" +
@@ -132,10 +413,31 @@ const file_messages_proto_rawDesc = "" +
 	"\x0emessages.proto\x12\x05proto\x1a\vtypes.proto\x1a\x15latency_tracker.proto\"k\n" +
 	"\x10ProtoMessageBase\x12!\n" +
 	"\fpayload_type\x18\x01 \x01(\tR\vpayloadType\x124\n" +
-	"\alatency\x18\x02 \x01(\v2\x1a.proto.ProtoLatencyTrackerR\alatency\"v\n" +
-	"\x11ProtoMessageInput\x12:\n" +
-	"\fmessage_base\x18\x01 \x01(\v2\x17.proto.ProtoMessageBaseR\vmessageBase\x12%\n" +
-	"\x04data\x18\x02 \x01(\v2\x11.proto.ProtoInputR\x04dataB\x16Z\x14relay/internal/protob\x06proto3"
+	"\alatency\x18\x02 \x01(\v2\x1a.proto.ProtoLatencyTrackerR\alatency\"\x9b\t\n" +
+	"\fProtoMessage\x12:\n" +
+	"\fmessage_base\x18\x01 \x01(\v2\x17.proto.ProtoMessageBaseR\vmessageBase\x126\n" +
+	"\n" +
+	"mouse_move\x18\x02 \x01(\v2\x15.proto.ProtoMouseMoveH\x00R\tmouseMove\x12@\n" +
+	"\x0emouse_move_abs\x18\x03 \x01(\v2\x18.proto.ProtoMouseMoveAbsH\x00R\fmouseMoveAbs\x129\n" +
+	"\vmouse_wheel\x18\x04 \x01(\v2\x16.proto.ProtoMouseWheelH\x00R\n" +
+	"mouseWheel\x12@\n" +
+	"\x0emouse_key_down\x18\x05 \x01(\v2\x18.proto.ProtoMouseKeyDownH\x00R\fmouseKeyDown\x12:\n" +
+	"\fmouse_key_up\x18\x06 \x01(\v2\x16.proto.ProtoMouseKeyUpH\x00R\n" +
+	"mouseKeyUp\x120\n" +
+	"\bkey_down\x18\a \x01(\v2\x13.proto.ProtoKeyDownH\x00R\akeyDown\x12*\n" +
+	"\x06key_up\x18\b \x01(\v2\x11.proto.ProtoKeyUpH\x00R\x05keyUp\x12K\n" +
+	"\x11controller_attach\x18\t \x01(\v2\x1c.proto.ProtoControllerAttachH\x00R\x10controllerAttach\x12K\n" +
+	"\x11controller_detach\x18\n" +
+	" \x01(\v2\x1c.proto.ProtoControllerDetachH\x00R\x10controllerDetach\x12K\n" +
+	"\x11controller_rumble\x18\v \x01(\v2\x1c.proto.ProtoControllerRumbleH\x00R\x10controllerRumble\x12X\n" +
+	"\x16controller_state_batch\x18\f \x01(\v2 .proto.ProtoControllerStateBatchH\x00R\x14controllerStateBatch\x12#\n" +
+	"\x03ice\x18\x14 \x01(\v2\x0f.proto.ProtoICEH\x00R\x03ice\x12#\n" +
+	"\x03sdp\x18\x15 \x01(\v2\x0f.proto.ProtoSDPH\x00R\x03sdp\x12#\n" +
+	"\x03raw\x18\x16 \x01(\v2\x0f.proto.ProtoRawH\x00R\x03raw\x12b\n" +
+	"\x1aclient_request_room_stream\x18\x17 \x01(\v2#.proto.ProtoClientRequestRoomStreamH\x00R\x17clientRequestRoomStream\x12Q\n" +
+	"\x13client_disconnected\x18\x18 \x01(\v2\x1e.proto.ProtoClientDisconnectedH\x00R\x12clientDisconnected\x12L\n" +
+	"\x12server_push_stream\x18\x19 \x01(\v2\x1c.proto.ProtoServerPushStreamH\x00R\x10serverPushStreamB\t\n" +
+	"\apayloadB\x16Z\x14relay/internal/protob\x06proto3"
 
 var (
 	file_messages_proto_rawDescOnce sync.Once
@@ -151,20 +453,52 @@ func file_messages_proto_rawDescGZIP() []byte {
 
 var file_messages_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_messages_proto_goTypes = []any{
-	(*ProtoMessageBase)(nil),    // 0: proto.ProtoMessageBase
-	(*ProtoMessageInput)(nil),   // 1: proto.ProtoMessageInput
-	(*ProtoLatencyTracker)(nil), // 2: proto.ProtoLatencyTracker
-	(*ProtoInput)(nil),          // 3: proto.ProtoInput
+	(*ProtoMessageBase)(nil),             // 0: proto.ProtoMessageBase
+	(*ProtoMessage)(nil),                 // 1: proto.ProtoMessage
+	(*ProtoLatencyTracker)(nil),          // 2: proto.ProtoLatencyTracker
+	(*ProtoMouseMove)(nil),               // 3: proto.ProtoMouseMove
+	(*ProtoMouseMoveAbs)(nil),            // 4: proto.ProtoMouseMoveAbs
+	(*ProtoMouseWheel)(nil),              // 5: proto.ProtoMouseWheel
+	(*ProtoMouseKeyDown)(nil),            // 6: proto.ProtoMouseKeyDown
+	(*ProtoMouseKeyUp)(nil),              // 7: proto.ProtoMouseKeyUp
+	(*ProtoKeyDown)(nil),                 // 8: proto.ProtoKeyDown
+	(*ProtoKeyUp)(nil),                   // 9: proto.ProtoKeyUp
+	(*ProtoControllerAttach)(nil),        // 10: proto.ProtoControllerAttach
+	(*ProtoControllerDetach)(nil),        // 11: proto.ProtoControllerDetach
+	(*ProtoControllerRumble)(nil),        // 12: proto.ProtoControllerRumble
+	(*ProtoControllerStateBatch)(nil),    // 13: proto.ProtoControllerStateBatch
+	(*ProtoICE)(nil),                     // 14: proto.ProtoICE
+	(*ProtoSDP)(nil),                     // 15: proto.ProtoSDP
+	(*ProtoRaw)(nil),                     // 16: proto.ProtoRaw
+	(*ProtoClientRequestRoomStream)(nil), // 17: proto.ProtoClientRequestRoomStream
+	(*ProtoClientDisconnected)(nil),      // 18: proto.ProtoClientDisconnected
+	(*ProtoServerPushStream)(nil),        // 19: proto.ProtoServerPushStream
 }
 var file_messages_proto_depIdxs = []int32{
-	2, // 0: proto.ProtoMessageBase.latency:type_name -> proto.ProtoLatencyTracker
-	0, // 1: proto.ProtoMessageInput.message_base:type_name -> proto.ProtoMessageBase
-	3, // 2: proto.ProtoMessageInput.data:type_name -> proto.ProtoInput
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	3, // [3:3] is the sub-list for extension extendee
-	0, // [0:3] is the sub-list for field type_name
+	2,  // 0: proto.ProtoMessageBase.latency:type_name -> proto.ProtoLatencyTracker
+	0,  // 1: proto.ProtoMessage.message_base:type_name -> proto.ProtoMessageBase
+	3,  // 2: proto.ProtoMessage.mouse_move:type_name -> proto.ProtoMouseMove
+	4,  // 3: proto.ProtoMessage.mouse_move_abs:type_name -> proto.ProtoMouseMoveAbs
+	5,  // 4: proto.ProtoMessage.mouse_wheel:type_name -> proto.ProtoMouseWheel
+	6,  // 5: proto.ProtoMessage.mouse_key_down:type_name -> proto.ProtoMouseKeyDown
+	7,  // 6: proto.ProtoMessage.mouse_key_up:type_name -> proto.ProtoMouseKeyUp
+	8,  // 7: proto.ProtoMessage.key_down:type_name -> proto.ProtoKeyDown
+	9,  // 8: proto.ProtoMessage.key_up:type_name -> proto.ProtoKeyUp
+	10, // 9: proto.ProtoMessage.controller_attach:type_name -> proto.ProtoControllerAttach
+	11, // 10: proto.ProtoMessage.controller_detach:type_name -> proto.ProtoControllerDetach
+	12, // 11: proto.ProtoMessage.controller_rumble:type_name -> proto.ProtoControllerRumble
+	13, // 12: proto.ProtoMessage.controller_state_batch:type_name -> proto.ProtoControllerStateBatch
+	14, // 13: proto.ProtoMessage.ice:type_name -> proto.ProtoICE
+	15, // 14: proto.ProtoMessage.sdp:type_name -> proto.ProtoSDP
+	16, // 15: proto.ProtoMessage.raw:type_name -> proto.ProtoRaw
+	17, // 16: proto.ProtoMessage.client_request_room_stream:type_name -> proto.ProtoClientRequestRoomStream
+	18, // 17: proto.ProtoMessage.client_disconnected:type_name -> proto.ProtoClientDisconnected
+	19, // 18: proto.ProtoMessage.server_push_stream:type_name -> proto.ProtoServerPushStream
+	19, // [19:19] is the sub-list for method output_type
+	19, // [19:19] is the sub-list for method input_type
+	19, // [19:19] is the sub-list for extension type_name
+	19, // [19:19] is the sub-list for extension extendee
+	0,  // [0:19] is the sub-list for field type_name
 }
 
 func init() { file_messages_proto_init() }
@@ -174,6 +508,25 @@ func file_messages_proto_init() {
 	}
 	file_types_proto_init()
 	file_latency_tracker_proto_init()
+	file_messages_proto_msgTypes[1].OneofWrappers = []any{
+		(*ProtoMessage_MouseMove)(nil),
+		(*ProtoMessage_MouseMoveAbs)(nil),
+		(*ProtoMessage_MouseWheel)(nil),
+		(*ProtoMessage_MouseKeyDown)(nil),
+		(*ProtoMessage_MouseKeyUp)(nil),
+		(*ProtoMessage_KeyDown)(nil),
+		(*ProtoMessage_KeyUp)(nil),
+		(*ProtoMessage_ControllerAttach)(nil),
+		(*ProtoMessage_ControllerDetach)(nil),
+		(*ProtoMessage_ControllerRumble)(nil),
+		(*ProtoMessage_ControllerStateBatch)(nil),
+		(*ProtoMessage_Ice)(nil),
+		(*ProtoMessage_Sdp)(nil),
+		(*ProtoMessage_Raw)(nil),
+		(*ProtoMessage_ClientRequestRoomStream)(nil),
+		(*ProtoMessage_ClientDisconnected)(nil),
+		(*ProtoMessage_ServerPushStream)(nil),
+	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{

packages/relay/internal/shared/participant.go

@@ -1,44 +1,126 @@
 package shared
 
 import (
+	"errors"
 	"fmt"
+	"io"
+	"log/slog"
 	"relay/internal/common"
 	"relay/internal/connections"
+	"sync"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/oklog/ulid/v2"
 	"github.com/pion/webrtc/v4"
 )
 
 type Participant struct {
 	ID             ulid.ULID
+	SessionID      string  // Track session for reconnection
+	PeerID         peer.ID // libp2p peer ID
 	PeerConnection *webrtc.PeerConnection
 	DataChannel    *connections.NestriDataChannel
+
+	// Per-viewer tracks and channels
+	VideoTrack *webrtc.TrackLocalStaticRTP
+	AudioTrack *webrtc.TrackLocalStaticRTP
+
+	// Per-viewer RTP state for retiming
+	VideoSequenceNumber uint16
+	VideoTimestamp      uint32
+	AudioSequenceNumber uint16
+	AudioTimestamp      uint32
+
+	packetQueue chan *participantPacket
+	closeOnce   sync.Once
 }
 
-func NewParticipant() (*Participant, error) {
+func NewParticipant(sessionID string, peerID peer.ID) (*Participant, error) {
 	id, err := common.NewULID()
 	if err != nil {
 		return nil, fmt.Errorf("failed to create ULID for Participant: %w", err)
 	}
-	return &Participant{
-		ID: id,
-	}, nil
-}
-
-func (p *Participant) addTrack(trackLocal *webrtc.TrackLocalStaticRTP) error {
-	rtpSender, err := p.PeerConnection.AddTrack(trackLocal)
-	if err != nil {
-		return err
+	p := &Participant{
+		ID:                  id,
+		SessionID:           sessionID,
+		PeerID:              peerID,
+		VideoSequenceNumber: 0,
+		VideoTimestamp:      0,
+		AudioSequenceNumber: 0,
+		AudioTimestamp:      0,
+		packetQueue:         make(chan *participantPacket, 1000),
 	}
 
-	go func() {
-		rtcpBuffer := make([]byte, 1400)
-		for {
-			if _, _, rtcpErr := rtpSender.Read(rtcpBuffer); rtcpErr != nil {
-				break
+	go p.packetWriter()
+
+	return p, nil
+}
+
+// SetTrack sets audio/video track for Participant
+func (p *Participant) SetTrack(trackType webrtc.RTPCodecType, track *webrtc.TrackLocalStaticRTP) {
+	switch trackType {
+	case webrtc.RTPCodecTypeAudio:
+		p.AudioTrack = track
+		_, err := p.PeerConnection.AddTrack(track)
+		if err != nil {
+			slog.Error("Failed to add audio track", "participant", p.ID, "err", err)
+		}
+	case webrtc.RTPCodecTypeVideo:
+		p.VideoTrack = track
+		_, err := p.PeerConnection.AddTrack(track)
+		if err != nil {
+			slog.Error("Failed to add video track", "participant", p.ID, "err", err)
+		}
+	default:
+		slog.Warn("Unknown track type", "participant", p.ID, "trackType", trackType)
+	}
+}
+
+// Close cleans up participant resources
+func (p *Participant) Close() {
+	p.closeOnce.Do(func() {
+		close(p.packetQueue)
+	})
+	if p.DataChannel != nil {
+		err := p.DataChannel.Close()
+		if err != nil {
+			slog.Error("Failed to close DataChannel", "participant", p.ID, "err", err)
+		}
+		p.DataChannel = nil
+	}
+	if p.PeerConnection != nil {
+		err := p.PeerConnection.Close()
+		if err != nil {
+			slog.Error("Failed to close PeerConnection", "participant", p.ID, "err", err)
+		}
+		p.PeerConnection = nil
+	}
+	if p.VideoTrack != nil {
+		p.VideoTrack = nil
+	}
+	if p.AudioTrack != nil {
+		p.AudioTrack = nil
+	}
+}
+
+func (p *Participant) packetWriter() {
+	for pkt := range p.packetQueue {
+		var track *webrtc.TrackLocalStaticRTP
+
+		// No mutex needed - only this goroutine modifies these
+		if pkt.kind == webrtc.RTPCodecTypeAudio {
+			track = p.AudioTrack
+		} else {
+			track = p.VideoTrack
+		}
+
+		if track != nil {
+			if err := track.WriteRTP(pkt.packet); err != nil && !errors.Is(err, io.ErrClosedPipe) {
+				slog.Error("WriteRTP failed", "participant", p.ID, "kind", pkt.kind, "err", err)
 			}
 		}
-	}()
 
-	return nil
+		// Return packet struct to pool
+		participantPacketPool.Put(pkt)
+	}
 }

packages/relay/internal/shared/room.go

@@ -2,14 +2,27 @@ package shared
 
 import (
 	"log/slog"
-	"relay/internal/common"
 	"relay/internal/connections"
+	"sync"
+	"sync/atomic"
 
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/oklog/ulid/v2"
+	"github.com/pion/rtp"
 	"github.com/pion/webrtc/v4"
 )
 
+var participantPacketPool = sync.Pool{
+	New: func() interface{} {
+		return &participantPacket{}
+	},
+}
+
+type participantPacket struct {
+	kind         webrtc.RTPCodecType
+	packet       *rtp.Packet
+}
+
 type RoomInfo struct {
 	ID      ulid.ULID `json:"id"`
 	Name    string    `json:"name"`
@@ -18,49 +31,137 @@ type RoomInfo struct {
 
 type Room struct {
 	RoomInfo
+	AudioCodec     webrtc.RTPCodecCapability
+	VideoCodec     webrtc.RTPCodecCapability
 	PeerConnection *webrtc.PeerConnection
-	AudioTrack     *webrtc.TrackLocalStaticRTP
-	VideoTrack     *webrtc.TrackLocalStaticRTP
 	DataChannel    *connections.NestriDataChannel
-	Participants   *common.SafeMap[ulid.ULID, *Participant]
+
+	// Atomic pointer to slice of participant channels
+	participantChannels atomic.Pointer[[]chan<- *participantPacket]
+	participantsMtx     sync.Mutex // Use only for add/remove
+
+	Participants map[ulid.ULID]*Participant // Keep general track of Participant(s)
+
+	// Track last seen values to calculate diffs
+	LastVideoTimestamp      uint32
+	LastVideoSequenceNumber uint16
+	LastAudioTimestamp      uint32
+	LastAudioSequenceNumber uint16
+
+	VideoTimestampSet bool
+	VideoSequenceSet  bool
+	AudioTimestampSet bool
+	AudioSequenceSet  bool
 }
 
 func NewRoom(name string, roomID ulid.ULID, ownerID peer.ID) *Room {
-	return &Room{
+	r := &Room{
 		RoomInfo: RoomInfo{
 			ID:      roomID,
 			Name:    name,
 			OwnerID: ownerID,
 		},
-		Participants: common.NewSafeMap[ulid.ULID, *Participant](),
+		PeerConnection: nil,
+		DataChannel:    nil,
+		Participants:   make(map[ulid.ULID]*Participant),
+	}
+
+	emptyChannels := make([]chan<- *participantPacket, 0)
+	r.participantChannels.Store(&emptyChannels)
+
+	return r
+}
+
+// Close closes up Room (stream ended)
+func (r *Room) Close() {
+	if r.DataChannel != nil {
+		err := r.DataChannel.Close()
+		if err != nil {
+			slog.Error("Failed to close Room DataChannel", err)
+		}
+		r.DataChannel = nil
+	}
+	if r.PeerConnection != nil {
+		err := r.PeerConnection.Close()
+		if err != nil {
+			slog.Error("Failed to close Room PeerConnection", err)
+		}
+		r.PeerConnection = nil
 	}
 }
 
 // AddParticipant adds a Participant to a Room
 func (r *Room) AddParticipant(participant *Participant) {
-	slog.Debug("Adding participant to room", "participant", participant.ID, "room", r.Name)
-	r.Participants.Set(participant.ID, participant)
+	r.participantsMtx.Lock()
+	defer r.participantsMtx.Unlock()
+
+	r.Participants[participant.ID] = participant
+
+	// Update channel slice atomically
+	current := r.participantChannels.Load()
+	newChannels := make([]chan<- *participantPacket, len(*current)+1)
+	copy(newChannels, *current)
+	newChannels[len(*current)] = participant.packetQueue
+
+	r.participantChannels.Store(&newChannels)
+
+	slog.Debug("Added participant", "participant", participant.ID, "room", r.Name)
 }
 
-// Removes a Participant from a Room by participant's ID
-func (r *Room) removeParticipantByID(pID ulid.ULID) {
-	if _, ok := r.Participants.Get(pID); ok {
-		r.Participants.Delete(pID)
+// RemoveParticipantByID removes a Participant from a Room by participant's ID
+func (r *Room) RemoveParticipantByID(pID ulid.ULID) {
+	r.participantsMtx.Lock()
+	defer r.participantsMtx.Unlock()
+
+	participant, ok := r.Participants[pID]
+	if !ok {
+		return
 	}
+
+	delete(r.Participants, pID)
+
+	// Update channel slice
+	current := r.participantChannels.Load()
+	newChannels := make([]chan<- *participantPacket, 0, len(*current)-1)
+	for _, ch := range *current {
+		if ch != participant.packetQueue {
+			newChannels = append(newChannels, ch)
+		}
+	}
+
+	r.participantChannels.Store(&newChannels)
+
+	slog.Debug("Removed participant", "participant", pID, "room", r.Name)
 }
 
-// IsOnline checks if the room is online (has both audio and video tracks)
+// IsOnline checks if the room is online
 func (r *Room) IsOnline() bool {
-	return r.AudioTrack != nil && r.VideoTrack != nil
+	return r.PeerConnection != nil
 }
 
-func (r *Room) SetTrack(trackType webrtc.RTPCodecType, track *webrtc.TrackLocalStaticRTP) {
-	switch trackType {
-	case webrtc.RTPCodecTypeAudio:
-		r.AudioTrack = track
-	case webrtc.RTPCodecTypeVideo:
-		r.VideoTrack = track
-	default:
-		slog.Warn("Unknown track type", "room", r.Name, "trackType", trackType)
+func (r *Room) BroadcastPacket(kind webrtc.RTPCodecType, pkt *rtp.Packet) {
+	// Lock-free load of channel slice
+	channels := r.participantChannels.Load()
+
+	// no participants..
+	if len(*channels) == 0 {
+		return
+	}
+
+	// Send to each participant channel (non-blocking)
+	for i, ch := range *channels {
+		// Get packet struct from pool
+		pp := participantPacketPool.Get().(*participantPacket)
+		pp.kind = kind
+		pp.packet = pkt
+
+		select {
+		case ch <- pp:
+			// Sent successfully
+		default:
+			// Channel full, drop packet, log?
+			slog.Warn("Channel full, dropping packet", "channel_index", i)
+			participantPacketPool.Put(pp)
+		}
 	}
 }

packages/scripts/entrypoint.sh

@@ -15,13 +15,13 @@ NVIDIA_INSTALLER_DIR="/tmp"
 TIMEOUT_SECONDS=10
 ENTCMD_PREFIX=""
 
-# Ensures user directory ownership
-chown_user_directory() {
+# Ensures user ownership across directories
+handle_user_permissions() {
     if ! $ENTCMD_PREFIX chown "${NESTRI_USER}:${NESTRI_USER}" "${NESTRI_HOME}" 2>/dev/null; then
         echo "Error: Failed to change ownership of ${NESTRI_HOME} to ${NESTRI_USER}:${NESTRI_USER}" >&2
         return 1
     fi
-    # Also apply to .cache separately
+    # Also apply to .cache
     if [[ -d "${NESTRI_HOME}/.cache" ]]; then
         if ! $ENTCMD_PREFIX chown "${NESTRI_USER}:${NESTRI_USER}" "${NESTRI_HOME}/.cache" 2>/dev/null; then
             echo "Error: Failed to change ownership of ${NESTRI_HOME}/.cache to ${NESTRI_USER}:${NESTRI_USER}" >&2
@@ -324,9 +324,23 @@ main() {
         log "Skipping CAP_SYS_NICE for gamescope, capability not available"
     fi
 
-    # Handle user directory permissions
-    log "Ensuring user directory permissions..."
-    chown_user_directory || exit 1
+    # Make sure /tmp/.X11-unix exists..
+    if [[ ! -d "/tmp/.X11-unix" ]]; then
+        log "Creating /tmp/.X11-unix directory.."
+        $ENTCMD_PREFIX mkdir -p /tmp/.X11-unix || {
+            log "Error: Failed to create /tmp/.X11-unix directory"
+            exit 1
+        }
+        # Set required perms..
+        $ENTCMD_PREFIX chmod 1777 /tmp/.X11-unix || {
+            log "Error: Failed to chmod /tmp/.X11-unix to 1777"
+            exit 1
+        }
+    fi
+
+    # Handle user permissions
+    log "Ensuring user permissions..."
+    handle_user_permissions || exit 1
 
     # Setup namespaceless env if needed for container runtime
     if [[ "$container_runtime" != "podman" ]]; then
@@ -334,18 +348,8 @@ main() {
         setup_namespaceless
     fi
 
-    # Make sure /run/udev/ directory exists with /run/udev/control, needed for virtual controller support
-    if [[ ! -d "/run/udev" || ! -e "/run/udev/control" ]]; then
-        log "Creating /run/udev directory and control file..."
-        $ENTCMD_PREFIX mkdir -p /run/udev || {
-            log "Error: Failed to create /run/udev directory"
-            exit 1
-        }
-        $ENTCMD_PREFIX touch /run/udev/control || {
-            log "Error: Failed to create /run/udev/control file"
-            exit 1
-        }
-    fi
+    # Wait for vimputti socket before switching to application startup
+    wait_for_socket "/tmp/vimputti-0" "vimputti" || exit 1
 
     # Switch to nestri runner entrypoint
     log "Switching to application startup entrypoint..."

packages/scripts/entrypoint_nestri.sh

@@ -106,12 +106,9 @@ start_compositor() {
     kill_if_running "${COMPOSITOR_PID:-}" "compositor"
     kill_if_running "${APP_PID:-}" "application"
 
-    # Set default values only if variables are unset (not empty)
-    if [[ -z "${NESTRI_LAUNCH_CMD+x}" ]]; then
-        NESTRI_LAUNCH_CMD="dbus-launch steam -tenfoot -cef-force-gpu"
-    fi
+    # Set default compositor if unset
     if [[ -z "${NESTRI_LAUNCH_COMPOSITOR+x}" ]]; then
-        NESTRI_LAUNCH_COMPOSITOR="gamescope --backend wayland --force-grab-cursor -g -f --rt --mangoapp -W ${WIDTH} -H ${HEIGHT} -r ${FRAMERATE:-60}"
+        NESTRI_LAUNCH_COMPOSITOR="gamescope --backend wayland -g -f --rt -W ${WIDTH} -H ${HEIGHT} -r ${FRAMERATE:-60}"
     fi
 
     # If PRELOAD_SHIM_arch's are set and exist, set LD_PRELOAD for 32/64-bit apps
@@ -121,6 +118,16 @@ start_compositor() {
         log "Using LD_PRELOAD shim(s)"
     fi
 
+    # Configure launch cmd with dbus if set
+    local launch_cmd=""
+    if [[ -n "${NESTRI_LAUNCH_CMD+x}" ]]; then
+        if $do_ld_preload; then
+            launch_cmd="LD_PRELOAD='/usr/\$LIB/libvimputti_shim.so' dbus-launch $NESTRI_LAUNCH_CMD"
+        else
+            launch_cmd="dbus-launch $NESTRI_LAUNCH_CMD"
+        fi
+    fi
+
     # Launch compositor if configured
     if [[ -n "${NESTRI_LAUNCH_COMPOSITOR}" ]]; then
         local compositor_cmd="$NESTRI_LAUNCH_COMPOSITOR"
@@ -129,17 +136,12 @@ start_compositor() {
         # Check if this is a gamescope command
         if [[ "$compositor_cmd" == *"gamescope"* ]]; then
             is_gamescope=true
-            if [[ -n "$NESTRI_LAUNCH_CMD" ]] && [[ "$compositor_cmd" != *" -- "* ]]; then
-                # If steam in launch command, enable gamescope integration via -e
-                if [[ "$NESTRI_LAUNCH_CMD" == *"steam"* ]]; then
-                    compositor_cmd+=" -e"
-                fi
-                # If ld_preload is true, add env with LD_PRELOAD
-                if $do_ld_preload; then
-                    compositor_cmd+=" -- env LD_PRELOAD='/usr/\$LIB/libvimputti_shim.so' bash -c $(printf %q "$NESTRI_LAUNCH_CMD")"
-                else
-                    compositor_cmd+=" -- bash -c $(printf %q "$NESTRI_LAUNCH_CMD")"
+            if [[ -n "$launch_cmd" ]] && [[ "$compositor_cmd" != *" -- "* ]]; then
+                # If steam in launch command, enable gamescope integration via -e and enable mangohud
+                if [[ "$launch_cmd" == *"steam"* ]]; then
+                    compositor_cmd+=" --mangoapp -e"
                 fi
+                compositor_cmd+=" -- bash -c $(printf %q "$launch_cmd")"
             fi
         fi
 
@@ -185,9 +187,9 @@ start_compositor() {
                     WAYLAND_DISPLAY=wayland-0 wlr-randr --output "$OUTPUT_NAME" --custom-mode "$WIDTH"x"$HEIGHT"
                     log "Patched resolution with wlr-randr"
 
-                    if [[ -n "${NESTRI_LAUNCH_CMD}" ]]; then
-                        log "Starting application: $NESTRI_LAUNCH_CMD"
-                        WAYLAND_DISPLAY=wayland-0 /bin/bash -c "$NESTRI_LAUNCH_CMD" &
+                    if [[ -n "$launch_cmd" ]]; then
+                        log "Starting application: $launch_cmd"
+                        WAYLAND_DISPLAY="$COMPOSITOR_SOCKET" bash -c "$launch_cmd" &
                         APP_PID=$!
                     fi
                 else
@@ -200,9 +202,9 @@ start_compositor() {
         log "Warning: Compositor socket not found after 15 seconds ($COMPOSITOR_SOCKET)"
     else
         # Launch standalone application if no compositor
-        if [[ -n "${NESTRI_LAUNCH_CMD}" ]]; then
-            log "Starting application: $NESTRI_LAUNCH_CMD"
-            WAYLAND_DISPLAY=wayland-1 /bin/bash -c "$NESTRI_LAUNCH_CMD" &
+        if [[ -n "$launch_cmd" ]]; then
+            log "Starting standalone application: $launch_cmd"
+            WAYLAND_DISPLAY=wayland-1 bash -c "$launch_cmd" &
             APP_PID=$!
         else
             log "No compositor or application configured"

packages/scripts/envs.sh

@@ -4,15 +4,13 @@ export USER=${NESTRI_USER}
 export LANG=${NESTRI_LANG}
 export HOME=${NESTRI_HOME}
 export XDG_RUNTIME_DIR=${NESTRI_XDG_RUNTIME_DIR}
-export XDG_SESSION_TYPE=x11
-export DISPLAY=:0
 
 # Causes some setups to break
 export PROTON_NO_FSYNC=1
 
-# Sleeker Mangohud preset :)
-export MANGOHUD_CONFIG=preset=2
-
 # Make gstreamer GL elements work without display output (NVIDIA issue..)
 export GST_GL_API=gles2
 export GST_GL_WINDOW=surfaceless
+
+# Gamescope does not respect MangoHud default config location
+export MANGOHUD_CONFIGFILE=/etc/nestri/configs/MangoHud/MangoHud.conf

packages/scripts/supervisord.conf

@@ -18,7 +18,7 @@ autorestart=true
 autostart=true
 startretries=3
 priority=3
-nice=-10
+nice=-2
 environment=HOME=%(ENV_NESTRI_HOME)s,XDG_RUNTIME_DIR=%(ENV_NESTRI_XDG_RUNTIME_DIR)s
 
 [program:pipewire-pulse]
@@ -28,7 +28,7 @@ autorestart=true
 autostart=true
 startretries=3
 priority=4
-nice=-10
+nice=-2
 environment=HOME=%(ENV_NESTRI_HOME)s,XDG_RUNTIME_DIR=%(ENV_NESTRI_XDG_RUNTIME_DIR)s
 
 [program:wireplumber]
@@ -38,7 +38,7 @@ autorestart=true
 autostart=true
 startretries=3
 priority=5
-nice=-10
+nice=-2
 environment=HOME=%(ENV_NESTRI_HOME)s,XDG_RUNTIME_DIR=%(ENV_NESTRI_XDG_RUNTIME_DIR)s
 
 [program:vimputti-manager]

packages/server/Cargo.toml

@@ -22,13 +22,13 @@ rand = "0.9"
 rustls = { version = "0.23", features = ["ring"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-vimputti = "0.1.3"
+vimputti = "0.1.7"
 chrono = "0.4"
 prost = "0.14"
 prost-types = "0.14"
 parking_lot = "0.12"
 byteorder = "1.5"
-libp2p = { version = "0.56", features = ["identify", "dns", "tcp", "noise", "ping", "tokio", "serde", "yamux", "macros", "websocket", "autonat"] }
+libp2p = { version = "0.56", features = ["identify", "dns", "tcp", "noise", "ping", "tokio", "serde", "yamux", "macros", "autonat", "quic"] }
 libp2p-identify = "0.47"
 libp2p-ping = "0.47"
 libp2p-autonat = { version = "0.15", features = ["v2"] }
@@ -37,6 +37,7 @@ libp2p-yamux = "0.47"
 libp2p-noise = "0.46"
 libp2p-dns = { version = "0.44", features = ["tokio"] }
 libp2p-tcp = { version = "0.44", features = ["tokio"] }
-libp2p-websocket = "0.45"
+libp2p-quic = { version = "0.13", features = ["tokio"] }
 dashmap = "6.1"
 anyhow = "1.0"
+unsigned-varint = "0.8"

packages/server/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.90"
+channel = "1.91"

packages/server/src/args.rs

@@ -122,6 +122,14 @@ impl Args {
                     .value_parser(value_parser!(encoding_args::RateControlMethod))
                     .default_value("cbr"),
             )
+            .arg(
+                Arg::new("video-latency-control")
+                    .long("video-latency-control")
+                    .env("VIDEO_LATENCY_CONTROL")
+                    .help("Video latency control")
+                    .value_parser(value_parser!(encoding_args::LatencyControl))
+                    .default_value("lowest-latency"),
+            )
             .arg(
                 Arg::new("video-cqp")
                     .long("video-cqp")
@@ -165,6 +173,14 @@ impl Args {
                     )
                     .default_value("8"),
             )
+            .arg(
+                Arg::new("keyframe-dist-secs")
+                    .long("keyframe-dist-secs")
+                    .env("KEYFRAME_DIST_SECS")
+                    .help("Distance between keyframes in seconds")
+                    .value_parser(value_parser!(u32).range(1..))
+                    .default_value("1"),
+            )
             .arg(
                 Arg::new("audio-capture-method")
                     .long("audio-capture-method")
@@ -195,6 +211,14 @@ impl Args {
                     .value_parser(value_parser!(encoding_args::RateControlMethod))
                     .default_value("cbr"),
             )
+            .arg(
+                Arg::new("audio-latency-control")
+                    .long("audio-latency-control")
+                    .env("AUDIO_LATENCY_CONTROL")
+                    .help("Audio latency control")
+                    .value_parser(value_parser!(encoding_args::LatencyControl))
+                    .default_value("lowest-latency"),
+            )
             .arg(
                 Arg::new("audio-bitrate")
                     .long("audio-bitrate")
@@ -211,6 +235,14 @@ impl Args {
                     .value_parser(value_parser!(u32).range(1..))
                     .default_value("192"),
             )
+            .arg(
+                Arg::new("software-render")
+                    .long("software-render")
+                    .env("SOFTWARE_RENDER")
+                    .help("Use software rendering for wayland")
+                    .value_parser(BoolishValueParser::new())
+                    .default_value("false"),
+            )
             .arg(
                 Arg::new("zero-copy")
                     .long("zero-copy")

packages/server/src/args/app_args.rs

@@ -15,6 +15,9 @@ pub struct AppArgs {
     /// vimputti socket path
     pub vimputti_path: Option<String>,
 
+    /// Use software rendering for wayland display
+    pub software_render: bool,
+
     /// Experimental zero-copy pipeline support
     /// TODO: Move to video encoding flags
     pub zero_copy: bool,
@@ -51,6 +54,10 @@ impl AppArgs {
             vimputti_path: matches
                 .get_one::<String>("vimputti-path")
                 .map(|s| s.clone()),
+            software_render: matches
+                .get_one::<bool>("software-render")
+                .unwrap_or(&false)
+                .clone(),
             zero_copy: matches
                 .get_one::<bool>("zero-copy")
                 .unwrap_or(&false)
@@ -73,6 +80,7 @@ impl AppArgs {
             "> vimputti_path: '{}'",
             self.vimputti_path.as_ref().map_or("None", |s| s.as_str())
         );
+        tracing::info!("> software_render: {}", self.software_render);
         tracing::info!("> zero_copy: {}", self.zero_copy);
     }
 }

packages/server/src/args/encoding_args.rs

@@ -60,6 +60,12 @@ pub enum RateControl {
     CBR(RateControlCBR),
 }
 
+#[derive(Debug, PartialEq, Eq, Clone, ValueEnum)]
+pub enum LatencyControl {
+    LowestLatency,
+    HighestQuality,
+}
+
 pub struct EncodingOptionsBase {
     /// Codec (e.g. "h264", "opus" etc.)
     pub codec: Codec,
@@ -67,6 +73,8 @@ pub struct EncodingOptionsBase {
     pub encoder: Option<String>,
     /// Rate control method (e.g. "cqp", "vbr", "cbr")
     pub rate_control: RateControl,
+    /// Latency control option, what to tweak settings towards (latency or quality)
+    pub latency_control: LatencyControl,
 }
 impl EncodingOptionsBase {
     pub fn debug_print(&self) {
@@ -87,6 +95,14 @@ impl EncodingOptionsBase {
                 tracing::info!("-> Target Bitrate: {}", cbr.target_bitrate);
             }
         }
+        match &self.latency_control {
+            LatencyControl::LowestLatency => {
+                tracing::info!("> Latency Control: Priorizing lowest latency");
+            }
+            LatencyControl::HighestQuality => {
+                tracing::info!("> Latency Control: Priorizing quality at the cost of latency");
+            }
+        }
     }
 }
 
@@ -94,6 +110,7 @@ pub struct VideoEncodingOptions {
     pub base: EncodingOptionsBase,
     pub encoder_type: EncoderType,
     pub bit_depth: u32,
+    pub keyframe_dist_secs: u32,
 }
 impl VideoEncodingOptions {
     pub fn from_matches(matches: &clap::ArgMatches) -> Self {
@@ -125,6 +142,10 @@ impl VideoEncodingOptions {
                         max_bitrate: matches.get_one::<u32>("video-bitrate-max").unwrap().clone(),
                     }),
                 },
+                latency_control: matches
+                    .get_one::<LatencyControl>("video-latency-control")
+                    .unwrap_or(&LatencyControl::LowestLatency)
+                    .clone(),
             },
             encoder_type: matches
                 .get_one::<EncoderType>("video-encoder-type")
@@ -134,6 +155,10 @@ impl VideoEncodingOptions {
                 .get_one::<u32>("video-bit-depth")
                 .copied()
                 .unwrap_or(8),
+            keyframe_dist_secs: matches
+                .get_one::<u32>("keyframe-dist-secs")
+                .copied()
+                .unwrap_or(1),
         }
     }
 
@@ -142,6 +167,7 @@ impl VideoEncodingOptions {
         self.base.debug_print();
         tracing::info!("> Encoder Type: {}", self.encoder_type.as_str());
         tracing::info!("> Bit Depth: {}", self.bit_depth);
+        tracing::info!("> Keyframe Distance Seconds: {}", self.keyframe_dist_secs);
     }
 }
 impl Deref for VideoEncodingOptions {
@@ -208,6 +234,10 @@ impl AudioEncodingOptions {
                     }),
                     wot => panic!("Invalid rate control method for audio: {}", wot.as_str()),
                 },
+                latency_control: matches
+                    .get_one::<LatencyControl>("audio-latency-control")
+                    .unwrap_or(&LatencyControl::LowestLatency)
+                    .clone(),
             },
             capture_method: matches
                 .get_one::<AudioCaptureMethod>("audio-capture-method")

packages/server/src/enc_helper.rs

@@ -74,7 +74,6 @@ pub enum EncoderAPI {
     QSV,
     VAAPI,
     NVENC,
-    AMF,
     SOFTWARE,
     UNKNOWN,
 }
@@ -85,7 +84,6 @@ impl EncoderAPI {
             Self::QSV => "Intel QuickSync Video",
             Self::VAAPI => "Video Acceleration API",
             Self::NVENC => "NVIDIA NVENC",
-            Self::AMF => "AMD Media Framework",
             Self::SOFTWARE => "Software",
             Self::UNKNOWN => "Unknown",
         }
@@ -167,8 +165,6 @@ fn get_encoder_api(encoder: &str, encoder_type: &EncoderType) -> EncoderAPI {
                 EncoderAPI::VAAPI
             } else if encoder.starts_with("nv") {
                 EncoderAPI::NVENC
-            } else if encoder.starts_with("amf") {
-                EncoderAPI::AMF
             } else {
                 EncoderAPI::UNKNOWN
             }
@@ -275,9 +271,9 @@ pub fn encoder_low_latency_params(
     encoder: &VideoEncoderInfo,
     _rate_control: &RateControl,
     framerate: u32,
+    keyframe_dist_secs: u32,
 ) -> VideoEncoderInfo {
-    // 1 second keyframe interval for fast recovery, is this too taxing?
-    let mut encoder_optz = encoder_gop_params(encoder, framerate);
+    let mut encoder_optz = encoder_gop_params(encoder, framerate * keyframe_dist_secs);
 
     match encoder_optz.encoder_api {
         EncoderAPI::QSV => {
@@ -293,16 +289,6 @@ pub fn encoder_low_latency_params(
             encoder_optz.set_parameter("tune", "ultra-low-latency");
             encoder_optz.set_parameter("zerolatency", "true");
         }
-        EncoderAPI::AMF => {
-            encoder_optz.set_parameter("preset", "speed");
-            let usage = match encoder_optz.codec {
-                VideoCodec::H264 | VideoCodec::H265 => "ultra-low-latency",
-                VideoCodec::AV1 => "low-latency",
-            };
-            if !usage.is_empty() {
-                encoder_optz.set_parameter("usage", usage);
-            }
-        }
         EncoderAPI::SOFTWARE => match encoder_optz.name.as_str() {
             "openh264enc" => {
                 encoder_optz.set_parameter("complexity", "low");
@@ -330,6 +316,56 @@ pub fn encoder_low_latency_params(
     encoder_optz
 }
 
+pub fn encoder_high_quality_params(
+    encoder: &VideoEncoderInfo,
+    _rate_control: &RateControl,
+    framerate: u32,
+    keyframe_dist_secs: u32,
+) -> VideoEncoderInfo {
+    let mut encoder_optz = encoder_gop_params(encoder, framerate * keyframe_dist_secs);
+
+    match encoder_optz.encoder_api {
+        EncoderAPI::QSV => {
+            encoder_optz.set_parameter("low-latency", "false");
+            encoder_optz.set_parameter("target-usage", "1");
+        }
+        EncoderAPI::VAAPI => {
+            encoder_optz.set_parameter("target-usage", "1");
+        }
+        EncoderAPI::NVENC => {
+            encoder_optz.set_parameter("multi-pass", "two-pass");
+            encoder_optz.set_parameter("preset", "p7");
+            encoder_optz.set_parameter("tune", "high-quality");
+            encoder_optz.set_parameter("zerolatency", "false");
+            encoder_optz.set_parameter("spatial-aq", "true");
+            encoder_optz.set_parameter("rc-lookahead", "3");
+        }
+        EncoderAPI::SOFTWARE => match encoder_optz.name.as_str() {
+            "openh264enc" => {
+                encoder_optz.set_parameter("complexity", "high");
+                encoder_optz.set_parameter("usage-type", "screen");
+            }
+            "x264enc" => {
+                encoder_optz.set_parameter("rc-lookahead", "3");
+                encoder_optz.set_parameter("speed-preset", "medium");
+            }
+            "svtav1enc" => {
+                encoder_optz.set_parameter("preset", "8");
+                encoder_optz.set_parameter("parameters-string", "lookahead=3");
+            }
+            "av1enc" => {
+                encoder_optz.set_parameter("usage-profile", "realtime");
+                encoder_optz.set_parameter("cpu-used", "8");
+                encoder_optz.set_parameter("lag-in-frames", "3");
+            }
+            _ => {}
+        },
+        _ => {}
+    }
+
+    encoder_optz
+}
+
 pub fn get_compatible_encoders(gpus: &Vec<GPUInfo>) -> Vec<VideoEncoderInfo> {
     let mut encoders = Vec::new();
     let registry = gstreamer::Registry::get();
@@ -427,16 +463,6 @@ pub fn get_compatible_encoders(gpus: &Vec<GPUInfo>) -> Vec<VideoEncoderInfo> {
                                 None
                             }
                         }
-                        EncoderAPI::AMF if element.has_property("device") => {
-                            let device_id = match element.property_value("device").get::<u32>() {
-                                Ok(v) => Some(v as usize),
-                                Err(_) => None,
-                            };
-
-                            device_id.and_then(|id| {
-                                get_gpus_by_vendor(&gpus, GPUVendor::AMD).get(id).cloned()
-                            })
-                        }
                         _ => None,
                     }
                 })
@@ -549,7 +575,6 @@ pub fn get_best_compatible_encoder(
         score += match encoder.encoder_api {
             EncoderAPI::NVENC => 3,
             EncoderAPI::QSV => 3,
-            EncoderAPI::AMF => 3,
             EncoderAPI::VAAPI => 2,
             EncoderAPI::SOFTWARE => 1,
             EncoderAPI::UNKNOWN => 0,
@@ -585,7 +610,6 @@ pub fn get_best_working_encoder(
     encoders: &Vec<VideoEncoderInfo>,
     codec: &Codec,
     encoder_type: &EncoderType,
-    zero_copy: bool,
 ) -> Result<VideoEncoderInfo, Box<dyn Error>> {
     let mut candidates = get_encoders_by_videocodec(
         encoders,
@@ -601,7 +625,7 @@ pub fn get_best_working_encoder(
     while !candidates.is_empty() {
         let best = get_best_compatible_encoder(&candidates, codec, encoder_type)?;
         tracing::info!("Testing encoder: {}", best.name,);
-        if test_encoder(&best, zero_copy).is_ok() {
+        if test_encoder(&best).is_ok() {
             return Ok(best);
         } else {
             // Remove this encoder and try next best
@@ -613,25 +637,10 @@ pub fn get_best_working_encoder(
 }
 
 /// Test if a pipeline with the given encoder can be created and set to Playing
-pub fn test_encoder(encoder: &VideoEncoderInfo, zero_copy: bool) -> Result<(), Box<dyn Error>> {
-    let src = gstreamer::ElementFactory::make("waylanddisplaysrc").build()?;
-    if let Some(gpu_info) = &encoder.gpu_info {
-        src.set_property_from_str("render-node", gpu_info.render_path());
-    }
+pub fn test_encoder(encoder: &VideoEncoderInfo) -> Result<(), Box<dyn Error>> {
+    let src = gstreamer::ElementFactory::make("videotestsrc").build()?;
     let caps_filter = gstreamer::ElementFactory::make("capsfilter").build()?;
-    let caps = gstreamer::Caps::from_str(&format!(
-        "{},width=1280,height=720,framerate=30/1{}",
-        if zero_copy {
-            if encoder.encoder_api == EncoderAPI::NVENC {
-                "video/x-raw(memory:CUDAMemory)"
-            } else {
-                "video/x-raw(memory:DMABuf)"
-            }
-        } else {
-            "video/x-raw"
-        },
-        if zero_copy { "" } else { ",format=RGBx" }
-    ))?;
+    let caps = gstreamer::Caps::from_str("video/x-raw,width=1280,height=720,framerate=30/1")?;
     caps_filter.set_property("caps", &caps);
 
     let enc = gstreamer::ElementFactory::make(&encoder.name).build()?;
@@ -642,41 +651,9 @@ pub fn test_encoder(encoder: &VideoEncoderInfo, zero_copy: bool) -> Result<(), B
     // Create pipeline and link elements
     let pipeline = gstreamer::Pipeline::new();
 
-    if zero_copy {
-        if encoder.encoder_api == EncoderAPI::NVENC {
-            // NVENC zero-copy path
-            pipeline.add_many(&[&src, &caps_filter, &enc, &sink])?;
-            gstreamer::Element::link_many(&[&src, &caps_filter, &enc, &sink])?;
-        } else {
-            // VA-API/QSV zero-copy path
-            let vapostproc = gstreamer::ElementFactory::make("vapostproc").build()?;
-            let va_caps_filter = gstreamer::ElementFactory::make("capsfilter").build()?;
-            let va_caps = gstreamer::Caps::from_str("video/x-raw(memory:VAMemory),format=NV12")?;
-            va_caps_filter.set_property("caps", &va_caps);
-
-            pipeline.add_many(&[
-                &src,
-                &caps_filter,
-                &vapostproc,
-                &va_caps_filter,
-                &enc,
-                &sink,
-            ])?;
-            gstreamer::Element::link_many(&[
-                &src,
-                &caps_filter,
-                &vapostproc,
-                &va_caps_filter,
-                &enc,
-                &sink,
-            ])?;
-        }
-    } else {
-        // Non-zero-copy path for all encoders - needs videoconvert
-        let videoconvert = gstreamer::ElementFactory::make("videoconvert").build()?;
-        pipeline.add_many(&[&src, &caps_filter, &videoconvert, &enc, &sink])?;
-        gstreamer::Element::link_many(&[&src, &caps_filter, &videoconvert, &enc, &sink])?;
-    }
+    let videoconvert = gstreamer::ElementFactory::make("videoconvert").build()?;
+    pipeline.add_many(&[&src, &caps_filter, &videoconvert, &enc, &sink])?;
+    gstreamer::Element::link_many(&[&src, &caps_filter, &videoconvert, &enc, &sink])?;
 
     let bus = pipeline.bus().ok_or("Pipeline has no bus")?;
     pipeline.set_state(gstreamer::State::Playing)?;

packages/server/src/input/controller.rs

@@ -1,7 +1,5 @@
-use crate::proto::proto::proto_input::InputType::{
-    ControllerAttach, ControllerAxis, ControllerButton, ControllerDetach, ControllerRumble,
-    ControllerStick, ControllerTrigger,
-};
+use crate::proto::proto::ProtoControllerAttach;
+use crate::proto::proto::proto_message::Payload;
 use anyhow::Result;
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -31,10 +29,8 @@ impl ControllerInput {
         client: &vimputti::client::VimputtiClient,
     ) -> Result<Self> {
         let config = controller_string_to_type(&controller_type)?;
-        Ok(Self {
-            config: config.clone(),
-            device: client.create_device(config).await?,
-        })
+        let device = client.create_device(config.clone()).await?;
+        Ok(Self { config, device })
     }
 
     pub fn device_mut(&mut self) -> &mut vimputti::client::VirtualController {
@@ -48,157 +44,357 @@ impl ControllerInput {
 
 pub struct ControllerManager {
     vimputti_client: Arc<vimputti::client::VimputtiClient>,
-    cmd_tx: mpsc::Sender<crate::proto::proto::ProtoInput>,
-    rumble_tx: mpsc::Sender<(u32, u16, u16, u16)>, // (slot, strong, weak, duration_ms)
+    cmd_tx: mpsc::Sender<Payload>,
+    rumble_tx: mpsc::Sender<(u32, u16, u16, u16, String)>, // (slot, strong, weak, duration_ms, session_id)
+    attach_tx: mpsc::Sender<ProtoControllerAttach>,
 }
 impl ControllerManager {
     pub fn new(
         vimputti_client: Arc<vimputti::client::VimputtiClient>,
-    ) -> Result<(Self, mpsc::Receiver<(u32, u16, u16, u16)>)> {
-        let (cmd_tx, cmd_rx) = mpsc::channel(100);
-        let (rumble_tx, rumble_rx) = mpsc::channel(100);
+    ) -> Result<(
+        Self,
+        mpsc::Receiver<(u32, u16, u16, u16, String)>,
+        mpsc::Receiver<ProtoControllerAttach>,
+    )> {
+        let (cmd_tx, cmd_rx) = mpsc::channel(512);
+        let (rumble_tx, rumble_rx) = mpsc::channel(256);
+        let (attach_tx, attach_rx) = mpsc::channel(64);
         tokio::spawn(command_loop(
             cmd_rx,
             vimputti_client.clone(),
             rumble_tx.clone(),
+            attach_tx.clone(),
         ));
         Ok((
             Self {
                 vimputti_client,
                 cmd_tx,
                 rumble_tx,
+                attach_tx,
             },
             rumble_rx,
+            attach_rx,
         ))
     }
 
-    pub async fn send_command(&self, input: crate::proto::proto::ProtoInput) -> Result<()> {
-        self.cmd_tx.send(input).await?;
+    pub async fn send_command(&self, payload: Payload) -> Result<()> {
+        self.cmd_tx.send(payload).await?;
         Ok(())
     }
 }
 
+struct ControllerSlot {
+    controller: ControllerInput,
+    session_id: String,
+    session_slot: u32,
+}
+
+// Returns first free controller slot from 0-16
+fn get_free_slot(controllers: &HashMap<u32, ControllerSlot>) -> Option<u32> {
+    for slot in 0..17 {
+        if !controllers.contains_key(&slot) {
+            return Some(slot);
+        }
+    }
+    None
+}
+
 async fn command_loop(
-    mut cmd_rx: mpsc::Receiver<crate::proto::proto::ProtoInput>,
+    mut cmd_rx: mpsc::Receiver<Payload>,
     vimputti_client: Arc<vimputti::client::VimputtiClient>,
-    rumble_tx: mpsc::Sender<(u32, u16, u16, u16)>,
+    rumble_tx: mpsc::Sender<(u32, u16, u16, u16, String)>,
+    attach_tx: mpsc::Sender<ProtoControllerAttach>,
 ) {
-    let mut controllers: HashMap<u32, ControllerInput> = HashMap::new();
-    while let Some(input) = cmd_rx.recv().await {
-        if let Some(input_type) = input.input_type {
-            match input_type {
-                ControllerAttach(data) => {
-                    // Check if controller already exists in the slot, if so, ignore
-                    if controllers.contains_key(&(data.slot as u32)) {
-                        tracing::warn!(
-                            "Controller slot {} already occupied, ignoring attach",
-                            data.slot
+    let mut controllers: HashMap<u32, ControllerSlot> = HashMap::new();
+    while let Some(payload) = cmd_rx.recv().await {
+        match payload {
+            Payload::ControllerAttach(data) => {
+                let session_id = data.session_id.clone();
+                let session_slot = data.session_slot.clone();
+
+                // Check if this session already has a slot (reconnection)
+                let existing_slot = controllers
+                    .iter()
+                    .find(|(_, slot)| {
+                        slot.session_id == session_id && slot.session_slot == session_slot as u32
+                    })
+                    .map(|(slot_num, _)| *slot_num);
+
+                if let Some(existing_slot) = existing_slot {
+                    if let Some(controller_slot) = controllers.get_mut(&existing_slot) {
+                        let rumble_tx = rumble_tx.clone();
+                        let attach_tx = attach_tx.clone();
+
+                        controller_slot
+                            .controller
+                            .device_mut()
+                            .on_rumble(move |strong, weak, duration_ms| {
+                                let _ = rumble_tx.try_send((
+                                    existing_slot,
+                                    strong,
+                                    weak,
+                                    duration_ms,
+                                    data.session_id.clone(),
+                                ));
+                            })
+                            .await
+                            .map_err(|e| {
+                                tracing::warn!(
+                                    "Failed to register rumble callback for slot {}: {}",
+                                    existing_slot,
+                                    e
+                                );
+                            })
+                            .ok();
+
+                        // Return to attach_tx what slot was assigned
+                        let attach_info = ProtoControllerAttach {
+                            id: data.id.clone(),
+                            session_slot: existing_slot as i32,
+                            session_id: session_id.clone(),
+                        };
+
+                        match attach_tx.send(attach_info).await {
+                            Ok(_) => {
+                                tracing::info!(
+                                    "Controller {} re-attached to slot {} (session: {})",
+                                    data.id,
+                                    existing_slot,
+                                    session_id
+                                );
+                            }
+                            Err(e) => {
+                                tracing::error!(
+                                    "Failed to send re-attach info for slot {}: {}",
+                                    existing_slot,
+                                    e
+                                );
+                            }
+                        }
+                    }
+                } else if let Some(slot) = get_free_slot(&controllers) {
+                    if let Ok(mut controller) =
+                        ControllerInput::new(data.id.clone(), &vimputti_client).await
+                    {
+                        let rumble_tx = rumble_tx.clone();
+                        let attach_tx = attach_tx.clone();
+
+                        controller
+                            .device_mut()
+                            .on_rumble(move |strong, weak, duration_ms| {
+                                let _ = rumble_tx.try_send((
+                                    slot,
+                                    strong,
+                                    weak,
+                                    duration_ms,
+                                    data.session_id.clone(),
+                                ));
+                            })
+                            .await
+                            .map_err(|e| {
+                                tracing::warn!(
+                                    "Failed to register rumble callback for slot {}: {}",
+                                    slot,
+                                    e
+                                );
+                            })
+                            .ok();
+
+                        // Return to attach_tx what slot was assigned
+                        let attach_info = ProtoControllerAttach {
+                            id: data.id.clone(),
+                            session_slot: slot as i32,
+                            session_id: session_id.clone(),
+                        };
+
+                        match attach_tx.send(attach_info).await {
+                            Ok(_) => {
+                                controllers.insert(
+                                    slot,
+                                    ControllerSlot {
+                                        controller,
+                                        session_id: session_id.clone(),
+                                        session_slot: session_slot.clone() as u32,
+                                    },
+                                );
+                                tracing::info!(
+                                    "Controller {} attached to slot {} (session: {})",
+                                    data.id,
+                                    slot,
+                                    session_id
+                                );
+                            }
+                            Err(e) => {
+                                tracing::error!(
+                                    "Failed to send attach info for slot {}: {}",
+                                    slot,
+                                    e
+                                );
+                            }
+                        }
+                    } else {
+                        tracing::error!(
+                            "Failed to create controller of type {} for slot {}",
+                            data.id,
+                            slot
+                        );
+                    }
+                }
+            }
+            Payload::ControllerDetach(data) => {
+                if controllers.remove(&(data.session_slot as u32)).is_some() {
+                    tracing::info!("Controller detached from slot {}", data.session_slot);
+                } else {
+                    tracing::warn!(
+                        "No controller found in slot {} to detach",
+                        data.session_slot
+                    );
+                }
+            }
+            Payload::ClientDisconnected(data) => {
+                tracing::info!(
+                    "Client disconnected, cleaning up controller slots: {:?} (client session: {})",
+                    data.controller_slots,
+                    data.session_id
+                );
+                // Remove all controllers for the disconnected slots
+                for slot in &data.controller_slots {
+                    if controllers.remove(&(*slot as u32)).is_some() {
+                        tracing::info!(
+                            "Removed controller from slot {} (client session: {})",
+                            slot,
+                            data.session_id
                         );
                     } else {
-                        if let Ok(mut controller) =
-                            ControllerInput::new(data.id.clone(), &vimputti_client).await
-                        {
-                            let slot = data.slot as u32;
-                            let rumble_tx = rumble_tx.clone();
+                        tracing::warn!(
+                            "No controller found in slot {} to cleanup (client session: {})",
+                            slot,
+                            data.session_id
+                        );
+                    }
+                }
+            }
+            Payload::ControllerStateBatch(data) => {
+                if let Some(controller) = controllers.get(&(data.session_slot as u32)) {
+                    let device = controller.controller.device();
 
-                            controller
-                                .device_mut()
-                                .on_rumble(move |strong, weak, duration_ms| {
-                                    let _ = rumble_tx.try_send((slot, strong, weak, duration_ms));
-                                })
-                                .await
-                                .map_err(|e| {
-                                    tracing::warn!(
-                                        "Failed to register rumble callback for slot {}: {}",
-                                        slot,
-                                        e
-                                    );
-                                })
-                                .ok();
-
-                            controllers.insert(data.slot as u32, controller);
-                            tracing::info!("Controller {} attached to slot {}", data.id, data.slot);
-                        } else {
-                            tracing::error!(
-                                "Failed to create controller of type {} for slot {}",
-                                data.id,
-                                data.slot
-                            );
+                    // Handle inputs based on update type
+                    if data.update_type == 0 {
+                        // FULL_STATE: Update all values
+                        let _ = device.sync().await;
+                        for (btn_code, pressed) in data.button_changed_mask {
+                            if let Some(button) = vimputti::Button::from_ev_code(btn_code as u16) {
+                                let _ = device.button(button, pressed).await;
+                                let _ = device.sync().await;
+                            }
                         }
-                    }
-                }
-                ControllerDetach(data) => {
-                    if controllers.remove(&(data.slot as u32)).is_some() {
-                        tracing::info!("Controller detached from slot {}", data.slot);
-                    } else {
-                        tracing::warn!("No controller found in slot {} to detach", data.slot);
-                    }
-                }
-                ControllerButton(data) => {
-                    if let Some(controller) = controllers.get(&(data.slot as u32)) {
-                        if let Some(button) = vimputti::Button::from_ev_code(data.button as u16) {
-                            let device = controller.device();
-                            device.button(button, data.pressed);
-                            device.sync();
+                        if let Some(x) = data.left_stick_x {
+                            let _ = device.axis(vimputti::Axis::LeftStickX, x).await;
+                            let _ = device.sync().await;
+                        }
+                        if let Some(y) = data.left_stick_y {
+                            let _ = device.axis(vimputti::Axis::LeftStickY, y).await;
+                            let _ = device.sync().await;
+                        }
+                        if let Some(x) = data.right_stick_x {
+                            let _ = device.axis(vimputti::Axis::RightStickX, x).await;
+                            let _ = device.sync().await;
+                        }
+                        if let Some(y) = data.right_stick_y {
+                            let _ = device.axis(vimputti::Axis::RightStickY, y).await;
+                            let _ = device.sync().await;
+                        }
+                        if let Some(value) = data.left_trigger {
+                            let _ = device.axis(vimputti::Axis::LowerLeftTrigger, value).await;
+                            let _ = device.sync().await;
+                        }
+                        if let Some(value) = data.right_trigger {
+                            let _ = device.axis(vimputti::Axis::LowerRightTrigger, value).await;
+                            let _ = device.sync().await;
+                        }
+                        if let Some(x) = data.dpad_x {
+                            let _ = device.axis(vimputti::Axis::DPadX, x).await;
+                            let _ = device.sync().await;
+                        }
+                        if let Some(y) = data.dpad_y {
+                            let _ = device.axis(vimputti::Axis::DPadY, y).await;
+                            let _ = device.sync().await;
                         }
                     } else {
-                        tracing::warn!("Controller slot {} not found for button event", data.slot);
-                    }
-                }
-                ControllerStick(data) => {
-                    if let Some(controller) = controllers.get(&(data.slot as u32)) {
-                        let device = controller.device();
-                        if data.stick == 0 {
-                            // Left stick
-                            device.axis(vimputti::Axis::LeftStickX, data.x);
-                            device.sync();
-                            device.axis(vimputti::Axis::LeftStickY, data.y);
-                        } else if data.stick == 1 {
-                            // Right stick
-                            device.axis(vimputti::Axis::RightStickX, data.x);
-                            device.sync();
-                            device.axis(vimputti::Axis::RightStickY, data.y);
+                        // DELTA: Only update changed values
+                        if let Some(changed_fields) = data.changed_fields {
+                            let _ = device.sync().await;
+                            if (changed_fields & (1 << 0)) != 0 {
+                                for (btn_code, pressed) in data.button_changed_mask {
+                                    if let Some(button) =
+                                        vimputti::Button::from_ev_code(btn_code as u16)
+                                    {
+                                        let _ = device.button(button, pressed).await;
+                                        let _ = device.sync().await;
+                                    }
+                                }
+                            }
+                            if (changed_fields & (1 << 1)) != 0 {
+                                if let Some(x) = data.left_stick_x {
+                                    let _ = device.axis(vimputti::Axis::LeftStickX, x).await;
+                                    let _ = device.sync().await;
+                                }
+                            }
+                            if (changed_fields & (1 << 2)) != 0 {
+                                if let Some(y) = data.left_stick_y {
+                                    let _ = device.axis(vimputti::Axis::LeftStickY, y).await;
+                                    let _ = device.sync().await;
+                                }
+                            }
+                            if (changed_fields & (1 << 3)) != 0 {
+                                if let Some(x) = data.right_stick_x {
+                                    let _ = device.axis(vimputti::Axis::RightStickX, x).await;
+                                    let _ = device.sync().await;
+                                }
+                            }
+                            if (changed_fields & (1 << 4)) != 0 {
+                                if let Some(y) = data.right_stick_y {
+                                    let _ = device.axis(vimputti::Axis::RightStickY, y).await;
+                                    let _ = device.sync().await;
+                                }
+                            }
+                            if (changed_fields & (1 << 5)) != 0 {
+                                if let Some(value) = data.left_trigger {
+                                    let _ =
+                                        device.axis(vimputti::Axis::LowerLeftTrigger, value).await;
+                                    let _ = device.sync().await;
+                                }
+                            }
+                            if (changed_fields & (1 << 6)) != 0 {
+                                if let Some(value) = data.right_trigger {
+                                    let _ =
+                                        device.axis(vimputti::Axis::LowerRightTrigger, value).await;
+                                    let _ = device.sync().await;
+                                }
+                            }
+                            if (changed_fields & (1 << 7)) != 0 {
+                                if let Some(x) = data.dpad_x {
+                                    let _ = device.axis(vimputti::Axis::DPadX, x).await;
+                                    let _ = device.sync().await;
+                                }
+                            }
+                            if (changed_fields & (1 << 8)) != 0 {
+                                if let Some(y) = data.dpad_y {
+                                    let _ = device.axis(vimputti::Axis::DPadY, y).await;
+                                    let _ = device.sync().await;
+                                }
+                            }
                         }
-                        device.sync();
-                    } else {
-                        tracing::warn!("Controller slot {} not found for stick event", data.slot);
                     }
+                } else {
+                    tracing::warn!(
+                        "Controller slot {} not found for state batch event",
+                        data.session_slot
+                    );
                 }
-                ControllerTrigger(data) => {
-                    if let Some(controller) = controllers.get(&(data.slot as u32)) {
-                        let device = controller.device();
-                        if data.trigger == 0 {
-                            // Left trigger
-                            device.axis(vimputti::Axis::LowerLeftTrigger, data.value);
-                        } else if data.trigger == 1 {
-                            // Right trigger
-                            device.axis(vimputti::Axis::LowerRightTrigger, data.value);
-                        }
-                        device.sync();
-                    } else {
-                        tracing::warn!("Controller slot {} not found for trigger event", data.slot);
-                    }
-                }
-                ControllerAxis(data) => {
-                    if let Some(controller) = controllers.get(&(data.slot as u32)) {
-                        let device = controller.device();
-                        if data.axis == 0 {
-                            // dpad x
-                            device.axis(vimputti::Axis::DPadX, data.value);
-                        } else if data.axis == 1 {
-                            // dpad y
-                            device.axis(vimputti::Axis::DPadY, data.value);
-                        }
-                        device.sync();
-                    }
-                }
-                // Rumble will be outgoing event..
-                ControllerRumble(_) => {
-                    //no-op
-                }
-                _ => {
-                    //no-op
-                }
+            }
+            _ => {
+                //no-op
             }
         }
     }

packages/server/src/main.rs

@@ -3,12 +3,12 @@ mod enc_helper;
 mod gpu;
 mod input;
 mod latency;
-mod messages;
 mod nestrisink;
 mod p2p;
 mod proto;
 
 use crate::args::encoding_args;
+use crate::args::encoding_args::LatencyControl;
 use crate::enc_helper::{EncoderAPI, EncoderType};
 use crate::gpu::{GPUInfo, GPUVendor};
 use crate::input::controller::ControllerManager;
@@ -25,7 +25,7 @@ use tracing_subscriber::EnvFilter;
 use tracing_subscriber::filter::LevelFilter;
 
 // Handles gathering GPU information and selecting the most suitable GPU
-fn handle_gpus(args: &args::Args) -> Result<Vec<gpu::GPUInfo>, Box<dyn Error>> {
+fn handle_gpus(args: &args::Args) -> Result<Vec<GPUInfo>, Box<dyn Error>> {
     tracing::info!("Gathering GPU information..");
     let mut gpus = gpu::get_gpus()?;
     if gpus.is_empty() {
@@ -120,7 +120,6 @@ fn handle_encoder_video(
             &video_encoders,
             &args.encoding.video.codec,
             &args.encoding.video.encoder_type,
-            args.app.zero_copy,
         )?;
     }
     tracing::info!("Selected video encoder: '{}'", video_encoder.name);
@@ -132,11 +131,20 @@ fn handle_encoder_video_settings(
     args: &args::Args,
     video_encoder: &enc_helper::VideoEncoderInfo,
 ) -> enc_helper::VideoEncoderInfo {
-    let mut optimized_encoder = enc_helper::encoder_low_latency_params(
-        &video_encoder,
-        &args.encoding.video.rate_control,
-        args.app.framerate,
-    );
+    let mut optimized_encoder = match args.encoding.video.latency_control {
+        LatencyControl::LowestLatency => enc_helper::encoder_low_latency_params(
+            &video_encoder,
+            &args.encoding.video.rate_control,
+            args.app.framerate,
+            args.encoding.video.keyframe_dist_secs,
+        ),
+        LatencyControl::HighestQuality => enc_helper::encoder_high_quality_params(
+            &video_encoder,
+            &args.encoding.video.rate_control,
+            args.app.framerate,
+            args.encoding.video.keyframe_dist_secs,
+        ),
+    };
     // Handle rate-control method
     match &args.encoding.video.rate_control {
         encoding_args::RateControl::CQP(cqp) => {
@@ -257,11 +265,15 @@ async fn main() -> Result<(), Box<dyn Error>> {
             None
         }
     };
-    let (controller_manager, rumble_rx) = if let Some(vclient) = vimputti_client {
-        let (controller_manager, rumble_rx) = ControllerManager::new(vclient)?;
-        (Some(Arc::new(controller_manager)), Some(rumble_rx))
+    let (controller_manager, rumble_rx, attach_rx) = if let Some(vclient) = vimputti_client {
+        let (controller_manager, rumble_rx, attach_rx) = ControllerManager::new(vclient)?;
+        (
+            Some(Arc::new(controller_manager)),
+            Some(rumble_rx),
+            Some(attach_rx),
+        )
     } else {
-        (None, None)
+        (None, None, None)
     };
 
     /*** PIPELINE CREATION ***/
@@ -320,7 +332,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
     /* Video */
     // Video Source Element
     let video_source = Arc::new(gstreamer::ElementFactory::make("waylanddisplaysrc").build()?);
-    if let Some(gpu_info) = &video_encoder_info.gpu_info {
+    if args.app.software_render {
+        video_source.set_property_from_str("render-node", "software");
+    } else if let Some(gpu_info) = &video_encoder_info.gpu_info {
         video_source.set_property_from_str("render-node", gpu_info.render_path());
     }
 
@@ -416,6 +430,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         video_source.clone(),
         controller_manager,
         rumble_rx,
+        attach_rx,
     )
     .await?;
     let webrtcsink = BaseWebRTCSink::with_signaller(Signallable::from(signaller.clone()));
@@ -424,47 +439,36 @@ async fn main() -> Result<(), Box<dyn Error>> {
     webrtcsink.set_property("do-retransmission", false);
 
     /* Queues */
+    // Sink queues
+    let video_sink_queue = gstreamer::ElementFactory::make("queue").build()?;
+    let audio_sink_queue = gstreamer::ElementFactory::make("queue").build()?;
+
+    // Source queues
     let video_source_queue = gstreamer::ElementFactory::make("queue")
-        .property("max-size-buffers", 5u32)
+        .property("max-size-buffers", 2u32)
+        .property("max-size-time", 0u64)
+        .property("max-size-bytes", 0u32)
         .build()?;
-
     let audio_source_queue = gstreamer::ElementFactory::make("queue")
-        .property("max-size-buffers", 5u32)
-        .build()?;
-
-    let video_queue = gstreamer::ElementFactory::make("queue")
-        .property("max-size-buffers", 5u32)
-        .build()?;
-
-    let audio_queue = gstreamer::ElementFactory::make("queue")
-        .property("max-size-buffers", 5u32)
-        .build()?;
-
-    /* Clock Sync */
-    let video_clocksync = gstreamer::ElementFactory::make("clocksync")
-        .property("sync-to-first", true)
-        .build()?;
-
-    let audio_clocksync = gstreamer::ElementFactory::make("clocksync")
-        .property("sync-to-first", true)
+        .property("max-size-buffers", 2u32)
+        .property("max-size-time", 0u64)
+        .property("max-size-bytes", 0u32)
         .build()?;
 
     // Add elements to the pipeline
     pipeline.add_many(&[
         webrtcsink.upcast_ref(),
+        &video_sink_queue,
+        &audio_sink_queue,
         &video_encoder,
         &caps_filter,
-        &video_queue,
-        &video_clocksync,
         &video_source_queue,
         &video_source,
         &audio_encoder,
         &audio_capsfilter,
-        &audio_queue,
-        &audio_clocksync,
+        &audio_source_queue,
         &audio_rate,
         &audio_converter,
-        &audio_source_queue,
         &audio_source,
     ])?;
 
@@ -491,20 +495,27 @@ async fn main() -> Result<(), Box<dyn Error>> {
     // Link main audio branch
     gstreamer::Element::link_many(&[
         &audio_source,
-        &audio_source_queue,
         &audio_converter,
         &audio_rate,
         &audio_capsfilter,
-        &audio_queue,
-        &audio_clocksync,
+        &audio_source_queue,
         &audio_encoder,
     ])?;
 
     // Link audio parser to audio encoder if present, otherwise just webrtcsink
     if let Some(parser) = &audio_parser {
-        gstreamer::Element::link_many(&[&audio_encoder, parser, webrtcsink.upcast_ref()])?;
+        gstreamer::Element::link_many(&[
+            &audio_encoder,
+            parser,
+            &audio_sink_queue,
+            webrtcsink.upcast_ref(),
+        ])?;
     } else {
-        gstreamer::Element::link_many(&[&audio_encoder, webrtcsink.upcast_ref()])?;
+        gstreamer::Element::link_many(&[
+            &audio_encoder,
+            &audio_sink_queue,
+            webrtcsink.upcast_ref(),
+        ])?;
     }
 
     // With zero-copy..
@@ -513,30 +524,21 @@ async fn main() -> Result<(), Box<dyn Error>> {
         if let (Some(vapostproc), Some(va_caps_filter)) = (&vapostproc, &va_caps_filter) {
             gstreamer::Element::link_many(&[
                 &video_source,
-                &video_source_queue,
                 &caps_filter,
-                &video_queue,
-                &video_clocksync,
+                &video_source_queue,
                 &vapostproc,
                 &va_caps_filter,
                 &video_encoder,
             ])?;
         } else if video_encoder_info.encoder_api == EncoderAPI::NVENC {
             // NVENC pipeline
-            gstreamer::Element::link_many(&[
-                &video_source,
-                &video_source_queue,
-                &caps_filter,
-                &video_encoder,
-            ])?;
+            gstreamer::Element::link_many(&[&video_source, &caps_filter, &video_encoder])?;
         }
     } else {
         gstreamer::Element::link_many(&[
             &video_source,
-            &video_source_queue,
             &caps_filter,
-            &video_queue,
-            &video_clocksync,
+            &video_source_queue,
             &video_converter.unwrap(),
             &video_encoder,
         ])?;
@@ -544,21 +546,24 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     // Link video parser if present with webrtcsink, otherwise just link webrtc sink
     if let Some(parser) = &video_parser {
-        gstreamer::Element::link_many(&[&video_encoder, parser, webrtcsink.upcast_ref()])?;
+        gstreamer::Element::link_many(&[
+            &video_encoder,
+            parser,
+            &video_sink_queue,
+            webrtcsink.upcast_ref(),
+        ])?;
     } else {
-        gstreamer::Element::link_many(&[&video_encoder, webrtcsink.upcast_ref()])?;
+        gstreamer::Element::link_many(&[
+            &video_encoder,
+            &video_sink_queue,
+            webrtcsink.upcast_ref(),
+        ])?;
     }
 
-    // Make sure QOS is disabled to avoid latency
-    video_encoder.set_property("qos", false);
+    video_source.set_property("do-timestamp", &false);
+    audio_source.set_property("do-timestamp", &false);
 
     // Optimize latency of pipeline
-    video_source
-        .sync_state_with_parent()
-        .expect("failed to sync with parent");
-    video_source.set_property("do-timestamp", &true);
-    audio_source.set_property("do-timestamp", &true);
-
     pipeline.set_property("latency", &0u64);
     pipeline.set_property("async-handling", true);
     pipeline.set_property("message-forward", true);

packages/server/src/messages.rs

@@ -1,50 +0,0 @@
-use crate::latency::LatencyTracker;
-use serde::{Deserialize, Serialize};
-use webrtc::ice_transport::ice_candidate::RTCIceCandidateInit;
-use webrtc::peer_connection::sdp::session_description::RTCSessionDescription;
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct MessageBase {
-    pub payload_type: String,
-    pub latency: Option<LatencyTracker>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct MessageRaw {
-    #[serde(flatten)]
-    pub base: MessageBase,
-    pub data: serde_json::Value,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct MessageLog {
-    #[serde(flatten)]
-    pub base: MessageBase,
-    pub level: String,
-    pub message: String,
-    pub time: String,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct MessageMetrics {
-    #[serde(flatten)]
-    pub base: MessageBase,
-    pub usage_cpu: f64,
-    pub usage_memory: f64,
-    pub uptime: u64,
-    pub pipeline_latency: f64,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct MessageICE {
-    #[serde(flatten)]
-    pub base: MessageBase,
-    pub candidate: RTCIceCandidateInit,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct MessageSDP {
-    #[serde(flatten)]
-    pub base: MessageBase,
-    pub sdp: RTCSessionDescription,
-}

packages/server/src/nestrisink/imp.rs

@@ -1,11 +1,11 @@
 use crate::input::controller::ControllerManager;
-use crate::messages::{MessageBase, MessageICE, MessageRaw, MessageSDP};
 use crate::p2p::p2p::NestriConnection;
 use crate::p2p::p2p_protocol_stream::NestriStreamProtocol;
-use crate::proto::proto::proto_input::InputType::{
-    KeyDown, KeyUp, MouseKeyDown, MouseKeyUp, MouseMove, MouseMoveAbs, MouseWheel,
+use crate::proto::proto::proto_message::Payload;
+use crate::proto::proto::{
+    ProtoControllerAttach, ProtoControllerRumble, ProtoIce, ProtoMessage, ProtoSdp,
+    ProtoServerPushStream, RtcIceCandidateInit, RtcSessionDescriptionInit,
 };
-use crate::proto::proto::{ProtoInput, ProtoMessageInput};
 use anyhow::Result;
 use glib::subclass::prelude::*;
 use gstreamer::glib;
@@ -16,8 +16,6 @@ use parking_lot::RwLock as PLRwLock;
 use prost::Message;
 use std::sync::{Arc, LazyLock};
 use tokio::sync::{Mutex, mpsc};
-use webrtc::ice_transport::ice_candidate::RTCIceCandidateInit;
-use webrtc::peer_connection::sdp::session_description::RTCSessionDescription;
 
 pub struct Signaller {
     stream_room: PLRwLock<Option<String>>,
@@ -25,7 +23,8 @@ pub struct Signaller {
     wayland_src: PLRwLock<Option<Arc<gstreamer::Element>>>,
     data_channel: PLRwLock<Option<Arc<gstreamer_webrtc::WebRTCDataChannel>>>,
     controller_manager: PLRwLock<Option<Arc<ControllerManager>>>,
-    rumble_rx: Mutex<Option<mpsc::Receiver<(u32, u16, u16, u16)>>>,
+    rumble_rx: Mutex<Option<mpsc::Receiver<(u32, u16, u16, u16, String)>>>,
+    attach_rx: Mutex<Option<mpsc::Receiver<ProtoControllerAttach>>>,
 }
 impl Default for Signaller {
     fn default() -> Self {
@@ -36,6 +35,7 @@ impl Default for Signaller {
             data_channel: PLRwLock::new(None),
             controller_manager: PLRwLock::new(None),
             rumble_rx: Mutex::new(None),
+            attach_rx: Mutex::new(None),
         }
     }
 }
@@ -70,15 +70,27 @@ impl Signaller {
         self.controller_manager.read().clone()
     }
 
-    pub async fn set_rumble_rx(&self, rumble_rx: mpsc::Receiver<(u32, u16, u16, u16)>) {
+    pub async fn set_rumble_rx(&self, rumble_rx: mpsc::Receiver<(u32, u16, u16, u16, String)>) {
         *self.rumble_rx.lock().await = Some(rumble_rx);
     }
 
-    // Change getter to take ownership:
-    pub async fn take_rumble_rx(&self) -> Option<mpsc::Receiver<(u32, u16, u16, u16)>> {
+    pub async fn take_rumble_rx(&self) -> Option<mpsc::Receiver<(u32, u16, u16, u16, String)>> {
         self.rumble_rx.lock().await.take()
     }
 
+    pub async fn set_attach_rx(
+        &self,
+        attach_rx: mpsc::Receiver<crate::proto::proto::ProtoControllerAttach>,
+    ) {
+        *self.attach_rx.lock().await = Some(attach_rx);
+    }
+
+    pub async fn take_attach_rx(
+        &self,
+    ) -> Option<mpsc::Receiver<crate::proto::proto::ProtoControllerAttach>> {
+        self.attach_rx.lock().await.take()
+    }
+
     pub fn set_data_channel(&self, data_channel: gstreamer_webrtc::WebRTCDataChannel) {
         *self.data_channel.write() = Some(Arc::new(data_channel));
     }
@@ -95,68 +107,85 @@ impl Signaller {
         };
         {
             let self_obj = self.obj().clone();
-            stream_protocol.register_callback("answer", move |data| {
-                if let Ok(message) = serde_json::from_slice::<MessageSDP>(&data) {
-                    let sdp = gst_sdp::SDPMessage::parse_buffer(message.sdp.sdp.as_bytes())
-                        .map_err(|e| anyhow::anyhow!("Invalid SDP in 'answer': {e:?}"))?;
-                    let answer = WebRTCSessionDescription::new(WebRTCSDPType::Answer, sdp);
-                    Ok(self_obj.emit_by_name::<()>(
-                        "session-description",
-                        &[&"unique-session-id", &answer],
-                    ))
+            stream_protocol.register_callback("answer", move |msg| {
+                if let Some(payload) = msg.payload {
+                    match payload {
+                        Payload::Sdp(sdp) => {
+                            if let Some(sdp) = sdp.sdp {
+                                let sdp = gst_sdp::SDPMessage::parse_buffer(sdp.sdp.as_bytes())
+                                    .map_err(|e| {
+                                        anyhow::anyhow!("Invalid SDP in 'answer': {e:?}")
+                                    })?;
+                                let answer =
+                                    WebRTCSessionDescription::new(WebRTCSDPType::Answer, sdp);
+                                return Ok(self_obj.emit_by_name::<()>(
+                                    "session-description",
+                                    &[&"unique-session-id", &answer],
+                                ));
+                            }
+                        }
+                        _ => {
+                            tracing::warn!("Unexpected payload type for answer");
+                            return Ok(());
+                        }
+                    }
                 } else {
-                    anyhow::bail!("Failed to decode SDP message");
+                    anyhow::bail!("Failed to decode answer message");
                 }
+                Ok(())
             });
         }
         {
             let self_obj = self.obj().clone();
-            stream_protocol.register_callback("ice-candidate", move |data| {
-                if let Ok(message) = serde_json::from_slice::<MessageICE>(&data) {
-                    let candidate = message.candidate;
-                    let sdp_m_line_index = candidate.sdp_mline_index.unwrap_or(0) as u32;
-                    let sdp_mid = candidate.sdp_mid;
-                    Ok(self_obj.emit_by_name::<()>(
-                        "handle-ice",
-                        &[
-                            &"unique-session-id",
-                            &sdp_m_line_index,
-                            &sdp_mid,
-                            &candidate.candidate,
-                        ],
-                    ))
+            stream_protocol.register_callback("ice-candidate", move |msg| {
+                if let Some(payload) = msg.payload {
+                    match payload {
+                        Payload::Ice(ice) => {
+                            if let Some(candidate) = ice.candidate {
+                                let sdp_m_line_index = candidate.sdp_m_line_index.unwrap_or(0);
+                                return Ok(self_obj.emit_by_name::<()>(
+                                    "handle-ice",
+                                    &[
+                                        &"unique-session-id",
+                                        &sdp_m_line_index,
+                                        &candidate.sdp_mid,
+                                        &candidate.candidate,
+                                    ],
+                                ));
+                            }
+                        }
+                        _ => {
+                            tracing::warn!("Unexpected payload type for ice-candidate");
+                            return Ok(());
+                        }
+                    }
                 } else {
                     anyhow::bail!("Failed to decode ICE message");
                 }
+                Ok(())
             });
         }
         {
             let self_obj = self.obj().clone();
-            stream_protocol.register_callback("push-stream-ok", move |data| {
-                if let Ok(answer) = serde_json::from_slice::<MessageRaw>(&data) {
-                    // Decode room name string
-                    if let Some(room_name) = answer.data.as_str() {
-                        gstreamer::info!(
-                            gstreamer::CAT_DEFAULT,
-                            "Received OK answer for room: {}",
-                            room_name
-                        );
-                    } else {
-                        gstreamer::error!(
-                            gstreamer::CAT_DEFAULT,
-                            "Failed to decode room name from answer"
-                        );
-                    }
-
-                    // Send our SDP offer
-                    Ok(self_obj.emit_by_name::<()>(
-                        "session-requested",
-                        &[
-                            &"unique-session-id",
-                            &"consumer-identifier",
-                            &None::<WebRTCSessionDescription>,
-                        ],
-                    ))
+            stream_protocol.register_callback("push-stream-ok", move |msg| {
+                if let Some(payload) = msg.payload {
+                    return match payload {
+                        Payload::ServerPushStream(_res) => {
+                            // Send our SDP offer
+                            Ok(self_obj.emit_by_name::<()>(
+                                "session-requested",
+                                &[
+                                    &"unique-session-id",
+                                    &"consumer-identifier",
+                                    &None::<WebRTCSessionDescription>,
+                                ],
+                            ))
+                        }
+                        _ => {
+                            tracing::warn!("Unexpected payload type for push-stream-ok");
+                            Ok(())
+                        }
+                    };
                 } else {
                     anyhow::bail!("Failed to decode answer");
                 }
@@ -200,12 +229,14 @@ impl Signaller {
                                 // Spawn async task to take the receiver and set up
                                 tokio::spawn(async move {
                                     let rumble_rx = signaller.imp().take_rumble_rx().await;
+                                    let attach_rx = signaller.imp().take_attach_rx().await;
                                     let controller_manager =
                                         signaller.imp().get_controller_manager();
 
                                     setup_data_channel(
                                         controller_manager,
                                         rumble_rx,
+                                        attach_rx,
                                         data_channel,
                                         &wayland_src,
                                     );
@@ -243,19 +274,18 @@ impl SignallableImpl for Signaller {
             return;
         };
 
-        let push_msg = MessageRaw {
-            base: MessageBase {
-                payload_type: "push-stream-room".to_string(),
-                latency: None,
-            },
-            data: serde_json::Value::from(stream_room),
-        };
-
         let Some(stream_protocol) = self.get_stream_protocol() else {
             gstreamer::error!(gstreamer::CAT_DEFAULT, "Stream protocol not set");
             return;
         };
 
+        let push_msg = crate::proto::create_message(
+            Payload::ServerPushStream(ProtoServerPushStream {
+                room_name: stream_room,
+            }),
+            "push-stream-room",
+            None,
+        );
         if let Err(e) = stream_protocol.send_message(&push_msg) {
             tracing::error!("Failed to send push stream room message: {:?}", e);
         }
@@ -266,20 +296,22 @@ impl SignallableImpl for Signaller {
     }
 
     fn send_sdp(&self, _session_id: &str, sdp: &WebRTCSessionDescription) {
-        let sdp_message = MessageSDP {
-            base: MessageBase {
-                payload_type: "offer".to_string(),
-                latency: None,
-            },
-            sdp: RTCSessionDescription::offer(sdp.sdp().as_text().unwrap()).unwrap(),
-        };
-
         let Some(stream_protocol) = self.get_stream_protocol() else {
             gstreamer::error!(gstreamer::CAT_DEFAULT, "Stream protocol not set");
             return;
         };
 
-        if let Err(e) = stream_protocol.send_message(&sdp_message) {
+        let sdp_msg = crate::proto::create_message(
+            Payload::Sdp(ProtoSdp {
+                sdp: Some(RtcSessionDescriptionInit {
+                    sdp: sdp.sdp().as_text().unwrap(),
+                    r#type: "offer".to_string(),
+                }),
+            }),
+            "offer",
+            None,
+        );
+        if let Err(e) = stream_protocol.send_message(&sdp_msg) {
             tracing::error!("Failed to send SDP message: {:?}", e);
         }
     }
@@ -291,26 +323,25 @@ impl SignallableImpl for Signaller {
         sdp_m_line_index: u32,
         sdp_mid: Option<String>,
     ) {
-        let candidate_init = RTCIceCandidateInit {
-            candidate: candidate.to_string(),
-            sdp_mid,
-            sdp_mline_index: Some(sdp_m_line_index as u16),
-            ..Default::default()
-        };
-        let ice_message = MessageICE {
-            base: MessageBase {
-                payload_type: "ice-candidate".to_string(),
-                latency: None,
-            },
-            candidate: candidate_init,
-        };
-
         let Some(stream_protocol) = self.get_stream_protocol() else {
             gstreamer::error!(gstreamer::CAT_DEFAULT, "Stream protocol not set");
             return;
         };
 
-        if let Err(e) = stream_protocol.send_message(&ice_message) {
+        let candidate_init = RtcIceCandidateInit {
+            candidate: candidate.to_string(),
+            sdp_mid,
+            sdp_m_line_index: Some(sdp_m_line_index),
+            ..Default::default() //username_fragment: Some(session_id.to_string()), TODO: required?
+        };
+        let ice_msg = crate::proto::create_message(
+            Payload::Ice(ProtoIce {
+                candidate: Some(candidate_init),
+            }),
+            "ice-candidate",
+            None,
+        );
+        if let Err(e) = stream_protocol.send_message(&ice_msg) {
             tracing::error!("Failed to send ICE candidate message: {:?}", e);
         }
     }
@@ -351,7 +382,8 @@ impl ObjectImpl for Signaller {
 
 fn setup_data_channel(
     controller_manager: Option<Arc<ControllerManager>>,
-    rumble_rx: Option<mpsc::Receiver<(u32, u16, u16, u16)>>, // (slot, strong, weak, duration_ms)
+    rumble_rx: Option<mpsc::Receiver<(u32, u16, u16, u16, String)>>, // (slot, strong, weak, duration_ms, session_id)
+    attach_rx: Option<mpsc::Receiver<ProtoControllerAttach>>,
     data_channel: Arc<gstreamer_webrtc::WebRTCDataChannel>,
     wayland_src: &gstreamer::Element,
 ) {
@@ -361,11 +393,11 @@ fn setup_data_channel(
     // Spawn async processor
     tokio::spawn(async move {
         while let Some(data) = rx.recv().await {
-            match ProtoMessageInput::decode(data.as_slice()) {
-                Ok(message_input) => {
-                    if let Some(message_base) = message_input.message_base {
+            match ProtoMessage::decode(data.as_slice()) {
+                Ok(msg_wrapper) => {
+                    if let Some(message_base) = msg_wrapper.message_base {
                         if message_base.payload_type == "input" {
-                            if let Some(input_data) = message_input.data {
+                            if let Some(input_data) = msg_wrapper.payload {
                                 if let Some(event) = handle_input_message(input_data) {
                                     // Send the event to wayland source, result bool is ignored
                                     let _ = wayland_src.send_event(event);
@@ -373,7 +405,7 @@ fn setup_data_channel(
                             }
                         } else if message_base.payload_type == "controllerInput" {
                             if let Some(controller_manager) = &controller_manager {
-                                if let Some(input_data) = message_input.data {
+                                if let Some(input_data) = msg_wrapper.payload {
                                     let _ = controller_manager.send_command(input_data).await;
                                 }
                             }
@@ -391,26 +423,18 @@ fn setup_data_channel(
     if let Some(mut rumble_rx) = rumble_rx {
         let data_channel_clone = data_channel.clone();
         tokio::spawn(async move {
-            while let Some((slot, strong, weak, duration_ms)) = rumble_rx.recv().await {
-                let rumble_msg = ProtoMessageInput {
-                    message_base: Some(crate::proto::proto::ProtoMessageBase {
-                        payload_type: "controllerInput".to_string(),
-                        latency: None,
+            while let Some((slot, strong, weak, duration_ms, session_id)) = rumble_rx.recv().await {
+                let rumble_msg = crate::proto::create_message(
+                    Payload::ControllerRumble(ProtoControllerRumble {
+                        session_slot: slot as i32,
+                        session_id: session_id,
+                        low_frequency: weak as i32,
+                        high_frequency: strong as i32,
+                        duration: duration_ms as i32,
                     }),
-                    data: Some(ProtoInput {
-                        input_type: Some(
-                            crate::proto::proto::proto_input::InputType::ControllerRumble(
-                                crate::proto::proto::ProtoControllerRumble {
-                                    r#type: "ControllerRumble".to_string(),
-                                    slot: slot as i32,
-                                    low_frequency: weak as i32,
-                                    high_frequency: strong as i32,
-                                    duration: duration_ms as i32,
-                                },
-                            ),
-                        ),
-                    }),
-                };
+                    "controllerInput",
+                    None,
+                );
 
                 let data = rumble_msg.encode_to_vec();
                 let bytes = glib::Bytes::from_owned(data);
@@ -422,6 +446,27 @@ fn setup_data_channel(
         });
     }
 
+    // Spawn attach sender
+    if let Some(mut attach_rx) = attach_rx {
+        let data_channel_clone = data_channel.clone();
+        tokio::spawn(async move {
+            while let Some(attach_msg) = attach_rx.recv().await {
+                let proto_msg = crate::proto::create_message(
+                    Payload::ControllerAttach(attach_msg),
+                    "controllerInput",
+                    None,
+                );
+
+                let data = proto_msg.encode_to_vec();
+                let bytes = glib::Bytes::from_owned(data);
+
+                if let Err(e) = data_channel_clone.send_data_full(Some(&bytes)) {
+                    tracing::warn!("Failed to send controller attach data: {}", e);
+                }
+            }
+        });
+    }
+
     data_channel.connect_on_message_data(move |_data_channel, data| {
         if let Some(data) = data {
             let _ = tx.send(data.to_vec());
@@ -429,68 +474,64 @@ fn setup_data_channel(
     });
 }
 
-fn handle_input_message(input_msg: ProtoInput) -> Option<gstreamer::Event> {
-    if let Some(input_type) = input_msg.input_type {
-        match input_type {
-            MouseMove(data) => {
-                let structure = gstreamer::Structure::builder("MouseMoveRelative")
-                    .field("pointer_x", data.x as f64)
-                    .field("pointer_y", data.y as f64)
-                    .build();
+fn handle_input_message(payload: Payload) -> Option<gstreamer::Event> {
+    match payload {
+        Payload::MouseMove(data) => {
+            let structure = gstreamer::Structure::builder("MouseMoveRelative")
+                .field("pointer_x", data.x as f64)
+                .field("pointer_y", data.y as f64)
+                .build();
 
-                Some(gstreamer::event::CustomUpstream::new(structure))
-            }
-            MouseMoveAbs(data) => {
-                let structure = gstreamer::Structure::builder("MouseMoveAbsolute")
-                    .field("pointer_x", data.x as f64)
-                    .field("pointer_y", data.y as f64)
-                    .build();
-
-                Some(gstreamer::event::CustomUpstream::new(structure))
-            }
-            KeyDown(data) => {
-                let structure = gstreamer::Structure::builder("KeyboardKey")
-                    .field("key", data.key as u32)
-                    .field("pressed", true)
-                    .build();
-
-                Some(gstreamer::event::CustomUpstream::new(structure))
-            }
-            KeyUp(data) => {
-                let structure = gstreamer::Structure::builder("KeyboardKey")
-                    .field("key", data.key as u32)
-                    .field("pressed", false)
-                    .build();
-
-                Some(gstreamer::event::CustomUpstream::new(structure))
-            }
-            MouseWheel(data) => {
-                let structure = gstreamer::Structure::builder("MouseAxis")
-                    .field("x", data.x as f64)
-                    .field("y", data.y as f64)
-                    .build();
-
-                Some(gstreamer::event::CustomUpstream::new(structure))
-            }
-            MouseKeyDown(data) => {
-                let structure = gstreamer::Structure::builder("MouseButton")
-                    .field("button", data.key as u32)
-                    .field("pressed", true)
-                    .build();
-
-                Some(gstreamer::event::CustomUpstream::new(structure))
-            }
-            MouseKeyUp(data) => {
-                let structure = gstreamer::Structure::builder("MouseButton")
-                    .field("button", data.key as u32)
-                    .field("pressed", false)
-                    .build();
-
-                Some(gstreamer::event::CustomUpstream::new(structure))
-            }
-            _ => None,
+            Some(gstreamer::event::CustomUpstream::new(structure))
         }
-    } else {
-        None
+        Payload::MouseMoveAbs(data) => {
+            let structure = gstreamer::Structure::builder("MouseMoveAbsolute")
+                .field("pointer_x", data.x as f64)
+                .field("pointer_y", data.y as f64)
+                .build();
+
+            Some(gstreamer::event::CustomUpstream::new(structure))
+        }
+        Payload::KeyDown(data) => {
+            let structure = gstreamer::Structure::builder("KeyboardKey")
+                .field("key", data.key as u32)
+                .field("pressed", true)
+                .build();
+
+            Some(gstreamer::event::CustomUpstream::new(structure))
+        }
+        Payload::KeyUp(data) => {
+            let structure = gstreamer::Structure::builder("KeyboardKey")
+                .field("key", data.key as u32)
+                .field("pressed", false)
+                .build();
+
+            Some(gstreamer::event::CustomUpstream::new(structure))
+        }
+        Payload::MouseWheel(data) => {
+            let structure = gstreamer::Structure::builder("MouseAxis")
+                .field("x", data.x as f64)
+                .field("y", data.y as f64)
+                .build();
+
+            Some(gstreamer::event::CustomUpstream::new(structure))
+        }
+        Payload::MouseKeyDown(data) => {
+            let structure = gstreamer::Structure::builder("MouseButton")
+                .field("button", data.key as u32)
+                .field("pressed", true)
+                .build();
+
+            Some(gstreamer::event::CustomUpstream::new(structure))
+        }
+        Payload::MouseKeyUp(data) => {
+            let structure = gstreamer::Structure::builder("MouseButton")
+                .field("button", data.key as u32)
+                .field("pressed", false)
+                .build();
+
+            Some(gstreamer::event::CustomUpstream::new(structure))
+        }
+        _ => None,
     }
 }

packages/server/src/nestrisink/mod.rs

@@ -18,7 +18,8 @@ impl NestriSignaller {
         nestri_conn: NestriConnection,
         wayland_src: Arc<gstreamer::Element>,
         controller_manager: Option<Arc<ControllerManager>>,
-        rumble_rx: Option<mpsc::Receiver<(u32, u16, u16, u16)>>,
+        rumble_rx: Option<mpsc::Receiver<(u32, u16, u16, u16, String)>>,
+        attach_rx: Option<mpsc::Receiver<crate::proto::proto::ProtoControllerAttach>>,
     ) -> Result<Self, Box<dyn std::error::Error>> {
         let obj: Self = glib::Object::new();
         obj.imp().set_stream_room(room);
@@ -30,6 +31,9 @@ impl NestriSignaller {
         if let Some(rumble_rx) = rumble_rx {
             obj.imp().set_rumble_rx(rumble_rx).await;
         }
+        if let Some(attach_rx) = attach_rx {
+            obj.imp().set_attach_rx(attach_rx).await;
+        }
         Ok(obj)
     }
 }

packages/server/src/p2p/p2p.rs

@@ -55,9 +55,8 @@ impl NestriP2P {
                     noise::Config::new,
                     yamux::Config::default,
                 )?
+                .with_quic()
                 .with_dns()?
-                .with_websocket(noise::Config::new, yamux::Config::default)
-                .await?
                 .with_behaviour(|key| NestriBehaviour::new(key.public()))?
                 .build(),
         ));

packages/server/src/p2p/p2p_protocol_stream.rs

@@ -3,21 +3,22 @@ use crate::p2p::p2p_safestream::SafeStream;
 use anyhow::Result;
 use dashmap::DashMap;
 use libp2p::StreamProtocol;
+use prost::Message;
 use std::sync::Arc;
 use tokio::sync::mpsc;
 
 // Cloneable callback type
-pub type CallbackInner = dyn Fn(Vec<u8>) -> Result<()> + Send + Sync + 'static;
+pub type CallbackInner = dyn Fn(crate::proto::proto::ProtoMessage) -> Result<()> + Send + Sync + 'static;
 pub struct Callback(Arc<CallbackInner>);
 impl Callback {
     pub fn new<F>(f: F) -> Self
     where
-        F: Fn(Vec<u8>) -> Result<()> + Send + Sync + 'static,
+        F: Fn(crate::proto::proto::ProtoMessage) -> Result<()> + Send + Sync + 'static,
     {
         Callback(Arc::new(f))
     }
 
-    pub fn call(&self, data: Vec<u8>) -> Result<()> {
+    pub fn call(&self, data: crate::proto::proto::ProtoMessage) -> Result<()> {
         self.0(data)
     }
 }
@@ -104,26 +105,31 @@ impl NestriStreamProtocol {
                     }
                 };
 
-                match serde_json::from_slice::<crate::messages::MessageBase>(&data) {
-                    Ok(base_message) => {
-                        let response_type = base_message.payload_type;
+                match crate::proto::proto::ProtoMessage::decode(data.as_slice()) {
+                    Ok(message) => {
+                        if let Some(base_message) = &message.message_base {
+                            let response_type = &base_message.payload_type;
+                            let response_type = response_type.clone();
 
-                        // With DashMap, we don't need explicit locking
-                        // we just get the callback directly if it exists
-                        if let Some(callback) = callbacks.get(&response_type) {
-                            // Execute the callback
-                            if let Err(e) = callback.call(data.clone()) {
-                                tracing::error!(
-                                    "Callback for response type '{}' errored: {:?}",
-                                    response_type,
-                                    e
+                            // With DashMap, we don't need explicit locking
+                            // we just get the callback directly if it exists
+                            if let Some(callback) = callbacks.get(&response_type) {
+                                // Execute the callback
+                                if let Err(e) = callback.call(message) {
+                                    tracing::error!(
+                                        "Callback for response type '{}' errored: {:?}",
+                                        response_type,
+                                        e
+                                    );
+                                }
+                            } else {
+                                tracing::warn!(
+                                    "No callback registered for response type: {}",
+                                    response_type
                                 );
                             }
                         } else {
-                            tracing::warn!(
-                                "No callback registered for response type: {}",
-                                response_type
-                            );
+                            tracing::error!("No base message in decoded protobuf message",);
                         }
                     }
                     Err(e) => {
@@ -154,8 +160,9 @@ impl NestriStreamProtocol {
         })
     }
 
-    pub fn send_message<M: serde::Serialize>(&self, message: &M) -> Result<()> {
-        let json_data = serde_json::to_vec(message)?;
+    pub fn send_message(&self, message: &crate::proto::proto::ProtoMessage) -> Result<()> {
+        let mut buf = Vec::new();
+        message.encode(&mut buf)?;
         let Some(tx) = &self.tx else {
             return Err(anyhow::Error::msg(
                 if self.read_handle.is_none() && self.write_handle.is_none() {
@@ -165,13 +172,13 @@ impl NestriStreamProtocol {
                 },
             ));
         };
-        tx.try_send(json_data)?;
+        tx.try_send(buf)?;
         Ok(())
     }
 
     pub fn register_callback<F>(&self, response_type: &str, callback: F)
     where
-        F: Fn(Vec<u8>) -> Result<()> + Send + Sync + 'static,
+        F: Fn(crate::proto::proto::ProtoMessage) -> Result<()> + Send + Sync + 'static,
     {
         self.callbacks
             .insert(response_type.to_string(), Callback::new(callback));

packages/server/src/p2p/p2p_safestream.rs

@@ -1,11 +1,9 @@
 use anyhow::Result;
-use byteorder::{BigEndian, ByteOrder};
 use libp2p::futures::io::{ReadHalf, WriteHalf};
 use libp2p::futures::{AsyncReadExt, AsyncWriteExt};
 use std::sync::Arc;
 use tokio::sync::Mutex;
-
-const MAX_SIZE: usize = 1024 * 1024; // 1MB
+use unsigned_varint::{decode, encode};
 
 pub struct SafeStream {
     stream_read: Arc<Mutex<ReadHalf<libp2p::Stream>>>,
@@ -29,34 +27,52 @@ impl SafeStream {
     }
 
     async fn send_with_length_prefix(&self, data: &[u8]) -> Result<()> {
-        if data.len() > MAX_SIZE {
-            anyhow::bail!("Data exceeds maximum size");
-        }
-
-        let mut buffer = Vec::with_capacity(4 + data.len());
-        buffer.extend_from_slice(&(data.len() as u32).to_be_bytes()); // Length prefix
-        buffer.extend_from_slice(data); // Payload
-
         let mut stream_write = self.stream_write.lock().await;
-        stream_write.write_all(&buffer).await?; // Single write
+
+        // Encode length as varint
+        let mut length_buf = encode::usize_buffer();
+        let length_bytes = encode::usize(data.len(), &mut length_buf);
+
+        // Write varint length prefix
+        stream_write.write_all(length_bytes).await?;
+
+        // Write payload
+        stream_write.write_all(data).await?;
         stream_write.flush().await?;
+
         Ok(())
     }
 
     async fn receive_with_length_prefix(&self) -> Result<Vec<u8>> {
         let mut stream_read = self.stream_read.lock().await;
 
-        // Read length prefix + data in one syscall
-        let mut length_prefix = [0u8; 4];
-        stream_read.read_exact(&mut length_prefix).await?;
-        let length = BigEndian::read_u32(&length_prefix) as usize;
+        // Read varint length prefix (up to 10 bytes for u64)
+        let mut length_buf = Vec::new();
+        let mut temp_byte = [0u8; 1];
 
-        if length > MAX_SIZE {
-            anyhow::bail!("Received data exceeds maximum size");
+        loop {
+            stream_read.read_exact(&mut temp_byte).await?;
+            length_buf.push(temp_byte[0]);
+
+            // Check if this is the last byte (MSB = 0)
+            if temp_byte[0] & 0x80 == 0 {
+                break;
+            }
+
+            // Protect against malicious infinite varints
+            if length_buf.len() > 10 {
+                anyhow::bail!("Invalid varint encoding");
+            }
         }
 
+        // Decode the varint
+        let (length, _) = decode::usize(&length_buf)
+            .map_err(|e| anyhow::anyhow!("Failed to decode varint: {}", e))?;
+
+        // Read payload
         let mut buffer = vec![0u8; length];
         stream_read.read_exact(&mut buffer).await?;
+
         Ok(buffer)
     }
 }

packages/server/src/proto.rs

@@ -1 +1,35 @@
 pub mod proto;
+
+pub struct CreateMessageOptions {
+    pub sequence_id: Option<String>,
+    pub latency: Option<proto::ProtoLatencyTracker>,
+}
+
+pub fn create_message(
+    payload: proto::proto_message::Payload,
+    payload_type: impl Into<String>,
+    options: Option<CreateMessageOptions>,
+) -> proto::ProtoMessage {
+    let opts = options.unwrap_or(CreateMessageOptions {
+        sequence_id: None,
+        latency: None,
+    });
+
+    let latency = opts.latency.or_else(|| {
+        opts.sequence_id.map(|seq_id| proto::ProtoLatencyTracker {
+            sequence_id: seq_id,
+            timestamps: vec![proto::ProtoTimestampEntry {
+                stage: "created".to_string(),
+                time: Some(prost_types::Timestamp::from(std::time::SystemTime::now())),
+            }],
+        })
+    });
+
+    proto::ProtoMessage {
+        message_base: Some(proto::ProtoMessageBase {
+            payload_type: payload_type.into(),
+            latency,
+        }),
+        payload: Some(payload),
+    }
+}

packages/server/src/proto/gen.rs

@@ -1,202 +0,0 @@
-// @generated
-// This file is @generated by prost-build.
-/// EntityState represents the state of an entity in the mesh (e.g., a room).
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct EntityState {
-    /// Type of entity (e.g., "room")
-    #[prost(string, tag="1")]
-    pub entity_type: ::prost::alloc::string::String,
-    /// Unique identifier (e.g., room name)
-    #[prost(string, tag="2")]
-    pub entity_id: ::prost::alloc::string::String,
-    /// Whether the entity is active
-    #[prost(bool, tag="3")]
-    pub active: bool,
-    /// Relay ID that owns this entity
-    #[prost(string, tag="4")]
-    pub owner_relay_id: ::prost::alloc::string::String,
-}
-/// MeshMessage is the top-level message for all relay-to-relay communication.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct MeshMessage {
-    #[prost(oneof="mesh_message::Type", tags="1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13")]
-    pub r#type: ::core::option::Option<mesh_message::Type>,
-}
-/// Nested message and enum types in `MeshMessage`.
-pub mod mesh_message {
-    #[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum Type {
-        /// Level 0
-        #[prost(message, tag="1")]
-        StateUpdate(super::StateUpdate),
-        #[prost(message, tag="2")]
-        Ack(super::Ack),
-        #[prost(message, tag="3")]
-        RetransmissionRequest(super::RetransmissionRequest),
-        #[prost(message, tag="4")]
-        Retransmission(super::Retransmission),
-        #[prost(message, tag="5")]
-        Heartbeat(super::Heartbeat),
-        #[prost(message, tag="6")]
-        SuspectRelay(super::SuspectRelay),
-        #[prost(message, tag="7")]
-        Disconnect(super::Disconnect),
-        /// Level 1
-        #[prost(message, tag="8")]
-        ForwardSdp(super::ForwardSdp),
-        #[prost(message, tag="9")]
-        ForwardIce(super::ForwardIce),
-        #[prost(message, tag="10")]
-        ForwardIngest(super::ForwardIngest),
-        #[prost(message, tag="11")]
-        StreamRequest(super::StreamRequest),
-        /// Level 2
-        #[prost(message, tag="12")]
-        Handshake(super::Handshake),
-        #[prost(message, tag="13")]
-        HandshakeResponse(super::HandshakeResponse),
-    }
-}
-/// Handshake to inititiate new connection to mesh.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Handshake {
-    /// UUID of the relay
-    #[prost(string, tag="1")]
-    pub relay_id: ::prost::alloc::string::String,
-    /// base64 encoded Diffie-Hellman public key
-    #[prost(string, tag="2")]
-    pub dh_public_key: ::prost::alloc::string::String,
-}
-/// HandshakeResponse to respond to a mesh joiner.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct HandshakeResponse {
-    #[prost(string, tag="1")]
-    pub relay_id: ::prost::alloc::string::String,
-    #[prost(string, tag="2")]
-    pub dh_public_key: ::prost::alloc::string::String,
-    /// relay id to signature
-    #[prost(map="string, string", tag="3")]
-    pub approvals: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>,
-}
-/// Forwarded SDP from another relay.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ForwardSdp {
-    #[prost(string, tag="1")]
-    pub room_name: ::prost::alloc::string::String,
-    #[prost(string, tag="2")]
-    pub participant_id: ::prost::alloc::string::String,
-    #[prost(string, tag="3")]
-    pub sdp: ::prost::alloc::string::String,
-    /// "offer" or "answer"
-    #[prost(string, tag="4")]
-    pub r#type: ::prost::alloc::string::String,
-}
-/// Forwarded ICE candidate from another relay.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ForwardIce {
-    #[prost(string, tag="1")]
-    pub room_name: ::prost::alloc::string::String,
-    #[prost(string, tag="2")]
-    pub participant_id: ::prost::alloc::string::String,
-    #[prost(string, tag="3")]
-    pub candidate: ::prost::alloc::string::String,
-}
-/// Forwarded ingest room from another relay.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ForwardIngest {
-    #[prost(string, tag="1")]
-    pub room_name: ::prost::alloc::string::String,
-}
-/// Stream request from mesh.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct StreamRequest {
-    #[prost(string, tag="1")]
-    pub room_name: ::prost::alloc::string::String,
-}
-/// StateUpdate propagates entity state changes across the mesh.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct StateUpdate {
-    /// Unique sequence number for this update
-    #[prost(uint64, tag="1")]
-    pub sequence_number: u64,
-    /// Key: entity_id (e.g., room name), Value: EntityState
-    #[prost(map="string, message", tag="2")]
-    pub entities: ::std::collections::HashMap<::prost::alloc::string::String, EntityState>,
-}
-/// Ack acknowledges receipt of a StateUpdate.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Ack {
-    /// UUID of the acknowledging relay
-    #[prost(string, tag="1")]
-    pub relay_id: ::prost::alloc::string::String,
-    /// Sequence number being acknowledged
-    #[prost(uint64, tag="2")]
-    pub sequence_number: u64,
-}
-/// RetransmissionRequest requests a missed StateUpdate.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct RetransmissionRequest {
-    /// UUID of the requesting relay
-    #[prost(string, tag="1")]
-    pub relay_id: ::prost::alloc::string::String,
-    /// Sequence number of the missed update
-    #[prost(uint64, tag="2")]
-    pub sequence_number: u64,
-}
-/// Retransmission resends a StateUpdate.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Retransmission {
-    /// UUID of the sending relay
-    #[prost(string, tag="1")]
-    pub relay_id: ::prost::alloc::string::String,
-    /// The retransmitted update
-    #[prost(message, optional, tag="2")]
-    pub state_update: ::core::option::Option<StateUpdate>,
-}
-/// Heartbeat signals relay liveness.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Heartbeat {
-    /// UUID of the sending relay
-    #[prost(string, tag="1")]
-    pub relay_id: ::prost::alloc::string::String,
-    /// Time of the heartbeat
-    #[prost(message, optional, tag="2")]
-    pub timestamp: ::core::option::Option<::prost_types::Timestamp>,
-}
-/// SuspectRelay marks a relay as potentially unresponsive.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct SuspectRelay {
-    /// UUID of the suspected relay
-    #[prost(string, tag="1")]
-    pub relay_id: ::prost::alloc::string::String,
-    /// Reason for suspicion (e.g., "no heartbeat")
-    #[prost(string, tag="2")]
-    pub reason: ::prost::alloc::string::String,
-}
-/// Disconnect signals to remove a relay from the mesh.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Disconnect {
-    /// UUID of the relay to disconnect
-    #[prost(string, tag="1")]
-    pub relay_id: ::prost::alloc::string::String,
-    /// Reason for disconnection (e.g., "unresponsive")
-    #[prost(string, tag="2")]
-    pub reason: ::prost::alloc::string::String,
-}
-// @@protoc_insertion_point(module)

packages/server/src/proto/proto.rs

@@ -1,14 +1,12 @@
 // @generated
 // This file is @generated by prost-build.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProtoTimestampEntry {
     #[prost(string, tag="1")]
     pub stage: ::prost::alloc::string::String,
     #[prost(message, optional, tag="2")]
     pub time: ::core::option::Option<::prost_types::Timestamp>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProtoLatencyTracker {
     #[prost(string, tag="1")]
@@ -19,191 +17,94 @@ pub struct ProtoLatencyTracker {
 // Mouse messages 
 
 /// MouseMove message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProtoMouseMove {
-    /// Fixed value "MouseMove"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    #[prost(int32, tag="2")]
+    #[prost(int32, tag="1")]
     pub x: i32,
-    #[prost(int32, tag="3")]
+    #[prost(int32, tag="2")]
     pub y: i32,
 }
 /// MouseMoveAbs message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProtoMouseMoveAbs {
-    /// Fixed value "MouseMoveAbs"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    #[prost(int32, tag="2")]
+    #[prost(int32, tag="1")]
     pub x: i32,
-    #[prost(int32, tag="3")]
+    #[prost(int32, tag="2")]
     pub y: i32,
 }
 /// MouseWheel message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProtoMouseWheel {
-    /// Fixed value "MouseWheel"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    #[prost(int32, tag="2")]
+    #[prost(int32, tag="1")]
     pub x: i32,
-    #[prost(int32, tag="3")]
+    #[prost(int32, tag="2")]
     pub y: i32,
 }
 /// MouseKeyDown message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProtoMouseKeyDown {
-    /// Fixed value "MouseKeyDown"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    #[prost(int32, tag="2")]
+    #[prost(int32, tag="1")]
     pub key: i32,
 }
 /// MouseKeyUp message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProtoMouseKeyUp {
-    /// Fixed value "MouseKeyUp"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    #[prost(int32, tag="2")]
+    #[prost(int32, tag="1")]
     pub key: i32,
 }
 // Keyboard messages 
 
 /// KeyDown message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProtoKeyDown {
-    /// Fixed value "KeyDown"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    #[prost(int32, tag="2")]
+    #[prost(int32, tag="1")]
     pub key: i32,
 }
 /// KeyUp message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProtoKeyUp {
-    /// Fixed value "KeyUp"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    #[prost(int32, tag="2")]
+    #[prost(int32, tag="1")]
     pub key: i32,
 }
+// Clipboard message
+// message ProtoClipboard {
+//   string content = 1; // Clipboard content
+// }
+
 // Controller messages 
 
 /// ControllerAttach message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProtoControllerAttach {
-    /// Fixed value "ControllerAttach"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
     /// One of the following enums: "ps", "xbox" or "switch"
-    #[prost(string, tag="2")]
+    #[prost(string, tag="1")]
     pub id: ::prost::alloc::string::String,
-    /// Slot number (0-3)
-    #[prost(int32, tag="3")]
-    pub slot: i32,
+    /// Session specific slot number (0-3)
+    #[prost(int32, tag="2")]
+    pub session_slot: i32,
+    /// Session ID of the client
+    #[prost(string, tag="3")]
+    pub session_id: ::prost::alloc::string::String,
 }
 /// ControllerDetach message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProtoControllerDetach {
-    /// Fixed value "ControllerDetach"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    /// Slot number (0-3)
-    #[prost(int32, tag="2")]
-    pub slot: i32,
-}
-/// ControllerButton message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ProtoControllerButton {
-    /// Fixed value "ControllerButtons"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    /// Slot number (0-3)
-    #[prost(int32, tag="2")]
-    pub slot: i32,
-    /// Button code (linux input event code)
-    #[prost(int32, tag="3")]
-    pub button: i32,
-    /// true if pressed, false if released
-    #[prost(bool, tag="4")]
-    pub pressed: bool,
-}
-/// ControllerTriggers message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ProtoControllerTrigger {
-    /// Fixed value "ControllerTriggers"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    /// Slot number (0-3)
-    #[prost(int32, tag="2")]
-    pub slot: i32,
-    /// Trigger number (0 for left, 1 for right)
-    #[prost(int32, tag="3")]
-    pub trigger: i32,
-    /// trigger value (-32768 to 32767)
-    #[prost(int32, tag="4")]
-    pub value: i32,
-}
-/// ControllerSticks message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ProtoControllerStick {
-    /// Fixed value "ControllerStick"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    /// Slot number (0-3)
-    #[prost(int32, tag="2")]
-    pub slot: i32,
-    /// Stick number (0 for left, 1 for right)
-    #[prost(int32, tag="3")]
-    pub stick: i32,
-    /// X axis value (-32768 to 32767)
-    #[prost(int32, tag="4")]
-    pub x: i32,
-    /// Y axis value (-32768 to 32767)
-    #[prost(int32, tag="5")]
-    pub y: i32,
-}
-/// ControllerAxis message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ProtoControllerAxis {
-    /// Fixed value "ControllerAxis"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    /// Slot number (0-3)
-    #[prost(int32, tag="2")]
-    pub slot: i32,
-    /// Axis number (0 for d-pad horizontal, 1 for d-pad vertical)
-    #[prost(int32, tag="3")]
-    pub axis: i32,
-    /// axis value (-1 to 1)
-    #[prost(int32, tag="4")]
-    pub value: i32,
+    /// Session specific slot number (0-3)
+    #[prost(int32, tag="1")]
+    pub session_slot: i32,
+    /// Session ID of the client
+    #[prost(string, tag="2")]
+    pub session_id: ::prost::alloc::string::String,
 }
 /// ControllerRumble message
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProtoControllerRumble {
-    /// Fixed value "ControllerRumble"
-    #[prost(string, tag="1")]
-    pub r#type: ::prost::alloc::string::String,
-    /// Slot number (0-3)
-    #[prost(int32, tag="2")]
-    pub slot: i32,
+    /// Session specific slot number (0-3)
+    #[prost(int32, tag="1")]
+    pub session_slot: i32,
+    /// Session ID of the client
+    #[prost(string, tag="2")]
+    pub session_id: ::prost::alloc::string::String,
     /// Low frequency rumble (0-65535)
     #[prost(int32, tag="3")]
     pub low_frequency: i32,
@@ -214,49 +115,145 @@ pub struct ProtoControllerRumble {
     #[prost(int32, tag="5")]
     pub duration: i32,
 }
-/// Union of all Input types
-#[allow(clippy::derive_partial_eq_without_eq)]
+/// ControllerStateBatch - single message containing full or partial controller state
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ProtoInput {
-    #[prost(oneof="proto_input::InputType", tags="1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14")]
-    pub input_type: ::core::option::Option<proto_input::InputType>,
+pub struct ProtoControllerStateBatch {
+    /// Session specific slot number (0-3)
+    #[prost(int32, tag="1")]
+    pub session_slot: i32,
+    /// Session ID of the client
+    #[prost(string, tag="2")]
+    pub session_id: ::prost::alloc::string::String,
+    #[prost(enumeration="proto_controller_state_batch::UpdateType", tag="3")]
+    pub update_type: i32,
+    /// Sequence number for packet loss detection
+    #[prost(uint32, tag="4")]
+    pub sequence: u32,
+    /// Button state map (Linux event codes)
+    #[prost(map="int32, bool", tag="5")]
+    pub button_changed_mask: ::std::collections::HashMap<i32, bool>,
+    /// Analog inputs
+    ///
+    /// -32768 to 32767
+    #[prost(int32, optional, tag="6")]
+    pub left_stick_x: ::core::option::Option<i32>,
+    /// -32768 to 32767
+    #[prost(int32, optional, tag="7")]
+    pub left_stick_y: ::core::option::Option<i32>,
+    /// -32768 to 32767
+    #[prost(int32, optional, tag="8")]
+    pub right_stick_x: ::core::option::Option<i32>,
+    /// -32768 to 32767
+    #[prost(int32, optional, tag="9")]
+    pub right_stick_y: ::core::option::Option<i32>,
+    /// -32768 to 32767
+    #[prost(int32, optional, tag="10")]
+    pub left_trigger: ::core::option::Option<i32>,
+    /// -32768 to 32767
+    #[prost(int32, optional, tag="11")]
+    pub right_trigger: ::core::option::Option<i32>,
+    /// -1, 0, or 1
+    #[prost(int32, optional, tag="12")]
+    pub dpad_x: ::core::option::Option<i32>,
+    /// -1, 0, or 1
+    #[prost(int32, optional, tag="13")]
+    pub dpad_y: ::core::option::Option<i32>,
+    /// Bitmask indicating which fields have changed
+    /// Bit 0: button_changed_mask, Bit 1: left_stick_x, Bit 2: left_stick_y, etc.
+    #[prost(uint32, optional, tag="14")]
+    pub changed_fields: ::core::option::Option<u32>,
 }
-/// Nested message and enum types in `ProtoInput`.
-pub mod proto_input {
-    #[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Oneof)]
-    pub enum InputType {
-        #[prost(message, tag="1")]
-        MouseMove(super::ProtoMouseMove),
-        #[prost(message, tag="2")]
-        MouseMoveAbs(super::ProtoMouseMoveAbs),
-        #[prost(message, tag="3")]
-        MouseWheel(super::ProtoMouseWheel),
-        #[prost(message, tag="4")]
-        MouseKeyDown(super::ProtoMouseKeyDown),
-        #[prost(message, tag="5")]
-        MouseKeyUp(super::ProtoMouseKeyUp),
-        #[prost(message, tag="6")]
-        KeyDown(super::ProtoKeyDown),
-        #[prost(message, tag="7")]
-        KeyUp(super::ProtoKeyUp),
-        #[prost(message, tag="8")]
-        ControllerAttach(super::ProtoControllerAttach),
-        #[prost(message, tag="9")]
-        ControllerDetach(super::ProtoControllerDetach),
-        #[prost(message, tag="10")]
-        ControllerButton(super::ProtoControllerButton),
-        #[prost(message, tag="11")]
-        ControllerTrigger(super::ProtoControllerTrigger),
-        #[prost(message, tag="12")]
-        ControllerStick(super::ProtoControllerStick),
-        #[prost(message, tag="13")]
-        ControllerAxis(super::ProtoControllerAxis),
-        #[prost(message, tag="14")]
-        ControllerRumble(super::ProtoControllerRumble),
+/// Nested message and enum types in `ProtoControllerStateBatch`.
+pub mod proto_controller_state_batch {
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum UpdateType {
+        /// Complete controller state
+        FullState = 0,
+        /// Only changed fields
+        Delta = 1,
+    }
+    impl UpdateType {
+        /// String value of the enum field names used in the ProtoBuf definition.
+        ///
+        /// The values are not transformed in any way and thus are considered stable
+        /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+        pub fn as_str_name(&self) -> &'static str {
+            match self {
+                Self::FullState => "FULL_STATE",
+                Self::Delta => "DELTA",
+            }
+        }
+        /// Creates an enum from field names used in the ProtoBuf definition.
+        pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+            match value {
+                "FULL_STATE" => Some(Self::FullState),
+                "DELTA" => Some(Self::Delta),
+                _ => None,
+            }
+        }
     }
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
+// WebRTC + signaling 
+
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct RtcIceCandidateInit {
+    #[prost(string, tag="1")]
+    pub candidate: ::prost::alloc::string::String,
+    #[prost(uint32, optional, tag="2")]
+    pub sdp_m_line_index: ::core::option::Option<u32>,
+    #[prost(string, optional, tag="3")]
+    pub sdp_mid: ::core::option::Option<::prost::alloc::string::String>,
+    #[prost(string, optional, tag="4")]
+    pub username_fragment: ::core::option::Option<::prost::alloc::string::String>,
+}
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct RtcSessionDescriptionInit {
+    #[prost(string, tag="1")]
+    pub sdp: ::prost::alloc::string::String,
+    #[prost(string, tag="2")]
+    pub r#type: ::prost::alloc::string::String,
+}
+/// ProtoICE message
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct ProtoIce {
+    #[prost(message, optional, tag="1")]
+    pub candidate: ::core::option::Option<RtcIceCandidateInit>,
+}
+/// ProtoSDP message
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct ProtoSdp {
+    #[prost(message, optional, tag="1")]
+    pub sdp: ::core::option::Option<RtcSessionDescriptionInit>,
+}
+/// ProtoRaw message
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct ProtoRaw {
+    #[prost(string, tag="1")]
+    pub data: ::prost::alloc::string::String,
+}
+/// ProtoClientRequestRoomStream message
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct ProtoClientRequestRoomStream {
+    #[prost(string, tag="1")]
+    pub room_name: ::prost::alloc::string::String,
+    #[prost(string, tag="2")]
+    pub session_id: ::prost::alloc::string::String,
+}
+/// ProtoClientDisconnected message
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct ProtoClientDisconnected {
+    #[prost(string, tag="1")]
+    pub session_id: ::prost::alloc::string::String,
+    #[prost(int32, repeated, tag="2")]
+    pub controller_slots: ::prost::alloc::vec::Vec<i32>,
+}
+/// ProtoServerPushStream message
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct ProtoServerPushStream {
+    #[prost(string, tag="1")]
+    pub room_name: ::prost::alloc::string::String,
+}
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProtoMessageBase {
     #[prost(string, tag="1")]
@@ -264,12 +261,55 @@ pub struct ProtoMessageBase {
     #[prost(message, optional, tag="2")]
     pub latency: ::core::option::Option<ProtoLatencyTracker>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct ProtoMessageInput {
+pub struct ProtoMessage {
     #[prost(message, optional, tag="1")]
     pub message_base: ::core::option::Option<ProtoMessageBase>,
-    #[prost(message, optional, tag="2")]
-    pub data: ::core::option::Option<ProtoInput>,
+    #[prost(oneof="proto_message::Payload", tags="2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 20, 21, 22, 23, 24, 25")]
+    pub payload: ::core::option::Option<proto_message::Payload>,
+}
+/// Nested message and enum types in `ProtoMessage`.
+pub mod proto_message {
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Payload {
+        /// Input types
+        #[prost(message, tag="2")]
+        MouseMove(super::ProtoMouseMove),
+        #[prost(message, tag="3")]
+        MouseMoveAbs(super::ProtoMouseMoveAbs),
+        #[prost(message, tag="4")]
+        MouseWheel(super::ProtoMouseWheel),
+        #[prost(message, tag="5")]
+        MouseKeyDown(super::ProtoMouseKeyDown),
+        #[prost(message, tag="6")]
+        MouseKeyUp(super::ProtoMouseKeyUp),
+        #[prost(message, tag="7")]
+        KeyDown(super::ProtoKeyDown),
+        /// ProtoClipboard clipboard = 9;
+        #[prost(message, tag="8")]
+        KeyUp(super::ProtoKeyUp),
+        /// Controller input types
+        #[prost(message, tag="9")]
+        ControllerAttach(super::ProtoControllerAttach),
+        #[prost(message, tag="10")]
+        ControllerDetach(super::ProtoControllerDetach),
+        #[prost(message, tag="11")]
+        ControllerRumble(super::ProtoControllerRumble),
+        #[prost(message, tag="12")]
+        ControllerStateBatch(super::ProtoControllerStateBatch),
+        /// Signaling types
+        #[prost(message, tag="20")]
+        Ice(super::ProtoIce),
+        #[prost(message, tag="21")]
+        Sdp(super::ProtoSdp),
+        #[prost(message, tag="22")]
+        Raw(super::ProtoRaw),
+        #[prost(message, tag="23")]
+        ClientRequestRoomStream(super::ProtoClientRequestRoomStream),
+        #[prost(message, tag="24")]
+        ClientDisconnected(super::ProtoClientDisconnected),
+        #[prost(message, tag="25")]
+        ServerPushStream(super::ProtoServerPushStream),
+    }
 }
 // @@protoc_insertion_point(module)

protobufs/messages.proto

@@ -12,7 +12,30 @@ message ProtoMessageBase {
   ProtoLatencyTracker latency = 2;
 }
 
-message ProtoMessageInput {
-    ProtoMessageBase message_base = 1;
-    ProtoInput data = 2;
+message ProtoMessage {
+  ProtoMessageBase message_base = 1;
+  oneof payload {
+    // Input types
+    ProtoMouseMove mouse_move = 2;
+    ProtoMouseMoveAbs mouse_move_abs = 3;
+    ProtoMouseWheel mouse_wheel = 4;
+    ProtoMouseKeyDown mouse_key_down = 5;
+    ProtoMouseKeyUp mouse_key_up = 6;
+    ProtoKeyDown key_down = 7;
+    ProtoKeyUp key_up = 8;
+
+    // Controller input types
+    ProtoControllerAttach controller_attach = 9;
+    ProtoControllerDetach controller_detach = 10;
+    ProtoControllerRumble controller_rumble = 11;
+    ProtoControllerStateBatch controller_state_batch = 12;
+
+    // Signaling types
+    ProtoICE ice = 20;
+    ProtoSDP sdp = 21;
+    ProtoRaw raw = 22;
+    ProtoClientRequestRoomStream client_request_room_stream = 23;
+    ProtoClientDisconnected client_disconnected = 24;
+    ProtoServerPushStream server_push_stream = 25;
+  }
 }

protobufs/types.proto

@@ -8,124 +8,142 @@ package proto;
 
 // MouseMove message
 message ProtoMouseMove {
-  string type = 1; // Fixed value "MouseMove"
-  int32 x = 2;
-  int32 y = 3;
+  int32 x = 1;
+  int32 y = 2;
 }
 
 // MouseMoveAbs message
 message ProtoMouseMoveAbs {
-  string type = 1; // Fixed value "MouseMoveAbs"
-  int32 x = 2;
-  int32 y = 3;
+  int32 x = 1;
+  int32 y = 2;
 }
 
 // MouseWheel message
 message ProtoMouseWheel {
-  string type = 1; // Fixed value "MouseWheel"
-  int32 x = 2;
-  int32 y = 3;
+  int32 x = 1;
+  int32 y = 2;
 }
 
 // MouseKeyDown message
 message ProtoMouseKeyDown {
-  string type = 1; // Fixed value "MouseKeyDown"
-  int32 key = 2;
+  int32 key = 1;
 }
 
 // MouseKeyUp message
 message ProtoMouseKeyUp {
-  string type = 1; // Fixed value "MouseKeyUp"
-  int32 key = 2;
+  int32 key = 1;
 }
 
 /* Keyboard messages */
 
 // KeyDown message
 message ProtoKeyDown {
-  string type = 1; // Fixed value "KeyDown"
-  int32 key = 2;
+  int32 key = 1;
 }
 
 // KeyUp message
 message ProtoKeyUp {
-  string type = 1; // Fixed value "KeyUp"
-  int32 key = 2;
+  int32 key = 1;
 }
 
 /* Controller messages */
 
 // ControllerAttach message
 message ProtoControllerAttach {
-  string type = 1; // Fixed value "ControllerAttach"
-  string id = 2; // One of the following enums: "ps", "xbox" or "switch"
-  int32 slot = 3; // Slot number (0-3)
+  string id = 1; // One of the following enums: "ps", "xbox" or "switch"
+  int32 session_slot = 2; // Session specific slot number (0-3)
+  string session_id = 3; // Session ID of the client
 }
 
 // ControllerDetach message
 message ProtoControllerDetach {
-  string type = 1; // Fixed value "ControllerDetach"
-  int32 slot = 2; // Slot number (0-3)
-}
-
-// ControllerButton message
-message ProtoControllerButton {
-  string type = 1; // Fixed value "ControllerButtons"
-  int32 slot = 2; // Slot number (0-3)
-  int32 button = 3; // Button code (linux input event code)
-  bool pressed = 4; // true if pressed, false if released
-}
-
-// ControllerTriggers message
-message ProtoControllerTrigger {
-  string type = 1; // Fixed value "ControllerTriggers"
-  int32 slot = 2; // Slot number (0-3)
-  int32 trigger = 3; // Trigger number (0 for left, 1 for right)
-  int32 value = 4; // trigger value (-32768 to 32767)
-}
-
-// ControllerSticks message
-message ProtoControllerStick {
-  string type = 1; // Fixed value "ControllerStick"
-  int32 slot = 2; // Slot number (0-3)
-  int32 stick = 3; // Stick number (0 for left, 1 for right)
-  int32 x = 4; // X axis value (-32768 to 32767)
-  int32 y = 5; // Y axis value (-32768 to 32767)
-}
-
-// ControllerAxis message
-message ProtoControllerAxis {
-  string type = 1; // Fixed value "ControllerAxis"
-  int32 slot = 2; // Slot number (0-3)
-  int32 axis = 3; // Axis number (0 for d-pad horizontal, 1 for d-pad vertical)
-  int32 value = 4; // axis value (-1 to 1)
+  int32 session_slot = 1; // Session specific slot number (0-3)
+  string session_id = 2; // Session ID of the client
 }
 
 // ControllerRumble message
 message ProtoControllerRumble {
-  string type = 1; // Fixed value "ControllerRumble"
-  int32 slot = 2; // Slot number (0-3)
+  int32 session_slot = 1; // Session specific slot number (0-3)
+  string session_id = 2; // Session ID of the client
   int32 low_frequency = 3; // Low frequency rumble (0-65535)
   int32 high_frequency = 4; // High frequency rumble (0-65535)
   int32 duration = 5; // Duration in milliseconds
 }
 
-// Union of all Input types
-message ProtoInput {
-  oneof input_type {
-    ProtoMouseMove mouse_move = 1;
-    ProtoMouseMoveAbs mouse_move_abs = 2;
-    ProtoMouseWheel mouse_wheel = 3;
-    ProtoMouseKeyDown mouse_key_down = 4;
-    ProtoMouseKeyUp mouse_key_up = 5;
-    ProtoKeyDown key_down = 6;
-    ProtoKeyUp key_up = 7;
-    ProtoControllerAttach controller_attach = 8;
-    ProtoControllerDetach controller_detach = 9;
-    ProtoControllerButton controller_button = 10;
-    ProtoControllerTrigger controller_trigger = 11;
-    ProtoControllerStick controller_stick = 12;
-    ProtoControllerAxis controller_axis = 13;
-    ProtoControllerRumble controller_rumble = 14;
+// ControllerStateBatch - single message containing full or partial controller state
+message ProtoControllerStateBatch {
+  int32 session_slot = 1; // Session specific slot number (0-3)
+  string session_id = 2; // Session ID of the client
+
+  enum UpdateType {
+    FULL_STATE = 0;    // Complete controller state
+    DELTA = 1;         // Only changed fields
   }
+  UpdateType update_type = 3;
+
+  // Sequence number for packet loss detection
+  uint32 sequence = 4;
+
+  // Button state map (Linux event codes)
+  map<int32, bool> button_changed_mask = 5;
+
+  // Analog inputs
+  optional int32 left_stick_x = 6;   // -32768 to 32767
+  optional int32 left_stick_y = 7;   // -32768 to 32767
+  optional int32 right_stick_x = 8;  // -32768 to 32767
+  optional int32 right_stick_y = 9;  // -32768 to 32767
+  optional int32 left_trigger = 10;  // -32768 to 32767
+  optional int32 right_trigger = 11; // -32768 to 32767
+  optional int32 dpad_x = 12;        // -1, 0, or 1
+  optional int32 dpad_y = 13;        // -1, 0, or 1
+
+  // Bitmask indicating which fields have changed
+  // Bit 0: button_changed_mask, Bit 1: left_stick_x, Bit 2: left_stick_y, etc.
+  optional uint32 changed_fields = 14;
+}
+
+/* WebRTC + signaling */
+
+message RTCIceCandidateInit {
+  string candidate = 1;
+  optional uint32 sdpMLineIndex = 2;
+  optional string sdpMid = 3;
+  optional string usernameFragment = 4;
+}
+
+message RTCSessionDescriptionInit {
+  string sdp = 1;
+  string type = 2;
+}
+
+// ProtoICE message
+message ProtoICE {
+  RTCIceCandidateInit candidate = 1;
+}
+
+// ProtoSDP message
+message ProtoSDP {
+  RTCSessionDescriptionInit sdp = 1;
+}
+
+// ProtoRaw message
+message ProtoRaw {
+  string data = 1;
+}
+
+// ProtoClientRequestRoomStream message
+message ProtoClientRequestRoomStream {
+  string room_name = 1;
+  string session_id = 2;
+}
+
+// ProtoClientDisconnected message
+message ProtoClientDisconnected {
+  string session_id = 1;
+  repeated int32 controller_slots = 2;
+}
+
+// ProtoServerPushStream message
+message ProtoServerPushStream {
+  string room_name = 1;
 }