Chore: Address Sonar quality warnings

Author: waffles-dev

src/main/main.ts

@@ -146,6 +146,6 @@ app.on("second-instance", _ => {
     }
 });
 
-ipcMain.on("message", (event, message) => {
+ipcMain.on("message", (_event, message) => {
     console.log(message);
 });

src/renderer/App.vue

@@ -159,9 +159,7 @@ import { WinboatConfig } from "./lib/config";
 import { USBManager } from "./lib/usbmanager";
 import { GUEST_NOVNC_PORT } from "./lib/constants";
 const { BrowserWindow }: typeof import("@electron/remote") = require("@electron/remote");
-const os: typeof import("os") = require("os");
-const path: typeof import("path") = require("path");
-const remote: typeof import("@electron/remote") = require("@electron/remote");
+const os: typeof import("os") = require("node:os");
 
 const $router = useRouter();
 const appVer = import.meta.env.VITE_APP_VERSION;
@@ -178,14 +176,14 @@ const novncURL = ref("");
 
 onMounted(async () => {
     const winboatInstalled = await isInstalled();
-    if (!winboatInstalled) {
+    if (winboatInstalled) {
+        winboat = Winboat.getInstance(); // Instantiate singleton class
+        wbConfig = WinboatConfig.getInstance(); // Instantiate singleton class
+        USBManager.getInstance(); // Instantiate singleton class
+        $router.push("/home");
+    } else {
         console.log("Not installed, redirecting to setup...");
         $router.push("/setup");
-    } else {
-        winboat = new Winboat(); // Instantiate singleton class
-        wbConfig = new WinboatConfig(); // Instantiate singleton class
-        new USBManager(); // Instantiate singleton class
-        $router.push("/home");
     }
 
     // Watch for guest server updates and show dialog

src/renderer/components/WBContextMenu.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, onUnmounted, nextTick } from "vue";
+import { ref, computed, onUnmounted, nextTick } from "vue";
 
 interface Props {
     trigger?: "contextmenu" | "click" | "none";
@@ -37,7 +37,6 @@ const emit = defineEmits<{
     hide: [];
 }>();
 
-const contextMenuRef = ref<HTMLElement>();
 const triggerRef = ref<HTMLElement>();
 const menuRef = ref<HTMLElement>();
 

src/renderer/lib/config.ts

@@ -1,5 +1,5 @@
-const fs: typeof import("fs") = require("fs");
-const path: typeof import("path") = require("path");
+const fs: typeof import("fs") = require("node:fs");
+const path: typeof import("path") = require("node:path");
 import { type WinApp } from "../../types";
 import { WINBOAT_DIR } from "./constants";
 import { type PTSerializableDeviceInfo } from "./usbmanager";
@@ -37,15 +37,18 @@ const defaultConfig: WinboatConfigObj = {
 };
 
 export class WinboatConfig {
-    private static instance: WinboatConfig;
-    #configPath: string = path.join(WINBOAT_DIR, "winboat.config.json");
+    private static instance: WinboatConfig | null = null;
+    readonly #configPath: string = path.join(WINBOAT_DIR, "winboat.config.json");
     #configData: WinboatConfigObj = { ...defaultConfig };
 
-    constructor() {
-        if (WinboatConfig.instance) return WinboatConfig.instance;
+    static getInstance() {
+        WinboatConfig.instance ??= new WinboatConfig();
+        return WinboatConfig.instance;
+    }
+
+    private constructor() {
         this.#configData = this.readConfig();
         console.log("Reading current config", this.#configData);
-        WinboatConfig.instance = this;
     }
 
     get config(): WinboatConfigObj {

src/renderer/lib/constants.ts

@@ -1,5 +1,5 @@
-const os: typeof import("os") = require("os");
-const path: typeof import("path") = require("path");
+const os: typeof import("os") = require("node:os");
+const path: typeof import("path") = require("node:path");
 
 // Should be {home}/.winboat
 export const WINBOAT_DIR = path.join(os.homedir(), ".winboat");

src/renderer/lib/install.ts

@@ -6,10 +6,10 @@ import { createLogger } from "../utils/log";
 import { createNanoEvents, type Emitter } from "nanoevents";
 import { PortManager } from "../utils/port";
 import { Winboat } from "./winboat";
-const fs: typeof import("fs") = require("fs");
-const { exec }: typeof import("child_process") = require("child_process");
-const path: typeof import("path") = require("path");
-const { promisify }: typeof import("util") = require("util");
+const fs: typeof import("fs") = require("node:fs");
+const { exec }: typeof import("child_process") = require("node:child_process");
+const path: typeof import("path") = require("node:path");
+const { promisify }: typeof import("util") = require("node:util");
 const nodeFetch: typeof import("node-fetch").default = require("node-fetch");
 const remote: typeof import("@electron/remote") = require("@electron/remote");
 
@@ -145,21 +145,21 @@ export class InstallManager {
 
         // Storage folder mapping
         const storageFolderIdx = composeContent.services.windows.volumes.findIndex(vol => vol.includes("/storage"));
-        if (storageFolderIdx !== -1) {
-            composeContent.services.windows.volumes[storageFolderIdx] = `${this.conf.installFolder}:/storage`;
-        } else {
+        if (storageFolderIdx === -1) {
             logger.warn("No /storage volume found in compose template, adding one...");
             composeContent.services.windows.volumes.push(`${this.conf.installFolder}:/storage`);
+        } else {
+            composeContent.services.windows.volumes[storageFolderIdx] = `${this.conf.installFolder}:/storage`;
         }
 
         // Home folder mapping
         if (!this.conf.shareHomeFolder) {
             const sharedFolderIdx = composeContent.services.windows.volumes.findIndex(vol => vol.includes("/shared"));
-            if (sharedFolderIdx !== -1) {
+            if (sharedFolderIdx === -1) {
+                logger.info("No home folder sharing volume found, nothing to remove");
+            } else {
                 composeContent.services.windows.volumes.splice(sharedFolderIdx, 1);
                 logger.info("Removed home folder sharing as per user configuration");
-            } else {
-                logger.info("No home folder sharing volume found, nothing to remove");
             }
         }
 
@@ -242,8 +242,7 @@ export class InstallManager {
 
         // Start the container
         try {
-            // execSync(`docker compose -f ${composeFilePath} up -d`, { stdio: 'inherit' });
-            const { stdout, stderr } = await execAsync(`docker compose -f ${composeFilePath} up -d`);
+            const { stderr } = await execAsync(`docker compose -f ${composeFilePath} up -d`);
             if (stderr) {
                 logger.error(stderr);
             }
@@ -263,6 +262,7 @@ export class InstallManager {
         this.changeState(InstallStates.MONITORING_PREINSTALL);
         logger.info("Starting preinstall monitoring...");
 
+        const re = new RegExp(/>([^<]+)</);
         while (true) {
             try {
                 const vncHostPort = this.portMgr.value!.getHostPort(GUEST_NOVNC_PORT);
@@ -272,8 +272,7 @@ export class InstallManager {
                     return; // Exit the method when we get 404
                 }
                 const message = await response.text();
-                const re = />([^<]+)</;
-                const messageFormatted = message.match(re)?.[1] || message;
+                const messageFormatted = re.exec(message)?.[1] || message;
                 this.setPreinstallMsg(messageFormatted);
             } catch (error) {
                 if (error instanceof Error && error.message.includes("404")) {
@@ -304,7 +303,7 @@ export class InstallManager {
                     logger.info("WinBoat Guest Server is up and healthy!");
                     this.changeState(InstallStates.COMPLETED);
 
-                    const winboat = new Winboat();
+                    const winboat = Winboat.getInstance();
                     const config = winboat.parseCompose();
                     const filteredVolumes = config.services.windows.volumes.filter(
                         volume => !volume.endsWith("/boot.iso"),
@@ -325,7 +324,7 @@ export class InstallManager {
                         } minutes...`,
                     );
                 }
-            } catch (error) {
+            } catch {
                 // Log every 60 seconds for errors too
                 if (attempts % 12 === 0) {
                     logger.info(`API not responding yet, still waiting after ${(attempts * 5) / 60} minutes...`);

src/renderer/lib/qmp.ts

@@ -1,9 +1,9 @@
 import { WINBOAT_DIR } from "./constants";
 import { createLogger } from "../utils/log";
-const path: typeof import("path") = require("path");
+const path: typeof import("path") = require("node:path");
 import { type Socket } from "net";
 import { assert } from "@vueuse/core";
-const { createConnection }: typeof import("net") = require("net");
+const { createConnection }: typeof import("net") = require("node:net");
 
 const logger = createLogger(path.join(WINBOAT_DIR, "qmp.log"));
 
@@ -110,7 +110,7 @@ export type QMPResponse<T extends QMPCommand> = QMPReturn<
 >;
 
 export class QMPManager {
-    private static IS_ALIVE_TIMEOUT = 2000;
+    private static readonly IS_ALIVE_TIMEOUT = 2000;
     qmpSocket: Socket;
 
     /**

src/renderer/lib/specs.ts

@@ -1,8 +1,8 @@
 import { getFreeRDP } from "../utils/getFreeRDP";
-const fs: typeof import("fs") = require("fs");
-const os: typeof import("os") = require("os");
-const { exec }: typeof import("child_process") = require("child_process");
-const { promisify }: typeof import("util") = require("util");
+const fs: typeof import("fs") = require("node:fs");
+const os: typeof import("os") = require("node:os");
+const { exec }: typeof import("child_process") = require("node:child_process");
+const { promisify }: typeof import("util") = require("node:util");
 const execAsync = promisify(exec);
 
 export function satisfiesPrequisites(specs: Specs) {
@@ -35,7 +35,7 @@ export async function getSpecs() {
     // Physical CPU cores check
     try {
         const res = (await execAsync('lscpu -p | egrep -v "^#" | sort -u -t, -k 2,4 | wc -l')).stdout;
-        specs.cpuCores = parseInt(res.trim(), 10);
+        specs.cpuCores = Number.parseInt(res.trim(), 10);
     } catch (e) {
         console.error("Error getting CPU cores:", e);
     }
@@ -73,9 +73,9 @@ export async function getSpecs() {
         if (dockerComposeOutput) {
             // Example output: "Docker Compose version v2.35.1"
             // Example output 2: "Docker Compose version 2.36.2"
-            const versionMatch = dockerComposeOutput.match(/(\d+\.\d+\.\d+)/);
+            const versionMatch = new RegExp(/(\d+\.\d+\.\d+)/).exec(dockerComposeOutput);
             if (versionMatch) {
-                const majorVersion = parseInt(versionMatch[1].split(".")[0], 10);
+                const majorVersion = Number.parseInt(versionMatch[1].split(".")[0], 10);
                 specs.dockerComposeInstalled = majorVersion >= 2;
             } else {
                 specs.dockerComposeInstalled = false; // No valid version found
@@ -130,11 +130,12 @@ export async function getMemoryInfo() {
         const totalMemLine = memInfo.split("\n").find(line => line.startsWith("MemTotal"));
         const availableMemLine = memInfo.split("\n").find(line => line.startsWith("MemAvailable"));
         if (totalMemLine) {
-            memoryInfo.totalGB = Math.round((parseInt(totalMemLine.split(/\s+/)[1]) / 1024 / 1024) * 100) / 100;
+            memoryInfo.totalGB = Math.round((Number.parseInt(totalMemLine.split(/\s+/)[1]) / 1024 / 1024) * 100) / 100;
         }
 
         if (availableMemLine) {
-            memoryInfo.availableGB = Math.round((parseInt(availableMemLine.split(/\s+/)[1]) / 1024 / 1024) * 100) / 100;
+            memoryInfo.availableGB =
+                Math.round((Number.parseInt(availableMemLine.split(/\s+/)[1]) / 1024 / 1024) * 100) / 100;
         }
 
         return memoryInfo;