Ecosystem/monerod-gui
1
0
Fork 0
mirror of https://github.com/everoddandeven/monerod-gui.git synced 2024-12-22 19:49:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bring splash screen back

Browse source
This commit is contained in:
argenius 2024-11-16 14:13:17 +01:00
parent ab82920f08
commit 3bc0e1b93e
4 changed files with 80 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
angular.json
View file

@ -34,7 +34,8 @@
"inlineStyleLanguage": "scss", "inlineStyleLanguage": "scss",
"assets": [ "assets": [
"src/favicon.ico", "src/favicon.ico",
"src/assets" "src/assets",
"src/splash.html"
], ],
"scripts": [ "scripts": [
"node_modules/jquery/dist/jquery.min.js", "node_modules/jquery/dist/jquery.min.js",

60
app/main.ts
View file

@ -13,6 +13,11 @@ import { BatteryUtils, FileUtils, NetworkUtils } from './utils';
app.setName('Monero Daemon'); app.setName('Monero Daemon');
if (process.platform === 'win32')
{
app.setAppUserModelId(app.name);
}
let win: BrowserWindow | null = null; let win: BrowserWindow | null = null;
let isHidden: boolean = false; let isHidden: boolean = false;
let isQuitting: boolean = false; let isQuitting: boolean = false;
@ -121,7 +126,7 @@ function createTray(): Tray {
return tray; return tray;
} }
function createWindow(): BrowserWindow { async function createWindow(): Promise<BrowserWindow> {
const size = screen.getPrimaryDisplay().workAreaSize; const size = screen.getPrimaryDisplay().workAreaSize;
tray = createTray(); tray = createTray();
@ -167,7 +172,7 @@ function createWindow(): BrowserWindow {
const url = new URL(path.join('file:', dirname, pathIndex)); const url = new URL(path.join('file:', dirname, pathIndex));
console.log(`Main window url: ${url}`); console.log(`Main window url: ${url}`);
win.loadURL(url.href); await win.loadURL(url.href);
} }
win.on('close', (event) => { win.on('close', (event) => {
@ -192,12 +197,8 @@ function createWindow(): BrowserWindow {
return win; return win;
} }
const createSplashWindow = async (): Promise<BrowserWindow | undefined> => { const createSplashWindow = async (): Promise<BrowserWindow | undefined> => {
return undefined; console.log("createSplashWindow()");
if (os.platform() == 'win32' || AppMainProcess.isPortable) {
return undefined;
}
const window = new BrowserWindow({ const window = new BrowserWindow({
width: 480, width: 480,
@ -209,7 +210,12 @@ const createSplashWindow = async (): Promise<BrowserWindow | undefined> => {
icon: wdwIcon, icon: wdwIcon,
minimizable: false, minimizable: false,
maximizable: false, maximizable: false,
fullscreen: false fullscreen: false,
fullscreenable: false,
movable: false,
resizable: false,
closable: true,
center: true
}); });
// Path when running electron executable // Path when running electron executable
@ -220,7 +226,15 @@ const createSplashWindow = async (): Promise<BrowserWindow | undefined> => {
pathIndex = '../dist/splash.html'; pathIndex = '../dist/splash.html';
} }
const url = new URL(path.join('file:', dirname, pathIndex)); if (!fs.existsSync(path.join(dirname, pathIndex))) {
console.error("createSplashScreen(): path doesn't exists: " + path.join(dirname, pathIndex));
window.close();
return undefined;
}
const indexPath = path.join('file:', dirname, pathIndex);
const url = new URL(indexPath);
await window.loadURL(url.href); await window.loadURL(url.href);
@ -297,32 +311,36 @@ async function startMoneroDaemon(commandOptions: string[]): Promise<MonerodProce
commandOptions.push('--non-interactive'); commandOptions.push('--non-interactive');
monerodProcess = new MonerodProcess({ const monerodProc = new MonerodProcess({
monerodCmd: monerodPath, monerodCmd: monerodPath,
flags: commandOptions, flags: commandOptions,
isExe: true isExe: true
}); });
monerodProcess.onStdOut((data) => { monerodProc.onStdOut((data) => {
win?.webContents.send('monero-stdout', `${data}`); win?.webContents.send('monero-stdout', `${data}`);
}); });
monerodProcess.onStdErr((data) => { monerodProc.onStdErr((data) => {
win?.webContents.send('monero-stderr', `${data}`); win?.webContents.send('monero-stderr', `${data}`);
}); });
monerodProcess.onError((err: Error) => { monerodProc.onError((err: Error) => {
win?.webContents.send('monero-stderr', `${err.message}`); win?.webContents.send('monero-stderr', `${err.message}`);
}); });
monerodProcess.onClose((_code: number | null) => { monerodProc.onClose((_code: number | null) => {
const code = _code != null ? _code : -Number.MAX_SAFE_INTEGER; const code = _code != null ? _code : -Number.MAX_SAFE_INTEGER;
console.log(`monerod exited with code: ${code}`); const msg = `Process monerod ${monerodProc.pid} exited with code: ${code}`;
win?.webContents.send('monero-stdout', `monerod exited with code: ${code}`); console.log(msg);
win?.webContents.send('monero-stdout', msg);
win?.webContents.send('monero-close', code); win?.webContents.send('monero-close', code);
monerodProcess = null; monerodProcess = null;
}); });
monerodProcess = null;
monerodProcess = monerodProc;
try { try {
await monerodProcess.start(); await monerodProcess.start();
win?.webContents.send('monerod-started', true); win?.webContents.send('monerod-started', true);
@ -427,14 +445,14 @@ try {
const gotInstanceLock = app.requestSingleInstanceLock(); const gotInstanceLock = app.requestSingleInstanceLock();
if (!gotInstanceLock) { if (!gotInstanceLock) {
dialog.showErrorBox('', 'Another instance of monerod GUI is running'); dialog.showErrorBox('', 'Another instance of Monerod GUI is running');
app.quit(); app.quit();
return; return;
} }
setTimeout(async () => { setTimeout(async () => {
const splash = await createSplashWindow(); const splash = await createSplashWindow();
createWindow(); await createWindow();
await new Promise<void>((resolve, reject) => { await new Promise<void>((resolve, reject) => {
try { try {
@ -463,11 +481,11 @@ try {
} }
}); });
app.on('activate', () => { app.on('activate', async () => {
// On OS X it's common to re-create a window in the app when the // On OS X it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open. // dock icon is clicked and there are no other windows open.
if (win === null) { if (win === null) {
createWindow(); await createWindow();
} }
}); });

8
app/process/AppChildProcess.ts
View file

@ -17,6 +17,14 @@ export class AppChildProcess {
protected _command: string; protected _command: string;
protected readonly _args?: string[]; protected readonly _args?: string[];
public get pid(): number {
if (!this._process || this._process.pid == null) {
return -1;
}
return this._process.pid;
}
protected readonly _handlers: { protected readonly _handlers: {
'stdout': ((data: string) => void)[], 'stdout': ((data: string) => void)[],
'stderr': ((err: string) => void)[], 'stderr': ((err: string) => void)[],

46
app/process/MonerodProcess.ts
View file

@ -44,12 +44,12 @@ export class MonerodProcess extends AppChildProcess {
let foundUsage: boolean = false; let foundUsage: boolean = false;
proc.onError((err: Error) => { proc.onError((err: Error) => {
console.log(`MonerodProcess.isValidMonerodPath(): '${err.message}'`); console.log(`MonerodProcess.isValidMonerodPath(): Error: '${err.message}'`);
resolve(false); resolve(false);
}); });
proc.onStdErr((err: string) => { proc.onStdErr((err: string) => {
console.log(`MonerodProcess.isValidMonerodPath(): '${err}'`); console.log(`MonerodProcess.isValidMonerodPath(): Std Error: '${err}'`);
resolve(false); resolve(false);
}); });
@ -58,8 +58,6 @@ export class MonerodProcess extends AppChildProcess {
return; return;
} }
console.log(`MonerodProcess.isValidMonerodPath(): '${data}'`);
if ( if (
`${data}`.includes('monerod [options|settings] [daemon_command...]') || `${data}`.includes('monerod [options|settings] [daemon_command...]') ||
`${data}`.includes('monerod.exe [options|settings] [daemon_command...]') `${data}`.includes('monerod.exe [options|settings] [daemon_command...]')
@ -70,7 +68,7 @@ export class MonerodProcess extends AppChildProcess {
proc.onClose((code: number | null) => { proc.onClose((code: number | null) => {
console.log(`MonerodProcess.isValidMonerodPath(): exit code '${code}', found usage: ${foundUsage}`); console.log(`MonerodProcess.isValidMonerodPath(): exit code '${code}', found usage: ${foundUsage}`);
resolve(foundUsage); resolve(foundUsage && code == 0);
}); });
}); });
@ -104,6 +102,7 @@ export class MonerodProcess extends AppChildProcess {
console.log(message); console.log(message);
let firstPatternFound = false; let firstPatternFound = false;
const waitForPattern = this._args ? !this._args.includes('--version') && !this.args.includes('--help') : true;
const patternPromise = new Promise<void>((resolve, reject) => { const patternPromise = new Promise<void>((resolve, reject) => {
let firstStdout = true; let firstStdout = true;
@ -112,12 +111,18 @@ export class MonerodProcess extends AppChildProcess {
const onStdOut = (out: string) => { const onStdOut = (out: string) => {
if (firstStdout) { if (firstStdout) {
firstStdout = false; firstStdout = false;
if (!waitForPattern) {
return;
}
timeout = setTimeout(() => { timeout = setTimeout(() => {
if (this._process && this._process.exitCode == null) { if (this._process && this._process.exitCode == null) {
this._process.kill(); this._process.kill();
} }
timeout = undefined; timeout = undefined;
reject(new Error("Timeout out"));
reject(new Error("MonerodProcess.start(): Timed out"));
}, 90*1000); }, 90*1000);
} }
@ -128,7 +133,14 @@ export class MonerodProcess extends AppChildProcess {
} }
if (firstPatternFound) { if (firstPatternFound) {
if(timeout !== undefined) clearTimeout(timeout); if(timeout !== undefined) {
clearTimeout(timeout);
console.log("MonerodProcess.start(): Cleared timeout");
}
else {
console.log("MonerodProcess.start(): No timeout found");
}
resolve(); resolve();
} }
else { else {
@ -144,9 +156,9 @@ export class MonerodProcess extends AppChildProcess {
if (!this._process || !this._process.pid) { if (!this._process || !this._process.pid) {
throw new Error("Monerod process did not start!"); throw new Error("Monerod process did not start!");
} }
try { try {
const waitForPattern = this._args ? !this._args.includes('--version') && !this.args.includes('--help') : true; console.log(`MonerodProcess.start(): wait for pattern: ${waitForPattern}`);
if (waitForPattern) await patternPromise; if (waitForPattern) await patternPromise;
console.log("Started monerod process pid: " + this._process.pid); console.log("Started monerod process pid: " + this._process.pid);
@ -175,27 +187,31 @@ export class MonerodProcess extends AppChildProcess {
const promise = new Promise<string>((resolve, reject) => { const promise = new Promise<string>((resolve, reject) => {
proc.onError((err: Error) => { proc.onError((err: Error) => {
console.log("proc.onError():"); console.log("MonerodProcess.getVersion(): proc.onError():");
console.error(err); console.error(err);
reject(err) reject(err)
}); });
proc.onStdErr((err: string) => { proc.onStdErr((err: string) => {
console.log("proc.onStdErr()"); console.log("MonerodProcess.getVersion(): proc.onStdErr()");
console.error(err); console.error(err);
reject(new Error(err)); reject(new Error(err));
}); });
proc.onStdOut((version: string) => { proc.onStdOut((version: string) => {
console.log("proc.onStdOut():"); if (version == '') {
return;
}
console.log("MonerodProcess.getVersion(): proc.onStdOut():");
console.log(version); console.log(version);
resolve(version); resolve(version);
}); });
}); });
console.log("Before proc.start()"); console.log("MonerodProcess.getVersion(): Before proc.start()");
await proc.start(); await proc.start();
console.log("After proc.start()"); console.log("MonerodProcess.getVersion(): After proc.start()");
return await promise; return await promise;
} }