fix: variables names in main.js. add: package-lock

:P

Author: noxygalaxy

main.js

@@ -3,11 +3,11 @@ const path = require('path');
 const fs = require('fs');
 const Registry = require('winreg');
 
-let wnxKjd;
-let tryxNoxy = null;
+let mainWindow;
+let tray = null;
 
-function crtWndFksj() {
-  wnxKjd = new BrowserWindow({
+function createWindow() {
+  mainWindow = new BrowserWindow({
     width: 1280,
     height: 720,
     webPreferences: {
@@ -20,229 +20,229 @@ function crtWndFksj() {
     icon: path.join(__dirname, 'src', 'assets', 'logos', 'twl.png'),
   });
 
-  wnxKjd.loadFile('src/index.html');
-  wnxKjd.on('close', (evntPqr) => {
-    evntPqr.preventDefault();
-    wnxKjd.hide();
+  mainWindow.loadFile('src/index.html');
+  mainWindow.on('close', (event) => {
+    event.preventDefault();
+    mainWindow.hide();
   });
 
-  crtTryGhl();
+  createTray();
 }
 
-function gtStmPthJkl() {
-  return new Promise((rslvMno) => {
-    const rgKyAbc = new Registry({ hive: Registry.HKCU, key: '\\Software\\Valve\\Steam' });
-    rgKyAbc.get('SteamPath', (errXyz, itmDef) => {
-      if (errXyz) {
-        console.error('Error getting Steam path:', errXyz);
-        rslvMno(null);
+function getSteamPath() {
+  return new Promise((resolve) => {
+    const registryKey = new Registry({ hive: Registry.HKCU, key: '\\Software\\Valve\\Steam' });
+    registryKey.get('SteamPath', (error, item) => {
+      if (error) {
+        console.error('Error getting Steam path:', error);
+        resolve(null);
       } else {
-        rslvMno(itmDef ? itmDef.value : null);
+        resolve(item ? item.value : null);
       }
     });
   });
 }
 
-function prsLbrFldsQwe(stmPthRty) {
+function parseLibraryFolders(steamPath) {
   try {
-    const vdfPthUio = path.join(stmPthRty, 'steamapps', 'libraryfolders.vdf');
-    if (!fs.existsSync(vdfPthUio)) {
-      console.log('libraryfolders.vdf not found at:', vdfPthUio);
+    const vdfPath = path.join(steamPath, 'steamapps', 'libraryfolders.vdf');
+    if (!fs.existsSync(vdfPath)) {
+      console.log('libraryfolders.vdf not found at:', vdfPath);
       return {};
     }
 
-    const cntntPas = fs.readFileSync(vdfPthUio, 'utf8');
-    const lbrFldsDfg = {};
-    let crrntFldrHjk = null;
-    let inAppsLmn = false;
-
-    cntntPas.split('\n').forEach(lnOpq => {
-      const trmmdRst = lnOpq.trim();
-      const fldrMtchUvw = trmmdRst.match(/^"(\d+)"$/);
-      if (fldrMtchUvw && !inAppsLmn) {
-        crrntFldrHjk = fldrMtchUvw[1];
-        lbrFldsDfg[crrntFldrHjk] = { path: '', apps: {} };
-      } else if (crrntFldrHjk && trmmdRst.startsWith('"path"')) {
-        const pthMtchXyz = trmmdRst.match(/"path"\s+"(.+)"/);
-        if (pthMtchXyz) lbrFldsDfg[crrntFldrHjk].path = pthMtchXyz[1].replace(/\\\\/g, '\\');
-      } else if (trmmdRst === '"apps"') {
-        inAppsLmn = true;
-      } else if (trmmdRst === '}' && inAppsLmn) {
-        inAppsLmn = false;
-      } else if (inAppsLmn && trmmdRst.match(/^"(\d+)"/)) {
-        const appMtchBcd = trmmdRst.match(/"(\d+)"\s+"(\d+)"/);
-        if (appMtchBcd) lbrFldsDfg[crrntFldrHjk].apps[appMtchBcd[1]] = appMtchBcd[2];
+    const content = fs.readFileSync(vdfPath, 'utf8');
+    const libraryFolders = {};
+    let currentFolder = null;
+    let inAppsSection = false;
+
+    content.split('\n').forEach(line => {
+      const trimmedLine = line.trim();
+      const folderMatch = trimmedLine.match(/^"(\d+)"$/);
+      if (folderMatch && !inAppsSection) {
+        currentFolder = folderMatch[1];
+        libraryFolders[currentFolder] = { path: '', apps: {} };
+      } else if (currentFolder && trimmedLine.startsWith('"path"')) {
+        const pathMatch = trimmedLine.match(/"path"\s+"(.+)"/);
+        if (pathMatch) libraryFolders[currentFolder].path = pathMatch[1].replace(/\\\\/g, '\\');
+      } else if (trimmedLine === '"apps"') {
+        inAppsSection = true;
+      } else if (trimmedLine === '}' && inAppsSection) {
+        inAppsSection = false;
+      } else if (inAppsSection && trimmedLine.match(/^"(\d+)"/)) {
+        const appMatch = trimmedLine.match(/"(\d+)"\s+"(\d+)"/);
+        if (appMatch) libraryFolders[currentFolder].apps[appMatch[1]] = appMatch[2];
       }
     });
-    return lbrFldsDfg;
-  } catch (errEfg) {
-    console.error('Error parsing library folders:', errEfg);
+    return libraryFolders;
+  } catch (error) {
+    console.error('Error parsing library folders:', error);
     return {};
   }
 }
 
-async function isStmGmInstldHij(stmPthJkl, appIdMno, gmFldrPqr) {
+async function isSteamGameInstalled(steamPath, appId, gameFolder) {
   try {
-    const drctPthStu = path.join(stmPthJkl, 'steamapps', 'common', gmFldrPqr);
-    if (fs.existsSync(drctPthStu)) return true;
-
-    const lbrFldsVwx = prsLbrFldsQwe(stmPthJkl);
-    for (const fldrYza in lbrFldsVwx) {
-      if (lbrFldsVwx[fldrYza].apps[appIdMno]) {
-        const gmPthBcd = path.join(lbrFldsVwx[fldrYza].path, 'steamapps', 'common', gmFldrPqr);
-        if (fs.existsSync(gmPthBcd)) return true;
+    const directPath = path.join(steamPath, 'steamapps', 'common', gameFolder);
+    if (fs.existsSync(directPath)) return true;
+
+    const libraryFolders = parseLibraryFolders(steamPath);
+    for (const folder in libraryFolders) {
+      if (libraryFolders[folder].apps[appId]) {
+        const gamePath = path.join(libraryFolders[folder].path, 'steamapps', 'common', gameFolder);
+        if (fs.existsSync(gamePath)) return true;
       }
     }
     return false;
-  } catch (errDef) {
-    console.error('Error checking Steam game installation:', errDef);
+  } catch (error) {
+    console.error('Error checking Steam game installation:', error);
     return false;
   }
 }
 
-async function gtGmPthGhi(gmIdJkl) {
-  const appDtaPthMno = app.getPath('appData');
-  const gmsPqr = {
+async function getGamePath(gameId) {
+  const appDataPath = app.getPath('appData');
+  const games = {
     'tw': { steamAppId: '380840', steamGameFolder: 'Teeworlds' },
     'ddnet': { steamAppId: '412220', steamGameFolder: 'DDraceNetwork' },
     'tclient': { clientName: 'TClient' },
     'cactus': { clientName: 'Cactus' }
   };
 
-  const gmDtaStu = gmsPqr[gmIdJkl];
-  if (!gmDtaStu) return false;
+  const gameData = games[gameId];
+  if (!gameData) return false;
 
-  if (gmDtaStu.steamAppId) {
-    const stmPthVwx = await gtStmPthJkl();
-    if (!stmPthVwx) return false;
-    return await isStmGmInstldHij(stmPthVwx, gmDtaStu.steamAppId, gmDtaStu.steamGameFolder);
-  } else if (gmDtaStu.clientName) {
-    const clntPthYza = path.join(appDtaPthMno, 'TWLauncher', 'clients', gmDtaStu.clientName);
-    return fs.existsSync(clntPthYza);
+  if (gameData.steamAppId) {
+    const steamPath = await getSteamPath();
+    if (!steamPath) return false;
+    return await isSteamGameInstalled(steamPath, gameData.steamAppId, gameData.steamGameFolder);
+  } else if (gameData.clientName) {
+    const clientPath = path.join(appDataPath, 'TWLauncher', 'clients', gameData.clientName);
+    return fs.existsSync(clientPath);
   }
   return false;
 }
 
-async function bldTryMnuAbc() {
+async function buildTrayMenu() {
   try {
-    const isTwInstldDef = await gtGmPthGhi('tw');
-    const isDdnetInstldGhi = await gtGmPthGhi('ddnet');
-    const isTclntInstldJkl = await gtGmPthGhi('tclient');
-    const isCctsInstldMno = await gtGmPthGhi('cactus');
+    const isTeeworldsInstalled = await getGamePath('tw');
+    const isDdnetInstalled = await getGamePath('ddnet');
+    const isTclientInstalled = await getGamePath('tclient');
+    const isCactusInstalled = await getGamePath('cactus');
 
     console.log('Building tray menu with status:', {
-      Teeworlds: isTwInstldDef,
-      DDraceNetwork: isDdnetInstldGhi,
-      TClient: isTclntInstldJkl,
-      Cactus: isCctsInstldMno
+      Teeworlds: isTeeworldsInstalled,
+      DDraceNetwork: isDdnetInstalled,
+      TClient: isTclientInstalled,
+      Cactus: isCactusInstalled
     });
 
-    const lnchSubmnuPqr = Menu.buildFromTemplate([
+    const launchSubmenu = Menu.buildFromTemplate([
       { 
         label: 'Teeworlds', 
         icon: path.join(__dirname, 'src', 'assets', 'tray', 'tw.png'), 
-        click: () => lnchGmStu('tw'),
-        enabled: isTwInstldDef
+        click: () => launchGame('tw'),
+        enabled: isTeeworldsInstalled
       },
       { 
         label: 'DDraceNetwork', 
         icon: path.join(__dirname, 'src', 'assets', 'tray', 'ddnet.png'), 
-        click: () => lnchGmStu('ddnet'),
-        enabled: isDdnetInstldGhi
+        click: () => launchGame('ddnet'),
+        enabled: isDdnetInstalled
       },
       { 
         label: 'TClient', 
         icon: path.join(__dirname, 'src', 'assets', 'tray', 'tclient.png'), 
-        click: () => lnchGmStu('tclient'),
-        enabled: isTclntInstldJkl
+        click: () => launchGame('tclient'),
+        enabled: isTclientInstalled
       },
       { 
         label: 'Cactus', 
         icon: path.join(__dirname, 'src', 'assets', 'tray', 'cactus.png'), 
-        click: () => lnchGmStu('cactus'),
-        enabled: isCctsInstldMno
+        click: () => launchGame('cactus'),
+        enabled: isCactusInstalled
       }
     ]);
 
     return Menu.buildFromTemplate([
-      { label: 'Show App', click: () => wnxKjd.show() },
-      { label: 'Launch', submenu: lnchSubmnuPqr },
+      { label: 'Show App', click: () => mainWindow.show() },
+      { label: 'Launch', submenu: launchSubmenu },
       { label: 'Close App', click: () => {
-          wnxKjd.destroy();
+          mainWindow.destroy();
           app.quit();
       }},
     ]);
-  } catch (errVwx) {
-    console.error('Error building tray menu:', errVwx);
+  } catch (error) {
+    console.error('Error building tray menu:', error);
     return Menu.buildFromTemplate([
-      { label: 'Show App', click: () => wnxKjd.show() },
+      { label: 'Show App', click: () => mainWindow.show() },
       { label: 'Close App', click: () => {
-          wnxKjd.destroy();
+          mainWindow.destroy();
           app.quit();
       }}
     ]);
   }
 }
 
-function crtTryGhl() {
-  tryxNoxy = new Tray(path.join(__dirname, 'src', 'assets', 'logos', 'twl.png'));
-  tryxNoxy.setToolTip('TWLauncher by noxygalaxy');
+function createTray() {
+  tray = new Tray(path.join(__dirname, 'src', 'assets', 'logos', 'twl.png'));
+  tray.setToolTip('TWLauncher by noxygalaxy');
 
-  tryxNoxy.on('right-click', async () => {
+  tray.on('right-click', async () => {
     console.log('Tray right-clicked');
-    const mnuYza = await bldTryMnuAbc();
-    tryxNoxy.popUpContextMenu(mnuYza);
+    const menu = await buildTrayMenu();
+    tray.popUpContextMenu(menu);
   });
 
-  bldTryMnuAbc().then(mnuBcd => {
-    tryxNoxy.setContextMenu(mnuBcd);
+  buildTrayMenu().then(menu => {
+    tray.setContextMenu(menu);
   });
 }
 
-function lnchGmStu(idEfg) {
-  console.log(`Launching game: ${idEfg}`);
-  wnxKjd.webContents.send('launch-game', idEfg);
+function launchGame(id) {
+  console.log(`Launching game: ${id}`);
+  mainWindow.webContents.send('launch-game', id);
 }
 
 ipcMain.on('minimize-window', () => {
-    wnxKjd.minimize();
+    mainWindow.minimize();
 });
 
 ipcMain.on('hide-window', () => {
-    wnxKjd.hide();
-    tryxNoxy.displayBalloon({
-        title:'TWLauncher',
-        content:'Launcher will work in background, to close it right click on the tray icon',
+    mainWindow.hide();
+    tray.displayBalloon({
+        title: 'TWLauncher',
+        content: 'Launcher will work in background, to close it right click on the tray icon',
         icon: path.join(__dirname, 'src', 'assets', 'logos', 'twl.png'),
     });
 });
 
 ipcMain.on('launch-game', async () => {
-  const mnuHij = await bldTryMnuAbc();
-  tryxNoxy.setContextMenu(mnuHij);
+  const menu = await buildTrayMenu();
+  tray.setContextMenu(menu);
 });
 
 app.whenReady().then(() => {
-  const appDtaPthJkl = app.getPath('appData');
-  const clntsPthMno = path.join(appDtaPthJkl, 'TWLauncher', 'clients');
+  const appDataPath = app.getPath('appData');
+  const clientsPath = path.join(appDataPath, 'TWLauncher', 'clients');
 
-  if (!fs.existsSync(clntsPthMno)) {
-    fs.mkdirSync(clntsPthMno, { recursive: true });
+  if (!fs.existsSync(clientsPath)) {
+    fs.mkdirSync(clientsPath, { recursive: true });
   }
 
-  crtWndFksj();
+  createWindow();
 
   app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) crtWndFksj();
-    else wnxKjd.show();
+    if (BrowserWindow.getAllWindows().length === 0) createWindow();
+    else mainWindow.show();
   });
 });
 
-app.on('window-all-closed', (ePqr) => {
-  ePqr.preventDefault();
-  tryxNoxy.displayBalloon({
-    title:'TWLauncher',
-    content:'Goodbye! <3',
+app.on('window-all-closed', (event) => {
+  event.preventDefault();
+  tray.displayBalloon({
+    title: 'TWLauncher',
+    content: 'Goodbye! <3',
     icon: path.join(__dirname, 'src', 'assets', 'logos', 'twl.png'),
   });
-});
+});