From 43ef9c9430b657df608d14898cf4e0c06fdd6479 Mon Sep 17 00:00:00 2001
From: extremeheat <extreme@protonmail.ch>
Date: Thu, 25 Mar 2021 02:33:56 -0400
Subject: [PATCH] Add internal client/server test

---
 src/auth/loginVerify.js |  5 ++---
 src/serverPlayer.js     | 10 +++++-----
 test/internal.js        |  2 +-
 test/internal.test.js   | 11 +++++++++++
 4 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 test/internal.test.js

diff --git a/src/auth/loginVerify.js b/src/auth/loginVerify.js
index 6d21e41..e1c2743 100644
--- a/src/auth/loginVerify.js
+++ b/src/auth/loginVerify.js
@@ -17,10 +17,10 @@ module.exports = (client, server, options) => {
 
     let pubKey = mcPubKeyToPem(getX5U(chain[0])) // the first one is client signed, allow it
     let finalKey = null
-    console.log(pubKey)
+    // console.log(pubKey)
     for (const token of chain) {
       const decoded = JWT.verify(token, pubKey, { algorithms: 'ES384' })
-      console.log('Decoded', decoded)
+      // console.log('Decoded', decoded)
 
       // Check if signed by Mojang key
       const x5u = getX5U(token)
@@ -69,7 +69,6 @@ function getX5U (token) {
 }
 
 function mcPubKeyToPem (mcPubKeyBuffer) {
-  console.log(mcPubKeyBuffer)
   if (mcPubKeyBuffer[0] === '-') return mcPubKeyBuffer
   let pem = '-----BEGIN PUBLIC KEY-----\n'
   let base64PubKey = mcPubKeyBuffer.toString('base64')
diff --git a/src/serverPlayer.js b/src/serverPlayer.js
index 6fb03bb..b11d8f4 100644
--- a/src/serverPlayer.js
+++ b/src/serverPlayer.js
@@ -1,6 +1,7 @@
 const { ClientStatus, Connection } = require('./connection')
 const fs = require('fs')
 const Options = require('./options')
+const debug = require('debug')('minecraft-protocol')
 
 const { Encrypt } = require('./auth/encryption')
 const Login = require('./auth/login')
@@ -21,8 +22,8 @@ class Player extends Connection {
 
     this.startQueue()
     this.status = ClientStatus.Authenticating
-    this.inLog = (...args) => console.info('S ->', ...args)
-    this.outLog = (...args) => console.info('S <-', ...args)
+    this.inLog = (...args) => debug('S ->', ...args)
+    this.outLog = (...args) => debug('S <-', ...args)
   }
 
   getData () {
@@ -125,10 +126,9 @@ class Player extends Connection {
       throw e
     }
 
-    console.log('-> S', des)
     switch (des.data.name) {
       case 'login':
-        console.log(des)
+        // console.log(des)
         this.onLogin(des)
         return
       case 'client_to_server_handshake':
@@ -142,7 +142,7 @@ class Player extends Connection {
         this.emit('spawn')
         break
       default:
-        console.log('ignoring, unhandled')
+        // console.log('ignoring, unhandled')
     }
     this.emit(des.data.name, des.data.params)
   }
diff --git a/test/internal.js b/test/internal.js
index e01e932..6e04641 100644
--- a/test/internal.js
+++ b/test/internal.js
@@ -1,4 +1,4 @@
-process.env.DEBUG = 'minecraft-protocol raknet'
+// process.env.DEBUG = 'minecraft-protocol raknet'
 const { Server, Client } = require('../')
 const { dumpPackets, hasDumps } = require('../tools/genPacketDumps')
 const DataProvider = require('../data/provider')
diff --git a/test/internal.test.js b/test/internal.test.js
new file mode 100644
index 0000000..e3feeac
--- /dev/null
+++ b/test/internal.test.js
@@ -0,0 +1,11 @@
+/* eslint-env jest */
+
+const { timedTest } = require('./internal')
+
+describe('internal client/server test', function () {
+  this.timeout(120 * 1000)
+
+  it('connects', async () => {
+    await timedTest()
+  })
+})