fix: fix joining to some popular servers (since dns was resovle was i…

…ncorrectly used)

fix: fix some auth issues when starting the app locally

src/inventoryWindows.ts

@@ -54,7 +54,6 @@ export const onGameLoad = (onLoad) => {
 
   bot.on('windowOpen', (win) => {
     if (implementedContainersGuiMap[win.type]) {
-      // todo also render title!
       openWindow(implementedContainersGuiMap[win.type])
     } else if (options.unimplementedContainers) {
       openWindow('ChestWin')
@@ -385,6 +384,11 @@ const openWindow = (type: string | undefined) => {
 
   lastWindow = inv
   const upWindowItems = () => {
+    if (!lastWindow && bot.currentWindow) {
+      // edge case: might happen due to high ping, inventory should be closed soon!
+      // openWindow(implementedContainersGuiMap[bot.currentWindow.type])
+      return
+    }
     void Promise.resolve().then(() => upInventoryItems(type === undefined))
   }
   upWindowItems()

src/microsoftAuthflow.ts

@@ -93,8 +93,8 @@ export default async ({ tokenCaches, proxyBaseUrl, setProgressText = (text) => {
   }
 }
 
-function isPageSecure () {
-  return window.location.protocol === 'https:'
+function isPageSecure (url = window.location.href) {
+  return !url.startsWith('http:')
 }
 
 // restore dates from strings
@@ -161,9 +161,10 @@ function pemToArrayBuffer (pem) {
 }
 
 const urlWithBase = (url: string, base: string) => {
-  if (!base.startsWith('http')) base = `https://${base}`
+  const defaultBase = isPageSecure() ? 'https' : 'http'
+  if (!base.startsWith('http')) base = `${defaultBase}://${base}`
   const urlObj = new URL(url, base)
   base = base.replace(/^https?:\/\//, '')
-  urlObj.host = base.includes(':') ? base : `${base}:${isPageSecure() ? '443' : '80'}`
+  urlObj.host = base.includes(':') ? base : `${base}:${isPageSecure(base) ? '443' : '80'}`
   return urlObj
 }

src/shims/dns.js

@@ -26,6 +26,7 @@ module.exports.resolveSrv = function (hostname, callback) {
     const willreturn = []
     for (const object of response.Answer) {
       const data = object.data.split(' ')
+      if (data[3] === undefined || data[2] === undefined) continue
       willreturn.push({
         priority: data[0],
         weight: data[1],