mirror of
https://github.com/Tzahi12345/YoutubeDL-Material.git
synced 2026-04-22 18:13:20 +03:00
Electron app opens if server is already open
Added logging to electron
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
const { app, BrowserWindow } = require('electron');
|
const { app, BrowserWindow } = require('electron');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
const elogger = require('electron-log');
|
||||||
const { spawn } = require('child_process');
|
const { spawn } = require('child_process');
|
||||||
|
|
||||||
let win;
|
let win;
|
||||||
@@ -44,6 +45,13 @@ function createMainWindow() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function loadPage() {
|
||||||
|
splashWindow.close()
|
||||||
|
// load the dist folder from Angular
|
||||||
|
win.loadURL('http://localhost:17442')
|
||||||
|
win.show()
|
||||||
|
}
|
||||||
|
|
||||||
function createWindow() {
|
function createWindow() {
|
||||||
serverProcess = spawn('node', [path.join(__dirname, 'app.js')]);
|
serverProcess = spawn('node', [path.join(__dirname, 'app.js')]);
|
||||||
|
|
||||||
@@ -53,10 +61,7 @@ function createWindow() {
|
|||||||
// Log the server output to the console
|
// Log the server output to the console
|
||||||
serverProcess.stdout.on('data', (data) => {
|
serverProcess.stdout.on('data', (data) => {
|
||||||
if (data.toString().includes('started on PORT')) {
|
if (data.toString().includes('started on PORT')) {
|
||||||
splashWindow.close()
|
loadPage();
|
||||||
// load the dist folder from Angular
|
|
||||||
win.loadURL('http://localhost:17442')
|
|
||||||
win.show()
|
|
||||||
}
|
}
|
||||||
console.log(`Server output: ${data}`);
|
console.log(`Server output: ${data}`);
|
||||||
});
|
});
|
||||||
@@ -64,6 +69,11 @@ function createWindow() {
|
|||||||
// Log any errors to the console
|
// Log any errors to the console
|
||||||
serverProcess.stderr.on('data', (data) => {
|
serverProcess.stderr.on('data', (data) => {
|
||||||
console.error(`Server error: ${data}`);
|
console.error(`Server error: ${data}`);
|
||||||
|
const error = data.toString();
|
||||||
|
if (error.includes('EADDRINUSE')) {
|
||||||
|
loadPage();
|
||||||
|
}
|
||||||
|
elogger.error(error);
|
||||||
});
|
});
|
||||||
|
|
||||||
process.on('uncaughtException', (error) => {
|
process.on('uncaughtException', (error) => {
|
||||||
|
|||||||
5
backend/package-lock.json
generated
5
backend/package-lock.json
generated
@@ -1842,6 +1842,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/electron-is-packaged/-/electron-is-packaged-1.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/electron-is-packaged/-/electron-is-packaged-1.0.2.tgz",
|
||||||
"integrity": "sha512-JZpV9QgVsehop7tm3KDll2/iJ9K3e7mL+jm6E3gA96zurIhxv3FZ0kxJK0eGL9c3SYORU1rN+/q2Ia8/v62Pjw=="
|
"integrity": "sha512-JZpV9QgVsehop7tm3KDll2/iJ9K3e7mL+jm6E3gA96zurIhxv3FZ0kxJK0eGL9c3SYORU1rN+/q2Ia8/v62Pjw=="
|
||||||
},
|
},
|
||||||
|
"electron-log": {
|
||||||
|
"version": "4.4.8",
|
||||||
|
"resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz",
|
||||||
|
"integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA=="
|
||||||
|
},
|
||||||
"electron-osx-sign": {
|
"electron-osx-sign": {
|
||||||
"version": "0.6.0",
|
"version": "0.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz",
|
||||||
|
|||||||
@@ -60,6 +60,7 @@
|
|||||||
"bcryptjs": "^2.4.0",
|
"bcryptjs": "^2.4.0",
|
||||||
"compression": "^1.7.4",
|
"compression": "^1.7.4",
|
||||||
"config": "^3.2.3",
|
"config": "^3.2.3",
|
||||||
|
"electron-log": "^4.4.8",
|
||||||
"electron-root-path": "^1.1.0",
|
"electron-root-path": "^1.1.0",
|
||||||
"express": "^4.17.3",
|
"express": "^4.17.3",
|
||||||
"feed": "^4.2.2",
|
"feed": "^4.2.2",
|
||||||
|
|||||||
Reference in New Issue
Block a user