fix: add correction to binary generation

Author: lucassm02

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "mem-gui",
-  "description": "A graphical interface (GUI) for managing Memcached databases and cache. Provides an intuitive way to list, create, edit, and delete keys, as well as manage multiple server connections efficiently.",
+  "name": "MemGUI",
+  "description": "GUI for managing Memcached",
   "private": false,
   "version": "0.1.0",
   "author": {
@@ -11,18 +11,19 @@
   "license": "SEE LICENSE IN LICENSE",
   "scripts": {
     "clean": "rimraf dist && rimraf release",
-    "prestart": "yarn clean && tsc && node scripts/fix-server-extension.js",
-    "predev": "yarn clean && tsc && node scripts/fix-server-extension.js",
+    "prestart": "yarn clean && tsc && node scripts/build-server.js",
+    "predev": "yarn clean && tsc && node scripts/build-server.js",
     "dev": "concurrently \"npm run ui\" \"wait-on http://localhost:5173 && npm run electron\"",
     "ui": "vite",
     "server": "tsx src/server/index.ts",
     "electron": "electron .",
     "build:server": "tsc",
     "build:ui": "vite build",
-    "build:all": "yarn clean && yarn build:ui && yarn build:server && node scripts/fix-server-extension.js && electron-builder",
+    "build:all": "yarn clean && yarn build:ui && yarn build:server && node scripts/build-server.js && electron-builder",
     "start": "electron ."
   },
   "build": {
+    "asar": false,
     "extraFiles": [
       {
         "from": "dist/",
@@ -79,6 +80,7 @@
     "electron": "^34.0.2",
     "electron-builder": "^25.1.8",
     "electron-is-dev": "^3.0.1",
+    "esbuild": "^0.24.2",
     "eslint": "^9.17.0",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^5.0.0",

scripts/build-server.js

@@ -0,0 +1,16 @@
+/* eslint-disable no-undef */
+import { build } from 'esbuild';
+import path from 'path';
+
+const inputFilePath = path.join('src/server/index.ts');
+const outputFilePath = path.join('dist/server/index.cjs');
+
+build({
+  entryPoints: [inputFilePath],
+  bundle: true,
+  platform: 'node',
+  target: 'node22',
+  outfile: outputFilePath,
+  external: [],
+  sourcemap: true,
+}).catch(() => process.exit(1));

scripts/fix-server-extension.js

@@ -1,21 +1,54 @@
 const { app, BrowserWindow, ipcMain, screen } = require('electron');
 const path = require('path');
-const { spawn } = require('child_process');
+const net = require('net');
+
+const DEFAULT_SERVER_PORT = 33080;
 
 const isDev = !app.isPackaged;
 
 const serverPath = isDev
   ? path.join(__dirname, '../../dist/server/index.cjs')
   : path.join(process.resourcesPath, 'server/index.cjs');
 
-app.whenReady().then(() => {
-  const primaryDisplay = screen.getPrimaryDisplay();
-  const { width, height } = primaryDisplay.workAreaSize;
+const startURL = isDev
+  ? 'http://localhost:5173'
+  : `http://localhost:${DEFAULT_SERVER_PORT}/index.html`;
+
+async function isPortInUse(port) {
+  return new Promise((resolve) => {
+    const server = net.createServer();
+    server.once('error', (err) => {
+      if (err.code === 'EADDRINUSE') {
+        resolve(true);
+      } else {
+        resolve(false);
+      }
+    });
+
+    server.once('listening', () => {
+      server.close();
+      resolve(false);
+    });
 
-  const apiProcess = spawn('node', [serverPath], {
-    windowsHide: true,
-    stdio: 'ignore',
+    server.listen(port);
   });
+}
+
+app.whenReady().then(async () => {
+  try {
+    const { server } = require(serverPath);
+
+    const isUsed = await isPortInUse(DEFAULT_SERVER_PORT);
+
+    if (!isUsed) {
+      await server.listen(DEFAULT_SERVER_PORT);
+    }
+  } catch (error) {
+    console.error('Unable to create a new http sever', error);
+  }
+
+  const primaryDisplay = screen.getPrimaryDisplay();
+  const { width, height } = primaryDisplay.workAreaSize;
 
   const iconPath = path.join(__dirname, '..', '..', 'assets', 'mem-gui.ico');
 
@@ -34,22 +67,8 @@ app.whenReady().then(() => {
     icon: iconPath,
   });
 
-  const startURL = isDev
-    ? 'http://localhost:5173'
-    : 'http://localhost:33080/index.html';
-
   mainWindow.loadURL(startURL);
 
-  app.on('quit', () => {
-    if (apiProcess) {
-      try {
-        process.kill(apiProcess.pid);
-      } catch (error) {
-        console.error('Erro ao encerrar o subprocesso:', error);
-      }
-    }
-  });
-
   mainWindow.on('maximize', () => {
     mainWindow.webContents.send('window-maximized');
   });

src/electron/main.cjs

@@ -12,7 +12,6 @@ import { v4 as uuidv4 } from 'uuid';
 
 const TELNET_TIMEOUT = 5000;
 const MAX_CONCURRENT_REQUESTS = 10;
-const DEFAULT_SERVER_PORT = 33080;
 const CONNECTION_TIMEOUT = 300_000;
 
 const STATIC_FILES_PATH = path.join(__dirname, '..', 'ui');
@@ -47,13 +46,13 @@ interface MemcachedConnection {
   lastActive: Date;
 }
 
-const app = express();
-app.use(cors());
-app.use(express.json());
+const server = express();
+server.use(cors());
+server.use(express.json());
 
-app.use(express.static(STATIC_FILES_PATH));
+server.use(express.static(STATIC_FILES_PATH));
 
-app.use(
+server.use(
   (
     err: Error,
     req: express.Request,
@@ -472,7 +471,7 @@ const CacheController = {
   },
 };
 
-app.post(
+server.post(
   '/api/connections',
   validateRequest([
     body('host').isString(),
@@ -481,23 +480,23 @@ app.post(
   ConnectionController.connect
 );
 
-app.delete(
+server.delete(
   '/api/connections',
   checkConnection,
   ConnectionController.disconnect
 );
 
-app.get('/api/connections', checkConnection, ConnectionController.status);
+server.get('/api/connections', checkConnection, ConnectionController.status);
 
-app.get('/api/keys', checkConnection, CacheController.listKeys);
+server.get('/api/keys', checkConnection, CacheController.listKeys);
 
-app.get(
+server.get(
   '/api/keys/:key',
   checkConnection,
   validateRequest([param('key').isString().notEmpty()]),
   CacheController.getKey
 );
-app.post(
+server.post(
   '/api/keys',
   checkConnection,
   validateRequest([
@@ -507,16 +506,11 @@ app.post(
   ]),
   CacheController.setKey
 );
-app.delete(
+server.delete(
   '/api/keys/:key',
   checkConnection,
   validateRequest([param('key').isString().notEmpty()]),
   CacheController.deleteKey
 );
 
-const PORT = DEFAULT_SERVER_PORT;
-app.listen(PORT, () => {
-  logger.info(`Servidor iniciado na porta ${PORT}`);
-});
-
-export default app;
+export { server };

src/server/index.ts

@@ -2294,7 +2294,7 @@ es6-error@^4.1.1:
 
 esbuild@^0.24.2:
   version "0.24.2"
-  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.24.2.tgz#b5b55bee7de017bff5fb8a4e3e44f2ebe2c3567d"
   integrity sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==
   optionalDependencies:
     "@esbuild/aix-ppc64" "0.24.2"