Fix filtering tab for Bedrock and start to switch to electron-store

html/startPage/script.js

@@ -1,21 +1,23 @@
-/* global localStorage */
-
 const { ipcRenderer } = require('electron')
+const Store = require('electron-store');
+
+const store = new Store();
 
 /* const customTitlebar = require('custom-electron-titlebar');
 
 new customTitlebar.Titlebar({
     backgroundColor: customTitlebar.Color.fromHex('#FFF')
 }); */
 
-if (localStorage.getItem('authConsentGiven') !== 'true') {
+if (!store.get('authConsentGiven')) {
   document.getElementById('consent-box').style.display = 'contents'
 }
 
 let isLoading = false
-
 let connectAddress
 let connectPort
+
+
 let listenPort
 let platform
 let version
@@ -33,19 +35,19 @@ function loadSettings (newPlatform) {
 }
 
 function saveSettings (thePlatform) {
-  localStorage.setItem('lastPlatform', platform)
-  localStorage.setItem(thePlatform + 'LastVersion', version)
-  localStorage.setItem(thePlatform + 'LastConnectAddress', connectAddress)
-  localStorage.setItem(thePlatform + 'LastConnectPort', connectPort)
-  localStorage.setItem(thePlatform + 'LastListenPort', listenPort)
+  store.set('lastPlatform', platform)
+  store.set(thePlatform + 'LastVersion', version)
+  store.set(thePlatform + 'LastConnectAddress', connectAddress)
+  store.set(thePlatform + 'LastConnectPort', connectPort)
+  store.set(thePlatform + 'LastListenPort', listenPort)
 }
 
 function loadSetting (name, varname, elementID, defaultValue) {
-  if (!localStorage.getItem(name)) {
-    localStorage.setItem(name, defaultValue)
+  if (!store.get(name)) {
+    store.set(name, defaultValue)
   }
 
-  window[varname] = localStorage.getItem(name)
+  window[varname] = store.get(name)
   document.getElementById(elementID).value = window[varname]
 }
 
@@ -92,11 +94,11 @@ window.startProxy = function (event) {
     listenPort = (listenPort === '') ? '25566' : listenPort
   }
   if (document.getElementById('consent').checked) {
-    localStorage.setItem('authConsentGiven', 'true')
+    store.set('authConsentGiven', true)
   }
   // TODO: Validate data (e.g. port range)
   ipcRenderer.send('startProxy', JSON.stringify({
-    consent: localStorage.getItem('authConsentGiven') === 'true',
+    consent: store.get('authConsentGiven'),
     connectAddress: connectAddress,
     connectPort: connectPort,
     listenPort: listenPort,

package.json

@@ -46,6 +46,7 @@
     "clusterize.js": "^0.18.1",
     "electron-localshortcut": "^3.2.1",
     "electron-squirrel-startup": "^1.0.0",
+    "electron-store": "^6.0.1",
     "electron-unhandled": "^3.0.2",
     "electron-window-state": "^5.0.3",
     "escape-html": "^1.0.3",

src/proxy/bedrock/proxy.js

@@ -18,6 +18,8 @@ exports.capabilities = {
   jsonData: true,
   rawData: true,
   scriptingSupport: false,
+  clientboundPackets: {},
+  serverboundPackets: {},
   wikiVgPage: 'https://wiki.vg/Bedrock_Protocol'
 }
 
@@ -27,6 +29,15 @@ exports.startProxy = function (host, port, listenPort, version, authConsent, cal
   proxyPass = java.import('com.nukkitx.proxypass.ProxyPass')
   proxyPlayerSession = java.import('com.nukkitx.proxypass.network.bedrock.session.ProxyPlayerSession')
 
+  const packetTypes = JSON.parse(proxyPlayerSession.getIdBiMapStaticSync())
+  for (const index in packetTypes) {
+    const idString = '0x' + Number(index).toString(16).padStart(2, '0')
+    const name = packetTypes[index].toLowerCase()
+    // There isn't much of a distinction between serverbound and clientbound in Bedrock and many packets can be sent both ways
+    exports.capabilities.clientboundPackets[idString] = name
+    exports.capabilities.serverboundPackets[idString] = name
+  }
+
   storedCallback = callback
 
   console.log(proxyPass)