move stuff to systeminformation.js

Author: khassel

js/systeminformation.js

@@ -1,4 +1,39 @@
+const os = require("node:os");
+const si = require("systeminformation");
+// needed with relative path because logSystemInformation is called in an own process in app.js:
 const mmVersion = require("../package").version;
-const { logSystemInformation } = require("./utils");
+const Log = require("./logger");
 
+const logSystemInformation = async (mirrorVersion) => {
+	try {
+		const system = await si.system();
+		const osInfo = await si.osInfo();
+		const versions = await si.versions();
+
+		const usedNodeVersion = process.version.replace("v", "");
+		const installedNodeVersion = versions.node;
+		const totalRam = (os.totalmem() / 1024 / 1024).toFixed(2);
+		const freeRam = (os.freemem() / 1024 / 1024).toFixed(2);
+		const usedRam = ((os.totalmem() - os.freemem()) / 1024 / 1024).toFixed(2);
+
+		let systemDataString = [
+			"\n####  System Information  ####",
+			`- SYSTEM:   manufacturer: ${system.manufacturer}; model: ${system.model}; virtual: ${system.virtual}; MM: ${mirrorVersion}`,
+			`- OS:       platform: ${osInfo.platform}; distro: ${osInfo.distro}; release: ${osInfo.release}; arch: ${osInfo.arch}; kernel: ${versions.kernel}`,
+			`- VERSIONS: electron: ${process.versions.electron}; used node: ${usedNodeVersion}; installed node: ${installedNodeVersion}; npm: ${versions.npm}; pm2: ${versions.pm2}`,
+			`- ENV:      XDG_SESSION_TYPE: ${process.env.XDG_SESSION_TYPE}; MM_CONFIG_FILE: ${process.env.MM_CONFIG_FILE}`,
+			`            WAYLAND_DISPLAY:  ${process.env.WAYLAND_DISPLAY}; DISPLAY: ${process.env.DISPLAY}; ELECTRON_ENABLE_GPU: ${process.env.ELECTRON_ENABLE_GPU}`,
+			`- RAM:      total: ${totalRam} MB; free: ${freeRam} MB; used: ${usedRam} MB`,
+			`- OTHERS:   uptime: ${Math.floor(os.uptime() / 60)} minutes; timeZone: ${Intl.DateTimeFormat().resolvedOptions().timeZone}`
+		].join("\n");
+		Log.info(systemDataString);
+
+		// Return is currently only for tests
+		return systemDataString;
+	} catch (error) {
+		Log.error(error);
+	}
+};
+
+module.exports = logSystemInformation;
 logSystemInformation(`v${mmVersion}`);

js/utils.js

@@ -1,7 +1,5 @@
-const os = require("node:os");
 const fs = require("node:fs");
-const si = require("systeminformation");
-const Log = require("./logger"); // needed with relative path because logSystemInformation is called in an own process in app.js
+const Log = require("logger");
 
 const modulePositions = []; // will get list from index.html
 const regionRegEx = /"region ([^"]*)/i;
@@ -10,37 +8,6 @@ const discoveredPositionsJSFilename = "js/positions.js";
 
 module.exports = {
 
-	async logSystemInformation (mirrorVersion) {
-		try {
-			const system = await si.system();
-			const osInfo = await si.osInfo();
-			const versions = await si.versions();
-
-			const usedNodeVersion = process.version.replace("v", "");
-			const installedNodeVersion = versions.node;
-			const totalRam = (os.totalmem() / 1024 / 1024).toFixed(2);
-			const freeRam = (os.freemem() / 1024 / 1024).toFixed(2);
-			const usedRam = ((os.totalmem() - os.freemem()) / 1024 / 1024).toFixed(2);
-
-			let systemDataString = [
-				"\n####  System Information  ####",
-				`- SYSTEM:   manufacturer: ${system.manufacturer}; model: ${system.model}; virtual: ${system.virtual}; MM: ${mirrorVersion}`,
-				`- OS:       platform: ${osInfo.platform}; distro: ${osInfo.distro}; release: ${osInfo.release}; arch: ${osInfo.arch}; kernel: ${versions.kernel}`,
-				`- VERSIONS: electron: ${process.versions.electron}; used node: ${usedNodeVersion}; installed node: ${installedNodeVersion}; npm: ${versions.npm}; pm2: ${versions.pm2}`,
-				`- ENV:      XDG_SESSION_TYPE: ${process.env.XDG_SESSION_TYPE}; MM_CONFIG_FILE: ${process.env.MM_CONFIG_FILE}`,
-				`            WAYLAND_DISPLAY:  ${process.env.WAYLAND_DISPLAY}; DISPLAY: ${process.env.DISPLAY}; ELECTRON_ENABLE_GPU: ${process.env.ELECTRON_ENABLE_GPU}`,
-				`- RAM:      total: ${totalRam} MB; free: ${freeRam} MB; used: ${usedRam} MB`,
-				`- OTHERS:   uptime: ${Math.floor(os.uptime() / 60)} minutes; timeZone: ${Intl.DateTimeFormat().resolvedOptions().timeZone}`
-			].join("\n");
-			Log.info(systemDataString);
-
-			// Return is currently only for tests
-			return systemDataString;
-		} catch (error) {
-			Log.error(error);
-		}
-	},
-
 	// return all available module positions
 	getAvailableModulePositions () {
 		return modulePositions;

tests/unit/classes/systeminformation_spec.js

@@ -0,0 +1,7 @@
+const SystemInformation = require("../../../js/systeminformation");
+
+describe("SystemInformation", () => {
+	it("should output system information", async () => {
+		await expect(SystemInformation()).resolves.toContain("platform: linux");
+	});
+});