From 95091d5291423b033a912ac61e07b2f17bb1af64 Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Sun, 21 May 2023 20:41:19 -0700 Subject: [PATCH 01/17] fix: Add missing Mineflayer dependency --- package.json | 89 +++++++++++++++++++++++++------------------------- pnpm-lock.yaml | 31 ++++++++---------- 2 files changed, 59 insertions(+), 61 deletions(-) diff --git a/package.json b/package.json index 5a11024..dfa70ad 100644 --- a/package.json +++ b/package.json @@ -1,44 +1,45 @@ -{ - "name": "2based2wait", - "version": "1.0.5-beta.1", - "description": "Lightweight and extensible proxy for 2B2T.", - "main": "proxy.js", - "scripts": { - "test": "mocha --exit --bail", - "testLocal": "CI=true mocha --exit --bail", - "start": "node proxy.js", - "supervisor": "supervisor -n success proxy.js", - "supervisorAllGasNoBrakes": "supervisor proxy.js", - "generate-documentation": "node proxy.js --documentation", - "process-archives": "node ./scripts/processArchives.js", - "update-ngrok-binary": "node ./scripts/updateNgrokBinary.js", - "debug-info": "node ./scripts/debugFetch.js", - "lint": "eslint --ext .js" - }, - "author": "Enchoseon", - "license": "GPL-2.0", - "dependencies": { - "@rob9315/mcproxy": "^1.0.0", - "deepmerge": "^4.3.0", - "joi": "^17.6.0", - "json5": "^2.2.3", - "minecraft-data": "^3.26.0", - "minecraft-protocol": "^1.40.3", - "mineflayer-antiafk": "github:Etiaro/mineflayer-antiafk", - "mineflayer-auto-eat": "^3.3.0", - "ngrok": "^4.3.1", - "node-fetch": "^2.6.9", - "node-notifier": "^10.0.1", - "prismarine-chat": "^1.8.0", - "prismarine-provider-anvil": "^2.7.0" - }, - "devDependencies": { - "eslint": "^8.33.0", - "eslint-plugin-jsdoc": "^39.8.0", - "mocha": "^10.2.0" - }, - "repository": { - "type": "git", - "url": "https://github.com/Enchoseon/2based2wait.git" - } -} +{ + "name": "2based2wait", + "version": "1.0.5-beta.1", + "description": "Lightweight and extensible proxy for 2B2T.", + "main": "proxy.js", + "scripts": { + "test": "mocha --exit --bail", + "testLocal": "CI=true mocha --exit --bail", + "start": "node proxy.js", + "supervisor": "supervisor -n success proxy.js", + "supervisorAllGasNoBrakes": "supervisor proxy.js", + "generate-documentation": "node proxy.js --documentation", + "process-archives": "node ./scripts/processArchives.js", + "update-ngrok-binary": "node ./scripts/updateNgrokBinary.js", + "debug-info": "node ./scripts/debugFetch.js", + "lint": "eslint --ext .js" + }, + "author": "Enchoseon", + "license": "GPL-2.0", + "dependencies": { + "@rob9315/mcproxy": "^1.0.0", + "deepmerge": "^4.3.0", + "joi": "^17.6.0", + "json5": "^2.2.3", + "minecraft-data": "^3.26.0", + "minecraft-protocol": "^1.40.3", + "mineflayer": "^4.8.1", + "mineflayer-antiafk": "github:Etiaro/mineflayer-antiafk", + "mineflayer-auto-eat": "^3.3.0", + "ngrok": "^4.3.1", + "node-fetch": "^2.6.9", + "node-notifier": "^10.0.1", + "prismarine-chat": "^1.8.0", + "prismarine-provider-anvil": "^2.7.0" + }, + "devDependencies": { + "eslint": "^8.33.0", + "eslint-plugin-jsdoc": "^39.8.0", + "mocha": "^10.2.0" + }, + "repository": { + "type": "git", + "url": "https://github.com/Enchoseon/2based2wait.git" + } +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 44235e7..1f05815 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,9 +19,12 @@ dependencies: minecraft-protocol: specifier: ^1.40.3 version: 1.40.3 + mineflayer: + specifier: ^4.8.1 + version: 4.8.1 mineflayer-antiafk: specifier: github:Etiaro/mineflayer-antiafk - version: github.com/Etiaro/mineflayer-antiafk/1ddcc1154c94d6ea85f9e8417dd429a9ce72d21b + version: github.com/Etiaro/mineflayer-antiafk/0cff6e6b90e149b0eb14ee113b2db4eff3379757 mineflayer-auto-eat: specifier: ^3.3.0 version: 3.3.1 @@ -150,7 +153,7 @@ packages: dependencies: minecraft-data: 3.26.0 minecraft-protocol: 1.40.3 - mineflayer: 4.8.0 + mineflayer: 4.8.1 prismarine-item: 1.12.1 smart-buffer: 4.2.0 transitivePeerDependencies: @@ -1145,10 +1148,6 @@ packages: engines: {node: '>=10'} dev: false - /minecraft-data@2.221.0: - resolution: {integrity: sha512-0AhqzbIKb6WqPSF6qBevaPryeWOz545hLxt6q+gfJF8YIQX/YfkyX/nXWhl+pSIS2rTBcQ0RJkRCtTeRzQwHDA==} - dev: false - /minecraft-data@3.26.0: resolution: {integrity: sha512-9DGMM4qI7DdOFTMbtr3Wa/W+XXq11//Lhz+O0YRce9LHyYUDw34tvJcETHR0PNuE7p84J7kV02VLAOV+B1094Q==} dev: false @@ -1184,18 +1183,16 @@ packages: - supports-color dev: false - /mineflayer-auto-eat@2.3.3: - resolution: {integrity: sha512-fy0Jjd9dcnjkcucPcs2uN13wYF4KChEby11pO6Iq3SyRDqjHuKa7U/DKbo5MZaTmucBMRPE1+ETl3kWEI/FCjg==} - dependencies: - minecraft-data: 2.221.0 - dev: false - /mineflayer-auto-eat@3.3.1: resolution: {integrity: sha512-SoPdRYp8VubAOYyvBEo/tJefzkgTii1UK301UwuFRP3kkIhC1tRi5XNgWibT2vhM7JULxi8AQq+NuXJ1UL/5yQ==} dev: false - /mineflayer@4.8.0: - resolution: {integrity: sha512-0LHYXAwGgRbMWUnQ2R7dDEN5u6ktgfZFsQ6C584wZArvmK/5YhGnDRV330zkOtL8KJAsnR2nwX8RvtFOD3Y1Qw==} + /mineflayer-auto-eat@3.3.6: + resolution: {integrity: sha512-CgtIboWu5xB7bWmPTtU66TgfPoKdyOmtgFBEQZ1RoEwednX/cVBTZmMTMpG8PLOPPbfb4wBi1Qd7A0qmkd0SFA==} + dev: false + + /mineflayer@4.8.1: + resolution: {integrity: sha512-xqt5gdBvYHO1UV2slBm1QFFI2dHyfoMAxwSgxIGOuobIrZ05pY56XV6GW+NWQK0gqS4+MA5n0VakXPWZ5trzBQ==} engines: {node: '>=14'} dependencies: minecraft-data: 3.26.0 @@ -1963,11 +1960,11 @@ packages: engines: {node: '>=10'} dev: true - github.com/Etiaro/mineflayer-antiafk/1ddcc1154c94d6ea85f9e8417dd429a9ce72d21b: - resolution: {tarball: https://codeload.github.com/Etiaro/mineflayer-antiafk/tar.gz/1ddcc1154c94d6ea85f9e8417dd429a9ce72d21b} + github.com/Etiaro/mineflayer-antiafk/0cff6e6b90e149b0eb14ee113b2db4eff3379757: + resolution: {tarball: https://codeload.github.com/Etiaro/mineflayer-antiafk/tar.gz/0cff6e6b90e149b0eb14ee113b2db4eff3379757} name: mineflayer-antiafk version: 1.1.1 dependencies: - mineflayer-auto-eat: 2.3.3 + mineflayer-auto-eat: 3.3.6 vec3: 0.1.7 dev: false From 49c61cdbedb3e40178ce4093f010dd0e8a3d0c77 Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Sun, 21 May 2023 20:44:22 -0700 Subject: [PATCH 02/17] doc: Change instructions to current prerelease --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 90c501c..93affd8 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ### Quick Start -1. Clone the latest release: `git clone https://github.com/Enchoseon/2based2wait --branch v1.0.4 --depth 1 && cd 2based2wait` +1. Clone the latest pre-release: `git clone https://github.com/Enchoseon/2based2wait --branch v1.0.5-beta.2 --depth 1 && cd 2based2wait` 2. Install dependencies: `pnpm install --prod` 3. Configure your proxy: - Duplicate the `default-config.json` template file and rename it to `config.json` From 937ecf1b29062ca169c89ba4ccd6c61a3f1229ab Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Fri, 18 Aug 2023 14:51:17 -0700 Subject: [PATCH 03/17] update: Bump deps, use IceTank's fork of mcproxy --- package.json | 12 +-- pnpm-lock.yaml | 209 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 141 insertions(+), 80 deletions(-) diff --git a/package.json b/package.json index dfa70ad..ec12d55 100644 --- a/package.json +++ b/package.json @@ -18,19 +18,19 @@ "author": "Enchoseon", "license": "GPL-2.0", "dependencies": { - "@rob9315/mcproxy": "^1.0.0", - "deepmerge": "^4.3.0", + "@icetank/mcproxy": "^1.0.4", + "deepmerge": "^4.3.1", "joi": "^17.6.0", "json5": "^2.2.3", - "minecraft-data": "^3.26.0", - "minecraft-protocol": "^1.40.3", - "mineflayer": "^4.8.1", + "minecraft-data": "^3.41.0", + "minecraft-protocol": "^1.44.0", + "mineflayer": "^4.11.0", "mineflayer-antiafk": "github:Etiaro/mineflayer-antiafk", "mineflayer-auto-eat": "^3.3.0", "ngrok": "^4.3.1", "node-fetch": "^2.6.9", "node-notifier": "^10.0.1", - "prismarine-chat": "^1.8.0", + "prismarine-chat": "^1.9.0", "prismarine-provider-anvil": "^2.7.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1f05815..923e17b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,12 +1,16 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + dependencies: - '@rob9315/mcproxy': - specifier: ^1.0.0 - version: 1.0.0 + '@icetank/mcproxy': + specifier: ^1.0.4 + version: 1.0.4 deepmerge: - specifier: ^4.3.0 - version: 4.3.0 + specifier: ^4.3.1 + version: 4.3.1 joi: specifier: ^17.6.0 version: 17.7.0 @@ -14,14 +18,14 @@ dependencies: specifier: ^2.2.3 version: 2.2.3 minecraft-data: - specifier: ^3.26.0 - version: 3.26.0 + specifier: ^3.41.0 + version: 3.41.0 minecraft-protocol: - specifier: ^1.40.3 - version: 1.40.3 + specifier: ^1.44.0 + version: 1.44.0 mineflayer: - specifier: ^4.8.1 - version: 4.8.1 + specifier: ^4.11.0 + version: 4.11.0 mineflayer-antiafk: specifier: github:Etiaro/mineflayer-antiafk version: github.com/Etiaro/mineflayer-antiafk/0cff6e6b90e149b0eb14ee113b2db4eff3379757 @@ -38,11 +42,11 @@ dependencies: specifier: ^10.0.1 version: 10.0.1 prismarine-chat: - specifier: ^1.8.0 - version: 1.8.0 + specifier: ^1.9.0 + version: 1.9.0 prismarine-provider-anvil: specifier: ^2.7.0 - version: 2.7.0(minecraft-data@3.26.0) + version: 2.7.0(minecraft-data@3.41.0) devDependencies: eslint: @@ -127,6 +131,19 @@ packages: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true + /@icetank/mcproxy@1.0.4: + resolution: {integrity: sha512-kl0pZgfZkTg2QPKCskpY6TvThjutZmucJJD91aE58wrbHNO0ChwZnlUX+NCwjTlgxM3jMeK1qB/VC4XYo8l7Iw==} + dependencies: + minecraft-data: 3.41.0 + minecraft-protocol: 1.44.0 + mineflayer: 4.11.0 + prismarine-item: 1.14.0 + smart-buffer: 4.2.0 + transitivePeerDependencies: + - encoding + - supports-color + dev: false + /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -148,19 +165,6 @@ packages: fastq: 1.15.0 dev: true - /@rob9315/mcproxy@1.0.0: - resolution: {integrity: sha512-9ocEzDt3jmimqCOtfp4ut4Xx4v0Ub17YSEBEDP/yAb27/jgzK3lree/UhDx5QBBVDKhPDu13VcIS+Ho2jWDq4g==} - dependencies: - minecraft-data: 3.26.0 - minecraft-protocol: 1.40.3 - mineflayer: 4.8.1 - prismarine-item: 1.12.1 - smart-buffer: 4.2.0 - transitivePeerDependencies: - - encoding - - supports-color - dev: false - /@sideway/address@4.1.4: resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==} dependencies: @@ -206,18 +210,18 @@ packages: '@types/node': 8.10.66 dev: false - /@types/node@18.13.0: - resolution: {integrity: sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==} + /@types/node@20.5.0: + resolution: {integrity: sha512-Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q==} dev: false /@types/node@8.10.66: resolution: {integrity: sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==} dev: false - /@types/readable-stream@2.3.15: - resolution: {integrity: sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==} + /@types/readable-stream@4.0.1: + resolution: {integrity: sha512-TSGmoAl2OVQ7sI1ToKoaonynp6kPdTDaBPvgMRz8ABvohWmYvimQqaZkaupTPjcOrpz8+ZdOBv3rCmAvBgVhqg==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.5.0 safe-buffer: 5.1.2 dev: false @@ -505,8 +509,8 @@ packages: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} dev: true - /deepmerge@4.3.0: - resolution: {integrity: sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==} + /deepmerge@4.3.1: + resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} dev: false @@ -1148,26 +1152,26 @@ packages: engines: {node: '>=10'} dev: false - /minecraft-data@3.26.0: - resolution: {integrity: sha512-9DGMM4qI7DdOFTMbtr3Wa/W+XXq11//Lhz+O0YRce9LHyYUDw34tvJcETHR0PNuE7p84J7kV02VLAOV+B1094Q==} + /minecraft-data@3.41.0: + resolution: {integrity: sha512-Xy2S5wZEImE60RknhaVJub6xpMv4t0vWd0/fGzbq1xix2dEG7U6YV/tbRrt6UvPi7jcK+uqR4T/INH7LQMFdqQ==} dev: false /minecraft-folder-path@1.2.0: resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==} dev: false - /minecraft-protocol@1.40.3: - resolution: {integrity: sha512-+6WTrQcqBRXYST8Ha2V30XZ2zcooXA8fBNgKvIHVE/AkWs1kDjiwH1gdhPlK17JMLnV+yYSH4PACsk5VAOuqPA==} + /minecraft-protocol@1.44.0: + resolution: {integrity: sha512-sYu4fFzUKt3spPG5tAdkaB9sNQPT0sV6fyS0sS7/nxdzFfjmLhF6BLNC+32ieK4/MhgNyHtH6xusD0Bi0Roq9w==} engines: {node: '>=14'} dependencies: - '@types/readable-stream': 2.3.15 + '@types/readable-stream': 4.0.1 aes-js: 3.1.2 buffer-equal: 1.0.1 debug: 4.3.4(supports-color@8.1.1) endian-toggle: 0.0.0 lodash.get: 4.4.2 lodash.merge: 4.6.2 - minecraft-data: 3.26.0 + minecraft-data: 3.41.0 minecraft-folder-path: 1.2.0 node-fetch: 2.6.9 node-rsa: 0.4.2 @@ -1191,23 +1195,23 @@ packages: resolution: {integrity: sha512-CgtIboWu5xB7bWmPTtU66TgfPoKdyOmtgFBEQZ1RoEwednX/cVBTZmMTMpG8PLOPPbfb4wBi1Qd7A0qmkd0SFA==} dev: false - /mineflayer@4.8.1: - resolution: {integrity: sha512-xqt5gdBvYHO1UV2slBm1QFFI2dHyfoMAxwSgxIGOuobIrZ05pY56XV6GW+NWQK0gqS4+MA5n0VakXPWZ5trzBQ==} + /mineflayer@4.11.0: + resolution: {integrity: sha512-LFCpvqEcjvVG5U7SpkZybaT0h41yR9W9IWm/QTHM5VBn2VDGsB40zyyZpTOiOI4F57DoOxypGy8048jq5k4u2Q==} engines: {node: '>=14'} dependencies: - minecraft-data: 3.26.0 - minecraft-protocol: 1.40.3 - prismarine-biome: 1.3.0(minecraft-data@3.26.0)(prismarine-registry@1.7.0) - prismarine-block: 1.16.3 - prismarine-chat: 1.8.0 - prismarine-chunk: 1.33.0(minecraft-data@3.26.0) + minecraft-data: 3.41.0 + minecraft-protocol: 1.44.0 + prismarine-biome: 1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0) + prismarine-block: 1.17.0 + prismarine-chat: 1.9.0 + prismarine-chunk: 1.34.0(minecraft-data@3.41.0) prismarine-entity: 2.2.0 - prismarine-item: 1.12.1 + prismarine-item: 1.14.0 prismarine-nbt: 2.2.1 - prismarine-physics: 1.6.0 + prismarine-physics: 1.7.0 prismarine-recipe: 1.3.1(prismarine-registry@1.7.0) prismarine-registry: 1.7.0 - prismarine-windows: 2.6.1 + prismarine-windows: 2.8.0 prismarine-world: 3.6.1 protodef: 1.15.0 typed-emitter: 1.4.0 @@ -1438,29 +1442,40 @@ packages: - supports-color dev: false - /prismarine-biome@1.3.0(minecraft-data@3.26.0)(prismarine-registry@1.7.0): + /prismarine-biome@1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0): resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==} peerDependencies: minecraft-data: ^3.0.0 prismarine-registry: ^1.1.0 dependencies: - minecraft-data: 3.26.0 + minecraft-data: 3.41.0 prismarine-registry: 1.7.0 dev: false /prismarine-block@1.16.3: resolution: {integrity: sha512-E9OazjIqnEgcXM6me6EIeQFMcNRWZzsaftWtetRSIKVoW+4UKWleb6lTNKh9kq7wNxciKavcYBmKL3sF7HfSaA==} dependencies: - minecraft-data: 3.26.0 - prismarine-biome: 1.3.0(minecraft-data@3.26.0)(prismarine-registry@1.7.0) - prismarine-chat: 1.8.0 + minecraft-data: 3.41.0 + prismarine-biome: 1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0) + prismarine-chat: 1.9.0 prismarine-item: 1.12.1 prismarine-nbt: 2.2.1 prismarine-registry: 1.7.0 dev: false - /prismarine-chat@1.8.0: - resolution: {integrity: sha512-hEz47GESIEP0W1KSHrK7ZSy0PqbQW7khYWenv8d5wvyAYnBs1E4KXDBJSWqyGIYinKGN9aes8v3xpQhgURK/Fg==} + /prismarine-block@1.17.0: + resolution: {integrity: sha512-GawzWU91pH4sLTtMvrRe2wiEbO8hgTRwViCBYoFmmqeJYLiblq4GfXOvclj3rEAEdAAVzRKCQxQHpLJhhLWssg==} + dependencies: + minecraft-data: 3.41.0 + prismarine-biome: 1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0) + prismarine-chat: 1.9.0 + prismarine-item: 1.14.0 + prismarine-nbt: 2.2.1 + prismarine-registry: 1.7.0 + dev: false + + /prismarine-chat@1.9.0: + resolution: {integrity: sha512-HFOrMy+5xfu2LqYTP0X2TUygy+nAupZ+hqeoWbznct0peZOQumL0ko+OIXqaOmouSXtyMfgmYSYtdagk0TMqFw==} dependencies: mojangson: 2.0.2 prismarine-item: 1.12.1 @@ -1468,11 +1483,11 @@ packages: prismarine-registry: 1.7.0 dev: false - /prismarine-chunk@1.33.0(minecraft-data@3.26.0): + /prismarine-chunk@1.33.0(minecraft-data@3.41.0): resolution: {integrity: sha512-oTkhyE8EWV5mMOaUyCACiUUtx1270Mo18Ryj+t5Y8dglT4QfVwBsYeph+O40kNL9TK5cTW1lFYg5vr2rWuFGnw==} engines: {node: '>=14'} dependencies: - prismarine-biome: 1.3.0(minecraft-data@3.26.0)(prismarine-registry@1.7.0) + prismarine-biome: 1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0) prismarine-block: 1.16.3 prismarine-nbt: 2.2.1 prismarine-registry: 1.7.0 @@ -1484,12 +1499,28 @@ packages: - minecraft-data dev: false + /prismarine-chunk@1.34.0(minecraft-data@3.41.0): + resolution: {integrity: sha512-5RuQk8w9Ot550G5mmUFZvjpHugEXozgEFXiAhynrBCHOKJ3mMQ7VvhWF2irtjx+d2t29yDAiSEiSS34vxAmODQ==} + engines: {node: '>=14'} + dependencies: + prismarine-biome: 1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0) + prismarine-block: 1.17.0 + prismarine-nbt: 2.2.1 + prismarine-registry: 1.7.0 + smart-buffer: 4.2.0 + uint4: 0.1.2 + vec3: 0.1.7 + xxhash-wasm: 0.4.2 + transitivePeerDependencies: + - minecraft-data + dev: false + /prismarine-entity@2.2.0: resolution: {integrity: sha512-boqJbMpGHG2ddFUUo9aKkKPUHQbFMWkUCw8SRdZ+jrZxABsstL9619I8ujwPYoOMJjMyfYWgdEPNyHGiUqqukA==} dependencies: - minecraft-data: 3.26.0 - prismarine-chat: 1.8.0 - prismarine-item: 1.12.1 + minecraft-data: 3.41.0 + prismarine-chat: 1.9.0 + prismarine-item: 1.14.0 prismarine-registry: 1.7.0 vec3: 0.1.7 dev: false @@ -1501,24 +1532,31 @@ packages: prismarine-registry: 1.7.0 dev: false + /prismarine-item@1.14.0: + resolution: {integrity: sha512-udQHYGJ05klFe8Kkc0TOmwoXj5Xl1ZPgHVoMbGUAFB9exN4TFxEa1A39vkSYhxP5Et9PNufQQvFBFVom0nXikA==} + dependencies: + prismarine-nbt: 2.2.1 + prismarine-registry: 1.7.0 + dev: false + /prismarine-nbt@2.2.1: resolution: {integrity: sha512-Mb50c58CPnuZ+qvM31DBa08tf9UumlTq1LkvpMoUpKfCuN05GZHTqCUwER3lxTSHLL0GZKghIPbYR/JQkINijQ==} dependencies: protodef: 1.15.0 dev: false - /prismarine-physics@1.6.0: - resolution: {integrity: sha512-OqhWAt+lQRCxpodAgdRZg/9C815Xy+YUj5a4iPVIRVineD2x8UuUxCJInE4R8kFFs9PhupNtiXzgEtdmbUB/Mw==} + /prismarine-physics@1.7.0: + resolution: {integrity: sha512-NIm13HYQU6gzWyzb64eSS2civSbnn4cmqZgX+o27TWZMdqJEqmwPZaHSo9rHhPT96c3ZodelRE4qGIEE7q4gow==} dependencies: - minecraft-data: 3.26.0 + minecraft-data: 3.41.0 prismarine-nbt: 2.2.1 vec3: 0.1.7 dev: false - /prismarine-provider-anvil@2.7.0(minecraft-data@3.26.0): + /prismarine-provider-anvil@2.7.0(minecraft-data@3.41.0): resolution: {integrity: sha512-a4NfihRfy+PeKpiWp2CJxTUPMhSROXb7JzA44nfRXqHPDnK4ilC2+MBNeZyi5Wj5OuYRbSd8ZS44YkQMoFR9aQ==} dependencies: - prismarine-chunk: 1.33.0(minecraft-data@3.26.0) + prismarine-chunk: 1.33.0(minecraft-data@3.41.0) prismarine-nbt: 2.2.1 uint4: 0.1.2 vec3: 0.1.7 @@ -1547,16 +1585,16 @@ packages: /prismarine-registry@1.7.0: resolution: {integrity: sha512-yyva0FpWI078nNeMhx8ekVza5uUTYhEv+C+ADu3wUQXiG8qhXkvrf0uzsnhTgZL8BLdsi2axgCEiKw9qSKIuxQ==} dependencies: - minecraft-data: 3.26.0 + minecraft-data: 3.41.0 prismarine-nbt: 2.2.1 dev: false - /prismarine-windows@2.6.1: - resolution: {integrity: sha512-5B8+W4Zb9MWaakd38I/WW564zEgat6bC23ftcv15yVYmHZTq8mtUfX2GsOUD3Pu/aFKarvXpyyJahFMUTUVoXg==} + /prismarine-windows@2.8.0: + resolution: {integrity: sha512-9HVhJ8tfCeRubYwQzgz8oiHNAebMJ5hDdjm45PZwrOgewaislnR2HDsbPMWiCcyWkYL7J8bVLVoSzEzv5pH98g==} dependencies: - prismarine-item: 1.12.1 + prismarine-item: 1.14.0 prismarine-registry: 1.7.0 - typed-emitter: 1.4.0 + typed-emitter: 2.1.0 dev: false /prismarine-world@3.6.1: @@ -1700,6 +1738,14 @@ packages: queue-microtask: 1.2.3 dev: true + /rxjs@7.8.1: + resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} + requiresBuild: true + dependencies: + tslib: 2.6.1 + dev: false + optional: true + /safe-buffer@5.1.2: resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} dev: false @@ -1811,6 +1857,11 @@ packages: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} dev: false + /tslib@2.6.1: + resolution: {integrity: sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==} + dev: false + optional: true + /type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} @@ -1827,6 +1878,12 @@ packages: resolution: {integrity: sha512-weBmoo3HhpKGgLBOYwe8EB31CzDFuaK7CCL+axXhUYhn4jo6DSkHnbefboCF5i4DQ2aMFe0C/FdTWcPdObgHyg==} dev: false + /typed-emitter@2.1.0: + resolution: {integrity: sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==} + optionalDependencies: + rxjs: 7.8.1 + dev: false + /uint4@0.1.2: resolution: {integrity: sha512-lhEx78gdTwFWG+mt6cWAZD/R6qrIj0TTBeH5xwyuDJyswLNlGe+KVlUPQ6+mx5Ld332pS0AMUTo9hIly7YsWxQ==} dev: false @@ -1855,6 +1912,10 @@ packages: resolution: {integrity: sha512-EZSeXBL+L3go2wWwtQQse4fEcNGIQjT14qvi4LYVj1ifZt/J5XZ1QZqkDuOVVH07YwTEIFbsAv3pzwUpF7x9Wg==} dev: false + /vec3@0.1.8: + resolution: {integrity: sha512-LfKrP625Bsg/Tj52YdYPsHmpsJuo+tc6fLxZxXjEo9k2xSspKlPvoYTHehykKhp1FvV9nm+XU3Ehej5/9tpDCg==} + dev: false + /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} dev: false @@ -1966,5 +2027,5 @@ packages: version: 1.1.1 dependencies: mineflayer-auto-eat: 3.3.6 - vec3: 0.1.7 + vec3: 0.1.8 dev: false From 3d1c48a660e70f5f99f2f63db698dbb2d35190bc Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Fri, 18 Aug 2023 15:02:34 -0700 Subject: [PATCH 04/17] fix: Switch mcproxy to fork --- proxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy.js b/proxy.js index 8e28474..9f28f7b 100644 --- a/proxy.js +++ b/proxy.js @@ -4,7 +4,7 @@ // Imports // ======= -const mcproxy = require("@rob9315/mcproxy"); +const mcproxy = require("@icetank/mcproxy"); const mc = require("minecraft-protocol"); const { config, status, updateStatus, updateCoordinatorStatus } = require("./util/config.js"); From 7cebd773eeee07fe24aa46cfa3489426aa9e06fb Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Sat, 19 Aug 2023 02:22:46 -0700 Subject: [PATCH 05/17] fix: Move plugin initialization to spawn event --- util/mineflayer.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/util/mineflayer.js b/util/mineflayer.js index 9447afa..bf63b5e 100644 --- a/util/mineflayer.js +++ b/util/mineflayer.js @@ -22,12 +22,6 @@ function initialize(bot) { // Load plugins bot.loadPlugin(autoeat); bot.loadPlugin(antiafk); - // Set plugin options - bot.afk.setOptions(config.mineflayer.antiAfk); - bot.afk.setOptions({ - "killauraEnabled": false, - "autoEatEnabled": false - }); // Create bot bot.once("login", () => { // =============== @@ -40,6 +34,15 @@ function initialize(bot) { } }); bot.once("spawn", () => { + // ======= + // Antiafk + // ======= + // Set plugin options + bot.afk.setOptions(config.mineflayer.antiAfk); + bot.afk.setOptions({ + "killauraEnabled": false, + "autoEatEnabled": false + }); // ======= // Autoeat // ======= From 2a58c32c530b589aeac0fc74561eb77882c28fdf Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Sat, 19 Aug 2023 02:35:26 -0700 Subject: [PATCH 06/17] add: config.proxy.active config variable proxy.active allows for easy toggling of proxy functionality --- docs/configuration-guide.md | 1 + proxy.js | 9 +++++++-- util/schemas.js | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/configuration-guide.md b/docs/configuration-guide.md index 4651abf..03c99a2 100644 --- a/docs/configuration-guide.md +++ b/docs/configuration-guide.md @@ -44,6 +44,7 @@ - **[port](#user-content-server-port)** `{type: number}` `{default: 25565}` : Port of the server to connect to **[proxy](#user-content-proxy)** `{type: object}` : Settings for how you connect to the proxy + - **[active](#user-content-proxy-active)** `{type: boolean}` `{default: true}` : Whether to allow players to control the account by connecting through a tunnel - **[whitelist](#user-content-proxy-whitelist)** `{type: array}` : Playernames of accounts that are allowed to connect to the proxy - **[onlineMode](#user-content-proxy-onlinemode)** `{type: boolean}` `{default: true}` : Whether to enable online-mode on the proxy. This probably should never be touched - **[loopbackAddress](#user-content-proxy-loopbackaddress)** `{type: string}` `{default: "127.0.0.1"}` : Loopback address to connect to the proxy. (options: '127.0.0.1', 'localhost', '0.0.0.0', '::1') diff --git a/proxy.js b/proxy.js index 9f28f7b..eeed030 100644 --- a/proxy.js +++ b/proxy.js @@ -85,14 +85,19 @@ function start() { updateCoordinatorStatus(); } - // Create local server - createLocalServer(); + // Create local server for proxy connections + if (config.proxy.active) { + createLocalServer(); + } // Create client (connects to server) if (!config.waitForControllerBeforeConnect) { // ... but if waitForControllerBeforeConnect is true, delay the creation of the client until someone connects to the local server createClient(); } else { console.log("Waiting for a controller..."); + if (!config.proxy.active) { + console.log("WARNING: config.waitForControllerBeforeConnect is true but config.proxy.active is false, meaning there will never be a controller!"); + } if (config.ngrok.active) { // Create ngrok tunnel ngrok.createTunnel(); // Note: May overwrite MSA instructions in console(?) } diff --git a/util/schemas.js b/util/schemas.js index 6cdc0b5..75028e1 100644 --- a/util/schemas.js +++ b/util/schemas.js @@ -111,6 +111,8 @@ const configSchema = joi.object({ }).default() .description("Settings for how the proxy connects to the server"), "proxy": joi.object({ + "active": joi.boolean().default(true) + .description("Whether to allow players to control the account by connecting through a tunnel"), "whitelist": joi.array().items(usernameSchema) .description("Playernames of accounts that are allowed to connect to the proxy"), "onlineMode": joi.boolean().default(true) From d20bf4ca485099c9a6e68d8a5a015f983e7c29f1 Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Sun, 20 Aug 2023 22:36:48 -0700 Subject: [PATCH 07/17] feature: Autototem Automatically equip a totem in the offhand --- docs/configuration-guide.md | 2 ++ util/mineflayer.js | 11 +++++++++++ util/schemas.js | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/docs/configuration-guide.md b/docs/configuration-guide.md index 03c99a2..488ac1d 100644 --- a/docs/configuration-guide.md +++ b/docs/configuration-guide.md @@ -76,6 +76,8 @@ - **[chatting](#user-content-mineflayer-antiafk-chatting)** `{type: boolean}` `{default: false}` : Whether the proxy will chat - **[chatMessages](#user-content-mineflayer-antiafk-chatmessages)** `{type: array}` `{default: ["!pt","!queue"]}` : Chat messages that the proxy will send if chatting is enabled - **[chatInterval](#user-content-mineflayer-antiafk-chatinterval)** `{type: number}` `{default: 690420}` : Time (in milliseconds) between each chat message + - **[autoTotem](#user-content-mineflayer-autototem)** `{type: object}` : Settings for autototem + - **[interval](#user-content-mineflayer-autototem-interval)** `{type: number}` `{default: 50}` : Time (in milliseconds) between each totem equip attempt **[experimental](#user-content-experimental)** `{type: object}` : Settings for experimental features that may be more unstable in resource usage and/or server and version parity - **[spoofPlayerInfo](#user-content-experimental-spoofplayerinfo)** `{type: object}` diff --git a/util/mineflayer.js b/util/mineflayer.js index bf63b5e..567a76c 100644 --- a/util/mineflayer.js +++ b/util/mineflayer.js @@ -61,6 +61,17 @@ function initialize(bot) { } } }, config.mineflayer.killAura.interval * 1000); + // ========== + // Auto Totem + // ========== + setInterval(() => { + if (status.mineflayer === "true" && status.inQueue === "false") { + const totem = bot.inventory.findInventoryItem("totem_of_undying", null); + if (totem) { + bot.equip(totem, "off-hand"); + } + } + }, config.mineflayer.autoTotem.interval * 1000); // ===== // Jesus // ===== diff --git a/util/schemas.js b/util/schemas.js index 75028e1..e86a03a 100644 --- a/util/schemas.js +++ b/util/schemas.js @@ -175,7 +175,12 @@ const configSchema = joi.object({ "chatInterval": joi.number().integer().positive().default(690420) // Not setting a minimum for this seems dangerous... .description("Time (in milliseconds) between each chat message") }).default() - .description("Settings for antiafk") + .description("Settings for antiafk"), + "autoTotem": joi.object({ + "interval": joi.number().integer().positive().min(1).default(50) + .description("Time (in milliseconds) between each totem equip attempt") + }).default() + .description("Settings for autototem"), }).default() .description("Settings for the mineflayer bot"), "experimental": joi.object({ From c8cca517e094d1969b06dbd970209e533d6a06d8 Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Sun, 1 Oct 2023 22:24:10 -0700 Subject: [PATCH 08/17] change: Use 1-19 branch of icetank/mcproxy --- package.json | 2 +- pnpm-lock.yaml | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index ec12d55..a038c48 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "author": "Enchoseon", "license": "GPL-2.0", "dependencies": { - "@icetank/mcproxy": "^1.0.4", + "@icetank/mcproxy": "github:IceTank/mcproxy#1-19", "deepmerge": "^4.3.1", "joi": "^17.6.0", "json5": "^2.2.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 923e17b..80a2e68 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -131,19 +131,6 @@ packages: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true - /@icetank/mcproxy@1.0.4: - resolution: {integrity: sha512-kl0pZgfZkTg2QPKCskpY6TvThjutZmucJJD91aE58wrbHNO0ChwZnlUX+NCwjTlgxM3jMeK1qB/VC4XYo8l7Iw==} - dependencies: - minecraft-data: 3.41.0 - minecraft-protocol: 1.44.0 - mineflayer: 4.11.0 - prismarine-item: 1.14.0 - smart-buffer: 4.2.0 - transitivePeerDependencies: - - encoding - - supports-color - dev: false - /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -2029,3 +2016,17 @@ packages: mineflayer-auto-eat: 3.3.6 vec3: 0.1.8 dev: false + + github.com/IceTank/mcproxy/6841d91dd7ac5c96552d89a960a5ba1258d017ff: + resolution: {tarball: https://codeload.github.com/IceTank/mcproxy/tar.gz/6841d91dd7ac5c96552d89a960a5ba1258d017ff} + name: '@icetank/mcproxy' + version: 1.0.3 + requiresBuild: true + dependencies: + deepcopy: 2.1.0 + mineflayer: 4.14.0 + smart-buffer: 4.2.0 + transitivePeerDependencies: + - encoding + - supports-color + dev: false From 7ef47004d29b89e3e352798c88c84033aba1aeaa Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Sun, 1 Oct 2023 22:25:33 -0700 Subject: [PATCH 09/17] update: packages --- package.json | 22 +- pnpm-lock.yaml | 555 ++++++++++++++++++++++++------------------------- 2 files changed, 288 insertions(+), 289 deletions(-) diff --git a/package.json b/package.json index a038c48..0e480e0 100644 --- a/package.json +++ b/package.json @@ -20,22 +20,24 @@ "dependencies": { "@icetank/mcproxy": "github:IceTank/mcproxy#1-19", "deepmerge": "^4.3.1", - "joi": "^17.6.0", + "joi": "^17.10.2", "json5": "^2.2.3", - "minecraft-data": "^3.41.0", + "mcproxy#1-19": "link:@icetank/mcproxy#1-19", + "minecraft-data": "^3.46.1", "minecraft-protocol": "^1.44.0", - "mineflayer": "^4.11.0", + "mineflayer": "^4.14.0", "mineflayer-antiafk": "github:Etiaro/mineflayer-antiafk", - "mineflayer-auto-eat": "^3.3.0", - "ngrok": "^4.3.1", - "node-fetch": "^2.6.9", + "mineflayer-auto-eat": "^3.3.6", + "ngrok": "^4.3.3", + "node-fetch": "^2.7.0", "node-notifier": "^10.0.1", - "prismarine-chat": "^1.9.0", - "prismarine-provider-anvil": "^2.7.0" + "prismarine-chat": "^1.9.1", + "prismarine-provider-anvil": "^2.7.0", + "typescript": "^5.2.2" }, "devDependencies": { - "eslint": "^8.33.0", - "eslint-plugin-jsdoc": "^39.8.0", + "eslint": "^8.50.0", + "eslint-plugin-jsdoc": "^39.9.1", "mocha": "^10.2.0" }, "repository": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 80a2e68..e2c4257 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,72 +6,83 @@ settings: dependencies: '@icetank/mcproxy': - specifier: ^1.0.4 - version: 1.0.4 + specifier: github:IceTank/mcproxy#1-19 + version: github.com/IceTank/mcproxy/6841d91dd7ac5c96552d89a960a5ba1258d017ff deepmerge: specifier: ^4.3.1 version: 4.3.1 joi: - specifier: ^17.6.0 - version: 17.7.0 + specifier: ^17.10.2 + version: 17.10.2 json5: specifier: ^2.2.3 version: 2.2.3 + mcproxy#1-19: + specifier: link:@icetank/mcproxy#1-19 + version: link:@icetank/mcproxy#1-19 minecraft-data: - specifier: ^3.41.0 - version: 3.41.0 + specifier: ^3.46.1 + version: 3.46.1 minecraft-protocol: specifier: ^1.44.0 version: 1.44.0 mineflayer: - specifier: ^4.11.0 - version: 4.11.0 + specifier: ^4.14.0 + version: 4.14.0 mineflayer-antiafk: specifier: github:Etiaro/mineflayer-antiafk - version: github.com/Etiaro/mineflayer-antiafk/0cff6e6b90e149b0eb14ee113b2db4eff3379757 + version: github.com/Etiaro/mineflayer-antiafk/41a08c7e71adb052baee4b739510b6f78987291b mineflayer-auto-eat: - specifier: ^3.3.0 - version: 3.3.1 + specifier: ^3.3.6 + version: 3.3.6 ngrok: - specifier: ^4.3.1 + specifier: ^4.3.3 version: 4.3.3 node-fetch: - specifier: ^2.6.9 - version: 2.6.9 + specifier: ^2.7.0 + version: 2.7.0 node-notifier: specifier: ^10.0.1 version: 10.0.1 prismarine-chat: - specifier: ^1.9.0 - version: 1.9.0 + specifier: ^1.9.1 + version: 1.9.1 prismarine-provider-anvil: specifier: ^2.7.0 - version: 2.7.0(minecraft-data@3.41.0) + version: 2.7.0(minecraft-data@3.46.1) + typescript: + specifier: ^5.2.2 + version: 5.2.2 devDependencies: eslint: - specifier: ^8.33.0 - version: 8.33.0 + specifier: ^8.50.0 + version: 8.50.0 eslint-plugin-jsdoc: - specifier: ^39.8.0 - version: 39.9.1(eslint@8.33.0) + specifier: ^39.9.1 + version: 39.9.1(eslint@8.50.0) mocha: specifier: ^10.2.0 version: 10.2.0 packages: - /@azure/msal-common@10.0.0: - resolution: {integrity: sha512-/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg==} + /@aashutoshrathi/word-wrap@1.2.6: + resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} + engines: {node: '>=0.10.0'} + dev: true + + /@azure/msal-common@14.0.3: + resolution: {integrity: sha512-Vl5SsC3zvQ8913GnO5Typox+35M6CaXmO/2FXi35LfMAV3ZB/HLCsldLxylI01c3CmtOm7pICWpOjp/DlQ9RWA==} engines: {node: '>=0.8.0'} dev: false - /@azure/msal-node@1.15.0: - resolution: {integrity: sha512-fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA==} - engines: {node: 10 || 12 || 14 || 16 || 18} + /@azure/msal-node@2.1.0: + resolution: {integrity: sha512-RiYnw8VdrFJrgTfHAfiAhRehIYN/H8vQ00DGVTYMOtlOkoEbZneK0qs8DV3p2WKVB5GN0cshVSI79N0fVlgbmg==} + engines: {node: 18 || 20} dependencies: - '@azure/msal-common': 10.0.0 - jsonwebtoken: 9.0.0 + '@azure/msal-common': 14.0.3 + jsonwebtoken: 9.0.2 uuid: 8.3.2 dev: false @@ -84,14 +95,29 @@ packages: jsdoc-type-pratt-parser: 3.1.0 dev: true - /@eslint/eslintrc@1.4.1: - resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==} + /@eslint-community/eslint-utils@4.4.0(eslint@8.50.0): + resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + dependencies: + eslint: 8.50.0 + eslint-visitor-keys: 3.4.3 + dev: true + + /@eslint-community/regexpp@4.9.0: + resolution: {integrity: sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + dev: true + + /@eslint/eslintrc@2.1.2: + resolution: {integrity: sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 debug: 4.3.4(supports-color@8.1.1) - espree: 9.4.1 - globals: 13.20.0 + espree: 9.6.1 + globals: 13.22.0 ignore: 5.2.4 import-fresh: 3.3.0 js-yaml: 4.1.0 @@ -101,6 +127,11 @@ packages: - supports-color dev: true + /@eslint/js@8.50.0: + resolution: {integrity: sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + /@hapi/hoek@9.3.0: resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==} dev: false @@ -111,8 +142,8 @@ packages: '@hapi/hoek': 9.3.0 dev: false - /@humanwhocodes/config-array@0.11.8: - resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==} + /@humanwhocodes/config-array@0.11.11: + resolution: {integrity: sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==} engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 1.2.1 @@ -181,14 +212,14 @@ packages: /@types/cacheable-request@6.0.3: resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==} dependencies: - '@types/http-cache-semantics': 4.0.1 + '@types/http-cache-semantics': 4.0.2 '@types/keyv': 3.1.4 '@types/node': 8.10.66 - '@types/responselike': 1.0.0 + '@types/responselike': 1.0.1 dev: false - /@types/http-cache-semantics@4.0.1: - resolution: {integrity: sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==} + /@types/http-cache-semantics@4.0.2: + resolution: {integrity: sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw==} dev: false /@types/keyv@3.1.4: @@ -197,29 +228,29 @@ packages: '@types/node': 8.10.66 dev: false - /@types/node@20.5.0: - resolution: {integrity: sha512-Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q==} + /@types/node@20.8.0: + resolution: {integrity: sha512-LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ==} dev: false /@types/node@8.10.66: resolution: {integrity: sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==} dev: false - /@types/readable-stream@4.0.1: - resolution: {integrity: sha512-TSGmoAl2OVQ7sI1ToKoaonynp6kPdTDaBPvgMRz8ABvohWmYvimQqaZkaupTPjcOrpz8+ZdOBv3rCmAvBgVhqg==} + /@types/readable-stream@4.0.3: + resolution: {integrity: sha512-Z8BOzyIj3UPpn3j5DmDNKIw4wPN9N8a1d1oyteiprWq+wxdgQNC0UfFAQwWjmjyA7uoj7mvoWgxWWH66zYtm4Q==} dependencies: - '@types/node': 20.5.0 + '@types/node': 20.8.0 safe-buffer: 5.1.2 dev: false - /@types/responselike@1.0.0: - resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} + /@types/responselike@1.0.1: + resolution: {integrity: sha512-TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg==} dependencies: '@types/node': 8.10.66 dev: false - /@types/yauzl@2.10.0: - resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} + /@types/yauzl@2.10.1: + resolution: {integrity: sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==} requiresBuild: true dependencies: '@types/node': 8.10.66 @@ -246,16 +277,16 @@ packages: event-target-shim: 5.0.1 dev: false - /acorn-jsx@5.3.2(acorn@8.8.2): + /acorn-jsx@5.3.2(acorn@8.10.0): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 8.8.2 + acorn: 8.10.0 dev: true - /acorn@8.8.2: - resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==} + /acorn@8.10.0: + resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} engines: {node: '>=0.4.0'} hasBin: true dev: true @@ -308,7 +339,7 @@ packages: /axios@0.21.4(debug@4.3.4): resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.2(debug@4.3.4) + follow-redirects: 1.15.3(debug@4.3.4) transitivePeerDependencies: - debug dev: false @@ -375,14 +406,14 @@ packages: engines: {node: '>=10.6.0'} dev: false - /cacheable-request@7.0.2: - resolution: {integrity: sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==} + /cacheable-request@7.0.4: + resolution: {integrity: sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==} engines: {node: '>=8'} dependencies: clone-response: 1.0.3 get-stream: 5.2.0 http-cache-semantics: 4.1.1 - keyv: 4.5.2 + keyv: 4.5.3 lowercase-keys: 2.0.0 normalize-url: 6.1.0 responselike: 2.0.1 @@ -418,7 +449,7 @@ packages: normalize-path: 3.0.0 readdirp: 3.6.0 optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 dev: true /cliui@7.0.4: @@ -496,6 +527,12 @@ packages: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} dev: true + /deepcopy@2.1.0: + resolution: {integrity: sha512-8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ==} + dependencies: + type-detect: 4.0.8 + dev: false + /deepmerge@4.3.1: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} @@ -552,7 +589,7 @@ packages: engines: {node: '>=10'} dev: true - /eslint-plugin-jsdoc@39.9.1(eslint@8.33.0): + /eslint-plugin-jsdoc@39.9.1(eslint@8.50.0): resolution: {integrity: sha512-Rq2QY6BZP2meNIs48aZ3GlIlJgBqFCmR55+UBvaDkA3ZNQ0SvQXOs2QKkubakEijV8UbIVbVZKsOVN8G3MuqZw==} engines: {node: ^14 || ^16 || ^17 || ^18 || ^19} peerDependencies: @@ -562,49 +599,37 @@ packages: comment-parser: 1.3.1 debug: 4.3.4(supports-color@8.1.1) escape-string-regexp: 4.0.0 - eslint: 8.33.0 + eslint: 8.50.0 esquery: 1.5.0 - semver: 7.3.8 + semver: 7.5.4 spdx-expression-parse: 3.0.1 transitivePeerDependencies: - supports-color dev: true - /eslint-scope@7.1.1: - resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==} + /eslint-scope@7.2.2: + resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: esrecurse: 4.3.0 estraverse: 5.3.0 dev: true - /eslint-utils@3.0.0(eslint@8.33.0): - resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} - engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} - peerDependencies: - eslint: '>=5' - dependencies: - eslint: 8.33.0 - eslint-visitor-keys: 2.1.0 - dev: true - - /eslint-visitor-keys@2.1.0: - resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==} - engines: {node: '>=10'} - dev: true - - /eslint-visitor-keys@3.3.0: - resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==} + /eslint-visitor-keys@3.4.3: + resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.33.0: - resolution: {integrity: sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==} + /eslint@8.50.0: + resolution: {integrity: sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint/eslintrc': 1.4.1 - '@humanwhocodes/config-array': 0.11.8 + '@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0) + '@eslint-community/regexpp': 4.9.0 + '@eslint/eslintrc': 2.1.2 + '@eslint/js': 8.50.0 + '@humanwhocodes/config-array': 0.11.11 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 ajv: 6.12.6 @@ -613,53 +638,41 @@ packages: debug: 4.3.4(supports-color@8.1.1) doctrine: 3.0.0 escape-string-regexp: 4.0.0 - eslint-scope: 7.1.1 - eslint-utils: 3.0.0(eslint@8.33.0) - eslint-visitor-keys: 3.3.0 - espree: 9.4.1 - esquery: 1.4.0 + eslint-scope: 7.2.2 + eslint-visitor-keys: 3.4.3 + espree: 9.6.1 + esquery: 1.5.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 file-entry-cache: 6.0.1 find-up: 5.0.0 glob-parent: 6.0.2 - globals: 13.20.0 - grapheme-splitter: 1.0.4 + globals: 13.22.0 + graphemer: 1.4.0 ignore: 5.2.4 - import-fresh: 3.3.0 imurmurhash: 0.1.4 is-glob: 4.0.3 is-path-inside: 3.0.3 - js-sdsl: 4.3.0 js-yaml: 4.1.0 json-stable-stringify-without-jsonify: 1.0.1 levn: 0.4.1 lodash.merge: 4.6.2 minimatch: 3.1.2 natural-compare: 1.4.0 - optionator: 0.9.1 - regexpp: 3.2.0 + optionator: 0.9.3 strip-ansi: 6.0.1 - strip-json-comments: 3.1.1 text-table: 0.2.0 transitivePeerDependencies: - supports-color dev: true - /espree@9.4.1: - resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==} + /espree@9.6.1: + resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.8.2 - acorn-jsx: 5.3.2(acorn@8.8.2) - eslint-visitor-keys: 3.3.0 - dev: true - - /esquery@1.4.0: - resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==} - engines: {node: '>=0.10'} - dependencies: - estraverse: 5.3.0 + acorn: 8.10.0 + acorn-jsx: 5.3.2(acorn@8.10.0) + eslint-visitor-keys: 3.4.3 dev: true /esquery@1.5.0: @@ -705,7 +718,7 @@ packages: get-stream: 5.2.0 yauzl: 2.10.0 optionalDependencies: - '@types/yauzl': 2.10.0 + '@types/yauzl': 2.10.1 transitivePeerDependencies: - supports-color dev: false @@ -736,7 +749,7 @@ packages: resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} engines: {node: ^10.12.0 || >=12.0.0} dependencies: - flat-cache: 3.0.4 + flat-cache: 3.1.0 dev: true /fill-range@7.0.1: @@ -754,11 +767,12 @@ packages: path-exists: 4.0.0 dev: true - /flat-cache@3.0.4: - resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==} - engines: {node: ^10.12.0 || >=12.0.0} + /flat-cache@3.1.0: + resolution: {integrity: sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==} + engines: {node: '>=12.0.0'} dependencies: - flatted: 3.2.7 + flatted: 3.2.9 + keyv: 4.5.3 rimraf: 3.0.2 dev: true @@ -767,12 +781,12 @@ packages: hasBin: true dev: true - /flatted@3.2.7: - resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} + /flatted@3.2.9: + resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} dev: true - /follow-redirects@1.15.2(debug@4.3.4): - resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} + /follow-redirects@1.15.3(debug@4.3.4): + resolution: {integrity: sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==} engines: {node: '>=4.0'} peerDependencies: debug: '*' @@ -787,8 +801,8 @@ packages: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} dev: true - /fsevents@2.3.2: - resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} + /fsevents@2.3.3: + resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] requiresBuild: true @@ -843,8 +857,8 @@ packages: path-is-absolute: 1.0.1 dev: true - /globals@13.20.0: - resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==} + /globals@13.22.0: + resolution: {integrity: sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==} engines: {node: '>=8'} dependencies: type-fest: 0.20.2 @@ -857,9 +871,9 @@ packages: '@sindresorhus/is': 4.6.0 '@szmarczak/http-timer': 4.0.6 '@types/cacheable-request': 6.0.3 - '@types/responselike': 1.0.0 + '@types/responselike': 1.0.1 cacheable-lookup: 5.0.4 - cacheable-request: 7.0.2 + cacheable-request: 7.0.4 decompress-response: 6.0.0 http2-wrapper: 1.0.3 lowercase-keys: 2.0.0 @@ -867,8 +881,8 @@ packages: responselike: 2.0.1 dev: false - /grapheme-splitter@1.0.4: - resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==} + /graphemer@1.4.0: + resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} dev: true /growly@1.3.0: @@ -994,8 +1008,8 @@ packages: /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - /joi@17.7.0: - resolution: {integrity: sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==} + /joi@17.10.2: + resolution: {integrity: sha512-hcVhjBxRNW/is3nNLdGLIjkgXetkeGc2wyhydhz8KumG23Aerk4HPjU5zaPAMRqXQFc0xNqXTC7+zQjxr0GlKA==} dependencies: '@hapi/hoek': 9.3.0 '@hapi/topo': 5.1.0 @@ -1004,14 +1018,10 @@ packages: '@sideway/pinpoint': 2.0.0 dev: false - /jose@4.11.4: - resolution: {integrity: sha512-94FdcR8felat4vaTJyL/WVdtlWLlsnLMZP8v+A0Vru18K3bQ22vn7TtpVh3JlgBFNIlYOUlGqwp/MjRPOnIyCQ==} + /jose@4.14.6: + resolution: {integrity: sha512-EqJPEUlZD0/CSUMubKtMaYUOtWe91tZXTWMJZoKSbLk+KtdhNdcvppH8lA9XwVu2V4Ailvsj0GBZJ2ZwDjfesQ==} dev: false - /js-sdsl@4.3.0: - resolution: {integrity: sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==} - dev: true - /js-yaml@4.1.0: resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} hasBin: true @@ -1026,7 +1036,6 @@ packages: /json-buffer@3.0.1: resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} - dev: false /json-schema-traverse@0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} @@ -1041,14 +1050,20 @@ packages: hasBin: true dev: false - /jsonwebtoken@9.0.0: - resolution: {integrity: sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==} + /jsonwebtoken@9.0.2: + resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==} engines: {node: '>=12', npm: '>=6'} dependencies: jws: 3.2.2 - lodash: 4.17.21 + lodash.includes: 4.3.0 + lodash.isboolean: 3.0.3 + lodash.isinteger: 4.0.4 + lodash.isnumber: 3.0.3 + lodash.isplainobject: 4.0.6 + lodash.isstring: 4.0.1 + lodash.once: 4.1.1 ms: 2.1.3 - semver: 7.3.8 + semver: 7.5.4 dev: false /jwa@1.4.1: @@ -1066,11 +1081,10 @@ packages: safe-buffer: 5.2.1 dev: false - /keyv@4.5.2: - resolution: {integrity: sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==} + /keyv@4.5.3: + resolution: {integrity: sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==} dependencies: json-buffer: 3.0.1 - dev: false /levn@0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} @@ -1095,15 +1109,39 @@ packages: resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==} dev: false + /lodash.includes@4.3.0: + resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==} + dev: false + + /lodash.isboolean@3.0.3: + resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==} + dev: false + + /lodash.isinteger@4.0.4: + resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==} + dev: false + + /lodash.isnumber@3.0.3: + resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==} + dev: false + + /lodash.isplainobject@4.0.6: + resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==} + dev: false + + /lodash.isstring@4.0.1: + resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==} + dev: false + /lodash.merge@4.6.2: resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} - /lodash.reduce@4.6.0: - resolution: {integrity: sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==} + /lodash.once@4.1.1: + resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==} dev: false - /lodash@4.17.21: - resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + /lodash.reduce@4.6.0: + resolution: {integrity: sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==} dev: false /log-symbols@4.1.0: @@ -1139,8 +1177,8 @@ packages: engines: {node: '>=10'} dev: false - /minecraft-data@3.41.0: - resolution: {integrity: sha512-Xy2S5wZEImE60RknhaVJub6xpMv4t0vWd0/fGzbq1xix2dEG7U6YV/tbRrt6UvPi7jcK+uqR4T/INH7LQMFdqQ==} + /minecraft-data@3.46.1: + resolution: {integrity: sha512-asIlURpAfAN1k7H9Ffkas8SrPhwYrQqp52ZECZPgnChcksjeWcDnRz6HLehns1O5TyPo2SBGvjIYztanKQpy7g==} dev: false /minecraft-folder-path@1.2.0: @@ -1151,22 +1189,22 @@ packages: resolution: {integrity: sha512-sYu4fFzUKt3spPG5tAdkaB9sNQPT0sV6fyS0sS7/nxdzFfjmLhF6BLNC+32ieK4/MhgNyHtH6xusD0Bi0Roq9w==} engines: {node: '>=14'} dependencies: - '@types/readable-stream': 4.0.1 + '@types/readable-stream': 4.0.3 aes-js: 3.1.2 buffer-equal: 1.0.1 debug: 4.3.4(supports-color@8.1.1) endian-toggle: 0.0.0 lodash.get: 4.4.2 lodash.merge: 4.6.2 - minecraft-data: 3.41.0 + minecraft-data: 3.46.1 minecraft-folder-path: 1.2.0 - node-fetch: 2.6.9 + node-fetch: 2.7.0 node-rsa: 0.4.2 - prismarine-auth: 2.2.0 + prismarine-auth: 2.3.0 prismarine-nbt: 2.2.1 - prismarine-realms: 1.3.0 + prismarine-realms: 1.3.2 protodef: 1.15.0 - readable-stream: 4.3.0 + readable-stream: 4.4.2 uuid-1345: 1.0.2 yggdrasil: 1.7.0 transitivePeerDependencies: @@ -1174,35 +1212,31 @@ packages: - supports-color dev: false - /mineflayer-auto-eat@3.3.1: - resolution: {integrity: sha512-SoPdRYp8VubAOYyvBEo/tJefzkgTii1UK301UwuFRP3kkIhC1tRi5XNgWibT2vhM7JULxi8AQq+NuXJ1UL/5yQ==} - dev: false - /mineflayer-auto-eat@3.3.6: resolution: {integrity: sha512-CgtIboWu5xB7bWmPTtU66TgfPoKdyOmtgFBEQZ1RoEwednX/cVBTZmMTMpG8PLOPPbfb4wBi1Qd7A0qmkd0SFA==} dev: false - /mineflayer@4.11.0: - resolution: {integrity: sha512-LFCpvqEcjvVG5U7SpkZybaT0h41yR9W9IWm/QTHM5VBn2VDGsB40zyyZpTOiOI4F57DoOxypGy8048jq5k4u2Q==} + /mineflayer@4.14.0: + resolution: {integrity: sha512-4EYzUmZNxH3Gpz3GkgO2eaR90ANb50nVhMCU2y6Rl1Ru8M6HqxID1Eg7tRgsodfAOD+AKh5SPwmPnISLcxvnOA==} engines: {node: '>=14'} dependencies: - minecraft-data: 3.41.0 + minecraft-data: 3.46.1 minecraft-protocol: 1.44.0 - prismarine-biome: 1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0) - prismarine-block: 1.17.0 - prismarine-chat: 1.9.0 - prismarine-chunk: 1.34.0(minecraft-data@3.41.0) - prismarine-entity: 2.2.0 + prismarine-biome: 1.3.0(minecraft-data@3.46.1)(prismarine-registry@1.7.0) + prismarine-block: 1.17.1 + prismarine-chat: 1.9.1 + prismarine-chunk: 1.35.0(minecraft-data@3.46.1) + prismarine-entity: 2.3.1 prismarine-item: 1.14.0 prismarine-nbt: 2.2.1 - prismarine-physics: 1.7.0 + prismarine-physics: 1.8.0 prismarine-recipe: 1.3.1(prismarine-registry@1.7.0) prismarine-registry: 1.7.0 prismarine-windows: 2.8.0 - prismarine-world: 3.6.1 + prismarine-world: 3.6.2 protodef: 1.15.0 typed-emitter: 1.4.0 - vec3: 0.1.7 + vec3: 0.1.8 transitivePeerDependencies: - encoding - supports-color @@ -1249,8 +1283,8 @@ packages: yargs-unparser: 2.0.0 dev: true - /mojangson@2.0.2: - resolution: {integrity: sha512-iGPRE1Ez+W+42Dt4Ao91c9VVs+FmuRUlAFDef76xRX3mbZrTNuezDtFI0PbfYqheg/B0fSiq0Q0V1emZNt37cw==} + /mojangson@2.0.4: + resolution: {integrity: sha512-HYmhgDjr1gzF7trGgvcC/huIg2L8FsVbi/KacRe6r1AswbboGVZDS47SOZlomPuMWvZLas8m9vuHHucdZMwTmQ==} dependencies: nearley: 2.20.1 dev: false @@ -1303,8 +1337,8 @@ packages: - supports-color dev: false - /node-fetch@2.6.9: - resolution: {integrity: sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==} + /node-fetch@2.7.0: + resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==} engines: {node: 4.x || >=6.0.0} peerDependencies: encoding: ^0.1.0 @@ -1320,7 +1354,7 @@ packages: dependencies: growly: 1.3.0 is-wsl: 2.2.0 - semver: 7.3.8 + semver: 7.5.4 shellwords: 0.1.1 uuid: 8.3.2 which: 2.0.2 @@ -1347,16 +1381,16 @@ packages: dependencies: wrappy: 1.0.2 - /optionator@0.9.1: - resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} + /optionator@0.9.3: + resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} engines: {node: '>= 0.8.0'} dependencies: + '@aashutoshrathi/word-wrap': 1.2.6 deep-is: 0.1.4 fast-levenshtein: 2.0.6 levn: 0.4.1 prelude-ls: 1.2.1 type-check: 0.4.0 - word-wrap: 1.2.3 dev: true /p-cancelable@2.1.1: @@ -1414,14 +1448,14 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prismarine-auth@2.2.0: - resolution: {integrity: sha512-3XfR3bqrd7nrTVyEqMwuYRr+/Vy+hkfBplubSDuoRAcRCs90lDx7R4EG3fjMSoKY53RLTXjeFnsB6m1krhL/2A==} + /prismarine-auth@2.3.0: + resolution: {integrity: sha512-giKZiHwuQdpMJ7KX94UncOJqM3u+yqKIR2UI/rqmdmFUuQilV9vhlz/zehpVkvo7FE8gmZsuUMCUPhI+gtgd3A==} dependencies: - '@azure/msal-node': 1.15.0 + '@azure/msal-node': 2.1.0 '@xboxreplay/xboxlive-auth': 3.3.3(debug@4.3.4) debug: 4.3.4(supports-color@8.1.1) - jose: 4.11.4 - node-fetch: 2.6.9 + jose: 4.14.6 + node-fetch: 2.7.0 smart-buffer: 4.2.0 uuid-1345: 1.0.2 transitivePeerDependencies: @@ -1429,94 +1463,59 @@ packages: - supports-color dev: false - /prismarine-biome@1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0): + /prismarine-biome@1.3.0(minecraft-data@3.46.1)(prismarine-registry@1.7.0): resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==} peerDependencies: minecraft-data: ^3.0.0 prismarine-registry: ^1.1.0 dependencies: - minecraft-data: 3.41.0 - prismarine-registry: 1.7.0 - dev: false - - /prismarine-block@1.16.3: - resolution: {integrity: sha512-E9OazjIqnEgcXM6me6EIeQFMcNRWZzsaftWtetRSIKVoW+4UKWleb6lTNKh9kq7wNxciKavcYBmKL3sF7HfSaA==} - dependencies: - minecraft-data: 3.41.0 - prismarine-biome: 1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0) - prismarine-chat: 1.9.0 - prismarine-item: 1.12.1 - prismarine-nbt: 2.2.1 + minecraft-data: 3.46.1 prismarine-registry: 1.7.0 dev: false - /prismarine-block@1.17.0: - resolution: {integrity: sha512-GawzWU91pH4sLTtMvrRe2wiEbO8hgTRwViCBYoFmmqeJYLiblq4GfXOvclj3rEAEdAAVzRKCQxQHpLJhhLWssg==} + /prismarine-block@1.17.1: + resolution: {integrity: sha512-r1TIn/b5v77BX4a+qd+Yv+4/vZpsC/Jp5ElYxd6++2wpCnqiuxVG7BlS2Eo14vez1M2gt3qoNEl54Hr8qox/rQ==} dependencies: - minecraft-data: 3.41.0 - prismarine-biome: 1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0) - prismarine-chat: 1.9.0 + minecraft-data: 3.46.1 + prismarine-biome: 1.3.0(minecraft-data@3.46.1)(prismarine-registry@1.7.0) + prismarine-chat: 1.9.1 prismarine-item: 1.14.0 prismarine-nbt: 2.2.1 prismarine-registry: 1.7.0 dev: false - /prismarine-chat@1.9.0: - resolution: {integrity: sha512-HFOrMy+5xfu2LqYTP0X2TUygy+nAupZ+hqeoWbznct0peZOQumL0ko+OIXqaOmouSXtyMfgmYSYtdagk0TMqFw==} + /prismarine-chat@1.9.1: + resolution: {integrity: sha512-x7WWa5MNhiLZSO6tw+YyKpzquFZ+DNISVgiV6K3SU0GsishMXe+nto02WhF/4AuFerKdugm9u1d/r4C4zSkJOg==} dependencies: - mojangson: 2.0.2 - prismarine-item: 1.12.1 - prismarine-nbt: 2.2.1 - prismarine-registry: 1.7.0 - dev: false - - /prismarine-chunk@1.33.0(minecraft-data@3.41.0): - resolution: {integrity: sha512-oTkhyE8EWV5mMOaUyCACiUUtx1270Mo18Ryj+t5Y8dglT4QfVwBsYeph+O40kNL9TK5cTW1lFYg5vr2rWuFGnw==} - engines: {node: '>=14'} - dependencies: - prismarine-biome: 1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0) - prismarine-block: 1.16.3 + mojangson: 2.0.4 + prismarine-item: 1.14.0 prismarine-nbt: 2.2.1 prismarine-registry: 1.7.0 - smart-buffer: 4.2.0 - uint4: 0.1.2 - vec3: 0.1.7 - xxhash-wasm: 0.4.2 - transitivePeerDependencies: - - minecraft-data dev: false - /prismarine-chunk@1.34.0(minecraft-data@3.41.0): - resolution: {integrity: sha512-5RuQk8w9Ot550G5mmUFZvjpHugEXozgEFXiAhynrBCHOKJ3mMQ7VvhWF2irtjx+d2t29yDAiSEiSS34vxAmODQ==} + /prismarine-chunk@1.35.0(minecraft-data@3.46.1): + resolution: {integrity: sha512-Q1lElMUle7wWxWdQjbZo3j2/dLNG325j90IcbbMmBTnHdQSWIjWFe792XOz3RVBlvrhRJEiZk38S6/eQTQ9esw==} engines: {node: '>=14'} dependencies: - prismarine-biome: 1.3.0(minecraft-data@3.41.0)(prismarine-registry@1.7.0) - prismarine-block: 1.17.0 + prismarine-biome: 1.3.0(minecraft-data@3.46.1)(prismarine-registry@1.7.0) + prismarine-block: 1.17.1 prismarine-nbt: 2.2.1 prismarine-registry: 1.7.0 smart-buffer: 4.2.0 uint4: 0.1.2 - vec3: 0.1.7 + vec3: 0.1.8 xxhash-wasm: 0.4.2 transitivePeerDependencies: - minecraft-data dev: false - /prismarine-entity@2.2.0: - resolution: {integrity: sha512-boqJbMpGHG2ddFUUo9aKkKPUHQbFMWkUCw8SRdZ+jrZxABsstL9619I8ujwPYoOMJjMyfYWgdEPNyHGiUqqukA==} + /prismarine-entity@2.3.1: + resolution: {integrity: sha512-HOv8l7IetHNf4hwZ7V/W4vM3GNl+e6VCtKDkH9h02TRq7jWngsggKtJV+VanCce/sNwtJUhJDjORGs728ep4MA==} dependencies: - minecraft-data: 3.41.0 - prismarine-chat: 1.9.0 + prismarine-chat: 1.9.1 prismarine-item: 1.14.0 prismarine-registry: 1.7.0 - vec3: 0.1.7 - dev: false - - /prismarine-item@1.12.1: - resolution: {integrity: sha512-Q+cV8WCM6gTO/K8gIpe4sTCVj0wdXy/IIctpQhgj4iRPoRY/rLCI88FAGsLNU1cabOFQDO3a0NIz+KLvhOvbQA==} - dependencies: - prismarine-nbt: 2.2.1 - prismarine-registry: 1.7.0 + vec3: 0.1.8 dev: false /prismarine-item@1.14.0: @@ -1532,30 +1531,30 @@ packages: protodef: 1.15.0 dev: false - /prismarine-physics@1.7.0: - resolution: {integrity: sha512-NIm13HYQU6gzWyzb64eSS2civSbnn4cmqZgX+o27TWZMdqJEqmwPZaHSo9rHhPT96c3ZodelRE4qGIEE7q4gow==} + /prismarine-physics@1.8.0: + resolution: {integrity: sha512-gbM+S+bmVtOKVv+Z0WGaHMeEeBHISIDsRDRlv8sr0dex3ZJRhuq8djA02CBreguXtI18ZKh6q3TSj2qDr45NHA==} dependencies: - minecraft-data: 3.41.0 + minecraft-data: 3.46.1 prismarine-nbt: 2.2.1 - vec3: 0.1.7 + vec3: 0.1.8 dev: false - /prismarine-provider-anvil@2.7.0(minecraft-data@3.41.0): + /prismarine-provider-anvil@2.7.0(minecraft-data@3.46.1): resolution: {integrity: sha512-a4NfihRfy+PeKpiWp2CJxTUPMhSROXb7JzA44nfRXqHPDnK4ilC2+MBNeZyi5Wj5OuYRbSd8ZS44YkQMoFR9aQ==} dependencies: - prismarine-chunk: 1.33.0(minecraft-data@3.41.0) + prismarine-chunk: 1.35.0(minecraft-data@3.46.1) prismarine-nbt: 2.2.1 uint4: 0.1.2 - vec3: 0.1.7 + vec3: 0.1.8 transitivePeerDependencies: - minecraft-data dev: false - /prismarine-realms@1.3.0: - resolution: {integrity: sha512-heAzbP2bI/dGjoHUWAe3pncg3jHwNLjN0nkZb98jbpJxgsogx/8Cqejd1Oc+EVnqnVwNyiyITfCoH3ECqYeikw==} + /prismarine-realms@1.3.2: + resolution: {integrity: sha512-5apl9Ru8veTj5q2OozRc4GZOuSIcs3yY4UEtALiLKHstBe8bRw8vNlaz4Zla3jsQ8yP/ul1b1IJINTRbocuA6g==} dependencies: debug: 4.3.4(supports-color@8.1.1) - node-fetch: 2.6.9 + node-fetch: 2.7.0 transitivePeerDependencies: - encoding - supports-color @@ -1572,7 +1571,7 @@ packages: /prismarine-registry@1.7.0: resolution: {integrity: sha512-yyva0FpWI078nNeMhx8ekVza5uUTYhEv+C+ADu3wUQXiG8qhXkvrf0uzsnhTgZL8BLdsi2axgCEiKw9qSKIuxQ==} dependencies: - minecraft-data: 3.41.0 + minecraft-data: 3.46.1 prismarine-nbt: 2.2.1 dev: false @@ -1584,11 +1583,11 @@ packages: typed-emitter: 2.1.0 dev: false - /prismarine-world@3.6.1: - resolution: {integrity: sha512-sv7rR+vJ/ac3/dm4MoumreL4eqMi3B+h8I+JDYXQkNCdSJJISniQvi5qS4zTnAUCGXx/N6QfQ02bjBfyEoZuRw==} + /prismarine-world@3.6.2: + resolution: {integrity: sha512-xNNo3bd8EnCMjiPbVrh3jYa1Upa8Krkb13BgO7FOOfD5ZYf+iYDZewBtDbHYWzZZB2N0JlTtimMOHRhZhDJirw==} engines: {node: '>=8.0.0'} dependencies: - vec3: 0.1.7 + vec3: 0.1.8 dev: false /process@0.11.10: @@ -1610,7 +1609,7 @@ packages: lodash.get: 4.4.2 lodash.reduce: 4.6.0 protodef-validator: 1.3.1 - readable-stream: 3.6.0 + readable-stream: 3.6.2 dev: false /pump@3.0.0: @@ -1651,8 +1650,8 @@ packages: safe-buffer: 5.2.1 dev: true - /readable-stream@3.6.0: - resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==} + /readable-stream@3.6.2: + resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} engines: {node: '>= 6'} dependencies: inherits: 2.0.4 @@ -1660,14 +1659,15 @@ packages: util-deprecate: 1.0.2 dev: false - /readable-stream@4.3.0: - resolution: {integrity: sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ==} + /readable-stream@4.4.2: + resolution: {integrity: sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: abort-controller: 3.0.0 buffer: 6.0.3 events: 3.3.0 process: 0.11.10 + string_decoder: 1.3.0 dev: false /readdirp@3.6.0: @@ -1677,11 +1677,6 @@ packages: picomatch: 2.3.1 dev: true - /regexpp@3.2.0: - resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==} - engines: {node: '>=8'} - dev: true - /require-directory@2.1.1: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} engines: {node: '>=0.10.0'} @@ -1729,7 +1724,7 @@ packages: resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} requiresBuild: true dependencies: - tslib: 2.6.1 + tslib: 2.6.2 dev: false optional: true @@ -1740,8 +1735,8 @@ packages: /safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} - /semver@7.3.8: - resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==} + /semver@7.5.4: + resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} engines: {node: '>=10'} hasBin: true dependencies: @@ -1782,11 +1777,11 @@ packages: resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} dependencies: spdx-exceptions: 2.3.0 - spdx-license-ids: 3.0.12 + spdx-license-ids: 3.0.15 dev: true - /spdx-license-ids@3.0.12: - resolution: {integrity: sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==} + /spdx-license-ids@3.0.15: + resolution: {integrity: sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ==} dev: true /string-width@4.2.3: @@ -1844,8 +1839,8 @@ packages: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} dev: false - /tslib@2.6.1: - resolution: {integrity: sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==} + /tslib@2.6.2: + resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: false optional: true @@ -1856,6 +1851,11 @@ packages: prelude-ls: 1.2.1 dev: true + /type-detect@4.0.8: + resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} + engines: {node: '>=4'} + dev: false + /type-fest@0.20.2: resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} engines: {node: '>=10'} @@ -1871,6 +1871,12 @@ packages: rxjs: 7.8.1 dev: false + /typescript@5.2.2: + resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} + engines: {node: '>=14.17'} + hasBin: true + dev: false + /uint4@0.1.2: resolution: {integrity: sha512-lhEx78gdTwFWG+mt6cWAZD/R6qrIj0TTBeH5xwyuDJyswLNlGe+KVlUPQ6+mx5Ld332pS0AMUTo9hIly7YsWxQ==} dev: false @@ -1895,10 +1901,6 @@ packages: hasBin: true dev: false - /vec3@0.1.7: - resolution: {integrity: sha512-EZSeXBL+L3go2wWwtQQse4fEcNGIQjT14qvi4LYVj1ifZt/J5XZ1QZqkDuOVVH07YwTEIFbsAv3pzwUpF7x9Wg==} - dev: false - /vec3@0.1.8: resolution: {integrity: sha512-LfKrP625Bsg/Tj52YdYPsHmpsJuo+tc6fLxZxXjEo9k2xSspKlPvoYTHehykKhp1FvV9nm+XU3Ehej5/9tpDCg==} dev: false @@ -1921,11 +1923,6 @@ packages: dependencies: isexe: 2.0.0 - /word-wrap@1.2.3: - resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==} - engines: {node: '>=0.10.0'} - dev: true - /workerpool@6.2.1: resolution: {integrity: sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==} dev: true @@ -1997,7 +1994,7 @@ packages: /yggdrasil@1.7.0: resolution: {integrity: sha512-QBIo5fiNd7688G3FqXXYGr36uyrYzczlNuzpWFy2zL3+R+3KT2lF+wFxm51synfA3l3z6IBiGOc1/EVXWCYY1Q==} dependencies: - node-fetch: 2.6.9 + node-fetch: 2.7.0 uuid: 8.3.2 transitivePeerDependencies: - encoding @@ -2008,8 +2005,8 @@ packages: engines: {node: '>=10'} dev: true - github.com/Etiaro/mineflayer-antiafk/0cff6e6b90e149b0eb14ee113b2db4eff3379757: - resolution: {tarball: https://codeload.github.com/Etiaro/mineflayer-antiafk/tar.gz/0cff6e6b90e149b0eb14ee113b2db4eff3379757} + github.com/Etiaro/mineflayer-antiafk/41a08c7e71adb052baee4b739510b6f78987291b: + resolution: {tarball: https://codeload.github.com/Etiaro/mineflayer-antiafk/tar.gz/41a08c7e71adb052baee4b739510b6f78987291b} name: mineflayer-antiafk version: 1.1.1 dependencies: From 24b0e9170a13617c36bda58786650657f646d6b1 Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Sun, 1 Oct 2023 22:26:04 -0700 Subject: [PATCH 10/17] fix: Queue detection `conn.bot.game.dimension` is now "the_end" instead of "minecraft:end" --- util/queue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/queue.js b/util/queue.js index 3b573ed..c76775e 100644 --- a/util/queue.js +++ b/util/queue.js @@ -22,7 +22,7 @@ let sentNotification = false; * @param {object} conn McProxy conn object */ function difficultyPacketHandler(packetData, conn) { - const inQueue = (conn.bot.game.serverBrand === "2b2t (Velocity)") && (conn.bot.game.dimension === "minecraft:end") && (packetData.difficulty === 1); + const inQueue = (conn.bot.game.serverBrand === "2b2t (Velocity)") && (conn.bot.game.dimension === "the_end") && (packetData.difficulty === 1); if (updateStatus("inQueue", inQueue) && inQueue === false && config.notify.whenJoining) { // Send notification when joining server notifier.sendToast("In Server!"); notifier.sendWebhook({ From 863707bed0498c792d158b99fe42299cf4969ed8 Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:17:22 -0800 Subject: [PATCH 11/17] tweak: packet name checks in respective handlers Moved checks of packetMeta.name from big switch statement in proxy.js into respective packet handler functions. --- proxy.js | 22 +++++----------------- util/chatty.js | 5 ++++- util/downloader.js | 5 ++++- util/queue.js | 10 ++++++++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/proxy.js b/proxy.js index eeed030..f2b58ab 100644 --- a/proxy.js +++ b/proxy.js @@ -50,23 +50,11 @@ function packetHandler(packetData, packetMeta) { logger.packetHandler(packetData, packetMeta, "server"); // Assorted packet handlers - switch (packetMeta.name) { - case "chat": // Forward chat packets to chatty.js for livechat relay and reading server restart messages - chatty.chatPacketHandler(packetData); - break; - case "difficulty": // Difficulty packet handler, checks whether or not we're in queue (explanation: when rerouted by Velocity, the difficulty packet is always sent after the MC|Brand packet.) - queue.difficultyPacketHandler(packetData, conn); - break; - case "playerlist_header": // Playerlist packet handler, checks position in queue - queue.playerlistHeaderPacketHandler(packetData, server); - break; - case "map_chunk": - if (!config.experimental.worldDownloader.active) break; - downloader.mapChunkPacketHandler(packetData); // Don't proceed if world downloader isn't enabled - break; - default: - break; - } + chatty.chatPacketHandler(packetMeta.name, packetData); + queue.difficultyPacketHandler(packetMeta.name, packetData, conn); + queue.playerlistHeaderPacketHandler(packetMeta.name, packetData, server); + if (!config.experimental.worldDownloader.active) + downloader.mapChunkPacketHandler(packetMeta.name, packetData); // Reset uncleanDisconnectMonitor timer refreshMonitor(); diff --git a/util/chatty.js b/util/chatty.js index 9485ff0..752922c 100644 --- a/util/chatty.js +++ b/util/chatty.js @@ -15,9 +15,12 @@ const ChatMessage = require("prismarine-chat")(config.server.version); /** * Handle incoming chat packets + * @param {string} packetName Packet type * @param {object} packetData Packet data object */ -function chatPacketHandler(packetData) { +function chatPacketHandler(packetName, packetData) { + if (packetName != "chat") + return; // Parse chat messages const msgObj = JSON.parse(packetData.message); const msg = ChatMessage.fromNotch(msgObj).toString(); diff --git a/util/downloader.js b/util/downloader.js index 0f51f56..226ab53 100644 --- a/util/downloader.js +++ b/util/downloader.js @@ -14,9 +14,12 @@ const logger = require("./logger.js"); /** * Extremely unstable world downloader + * @param {string} packetName Packet type * @param {object} packetData Packetdata from map_chunk */ -function mapChunkPacketHandler(packetData) { +function mapChunkPacketHandler(packetName, packetData) { + if (packetName != "map_chunk") + return; const serialized = JSON.stringify([ // Serialize the data we want to save Math.floor(Date.now() / 1000), packetData.x, diff --git a/util/queue.js b/util/queue.js index c76775e..6b3e302 100644 --- a/util/queue.js +++ b/util/queue.js @@ -18,10 +18,13 @@ let sentNotification = false; /** * Difficulty packet handler, checks whether or not we're in queue * (explanation: when rerouted by Velocity, the difficulty packet is always sent *after* the MC|Brand packet.) + * @param {string} packetName Packet type * @param {object} packetData `difficulty` packet data object * @param {object} conn McProxy conn object */ -function difficultyPacketHandler(packetData, conn) { +function difficultyPacketHandler(packetName, packetData, conn) { + if (packetName != "difficulty") + return; const inQueue = (conn.bot.game.serverBrand === "2b2t (Velocity)") && (conn.bot.game.dimension === "the_end") && (packetData.difficulty === 1); if (updateStatus("inQueue", inQueue) && inQueue === false && config.notify.whenJoining) { // Send notification when joining server notifier.sendToast("In Server!"); @@ -37,10 +40,13 @@ function difficultyPacketHandler(packetData, conn) { /** * Playerlist packet handler, checks position in queue + * @param {string} packetName Packet type * @param {object} packetData `playerlist_header` packet data object * @param {object} server Mineflayer server object */ -function playerlistHeaderPacketHandler(packetData, server) { +function playerlistHeaderPacketHandler(packetName, packetData, server) { + if (packetName != "playerlist_header") + return; // If no longer in queue, stop here if (status.inQueue === "false") { updateStatus("position", "In Server!"); From 1d4f35772e057fbb2fd7bd4945d372335d39b456 Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Fri, 22 Dec 2023 22:56:12 -0800 Subject: [PATCH 12/17] feat: experimental.syncGamestate for desyncs experimental.syncGamestate is an experimental flag that aggressively sends fake packets in an attempt to sync the client's game state. This is to help with clients getting desynced when they miss packets that only get sent once, either by connecting to the proxy after it has joined a game OR by logging in and out of the proxy. Relevant Issue: #85 Current features: 1. Fix invisible vehicles 2. Forcibly update experience bar 3. Fix undismountable vehicles TODO: (things to fix) - Sign data desync (blank signs) - Hunger - Empty Advancements - Empty Recipe book (from a cursory glance this appears to already be fixed upstream, not sure why this is broken) - Unre-mountable vehicles after reconnecting * Probably something to with metadata or dismounting. * Breaking boat and placing it down again fixed this --- docs/configuration-guide.md | 2 ++ proxy.js | 44 ++++++++++++++++++++++++++++++++----- util/schemas.js | 4 ++++ 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/docs/configuration-guide.md b/docs/configuration-guide.md index 488ac1d..10fa46a 100644 --- a/docs/configuration-guide.md +++ b/docs/configuration-guide.md @@ -112,6 +112,8 @@ - **[windowBits](#user-content-experimental-worlddownloader-compression-windowbits)** `{type: number}` `{default: 15}` : How much memory to allocate to the history buffer between 8 and 15. Higher values result in better compression ratio at the expense of memory usage - **[maxThreadpool](#user-content-experimental-maxthreadpool)** `{type: object}` - **[active](#user-content-experimental-maxthreadpool-active)** `{type: boolean}` `{default: true}` : Whether to set UV_THREADPOOL_SIZE to use all possible CPU logic cores + - **[syncGamestate](#user-content-experimental-syncgamestate)** `{type: object}` + - **[active](#user-content-experimental-syncgamestate-active)** `{type: boolean}` `{default: true}` : Send fake packets to attempt to sync gamestate **[waitForControllerBeforeConnect](#user-content-waitforcontrollerbeforeconnect)** `{type: boolean}` `{default: false}` : Whether the proxy will wait for someone to take control before it connects to the server diff --git a/proxy.js b/proxy.js index f2b58ab..5650b64 100644 --- a/proxy.js +++ b/proxy.js @@ -268,9 +268,10 @@ function createLocalServer() { // Stop Mineflayer stopMineflayer(); - // Spoof player_info (skin fix) - if (config.experimental.spoofPlayerInfo.active) { - conn.bot.waitForTicks(1).then(() => { + // Send fake packets + setTimeout(function(){ + // Spoof player_info (skin fix) + if (config.experimental.spoofPlayerInfo.active) { bridgeClient.write("player_info", { // Add spoofed player to tablist action: 0, data: [{ @@ -291,8 +292,41 @@ function createLocalServer() { properties: [] }] }); - }); - } + } + // Attempt to fix game state desyncs by sending fake packets to the client + if (config.experimental.syncGamestate.active) { + if (typeof conn.bot.experience !== "undefined") { + bridgeClient.write("experience", { + "experienceBar": conn.bot.experience.progress, + "totalExperience": conn.bot.experience.points, + "level": conn.bot.experience.level + }); + } + if (typeof conn.bot.vehicle !== "undefined") { + conn.bot.dismount(); + } + for (const entityIndex in conn.bot.entities) { + const ENTITY = conn.bot.entities[entityIndex]; + if (ENTITY.kind !== "Vehicles") + continue; + bridgeClient.write("spawn_entity", { + "entityId": ENTITY.id, + "objectUUID": ENTITY.uuid, + "type": ENTITY.entityType, + "x": ENTITY.position.x, + "y": ENTITY.position.y, + "z": ENTITY.position.z, + "pitch": 0, + "yaw": ENTITY.yaw, + "headPitch": ENTITY.pitch, + "objectData": ENTITY.metadata, + "velocityX": ENTITY.velocity.x, + "velocityY": ENTITY.velocity.y, + "velocityZ": ENTITY.velocity.z, + }); + } + } + }, 1000); // Log packets bridgeClient.on("packet", (packetData, packetMeta) => { diff --git a/util/schemas.js b/util/schemas.js index e86a03a..3b07e60 100644 --- a/util/schemas.js +++ b/util/schemas.js @@ -242,6 +242,10 @@ const configSchema = joi.object({ "active": joi.boolean().default(true) .description("Whether to set UV_THREADPOOL_SIZE to use all possible CPU logic cores") }).default(), + "syncGamestate": joi.object({ + "active": joi.boolean().default(true) + .description("Send fake packets to attempt to sync gamestate") + }).default(), }).default() .description("Settings for experimental features that may be more unstable in resource usage and/or server and version parity"), "waitForControllerBeforeConnect": joi.boolean().default(false) From 56021dda61b60bf0eea22625cbcff805b3c30ea3 Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:21:12 -0800 Subject: [PATCH 13/17] fix: Use mcproxy release instead of branch --- package.json | 3 +-- pnpm-lock.yaml | 32 +++++++++++++------------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 0e480e0..502ac60 100644 --- a/package.json +++ b/package.json @@ -18,11 +18,10 @@ "author": "Enchoseon", "license": "GPL-2.0", "dependencies": { - "@icetank/mcproxy": "github:IceTank/mcproxy#1-19", + "@icetank/mcproxy": "^1.0.6", "deepmerge": "^4.3.1", "joi": "^17.10.2", "json5": "^2.2.3", - "mcproxy#1-19": "link:@icetank/mcproxy#1-19", "minecraft-data": "^3.46.1", "minecraft-protocol": "^1.44.0", "mineflayer": "^4.14.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e2c4257..330ed72 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@icetank/mcproxy': - specifier: github:IceTank/mcproxy#1-19 - version: github.com/IceTank/mcproxy/6841d91dd7ac5c96552d89a960a5ba1258d017ff + specifier: ^1.0.6 + version: 1.0.6 deepmerge: specifier: ^4.3.1 version: 4.3.1 @@ -17,9 +17,6 @@ dependencies: json5: specifier: ^2.2.3 version: 2.2.3 - mcproxy#1-19: - specifier: link:@icetank/mcproxy#1-19 - version: link:@icetank/mcproxy#1-19 minecraft-data: specifier: ^3.46.1 version: 3.46.1 @@ -162,6 +159,17 @@ packages: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true + /@icetank/mcproxy@1.0.6: + resolution: {integrity: sha512-me3r03xdJfYMrFMBKPzqlGmP6c3vrl3M5FsPglF83UBY5mYFdPEBfoBWh0Bn/f7i9WmFdu6RW0Prtk6Vw4T6Iw==} + dependencies: + deepcopy: 2.1.0 + mineflayer: 4.14.0 + smart-buffer: 4.2.0 + transitivePeerDependencies: + - encoding + - supports-color + dev: false + /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -2013,17 +2021,3 @@ packages: mineflayer-auto-eat: 3.3.6 vec3: 0.1.8 dev: false - - github.com/IceTank/mcproxy/6841d91dd7ac5c96552d89a960a5ba1258d017ff: - resolution: {tarball: https://codeload.github.com/IceTank/mcproxy/tar.gz/6841d91dd7ac5c96552d89a960a5ba1258d017ff} - name: '@icetank/mcproxy' - version: 1.0.3 - requiresBuild: true - dependencies: - deepcopy: 2.1.0 - mineflayer: 4.14.0 - smart-buffer: 4.2.0 - transitivePeerDependencies: - - encoding - - supports-color - dev: false From 74147bcdfe09a84e59d01b6b8322451630f3c0b3 Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:22:20 -0800 Subject: [PATCH 14/17] chore: pnpm upgrade --- package.json | 16 +- pnpm-lock.yaml | 406 +++++++++++++++++++++++++------------------------ 2 files changed, 213 insertions(+), 209 deletions(-) diff --git a/package.json b/package.json index 502ac60..a796aa6 100644 --- a/package.json +++ b/package.json @@ -20,24 +20,24 @@ "dependencies": { "@icetank/mcproxy": "^1.0.6", "deepmerge": "^4.3.1", - "joi": "^17.10.2", + "joi": "^17.12.2", "json5": "^2.2.3", - "minecraft-data": "^3.46.1", - "minecraft-protocol": "^1.44.0", - "mineflayer": "^4.14.0", + "minecraft-data": "^3.62.0", + "minecraft-protocol": "^1.47.0", + "mineflayer": "^4.20.0", "mineflayer-antiafk": "github:Etiaro/mineflayer-antiafk", "mineflayer-auto-eat": "^3.3.6", "ngrok": "^4.3.3", "node-fetch": "^2.7.0", "node-notifier": "^10.0.1", - "prismarine-chat": "^1.9.1", + "prismarine-chat": "^1.10.0", "prismarine-provider-anvil": "^2.7.0", - "typescript": "^5.2.2" + "typescript": "^5.3.3" }, "devDependencies": { - "eslint": "^8.50.0", + "eslint": "^8.57.0", "eslint-plugin-jsdoc": "^39.9.1", - "mocha": "^10.2.0" + "mocha": "^10.3.0" }, "repository": { "type": "git", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 330ed72..654795a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,20 +12,20 @@ dependencies: specifier: ^4.3.1 version: 4.3.1 joi: - specifier: ^17.10.2 - version: 17.10.2 + specifier: ^17.12.2 + version: 17.12.2 json5: specifier: ^2.2.3 version: 2.2.3 minecraft-data: - specifier: ^3.46.1 - version: 3.46.1 + specifier: ^3.62.0 + version: 3.62.0 minecraft-protocol: - specifier: ^1.44.0 - version: 1.44.0 + specifier: ^1.47.0 + version: 1.47.0 mineflayer: - specifier: ^4.14.0 - version: 4.14.0 + specifier: ^4.20.0 + version: 4.20.0 mineflayer-antiafk: specifier: github:Etiaro/mineflayer-antiafk version: github.com/Etiaro/mineflayer-antiafk/41a08c7e71adb052baee4b739510b6f78987291b @@ -42,25 +42,25 @@ dependencies: specifier: ^10.0.1 version: 10.0.1 prismarine-chat: - specifier: ^1.9.1 - version: 1.9.1 + specifier: ^1.10.0 + version: 1.10.0 prismarine-provider-anvil: specifier: ^2.7.0 - version: 2.7.0(minecraft-data@3.46.1) + version: 2.7.0(minecraft-data@3.62.0) typescript: - specifier: ^5.2.2 - version: 5.2.2 + specifier: ^5.3.3 + version: 5.3.3 devDependencies: eslint: - specifier: ^8.50.0 - version: 8.50.0 + specifier: ^8.57.0 + version: 8.57.0 eslint-plugin-jsdoc: specifier: ^39.9.1 - version: 39.9.1(eslint@8.50.0) + version: 39.9.1(eslint@8.57.0) mocha: - specifier: ^10.2.0 - version: 10.2.0 + specifier: ^10.3.0 + version: 10.3.0 packages: @@ -69,16 +69,16 @@ packages: engines: {node: '>=0.10.0'} dev: true - /@azure/msal-common@14.0.3: - resolution: {integrity: sha512-Vl5SsC3zvQ8913GnO5Typox+35M6CaXmO/2FXi35LfMAV3ZB/HLCsldLxylI01c3CmtOm7pICWpOjp/DlQ9RWA==} + /@azure/msal-common@14.7.1: + resolution: {integrity: sha512-v96btzjM7KrAu4NSEdOkhQSTGOuNUIIsUdB8wlyB9cdgl5KqEKnTonHUZ8+khvZ6Ap542FCErbnTyDWl8lZ2rA==} engines: {node: '>=0.8.0'} dev: false - /@azure/msal-node@2.1.0: - resolution: {integrity: sha512-RiYnw8VdrFJrgTfHAfiAhRehIYN/H8vQ00DGVTYMOtlOkoEbZneK0qs8DV3p2WKVB5GN0cshVSI79N0fVlgbmg==} - engines: {node: 18 || 20} + /@azure/msal-node@2.6.4: + resolution: {integrity: sha512-nNvEPx009/80UATCToF+29NZYocn01uKrB91xtFr7bSqkqO1PuQGXRyYwryWRztUrYZ1YsSbw9A+LmwOhpVvcg==} + engines: {node: '>=16'} dependencies: - '@azure/msal-common': 14.0.3 + '@azure/msal-common': 14.7.1 jsonwebtoken: 9.0.2 uuid: 8.3.2 dev: false @@ -92,30 +92,30 @@ packages: jsdoc-type-pratt-parser: 3.1.0 dev: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.50.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.57.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.50.0 + eslint: 8.57.0 eslint-visitor-keys: 3.4.3 dev: true - /@eslint-community/regexpp@4.9.0: - resolution: {integrity: sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==} + /@eslint-community/regexpp@4.10.0: + resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} dev: true - /@eslint/eslintrc@2.1.2: - resolution: {integrity: sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==} + /@eslint/eslintrc@2.1.4: + resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 debug: 4.3.4(supports-color@8.1.1) espree: 9.6.1 - globals: 13.22.0 - ignore: 5.2.4 + globals: 13.24.0 + ignore: 5.3.1 import-fresh: 3.3.0 js-yaml: 4.1.0 minimatch: 3.1.2 @@ -124,8 +124,8 @@ packages: - supports-color dev: true - /@eslint/js@8.50.0: - resolution: {integrity: sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==} + /@eslint/js@8.57.0: + resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true @@ -139,11 +139,11 @@ packages: '@hapi/hoek': 9.3.0 dev: false - /@humanwhocodes/config-array@0.11.11: - resolution: {integrity: sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==} + /@humanwhocodes/config-array@0.11.14: + resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} engines: {node: '>=10.10.0'} dependencies: - '@humanwhocodes/object-schema': 1.2.1 + '@humanwhocodes/object-schema': 2.0.2 debug: 4.3.4(supports-color@8.1.1) minimatch: 3.1.2 transitivePeerDependencies: @@ -155,15 +155,15 @@ packages: engines: {node: '>=12.22'} dev: true - /@humanwhocodes/object-schema@1.2.1: - resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} + /@humanwhocodes/object-schema@2.0.2: + resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==} dev: true /@icetank/mcproxy@1.0.6: resolution: {integrity: sha512-me3r03xdJfYMrFMBKPzqlGmP6c3vrl3M5FsPglF83UBY5mYFdPEBfoBWh0Bn/f7i9WmFdu6RW0Prtk6Vw4T6Iw==} dependencies: deepcopy: 2.1.0 - mineflayer: 4.14.0 + mineflayer: 4.20.0 smart-buffer: 4.2.0 transitivePeerDependencies: - encoding @@ -188,11 +188,11 @@ packages: engines: {node: '>= 8'} dependencies: '@nodelib/fs.scandir': 2.1.5 - fastq: 1.15.0 + fastq: 1.17.1 dev: true - /@sideway/address@4.1.4: - resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==} + /@sideway/address@4.1.5: + resolution: {integrity: sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==} dependencies: '@hapi/hoek': 9.3.0 dev: false @@ -220,14 +220,14 @@ packages: /@types/cacheable-request@6.0.3: resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==} dependencies: - '@types/http-cache-semantics': 4.0.2 + '@types/http-cache-semantics': 4.0.4 '@types/keyv': 3.1.4 '@types/node': 8.10.66 - '@types/responselike': 1.0.1 + '@types/responselike': 1.0.3 dev: false - /@types/http-cache-semantics@4.0.2: - resolution: {integrity: sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw==} + /@types/http-cache-semantics@4.0.4: + resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==} dev: false /@types/keyv@3.1.4: @@ -236,35 +236,41 @@ packages: '@types/node': 8.10.66 dev: false - /@types/node@20.8.0: - resolution: {integrity: sha512-LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ==} + /@types/node@20.11.24: + resolution: {integrity: sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==} + dependencies: + undici-types: 5.26.5 dev: false /@types/node@8.10.66: resolution: {integrity: sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==} dev: false - /@types/readable-stream@4.0.3: - resolution: {integrity: sha512-Z8BOzyIj3UPpn3j5DmDNKIw4wPN9N8a1d1oyteiprWq+wxdgQNC0UfFAQwWjmjyA7uoj7mvoWgxWWH66zYtm4Q==} + /@types/readable-stream@4.0.10: + resolution: {integrity: sha512-AbUKBjcC8SHmImNi4yK2bbjogQlkFSg7shZCcicxPQapniOlajG8GCc39lvXzCWX4lLRRs7DM3VAeSlqmEVZUA==} dependencies: - '@types/node': 20.8.0 + '@types/node': 20.11.24 safe-buffer: 5.1.2 dev: false - /@types/responselike@1.0.1: - resolution: {integrity: sha512-TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg==} + /@types/responselike@1.0.3: + resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} dependencies: '@types/node': 8.10.66 dev: false - /@types/yauzl@2.10.1: - resolution: {integrity: sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==} + /@types/yauzl@2.10.3: + resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==} requiresBuild: true dependencies: '@types/node': 8.10.66 dev: false optional: true + /@ungap/structured-clone@1.2.0: + resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} + dev: true + /@xboxreplay/errors@0.1.0: resolution: {integrity: sha512-Tgz1d/OIPDWPeyOvuL5+aai5VCcqObhPnlI3skQuf80GVF3k1I0lPCnGC+8Cm5PV9aLBT5m8qPcJoIUQ2U4y9g==} dev: false @@ -285,16 +291,16 @@ packages: event-target-shim: 5.0.1 dev: false - /acorn-jsx@5.3.2(acorn@8.10.0): + /acorn-jsx@5.3.2(acorn@8.11.3): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 8.10.0 + acorn: 8.11.3 dev: true - /acorn@8.10.0: - resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} + /acorn@8.11.3: + resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} engines: {node: '>=0.4.0'} hasBin: true dev: true @@ -347,7 +353,7 @@ packages: /axios@0.21.4(debug@4.3.4): resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.3(debug@4.3.4) + follow-redirects: 1.15.5(debug@4.3.4) transitivePeerDependencies: - debug dev: false @@ -421,7 +427,7 @@ packages: clone-response: 1.0.3 get-stream: 5.2.0 http-cache-semantics: 4.1.1 - keyv: 4.5.3 + keyv: 4.5.4 lowercase-keys: 2.0.0 normalize-url: 6.1.0 responselike: 2.0.1 @@ -587,8 +593,8 @@ packages: resolution: {integrity: sha512-ShfqhXeHRE4TmggSlHXG8CMGIcsOsqDw/GcoPcosToE59Rm9e4aXaMhEQf2kPBsBRrKem1bbOAv5gOKnkliMFQ==} dev: false - /escalade@3.1.1: - resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} + /escalade@3.1.2: + resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} engines: {node: '>=6'} dev: true @@ -597,7 +603,7 @@ packages: engines: {node: '>=10'} dev: true - /eslint-plugin-jsdoc@39.9.1(eslint@8.50.0): + /eslint-plugin-jsdoc@39.9.1(eslint@8.57.0): resolution: {integrity: sha512-Rq2QY6BZP2meNIs48aZ3GlIlJgBqFCmR55+UBvaDkA3ZNQ0SvQXOs2QKkubakEijV8UbIVbVZKsOVN8G3MuqZw==} engines: {node: ^14 || ^16 || ^17 || ^18 || ^19} peerDependencies: @@ -607,9 +613,9 @@ packages: comment-parser: 1.3.1 debug: 4.3.4(supports-color@8.1.1) escape-string-regexp: 4.0.0 - eslint: 8.50.0 + eslint: 8.57.0 esquery: 1.5.0 - semver: 7.5.4 + semver: 7.6.0 spdx-expression-parse: 3.0.1 transitivePeerDependencies: - supports-color @@ -628,18 +634,19 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.50.0: - resolution: {integrity: sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==} + /eslint@8.57.0: + resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0) - '@eslint-community/regexpp': 4.9.0 - '@eslint/eslintrc': 2.1.2 - '@eslint/js': 8.50.0 - '@humanwhocodes/config-array': 0.11.11 + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + '@eslint-community/regexpp': 4.10.0 + '@eslint/eslintrc': 2.1.4 + '@eslint/js': 8.57.0 + '@humanwhocodes/config-array': 0.11.14 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 + '@ungap/structured-clone': 1.2.0 ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 @@ -655,9 +662,9 @@ packages: file-entry-cache: 6.0.1 find-up: 5.0.0 glob-parent: 6.0.2 - globals: 13.22.0 + globals: 13.24.0 graphemer: 1.4.0 - ignore: 5.2.4 + ignore: 5.3.1 imurmurhash: 0.1.4 is-glob: 4.0.3 is-path-inside: 3.0.3 @@ -678,8 +685,8 @@ packages: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.10.0 - acorn-jsx: 5.3.2(acorn@8.10.0) + acorn: 8.11.3 + acorn-jsx: 5.3.2(acorn@8.11.3) eslint-visitor-keys: 3.4.3 dev: true @@ -726,7 +733,7 @@ packages: get-stream: 5.2.0 yauzl: 2.10.0 optionalDependencies: - '@types/yauzl': 2.10.1 + '@types/yauzl': 2.10.3 transitivePeerDependencies: - supports-color dev: false @@ -741,8 +748,8 @@ packages: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} dev: true - /fastq@1.15.0: - resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} + /fastq@1.17.1: + resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} dependencies: reusify: 1.0.4 dev: true @@ -757,7 +764,7 @@ packages: resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} engines: {node: ^10.12.0 || >=12.0.0} dependencies: - flat-cache: 3.1.0 + flat-cache: 3.2.0 dev: true /fill-range@7.0.1: @@ -775,12 +782,12 @@ packages: path-exists: 4.0.0 dev: true - /flat-cache@3.1.0: - resolution: {integrity: sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==} - engines: {node: '>=12.0.0'} + /flat-cache@3.2.0: + resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} + engines: {node: ^10.12.0 || >=12.0.0} dependencies: - flatted: 3.2.9 - keyv: 4.5.3 + flatted: 3.3.1 + keyv: 4.5.4 rimraf: 3.0.2 dev: true @@ -789,12 +796,12 @@ packages: hasBin: true dev: true - /flatted@3.2.9: - resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} + /flatted@3.3.1: + resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true - /follow-redirects@1.15.3(debug@4.3.4): - resolution: {integrity: sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==} + /follow-redirects@1.15.5(debug@4.3.4): + resolution: {integrity: sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==} engines: {node: '>=4.0'} peerDependencies: debug: '*' @@ -843,8 +850,8 @@ packages: is-glob: 4.0.3 dev: true - /glob@7.2.0: - resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==} + /glob@7.2.3: + resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 @@ -854,19 +861,19 @@ packages: path-is-absolute: 1.0.1 dev: true - /glob@7.2.3: - resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} + /glob@8.1.0: + resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} + engines: {node: '>=12'} dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.1.2 + minimatch: 5.0.1 once: 1.4.0 - path-is-absolute: 1.0.1 dev: true - /globals@13.22.0: - resolution: {integrity: sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==} + /globals@13.24.0: + resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==} engines: {node: '>=8'} dependencies: type-fest: 0.20.2 @@ -879,7 +886,7 @@ packages: '@sindresorhus/is': 4.6.0 '@szmarczak/http-timer': 4.0.6 '@types/cacheable-request': 6.0.3 - '@types/responselike': 1.0.1 + '@types/responselike': 1.0.3 cacheable-lookup: 5.0.4 cacheable-request: 7.0.4 decompress-response: 6.0.0 @@ -928,8 +935,8 @@ packages: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} dev: false - /ignore@5.2.4: - resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} + /ignore@5.3.1: + resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} engines: {node: '>= 4'} dev: true @@ -1016,18 +1023,18 @@ packages: /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - /joi@17.10.2: - resolution: {integrity: sha512-hcVhjBxRNW/is3nNLdGLIjkgXetkeGc2wyhydhz8KumG23Aerk4HPjU5zaPAMRqXQFc0xNqXTC7+zQjxr0GlKA==} + /joi@17.12.2: + resolution: {integrity: sha512-RonXAIzCiHLc8ss3Ibuz45u28GOsWE1UpfDXLbN/9NKbL4tCJf8TWYVKsoYuuh+sAUt7fsSNpA+r2+TBA6Wjmw==} dependencies: '@hapi/hoek': 9.3.0 '@hapi/topo': 5.1.0 - '@sideway/address': 4.1.4 + '@sideway/address': 4.1.5 '@sideway/formula': 3.0.1 '@sideway/pinpoint': 2.0.0 dev: false - /jose@4.14.6: - resolution: {integrity: sha512-EqJPEUlZD0/CSUMubKtMaYUOtWe91tZXTWMJZoKSbLk+KtdhNdcvppH8lA9XwVu2V4Ailvsj0GBZJ2ZwDjfesQ==} + /jose@4.15.4: + resolution: {integrity: sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==} dev: false /js-yaml@4.1.0: @@ -1071,7 +1078,7 @@ packages: lodash.isstring: 4.0.1 lodash.once: 4.1.1 ms: 2.1.3 - semver: 7.5.4 + semver: 7.6.0 dev: false /jwa@1.4.1: @@ -1089,8 +1096,8 @@ packages: safe-buffer: 5.2.1 dev: false - /keyv@4.5.3: - resolution: {integrity: sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==} + /keyv@4.5.4: + resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} dependencies: json-buffer: 3.0.1 @@ -1185,34 +1192,35 @@ packages: engines: {node: '>=10'} dev: false - /minecraft-data@3.46.1: - resolution: {integrity: sha512-asIlURpAfAN1k7H9Ffkas8SrPhwYrQqp52ZECZPgnChcksjeWcDnRz6HLehns1O5TyPo2SBGvjIYztanKQpy7g==} + /minecraft-data@3.62.0: + resolution: {integrity: sha512-jJXZ/WgyX79tIHlqvfyqG+sJDUekHiA3e9NRUCMGUno4NDrZMcpRI065DnkrI720RHTMb8iadf0NmnBP4Rla5A==} dev: false /minecraft-folder-path@1.2.0: resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==} dev: false - /minecraft-protocol@1.44.0: - resolution: {integrity: sha512-sYu4fFzUKt3spPG5tAdkaB9sNQPT0sV6fyS0sS7/nxdzFfjmLhF6BLNC+32ieK4/MhgNyHtH6xusD0Bi0Roq9w==} + /minecraft-protocol@1.47.0: + resolution: {integrity: sha512-IHL8faXLLIWv1O+2v2NgyKlooilu/OiSL9orI8Kqed/rZvVOrFPzs2PwMAYjpQX9gxLPhiSU19KqZ8CjfNuqhg==} engines: {node: '>=14'} dependencies: - '@types/readable-stream': 4.0.3 + '@types/readable-stream': 4.0.10 aes-js: 3.1.2 buffer-equal: 1.0.1 debug: 4.3.4(supports-color@8.1.1) endian-toggle: 0.0.0 lodash.get: 4.4.2 lodash.merge: 4.6.2 - minecraft-data: 3.46.1 + minecraft-data: 3.62.0 minecraft-folder-path: 1.2.0 node-fetch: 2.7.0 node-rsa: 0.4.2 - prismarine-auth: 2.3.0 - prismarine-nbt: 2.2.1 + prismarine-auth: 2.4.1 + prismarine-chat: 1.10.0 + prismarine-nbt: 2.5.0 prismarine-realms: 1.3.2 protodef: 1.15.0 - readable-stream: 4.4.2 + readable-stream: 4.5.2 uuid-1345: 1.0.2 yggdrasil: 1.7.0 transitivePeerDependencies: @@ -1224,27 +1232,27 @@ packages: resolution: {integrity: sha512-CgtIboWu5xB7bWmPTtU66TgfPoKdyOmtgFBEQZ1RoEwednX/cVBTZmMTMpG8PLOPPbfb4wBi1Qd7A0qmkd0SFA==} dev: false - /mineflayer@4.14.0: - resolution: {integrity: sha512-4EYzUmZNxH3Gpz3GkgO2eaR90ANb50nVhMCU2y6Rl1Ru8M6HqxID1Eg7tRgsodfAOD+AKh5SPwmPnISLcxvnOA==} - engines: {node: '>=14'} + /mineflayer@4.20.0: + resolution: {integrity: sha512-X2cRjbPnAXFlz+byXs3yIFiGTCkB1v4Ei+BhMurfmVy16Wvz9wC1Wd/e+QAex6KOJ8BIPu7JIoq+47VyFmcrDA==} + engines: {node: '>=18'} dependencies: - minecraft-data: 3.46.1 - minecraft-protocol: 1.44.0 - prismarine-biome: 1.3.0(minecraft-data@3.46.1)(prismarine-registry@1.7.0) + minecraft-data: 3.62.0 + minecraft-protocol: 1.47.0 + prismarine-biome: 1.3.0(minecraft-data@3.62.0)(prismarine-registry@1.7.0) prismarine-block: 1.17.1 - prismarine-chat: 1.9.1 - prismarine-chunk: 1.35.0(minecraft-data@3.46.1) - prismarine-entity: 2.3.1 + prismarine-chat: 1.10.0 + prismarine-chunk: 1.35.0(minecraft-data@3.62.0) + prismarine-entity: 2.4.0 prismarine-item: 1.14.0 - prismarine-nbt: 2.2.1 + prismarine-nbt: 2.5.0 prismarine-physics: 1.8.0 prismarine-recipe: 1.3.1(prismarine-registry@1.7.0) prismarine-registry: 1.7.0 - prismarine-windows: 2.8.0 - prismarine-world: 3.6.2 + prismarine-windows: 2.9.0 + prismarine-world: 3.6.3 protodef: 1.15.0 typed-emitter: 1.4.0 - vec3: 0.1.8 + vec3: 0.1.10 transitivePeerDependencies: - encoding - supports-color @@ -1263,8 +1271,8 @@ packages: brace-expansion: 2.0.1 dev: true - /mocha@10.2.0: - resolution: {integrity: sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==} + /mocha@10.3.0: + resolution: {integrity: sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg==} engines: {node: '>= 14.0.0'} hasBin: true dependencies: @@ -1275,13 +1283,12 @@ packages: diff: 5.0.0 escape-string-regexp: 4.0.0 find-up: 5.0.0 - glob: 7.2.0 + glob: 8.1.0 he: 1.2.0 js-yaml: 4.1.0 log-symbols: 4.1.0 minimatch: 5.0.1 ms: 2.1.3 - nanoid: 3.3.3 serialize-javascript: 6.0.0 strip-json-comments: 3.1.1 supports-color: 8.1.1 @@ -1307,12 +1314,6 @@ packages: /ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - /nanoid@3.3.3: - resolution: {integrity: sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - dev: true - /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true @@ -1362,7 +1363,7 @@ packages: dependencies: growly: 1.3.0 is-wsl: 2.2.0 - semver: 7.5.4 + semver: 7.6.0 shellwords: 0.1.1 uuid: 8.3.2 which: 2.0.2 @@ -1456,13 +1457,13 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prismarine-auth@2.3.0: - resolution: {integrity: sha512-giKZiHwuQdpMJ7KX94UncOJqM3u+yqKIR2UI/rqmdmFUuQilV9vhlz/zehpVkvo7FE8gmZsuUMCUPhI+gtgd3A==} + /prismarine-auth@2.4.1: + resolution: {integrity: sha512-DwDI3Ucxf/eThJJo5QVzlywFrJulL1fK1z6F8bybvddim8YgudRksQc3w4cE2m0hPPHfE1BRd5lh1NpedrixMQ==} dependencies: - '@azure/msal-node': 2.1.0 + '@azure/msal-node': 2.6.4 '@xboxreplay/xboxlive-auth': 3.3.3(debug@4.3.4) debug: 4.3.4(supports-color@8.1.1) - jose: 4.14.6 + jose: 4.15.4 node-fetch: 2.7.0 smart-buffer: 4.2.0 uuid-1345: 1.0.2 @@ -1471,70 +1472,69 @@ packages: - supports-color dev: false - /prismarine-biome@1.3.0(minecraft-data@3.46.1)(prismarine-registry@1.7.0): + /prismarine-biome@1.3.0(minecraft-data@3.62.0)(prismarine-registry@1.7.0): resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==} peerDependencies: minecraft-data: ^3.0.0 prismarine-registry: ^1.1.0 dependencies: - minecraft-data: 3.46.1 + minecraft-data: 3.62.0 prismarine-registry: 1.7.0 dev: false /prismarine-block@1.17.1: resolution: {integrity: sha512-r1TIn/b5v77BX4a+qd+Yv+4/vZpsC/Jp5ElYxd6++2wpCnqiuxVG7BlS2Eo14vez1M2gt3qoNEl54Hr8qox/rQ==} dependencies: - minecraft-data: 3.46.1 - prismarine-biome: 1.3.0(minecraft-data@3.46.1)(prismarine-registry@1.7.0) - prismarine-chat: 1.9.1 + minecraft-data: 3.62.0 + prismarine-biome: 1.3.0(minecraft-data@3.62.0)(prismarine-registry@1.7.0) + prismarine-chat: 1.10.0 prismarine-item: 1.14.0 - prismarine-nbt: 2.2.1 + prismarine-nbt: 2.5.0 prismarine-registry: 1.7.0 dev: false - /prismarine-chat@1.9.1: - resolution: {integrity: sha512-x7WWa5MNhiLZSO6tw+YyKpzquFZ+DNISVgiV6K3SU0GsishMXe+nto02WhF/4AuFerKdugm9u1d/r4C4zSkJOg==} + /prismarine-chat@1.10.0: + resolution: {integrity: sha512-f9ESzi2Kkf4GJadtgBl+SmvtAlmOXaso6Fxt4M/vUXDKgQNSk66APmIHnBkKWyjzG9X2VXsbDGeIIPf/d3guxA==} dependencies: mojangson: 2.0.4 - prismarine-item: 1.14.0 - prismarine-nbt: 2.2.1 + prismarine-nbt: 2.5.0 prismarine-registry: 1.7.0 dev: false - /prismarine-chunk@1.35.0(minecraft-data@3.46.1): + /prismarine-chunk@1.35.0(minecraft-data@3.62.0): resolution: {integrity: sha512-Q1lElMUle7wWxWdQjbZo3j2/dLNG325j90IcbbMmBTnHdQSWIjWFe792XOz3RVBlvrhRJEiZk38S6/eQTQ9esw==} engines: {node: '>=14'} dependencies: - prismarine-biome: 1.3.0(minecraft-data@3.46.1)(prismarine-registry@1.7.0) + prismarine-biome: 1.3.0(minecraft-data@3.62.0)(prismarine-registry@1.7.0) prismarine-block: 1.17.1 - prismarine-nbt: 2.2.1 + prismarine-nbt: 2.5.0 prismarine-registry: 1.7.0 smart-buffer: 4.2.0 uint4: 0.1.2 - vec3: 0.1.8 + vec3: 0.1.10 xxhash-wasm: 0.4.2 transitivePeerDependencies: - minecraft-data dev: false - /prismarine-entity@2.3.1: - resolution: {integrity: sha512-HOv8l7IetHNf4hwZ7V/W4vM3GNl+e6VCtKDkH9h02TRq7jWngsggKtJV+VanCce/sNwtJUhJDjORGs728ep4MA==} + /prismarine-entity@2.4.0: + resolution: {integrity: sha512-DBwjmoCX1IYAhN99KwYkk2rMArn65JHTzuuGXchr4GLWQs7UN4Pf9tELqBwNOu4r57x3RaW0+9+0sI3FvJQWzQ==} dependencies: - prismarine-chat: 1.9.1 + prismarine-chat: 1.10.0 prismarine-item: 1.14.0 prismarine-registry: 1.7.0 - vec3: 0.1.8 + vec3: 0.1.10 dev: false /prismarine-item@1.14.0: resolution: {integrity: sha512-udQHYGJ05klFe8Kkc0TOmwoXj5Xl1ZPgHVoMbGUAFB9exN4TFxEa1A39vkSYhxP5Et9PNufQQvFBFVom0nXikA==} dependencies: - prismarine-nbt: 2.2.1 + prismarine-nbt: 2.5.0 prismarine-registry: 1.7.0 dev: false - /prismarine-nbt@2.2.1: - resolution: {integrity: sha512-Mb50c58CPnuZ+qvM31DBa08tf9UumlTq1LkvpMoUpKfCuN05GZHTqCUwER3lxTSHLL0GZKghIPbYR/JQkINijQ==} + /prismarine-nbt@2.5.0: + resolution: {integrity: sha512-F0/8UAa9SDDnAGrBYqZc4nG8h2zj5cE2eAJU5xlDR/IsQQ3moVxkOjE3h3nMv6SbvZrvAcgX7waA/nd9LLHYdA==} dependencies: protodef: 1.15.0 dev: false @@ -1542,18 +1542,18 @@ packages: /prismarine-physics@1.8.0: resolution: {integrity: sha512-gbM+S+bmVtOKVv+Z0WGaHMeEeBHISIDsRDRlv8sr0dex3ZJRhuq8djA02CBreguXtI18ZKh6q3TSj2qDr45NHA==} dependencies: - minecraft-data: 3.46.1 - prismarine-nbt: 2.2.1 - vec3: 0.1.8 + minecraft-data: 3.62.0 + prismarine-nbt: 2.5.0 + vec3: 0.1.10 dev: false - /prismarine-provider-anvil@2.7.0(minecraft-data@3.46.1): + /prismarine-provider-anvil@2.7.0(minecraft-data@3.62.0): resolution: {integrity: sha512-a4NfihRfy+PeKpiWp2CJxTUPMhSROXb7JzA44nfRXqHPDnK4ilC2+MBNeZyi5Wj5OuYRbSd8ZS44YkQMoFR9aQ==} dependencies: - prismarine-chunk: 1.35.0(minecraft-data@3.46.1) - prismarine-nbt: 2.2.1 + prismarine-chunk: 1.35.0(minecraft-data@3.62.0) + prismarine-nbt: 2.5.0 uint4: 0.1.2 - vec3: 0.1.8 + vec3: 0.1.10 transitivePeerDependencies: - minecraft-data dev: false @@ -1579,23 +1579,23 @@ packages: /prismarine-registry@1.7.0: resolution: {integrity: sha512-yyva0FpWI078nNeMhx8ekVza5uUTYhEv+C+ADu3wUQXiG8qhXkvrf0uzsnhTgZL8BLdsi2axgCEiKw9qSKIuxQ==} dependencies: - minecraft-data: 3.46.1 - prismarine-nbt: 2.2.1 + minecraft-data: 3.62.0 + prismarine-nbt: 2.5.0 dev: false - /prismarine-windows@2.8.0: - resolution: {integrity: sha512-9HVhJ8tfCeRubYwQzgz8oiHNAebMJ5hDdjm45PZwrOgewaislnR2HDsbPMWiCcyWkYL7J8bVLVoSzEzv5pH98g==} + /prismarine-windows@2.9.0: + resolution: {integrity: sha512-fm4kOLjGFPov7TEJRmXHoiPabxIQrG36r2mDjlNxfkcLfMHFb3/1ML6mp4iRQa7wL0GK4DIAyiBqCWoeWDxARg==} dependencies: prismarine-item: 1.14.0 prismarine-registry: 1.7.0 typed-emitter: 2.1.0 dev: false - /prismarine-world@3.6.2: - resolution: {integrity: sha512-xNNo3bd8EnCMjiPbVrh3jYa1Upa8Krkb13BgO7FOOfD5ZYf+iYDZewBtDbHYWzZZB2N0JlTtimMOHRhZhDJirw==} + /prismarine-world@3.6.3: + resolution: {integrity: sha512-zqdqPEYCDHzqi6hglJldEO63bOROXpbZeIdxBmoQq7o04Lf81t016LU6stFHo3E+bmp5+xU74eDFdOvzYNABkA==} engines: {node: '>=8.0.0'} dependencies: - vec3: 0.1.8 + vec3: 0.1.10 dev: false /process@0.11.10: @@ -1627,8 +1627,8 @@ packages: once: 1.4.0 dev: false - /punycode@2.3.0: - resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} + /punycode@2.3.1: + resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} /queue-microtask@1.2.3: @@ -1667,8 +1667,8 @@ packages: util-deprecate: 1.0.2 dev: false - /readable-stream@4.4.2: - resolution: {integrity: sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==} + /readable-stream@4.5.2: + resolution: {integrity: sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: abort-controller: 3.0.0 @@ -1743,8 +1743,8 @@ packages: /safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} - /semver@7.5.4: - resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} + /semver@7.6.0: + resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} engines: {node: '>=10'} hasBin: true dependencies: @@ -1777,19 +1777,19 @@ packages: engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} dev: false - /spdx-exceptions@2.3.0: - resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==} + /spdx-exceptions@2.5.0: + resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==} dev: true /spdx-expression-parse@3.0.1: resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} dependencies: - spdx-exceptions: 2.3.0 - spdx-license-ids: 3.0.15 + spdx-exceptions: 2.5.0 + spdx-license-ids: 3.0.17 dev: true - /spdx-license-ids@3.0.15: - resolution: {integrity: sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ==} + /spdx-license-ids@3.0.17: + resolution: {integrity: sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==} dev: true /string-width@4.2.3: @@ -1879,8 +1879,8 @@ packages: rxjs: 7.8.1 dev: false - /typescript@5.2.2: - resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} + /typescript@5.3.3: + resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} engines: {node: '>=14.17'} hasBin: true dev: false @@ -1889,10 +1889,14 @@ packages: resolution: {integrity: sha512-lhEx78gdTwFWG+mt6cWAZD/R6qrIj0TTBeH5xwyuDJyswLNlGe+KVlUPQ6+mx5Ld332pS0AMUTo9hIly7YsWxQ==} dev: false + /undici-types@5.26.5: + resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + dev: false + /uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: - punycode: 2.3.0 + punycode: 2.3.1 /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -1909,8 +1913,8 @@ packages: hasBin: true dev: false - /vec3@0.1.8: - resolution: {integrity: sha512-LfKrP625Bsg/Tj52YdYPsHmpsJuo+tc6fLxZxXjEo9k2xSspKlPvoYTHehykKhp1FvV9nm+XU3Ehej5/9tpDCg==} + /vec3@0.1.10: + resolution: {integrity: sha512-Sr1U3mYtMqCOonGd3LAN9iqy0qF6C+Gjil92awyK/i2OwiUo9bm7PnLgFpafymun50mOjnDcg4ToTgRssrlTcw==} dev: false /webidl-conversions@3.0.1: @@ -1984,7 +1988,7 @@ packages: engines: {node: '>=10'} dependencies: cliui: 7.0.4 - escalade: 3.1.1 + escalade: 3.1.2 get-caller-file: 2.0.5 require-directory: 2.1.1 string-width: 4.2.3 @@ -2019,5 +2023,5 @@ packages: version: 1.1.1 dependencies: mineflayer-auto-eat: 3.3.6 - vec3: 0.1.8 + vec3: 0.1.10 dev: false From 4132a4dfe3803f6ac79bf1b91f8922df93b54dff Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:41:07 -0800 Subject: [PATCH 15/17] fix: Tests - Fixed a broken test by removing it (test best way to fix tests) --- test/test.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/test/test.js b/test/test.js index f9f9325..82d005f 100644 --- a/test/test.js +++ b/test/test.js @@ -55,7 +55,7 @@ describe("2Bored2Wait Testing", () => { // ============== /** - * Send packets that'll test a couple aspects of the proxy. This is not version agnostic and only works for 1.12.2. + * Send packets that'll test a couple aspects of the proxy. This is not version agnostic is based on packets I got connecting through 1.19.4 * @returns {Promise} Promise object representing success of server login code */ function waitForLogin() { @@ -80,12 +80,16 @@ function waitForLogin() { "levelType": "default", "reducedDebugInfo": false }); - client.write("custom_payload", { - "channel": "MC|Brand", - "data": Buffer.from("2b2t (Velocity)", "utf8") - }); + // client.write("custom_payload", { + // "channel": "minecraft:brand", + // "data": { + // "type": "Buffer", + // "data": [15,50,98,50,116,32,40,86,101,108,111,99,105,116,121,41] + // } + // }); client.write("difficulty", { - "difficulty": 1 + "difficulty": 1, + "difficultyLocked": false }); // ============ // Chat Message @@ -108,4 +112,4 @@ function waitForLogin() { resolve(client.username); }); }); -} \ No newline at end of file +} From 1b258b5deab196d94265053736c5df027a6b864a Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:45:55 -0800 Subject: [PATCH 16/17] fix: autoInstallPeers -> false Attempt to fix CI failing --- .npmrc | 1 + pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..f301fed --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +auto-install-peers=false diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 654795a..d4865f1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,7 +1,7 @@ lockfileVersion: '6.0' settings: - autoInstallPeers: true + autoInstallPeers: false excludeLinksFromLockfile: false dependencies: From 26f283a2d65fc31c829c38fb403ae4291306cdb6 Mon Sep 17 00:00:00 2001 From: Enchoseon <38841444+Enchoseon@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:47:46 -0800 Subject: [PATCH 17/17] bump: CI node version 16 -> 18 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9e7c98..d33d746 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - name: Install Node.js uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - uses: pnpm/action-setup@v2 name: Install pnpm @@ -45,4 +45,4 @@ jobs: run: pnpm install - name: Run test - run: pnpm run test \ No newline at end of file + run: pnpm run test