Merge branch 'dev' of github.com:nestrilabs/nestri into capacitor-testings

## Description

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

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


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

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

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

---------

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

.dockerignore

@@ -0,0 +1,4 @@
+**/target/
+**/.git
+**/.env
+**/.idea

.env.example

@@ -0,0 +1,2 @@
+CLOUDFLARE_API_TOKEN=
+NEON_API_TOKEN=

.github/CODEOWNERS

@@ -1 +1,16 @@
-* @wanjohiryan
+* @dev-team
+
+/apps/ @victorpahuus @AquaWolf
+/packages/ui/ @wanjohiryan @victorpahuus @AquaWolf
+
+/protobufs/ @AquaWolf @DatCaptainHorse
+
+/infra/ @wanjohiryan
+/packages/core/ @wanjohiryan
+/packages/functions/ @wanjohiryan
+
+/containerfiles/ @DatCaptainHorse
+/packages/server/ @DatCaptainHorse
+/packages/relay/ @DatCaptainHorse
+/packages/scripts/ @DatCaptainHorse
+/packages/input/ @DatCaptainHorse

.github/FUNDING.yml

@@ -0,0 +1 @@
+polar: nestri

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,2 @@
+## Description
+<!-- Briefly describe the purpose and scope of your changes -->

.github/dependabot.yml

@@ -1,18 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: 'gitsubmodule'
-    directory: '/'
-    schedule:
-      interval: 'daily'
-    open-pull-requests-limit: 10
-    labels:
-      - 'type/build'
-  - package-ecosystem: 'github-actions'
-    directory: '/'
-    schedule:
-      interval: 'weekly'
-    labels:
-      - 'type/build'
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]

.github/labeler.yml

@@ -1,119 +0,0 @@
-version: 2
-labels:
-  - label: 'type/chore'
-    branch: '^chore/.*'
-    title:  '^\s*.*?\schore(?:(.+))?!?:'
-
-  - label: 'type/fix'
-    branch: '^fix/.*'
-    title: '^\s*.*?\sfix(?:(.+))?!?:'
-
-  - label: 'type/feat'
-    branch: '^feat/.*'
-    title: '^\s*.*?\sfeat(?:(.+))?!?:'
-
-  - label: 'type/breaking'
-    body: '(?i)breaking.*'
-
-  - label: 'type/docs'
-    branch: '^docs/.*'
-    title: '^\s*.*?\sdocs(?:(.+))?!?:'
-    branch: '^docs/.*'
-    files:
-     - '**/*.md$'
-     - '**/*.mdx$'
-
-  - label: 'type/ci'
-    branch: '^ci/.*'  
-    title: '^\s*.*?\sci(?:(.+))?!?:'
-    files:
-     - '.github/.+'
-
-  - label: 'type/build'
-    branch: '^dependabot/.*'
-    title: '^\s*.*?\sbuild(?:(.+))?!?:'
-
-  - label: 'type/perf'
-    title: '^\s*.*?\sperf(?:(.+))?!?:'
-
-  - label: 'mergeable/false'
-    mergeable: False
-
-  - label: 'usr/dependabot'
-    branch: '^dependabot/.*' 
-    authors: 
-      - 'dependabot[bot]'
-
-  - label: 'scope/back-end'
-    files:
-     - 'server.Dockerfile'  
-  
-  - label: 'scope/base'
-    files:
-     - 'base.Dockerfile'
-
-  - label: 'scope/ffmpeg'
-    files:
-     - 'ffmpeg.Dockerfile'
-
-  - label: 'scope/recorder'
-    files:
-     - 'recorder.Dockerfile'
-     
-  - label: 'scope/relay'
-    files:
-     - 'relay.Dockerfile'
-
-  - label: 'scope/front-end'
-    files:
-     - 'apps/www/.+'
-
-  - label: 'pkg/www'
-    files:
-     - 'apps/www/.+'
-
-  - label: 'scope/git'
-    files:
-     - '**/.gitignore$'
-     - '.github/.+'
-
-  - label: "size/xs"
-    size:
-        below: 10
-        exclude-files: ["pnpm-lock.yml","yarn.lock"]
-
-  - label: "size/s"
-    size:
-        above: 9
-        below: 100
-        exclude-files: ["pnpm-lock.yml","yarn.lock"]  
-        
-  - label: "size/m"
-    size:
-        above: 49
-        below: 200
-        exclude-files: ["pnpm-lock.yml","yarn.lock"]  
-        
-  - label: "size/l"
-    size:
-        above: 199
-        below: 500
-        exclude-files: ["pnpm-lock.yml","yarn.lock"]  
-        
-  - label: "size/xl"
-    size:
-        above: 499
-        below: 1000
-        exclude-files: ["pnpm-lock.yml","yarn.lock"]
-
-  - label: "size/xxl"
-    size:
-        above: 999
-        exclude-files: ["pnpm-lock.yml","yarn.lock"]
-
-  - label: "usr/wanjohi"
-    authors: ['wanjohiryan']
-    
-  - label: "usr/unknown"
-    negate: True
-    authors: ['wanjohiryan','apps/dependabot','dependabot', 'dependabot[bot]']

.github/labels.yml

@@ -1,108 +0,0 @@
-# Default labels
-- name: "type/fix"
-  color: "B60205"
-
-- name: "type/build"
-  color: "6C55D7"
-
-- name: "type/feat"
-  color: "0ADE12"
-
-- name: "type/docs"
-  color: "891059"
-
-- name: "type/refactor"
-  color: "8D44DF"
-
-- name: "type/revert"
-  color: "5319e7"
-
-- name: "type/style"
-  color: "D71964"
-
-- name: "type/test"
-  color: "0B9EE8"
-
-- name: "type/breaking"
-  color: "0590CC"
-
-- name: "type/chore"
-  color: "B44A63"
-
-- name: "type/ci"
-  color: "4FE1A6"
-
-- name: "type/perf"
-  color: "4FE1A6"
-
-- name: "mergeable/false"
-  color: "B60205"
-  
-- name: "priority/high"
-  color: "D4E734"
-  
-- name: "priority/mid"
-  color: "D4E734"
-  
-- name: "priority/low"
-  color: "D4E734"
-  
-- name: "reg/docker"
-  color: "5319e7"
-  
-- name: "reg/npm"
-  color: "5319e7"
-  
-- name: "pkg/www"
-  color: "5319e7"
-  
-- name: "pkg/lib"
-  color: "5319e7"
-  
-- name: "pkg/aws"
-  color: "5319e7"
-  
-- name: "scope/git"
-  color: "B61B66"
-  
-- name: "scope/infra"
-  color: "B61B66"
-  
-- name: "scope/front-end"
-  color: "B61B66"
-
-- name: "scope/relay"
-  color: "B61B66"
-  
-- name: "scope/base"
-  color: "B61B66"
-  
-- name: "scope/back-end"
-  color: "B61B66"
-  
-- name: "size/xs"
-  color: "AD4322"
-  
-- name: "size/s"
-  color: "AD4322"
-  
-- name: "size/m"
-  color: "AD4322"
-  
-- name: "size/l"
-  color: "AD4322"
-  
-- name: "size/xl"
-  color: "AD4322"
-  
-- name: "size/xxl"
-  color: "AD4322"
-  
-- name: "usr/wanjohi"
-  color: "09469C"
-  
-- name: "usr/dependabot"
-  color: "09469C"
-  
-- name: "usr/unknown"
-  color: "09469C"

.github/pull_request_template.md

@@ -1,3 +0,0 @@
-## Description
-
-**What issue are you solving (or what feature are you adding) and how are you doing it?**

.github/release-drafter.yml

@@ -1,45 +0,0 @@
-name-template: 'v$RESOLVED_VERSION'
-tag-template: 'v$RESOLVED_VERSION'
-template: |
-  # What's Changed
-
-  $CHANGES
-
-  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
-categories:
-  - title: '⚠ Breaking Changes'
-    label: 'type/breaking'
-  - title: '🚀 New Features'
-    label: 'type/feat'
-  - title: '🐜 Bug Fixes'
-    label: 'type/fix'
-  - title: '🧰 Maintenance'
-    label: 'type/chore'
-  - title: '📖 Documentation'
-    label: 'type/docs'
-  - title: '⬆ Version Upgrades'
-    label: 'type/build'
-    collapse-after: 10
-  - title: 'Other changes'
-    collapse-after: 10
-
-version-resolver:
-  major:
-    labels:
-      - 'type/breaking'
-  minor:
-    labels:
-      - 'type/feat'
-  patch:
-    labels:
-      - 'type/fix'
-      - 'type/build'
-      - 'type/docs'
-      - 'type/chore'
-      - 'type/refactor'
-      - 'type/ci'
-      - 'type/style'
-      - 'type/test'
-
-exclude-labels:
-  - 'skip-changelog'

.github/workflows/autolabeller.yml

@@ -1,93 +0,0 @@
-name: Pull request auto-labeller
-
-on:
-  pull_request:
-    types:
-      - labeled
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-      - edited
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  validate:
-    name: Validate PR title
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - uses: amannn/action-semantic-pull-request@cfb60706e18bc85e8aec535e3c577abe8f70378e
-        id: lint_pr_title
-        env:
-          GITHUB_TOKEN: ${{ secrets.GIT_MASTER_TOKEN }}
-        with:
-          types: |-
-            build
-            chore
-            ci
-            deprecate
-            docs
-            feat
-            fix
-            perf
-            refactor
-            remove
-            revert
-            security
-            style
-            test
-          requireScope: false
-          # Ensures the subject start with an uppercase character.
-          subjectPattern: ^([A-Z]).+$
-          headerPattern: '^\s*.*?\s(\w*)(?:\(([\w$.\-*/ ]*)\))?: (.*)$'
-          headerPatternCorrespondence: type, scope, subject
-          subjectPatternError: |
-            The subject "{subject}" found in the pull request title "{title}"
-            didn't match the configured pattern. Please ensure that the subject
-            starts with an uppercase character
-  
-      - uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
-        # When the previous steps fails, the workflow would stop. By adding this
-        # condition you can continue the execution with the populated error message.
-        if: always() && (steps.lint_pr_title.outputs.error_message != null)
-        with:
-          header: pr-title-lint-error
-          message: |
-            Hey there and thank you for opening this pull request! 👋🏼
-            
-            We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/) and it looks like your proposed title needs to be adjusted.
-            Additionally, the subject of the title must start with an uppercase character (e.g. feat: New `search` component).
-            
-            ```
-            ${{ steps.lint_pr_title.outputs.error_message }}
-            ```
-      # Delete a previous comment when the issue has been resolved
-      - if: ${{ steps.lint_pr_title.outputs.error_message == null }}
-        uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
-        with:   
-          header: pr-title-lint-error
-          delete: true
-
-  label:
-    needs: [ validate ]
-    runs-on: ubuntu-latest
-    name: Add labels
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - name: Checkout your code
-        uses: actions/checkout@v4
-
-      - uses: srvaroa/labeler@v1
-        with:
-          config_path: .github/labeler.yml
-          use_local_config: true #FIXME:
-          fail_on_error: true
-        env:
-          GITHUB_TOKEN: "${{ secrets.GIT_MASTER_TOKEN }}"

.github/workflows/base.yml

@@ -1,135 +0,0 @@
-#Tabs not spaces, you moron :)
-
-name: CI for netris:base
-
-on:
-    pull_request:
-        paths:
-            - "base.Dockerfile"
-            - ".github/workflows/base.yml"
-    schedule:
-        - cron: 0 0 * * * # At the end of everyday
-    push:
-        branches: [main]
-        paths:
-            - "base.Dockerfile"
-            - ".github/workflows/base.yml"
-        tags:
-            - v*.*.*
-    release:
-        types: [created]
-
-# concurrency:
-#     group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
-#     cancel-in-progress: true
-
-env:
-    REGISTRY: ghcr.io
-    IMAGE_NAME: netrisdotme/netris
-    BASE_TAG_PREFIX: base
-
-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: base.Dockerfile
-                context: ./
-                push: false
-                load: true
-                tags: netris:base
-
-    build-docker-main:
-        name: Build image on merge
-        if: ${{github.ref == 'refs/heads/main'}}
-        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: ${{ secrets.GIT_MASTER_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=ref,event=tag
-                  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: base.Dockerfile
-                context: ./
-                push: true
-                tags: ${{ steps.meta.outputs.tags }}
-                labels: ${{ steps.meta.outputs.labels }}
-    
-    build-docker-release:
-        name: Build image on release
-        if: ${{ github.event_name == 'release' }}
-        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: ${{ secrets.GIT_MASTER_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=ref,event=tag
-                  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: base.Dockerfile
-                context: ./
-                push: true
-                tags: ${{ steps.meta.outputs.tags }}
-                labels: ${{ steps.meta.outputs.labels }}

.github/workflows/docker-bake.hcl

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

.github/workflows/labels.yml

@@ -1,33 +0,0 @@
-name: GH labels maintainer
-
-on:
-  push:
-    branches:
-      - 'main'
-    paths:
-      - '.github/labels.yml'
-      - '.github/workflows/labels.yml'
-  pull_request:
-    paths:
-      - '.github/labels.yml'
-      - '.github/workflows/labels.yml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  labeler:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Run Labeler 
-        uses: crazy-max/ghaction-github-labeler@v5
-        env:
-          GITHUB_TOKEN: "${{ secrets.GIT_MASTER_TOKEN }}"
-        with:
-          dry-run: ${{ github.event_name == 'pull_request' }}
-          github-token: ${{ secrets.GIT_MASTER_TOKEN }}

.github/workflows/play-standalone.yml

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

.github/workflows/relay.yml

@@ -1,36 +1,30 @@
-#Tabs not spaces, you moron :)
-
-name: CI for netris:relay
+name: Build Nestri relay
 
 on:
     pull_request:
         paths:
-            - "relay.Dockerfile"
+            - "containerfiles/relay.Containerfile"
+            - "packages/relay/**"
             - ".github/workflows/relay.yml"
-    schedule:
-        - cron: 0 0 * * * # At the end of everyday
     push:
-        branches: [main]
+        branches: [dev, production]
         paths:
-            - "relay.Dockerfile"
+            - "containerfiles/relay.Containerfile"
             - ".github/workflows/relay.yml"
+            - "packages/relay/**"
         tags:
             - v*.*.*
     release:
         types: [created]
 
-# concurrency:
-#     group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
-#     cancel-in-progress: true
-
 env:
     REGISTRY: ghcr.io
-    IMAGE_NAME: netrisdotme/netris
+    IMAGE_NAME: nestrilabs/nestri
     BASE_TAG_PREFIX: relay
 
 jobs:
     build-docker-pr:
-        name: Build image on pr
+        name: Build image on PR
         runs-on: ubuntu-latest
         if: ${{ github.event_name == 'pull_request' }}
         steps:
@@ -44,15 +38,15 @@ jobs:
               name: Build Docker image
               uses: docker/build-push-action@v5
               with:
-                file: relay.Dockerfile
+                file: containerfiles/relay.Containerfile
                 context: ./
                 push: false
                 load: true
-                tags: netris:relay
-
-    build-docker-main:
-        name: Build image on merge
-        if: ${{github.ref == 'refs/heads/main'}}
+                tags: nestri:relay
+    
+    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
@@ -67,7 +61,7 @@ jobs:
               with:
                 registry: ${{ env.REGISTRY }}
                 username: ${{ github.actor }}
-                password: ${{ secrets.GIT_MASTER_TOKEN }}
+                password: ${{ github.token }}
             - 
               name: Extract Container metadata
               id: meta
@@ -78,7 +72,8 @@ jobs:
                 #tag on release, and a nightly build for 'dev'
                 tags: |
                   type=raw,value=nightly,enable={{is_default_branch}}
-                  type=ref,event=tag
+                  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}}
@@ -86,50 +81,8 @@ jobs:
               name: Build Docker image
               uses: docker/build-push-action@v5
               with:
-                file: relay.Dockerfile
+                file:  containerfiles/relay.Containerfile
                 context: ./
                 push: true
                 tags: ${{ steps.meta.outputs.tags }}
                 labels: ${{ steps.meta.outputs.labels }}
-                
-    build-docker-release:
-        name: Build image on release
-        if: ${{ github.event_name == 'release' }}
-        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: ${{ secrets.GIT_MASTER_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=ref,event=tag
-                  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: relay.Dockerfile
-                context: ./
-                push: true
-                tags: ${{ steps.meta.outputs.tags }}
-                labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release-drafter.yml

@@ -1,16 +0,0 @@
-name: Release drafter
-
-on:
-    push:
-      branches: [ main ]
-
-jobs:
-  update_release_draft:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - uses: release-drafter/release-drafter@v6
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.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/server.yml

@@ -1,137 +0,0 @@
-#Tabs not spaces, you moron :)
-
-name: CI for netris:server
-
-on:
-    pull_request:
-        paths:
-            - "server.Dockerfile"
-            - ".scripts/**"
-            - ".github/workflows/server.yml"
-    schedule:
-        - cron: 0 0 * * * # At the end of everyday
-    push:
-        branches: [main]
-        paths:
-            - "server.Dockerfile"
-            - ".scripts/**"
-            - ".github/workflows/server.yml"
-        tags:
-            - v*.*.*
-    release:
-        types: [created]
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: netrisdotme/netris
-  BASE_TAG_PREFIX: server
-
-# concurrency:
-#   group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
-#   cancel-in-progress: true
-  
-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: server.Dockerfile
-                context: ./
-                push: false
-                load: true
-                tags: netris:server
-
-    build-docker-main:
-        name: Build image on merge to main
-        if: ${{github.ref == 'refs/heads/main'}}
-        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: ${{ secrets.GIT_MASTER_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=ref,event=tag
-                  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: server.Dockerfile
-                context: ./
-                push: true
-                tags: ${{ steps.meta.outputs.tags }}
-                labels: ${{ steps.meta.outputs.labels }}
-                
-    build-docker-release:
-        name: Build image on release
-        if: ${{ github.event_name == 'release' }}
-        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: ${{ secrets.GIT_MASTER_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=ref,event=tag
-                  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: server.Dockerfile
-                context: ./
-                push: true
-                tags: ${{ steps.meta.outputs.tags }}
-                labels: ${{ steps.meta.outputs.labels }}

.github/workflows/warp-input.yml

@@ -1,236 +0,0 @@
-#Tabs not spaces, you moron :)
-
-name: CI for netris:warp-input
-
-on:
-    pull_request:
-        paths:
-            - "warp-input.Dockerfile"
-            - ".github/workflows/warp-input.yml"
-            - "bin/input/**"
-    schedule:
-        - cron: 0 0 * * * # At the end of everyday
-    workflow_dispatch:
-    push:
-        branches: [main]
-        paths:
-            - "warp-input.Dockerfile"
-            - ".github/workflows/warp-input.yml"
-            - "bin/input/**"
-        tags:
-            - v*.*.*
-    release:
-        types: [published, created]
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: netrisdotme/netris
-  BASE_TAG_PREFIX: warp-input
-
-# concurrency:
-#   group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
-#   cancel-in-progress: true
-  
-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
-              with:
-                submodules: recursive
-            - 
-              name: Setup Docker Buildx
-              uses: docker/setup-buildx-action@v3
-            - 
-              name: Build Docker image
-              uses: docker/build-push-action@v5
-              with:
-                file: warp-input.Dockerfile
-                context: ./
-                push: false
-                load: true
-                tags: netris:warp-input
-
-    build-docker-main:
-        name: Build image on merge to main
-        if: ${{github.ref == 'refs/heads/main'}}
-        runs-on: ubuntu-latest
-        permissions:
-            contents: read
-            packages: write
-        steps:
-            -
-              name: Checkout repo
-              uses: actions/checkout@v4
-              with:
-                submodules: recursive
-            - 
-              name: Log into registry ${{ env.REGISTRY }}
-              uses: docker/login-action@v3
-              with:
-                registry: ${{ env.REGISTRY }}
-                username: ${{ github.actor }}
-                password: ${{ secrets.GIT_MASTER_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=ref,event=tag
-                  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: warp-input.Dockerfile
-                context: ./
-                push: true
-                tags: ${{ steps.meta.outputs.tags }}
-                labels: ${{ steps.meta.outputs.labels }}
-                
-    build-docker-release:
-        name: Build image on release
-        if: ${{ github.event_name == 'release' }}
-        runs-on: ubuntu-latest
-        permissions:
-            contents: read
-            packages: write
-        steps:
-            -
-              name: Checkout repo
-              uses: actions/checkout@v4
-              with:
-                submodules: recursive
-            - 
-              name: Log into registry ${{ env.REGISTRY }}
-              uses: docker/login-action@v3
-              with:
-                registry: ${{ env.REGISTRY }}
-                username: ${{ github.actor }}
-                password: ${{ secrets.GIT_MASTER_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=ref,event=tag
-                  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: warp-input.Dockerfile
-                context: ./
-                push: true
-                tags: ${{ steps.meta.outputs.tags }}
-                labels: ${{ steps.meta.outputs.labels }}
-                
-    build-warp-input-release:
-      if: ${{ github.event_name == 'release' }}
-      defaults:
-        run:
-          working-directory: bin/input
-      strategy:
-        fail-fast: false
-        matrix:
-          settings:
-            - host: ubuntu-20.04
-              target: x86_64-unknown-linux-gnu
-              bundles: appimage
-              asset_name: warp-input-ubuntu-amd64
-            - host: windows-latest
-              target: x86_64-pc-windows-msvc
-              bundles: msi
-              asset_name: warp-input-windows-amd64
-            # - host: macos-latest
-            #   target: x86_64-apple-darwin
-            #   bundles: dmg
-            #   asset_name: warp-input-macos-amd64
-            # - host: macos-latest
-            #   target: aarch64-apple-darwin
-            #   bundles: dmg
-            #   asset_name: warp-input-macos-apple-silicon
-            # - host: ubuntu-20.04
-            #   target: x86_64-unknown-linux-musl
-            # - host: ubuntu-20.04
-            #   target: aarch64-unknown-linux-gnu
-            # - host: ubuntu-20.04
-            #   target: aarch64-unknown-linux-musl
-            # - host: ubuntu-20.04
-            #   target: armv7-unknown-linux-gnueabihf
-      name: Build warp-input on release
-      runs-on: ${{ matrix.settings.host }}
-      steps:
-        - name: Checkout repository
-          uses: actions/checkout@v4
-          with:
-            submodules: recursive
-
-        - name: Install Rust
-          id: toolchain
-          uses: dtolnay/rust-toolchain@stable
-          with:
-            targets: ${{ matrix.settings.target }}
-            toolchain: stable
-            components: clippy, rustfmt
-
-        - name: Cache Rust Dependencies
-          uses: Swatinem/rust-cache@v2
-          with:
-            save-if: false
-            prefix-key: 'v0-rust-deps'
-            shared-key: ${{ matrix.settings.target }}
-
-        - name: Cargo build
-          run: cargo build --target ${{ matrix.settings.target }} --release
-
-        - name: Copy and rename artifacts (Linux)
-          if: ${{ matrix.settings.host == 'ubuntu-20.04' }}
-          run: |
-            cp target/${{ matrix.settings.target }}/release/warp-input ./warp-input
-      
-        - name: Copy and rename artifacts (Windows)
-          if: ${{ matrix.settings.host == 'windows-latest' }}
-          run: |
-            cp "target/${{ matrix.settings.target }}/release/warp-input.exe" ./warp-input.exe
-          
-        - name: Copy and rename artifacts (macOS)
-          if: ${{ matrix.settings.host == 'macos-latest' }}
-          run: |
-            cp target/${{ matrix.settings.target }}/release/warp-input ./warp-input
-        
-        - name: Publish release for (${{ matrix.settings.host }})
-          if: ${{ matrix.settings.host == 'windows-latest' }}
-          uses: svenstaro/upload-release-action@2.9.0
-          with: 
-            repo_token: ${{ secrets.GIT_MASTER_TOKEN  }}
-            file: ./bin/input/warp-input.exe
-            asset_name:  ${{ matrix.settings.asset_name }}
-            tag: ${{ github.ref }}
-      
-        - name: Publish release for (${{ matrix.settings.host }})
-          if: ${{ matrix.settings.host != 'windows-latest' }}
-          uses: svenstaro/upload-release-action@2.9.0
-          with: 
-            repo_token: ${{ secrets.GIT_MASTER_TOKEN  }}
-            file: ./bin/input/warp-input
-            asset_name:  ${{ matrix.settings.asset_name }}
-            tag: ${{ github.ref }}

.github/workflows/warp.yml

@@ -1,234 +0,0 @@
-#Tabs not spaces, you moron :)
-
-name: CI for netris:warp
-
-on:
-    pull_request:
-        paths:
-            - "warp.Dockerfile"
-            - ".github/workflows/warp.yml"
-    schedule:
-        - cron: 0 0 * * * # At the end of everyday
-    workflow_dispatch:
-    push:
-        branches: [main]
-        paths:
-            - "warp.Dockerfile"
-            - ".github/workflows/warp.yml"
-        tags:
-            - v*.*.*
-    release:
-        types: [published, created]
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: netrisdotme/netris
-  BASE_TAG_PREFIX: warp
-
-# concurrency:
-#   group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
-#   cancel-in-progress: true
-  
-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
-              with:
-                submodules: recursive
-            - 
-              name: Setup Docker Buildx
-              uses: docker/setup-buildx-action@v3
-            - 
-              name: Build Docker image
-              uses: docker/build-push-action@v5
-              with:
-                file: warp.Dockerfile
-                context: ./
-                push: false
-                load: true
-                tags: netris:warp
-
-    build-docker-main:
-        name: Build image on merge to main
-        if: ${{github.ref == 'refs/heads/main'}}
-        runs-on: ubuntu-latest
-        permissions:
-            contents: read
-            packages: write
-        steps:
-            -
-              name: Checkout repo
-              uses: actions/checkout@v4
-              with:
-                submodules: recursive
-            - 
-              name: Log into registry ${{ env.REGISTRY }}
-              uses: docker/login-action@v3
-              with:
-                registry: ${{ env.REGISTRY }}
-                username: ${{ github.actor }}
-                password: ${{ secrets.GIT_MASTER_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=ref,event=tag
-                  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: warp.Dockerfile
-                context: ./
-                push: true
-                tags: ${{ steps.meta.outputs.tags }}
-                labels: ${{ steps.meta.outputs.labels }}
-                
-    build-docker-release:
-        name: Build image on release
-        if: ${{ github.event_name == 'release' }}
-        runs-on: ubuntu-latest
-        permissions:
-            contents: read
-            packages: write
-        steps:
-            -
-              name: Checkout repo
-              uses: actions/checkout@v4
-              with:
-                submodules: recursive
-            - 
-              name: Log into registry ${{ env.REGISTRY }}
-              uses: docker/login-action@v3
-              with:
-                registry: ${{ env.REGISTRY }}
-                username: ${{ github.actor }}
-                password: ${{ secrets.GIT_MASTER_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=ref,event=tag
-                  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: warp.Dockerfile
-                context: ./
-                push: true
-                tags: ${{ steps.meta.outputs.tags }}
-                labels: ${{ steps.meta.outputs.labels }}
-                
-    build-warp-release:
-      if: ${{ github.event_name == 'release' }}
-      defaults:
-        run:
-          working-directory: moq-server
-      strategy:
-        fail-fast: false
-        matrix:
-          settings:
-            - host: ubuntu-20.04
-              target: x86_64-unknown-linux-gnu
-              bundles: appimage
-              asset_name: warp-ubuntu-amd64
-            - host: windows-latest
-              target: x86_64-pc-windows-msvc
-              bundles: msi
-              asset_name: warp-windows-amd64
-            - host: macos-latest
-              target: x86_64-apple-darwin
-              bundles: dmg
-              asset_name: warp-macos-amd64
-            - host: macos-latest
-              target: aarch64-apple-darwin
-              bundles: dmg
-              asset_name: warp-macos-apple-silicon
-            # - host: ubuntu-20.04
-            #   target: x86_64-unknown-linux-musl
-            # - host: ubuntu-20.04
-            #   target: aarch64-unknown-linux-gnu
-            # - host: ubuntu-20.04
-            #   target: aarch64-unknown-linux-musl
-            # - host: ubuntu-20.04
-            #   target: armv7-unknown-linux-gnueabihf
-      name: Build warp on release
-      runs-on: ${{ matrix.settings.host }}
-      steps:
-        - name: Checkout repository
-          uses: actions/checkout@v4
-          with:
-            submodules: recursive
-
-        - name: Install Rust
-          id: toolchain
-          uses: dtolnay/rust-toolchain@stable
-          with:
-            targets: ${{ matrix.settings.target }}
-            toolchain: stable
-            components: clippy, rustfmt
-
-        - name: Cache Rust Dependencies
-          uses: Swatinem/rust-cache@v2
-          with:
-            save-if: false
-            prefix-key: 'v0-rust-deps'
-            shared-key: ${{ matrix.settings.target }}
-
-        - name: Cargo build
-          run: cargo build --target ${{ matrix.settings.target }} --manifest-path ./moq-pub/Cargo.toml --release
-
-        - name: Copy and rename artifacts (Linux)
-          if: ${{ matrix.settings.host == 'ubuntu-20.04' }}
-          run: |
-            cp target/${{ matrix.settings.target }}/release/moq-pub ./warp
-      
-        - name: Copy and rename artifacts (Windows)
-          if: ${{ matrix.settings.host == 'windows-latest' }}
-          run: |
-            cp "target/${{ matrix.settings.target }}/release/moq-pub.exe" ./warp.exe
-          
-        - name: Copy and rename artifacts (macOS)
-          if: ${{ matrix.settings.host == 'macos-latest' }}
-          run: |
-            cp target/${{ matrix.settings.target }}/release/moq-pub ./warp
-        
-        - name: Publish release for (${{ matrix.settings.host }})
-          if: ${{ matrix.settings.host == 'windows-latest' }}
-          uses: svenstaro/upload-release-action@2.9.0
-          with: 
-            repo_token: ${{ secrets.GITHUB_TOKEN  }}
-            file: ./moq-server/warp.exe
-            asset_name:  ${{ matrix.settings.asset_name }}
-            tag: ${{ github.ref }}
-      
-        - name: Publish release for (${{ matrix.settings.host }})
-          if: ${{ matrix.settings.host != 'windows-latest' }}
-          uses: svenstaro/upload-release-action@2.9.0
-          with: 
-            repo_token: ${{ secrets.GITHUB_TOKEN  }}
-            file: ./moq-server/warp
-            asset_name:  ${{ matrix.settings.asset_name }}
-            tag: ${{ github.ref }}

.gitignore

@@ -0,0 +1,58 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# Dependencies
+node_modules
+.pnp
+.pnp.js
+
+# Local env files
+.env
+.env.local
+.env.sst
+.env.development.local
+.env.test.local
+.env.production.local
+
+.idea/
+
+# Testing
+coverage
+
+# Turbo
+.turbo
+
+# Vercel
+.vercel
+
+# Build Outputs
+.next/
+out/
+build
+dist
+
+
+# Debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Misc
+.DS_Store
+*.pem
+
+# sst
+.sst
+
+#Bun merging errors, EVERY time :(
+bun.lockb
+
+#tests
+id_*
+
+#Rust
+target
+
+tmp
+.partykit
+
+key_*

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "moq-server"]
-	path = moq-server
-	url = https://github.com/kixelated/moq-rs

.scripts/entrypoint.sh

@@ -1,171 +0,0 @@
-#!/bin/bash -e
-trap "echo TRAPed signal" HUP INT QUIT TERM
-
-# Create and modify permissions of XDG_RUNTIME_DIR
-sudo -u netris mkdir -pm700 /tmp/runtime-1000
-sudo chown netris:netris /tmp/runtime-1000
-sudo -u netris chmod 700 /tmp/runtime-1000
-# Make user directory owned by the user in case it is not
-sudo chown netris:netris /home/netris || sudo chown netris:netris /home/netris/* || { echo "$(date +"[%Y-%m-%d %H:%M:%S]") Failed to change user directory permissions. There may be permission issues."; }
-
-#Input devices ownable by our default user
-export REQUIRED_DEVICES=${REQUIRED_DEVICES:-/dev/uinput /dev/input/event*}
-
-declare -A group_map
-
-for dev in $REQUIRED_DEVICES; do
-  if [ -e "$dev" ]; then
-    dev_group=$(stat -c "%G" "$dev")
-    dev_gid=$(stat -c "%g" "$dev")
-
-    if [ "$dev_group" = "UNKNOWN" ]; then
-      new_name="netris-gid-$dev_gid"
-      # We only have a GID for this group; create a named group for it
-      # this isn't 100% necessary but it prevents some useless noise in the console
-      sudo groupadd -g "$dev_gid" "$new_name"
-      group_map[$new_name]=1
-    else
-      # the group already exists; just add it to the list
-      group_map[$dev_group]=1
-    fi
-
-    # is this device read/writable by the group? if not, make it so
-    if [ "$(stat -c "%a" "$dev" | cut -c2)" -lt 6 ]; then
-      sudo chmod g+rw "$dev"
-    fi
-  else
-    echo "$(date +"[%Y-%m-%d %H:%M:%S]") Path '$dev' is not present."
-  fi
-done
-
-join_by() { local IFS="$1"; shift; echo "$*"; }
-
-groups=$(join_by "," "${!group_map[@]}")
-if [ "$groups" != "" ]; then
-  echo "$(date +"[%Y-%m-%d %H:%M:%S]") Adding user '${USER}' to groups: $groups"
-  sudo usermod -a -G "$groups" "${USER}"
-else
-  echo "$(date +"[%Y-%m-%d %H:%M:%S]") Not modifying user groups ($groups)"
-fi
-
-# Remove directories to make sure the desktop environment starts
-sudo rm -rf /tmp/.X* ~/.cache
-# Change time zone from environment variable
-sudo ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime && echo "$TZ" | sudo tee /etc/timezone >/dev/null
-# Add gamescope directories to path
-export PATH="${PATH:+${PATH}:}/usr/local/games:/usr/games"
-
-# This symbolic link enables running Xorg inside a container with `-sharevts`
-sudo ln -snf /dev/ptmx /dev/tty7
-# Start DBus without systemd
-sudo /etc/init.d/dbus start
-
-# Install Proton-GE for this user
-netris-proton -i
-
-# Install NVIDIA userspace driver components including X graphic libraries
-if ! command -v nvidia-xconfig &> /dev/null; then
-  # Driver version is provided by the kernel through the container toolkit
-  export DRIVER_ARCH="$(dpkg --print-architecture | sed -e 's/arm64/aarch64/' -e 's/armhf/32bit-ARM/' -e 's/i.*86/x86/' -e 's/amd64/x86_64/' -e 's/unknown/x86_64/')"
-  export DRIVER_VERSION="$(head -n1 </proc/driver/nvidia/version | awk '{for(i=1;i<=NF;i++) if ($i ~ /^[0-9]+\.[0-9\.]+/) {print $i; exit}}')"
-  cd /tmp
-  # If version is different, new installer will overwrite the existing components
-  if [ ! -f "/tmp/NVIDIA-Linux-${DRIVER_ARCH}-${DRIVER_VERSION}.run" ]; then
-    # Check multiple sources in order to probe both consumer and datacenter driver versions
-    curl -fsSL -O "https://international.download.nvidia.com/XFree86/Linux-${DRIVER_ARCH}/${DRIVER_VERSION}/NVIDIA-Linux-${DRIVER_ARCH}-${DRIVER_VERSION}.run" || curl -fsSL -O "https://international.download.nvidia.com/tesla/${DRIVER_VERSION}/NVIDIA-Linux-${DRIVER_ARCH}-${DRIVER_VERSION}.run" || { echo "Failed NVIDIA GPU driver download. Exiting."; exit 1; }
-  fi
-  # Extract installer before installing
-  sudo sh "NVIDIA-Linux-${DRIVER_ARCH}-${DRIVER_VERSION}.run" -x
-  cd "NVIDIA-Linux-${DRIVER_ARCH}-${DRIVER_VERSION}"
-  # Run installation without the kernel modules and host components
-  sudo ./nvidia-installer --silent \
-                    --no-kernel-module \
-                    --install-compat32-libs \
-                    --no-nouveau-check \
-                    --no-nvidia-modprobe \
-                    --no-rpms \
-                    --no-backup \
-                    --no-check-for-alternate-installs
-  sudo rm -rf /tmp/NVIDIA* && cd ~
-fi
-
-# Allow starting Xorg from a pseudoterminal instead of strictly on a tty console
-if [ ! -f /etc/X11/Xwrapper.config ]; then
-    echo -e "allowed_users=anybody\nneeds_root_rights=yes" | sudo tee /etc/X11/Xwrapper.config > /dev/null
-fi
-if grep -Fxq "allowed_users=console" /etc/X11/Xwrapper.config; then
-  sudo sed -i "s/allowed_users=console/allowed_users=anybody/;$ a needs_root_rights=yes" /etc/X11/Xwrapper.config
-fi
-
-# Remove existing Xorg configuration
-if [ -f "/etc/X11/xorg.conf" ]; then
-  sudo rm -f "/etc/X11/xorg.conf"
-fi
-
-# Get first GPU device if all devices are available or `NVIDIA_VISIBLE_DEVICES` is not set
-if [ "$NVIDIA_VISIBLE_DEVICES" == "all" ] || [ -z "$NVIDIA_VISIBLE_DEVICES" ]; then
-  export GPU_SELECT="$(sudo nvidia-smi --query-gpu=uuid --format=csv | sed -n 2p)"
-# Get first GPU device out of the visible devices in other situations
-else
-  export GPU_SELECT="$(sudo nvidia-smi --id=$(echo "$NVIDIA_VISIBLE_DEVICES" | cut -d ',' -f1) --query-gpu=uuid --format=csv | sed -n 2p)"
-  if [ -z "$GPU_SELECT" ]; then
-    export GPU_SELECT="$(sudo nvidia-smi --query-gpu=uuid --format=csv | sed -n 2p)"
-  fi
-fi
-
-if [ -z "$GPU_SELECT" ]; then
-  echo "No NVIDIA GPUs detected or nvidia-container-toolkit not configured. Exiting."
-  exit 1
-fi
-
-# Setting `VIDEO_PORT` to none disables RANDR/XRANDR, do not set this if using datacenter GPUs
-if [ "${VIDEO_PORT,,}" = "none" ]; then
-  export CONNECTED_MONITOR="--use-display-device=None"
-# The X server is otherwise deliberately set to a specific video port despite not being plugged to enable RANDR/XRANDR, monitor will display the screen if plugged to the specific port
-else
-  export CONNECTED_MONITOR="--connected-monitor=${VIDEO_PORT}"
-fi
-
-# Bus ID from nvidia-smi is in hexadecimal format and should be converted to decimal format (including the domain) which Xorg understands, required because nvidia-xconfig doesn't work as intended in a container
-HEX_ID="$(sudo nvidia-smi --query-gpu=pci.bus_id --id="$GPU_SELECT" --format=csv | sed -n 2p)"
-IFS=":." ARR_ID=($HEX_ID)
-unset IFS
-BUS_ID="PCI:$((16#${ARR_ID[1]}))@$((16#${ARR_ID[0]})):$((16#${ARR_ID[2]})):$((16#${ARR_ID[3]}))"
-# A custom modeline should be generated because there is no monitor to fetch this information normally
-export MODELINE="$(cvt -r "${SIZEW}" "${SIZEH}" "${REFRESH}" | sed -n 2p)"
-# Generate /etc/X11/xorg.conf with nvidia-xconfig
-sudo nvidia-xconfig --virtual="${SIZEW}x${SIZEH}" --depth="$CDEPTH" --mode="$(echo "$MODELINE" | awk '{print $2}' | tr -d '\"')" --allow-empty-initial-configuration --no-probe-all-gpus --busid="$BUS_ID" --include-implicit-metamodes --mode-debug --no-sli --no-base-mosaic --only-one-x-screen ${CONNECTED_MONITOR}
-# Guarantee that the X server starts without a monitor by adding more options to the configuration
-sudo sed -i '/Driver\s\+"nvidia"/a\    Option         "ModeValidation" "NoMaxPClkCheck,NoEdidMaxPClkCheck,NoMaxSizeCheck,NoHorizSyncCheck,NoVertRefreshCheck,NoVirtualSizeCheck,NoExtendedGpuCapabilitiesCheck,NoTotalSizeCheck,NoDualLinkDVICheck,NoDisplayPortBandwidthCheck,AllowNon3DVisionModes,AllowNonHDMI3DModes,AllowNonEdidModes,NoEdidHDMI2Check,AllowDpInterlaced"' /etc/X11/xorg.conf
-# Add custom generated modeline to the configuration
-sudo sed -i '/Section\s\+"Monitor"/a\    '"$MODELINE" /etc/X11/xorg.conf
-# Prevent interference between GPUs, add this to the host or other containers running Xorg as well
-echo -e "Section \"ServerFlags\"\n    Option \"AutoAddGPU\" \"false\"\nEndSection" | sudo tee -a /etc/X11/xorg.conf > /dev/null
-
-# Default display is :0 across the container
-export DISPLAY=":0"
-# Run Xorg server with required extensions
-/usr/bin/Xorg vt7 -noreset -novtswitch -sharevts -dpi "${DPI}" +extension "COMPOSITE" +extension "DAMAGE" +extension "GLX" +extension "RANDR" +extension "RENDER" +extension "MIT-SHM" +extension "XFIXES" +extension "XTEST" "${DISPLAY}" &
-
-# Wait for X11 to start
-echo "Waiting for X socket"
-until [ -S "/tmp/.X11-unix/X${DISPLAY/:/}" ]; do sleep 1; done
-echo "X socket is ready"
-
-# Wait for X11 to start
-echo "$(date +"[%Y-%m-%d %H:%M:%S]") Waiting for X socket"
-until [ -S "/tmp/.X11-unix/X${DISPLAY/:/}" ]; do sleep 1; done
-echo "$(date +"[%Y-%m-%d %H:%M:%S]") X socket is ready"
-
-if [[ -z "${SESSION_ID}" ]]; then
-  echo "$(date +"[%Y-%m-%d %H:%M:%S]") No stream name was found, did you forget to set the env variable NAME?" && exit 1
-else
-  /usr/bin/gpu-screen-recorder -w screen -c flv -f 60 -a "$(pactl get-default-sink).monitor" | ffmpeg -hide_banner -v quiet -i pipe:0 -c copy -f mp4 -movflags empty_moov+frag_every_frame+separate_moof+omit_tfhd_offset - | /usr/bin/warp --name "${SESSION_ID}" https://fst.so:4443 &
-fi
-
-openbox-session &
-
-# /usr/games/gamescope -- mangohud glxgears > /dev/null & 
-
-echo "$(date +"[%Y-%m-%d %H:%M:%S]") Session Running. Press [Return] to exit."
-read

.scripts/proton

@@ -1,610 +0,0 @@
-#!/bin/bash
-# Version 1.1
-#Copied from https://github.com/noabody/unibuild/blob/master/data/wstart
-
-# WINEARCH win32/win64 not as good as binary wine/wine64"
-# WINEDEBUG="-all" not as good as dev/null
-
-# complex command line builder to simplify command objects
-# vars bin, pfx set to wine binary, prefix dirs initially
-# menus will dynamically set bin pfx to specific targets
-# menu shows gui based 32/64-bit pe header exe via pev
-# var 'x' for unified cross-functionality
-# ${@:2} skips 'wstart' and 1st arg
-
-# manjaro 21.2.1
-#sudo pacman -S bash binutils findutils gendesk grep icoutils pcre2 perl yay winetricks; yay -S pev
-
-# wnbin needs wine dir with: bin lib lib64 share
-# manjaro default path is /usr
-# can symlink various wnbin="$HOME/.local/opt"
-#mkdir "$HOME"/.local/opt
-#ln -sf /usr "$HOME"/.local/opt/wine
-#ln -sf /usr/share/steam/compatibilitytools.d/proton-ge-custom/files "$HOME"/.local/opt/proton
-
-wnbin="/usr"
-# top level wine dir, symlink into "$HOME/.local/opt" to flatten paths
-wnpfx="$HOME"
-# top level wine prefix dir
-pntop="$HOME/.steam"
-# top level linux steam dir
-pnapp="$pntop/steam/steamapps"
-# steamapps subdir
-pnbin="$pnapp/common"
-# proton subdir normally under top/app
-pnpfx="$pnapp/compatdata"
-# proton prefix subdir normally under top/app
-pnpge="$pntop/root/compatibilitytools.d"
-# proton ge
-progs="drive_c/Program Files"
-# Program Files standard subdir
-stcmn="Steam/steamapps/common"
-# windows steam client subdir under progs
-desk="$HOME/Desktop"
-# desktop entry folder
-icon="applications-other"
-# default icon
-temp="$HOME/Downloads"
-# temp folder
-clprm=("${@:2}")
-# store cmdline args minus first option
-x="$(echo "$1" | grep -Pio '(?<=-)[wp]')"
-# 1st letter of 1st cmd line arg determines wine/proton
-if [[ -n "$x" ]]; then
-  xarg="$(echo "$1" | perl -pe 's/-[wp]/-x/gi')"
-else
-  xarg="$(echo "$1" | perl -pe 's/-x+/-/gi')"
-fi
-# drop 1st letter x or change to it
-xcmd=()
-i_mnus=()
-myprnt=()
-i_syms=()
-pmenu=("Command Prompt/wineconsole.exe" "Control Panel/control.exe" "Registry Editor/regedit.exe" "Task Manager/taskmgr.exe" "Windows Explorer/explorer.exe" "Wine Configuration/winecfg.exe")
-# scalable built-in programs menu
-unset WINEARCH WINEDLLPATH WINEPREFIX STEAM_COMPAT_CLIENT_INSTALL_PATH STEAM_COMPAT_DATA_PATH
-# prevent shell inheritance of env vars we use
-
-w_menu () {
-PS3="Please enter your choice: "
-select answer in "${i_mnus[@]}"; do
-  for item in "${i_mnus[@]}"; do
-    if [[ $item == "$answer" ]]; then
-      break 2
-    fi
-  done
-done
-# repeating menu requires valid selection from array
-if [[ "$answer" = "quit" ]]; then
-# pop quit from end of array for menu option
-  exit
-else
-  xmrtn="$answer"
-fi
-unset i_mnus
-clear
-}
-
-# Path ordering: wine64 x64/x32 or wine32 x32 then standard
-# Order critical to proper operation
-xn64 () {
-xstrt="wine64"
-xnldl="$xnbin/lib64:$xnbin/lib"
-xndll="$xnbin/lib64/wine:$xnbin/lib/wine"
-}
-
-xn32 () {
-xstrt="wine"
-xnldl="$xnbin/lib"
-xndll="$xnbin/lib/wine"
-}
-
-xnint () {
-if [[ "$x" = "p" ]]; then
-  xnbin="$pnbin"
-  xnpfx="$pnpfx"
-  dpth=(4 3)
-else
-  xnbin="$wnbin"
-  xnpfx="$wnpfx"
-  dpth=(3 2)
-fi
-}
-
-xnexe () {
-# menu installed wine/proton or exit
-readarray -t i_mnus < <(find -L "$xnbin" -maxdepth "${dpth[0]}" -type f -iname 'wine' ! \( -ipath '*/sbin*' \) 2>/dev/null | perl -pe "s|\Q$xnbin\E/(.*)[/]*bin/wine|\1| ; s|/$||" | sort ; echo "quit")
-if [[ ${#i_mnus[@]} -gt 2 ]]; then
-  clear
-  w_menu
-  xnbin="$(realpath "$xnbin/$xmrtn")"
-  unset xmrtn
-elif [[ ${#i_mnus[@]} -eq 2 ]]; then
-  xnbin="$(realpath "$xnbin/${i_mnus[0]}")"
-else
-  echo "No installed Wine/Proton found."
-  exit 1
-fi
-}
-
-xndef () {
-# create default prefix cross-function
-if [[ "$x" = "p" ]]; then
-  if [[ ! -d "$xnpfx/0" ]]; then
-  # always create default 0 prefix
-    xnpfx="$xnpfx/0"
-    echo "Creating default prefix: $xnpfx"
-    mkdir -p "$xnpfx"
-    STEAM_COMPAT_DATA_PATH="$xnpfx" "${xnbin%/*}/proton" run > /dev/null 2>&1 &
-    xnpfx="$xnpfx/pfx"
-  fi
-else
-  if [[ ! -d "$xnpfx/.wine" ]]; then
-  # always create default wine prefix
-    xnpfx="$xnpfx/.wine"
-    echo "Creating default prefix: $xnpfx"
-    WINEPREFIX="$xnpfx" "$xnbin"/bin/winecfg > /dev/null 2>&1 &
-    if [[ -d "$HOME/.wine" && "$HOME/.wine" != "$xnpfx" ]]; then
-      rm -rf "$HOME"/.wine
-      ln -sf "$xnpfx" "$HOME"/.wine
-    fi
-  fi
-fi
-}
-
-xnpre () {
-# menu wine/proton prefix
-readarray -t i_mnus < <(find "$xnpfx" -maxdepth "${dpth[1]}" -type f -iname 'system.reg' 2>/dev/null | perl -pe "s|\Q$xnpfx\E/(.*)/system.reg|\1|" | sort ; echo "quit")
-# use perl escaped Q/E to preserve special characters in path variable
-if [[ ${#i_mnus[@]} -gt 2 ]]; then
-# display menu with min two options plus quit
-# guard proton cross-function
-  if [[ "$x" = "p" ]]; then
-    # shellcheck disable=SC2044
-    for value in $(find "$xnpfx" -maxdepth 1 -type d -ipath '*/[0-9]*' -printf "${xnpfx///compatdata}/appmanifest_%P.acf\n" 2>/dev/null); do
-      test -f "$value" && myprnt+=("$(grep -Pio '^\s+\"(appid|name)\"\s+\"(.*)\"' "$value" | perl -pe 's/.*appid.+?\"(.*)\"\v|.*name.+?\"(.*)\"/\1 \2/')")
-    done
-    if [[ ${#myprnt[@]} -gt 0 ]]; then
-      printf '%s\n' "${myprnt[@]}" | sort
-    fi
-    # correlate appmanifest to proton prefix and list before menu
-    unset myprnt
-  fi
-  w_menu
-  xnpfx="$xnpfx/$xmrtn"
-  unset xmrtn
-elif [[ ${#i_mnus[@]} -eq 2 ]]; then
-# don't menu if only one option plus quit
-  xnpfx="$xnpfx/${i_mnus[0]}"
-fi
-if [[ -d "$xnpfx/$progs (x86)" ]]; then
-  xn64
-else
-  xn32
-fi
-}
-
-xnenv () {
-# core env vars allow proper targetting of wine/proton
-xpath="$xnbin/bin:$PATH"
-xcmd=(env PATH="$xpath" WINEDLLPATH="$xndll" LD_LIBRARY_PATH="$xnldl" WINEPREFIX="$xnpfx")
-# guard proton cross-function which adds on to core env vars
-if [[ "$x" = "p" ]]; then
-  xcmd+=(STEAM_COMPAT_DATA_PATH="${xnpfx///pfx}" STEAM_COMPAT_CLIENT_INSTALL_PATH="$pntop")
-fi
-}
-
-xnldr () {
-# loader default to proton as applicable, otherwise wine
-if [[ "$x" = "p" ]]; then
-  read -r -p 'wine loader? [y/N] ' chse
-  if [[ "$chse" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
-    xcmd+=("$xstrt")
-  else
-    xcmd+=("${xnbin%/*}/proton" "run")
-  fi
-else
-  xcmd+=("$xstrt")
-fi
-}
-
-xnset () {
-# set cross-fuction
-xnint
-# wine/proton menu
-xnexe
-# create default prefix as required
-xndef
-# wine/proton prefix
-xnpre
-# wine/proton env vars
-xnenv
-}
-
-xlnch () {
-# cross-function command line launcher
-if [[ -z "$dbg" ]]; then
-  ("${xcmd[@]}" > /dev/null 2>&1 &)
-else
-  echo "${xcmd[@]}"
-  if [[ "$dbg" = "1" ]]; then
-    ("${xcmd[@]}" &)
-  elif [[ "$dbg" = "2" ]]; then
-    (WINEDEBUG="warn+all" "${xcmd[@]}" &)
-  fi
-fi
-# prepend cmd with dbg=1 to see command and default debug output
-# dbg=2 to see command and all debug output, dbg=? for command only
-}
-
-allexe () {
-# unfiltered list of exe in specified path
-if [[ -n "$(stat --file-system --format=%T "$(stat --format=%m "$pedir" 2>/dev/null)" 2>/dev/null | grep -Pio 'fuse')" ]]; then
-  readarray -t i_mnus < <(find "$pedir" -maxdepth 7 -type f -regextype posix-extended -iname '*.exe' 2>/dev/null | perl -pe "s|\Q$pedir\E/(.*)|\1|" | sort ; echo "quit")
-  # skip exe validity tests if file is on network drive
-else
-  readarray -t i_mnus < <(env pedir="$pedir" find "$pedir" -maxdepth 7 -type f -regextype posix-extended -iname '*.exe' -exec sh -c '(readpe -h optional "$1" 2>/dev/null | grep -Piq '0x2.*gui') && (wrestool "$1" 2>/dev/null | grep -Piq 'type=icon') && echo "$1" 2>/dev/null | perl -pe "s|\Q$pedir\E/(.*)|\1|"' -- {} \; 2>/dev/null | sort ; echo "quit")
-  # perform exe validity tests if file is on local drive
-fi
-}
-
-fewexe () {
-# filtered list of exe in standard paths
-readarray -t i_mnus < <(env pedir="$pedir" find "$pedir" -maxdepth 7 -type f -regextype posix-extended ! \( -ipath '*cache*' -o -ipath '*/microsoft*' -o -ipath '*/windows*' -o -ipath '*/temp*' \) ! \( -iregex '.*(capture|clokspl|helper|iexplore|install|internal|kernel|[^ ]launcher|legacypm|overlay|proxy|redist|renderer|(crash|error)reporter|serv(er|ice)|setup|streaming|tutorial|unins|update).*' \) -iname '*.exe' -exec sh -c '(readpe -h optional "$1" 2>/dev/null | grep -Piq '0x2.*gui') && (wrestool "$1" 2>/dev/null | grep -Piq 'type=icon') && echo "$1" 2>/dev/null | perl -pe "s|\Q$pedir\E/(.*)|\1|"' -- {} \; 2>/dev/null | sort ; echo "quit")
-# valid exe will have gui and icon
-}
-
-alloth () {
-# unfiltered list of variable type in specified path
-  readarray -t i_mnus < <(find "$pedir" -maxdepth 7 -type f -regextype posix-extended -iname "$xflt" 2>/dev/null | perl -pe "s|\Q$pedir\E/(.*)|\1|" | sort ; echo "quit")
-}
-
-fewoth () {
-# filtered list of variable type in standard paths
-readarray -t i_mnus < <(env pedir="$pedir" find "$pedir" -maxdepth 7 -type f -regextype posix-extended ! \( -ipath '*cache*' -o -ipath '*/microsoft*' -o -ipath '*/windows*' -o -ipath '*/temp*' \) ! \( -iregex '.*(capture|clokspl|helper|iexplore|install|internal|kernel|[^ ]launcher|legacypm|overlay|proxy|redist|renderer|(crash|error)reporter|serv(er|ice)|setup|streaming|tutorial|unins|update).*' \) -iname "$xflt" 2>/dev/null | perl -pe "s|\Q$pedir\E/(.*)|\1|" | sort ; echo "quit")
-}
-
-xbld () {
-# cross-function custom prefix builder
-pnpfx="$pnpfx/${clprm[0]}"
-wnpfx="$wnpfx/${clprm[0]}"
-xnint
-if [[ -z "${clprm[0]}" ]]; then
-  echo "Wine/Proton prefix name required: (e.g. .wine, 0 )"
-elif [[ -d "$xnpfx" ]]; then
-  echo "Wine/Proton Prefix exists: $xnpfx"
-else
-  xnexe
-  echo "Creating Wine/Proton Prefix: ${clprm[0]}"
-  if [[ "$x" = "p" ]]; then
-    xnenv
-    mkdir -p "$xnpfx"
-    xcmd+=(STEAM_COMPAT_DATA_PATH="$xnpfx" "${xnbin%/*}/proton" "run")
-  else
-    read -r -p '32-bit only? [y/N] ' chse
-    if [[ "$chse" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
-      xn32
-      xnenv
-      xcmd+=(WINEARCH="win32" "$xstrt" "winecfg.exe")
-    else
-      xn64
-      xnenv
-      xcmd+=(WINEARCH="win64" "$xstrt" "winecfg.exe")
-    fi
-  fi
-  xlnch
-fi
-}
-
-xpmn () {
-# use specified exe, menu specified folder, or menu system
-if [[ -f "${clprm[0]}" ]]; then
-# parse 1st cmdline arg, queue if valid file
-  pedir="$(realpath "${clprm[0]}")"
-  xmrtn="$(basename "$pedir")"
-  pedir="$(dirname "$pedir")"
-else
-  if [[ -d "${clprm[0]}" ]]; then
-  # parse 1st cmdline arg, use as path if valid
-    pedir="$(realpath "${clprm[0]}")"
-    test -z "$xflt" && allexe || alloth
-  else
-  # if no cmdline path, use prefix drive_c
-    pedir="$xnpfx/drive_c"
-    test -z "$xflt" && fewexe || fewoth
-  fi
-  # create menu, from path, of file
-  test ${#i_mnus[@]} -gt 1 && w_menu
-fi
-}
-
-xlyt() {
-# pe layout for launch
-# 64-bit prefix, 32-bit pe header, reset env to 32
-if [[ -n "$(readpe -h optional "$pedir/$xmrtn" 2>/dev/null | grep -Pi 'magic number.*0x10b')" && -d "$xnpfx/$progs (x86)" ]]; then
-  xn32
-  xnenv
-fi
-xnldr
-# if 1st arg is file/folder, skip it and run selection + remaining args
-if [[ -e "${clprm[0]}" ]];then
-  xcmd+=("$pedir/$xmrtn" "${clprm[@]:1}")
-else
-  xcmd+=("$pedir/$xmrtn" "${clprm[@]}")
-fi
-}
-
-xstm() {
-if [[ "$x" = "p" ]]; then
-  sstrt="$(realpath "$(which steam)" 2>/dev/null)"
-else
-  xnset
-  sstrt="$(find "$xnpfx/drive_c" -maxdepth 3 -iname 'steam.exe' 2>/dev/null)"
-  if [[ -f "$sstrt" ]]; then
-    pnapp="$(dirname "$sstrt")/steamapps"
-    xcmd+=("$xstrt")
-  fi
-fi
-# find wine/proton steam binary path, normally subdir of program files
-if [[ -f "$sstrt" ]]; then
-  test -d "$pnapp" && readarray -t i_mnus < <(find "$pnapp" -maxdepth 1 -type f -iname 'appmanifest_*.acf' -exec grep -Pio '^\s+\"(appid|name)\"\s+\"(.*)\"' "{}" \; 2>/dev/null | perl -pe 's/.*appid.+?\"(.*)\"\v|.*name.+?\"(.*)\"/\1 \2/' | sort ; echo -e "steam\nquit")
-  # read appmanifests to create menu entries
-  test ${#i_mnus[@]} -gt 2 && w_menu && xmrtn="$(expr "$xmrtn" : '\([0-9]*\)')"
-  if [[ -n "$xmrtn" ]]; then
-  # lauch selection with steam
-    xcmd+=("$sstrt" "-no-browser" "-applaunch" "$xmrtn")
-    xlnch
-  else
-  # launch steam was selected
-  # minigamelist (short game list) for no-browser (disabled chrome) to save memory
-    xcmd+=("$sstrt" "-no-browser" "steam://open/minigameslist")
-    xlnch
-  fi
-else
-  echo -e "Steam not found."
-fi
-}
-
-xpge () {
-    test -d "$pnpge" || mkdir -p "$pnpge"
-    test -d "$pnbin" || mkdir -p "$pnbin"
-
-    if [[ ! -d "$(dirname "$pnpge")" ]]; then
-        echo -e "Could not create folder 'compatibilitytools.d/protonge' in:\n  $(dirname "$pnpge")\n because that path does not exist.\nVerify script variable 'pnpge'"
-    elif [[ ! -d "$pnbin" ]]; then
-        echo -e "Could not create sym-link 'protonge' in:\n  $pnbin\n because that path does not exist.\nVerify script variable 'pnbin'"
-    else
-        gedl="$(curl -sL https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases/latest | jq -r ".tag_name")"
-        #  gedl="$(gh release list -R GloriousEggroll/proton-ge-custom -L 1 | grep -Pio '^ge[^ ]+')"
-        gever="$(echo "$gedl" | grep -Pio '(?<=ge-proton).*')"
-        if [[ -f "$pnpge/protonge/version" ]]; then
-            if [[ -z "$(grep -Pio "$gever" "$pnpge/protonge/version")" ]]; then
-                echo -e "Available Proton GE $gever differs from installed, updating...\n"
-                chse=y
-            else
-                echo -e "Available Proton GE $gever matches installed, nothing to do.\n"
-            fi
-        else
-            echo -e "Proton GE not found, installing...\n"
-            chse=y
-        fi
-    fi
-    if [[ -n "$chse" ]]; then
-        wget --progress=dot:giga "$(curl -s https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases/latest | grep browser_download_url | cut -d\" -f4 | grep .tar.gz)" -P "$temp"/
-
-        rm -rf "$pnpge/protonge"
-        tar -xf "$temp/$gedl".tar.gz -C "$pnpge/"
-        mv "$pnpge"/*roton* "$pnpge/protonge"
-        rm -f "$temp/$gedl".tar.gz
-        grep -Piq "$gever" "$pnpge/protonge/version" || perl -pi -e "s|(?<=ge-proton).*|$gever|gi" "$pnpge/protonge/version"
-        test -h "$pnbin/protonge" || ln -sf "$pnpge/protonge" "$pnbin"
-    fi
-}
-
-xwn () {
-    export WINE_BRANCH=staging
-    sudo mkdir -pm755 /etc/apt/keyrings && sudo curl -fsSL -o /etc/apt/keyrings/winehq-archive.key "https://dl.winehq.org/wine-builds/winehq.key" \
-    && sudo curl -fsSL -o "/etc/apt/sources.list.d/winehq-$(grep UBUNTU_CODENAME= /etc/os-release | cut -d= -f2 | tr -d '\"').sources" "https://dl.winehq.org/wine-builds/ubuntu/dists/$(grep UBUNTU_CODENAME= /etc/os-release | cut -d= -f2 | tr -d '\"')/winehq-$(grep UBUNTU_CODENAME= /etc/os-release | cut -d= -f2 | tr -d '\"').sources" \
-    && sudo apt-get update && sudo apt-get install --install-recommends -y winehq-${WINE_BRANCH} \
-    && sudo curl -fsSL -o /usr/bin/winetricks "https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks" \
-    && sudo chmod 755 /usr/bin/winetricks \
-    && sudo curl -fsSL -o /usr/share/bash-completion/completions/winetricks "https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks.bash-completion"
-}
-
-usage() {
-  echo -e "\n$(basename $0): ERROR - $*" 1>&2
-  echo -e "\nusage: $(basename $0)\n [-?a,--?add] [-?b,--?bld] [-?c,--?cmd] [-?d,--?dsk]\n [-?i,--?inf] [-?k,--?kil] [-?o,--?ovr] [-?p,--?prg]\n [-?s,--?stm] [-?t,--?trk] [-?u,--?cut] [-?v,--?ver]\n\n[?] = (p)roton, (w)ine\n (add) exe path to reg, (bld) build prefix,\n (cmd) prog menu, (dsk) desktop, (inf) exe info,\n (kil) kill wine, (ovr) overrides, (prg) exe list,\n (stm) steam, (trk) winetricks, (cut) shortcut,\n (ver) wine version\n" 1>&2
-}
-
-if [[ $# -lt 1 ]]; then
-  usage "one option required!"
-else
-  case $xarg in
-    -xa|--xadd)
-    # cross-fuction path add to registry based on exe
-      xnint
-      xnpre
-      xpmn
-      if [[ -n "$xmrtn" ]]; then
-        ptadd="$(dirname "$pedir/$xmrtn")"
-        ptadd="z:${ptadd////\\\\}"
-        read -r -p 'prepend to system path? [y/N] ' chse
-        clear
-        if [[ "$chse" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
-          xnreg='System\\CurrentControlSet\\Control\\Session Manager\\Environment'
-          xmrtn='system.reg'
-        else
-          xnreg='Environment'
-          xmrtn='user.reg'
-        fi
-        if [[ -z "$(pcre2grep -Mio "\[\Q${xnreg,,}\E\](?s).+?\"PATH\"=str\(2\):\".+?(?=\[.+?\])(?-s)" "$xnpfx/$xmrtn")" ]]; then
-          perl -0777 -pi -e "s|(\[\Q${xnreg,,}\E\](?s).+?#time=(?-s).*)(?s)(.+?)(?=\[.+?\])(?-s)|\\1\n\"PATH\"=str\(2\):\"${ptadd//\\/\\\\}\"\\2|gi" "$xnpfx/$xmrtn"
-          echo -e "$( (echo "$xnreg" | grep -Pioq '\\Environment') && echo 'HKLM\\' || echo 'HKCU\\')$xnreg:\n\n  $ptadd\n\nPATH created successfully\n"
-        elif [[ -z "$(pcre2grep -Mio "\[\Q${xnreg,,}\E\](?s).+?\"PATH\"=str\(2\):\"(?-s).*\Q${ptadd,,}\E[\;\"](?s).+?(?=\[.+?\])(?-s)" "$xnpfx/$xmrtn")" ]]; then
-          perl -0777 -pi -e "s|(\[\Q${xnreg,,}\E\](?s).+?\"PATH\"=str\(2\):\")(?-s)(.*)(?s)(.+?)(?=\[.+?\])(?-s)|\\1${ptadd//\\/\\\\}\;\\2\\3|gi" "$xnpfx/$xmrtn"
-          echo -e "$( (echo "$xnreg" | grep -Pioq '\\Environment') && echo 'HKLM\\' || echo 'HKCU\\')$xnreg:\n\n  $ptadd\n\nPATH added successfully\n"
-        else
-          echo -e "$( (echo "$xnreg" | grep -Pioq '\\Environment') && echo 'HKLM\\' || echo 'HKCU\\')$xnreg:\n\n  $ptadd\n\nalready in PATH\n"
-        fi
-        # \Q \E adds \ to non alphanums but variable with \E ends \Q
-        # lowercase ${var,,} to avoid since path/reg not case sensitive
-        # linux path is case sensitive so user must not create duplicates
-      fi
-    ;;
-    -xb|--xbld)
-    # cross-function prefix builder
-      xbld
-    ;;
-    -xc|--xcmd)
-    # cross-function standard tools menu
-      xnset
-      readarray -t i_mnus < <(printf '%s\n' "${pmenu[@]}" | perl -pe 's|/.*||gi' ; echo "quit")
-      w_menu
-      xmrtn="$(printf '%s\n' "${pmenu[@]}" | grep -Pio "(?<=$xmrtn/).*")"
-      xnldr
-      if [[ -f "${clprm[0]}" ]];then
-        pedir="$(realpath "${clprm[0]}")"
-        cd "$(dirname "$pedir")" || exit
-        xcmd+=("$xmrtn" "$pedir" "${clprm[@]:1}")
-      else
-        xcmd+=("$xmrtn" "${clprm[@]}")
-      fi
-      xlnch
-    ;;
-    -xd|--xdsk)
-    # cross-function wine desktop
-      xnset
-      xnldr
-      xcmd+=("explorer.exe" "/desktop=shell,1024x768" "explorer.exe")
-      xlnch
-    ;;
-    -i|--install)
-    # proton ge
-      xpge
-      xwn
-    ;;
-    -xi|--xinf)
-    # cross-fuction program info
-      if [[ ! -f "${clprm[0]}" && ! -d "${clprm[0]}" ]]; then
-      # don't menu prefix on supplied file or folder
-        xnint
-        xnpre
-      fi
-      if [[ ! -f "${clprm[0]}" ]]; then
-      # offer to menu dll if no file given
-        read -r -p 'query dll? [y/N] ' chse
-        if [[ "$chse" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
-          xflt="*.dll"
-        fi
-      fi
-      xpmn
-      IFS=$'\n'
-      if [[ -n "$xmrtn" ]]; then
-        if [[ $(readpe "$pedir/$xmrtn" 2>/dev/null) ]]; then
-        # if file is PE print 32/64-bit and dll references
-          myprnt+=("$(readpe -h optional "$pedir/$xmrtn" 2>/dev/null | grep -Piq 'PE32\+' && echo -e "FILE:\n$xmrtn\n \nPE HEADER:\n64-bit" || echo -e "FILE:\n$xmrtn\n \nPE HEADER:\n32-bit")")
-          myprnt+=("$(echo -e ' \nVersion:' ; peres -v "$pedir/$xmrtn" 2>/dev/null | grep -Pio '(?<=Product Version:).*' | tr -d ' ')")
-          # find dll references, filenames without spaces
-          myprnt+=("$(echo -e ' \nREFERENCES:' ; strings "$pedir/$xmrtn" | grep -Pio '[^<>:"/\\|?*\s]+\.dll' | perl -pe 's|([^/]*\Z)|lc($1)|e' | sort -u ; echo ' ')")
-        else
-          myprnt+=("$(echo -e ' \nNot a 32/64-bit program, no information to provide\n ')")
-        fi
-      else
-        myprnt+=("$(echo -e ' \nNo file found\n ')")
-      fi
-      printf '%s\n' "${myprnt[@]}"
-      unset IFS myprnt
-    ;;
-    -xk|--xkil)
-    # cross-function wine kill, must select same as running
-      xnset
-      xcmd+=("wineserver" "-k")
-      xlnch
-    ;;
-    -xo|--xovr)
-    # cross-function prefix override list
-      xnint
-      xnpre
-      read -r -p 'per application? [y/N] ' chse
-      clear
-      IFS=$'\n'
-      myprnt+=("$(echo -e "Prefix:\n$xnpfx\n ")")
-      if [[ "$chse" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
-        # show existing per-application overrides
-        myprnt+=("$(echo -e 'Per-application overrides:' ; pcre2grep -Mio '\[\Qsoftware\\wine\\appdefaults\\\E[^\\]+\Q\\dlloverrides\E\](?s).+?(?=\[.+?\])(?-s)' "$xnpfx/user.reg" | grep -Pio '(?<=appdefaults..).*(?=..dlloverrides)|\".*\"' && echo ' ' || echo -e 'None found\n ')")
-      else
-        # show existing prefix overrides
-        myprnt+=("$(echo -e 'Global overrides:' ; pcre2grep -Mio '\[\Qsoftware\\wine\\dlloverrides\E\](?s).+?(?=\[.+?\])(?-s)' "$xnpfx/user.reg" | grep -Pio '\".*\"' && echo ' ' || echo -e 'None found\n ')")
-      fi
-      printf '%s\n' "${myprnt[@]}"
-      unset IFS myprnt
-      # A command like:
-      # perl -pi -e 's/(\".*msvc.*\"=\")(.*),(.*)(")/\1\3,\2\4/g' user.reg
-      # Swaps msvc entries (native,builtin) to (builtin,native)
-    ;;
-    -xr|--xrun)
-    # cross-fuction run program - 1st arg valid file to run, folder to menu,
-    # neither (sys menu), 2nd arg... passed to exe
-      xnset
-      xpmn
-      if [[ -n "$xmrtn" ]]; then
-        xlyt
-        # change to exe dir before run
-        cd "$(dirname "$pedir/$xmrtn")" || exit
-        xlnch
-      fi
-    ;;
-    -xs|--xstm)
-    # cross-function steam launcher
-      xstm
-    ;;
-    -xt|--xtrk)
-    # cross-function winetricks
-      xnset
-      # winetricks for selected wine/proton prefix
-      if [[ ${#clprm[@]} -gt 0 ]]; then
-        xcmd+=("winetricks" "${clprm[@]}")
-        dbg="1"
-        # use args if supplied, otherwise gui
-      else
-        xcmd+=("winetricks" "--gui")
-        # protontricks may work better
-      fi
-      xlnch
-    ;;
-    -xu|--xcut)
-    # cross-function desktop shortcut
-      if [[ -d "$desk" ]]; then
-        xnset
-        xpmn
-        if [[ -n "$xmrtn" ]]; then
-          xlyt
-          # change to desktop dir before create icon
-          cd "$desk" || exit
-          read -r -e -p $'Shortcut Name?\x0a' -i "$(basename "${xmrtn/.*}")" chse
-          # create desktop entry
-          gendesk -f -n --name="$chse" --comment='created by wstart' --custom='Keywords=wine;proton;launcher;' --exec="bash -c 'cd \"$(dirname "$pedir/$xmrtn")\" ; $(printf '"%s" ' "${xcmd[@]}")'" --icon="$icon" --terminal=false --categories='Emulator;Game' --startupnotify=false --pkgname="$chse"
-          chmod 755 "$chse".desktop
-        fi
-      else
-        echo -e "Invalid desktop location:  $desk\nPlease edit the script"
-      fi
-    ;;
-    -xv|--xver)
-    # cross-function wine version
-      xnint
-      xnexe
-      xnenv
-      xcmd+=("wine" "--version")
-      ("${xcmd[@]}" &)
-    ;;
-    -h|--help)
-      echo -e "\n  General usage:  netris-proton -w? args\n  -w? options for wine and -p? for proton.\n  Type wstart by itself for command list.\n\n  Edit script path variables as needed.\n  bash, find, gendesk, grep, readpe,\n  strings, winetricks, wrestool,\n  pcre2grep, peres, perl needed by\n  certain items.\n"
-    ;;
-    -*|\*|*)
-     # do_usage
-      usage "invalid option $1"
-      exit 1
-    ;;
-  esac
-fi

.scripts/startup.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-#TODO: Fix the warp-input startup problem
-if [ -z "$SESSION_ID" ]; then
-    echo "Error: SESSION_ID environment variable is not set."
-    exit 1
-fi
-
-xarg="$*"
-
-if [ -z "$xarg" ]; then
-    echo "Error: No command specified to run the game. Exiting."
-    exit 1
-fi
- 
-#Open udp port to listed for QUIC events on 
-export PORT=${PORT:-"8080"}
-
-escaped_xarg=$(printf '%s\n' "$xarg" | sed -e 's/[\/&]/\\&/g')
-
-sudo sed -i "s|^command.*=.*$|command=bash -c \"$escaped_xarg\"|" /etc/supervisord.d/game.ini
-
-sudo sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisord.d/game.ini
-
-sudo -E /usr/bin/supervisord -c /etc/supervisord.conf

.scripts/supervisord.conf

@@ -1,45 +0,0 @@
-[supervisord]
-user=netris
-nodaemon=true
-loglevel=info
-logfile=/tmp/supervisord.log
-pidfile=/tmp/supervisord.pid
-
-[include]
-files = /etc/supervisord.d/*.ini
-
-[program:entrypoint]
-command=/etc/entrypoint.sh
-user=netris
-logfile=/tmp/entrypoint.log
-pidfile=/tmp/entrypoint.pid
-stopsignal=INT
-autostart=true
-autorestart=true
-redirect_stderr=true
-priority=1
-
-[program:pulseaudio]
-user=netris
-command=bash -c "until [ -S \"/tmp/.X11-unix/X${DISPLAY/:/}\" ]; do sleep 1; done; sudo /usr/bin/pulseaudio -k >/dev/null 2>&1 || sudo /usr/bin/pulseaudio --system --verbose --log-target=stderr --realtime=true --disallow-exit -L 'module-native-protocol-tcp auth-ip-acl=127.0.0.0/8 port=4713 auth-anonymous=1'"
-environment=DISPLAY=":0"
-logfile=/tmp/pulseaudio.log
-pidfile=/tmp/pulseaudio.pid
-stopsignal=INT
-autostart=true
-autorestart=true
-redirect_stderr=true
-priority=10
-
-[program:warp-input]
-command=bash -c "until [ -S \"/tmp/.X11-unix/X${DISPLAY/:/}\" ]; do sleep 1; done; /usr/bin/warp-input --namespace $SESSION_ID --bind '[::]:8080' https://fst.so:4443"
-logfile=/tmp/warp-input.log
-pidfile=/tmp/warp-input.pid
-stopsignal=INT
-user=netris
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY=":0",SESSION_ID="%(ENV_SESSION_ID)s"
-autostart=true
-autorestart=true
-startretries=100
-redirect_stderr=true    
-priority=20

.scripts/supervisord.d/game.ini

@@ -1,14 +0,0 @@
-[program:game]
-priority=30
-autostart=false
-autorestart=true
-user=netris
-# directory=/
-command=netris-proton -r /games/AlanWake.exe
-stopsignal=INT
-logfile=/tmp/game.log
-pidfile=/tmp/game.pid
-stopsignal=INT
-autostart=true
-autorestart=true
-redirect_stderr=true

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "files.eol": "\n"
-}

LICENSE

@@ -1,3 +1,13 @@
+Copyright (c) 2023-present Nestri Labs, Inc.
+
+Portions of this software are licensed as follows:
+
+* All content that resides under https://github.com/nestrilabs/nestri/tree/dev/cloud and 
+https://github.com/nestrilabs/nestri/tree/production/cloud directory of this repository (Commercial License) is licensed under the license defined in "cloud/LICENSE".
+* All third party components incorporated into the Nestri Software are licensed under the original license provided by the owner of the applicable component.
+* Content outside of the above mentioned directories or restrictions above is available under the "AGPLv3" license as defined below.
+
+
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
@@ -629,8 +639,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    Netris: The open-source cloud gaming platform for friends
-    Copyright (C) 2024  Wanjohi Ryan
+    Nestri: Your games, Your rules
+    Copyright (C) 2023  WanjohiRyan
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as published
@@ -658,4 +668,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.

README.md

@@ -1,209 +1,23 @@
-<div align="center">
-<div>
-
-<a href="https://netris.me" >
-<img height="160" src="/assets/logo.png">
-</a>
-
-</div>
-
-&nbsp;
-&nbsp;
-
-<div align="center" >
-<h1>
-<a href="https://netris.me" >
-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="/assets/logo-name-white.png">
-  <source media="(prefers-color-scheme: light)" srcset="/assets/logo-name-black.png">
-  <img alt="netris logo name" src="/assets/logo-name-black.png">
-</picture>
-
-</a>
-
-</h1>
-
-</div>
-&nbsp;
-&nbsp;
-
-An open-source cloud gaming platform built for you to play together with your friends. <br/> A GeForce NOW alternative that can be self-hosted.<br/>
-
-</div>
-
-&nbsp;
-&nbsp;
- <div align="center" >
-
-[![][github-release-shield]][github-release-link]
-[![][discord-shield]][discord-link]
-[![][github-license-shield]][github-license-link]
-[![][github-stars-shield]][github-stars-link]
-
-**Share the Netris Repository on Social Media**
-
-[![][share-x-shield]][share-x-link]
-[![][share-reddit-shield]][share-reddit-link]
-
-</div>
-&nbsp;
-&nbsp;
-
-<div align="center" >
-
-[![][image-overview]][website-link]
-
-</div>
-
-## Features 🌟
-
-As Netris navigates through its _experimental_ phase, we're in the process of crafting and testing a variety of features for you:
-
-1. **🎮 Proton-GE Compatibility:** We utilize Proton-GE for running games, offering extensive game compatibility and ensuring you can play a wide variety of titles.
-
-2. **⚡ QUIC Protocol:** For input and video/audio transmission, we use QUIC via [MoQ][moq-github-url] to significantly reduce latency on variable networks, ensuring crisp visuals without sacrificing data or increasing latency.
-
-3. **🔗 Session IDs:** With a `SESSION_ID`, we seamlessly tie your game progress, achievements, and devices without the need for logging into [netris.me][website-link]. Our public CDNs, currently located in Europe (eu-north-1) and the US (us-east-1), further reduce latency for friends playing together from afar. More locations are on the way!
-
-4. **🔄 Automatic Game Progress Sync:** Like Stadia's state share, we automatically sync your game progress based on the *.exe file you're running, allowing you to share your progress with friends via a link.
-
-5. **👫 Co-op Gameplay:** Play co-op with up to 8 people, or play single player by sharing mouse and keyboard inputs seamlessly (similar to [neko][neko-url]).
-
-6. **🌐 Cross-Platform Play:** Our platform is accessible on any device that can run a Chrome-based browser, including Edge, Chrome, Brave, and Arc. And you do not have to set up anything, it's all done and maintained for you.
-
-7. **📊 Bandwidth Optimization:** Experience hardware-accelerated `VMAF` for optimized bandwidth, ensuring the best possible video quality. [Learn More][vmaf-cuda-link]
-
-8. **🌟 ...and more:** Stay tuned as we continue to add features _sometimes inspired by platforms like Stadia_, to give you the best and most customizable gaming experience.
-
-This platform is in an _experimental_ phase, and we're actively working on adding new features. Your feedback and support is very much appreciated.
-
-> \[!IMPORTANT]
->
-> If you're excited about what we're doing and want to support our journey, consider giving us a star ⭐ on our repository. Your support fuels our progress!. \~ ✨
-
-
-[![][image-star]][github-stars-link]
-
-
-## Getting Started 🎮
-
-Whether you're looking to self-host Netris or simply want to try it out without the need for your own GPU, we've got you covered. Choose the path that best suits your needs:
-
-<!-- _You can always change your option later without losing game progress_ -->
-
-| If you don't have a Nvidia GPU or prefer not to self-host, you can visit our website. No installation or set up required ! <br/> This is the perfect option for gamers looking to dive straight into the action without any setup. | [👉🏽 Get Access][website-link] |
-| :---------------------------------------- | :----------------------------------------------------------------------------------------------------------------- |
-| If you're interested in self-hosting Netris, continue reading for detailed instructions on how to get started. <br/> This option is ideal if you have your own Nvidia GPU and are comfortable with setting up and managing your own server. | [🛠️ Self Host Netris](#self-hosting) |
-
-> \[!TIP]
->
-> Remember, flexibility is key with Netris. You're free to switch between self-hosting and using `netris.me` whenever you like, without losing your game progress. \~ 💡
-<a name="self-hosting"></a>
-
-### Self-Hosting Netris 🔨
-
-For those interested in self-hosting, here are is what you need to get your own Netris server up and running:
-
-- **Nvidia GPU**: Unfortunately, this setup is exclusive to Nvidia GPUs. If you don't own one, consider renting from cloud services like AWS, GCP, or Vast.ai. We highly recommend this approach.
-
-- **CUDA**: For GPU acceleration, CUDA version `12.0` or newer is required. Verify your CUDA installation by running `nvcc --version`.
-
-- **Docker**: Ensure you have `docker` and `nvidia-docker` are up to date to avoid compatibility issues with CUDA. You can check your Docker version by running `docker --version` in your terminal.
-
-- **GPU Driver**: Ensure your GPU drivers are up to date to avoid compatibility issues with CUDA. Nvidia driver version `520.56.06` or newer is required.
-
-- **Xorg Display**: Your Nvidia GPU should not be attached to a running X display server. You can confirm this by running `nvidia-smi`.
-
-- **Nvidia-DRM**: Make sure that the `nvidia-drm` module has been loaded and that the module is loaded with the flag `modeset=1`. Confirm this by running `sudo cat /sys/module/nvidia_drm/parameters/modeset` 
-
-> \[!TIP]
->
-> Typically, if your setup meets the necessary CUDA requirements, the `nvidia-drm` module will already be loaded, particularly in AWS G4dn instances. \~ 💡
-
-### Step-by-Step Guide
-
-Follow these steps to get Netris up and running on your system.
-
-> \[!IMPORTANT]
->
-> This is our pilot, there is a lot we haven't figured out yet. Please file an issue if anything comes up. \~ 🫂
-
-
-> \[!TIP]
->
-> The setup process will become much simpler with the launch of our CLI tool, so stay tuned for that! In the meantime, you'll need to follow these manual steps.
-
-#### Step 1: Navigate to Your Game Directory
-
-First, change your directory to the location of your `.exe` file. For Steam games, this typically means:
-
-```bash
-cd $HOME/.steam/steam/steamapps
-ls -la .
-```
-
-#### Step 2: Generate a Session ID
-
-Create a unique session ID using the following command:
-
-```bash
-head /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | head -c 16
-```
-
-This command generates a random 16-character string. Be sure to note this string carefully, as you'll need it for the next step.
-
-#### Step 3: Launch the Netris Server
-
-With your SESSION_ID ready, insert it into the command below, replacing `<copy here>` with your actual session ID. Then, run the command to start the Netris server:
-
-```
-docker run --gpus all --device=/dev/dri --name netris -it --entrypoint /bin/bash -e SESSION_ID=<copy here> -v "$(pwd)":/game -p 8080:8080/udp --cap-add=SYS_NICE --cap-add=SYS_ADMIN ghcr.io/netrisdotme/netris/server:nightly
-```
-
-> \[!TIP]
->
-> Ensure UDP port 8080 is accessible from the internet. Use `ufw allow 8080/udp` or adjust your cloud provider's security group settings accordingly.
-
-#### Step 4: Configure the Game within the Container
-
-After executing the previous command, you'll be in a new shell within the container (example: `netris@3f199ee68c01:~$`). Perform the following checks:
-
-1. Verify the game is mounted by executing `ls -la /game`. If not, exit and ensure you've correctly mounted the game directory as a volume.
-2. Then, start the Netris server by running `/etc/startup.sh > /dev/null &`.
-
-#### Step 5: Running Your Game
-
-Wait for the `.X11-unix` directory to appear in `/tmp` (check with `ls -la /tmp`). Once it appears, you're ready to launch your game.
-
-- With Proton-GE: `netris-proton -pr <game>.exe`
-- With Wine: `netris-proton -wr <game>.exe`
-
-#### Step 6: Begin Playing
-
-Finally, construct the play URL with your session ID:
-
-```
-echo "https://netris.me/play/$SESSION_ID"
-```
-
-Navigate to this URL in your browser, click on the page to capture your mouse pointer, and start playing!
-
-
-[github-release-link]: https://github.com/wanjohiryan/netris/releases
-[github-release-shield]: https://img.shields.io/github/v/release/wanjohiryan/netris?color=369eff&labelColor=black&logo=github&style=flat-square
-[discord-shield]: https://img.shields.io/discord/1080111004698021909?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square
-[discord-link]: https://discord.com/invite/Y6etn3qKZ3
-[github-license-shield]: https://img.shields.io/github/license/wanjohiryan/netris?color=white&labelColor=black&style=flat-square
-[github-license-link]: https://github.com/wanjohiryan/netris/blob/main/LICENSE
-[github-stars-shield]: https://img.shields.io/github/stars/wanjohiryan/netris?color=ffcb47&labelColor=black&style=flat-square
-[github-stars-link]: https://github.com/wanjohiryan/netris/network/stargazers
-[share-x-shield]: https://img.shields.io/badge/-share%20on%20x-black?labelColor=black&logo=x&logoColor=white&style=flat-square
-[share-x-link]: https://twitter.com/intent/tweet?text=Hey%2C%20check%20out%20this%20Github%20repository.%20It%20is%20an%20open-source%20self-hosted%20Geforce%20Now%20alternative.&url=https%3A%2F%2Fgithub.com%2Fwanjohiryan%2Fnetris
-[share-reddit-shield]: https://img.shields.io/badge/-share%20on%20reddit-black?labelColor=black&logo=reddit&logoColor=white&style=flat-square
-[share-reddit-link]: https://www.reddit.com/submit?title=Hey%2C%20check%20out%20this%20Github%20repository.%20It%20is%20an%20open-source%20self-hosted%20Geforce%20Now%20alternative.&url=https%3A%2F%2Fgithub.com%2Fwanjohiryan%2Fnetris
-[image-overview]: assets/banner.png
-[website-link]: https://netris.me
-[neko-url]: https://github.com/m1k1o/neko
-[image-star]: assets/star-us.png
-[moq-github-url]: https://quic.video
-[vmaf-cuda-link]: https://developer.nvidia.com/blog/calculating-video-quality-using-nvidia-gpus-and-vmaf-cuda/
+<p align="center">
+  <a href="https://nestri.io">
+    <picture>
+      <source srcset="packages/web/public/logo.white.svg" media="(prefers-color-scheme: dark)">
+      <source srcset="packages/web/public/logo.black.svg" media="(prefers-color-scheme: light)">
+      <img src="packages/web/public/logo.black.svg" alt="Nestri logo">
+    </picture>
+  </a>
+</p>
+<p align="center">Deploy and stream games/apps in the cloud. Use our GPUs or bring your own.</p>
+<p align="center">
+  <a href="https://discord.com/invite/Y6etn3qKZ3"><img alt="Discord" src="https://img.shields.io/discord/1080111004698021909?style=flat-square&label=discord" /></a>
+  <a href="https://github.com/nestrilabs/nestri/blob/dev/LICENSE"><img alt="Nestri License" src="https://img.shields.io/github/license/nestriness/nestri?style=flat-square" /></a>
+  <a href="https://github.com/nestrilabs/nestri/actions/workflows/runner.yml"><img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/nestrilabs/nestri/runner.yml?style=flat-square&branch=dev" /></a>
+ <!-- <a href="https://nestri.io" style="text-decoration: none;">
+    <img src="https://img.shields.io/badge/Start%20Playing%20Now-For%20$1/hour-brightgreen?style=flat-square" alt="Umami Demo" />
+  </a>  -->
+</p>
+
+<!-- TODO: Add a link to the demo app when it's ready -->
+<!-- TODO: Add a link to install for self-hosters -->
+<!-- TODO: Add a CTA for hosted option -->
+<!-- TODO: Add feature imagery like Lobechat -->

apps/www/.create-qwik-28s64ekndxx/package.json

@@ -1,46 +0,0 @@
-{
-  "name": "qwik-project-name",
-  "scripts": {
-    "build": "qwik build",
-    "build.client": "vite build",
-    "build.preview": "vite build --ssr src/entry.preview.tsx",
-    "build.types": "tsc --incremental --noEmit",
-    "dev": "vite --mode ssr",
-    "dev.debug": "node --inspect-brk ./node_modules/vite/bin/vite.js --mode ssr --force",
-    "fmt": "prettier --write .",
-    "fmt.check": "prettier --check .",
-    "lint": "eslint \"src/**/*.ts*\"",
-    "preview": "qwik build preview && vite preview --open",
-    "start": "vite --open --mode ssr",
-    "deploy": "echo 'Run \"npm run qwik add\" to install a server adapter'",
-    "qwik": "qwik"
-  },
-  "devDependencies": {
-    "@builder.io/qwik": "^1.5.1",
-    "@builder.io/qwik-city": "^1.5.1",
-    "@types/eslint": "^8.56.5",
-    "@types/node": "^20.11.24",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
-    "eslint": "^8.57.0",
-    "eslint-plugin-qwik": "^1.5.1",
-    "prettier": "^3.2.5",
-    "typescript": "5.3.3",
-    "undici": "*",
-    "vite": "^5.1.4",
-    "vite-tsconfig-paths": "^4.2.1"
-  },
-  "trustedDependencies": [
-    "sharp"
-  ],
-  "trustedDependencies-annotation": "Needed for bun to allow running install scripts",
-  "engines": {
-    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-    "npm": ">=10.0.0",
-    "pnpm": ">=8.0.0",
-    "yarn": ">=3.0.0"
-  },
-  "engines-annotation": "Mostly required by sharp which needs a Node-API v9 compatible runtime",
-  "private": true,
-  "type": "module"
-}

apps/www/.eslintignore

@@ -1,38 +0,0 @@
-**/*.log
-**/.DS_Store
-*.
-.vscode/settings.json
-.history
-.yarn
-bazel-*
-bazel-bin
-bazel-out
-bazel-qwik
-bazel-testlogs
-dist
-dist-dev
-lib
-lib-types
-etc
-external
-node_modules
-temp
-tsc-out
-tsdoc-metadata.json
-target
-output
-rollup.config.js
-build
-.cache
-.vscode
-.rollup.cache
-dist
-tsconfig.tsbuildinfo
-vite.config.ts
-*.spec.tsx
-*.spec.ts
-.netlify
-pnpm-lock.yaml
-package-lock.json
-yarn.lock
-server

apps/www/.eslintrc.cjs

@@ -1,42 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    browser: true,
-    es2021: true,
-    node: true,
-  },
-  extends: [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:qwik/recommended",
-  ],
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: ["./tsconfig.json"],
-    ecmaVersion: 2021,
-    sourceType: "module",
-    ecmaFeatures: {
-      jsx: true,
-    },
-  },
-  plugins: ["@typescript-eslint"],
-  rules: {
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/no-inferrable-types": "off",
-    "@typescript-eslint/no-non-null-assertion": "off",
-    "@typescript-eslint/no-empty-interface": "off",
-    "@typescript-eslint/no-namespace": "off",
-    "@typescript-eslint/no-empty-function": "off",
-    "@typescript-eslint/no-this-alias": "off",
-    "@typescript-eslint/ban-types": "off",
-    "@typescript-eslint/ban-ts-comment": "off",
-    "prefer-spread": "off",
-    "no-case-declarations": "off",
-    "no-console": "off",
-    "@typescript-eslint/no-unused-vars": ["warn"],
-    "@typescript-eslint/consistent-type-imports": "warn",
-    "@typescript-eslint/no-unnecessary-condition": "warn",
-  },
-};

apps/www/.gitignore

@@ -1,44 +0,0 @@
-# Build
-/dist
-/lib
-/lib-types
-/server
-
-# Development
-node_modules
-*.local
-
-# Cache
-.cache
-.mf
-.rollup.cache
-tsconfig.tsbuildinfo
-
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-# Editor
-.vscode/*
-!.vscode/launch.json
-!.vscode/*.code-snippets
-
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-
-# Yarn
-.yarn/*
-!.yarn/releases
-
-# Vercel
-.vercel

apps/www/.prettierignore

@@ -1,37 +0,0 @@
-**/*.log
-**/.DS_Store
-*.
-.vscode/settings.json
-.history
-.yarn
-bazel-*
-bazel-bin
-bazel-out
-bazel-qwik
-bazel-testlogs
-dist
-dist-dev
-lib
-lib-types
-etc
-external
-node_modules
-temp
-tsc-out
-tsdoc-metadata.json
-target
-output
-rollup.config.js
-build
-.cache
-.vscode
-.rollup.cache
-tsconfig.tsbuildinfo
-vite.config.ts
-*.spec.tsx
-*.spec.ts
-.netlify
-pnpm-lock.yaml
-package-lock.json
-yarn.lock
-server

apps/www/.prettierrc.js

@@ -1,3 +0,0 @@
-export default {
-  plugins: ['prettier-plugin-tailwindcss'],
-}

apps/www/.vscode/launch.json

@@ -1,24 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Launch Chrome",
-      "request": "launch",
-      "type": "chrome",
-      "url": "http://localhost:5173",
-      "webRoot": "${workspaceFolder}"
-    },
-    {
-      "type": "node",
-      "name": "dev.debug",
-      "request": "launch",
-      "skipFiles": ["<node_internals>/**"],
-      "cwd": "${workspaceFolder}",
-      "program": "${workspaceFolder}/node_modules/vite/bin/vite.js",
-      "args": ["--mode", "ssr", "--force"]
-    }
-  ]
-}

apps/www/.vscode/qwik-city.code-snippets

@@ -1,36 +0,0 @@
-{
-  "onRequest": {
-    "scope": "javascriptreact,typescriptreact",
-    "prefix": "qonRequest",
-    "description": "onRequest function for a route index",
-    "body": [
-      "export const onRequest: RequestHandler = (request) => {",
-      "  $0",
-      "};",
-    ],
-  },
-  "loader$": {
-    "scope": "javascriptreact,typescriptreact",
-    "prefix": "qloader$",
-    "description": "loader$()",
-    "body": ["export const $1 = routeLoader$(() => {", "  $0", "});"],
-  },
-  "action$": {
-    "scope": "javascriptreact,typescriptreact",
-    "prefix": "qaction$",
-    "description": "action$()",
-    "body": ["export const $1 = routeAction$((data) => {", "  $0", "});"],
-  },
-  "Full Page": {
-    "scope": "javascriptreact,typescriptreact",
-    "prefix": "qpage",
-    "description": "Simple page component",
-    "body": [
-      "import { component$ } from '@builder.io/qwik';",
-      "",
-      "export default component$(() => {",
-      "  $0",
-      "});",
-    ],
-  },
-}

apps/www/.vscode/qwik.code-snippets

@@ -1,78 +0,0 @@
-{
-  "Qwik component (simple)": {
-    "scope": "javascriptreact,typescriptreact",
-    "prefix": "qcomponent$",
-    "description": "Simple Qwik component",
-    "body": [
-      "export const ${1:${TM_FILENAME_BASE/(.*)/${1:/pascalcase}/}} = component$(() => {",
-      "  return <${2:div}>$4</$2>",
-      "});",
-    ],
-  },
-  "Qwik component (props)": {
-    "scope": "typescriptreact",
-    "prefix": "qcomponent$ + props",
-    "description": "Qwik component w/ props",
-    "body": [
-      "export interface ${1:${TM_FILENAME_BASE/(.*)/${1:/pascalcase}/}}Props {",
-      "  $2",
-      "}",
-      "",
-      "export const $1 = component$<$1Props>((props) => {",
-      "  const ${2:count} = useSignal(0);",
-      "  return (",
-      "    <${3:div} on${4:Click}$={(ev) => {$5}}>",
-      "      $6",
-      "    </${3}>",
-      "  );",
-      "});",
-    ],
-  },
-  "Qwik signal": {
-    "scope": "javascriptreact,typescriptreact",
-    "prefix": "quseSignal",
-    "description": "useSignal() declaration",
-    "body": ["const ${1:foo} = useSignal($2);", "$0"],
-  },
-  "Qwik store": {
-    "scope": "javascriptreact,typescriptreact",
-    "prefix": "quseStore",
-    "description": "useStore() declaration",
-    "body": ["const ${1:state} = useStore({", "  $2", "});", "$0"],
-  },
-  "$ hook": {
-    "scope": "javascriptreact,typescriptreact",
-    "prefix": "q$",
-    "description": "$() function hook",
-    "body": ["$(() => {", "  $0", "});", ""],
-  },
-  "useVisibleTask": {
-    "scope": "javascriptreact,typescriptreact",
-    "prefix": "quseVisibleTask",
-    "description": "useVisibleTask$() function hook",
-    "body": ["useVisibleTask$(({ track }) => {", "  $0", "});", ""],
-  },
-  "useTask": {
-    "scope": "javascriptreact,typescriptreact",
-    "prefix": "quseTask$",
-    "description": "useTask$() function hook",
-    "body": [
-      "useTask$(({ track }) => {",
-      "  track(() => $1);",
-      "  $0",
-      "});",
-      "",
-    ],
-  },
-  "useResource": {
-    "scope": "javascriptreact,typescriptreact",
-    "prefix": "quseResource$",
-    "description": "useResource$() declaration",
-    "body": [
-      "const $1 = useResource$(({ track, cleanup }) => {",
-      "  $0",
-      "});",
-      "",
-    ],
-  },
-}

apps/www/README.md

@@ -1,109 +0,0 @@
-# Qwik City App ⚡️
-
-- [Qwik Docs](https://qwik.builder.io/)
-- [Discord](https://qwik.builder.io/chat)
-- [Qwik GitHub](https://github.com/BuilderIO/qwik)
-- [@QwikDev](https://twitter.com/QwikDev)
-- [Vite](https://vitejs.dev/)
-
----
-
-## Project Structure
-
-This project is using Qwik with [QwikCity](https://qwik.builder.io/qwikcity/overview/). QwikCity is just an extra set of tools on top of Qwik to make it easier to build a full site, including directory-based routing, layouts, and more.
-
-Inside your project, you'll see the following directory structure:
-
-```
-├── public/
-│   └── ...
-└── src/
-    ├── components/
-    │   └── ...
-    └── routes/
-        └── ...
-```
-
-- `src/routes`: Provides the directory-based routing, which can include a hierarchy of `layout.tsx` layout files, and an `index.tsx` file as the page. Additionally, `index.ts` files are endpoints. Please see the [routing docs](https://qwik.builder.io/qwikcity/routing/overview/) for more info.
-
-- `src/components`: Recommended directory for components.
-
-- `public`: Any static assets, like images, can be placed in the public directory. Please see the [Vite public directory](https://vitejs.dev/guide/assets.html#the-public-directory) for more info.
-
-## Add Integrations and deployment
-
-Use the `pnpm qwik add` command to add additional integrations. Some examples of integrations includes: Cloudflare, Netlify or Express Server, and the [Static Site Generator (SSG)](https://qwik.builder.io/qwikcity/guides/static-site-generation/).
-
-```shell
-pnpm qwik add # or `pnpm qwik add`
-```
-
-## Development
-
-Development mode uses [Vite's development server](https://vitejs.dev/). The `dev` command will server-side render (SSR) the output during development.
-
-```shell
-npm start # or `pnpm start`
-```
-
-> Note: during dev mode, Vite may request a significant number of `.js` files. This does not represent a Qwik production build.
-
-## Preview
-
-The preview command will create a production build of the client modules, a production build of `src/entry.preview.tsx`, and run a local server. The preview server is only for convenience to preview a production build locally and should not be used as a production server.
-
-```shell
-pnpm preview # or `pnpm preview`
-```
-
-## Production
-
-The production build will generate client and server modules by running both client and server build commands. The build command will use Typescript to run a type check on the source code.
-
-```shell
-pnpm build # or `pnpm build`
-```
-
-## Vercel Edge
-
-This starter site is configured to deploy to [Vercel Edge Functions](https://vercel.com/docs/concepts/functions/edge-functions), which means it will be rendered at an edge location near to your users.
-
-## Installation
-
-The adaptor will add a new `vite.config.ts` within the `adapters/` directory, and a new entry file will be created, such as:
-
-```
-└── adapters/
-    └── vercel-edge/
-        └── vite.config.ts
-└── src/
-    └── entry.vercel-edge.tsx
-```
-
-Additionally, within the `package.json`, the `build.server` script will be updated with the Vercel Edge build.
-
-## Production build
-
-To build the application for production, use the `build` command, this command will automatically run `pnpm build.server` and `pnpm build.client`:
-
-```shell
-pnpm build
-```
-
-[Read the full guide here](https://github.com/BuilderIO/qwik/blob/main/starters/adapters/vercel-edge/README.md)
-
-## Dev deploy
-
-To deploy the application for development:
-
-```shell
-pnpm deploy
-```
-
-Notice that you might need a [Vercel account](https://docs.Vercel.com/get-started/) in order to complete this step!
-
-## Production deploy
-
-The project is ready to be deployed to Vercel. However, you will need to create a git repository and push the code to it.
-
-You can [deploy your site to Vercel](https://vercel.com/docs/concepts/deployments/overview) either via a Git provider integration or through the Vercel CLI.

apps/www/adapters/vercel-edge/vite.config.ts

@@ -1,16 +0,0 @@
-import { vercelEdgeAdapter } from "@builder.io/qwik-city/adapters/vercel-edge/vite";
-import { extendConfig } from "@builder.io/qwik-city/vite";
-import baseConfig from "../../vite.config";
-
-export default extendConfig(baseConfig, () => {
-  return {
-    build: {
-      ssr: true,
-      rollupOptions: {
-        input: ["src/entry.vercel-edge.tsx", "@qwik-city-plan"],
-      },
-      outDir: ".vercel/output/functions/_qwik-city.func",
-    },
-    plugins: [vercelEdgeAdapter()],
-  };
-});

apps/www/package.json

@@ -1,58 +0,0 @@
-{
-  "name": "my-qwik-empty-starter",
-  "description": "App with Routing built-in ready to create your app",
-  "engines": {
-    "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-  },
-  "engines-annotation": "Mostly required by sharp which needs a Node-API v9 compatible runtime",
-  "private": true,
-  "trustedDependencies": [
-    "sharp"
-  ],
-  "trustedDependencies-annotation": "Needed for bun to allow running install scripts",
-  "type": "module",
-  "scripts": {
-    "build": "qwik build",
-    "build.client": "vite build",
-    "build.preview": "vite build --ssr src/entry.preview.tsx",
-    "build.server": "vite build -c adapters/vercel-edge/vite.config.ts",
-    "build.types": "tsc --incremental --noEmit",
-    "deploy": "vercel deploy",
-    "dev": "vite --mode ssr",
-    "dev.debug": "node --inspect-brk ./node_modules/vite/bin/vite.js --mode ssr --force",
-    "fmt": "prettier --write .",
-    "fmt.check": "prettier --check .",
-    "lint": "eslint \"src/**/*.ts*\"",
-    "preview": "qwik build preview && vite preview --open",
-    "start": "vite --open --mode ssr",
-    "qwik": "qwik"
-  },
-  "devDependencies": {
-    "@builder.io/qwik": "^1.5.1",
-    "@builder.io/qwik-city": "^1.5.1",
-    "@builder.io/qwik-react": "0.5.0",
-    "@types/eslint": "^8.56.5",
-    "@types/node": "^20.11.24",
-    "@types/react": "^18.2.28",
-    "@types/react-dom": "^18.2.13",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
-    "autoprefixer": "^10.4.14",
-    "eslint": "^8.57.0",
-    "eslint-plugin-qwik": "^1.5.1",
-    "postcss": "^8.4.31",
-    "prettier": "^3.2.5",
-    "prettier-plugin-tailwindcss": "^0.5.4",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "tailwindcss": "3.3.3",
-    "typescript": "5.3.3",
-    "undici": "*",
-    "vercel": "^29.1.1",
-    "vite": "^5.1.4",
-    "vite-tsconfig-paths": "^4.2.1"
-  },
-  "dependencies": {
-    "@fontsource/geist-sans": "^5.0.2"
-  }
-}

apps/www/postcss.config.cjs

@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-}

apps/www/public/manifest.json

@@ -1,9 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/web-manifest-combined.json",
-  "name": "qwik-project-name",
-  "short_name": "Welcome to Qwik",
-  "start_url": ".",
-  "display": "standalone",
-  "background_color": "#fff",
-  "description": "A Qwik project app."
-}

apps/www/src/components/router-head/router-head.tsx

@@ -1,32 +0,0 @@
-import { component$ } from "@builder.io/qwik";
-import { useDocumentHead, useLocation } from "@builder.io/qwik-city";
-
-/**
- * The RouterHead component is placed inside of the document `<head>` element.
- */
-export const RouterHead = component$(() => {
-  const head = useDocumentHead();
-  const loc = useLocation();
-
-  return (
-    <>
-      <title>{head.title}</title>
-
-      <link rel="canonical" href={loc.url.href} />
-      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-      <link rel="icon" type="image/png" href="/favicon.png" />
-
-      {head.meta.map((m) => (
-        <meta key={m.key} {...m} />
-      ))}
-
-      {head.links.map((l) => (
-        <link key={l.key} {...l} />
-      ))}
-
-      {head.styles.map((s) => (
-        <style key={s.key} {...s.props} dangerouslySetInnerHTML={s.style} />
-      ))}
-    </>
-  );
-});

apps/www/src/entry.dev.tsx

@@ -1,17 +0,0 @@
-/*
- * WHAT IS THIS FILE?
- *
- * Development entry point using only client-side modules:
- * - Do not use this mode in production!
- * - No SSR
- * - No portion of the application is pre-rendered on the server.
- * - All of the application is running eagerly in the browser.
- * - More code is transferred to the browser than in SSR mode.
- * - Optimizer/Serialization/Deserialization code is not exercised!
- */
-import { render, type RenderOptions } from "@builder.io/qwik";
-import Root from "./root";
-
-export default function (opts: RenderOptions) {
-  return render(document, <Root />, opts);
-}

apps/www/src/entry.preview.tsx

@@ -1,20 +0,0 @@
-/*
- * WHAT IS THIS FILE?
- *
- * It's the bundle entry point for `npm run preview`.
- * That is, serving your app built in production mode.
- *
- * Feel free to modify this file, but don't remove it!
- *
- * Learn more about Vite's preview command:
- * - https://vitejs.dev/config/preview-options.html#preview-options
- *
- */
-import { createQwikCity } from "@builder.io/qwik-city/middleware/node";
-import qwikCityPlan from "@qwik-city-plan";
-import render from "./entry.ssr";
-
-/**
- * The default export is the QwikCity adapter used by Vite preview.
- */
-export default createQwikCity({ render, qwikCityPlan });

apps/www/src/entry.ssr.tsx

@@ -1,30 +0,0 @@
-/**
- * WHAT IS THIS FILE?
- *
- * SSR entry point, in all cases the application is rendered outside the browser, this
- * entry point will be the common one.
- *
- * - Server (express, cloudflare...)
- * - npm run start
- * - npm run preview
- * - npm run build
- *
- */
-import {
-  renderToStream,
-  type RenderToStreamOptions,
-} from "@builder.io/qwik/server";
-import { manifest } from "@qwik-client-manifest";
-import Root from "./root";
-
-export default function (opts: RenderToStreamOptions) {
-  return renderToStream(<Root />, {
-    manifest,
-    ...opts,
-    // Use container attributes to set attributes on the html tag.
-    containerAttributes: {
-      lang: "en-us",
-      ...opts.containerAttributes,
-    },
-  });
-}

apps/www/src/entry.vercel-edge.tsx

@@ -1,22 +0,0 @@
-/*
- * WHAT IS THIS FILE?
- *
- * It's the entry point for Vercel Edge when building for production.
- *
- * Learn more about the Vercel Edge integration here:
- * - https://qwik.builder.io/docs/deployments/vercel-edge/
- *
- */
-import {
-  createQwikCity,
-  type PlatformVercel,
-} from "@builder.io/qwik-city/middleware/vercel-edge";
-import qwikCityPlan from "@qwik-city-plan";
-import { manifest } from "@qwik-client-manifest";
-import render from "./entry.ssr";
-
-declare global {
-  interface QwikCityPlatform extends PlatformVercel {}
-}
-
-export default createQwikCity({ render, qwikCityPlan, manifest });

apps/www/src/global.css

@@ -1,15 +0,0 @@
-/**
- * Tailwind CSS imports
- * View the full documentation at https://tailwindcss.com
- */
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-html *,
-html *::after,
-html *::before {
-  box-sizing: border-box;
-  margin: 0;
-  padding: 0;
-}

apps/www/src/root.tsx

@@ -1,33 +0,0 @@
-import { component$ } from "@builder.io/qwik";
-import {
-  QwikCityProvider,
-  RouterOutlet,
-  ServiceWorkerRegister,
-} from "@builder.io/qwik-city";
-import { RouterHead } from "./components/router-head/router-head";
-
-import "./global.css";
-import "@fontsource/geist-sans/400.css";
-
-export default component$(() => {
-  /**
-   * The root of a QwikCity site always start with the <QwikCityProvider> component,
-   * immediately followed by the document's <head> and <body>.
-   *
-   * Don't remove the `<head>` and `<body>` elements.
-   */
-
-  return (
-    <QwikCityProvider>
-      <head>
-        <meta charSet="utf-8" />
-        <link rel="manifest" href="/manifest.json" />
-        <RouterHead />
-      </head>
-      <body lang="en" class="min-h-screen font-sans antialiased">
-        <RouterOutlet />
-        <ServiceWorkerRegister />
-      </body>
-    </QwikCityProvider>
-  );
-});

apps/www/src/routes/index.tsx

@@ -1,14 +0,0 @@
-import { component$ } from "@builder.io/qwik";
-
-export default component$(() => {
-  return (
-    <div class='justify-center items-center w-screen h-screen flex flex-col gap-3' >
-      <h1 class='text-3xl' >Hi 👋</h1>
-      <p class='text-xl' >
-        Can't wait to see what you build with qwik!
-        <br />
-        Happy coding.
-      </p>
-    </div>
-  );
-});

apps/www/src/routes/layout.tsx

@@ -1,29 +0,0 @@
-import { component$, Slot } from "@builder.io/qwik";
-import type { RequestHandler } from "@builder.io/qwik-city";
-import type { DocumentHead } from "@builder.io/qwik-city";
-
-export const onGet: RequestHandler = async ({ cacheControl }) => {
-  // Control caching for this request for best performance and to reduce hosting costs:
-  // https://qwik.builder.io/docs/caching/
-  cacheControl({
-    // Always serve a cached response by default, up to a week stale
-    staleWhileRevalidate: 60 * 60 * 24 * 7,
-    // Max once every 5 seconds, revalidate on the server to get a fresh version of this page
-    maxAge: 5,
-  });
-};
-
-export default component$(() => {
-  return <Slot />;
-});
-
-
-export const head: DocumentHead = {
-  title: "netris.me/dev | Build the future of gaming",
-  meta: [
-    {
-      name: "description",
-      content: "Play with your friends right from your browser",
-    },
-  ],
-};

apps/www/src/routes/service-worker.ts

@@ -1,18 +0,0 @@
-/*
- * WHAT IS THIS FILE?
- *
- * The service-worker.ts file is used to have state of the art prefetching.
- * https://qwik.builder.io/qwikcity/prefetching/overview/
- *
- * Qwik uses a service worker to speed up your site and reduce latency, ie, not used in the traditional way of offline.
- * You can also use this file to add more functionality that runs in the service worker.
- */
-import { setupServiceWorker } from "@builder.io/qwik-city/service-worker";
-
-setupServiceWorker();
-
-addEventListener("install", () => self.skipWaiting());
-
-addEventListener("activate", () => self.clients.claim());
-
-declare const self: ServiceWorkerGlobalScope;

apps/www/tailwind.config.js

@@ -1,26 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-export default {
-  content: ['./src/**/*.{js,ts,jsx,tsx,mdx}'],
-  theme: {
-    extend: {
-      fontFamily: {
-        sans: [
-          "Geist Sans",
-          "ui-sans-serif",
-          "system-ui",
-          "-apple-system",
-          "BlinkMacSystemFont",
-          "Inter",
-          "Segoe UI",
-          "Roboto",
-          "sans-serif",
-          "Apple Color Emoji",
-          "Segoe UI Emoji",
-          "Segoe UI Symbol",
-          "Noto Color Emoji",
-        ],
-      },
-    },
-  },
-  plugins: [],
-};

apps/www/tsconfig.json

@@ -1,26 +0,0 @@
-{
-  "compilerOptions": {
-    "allowJs": true,
-    "target": "ES2017",
-    "module": "ES2022",
-    "lib": ["es2022", "DOM", "WebWorker", "DOM.Iterable"],
-    "jsx": "react-jsx",
-    "jsxImportSource": "@builder.io/qwik",
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "incremental": true,
-    "isolatedModules": true,
-    "outDir": "tmp",
-    "noEmit": true,
-    "types": ["node", "vite/client"],
-    "paths": {
-      "~/*": ["./src/*"]
-    }
-  },
-  "files": ["./.eslintrc.cjs"],
-  "include": ["src", "./*.d.ts", "./*.config.ts"]
-}

apps/www/vercel.json

@@ -1,13 +0,0 @@
-{
-  "headers": [
-    {
-      "source": "/build/(.*)",
-      "headers": [
-        {
-          "key": "Cache-Control",
-          "value": "public, max-age=31536000, s-maxage=31536000, immutable"
-        }
-      ]
-    }
-  ]
-}

apps/www/vite.config.ts

@@ -1,56 +0,0 @@
-/**
- * This is the base config for vite.
- * When building, the adapter config is used which loads this file and extends it.
- */
-import { defineConfig, type UserConfig } from "vite";
-import { qwikVite } from "@builder.io/qwik/optimizer";
-import { qwikCity } from "@builder.io/qwik-city/vite";
-import tsconfigPaths from "vite-tsconfig-paths";
-import pkg from "./package.json";
-import { qwikReact } from "@builder.io/qwik-react/vite";
-const { dependencies = {}, devDependencies = {} } = pkg as any as {
-  dependencies: Record<string, string>;
-  devDependencies: Record<string, string>;
-  [key: string]: unknown;
-};
-/**
- * Note that Vite normally starts from `index.html` but the qwikCity plugin makes start at `src/entry.ssr.tsx` instead.
- */
-
-export default defineConfig(({ command, mode }): UserConfig => {
-  return {
-    plugins: [qwikCity(), qwikVite(), tsconfigPaths(), qwikReact()],
-    // This tells Vite which dependencies to pre-build in dev mode.
-    optimizeDeps: {
-      // Put problematic deps that break bundling here, mostly those with binaries.
-      // For example ['better-sqlite3'] if you use that in server functions.
-      exclude: [],
-    },
-    // This tells Vite how to bundle the server code.
-    ssr:
-      command === "build" && mode === "production"
-        ? {
-            // All dev dependencies should be bundled in the server build
-            noExternal: Object.keys(devDependencies),
-            // Anything marked as a dependency will not be bundled
-            // These should only be production binary deps (including deps of deps), CLI deps, and their module graph
-            // If a dep-of-dep needs to be external, add it here
-            // For example, if something uses `bcrypt` but you don't have it as a dep, you can write
-            // external: [...Object.keys(dependencies), 'bcrypt']
-            external: Object.keys(dependencies),
-          }
-        : undefined,
-    server: {
-      headers: {
-        // Don't cache the server response in dev mode
-        "Cache-Control": "public, max-age=0",
-      },
-    },
-    preview: {
-      headers: {
-        // Do cache the server response in preview (non-adapter production build)
-        "Cache-Control": "public, max-age=600",
-      },
-    },
-  };
-});

base.Dockerfile

@@ -1,288 +0,0 @@
-# This builds and updates the screen recorder we use on Netris
-# From https://git.dec05eba.com/gpu-screen-recorder
-FROM ubuntu:23.10
-
-ENV DEBIAN_FRONTEND=noninteractive \
-    TIMEZONE=Africa/Nairobi \
-    XDG_RUNTIME_DIR=/tmp/runtime-ubuntu \ 
-    DISPLAY=:0 \    
-    PULSE_SERVER=unix:/run/pulse/native
-    # WAYLAND_DISPLAY=wayland-0
-
-# Install fundamental packages
-RUN apt-get clean \
-    && apt-get update \
-    && apt-get upgrade -y \
-    && apt-get install --no-install-recommends -y \
-    apt-transport-https \
-    apt-utils \
-    build-essential \
-    ca-certificates \
-    curl \
-    gnupg \
-    locales \
-    make \
-    software-properties-common \
-    wget \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen en_US.UTF-8
-
-# Set locales
-ENV LANG=en_US.UTF-8 \
-    LANGUAGE=en_US:en \
-    LC_ALL=en_US.UTF-8 
-
-# Install operating system libraries or packages
-RUN dpkg --add-architecture i386 \
-    && apt-get update \
-    && apt-get install --no-install-recommends -y \
-    alsa-base \
-    alsa-utils \
-    cups-browsed \
-    cups-bsd \
-    cups-common \
-    cups-filters \
-    printer-driver-cups-pdf \
-    file \
-    bzip2 \
-    gzip \
-    xz-utils \
-    unar \
-    rar \
-    unrar \
-    zip \
-    unzip \
-    zstd \
-    gcc \
-    git \
-    jq \
-    python3 \
-    python3-cups \
-    python3-numpy \
-    ssl-cert \
-    nano \
-    vim \
-    htop \
-    fakeroot \
-    fonts-dejavu \
-    fonts-freefont-ttf \
-    fonts-hack \
-    fonts-liberation \
-    fonts-noto \
-    fonts-noto-cjk \
-    fonts-noto-cjk-extra \
-    fonts-noto-color-emoji \
-    fonts-noto-extra \
-    fonts-noto-ui-extra \
-    fonts-noto-hinted \
-    fonts-noto-mono \
-    fonts-noto-unhinted \
-    fonts-opensymbol \
-    fonts-symbola \
-    fonts-ubuntu \
-    lame \
-    less \
-    libavcodec-extra \
-    libpulse0 \
-    pulseaudio \
-    supervisor \
-    net-tools \
-    packagekit-tools \
-    pkg-config \
-    mesa-utils \
-    va-driver-all \
-    va-driver-all:i386 \
-    i965-va-driver-shaders \
-    i965-va-driver-shaders:i386 \
-    intel-media-va-driver-non-free \
-    intel-media-va-driver-non-free:i386 \
-    libva2 \
-    libva2:i386 \
-    vainfo \
-    vdpau-driver-all \
-    vdpau-driver-all:i386 \
-    vdpauinfo \
-    mesa-vulkan-drivers \
-    mesa-vulkan-drivers:i386 \
-    libvulkan-dev \
-    libvulkan-dev:i386 \
-    vulkan-tools \
-    ocl-icd-libopencl1 \
-    clinfo \
-    dbus-user-session \
-    dbus-x11 \
-    libdbus-c++-1-0v5 \
-    xkb-data \
-    xauth \
-    xbitmaps \
-    xdg-user-dirs \
-    xdg-utils \
-    xfonts-base \
-    xfonts-scalable \
-    xinit \
-    xsettingsd \
-    libxrandr-dev \
-    x11-xkb-utils \
-    x11-xserver-utils \
-    x11-utils \
-    x11-apps \
-    xserver-xorg-input-all \
-    xserver-xorg-input-wacom \
-    xserver-xorg-video-all \
-    xserver-xorg-video-intel \
-    xserver-xorg-video-qxl \
-    # Install OpenGL libraries
-    libxau6 \
-    libxau6:i386 \
-    libxdmcp6 \
-    libxdmcp6:i386 \
-    libxcb1 \
-    libxcb1:i386 \
-    libxext6 \
-    libxext6:i386 \
-    libx11-6 \
-    libx11-6:i386 \
-    libxv1 \
-    libxv1:i386 \
-    libxtst6 \
-    libxtst6:i386 \
-    libglvnd0 \
-    libglvnd0:i386 \
-    libgl1 \
-    libgl1:i386 \
-    libglx0 \
-    libglx0:i386 \
-    libegl1 \
-    libegl1:i386 \
-    libgles2 \
-    libgles2:i386 \
-    libglu1 \
-    libglu1:i386 \
-    libsm6 \
-    libsm6:i386 \
-    mesa-utils \
-    mesa-utils-extra \
-    xcvt \
-    && rm -rf /var/lib/apt/lists/* \
-    && echo "/usr/local/nvidia/lib" >> /etc/ld.so.conf.d/nvidia.conf \
-    && echo "/usr/local/nvidia/lib64" >> /etc/ld.so.conf.d/nvidia.conf \
-    # Configure OpenCL manually
-    && mkdir -pm755 /etc/OpenCL/vendors \
-    && echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd \
-    # Configure Vulkan manually
-    && VULKAN_API_VERSION=$(dpkg -s libvulkan1 | grep -oP 'Version: [0-9|\.]+' | grep -oP '[0-9]+(\.[0-9]+)(\.[0-9]+)') \
-    && mkdir -pm755 /etc/vulkan/icd.d/ \
-    && echo "{\n\
-        \"file_format_version\" : \"1.0.0\",\n\
-        \"ICD\": {\n\
-            \"library_path\": \"libGLX_nvidia.so.0\",\n\
-            \"api_version\" : \"${VULKAN_API_VERSION}\"\n\
-        }\n\
-    }" > /etc/vulkan/icd.d/nvidia_icd.json \
-    # Configure EGL manually
-    && mkdir -pm755 /usr/share/glvnd/egl_vendor.d/ \
-    && echo "{\n\
-        \"file_format_version\" : \"1.0.0\",\n\
-        \"ICD\": {\n\
-            \"library_path\": \"libEGL_nvidia.so.0\"\n\
-        }\n\
-    }" > /usr/share/glvnd/egl_vendor.d/10_nvidia.json
-
-# Expose NVIDIA libraries and paths
-ENV PATH=/usr/local/nvidia/bin${PATH:+:${PATH}} \
-    LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}/usr/local/nvidia/lib:/usr/local/nvidia/lib64 \
-    XDG_SESSION_TYPE=x11 \
-    # Enable AppImage execution in containers
-    APPIMAGE_EXTRACT_AND_RUN=1
-
-ENV \
-    # Make all NVIDIA GPUs visible by default
-    NVIDIA_VISIBLE_DEVICES=all \
-    # All NVIDIA driver capabilities should preferably be used, check `NVIDIA_DRIVER_CAPABILITIES` inside the container if things do not work
-    NVIDIA_DRIVER_CAPABILITIES=all \
-    # Disable VSYNC for NVIDIA GPUs
-     __GL_SYNC_TO_VBLANK=0 
-
-#Build and install gpu-screen-recorder
-RUN apt-get update -y \
-    && apt-get install -y \
-    curl \
-    unzip \
-    git \
-    build-essential \
-    ninja-build \
-    gcc \
-    meson \
-    cmake \
-    ccache \
-    bison \
-    software-properties-common \
-    ca-certificates \
-    equivs \
-    ca-certificates\
-    libcap2-bin \
-    libllvm15 \
-    libavcodec-dev \
-    libavformat-dev \
-    libavutil-dev \
-    libavfilter-dev \
-    libavdevice-dev \
-    libswresample-dev \
-    libswscale-dev \
-    libx11-dev \
-    libxcomposite-dev \
-    libkpipewire-dev \
-    libxrandr-dev \
-    libxfixes-dev \
-    libpulse-dev \
-    libswresample-dev \
-    libva-dev \
-    libcap-dev \
-    libdrm-dev \
-    libgl-dev \
-    libegl-dev \
-    libwayland-dev \
-    libnvidia-egl-wayland-dev \
-    libwayland-egl-backend-dev \
-    wayland-protocols \
-    && rm -rf /var/lib/apt/lists/* \
-    #Install Nvrtc
-    && NVRTC_VERSION="11.0.221" \
-    && cd /tmp && curl -fsSL -o nvidia_cuda_nvrtc_linux_x86_64.whl "https://developer.download.nvidia.com/compute/redist/nvidia-cuda-nvrtc/nvidia_cuda_nvrtc-${NVRTC_VERSION}-cp36-cp36m-linux_x86_64.whl" \
-    && unzip -joq -d ./nvrtc nvidia_cuda_nvrtc_linux_x86_64.whl && cd nvrtc && chmod 755 libnvrtc* \
-    && find . -maxdepth 1 -type f -name "*libnvrtc.so.*" -exec sh -c 'ln -snf $(basename {}) libnvrtc.so' \; \
-    && mkdir -p /usr/local/nvidia/lib && mv -f libnvrtc* /usr/local/nvidia/lib \
-    && git clone https://repo.dec05eba.com/gpu-screen-recorder && cd gpu-screen-recorder \
-    && chmod +x ./build.sh ./install.sh \
-    && ./install.sh 
-
-#Try building shadow-cast
-RUN git clone https://github.com/gmbeard/shadow-cast && cd shadow-cast \
-    && mkdir ./build && cd ./build \ 
-    && cmake -DCMAKE_CXX_FLAGS="-Wno-error=unused-result" -DCMAKE_C_FLAGS="-Wno-error=unused-result" .. \ 
-    && cmake --build . -- -j$(nproc) \
-    && chmod +x ./install-helper.sh \
-    && ./install-helper.sh
-
-RUN apt-get update -y; \
-    apt-get upgrade -y; \
-    add-apt-repository ppa:savoury1/ffmpeg4 \
-    add-apt-repository ppa:savoury1/ffmpeg6 \
-    apt-get update -y; \
-    apt-get upgrade -y && apt-get dist-upgrade -y; \
-    apt-get install ffmpeg -y; \
-    #
-    # Log the ffmpeg version
-    ffmpeg -version    
-
-# Install Xorg and NVIDIA driver installer dependencies
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        kmod \
-        libc6-dev \
-        libc6:i386 \
-        libpci3 \
-        libelf-dev \
-        pkg-config \
-        xorg \
-        && rm -rf /var/lib/apt/lists/*

bin/input/.gitignore

@@ -1 +0,0 @@
-/target

bin/input/Cargo.toml

@@ -1,21 +0,0 @@
-[package]
-name = "warp-input"
-version = "0.0.1"
-edition = "2021"
-
-[dependencies]
-anyhow = "1.0.82"
-chrono = "0.4.38"
-clap = "4.5.4"
-enigo = "0.2.1"
-env_logger = "0.11.3"
-log = "0.4.21"
-moq-native = { git = "https://github.com/kixelated/moq-rs", version = "0.1.0" }
-moq-transport = { git = "https://github.com/kixelated/moq-rs", version = "0.5.0" }
-rand = "0.8.5"
-serde = { version="1.0.202" , features = ["derive"]}
-serde_json = "1.0.117"
-tokio = "1.37.0"
-tracing = "0.1.40"
-tracing-subscriber = "0.3.18"
-url = "2.5.0"

bin/input/src/cli.rs

@@ -1,43 +0,0 @@
-use clap::Parser;
-use std::{net, path};
-use url::Url;
-
-#[derive(Parser, Clone, Debug)]
-pub struct Config {
-	/// Listen for UDP packets on the given address.
-	#[arg(long, default_value = "[::]:8080")]
-	pub bind: net::SocketAddr,
-
-	/// Connect to the given URL starting with https://
-	#[arg(value_parser = moq_url)]
-	pub url: Url,
-
-	/// Use the TLS root CA at this path, encoded as PEM.
-	///
-	/// This value can be provided multiple times for multiple roots.
-	/// If this is empty, system roots will be used instead
-	#[arg(long)]
-	pub tls_root: Vec<path::PathBuf>,
-
-	/// Danger: Disable TLS certificate verification.
-	///
-	/// Fine for local development, but should be used in caution in production.
-	#[arg(long)]
-	pub tls_disable_verify: bool,
-
-	/// Publish the current time to the relay, otherwise only subscribe.
-	// #[arg(long)]
-	// pub publish: bool,
-
-	/// The name of the input track.
-	#[arg(long, default_value = "netris")]
-	pub namespace: String,
-
-	/// The name of the input track.
-	#[arg(long, default_value = ".catalog")]
-	pub track: String,
-}
-
-fn moq_url(s: &str) -> Result<Url, String> {
-	Url::try_from(s).map_err(|e| e.to_string())
-}

bin/input/src/input.rs

@@ -1,277 +0,0 @@
-use anyhow::Context;
-use enigo::{
-    Axis::Horizontal,
-    Coordinate::Rel,
-    Direction::{Press, Release},
-    Enigo, Keyboard, Mouse, Settings,
-};
-use moq_transport::
-    serve::{
-        DatagramsReader, GroupsReader, ObjectsReader,
-        StreamReader, TrackReader, TrackReaderMode,
-    };
-
-use serde::{Deserialize, Serialize};
-pub struct Subscriber {
-    track: TrackReader,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct MessageObject {
-    input_type: String,
-    delta_y: Option<i32>,
-    delta_x: Option<i32>,
-    button: Option<i32>,
-    key_code: Option<i32>,
-}
-
-impl Subscriber {
-    pub fn new(track: TrackReader) -> Self {
-        Self { track }
-    }
-
-    // pub async fn run(self) -> anyhow::Result<()> {
-    //     loop {
-    //         match self.track.mode().await {
-    //             Ok(mode) => match mode {
-    //                 TrackReaderMode::Stream(stream) => loop {
-    //                     if let Err(err) = Self::recv_stream(stream.clone()).await {
-    //                         tracing::warn!("Error receiving streams: {}, retrying...", err);
-    //                         tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-    //                     } else {
-    //                         break;
-    //                     }
-    //                 },
-    //                 TrackReaderMode::Groups(groups) => loop {
-    //                     if let Err(err) = Self::recv_groups(groups.clone()).await {
-    //                         tracing::warn!("Error receiving groups: {}, retrying...", err);
-    //                         tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-    //                     } else {
-    //                         break;
-    //                     }
-    //                 },
-    //                 TrackReaderMode::Objects(objects) => loop {
-    //                     if let Err(err) = Self::recv_objects(objects.clone()).await {
-    //                         tracing::warn!("Error receiving objects: {}, retrying...", err);
-    //                         tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-    //                     } else {
-    //                         break;
-    //                     }
-    //                 },
-    //                 TrackReaderMode::Datagrams(datagrams) => loop {
-    //                     if let Err(err) = Self::recv_datagrams(datagrams.clone()).await {
-    //                         tracing::warn!("Error receiving datagrams: {}, retrying...", err);
-    //                         tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-    //                     } else {
-    //                         break;
-    //                     }
-    //                 },
-    //             },
-    //             Err(_) => {
-    //                 tracing::warn!("Failed to get mode, retrying...");
-    //                 tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-    //                 return Ok(());
-    //             }
-    //         }
-    //     }
-    // }
-
-    pub async fn run(self) -> anyhow::Result<()> {
-        match self.track.mode().await.context("failed to connect")? {
-            TrackReaderMode::Stream(stream) => Self::recv_stream(stream).await,
-            TrackReaderMode::Groups(groups) => Self::recv_groups(groups).await,
-            TrackReaderMode::Objects(objects) => Self::recv_objects(objects).await,
-            TrackReaderMode::Datagrams(datagrams) => Self::recv_datagrams(datagrams).await,
-        }
-    }
-
-    async fn recv_stream(mut track: StreamReader) -> anyhow::Result<()> {
-        while let Some(mut group) = track.next().await? {
-            while let Some(object) = group.read_next().await? {
-                let str = String::from_utf8_lossy(&object);
-                println!("{}", str);
-            }
-        }
-        Ok(())
-    }
-
-    async fn recv_groups(mut groups: GroupsReader) -> anyhow::Result<()> {
-        while let Some(mut group) = groups.next().await? {
-            let base = group
-                .read_next()
-                .await
-                .context("failed to get first object")?
-                .context("empty group")?;
-
-            //TODO: Use this to allow for authorisation (admin, player or guest) etc etc
-            let _base = String::from_utf8_lossy(&base);
-            // let json = serde_json::from_str(&str)?;
-
-            //TODO: Handle clipboard
-            let mut enigo = Enigo::new(&Settings::default()).unwrap();
-            while let Some(object) = group.read_next().await? {
-                let str = String::from_utf8_lossy(&object);
-                let parsed: MessageObject = serde_json::from_str(&str)?;
-                match parsed.input_type.as_str() {
-                    "mouse_move" => {
-                        if let (Some(x), Some(y)) = (parsed.delta_x, parsed.delta_y) {
-                            // println!("Handling mouse_move with delta_x: {}, delta_y: {}", x, y);
-                            enigo.move_mouse(x, y, Rel).unwrap();
-                        }
-                    }
-                    "mouse_key_down" => {
-                        if let Some(button) = parsed.button {
-                            // println!("Handling mouse_key_down with key: {}", button);
-                            if let Some(key) = mouse_key_to_enigo(button) {
-                                enigo.button(key, Press).unwrap();
-                            }
-                        }
-                    }
-                    "mouse_key_up" => {
-                        if let Some(button) = parsed.button {
-                            // println!("Handling mouse_key_up with key: {}", button);
-                            if let Some(key) = mouse_key_to_enigo(button) {
-                                enigo.button(key, Release).unwrap();
-                            }
-                        }
-                    }
-                    "mouse_wheel_up" => {
-                        //TODO: handle vertical scrolling
-                        // println!("Handling mouse_wheel_up with key");
-                        enigo.scroll(-2, Horizontal).unwrap();
-                    }
-                    "mouse_wheel_down" => {
-                        //TODO: handle vertical scrolling
-                        // println!("Handling mouse_wheel_down with key");
-                        enigo.scroll(2, Horizontal).unwrap();
-                    }
-                    "key_up" => {
-                        if let Some(key_code) = parsed.key_code {
-                            // println!("Handling key_up with key: {}", key_code);
-                            if let Some(key) = key_to_enigo(key_code as u8) {
-                                enigo.key(key, Release).unwrap();
-                            }
-                        }
-                    }
-                    "key_down" => {
-                        if let Some(key_code) = parsed.key_code {
-                            // println!("Handling key_down with key: {}", key_code);
-                            if let Some(key) = key_to_enigo(key_code as u8) {
-                                enigo.key(key, Press).unwrap();
-                            }
-                        }
-                    }
-                    _ => {
-                        println!("Unknown input_type: {}", parsed.input_type);
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn recv_objects(mut objects: ObjectsReader) -> anyhow::Result<()> {
-        while let Some(mut object) = objects.next().await? {
-            let payload = object.read_all().await?;
-            let str = String::from_utf8_lossy(&payload);
-            println!("{}", str);
-        }
-
-        Ok(())
-    }
-
-    async fn recv_datagrams(mut datagrams: DatagramsReader) -> anyhow::Result<()> {
-        while let Some(datagram) = datagrams.read().await? {
-            let str = String::from_utf8_lossy(&datagram.payload);
-            println!("{}", str);
-        }
-
-        Ok(())
-    }
-}
-
-pub fn mouse_key_to_enigo(key: i32) -> Option<enigo::Button> {
-    match key {
-        0 => Some(enigo::Button::Left),
-        1 => Some(enigo::Button::Middle),
-        2 => Some(enigo::Button::Right),
-        _ => None,
-    }
-}
-
-pub fn key_to_enigo(key: u8) -> Option<enigo::Key> {
-    match key {
-        27 => Some(enigo::Key::Escape),
-        112 => Some(enigo::Key::F1),
-        113 => Some(enigo::Key::F2),
-        114 => Some(enigo::Key::F3),
-        115 => Some(enigo::Key::F4),
-        116 => Some(enigo::Key::F5),
-        117 => Some(enigo::Key::F6),
-        118 => Some(enigo::Key::F7),
-        119 => Some(enigo::Key::F8),
-        120 => Some(enigo::Key::F9),
-        121 => Some(enigo::Key::F10),
-        122 => Some(enigo::Key::F11),
-        123 => Some(enigo::Key::F12),
-        // 19 => Some(enigo::Key::Pause), // Pause
-        // 97 => Some(enigo::Key::Print), // Print
-        46 => Some(enigo::Key::Delete),
-        35 => Some(enigo::Key::End),
-        192 => Some(enigo::Key::Unicode('`')),
-        48 => Some(enigo::Key::Unicode('0')),
-        49 => Some(enigo::Key::Unicode('1')),
-        50 => Some(enigo::Key::Unicode('2')),
-        51 => Some(enigo::Key::Unicode('3')),
-        52 => Some(enigo::Key::Unicode('4')),
-        53 => Some(enigo::Key::Unicode('5')),
-        54 => Some(enigo::Key::Unicode('6')),
-        55 => Some(enigo::Key::Unicode('7')),
-        56 => Some(enigo::Key::Unicode('8')),
-        57 => Some(enigo::Key::Unicode('9')),
-        189 => Some(enigo::Key::Unicode('-')),
-        187 => Some(enigo::Key::Unicode('=')),
-        8 => Some(enigo::Key::Backspace),
-        9 => Some(enigo::Key::Tab),
-        219 => Some(enigo::Key::Unicode('[')),
-        221 => Some(enigo::Key::Unicode(']')),
-        220 => Some(enigo::Key::Unicode('\\')),
-        20 => Some(enigo::Key::CapsLock),
-        186 => Some(enigo::Key::Unicode(';')),
-        222 => Some(enigo::Key::Unicode('\'')),
-        13 => Some(enigo::Key::Return),
-        16 => Some(enigo::Key::Shift), // ShiftL
-        188 => Some(enigo::Key::Unicode(',')),
-        190 => Some(enigo::Key::Unicode('.')),
-        191 => Some(enigo::Key::Unicode('/')),
-        161 => Some(enigo::Key::Shift), // ShiftR
-        38 => Some(enigo::Key::UpArrow),
-        17 => Some(enigo::Key::Control), // ControlL
-        18 => Some(enigo::Key::Alt),     // AltL
-        32 => Some(enigo::Key::Space),
-        165 => Some(enigo::Key::Alt), // AltR
-        // 103 => Some(enigo::Key::Menu),
-        163 => Some(enigo::Key::Control), // ControlR
-        37 => Some(enigo::Key::LeftArrow),
-        40 => Some(enigo::Key::DownArrow),
-        39 => Some(enigo::Key::RightArrow),
-        // 99 => Some(enigo::Key::Raw(45)), // Insert
-        34 => Some(enigo::Key::PageDown),
-        36 => Some(enigo::Key::Home),
-        33 => Some(enigo::Key::PageUp),
-        a if a >= 65 && a <= 90 => Some(enigo::Key::Unicode((a - 65 + ('a' as u8)) as char)),
-        _ => None,
-    }
-}
-
-//NAME="${NAME:-$(head /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | head -c 16)}"
-// let _name = env::var("NAMESPACE").unwrap_or_else(|_| {
-//     let rng = rand::thread_rng();
-//     let random_string: String = rng
-//         .sample_iter(&rand::distributions::Alphanumeric)
-//         .take(16)
-//         .map(char::from)
-//         .collect();
-//     random_string
-// });

bin/input/src/main.rs

@@ -1,121 +0,0 @@
-use anyhow::Context;
-use chrono::prelude::*;
-use clap::Parser;
-use moq_native::quic;
-use moq_transport::{serve, session::Subscriber};
-use std::net;
-use url::Url;
-
-mod input;
-
-#[derive(Parser, Clone)]
-pub struct Cli {
-    /// Listen for UDP packets on the given address.
-    #[arg(long, default_value = "[::]:0")]
-    pub bind: net::SocketAddr,
-
-    /// Connect to the given URL starting with https://
-    #[arg()]
-    pub url: Url,
-
-    /// The TLS configuration.
-    #[command(flatten)]
-    pub tls: moq_native::tls::Cli,
-
-    // /// Publish the current time to the relay, otherwise only subscribe.
-    // #[arg(long)]
-    // pub publish: bool,
-    /// The name of the input track.
-    #[arg(long, default_value = "netris")]
-    pub namespace: String,
-
-    /// The name of the input track.
-    #[arg(long, default_value = ".catalog")]
-    pub track: String,
-}
-
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    env_logger::init();
-
-    // Disable tracing so we don't get a bunch of Quinn spam.
-    let tracer = tracing_subscriber::FmtSubscriber::builder()
-        .with_max_level(tracing::Level::WARN)
-        .finish();
-    tracing::subscriber::set_global_default(tracer).unwrap();
-
-    let config = Cli::parse();
-    let tls = config.tls.load()?;
-
-    let quic = quic::Endpoint::new(quic::Config {
-        bind: config.bind,
-        tls,
-    })?;
-
-    let start = Utc::now();
-    let mut now = start;
-
-    loop {
-        log::info!("connecting to server: url={}", config.url);
-
-        let session = quic.client.connect(&config.url).await?;
-
-        let (session, mut subscriber) = Subscriber::connect(session)
-            .await
-            .context("failed to create MoQ Transport session")?;
-
-        let namespace = format!("{}input", config.namespace);
-
-        let (prod, sub) = serve::Track::new(namespace, config.track.clone()).produce();
-
-        let input = input::Subscriber::new(sub);
-
-        // let (session, mut publisher) = Publisher::connect(session)
-        //     .await
-        //     .context("failed to create MoQ Transport session")?;
-
-        // let (mut writer, _, reader) = serve::Tracks {
-        //     namespace: config.namespace.clone(),
-        // }
-        // .produce();
-
-        // let track = writer.create(&config.track).unwrap();
-        // let input_publisher = input::Publisher::new(track.groups()?);
-
-        tokio::select! {
-            res = session.run() => {
-                if let Err(e) = res {
-                    log::error!("session error: {}", e);
-                    continue;
-                }
-            },
-            res = input.run() => {
-                if let Err(e) = res {
-                    log::error!("input subscriber error: {}", e);
-                    continue;
-                }
-            },
-            // res = publisher.announce(reader) => res.context("failed to serve tracks")?,
-            res = subscriber.subscribe(prod) => {
-                if let Err(e) = res {
-                    log::error!("failed to subscribe to track: {}", e);
-                    continue;
-                }
-            },
-        }
-
-        let next = now + chrono::Duration::try_minutes(1).unwrap();
-        let next = next.with_second(0).unwrap().with_nanosecond(0).unwrap();
-
-        let delay = (next - now).to_std().unwrap();
-        tokio::time::sleep(delay).await;
-
-        // if next.minute() - now.minute() == 10 {
-        //     return Ok(());
-        // }
-
-        now = next; // just assume we didn't undersleep
-    }
-
-    // Ok(())
-}

buf.gen.yaml

@@ -0,0 +1,17 @@
+version: v2
+inputs:
+  - directory: protobufs
+plugins:
+  # TypeScript (frontend)
+  - remote: buf.build/bufbuild/es
+    out: packages/input/src/proto
+    opt: target=ts
+
+  # Golang (relay)
+  - remote: buf.build/protocolbuffers/go
+    out: packages/relay/internal/proto
+    opt: paths=source_relative
+
+  # Rust (nestri-server)
+  - remote: buf.build/community/neoeinstein-prost
+    out: packages/server/src/proto

cloud/LICENSE

@@ -0,0 +1,42 @@
+The Nestri Commercial License (the “Commercial License”)
+Copyright (c) 2023-present Nestri Labs, Inc
+
+With regard to the Nestri Software:
+
+This software and associated documentation files (the "Software") may only be
+used in production, if you (and any entity that you represent) have agreed to,
+and are in compliance with, the Nestri Subscription Terms available
+at https://nestri.io/terms, or other agreements governing
+the use of the Software, as mutually agreed by you and Nestri Labs, Inc,
+and otherwise have a valid Nestri Enterprise Edition subscription ("Commercial Subscription")
+for the correct number of hosts as defined in the "Commercial Terms ("Hosts"). Subject to the foregoing sentence,
+you are free to modify this Software and publish patches to the Software. You agree
+that Nestri Labs and/or its licensors (as applicable) retain all right, title and interest in
+and to all such modifications and/or patches, and all such modifications and/or
+patches may only be used, copied, modified, displayed, distributed, or otherwise
+exploited with a valid Commercial Subscription for the correct number of hosts.
+Notwithstanding the foregoing, you may copy and modify the Software for development
+and testing purposes, without requiring a subscription. You agree that Cal.com and/or
+its licensors (as applicable) retain all right, title and interest in and to all such
+modifications. You are not granted any other rights beyond what is expressly stated herein.
+Subject to the foregoing, it is forbidden to copy, merge, publish, distribute, sublicense,
+and/or sell the Software.
+
+This Commercial License applies only to the part of this Software that is not distributed under
+the AGPLv3 license. Any part of this Software distributed under the MIT license or which
+is served client-side as an image, font, cascading stylesheet (CSS), file which produces
+or is compiled, arranged, augmented, or combined into client-side JavaScript, in whole or
+in part, is copyrighted under the AGPLv3 license. The full text of this Commercial License shall
+be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+For all third party components incorporated into the Nestri Software, those
+components are licensed under the original license provided by the owner of the
+applicable component.

cloud/infra/api.ts

@@ -0,0 +1,12 @@
+import { urls } from "./urls";
+import { auth } from "./auth";
+import { domain } from "./stage";
+import { secret } from "./secrets";
+import { database } from "./database";
+
+export const api = new sst.cloudflare.Worker("Api", {
+  url: true,
+  domain: `api.${domain}`,
+  handler: "cloud/packages/functions/src/api/index.ts",
+  link: [database, secret.POLAR_API_KEY, urls, auth],
+});

cloud/infra/auth.ts

@@ -0,0 +1,25 @@
+import { domain } from "./stage";
+import { secret } from "./secrets";
+import { database } from "./database";
+
+const authStorage = new sst.cloudflare.Kv("AuthStorage");
+
+export const auth = new sst.cloudflare.Worker("Auth", {
+  handler: "cloud/packages/functions/src/auth/index.ts",
+  domain: `auth.${domain}`,
+  url: true,
+  link: [
+    database,
+    authStorage,
+    secret.POLAR_API_KEY,
+    secret.DISCORD_CLIENT_ID,
+    secret.DISCORD_CLIENT_SECRET,
+  ],
+  transform: {
+    worker: {
+      placement: {
+        mode: "smart",
+      },
+    },
+  },
+});

cloud/infra/database.ts

@@ -0,0 +1,54 @@
+const dbProject = neon.getProjectOutput({
+  id: "curly-fire-59112557",
+});
+
+const dbBranchId =
+  $app.stage !== "production"
+    ? new neon.Branch("NeonBranch", {
+        parentId: dbProject.defaultBranchId,
+        projectId: dbProject.id,
+        name: $app.stage,
+      }).id
+    : dbProject.defaultBranchId;
+
+const dbEndpoint = new neon.Endpoint("NeonEndpoint", {
+  projectId: dbProject.id,
+  branchId: dbBranchId,
+  poolerEnabled: true,
+  type: "read_write",
+});
+
+const dbRole = new neon.Role("NeonRole", {
+  name: `nestri-${$app.stage}-role`,
+  branchId: dbBranchId,
+  projectId: dbProject.id,
+});
+
+const db = new neon.Database(
+  "NeonDatabase",
+  {
+    branchId: dbBranchId,
+    projectId: dbProject.id,
+    ownerName: dbRole.name,
+    name: `nestri-${$app.stage}`,
+  },
+  { dependsOn: [dbRole] },
+);
+
+export const database = new sst.Linkable("Database", {
+  properties: {
+    name: db.name,
+    user: dbRole.name,
+    host: dbEndpoint.host,
+    password: dbRole.password,
+  },
+});
+
+new sst.x.DevCommand("Studio", {
+  link: [database],
+  dev: {
+    command: "bun db studio",
+    directory: "cloud/packages/core",
+    autostart: true,
+  },
+});

cloud/infra/secrets.ts

@@ -0,0 +1,5 @@
+export const secret = {
+  DISCORD_CLIENT_ID: new sst.Secret("DISCORD_CLIENT_ID"),
+  DISCORD_CLIENT_SECRET: new sst.Secret("DISCORD_CLIENT_SECRET"),
+  POLAR_API_KEY: new sst.Secret("POLAR_API_KEY"),
+};

cloud/infra/stage.ts

@@ -0,0 +1,5 @@
+export const domain = (() => {
+  if ($app.stage === "production") return "nestri.io"
+  if ($app.stage === "dev") return "dev.nestri.io"
+  return `${$app.stage}.dev.nestri.io`
+})()

cloud/infra/urls.ts

@@ -0,0 +1,10 @@
+import { domain } from "./stage";
+
+export const urls = new sst.Linkable("Urls", {
+  properties: {
+    api: "https://api." + domain,
+    auth: "https://auth." + domain,
+    site: $dev ? "http://localhost:4321" : "https://" + domain,
+    openapi: "https://api." + domain + "/doc",
+  },
+});

cloud/packages/core/drizzle.config.ts

@@ -0,0 +1,12 @@
+import { Resource } from "sst";
+import { defineConfig } from "drizzle-kit";
+
+export default defineConfig({
+  verbose: true,
+  out: "./migrations",
+  dialect: "postgresql",
+  dbCredentials: {
+    url: `postgres://${Resource.Database.user}:${Resource.Database.password}@${Resource.Database.host}/${Resource.Database.name}?sslmode=require`,
+  },
+  schema: "./src/**/*.sql.ts",
+});

cloud/packages/core/migrations/0000_flaky_matthew_murdock.sql

@@ -0,0 +1,39 @@
+CREATE TABLE "member" (
+	"id" char(30) NOT NULL,
+	"team_id" char(30) NOT NULL,
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"time_seen" timestamp with time zone,
+	"email" varchar(255) NOT NULL,
+	CONSTRAINT "member_team_id_id_pk" PRIMARY KEY("team_id","id")
+);
+--> statement-breakpoint
+CREATE TABLE "team" (
+	"id" char(30) PRIMARY KEY NOT NULL,
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"name" varchar(255) NOT NULL,
+	"slug" varchar(255) NOT NULL,
+	"plan_type" text NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "user" (
+	"id" char(30) PRIMARY KEY NOT NULL,
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"avatar_url" text,
+	"name" varchar(255) NOT NULL,
+	"discriminator" integer NOT NULL,
+	"email" varchar(255) NOT NULL,
+	"polar_customer_id" varchar(255),
+	"flags" json DEFAULT '{}'::json,
+	CONSTRAINT "user_polar_customer_id_unique" UNIQUE("polar_customer_id")
+);
+--> statement-breakpoint
+CREATE INDEX "email_global" ON "member" USING btree ("email");--> statement-breakpoint
+CREATE UNIQUE INDEX "member_email" ON "member" USING btree ("team_id","email");--> statement-breakpoint
+CREATE UNIQUE INDEX "team_slug" ON "team" USING btree ("slug");--> statement-breakpoint
+CREATE UNIQUE INDEX "user_email" ON "user" USING btree ("email");

cloud/packages/core/migrations/0001_nifty_sauron.sql

@@ -0,0 +1,2 @@
+DROP INDEX "team_slug";--> statement-breakpoint
+CREATE UNIQUE INDEX "slug" ON "team" USING btree ("slug");

cloud/packages/core/migrations/0002_simple_outlaw_kid.sql

@@ -0,0 +1,17 @@
+CREATE TABLE "steam" (
+	"id" char(30) NOT NULL,
+	"user_id" char(30) NOT NULL,
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"avatar_url" text NOT NULL,
+	"access_token" text NOT NULL,
+	"email" varchar(255) NOT NULL,
+	"country" varchar(255) NOT NULL,
+	"username" varchar(255) NOT NULL,
+	"persona_name" varchar(255) NOT NULL,
+	CONSTRAINT "steam_user_id_id_pk" PRIMARY KEY("user_id","id")
+);
+--> statement-breakpoint
+CREATE INDEX "global_steam_email" ON "steam" USING btree ("email");--> statement-breakpoint
+CREATE UNIQUE INDEX "steam_email" ON "steam" USING btree ("user_id","email");

cloud/packages/core/migrations/0002_tiny_toad_men.sql

@@ -0,0 +1,13 @@
+CREATE TABLE "machine" (
+	"id" char(30) PRIMARY KEY NOT NULL,
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"country" text NOT NULL,
+	"timezone" text NOT NULL,
+	"location" "point" NOT NULL,
+	"fingerprint" varchar(32) NOT NULL,
+	"country_code" varchar(2) NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX "machine_fingerprint" ON "machine" USING btree ("fingerprint");

cloud/packages/core/migrations/0003_first_big_bertha.sql

@@ -0,0 +1,22 @@
+CREATE TABLE "machine" (
+	"id" char(30) PRIMARY KEY NOT NULL,
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"country" text NOT NULL,
+	"timezone" text NOT NULL,
+	"location" "point" NOT NULL,
+	"fingerprint" varchar(32) NOT NULL,
+	"country_code" varchar(2) NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "steam" RENAME COLUMN "country" TO "country_code";--> statement-breakpoint
+DROP INDEX "global_steam_email";--> statement-breakpoint
+ALTER TABLE "steam" ADD COLUMN "time_seen" timestamp with time zone;--> statement-breakpoint
+ALTER TABLE "steam" ADD COLUMN "steam_id" integer NOT NULL;--> statement-breakpoint
+ALTER TABLE "steam" ADD COLUMN "last_game" json NOT NULL;--> statement-breakpoint
+ALTER TABLE "steam" ADD COLUMN "steam_email" varchar(255) NOT NULL;--> statement-breakpoint
+ALTER TABLE "steam" ADD COLUMN "limitation" json NOT NULL;--> statement-breakpoint
+CREATE UNIQUE INDEX "machine_fingerprint" ON "machine" USING btree ("fingerprint");--> statement-breakpoint
+ALTER TABLE "steam" DROP COLUMN "access_token";--> statement-breakpoint
+ALTER TABLE "user" DROP COLUMN "flags";

cloud/packages/core/migrations/0004_amused_mattie_franklin.sql

@@ -0,0 +1,8 @@
+ALTER TABLE "steam" RENAME COLUMN "time_seen" TO "last_seen";--> statement-breakpoint
+DROP INDEX "steam_email";--> statement-breakpoint
+ALTER TABLE "steam" DROP CONSTRAINT "steam_user_id_id_pk";--> statement-breakpoint
+ALTER TABLE "steam" ADD PRIMARY KEY ("id");--> statement-breakpoint
+ALTER TABLE "machine" ADD CONSTRAINT "machine_user_id_id_pk" PRIMARY KEY("user_id","id");--> statement-breakpoint
+ALTER TABLE "machine" ADD COLUMN "user_id" char(30);--> statement-breakpoint
+ALTER TABLE "steam" ADD CONSTRAINT "steam_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "steam" DROP COLUMN "email";

cloud/packages/core/migrations/0005_aspiring_stature.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "machine" DROP CONSTRAINT "machine_user_id_id_pk";--> statement-breakpoint
+ALTER TABLE "machine" DROP COLUMN "user_id";

cloud/packages/core/migrations/0006_worthless_dreadnoughts.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "member" ADD COLUMN "role" text NOT NULL;--> statement-breakpoint
+ALTER TABLE "team" DROP COLUMN "plan_type";

cloud/packages/core/migrations/0007_warm_secret_warriors.sql

@@ -0,0 +1,15 @@
+CREATE TABLE "subscription" (
+	"id" char(30) NOT NULL,
+	"user_id" char(30) NOT NULL,
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"team_id" char(30) NOT NULL,
+	"standing" text NOT NULL,
+	"plan_type" text NOT NULL,
+	"tokens" integer NOT NULL,
+	"product_id" varchar(255),
+	"subscription_id" varchar(255)
+);
+--> statement-breakpoint
+ALTER TABLE "subscription" ADD CONSTRAINT "subscription_team_id_team_id_fk" FOREIGN KEY ("team_id") REFERENCES "public"."team"("id") ON DELETE cascade ON UPDATE no action;

cloud/packages/core/migrations/0008_third_mindworm.sql

@@ -0,0 +1,3 @@
+ALTER TABLE "subscription" ADD CONSTRAINT "subscription_id_team_id_pk" PRIMARY KEY("id","team_id");--> statement-breakpoint
+CREATE UNIQUE INDEX "subscription_id" ON "subscription" USING btree ("id");--> statement-breakpoint
+CREATE INDEX "subscription_user_id" ON "subscription" USING btree ("user_id");

cloud/packages/core/migrations/0009_luxuriant_wraith.sql

@@ -0,0 +1,2 @@
+CREATE UNIQUE INDEX "steam_id" ON "steam" USING btree ("steam_id");--> statement-breakpoint
+CREATE INDEX "steam_user_id" ON "steam" USING btree ("user_id");

cloud/packages/core/migrations/0010_certain_dust.sql

@@ -0,0 +1,94 @@
+CREATE TYPE "public"."member_role" AS ENUM('child', 'adult');--> statement-breakpoint
+CREATE TYPE "public"."steam_status" AS ENUM('online', 'offline', 'dnd', 'playing');--> statement-breakpoint
+CREATE TABLE "steam_account_credentials" (
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"steam_id" varchar(255) PRIMARY KEY NOT NULL,
+	"refresh_token" text NOT NULL,
+	"expiry" timestamp with time zone NOT NULL,
+	"username" varchar(255) NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "friends_list" (
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"steam_id" varchar(255) NOT NULL,
+	"friend_steam_id" varchar(255) NOT NULL,
+	CONSTRAINT "friends_list_steam_id_friend_steam_id_pk" PRIMARY KEY("steam_id","friend_steam_id")
+);
+--> statement-breakpoint
+CREATE TABLE "members" (
+	"id" char(30) NOT NULL,
+	"team_id" char(30) NOT NULL,
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"user_id" char(30),
+	"steam_id" varchar(255) NOT NULL,
+	"role" "member_role" NOT NULL,
+	CONSTRAINT "members_id_team_id_pk" PRIMARY KEY("id","team_id")
+);
+--> statement-breakpoint
+CREATE TABLE "steam_accounts" (
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"steam_id" varchar(255) PRIMARY KEY NOT NULL,
+	"user_id" char(30),
+	"status" "steam_status" NOT NULL,
+	"last_synced_at" timestamp with time zone NOT NULL,
+	"real_name" varchar(255),
+	"member_since" timestamp with time zone NOT NULL,
+	"name" varchar(255) NOT NULL,
+	"profile_url" varchar(255),
+	"username" varchar(255) NOT NULL,
+	"avatar_hash" varchar(255) NOT NULL,
+	"limitations" json NOT NULL,
+	CONSTRAINT "idx_steam_username" UNIQUE("username")
+);
+--> statement-breakpoint
+CREATE TABLE "teams" (
+	"id" char(30) PRIMARY KEY NOT NULL,
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"name" varchar(255) NOT NULL,
+	"owner_id" char(30) NOT NULL,
+	"invite_code" varchar(10) NOT NULL,
+	"slug" varchar(255) NOT NULL,
+	"max_members" bigint NOT NULL,
+	CONSTRAINT "idx_team_invite_code" UNIQUE("invite_code")
+);
+--> statement-breakpoint
+CREATE TABLE "users" (
+	"id" char(30) PRIMARY KEY NOT NULL,
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"email" varchar(255) NOT NULL,
+	"avatar_url" text,
+	"last_login" timestamp with time zone NOT NULL,
+	"name" varchar(255) NOT NULL,
+	"polar_customer_id" varchar(255),
+	CONSTRAINT "idx_user_email" UNIQUE("email")
+);
+--> statement-breakpoint
+DROP TABLE "machine" CASCADE;--> statement-breakpoint
+DROP TABLE "member" CASCADE;--> statement-breakpoint
+DROP TABLE "steam" CASCADE;--> statement-breakpoint
+DROP TABLE "subscription" CASCADE;--> statement-breakpoint
+DROP TABLE "team" CASCADE;--> statement-breakpoint
+DROP TABLE "user" CASCADE;--> statement-breakpoint
+ALTER TABLE "steam_account_credentials" ADD CONSTRAINT "steam_account_credentials_steam_id_steam_accounts_steam_id_fk" FOREIGN KEY ("steam_id") REFERENCES "public"."steam_accounts"("steam_id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "friends_list" ADD CONSTRAINT "friends_list_steam_id_steam_accounts_steam_id_fk" FOREIGN KEY ("steam_id") REFERENCES "public"."steam_accounts"("steam_id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "friends_list" ADD CONSTRAINT "friends_list_friend_steam_id_steam_accounts_steam_id_fk" FOREIGN KEY ("friend_steam_id") REFERENCES "public"."steam_accounts"("steam_id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "members" ADD CONSTRAINT "members_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "members" ADD CONSTRAINT "members_steam_id_steam_accounts_steam_id_fk" FOREIGN KEY ("steam_id") REFERENCES "public"."steam_accounts"("steam_id") ON DELETE cascade ON UPDATE restrict;--> statement-breakpoint
+ALTER TABLE "steam_accounts" ADD CONSTRAINT "steam_accounts_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "teams" ADD CONSTRAINT "teams_owner_id_users_id_fk" FOREIGN KEY ("owner_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "teams" ADD CONSTRAINT "teams_slug_steam_accounts_username_fk" FOREIGN KEY ("slug") REFERENCES "public"."steam_accounts"("username") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE UNIQUE INDEX "idx_member_steam_id" ON "members" USING btree ("team_id","steam_id");--> statement-breakpoint
+CREATE UNIQUE INDEX "idx_member_user_id" ON "members" USING btree ("team_id","user_id") WHERE "members"."user_id" is not null;--> statement-breakpoint
+CREATE UNIQUE INDEX "idx_team_slug" ON "teams" USING btree ("slug");

cloud/packages/core/migrations/0011_simple_azazel.sql

@@ -0,0 +1,89 @@
+CREATE TYPE "public"."compatibility" AS ENUM('high', 'mid', 'low', 'unknown');--> statement-breakpoint
+CREATE TYPE "public"."category_type" AS ENUM('tag', 'genre', 'publisher', 'developer');--> statement-breakpoint
+CREATE TYPE "public"."image_type" AS ENUM('heroArt', 'icon', 'logo', 'superHeroArt', 'poster', 'boxArt', 'screenshot', 'background');--> statement-breakpoint
+CREATE TABLE "base_games" (
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"id" varchar(255) PRIMARY KEY NOT NULL,
+	"slug" varchar(255) NOT NULL,
+	"name" text NOT NULL,
+	"release_date" timestamp with time zone NOT NULL,
+	"size" json NOT NULL,
+	"description" text NOT NULL,
+	"primary_genre" text NOT NULL,
+	"controller_support" text,
+	"compatibility" "compatibility" DEFAULT 'unknown' NOT NULL,
+	"score" numeric(2, 1) NOT NULL,
+	CONSTRAINT "idx_base_games_slug" UNIQUE("slug")
+);
+--> statement-breakpoint
+CREATE TABLE "categories" (
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"slug" varchar(255) NOT NULL,
+	"type" "category_type" NOT NULL,
+	"name" text NOT NULL,
+	CONSTRAINT "categories_slug_type_pk" PRIMARY KEY("slug","type")
+);
+--> statement-breakpoint
+CREATE TABLE "games" (
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"base_game_id" varchar(255) NOT NULL,
+	"category_slug" varchar(255) NOT NULL,
+	"type" "category_type" NOT NULL,
+	CONSTRAINT "games_base_game_id_category_slug_type_pk" PRIMARY KEY("base_game_id","category_slug","type")
+);
+--> statement-breakpoint
+CREATE TABLE "images" (
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"type" "image_type" NOT NULL,
+	"image_hash" varchar(255) NOT NULL,
+	"base_game_id" varchar(255) NOT NULL,
+	"source_url" text NOT NULL,
+	"position" integer DEFAULT 0 NOT NULL,
+	"file_size" integer NOT NULL,
+	"dimensions" json NOT NULL,
+	"extracted_color" json NOT NULL,
+	CONSTRAINT "images_image_hash_type_base_game_id_position_pk" PRIMARY KEY("image_hash","type","base_game_id","position")
+);
+--> statement-breakpoint
+CREATE TABLE "game_libraries" (
+	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_updated" timestamp with time zone DEFAULT now() NOT NULL,
+	"time_deleted" timestamp with time zone,
+	"base_game_id" varchar(255) NOT NULL,
+	"owner_id" varchar(255) NOT NULL,
+	CONSTRAINT "game_libraries_base_game_id_owner_id_pk" PRIMARY KEY("base_game_id","owner_id")
+);
+--> statement-breakpoint
+ALTER TABLE "steam_accounts" RENAME COLUMN "steam_id" TO "id";--> statement-breakpoint
+ALTER TABLE "steam_account_credentials" DROP CONSTRAINT "steam_account_credentials_steam_id_steam_accounts_steam_id_fk";
+--> statement-breakpoint
+ALTER TABLE "friends_list" DROP CONSTRAINT "friends_list_steam_id_steam_accounts_steam_id_fk";
+--> statement-breakpoint
+ALTER TABLE "friends_list" DROP CONSTRAINT "friends_list_friend_steam_id_steam_accounts_steam_id_fk";
+--> statement-breakpoint
+ALTER TABLE "members" DROP CONSTRAINT "members_steam_id_steam_accounts_steam_id_fk";
+--> statement-breakpoint
+ALTER TABLE "games" ADD CONSTRAINT "games_base_game_id_base_games_id_fk" FOREIGN KEY ("base_game_id") REFERENCES "public"."base_games"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "games" ADD CONSTRAINT "games_categories_fkey" FOREIGN KEY ("category_slug","type") REFERENCES "public"."categories"("slug","type") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "images" ADD CONSTRAINT "images_base_game_id_base_games_id_fk" FOREIGN KEY ("base_game_id") REFERENCES "public"."base_games"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "game_libraries" ADD CONSTRAINT "game_libraries_base_game_id_base_games_id_fk" FOREIGN KEY ("base_game_id") REFERENCES "public"."base_games"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "game_libraries" ADD CONSTRAINT "game_libraries_owner_id_steam_accounts_id_fk" FOREIGN KEY ("owner_id") REFERENCES "public"."steam_accounts"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE INDEX "idx_categories_type" ON "categories" USING btree ("type");--> statement-breakpoint
+CREATE INDEX "idx_games_category_slug" ON "games" USING btree ("category_slug");--> statement-breakpoint
+CREATE INDEX "idx_games_category_type" ON "games" USING btree ("type");--> statement-breakpoint
+CREATE INDEX "idx_images_type" ON "images" USING btree ("type");--> statement-breakpoint
+CREATE INDEX "idx_images_game_id" ON "images" USING btree ("base_game_id");--> statement-breakpoint
+CREATE INDEX "idx_game_libraries_owner_id" ON "game_libraries" USING btree ("owner_id");--> statement-breakpoint
+ALTER TABLE "steam_account_credentials" ADD CONSTRAINT "steam_account_credentials_steam_id_steam_accounts_id_fk" FOREIGN KEY ("steam_id") REFERENCES "public"."steam_accounts"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "friends_list" ADD CONSTRAINT "friends_list_steam_id_steam_accounts_id_fk" FOREIGN KEY ("steam_id") REFERENCES "public"."steam_accounts"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "friends_list" ADD CONSTRAINT "friends_list_friend_steam_id_steam_accounts_id_fk" FOREIGN KEY ("friend_steam_id") REFERENCES "public"."steam_accounts"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "members" ADD CONSTRAINT "members_steam_id_steam_accounts_id_fk" FOREIGN KEY ("steam_id") REFERENCES "public"."steam_accounts"("id") ON DELETE cascade ON UPDATE restrict;--> statement-breakpoint
+CREATE INDEX "idx_friends_list_friend_steam_id" ON "friends_list" USING btree ("friend_steam_id");

cloud/packages/core/migrations/0012_glorious_jetstream.sql

@@ -0,0 +1,4 @@
+ALTER TABLE "games" DROP CONSTRAINT "games_categories_fkey";
+--> statement-breakpoint
+ALTER TABLE "games" ADD CONSTRAINT "games_categories_fkey" FOREIGN KEY ("category_slug","type") REFERENCES "public"."categories"("slug","type") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE INDEX "idx_games_category_slug_type" ON "games" USING btree ("category_slug","type");

cloud/packages/core/migrations/0013_neat_colleen_wing.sql

@@ -0,0 +1,3 @@
+CREATE TYPE "public"."controller_support" AS ENUM('full', 'unknown');--> statement-breakpoint
+ALTER TABLE "base_games" ALTER COLUMN "controller_support" SET DATA TYPE controller_support;--> statement-breakpoint
+ALTER TABLE "base_games" ALTER COLUMN "controller_support" SET NOT NULL;

cloud/packages/core/migrations/0014_thin_groot.sql

@@ -0,0 +1 @@
+ALTER TABLE "base_games" ALTER COLUMN "primary_genre" DROP NOT NULL;