Implement auth

config.json

@@ -3,5 +3,6 @@
   "defaultHostPort": 10000,
   "defaultProxy": "",
   "defaultProxyPort": 0,
-  "defaultVersion": "1.18.2"
+  "defaultVersion": "1.18.2",
+  "extension_id": "ncghkfgegekillgpmbpacghgfbekcdkj"
 }

index.js

@@ -184,7 +184,9 @@ async function connect (options) {
     viewDistance: 'tiny',
     checkTimeoutInterval: 240 * 1000,
     noPongTimeout: 240 * 1000,
-    closeTimeout: 240 * 1000
+    closeTimeout: 240 * 1000,
+    session: options.onlineMode ? options.auth : undefined,
+    skipValidation: true
   })
 
   bot.on('error', (err) => {

lib/menus/play_screen.js

@@ -70,13 +70,37 @@ class PlayScreen extends LitElement {
     this.username = window.localStorage.getItem('username') ?? 'pviewer' + (Math.floor(Math.random() * 1000))
     this.password = ''
     this.version = ''
+    this.onlineMode = false
+    this.auth = {}
 
     window.fetch('config.json').then(res => res.json()).then(config => {
       this.server = config.defaultHost
       this.serverport = config.defaultHostPort ?? 25565
       this.proxy = config.defaultProxy
       this.proxyport = !config.defaultProxy && !config.defaultProxyPort ? '' : config.defaultProxyPort ?? 443
       this.version = config.defaultVersion
+      if (chrome && chrome.runtime && config.extension_id) {
+        try {
+          chrome.runtime.sendMessage(config.extension_id, { type: 'login' }, response => {
+            if (response) {
+              const username = this.shadowRoot.getElementById('username')
+              username.shadowRoot.getElementById('username').disabled = true
+              username.value = response.name
+              this.username = response.name
+              this.onlineMode = true
+
+              this.auth = {
+                accessToken: response.access_token,
+                clientToken: response.client_token,
+                selectedProfile: {
+                  id: response.uuid,
+                  name: response.name
+                }
+              }
+            }
+          })
+        } catch (e) {}
+      }
     })
   }
 
@@ -124,13 +148,15 @@ class PlayScreen extends LitElement {
             pmui-width="150px"
             pmui-label="Username"
             pmui-id="username"
+            id="username"
             pmui-value="${this.username}"
             @input=${e => { this.username = e.target.value }}
           ></pmui-editbox>
           <pmui-editbox
             pmui-width="150px"
             pmui-label="Bot Version"
             pmui-id="botversion"
+            id="botversion"
             pmui-value="${this.version}"
             @input=${e => { this.version = e.target.value }}
           ></pmui-editbox>
@@ -154,7 +180,9 @@ class PlayScreen extends LitElement {
         proxy: `${this.proxy}${this.proxy !== '' ? `:${this.proxyport}` : ''}`,
         username: this.username,
         password: this.password,
-        botVersion: this.version
+        botVersion: this.version,
+        onlineMode: this.onlineMode,
+        auth: this.auth
       }
     }))
   }

modules/fetch.js

@@ -0,0 +1,31 @@
+const config = require('../config.json')
+
+let hasExtension
+if (chrome && chrome.runtime && config.extension_id) {
+  try {
+    chrome.runtime.sendMessage(config.extension_id, { type: 'version' }, response => {
+      hasExtension = true
+    })
+  } catch (e) {
+    hasExtension = false
+  }
+} else {
+  hasExtension = false
+}
+
+module.exports = (...args) => {
+  if (!hasExtension) {
+    return window.fetch
+  }
+
+  return new Promise(resolve => {
+    chrome.runtime.sendMessage(config.extension_id || '', { type: 'fetch', req: args }, response => {
+      resolve({
+        status: response.status,
+        text: async function () {
+          return response.text
+        }
+      })
+    })
+  })
+}

package.json

@@ -36,6 +36,7 @@
   "dependencies": {
     "compression": "^1.7.4",
     "express": "^4.17.1",
+    "fetch-no-cors": "^1.0.13",
     "ismobilejs": "^1.1.1",
     "lit": "^2.0.2",
     "net-browserify": "PrismarineJS/net-browserify",
@@ -74,5 +75,8 @@
     "webpack-dev-server": "^4.0.0",
     "webpack-merge": "^5.7.3",
     "workbox-webpack-plugin": "^6.1.2"
+  },
+  "standard": {
+    "globals": [ "chrome" ]
   }
 }

webpack.common.js

@@ -21,6 +21,7 @@ const config = {
       express: false,
       net: 'net-browserify',
       fs: 'memfs',
+      'node-fetch': require.resolve('./modules/fetch.js'),
       jose: false
     },
     fallback: {