Merge pull request #18 from lillithkt/lillith-changes-to-pr

Many changes, see description

Author: JovannMC

.github/workflows/build-mac-arm64.yml

@@ -0,0 +1,88 @@
+name: Build application
+
+on:
+    push:
+    workflow_dispatch:
+    create:
+
+jobs:
+    build:
+        strategy:
+          matrix:
+            os: [ubuntu-latest, windows-latest, macos-latest]
+        runs-on: ${{ matrix.os }}
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+
+            - name: Set up Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "20"
+
+
+            - name: Install dependencies on Ubuntu
+              if: matrix.os == 'ubuntu-latest'
+              run: |
+                  sudo apt-get update
+                  sudo apt-get install -y libudev-dev
+            - name: Install Node.js dependencies
+              run: npm install
+
+            - name: Build the application
+              run: npm run build
+
+            - name: Compress Linux build artifacts (x64)
+              if: matrix.os == 'ubuntu-latest'
+              run: |
+                zip -r build/SlimeTora-linux-x64.zip build/SlimeTora-linux-x64
+                zip -r build/SlimeTora-linux-arm64.zip build/SlimeTora-linux-arm64
+            - name: Compress Windows build artifacts
+              if: matrix.os == 'windows-latest'
+              run: |
+                powershell Compress-Archive -Path build\SlimeTora-win32-arm64\* -DestinationPath build\SlimeTora-win32-arm64.zip
+                powershell Compress-Archive -Path build\SlimeTora-win32-x64\* -DestinationPath build\SlimeTora-win32-x64.zip
+            - name: Compress macOS build artifacts
+              if: matrix.os == 'macos-latest'
+              run: |
+                zip -r build/SlimeTora-darwin-arm64.zip build/SlimeTora-darwin-arm64
+                zip -r build/SlimeTora-darwin-x64.zip build/SlimeTora-darwin-x64
+            - name: Archive build artifacts for Linux (x64)
+              if: matrix.os == 'ubuntu-latest'
+              uses: actions/upload-artifact@v4
+              with:
+                  name: build-artifacts-linux-x64
+                  path: build/SlimeTora-linux-x64.zip
+            - name: Archive build artifacts for Linux (arm64)
+              if: matrix.os == 'ubuntu-latest'
+              uses: actions/upload-artifact@v4
+              with:
+                  name: build-artifacts-linux-arm64
+                  path: build/SlimeTora-linux-arm64.zip
+
+            - name: Archive build artifacts for Windows (x64)
+              if: matrix.os == 'windows-latest'
+              uses: actions/upload-artifact@v4
+              with:
+                  name: build-artifacts-win32-x64
+                  path: build/SlimeTora-win32-x64.zip
+            - name: Archive build artifacts for Windows (arm64)
+              if: matrix.os == 'windows-latest'
+              uses: actions/upload-artifact@v4
+              with:
+                  name: build-artifacts-win32-arm64
+                  path: build/SlimeTora-win32-arm64.zip
+
+            - name: Archive build artifacts for macOS (arm64)
+              if: matrix.os == 'macos-latest'
+              uses: actions/upload-artifact@v4
+              with:
+                  name: build-artifacts-macos-arm64
+                  path: build/SlimeTora-darwin-arm64.zip
+            - name: Archive build artifacts for macOS (x64)
+              if: matrix.os == 'macos-latest'
+              uses: actions/upload-artifact@v4
+              with:
+                  name: build-artifacts-macos-x64
+                  path: build/SlimeTora-darwin-x64.zip

.github/workflows/build-mac-x64.yml

@@ -103,3 +103,5 @@ out/
 notes.txt
 src/static/css/index.css
 src/static/css/index.css.map
+
+config.json

.github/workflows/build-ubuntu.yml

@@ -21,10 +21,9 @@
         "start": "npm run preload && cross-env DEVELOPMENT=true && electron .",
         "dev": "cross-env DEVELOPMENT=true && tsc && npm run copy-files && electron .",
         "build": "npm run preload && npx @electron/packager . SlimeTora --arch=x64,arm64 --overwrite --out=build/ --icon=src/static/images/icon.ico --asar --extra-resource=src/languages --prune --ignore=\"^/(src|docs|.vscode|.eslintrc.cjs|.prettierrc|tsconfig.json|README.md|.gitignore|notes.txt|.github)$\"",
-        "build-bulma": "npx sass ./src/static/css/index.scss ./src/static/css/index.css",
-        "build-bulma:watch": "npx sass --watch ./src/static/css/index.scss ./src/static/css/index.css",
-        "preload": "npm run build-bulma && npx @electron/rebuild && npx del-cli dist/ && tsc && npm run copy-files",
-        "copy-files": "npx copyfiles -u 1 \"src/**/*.js\" \"src/**/*.html\" \"src/**/*.css\" \"src/**/*.ico\" \"src/**/*.png\" \"src/**/*.webp\" \"src/**/*.webm\" \"src/**/*.svg\" \"src/**/*.fbx\" src/languages/* dist/",
+        "preload": "npx @electron/rebuild && npx del-cli dist/ && tsc && npm run copy-files && npm run build-bulma",
+        "copy-files": "npx copyfiles -u 1 src/static/**/* src/languages/**/* dist/",
+        "build-bulma": "npx sass ./src/static/css/index.scss ./dist/static/css/index.css",
         "lint": "eslint ./src/**/*.ts"
     },
     "keywords": [],
@@ -54,6 +53,7 @@
         "loc-i18next": "^0.1.6",
         "lodash-es": "^4.17.21",
         "quaternion": "2.0.1",
+        "rand-seed": "^2.1.7",
         "three": "^0.174.0"
     }
 }

.github/workflows/build-windows.yml

@@ -13,13 +13,13 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
 const mainPath = app.isPackaged ? path.dirname(app.getPath("exe")) : __dirname;
-const configPath = path.resolve(mainPath, "config.json");
+const configPath = app.isPackaged ? path.resolve(mainPath, "config.json") : path.resolve(path.join(mainPath, ".."), "config.json")
 const isMac = process.platform === "darwin";
 // don't mess with this or languages will fail to load cause of how the project is structured, lol
 // i hate how this is done.
 const languagesPath = path.resolve(
     mainPath,
-    isMac ? ".." : "",
+    (isMac && app.isPackaged) ? ".." : "",
     app.isPackaged ? (isMac ? "Resources/languages" : "resources/languages") : "languages"
 );
 let mainWindow: BrowserWindow;
@@ -692,7 +692,7 @@ ipcMain.on("fix-trackers", async () => {
     };
 
     const intervalId = setInterval(sendCommands, 100);
-    await dialog.showMessageBox(dialogOptions);
+    await dialog.showMessageBox(mainWindow, dialogOptions);
     clearInterval(intervalId);
 
     const endTime = Date.now();
@@ -1166,6 +1166,7 @@ import { EmulatedTracker } from "@slimevr/tracker-emulation";
 import { ActivePorts } from "haritorax-interpreter/dist/mode/com";
 import BetterQuaternion from "quaternion";
 import { ParsedUrlQueryInput } from "querystring";
+import Rand from "rand-seed"
 
 // For haritorax-interpreter
 // Used to handle errors coming from haritorax-interpreter and display them to the user if wanted
@@ -1239,6 +1240,11 @@ async function addTracker(trackerName: string) {
     processQueue();
 }
 
+function MacAddressFromName(name: string) {
+    const rand = new Rand(name);
+    return new MACAddress(new Array(6).fill(0).map(() => Math.floor(rand.next() * 256)) as any)
+}
+
 async function processQueue() {
     if (isProcessingQueue || trackerQueue.length === 0) return;
     isProcessingQueue = true;
@@ -1251,7 +1257,7 @@ async function processQueue() {
         if (connectedDevices.get(trackerName) !== undefined) return;
 
         // Check if tracker has a MAC address assigned already in the config
-        let macAddress = MACAddress.random();
+        let macAddress = MacAddressFromName(trackerName);
         let macBytes = config.trackers?.[trackerName]?.macAddress?.bytes;
         if (macBytes && macBytes.length === 6) {
             macAddress = new MACAddress(macBytes);