Improve test reliability: reconnect, retry, server console, packet fix (#3873)

* Fix chatAddPattern test to filter by expected username

The test used once(bot, 'chat') which matches ANY chat message.
Admin messages from /give or /clear in resetState could arrive and
match before the test's tellraw. Now filters for username === 'U9G'.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Use server console for clearInventory give and clear

Now that chatAddPattern test filters by username, server console
admin messages no longer interfere. Server console commands are
more reliable than bot.chat — they work even if the bot is in a
bad state.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Use server console for teleport in resetState

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Reduce resetState operation timeout from 20s to 5s

Operations like gamemode change, clear inventory, and teleport
complete in <1s. A 5s timeout fails faster and lets retries
kick in sooner instead of waiting 20s per failure.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Run example tests last to limit blast radius

Tests that spawn child processes (exampleBee, exampleDigger,
exampleInventory) can crash and disconnect the bot, cascading
to fail all subsequent tests. Running them last ensures they
can only affect each other, not the main test suite.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Auto-reconnect bot after disconnect in runTest

When a test crashes and disconnects the bot (e.g. exampleDigger
child process failure), subsequent tests would cascade-fail.
Now detects !bot.entity and reconnects with a fresh bot instance
before running the next test.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Fix clearInventory: use bot.chat for /give, server console for /clear

Server console /give doesn't trigger updateSlot on 1.21.9+.
Use bot.chat('/give @A stone 1') for the give (works on all versions)
and wrap.writeServer for /clear (more reliable than chat for clear).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Add set_player_inventory handler for 1.21.9+ server commands

MC 1.21.9+ uses a new set_player_inventory packet for server-initiated
inventory changes (e.g. console /give) instead of set_slot. Mineflayer
had no handler for it, so updateSlot events never fired.

This fixes server console /give on 1.21.9+ and also benefits any
user code that relies on inventory updates from server commands.

Also reverts clearInventory to use server console for both give and
clear now that the packet handler is in place.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Trigger CI with set_player_inventory handler

* Fix clearInventory: use bot.chat for /give on all versions

Server console /give doesn't send inventory update packets to the
client on 1.21.9+ (no set_slot nor set_player_inventory). The item
gets added server-side but the client never knows about it.

Use bot.chat('/give @A stone 1') which goes through the player's
command executor and always sends proper set_slot packets.

Keep server console for /clear (which does send set_slot reliably).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Increase /give timeout to 10s for loaded CI runners

The 5s timeout is fine for server console commands but bot.chat
goes through the network stack and can be slower on loaded runners
with 4 MC servers sharing one container.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Fix clearInventory: use bot.chat for /clear too on 1.21.9+

Server console /clear also doesn't send proper inventory packets on
1.21.9+. Use bot.chat for both /give and /clear, waiting for the
chat message confirmation for /clear.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: rom1504 <rom1504@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: rom1504

lib/plugins/inventory.js

@@ -728,6 +728,12 @@ function inject (bot, { hideErrors }) {
     const newItem = Item.fromNotch(packet.item)
     bot._setSlot(packet.slot, newItem, window)
   })
+  // 1.21.9+ uses set_player_inventory for server-initiated inventory changes
+  // (e.g. console /give) instead of set_slot
+  bot._client.on('set_player_inventory', (packet) => {
+    const newItem = Item.fromNotch(packet.contents)
+    bot._setSlot(packet.slotId, newItem)
+  })
   bot._client.on('window_items', (packet) => {
     const window = packet.windowId === 0 ? bot.inventory : bot.currentWindow
     if (!window || window.id !== packet.windowId) {

test/externalTest.js

@@ -8,6 +8,7 @@ const fs = require('fs')
 const path = require('path')
 
 const { getPort } = require('./common/util')
+const { once } = require('../lib/promise_utils')
 
 // set this to false if you want to test without starting a server automatically
 const START_THE_SERVER = true
@@ -124,10 +125,39 @@ for (const supportedVersion of mineflayer.testedVersions) {
       })
     })
 
+    async function reconnectBot () {
+      console.log('  Bot disconnected, reconnecting...')
+      try { bot.end() } catch (e) { /* ignore */ }
+      await new Promise(resolve => setTimeout(resolve, 1000))
+      bot = mineflayer.createBot({
+        username: 'flatbot',
+        viewDistance: 'tiny',
+        port: PORT,
+        host: '127.0.0.1',
+        version: supportedVersion
+      })
+      commonTest(bot, wrap)
+      bot.test.port = PORT
+      await once(bot, 'spawn')
+      console.log('  Bot reconnected')
+      wrap.writeServer('op flatbot\n')
+      await new Promise(resolve => setTimeout(resolve, 2000))
+    }
+
     const externalTestsFolder = path.resolve(__dirname, './externalTests')
     let distinctFailures = 0
+    // Sort test files so example tests (which spawn child processes and can
+    // crash/disconnect the bot) run last, limiting their blast radius.
+    const dangerousTests = ['exampleBee', 'exampleDigger', 'exampleInventory']
     fs.readdirSync(externalTestsFolder)
       .filter(file => fs.statSync(path.join(externalTestsFolder, file)).isFile())
+      .sort((a, b) => {
+        const aName = path.basename(a, '.js')
+        const bName = path.basename(b, '.js')
+        const aDangerous = dangerousTests.includes(aName) ? 1 : 0
+        const bDangerous = dangerousTests.includes(bName) ? 1 : 0
+        return aDangerous - bDangerous
+      })
       .forEach((test) => {
         test = path.basename(test, '.js')
         const testFunctions = require(`./externalTests/${test}`)(supportedVersion)
@@ -140,7 +170,11 @@ for (const supportedVersion of mineflayer.testedVersions) {
             if (this.test._currentRetry > 0) {
               console.log(`  [retry ${this.test._currentRetry}] ${testName}`)
             }
-            bot.test.resetState()
+            // Reconnect if bot got disconnected by a previous test
+            const reconnect = !bot.entity
+              ? reconnectBot()
+              : Promise.resolve()
+            reconnect.then(() => bot.test.resetState())
               .then(() => {
                 bot.test.sayEverywhere(`### Starting ${testName}`)
                 return testFunction(bot, done)

test/externalTests/chat.js

@@ -1,5 +1,5 @@
 const assert = require('assert')
-const { once } = require('../../lib/promise_utils')
+const { once, onceWithCleanup } = require('../../lib/promise_utils')
 
 module.exports = () => {
   async function runTest (bot, testFunction) {
@@ -27,7 +27,10 @@ module.exports = () => {
   addTest('test chatAddPattern', async (bot) => {
     await once(bot, 'message') // => starting chat test chatAddPattern
     bot.chat('/tellraw @p {"translate":"chat.type.text", "with":["U9G", "Hello World!"]}')
-    const [username, message, translate, chatMessage] = await once(bot, 'chat')
+    const [username, message, translate, chatMessage] = await onceWithCleanup(bot, 'chat', {
+      timeout: 20000,
+      checkCondition: (username) => username === 'U9G'
+    })
     assert.strictEqual(username, 'U9G')
     assert.strictEqual(message, 'Hello World!')
     assert.strictEqual(translate, 'chat.type.text')

test/externalTests/plugins/testCommon.js

@@ -6,7 +6,7 @@ const process = require('process')
 const assert = require('assert')
 const { sleep, onceWithCleanup } = require('../../../lib/promise_utils')
 
-const timeout = 20000
+const timeout = 5000
 module.exports = inject
 
 function inject (bot, wrap) {
@@ -123,15 +123,15 @@ function inject (bot, wrap) {
   }
 
   async function clearInventory () {
-    // Give a stone then clear — same as the original approach.
-    // The /give ensures the server has something to clear.
+    // Use bot.chat for /give (server console /give doesn't send inventory
+    // update packets on 1.21.9+). Use server console for /clear.
     bot.chat('/give @a stone 1')
     await onceWithCleanup(bot.inventory, 'updateSlot', {
-      timeout,
+      timeout: 10000,
       checkCondition: (slot, oldItem, newItem) => newItem?.name === 'stone'
     })
     const clearMsg = onceWithCleanup(bot, 'message', {
-      timeout,
+      timeout: 10000,
       checkCondition: msg => msg.translate === 'commands.clear.success.single' || msg.translate === 'commands.clear.success'
     })
     bot.chat('/clear')
@@ -145,10 +145,11 @@ function inject (bot, wrap) {
   }
 
   async function teleport (position) {
+    // Use server console for teleport — works even if bot is in a bad state
     if (bot.supportFeature('hasExecuteCommand')) {
-      bot.test.sayEverywhere(`/execute in overworld run teleport ${bot.username} ${position.x} ${position.y} ${position.z}`)
+      wrap.writeServer(`execute in overworld run teleport ${bot.username} ${position.x} ${position.y} ${position.z}\n`)
     } else {
-      bot.test.sayEverywhere(`/tp ${bot.username} ${position.x} ${position.y} ${position.z}`)
+      wrap.writeServer(`tp ${bot.username} ${position.x} ${position.y} ${position.z}\n`)
     }
     return onceWithCleanup(bot, 'move', {
       timeout,