mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-22 01:51:20 -08:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8655fe22bc | ||
|
|
b08e2a0807 |
No files matched your search
@@ -1,15 +0,0 @@
|
||||
# Copy to .env.local to report to Sentry from local builds.
|
||||
# Read by the gui (vite), electron and server (gradle) builds. Real environment variables win.
|
||||
# Rebuild after changing it, the values are baked in at build time.
|
||||
|
||||
# Forces a Sentry release. Without it only clean tagged builds report.
|
||||
# Source maps are never uploaded for a forced release.
|
||||
SENTRY_RELEASE=v0.0.0-local
|
||||
|
||||
# Keeps local events out of production alerts and release health. Defaults to production.
|
||||
SENTRY_ENVIRONMENT=development
|
||||
|
||||
# Leave a DSN empty to disable that part.
|
||||
SENTRY_GUI_DSN=
|
||||
SENTRY_ELECTRON_DSN=
|
||||
SENTRY_SERVER_DSN=
|
||||
@@ -1,9 +1,10 @@
|
||||
if ! has nix_direnv_version || ! nix_direnv_version 3.1.1; then
|
||||
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.1.1/direnvrc" "sha256-p+fzQdrms/hDa7g+soShAybJNo4bN4SIAeSfqNKgD5I="
|
||||
if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
|
||||
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
|
||||
fi
|
||||
|
||||
watch_file package.json
|
||||
if ! use flake .
|
||||
nix_direnv_watch_file rust-toolchain.toml
|
||||
nix_direnv_watch_file package.json
|
||||
if ! use flake . --impure
|
||||
then
|
||||
echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
|
||||
fi
|
||||
@@ -3,12 +3,3 @@
|
||||
*.png binary
|
||||
*.webp binary
|
||||
*.gif binary
|
||||
|
||||
*.ftl -linguist-detectable
|
||||
|
||||
# GUI assets (gui/app-next/src/assets)
|
||||
gui/app-next/src/assets/**/*.webp filter=lfs diff=lfs merge=lfs -text
|
||||
gui/app-next/src/assets/**/*.webm filter=lfs diff=lfs merge=lfs -text
|
||||
gui/app-next/src/assets/**/*.gltf filter=lfs diff=lfs merge=lfs -text
|
||||
gui/app-next/src/assets/**/*.glb filter=lfs diff=lfs merge=lfs -text
|
||||
gui/app-next/src/assets/**/*.ogg filter=lfs diff=lfs merge=lfs -text
|
||||
+28
-18
@@ -1,28 +1,38 @@
|
||||
# Global code owner
|
||||
* @Eirenliel
|
||||
|
||||
# Make everyone be able to approve SolarXR submodule changes
|
||||
/solarxr-protocol @ButterscotchV @Erimelowo @loucass003
|
||||
/solarxr-protocol @ButterscotchV @Erimelowo @ImUrX @loucass003
|
||||
|
||||
# Make Loucass the owner of all GUI stuff
|
||||
/gui/ @loucass003
|
||||
/pnpm-lock.yaml @loucass003
|
||||
/pnpm-workspace.yaml @loucass003
|
||||
# Make Loucas and Uriel the owners of all GUI stuff
|
||||
/gui/ @ImUrX @loucass003
|
||||
/pnpm-lock.yaml @ImUrX @loucass003
|
||||
/pnpm-workspace.yaml @ImUrX @loucass003
|
||||
|
||||
# loucass003 and Erimel responsible for i18n
|
||||
/gui/public/i18n/ @loucass003 @Erimelowo @ImSapphire
|
||||
/gui/src/i18n/ @loucass003 @Erimelowo
|
||||
/l10n.toml @loucass003 @Erimelowo
|
||||
# Uriel and Erimel responsible for i18n
|
||||
/gui/public/i18n/ @ImUrX @Erimelowo
|
||||
/gui/src/i18n/ @ImUrX @Erimelowo
|
||||
/l10n.toml @ImUrX @Erimelowo
|
||||
|
||||
/gui/src/components/settings/ @Erimelowo @loucass003
|
||||
/gui/src/components/settings/ @Erimelowo @ImUrX
|
||||
|
||||
# Electron part of the GUI
|
||||
/gui/electron/ @loucass003
|
||||
# Rust part of the GUI
|
||||
/gui/src-tauri/ @ImUrX
|
||||
/Cargo.lock @ImUrX
|
||||
|
||||
# Some server code~
|
||||
/server/ @ButterscotchV @loucass003 @Erimelowo
|
||||
/server/ @ButterscotchV @Eirenliel @Erimelowo
|
||||
|
||||
/bindings-provider/ @ImSapphire
|
||||
/server/src/main/java/dev/slimevr/autobone/ @ButterscotchV
|
||||
/server/src/main/java/dev/slimevr/poserecorder/ @ButterscotchV
|
||||
/server/src/main/java/dev/slimevr/posestreamer/ @ButterscotchV
|
||||
|
||||
/server/src/main/java/dev/slimevr/osc/ @Erimelowo
|
||||
/server/src/main/java/dev/slimevr/tracking/processor/ @Erimelowo
|
||||
/server/src/main/java/dev/slimevr/filtering/ @Erimelowo
|
||||
|
||||
# Linux files
|
||||
*.nix @loucass003
|
||||
/flake.lock @loucass003
|
||||
/dev.slimevr.SlimeVR.metainfo.xml @loucass003
|
||||
/.envrc @loucass003
|
||||
*.nix @ImUrX
|
||||
/flake.lock @ImUrX
|
||||
/dev.slimevr.SlimeVR.metainfo.xml @ImUrX
|
||||
/.envrc @ImUrX
|
||||
@@ -0,0 +1,37 @@
|
||||
"Area: Continuous Integration":
|
||||
- changed-files:
|
||||
- any-glob-to-any-file: ".github/**"
|
||||
"Area: Application Protocol":
|
||||
- changed-files:
|
||||
- any-glob-to-any-file: ["solarxr-protocol"]
|
||||
"Area: AutoBone":
|
||||
- changed-files:
|
||||
- any-glob-to-any-file: "server/core/src/main/java/dev/slimevr/autobone/**"
|
||||
"Area: Documentation":
|
||||
- changed-files:
|
||||
- any-glob-to-any-file: "**/*.md"
|
||||
"Area: GUI":
|
||||
- all:
|
||||
- changed-files:
|
||||
- all-globs-to-any-file: ["gui/**/*", "!gui/public/i18n/**/*"]
|
||||
"Area: Hardware Protocol":
|
||||
- changed-files:
|
||||
- any-glob-to-any-file: "server/core/src/main/java/dev/slimevr/tracking/trackers/udp/**"
|
||||
"Area: Server":
|
||||
- changed-files:
|
||||
- any-glob-to-any-file: ["server/**", "*gradle*", "gradle/**"]
|
||||
"Area: Skeletal Model":
|
||||
- changed-files:
|
||||
- any-glob-to-any-file: "server/core/src/main/java/dev/slimevr/tracking/processor/**"
|
||||
"Area: SteamVR Driver":
|
||||
- changed-files:
|
||||
- any-glob-to-any-file: "server/desktop/src/main/java/dev/slimevr/desktop/platform/**"
|
||||
"Area: Translation":
|
||||
- changed-files:
|
||||
- any-glob-to-any-file: "gui/public/i18n/**"
|
||||
"Area: VMC":
|
||||
- changed-files:
|
||||
- any-glob-to-any-file: ["server/core/src/main/java/dev/slimevr/osc/Unity*", "server/core/src/main/java/dev/slimevr/osc/VMC*", "server/core/src/main/java/dev/slimevr/osc/VRM*"]
|
||||
"Area: VRCOSC":
|
||||
- changed-files:
|
||||
- any-glob-to-any-file: ["server/core/src/main/java/dev/slimevr/osc/VRC*"]
|
||||
@@ -0,0 +1,129 @@
|
||||
name: Build GUI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- .github/workflows/build-gui.yml
|
||||
- gui/**
|
||||
- package*.json
|
||||
pull_request:
|
||||
paths:
|
||||
- .github/workflows/build-gui.yml
|
||||
- gui/**
|
||||
- package*.json
|
||||
workflow_dispatch:
|
||||
create:
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
pnpm i
|
||||
cd gui
|
||||
pnpm run lint
|
||||
|
||||
build:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os:
|
||||
[
|
||||
ubuntu-22.04,
|
||||
windows-latest,
|
||||
macos-latest,
|
||||
ubuntu-22.04-arm,
|
||||
windows-11-arm,
|
||||
]
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
env:
|
||||
# Don't mark warnings as errors
|
||||
CI: false
|
||||
BUILD_ARCH: ${{ endsWith(matrix.os, 'arm') && 'aarch64' || 'amd64' }}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- if: startsWith(matrix.os, 'ubuntu')
|
||||
name: Set up Linux dependencies
|
||||
uses: awalsh128/[email protected]
|
||||
with:
|
||||
packages: libgtk-3-dev webkit2gtk-4.1 libappindicator3-dev librsvg2-dev patchelf
|
||||
# Increment to invalidate the cache
|
||||
version: ${{ format('v1.0-{0}', env.BUILD_ARCH) }}
|
||||
# Enables a workaround to attempt to run pre and post install scripts
|
||||
execute_install_scripts: true
|
||||
# Disables uploading logs as a build artifact
|
||||
debug: false
|
||||
|
||||
- if: matrix.os == 'windows-11-arm'
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
cache: false
|
||||
|
||||
- name: Cache cargo dependencies
|
||||
uses: Swatinem/rust-cache@v2
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
|
||||
- name: Install dependencies
|
||||
shell: bash
|
||||
run: pnpm i
|
||||
|
||||
- name: Build
|
||||
shell: bash
|
||||
env:
|
||||
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
|
||||
NODE_OPTIONS: ${{ matrix.os == 'macos-latest' && '--max-old-space-size=4096' || '' }}
|
||||
run: pnpm run skipbundler --config $( ./gui/scripts/gitversion.mjs )
|
||||
|
||||
- if: startsWith(matrix.os, 'windows')
|
||||
name: Upload a Build Artifact (Windows)
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
# Artifact name
|
||||
name: ${{ format('SlimeVR-GUI-Windows-{0}', env.BUILD_ARCH) }}
|
||||
# A file, directory or wildcard pattern that describes what to upload
|
||||
path: target/release/slimevr.exe
|
||||
|
||||
- if: startsWith(matrix.os, 'ubuntu')
|
||||
name: Upload a Build Artifact (Linux)
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
# Artifact name
|
||||
name: ${{ format('SlimeVR-GUI-Linux-{0}', env.BUILD_ARCH) }}
|
||||
# A file, directory or wildcard pattern that describes what to upload
|
||||
path: target/release/slimevr
|
||||
|
||||
- if: matrix.os == 'macos-latest'
|
||||
name: Upload a Build Artifact (macOS)
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
# Artifact name
|
||||
name: SlimeVR-GUI-macOS
|
||||
# A file, directory or wildcard pattern that describes what to upload
|
||||
path: target/release/slimevr
|
||||
@@ -1,344 +0,0 @@
|
||||
name: SlimeVR Full Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
tags: ["v*"]
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
setup-matrix:
|
||||
name: Configure Build Matrix
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
matrix: ${{ steps.set-matrix.outputs.matrix }}
|
||||
matrix-cpp: ${{ steps.set-matrix.outputs.matrix-cpp }}
|
||||
steps:
|
||||
- id: set-matrix
|
||||
shell: bash
|
||||
run: |
|
||||
BASE='[{"os":"ubuntu-22.04","platform":"linux"},{"os":"windows-latest","platform":"windows"},{"os":"macos-latest","platform":"macos"}]'
|
||||
EXTRA='[{"os":"ubuntu-22.04-arm","platform":"linux"},{"os":"windows-11-arm","platform":"windows"}]'
|
||||
|
||||
if [[ "${{ github.ref }}" == refs/tags/v* || "${{ github.ref }}" == refs/heads/main || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
|
||||
RESULT=$(echo "$BASE $EXTRA" | jq -c -s 'add')
|
||||
else
|
||||
RESULT=$(echo "$BASE" | jq -c '.')
|
||||
fi
|
||||
RESULT_CPP=$(echo "$RESULT" | jq -c '[ .[] | select ( (.platform != "macos") and ( (.platform != "windows") or (.os | endswith("-arm") | not) ) ) ]')
|
||||
|
||||
echo "matrix={\"include\":$RESULT}" >> "$GITHUB_OUTPUT"
|
||||
echo "matrix-cpp={\"include\":$RESULT_CPP}" >> "$GITHUB_OUTPUT"
|
||||
|
||||
build-bindings-provider:
|
||||
name: Build bindings provider for ${{ matrix.os }}
|
||||
needs: [setup-matrix]
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix-cpp) }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: recursive
|
||||
- if: matrix.platform == 'linux'
|
||||
name: Install GCC
|
||||
uses: egor-tensin/setup-gcc@v2
|
||||
with:
|
||||
version: 16
|
||||
- name: Get CMake
|
||||
uses: lukka/get-cmake@latest
|
||||
- name: Configure
|
||||
run: cmake -S bindings-provider/ -B bindings-provider/build -DCMAKE_BUILD_TYPE=Release
|
||||
- name: Build
|
||||
run: cmake --build bindings-provider/build --config Release -j6
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: bindings-provider-${{ matrix.platform }}-${{ matrix.os }}
|
||||
path: |
|
||||
bindings-provider/build/slimevr-bindings-provider
|
||||
bindings-provider/build/libopenvr_api.so
|
||||
bindings-provider/build/Release/SlimeVR-Bindings-Provider.exe
|
||||
bindings-provider/build/openvr_api.dll
|
||||
|
||||
gui-checks:
|
||||
name: Gui Checks
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Get tags
|
||||
run: git fetch --tags origin --recurse-submodules=no --force
|
||||
- name: Setup PNPM
|
||||
uses: pnpm/action-setup@v6
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
- name: GUI Lint
|
||||
run: pnpm i && pnpm run lint
|
||||
|
||||
server-checks:
|
||||
name: Server Checks
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Set up JDK 25
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
java-version: '25'
|
||||
distribution: 'temurin'
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v6
|
||||
- name: Server Spotless Check
|
||||
run: ./gradlew spotlessCheck --build-cache
|
||||
|
||||
build-server-jar:
|
||||
name: Build Desktop Server
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Get tags
|
||||
run: git fetch --tags origin --recurse-submodules=no --force
|
||||
- name: Set up JDK 25
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
java-version: '25'
|
||||
distribution: 'temurin'
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v6
|
||||
- name: Build ShadowJar
|
||||
run: ./gradlew :server:desktop:shadowJar --build-cache
|
||||
env:
|
||||
SENTRY_SERVER_DSN: ${{ vars.SENTRY_SERVER_DSN }}
|
||||
- name: Test with Gradle
|
||||
run: ./gradlew :server:core:jvmTest
|
||||
- name: Upload Server Jar
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: server-jar
|
||||
path: |
|
||||
server/desktop/build/libs/slimevr.jar
|
||||
server/core/resources
|
||||
|
||||
build-gui-frontend:
|
||||
name: Build GUI Assets
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Get tags
|
||||
run: git fetch --tags origin --recurse-submodules=no --force
|
||||
- name: Setup PNPM
|
||||
uses: pnpm/action-setup@v6
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
- name: Build JS
|
||||
env:
|
||||
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
|
||||
SENTRY_GUI_DSN: ${{ vars.SENTRY_GUI_DSN }}
|
||||
SENTRY_ELECTRON_DSN: ${{ vars.SENTRY_ELECTRON_DSN }}
|
||||
SENTRY_SERVER_DSN: ${{ vars.SENTRY_SERVER_DSN }}
|
||||
run: pnpm i && pnpm run build
|
||||
- name: Tar GUI Dist
|
||||
run: tar -czf slimevr-gui-dist.tar.gz -C gui/electron/out .
|
||||
- name: Upload GUI Dist
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: gui-dist
|
||||
path: slimevr-gui-dist.tar.gz
|
||||
|
||||
package-desktop:
|
||||
name: Package Desktop (${{ matrix.platform }} - ${{ matrix.os }})
|
||||
needs: [setup-matrix, build-server-jar, build-gui-frontend, build-bindings-provider]
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Get tags
|
||||
run: git fetch --tags origin --recurse-submodules=no --force
|
||||
- name: Setup PNPM
|
||||
uses: pnpm/action-setup@v6
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
- name: Download Server Jar
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: server-jar
|
||||
path: server
|
||||
- if: contains(fromJson(needs.setup-matrix.outputs.matrix-cpp).include.*.os, matrix.os)
|
||||
name: Download bindings provider artifact
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: bindings-provider-${{ matrix.platform }}-${{ matrix.os }}
|
||||
path: bindings-provider/build/${{ matrix.platform == 'windows' && 'win' || 'linux' }}-${{ endsWith(matrix.os, '-arm') && 'arm64' || 'x64' }}
|
||||
- name: Download GUI Dist
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: gui-dist
|
||||
- name: Extract GUI for Electron
|
||||
shell: bash
|
||||
run: mkdir -p gui/electron/out && tar -xzf slimevr-gui-dist.tar.gz -C gui/electron/out
|
||||
- name: Run Electron Builder
|
||||
shell: bash
|
||||
run: |
|
||||
mkdir -p gui/electron/dist/artifacts/linux/ \
|
||||
gui/electron/dist/artifacts/win \
|
||||
gui/electron/dist/artifacts/mac
|
||||
VERSION=$(git --no-pager tag --sort -taggerdate --points-at HEAD | head -1)
|
||||
[ -z "$VERSION" ] && VERSION="0.0.0"
|
||||
VERSION="${VERSION#v}"
|
||||
echo "Building version: $VERSION"
|
||||
pnpm i
|
||||
cd gui/electron
|
||||
pnpm exec electron-builder --${{ matrix.platform }} \
|
||||
${{ matrix.platform == 'macos' && '--universal' || '' }} \
|
||||
--config.extraMetadata.version="$VERSION" \
|
||||
--publish never
|
||||
- name: Collect and Rename Artifacts
|
||||
shell: bash
|
||||
run: |
|
||||
SRC_DIR="${{ github.workspace }}/gui/electron/dist/artifacts"
|
||||
DEST_DIR="${{ github.workspace }}/release-out"
|
||||
mkdir -p "$DEST_DIR"
|
||||
|
||||
if [ "${{ matrix.platform }}" == "windows" ]; then
|
||||
[[ "${{ matrix.os }}" == *"arm"* ]] && SUFFIX="win-aarch64" || SUFFIX="win64"
|
||||
cp "$SRC_DIR"/win/*.zip "$DEST_DIR/SlimeVR-$SUFFIX.zip"
|
||||
|
||||
elif [ "${{ matrix.platform }}" == "linux" ]; then
|
||||
for f in "$SRC_DIR"/linux/*; do
|
||||
[ -d "$f" ] && continue
|
||||
BASE=$(basename "$f")
|
||||
NEW_NAME=$(echo "$BASE" | sed -e 's/x86_64/amd64/g' -e 's/arm64/aarch64/g')
|
||||
cp "$f" "$DEST_DIR/$NEW_NAME"
|
||||
done
|
||||
|
||||
elif [ "${{ matrix.platform }}" == "macos" ]; then
|
||||
cp "$SRC_DIR"/mac/*.dmg "$DEST_DIR/SlimeVR-mac.dmg"
|
||||
fi
|
||||
|
||||
echo "Collected files:"
|
||||
ls -lh "$DEST_DIR"
|
||||
- name: Upload For Release
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: release-${{ matrix.platform }}-${{ matrix.os }}
|
||||
path: release-out/*
|
||||
|
||||
bundle-android:
|
||||
name: Build Android APK
|
||||
needs: [build-gui-frontend]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Get tags
|
||||
run: git fetch --tags origin --recurse-submodules=no --force
|
||||
- name: Set up JDK 25
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
java-version: '25'
|
||||
distribution: 'temurin'
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v6
|
||||
- name: Download GUI Dist
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: gui-dist
|
||||
- name: Extract GUI for Android
|
||||
run: mkdir -p gui/electron/out && tar -xzf slimevr-gui-dist.tar.gz -C gui/electron/out
|
||||
- name: Build APK
|
||||
run: ./gradlew :server:android:build --build-cache
|
||||
env:
|
||||
SENTRY_SERVER_DSN: ${{ vars.SENTRY_SERVER_DSN }}
|
||||
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
|
||||
ANDROID_STORE_FILE: ${{ secrets.ANDROID_STORE_FILE }}
|
||||
ANDROID_STORE_PASSWD: ${{ secrets.ANDROID_STORE_PASSWD }}
|
||||
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
|
||||
ANDROID_KEY_PASSWD: ${{ secrets.ANDROID_KEY_PASSWD }}
|
||||
- name: Prepare APK
|
||||
run: cp server/android/build/outputs/apk/release/*.apk ./SlimeVR-android.apk
|
||||
- name: Upload APK
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: release-android
|
||||
path: SlimeVR-android.apk
|
||||
|
||||
- name: Build Google Play release bundle
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
run: ./gradlew :server:android:bundleRelease
|
||||
env:
|
||||
SENTRY_SERVER_DSN: ${{ vars.SENTRY_SERVER_DSN }}
|
||||
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
|
||||
ANDROID_STORE_FILE: ${{ secrets.ANDROID_GPLAY_STORE_FILE }}
|
||||
ANDROID_STORE_PASSWD: ${{ secrets.ANDROID_GPLAY_STORE_PASSWD }}
|
||||
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_GPLAY_KEY_ALIAS }}
|
||||
ANDROID_KEY_PASSWD: ${{ secrets.ANDROID_GPLAY_KEY_PASSWD }}
|
||||
|
||||
- name: Upload the Google Play artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
with:
|
||||
# Artifact name
|
||||
name: 'SlimeVR-Android-GPDev' # optional, default is artifact
|
||||
# A file, directory or wildcard pattern that describes what to upload
|
||||
path: server/android/build/outputs/bundle/release/*
|
||||
|
||||
create-release:
|
||||
name: Finalize Release Draft
|
||||
needs: [package-desktop, bundle-android, build-server-jar, build-gui-frontend]
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Download All Release Artifacts
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
pattern: release-*
|
||||
path: release-out
|
||||
merge-multiple: true
|
||||
- name: Download Server Jar
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: server-jar
|
||||
path: server
|
||||
- name: Download GUI Dist
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: gui-dist
|
||||
- name: Create GitHub Release
|
||||
uses: softprops/action-gh-release@v3
|
||||
with:
|
||||
draft: true
|
||||
generate_release_notes: true
|
||||
files: |
|
||||
release-out/*
|
||||
server/desktop/build/libs/slimevr.jar
|
||||
slimevr-gui-dist.tar.gz
|
||||
@@ -12,7 +12,7 @@ jobs:
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
steps:
|
||||
- uses: actions/setup-node@v6
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22.x'
|
||||
|
||||
@@ -20,13 +20,13 @@ jobs:
|
||||
run: |
|
||||
npx @slimevr/update-manifest-generator@latest
|
||||
|
||||
- uses: actions/upload-artifact@v7
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: "update-manifest.json"
|
||||
path: ./update-manifest.json
|
||||
|
||||
- name: Upload update-manifest.json to release
|
||||
uses: softprops/action-gh-release@v3
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
tag_name: ${{ secrets.UPDATE_MANIFEST_RELEASE_TAG }}
|
||||
files: ./update-manifest.json
|
||||
|
||||
@@ -0,0 +1,390 @@
|
||||
# This workflow will build a Java project with Gradle
|
||||
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
|
||||
|
||||
name: SlimeVR Server
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
create:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest, windows-latest]
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Get tags
|
||||
run: git fetch --tags origin --recurse-submodules=no --force
|
||||
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'adopt'
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
|
||||
- run: mkdir ./gui/dist && touch ./gui/dist/somefile
|
||||
shell: bash
|
||||
|
||||
- name: Check code formatting
|
||||
run: ./gradlew spotlessCheck
|
||||
|
||||
- name: Test with Gradle
|
||||
run: ./gradlew test
|
||||
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Get tags
|
||||
run: git fetch --tags origin --recurse-submodules=no --force
|
||||
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'adopt'
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew shadowJar
|
||||
|
||||
- name: Upload the Server JAR as a Build Artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
# Artifact name
|
||||
name: 'SlimeVR-Server' # optional, default is artifact
|
||||
# A file, directory or wildcard pattern that describes what to upload
|
||||
path: server/desktop/build/libs/slimevr.jar
|
||||
|
||||
- name: Upload to draft release
|
||||
uses: softprops/action-gh-release@v2
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
with:
|
||||
draft: true
|
||||
generate_release_notes: true
|
||||
files: |
|
||||
server/desktop/build/libs/slimevr.jar
|
||||
|
||||
bundle-android:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Get tags
|
||||
run: git fetch --tags origin --recurse-submodules=no --force
|
||||
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'adopt'
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
|
||||
- name: Install dependencies
|
||||
run: pnpm i
|
||||
|
||||
- name: Build
|
||||
env:
|
||||
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
|
||||
run: cd gui && pnpm run build
|
||||
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew :server:android:assembleDebug
|
||||
|
||||
- name: Upload the Android Build Artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
# Artifact name
|
||||
name: 'SlimeVR-Android' # optional, default is artifact
|
||||
# A file, directory or wildcard pattern that describes what to upload
|
||||
path: server/android/build/outputs/apk/*
|
||||
|
||||
- name: Prepare for release
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
run: |
|
||||
cp server/android/build/outputs/apk/debug/android-debug.apk ./SlimeVR-android.apk
|
||||
|
||||
- name: Upload to draft release
|
||||
uses: softprops/action-gh-release@v2
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
with:
|
||||
draft: true
|
||||
generate_release_notes: true
|
||||
files: |
|
||||
./SlimeVR-android.apk
|
||||
|
||||
bundle-linux:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest, ubuntu-24.04-arm]
|
||||
runs-on: ${{ matrix.os }}
|
||||
needs: [build, test]
|
||||
if: contains(fromJSON('["workflow_dispatch", "create"]'), github.event_name)
|
||||
|
||||
env:
|
||||
BUILD_ARCH: ${{ endsWith(matrix.os, 'arm') && 'aarch64' || 'amd64' }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: 'SlimeVR-Server'
|
||||
path: server/desktop/build/libs/
|
||||
|
||||
- name: Set up Linux dependencies
|
||||
uses: awalsh128/[email protected]
|
||||
with:
|
||||
packages: |
|
||||
build-essential curl wget file libssl-dev libgtk-3-dev libappindicator3-dev librsvg2-dev
|
||||
# Increment to invalidate the cache
|
||||
version: ${{ format('v1.0-{0}', env.BUILD_ARCH) }}
|
||||
# Enables a workaround to attempt to run pre and post install scripts
|
||||
execute_install_scripts: true
|
||||
# Disables uploading logs as a build artifact
|
||||
debug: false
|
||||
|
||||
- name: Set up specific Linux versioned dependencies
|
||||
run: |
|
||||
sudo apt-get update && sudo apt-get install -y \
|
||||
libwebkit2gtk-4.1-0=2.44.0-2 \
|
||||
libwebkit2gtk-4.1-dev=2.44.0-2 \
|
||||
libjavascriptcoregtk-4.1-0=2.44.0-2 \
|
||||
libjavascriptcoregtk-4.1-dev=2.44.0-2 \
|
||||
gir1.2-javascriptcoregtk-4.1=2.44.0-2 \
|
||||
gir1.2-webkit2-4.1=2.44.0-2;
|
||||
|
||||
- name: Cache cargo dependencies
|
||||
uses: Swatinem/rust-cache@v2
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
|
||||
- name: Install dependencies
|
||||
run: pnpm i
|
||||
|
||||
- name: Build
|
||||
env:
|
||||
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
|
||||
run: pnpm run tauri build --config $( ./gui/scripts/gitversion.mjs )
|
||||
|
||||
- name: Make GUI tarball
|
||||
run: |
|
||||
tar czf slimevr-gui-dist.tar.gz -C gui/dist/ .
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
with:
|
||||
name: SlimeVR-GUI-Dist
|
||||
path: ./slimevr-gui-dist.tar.gz
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ format('SlimeVR-GUI-Deb-{0}', env.BUILD_ARCH) }}
|
||||
path: target/release/bundle/deb/slimevr*.deb
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ format('SlimeVR-GUI-AppImage-{0}', env.BUILD_ARCH) }}
|
||||
path: target/release/bundle/appimage/slimevr*.AppImage
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ format('SlimeVR-GUI-RPM-{0}', env.BUILD_ARCH) }}
|
||||
path: target/release/bundle/rpm/slimevr*.rpm
|
||||
|
||||
- name: Prepare for release
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
run: |
|
||||
cp target/release/bundle/appimage/slimevr*.AppImage "./SlimeVR-$BUILD_ARCH.appimage"
|
||||
cp target/release/bundle/deb/slimevr*.deb "./SlimeVR-$BUILD_ARCH.deb"
|
||||
cp target/release/bundle/rpm/slimevr*.rpm "./SlimeVR-$BUILD_ARCH.rpm"
|
||||
|
||||
- name: Upload to draft release
|
||||
uses: softprops/action-gh-release@v2
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
with:
|
||||
draft: true
|
||||
generate_release_notes: true
|
||||
files: |
|
||||
./slimevr-gui-dist.tar.gz
|
||||
./SlimeVR-*.appimage
|
||||
./SlimeVR-*.deb
|
||||
./SlimeVR-*.rpm
|
||||
|
||||
bundle-mac:
|
||||
runs-on: macos-latest
|
||||
needs: [build, test]
|
||||
if: contains(fromJSON('["workflow_dispatch", "create"]'), github.event_name)
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: 'SlimeVR-Server'
|
||||
path: server/desktop/build/libs/
|
||||
|
||||
- name: Cache cargo dependencies
|
||||
uses: Swatinem/rust-cache@v2
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
rustup target add x86_64-apple-darwin
|
||||
pnpm i
|
||||
|
||||
- name: Build
|
||||
env:
|
||||
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
|
||||
NODE_OPTIONS: --max-old-space-size=4096
|
||||
run: pnpm run tauri build --target universal-apple-darwin --config $( ./gui/scripts/gitversion.mjs )
|
||||
|
||||
- name: Modify Application
|
||||
run: |
|
||||
cd target/universal-apple-darwin/release/bundle/macos/slimevr.app/Contents/MacOS
|
||||
cp $( git rev-parse --show-toplevel )/server/desktop/build/libs/slimevr.jar ./
|
||||
cd ../../../
|
||||
/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName SlimeVR" slimevr.app/Contents/Info.plist
|
||||
/usr/libexec/PlistBuddy -c "Set :CFBundleName SlimeVR" slimevr.app/Contents/Info.plist
|
||||
codesign --sign - --deep --force slimevr.app
|
||||
mv slimevr.app SlimeVR.app
|
||||
cd ../dmg/
|
||||
./bundle_dmg.sh --volname SlimeVR --icon slimevr 180 170 --app-drop-link 480 170 \
|
||||
--window-size 660 400 --hide-extension ../macos/SlimeVR.app \
|
||||
--volicon ../macos/SlimeVR.app/Contents/Resources/icon.icns --skip-jenkins \
|
||||
--eula ../../../../../LICENSE-MIT slimevr.dmg ../macos/SlimeVR.app
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: SlimeVR-GUI-MacApp
|
||||
path: target/universal-apple-darwin/release/bundle/macos/SlimeVR*.app
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: SlimeVR-GUI-MacDmg
|
||||
path: target/universal-apple-darwin/release/bundle/dmg/slimevr.dmg
|
||||
|
||||
- name: Prepare for release
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
run: |
|
||||
cp target/universal-apple-darwin/release/bundle/dmg/slimevr.dmg ./SlimeVR-mac.dmg
|
||||
|
||||
- name: Upload to draft release
|
||||
uses: softprops/action-gh-release@v2
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
with:
|
||||
draft: true
|
||||
generate_release_notes: true
|
||||
files: |
|
||||
./SlimeVR-mac.dmg
|
||||
|
||||
bundle-windows:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [windows-latest, windows-11-arm]
|
||||
runs-on: ${{ matrix.os }}
|
||||
needs: [build, test]
|
||||
if: contains(fromJSON('["workflow_dispatch", "create"]'), github.event_name)
|
||||
|
||||
env:
|
||||
BUILD_ARCH: ${{ endsWith(matrix.os, 'arm') && 'win-aarch64' || 'win64' }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: 'SlimeVR-Server'
|
||||
path: server/desktop/build/libs/
|
||||
|
||||
- if: matrix.os == 'windows-11-arm'
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
cache: false
|
||||
|
||||
- name: Cache cargo dependencies
|
||||
uses: Swatinem/rust-cache@v2
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
|
||||
- name: Install dependencies
|
||||
shell: bash
|
||||
run: pnpm i
|
||||
|
||||
- name: Build
|
||||
shell: bash
|
||||
env:
|
||||
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
|
||||
run: pnpm run skipbundler --config $( ./gui/scripts/gitversion.mjs )
|
||||
|
||||
- name: Bundle to zips
|
||||
shell: bash
|
||||
run: |
|
||||
mkdir SlimeVR
|
||||
cp gui/src-tauri/icons/icon.ico ./SlimeVR/run.ico
|
||||
cp server/desktop/build/libs/slimevr.jar ./SlimeVR/slimevr.jar
|
||||
cp server/core/resources/* ./SlimeVR/
|
||||
cp target/release/slimevr.exe ./SlimeVR/
|
||||
7z a -tzip "SlimeVR-$BUILD_ARCH.zip" ./SlimeVR/
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ format('SlimeVR-GUI-Windows-{0}', env.BUILD_ARCH) }}
|
||||
path: ./SlimeVR*.zip
|
||||
|
||||
- name: Upload to draft release
|
||||
uses: softprops/action-gh-release@v2
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
with:
|
||||
draft: true
|
||||
generate_release_notes: true
|
||||
files: ./SlimeVR-*.zip
|
||||
@@ -0,0 +1,22 @@
|
||||
# This workflow will triage pull requests and apply a label based on the
|
||||
# paths that are modified in the pull request.
|
||||
#
|
||||
# To use this workflow, you will need to set up a .github/labeler.yml
|
||||
# file with configuration. For more information, see:
|
||||
# https://github.com/actions/labeler
|
||||
|
||||
name: Labeler
|
||||
on: [pull_request_target]
|
||||
|
||||
jobs:
|
||||
label:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: read
|
||||
pull-requests: write
|
||||
|
||||
steps:
|
||||
- uses: actions/labeler@v5
|
||||
with:
|
||||
repo-token: "${{ secrets.GITHUB_TOKEN }}"
|
||||
@@ -3,19 +3,22 @@ on:
|
||||
push:
|
||||
branches:
|
||||
- pontoon
|
||||
|
||||
jobs:
|
||||
pull_request:
|
||||
if: ${{ github.repository == 'SlimeVR/SlimeVR-Server' }}
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
pull-requests: write
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: pull-request
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.PONTOON_BOT_KEY }}
|
||||
run: |
|
||||
gh_pr_up() { gh pr create "$@" --label "Area: Translation" --base main || gh pr edit "$@"; }
|
||||
gh_pr_up --title "New Pontoon translations" --body "Please don't squash me 🥺"
|
||||
- uses: repo-sync/pull-request@v2
|
||||
with:
|
||||
destination_branch: "main"
|
||||
pr_title: "New Pontoon translations"
|
||||
pr_body: "Please don't squash me 🥺"
|
||||
pr_label: "Area: Translation"
|
||||
github_token: ${{ secrets.PONTOON_BOT_KEY }}
|
||||
@@ -15,7 +15,7 @@ jobs:
|
||||
contents: write
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: pontoon
|
||||
submodules: recursive
|
||||
|
||||
+4
-21
@@ -4,12 +4,8 @@
|
||||
# Syncthing ignore file
|
||||
.stignore
|
||||
|
||||
# Ignore .idea, except shared project inspection profiles and run configurations
|
||||
.idea/*
|
||||
!.idea/inspectionProfiles/
|
||||
!.idea/inspectionProfiles/*.xml
|
||||
!.idea/runConfigurations/
|
||||
!.idea/runConfigurations/*.xml
|
||||
# Ignore .idea
|
||||
.idea
|
||||
|
||||
# Ignore .fleet
|
||||
.fleet
|
||||
@@ -38,28 +34,15 @@
|
||||
# ignore gradle build folder
|
||||
build/
|
||||
|
||||
# created by clangd for index cache
|
||||
.cache/
|
||||
# Rust build artifacts
|
||||
/target
|
||||
|
||||
# direnv has been claimed for Nix usage
|
||||
.direnv/
|
||||
.devenv
|
||||
|
||||
# Git worktrees
|
||||
.worktree/
|
||||
|
||||
# Ignore Android local properties
|
||||
local.properties
|
||||
|
||||
# Ignore temporary config
|
||||
vrconfig.yml.tmp
|
||||
|
||||
|
||||
# Nixos
|
||||
.bin/
|
||||
|
||||
.env.local
|
||||
|
||||
|
||||
# Fuck claude
|
||||
.claude
|
||||
@@ -1,6 +1,3 @@
|
||||
[submodule "solarxr-protocol"]
|
||||
path = solarxr-protocol
|
||||
url = https://github.com/SlimeVR/SolarXR-Protocol.git
|
||||
[submodule "svr-bindings-provider/openvr"]
|
||||
path = bindings-provider/openvr
|
||||
url = https://github.com/ValveSoftware/openvr.git
|
||||
-6
@@ -1,6 +0,0 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="ConvertLongToDuration" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
</profile>
|
||||
</component>
|
||||
-7
@@ -1,7 +0,0 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<settings>
|
||||
<option name="PROJECT_PROFILE" value="Project Default" />
|
||||
<option name="USE_PROJECT_PROFILE" value="true" />
|
||||
<version value="1.0" />
|
||||
</settings>
|
||||
</component>
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="SlimeVR Desktop" type="JetRunConfigurationType" factoryName="Kotlin">
|
||||
<module name="SlimeVR_Server.server.desktop.main" />
|
||||
<option name="MAIN_CLASS_NAME" value="dev.slimevr.desktop.Main" />
|
||||
<option name="VM_PARAMETERS" value="--enable-native-access=ALL-UNNAMED" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/server/desktop" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
</component>
|
||||
Vendored
+1
@@ -7,6 +7,7 @@
|
||||
"gaborv.flatbuffers",
|
||||
"dbaeumer.vscode-eslint",
|
||||
"esbenp.prettier-vscode",
|
||||
"rust-lang.rust-analyzer",
|
||||
"bradlc.vscode-tailwindcss",
|
||||
"EditorConfig.EditorConfig",
|
||||
"macabeus.vscode-fluent",
|
||||
|
||||
+10
-22
@@ -1,7 +1,5 @@
|
||||
# Contributing to SlimeVR
|
||||
|
||||
Please follow general contribution guidelines: [CONTRIBUTING.md](https://github.com/SlimeVR/.github/blob/main/profile/CONTRIBUTING.md).
|
||||
|
||||
This document describes essential knowledge required to contribute to the SlimeVR Server.
|
||||
|
||||
### Prerequisites
|
||||
@@ -9,6 +7,8 @@ This document describes essential knowledge required to contribute to the SlimeV
|
||||
- [Git](https://git-scm.com/downloads)
|
||||
- [Java v17+](https://adoptium.net/temurin/releases/)
|
||||
- [Node.js v16.9+](https://nodejs.org) (We recommend the use of `nvm` instead of installing Node.js directly)
|
||||
- [Microsoft Edge WebView2](https://developer.microsoft.com/en-us/microsoft-edge/webview2/#download-section) or `webkit2gtk` for Linux
|
||||
- [Rust](https://rustup.rs)
|
||||
|
||||
## Cloning the code
|
||||
First, clone the codebase using git in a terminal in the folder you want.
|
||||
@@ -24,26 +24,21 @@ Now you can open the codebase in [IDEA](https://www.jetbrains.com/idea/download/
|
||||
|
||||
### Java (server)
|
||||
|
||||
Before contributing to the server, read [server/README.md](server/README.md) for an overview of its architecture and design guidelines.
|
||||
|
||||
The Java code is built with `gradle`, a CLI tool that manages java projects and their
|
||||
dependencies.
|
||||
- You can run the server by running `./gradlew :server:desktop:run` in your IDE's terminal.
|
||||
- You can run the server by running `./gradlew run` in your IDE's terminal.
|
||||
- To compile the code, run `./gradlew shadowJar`. The result will
|
||||
be at `server/desktop/build/libs/slimevr.jar` (you can ignore `server.jar`).
|
||||
be at `server/build/libs/slimevr.jar` (you can ignore `server.jar`).
|
||||
|
||||
(Note: Your IDE may be able to do all of the above for you.)
|
||||
|
||||
### Electron (gui)
|
||||
### Tauri (gui)
|
||||
|
||||
- Activate corepack (included with Node.js) via `corepack enable`
|
||||
(might require launching Git Bash as administrator on Windows)
|
||||
- Make sure you're at the root of the repository.
|
||||
- Activate corepack (included with Node.JS) via `corepack enable` (might require administrator permissions)
|
||||
- Run `pnpm i` in your IDE's terminal to download and install dependencies.
|
||||
- To launch the GUI in dev mode, run `pnpm gui`.
|
||||
- If you get an "Electron uninstall" error, run `node .\gui\electron\node_modules\electron\install.js`.
|
||||
- Finally, to compile for production, run `pnpm package:build` under `gui/electron`.
|
||||
The result will be in `gui/dist/artifacts/`. Content will change depending on the platform.
|
||||
- Finally, to compile for production, run `pnpm run tauri build`. The result
|
||||
will be at `target/release/slimevr.exe`.
|
||||
|
||||
## Code style
|
||||
|
||||
@@ -89,10 +84,10 @@ Import the formatting settings defined in `spotless.xml`, like this:
|
||||
Eclipse will only do a subset of the checks in `spotless`, so you may still want to do
|
||||
`./gradlew spotlessApply` if you ever see an error from spotless.
|
||||
|
||||
### Electron (gui)
|
||||
### Tauri (gui)
|
||||
|
||||
We use ESLint and Prettier to format GUI code.
|
||||
- Make sure you're at the root of the repository.
|
||||
- First, go into the GUI's directory with your terminal by running `cd gui`.
|
||||
- To check code formatting, run `pnpm run lint`.
|
||||
- To fix code formatting, run `pnpm run lint:fix` and `pnpm run format`
|
||||
|
||||
@@ -121,10 +116,3 @@ licensed under `GPL-v3`.
|
||||
## Discord
|
||||
We use discord *a lot* to coordinate and discuss development. Come join us at
|
||||
https://discord.gg/SlimeVR!
|
||||
|
||||
## Use of AI, LLM, and code generation
|
||||
**Submission of any content directly from AI is strictly forbidden in all SlimeVR repositories**, including code, documentation, translation, images, sounds, etc. Including, but not limited to: vibe-coding, snippets generated by LLM, AI-generated icons, copilot auto-complete, commit descriptions, PR notes, issues texts and comments. If your auto-complete system suggest next word, function name or variable name - it's okay to use, if it suggest a whole code snipped - it's not allowed.
|
||||
|
||||
An exception is using translation tools to communicate with us if you're unable to properly express yourself in English. Please leave a comment that your post was translated and from which language. Submissions of machine translations to repositories are forbidden.
|
||||
|
||||
AI is allowed for things such as research, debugging, and questions, if no output of AI is submitted.
|
||||
Generated
+6401
File diff suppressed because it is too large.
Load diff
+16
@@ -0,0 +1,16 @@
|
||||
[workspace]
|
||||
# Use 2021 edition resolver, better resolves crate features.
|
||||
resolver = "2"
|
||||
|
||||
# A list of all rust crates in the workspace.
|
||||
members = ["gui/src-tauri"]
|
||||
|
||||
# These settings can be inherited by workspace members
|
||||
[workspace.package]
|
||||
edition = "2021"
|
||||
license = "MIT OR Apache-2.0"
|
||||
rust-version = "1.75" # Tauri's MSRV
|
||||
repository = "https://github.com/SlimeVR/SlimeVR-Server"
|
||||
|
||||
[profile.release]
|
||||
lto = "thin"
|
||||
@@ -22,8 +22,6 @@ Latest setup instructions are [in our docs](https://docs.slimevr.dev/server/inde
|
||||
## Building & Contributing
|
||||
For information on building and contributing to the codebase, see [CONTRIBUTING.md](CONTRIBUTING.md).
|
||||
|
||||
For an overview of the server architecture and design guidelines, see [server/README.md](server/README.md).
|
||||
|
||||
## Translating
|
||||
|
||||
Translation is done via Pontoon at [i18n.slimevr.dev](https://i18n.slimevr.dev/). Please join our [Discord translation forum](https://discord.com/channels/817184208525983775/1050413434249949235) to coordinate.
|
||||
@@ -72,6 +70,3 @@ okay with this and that you are authorized to provide the above licenses.
|
||||
[LICENSE-MIT]: LICENSE-MIT
|
||||
[LICENSE-APACHE]: LICENSE-APACHE
|
||||
[TRADEMARK]: TRADEMARK.md
|
||||
|
||||
|
||||
*if you read this, u cute*
|
||||
+32
-32
@@ -1,33 +1,33 @@
|
||||
## SlimeVR is a trademark or a registered trademark of SlimeVR B.V.
|
||||
|
||||
**Usage of SlimeVR software, hardware, or other intellectual property in this or other repositories does not grant you the right to use SlimeVR trademark as your own.**
|
||||
|
||||
The purpose of a trademark is to remove uncertainty for users and customers regarding the product's manufacturer or endorsement. You're not allowed to market your product using SlimeVR name, and your usage of the name should be only factual and descriptive. For example, calling original SlimeVR products SlimeVR or describing compatibility of other products or derivatives. This applies to all products, including software, and hardware including non-official Full-Body Trackers.
|
||||
|
||||
**Here are a few _acceptable_ uses of SlimeVR name when selling unofficial Slime trackers:**
|
||||
* SlimeVR-compatible trackers
|
||||
* Unofficial SlimeVR trackers / Non-official SlimeVR trackers
|
||||
* DIY SlimeVR trackers
|
||||
* Third-party SlimeVR Trackers
|
||||
* Custom SlimeVR-compatible trackers
|
||||
* < Your Brand > Slime Trackers
|
||||
* Using "SlimeVR" as a search tag
|
||||
|
||||
**_Unacceptable_ uses include, but are not limited to:**
|
||||
* SlimeVR store
|
||||
* Buy SlimeVR
|
||||
* SlimeVR Trackers
|
||||
* Original SlimeVR
|
||||
* Official SlimeVR
|
||||
* SlimeVR BMI270 (or any other IMU model along with SlimeVR name)
|
||||
* < Your brand > SlimeVR / < your brand > SlimeVR Trackers
|
||||
|
||||
Use of the SlimeVR name that can cause confusion is not allowed in any part of the listing, including, but not limited to: product title, product description, product metadata, site title, site name, site metadata, site texts, social media posts, or other advertisement.
|
||||
|
||||
Also, please ensure you use the correct spelling and capitalization: only **"SlimeVR" is acceptable**. Not "Slimevr", "slimevr", or "Slime VR". You're allowed to use the word "slime" as you wish, it's not a trademark.
|
||||
|
||||
Please understand that we have an obligation to reduce confusion for the customers, and we believe that our usage terms are generous compared to many other companies and products. This applies to all sellers or derivative products, we do not make exceptions.
|
||||
|
||||
---
|
||||
|
||||
## SlimeVR is a trademark or a registered trademark of SlimeVR B.V.
|
||||
|
||||
**Usage of SlimeVR software, hardware, or other intellectual property in this or other repositories does not grant you the right to use SlimeVR trademark as your own.**
|
||||
|
||||
The purpose of a trademark is to remove uncertainty for users and customers regarding the product's manufacturer or endorsement. You're not allowed to market your product using SlimeVR name, and your usage of the name should be only factual and descriptive. For example, calling original SlimeVR products SlimeVR or describing compatibility of other products or derivatives. This applies to all products, including software, and hardware including non-official Full-Body Trackers.
|
||||
|
||||
**Here are a few _acceptable_ uses of SlimeVR name when selling unofficial Slime trackers:**
|
||||
* SlimeVR-compatible trackers
|
||||
* Unofficial SlimeVR trackers / Non-official SlimeVR trackers
|
||||
* DIY SlimeVR trackers
|
||||
* Third-party SlimeVR Trackers
|
||||
* Custom SlimeVR-compatible trackers
|
||||
* < Your Brand > Slime Trackers
|
||||
* Using "SlimeVR" as a search tag
|
||||
|
||||
**_Unacceptable_ uses include, but are not limited to:**
|
||||
* SlimeVR store
|
||||
* Buy SlimeVR
|
||||
* SlimeVR Trackers
|
||||
* Original SlimeVR
|
||||
* Official SlimeVR
|
||||
* SlimeVR BMI270 (or any other IMU model along with SlimeVR name)
|
||||
* < Your brand > SlimeVR / < your brand > SlimeVR Trackers
|
||||
|
||||
Use of the SlimeVR name that can cause confusion is not allowed in any part of the listing, including, but not limited to: product title, product description, product metadata, site title, site name, site metadata, site texts, social media posts, or other advertisement.
|
||||
|
||||
Also, please ensure you use the correct spelling and capitalization: only **"SlimeVR" is acceptable**. Not "Slimevr", "slimevr", or "Slime VR". You're allowed to use the word "slime" as you wish, it's not a trademark.
|
||||
|
||||
Please understand that we have an obligation to reduce confusion for the customers, and we believe that our usage terms are generous compared to many other companies and products. This applies to all sellers or derivative products, we do not make exceptions.
|
||||
|
||||
---
|
||||
|
||||
If you have any questions about SlimeVR trademark or copyrighted materials, you can reach out to us at *tm[at]slimevr.dev*.
|
||||
@@ -1,299 +0,0 @@
|
||||
---
|
||||
Language: Cpp
|
||||
AccessModifierOffset: -4
|
||||
AlignAfterOpenBracket: Align
|
||||
AlignArrayOfStructures: None
|
||||
AlignConsecutiveAssignments:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCompound: false
|
||||
AlignFunctionDeclarations: false
|
||||
AlignFunctionPointers: false
|
||||
PadOperators: true
|
||||
AlignConsecutiveBitFields:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCompound: false
|
||||
AlignFunctionDeclarations: false
|
||||
AlignFunctionPointers: false
|
||||
PadOperators: false
|
||||
AlignConsecutiveDeclarations:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCompound: false
|
||||
AlignFunctionDeclarations: true
|
||||
AlignFunctionPointers: false
|
||||
PadOperators: false
|
||||
AlignConsecutiveMacros:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCompound: false
|
||||
AlignFunctionDeclarations: false
|
||||
AlignFunctionPointers: false
|
||||
PadOperators: false
|
||||
AlignConsecutiveShortCaseStatements:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCaseArrows: false
|
||||
AlignCaseColons: false
|
||||
AlignConsecutiveTableGenBreakingDAGArgColons:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCompound: false
|
||||
AlignFunctionDeclarations: false
|
||||
AlignFunctionPointers: false
|
||||
PadOperators: false
|
||||
AlignConsecutiveTableGenCondOperatorColons:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCompound: false
|
||||
AlignFunctionDeclarations: false
|
||||
AlignFunctionPointers: false
|
||||
PadOperators: false
|
||||
AlignConsecutiveTableGenDefinitionColons:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCompound: false
|
||||
AlignFunctionDeclarations: false
|
||||
AlignFunctionPointers: false
|
||||
PadOperators: false
|
||||
AlignEscapedNewlines: Right
|
||||
AlignOperands: DontAlign
|
||||
AlignTrailingComments:
|
||||
Kind: Always
|
||||
OverEmptyLines: 2
|
||||
AllowAllArgumentsOnNextLine: true
|
||||
AllowAllParametersOfDeclarationOnNextLine: true
|
||||
AllowBreakBeforeNoexceptSpecifier: Never
|
||||
AllowShortBlocksOnASingleLine: Empty
|
||||
AllowShortCaseExpressionOnASingleLine: true
|
||||
AllowShortCaseLabelsOnASingleLine: false
|
||||
AllowShortCompoundRequirementOnASingleLine: true
|
||||
AllowShortEnumsOnASingleLine: true
|
||||
AllowShortFunctionsOnASingleLine: All
|
||||
AllowShortIfStatementsOnASingleLine: Never
|
||||
AllowShortLambdasOnASingleLine: All
|
||||
AllowShortLoopsOnASingleLine: false
|
||||
AllowShortNamespacesOnASingleLine: false
|
||||
AlwaysBreakAfterDefinitionReturnType: None
|
||||
AlwaysBreakBeforeMultilineStrings: false
|
||||
AttributeMacros:
|
||||
- __capability
|
||||
BinPackArguments: true
|
||||
BinPackLongBracedList: true
|
||||
BinPackParameters: BinPack
|
||||
BitFieldColonSpacing: Both
|
||||
BracedInitializerIndentWidth: -1
|
||||
BraceWrapping:
|
||||
AfterCaseLabel: false
|
||||
AfterClass: false
|
||||
AfterControlStatement: Never
|
||||
AfterEnum: false
|
||||
AfterExternBlock: false
|
||||
AfterFunction: true
|
||||
AfterNamespace: false
|
||||
AfterObjCDeclaration: false
|
||||
AfterStruct: false
|
||||
AfterUnion: false
|
||||
BeforeCatch: false
|
||||
BeforeElse: false
|
||||
BeforeLambdaBody: false
|
||||
BeforeWhile: false
|
||||
IndentBraces: false
|
||||
SplitEmptyFunction: true
|
||||
SplitEmptyRecord: true
|
||||
SplitEmptyNamespace: true
|
||||
BreakAdjacentStringLiterals: true
|
||||
BreakAfterAttributes: Leave
|
||||
BreakAfterJavaFieldAnnotations: false
|
||||
BreakAfterReturnType: None
|
||||
BreakArrays: true
|
||||
BreakBeforeBinaryOperators: All
|
||||
BreakBeforeConceptDeclarations: Always
|
||||
BreakBeforeBraces: Attach
|
||||
BreakBeforeInlineASMColon: OnlyMultiline
|
||||
BreakBeforeTemplateCloser: false
|
||||
BreakBeforeTernaryOperators: true
|
||||
BreakBinaryOperations: Never
|
||||
BreakConstructorInitializers: BeforeComma
|
||||
BreakFunctionDefinitionParameters: false
|
||||
BreakInheritanceList: BeforeColon
|
||||
BreakStringLiterals: true
|
||||
BreakTemplateDeclarations: MultiLine
|
||||
ColumnLimit: 0
|
||||
CommentPragmas: '^ IWYU pragma:'
|
||||
CompactNamespaces: false
|
||||
ConstructorInitializerIndentWidth: 4
|
||||
ContinuationIndentWidth: 4
|
||||
Cpp11BracedListStyle: false
|
||||
DerivePointerAlignment: false
|
||||
DisableFormat: false
|
||||
EmptyLineAfterAccessModifier: Never
|
||||
EmptyLineBeforeAccessModifier: LogicalBlock
|
||||
EnumTrailingComma: Leave
|
||||
ExperimentalAutoDetectBinPacking: false
|
||||
FixNamespaceComments: true
|
||||
ForEachMacros:
|
||||
- foreach
|
||||
- Q_FOREACH
|
||||
- BOOST_FOREACH
|
||||
IfMacros:
|
||||
- KJ_IF_MAYBE
|
||||
IncludeBlocks: Preserve
|
||||
IncludeCategories:
|
||||
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
|
||||
Priority: 2
|
||||
SortPriority: 0
|
||||
CaseSensitive: false
|
||||
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
|
||||
Priority: 3
|
||||
SortPriority: 0
|
||||
CaseSensitive: false
|
||||
- Regex: '.*'
|
||||
Priority: 1
|
||||
SortPriority: 0
|
||||
CaseSensitive: false
|
||||
IncludeIsMainRegex: '(Test)?$'
|
||||
IncludeIsMainSourceRegex: ''
|
||||
IndentAccessModifiers: false
|
||||
IndentCaseBlocks: false
|
||||
IndentCaseLabels: false
|
||||
IndentExportBlock: true
|
||||
IndentExternBlock: AfterExternBlock
|
||||
IndentGotoLabels: true
|
||||
IndentPPDirectives: None
|
||||
IndentRequiresClause: true
|
||||
IndentWidth: 4
|
||||
IndentWrappedFunctionNames: false
|
||||
InsertBraces: false
|
||||
InsertNewlineAtEOF: false
|
||||
InsertTrailingCommas: None
|
||||
IntegerLiteralSeparator:
|
||||
Binary: 0
|
||||
BinaryMinDigits: 0
|
||||
Decimal: 0
|
||||
DecimalMinDigits: 0
|
||||
Hex: 0
|
||||
HexMinDigits: 0
|
||||
JavaScriptQuotes: Leave
|
||||
JavaScriptWrapImports: true
|
||||
KeepEmptyLines:
|
||||
AtEndOfFile: false
|
||||
AtStartOfBlock: true
|
||||
AtStartOfFile: true
|
||||
KeepFormFeed: false
|
||||
LambdaBodyIndentation: Signature
|
||||
LineEnding: DeriveLF
|
||||
MacroBlockBegin: ''
|
||||
MacroBlockEnd: ''
|
||||
MainIncludeChar: Quote
|
||||
MaxEmptyLinesToKeep: 1
|
||||
NamespaceIndentation: Inner
|
||||
ObjCBinPackProtocolList: Auto
|
||||
ObjCBlockIndentWidth: 4
|
||||
ObjCBreakBeforeNestedBlockParam: true
|
||||
ObjCSpaceAfterProperty: true
|
||||
ObjCSpaceBeforeProtocolList: true
|
||||
OneLineFormatOffRegex: ''
|
||||
PackConstructorInitializers: BinPack
|
||||
PenaltyBreakAssignment: 2
|
||||
PenaltyBreakBeforeFirstCallParameter: 19
|
||||
PenaltyBreakBeforeMemberAccess: 150
|
||||
PenaltyBreakComment: 300
|
||||
PenaltyBreakFirstLessLess: 120
|
||||
PenaltyBreakOpenParenthesis: 0
|
||||
PenaltyBreakScopeResolution: 500
|
||||
PenaltyBreakString: 1000
|
||||
PenaltyBreakTemplateDeclaration: 10
|
||||
PenaltyExcessCharacter: 1000000
|
||||
PenaltyIndentedWhitespace: 0
|
||||
PenaltyReturnTypeOnItsOwnLine: 60
|
||||
PointerAlignment: Left
|
||||
PPIndentWidth: -1
|
||||
QualifierAlignment: Leave
|
||||
ReferenceAlignment: Pointer
|
||||
ReflowComments: Always
|
||||
RemoveBracesLLVM: false
|
||||
RemoveEmptyLinesInUnwrappedLines: true
|
||||
RemoveParentheses: Leave
|
||||
RemoveSemicolon: false
|
||||
RequiresClausePosition: OwnLine
|
||||
RequiresExpressionIndentation: OuterScope
|
||||
SeparateDefinitionBlocks: Leave
|
||||
ShortNamespaceLines: 1
|
||||
SkipMacroDefinitionBody: false
|
||||
SortIncludes:
|
||||
Enabled: true
|
||||
IgnoreCase: false
|
||||
SortJavaStaticImport: Before
|
||||
SortUsingDeclarations: LexicographicNumeric
|
||||
SpaceAfterCStyleCast: false
|
||||
SpaceAfterLogicalNot: false
|
||||
SpaceAfterOperatorKeyword: false
|
||||
SpaceAfterTemplateKeyword: true
|
||||
SpaceAroundPointerQualifiers: Default
|
||||
SpaceBeforeAssignmentOperators: true
|
||||
SpaceBeforeCaseColon: false
|
||||
SpaceBeforeCpp11BracedList: false
|
||||
SpaceBeforeCtorInitializerColon: true
|
||||
SpaceBeforeInheritanceColon: true
|
||||
SpaceBeforeJsonColon: false
|
||||
SpaceBeforeParens: ControlStatements
|
||||
SpaceBeforeParensOptions:
|
||||
AfterControlStatements: true
|
||||
AfterForeachMacros: true
|
||||
AfterFunctionDefinitionName: false
|
||||
AfterFunctionDeclarationName: false
|
||||
AfterIfMacros: true
|
||||
AfterNot: false
|
||||
AfterOverloadedOperator: false
|
||||
AfterPlacementOperator: true
|
||||
AfterRequiresInClause: false
|
||||
AfterRequiresInExpression: false
|
||||
BeforeNonEmptyParentheses: false
|
||||
SpaceBeforeRangeBasedForLoopColon: true
|
||||
SpaceBeforeSquareBrackets: false
|
||||
SpaceInEmptyBlock: true
|
||||
SpacesBeforeTrailingComments: 1
|
||||
SpacesInAngles: Never
|
||||
SpacesInContainerLiterals: true
|
||||
SpacesInLineCommentPrefix:
|
||||
Minimum: 1
|
||||
Maximum: -1
|
||||
SpacesInParens: Never
|
||||
SpacesInParensOptions:
|
||||
ExceptDoubleParentheses: false
|
||||
InCStyleCasts: false
|
||||
InConditionalStatements: false
|
||||
InEmptyParentheses: false
|
||||
Other: false
|
||||
SpacesInSquareBrackets: false
|
||||
Standard: Latest
|
||||
StatementAttributeLikeMacros:
|
||||
- Q_EMIT
|
||||
StatementMacros:
|
||||
- Q_UNUSED
|
||||
- QT_REQUIRE_VERSION
|
||||
TableGenBreakInsideDAGArg: DontBreak
|
||||
TabWidth: 8
|
||||
UseTab: Never
|
||||
VerilogBreakBetweenInstancePorts: true
|
||||
WhitespaceSensitiveMacros:
|
||||
- BOOST_PP_STRINGIZE
|
||||
- CF_SWIFT_NAME
|
||||
- NS_SWIFT_NAME
|
||||
- PP_STRINGIZE
|
||||
- STRINGIZE
|
||||
WrapNamespaceBodyWithEmptyLines: Leave
|
||||
---
|
||||
Language: Proto
|
||||
DisableFormat: true
|
||||
...
|
||||
@@ -1,12 +0,0 @@
|
||||
# Garbage left behind on Windows
|
||||
|
||||
.vs/
|
||||
out/
|
||||
CMakeFiles/
|
||||
vcpkg_installed/
|
||||
src/resources/resources.hpp
|
||||
CMakeCache.txt
|
||||
build.ninja
|
||||
*.cmake
|
||||
*.dll
|
||||
*.log
|
||||
@@ -1,82 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.26)
|
||||
|
||||
project(SlimeVR-Bindings-Provider)
|
||||
|
||||
set(SOLARXR_PROTOCOL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../solarxr-protocol")
|
||||
set(FLATBUFFERS_GENERATED_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../solarxr-protocol/protocol/cpp")
|
||||
|
||||
# These are used to determine the OpenVR library path
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
set(PROCESSOR_ARCH "64")
|
||||
else()
|
||||
set(PROCESSOR_ARCH "32")
|
||||
endif()
|
||||
if(WIN32)
|
||||
set(OPENVR_LIBRARY_NAME "openvr_api")
|
||||
set(OPENVR_LIBRARY_EXT "dll")
|
||||
set(PLATFORM_NAME "win")
|
||||
elseif(APPLE)
|
||||
set(OPENVR_LIBRARY_NAME "libopenvr_api")
|
||||
set(OPENVR_LIBRARY_EXT "dylib")
|
||||
set(PLATFORM_NAME "osx")
|
||||
elseif(LINUX)
|
||||
set(OPENVR_LIBRARY_NAME "libopenvr_api")
|
||||
set(OPENVR_LIBRARY_EXT "so")
|
||||
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
|
||||
set(PLATFORM_NAME "linuxarm")
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
|
||||
set(PLATFORM_NAME "linux")
|
||||
else()
|
||||
message(FATAL_ERROR "Unknown/unsupported CPU architecture")
|
||||
endif()
|
||||
else()
|
||||
message(FATAL_ERROR "Unknown/unsupported platform")
|
||||
endif()
|
||||
|
||||
set(OPENVR_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/openvr")
|
||||
|
||||
message(STATUS "OpenVR library search path: ${OPENVR_ROOT}/lib/${PLATFORM_NAME}${PROCESSOR_ARCH}")
|
||||
find_library(OPENVR_LIBRARY NAMES openvr_api REQUIRED PATHS "${OPENVR_ROOT}/lib/${PLATFORM_NAME}${PROCESSOR_ARCH}/" NO_DEFAULT_PATH)
|
||||
message(STATUS "Found OpenVR library at: ${OPENVR_LIBRARY}")
|
||||
|
||||
add_executable("${PROJECT_NAME}"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/src/paths.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/src/logger.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/src/bridge/BridgeClient.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/src/bridge/BridgeTransport.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/src/vr_utils.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp"
|
||||
)
|
||||
set_target_properties("${PROJECT_NAME}" PROPERTIES CXX_STANDARD 23)
|
||||
target_include_directories("${PROJECT_NAME}" PRIVATE "${SOLARXR_PROTOCOL_ROOT}/lib/flatbuffers/include" "${SOLARXR_PROTOCOL_ROOT}/lib/flatbuffers/" "${FLATBUFFERS_GENERATED_ROOT}/include" "${CMAKE_CURRENT_SOURCE_DIR}/include" "${OPENVR_ROOT}/headers")
|
||||
target_link_libraries("${PROJECT_NAME}" PRIVATE "${OPENVR_LIBRARY}")
|
||||
if(WIN32)
|
||||
target_link_libraries("${PROJECT_NAME}" PRIVATE ws2_32)
|
||||
endif()
|
||||
|
||||
if(LINUX)
|
||||
set_target_properties("${PROJECT_NAME}" PROPERTIES OUTPUT_NAME slimevr-bindings-provider)
|
||||
endif()
|
||||
|
||||
set(OPENVR_RUNTIME_LIBRARY "${OPENVR_ROOT}/bin/${PLATFORM_NAME}${PROCESSOR_ARCH}/${OPENVR_LIBRARY_NAME}.${OPENVR_LIBRARY_EXT}")
|
||||
message(STATUS "Found OpenVR runtime library: ${OPENVR_RUNTIME_LIBRARY}")
|
||||
configure_file("${OPENVR_RUNTIME_LIBRARY}" "${CMAKE_CURRENT_BINARY_DIR}/." COPYONLY)
|
||||
|
||||
# Embed the resources into resources.hpp
|
||||
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
|
||||
src/resources/manifest.vrmanifest
|
||||
src/resources/action_manifest.json
|
||||
src/resources/generic.json
|
||||
src/resources/knuckles.json
|
||||
src/resources/oculus_touch.json
|
||||
src/resources/vive_controller.json
|
||||
)
|
||||
file(STRINGS src/resources/manifest.vrmanifest SVR_VRAPP_MANIFEST NEWLINE_CONSUME)
|
||||
file(STRINGS src/resources/action_manifest.json SVR_VRAPP_ACTION_MANIFEST NEWLINE_CONSUME)
|
||||
file(STRINGS src/resources/generic.json SVR_VRAPP_GENERIC_BINDS NEWLINE_CONSUME)
|
||||
file(STRINGS src/resources/knuckles.json SVR_VRAPP_KNUCKLES_BINDS NEWLINE_CONSUME)
|
||||
file(STRINGS src/resources/oculus_touch.json SVR_VRAPP_OCULUS_BINDS NEWLINE_CONSUME)
|
||||
file(STRINGS src/resources/vive_controller.json SVR_VRAPP_VIVE_BINDS NEWLINE_CONSUME)
|
||||
|
||||
configure_file(src/resources/resources.hpp.in src/resources/resources.hpp @ONLY)
|
||||
target_include_directories("${PROJECT_NAME}" PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/src")
|
||||
@@ -1,12 +0,0 @@
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
if ((Get-Command "clang-format" -ErrorAction SilentlyContinue) -eq $null) {
|
||||
$errorObj = New-Object System.IO.FileNotFoundException("clang-format is not installed, please install clang-format via your package manager (e.g. winget/chocolatey/scoop) and re-run the script")
|
||||
throw $errorObj
|
||||
}
|
||||
|
||||
$SourceFiles = Get-ChildItem -Path '.\src\' -Recurse -Include "*.cpp","*.hpp"
|
||||
foreach ($file in $SourceFiles) {
|
||||
Write-Output "Formatting $(Resolve-Path -Relative $file.FullName)"
|
||||
clang-format -i "$($file.FullName)"
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
#!/bin/bash
|
||||
if ! command -v clang-format >/dev/null 2>&1; then
|
||||
echo "clang-format is not installed, please install clang-format via your package manager (e.g. pacman/apt/dnf/winget) and re-run the script" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
find src/ \( \
|
||||
-iname '*.cpp' \
|
||||
-or -iname '*.hpp' \
|
||||
\) \
|
||||
-exec echo Formatting {} \; \
|
||||
-exec clang-format -i {} \;
|
||||
Submodule bindings-provider/openvr deleted from 9182530513.
@@ -1,52 +0,0 @@
|
||||
// SPDX-License-Identifier: MIT OR Apache-2.0
|
||||
// SPDX-FileCopyrightText: (c) 2026 Eiren Rain and SlimeVR Contributors
|
||||
#include "BridgeClient.hpp"
|
||||
#include "BridgeTransport.hpp"
|
||||
|
||||
#include <system_error>
|
||||
|
||||
using namespace std::literals::chrono_literals;
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
void BridgeClient::CreateConnection() {
|
||||
fs::path path = GetSocketPath();
|
||||
|
||||
Socket fd = socket(AF_UNIX, SOCK_STREAM, 0);
|
||||
if (fd == InvalidSocket) {
|
||||
int err = GetLastSocketError();
|
||||
throw std::system_error(err, std::system_category(), "socket() failed");
|
||||
}
|
||||
|
||||
if (last_path_ != path) {
|
||||
Logger::Get().Info("Trying to connect to socket {}", path.string());
|
||||
last_path_ = path;
|
||||
}
|
||||
|
||||
struct sockaddr_un addr{
|
||||
.sun_family = AF_UNIX,
|
||||
};
|
||||
|
||||
const std::u8string path_str = path.u8string();
|
||||
if (path_str.size() > std::size(addr.sun_path) - 1) {
|
||||
CloseSocket(fd);
|
||||
throw std::runtime_error("Socket path too long to fit in sun_path");
|
||||
}
|
||||
memcpy(addr.sun_path, path_str.data(), path_str.size() + 1);
|
||||
|
||||
int ret = connect(fd, reinterpret_cast<const struct sockaddr*>(&addr), sizeof(addr));
|
||||
if (ret == SocketError) {
|
||||
int err = GetLastSocketError();
|
||||
CloseSocket(fd);
|
||||
throw std::system_error(err, std::system_category(), "connect() failed");
|
||||
}
|
||||
|
||||
Logger::Get().Info("Connected to {}", path.string());
|
||||
|
||||
ret = SetNonBlocking(fd);
|
||||
if (ret == SocketError) {
|
||||
int err = GetLastSocketError();
|
||||
Logger::Get().Warning("Failed to set socket into non-blocking mode: {}", std::error_code(err, std::system_category()).message());
|
||||
}
|
||||
|
||||
fd_ = fd;
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
// SPDX-License-Identifier: MIT OR Apache-2.0
|
||||
// SPDX-FileCopyrightText: (c) 2026 Eiren Rain and SlimeVR Contributors
|
||||
#pragma once
|
||||
|
||||
#include "BridgeTransport.hpp"
|
||||
|
||||
/**
|
||||
* @brief Client implementation of @ref BridgeTransport for communication with SlimeVR Server using unix sockets.
|
||||
*
|
||||
* @copydoc BridgeTransport
|
||||
*/
|
||||
class BridgeClient : public BridgeTransport {
|
||||
public:
|
||||
using BridgeTransport::BridgeTransport;
|
||||
|
||||
private:
|
||||
void CreateConnection() override;
|
||||
|
||||
std::filesystem::path last_path_;
|
||||
};
|
||||
@@ -1,234 +0,0 @@
|
||||
// SPDX-License-Identifier: MIT OR Apache-2.0
|
||||
// SPDX-FileCopyrightText: (c) 2026 Eiren Rain and SlimeVR Contributors
|
||||
#include "BridgeTransport.hpp"
|
||||
#include "Endianness.hpp"
|
||||
|
||||
#include <solarxr_protocol/generated/all_generated.h>
|
||||
#include <system_error>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <winerror.h>
|
||||
#endif
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
#define UNIX_XDG_DATA_HOME_DEFAULT ".local/share/"
|
||||
#define SLIMEVR_IDENTIFIER "dev.slimevr.SlimeVR"
|
||||
#define UNIX_DEFAULT_TMP_DIR "/tmp"
|
||||
#define SOCKET_NAME "SlimeVRRpc"
|
||||
|
||||
void BridgeTransport::Stop() {
|
||||
if (!thread_.joinable() && !reconnect_thread_.joinable())
|
||||
return;
|
||||
Logger::Get().Info("Bridge stopping");
|
||||
StopAsync();
|
||||
thread_ = std::jthread();
|
||||
reconnect_thread_ = std::jthread();
|
||||
}
|
||||
|
||||
void BridgeTransport::StopAsync() {
|
||||
thread_.request_stop();
|
||||
reconnect_thread_.request_stop();
|
||||
cv_.notify_all();
|
||||
}
|
||||
|
||||
fs::path BridgeTransport::GetSocketPath() {
|
||||
std::vector<fs::path> paths = {};
|
||||
|
||||
if (const char* dir_override = std::getenv("SLIMEVR_SOCKET_DIR")) {
|
||||
paths.push_back(fs::path(dir_override) / SOCKET_NAME);
|
||||
}
|
||||
|
||||
#ifndef _WIN32
|
||||
if (const char* xdg_runtime = std::getenv("XDG_RUNTIME_DIR")) {
|
||||
paths.push_back(fs::path(xdg_runtime) / SOCKET_NAME);
|
||||
}
|
||||
|
||||
if (const char* xdg_data = std::getenv("XDG_DATA_HOME")) {
|
||||
paths.push_back(fs::path(xdg_data) / SLIMEVR_IDENTIFIER / SOCKET_NAME);
|
||||
}
|
||||
|
||||
if (const char* home = std::getenv("HOME")) {
|
||||
paths.push_back(fs::path(home) / UNIX_XDG_DATA_HOME_DEFAULT / SLIMEVR_IDENTIFIER / SOCKET_NAME);
|
||||
}
|
||||
#endif
|
||||
|
||||
std::error_code ec;
|
||||
for (auto path : paths) {
|
||||
if (fs::exists(path, ec)
|
||||
#ifdef _WIN32
|
||||
|| ec.value() == ERROR_CANT_ACCESS_FILE // Windows moment???
|
||||
#endif
|
||||
) {
|
||||
return path;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
// This should work as long as the user's machine does not have
|
||||
// the java.io.tmpdir system property overriden.
|
||||
WCHAR tmp_dir[MAX_PATH + 1];
|
||||
GetTempPathW(std::size(tmp_dir), tmp_dir);
|
||||
return fs::path(tmp_dir) / SOCKET_NAME;
|
||||
#else
|
||||
if (const char* tmp_dir = std::getenv("TMPDIR")) {
|
||||
return fs::path(tmp_dir) / SOCKET_NAME;
|
||||
} else {
|
||||
return fs::path(UNIX_DEFAULT_TMP_DIR) / SOCKET_NAME;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void BridgeTransport::OnRecv(std::span<uint8_t> event) {
|
||||
if (!message_callback_)
|
||||
return;
|
||||
|
||||
auto bundle = flatbuffers::GetRoot<solarxr_protocol::MessageBundle>(event.data());
|
||||
|
||||
if (auto data_feed_msgs = bundle->data_feed_msgs()) {
|
||||
for (auto msg : *data_feed_msgs) {
|
||||
// Logger::Get().Debug("Got message DataFeedMessage::{}", EnumNameDataFeedMessage(msg->message_type()));
|
||||
message_callback_(msg);
|
||||
}
|
||||
}
|
||||
if (auto rpc_msgs = bundle->rpc_msgs()) {
|
||||
for (auto msg : *rpc_msgs) {
|
||||
Logger::Get().Debug("Got message RpcMessage::{}", EnumNameRpcMessage(msg->message_type()));
|
||||
message_callback_(msg);
|
||||
}
|
||||
}
|
||||
if (auto driver_msgs = bundle->driver_msgs()) {
|
||||
for (auto msg : *driver_msgs) {
|
||||
// Logger::Get().Debug("Got message DriverMessage::{}", EnumNameDriverMessage(msg->message_type()));
|
||||
message_callback_(msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void BridgeTransport::Start() {
|
||||
thread_ = std::jthread([this](std::stop_token stop) { return RunThread(stop); });
|
||||
}
|
||||
|
||||
void BridgeTransport::RunThread(std::stop_token stop) {
|
||||
std::vector<uint8_t> data;
|
||||
data.reserve(0x10000);
|
||||
|
||||
// Kick off connection.
|
||||
ResetConnection();
|
||||
|
||||
while (!stop.stop_requested()) {
|
||||
std::shared_lock fd_lock(fd_mutex_);
|
||||
|
||||
if (fd_ == InvalidSocket) [[unlikely]] {
|
||||
cv_.wait(fd_lock, stop, [this] { return fd_ != InvalidSocket; });
|
||||
if (stop.stop_requested())
|
||||
break;
|
||||
}
|
||||
|
||||
try {
|
||||
ptrdiff_t ret = Poll(fd_, 1ms);
|
||||
if (ret == 0) [[likely]] {
|
||||
// No data on the socket after timeout
|
||||
continue;
|
||||
}
|
||||
|
||||
uint32_t msg_len;
|
||||
ret = ReadFully(fd_, stop, &msg_len, sizeof(msg_len));
|
||||
if (ret == 0) [[unlikely]] {
|
||||
throw std::runtime_error("EOF");
|
||||
}
|
||||
|
||||
msg_len = ConvertEndianness<std::endian::little>(msg_len);
|
||||
// If we get something bigger than this, something's probably up
|
||||
if (msg_len > 0x40000) [[unlikely]] {
|
||||
throw std::runtime_error(std::format("Got too large message ({} bytes)", msg_len));
|
||||
}
|
||||
|
||||
const uint32_t unwrapped_len = msg_len - 4;
|
||||
data.reserve(unwrapped_len);
|
||||
|
||||
ret = ReadFully(fd_, stop, data.data(), unwrapped_len);
|
||||
if (ret == 0) [[unlikely]] {
|
||||
throw std::runtime_error("EOF");
|
||||
}
|
||||
|
||||
OnRecv({ data.data(), unwrapped_len });
|
||||
} catch (Cancelled&) {
|
||||
continue;
|
||||
} catch (std::exception& e) {
|
||||
Logger::Get().Error("Error on socket: {}", e.what());
|
||||
error_callback_(e);
|
||||
fd_lock.unlock();
|
||||
ResetConnection();
|
||||
}
|
||||
}
|
||||
|
||||
CloseConnectionHandles();
|
||||
}
|
||||
|
||||
void BridgeTransport::ResetConnection() {
|
||||
CloseConnectionHandles();
|
||||
|
||||
reconnect_thread_ = std::jthread([this](std::stop_token stop) {
|
||||
while (!stop.stop_requested()) {
|
||||
try {
|
||||
std::unique_lock fd_lock(fd_mutex_);
|
||||
CreateConnection();
|
||||
assert(fd_ != InvalidSocket);
|
||||
|
||||
cv_.notify_all();
|
||||
|
||||
// connect callback may call a function that needs to block on the fd
|
||||
fd_lock.unlock();
|
||||
OnConnect();
|
||||
|
||||
return;
|
||||
} catch (std::system_error& e) {
|
||||
if (last_error_ != e.code()) {
|
||||
Logger::Get().Error("Error when trying to connect: {}", e.what());
|
||||
last_error_ = e.code();
|
||||
}
|
||||
error_callback_(e);
|
||||
} catch (std::exception& e) {
|
||||
Logger::Get().Error("Error when trying to connect: {}", e.what());
|
||||
error_callback_(e);
|
||||
}
|
||||
|
||||
std::this_thread::sleep_for(100ms);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void BridgeTransport::CloseConnectionHandles() {
|
||||
std::unique_lock fd_lock(fd_mutex_);
|
||||
if (fd_ == InvalidSocket)
|
||||
return;
|
||||
|
||||
CloseSocket(fd_);
|
||||
OnDisconnect();
|
||||
fd_ = InvalidSocket;
|
||||
}
|
||||
|
||||
void BridgeTransport::SendMessage(const flatbuffers::FlatBufferBuilder& fbb) {
|
||||
std::shared_lock fd_lock(fd_mutex_);
|
||||
if (fd_ == InvalidSocket) [[unlikely]]
|
||||
return;
|
||||
|
||||
std::lock_guard write_lock(write_mutex_);
|
||||
|
||||
if (fbb.GetSize() + 4 > std::numeric_limits<uint32_t>::max()) [[unlikely]] {
|
||||
Logger::Get().Warning("Skipping send of message (wrapped size larger than 32-bit unsigned integer limit)");
|
||||
return;
|
||||
}
|
||||
|
||||
const uint32_t size = static_cast<uint32_t>(fbb.GetSize());
|
||||
const uint32_t le_wrapped_size = ConvertEndianness<std::endian::little>(size + 4);
|
||||
|
||||
try {
|
||||
WriteFully(fd_, &le_wrapped_size, sizeof(le_wrapped_size));
|
||||
WriteFully(fd_, fbb.GetBufferPointer(), size);
|
||||
} catch (std::exception& e) {
|
||||
Logger::Get().Error("Failed to write message: {}", e.what());
|
||||
}
|
||||
}
|
||||
@@ -1,343 +0,0 @@
|
||||
// SPDX-License-Identifier: MIT OR Apache-2.0
|
||||
// SPDX-FileCopyrightText: (c) 2026 Eiren Rain and SlimeVR Contributors
|
||||
#pragma once
|
||||
|
||||
#include <condition_variable>
|
||||
#include <filesystem>
|
||||
#include <shared_mutex>
|
||||
#include <span>
|
||||
#include <system_error>
|
||||
#include <thread>
|
||||
#include <variant>
|
||||
|
||||
// Needs to be before anything that includes Windows.h to avoid macro clashes
|
||||
#include <solarxr_protocol/generated/all_generated.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define NOMINMAX
|
||||
#include <Winsock2.h>
|
||||
#include <afunix.h>
|
||||
// Microsoft why
|
||||
#undef ERROR
|
||||
#undef SendMessage
|
||||
#else
|
||||
#include <fcntl.h>
|
||||
#include <poll.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
#endif
|
||||
|
||||
#include "../logger.hpp"
|
||||
|
||||
/**
|
||||
* @brief Passes messages between SlimeVR Server and SteamVR Driver using Unix sockets.
|
||||
*
|
||||
* Client or Server connection handling is implemented by extending this class.
|
||||
*
|
||||
* This class provides a set of methods to start, stop an IO thread, and send messages over a Unix socket.
|
||||
*
|
||||
* When a message is received and parsed from the pipe, the on_message_received function passed in the constructor is called
|
||||
* from the bridge thread with the message as a parameter.
|
||||
*
|
||||
* @param logger A shared pointer to an Logger object to log messages from the transport.
|
||||
* @param on_message_received A function to be called from event loop thread when a message is received and parsed from the pipe.
|
||||
* @param on_connect A function to be called when the socket is connected to.
|
||||
* @param on_disconnect A function to be called when the connection is ended.
|
||||
*/
|
||||
class BridgeTransport {
|
||||
public:
|
||||
using MessageHeader = std::variant<const solarxr_protocol::data_feed::DataFeedMessageHeader*, const solarxr_protocol::rpc::RpcMessageHeader*, const solarxr_protocol::driver_protocol::DriverMessageHeader*>;
|
||||
|
||||
#ifdef _WIN32
|
||||
using Socket = SOCKET;
|
||||
constexpr static Socket InvalidSocket = INVALID_SOCKET;
|
||||
constexpr static int SocketError = SOCKET_ERROR;
|
||||
#else
|
||||
using Socket = int;
|
||||
constexpr static Socket InvalidSocket = -1;
|
||||
constexpr static int SocketError = -1;
|
||||
#endif
|
||||
|
||||
static inline int GetLastSocketError() {
|
||||
#ifdef _WIN32
|
||||
return WSAGetLastError();
|
||||
#else
|
||||
return errno;
|
||||
#endif
|
||||
}
|
||||
|
||||
static inline int CloseSocket(Socket fd) {
|
||||
#ifdef _WIN32
|
||||
return closesocket(fd);
|
||||
#else
|
||||
return close(fd);
|
||||
#endif
|
||||
}
|
||||
|
||||
static inline bool IsBlockingError(int err) {
|
||||
#ifdef _WIN32
|
||||
return err == WSAEWOULDBLOCK;
|
||||
#else
|
||||
return err == EAGAIN || err == EWOULDBLOCK;
|
||||
#endif
|
||||
}
|
||||
|
||||
static inline int SetNonBlocking(Socket fd) {
|
||||
#ifdef _WIN32
|
||||
u_long mode = 1;
|
||||
return ioctlsocket(fd, FIONBIO, &mode);
|
||||
#else
|
||||
return fcntl(fd, F_SETFL, O_NONBLOCK);
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Exception thrown when IO is cancelled by stop token.
|
||||
*/
|
||||
class Cancelled : public std::exception {
|
||||
public:
|
||||
Cancelled() noexcept { };
|
||||
~Cancelled() { };
|
||||
|
||||
const char* what() const noexcept override {
|
||||
return "IO operation cancelled";
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief Read @a size bytes from @a fd into @a data, retrying until all data is read or an error occurs.
|
||||
*
|
||||
* @throws @ref Cancelled stop was requested on @a stop
|
||||
* @throws std::system_error error returned on socket
|
||||
* @returns @ref SocketError on fail, otherwise number of bytes read
|
||||
*/
|
||||
static ptrdiff_t ReadFully(Socket fd, std::stop_token stop, void* data, size_t size) {
|
||||
ptrdiff_t ret;
|
||||
size_t received = 0;
|
||||
while (!stop.stop_requested() && received < size) {
|
||||
ret = recv(fd, reinterpret_cast<char*>(data) + received, size - received, 0);
|
||||
if (ret == 0) // EOF
|
||||
return ret;
|
||||
|
||||
if (ret == SocketError) [[unlikely]] {
|
||||
int err = GetLastSocketError();
|
||||
if (IsBlockingError(err)) [[likely]] {
|
||||
// we couldn't read because it would block, just try again
|
||||
continue;
|
||||
} else {
|
||||
throw std::system_error(err, std::system_category(), "recv() failed");
|
||||
}
|
||||
}
|
||||
|
||||
received += ret;
|
||||
}
|
||||
|
||||
if (stop.stop_requested())
|
||||
throw Cancelled();
|
||||
return received;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Write @a size bytes from @a data to @a fd, retrying until all data is written or an error occurs.
|
||||
*
|
||||
* @throws std::system_error error returned on socket
|
||||
*
|
||||
* @returns @ref SocketError on fail, otherwise number of bytes written
|
||||
*/
|
||||
static inline ptrdiff_t WriteFully(Socket fd, const void* data, size_t size) {
|
||||
#ifdef __linux__
|
||||
constexpr int flags = MSG_NOSIGNAL;
|
||||
#else
|
||||
constexpr int flags = 0;
|
||||
#endif
|
||||
|
||||
ptrdiff_t ret;
|
||||
size_t sent = 0;
|
||||
while (sent < size) {
|
||||
ret = send(fd, reinterpret_cast<const char*>(data) + sent, size - sent, flags);
|
||||
if (ret == SocketError) [[unlikely]] {
|
||||
int err = GetLastSocketError();
|
||||
if (IsBlockingError(err)) [[likely]] {
|
||||
// we couldn't write because it would block, just try again
|
||||
continue;
|
||||
} else {
|
||||
throw std::system_error(err, std::system_category(), "send() failed");
|
||||
}
|
||||
}
|
||||
|
||||
sent += ret;
|
||||
}
|
||||
|
||||
return sent;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Wait for input to be ready on @a fd, timing out after @a timeout.
|
||||
*
|
||||
* @param fd file descriptor to poll
|
||||
* @param timeout amount of time to wait before giving up
|
||||
*
|
||||
* @throws std::system_error error returned when polling
|
||||
* @throws std::runtime_error error on socket, or hang up was detected
|
||||
*
|
||||
* @returns @ref 0 if there is no data, positive value if there is data
|
||||
*/
|
||||
template <typename Rep, typename Period>
|
||||
static int Poll(Socket fd, std::chrono::duration<Rep, Period> timeout) noexcept(false) {
|
||||
struct pollfd pollfd{
|
||||
.fd = fd,
|
||||
.events = POLLIN,
|
||||
};
|
||||
|
||||
int ret;
|
||||
|
||||
#ifdef _WIN32
|
||||
ret = WSAPoll(&pollfd, 1, std::chrono::duration_cast<std::chrono::milliseconds>(timeout).count());
|
||||
#else
|
||||
{
|
||||
auto s = std::chrono::duration_cast<std::chrono::seconds>(timeout);
|
||||
auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(timeout - s);
|
||||
struct timespec ts{
|
||||
.tv_sec = s.count(),
|
||||
.tv_nsec = ns.count(),
|
||||
};
|
||||
ret = ppoll(&pollfd, 1, timeout == timeout.zero() ? nullptr : &ts, nullptr);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
constexpr int InterruptedErrno = WSAEINTR;
|
||||
#else
|
||||
constexpr int InterruptedErrno = EINTR;
|
||||
#endif
|
||||
|
||||
if (ret == SocketError) {
|
||||
int err = GetLastSocketError();
|
||||
throw std::system_error(err, std::system_category(), "Poll() failed");
|
||||
}
|
||||
|
||||
if ((pollfd.revents & (POLLERR | POLLHUP)) != 0) {
|
||||
throw std::runtime_error("Socket connection lost");
|
||||
}
|
||||
|
||||
return pollfd.revents & POLLIN;
|
||||
}
|
||||
|
||||
BridgeTransport(std::function<void(MessageHeader&&)> on_message_received = {},
|
||||
std::function<void()> on_connect = {},
|
||||
std::function<void()> on_disconnect = {},
|
||||
std::function<void(std::exception&)> on_error = {})
|
||||
: connect_callback_(on_connect)
|
||||
, message_callback_(on_message_received)
|
||||
, disconnect_callback_(on_disconnect)
|
||||
, error_callback_(on_error) {
|
||||
#ifdef _WIN32
|
||||
WSADATA _ws_data;
|
||||
if (int ret = WSAStartup(MAKEWORD(2, 2), &_ws_data); ret != 0) {
|
||||
Logger::Get().Error("WSAStartup failed with code {}", ret);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
virtual ~BridgeTransport() {
|
||||
Stop();
|
||||
#ifdef _WIN32
|
||||
WSACleanup();
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Starts the channel by creating a thread.
|
||||
*
|
||||
* Connects and automatic reconnects with a timeout are implemented internally.
|
||||
*/
|
||||
void Start();
|
||||
|
||||
/**
|
||||
* @brief Stops the channel by stopping the thread and closing the connection handles.
|
||||
*
|
||||
* Blocks until the thread is stopped and the connection handles are closed.
|
||||
*/
|
||||
void Stop();
|
||||
|
||||
/**
|
||||
* @brief Stops the channel asynchronously and returns immediately.
|
||||
*/
|
||||
void StopAsync();
|
||||
|
||||
/**
|
||||
* @brief Sends a message over the channel, you must Finish() the builder before calling this.
|
||||
*
|
||||
* @param message The message to send.
|
||||
*/
|
||||
void SendMessage(const flatbuffers::FlatBufferBuilder& fbb);
|
||||
|
||||
/**
|
||||
* @brief Checks if the channel is connected.
|
||||
*
|
||||
* @return true if the channel is connected, false otherwise.
|
||||
*/
|
||||
bool IsConnected() const {
|
||||
std::shared_lock fd_lock(fd_mutex_);
|
||||
return fd_ != InvalidSocket;
|
||||
};
|
||||
|
||||
protected:
|
||||
/**
|
||||
* @brief Try to create a connection.
|
||||
*
|
||||
* Called while an exclusive lock is taken on @ref fd_mutex_.
|
||||
* Make sure this doesn't block as it will hold up shutdown.
|
||||
*
|
||||
* @ref fd_ must be initialised if this returns without throwing.
|
||||
*
|
||||
* @throws std::system_error I/O error when creating connection
|
||||
* @throws std::exception failed to create connection
|
||||
*/
|
||||
virtual void CreateConnection() = 0;
|
||||
/**
|
||||
* @brief Close the current socket if it's connected.
|
||||
*
|
||||
* Locks @ref fd_mutex_, do not call this with the mutex locked.
|
||||
*/
|
||||
void ResetConnection();
|
||||
|
||||
/**
|
||||
* @brief Closes the current connection, must be called while an exclusive lock is taken on the mutex.
|
||||
*/
|
||||
void CloseConnectionHandles();
|
||||
|
||||
void OnConnect() {
|
||||
if (connect_callback_)
|
||||
connect_callback_();
|
||||
}
|
||||
void OnRecv(std::span<uint8_t> event);
|
||||
void OnDisconnect() {
|
||||
if (disconnect_callback_)
|
||||
disconnect_callback_();
|
||||
}
|
||||
|
||||
static std::filesystem::path GetSocketPath();
|
||||
|
||||
/// Guards @ref fd_ and the condition variable @ref cv_.
|
||||
mutable std::shared_mutex fd_mutex_;
|
||||
/// Guards write operations.
|
||||
mutable std::mutex write_mutex_;
|
||||
/// Signaled on connection, or when we're exiting.
|
||||
std::condition_variable_any cv_;
|
||||
Socket fd_ = InvalidSocket;
|
||||
|
||||
private:
|
||||
void RunThread(std::stop_token stop);
|
||||
|
||||
std::function<void()> connect_callback_;
|
||||
std::function<void(MessageHeader&&)> message_callback_;
|
||||
std::function<void()> disconnect_callback_;
|
||||
std::function<void(std::exception&)> error_callback_;
|
||||
|
||||
std::jthread thread_;
|
||||
std::jthread reconnect_thread_;
|
||||
std::optional<std::error_code> last_error_;
|
||||
};
|
||||
@@ -1,17 +0,0 @@
|
||||
// SPDX-License-Identifier: MIT OR Apache-2.0
|
||||
// SPDX-FileCopyrightText: (c) 2026 Eiren Rain and SlimeVR Contributors
|
||||
#pragma once
|
||||
|
||||
#include <bit>
|
||||
#include <type_traits>
|
||||
|
||||
template <std::endian Endianness, typename T>
|
||||
requires(std::is_integral_v<T>)
|
||||
inline T ConvertEndianness(T v) {
|
||||
// I don't really care about mixed endianness..
|
||||
if constexpr (std::endian::native == Endianness) {
|
||||
return v;
|
||||
} else {
|
||||
return std::byteswap(v);
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
#include "logger.hpp"
|
||||
#include "paths.hpp"
|
||||
|
||||
#ifdef _WIN32
|
||||
#define WIN32_MEAN_AND_LEAN
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
|
||||
Logger::Logger()
|
||||
: log_stream(Paths::GetLogPath() / "slimevr-bindings-provider.log",
|
||||
std::ios::out | std::ios::app)
|
||||
#ifdef _WIN32
|
||||
, should_log_to_std_streams(GetConsoleWindow() != nullptr)
|
||||
#endif
|
||||
{
|
||||
}
|
||||
|
||||
Logger& Logger::Get() {
|
||||
static Logger logger;
|
||||
return logger;
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <cassert>
|
||||
#include <chrono>
|
||||
#include <format>
|
||||
#include <fstream>
|
||||
#include <iomanip>
|
||||
#include <iostream>
|
||||
|
||||
class Logger {
|
||||
private:
|
||||
std::ofstream log_stream;
|
||||
#ifdef _WIN32
|
||||
bool should_log_to_std_streams;
|
||||
#endif
|
||||
|
||||
template <bool important, typename... Args>
|
||||
void Log(std::string_view suffix, std::format_string<Args...> fmt,
|
||||
Args&&... args) {
|
||||
auto now = std::chrono::system_clock::now();
|
||||
auto time_t = std::chrono::system_clock::to_time_t(now);
|
||||
|
||||
auto s = std::format(fmt, std::forward<Args>(args)...);
|
||||
#ifdef _WIN32
|
||||
if (should_log_to_std_streams) {
|
||||
#endif
|
||||
if constexpr (important)
|
||||
std::cerr << suffix << ' ' << s << '\n';
|
||||
else
|
||||
std::cout << suffix << ' ' << s << '\n';
|
||||
#ifdef _WIN32
|
||||
}
|
||||
#endif
|
||||
|
||||
log_stream << std::put_time(std::localtime(&time_t), "[%F %T]") //
|
||||
<< ' ' << suffix << ' ' << s << '\n';
|
||||
}
|
||||
|
||||
public:
|
||||
Logger();
|
||||
|
||||
template <typename... Args>
|
||||
void Debug(std::format_string<Args...> fmt, Args&&... args) {
|
||||
#ifndef NDEBUG
|
||||
Log<false>("[DEBUG]", fmt, std::forward<Args>(args)...);
|
||||
#endif
|
||||
}
|
||||
|
||||
template <typename... Args>
|
||||
void Info(std::format_string<Args...> fmt, Args&&... args) {
|
||||
Log<false>("[INFO]", fmt, std::forward<Args>(args)...);
|
||||
}
|
||||
|
||||
template <typename... Args>
|
||||
void Warning(std::format_string<Args...> fmt, Args&&... args) {
|
||||
Log<true>("[WARN]", fmt, std::forward<Args>(args)...);
|
||||
}
|
||||
|
||||
template <typename... Args>
|
||||
void Error(std::format_string<Args...> fmt, Args&&... args) {
|
||||
Log<true>("[ERROR]", fmt, std::forward<Args>(args)...);
|
||||
}
|
||||
|
||||
void Flush() {
|
||||
#ifdef _WIN32
|
||||
if (should_log_to_std_streams) {
|
||||
#endif
|
||||
std::cerr.flush();
|
||||
std::cout.flush();
|
||||
#ifdef _WIN32
|
||||
}
|
||||
#endif
|
||||
log_stream.flush();
|
||||
}
|
||||
|
||||
static Logger& Get();
|
||||
};
|
||||
@@ -1,298 +0,0 @@
|
||||
#include <csignal>
|
||||
#include <map>
|
||||
#include <optional>
|
||||
#include <thread>
|
||||
#include <tuple>
|
||||
|
||||
// These must be included before Windows.h because of some macro collisions.
|
||||
#include "flatbuffers/flatbuffers.h"
|
||||
#include "solarxr_protocol/generated/all_generated.h"
|
||||
|
||||
#include "bridge/BridgeClient.hpp"
|
||||
#include "logger.hpp"
|
||||
#include "vr_utils.hpp"
|
||||
|
||||
#include "openvr.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#define WIN32_MEAN_AND_LEAN
|
||||
#define NOMINMAX
|
||||
#include <Windows.h>
|
||||
#else
|
||||
#include <cstdlib>
|
||||
#endif
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
using namespace std::chrono_literals;
|
||||
using namespace solarxr_protocol;
|
||||
|
||||
static void ShutdownVR(vr::IVRSystem* _sys) { vr::VR_Shutdown(); }
|
||||
|
||||
static void OnYawReset(BridgeTransport& conn) {
|
||||
flatbuffers::FlatBufferBuilder fbb;
|
||||
|
||||
auto resetReq = rpc::CreateResetRequest(fbb, rpc::ResetType::YAW, 0, 0.f);
|
||||
auto msgHeader = rpc::CreateRpcMessageHeader(fbb, 0, 0, rpc::RpcMessage::ResetRequest, resetReq.Union());
|
||||
|
||||
auto rpcMsgs = fbb.CreateVector({ msgHeader });
|
||||
auto bundle = CreateMessageBundle(fbb, 0, rpcMsgs);
|
||||
fbb.Finish(bundle);
|
||||
conn.SendMessage(fbb);
|
||||
}
|
||||
static void OnFullReset(BridgeTransport& conn) {
|
||||
flatbuffers::FlatBufferBuilder fbb;
|
||||
|
||||
auto resetReq = rpc::CreateResetRequest(fbb, rpc::ResetType::FULL, 0, 0.f);
|
||||
auto msgHeader = rpc::CreateRpcMessageHeader(fbb, 0, 0, rpc::RpcMessage::ResetRequest, resetReq.Union());
|
||||
|
||||
auto rpcMsgs = fbb.CreateVector({ msgHeader });
|
||||
auto bundle = CreateMessageBundle(fbb, 0, rpcMsgs);
|
||||
fbb.Finish(bundle);
|
||||
conn.SendMessage(fbb);
|
||||
}
|
||||
static void OnMountingCalibration(BridgeTransport& conn) {
|
||||
flatbuffers::FlatBufferBuilder fbb;
|
||||
|
||||
auto resetReq = rpc::CreateResetRequest(fbb, rpc::ResetType::MOUNTING, 0, 0.f);
|
||||
auto msgHeader = rpc::CreateRpcMessageHeader(fbb, 0, 0, rpc::RpcMessage::ResetRequest, resetReq.Union());
|
||||
|
||||
auto rpcMsgs = fbb.CreateVector({ msgHeader });
|
||||
auto bundle = CreateMessageBundle(fbb, 0, rpcMsgs);
|
||||
fbb.Finish(bundle);
|
||||
conn.SendMessage(fbb);
|
||||
}
|
||||
static void OnFeetMountingCalibration(BridgeTransport& conn) {
|
||||
flatbuffers::FlatBufferBuilder fbb;
|
||||
|
||||
auto bodyParts = fbb.CreateVector(
|
||||
{ datatypes::BodyPart::LEFT_FOOT, datatypes::BodyPart::RIGHT_FOOT });
|
||||
auto resetReq = rpc::CreateResetRequest(fbb, rpc::ResetType::MOUNTING, bodyParts, 0.f);
|
||||
auto msgHeader = rpc::CreateRpcMessageHeader(fbb, 0, 0, rpc::RpcMessage::ResetRequest, resetReq.Union());
|
||||
|
||||
auto rpcMsgs = fbb.CreateVector({ msgHeader });
|
||||
auto bundle = CreateMessageBundle(fbb, 0, rpcMsgs);
|
||||
fbb.Finish(bundle);
|
||||
conn.SendMessage(fbb);
|
||||
}
|
||||
static void OnToggleTracking(BridgeTransport& conn) {
|
||||
static bool shouldPause = false;
|
||||
flatbuffers::FlatBufferBuilder fbb;
|
||||
|
||||
shouldPause = !shouldPause;
|
||||
auto toggleReq = rpc::CreateSetPauseTrackingRequest(fbb, shouldPause);
|
||||
auto msgHeader = rpc::CreateRpcMessageHeader(fbb, 0, 0, rpc::RpcMessage::SetPauseTrackingRequest, toggleReq.Union());
|
||||
|
||||
auto rpcMsgs = fbb.CreateVector({ msgHeader });
|
||||
auto bundle = CreateMessageBundle(fbb, 0, rpcMsgs);
|
||||
fbb.Finish(bundle);
|
||||
conn.SendMessage(fbb);
|
||||
}
|
||||
|
||||
sig_atomic_t should_exit = 0;
|
||||
|
||||
static void OnSignal(int signal) {
|
||||
Logger::Get().Info("Received signal {}", signal);
|
||||
should_exit = 1;
|
||||
}
|
||||
|
||||
int main() {
|
||||
auto& logger = Logger::Get();
|
||||
|
||||
// Steam and SteamVR respectively set these environment variables on applications that
|
||||
// they spawn, which the SteamVR client library (vrclient) will then use as the
|
||||
// application key when initiating the connection with vrserver. This may not
|
||||
// be ideal if we are launched by another Steam or OpenVR application, as we will inherit
|
||||
// their app key through the environment, which means SteamVR will load the wrong bindings.
|
||||
// A real-world example of this is if someone uses an application such as OpenVR-Autostarter
|
||||
// to start the SlimeVR Server. OpenVR-Autostarter installs an application manifest with the
|
||||
// app key "dreiekk.openvr-autostarter", so when it starts SlimeVR Server, which then starts us,
|
||||
// the STEAMVR_APPKEY="dreiekk.openvr-autostarter" environment variable will be set.
|
||||
//
|
||||
// We want SteamVR to use the appkey of the Steam version of our application if possible.
|
||||
// Unfortunately, we cannot install an application vrmanifest to force the app key,
|
||||
// as SteamVR requires a binary path in the manifest to consider it valid. We do not want to install
|
||||
// a manifest with a binary path because we want the SlimeVR Server to start us when the
|
||||
// driver initiates a connection, rather than getting auto-started by SteamVR.
|
||||
//
|
||||
// This is not documented anywhere publicly, see CVRClient::SendConnectMessage in vrclient instead.
|
||||
|
||||
constexpr const char* STEAM_APPID = "3245490";
|
||||
constexpr const char* STEAMVR_APPKEY = "steam.overlay.3245490";
|
||||
|
||||
#ifdef _WIN32
|
||||
SetEnvironmentVariableA("SteamAppId", STEAM_APPID);
|
||||
SetEnvironmentVariableA("STEAMVR_APPKEY", STEAMVR_APPKEY);
|
||||
#else
|
||||
setenv("SteamAppId", STEAM_APPID, 1);
|
||||
setenv("STEAMVR_APPKEY", STEAMVR_APPKEY, 1);
|
||||
#endif
|
||||
|
||||
try {
|
||||
BridgeClient conn(nullptr, nullptr, [] { should_exit = 1; }, [](std::exception&) { should_exit = 1; });
|
||||
conn.Start();
|
||||
|
||||
std::unique_ptr<vr::IVRSystem, decltype(&ShutdownVR)> sys{ nullptr, ShutdownVR };
|
||||
|
||||
// On vrlink, VR_Init returns
|
||||
// VRInitError_Driver_WirelessHmdNotConnected while the connection
|
||||
// is initialising, so keep calling VR_Init until it ends up
|
||||
// succeeding
|
||||
|
||||
vr::EVRInitError err{ vr::VRInitError_Driver_WirelessHmdNotConnected };
|
||||
while (err == vr::VRInitError_Driver_WirelessHmdNotConnected) {
|
||||
sys.reset(vr::VR_Init(&err, vr::VRApplication_Background));
|
||||
if (err == vr::VRInitError_Driver_WirelessHmdNotConnected)
|
||||
std::this_thread::sleep_for(500ms);
|
||||
}
|
||||
|
||||
if (sys == nullptr or err != vr::VRInitError_None) {
|
||||
logger.Error("Failed to init OpenVR: {} ({})",
|
||||
vr::VR_GetVRInitErrorAsSymbol(err),
|
||||
vr::VR_GetVRInitErrorAsEnglishDescription(err));
|
||||
return 1;
|
||||
}
|
||||
|
||||
logger.Info("Initialised OpenVR, HMD model '{}'", VRUtils::GetStringProp(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_ModelNumber_String).value_or("<unknown>"));
|
||||
|
||||
vr::IVRApplications* app = vr::VRApplications();
|
||||
vr::IVRInput* input = vr::VRInput();
|
||||
|
||||
fs::path actionManifestPath;
|
||||
std::tie(std::ignore, actionManifestPath) = VRUtils::InitialiseManifests();
|
||||
|
||||
// We don't want our app key to randomly change if SteamVR decides to honour
|
||||
// application manifests with no binary path. Instead let it generate an
|
||||
// app key based on the executable name (system.generated.[lowercase executable name])
|
||||
#if false
|
||||
if (auto err = app->AddApplicationManifest(appManifestPath.string().data(), true);
|
||||
err != vr::VRApplicationError_None) {
|
||||
logger.error("Failed to add application manifest: {}",
|
||||
app->GetApplicationsErrorNameFromEnum(err));
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
// SetActionManifestPath may return IPCError if vrserver is busy and takes
|
||||
// too long to reply, so keep invoking until it succeeds
|
||||
{
|
||||
vr::EVRInputError err;
|
||||
constexpr int max_tries = 5;
|
||||
int tries = 0;
|
||||
while ((err = input->SetActionManifestPath(actionManifestPath.string().data())) == vr::VRInputError_IPCError && tries++ < max_tries) {
|
||||
logger.Debug("IPC error loading action manifest, retrying ({}/{})", tries, max_tries);
|
||||
std::this_thread::sleep_for(20ms);
|
||||
}
|
||||
|
||||
if (err != vr::VRInputError_None) {
|
||||
logger.Error("Failed to set action manifest path: {}", std::to_underlying(err));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
vr::VRActionSetHandle_t action_set;
|
||||
if (auto err = input->GetActionSetHandle("/actions/main", &action_set);
|
||||
err != vr::VRInputError_None) {
|
||||
logger.Error("Failed to get main action set handle: {}", std::to_underlying(err));
|
||||
return 1;
|
||||
}
|
||||
|
||||
std::map<std::string, std::tuple<vr::VRActionHandle_t, std::function<void(BridgeTransport&)>>>
|
||||
actions{
|
||||
{ "/actions/main/in/YawReset", std::make_tuple(vr::k_ulInvalidActionHandle, OnYawReset) },
|
||||
{ "/actions/main/in/FullReset", std::make_tuple(vr::k_ulInvalidActionHandle, OnFullReset) },
|
||||
{ "/actions/main/in/MountingCalibration", std::make_tuple(vr::k_ulInvalidActionHandle, OnMountingCalibration) },
|
||||
{ "/actions/main/in/FeetMountingCalibration", std::make_tuple(vr::k_ulInvalidActionHandle, OnFeetMountingCalibration) },
|
||||
{ "/actions/main/in/ToggleTracking", std::make_tuple(vr::k_ulInvalidActionHandle, OnToggleTracking) },
|
||||
};
|
||||
|
||||
for (auto& [name, tuple] : actions) {
|
||||
auto& [handle, _] = tuple;
|
||||
if (auto err = input->GetActionHandle(name.c_str(), &handle);
|
||||
err != vr::VRInputError_None || handle == vr::k_ulInvalidActionHandle) {
|
||||
logger.Warning("Failed to get action handle for action {}: {}", name,
|
||||
std::to_underlying(err));
|
||||
}
|
||||
}
|
||||
|
||||
constexpr auto interval = 1000ms / 30;
|
||||
|
||||
signal(SIGINT, OnSignal);
|
||||
signal(SIGTERM, OnSignal);
|
||||
while (!should_exit) {
|
||||
vr::VREvent_t event{};
|
||||
while (sys->PollNextEvent(&event, sizeof(event))) {
|
||||
switch (event.eventType) {
|
||||
case vr::VREvent_Quit:
|
||||
logger.Info("OpenVR runtime requested quit");
|
||||
should_exit = 1;
|
||||
break;
|
||||
case vr::VREvent_Input_BindingLoadFailed: {
|
||||
auto& loadData = event.data.inputBinding;
|
||||
logger.Debug("Binding load failed (ulAppContainer={} pathMessage={} pathUrl={} pathControllerType={})",
|
||||
loadData.ulAppContainer, loadData.pathMessage, loadData.pathUrl, loadData.pathControllerType);
|
||||
break;
|
||||
}
|
||||
case vr::VREvent_Input_BindingLoadSuccessful: {
|
||||
auto& loadData = event.data.inputBinding;
|
||||
logger.Debug("Binding load successful (ulAppContainer={} pathMessage={} pathUrl={} pathControllerType={})",
|
||||
loadData.ulAppContainer, loadData.pathMessage, loadData.pathUrl, loadData.pathControllerType);
|
||||
break;
|
||||
}
|
||||
case vr::VREvent_Input_ActionManifestReloaded:
|
||||
logger.Debug("Action manifest reloaded");
|
||||
break;
|
||||
case vr::VREvent_Input_ActionManifestLoadFailed: {
|
||||
auto& manifestData = event.data.actionManifest;
|
||||
logger.Debug(
|
||||
"Action manifest load failed (pathAppKey={} pathMessage={} pathMessageParam={} pathManifestPath={})",
|
||||
manifestData.pathAppKey, manifestData.pathMessage, manifestData.pathMessageParam, manifestData.pathManifestPath);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
vr::VRActiveActionSet_t set{
|
||||
.ulActionSet = action_set,
|
||||
.ulRestrictedToDevice = vr::k_ulInvalidInputValueHandle,
|
||||
.ulSecondaryActionSet = vr::k_ulInvalidActionSetHandle,
|
||||
.nPriority = 0,
|
||||
};
|
||||
if (auto err = input->UpdateActionState(&set, sizeof(set), 1);
|
||||
err != vr::VRInputError_None) {
|
||||
logger.Warning("Error when updating action states: {}",
|
||||
std::to_underlying(err));
|
||||
}
|
||||
|
||||
for (auto& [name, tuple] : actions) {
|
||||
auto& [handle, callback] = tuple;
|
||||
vr::InputDigitalActionData_t action_data{};
|
||||
if (auto err = input->GetDigitalActionData(
|
||||
handle, &action_data, sizeof(action_data),
|
||||
vr::k_ulInvalidInputValueHandle);
|
||||
err != vr::VRInputError_None) {
|
||||
logger.Warning("Failed to get action state for {} ({}): {}", name, handle, std::to_underlying(err));
|
||||
continue;
|
||||
}
|
||||
|
||||
if (action_data.bActive && action_data.bChanged && action_data.bState) {
|
||||
logger.Debug("Action {} triggered", name);
|
||||
callback(conn);
|
||||
}
|
||||
}
|
||||
|
||||
logger.Flush();
|
||||
std::this_thread::sleep_for(interval);
|
||||
}
|
||||
|
||||
logger.Info("Main loop done");
|
||||
} catch (std::exception& ex) {
|
||||
logger.Error("Exception in main: {}", ex.what());
|
||||
logger.Flush();
|
||||
return 1;
|
||||
}
|
||||
|
||||
logger.Flush();
|
||||
return 0;
|
||||
}
|
||||
@@ -1,54 +0,0 @@
|
||||
#include "paths.hpp"
|
||||
|
||||
#ifdef _WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define NOMINMAX
|
||||
#include <Windows.h>
|
||||
#undef GetTempPath
|
||||
#endif
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
fs::path Paths::GetDataPath() {
|
||||
fs::path basePath{};
|
||||
|
||||
#if defined(__linux__)
|
||||
if (const char* dataHomeOverride = getenv("XDG_DATA_HOME")) {
|
||||
basePath = dataHomeOverride;
|
||||
} else {
|
||||
const char* homeDir = getenv("HOME");
|
||||
if (homeDir == nullptr)
|
||||
throw std::runtime_error("HOME is unset");
|
||||
|
||||
basePath = fs::path(homeDir) / ".local" / "share";
|
||||
}
|
||||
#elif defined(_WIN32)
|
||||
{
|
||||
const char* appData = getenv("APPDATA");
|
||||
if (appData == nullptr)
|
||||
throw std::runtime_error("APPDATA is unset");
|
||||
|
||||
basePath = appData;
|
||||
}
|
||||
#else
|
||||
#error "Unsupported platform"
|
||||
#endif
|
||||
|
||||
return basePath / "dev.slimevr.SlimeVR";
|
||||
}
|
||||
|
||||
fs::path Paths::GetLogPath() { return Paths::GetDataPath() / "logs"; }
|
||||
|
||||
fs::path Paths::GetTempPath() noexcept {
|
||||
#ifdef _WIN32
|
||||
WCHAR tmp_dir[MAX_PATH + 1];
|
||||
GetTempPathW(std::size(tmp_dir), tmp_dir);
|
||||
return tmp_dir;
|
||||
#else
|
||||
if (const char* tmp_dir = getenv("TMPDIR")) {
|
||||
return tmp_dir;
|
||||
}
|
||||
|
||||
return "/tmp";
|
||||
#endif
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <filesystem>
|
||||
|
||||
namespace Paths {
|
||||
// Throws when path cannot be found
|
||||
std::filesystem::path GetDataPath() noexcept(false);
|
||||
|
||||
// Throws when path cannot be found
|
||||
std::filesystem::path GetLogPath() noexcept(false);
|
||||
|
||||
std::filesystem::path GetTempPath() noexcept;
|
||||
} // namespace Paths
|
||||
@@ -1,64 +0,0 @@
|
||||
{
|
||||
"default_bindings": [
|
||||
{
|
||||
"controller_type": "generic",
|
||||
"binding_url": "generic.json"
|
||||
},
|
||||
{
|
||||
"controller_type": "oculus_touch",
|
||||
"binding_url": "oculus_touch.json"
|
||||
},
|
||||
{
|
||||
"controller_type": "knuckles",
|
||||
"binding_url": "knuckles.json"
|
||||
},
|
||||
{
|
||||
"controller_type": "vive_controller",
|
||||
"binding_url": "vive_controller.json"
|
||||
}
|
||||
],
|
||||
"actions": [
|
||||
{
|
||||
"name": "/actions/main/in/YawReset",
|
||||
"requirement": "optional",
|
||||
"type": "boolean"
|
||||
},
|
||||
{
|
||||
"name": "/actions/main/in/FullReset",
|
||||
"requirement": "optional",
|
||||
"type": "boolean"
|
||||
},
|
||||
{
|
||||
"name": "/actions/main/in/MountingCalibration",
|
||||
"requirement": "optional",
|
||||
"type": "boolean"
|
||||
},
|
||||
{
|
||||
"name": "/actions/main/in/FeetMountingCalibration",
|
||||
"requirement": "optional",
|
||||
"type": "boolean"
|
||||
},
|
||||
{
|
||||
"name": "/actions/main/in/ToggleTracking",
|
||||
"requirement": "optional",
|
||||
"type": "boolean"
|
||||
}
|
||||
],
|
||||
"action_sets": [
|
||||
{
|
||||
"name": "/actions/main",
|
||||
"usage": "leftright"
|
||||
}
|
||||
],
|
||||
"localization": [
|
||||
{
|
||||
"language_tag": "en_us",
|
||||
"/actions/main": "Utility Bindings",
|
||||
"/actions/main/in/YawReset": "Yaw Reset",
|
||||
"/actions/main/in/FullReset": "Full Reset",
|
||||
"/actions/main/in/MountingCalibration": "Mounting Calibration",
|
||||
"/actions/main/in/FeetMountingCalibration": "Feet Mounting Calibration",
|
||||
"/actions/main/in/ToggleTracking": "Toggle Tracking"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"name": "Default Bindings for Generic",
|
||||
"controller_type": "generic",
|
||||
"bindings": {
|
||||
"/actions/main": {
|
||||
"sources": [],
|
||||
"skeleton": [],
|
||||
"haptics": [],
|
||||
"poses": []
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"name": "Default Bindings for Knuckles",
|
||||
"controller_type": "knuckles",
|
||||
"bindings": {
|
||||
"/actions/main": {
|
||||
"sources": [],
|
||||
"skeleton": [],
|
||||
"haptics": [],
|
||||
"poses": []
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
{
|
||||
"source": "builtin",
|
||||
"applications": [{
|
||||
"app_key": "dev.slimevr.BindingsProvider",
|
||||
"is_dashboard_overlay": false,
|
||||
"action_manifest_path": "action_manifest.json",
|
||||
"strings": {
|
||||
"en_us": {
|
||||
"name": "SlimeVR Bindings Provider",
|
||||
"description": "SlimeVR Bindings Provider"
|
||||
}
|
||||
}
|
||||
}]
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"name": "Default Bindings for Oculus Touch",
|
||||
"controller_type": "oculus_touch",
|
||||
"bindings": {
|
||||
"/actions/main": {
|
||||
"sources": [],
|
||||
"skeleton": [],
|
||||
"haptics": [],
|
||||
"poses": []
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#cmakedefine SVR_VRAPP_MANIFEST R"(@SVR_VRAPP_MANIFEST@)"
|
||||
#cmakedefine SVR_VRAPP_ACTION_MANIFEST R"(@SVR_VRAPP_ACTION_MANIFEST@)"
|
||||
#cmakedefine SVR_VRAPP_GENERIC_BINDS R"(@SVR_VRAPP_GENERIC_BINDS@)"
|
||||
#cmakedefine SVR_VRAPP_KNUCKLES_BINDS R"(@SVR_VRAPP_KNUCKLES_BINDS@)"
|
||||
#cmakedefine SVR_VRAPP_OCULUS_BINDS R"(@SVR_VRAPP_OCULUS_BINDS@)"
|
||||
#cmakedefine SVR_VRAPP_VIVE_BINDS R"(@SVR_VRAPP_VIVE_BINDS@)"
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"name": "Default Bindings for Vive Wands",
|
||||
"controller_type": "vive_controller",
|
||||
"bindings": {
|
||||
"/actions/main": {
|
||||
"sources": [],
|
||||
"skeleton": [],
|
||||
"haptics": [],
|
||||
"poses": []
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
#include "vr_utils.hpp"
|
||||
#include "logger.hpp"
|
||||
#include "paths.hpp"
|
||||
#include "resources/resources.hpp"
|
||||
|
||||
#include <array>
|
||||
#include <fstream>
|
||||
#include <string_view>
|
||||
#include <utility>
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
std::optional<std::string>
|
||||
VRUtils::GetStringProp(vr::TrackedDeviceIndex_t deviceIndex,
|
||||
vr::ETrackedDeviceProperty prop) {
|
||||
vr::IVRSystem* sys = vr::VRSystem();
|
||||
vr::ETrackedPropertyError err{ vr::TrackedProp_Success };
|
||||
|
||||
uint32_t required_len = sys->GetStringTrackedDeviceProperty(deviceIndex, prop, nullptr, 0, &err);
|
||||
if (err != vr::TrackedProp_BufferTooSmall) {
|
||||
Logger::Get().Info(
|
||||
"Failed to get size of string property {} for device {}: {}",
|
||||
std::to_underlying(prop), deviceIndex,
|
||||
sys->GetPropErrorNameFromEnum(err));
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
std::string s(required_len - 1, '\0');
|
||||
sys->GetStringTrackedDeviceProperty(deviceIndex, prop, s.data(), required_len,
|
||||
&err);
|
||||
if (err != vr::TrackedProp_Success) {
|
||||
Logger::Get().Info("Failed to get string property {} for device {}: {}",
|
||||
std::to_underlying(prop), deviceIndex,
|
||||
sys->GetPropErrorNameFromEnum(err));
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
std::tuple<fs::path, fs::path> VRUtils::InitialiseManifests() {
|
||||
fs::path manifestDir = Paths::GetDataPath() / "bindings-provider";
|
||||
std::error_code ec;
|
||||
fs::create_directories(manifestDir, ec);
|
||||
if (ec) {
|
||||
throw std::runtime_error(
|
||||
std::format("Failed to create manifest folder: {}", ec.message()));
|
||||
}
|
||||
|
||||
using namespace std::string_view_literals;
|
||||
// Make sure the vrmanifest and action manifest are 1st and 2nd respectively
|
||||
// in the array
|
||||
std::array requiredFiles{
|
||||
std::make_pair("manifest.vrmanifest"sv, SVR_VRAPP_MANIFEST),
|
||||
std::make_pair("action_manifest.json"sv, SVR_VRAPP_ACTION_MANIFEST),
|
||||
std::make_pair("generic.json"sv, SVR_VRAPP_GENERIC_BINDS),
|
||||
std::make_pair("knuckles.json"sv, SVR_VRAPP_KNUCKLES_BINDS),
|
||||
std::make_pair("oculus_touch.json"sv, SVR_VRAPP_OCULUS_BINDS),
|
||||
std::make_pair("vive_controller.json"sv, SVR_VRAPP_VIVE_BINDS),
|
||||
};
|
||||
|
||||
for (auto& [name, contents] : requiredFiles) {
|
||||
fs::path path = manifestDir / name;
|
||||
if (!fs::exists(path)) {
|
||||
std::ofstream stream(path);
|
||||
stream << contents;
|
||||
}
|
||||
}
|
||||
|
||||
return { manifestDir / requiredFiles.at(0).first,
|
||||
manifestDir / requiredFiles.at(1).first };
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <filesystem>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <tuple>
|
||||
|
||||
#include "openvr.h"
|
||||
|
||||
namespace VRUtils {
|
||||
std::optional<std::string> GetStringProp(vr::TrackedDeviceIndex_t deviceIndex,
|
||||
vr::ETrackedDeviceProperty prop);
|
||||
|
||||
// Returns <app vrmanifest path, action manifest json path>
|
||||
std::tuple<std::filesystem::path, std::filesystem::path> InitialiseManifests();
|
||||
} // namespace VRUtils
|
||||
@@ -0,0 +1,3 @@
|
||||
plugins {
|
||||
id("org.ajoberstar.grgit")
|
||||
}
|
||||
-36
@@ -1,36 +0,0 @@
|
||||
# Crowdin Configuration File
|
||||
# https://developer.crowdin.com/configuration-file/
|
||||
|
||||
files:
|
||||
- source: /gui/app/public/i18n/en/translation.ftl
|
||||
translation: /gui/app/public/i18n/%locale%/%original_file_name%
|
||||
update_option: update_as_unapproved
|
||||
languages_mapping:
|
||||
locale:
|
||||
zh-CN: zh-Hans
|
||||
zh-TW: zh-Hant
|
||||
nb: nb-NO
|
||||
sv: sv-SE
|
||||
fr: fr
|
||||
de: de
|
||||
it: it
|
||||
ja: ja
|
||||
ko: ko
|
||||
ar: ar
|
||||
cs: cs
|
||||
da: da
|
||||
el: el
|
||||
es-419: es-419
|
||||
et: et
|
||||
fi: fi
|
||||
he: he
|
||||
lt: lt
|
||||
nl: nl
|
||||
pl: pl
|
||||
ru: ru
|
||||
th: th
|
||||
tr: tr
|
||||
uk: uk
|
||||
vi: vi
|
||||
# In-context editor pseudo-language
|
||||
ach-UG: ach-UG
|
||||
@@ -0,0 +1,242 @@
|
||||
# This template contains all of the possible sections and their default values
|
||||
|
||||
# Note that all fields that take a lint level have these possible values:
|
||||
# * deny - An error will be produced and the check will fail
|
||||
# * warn - A warning will be produced, but the check will not fail
|
||||
# * allow - No warning or error will be produced, though in some cases a note
|
||||
# will be
|
||||
|
||||
# The values provided in this template are the default values that will be used
|
||||
# when any section or field is not specified in your own configuration
|
||||
|
||||
# Root options
|
||||
|
||||
# The graph table configures how the dependency graph is constructed and thus
|
||||
# which crates the checks are performed against
|
||||
[graph]
|
||||
# If 1 or more target triples (and optionally, target_features) are specified,
|
||||
# only the specified targets will be checked when running `cargo deny check`.
|
||||
# This means, if a particular package is only ever used as a target specific
|
||||
# dependency, such as, for example, the `nix` crate only being used via the
|
||||
# `target_family = "unix"` configuration, that only having windows targets in
|
||||
# this list would mean the nix crate, as well as any of its exclusive
|
||||
# dependencies not shared by any other crates, would be ignored, as the target
|
||||
# list here is effectively saying which targets you are building for.
|
||||
targets = [
|
||||
# The triple can be any string, but only the target triples built in to
|
||||
# rustc (as of 1.40) can be checked against actual config expressions
|
||||
#"x86_64-unknown-linux-musl",
|
||||
# You can also specify which target_features you promise are enabled for a
|
||||
# particular target. target_features are currently not validated against
|
||||
# the actual valid features supported by the target architecture.
|
||||
#{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
|
||||
]
|
||||
# When creating the dependency graph used as the source of truth when checks are
|
||||
# executed, this field can be used to prune crates from the graph, removing them
|
||||
# from the view of cargo-deny. This is an extremely heavy hammer, as if a crate
|
||||
# is pruned from the graph, all of its dependencies will also be pruned unless
|
||||
# they are connected to another crate in the graph that hasn't been pruned,
|
||||
# so it should be used with care. The identifiers are [Package ID Specifications]
|
||||
# (https://doc.rust-lang.org/cargo/reference/pkgid-spec.html)
|
||||
#exclude = []
|
||||
# If true, metadata will be collected with `--all-features`. Note that this can't
|
||||
# be toggled off if true, if you want to conditionally enable `--all-features` it
|
||||
# is recommended to pass `--all-features` on the cmd line instead
|
||||
all-features = false
|
||||
# If true, metadata will be collected with `--no-default-features`. The same
|
||||
# caveat with `all-features` applies
|
||||
no-default-features = false
|
||||
# If set, these feature will be enabled when collecting metadata. If `--features`
|
||||
# is specified on the cmd line they will take precedence over this option.
|
||||
#features = []
|
||||
|
||||
# The output table provides options for how/if diagnostics are outputted
|
||||
[output]
|
||||
# When outputting inclusion graphs in diagnostics that include features, this
|
||||
# option can be used to specify the depth at which feature edges will be added.
|
||||
# This option is included since the graphs can be quite large and the addition
|
||||
# of features from the crate(s) to all of the graph roots can be far too verbose.
|
||||
# This option can be overridden via `--feature-depth` on the cmd line
|
||||
feature-depth = 1
|
||||
|
||||
# This section is considered when running `cargo deny check advisories`
|
||||
# More documentation for the advisories section can be found here:
|
||||
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
|
||||
[advisories]
|
||||
# The path where the advisory databases are cloned/fetched into
|
||||
#db-path = "$CARGO_HOME/advisory-dbs"
|
||||
# The url(s) of the advisory databases to use
|
||||
#db-urls = ["https://github.com/rustsec/advisory-db"]
|
||||
# A list of advisory IDs to ignore. Note that ignored advisories will still
|
||||
# output a note when they are encountered.
|
||||
ignore = [
|
||||
#"RUSTSEC-0000-0000",
|
||||
#{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" },
|
||||
#"[email protected]", # you can also ignore yanked crate versions if you wish
|
||||
#{ crate = "[email protected]", reason = "you can specify why you are ignoring the yanked crate" },
|
||||
]
|
||||
# If this is true, then cargo deny will use the git executable to fetch advisory database.
|
||||
# If this is false, then it uses a built-in git library.
|
||||
# Setting this to true can be helpful if you have special authentication requirements that cargo-deny does not support.
|
||||
# See Git Authentication for more information about setting up git authentication.
|
||||
#git-fetch-with-cli = true
|
||||
|
||||
# This section is considered when running `cargo deny check licenses`
|
||||
# More documentation for the licenses section can be found here:
|
||||
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
|
||||
[licenses]
|
||||
# List of explicitly allowed licenses
|
||||
# See https://spdx.org/licenses/ for list of possible licenses
|
||||
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
|
||||
allow = [
|
||||
"MIT",
|
||||
"Apache-2.0",
|
||||
"Apache-2.0 WITH LLVM-exception",
|
||||
"Unicode-3.0",
|
||||
"Unicode-DFS-2016",
|
||||
"MIT-0",
|
||||
"ISC",
|
||||
"BSD-3-Clause",
|
||||
"Zlib",
|
||||
"MPL-2.0",
|
||||
]
|
||||
# The confidence threshold for detecting a license from license text.
|
||||
# The higher the value, the more closely the license text must be to the
|
||||
# canonical license text of a valid SPDX license file.
|
||||
# [possible values: any between 0.0 and 1.0].
|
||||
confidence-threshold = 0.8
|
||||
# Allow 1 or more licenses on a per-crate basis, so that particular licenses
|
||||
# aren't accepted for every possible crate as with the normal allow list
|
||||
exceptions = [
|
||||
# Each entry is the crate and version constraint, and its specific allow
|
||||
# list
|
||||
#{ allow = ["Zlib"], crate = "adler32" },
|
||||
]
|
||||
|
||||
# Some crates don't have (easily) machine readable licensing information,
|
||||
# adding a clarification entry for it allows you to manually specify the
|
||||
# licensing information
|
||||
#[[licenses.clarify]]
|
||||
# The package spec the clarification applies to
|
||||
#crate = "ring"
|
||||
# The SPDX expression for the license requirements of the crate
|
||||
#expression = "MIT AND ISC AND OpenSSL"
|
||||
# One or more files in the crate's source used as the "source of truth" for
|
||||
# the license expression. If the contents match, the clarification will be used
|
||||
# when running the license check, otherwise the clarification will be ignored
|
||||
# and the crate will be checked normally, which may produce warnings or errors
|
||||
# depending on the rest of your configuration
|
||||
#license-files = [
|
||||
# Each entry is a crate relative path, and the (opaque) hash of its contents
|
||||
#{ path = "LICENSE", hash = 0xbd0eed23 }
|
||||
#]
|
||||
|
||||
[licenses.private]
|
||||
# If true, ignores workspace crates that aren't published, or are only
|
||||
# published to private registries.
|
||||
# To see how to mark a crate as unpublished (to the official registry),
|
||||
# visit https://doc.rust-lang.org/cargo/reference/manifest.html#the-publish-field.
|
||||
ignore = false
|
||||
# One or more private registries that you might publish crates to, if a crate
|
||||
# is only published to private registries, and ignore is true, the crate will
|
||||
# not have its license(s) checked
|
||||
registries = [
|
||||
#"https://sekretz.com/registry
|
||||
]
|
||||
|
||||
# This section is considered when running `cargo deny check bans`.
|
||||
# More documentation about the 'bans' section can be found here:
|
||||
# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
|
||||
[bans]
|
||||
# Lint level for when multiple versions of the same crate are detected
|
||||
multiple-versions = "warn"
|
||||
# Lint level for when a crate version requirement is `*`
|
||||
wildcards = "allow"
|
||||
# The graph highlighting used when creating dotgraphs for crates
|
||||
# with multiple versions
|
||||
# * lowest-version - The path to the lowest versioned duplicate is highlighted
|
||||
# * simplest-path - The path to the version with the fewest edges is highlighted
|
||||
# * all - Both lowest-version and simplest-path are used
|
||||
highlight = "all"
|
||||
# The default lint level for `default` features for crates that are members of
|
||||
# the workspace that is being checked. This can be overridden by allowing/denying
|
||||
# `default` on a crate-by-crate basis if desired.
|
||||
workspace-default-features = "allow"
|
||||
# The default lint level for `default` features for external crates that are not
|
||||
# members of the workspace. This can be overridden by allowing/denying `default`
|
||||
# on a crate-by-crate basis if desired.
|
||||
external-default-features = "allow"
|
||||
# List of crates that are allowed. Use with care!
|
||||
allow = [
|
||||
#"[email protected]",
|
||||
#{ crate = "[email protected]", reason = "you can specify a reason it is allowed" },
|
||||
]
|
||||
# List of crates to deny
|
||||
deny = [
|
||||
#"[email protected]",
|
||||
#{ crate = "[email protected]", reason = "you can specify a reason it is banned" },
|
||||
# Wrapper crates can optionally be specified to allow the crate when it
|
||||
# is a direct dependency of the otherwise banned crate
|
||||
#{ crate = "[email protected]", wrappers = ["this-crate-directly-depends-on-ansi_term"] },
|
||||
]
|
||||
|
||||
# List of features to allow/deny
|
||||
# Each entry the name of a crate and a version range. If version is
|
||||
# not specified, all versions will be matched.
|
||||
#[[bans.features]]
|
||||
#crate = "reqwest"
|
||||
# Features to not allow
|
||||
#deny = ["json"]
|
||||
# Features to allow
|
||||
#allow = [
|
||||
# "rustls",
|
||||
# "__rustls",
|
||||
# "__tls",
|
||||
# "hyper-rustls",
|
||||
# "rustls",
|
||||
# "rustls-pemfile",
|
||||
# "rustls-tls-webpki-roots",
|
||||
# "tokio-rustls",
|
||||
# "webpki-roots",
|
||||
#]
|
||||
# If true, the allowed features must exactly match the enabled feature set. If
|
||||
# this is set there is no point setting `deny`
|
||||
#exact = true
|
||||
|
||||
# Certain crates/versions that will be skipped when doing duplicate detection.
|
||||
skip = [
|
||||
#"[email protected]",
|
||||
#{ crate = "[email protected]", reason = "you can specify a reason why it can't be updated/removed" },
|
||||
]
|
||||
# Similarly to `skip` allows you to skip certain crates during duplicate
|
||||
# detection. Unlike skip, it also includes the entire tree of transitive
|
||||
# dependencies starting at the specified crate, up to a certain depth, which is
|
||||
# by default infinite.
|
||||
skip-tree = [
|
||||
#"[email protected]", # will be skipped along with _all_ of its direct and transitive dependencies
|
||||
#{ crate = "[email protected]", depth = 20 },
|
||||
]
|
||||
|
||||
# This section is considered when running `cargo deny check sources`.
|
||||
# More documentation about the 'sources' section can be found here:
|
||||
# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html
|
||||
[sources]
|
||||
# Lint level for what to happen when a crate from a crate registry that is not
|
||||
# in the allow list is encountered
|
||||
unknown-registry = "warn"
|
||||
# Lint level for what to happen when a crate from a git repository that is not
|
||||
# in the allow list is encountered
|
||||
unknown-git = "warn"
|
||||
# List of URLs for allowed crate registries. Defaults to the crates.io index
|
||||
# if not specified. If it is specified but empty, no registries are allowed.
|
||||
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
|
||||
# List of URLs for allowed Git repositories
|
||||
allow-git = []
|
||||
|
||||
[sources.allow-org]
|
||||
# 1 or more github.com organizations to allow git sources for
|
||||
github = [""]
|
||||
# 1 or more gitlab.com organizations to allow git sources for
|
||||
gitlab = [""]
|
||||
# 1 or more bitbucket.org organizations to allow git sources for
|
||||
bitbucket = [""]
|
||||
Generated
+316
-13
@@ -1,15 +1,112 @@
|
||||
{
|
||||
"nodes": {
|
||||
"flake-parts": {
|
||||
"cachix": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
"devenv": [
|
||||
"devenv"
|
||||
],
|
||||
"flake-compat": [
|
||||
"devenv"
|
||||
],
|
||||
"git-hooks": [
|
||||
"devenv",
|
||||
"git-hooks"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"devenv",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1790898470,
|
||||
"narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=",
|
||||
"lastModified": 1748883665,
|
||||
"narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=",
|
||||
"owner": "cachix",
|
||||
"repo": "cachix",
|
||||
"rev": "f707778d902af4d62d8dd92c269f8e70de09acbe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"ref": "latest",
|
||||
"repo": "cachix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"devenv": {
|
||||
"inputs": {
|
||||
"cachix": "cachix",
|
||||
"flake-compat": "flake-compat",
|
||||
"git-hooks": "git-hooks",
|
||||
"nix": "nix",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750800495,
|
||||
"narHash": "sha256-wBTGFNCx3Gr3BkNkEoFrKx9+d7otSdQesCDCPGDKZHk=",
|
||||
"owner": "cachix",
|
||||
"repo": "devenv",
|
||||
"rev": "b33ab3610c084a7e3fabc5eefaeb437449f1efe7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "devenv",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750833544,
|
||||
"narHash": "sha256-e5W27mfPGiM35qr0DjTUzLHP4ET2MbvRc4HJHScw/ko=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "c3940d9ff4d37e965e5841149367234c2aad1ab6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747046372,
|
||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"devenv",
|
||||
"nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "024633cd702b10285db5cb19b40ad48d2399ba60",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -18,13 +115,181 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749398372,
|
||||
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "flake-parts",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1659877975,
|
||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"git-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"devenv",
|
||||
"flake-compat"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"devenv",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749636823,
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "623c56286de5a3193aa38891a6991b28f9bab056",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"devenv",
|
||||
"git-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mk-shell-bin": {
|
||||
"locked": {
|
||||
"lastModified": 1677004959,
|
||||
"narHash": "sha256-/uEkr1UkJrh11vD02aqufCxtbF5YnhRTIKlx5kyvf+I=",
|
||||
"owner": "rrbutani",
|
||||
"repo": "nix-mk-shell-bin",
|
||||
"rev": "ff5d8bd4d68a347be5042e2f16caee391cd75887",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rrbutani",
|
||||
"repo": "nix-mk-shell-bin",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"devenv",
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-parts": "flake-parts",
|
||||
"git-hooks-nix": [
|
||||
"devenv",
|
||||
"git-hooks"
|
||||
],
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-23-11": [
|
||||
"devenv"
|
||||
],
|
||||
"nixpkgs-regression": [
|
||||
"devenv"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750117611,
|
||||
"narHash": "sha256-LTwASICtyN3AjzlF9l2ZNAIVZqclio3yRcwwZy3QSJA=",
|
||||
"owner": "cachix",
|
||||
"repo": "nix",
|
||||
"rev": "9e4fc95c388e2223d47da865503dee20d179776a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"ref": "devenv-2.30",
|
||||
"repo": "nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix2container": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749158376,
|
||||
"narHash": "sha256-uirStFNxauh0lxzBowcp28X+Sq7JgsBIDnbwbAfZwf8=",
|
||||
"owner": "nlewo",
|
||||
"repo": "nix2container",
|
||||
"rev": "0f8974c58755dba441df03598eefd1e1cd50e341",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nlewo",
|
||||
"repo": "nix2container",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixgl": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713543440,
|
||||
"narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
|
||||
"owner": "guibou",
|
||||
"repo": "nixGL",
|
||||
"rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "guibou",
|
||||
"repo": "nixGL",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1790822859,
|
||||
"narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=",
|
||||
"lastModified": 1747179050,
|
||||
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
|
||||
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -36,11 +301,11 @@
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1790477367,
|
||||
"narHash": "sha256-oujbxmVKDhci2E4EM3KyAbRUgp5/IsCoiA/LfEF7OOk=",
|
||||
"lastModified": 1748740939,
|
||||
"narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "f7cd230690d9fc982d06129f9189b101fddcfa3b",
|
||||
"rev": "656a64127e9d791a334452c6b6606d17539476e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -49,10 +314,48 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1750741721,
|
||||
"narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4b1164c3215f018c4442463a27689d973cffd750",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"devenv": "devenv",
|
||||
"fenix": "fenix",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"mk-shell-bin": "mk-shell-bin",
|
||||
"nix2container": "nix2container",
|
||||
"nixgl": "nixgl",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1750788942,
|
||||
"narHash": "sha256-bBSdUlEw/7xh66rtMEDg39xQUNN2VaDJIbRPIwhpFYk=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "c68c8a81a7d2979778ae1e8ba024beacb4fff6b6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -1,165 +1,156 @@
|
||||
{
|
||||
description = "SlimeVR Server & GUI";
|
||||
description = "Affordable full-body tracking for VR!";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
devenv = {
|
||||
url = "github:cachix/devenv";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix2container = {
|
||||
url = "github:nlewo/nix2container";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
mk-shell-bin.url = "github:rrbutani/nix-mk-shell-bin";
|
||||
nixgl = {
|
||||
url = "github:guibou/nixGL";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
fenix = {
|
||||
url = "github:nix-community/fenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
flake-parts,
|
||||
...
|
||||
}:
|
||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||
systems = [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
nixConfig = {
|
||||
extra-trusted-public-keys = "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=";
|
||||
extra-substituters = "https://devenv.cachix.org";
|
||||
};
|
||||
|
||||
perSystem =
|
||||
{
|
||||
system,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
runtimeLibs = [
|
||||
pkgs.alsa-lib
|
||||
pkgs.libpulseaudio
|
||||
pkgs.at-spi2-atk
|
||||
pkgs.at-spi2-core
|
||||
pkgs.cairo
|
||||
pkgs.cups
|
||||
pkgs.dbus
|
||||
pkgs.expat
|
||||
pkgs.gdk-pixbuf
|
||||
pkgs.glib
|
||||
pkgs.gtk3
|
||||
pkgs.libdrm
|
||||
pkgs.libgbm
|
||||
pkgs.libglvnd
|
||||
pkgs.libnotify
|
||||
pkgs.libxkbcommon
|
||||
pkgs.mesa
|
||||
pkgs.nspr
|
||||
pkgs.nss
|
||||
pkgs.pango
|
||||
pkgs.systemd
|
||||
pkgs.vulkan-loader
|
||||
pkgs.wayland
|
||||
pkgs.libX11
|
||||
pkgs.libXcomposite
|
||||
pkgs.libXdamage
|
||||
pkgs.libXext
|
||||
pkgs.libXfixes
|
||||
pkgs.libXrandr
|
||||
pkgs.libxcb
|
||||
pkgs.libxshmfence
|
||||
pkgs.libusb1
|
||||
pkgs.udev
|
||||
pkgs.libxcrypt-legacy
|
||||
outputs = inputs @ {
|
||||
self,
|
||||
flake-parts,
|
||||
nixgl,
|
||||
...
|
||||
}:
|
||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
||||
imports = [
|
||||
inputs.devenv.flakeModule
|
||||
];
|
||||
systems = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
|
||||
|
||||
perSystem = {
|
||||
config,
|
||||
self',
|
||||
inputs',
|
||||
pkgs,
|
||||
system,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
# Per-system attributes can be defined here. The self' and inputs'
|
||||
# module parameters provide easy access to attributes of the same
|
||||
# system.
|
||||
|
||||
# Equivalent to inputs'.nixpkgs.legacyPackages.hello;
|
||||
# packages.default = pkgs.hello;
|
||||
_module.args.pkgs = import self.inputs.nixpkgs {
|
||||
inherit system;
|
||||
overlays = [nixgl.overlay];
|
||||
};
|
||||
|
||||
devenv.shells.default = let
|
||||
fenixpkgs = inputs'.fenix.packages;
|
||||
rust_toolchain = lib.importTOML ./rust-toolchain.toml;
|
||||
in {
|
||||
name = "slimevr";
|
||||
|
||||
imports = [
|
||||
# This is just like the imports in devenv.nix.
|
||||
# See https://devenv.sh/guides/using-with-flake-parts/#import-a-devenv-module
|
||||
# ./devenv-foo.nix
|
||||
];
|
||||
|
||||
# we use static runtime
|
||||
# https://github.com/electron-userland/electron-builder/blob/a6117b3011a105204af8cc2eca02a56976d1ef29/packages/app-builder-lib/src/toolsets/linux.ts#L122
|
||||
appImageTools = pkgs.stdenvNoCC.mkDerivation {
|
||||
name = "electron-builder-appimage-runtime";
|
||||
src =
|
||||
let
|
||||
# Keep in sync with "appimage" toolset version in gui/electron/electron-builder.yml
|
||||
appimageToolsVersion = "1.0.3";
|
||||
in
|
||||
pkgs.fetchzip {
|
||||
url = "https://github.com/electron-userland/electron-builder-binaries/releases/download/appimage@${appimageToolsVersion}/appimage-tools-runtime-20251108.tar.gz";
|
||||
hash = "sha256-Iqhvyp6BNpH+tXvVO7MLgYbsJ6va4lXO7El3wtyWBII=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r -t $out/ lib/ runtimes/
|
||||
ln -s -t $out \
|
||||
"${pkgs.desktop-file-utils}/bin/desktop-file-validate" \
|
||||
"${pkgs.squashfsTools}/bin/mksquashfs"
|
||||
'';
|
||||
};
|
||||
|
||||
buildToolsVersion = "36.0.0";
|
||||
androidComposition = pkgs.androidenv.composeAndroidPackages {
|
||||
buildToolsVersions = [
|
||||
buildToolsVersion
|
||||
];
|
||||
platformVersions = [
|
||||
"36"
|
||||
# https://devenv.sh/reference/options/
|
||||
packages =
|
||||
(with pkgs; [
|
||||
pkgs.nixgl.nixGLIntel
|
||||
cacert
|
||||
])
|
||||
++ lib.optionals pkgs.stdenv.isLinux (with pkgs; [
|
||||
atk
|
||||
cairo
|
||||
dbus
|
||||
dbus.lib
|
||||
dprint
|
||||
gdk-pixbuf
|
||||
glib.out
|
||||
glib-networking
|
||||
gobject-introspection
|
||||
gtk3
|
||||
harfbuzz
|
||||
libffi
|
||||
libsoup_3
|
||||
openssl.dev
|
||||
pango
|
||||
pkg-config
|
||||
treefmt
|
||||
webkitgtk_4_1
|
||||
zlib
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
librsvg
|
||||
freetype
|
||||
expat
|
||||
libayatana-appindicator
|
||||
libusb1
|
||||
])
|
||||
++ lib.optionals pkgs.stdenv.isDarwin [
|
||||
pkgs.darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
languages.java = {
|
||||
enable = true;
|
||||
gradle.enable = true;
|
||||
jdk.package = pkgs.jdk17;
|
||||
};
|
||||
in
|
||||
{
|
||||
# For Android SDK
|
||||
_module.args.pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
config.android_sdk.accept_license = true;
|
||||
languages.kotlin.enable = true;
|
||||
|
||||
languages.javascript = {
|
||||
enable = true;
|
||||
corepack.enable = true;
|
||||
pnpm.enable = true;
|
||||
npm.enable = true;
|
||||
};
|
||||
|
||||
devShells.default = pkgs.mkShell rec {
|
||||
packages = [
|
||||
# for running the jar
|
||||
pkgs.jdk25
|
||||
|
||||
# for build
|
||||
pkgs.electron
|
||||
pkgs.rpm
|
||||
pkgs.fpm
|
||||
pkgs.p7zip
|
||||
# For Windows GUI cross-build
|
||||
pkgs.wineWow64Packages.stable
|
||||
pkgs.zlib
|
||||
pkgs.squashfsTools
|
||||
pkgs.desktop-file-utils
|
||||
pkgs.fakeroot
|
||||
pkgs.libarchive
|
||||
pkgs.icu
|
||||
pkgs.nodejs_22
|
||||
pkgs.pnpm
|
||||
pkgs.pkg-config
|
||||
pkgs.python3
|
||||
pkgs.gcc
|
||||
pkgs.gnumake
|
||||
pkgs.binutils
|
||||
pkgs.git
|
||||
pkgs.node-gyp-build
|
||||
androidComposition.androidsdk
|
||||
];
|
||||
buildInputs = runtimeLibs;
|
||||
|
||||
shellHook = ''
|
||||
export LD_LIBRARY_PATH="${
|
||||
lib.makeLibraryPath [
|
||||
pkgs.systemd
|
||||
pkgs.hidapi
|
||||
]
|
||||
}:$LD_LIBRARY_PATH"
|
||||
|
||||
# VSCode's extension host sets ELECTRON_RUN_AS_NODE=1 on itself, and
|
||||
# shells it forks inherit it. It makes electron run as plain node, so
|
||||
# the main process crashes on `import { app } from 'electron'`.
|
||||
unset ELECTRON_RUN_AS_NODE
|
||||
'';
|
||||
|
||||
JAVA_HOME = "${pkgs.jdk25}/lib/openjdk";
|
||||
USE_SYSTEM_FPM = "true";
|
||||
ELECTRON_BUILDER_7ZIP_PATH = "${pkgs.p7zip}/bin/7za";
|
||||
APPIMAGE_TOOLS_PATH = "${appImageTools}";
|
||||
# for electron-vite, so `pnpm gui` works
|
||||
ELECTRON_EXEC_PATH = "${pkgs.electron}/bin/electron";
|
||||
ANDROID_HOME = "${androidComposition.androidsdk}/libexec/android-sdk";
|
||||
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_HOME}/build-tools/${buildToolsVersion}/aapt2";
|
||||
languages.rust = {
|
||||
enable = true;
|
||||
toolchain = fenixpkgs.fromToolchainName {
|
||||
name = rust_toolchain.toolchain.channel;
|
||||
sha256 = "sha256-yMuSb5eQPO/bHv+Bcf/US8LVMbf/G/0MSfiPwBhiPpk=";
|
||||
};
|
||||
components = rust_toolchain.toolchain.components;
|
||||
};
|
||||
|
||||
env = {
|
||||
GIO_EXTRA_MODULES = "${pkgs.glib-networking}/lib/gio/modules:${pkgs.dconf.lib}/lib/gio/modules";
|
||||
};
|
||||
|
||||
enterShell = with pkgs; ''
|
||||
# Export a LD_LIBRARY_PATH without libudev-zero as libgudev not likey
|
||||
export SLIMEVR_RUST_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
|
||||
export LD_LIBRARY_PATH="${libudev-zero}/lib:${libayatana-appindicator}/lib:$LD_LIBRARY_PATH"
|
||||
# GStreamer plugins won't be found without this
|
||||
export GST_PLUGIN_SYSTEM_PATH_1_0="${pkgs.gst_all_1.gstreamer.out}/lib/gstreamer-1.0:${pkgs.gst_all_1.gst-plugins-base}/lib/gstreamer-1.0:${pkgs.gst_all_1.gst-plugins-good}/lib/gstreamer-1.0:${pkgs.gst_all_1.gst-plugins-bad}/lib/gstreamer-1.0"
|
||||
'';
|
||||
};
|
||||
};
|
||||
flake = {
|
||||
# The usual flake attributes can be defined here, including system-
|
||||
# agnostic ones like nixosModule and system-enumerating ones, although
|
||||
# those are more easily expressed in perSystem.
|
||||
};
|
||||
};
|
||||
}
|
||||
+7
-17
@@ -1,30 +1,20 @@
|
||||
# Fixes bug with spotless. See https://github.com/diffplug/spotless/issues/834#issuecomment-819118761
|
||||
org.gradle.jvmargs=-Xmx4g -Xms1g \
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
|
||||
org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
|
||||
|
||||
org.gradle.parallel=true
|
||||
#org.gradle.caching=true
|
||||
org.gradle.configureondemand=true
|
||||
|
||||
kotlin.code.style=official
|
||||
# https://github.com/Kotlin/kotlinx-atomicfu#atomicfu-compiler-plugin
|
||||
kotlinx.atomicfu.enableJvmIrTransformation=true
|
||||
|
||||
android.useAndroidX=true
|
||||
android.nonTransitiveRClass=true
|
||||
#org.gradle.configuration-cache=true
|
||||
# solarxr-protocol:kotlin-codegen's generateTestSchemas isn't cache-compatible yet (submodule); degrade to a warning there instead of failing the whole build
|
||||
#org.gradle.configuration-cache.problems=warn
|
||||
org.gradle.unsafe.configuration-cache=false
|
||||
|
||||
kotlinVersion=2.3.10
|
||||
spotlessVersion=8.2.1
|
||||
shadowJarVersion=9.3.1
|
||||
buildconfigVersion=6.0.7
|
||||
wireVersion=5.3.1
|
||||
# sentry and sentry-android-core must stay on the same version
|
||||
sentryVersion=8.+
|
||||
sentryAndroidGradleVersion=6.23.0
|
||||
kotlinVersion=2.0.20
|
||||
spotlessVersion=7.0.2
|
||||
shadowJarVersion=8.3.2
|
||||
buildconfigVersion=5.5.0
|
||||
grgitVersion=5.2.2
|
||||
Vendored
BIN
Binary file not shown.
+1
-3
@@ -1,8 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
@@ -15,8 +15,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@@ -57,7 +55,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@@ -85,8 +83,10 @@ done
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@@ -114,7 +114,7 @@ case "$( uname )" in #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH="\\\"\\\""
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
@@ -133,13 +133,10 @@ location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
@@ -147,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
# shellcheck disable=SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
@@ -155,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
# shellcheck disable=SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
@@ -200,20 +197,16 @@ if "$cygwin" || "$msys" ; then
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
|
||||
Vendored
+12
-14
@@ -13,8 +13,6 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
@@ -59,22 +57,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
VITE_FIRMWARE_TOOL_URL=https://fw-tool-api.slimevr.io
|
||||
VITE_FIRMWARE_TOOL_S3_URL=https://fw-tool-bucket.slimevr.io
|
||||
FIRMWARE_TOOL_SCHEMA_URL=https://fw-tool-api.slimevr.io/api-json
|
||||
|
||||
|
||||
# VITE_FIRMWARE_TOOL_URL=http://localhost:3000
|
||||
# VITE_FIRMWARE_TOOL_S3_URL=http://localhost:9000
|
||||
# FIRMWARE_TOOL_SCHEMA_URL=http://localhost:3000/api-json
|
||||
+7
-11
@@ -1,16 +1,16 @@
|
||||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
|
||||
|
||||
# JS/TS dependencies
|
||||
node_modules/
|
||||
.pnp
|
||||
/node_modules
|
||||
/.pnp
|
||||
.pnp.js
|
||||
|
||||
# testing
|
||||
coverage/
|
||||
/coverage
|
||||
|
||||
# Build artifacts
|
||||
build/
|
||||
target/
|
||||
/build
|
||||
/target
|
||||
|
||||
# misc
|
||||
.DS_Store
|
||||
@@ -26,16 +26,12 @@ yarn-error.log*
|
||||
*.log
|
||||
|
||||
# vite
|
||||
dist/
|
||||
stats.html
|
||||
/dist
|
||||
/stats.html
|
||||
vite.config.ts.timestamp*
|
||||
electron.vite.config.*.mjs
|
||||
|
||||
# eslint
|
||||
.eslintcache
|
||||
|
||||
# Sentry Config File
|
||||
.env.sentry-build-plugin
|
||||
|
||||
# electron
|
||||
out/
|
||||
@@ -1,5 +1,5 @@
|
||||
export default {
|
||||
'app/**/*.{js,jsx,ts,tsx}':
|
||||
'pnpm --filter @slimevr/gui-app exec eslint --no-warn-ignored --cache --fix',
|
||||
'**/*.{ts,tsx}': () => 'tsc -p tsconfig.json --noEmit',
|
||||
'src/**/*.{js,jsx,ts,tsx}': 'eslint --max-warnings=0 --no-warn-ignored --cache --fix',
|
||||
'**/*.{js,jsx,ts,tsx,css,scss,md,json}': 'prettier --write',
|
||||
};
|
||||
@@ -1,213 +0,0 @@
|
||||
import eslint from '@eslint/js';
|
||||
import betterTailwind from 'eslint-plugin-better-tailwindcss';
|
||||
import boundaries from 'eslint-plugin-boundaries';
|
||||
import jsxA11y from 'eslint-plugin-jsx-a11y';
|
||||
import solid from 'eslint-plugin-solid/configs/typescript';
|
||||
import globals from 'globals';
|
||||
import tseslint from 'typescript-eslint';
|
||||
import l10n from './eslint/l10n.js';
|
||||
import layers from './eslint/layers.js';
|
||||
|
||||
const UI_DEEP_IMPORT = {
|
||||
group: ['@/ui/*/*'],
|
||||
message: 'Import a ui folder through its index, e.g. @/ui/select.',
|
||||
};
|
||||
|
||||
// Each entry is allowed only in the files listed in `allowedIn`
|
||||
const restricted = {
|
||||
toFixed: {
|
||||
allowedIn: ['src/lib/format.ts'],
|
||||
selector: "CallExpression[callee.property.name='toFixed']",
|
||||
message: 'Use fmt() from @/lib/format, it is locale aware.',
|
||||
},
|
||||
intl: {
|
||||
allowedIn: ['src/lib/format.ts'],
|
||||
selector: "NewExpression[callee.object.name='Intl']",
|
||||
message: 'Use fmt/fmtList/fmtRelative from @/lib/format, they cache per locale.',
|
||||
},
|
||||
storage: {
|
||||
allowedIn: ['src/lib/storage.ts', 'src/lib/storage.test.ts'],
|
||||
selector: 'Identifier[name=/^(localStorage|sessionStorage)$/]',
|
||||
message: 'Use definePref/defineCache/defineSession from @/lib/storage.',
|
||||
},
|
||||
electronApi: {
|
||||
allowedIn: ['src/app/platform/**'],
|
||||
selector: "MemberExpression[property.name='electronAPI']",
|
||||
message: 'Use platform from @/lib/platform.',
|
||||
},
|
||||
keydown: {
|
||||
allowedIn: ['src/lib/keyboard.ts', 'src/ui/motion/**'],
|
||||
selector:
|
||||
"CallExpression[callee.property.name='addEventListener'][arguments.0.value=/^key(down|up)$/]",
|
||||
message:
|
||||
'Use useShortcut from @/lib/keyboard, Escape goes to the back stack (useBack).',
|
||||
},
|
||||
android: {
|
||||
allowedIn: ['src/app/platform/**', 'src/env.d.ts'],
|
||||
selector: "Identifier[name='__ANDROID__']",
|
||||
message: 'Use platform from @/lib/platform.',
|
||||
},
|
||||
};
|
||||
|
||||
function allow(from, to) {
|
||||
return {
|
||||
from: { element: { type: from } },
|
||||
allow: { to: { element: { type: to } } },
|
||||
};
|
||||
}
|
||||
|
||||
function restrictedSyntax(except = []) {
|
||||
return [
|
||||
'error',
|
||||
...Object.entries(restricted)
|
||||
.filter(([name]) => !except.includes(name))
|
||||
.map(([, { selector, message }]) => ({ selector, message })),
|
||||
];
|
||||
}
|
||||
|
||||
function restrictedOverrides() {
|
||||
const byPattern = new Map();
|
||||
for (const [name, { allowedIn }] of Object.entries(restricted)) {
|
||||
for (const pattern of allowedIn) {
|
||||
byPattern.set(pattern, [...(byPattern.get(pattern) ?? []), name]);
|
||||
}
|
||||
}
|
||||
return [...byPattern].map(([pattern, names]) => ({
|
||||
files: [pattern],
|
||||
rules: { 'no-restricted-syntax': restrictedSyntax(names) },
|
||||
}));
|
||||
}
|
||||
|
||||
export default tseslint.config(
|
||||
eslint.configs.recommended,
|
||||
...tseslint.configs.recommended,
|
||||
{
|
||||
files: ['src/**/*.{ts,tsx}'],
|
||||
...solid,
|
||||
languageOptions: {
|
||||
parser: tseslint.parser,
|
||||
parserOptions: { projectService: true, tsconfigRootDir: import.meta.dirname },
|
||||
globals: globals.browser,
|
||||
},
|
||||
plugins: {
|
||||
...solid.plugins,
|
||||
boundaries,
|
||||
l10n,
|
||||
},
|
||||
settings: {
|
||||
'import/resolver': {
|
||||
typescript: { alwaysTryTypes: true, project: './tsconfig.json' },
|
||||
},
|
||||
'boundaries/include': ['src/**/*'],
|
||||
'boundaries/elements': [
|
||||
{ type: 'app', pattern: 'src/app' },
|
||||
{ type: 'ui', pattern: 'src/ui' },
|
||||
{ type: 'lib', pattern: 'src/lib' },
|
||||
{ type: 'solarxr', pattern: 'src/solarxr' },
|
||||
{ type: 'domain', pattern: 'src/domain/*', capture: ['concept'] },
|
||||
{ type: 'pages', pattern: 'src/pages/*', capture: ['page'] },
|
||||
{ type: 'assets', pattern: 'src/assets' },
|
||||
],
|
||||
},
|
||||
rules: {
|
||||
...solid.rules,
|
||||
// External packages and imports inside one element (same page, same concept) are not checked
|
||||
'boundaries/dependencies': [
|
||||
'error',
|
||||
{
|
||||
default: 'disallow',
|
||||
policies: [
|
||||
allow('app', ['app', 'ui', 'lib', 'solarxr', 'domain', 'pages', 'assets']),
|
||||
allow('pages', ['ui', 'lib', 'solarxr', 'domain', 'assets']),
|
||||
allow('domain', ['ui', 'lib', 'solarxr', 'domain', 'assets']),
|
||||
allow('solarxr', ['lib', 'solarxr']),
|
||||
allow('ui', ['ui', 'lib', 'assets']),
|
||||
allow('assets', ['lib']),
|
||||
],
|
||||
},
|
||||
],
|
||||
'l10n/message-id': 'error',
|
||||
'no-throw-literal': 'error',
|
||||
'no-duplicate-imports': 'error',
|
||||
'no-restricted-syntax': restrictedSyntax(),
|
||||
'@typescript-eslint/no-unused-vars': [
|
||||
'warn',
|
||||
{ argsIgnorePattern: '^_', varsIgnorePattern: '^_', ignoreRestSiblings: true },
|
||||
],
|
||||
},
|
||||
},
|
||||
...restrictedOverrides(),
|
||||
{
|
||||
files: ['src/lib/**/*.{ts,tsx}'],
|
||||
plugins: { layers },
|
||||
rules: { 'layers/no-jsx': 'error' },
|
||||
},
|
||||
// Peer range stops at ESLint 9 but the rules only read JSX attributes
|
||||
{ files: ['src/**/*.tsx'], ...jsxA11y.flatConfigs.recommended },
|
||||
// Long class strings wrap into a multiline template literal, fixed by lint:fix
|
||||
{
|
||||
files: ['src/**/*.tsx'],
|
||||
plugins: { 'better-tailwindcss': betterTailwind },
|
||||
settings: { 'better-tailwindcss': { entryPoint: 'src/styles.css' } },
|
||||
rules: {
|
||||
'better-tailwindcss/enforce-consistent-line-wrapping': [
|
||||
'error',
|
||||
// Packed lines, no line per variant group. Wider than prettier so
|
||||
// only really long strings wrap at JSX indentation depth.
|
||||
{
|
||||
printWidth: 100,
|
||||
group: 'never',
|
||||
preferSingleLine: true,
|
||||
strictness: 'loose',
|
||||
},
|
||||
],
|
||||
// The type scale is the text tokens in styles.css, nothing else
|
||||
'better-tailwindcss/no-restricted-classes': [
|
||||
'error',
|
||||
{
|
||||
restrict: [
|
||||
{
|
||||
pattern: '^(?:.*:)?!?text-[\\[(].*$',
|
||||
message: 'No arbitrary text values, use text-standard, text-section or text-title.',
|
||||
},
|
||||
{
|
||||
pattern: '^(?:.*:)?!?text-(?:xs|sm|base|lg|xl|\\dxl)$',
|
||||
message: 'Tailwind sizes are removed, use text-standard, text-section or text-title.',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
// Solid compiles `ref={x}` into an assignment the rule cannot see
|
||||
{ files: ['src/**/*.tsx'], rules: { 'no-unassigned-vars': 'off' } },
|
||||
// Motion hooks belong to ui primitives, pages only use the containers
|
||||
{
|
||||
files: ['src/**/*.{ts,tsx}'],
|
||||
ignores: ['src/ui/**'],
|
||||
rules: {
|
||||
'no-restricted-imports': [
|
||||
'error',
|
||||
{
|
||||
paths: [
|
||||
{
|
||||
name: '@/ui/motion',
|
||||
importNames: ['useMotionItem'],
|
||||
message: 'Only ui primitives register motion items.',
|
||||
},
|
||||
],
|
||||
patterns: [UI_DEEP_IMPORT],
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
// Each ui folder is entered through its index; files inside it import each other relatively
|
||||
{
|
||||
files: ['src/ui/**/*.{ts,tsx}'],
|
||||
rules: { 'no-restricted-imports': ['error', { patterns: [UI_DEEP_IMPORT] }] },
|
||||
},
|
||||
// Local rules run in node
|
||||
{ files: ['eslint/**/*.js'], languageOptions: { globals: globals.node } },
|
||||
// Tests build their own bundles with made-up ids
|
||||
{ files: ['src/**/*.test.{ts,tsx}'], rules: { 'l10n/message-id': 'off' } }
|
||||
);
|
||||
@@ -1,202 +0,0 @@
|
||||
// Checks Fluent ids against the en-US translation.ftl: literal ids passed to `t`, `t.attr`,
|
||||
// the `id` prop of l10n components (with args), and any other string literal typed as MessageId
|
||||
// (props, options, `satisfies Record<..., MessageId>`). Ids must be full literals, args must match.
|
||||
import { parse } from '@fluent/syntax';
|
||||
import { readFileSync, statSync } from 'node:fs';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const FTL_FILE = fileURLToPath(new URL('../../app/public/i18n/en/translation.ftl', import.meta.url));
|
||||
const COMPONENTS = new Set(['Localized']);
|
||||
|
||||
let cache = { mtime: -1, messages: new Map() };
|
||||
|
||||
function collect(node, out) {
|
||||
if (!node || typeof node !== 'object') return;
|
||||
if (Array.isArray(node)) {
|
||||
for (const child of node) collect(child, out);
|
||||
return;
|
||||
}
|
||||
if (node.type === 'VariableReference') out.vars.add(node.id.name);
|
||||
else if (node.type === 'MessageReference') {
|
||||
out.refs.push({ id: node.id.name, attr: node.attribute?.name ?? null });
|
||||
}
|
||||
for (const [key, value] of Object.entries(node)) {
|
||||
if (key !== 'span' && typeof value === 'object') collect(value, out);
|
||||
}
|
||||
}
|
||||
|
||||
function patternInfo(pattern) {
|
||||
const out = { vars: new Set(), refs: [] };
|
||||
collect(pattern, out);
|
||||
return out;
|
||||
}
|
||||
|
||||
function loadMessages() {
|
||||
const mtime = statSync(FTL_FILE).mtimeMs;
|
||||
if (mtime === cache.mtime) return cache.messages;
|
||||
const messages = new Map();
|
||||
for (const entry of parse(readFileSync(FTL_FILE, 'utf8'), { withSpans: false }).body) {
|
||||
if (entry.type !== 'Message') continue;
|
||||
messages.set(entry.id.name, {
|
||||
value: entry.value ? patternInfo(entry.value) : null,
|
||||
attrs: new Map(entry.attributes.map((a) => [a.id.name, patternInfo(a.value)])),
|
||||
});
|
||||
}
|
||||
cache = { mtime, messages };
|
||||
return messages;
|
||||
}
|
||||
|
||||
function requiredVars(messages, id, attr, seen = new Set()) {
|
||||
const key = `${id}.${attr ?? ''}`;
|
||||
const message = messages.get(id);
|
||||
const info = attr === null ? message?.value : message?.attrs.get(attr);
|
||||
if (!info || seen.has(key)) return new Set();
|
||||
seen.add(key);
|
||||
const vars = new Set(info.vars);
|
||||
for (const ref of info.refs) {
|
||||
for (const v of requiredVars(messages, ref.id, ref.attr, seen)) vars.add(v);
|
||||
}
|
||||
return vars;
|
||||
}
|
||||
|
||||
// `handled` collects literals already checked through t()/Localized, so the type-based pass skips them
|
||||
function literalIds(node, context, handled) {
|
||||
if (node.type === 'Literal' || node.type === 'TemplateLiteral') handled.add(node);
|
||||
if (node.type === 'Literal' && typeof node.value === 'string') return [node.value];
|
||||
if (node.type === 'TemplateLiteral') {
|
||||
if (node.expressions.length === 0) return [node.quasis[0].value.cooked];
|
||||
context.report({ node, messageId: 'dynamic' });
|
||||
return null;
|
||||
}
|
||||
if (node.type === 'ConditionalExpression') {
|
||||
const a = literalIds(node.consequent, context, handled);
|
||||
const b = literalIds(node.alternate, context, handled);
|
||||
return a && b ? [...a, ...b] : null;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function isMessageIdType(type) {
|
||||
if (!type) return false;
|
||||
if (type.aliasSymbol?.escapedName === 'MessageId') return true;
|
||||
return type.isUnion() && type.types.some(isMessageIdType);
|
||||
}
|
||||
|
||||
function propName(prop) {
|
||||
if (prop.computed) return null;
|
||||
if (prop.key.type === 'Identifier') return prop.key.name;
|
||||
if (prop.key.type === 'Literal') return String(prop.key.value);
|
||||
return null;
|
||||
}
|
||||
|
||||
const messageId = {
|
||||
meta: {
|
||||
type: 'problem',
|
||||
docs: { description: 'Fluent ids exist in en-US and get the args they need' },
|
||||
schema: [],
|
||||
messages: {
|
||||
dynamic: 'Fluent ids must be full literals so they stay greppable.',
|
||||
unknown: 'Unknown Fluent id "{{id}}" (not in en-US translation.ftl).',
|
||||
noValue: 'Fluent message "{{id}}" has no value, only attributes.',
|
||||
unknownAttr: 'Fluent message "{{id}}" has no attribute "{{attr}}".',
|
||||
missingArgs: 'Fluent message "{{id}}" needs args: {{vars}}.',
|
||||
unknownArg: 'Fluent message "{{id}}" does not use arg "{{arg}}".',
|
||||
},
|
||||
},
|
||||
create(context) {
|
||||
const messages = loadMessages();
|
||||
const handled = new WeakSet();
|
||||
const services = context.sourceCode.parserServices;
|
||||
const checker = services?.program?.getTypeChecker();
|
||||
|
||||
function typedAsMessageId(node) {
|
||||
const tsNode = services.esTreeNodeToTSNodeMap.get(node);
|
||||
return isMessageIdType(checker.getContextualType(tsNode));
|
||||
}
|
||||
|
||||
function checkTyped(node) {
|
||||
if (!checker || handled.has(node) || !typedAsMessageId(node)) return;
|
||||
check(node, { attr: undefined, withArgs: false });
|
||||
}
|
||||
|
||||
function checkArgs(node, id, attr, argsNode) {
|
||||
const vars = requiredVars(messages, id, attr);
|
||||
if (!argsNode) {
|
||||
if (vars.size) context.report({ node, messageId: 'missingArgs', data: { id, vars: [...vars].join(', ') } });
|
||||
return;
|
||||
}
|
||||
if (argsNode.type !== 'ObjectExpression') return;
|
||||
if (argsNode.properties.some((p) => p.type !== 'Property' || propName(p) === null)) return;
|
||||
const given = new Set(argsNode.properties.map(propName));
|
||||
const missing = [...vars].filter((v) => !given.has(v));
|
||||
if (missing.length) {
|
||||
context.report({ node: argsNode, messageId: 'missingArgs', data: { id, vars: missing.join(', ') } });
|
||||
}
|
||||
for (const prop of argsNode.properties) {
|
||||
const arg = propName(prop);
|
||||
if (!vars.has(arg)) context.report({ node: prop, messageId: 'unknownArg', data: { id, arg } });
|
||||
}
|
||||
}
|
||||
|
||||
function check(idNode, { attr, argsNode, withArgs }) {
|
||||
const ids = literalIds(idNode, context, handled);
|
||||
if (!ids) return;
|
||||
for (const id of ids) {
|
||||
const message = messages.get(id);
|
||||
if (!message) {
|
||||
context.report({ node: idNode, messageId: 'unknown', data: { id } });
|
||||
continue;
|
||||
}
|
||||
if (attr === undefined && !message.value) {
|
||||
context.report({ node: idNode, messageId: 'noValue', data: { id } });
|
||||
continue;
|
||||
}
|
||||
if (typeof attr === 'string' && !message.attrs.has(attr)) {
|
||||
context.report({ node: idNode, messageId: 'unknownAttr', data: { id, attr } });
|
||||
continue;
|
||||
}
|
||||
if (withArgs && attr !== null) checkArgs(idNode, id, attr ?? null, argsNode);
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
CallExpression(node) {
|
||||
const { callee } = node;
|
||||
const [first, second, third] = node.arguments;
|
||||
if (!first) return;
|
||||
if (callee.type === 'Identifier' && callee.name === 't') {
|
||||
check(first, { attr: undefined, argsNode: second, withArgs: true });
|
||||
} else if (
|
||||
callee.type === 'MemberExpression' &&
|
||||
callee.object.type === 'Identifier' &&
|
||||
callee.object.name === 't' &&
|
||||
callee.property.type === 'Identifier' &&
|
||||
callee.property.name === 'attr' &&
|
||||
second
|
||||
) {
|
||||
const attr = second.type === 'Literal' && typeof second.value === 'string' ? second.value : null;
|
||||
check(first, { attr, argsNode: third, withArgs: true });
|
||||
}
|
||||
},
|
||||
JSXOpeningElement(node) {
|
||||
if (node.name.type !== 'JSXIdentifier' || !COMPONENTS.has(node.name.name)) return;
|
||||
const attrs = node.attributes.filter((a) => a.type === 'JSXAttribute');
|
||||
const idAttr = attrs.find((a) => a.name.name === 'id');
|
||||
if (!idAttr?.value) return;
|
||||
const idNode = idAttr.value.type === 'JSXExpressionContainer' ? idAttr.value.expression : idAttr.value;
|
||||
const argsAttr = attrs.find((a) => a.name.name === 'args');
|
||||
// Spread props may carry args, skip the args check then
|
||||
const withArgs = !node.attributes.some((a) => a.type === 'JSXSpreadAttribute');
|
||||
const argsNode = argsAttr?.value?.type === 'JSXExpressionContainer' ? argsAttr.value.expression : undefined;
|
||||
check(idNode, { attr: undefined, argsNode, withArgs });
|
||||
},
|
||||
// Props, options and `satisfies Record<..., MessageId>` values: anything typed MessageId
|
||||
Literal(node) {
|
||||
if (typeof node.value === 'string') checkTyped(node);
|
||||
},
|
||||
TemplateLiteral: checkTyped,
|
||||
};
|
||||
},
|
||||
};
|
||||
|
||||
export default { rules: { 'message-id': messageId } };
|
||||
@@ -1,14 +0,0 @@
|
||||
// lib holds services and reactive state, anything that renders lives in ui
|
||||
const noJsx = {
|
||||
meta: {
|
||||
type: 'problem',
|
||||
messages: { jsx: 'No JSX in lib, components belong in ui.' },
|
||||
schema: [],
|
||||
},
|
||||
create(context) {
|
||||
const report = (node) => context.report({ node, messageId: 'jsx' });
|
||||
return { JSXElement: report, JSXFragment: report };
|
||||
},
|
||||
};
|
||||
|
||||
export default { rules: { 'no-jsx': noJsx } };
|
||||
@@ -1,17 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="icon" href="/favicon.ico" />
|
||||
<meta name="viewport" content="width=device-width, minimum-scale=1.0" />
|
||||
<meta name="theme-color" content="#000000" />
|
||||
<link rel="apple-touch-icon" href="/logo192.png" />
|
||||
<link rel="manifest" href="/manifest.json" />
|
||||
<title>SlimeVR GUI</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/index.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,69 +0,0 @@
|
||||
{
|
||||
"name": "@slimevr/gui-app-next",
|
||||
"version": "0.0.0",
|
||||
"author": "SlimeVR Team <[email protected]>",
|
||||
"homepage": "https://slimevr.dev",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
"preview": "vite preview",
|
||||
"typecheck": "tsc --noEmit -p tsconfig.json && tsc --noEmit -p tsconfig.node.json",
|
||||
"test": "vitest run",
|
||||
"lint": "pnpm typecheck && eslint src && prettier --check \"src/**/*.{ts,tsx,css,json}\"",
|
||||
"lint:fix": "eslint --fix src && prettier --write \"src/**/*.{ts,tsx,css,json}\""
|
||||
},
|
||||
"dependencies": {
|
||||
"@fluent/bundle": "0.19.1",
|
||||
"@fluent/langneg": "0.7.0",
|
||||
"@fontsource-variable/lexend": "5.3.0",
|
||||
"@fontsource/jetbrains-mono": "5.3.0",
|
||||
"@fontsource/noto-sans": "5.3.0",
|
||||
"@fontsource/opendyslexic": "5.3.0",
|
||||
"@fontsource/poppins": "5.2.7",
|
||||
"@fontsource/ubuntu": "5.3.0",
|
||||
"@sentry/solid": "11.9.0",
|
||||
"@slimevr/gui-shared": "workspace:*",
|
||||
"@solidjs/router": "1.0.0",
|
||||
"browser-fs-access": "0.38.0",
|
||||
"flatbuffers": "22.10.26",
|
||||
"semver": "7.7.4",
|
||||
"solarxr-protocol": "workspace:*",
|
||||
"solid-js": "1.9.17",
|
||||
"valibot": "1.5.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "10.0.1",
|
||||
"@sentry/vite-plugin": "11.9.0",
|
||||
"@fluent/syntax": "0.19.0",
|
||||
"@iconify-json/heroicons": "1.2.3",
|
||||
"@iconify-json/ic": "1.2.4",
|
||||
"@iconify-json/lucide": "1.2.147",
|
||||
"@iconify-json/material-symbols": "1.2.96",
|
||||
"@solidjs/testing-library": "0.8.10",
|
||||
"@tailwindcss/vite": "4.3.3",
|
||||
"@testing-library/jest-dom": "7.0.1",
|
||||
"@testing-library/user-event": "14.6.8",
|
||||
"@types/node": "26.6.5",
|
||||
"@types/semver": "7.7.1",
|
||||
"axe-core": "4.14.0",
|
||||
"eslint": "10.13.0",
|
||||
"eslint-import-resolver-typescript": "^4.4.4",
|
||||
"eslint-plugin-better-tailwindcss": "4.10.0",
|
||||
"eslint-plugin-boundaries": "7.3.0",
|
||||
"eslint-plugin-jsx-a11y": "6.10.2",
|
||||
"eslint-plugin-solid": "0.18.1",
|
||||
"globals": "17.13.0",
|
||||
"jsdom": "30.1.3",
|
||||
"prettier": "3.9.10",
|
||||
"tailwindcss": "4.3.3",
|
||||
"typescript": "~6.0.3",
|
||||
"typescript-eslint": "8.72.0",
|
||||
"unplugin-icons": "24.0.0",
|
||||
"vite": "8.3.5",
|
||||
"vite-imagetools": "12.0.1",
|
||||
"vite-plugin-solid": "2.11.14",
|
||||
"vitest": "5.0.5"
|
||||
}
|
||||
}
|
||||
@@ -1,86 +0,0 @@
|
||||
import { useMatch } from '@solidjs/router';
|
||||
import { type JSX, Show } from 'solid-js';
|
||||
import HomeIcon from '~icons/material-symbols/home';
|
||||
import DesignIcon from '~icons/material-symbols/palette-outline-rounded';
|
||||
import GearIcon from '~icons/material-symbols/settings-rounded';
|
||||
import RulerIcon from '~icons/material-symbols/straighten-rounded';
|
||||
import { ConnectionGate } from '@/app/connection-gate';
|
||||
import { paths } from '@/app/routes';
|
||||
import { TitleBar } from '@/app/title-bar';
|
||||
import { handleBack } from '@/lib/back-stack';
|
||||
import { createMediaQuery, SHELL_QUERY } from '@/lib/media';
|
||||
import { MotionRegion } from '@/ui/motion';
|
||||
import { NavLink } from '@/ui/nav-link';
|
||||
|
||||
const MOUSE_BACK = 3;
|
||||
|
||||
// Same destinations at every width: bottom bar on phones, rail from `shell` up
|
||||
function Destinations() {
|
||||
const rail = createMediaQuery(SHELL_QUERY);
|
||||
|
||||
return (
|
||||
<MotionRegion
|
||||
orientation={rail() ? 'vertical' : 'horizontal'}
|
||||
class="
|
||||
order-last flex justify-around gap-sm px-sm pt-sm shell:order-first shell:flex-col
|
||||
shell:w-27.5 shell:shrink-0 shell:justify-start shell:pt-0 shell:pb-sm
|
||||
"
|
||||
>
|
||||
<NavLink to={paths.home} end label="navbar-home" icon={<HomeIcon />} />
|
||||
<NavLink
|
||||
to={paths.body}
|
||||
label="navbar-body_proportions"
|
||||
icon={<RulerIcon class="icon -rotate-45" />}
|
||||
/>
|
||||
<Show when={import.meta.env.DEV}>
|
||||
<NavLink
|
||||
to={paths.design}
|
||||
label="navbar-design"
|
||||
icon={<DesignIcon />}
|
||||
/>
|
||||
</Show>
|
||||
<div class="contents shell:mt-auto shell:flex shell:flex-col">
|
||||
<NavLink
|
||||
to={paths.settings}
|
||||
label="navbar-settings"
|
||||
icon={<GearIcon />}
|
||||
/>
|
||||
</div>
|
||||
</MotionRegion>
|
||||
);
|
||||
}
|
||||
|
||||
export function AppShell(props: { children: JSX.Element }) {
|
||||
// Setup runs without destinations, the flow footer owns the bottom
|
||||
const onboarding = useMatch(() => `${paths.onboarding}/*`);
|
||||
|
||||
function onPointerUp(e: PointerEvent) {
|
||||
if (e.button !== MOUSE_BACK) return;
|
||||
if (handleBack()) e.preventDefault();
|
||||
}
|
||||
|
||||
return (
|
||||
<div
|
||||
class="flex h-dvh flex-col bg-surface text-fg surface-sidebar"
|
||||
onPointerUp={onPointerUp}
|
||||
>
|
||||
<TitleBar />
|
||||
<ConnectionGate>
|
||||
<div class="flex min-h-0 flex-1 flex-col shell:flex-row">
|
||||
<Show when={!onboarding()}>
|
||||
<Destinations />
|
||||
</Show>
|
||||
<main
|
||||
classList={{ 'shell:ml-sm': !!onboarding() }}
|
||||
class="
|
||||
relative min-h-0 flex-1 overflow-y-auto overscroll-contain @container shell:mb-sm
|
||||
shell:scrollbar-gutter-stable
|
||||
"
|
||||
>
|
||||
{props.children}
|
||||
</main>
|
||||
</div>
|
||||
</ConnectionGate>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
import { HashRouter, type RouteSectionProps } from '@solidjs/router';
|
||||
import { withSentryRouterRouting } from '@sentry/solid/solidrouter';
|
||||
import { AppShell } from '@/app/app-shell';
|
||||
import { CrashBoundary } from '@/app/crash-screen';
|
||||
import { useHistoryBack } from '@/app/history-back';
|
||||
import { paths, routes } from '@/app/routes';
|
||||
import { searchDestinations } from '@/app/search-destinations';
|
||||
import { useShortcut } from '@/lib/keyboard';
|
||||
import { DOCS_SITE } from '@/lib/links';
|
||||
import { platform } from '@/lib/platform';
|
||||
import { QuickSearch } from '@/pages/settings/quick-search/quick-search';
|
||||
import { DialogHost } from '@/ui/dialog';
|
||||
import { MotionRoot } from '@/ui/motion';
|
||||
import { ToastHost } from '@/ui/toast';
|
||||
|
||||
const Router = withSentryRouterRouting(HashRouter);
|
||||
|
||||
function AppRoot(props: RouteSectionProps) {
|
||||
useHistoryBack();
|
||||
useShortcut('F1', () => platform.openUrl(DOCS_SITE), {
|
||||
scope: 'global',
|
||||
label: 'titlebar-docs',
|
||||
});
|
||||
|
||||
return (
|
||||
<MotionRoot>
|
||||
<AppShell>{props.children}</AppShell>
|
||||
<QuickSearch base={paths.settings} destinations={searchDestinations} />
|
||||
<DialogHost />
|
||||
<ToastHost />
|
||||
</MotionRoot>
|
||||
);
|
||||
}
|
||||
|
||||
export function App() {
|
||||
return (
|
||||
<CrashBoundary>
|
||||
<Router root={AppRoot}>{routes}</Router>
|
||||
</CrashBoundary>
|
||||
);
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
import { createPlatform } from '@/app/platform/detect';
|
||||
import { startReleaseCheck } from '@/domain/app-update/release-check';
|
||||
import { startDatafeed } from '@/domain/datafeed';
|
||||
import { initErrorReporting } from '@/domain/error-reporting';
|
||||
import { initSaveToasts } from '@/domain/settings/save-toasts';
|
||||
import { initKeyboard } from '@/lib/keyboard';
|
||||
import { initL10n } from '@/lib/l10n';
|
||||
import { setPlatform } from '@/lib/platform';
|
||||
import { loadPrefs } from '@/lib/storage';
|
||||
import { createSocketClient, serverUrl, setClient } from '@/solarxr/client';
|
||||
|
||||
// Everything that runs before render, in order. Returns the stop for the
|
||||
// background services.
|
||||
export async function boot(): Promise<() => void> {
|
||||
setPlatform(await createPlatform());
|
||||
setClient(createSocketClient({ url: serverUrl() }));
|
||||
await initErrorReporting();
|
||||
await loadPrefs();
|
||||
await initL10n();
|
||||
|
||||
const services = [
|
||||
initKeyboard(),
|
||||
initSaveToasts(),
|
||||
startReleaseCheck(),
|
||||
startDatafeed(),
|
||||
];
|
||||
return () => {
|
||||
for (const stop of services) stop();
|
||||
};
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
import { cleanup, render, screen } from '@solidjs/testing-library';
|
||||
import {
|
||||
ErrorReportingConsent,
|
||||
ErrorReportingSettingsResponseT,
|
||||
} from 'solarxr-protocol';
|
||||
import { afterEach, beforeAll, describe, expect, it } from 'vitest';
|
||||
import { ConnectionGate } from '@/app/connection-gate';
|
||||
import { setPlatform } from '@/lib/platform';
|
||||
import { fakePlatform } from '@/lib/platform-fake';
|
||||
import { setClient } from '@/solarxr/client';
|
||||
import { createFakeClient, type FakeClient } from '@/solarxr/testing';
|
||||
|
||||
let fake: FakeClient;
|
||||
|
||||
beforeAll(() => {
|
||||
setPlatform(fakePlatform());
|
||||
fake = createFakeClient({ connected: false });
|
||||
setClient(fake);
|
||||
});
|
||||
|
||||
function consent(value: ErrorReportingConsent) {
|
||||
fake.push(new ErrorReportingSettingsResponseT(value, 'user-1', 'session-1'));
|
||||
}
|
||||
|
||||
function renderGate() {
|
||||
render(() => (
|
||||
<ConnectionGate>
|
||||
<p>app</p>
|
||||
</ConnectionGate>
|
||||
));
|
||||
}
|
||||
|
||||
// Resources are module state, so the cases run as one story in order
|
||||
describe('ConnectionGate', () => {
|
||||
afterEach(cleanup);
|
||||
|
||||
it('shows the timeout error when the first connect takes too long', () => {
|
||||
renderGate();
|
||||
expect(screen.getByText('websocket-connecting')).toBeInTheDocument();
|
||||
fake.setTimedOut(true);
|
||||
expect(screen.getByText('websocket-timedout')).toBeInTheDocument();
|
||||
expect(screen.queryByText('app')).toBeNull();
|
||||
fake.setTimedOut(false);
|
||||
});
|
||||
|
||||
it('waits for consent, asks it, then shows the app and covers it on loss', () => {
|
||||
renderGate();
|
||||
fake.connect();
|
||||
expect(screen.getByText('websocket-connecting')).toBeInTheDocument();
|
||||
expect(screen.queryByText('app')).toBeNull();
|
||||
|
||||
consent(ErrorReportingConsent.UNDECIDED);
|
||||
expect(
|
||||
screen.getByText('error_collection_modal-title')
|
||||
).toBeInTheDocument();
|
||||
expect(screen.queryByText('app')).toBeNull();
|
||||
|
||||
consent(ErrorReportingConsent.ALLOWED);
|
||||
expect(screen.queryByText('error_collection_modal-title')).toBeNull();
|
||||
expect(screen.getByText('app').parentElement).not.toHaveClass('hidden');
|
||||
|
||||
fake.disconnect();
|
||||
expect(screen.getByText('websocket-connection_lost')).toBeInTheDocument();
|
||||
// Kept mounted under the screen
|
||||
expect(screen.getByText('app').parentElement).toHaveClass('hidden');
|
||||
|
||||
fake.connect();
|
||||
consent(ErrorReportingConsent.ALLOWED);
|
||||
expect(screen.queryByText('websocket-connection_lost')).toBeNull();
|
||||
expect(screen.getByText('app').parentElement).not.toHaveClass('hidden');
|
||||
});
|
||||
});
|
||||
@@ -1,188 +0,0 @@
|
||||
import {
|
||||
createEffect,
|
||||
createSignal,
|
||||
type JSX,
|
||||
Match,
|
||||
onMount,
|
||||
Show,
|
||||
Switch,
|
||||
} from 'solid-js';
|
||||
import { ErrorReportingConsent } from 'solarxr-protocol';
|
||||
import {
|
||||
answerConsent,
|
||||
crashReportAvailable,
|
||||
errorReportingSettings,
|
||||
needsConsentAnswer,
|
||||
sendCrashReport,
|
||||
} from '@/domain/error-reporting';
|
||||
import { ErrorReportingDetails } from '@/domain/error-reporting/error-reporting-details';
|
||||
import { cx } from '@/lib/cx';
|
||||
import { t } from '@/lib/l10n';
|
||||
import { platform, type CrashKind } from '@/lib/platform';
|
||||
import { flushPrefs } from '@/lib/storage';
|
||||
import { client } from '@/solarxr/client';
|
||||
import { TextButton } from '@/ui/button';
|
||||
import { focusEntry, MotionRegion } from '@/ui/motion';
|
||||
import { StatusState } from '@/ui/status-state';
|
||||
|
||||
type GateScreen = 'connection' | 'consent';
|
||||
|
||||
function CrashReportBanner(props: { kind: CrashKind }) {
|
||||
const [sent, setSent] = createSignal(false);
|
||||
const [sending, setSending] = createSignal(false);
|
||||
|
||||
async function send() {
|
||||
setSending(true);
|
||||
try {
|
||||
if (await sendCrashReport(props.kind)) setSent(true);
|
||||
} finally {
|
||||
setSending(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Show when={crashReportAvailable()}>
|
||||
<div
|
||||
class="
|
||||
flex w-full max-w-2xl flex-wrap items-center justify-between gap-md rounded-lg bg-surface
|
||||
px-lg py-md surface-section
|
||||
"
|
||||
>
|
||||
<p>
|
||||
{t(sent() ? 'websocket-report-sent' : 'websocket-report-question')}
|
||||
</p>
|
||||
<Show when={!sent()}>
|
||||
<TextButton
|
||||
label="websocket-report-send"
|
||||
loading={sending()}
|
||||
onClick={send}
|
||||
/>
|
||||
</Show>
|
||||
</div>
|
||||
</Show>
|
||||
);
|
||||
}
|
||||
|
||||
function ConnectionScreen() {
|
||||
const timedOut = () => client.status() === 'connecting' && client.timedOut();
|
||||
const lost = () => client.status() === 'disconnected';
|
||||
|
||||
async function close() {
|
||||
await flushPrefs();
|
||||
platform.window?.close();
|
||||
}
|
||||
|
||||
return (
|
||||
<Show
|
||||
when={timedOut() || lost()}
|
||||
fallback={
|
||||
<StatusState kind="loading" size="page" title="websocket-connecting" />
|
||||
}
|
||||
>
|
||||
<div class="flex flex-1 flex-col items-center gap-lg p-lg">
|
||||
<StatusState
|
||||
kind="error"
|
||||
size="page"
|
||||
title={
|
||||
timedOut() ? 'websocket-timedout' : 'websocket-connection_lost'
|
||||
}
|
||||
description={
|
||||
timedOut()
|
||||
? 'websocket-timedout-desc'
|
||||
: 'websocket-connection_lost-desc'
|
||||
}
|
||||
action={
|
||||
<Show when={platform.window}>
|
||||
<div class="flex flex-wrap justify-center gap-sm">
|
||||
<TextButton
|
||||
variant="primary"
|
||||
label="websocket-error-close"
|
||||
onClick={close}
|
||||
/>
|
||||
<Show when={platform.folders}>
|
||||
{(folders) => (
|
||||
<TextButton
|
||||
label="websocket-error-logs"
|
||||
onClick={() => void folders().openLogs()}
|
||||
/>
|
||||
)}
|
||||
</Show>
|
||||
</div>
|
||||
</Show>
|
||||
}
|
||||
/>
|
||||
<CrashReportBanner kind={timedOut() ? 'timeout' : 'connection_lost'} />
|
||||
</div>
|
||||
</Show>
|
||||
);
|
||||
}
|
||||
|
||||
function ConsentScreen() {
|
||||
let el!: HTMLDivElement;
|
||||
onMount(() => focusEntry(el));
|
||||
|
||||
return (
|
||||
<div
|
||||
ref={el}
|
||||
class="flex min-h-0 flex-1 justify-center overflow-y-auto p-lg"
|
||||
>
|
||||
<MotionRegion class="flex w-full max-w-2xl flex-col items-center gap-lg">
|
||||
<StatusState
|
||||
kind="empty"
|
||||
title="error_collection_modal-title"
|
||||
description="error_collection_modal-subtitle"
|
||||
/>
|
||||
<ErrorReportingDetails />
|
||||
<p class="text-center">{t('error_collection_modal-change_later')}</p>
|
||||
<div class="flex w-full flex-wrap-reverse justify-between gap-md">
|
||||
<TextButton
|
||||
variant="ghost"
|
||||
label="error_collection_modal-cancel"
|
||||
onClick={() => answerConsent(ErrorReportingConsent.DENIED)}
|
||||
/>
|
||||
<TextButton
|
||||
variant="primary"
|
||||
label="error_collection_modal-confirm"
|
||||
onClick={() => answerConsent(ErrorReportingConsent.ALLOWED)}
|
||||
/>
|
||||
</div>
|
||||
</MotionRegion>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export function ConnectionGate(props: { children: JSX.Element }) {
|
||||
const [shown, setShown] = createSignal(false);
|
||||
|
||||
function screen(): GateScreen | null {
|
||||
if (client.status() !== 'connected') return 'connection';
|
||||
if (!shown() && errorReportingSettings.state() !== 'fresh')
|
||||
return 'connection';
|
||||
if (needsConsentAnswer()) return 'consent';
|
||||
return null;
|
||||
}
|
||||
|
||||
createEffect(() => {
|
||||
if (!screen()) setShown(true);
|
||||
});
|
||||
|
||||
return (
|
||||
<>
|
||||
<Switch>
|
||||
<Match when={screen() === 'connection'}>
|
||||
<ConnectionScreen />
|
||||
</Match>
|
||||
<Match when={screen() === 'consent'}>
|
||||
<ConsentScreen />
|
||||
</Match>
|
||||
</Switch>
|
||||
<Show when={shown()}>
|
||||
<div
|
||||
class={cx('min-h-0 flex-1 flex-col', screen() ? 'hidden' : 'flex')}
|
||||
>
|
||||
{props.children}
|
||||
</div>
|
||||
</Show>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
import { ErrorBoundary, type JSX, Show } from 'solid-js';
|
||||
import { MinimalTitleBar } from '@/app/title-bar';
|
||||
import { lastReportId, reportError } from '@/domain/error-reporting';
|
||||
import { t } from '@/lib/l10n';
|
||||
import { TextButton } from '@/ui/button';
|
||||
import { CopyButton } from '@/ui/copy-button';
|
||||
import { StatusState } from '@/ui/status-state';
|
||||
|
||||
function CrashScreen(props: { eventId: string | undefined }) {
|
||||
return (
|
||||
<div class="flex h-screen flex-col bg-surface text-fg surface-sidebar">
|
||||
<MinimalTitleBar />
|
||||
<div class="flex min-h-0 flex-1 flex-col overflow-y-auto">
|
||||
<StatusState
|
||||
kind="error"
|
||||
size="page"
|
||||
title="crash_screen-title"
|
||||
description="crash_screen-description"
|
||||
action={
|
||||
<div class="flex flex-col items-center gap-md">
|
||||
<Show when={props.eventId}>
|
||||
{(id) => (
|
||||
<p class="font-mono select-text">
|
||||
{t('crash_screen-event_id', { id: id() })}
|
||||
</p>
|
||||
)}
|
||||
</Show>
|
||||
<div class="flex flex-wrap justify-center gap-sm">
|
||||
<Show when={props.eventId}>
|
||||
{(id) => <CopyButton text={id()} label="crash_screen-copy" />}
|
||||
</Show>
|
||||
<TextButton
|
||||
variant="primary"
|
||||
label="crash_screen-reload"
|
||||
onClick={() => window.location.reload()}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export function CrashBoundary(props: { children: JSX.Element }) {
|
||||
return (
|
||||
<ErrorBoundary
|
||||
fallback={(error) => {
|
||||
reportError(error, { tags: { boundary: 'app' } });
|
||||
return <CrashScreen eventId={lastReportId()} />;
|
||||
}}
|
||||
>
|
||||
{props.children}
|
||||
</ErrorBoundary>
|
||||
);
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
import { useLocation, useNavigate } from '@solidjs/router';
|
||||
import { onCleanup } from 'solid-js';
|
||||
import { setBackFallback } from '@/lib/back-stack';
|
||||
|
||||
function depth(): number {
|
||||
const state: unknown = window.history.state;
|
||||
if (typeof state !== 'object' || state === null || !('_depth' in state)) return 0;
|
||||
return typeof state._depth === 'number' ? state._depth : 0;
|
||||
}
|
||||
|
||||
// Router history under the overlays. Stops at the entry the app started on,
|
||||
// so back never leaves the app.
|
||||
export function useHistoryBack() {
|
||||
const navigate = useNavigate();
|
||||
const location = useLocation();
|
||||
const start = depth();
|
||||
|
||||
onCleanup(
|
||||
setBackFallback({
|
||||
can: () => {
|
||||
void location.key;
|
||||
return depth() > start;
|
||||
},
|
||||
back: () => navigate(-1),
|
||||
})
|
||||
);
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
import type { Platform } from '@/lib/platform';
|
||||
import { localCrossStorage } from '@/lib/storage';
|
||||
import { saveWithBrowser } from './browser-save';
|
||||
|
||||
type AndroidBridge = NonNullable<Window['__ANDROID__']>;
|
||||
|
||||
function toBase64(blob: Blob) {
|
||||
return new Promise<string>((resolve, reject) => {
|
||||
const reader = new FileReader();
|
||||
reader.onload = () => {
|
||||
const url = reader.result as string;
|
||||
resolve(url.slice(url.indexOf(',') + 1));
|
||||
};
|
||||
reader.onerror = () => reject(reader.error);
|
||||
reader.readAsDataURL(blob);
|
||||
});
|
||||
}
|
||||
|
||||
export function createAndroidPlatform(android: AndroidBridge): Platform {
|
||||
const settings = localCrossStorage('');
|
||||
const cache = localCrossStorage('slimevr-cache/');
|
||||
|
||||
return {
|
||||
kind: 'android',
|
||||
os: 'android',
|
||||
storage: (name) => (name === 'settings' ? settings : cache),
|
||||
openUrl: (url) => void window.open(url, '_blank'),
|
||||
saveFile: async (opts) => {
|
||||
if (typeof android.saveFile !== 'function') return saveWithBrowser(opts);
|
||||
const { blob, fileName } = opts;
|
||||
android.saveFile(
|
||||
fileName,
|
||||
blob.type || 'application/octet-stream',
|
||||
await toBase64(blob)
|
||||
);
|
||||
return 'saved';
|
||||
},
|
||||
systemInsets: { setBackground: (color) => android.updateInsetBackground(color) },
|
||||
};
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
import { fileSave } from 'browser-fs-access';
|
||||
import type { SaveOptions, SaveResult } from '@/lib/platform';
|
||||
|
||||
export async function saveWithBrowser({
|
||||
blob,
|
||||
fileName,
|
||||
extensions,
|
||||
}: SaveOptions): Promise<SaveResult> {
|
||||
try {
|
||||
await fileSave(blob, { fileName, extensions });
|
||||
return 'saved';
|
||||
} catch (e) {
|
||||
if (e instanceof DOMException && e.name === 'AbortError') return 'canceled';
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
import type { IElectronAPI } from '@slimevr/gui-shared';
|
||||
import { describe, expect, it, vi } from 'vitest';
|
||||
import { memoryCrossStorage } from '@/lib/platform-fake';
|
||||
import { createPlatform } from './detect';
|
||||
|
||||
describe('createPlatform', () => {
|
||||
it('resolves the OS before returning on electron', async () => {
|
||||
const storage = memoryCrossStorage();
|
||||
vi.stubGlobal('electronAPI', {
|
||||
osStats: async () => ({ type: 'linux' }),
|
||||
getStorage: async () => storage,
|
||||
} as Partial<IElectronAPI>);
|
||||
|
||||
const platform = await createPlatform();
|
||||
expect(platform.kind).toBe('desktop');
|
||||
expect(platform.os).toBe('linux');
|
||||
expect(platform.storage('settings')).toBe(storage);
|
||||
expect(platform.window).toBeDefined();
|
||||
});
|
||||
|
||||
it('picks android when the bridge is there', async () => {
|
||||
vi.stubGlobal('__ANDROID__', {
|
||||
isThere: () => true,
|
||||
updateInsetBackground: () => {},
|
||||
saveFile: () => {},
|
||||
});
|
||||
|
||||
const platform = await createPlatform();
|
||||
expect(platform.kind).toBe('android');
|
||||
expect(platform.systemInsets).toBeDefined();
|
||||
expect(platform.window).toBeUndefined();
|
||||
});
|
||||
|
||||
it('falls back to web', async () => {
|
||||
const platform = await createPlatform();
|
||||
expect(platform.kind).toBe('web');
|
||||
expect(platform.pickFile).toBeUndefined();
|
||||
});
|
||||
});
|
||||
@@ -1,11 +0,0 @@
|
||||
import type { Platform } from '@/lib/platform';
|
||||
import { createAndroidPlatform } from './android';
|
||||
import { createElectronPlatform } from './electron';
|
||||
import { createWebPlatform } from './web';
|
||||
|
||||
export async function createPlatform(): Promise<Platform> {
|
||||
if (window.electronAPI) return createElectronPlatform(window.electronAPI);
|
||||
const android = window.__ANDROID__;
|
||||
if (android?.isThere()) return createAndroidPlatform(android);
|
||||
return createWebPlatform();
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
import type { IElectronAPI } from '@slimevr/gui-shared';
|
||||
import type { Platform } from '@/lib/platform';
|
||||
import { saveWithBrowser } from './browser-save';
|
||||
|
||||
export async function createElectronPlatform(api: IElectronAPI): Promise<Platform> {
|
||||
const [os, settings, cache] = await Promise.all([
|
||||
api.osStats(),
|
||||
api.getStorage('settings'),
|
||||
api.getStorage('cache'),
|
||||
]);
|
||||
|
||||
return {
|
||||
kind: 'desktop',
|
||||
os: os.type,
|
||||
storage: (name) => (name === 'settings' ? settings : cache),
|
||||
openUrl: (url) => void api.openUrl(url),
|
||||
saveFile: saveWithBrowser,
|
||||
pickFile: async ({ mode, title, filters, defaultPath }) => {
|
||||
if (mode === 'save') {
|
||||
const res = await api.saveDialog({ title, filters, defaultPath });
|
||||
return res.canceled || !res.filePath ? null : res.filePath;
|
||||
}
|
||||
const res = await api.openDialog({
|
||||
title,
|
||||
filters,
|
||||
defaultPath,
|
||||
properties: [mode === 'directory' ? 'openDirectory' : 'openFile'],
|
||||
});
|
||||
return res.canceled ? null : (res.filePaths[0] ?? null);
|
||||
},
|
||||
window: {
|
||||
minimize: () => api.minimize(),
|
||||
toggleMaximize: () => api.toggleMaximize(),
|
||||
hide: () => api.hide(),
|
||||
close: () => api.close(),
|
||||
showDecorations: (on) => api.showDecorations(on),
|
||||
},
|
||||
folders: {
|
||||
openLogs: () => api.openLogsFolder(),
|
||||
openConfig: () => api.openConfigFolder(),
|
||||
installDir: () => api.getInstallDir(),
|
||||
},
|
||||
guiLogs: {
|
||||
onEvents: (cb) => api.onGuiLogEvents(cb),
|
||||
files: () => api.guiLogFiles(),
|
||||
read: (name) => api.readGuiLogFile(name),
|
||||
},
|
||||
log: (level, ...args) => api.log(level, ...args),
|
||||
errorReporting: {
|
||||
setState: (state) => api.setErrorReporting(state),
|
||||
sendCrash: (kind) => api.sendCrashReport(kind),
|
||||
},
|
||||
discordPresence: { set: (presence) => api.setPresence(presence) },
|
||||
translations: {
|
||||
set: (translations) => api.setTranslations(translations),
|
||||
override: () => api.i18nOverride(),
|
||||
onCrowdinPopupClosed: (cb) => api.onCrowdinPopupClosed(cb),
|
||||
},
|
||||
github: { get: (request) => api.ghGet(request) },
|
||||
steam: { isSteam: () => api.isSteam() },
|
||||
keybindRecording: (on) => api.setKeybindRecording(on),
|
||||
};
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
import type { Platform } from '@/lib/platform';
|
||||
import { localCrossStorage } from '@/lib/storage';
|
||||
import { saveWithBrowser } from './browser-save';
|
||||
|
||||
export function createWebPlatform(): Platform {
|
||||
const settings = localCrossStorage('');
|
||||
const cache = localCrossStorage('slimevr-cache/');
|
||||
|
||||
return {
|
||||
kind: 'web',
|
||||
os: 'unknown',
|
||||
storage: (name) => (name === 'settings' ? settings : cache),
|
||||
openUrl: (url) => void window.open(url, '_blank'),
|
||||
saveFile: saveWithBrowser,
|
||||
};
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
import type { RouteDefinition } from '@solidjs/router';
|
||||
import { BodyPage } from '@/pages/body/body-page';
|
||||
import { DesignPage } from '@/pages/design/design-page';
|
||||
import { HomePage } from '@/pages/home/home-page';
|
||||
import { onboardingRoute } from '@/pages/onboarding/onboarding-route';
|
||||
import { settingsRoute } from '@/pages/settings/settings-route';
|
||||
import { SetupPage } from '@/pages/setup/setup-page';
|
||||
|
||||
export const paths = {
|
||||
home: '/',
|
||||
body: '/body',
|
||||
setup: '/setup',
|
||||
onboarding: '/onboarding',
|
||||
settings: '/settings',
|
||||
design: '/design',
|
||||
} as const;
|
||||
|
||||
export const routes: RouteDefinition[] = [
|
||||
{ path: paths.home, component: HomePage },
|
||||
{ path: paths.body, component: BodyPage },
|
||||
{ path: paths.setup, component: SetupPage },
|
||||
onboardingRoute(paths.onboarding),
|
||||
settingsRoute({ base: paths.settings, wizard: paths.onboarding }),
|
||||
...(import.meta.env.DEV ? [{ path: paths.design, component: DesignPage }] : []),
|
||||
];
|
||||
@@ -1,8 +0,0 @@
|
||||
import { paths } from '@/app/routes';
|
||||
import type { SearchDestination } from '@/pages/settings/quick-search/search-entries';
|
||||
|
||||
// Pages outside the settings that quick search lists. Add a row when a page's route lands.
|
||||
export const searchDestinations: SearchDestination[] = [
|
||||
{ path: paths.home, title: 'navbar-home' },
|
||||
{ path: paths.onboarding, title: 'navbar-onboarding' },
|
||||
];
|
||||
@@ -1,198 +0,0 @@
|
||||
import { useMatch } from '@solidjs/router';
|
||||
import { createSignal, createUniqueId, Show } from 'solid-js';
|
||||
import { ServerInfosRequestT, ServerInfosResponseT } from 'solarxr-protocol';
|
||||
import DownloadIcon from '~icons/heroicons/arrow-down-tray-solid';
|
||||
import SearchIcon from '~icons/heroicons/magnifying-glass-20-solid';
|
||||
import QuestionIcon from '~icons/heroicons/question-mark-circle';
|
||||
import CloseIcon from '~icons/material-symbols/close-rounded';
|
||||
import MaximiseIcon from '~icons/material-symbols/crop-square-outline-rounded';
|
||||
import MinimiseIcon from '~icons/material-symbols/minimize-rounded';
|
||||
import GearIcon from '~icons/material-symbols/settings-rounded';
|
||||
import SlimevrLogoIcon from '~icons/slime/slimevr-logo';
|
||||
import { paths } from '@/app/routes';
|
||||
import { serverUpdate } from '@/domain/app-update/release-check';
|
||||
import {
|
||||
DOCS_SITE,
|
||||
LATEST_RELEASE_URL,
|
||||
RELEASES_URL,
|
||||
WINDOWS_DOWNLOAD_URL,
|
||||
} from '@/lib/links';
|
||||
import { platform, type WindowApi } from '@/lib/platform';
|
||||
import { flushPrefs } from '@/lib/storage';
|
||||
import { openQuickSearch } from '@/pages/settings/quick-search/quick-search';
|
||||
import { defineResource } from '@/solarxr/resource';
|
||||
import { TextButton } from '@/ui/button';
|
||||
import { MotionRegion } from '@/ui/motion';
|
||||
import { PlainLink } from '@/ui/plain-link';
|
||||
import { Tooltip } from '@/ui/tooltip';
|
||||
|
||||
const serverInfos = defineResource({
|
||||
request: () => new ServerInfosRequestT(),
|
||||
response: ServerInfosResponseT,
|
||||
});
|
||||
|
||||
const VERSION =
|
||||
(__VERSION_TAG__ || __COMMIT_HASH__) + (__GIT_CLEAN__ ? '' : '-dirty');
|
||||
|
||||
function localIp() {
|
||||
const ip = serverInfos.value()?.localIp;
|
||||
return ip ? String(ip) : null;
|
||||
}
|
||||
|
||||
function openUpdate() {
|
||||
platform.openUrl(
|
||||
platform.os === 'windows' ? WINDOWS_DOWNLOAD_URL : LATEST_RELEASE_URL
|
||||
);
|
||||
}
|
||||
|
||||
function WindowControls(props: { api: WindowApi }) {
|
||||
async function close() {
|
||||
await flushPrefs();
|
||||
props.api.close();
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<TextButton
|
||||
variant="ghost"
|
||||
size="small"
|
||||
iconOnly
|
||||
label="titlebar-minimize"
|
||||
icon={<MinimiseIcon class="icon icon-sm" />}
|
||||
onClick={() => props.api.minimize()}
|
||||
/>
|
||||
<TextButton
|
||||
variant="ghost"
|
||||
size="small"
|
||||
iconOnly
|
||||
label="titlebar-maximize"
|
||||
icon={<MaximiseIcon class="icon icon-sm" />}
|
||||
onClick={() => props.api.toggleMaximize()}
|
||||
/>
|
||||
<TextButton
|
||||
variant="ghost"
|
||||
size="small"
|
||||
iconOnly
|
||||
label="titlebar-close"
|
||||
icon={<CloseIcon class="icon icon-sm" />}
|
||||
onClick={close}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
// Window controls and logo only, for screens outside the router (crash screen): no links,
|
||||
// no server data, so it keeps working whatever broke
|
||||
export function MinimalTitleBar() {
|
||||
return (
|
||||
<div class="flex h-titlebar shrink-0 items-center gap-sm px-sm">
|
||||
<span class="flex h-5.5 w-12.25 translate-x-[2.17px] items-center justify-center text-special">
|
||||
<SlimevrLogoIcon
|
||||
aria-hidden="true"
|
||||
style={{ '--icon-size': '49.66px' }}
|
||||
/>
|
||||
</span>
|
||||
<span class="flex h-full items-center" data-electron-drag-region="true">
|
||||
SlimeVR
|
||||
</span>
|
||||
<div class="h-full flex-1" data-electron-drag-region="true" />
|
||||
<Show when={platform.window}>
|
||||
{(api) => <WindowControls api={api()} />}
|
||||
</Show>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export function TitleBar() {
|
||||
const onSettings = useMatch(() => `${paths.settings}/*`);
|
||||
const [versionEl, setVersionEl] = createSignal<HTMLAnchorElement>();
|
||||
const commitTipId = createUniqueId();
|
||||
|
||||
return (
|
||||
<MotionRegion
|
||||
orientation="horizontal"
|
||||
class="flex h-titlebar shrink-0 items-center gap-sm px-sm"
|
||||
>
|
||||
<div class="hidden shell:contents">
|
||||
<PlainLink
|
||||
to={paths.home}
|
||||
label="navbar-home"
|
||||
class="h-5.5 w-12.25 justify-center text-special"
|
||||
>
|
||||
<span class="flex translate-x-[2.17px]">
|
||||
<SlimevrLogoIcon
|
||||
aria-hidden="true"
|
||||
style={{ '--icon-size': '49.66px' }}
|
||||
/>
|
||||
</span>
|
||||
</PlainLink>
|
||||
<span class="flex h-full items-center" data-electron-drag-region="true">
|
||||
SlimeVR
|
||||
</span>
|
||||
</div>
|
||||
<div class={onSettings() ? 'hidden shell:contents' : 'contents'}>
|
||||
<PlainLink
|
||||
ref={setVersionEl}
|
||||
href={RELEASES_URL}
|
||||
describedBy={commitTipId}
|
||||
class="
|
||||
h-5.5 shrink-0 rounded-lg bg-success/20 px-3 font-bold whitespace-nowrap text-success
|
||||
select-text
|
||||
"
|
||||
>
|
||||
{VERSION}
|
||||
</PlainLink>
|
||||
<Tooltip id={commitTipId} anchor={versionEl}>
|
||||
{__COMMIT_HASH__}
|
||||
</Tooltip>
|
||||
</div>
|
||||
<Show when={onSettings() && localIp()}>
|
||||
{(ip) => (
|
||||
<span class="rounded-md bg-special/20 px-sm font-bold text-special select-text">
|
||||
{ip()}
|
||||
</span>
|
||||
)}
|
||||
</Show>
|
||||
<Show when={platform.window && serverUpdate()}>
|
||||
<TextButton
|
||||
variant="ghost"
|
||||
size="small"
|
||||
iconOnly
|
||||
label="titlebar-update"
|
||||
icon={<DownloadIcon />}
|
||||
onClick={openUpdate}
|
||||
/>
|
||||
</Show>
|
||||
<div class="h-full flex-1" data-electron-drag-region="true" />
|
||||
<TextButton
|
||||
variant="ghost"
|
||||
size="small"
|
||||
iconOnly
|
||||
label="titlebar-search"
|
||||
icon={<SearchIcon />}
|
||||
onClick={openQuickSearch}
|
||||
/>
|
||||
<TextButton
|
||||
to={paths.settings}
|
||||
variant="ghost"
|
||||
size="small"
|
||||
iconOnly
|
||||
label="titlebar-settings"
|
||||
icon={<GearIcon />}
|
||||
/>
|
||||
<div class="hidden shell:contents">
|
||||
<TextButton
|
||||
variant="ghost"
|
||||
size="small"
|
||||
iconOnly
|
||||
label="titlebar-docs"
|
||||
icon={<QuestionIcon />}
|
||||
onClick={() => platform.openUrl(DOCS_SITE)}
|
||||
/>
|
||||
</div>
|
||||
<Show when={platform.window}>
|
||||
{(api) => <WindowControls api={api()} />}
|
||||
</Show>
|
||||
</MotionRegion>
|
||||
);
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9d02c57155f8011a4363e242f3c195633450477b19ca5784ecf9b28df5401143
|
||||
size 460668
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:78bcd8987b35612739dfc8f556f6da497f689b26e96f5267b9a008ea9f46bd14
|
||||
size 592038
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d54e1a99c1c228d004d2c94d3e1ed49f0cc14d7a471b71130fe89aa1518acc73
|
||||
size 438548
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:76d5b68294770112ee3d97cddcf5751008df2cb3a372655e7611d4db231243fc
|
||||
size 139344
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:71fa8383b0fde387e91e88c0f95eb057ad62905df8ac78c89ade1627ad17b0b3
|
||||
size 21360
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:76c1f559ecc11239e2f126eb76ae4c2e097a26f227a915de7127db4f61eafc40
|
||||
size 27230
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:13b7a9177af9378284c4eca264590deae6654b8b92c00d9ca948628c16dd118f
|
||||
size 22590
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fd98226b28ed3f68b5a6fa03dada951fc4326c56119d59fcad09fef261053446
|
||||
size 155016
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fe7893c1645174eee669dfa9e7222c55638c8d498eb126a397a6df759c028919
|
||||
size 28604
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c71f29809334563348f8f29cf41afeb8bedbbd5ba2875bf40621b011ac52d2d3
|
||||
size 30678
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8b00c02450258536066870137876f4fe1882d4e4b6fc4ab9f32ad46220ed5efa
|
||||
size 52158
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:faabda8027d550b10723457a8274962b3b8d9eb906cbac0c73d20916e6633e95
|
||||
size 13558
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8bd89b59087cc0f019ca2179fcc57d99811c327cdd6b1fd6e57705f7299aa2ae
|
||||
size 14402
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:38aebca5266f47270dc60c4682022809e43676ac9b3dd4b5a586ce3157f8a8a0
|
||||
size 99786
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b40baa0413d30f5df34eb7bd7e8867cb73905a098fd7398de67a2d60b3882070
|
||||
size 152284
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:31e6929b6176244f53e85088812f5cc4e7b94679039688f929b21b8e1bb985e7
|
||||
size 94060
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6e95853b79d711826f454fcc48e5d4ffd608a74e13aff2c7aa8628730362dd0f
|
||||
size 154508
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f6dc4d54b43844a85099941b64a9b92cba0f58ebe33dc61a48e12536f20174b3
|
||||
size 130492
|
||||
Loaded 100 of 1820 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user