Add error message when unable to connect (Bedrock)

Heath123 · Dec 24, 2020 · 3d7a778 · 3d7a778
1 parent 46ab9c5
commit 3d7a778
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 7 deletions.
diff --git a/data/proxypass-pakkit.jar b/data/proxypass-pakkit.jar
diff --git a/html/mainPage/js/ipcHandler.js b/html/mainPage/js/ipcHandler.js
@@ -47,4 +47,9 @@ exports.setup = function (passedSharedVars) {
     const ipcMessage = JSON.parse(arg)
     handleError(ipcMessage.msg, ipcMessage.stack)
   })
+
+  sharedVars.ipcRenderer.on('message', (event, arg) => {
+    const ipcMessage = JSON.parse(arg)
+    errorDialog(ipcMessage.header, ipcMessage.info)
+  })
 }
diff --git a/html/mainPage/js/main.js b/html/mainPage/js/main.js
@@ -280,12 +280,13 @@ function editAndResend (id) {
 
   // dialogOpen = true
   document.getElementById('dialog-overlay').className = 'dialog-overlay active'
+  document.getElementById('dialog').className='dialog'
   document.getElementById('dialog').innerHTML =
 
-    `<h2>Edit and resend packet</h2>
-  <textarea id="packetEditor"></textarea>
-  <button style="margin-top: 16px;" onclick="resendEdited(${id}, packetEditor.getValue())">Send</button>
-  <button style="margin-top: 16px;" onclick="closeDialog()">Close</button>`
+   `<h2>Edit and resend packet</h2>
+    <textarea id="packetEditor"></textarea>
+    <button style="margin-top: 16px;" onclick="resendEdited(${id}, packetEditor.getValue())">Send</button>
+    <button style="margin-top: 16px;" class="bottom-button" onclick="closeDialog()">Close</button>`
 
   document.getElementById('packetEditor').value = JSON.stringify(sharedVars.allPackets[id].data, null, 2)
 
@@ -296,6 +297,18 @@ function editAndResend (id) {
   })
 }
 
+function errorDialog(header, info) {
+  // dialogOpen = true
+  document.getElementById('dialog-overlay').className = 'dialog-overlay active'
+  document.getElementById('dialog').className='dialog dialog-small'
+  document.getElementById('dialog').innerHTML =
+
+ `<h2>${header}</h2>
+  ${info}
+  <br>
+  <button style="margin-top: 16px;" class="bottom-button" onclick="closeDialog()">Close</button>`
+}
+
 sharedVars.ipcRenderer.on('editAndResend', (event, arg) => { // Context menu
   const ipcMessage = JSON.parse(arg)
   editAndResend(ipcMessage.id)

diff --git a/html/mainPage/style.css b/html/mainPage/style.css
@@ -125,6 +125,13 @@ div.dialog {
   box-sizing: border-box;
 }
 
+div.dialog-small {
+  top: calc(50% - 100px);
+  left: calc(50% - 250px);
+  height: 200px;
+  width: 500px;
+}
+
 .CodeMirror.CodeMirror {
   height: calc(100% - 120px);
 }
@@ -252,4 +259,9 @@ div.error {
 
 #mainPresets, #extendedPresets {
   display: contents;
+}
+
+.bottom-button {
+  position: absolute;
+  bottom: 16px;
 }
diff --git a/src/index.js b/src/index.js
@@ -215,7 +215,7 @@ if (continueProgram) {
             proxy = bedrockProxy
         }
         packetHandler.init(BrowserWindow.getAllWindows()[0], ipcMain, proxy)
-        proxy.startProxy(ipcMessage.connectAddress, ipcMessage.connectPort, ipcMessage.listenPort, ipcMessage.version, ipcMessage.consent, packetHandler.packetHandler, dataFolder)
+        proxy.startProxy(ipcMessage.connectAddress, ipcMessage.connectPort, ipcMessage.listenPort, ipcMessage.version, ipcMessage.consent, packetHandler.packetHandler, packetHandler.messageHandler , dataFolder)
         BrowserWindow.getAllWindows()[0].loadFile('html/mainPage/index.html')
     })
 

diff --git a/src/packetHandler.js b/src/packetHandler.js
@@ -64,3 +64,7 @@ exports.packetHandler = function (direction, meta, data, id, raw) {
     console.error(err)
   }
 }
+
+exports.messageHandler = function (header, info) {
+  mainWindow.send('message', JSON.stringify({ header: header, info: info }))
+}
diff --git a/src/proxy/bedrock/proxy.js b/src/proxy/bedrock/proxy.js
@@ -34,7 +34,7 @@ function launch() {
   })
 }
 
-exports.startProxy = function (passedHost, passedPort, passedListenPort, version, authConsent, callback, dataFolder) {
+exports.startProxy = function (passedHost, passedPort, passedListenPort, version, authConsent, callback, messageCallback, dataFolder) {
   host = passedHost
   port = passedPort
   listenPort = passedListenPort
@@ -63,6 +63,12 @@ exports.startProxy = function (passedHost, passedPort, passedListenPort, version
     for (const item of array) {
       if (item.isEvent) {
         switch(item.eventType) {
+          case 'unableToConnect':
+            messageCallback('Ubale to connect to server', 'Unable to connect to the Bedrock server at ' +
+              item.eventData.replace(/^\//, '') + // Remove slash at start
+              '. Make sure the server is online.')
+            relaunch()
+            break;
           case 'disconnect':
             console.log('Disconnect - relaunching proxy')
             relaunch()

diff --git a/src/proxy/java/proxy.js b/src/proxy/java/proxy.js
@@ -23,7 +23,7 @@ exports.capabilities = {
   versionId: undefined
 }
 
-exports.startProxy = function (host, port, listenPort, version, authConsent, callback, dataFolder) {
+exports.startProxy = function (host, port, listenPort, version, authConsent, callback, messageCallback, dataFolder) {
   storedCallback = callback
 
   // . cannot be in a JSON property name with electron-store