Server rewrite

.github/CODEOWNERS

@@ -1,3 +1,6 @@
+# Global code owner
+* @Eirenliel
+
 # Make everyone be able to approve SolarXR submodule changes
 /solarxr-protocol @ButterscotchV @Erimelowo @loucass003
 
@@ -13,11 +16,11 @@
 
 /gui/src/components/settings/ @Erimelowo @loucass003
 
-# Electron part of the GUI
+# Rust part of the GUI
 /gui/electron/ @loucass003
 
 # Some server code~
-/server/ @ButterscotchV @loucass003 @Erimelowo
+/server/ @ButterscotchV @Eirenliel @Erimelowo
 
 /server/src/main/java/dev/slimevr/autobone/ @ButterscotchV
 /server/src/main/java/dev/slimevr/poserecorder/ @ButterscotchV
@@ -27,8 +30,6 @@
 /server/src/main/java/dev/slimevr/tracking/processor/ @Erimelowo
 /server/src/main/java/dev/slimevr/filtering/ @Erimelowo
 
-/bindings-provider/ @ImSapphire
-
 # Linux files
 *.nix @loucass003
 /flake.lock @loucass003

.github/workflows/build.yml

@@ -13,7 +13,6 @@ jobs:
     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
@@ -26,44 +25,7 @@ jobs:
           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
@@ -72,10 +34,8 @@ jobs:
         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
+        uses: pnpm/action-setup@v4
       - name: Setup Node
         uses: actions/setup-node@v6
         with:
@@ -84,8 +44,8 @@ jobs:
       - name: GUI Lint
         run: pnpm i && cd gui && pnpm run lint
 
-  java-checks:
-    name: Java Checks
+  server-checks:
+    name: Server Checks
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -98,9 +58,11 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v6
-      - name: Java Spotless Check
+        uses: gradle/actions/setup-gradle@v5
+      - name: Server Spotless Check
         run: ./gradlew spotlessCheck --build-cache
+      - name: Server Detekt Lint
+        run: ./gradlew :server:detekt --build-cache
 
 
   build-server-jar:
@@ -111,21 +73,19 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: recursive
-      - name: Get tags
-        run: git fetch --tags origin --recurse-submodules=no --force
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'adopt'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v6
+        uses: gradle/actions/setup-gradle@v5
       - name: Build ShadowJar
         run: ./gradlew :server:desktop:shadowJar --build-cache
       - name: Test with Gradle
         run: ./gradlew :server:desktop:test
       - name: Upload Server Jar
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: server-jar
           path: |
@@ -140,10 +100,8 @@ jobs:
         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
+        uses: pnpm/action-setup@v4
       - name: Setup Node
         uses: actions/setup-node@v6
         with:
@@ -156,14 +114,14 @@ jobs:
       - name: Tar GUI Dist
         run: tar -czf slimevr-gui-dist.tar.gz -C gui/out .
       - name: Upload GUI Dist
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         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]
+    needs: [setup-matrix, build-server-jar, build-gui-frontend]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
@@ -173,28 +131,20 @@ jobs:
         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
+        uses: pnpm/action-setup@v4
       - 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
+        uses: actions/download-artifact@v6
         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
+        uses: actions/download-artifact@v6
         with:
           name: gui-dist
       - name: Extract GUI for Electron
@@ -208,15 +158,10 @@ jobs:
           mkdir -p gui/dist/artifacts/linux/ \
                    gui/dist/artifacts/win \
                    gui/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
+          pnpm i
           pnpm exec electron-builder --${{ matrix.platform }} \
             ${{ matrix.platform == 'macos' && '--universal' || '' }} \
-            --config.extraMetadata.version="$VERSION" \
             --publish never
       - name: Collect and Rename Artifacts
         shell: bash
@@ -244,7 +189,7 @@ jobs:
           echo "Collected files:"
           ls -lh "$DEST_DIR"
       - name: Upload For Release
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: release-${{ matrix.platform }}-${{ matrix.os }}
           path: release-out/*
@@ -258,17 +203,15 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: recursive
-      - name: Get tags
-        run: git fetch --tags origin --recurse-submodules=no --force
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'adopt'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v6
+        uses: gradle/actions/setup-gradle@v5
       - name: Download GUI Dist
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
           name: gui-dist
       - name: Extract GUI for Android
@@ -285,52 +228,34 @@ jobs:
       - name: Prepare APK
         run: cp server/android/build/outputs/apk/release/*.apk ./SlimeVR-android.apk
       - name: Upload APK
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         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:
-          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
+        uses: actions/download-artifact@v6
         with:
           pattern: release-*
           path: release-out
           merge-multiple: true
       - name: Download Server Jar
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
           name: server-jar
           path: server
       - name: Download GUI Dist
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
           name: gui-dist
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           generate_release_notes: true

.github/workflows/generate-update-manifest.yml

@@ -20,13 +20,13 @@ jobs:
         run: |
           npx @slimevr/update-manifest-generator@latest
 
-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v6
         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

.gitignore

@@ -4,8 +4,10 @@
 # Syncthing ignore file
 .stignore
 
-# Ignore .idea
-.idea
+# Ignore .idea, except shared project inspection profiles
+.idea/*
+!.idea/inspectionProfiles/
+!.idea/inspectionProfiles/*.xml
 
 # Ignore .fleet
 .fleet

.gitmodules

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