Update test server

package.json

@@ -9,7 +9,7 @@
     "test": "mocha --bail --exit",
     "pretest": "npm run lint",
     "lint": "standard",
-    "vanillaServer": "node tools/startVanillaServer.js",
+    "vanillaServer": "minecraft-bedrock-server --root tools --version",
     "dumpPackets": "node tools/genPacketDumps.js",
     "fix": "standard --fix"
   },
@@ -40,6 +40,7 @@
     "bedrock-protocol": "file:.",
     "bedrock-provider": "^2.0.0",
     "leveldb-zlib": "^1.0.1",
+    "minecraft-bedrock-server": "^1.4.2",
     "mocha": "^10.0.0",
     "protodef-yaml": "^1.1.0",
     "standard": "^17.0.0-2"

tools/startVanillaServer.js

@@ -1,156 +1,11 @@
-const http = require('https')
-const fs = require('fs')
-const cp = require('child_process')
-const debug = process.env.CI ? console.debug : require('debug')('minecraft-protocol')
-const https = require('https')
-const { getFiles, waitFor } = require('../src/datatypes/util')
+const bedrockServer = require('minecraft-bedrock-server')
 
-function head (url) {
-  return new Promise((resolve, reject) => {
-    const req = http.request(url, { method: 'HEAD', timeout: 1000 }, resolve)
-    req.on('error', reject)
-    req.on('timeout', () => { req.destroy(); debug('HEAD request timeout'); reject(new Error('timeout')) })
-    req.end()
-  })
-}
-function get (url, outPath) {
-  const file = fs.createWriteStream(outPath)
-  return new Promise((resolve, reject) => {
-    https.get(url, { timeout: 1000 * 20 }, response => {
-      if (response.statusCode !== 200) return reject(new Error('Server returned code ' + response.statusCode))
-      response.pipe(file)
-      file.on('finish', () => {
-        file.close()
-        resolve()
-      })
-    })
-  })
-}
-
-// Get the latest versions
-// TODO: once we support multi-versions
-function fetchLatestStable () {
-  get('https://raw.githubusercontent.com/minecraft-linux/mcpelauncher-versiondb/master/versions.json', 'versions.json')
-  const versions = JSON.parse(fs.readFileSync('./versions.json'))
-  const latest = versions[0]
-  return latest.version_name
-}
-
-// Download + extract vanilla server and enter the directory
-async function download (os, version, path = 'bds-') {
-  debug('Downloading server', os, version, 'into', path)
-  process.chdir(__dirname)
-  const verStr = version.split('.').slice(0, 3).join('.')
-  const dir = path + version
-
-  if (fs.existsSync(dir) && getFiles(dir).length) {
-    process.chdir(path + version) // Enter server folder
-    return verStr
+module.exports = {
+  ...bedrockServer,
+  startServerAndWait (version, withTimeout, options) {
+    return bedrockServer.startServerAndWait(version, withTimeout, { ...options, root: __dirname })
+  },
+  startServerAndWait2 (version, withTimeout, options) {
+    return bedrockServer.startServerAndWait2(version, withTimeout, { ...options, root: __dirname })
   }
-  try { fs.mkdirSync(dir) } catch { }
-
-  process.chdir(path + version) // Enter server folder
-  const url = (os, version) => `https://www.minecraft.net/bedrockdedicatedserver/bin-${os}/bedrock-server-${version}.zip`
-
-  let found = false
-
-  for (let i = 0; i < 20; i++) { // Check for the latest server build for version (major.minor.patch.BUILD)
-    const u = url(os, `${verStr}.${String(i).padStart(2, '0')}`)
-    debug('Opening', u, Date.now())
-    let ret
-    try { ret = await head(u) } catch (e) { continue }
-    if (ret.statusCode === 200) {
-      found = u
-      debug('Found server', ret.statusCode)
-      break
-    }
-  }
-  if (!found) throw Error('did not find server bin for ' + os + ' ' + version)
-  console.info('🔻 Downloading', found)
-  await get(found, 'bds.zip')
-  console.info('⚡ Unzipping')
-  // Unzip server
-  if (process.platform === 'linux') cp.execSync('unzip -u bds.zip && chmod +777 ./bedrock_server')
-  else cp.execSync('tar -xf bds.zip')
-  return verStr
-}
-
-const defaultOptions = {
-  'level-generator': '2',
-  'server-port': '19130',
-  'online-mode': 'false'
 }
-
-// Setup the server
-function configure (options = {}) {
-  const opts = { ...defaultOptions, ...options }
-  let config = fs.readFileSync('./server.properties', 'utf-8')
-  config += '\nplayer-idle-timeout=1\nallow-cheats=true\ndefault-player-permission-level=operator'
-  for (const o in opts) config += `\n${o}=${opts[o]}`
-  fs.writeFileSync('./server.properties', config)
-}
-
-function run (inheritStdout = true) {
-  const exe = process.platform === 'win32' ? 'bedrock_server.exe' : './bedrock_server'
-  return cp.spawn(exe, inheritStdout ? { stdio: 'inherit' } : {})
-}
-
-let lastHandle
-
-// Run the server
-async function startServer (version, onStart, options = {}) {
-  const os = process.platform === 'win32' ? 'win' : process.platform
-  if (os !== 'win' && os !== 'linux') {
-    throw Error('unsupported os ' + os)
-  }
-  await download(os, version, options.path)
-  configure(options)
-  const handle = lastHandle = run(!onStart)
-  handle.on('error', (...a) => {
-    console.warn('*** THE MINECRAFT PROCESS CRASHED ***', a)
-    handle.kill('SIGKILL')
-  })
-  if (onStart) {
-    let stdout = ''
-    handle.stdout.on('data', data => {
-      stdout += data
-      if (stdout.includes('Server started')) onStart()
-    })
-    handle.stdout.pipe(process.stdout)
-    handle.stderr.pipe(process.stdout)
-  }
-  return handle
-}
-
-// Start the server and wait for it to be ready, with a timeout
-async function startServerAndWait (version, withTimeout, options) {
-  let handle
-  await waitFor(async res => {
-    handle = await startServer(version, res, options)
-  }, withTimeout, () => {
-    handle?.kill()
-    throw new Error(`Server did not start on time (${withTimeout}ms, now ${Date.now()})`)
-  })
-  return handle
-}
-
-async function startServerAndWait2 (version, withTimeout, options) {
-  try {
-    return await startServerAndWait(version, 1000 * 60, options)
-  } catch (e) {
-    console.log(e)
-    console.log('^ Tring once more to start server in 10 seconds...')
-    lastHandle?.kill()
-    await new Promise(resolve => setTimeout(resolve, 10000))
-    process.chdir(__dirname)
-    fs.rmSync('bds-' + version, { recursive: true })
-    return await startServerAndWait(version, withTimeout, options)
-  }
-}
-
-if (!module.parent) {
-  // if (process.argv.length < 3) throw Error('Missing version argument')
-  startServer(process.argv[2] || '1.17.10', null, process.argv[3] ? { 'server-port': process.argv[3], 'online-mode': !!process.argv[4] } : undefined)
-}
-
-module.exports = { fetchLatestStable, startServer, startServerAndWait, startServerAndWait2 }