@@ -11,7 +11,6 @@ var convert = new Convert();
1111var helmet = require ( "helmet" ) ;
1212var compression = require ( "compression" ) ;
1313const WebSocket = require ( "ws" ) ;
14- const qs = require ( "qs" ) ;
1514const { encode, decode } = require ( "@msgpack/msgpack" ) ;
1615var port = process . env . PORT || 8080 ;
1716
@@ -47,25 +46,26 @@ server.listen(port, function () {
4746var botByNick = new Map ( ) ;
4847
4948wss . on ( "connection" , ( socket , req ) => {
49+ var query = new URLSearchParams ( req . url . substr ( 2 , req . url . length ) ) ;
5050 const emit = ( type , ...data ) => {
5151 socket . send ( encode ( [ type , ...data ] ) ) ;
5252 } ;
53- const query = qs . parse ( req . url . substr ( 1 ) , { ignoreQueryPrefix : true } ) ;
5453
55- if ( botByNick . get ( query . nick ) !== undefined ) {
54+ if ( botByNick . get ( query . get ( " nick" ) ) !== undefined ) {
5655 emit ( "alreadyPlaying" ) ;
5756 return ;
5857 }
59- console . log ( `[\x1b[32m+\x1b[0m] ${ query . nick } ` ) ;
58+ console . log ( `[\x1b[32m+\x1b[0m] ${ query . get ( " nick" ) } ` ) ;
6059 var heldItem = null ;
6160 var bot = mineflayer . createBot ( {
62- host : query . server ,
63- port : query . port ,
64- username : query . nick ,
61+ host : query . get ( " server" ) ,
62+ port : query . get ( " port" ) ,
63+ username : query . get ( " nick" ) ,
6564 version : version ,
66- password : query . premium === "true" ? query . password : undefined ,
65+ password :
66+ query . get ( "premium" ) === "true" ? query . get ( "password" ) : undefined ,
6767 } ) ;
68- botByNick . set ( query . nick , bot ) ;
68+ botByNick . set ( query . get ( " nick" ) , bot ) ;
6969 bot . _client . on ( "map_chunk" , function ( packet ) {
7070 var cell = new Chunk ( ) ;
7171 cell . load ( packet . chunkData , packet . bitMap , true , true ) ;
@@ -222,8 +222,8 @@ wss.on("connection", (socket, req) => {
222222 socket . on ( "close" , ( ) => {
223223 try {
224224 clearInterval ( interval ) ;
225- console . log ( `[\x1b[31m-\x1b[0m] ${ query . nick } ` ) ;
226- botByNick . delete ( query . nick ) ;
225+ console . log ( `[\x1b[31m-\x1b[0m] ${ query . get ( " nick" ) } ` ) ;
226+ botByNick . delete ( query . get ( " nick" ) ) ;
227227 bot . end ( ) ;
228228 } catch ( error ) { }
229229 } ) ;
0 commit comments