Fix dev, add CSP, v1.2.0-beta2

OCSYT · Jul 25, 2024 · 6d9d21b · 6d9d21b
1 parent 6a035ef
commit 6d9d21b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "slimetora",
     "productName": "slimetora",
     "type": "module",
-    "version": "1.2.0-beta1",
+    "version": "1.2.0-beta2",
     "description": "A program that connects the HaritoraX full body trackers to the SlimeVR server",
     "private": true,
     "author": {

diff --git a/src/main.ts b/src/main.ts
@@ -45,10 +45,6 @@ let connectionActive = false;
 const resources = await loadTranslations();
 let comPorts = await Binding.list();
 
-function isDevelopment() {
-    return process.env.DEVELOPMENT || !app.isPackaged;
-}
-
 /*
  * Translations (i18next)
  */
@@ -163,7 +159,7 @@ app.commandLine.appendSwitch("force_low_power_gpu");
 
 // Don't show the menu bar for performance (this disables the dev tools though, may remove this later)
 // could also set this depending on "logging mode" setting in config
-if (!isDevelopment) {
+if (!process.env.DEVELOPMENT && app.isPackaged) {
     log("Development mode disabled, hiding menu bar");
     Menu.setApplicationMenu(null);
 } else {
@@ -238,6 +234,7 @@ ipcMain.handle("get-com-ports", async (_event, arg: string) => {
 
     if (!device) {
         initializeDevice(true);
+        // @ts-ignore
         const ports = await device.getDevicePorts(arg);
         device = undefined;
         return ports;
@@ -339,6 +336,7 @@ ipcMain.handle("autodetect", async () => {
     initializeDevice(true);
 
     log("Auto-detect: getting available devices...");
+    // @ts-ignore
     const devices = await device.getAvailableDevices();
 
     let trackerSettingsTimeout: NodeJS.Timeout = null;
@@ -351,16 +349,19 @@ ipcMain.handle("autodetect", async () => {
         }
         if (devices.includes("GX6")) {
             log("Auto-detect: GX6 device found, starting connection...");
+            // @ts-ignore
             comPorts = await device.getDevicePorts("GX6");
             device.startConnection("com", comPorts, heartbeatInterval);
         }
         if (devices.includes("GX2")) {
             log("Auto-detect: GX2 device found, starting connection...");
+            // @ts-ignore
             comPorts = await device.getDevicePorts("GX2");
             device.startConnection("com", comPorts, heartbeatInterval);
         }
         if (devices.includes("HaritoraX Wired")) {
             log("Auto-detect: HaritoraX Wired device found, starting connection...");
+            // @ts-ignore
             comPorts = await device.getDevicePorts("HaritoraX Wired");
             device.startConnection("com", comPorts, heartbeatInterval);
         }

diff --git a/src/static/html/index.html b/src/static/html/index.html
@@ -3,6 +3,7 @@
     <head>
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';">
         <link rel="stylesheet" href="../css/index.css" />
         <script src="../js/index.js"></script>
     </head>

diff --git a/src/static/html/settings.html b/src/static/html/settings.html
@@ -3,6 +3,7 @@
     <head>
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';">
         <link rel="stylesheet" href="../css/index.css" />
         <script src="../js/settings.js"></script>
     </head>

diff --git a/src/static/html/visualization.html b/src/static/html/visualization.html
@@ -3,6 +3,7 @@
     <head>
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';">
         <title>Tracker visualization</title>
         <style>
             body {