Release

.github/workflows/ci.yml

@@ -40,3 +40,25 @@ jobs:
       #   if: ${{ github.event.pull_request.base.ref == 'release' }}
       #   env:
       #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  dedupe-check:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.head.ref == 'next'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install pnpm
+        run: npm install -g [email protected]
+
+      - name: Run pnpm dedupe
+        run: pnpm dedupe
+
+      - name: Check for changes
+        run: |
+          if ! git diff --exit-code --quiet pnpm-lock.yaml; then
+            echo "pnpm dedupe introduced changes:"
+            git diff --color=always pnpm-lock.yaml
+            exit 1
+          else
+            echo "No changes detected after pnpm dedupe in pnpm-lock.yaml"
+          fi

.github/workflows/next-deploy.yml

@@ -43,3 +43,26 @@ jobs:
           for alias in $(echo ${{ secrets.TEST_PREVIEW_DOMAIN }} | tr "," "\n"); do
             vercel alias set ${{ steps.deploy.outputs.stdout }} $alias --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro
           done
+
+      - name: Create Release Pull Request
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const { data: pulls } = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              head: `${context.repo.owner}:next`,
+              base: 'release',
+              state: 'open'
+            });
+
+            if (pulls.length === 0) {
+              await github.rest.pulls.create({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                title: 'Release',
+                head: 'next',
+                base: 'release',
+                body: 'PR was created automatically by the release workflow, hope you release it as soon as possible!',
+              });
+            }

.gitignore

@@ -18,5 +18,6 @@ out
 generated
 storybook-static
 server-jar
+config.local.json
 
 src/react/npmReactComponents.ts

Dockerfile

@@ -31,4 +31,5 @@ RUN npm i -g [email protected]
 RUN npm init -yp
 RUN pnpm i express github:zardoy/prismarinejs-net-browserify compression cors
 EXPOSE 8080
+VOLUME /app/dist
 ENTRYPOINT ["node", "server.js", "--prod"]

package.json

@@ -16,6 +16,7 @@
     "prod-start": "node server.js --prod",
     "test-mc-server": "tsx cypress/minecraft-server.mjs",
     "lint": "eslint \"{src,cypress,prismarine-viewer}/**/*.{ts,js,jsx,tsx}\"",
+    "lint-fix": "pnpm lint --fix",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build && node scripts/build.js moveStorybookFiles",
     "start-experiments": "vite --config experiments/vite.config.ts --host",
@@ -73,7 +74,7 @@
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
-    "minecraft-data": "3.80.0",
+    "minecraft-data": "3.83.1",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -142,7 +143,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.26",
+    "mc-assets": "^0.2.28",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
@@ -174,7 +175,7 @@
       "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.80.0",
+      "minecraft-data": "3.83.1",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "prismarine-physics": "github:zardoy/prismarine-physics",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
@@ -189,7 +190,7 @@
       "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
-      "minecraft-protocol@1.51.0": "patches/minecraft-protocol@1.49.0.patch"
+      "minecraft-protocol@1.54.0": "patches/minecraft-protocol@1.54.0.patch"
     }
   },
   "packageManager": "[email protected]"

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

@@ -95,10 +95,10 @@ index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108
 
        function onJoinServerResponse (err) {
 diff --git a/src/client.js b/src/client.js
-index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c278950ba7f396 100644
+index 74749698f8cee05b5dc749c271544f78d06645b0..e77e0a3f41c1ee780c3abbd54b0801d248c2a07c 100644
 --- a/src/client.js
 +++ b/src/client.js
-@@ -88,10 +88,12 @@ class Client extends EventEmitter {
+@@ -89,10 +89,12 @@ class Client extends EventEmitter {
        parsed.metadata.name = parsed.data.name
        parsed.data = parsed.data.params
        parsed.metadata.state = state
@@ -115,7 +115,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895
        }
        if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') {
          if (this._mcBundle.length) { // End bundle
-@@ -109,7 +111,13 @@ class Client extends EventEmitter {
+@@ -110,7 +112,13 @@ class Client extends EventEmitter {
            this._hasBundlePacket = false
          }
        } else {
@@ -130,7 +130,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895
        }
      })
    }
-@@ -167,7 +175,10 @@ class Client extends EventEmitter {
+@@ -168,7 +176,10 @@ class Client extends EventEmitter {
      }
 
      const onFatalError = (err) => {
@@ -142,7 +142,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895
        endSocket()
      }
 
-@@ -196,6 +207,8 @@ class Client extends EventEmitter {
+@@ -197,6 +208,8 @@ class Client extends EventEmitter {
      serializer -> framer -> socket -> splitter -> deserializer */
      if (this.serializer) {
        this.serializer.end()
@@ -151,7 +151,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895
      } else {
        if (this.socket) this.socket.end()
      }
-@@ -237,8 +250,11 @@ class Client extends EventEmitter {
+@@ -238,8 +251,11 @@ class Client extends EventEmitter {
 
    write (name, params) {
      if (!this.serializer.writable) { return }
@@ -166,18 +166,18 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895
    }
 
 diff --git a/src/index.d.ts b/src/index.d.ts
-index 423085259176a10c9dfeb617f00975df077d02be..ae0558b7c53ab24474b22240e8a2f4e4cde02f19 100644
+index e61d5403bab46251d35b22a2ea30eb09b2746a26..84f597427893671eeac231b11e6e42aa815601df 100644
 --- a/src/index.d.ts
 +++ b/src/index.d.ts
-@@ -134,6 +134,7 @@ declare module 'minecraft-protocol' {
+@@ -135,6 +135,7 @@ declare module 'minecraft-protocol' {
  		sessionServer?: string
  		keepAlive?: boolean
  		closeTimeout?: number
 +		closeTimeout?: number
  		noPongTimeout?: number
  		checkTimeoutInterval?: number
  		version?: string
-@@ -154,6 +155,8 @@ declare module 'minecraft-protocol' {
+@@ -155,6 +156,8 @@ declare module 'minecraft-protocol' {
  		disableChatSigning?: boolean
  		/** Pass custom client implementation if needed. */
  		Client?: Client

patches/minecraft-protocol@1.54.0.patch

@@ -0,0 +1,188 @@
+diff --git a/src/client/autoVersion.js b/src/client/autoVersion.js
+index 3fe1552672e4c0dd1b14b3b56950c3d7eaf3537b..6eb615e5827279c328d5547b5911626693252da4 100644
+--- a/src/client/autoVersion.js
++++ b/src/client/autoVersion.js
+@@ -9,7 +9,7 @@ module.exports = function (client, options) {
+   client.wait_connect = true // don't let src/client/setProtocol proceed on socket 'connect' until 'connect_allowed'
+   debug('pinging', options.host)
+   // TODO: use 0xfe ping instead for better compatibility/performance? https://github.com/deathcap/node-minecraft-ping
+-  ping(options, function (err, response) {
++  ping(options, async function (err, response) {
+     if (err) { return client.emit('error', err) }
+     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
++++ b/src/client/encrypt.js
+@@ -25,7 +25,11 @@ module.exports = function (client, options) {
+         if (packet.serverId !== '-') {
+           debug('This server appears to be an online server and you are providing no password, the authentication will probably fail')
+         }
+-        sendEncryptionKeyResponse()
++        client.end('This server appears to be an online server and you are providing no authentication. Try authenticating first.')
++        // sendEncryptionKeyResponse()
++        // client.once('set_compression', () => {
++        //   clearTimeout(loginTimeout)
++        // })
+       }
+
+       function onJoinServerResponse (err) {
+diff --git a/src/client.js b/src/client.js
+index 74749698f8cee05b5dc749c271544f78d06645b0..e77e0a3f41c1ee780c3abbd54b0801d248c2a07c 100644
+--- a/src/client.js
++++ b/src/client.js
+@@ -89,10 +89,12 @@ class Client extends EventEmitter {
+       parsed.metadata.name = parsed.data.name
+       parsed.data = parsed.data.params
+       parsed.metadata.state = state
+-      debug('read packet ' + state + '.' + parsed.metadata.name)
+-      if (debug.enabled) {
+-        const s = JSON.stringify(parsed.data, null, 2)
+-        debug(s && s.length > 10000 ? parsed.data : s)
++      if (!globalThis.excludeCommunicationDebugEvents?.includes(parsed.metadata.name)) {
++        debug('read packet ' + state + '.' + parsed.metadata.name)
++        if (debug.enabled) {
++          const s = JSON.stringify(parsed.data, null, 2)
++          debug(s && s.length > 10000 ? parsed.data : s)
++        }
+       }
+       if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') {
+         if (this._mcBundle.length) { // End bundle
+@@ -110,7 +112,13 @@ class Client extends EventEmitter {
+           this._hasBundlePacket = false
+         }
+       } else {
+-        emitPacket(parsed)
++        try {
++          emitPacket(parsed)
++        } catch (err) {
++          console.log('Client incorrectly handled packet ' + parsed.metadata.name)
++          console.error(err)
++          // todo investigate why it doesn't close the stream even if unhandled there
++        }
+       }
+     })
+   }
+@@ -168,7 +176,10 @@ class Client extends EventEmitter {
+     }
+
+     const onFatalError = (err) => {
+-      this.emit('error', err)
++      // todo find out what is trying to write after client disconnect
++      if(err.code !== 'ECONNABORTED') {
++        this.emit('error', err)
++      }
+       endSocket()
+     }
+
+@@ -197,6 +208,8 @@ class Client extends EventEmitter {
+     serializer -> framer -> socket -> splitter -> deserializer */
+     if (this.serializer) {
+       this.serializer.end()
++      this.socket?.end()
++      this.socket?.emit('end')
+     } else {
+       if (this.socket) this.socket.end()
+     }
+@@ -238,8 +251,11 @@ class Client extends EventEmitter {
+
+   write (name, params) {
+     if (!this.serializer.writable) { return }
+-    debug('writing packet ' + this.state + '.' + name)
+-    debug(params)
++    if (!globalThis.excludeCommunicationDebugEvents?.includes(name)) {
++      debug(`[${this.state}] from ${this.isServer ? 'server' : 'client'}: ` + name)
++      debug(params)
++    }
++    this.emit('writePacket', name, params)
+     this.serializer.write({ name, params })
+   }
+
+diff --git a/src/index.d.ts b/src/index.d.ts
+index e61d5403bab46251d35b22a2ea30eb09b2746a26..84f597427893671eeac231b11e6e42aa815601df 100644
+--- a/src/index.d.ts
++++ b/src/index.d.ts
+@@ -135,6 +135,7 @@ declare module 'minecraft-protocol' {
+ 		sessionServer?: string
+ 		keepAlive?: boolean
+ 		closeTimeout?: number
++		closeTimeout?: number
+ 		noPongTimeout?: number
+ 		checkTimeoutInterval?: number
+ 		version?: string
+@@ -155,6 +156,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 {