diff --git a/src/html/comps/pass-input.js b/src/html/comps/pass-input.js
index 1a35176..13ee289 100644
--- a/src/html/comps/pass-input.js
+++ b/src/html/comps/pass-input.js
@@ -10,6 +10,8 @@ const PassInputComp = Vue.component('pass-input', {
methods:{
fire(){
+ hideDimmer()
+ this.Modal.close()
this.Modal.open()
},
diff --git a/src/html/index.html b/src/html/index.html
index c049cdb..d3f74de 100644
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -328,7 +328,6 @@
// check if daemon is started
if(await api.send('daemonIsStarted', null, 500)) {
- console.log('meme')
this.appsArePublished = true
this.getApps()
return
diff --git a/src/ipc-events/start-daemon.js b/src/ipc-events/start-daemon.js
index 0d91acc..8507af6 100644
--- a/src/ipc-events/start-daemon.js
+++ b/src/ipc-events/start-daemon.js
@@ -63,6 +63,7 @@ module.exports = (ipcMain, mainWindow)=>{
if (str.includes('OK') && prevLog.includes('Starting websocket RPC server')){
WSConn.startWS(wsToken, mainWindow)
+
WSConn.get().on('open', ()=>{
mainWindow.webContents.send("startDaemon_RES", true)
})
@@ -76,7 +77,9 @@ module.exports = (ipcMain, mainWindow)=>{
if( str.includes("Apps broadcasted")) mainWindow.webContents.send("daemon_appsBroadcasted", true)
- if( str.includes('panic:')) mainWindow.webContents.send("daemon_ERROR", str)
+ if( (str.includes('panic:') || str.includes("FAIL")) &&
+ !str.includes('cipher: message authentication failed'))
+ mainWindow.webContents.send("daemon_ERROR", str)
prevLog = data.toString()
@@ -84,7 +87,7 @@ module.exports = (ipcMain, mainWindow)=>{
if(!mainWindow.isDestroyed())
mainWindow.webContents.send("stdLog", data.toString())
- //console.log(data.toString())
+ console.log(data.toString())
})
})
}
diff --git a/src/wsconn/wsconn.js b/src/wsconn/wsconn.js
index 27e36a3..949862a 100644
--- a/src/wsconn/wsconn.js
+++ b/src/wsconn/wsconn.js
@@ -68,9 +68,13 @@ const Conn = {
if(this._instance) return
// connect
- this._instance = new WS("ws://127.0.0.1:50750", {
- headers: { Authorization: `Bearer ${wsToken}`},
- })
+ try {
+ this._instance = new WS("ws://127.0.0.1:50750", {
+ headers: { Authorization: `Bearer ${wsToken}`},
+ })
+ } catch(e) {
+ console.log(e)
+ }
// events
//