diff --git a/package-lock.json b/package-lock.json index d416b16..d60903e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,10 @@ "license": "MIT", "dependencies": { "axios": "^0.21.1", - "bedrock-protocol": "^3.35.0", + "bedrock-protocol": "^3.47.0", "clusterize.js": "^0.18.1", "commander": "^7.1.0", + "electron-fetch": "1.9.1", "electron-localshortcut": "^3.2.1", "electron-squirrel-startup": "^1.0.0", "electron-store": "^8.0.1", @@ -21,7 +22,7 @@ "electron-window-state": "^5.0.3", "escape-html": "^1.0.3", "md5-file": "^5.0.0", - "minecraft-data": "^3.36.1", + "minecraft-data": "^3.93.0", "minecraft-folder-path": "^1.1.0", "minecraft-protocol": "^1.43.0", "node-eval": "^2.0.0", @@ -1349,9 +1350,9 @@ } }, "node_modules/bedrock-protocol": { - "version": "3.46.0", - "resolved": "https://registry.npmjs.org/bedrock-protocol/-/bedrock-protocol-3.46.0.tgz", - "integrity": "sha512-D0PEH4vvW8rrqLKntjANxfmZRzc/7o/vOF3EOGFuD20l/UsUkixX7uVDuSskhgQTg4LCG3wh8VMM5InmF39gBA==", + "version": "3.47.0", + "resolved": "https://registry.npmjs.org/bedrock-protocol/-/bedrock-protocol-3.47.0.tgz", + "integrity": "sha512-W62Nw6LIIfvA+w2JvzGFRfMBGtKb40UQxX8j7CIjj57nKHvxlYE9mVmd1aYHDW0n+qLdcotl+pwaD2Uosl6m9Q==", "license": "MIT", "dependencies": { "debug": "^4.3.1", @@ -2631,6 +2632,18 @@ "node": ">= 8.6" } }, + "node_modules/electron-fetch": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.9.1.tgz", + "integrity": "sha512-M9qw6oUILGVrcENMSRRefE1MbHPIz0h79EKIeJWK9v563aT9Qkh8aEHPO1H5vi970wPirNY+jO9OpFoLiMsMGA==", + "license": "MIT", + "dependencies": { + "encoding": "^0.1.13" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/electron-installer-common": { "version": "0.10.4", "resolved": "https://registry.npmjs.org/electron-installer-common/-/electron-installer-common-0.10.4.tgz", @@ -3685,7 +3698,6 @@ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", "license": "MIT", - "optional": true, "dependencies": { "iconv-lite": "^0.6.2" } @@ -4821,7 +4833,6 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "license": "MIT", - "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -5809,9 +5820,9 @@ } }, "node_modules/minecraft-data": { - "version": "3.92.0", - "resolved": "https://registry.npmjs.org/minecraft-data/-/minecraft-data-3.92.0.tgz", - "integrity": "sha512-CGfO50svzm+pSRa4Mbq4owsmRKbPCNkSZ3MCOyH+epC7yNjh+PUhPQFHWq72O51qsY7pAB5qM/bJn1ncwG1J5g==", + "version": "3.93.0", + "resolved": "https://registry.npmjs.org/minecraft-data/-/minecraft-data-3.93.0.tgz", + "integrity": "sha512-AaQ+mdcHb58uDqcoK380lRh83r3IpkGREdLi577BI51t2kru+mTVDO4IFDJzDm3e9N8C7T4KQ1qWl0id98KbtA==", "license": "MIT" }, "node_modules/minecraft-folder-path": { @@ -8125,7 +8136,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "devOptional": true, "license": "MIT" }, "node_modules/sax": { diff --git a/package.json b/package.json index c8901fa..d2a4528 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "axios": "^0.21.1", - "bedrock-protocol": "^3.35.0", + "bedrock-protocol": "^3.47.0", "clusterize.js": "^0.18.1", "commander": "^7.1.0", "electron-localshortcut": "^3.2.1", @@ -52,9 +52,10 @@ "electron-store": "^8.0.1", "electron-unhandled": "^3.0.2", "electron-window-state": "^5.0.3", + "electron-fetch": "1.9.1", "escape-html": "^1.0.3", "md5-file": "^5.0.0", - "minecraft-data": "^3.36.1", + "minecraft-data": "^3.93.0", "minecraft-folder-path": "^1.1.0", "minecraft-protocol": "^1.43.0", "node-eval": "^2.0.0", diff --git a/patches/prismarine-auth+2.7.0.patch b/patches/prismarine-auth+2.7.0.patch new file mode 100644 index 0000000..7662781 --- /dev/null +++ b/patches/prismarine-auth+2.7.0.patch @@ -0,0 +1,79 @@ +diff --git a/node_modules/prismarine-auth/src/TokenManagers/LiveTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/LiveTokenManager.js +index 062b3c0..7c714ec 100644 +--- a/node_modules/prismarine-auth/src/TokenManagers/LiveTokenManager.js ++++ b/node_modules/prismarine-auth/src/TokenManagers/LiveTokenManager.js +@@ -1,5 +1,5 @@ + const debug = require('debug')('prismarine-auth') +- ++const fetch = require('electron-fetch').default; + const { Endpoints } = require('../common/Constants') + const { checkStatus } = require('../common/Util') + +diff --git a/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockServicesManager.js b/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockServicesManager.js +index 06f9ed7..e0d168f 100644 +--- a/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockServicesManager.js ++++ b/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockServicesManager.js +@@ -1,5 +1,5 @@ + const debug = require('debug')('prismarine-auth') +- ++const fetch = require('electron-fetch').default; + const { Endpoints } = require('../common/Constants') + const { checkStatus } = require('../common/Util') + +diff --git a/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockTokenManager.js +index 9c5036e..a91a61d 100644 +--- a/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockTokenManager.js ++++ b/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockTokenManager.js +@@ -1,5 +1,5 @@ + const debug = require('debug')('prismarine-auth') +- ++const fetch = require('electron-fetch').default; + const { Endpoints } = require('../common/Constants') + const { checkStatus } = require('../common/Util') + +diff --git a/node_modules/prismarine-auth/src/TokenManagers/MinecraftJavaTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/MinecraftJavaTokenManager.js +index c89e8f1..79df714 100644 +--- a/node_modules/prismarine-auth/src/TokenManagers/MinecraftJavaTokenManager.js ++++ b/node_modules/prismarine-auth/src/TokenManagers/MinecraftJavaTokenManager.js +@@ -1,6 +1,6 @@ + const debug = require('debug')('prismarine-auth') + const crypto = require('crypto') +- ++const fetch = require('electron-fetch').default; + const { Endpoints, fetchOptions } = require('../common/Constants') + const { checkStatus } = require('../common/Util') + +diff --git a/node_modules/prismarine-auth/src/TokenManagers/MsaTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/MsaTokenManager.js +index 568385d..fb24dd6 100644 +--- a/node_modules/prismarine-auth/src/TokenManagers/MsaTokenManager.js ++++ b/node_modules/prismarine-auth/src/TokenManagers/MsaTokenManager.js +@@ -1,6 +1,6 @@ + const msal = require('@azure/msal-node') + const debug = require('debug')('prismarine-auth') +- ++const fetch = require('electron-fetch').default; + class MsaTokenManager { + constructor (msalConfig, scopes, cache) { + this.msaClientId = msalConfig.auth.clientId +diff --git a/node_modules/prismarine-auth/src/TokenManagers/PlayfabTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/PlayfabTokenManager.js +index 3ba041f..4eca82c 100644 +--- a/node_modules/prismarine-auth/src/TokenManagers/PlayfabTokenManager.js ++++ b/node_modules/prismarine-auth/src/TokenManagers/PlayfabTokenManager.js +@@ -1,5 +1,5 @@ + const debug = require('debug')('prismarine-auth') +- ++const fetch = require('electron-fetch').default; + const { Endpoints } = require('../common/Constants') + + class PlayfabTokenManager { +diff --git a/node_modules/prismarine-auth/src/TokenManagers/XboxTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/XboxTokenManager.js +index dd79fd5..fc6e5ad 100644 +--- a/node_modules/prismarine-auth/src/TokenManagers/XboxTokenManager.js ++++ b/node_modules/prismarine-auth/src/TokenManagers/XboxTokenManager.js +@@ -1,5 +1,5 @@ + const crypto = require('crypto') +- ++const fetch = require('electron-fetch').default; + const XboxLiveAuth = require('@xboxreplay/xboxlive-auth') + const debug = require('debug')('prismarine-auth') + const { SmartBuffer } = require('smart-buffer')