wip

Author: mc-zuri

test/mcbedrock.js

@@ -24,7 +24,6 @@ async function main (version = '1.19.63') {
   }
 
   await collectPackets(version, Object.keys(handlers), (name, params) => handlers[name](version, params))
-  await new Promise((resolve) => setTimeout(resolve, 30000))
   if (!loggedIn) {
     throw new Error('Did not login')
   }

test/mcbedrock.test.js

@@ -2,12 +2,16 @@
 
 const SUPPORTED_VERSIONS = ['1.17.10', '1.18.0', '1.18.11', '1.18.30', '1.19.1', '1.19.10']
 const test = require('./mcbedrock')
+const { sleep } = require('./util/sleep')
 
 describe('mcbedrock', function () {
-  this.timeout(18000 * 10)
+  const vcount = SUPPORTED_VERSIONS.length
+  this.timeout(vcount * 80 * 1000)
 
   for (const version of SUPPORTED_VERSIONS) {
-    // skipped bedrock because it times out; fix in https://github.com/PrismarineJS/prismarine-registry/issues/43
-    it.skip('works on ' + version, () => test(version))
+    it('works on ' + version, async () => {
+      await test(version);
+      await sleep(100);
+    })
   }
 })

test/mcpc.test.js

@@ -7,6 +7,6 @@ describe('mcpc', function () {
   this.timeout(9000 * 10)
 
   for (const version of SUPPORTED_VERSIONS) {
-    it('works on ' + version, () => test(version))
+    it.skip('works on ' + version, () => test(version))
   }
 })

test/util/collectBedrockPackets.js

@@ -1,52 +1,90 @@
 const bedrock = require('bedrock-protocol')
-const { startServer } = require('minecraft-bedrock-server')
+const { startServerAndWait2 } = require('minecraft-bedrock-server')
 const debug = require('debug')('prismarine-registry')
 const path = require('path')
+const { getPort } = require('./getPort')
+const { waitFor } = require('./waitFor')
 
-async function collectPackets (version, names = ['start_game'], cb) {
-  const collected = []
-  const server = await new Promise((resolve) => {
-    const server = startServer(version, () => resolve(server), {
-      'online-mode': false,
-      'server-port': 19130,
-      path: path.join(__dirname, `server_bedrock_${version}`)
-    })
+async function collectPackets(version, names = ['start_game'], cb) {
+  const [port, v6] = [await getPort(), await getPort()]
+  console.log('Starting vanilla server', version, 'on port', port, v6);
+  const server = await startServerAndWait2(version, 1000 * 220, {
+    'online-mode': false,
+    'server-port': port,
+    'server-portv6': v6,
+    path: path.join(__dirname, `server_bedrock_${version}`)
   })
-
-  console.log('Started server', version)
+  console.log('Started server')
 
   const client = bedrock.createClient({
-    version,
     host: '127.0.0.1',
-    port: 19130,
+    port,
     username: 'test',
-    offline: true
+    version,
+    raknetBackend: 'raknet-native',
+    offline: true,
+    //skipPing: true,
   })
 
-  let clientConnected = false
+  console.log('Started client')
+  //client.connect()
 
-  client.on('join', () => {
-    console.log('[client] Client connected')
-    clientConnected = true
-  })
+  let clientConnected = false
+  const collected = []
+  await waitFor((res) => {
 
-  for (const name of names) {
-    client.on(name, (packet) => {
-      cb(name, packet)
-      collected.push(packet)
+    client.on('join', () => {
+      console.log('[client] Client connected')
+      clientConnected = true
+      TryStop();
     })
-  }
 
-  client.on('packet', ({ name }) => debug('[client] -> ', name))
+    client.on('packet', ({ name }) => debug('[client] -> ', name))
 
-  setTimeout(() => {
-    console.log('Stopping server', version)
-    server.kill()
-    client.close()
-    if (!clientConnected) {
-      throw new Error('Client never connected')
+    for (const name of names) {
+      client.on(name, (packet) => {
+        cb(name, packet)
+        collected.push(packet);
+        TryStop();
+      })
     }
-  }, 9000)
+
+    function TryStop() {
+      if (clientConnected && collected.length === names.length) {
+        console.log('✔ Got all packets')
+        console.log('Stopping server', version)
+        server.kill()
+        client.close()
+        res()
+      }
+    }
+  }, 1000 * 60, () => {
+    client.close()
+    server.kill()
+    throw Error('❌ client timed out ')
+  });
+
+
+
+
+
+  console.log('Stopping server', version)
+
+
+
+
+
+
+
+
+  // setTimeout(() => {
+  //   console.log('Stopping server', version)
+  //   server.kill()
+  //   client.close()
+  //   if (!clientConnected) {
+  //     throw new Error('Client never connected')
+  //   }
+  // }, 9000)
 }
 
 module.exports = collectPackets

test/util/getPort.js

@@ -0,0 +1,17 @@
+const net = require('net')
+
+const getPort = () => new Promise(resolve => {
+  const server = net.createServer()
+  server.listen(0, '127.0.0.1')
+  server.on('listening', () => {
+    const { port } = server.address()
+    server.close(() => {
+      // Wait a bit for port to free as we try to bind right after freeing it
+      setTimeout(() => {
+        resolve(port)
+      }, 200)
+    })
+  })
+})
+
+module.exports = { getPort }

test/util/sleep.js

@@ -0,0 +1,5 @@
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms))
+}
+
+module.exports = { sleep }

test/util/waitFor.js

@@ -0,0 +1,12 @@
+async function waitFor(cb, withTimeout, onTimeout) {
+    let t
+    const ret = await Promise.race([
+        new Promise((resolve, reject) => cb(resolve, reject)),
+        new Promise(resolve => { t = setTimeout(() => resolve('timeout'), withTimeout) })
+    ])
+    clearTimeout(t)
+    if (ret === 'timeout') await onTimeout()
+    return ret
+}
+
+module.exports = { waitFor }