better connections

mattieFM · Sep 16, 2023 · 97f9dd9 · 97f9dd9
1 parent c511ddd
commit 97f9dd9
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 8 deletions.
diff --git a/www/mods/_multiplayer/hostMenu.js b/www/mods/_multiplayer/hostMenu.js
@@ -93,6 +93,7 @@ MATTIE.scenes.multiplayer.host.prototype.addOptionsBtns = function(){
     }).bind(this));
     this._optionsWindow.setHandler(MATTIE.CmdManager.returnToMultiplayer,  (()=>{
         MATTIE.multiplayer.getCurrentNetController().destroyAllConns();
+        MATTIE.multiplayer.getCurrentNetController().resetNet();
         MATTIE.menus.multiplayer.openMultiplayer();
 
     }).bind(this));

diff --git a/www/mods/_multiplayer/joinMenu.js b/www/mods/_multiplayer/joinMenu.js
@@ -46,7 +46,7 @@ MATTIE.scenes.multiplayer.join.prototype.addOptionsBtns = function(){
 
     this._optionsWindow.setHandler(MATTIE.CmdManager.joinGame, (()=>{
         this._inputWin.close();
-        MATTIE.multiplayer.clientController.hostId = this._inputWin.getInput()
+        MATTIE.multiplayer.clientController.hostId = (this._inputWin.getInput()).trim();
         MATTIE.menus.multiplayer.openLobby();
     }).bind(this));
 

diff --git a/www/mods/_multiplayer/lobby.js b/www/mods/_multiplayer/lobby.js
@@ -36,7 +36,7 @@ MATTIE.scenes.multiplayer.lobby.prototype.create = function(){
     btns[MATTIE.TextManager.forceStart] = MATTIE.CmdManager.forceStart
     this._optionsWindow = new MATTIE.windows.horizontalBtns(175+300+10, btns, 2);
     this._optionsWindow.setHandler(MATTIE.CmdManager.disconnect, (()=>{
-        MATTIE.multiplayer.getCurrentNetController().disconnectAllConns();
+        MATTIE.multiplayer.clientController.disconnectAllConns();
         MATTIE.menus.multiplayer.openMultiplayer();
     }).bind(this))
 

diff --git a/www/mods/_multiplayer/netControllerV2/baseNetController.js b/www/mods/_multiplayer/netControllerV2/baseNetController.js
@@ -38,7 +38,7 @@ class BaseNetController extends EventEmitter {
     disconnectAllConns(){
         this.canTryToReconnect = true;
         if(this.self){
-            this.self.disconnect();
+            this.self.disconnect()
         }
         // if(this.conn){
         //     this.conn.disconnect();
@@ -47,8 +47,8 @@ class BaseNetController extends EventEmitter {
 
     reconnectAllConns(){
         if(this.self){
+            if(!this.self.disconnected)
             this.self.reconnect();
-            this.self.disconnected = false;
         }
         this.setIsClient();
         // if(this.conn){
@@ -76,6 +76,10 @@ class BaseNetController extends EventEmitter {
     }
 
     clearControlVars(){
+        this.started = false;
+        this.players = {};
+        /** @type {[PlayerModel]} */
+        this.netPlayers = {};
         MATTIE.multiplayer.isClient = false;
         MATTIE.multiplayer.isHost = false;
         MATTIE.multiplayer.isActive = false;

diff --git a/www/mods/_multiplayer/netControllerV2/client.js b/www/mods/_multiplayer/netControllerV2/client.js
@@ -30,24 +30,34 @@ class ClientController extends BaseNetController {
     }
 
     open(){
+        if(!this.lastHostId) this.lastHostId = "";
         this.initEmitterOverrides(); //override stuff for interceptors
         this.setIsClient();
-        if(!this.self){
+        if(!this.lastHostId.includes(this.hostId) || !this.canTryToReconnect){
             this.self = new Peer();
             this.self.on('open', ()=>{
                 this.peerId = this.self.id;
                 this.player.setPeerId(this.peerId)
                 console.info(`Client opened at: ${this.peerId}`)
                 console.info(`Attempting to connect to host at: ${this.hostId}`)
-                MATTIE.multiplayer.clientController.connect();
+                this.connect();
             })
+        }else{
+            this.connect();
         }
+
+
+
+
     }
 
     connect(hostId=this.hostId){
-        if(this.lastHostId === hostId && this.canTryToReconnect) {
+        if(!this.lastHostId) this.lastHostId = "";
+        if(this.lastHostId.includes(hostId) && this.canTryToReconnect) {
+            console.log("last")
             this.reconnectAllConns();
             this.sendPlayerInfo();
+            this.lastHostId = hostId;
             return
         }
 
@@ -60,7 +70,8 @@ class ClientController extends BaseNetController {
             this.conn.on("data", (data) => {
                 //if(!this.self.disconnected)
                 this.onData(data,this.conn);
-            })
+            });
+
         this.lastHostId = hostId;
     }
 

diff --git a/www/mods/commonLibs/_common/menus/windows.js b/www/mods/commonLibs/_common/menus/windows.js
@@ -224,6 +224,10 @@ MATTIE.windows.textInput.prototype.initEventHandler = function() {
       }
 
     document.addEventListener('keydown', this._listenFunc, false);
+
+    setTimeout(() => { //automatically close after 50 seconds
+        this.close();
+    }, 50000);
 
 }