good release (#216)

CONTRIBUTING.md

@@ -169,6 +169,16 @@ New React components, improve UI (including mobile support).
 3. Develop, try to fix and test. Finally we should find a way to fix it. It's ideal to have an automatic test but it's not necessary for now
 3. Repeat step 1 to make sure the task is done and the problem is fixed (or the feature is implemented)
 
+## Updating Dependencies
+
+1. Ensure mineflayer fork is up to date with the latest version of mineflayer original repo
+2. Update PrismarineJS dependencies to the latest version: `minecraft-data` (be sure to replace the version twice in the package.json), `mineflayer`, `minecraft-protocol`, `prismarine-block`, `prismarine-chunk`, `prismarine-item`, ...
+3. If `minecraft-protocol` patch fails, do this:
+     1. Remove the patch from `patchedDependencies` in `package.json`
+     2. Run `pnpm patch minecraft-protocol`, open patch directory
+     3. Apply the patch manually in this directory: `patch -p1 < minecraft-protocol@<version>.patch`
+     4. Run the suggested command from `pnpm patch ...` (previous step) to update the patch
+
 ### Would be useful to have
 
 - cleanup folder & modules structure, cleanup playground code

package.json

@@ -67,12 +67,12 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.41",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.44",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
-    "minecraft-data": "3.65.0",
+    "minecraft-data": "3.76.0",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -172,20 +172,21 @@
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
-      "minecraft-data": "3.65.0",
+      "minecraft-data": "3.76.0",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
       "react": "^18.2.0",
-      "prismarine-chunk": "github:zardoy/prismarine-chunk"
+      "prismarine-chunk": "github:zardoy/prismarine-chunk",
+      "prismarine-item": "latest"
     },
     "updateConfig": {
       "ignoreDependencies": []
     },
     "patchedDependencies": {
-      "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
-      "[email protected]": "patches/[email protected]"
+      "[email protected]": "patches/[email protected]",
+      "[email protected]": "patches/[email protected]"
     }
   },
   "packageManager": "[email protected]"

patches/minecraft-protocol@1.47.0.patch → patches/minecraft-protocol@1.49.0.patch

@@ -12,13 +12,71 @@ index c437ecf3a0e4ab5758a48538c714b7e9651bb5da..d9c9895ae8614550aa09ad60a396ac32
      debug('ping response', response)
      // TODO: could also use ping pre-connect to save description, type, max players, etc.
 @@ -40,6 +40,7 @@ module.exports = function (client, options) {
-
+ 
      // Reinitialize client object with new version TODO: move out of its constructor?
      client.version = minecraftVersion
 +    await options.versionSelectedHook?.(client)
      client.state = states.HANDSHAKING
-
+ 
      // Let other plugins such as Forge/FML (modinfo) respond to the ping response
+diff --git a/src/client/chat.js b/src/client/chat.js
+index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aae0d1d337 100644
+--- a/src/client/chat.js
++++ b/src/client/chat.js
+@@ -111,7 +111,7 @@ module.exports = function (client, options) {
+         for (const player of packet.data) {
+           if (!player.chatSession) continue
+           client._players[player.UUID] = {
+-            publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
++            // publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
+             publicKeyDER: player.chatSession.publicKey.keyBytes,
+             sessionUuid: player.chatSession.uuid
+           }
+@@ -127,7 +127,7 @@ module.exports = function (client, options) {
+       for (const player of packet.data) {
+         if (player.crypto) {
+           client._players[player.UUID] = {
+-            publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
++            // publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
+             publicKeyDER: player.crypto.publicKey,
+             signature: player.crypto.signature,
+             displayName: player.displayName || player.name
+@@ -198,7 +198,7 @@ module.exports = function (client, options) {
+     if (mcData.supportFeature('useChatSessions')) {
+       const tsDelta = BigInt(Date.now()) - packet.timestamp
+       const expired = !packet.timestamp || tsDelta > messageExpireTime || tsDelta < 0
+-      const verified = !packet.unsignedChatContent && updateAndValidateSession(packet.senderUuid, packet.plainMessage, packet.signature, packet.index, packet.previousMessages, packet.salt, packet.timestamp) && !expired
++      const verified = false && !packet.unsignedChatContent && updateAndValidateSession(packet.senderUuid, packet.plainMessage, packet.signature, packet.index, packet.previousMessages, packet.salt, packet.timestamp) && !expired
+       if (verified) client._signatureCache.push(packet.signature)
+       client.emit('playerChat', {
+         plainMessage: packet.plainMessage,
+@@ -363,7 +363,7 @@ module.exports = function (client, options) {
+     }
+   }
+
+-  client._signedChat = (message, options = {}) => {
++  client._signedChat = async (message, options = {}) => {
+     options.timestamp = options.timestamp || BigInt(Date.now())
+     options.salt = options.salt || 1n
+
+@@ -405,7 +405,7 @@ module.exports = function (client, options) {
+         message,
+         timestamp: options.timestamp,
+         salt: options.salt,
+-        signature: (client.profileKeys && client._session) ? client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
++        signature: (client.profileKeys && client._session) ? await client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
+         offset: client._lastSeenMessages.pending,
+         acknowledged
+       })
+@@ -419,7 +419,7 @@ module.exports = function (client, options) {
+         message,
+         timestamp: options.timestamp,
+         salt: options.salt,
+-        signature: client.profileKeys ? client.signMessage(message, options.timestamp, options.salt, options.preview) : Buffer.alloc(0),
++        signature: client.profileKeys ? await client.signMessage(message, options.timestamp, options.salt, options.preview) : Buffer.alloc(0),
+         signedPreview: options.didPreview,
+         previousMessages: client._lastSeenMessages.map((e) => ({
+           messageSender: e.sender,
 diff --git a/src/client/encrypt.js b/src/client/encrypt.js
 index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108f4c63536 100644
 --- a/src/client/encrypt.js
@@ -34,10 +92,10 @@ index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108
 +        //   clearTimeout(loginTimeout)
 +        // })
        }
-
+ 
        function onJoinServerResponse (err) {
 diff --git a/src/client.js b/src/client.js
-index c89375e32babbf3559655b1e95f6441b9a30796f..f24cd5dc8fa9a0a4000b184fb3c79590a3ad8b8a 100644
+index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c278950ba7f396 100644
 --- a/src/client.js
 +++ b/src/client.js
 @@ -88,10 +88,12 @@ class Client extends EventEmitter {
@@ -72,9 +130,9 @@ index c89375e32babbf3559655b1e95f6441b9a30796f..f24cd5dc8fa9a0a4000b184fb3c79590
        }
      })
    }
-@@ -166,7 +174,10 @@ class Client extends EventEmitter {
+@@ -167,7 +175,10 @@ class Client extends EventEmitter {
      }
-
+ 
      const onFatalError = (err) => {
 -      this.emit('error', err)
 +      // todo find out what is trying to write after client disconnect
@@ -83,8 +141,8 @@ index c89375e32babbf3559655b1e95f6441b9a30796f..f24cd5dc8fa9a0a4000b184fb3c79590
 +      }
        endSocket()
      }
-
-@@ -195,6 +206,8 @@ class Client extends EventEmitter {
+ 
+@@ -196,6 +207,8 @@ class Client extends EventEmitter {
      serializer -> framer -> socket -> splitter -> deserializer */
      if (this.serializer) {
        this.serializer.end()
@@ -93,8 +151,8 @@ index c89375e32babbf3559655b1e95f6441b9a30796f..f24cd5dc8fa9a0a4000b184fb3c79590
      } else {
        if (this.socket) this.socket.end()
      }
-@@ -236,8 +249,11 @@ class Client extends EventEmitter {
-
+@@ -237,8 +250,11 @@ class Client extends EventEmitter {
+ 
    write (name, params) {
      if (!this.serializer.writable) { return }
 -    debug('writing packet ' + this.state + '.' + name)
@@ -106,83 +164,25 @@ index c89375e32babbf3559655b1e95f6441b9a30796f..f24cd5dc8fa9a0a4000b184fb3c79590
 +    this.emit('writePacket', name, params)
      this.serializer.write({ name, params })
    }
-
+ 
 diff --git a/src/index.d.ts b/src/index.d.ts
-index 0a5821c32d735e11205a280aa5a503c13533dc14..94a49f661d922478b940d853169b6087e6ec3df5 100644
+index 423085259176a10c9dfeb617f00975df077d02be..ae0558b7c53ab24474b22240e8a2f4e4cde02f19 100644
 --- a/src/index.d.ts
 +++ b/src/index.d.ts
-@@ -121,6 +121,7 @@ declare module 'minecraft-protocol' {
+@@ -134,6 +134,7 @@ declare module 'minecraft-protocol' {
  		sessionServer?: string
  		keepAlive?: boolean
  		closeTimeout?: number
 +		closeTimeout?: number
  		noPongTimeout?: number
  		checkTimeoutInterval?: number
  		version?: string
-@@ -141,6 +142,8 @@ declare module 'minecraft-protocol' {
+@@ -154,6 +155,8 @@ declare module 'minecraft-protocol' {
  		disableChatSigning?: boolean
  		/** Pass custom client implementation if needed. */
  		Client?: Client
 +		/** Can be used to prepare mc data on autoVersion (client.version has selected version) */
 +		versionSelectedHook?: (client: Client) => Promise<void> | void
  	}
-
+ 
  	export class Server extends EventEmitter {
-diff --git a/src/client/chat.js b/src/client/chat.js
-index 5cad9954db13d7121ed0a03792c2304156cdf436..ffd7c7d6299ef54854e0923f8d5296bf2a58956b 100644
---- a/src/client/chat.js
-+++ b/src/client/chat.js
-@@ -111,7 +111,7 @@ module.exports = function (client, options) {
-         for (const player of packet.data) {
-           if (!player.chatSession) continue
-           client._players[player.UUID] = {
--            publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
-+            // publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
-             publicKeyDER: player.chatSession.publicKey.keyBytes,
-             sessionUuid: player.chatSession.uuid
-           }
-@@ -127,7 +127,7 @@ module.exports = function (client, options) {
-       for (const player of packet.data) {
-         if (player.crypto) {
-           client._players[player.UUID] = {
--            publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
-+            // publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
-             publicKeyDER: player.crypto.publicKey,
-             signature: player.crypto.signature,
-             displayName: player.displayName || player.name
-@@ -198,7 +198,7 @@ module.exports = function (client, options) {
-     if (mcData.supportFeature('useChatSessions')) {
-       const tsDelta = BigInt(Date.now()) - packet.timestamp
-       const expired = !packet.timestamp || tsDelta > messageExpireTime || tsDelta < 0
--      const verified = !packet.unsignedChatContent && updateAndValidateSession(packet.senderUuid, packet.plainMessage, packet.signature, packet.index, packet.previousMessages, packet.salt, packet.timestamp) && !expired
-+      const verified = false && !packet.unsignedChatContent && updateAndValidateSession(packet.senderUuid, packet.plainMessage, packet.signature, packet.index, packet.previousMessages, packet.salt, packet.timestamp) && !expired
-       if (verified) client._signatureCache.push(packet.signature)
-       client.emit('playerChat', {
-         plainMessage: packet.plainMessage,
-@@ -363,7 +363,7 @@ module.exports = function (client, options) {
-     }
-   }
-
--  client._signedChat = (message, options = {}) => {
-+  client._signedChat = async (message, options = {}) => {
-     options.timestamp = options.timestamp || BigInt(Date.now())
-     options.salt = options.salt || 1n
-
-@@ -404,7 +404,7 @@ module.exports = function (client, options) {
-         message,
-         timestamp: options.timestamp,
-         salt: options.salt,
--        signature: (client.profileKeys && client._session) ? client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
-+        signature: (client.profileKeys && client._session) ? await client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
-         offset: client._lastSeenMessages.pending,
-         acknowledged
-       })
-@@ -418,7 +418,7 @@ module.exports = function (client, options) {
-         message,
-         timestamp: options.timestamp,
-         salt: options.salt,
--        signature: client.profileKeys ? client.signMessage(message, options.timestamp, options.salt, options.preview) : Buffer.alloc(0),
-+        signature: client.profileKeys ? await client.signMessage(message, options.timestamp, options.salt, options.preview) : Buffer.alloc(0),
-         signedPreview: options.didPreview,
-         previousMessages: client._lastSeenMessages.map((e) => ({
-           messageSender: e.sender,