GlcoinCore/specter-desktop
1
0
Fork 0
mirror of https://github.com/cryptoadvance/specter-desktop.git synced 2026-08-13 12:33:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Chore: Use prettier for Electron app (#2347)

Browse source 
* prettify main.js

* change multisig address verification

* add package-lock to .gitignore
This commit is contained in:
Manolis Mandrapilias 2023-06-28 11:58:40 +02:00 • committed by GitHub
parent 82d0fe385c
commit 5928b220de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 319 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -23,6 +23,7 @@ pyinstaller/version.txt
pyinstaller/electron/version-data.json
pyinstaller/electron/downloadloc.js
pyinstaller/electron/node_modules
pyinstaller/electron/package-lock.json
pyinstaller/electron/dist
pyinstaller/electron/fonts
pyinstaller/electron/typography.css

5
pyinstaller/electron/.prettierrc Normal file
View file

@ -0,0 +1,5 @@
{
"singleQuote": true,
"semi": false,
"printWidth": 125
}

611
pyinstaller/electron/main.js
View file

@ -6,10 +6,20 @@ const fs = require('fs')
const request = require('request')
const https = require('https')
const extract = require('extract-zip')
const defaultMenu = require('electron-default-menu');
const defaultMenu = require('electron-default-menu')
const ProgressBar = require('electron-progressbar')
const { spawn, exec } = require('child_process');
const { getFileHash, getAppSettings, appSettingsPath, specterdDirPath, specterAppLogPath, versionData, isDev, devFolder, isMac } = require('./helpers')
const { spawn, exec } = require('child_process')
const {
getFileHash,
getAppSettings,
appSettingsPath,
specterdDirPath,
specterAppLogPath,
versionData,
isDev,
devFolder,
isMac,
} = require('./helpers')
const downloadloc = require('./downloadloc')
const getDownloadLocation = downloadloc.getDownloadLocation
const appName = downloadloc.appName()
@ -17,34 +27,31 @@ const appNameLower = appName.toLowerCase()
// Quit again if there is no version-data in dev
if (isDev && versionData === undefined) {
console.log(`You need to create a version-data.json in your dev folder (${devFolder}) to run the app. Check helpers.js for the format. Quitting ...`)
console.log(
`You need to create a version-data.json in your dev folder (${devFolder}) to run the app. Check helpers.js for the format. Quitting ...`
)
app.quit()
return
}
ipcMain.handle("showMessageBoxSync", (e, message, buttons) => {
dialog.showMessageBoxSync(mainWindow, { message, buttons });
});
ipcMain.handle('showMessageBoxSync', (e, message, buttons) => {
dialog.showMessageBoxSync(mainWindow, { message, buttons })
})
// Logging
const {transports, format, createLogger } = require('winston')
const combinedLog = new transports.File({ filename: specterAppLogPath });
const { transports, format, createLogger } = require('winston')
const combinedLog = new transports.File({ filename: specterAppLogPath })
const winstonOptions = {
exitOnError: false,
format: format.combine(
format.timestamp(),
format.json(),
format.printf(info => {
return `${info.timestamp} [${info.level}] : ${info.message}`;
})
),
transports: [
new transports.Console({json:false}),
combinedLog
],
exceptionHandlers: [
combinedLog
]
exitOnError: false,
format: format.combine(
format.timestamp(),
format.json(),
format.printf((info) => {
return `${info.timestamp} [${info.level}] : ${info.message}`
})
),
transports: [new transports.Console({ json: false }), combinedLog],
exceptionHandlers: [combinedLog],
}
const logger = createLogger(winstonOptions)
@ -54,37 +61,35 @@ if (isDev) {
// Set the dock icon (MacOS and for development only)
if (isMac && isDev) {
const dockIcon = nativeImage.createFromPath(
app.getAppPath() + "/assets-dev/dock_icon_macos.png"
);
const dockIcon = nativeImage.createFromPath(app.getAppPath() + '/assets-dev/dock_icon_macos.png')
app.dock.setIcon(dockIcon)
}
let appSettings = getAppSettings()
let dimensions = { width: 1500, height: 1000 };
let dimensions = { width: 1500, height: 1000 }
// Modify the context menu
const contextMenu = require('electron-context-menu');
const contextMenu = require('electron-context-menu')
contextMenu({
menu: (actions) => [
{
menu: (actions) => [
{
label: 'Reload',
click: () => {
mainWindow.reload()
}
},
},
{
label: 'Back',
click: () => {
mainWindow.webContents.goBack()
}
},
},
actions.separator(),
actions.copy(),
actions.cut(),
actions.paste()
]
});
actions.paste(),
],
})
// The standard quit item cannot be replaced / modified and it is not triggering the
// before-quit event on MacOS if a child window is open
@ -94,93 +99,93 @@ const dockMenuWithforceQuit = Menu.buildFromTemplate([
click: () => {
// If the progress bar exists, close it
if (progressBar) {
progressBar.close();
progressBar.close()
}
// Quit the app
app.quit();
}
}
]);
app.quit()
},
},
])
// Download function with progress bar
// Download function with progress bar
let progressBar
const download = (uri, filename, callback) => {
// HEAD request first
request.head(uri, (err, res, body) => {
if (res.statusCode != 404) {
let receivedBytes = 0
const totalBytes = res.headers['content-length']
logger.info(`Total size to download: ${totalBytes}`)
progressBar = new ProgressBar({
indeterminate: false,
abortOnError: true,
text: 'Downloading the Specter binary from GitHub',
detail: 'This can take several minutes depending on your Internet connection. Specter will start once the download is finished.',
maxValue: totalBytes,
browserWindow: {
parent: mainWindow
if (res.statusCode != 404) {
let receivedBytes = 0
const totalBytes = res.headers['content-length']
logger.info(`Total size to download: ${totalBytes}`)
progressBar = new ProgressBar({
indeterminate: false,
abortOnError: true,
text: 'Downloading the Specter binary from GitHub',
detail:
'This can take several minutes depending on your Internet connection. Specter will start once the download is finished.',
maxValue: totalBytes,
browserWindow: {
parent: mainWindow,
},
style: {
detail: {
'margin-bottom': '12px',
},
style: {
detail: {
'margin-bottom': '12px'
},
bar: {
'background-color': '#fff'
},
value: {
'background-color': '#000'
}
bar: {
'background-color': '#fff',
},
value: {
'background-color': '#000',
},
},
})
// Add Force Quit item during download for MacOS dock
if (isMac) {
app.dock.setMenu(dockMenuWithforceQuit)
}
progressBar.on('completed', () => {
progressBar.close()
// Remove the Force Quit dock item again for Mac
if (isMac) {
const updatedDockMenu = Menu.buildFromTemplate(
dockMenuWithforceQuit.items.filter((item) => item.label !== 'Force Quit during download')
)
app.dock.setMenu(updatedDockMenu)
}
})
progressBar.on('aborted', () => {
logger.info('Download was aborted before it could finish.')
})
// Loggin the download progress
let lastLogTime = 0
const logInterval = 5000 // log every 5 seconds
progressBar.on('progress', () => {
const currentTime = Date.now()
if (currentTime - lastLogTime >= logInterval) {
lastLogTime = currentTime
logger.info(`Download status: ${((receivedBytes / totalBytes) * 100).toFixed(0)}%`)
}
})
// GET request
request(uri)
.on('data', (chunk) => {
receivedBytes += chunk.length
if (progressBar) {
progressBar.value = receivedBytes
}
})
// Add Force Quit item during download for MacOS dock
if (isMac) {
app.dock.setMenu(dockMenuWithforceQuit);
}
progressBar.on('completed', () => {
progressBar.close()
// Remove the Force Quit dock item again for Mac
if (isMac) {
const updatedDockMenu = Menu.buildFromTemplate(
dockMenuWithforceQuit.items.filter(item => item.label !== 'Force Quit during download')
);
app.dock.setMenu(updatedDockMenu);
}
});
progressBar.on('aborted', () => {
logger.info('Download was aborted before it could finish.')
});
// Loggin the download progress
let lastLogTime = 0;
const logInterval = 5000; // log every 5 seconds
progressBar.on('progress', () => {
const currentTime = Date.now();
if (currentTime - lastLogTime >= logInterval) {
lastLogTime = currentTime;
logger.info(`Download status: ${(receivedBytes/totalBytes * 100).toFixed(0)}%`);
}
});
// GET request
request(uri)
.on('data', (chunk) => {
receivedBytes += chunk.length
if (progressBar) {
progressBar.value = receivedBytes
}
})
.pipe(fs.createWriteStream(filename))
.on('close', callback)
}
// If the download link was not found, call callback (updatingLoaderMsg with error feedback)
else {
logger.info(`Error while trying to download specterd: ${err}`)
callback(true)
}
.pipe(fs.createWriteStream(filename))
.on('close', callback)
}
// If the download link was not found, call callback (updatingLoaderMsg with error feedback)
else {
logger.info(`Error while trying to download specterd: ${err}`)
callback(true)
}
})
}
@ -196,10 +201,10 @@ let quitted = false
let webPreferences = {
worldSafeExecuteJavaScript: true,
contextIsolation: true,
preload: path.join(__dirname, 'preload.js')
preload: path.join(__dirname, 'preload.js'),
}
app.commandLine.appendSwitch('ignore-certificate-errors');
app.commandLine.appendSwitch('ignore-certificate-errors')
let platformName = ''
switch (process.platform) {
@ -213,47 +218,46 @@ switch (process.platform) {
platformName = 'x86_64-linux-gnu'
break
default:
throw `Unknown platformName ${platformName}`
throw `Unknown platformName ${platformName}`
}
logger.info("Using version " + appSettings.specterdVersion);
logger.info("Using platformName " + platformName);
logger.info('Using version ' + appSettings.specterdVersion)
logger.info('Using platformName ' + platformName)
let trySavedAuth = true
app.on('login', function(event, webContents, request, authInfo, callback) {
event.preventDefault();
appSettings = getAppSettings(); // ensure latest settings are used
app.on('login', function (event, webContents, request, authInfo, callback) {
event.preventDefault()
appSettings = getAppSettings() // ensure latest settings are used
if (appSettings.basicAuth && trySavedAuth) {
callback(appSettings.basicAuthUser, appSettings.basicAuthPass);
callback(appSettings.basicAuthUser, appSettings.basicAuthPass)
} else {
let user = '';
let pass = '';
let win = createNewWindow('basic_auth.html', 800, 600, mainWindow, true);
win.show();
let user = ''
let pass = ''
let win = createNewWindow('basic_auth.html', 800, 600, mainWindow, true)
win.show()
win.on('close', (event) => {
win = null;
callback(user, pass);
});
win = null
callback(user, pass)
})
ipcMain.once('basic-auth', (event, creds) => {
if (win != null) {
user = creds.username;
pass = creds.password;
win.close();
user = creds.username
pass = creds.password
win.close()
}
});
})
}
// if we are prompted for auth again show the auth dialog
trySavedAuth = false;
trySavedAuth = false
})
function createWindow (specterURL) {
function createWindow(specterURL) {
if (!mainWindow) {
initMainWindow()
}
// Create the browser window.
if (appSettings.tor) {
mainWindow.webContents.session.setProxy({ proxyRules: appSettings.proxyURL });
mainWindow.webContents.session.setProxy({ proxyRules: appSettings.proxyURL })
}
mainWindow.loadURL(specterURL + '?mode=remote')
@ -264,66 +268,73 @@ function createWindow (specterURL) {
// Some APIs can only be used after this event occurs.
app.whenReady().then(() => {
// Create the tray icon
logger.info("Framework ready! Starting tray icon ...");
logger.info('Framework ready! Starting tray icon ...')
if (isMac) {
const trayIconPath = nativeTheme.shouldUseDarkColors
? "/assets/menu_icon_dark.png"
: "/assets/menu_icon_light.png";
const trayIconPath = nativeTheme.shouldUseDarkColors ? '/assets/menu_icon_dark.png' : '/assets/menu_icon_light.png'
const createTrayIcon = (trayIconPath) => {
let trayIcon = nativeImage.createFromPath(
app.getAppPath() + trayIconPath
);
let trayIcon = nativeImage.createFromPath(app.getAppPath() + trayIconPath)
// Resize
trayIcon = trayIcon.resize({ width: 22, height: 22 });
trayIcon = trayIcon.resize({ width: 22, height: 22 })
return trayIcon
}
const trayIcon = createTrayIcon(trayIconPath)
tray = new Tray(trayIcon);
tray = new Tray(trayIcon)
// Change the tray icon if appearance is changed in Mac settings
// Change the tray icon if appearance is changed in Mac settings
const updateTrayIcon = () => {
logger.info('Updating tray icon ...')
const trayIconPath = nativeTheme.shouldUseDarkColors
? "/assets/menu_icon_dark.png"
: "/assets/menu_icon_light.png";
const trayIconPath = nativeTheme.shouldUseDarkColors ? '/assets/menu_icon_dark.png' : '/assets/menu_icon_light.png'
const newTrayIcon = createTrayIcon(trayIconPath)
tray.setImage(newTrayIcon);
tray.setImage(newTrayIcon)
}
nativeTheme.on('updated', updateTrayIcon)
}
else {
const trayIcon = nativeImage.createFromPath(
app.getAppPath() + "/assets/menu_icon.png"
);
} else {
const trayIcon = nativeImage.createFromPath(app.getAppPath() + '/assets/menu_icon.png')
tray = new Tray(trayIcon)
}
trayMenu = [
{ label: 'Launching Specter ...', enabled: false },
{ label: 'Show Specter', click() { mainWindow.show() }},
{ label: 'Settings', click() { openPreferences() }},
{ label: 'Quit', click() { quitSpecterd(); app.quit() } },
{
label: 'Show Specter',
click() {
mainWindow.show()
},
},
{
label: 'Settings',
click() {
openPreferences()
},
},
{
label: 'Quit',
click() {
quitSpecterd()
app.quit()
},
},
]
tray.setToolTip('Specter')
tray.setContextMenu(Menu.buildFromTemplate(trayMenu))
dimensions = screen.getPrimaryDisplay().size;
dimensions = screen.getPrimaryDisplay().size
// create a new `splash`-Window
logger.info("Framework Ready! Initializing Main-Window, populating Menu ...");
// create a new `splash`-Window
logger.info('Framework Ready! Initializing Main-Window, populating Menu ...')
initMainWindow()
setMainMenu();
mainWindow.loadURL(`file://${__dirname}/splash.html`);
setMainMenu()
if (!fs.existsSync(specterdDirPath)){
logger.info("Creating specterd-binaries folder");
fs.mkdirSync(specterdDirPath, { recursive: true });
mainWindow.loadURL(`file://${__dirname}/splash.html`)
if (!fs.existsSync(specterdDirPath)) {
logger.info('Creating specterd-binaries folder')
fs.mkdirSync(specterdDirPath, { recursive: true })
}
if (!appSettings.versionInitialized || appSettings.versionInitialized != versionData.version) {
logger.info(`Updating ${appSettingsPath} : ${JSON.stringify(appSettings)}`);
logger.info(`Updating ${appSettingsPath} : ${JSON.stringify(appSettings)}`)
appSettings.specterdVersion = versionData.version
appSettings.specterdHash = versionData.sha256
appSettings.versionInitialized = versionData.version
@ -332,13 +343,15 @@ app.whenReady().then(() => {
const specterdPath = specterdDirPath + '/' + appNameLower + 'd'
if (fs.existsSync(specterdPath + (platformName == 'win64' ? '.exe' : ''))) {
getFileHash(specterdPath + (platformName == 'win64' ? '.exe' : ''), function (specterdHash) {
if (appSettings.specterdHash.toLowerCase() == specterdHash || appSettings.specterdHash == "") {
if (appSettings.specterdHash.toLowerCase() == specterdHash || appSettings.specterdHash == '') {
startSpecterd(specterdPath)
} else if (appSettings.specterdVersion != "") {
} else if (appSettings.specterdVersion != '') {
updatingLoaderMsg('Specterd version could not be validated. Trying again to download the Specter binary ...')
downloadSpecterd(specterdPath)
} else {
updatingLoaderMsg('Specterd file could not be validated and no version is configured in the settings<br>Please go to Preferences and set version to fetch or add an executable manually...')
updatingLoaderMsg(
'Specterd file could not be validated and no version is configured in the settings<br>Please go to Preferences and set version to fetch or add an executable manually...'
)
updateSpecterdStatus('Failed to locate specterd...')
}
})
@ -346,7 +359,9 @@ app.whenReady().then(() => {
if (appSettings.specterdVersion) {
downloadSpecterd(specterdPath)
} else {
updatingLoaderMsg('Specterd was not found and no version is configured in the settings<br>Please go to Preferences and set version to fetch or add an executable manually...')
updatingLoaderMsg(
'Specterd was not found and no version is configured in the settings<br>Please go to Preferences and set version to fetch or add an executable manually...'
)
updateSpecterdStatus('Failed to locate specterd...')
}
}
@ -355,15 +370,15 @@ app.whenReady().then(() => {
function initMainWindow() {
// In production we use the icons from the build folder
// Note: On MacOS setting an icon here as no effect
const iconPath = isDev ? path.join(__dirname, 'assets-dev/app_icon.png') : ""
const iconPath = isDev ? path.join(__dirname, 'assets-dev/app_icon.png') : ''
mainWindow = new BrowserWindow({
width: parseInt(dimensions.width * 0.8),
minWidth: 1120,
height: parseInt(dimensions.height * 0.8),
icon: iconPath,
webPreferences
webPreferences,
})
// Ensures that any links with target="_blank" or window.open() will be opened in the user's default browser instead of within the app
mainWindow.webContents.setWindowOpenHandler(({ url }) => {
shell.openExternal(url)
@ -371,43 +386,47 @@ function initMainWindow() {
})
mainWindow.on('close', function (event) {
if(platformName == 'win64') {
quitSpecterd()
app.quit()
} else {
event.preventDefault();
mainWindow.hide();
}
});
if (platformName == 'win64') {
quitSpecterd()
app.quit()
} else {
event.preventDefault()
mainWindow.hide()
}
})
mainWindow.webContents.on("did-fail-load", function() {
mainWindow.loadURL(`file://${__dirname}/splash.html`);
updatingLoaderMsg(`Failed to load: ${appSettings.specterURL}<br>Please make sure the URL is entered correctly in the settings and try again...`)
});
mainWindow.webContents.on('did-fail-load', function () {
mainWindow.loadURL(`file://${__dirname}/splash.html`)
updatingLoaderMsg(
`Failed to load: ${appSettings.specterURL}<br>Please make sure the URL is entered correctly in the settings and try again...`
)
})
}
function downloadSpecterd(specterdPath) {
updatingLoaderMsg(`Starting download`)
updateSpecterdStatus(`Downloading the ${appName} binary...`)
// Some logging
logger.info("Using version " + appSettings.specterdVersion);
logger.info("Using platformName " + platformName);
logger.info('Using version ' + appSettings.specterdVersion)
logger.info('Using platformName ' + platformName)
download_location = getDownloadLocation(appSettings.specterdVersion, platformName)
logger.info("Downloading from "+download_location);
download(download_location, specterdPath + '.zip', function(errored) {
logger.info('Downloading from ' + download_location)
download(download_location, specterdPath + '.zip', function (errored) {
if (errored == true) {
updatingLoaderMsg(`Downloading the ${appNameLower} binary from GitHub failed, could not reach the server or the file wasn't found.`)
updatingLoaderMsg(
`Downloading the ${appNameLower} binary from GitHub failed, could not reach the server or the file wasn't found.`
)
updateSpecterdStatus(`Downloading ${appNameLower}d failed...`)
return
}
updatingLoaderMsg('Download completed. Unpacking files...')
logger.info("Extracting "+specterdPath);
logger.info('Extracting ' + specterdPath)
extract(specterdPath + '.zip', { dir: specterdPath + '-dir' }).then(function () {
let extraPath = ''
switch (process.platform) {
case 'darwin':
extraPath = appNameLower + "d"
extraPath = appNameLower + 'd'
break
case 'win32':
extraPath = appNameLower + 'd.exe'
@ -420,9 +439,9 @@ function downloadSpecterd(specterdPath) {
fs.renameSync(oldPath, newPath)
fs.unlinkSync(specterdPath + '.zip')
fs.rmdirSync(specterdPath + '-dir', { recursive: true });
getFileHash(specterdPath + (platformName == 'win64' ? '.exe' : ''), function(specterdHash) {
if (appSettings.specterdHash.toLowerCase() === specterdHash || appSettings.specterdHash == "") {
fs.rmdirSync(specterdPath + '-dir', { recursive: true })
getFileHash(specterdPath + (platformName == 'win64' ? '.exe' : ''), function (specterdHash) {
if (appSettings.specterdHash.toLowerCase() === specterdHash || appSettings.specterdHash == '') {
startSpecterd(specterdPath)
} else {
updatingLoaderMsg('Specterd version could not be validated.')
@ -436,11 +455,11 @@ function downloadSpecterd(specterdPath) {
}
function updateSpecterdStatus(status) {
trayMenu[0] = { label: status, enabled: false };
trayMenu[0] = { label: status, enabled: false }
tray.setContextMenu(Menu.buildFromTemplate(trayMenu))
}
function updatingLoaderMsg(msg, showSpinner=false) {
function updatingLoaderMsg(msg, showSpinner = false) {
if (mainWindow) {
let code = `
var launchText = document.getElementById('launch-text');
@ -456,10 +475,10 @@ function updatingLoaderMsg(msg, showSpinner=false) {
spinnerElement.classList.add('hidden')
}
}
`;
mainWindow.webContents.executeJavaScript(code);
}
logger.info("Updated LoaderMsg: "+msg)
`
mainWindow.webContents.executeJavaScript(code)
}
logger.info('Updated LoaderMsg: ' + msg)
}
function checkSpecterd(logs, specterdStarted) {
@ -469,12 +488,11 @@ function checkSpecterd(logs, specterdStarted) {
const now = Date.now()
const timeElapsed = now - specterdStarted
if (timeElapsed > timeout) {
return "timeout"
return 'timeout'
}
if (logs.toString().includes('Serving Flask app')) {
return 'running';
}
else {
return 'running'
} else {
return 'not running'
}
}
@ -485,10 +503,10 @@ function startSpecterd(specterdPath) {
}
let appSettings = getAppSettings()
let hwiBridgeMode = appSettings.mode == 'hwibridge'
updatingLoaderMsg('Launching Specter ...', showSpinner=true)
updatingLoaderMsg('Launching Specter ...', (showSpinner = true))
updateSpecterdStatus('Launching Specter ...')
let specterdArgs = ["server"]
specterdArgs.push("--no-filelog")
let specterdArgs = ['server']
specterdArgs.push('--no-filelog')
if (hwiBridgeMode) specterdArgs.push('--hwibridge')
if (appSettings.specterdCLIArgs != '') {
// User has inputed cli arguments in the UI
@ -502,76 +520,72 @@ function startSpecterd(specterdPath) {
}
// locale fix (copying from nodejs-env + adding locales)
const options = {
env: { ...process.env}
env: { ...process.env },
}
options.env['LC_ALL']='en_US.utf-8'
options.env['LC_ALL'] = 'en_US.utf-8'
options.env['LANG'] = 'en_US.utf-8'
options.env['SPECTER_LOGFORMAT'] = 'SPECTERD: %(levelname)s in %(module)s: %(message)s'
specterdProcess = spawn(specterdPath, specterdArgs, options);
specterdProcess = spawn(specterdPath, specterdArgs, options)
const specterdStarted = Date.now()
// We are checking for both, stdout and stderr, to be on the save side.
let specterIsRunning = false
specterdProcess.stdout.on('data', (data) => {
logger.info("stdout-"+data.toString())
logger.info('stdout-' + data.toString())
let serverdStatus = checkSpecterd(data, specterdStarted)
// We don't want to check the logs forever, just until specterd is up and running
if (!specterIsRunning) {
if(serverdStatus === 'running') {
logger.info(`Specter server seems to run ...`);
if (serverdStatus === 'running') {
logger.info(`Specter server seems to run ...`)
updateSpecterdStatus('Specter is running')
specterIsRunning = true
if (mainWindow) {
logger.info('... creating Electron window for it.')
createWindow(appSettings.specterURL)
}
}
else if(serverdStatus === 'timeout') {
} else if (serverdStatus === 'timeout') {
showError('Specter does not seem to start. Check the logs in the menu for more details.')
updateSpecterdStatus('Specter does not start')
logger.error('Startup timeout for specterd exceeded')
}
else {
} else {
updatingLoaderMsg('Still waiting for Specter to start ...')
updateSpecterdStatus('Specter is starting')
}
}
});
})
specterdProcess.stderr.on('data', (data) => {
logger.info("stderr-"+data.toString())
logger.info('stderr-' + data.toString())
let serverdStatus = checkSpecterd(data, specterdStarted)
if (!specterIsRunning) {
if(serverdStatus === 'running') {
logger.info(`Specter server seems to run ...`);
if (serverdStatus === 'running') {
logger.info(`Specter server seems to run ...`)
updateSpecterdStatus('Specter is running')
specterIsRunning = true
if (mainWindow) {
logger.info('... creating Electron window for it.')
createWindow(appSettings.specterURL)
}
}
else if(serverdStatus === 'timeout') {
} else if (serverdStatus === 'timeout') {
showError('Specter does not seem to start. Check the logs in the menu for more details.')
updateSpecterdStatus('Specter does not start')
logger.error('Startup timeout for specterd exceeded')
}
else {
} else {
updatingLoaderMsg('Still waiting for Specter to start ...')
updateSpecterdStatus('Specter is starting')
}
}
});
})
specterdProcess.on('exit', (code) => {
logger.error(`specterd exited with code ${code}`);
logger.error(`specterd exited with code ${code}`)
showError(`Specter exited with exit code ${code}. Check the logs in the menu for more details.`)
});
})
specterdProcess.on('error', (err) => {
logger.error(`Error starting Specter server: ${err}`);
logger.error(`Error starting Specter server: ${err}`)
showError(`Specter failed to start, due to ${err.message}. Check the logs in the menu for more details.`)
});
})
app.on('activate', function () {
// On macOS it's common to re-create a window in the app when the
@ -581,16 +595,16 @@ function startSpecterd(specterdPath) {
// since these are streams, you can pipe them elsewhere
specterdProcess.on('close', (code) => {
updateSpecterdStatus('Specter stopped...')
logger.info(`child process exited with code ${code}`);
});
logger.info(`child process exited with code ${code}`)
})
}
app.on('window-all-closed', function(){
if(platformName == 'win64') {
app.on('window-all-closed', function () {
if (platformName == 'win64') {
quitSpecterd()
app.quit()
}
});
})
// Cleanup before quitting (helps prevent memory leaks)
app.on('before-quit', (event) => {
@ -600,16 +614,16 @@ app.on('before-quit', (event) => {
quitSpecterd()
if (mainWindow && !mainWindow.isDestroyed()) {
if (progressBar) {
// You can only destroy the progress bar if it hadn't been closed before
if (progressBar.browserWindow) {
progressBar.destroy()
}
progressBar = null
// You can only destroy the progress bar if it hadn't been closed before
if (progressBar.browserWindow) {
progressBar.destroy()
}
mainWindow.destroy()
mainWindow = null
prefWindow = null
tray = null
progressBar = null
}
mainWindow.destroy()
mainWindow = null
prefWindow = null
tray = null
}
}
})
@ -619,12 +633,12 @@ ipcMain.on('request-mainprocess-action', (event, arg) => {
case 'save-preferences':
// Child process already closed
if (!specterdProcess || specterdProcess.exitCode != null) {
prefWindow.webContents.executeJavaScript(`savePreferences()`);
prefWindow.webContents.executeJavaScript(`savePreferences()`)
} else {
specterdProcess.on('close', (code) => {
logger.info(`child process exited with code ${code}`);
prefWindow.webContents.executeJavaScript(`savePreferences()`);
});
logger.info(`child process exited with code ${code}`)
prefWindow.webContents.executeJavaScript(`savePreferences()`)
})
quitSpecterd()
}
break
@ -633,14 +647,14 @@ ipcMain.on('request-mainprocess-action', (event, arg) => {
app.quit()
break
}
});
})
function quitSpecterd() {
if (specterdProcess) {
try {
if (platformName == 'win64') {
exec('taskkill /F /T /PID ' + specterdProcess.pid);
exec('taskkill /IM specterd.exe ');
exec('taskkill /F /T /PID ' + specterdProcess.pid)
exec('taskkill /IM specterd.exe ')
process.kill(-specterdProcess.pid)
}
specterdProcess.kill('SIGINT')
@ -651,52 +665,54 @@ function quitSpecterd() {
}
function setMainMenu() {
const menu = defaultMenu(app, shell);
const menu = defaultMenu(app, shell)
// Add custom menu
if (platformName == 'osx') {
menu[0].submenu.splice(1, 0,
{
label: 'Settings...', // This is a naming convention on MacOS. If you use just "Preferences", it gets translated to "Settings..." on MacOS.
click: openPreferences,
accelerator: "CmdOrCtrl+,"
}
);
menu[0].submenu.splice(1, 0,
{
label: 'Specter Logs',
click: openErrorLog,
accelerator: "CmdOrCtrl+L"
}
);
menu[0].submenu.splice(1, 0, {
label: 'Settings...', // This is a naming convention on MacOS. If you use just "Preferences", it gets translated to "Settings..." on MacOS.
click: openPreferences,
accelerator: 'CmdOrCtrl+,',
})
menu[0].submenu.splice(1, 0, {
label: 'Specter Logs',
click: openErrorLog,
accelerator: 'CmdOrCtrl+L',
})
} else {
menu.unshift({
label: 'Specter',
submenu: [
label: 'Specter',
submenu: [
{
label: 'Settings',
click: openPreferences,
accelerator: "CmdOrCtrl+,"
accelerator: 'CmdOrCtrl+,',
},
{
label: 'Specter Logs',
click: openErrorLog,
accelerator: "CmdOrCtrl+L"
}
]
}
);
accelerator: 'CmdOrCtrl+L',
},
],
})
}
Menu.setApplicationMenu(Menu.buildFromTemplate(menu));
Menu.setApplicationMenu(Menu.buildFromTemplate(menu))
}
function createNewWindow(htmlContentFile, width, height, parent, modal) {
if (! width) {width=700}
if (! height) {height=750}
if (! parent) {parent=null}
if (! modal) {modal=false}
if (!width) {
width = 700
}
if (!height) {
height = 750
}
if (!parent) {
parent = null
}
if (!modal) {
modal = false
}
prefWindow = new BrowserWindow({
width: width,
height: height,
@ -707,38 +723,35 @@ function createNewWindow(htmlContentFile, width, height, parent, modal) {
nodeIntegration: true,
contextIsolation: false, // acceptable as this is not the mainwindow. No remote content!
enableRemoteModule: true,
}
},
})
prefWindow.webContents.on('new-window', function (e, url) {
e.preventDefault()
shell.openExternal(url)
})
prefWindow.webContents.on('new-window', function(e, url) {
e.preventDefault();
shell.openExternal(url);
});
prefWindow.loadURL(`file://${__dirname}/${htmlContentFile}`)
return prefWindow
}
function openPreferences() {
createNewWindow("settings.html", 800, 750, mainWindow).show()
createNewWindow('settings.html', 800, 750, mainWindow).show()
}
function openErrorLog() {
width = parseInt(dimensions.width * 0.7),
height = parseInt(dimensions.height * 0.7)
createNewWindow("error_logs.html", width, height).show()
;(width = parseInt(dimensions.width * 0.7)), (height = parseInt(dimensions.height * 0.7))
createNewWindow('error_logs.html', width, height).show()
}
function showError(error) {
updatingLoaderMsg('Specter encountered an error:<br>' + error.toString())
}
process.on('unhandledRejection', error => {
process.on('unhandledRejection', (error) => {
showError(error)
logger.error(error.toString(), error.name)
})
process.on("uncaughtException", error => {
process.on('uncaughtException', (error) => {
showError(error)
// I would love to rethrow the error here as this would create a stacktrace in the logs
// but this will terminate the whole process even though i've set

2
src/cryptoadvance/specter/templates/wallet/receive/wallet_receive.jinja
View file

@ -60,7 +60,7 @@
{% set xpubs_descriptor = wallet.get_descriptor(address=address, keep_xpubs=True, to_string=True, with_checksum=True) %}
<button type="button" onclick='displayAddressOnDevice(`{{ address }}`, `{{ descriptor }}`, `{{ xpubs_descriptor }}`)' class="button">{{ _("Display address on device") }}</button>
{% if wallet.is_multisig %}
<p class="note center optional">{{ _("Multsig address on device display is only available for BitBox02, ColdCard, KeepKey, Specter, and Trezor devices.") }}</p>
<p class="note center optional">{{ _("Multsig address on device display is only available for Specter DIY, Jade, ColdCard, BitBox02 and Trezor devices.") }}</p>
{% endif %}
{% endif %}
</form>