reconnect: fix socket events

Author: evolutionleo

Client/scripts/__WarpConfig/__WarpConfig.gml

@@ -16,7 +16,7 @@ network_set_config(network_config_use_non_blocking_socket, true)
 // toggle this off if you have some specific case where you need to keep the entities that are in the room locally
 #macro PURGE_ENTITIES_ON_ROOM_START true
 
-// instantly teleports if an entity has moved > than this on a single axis in a single tick
+// instantly teleports if an entity has moved > than this along an axis in a single tick
 #macro POS_INTERP_THRESH 100
 
 #macro TIMESTAMPS_ENABLED true
@@ -79,7 +79,7 @@ if (!CONFIGS_SET) {
 
 #macro SESSION_FILE $"session{MultiClientGetID()}.token"
 #macro OLD_SESSIONS_FILE "sessions_old.token"
-#macro CONNECT_TIMEOUT 60 * 5 // 5 seconds
+//#macro CONNECT_TIMEOUT 60 * 5 // 5 seconds
 
 
 // Allow up to 4000 ping (YYG recommends ~1000 for LAN-only games)

Client/scripts/authHandlers/authHandlers.gml

@@ -67,7 +67,7 @@ var sessionHandler = function(data) {
 			trace("Failed to login with a session. Reason: %", data.reason)
 
 			// create a new session if the old one didn't work
-			//sendSessionCreate()
+			sendSessionCreate()
 		}
 	}
 }

TypescriptServer/src/cmd/handlers/auth.ts

@@ -1,7 +1,7 @@
 import { addHandler } from "#cmd/handlePacket";
 import { Account, getAccountInfo, IAccount } from "#schemas/account";
 import Session from "#schemas/session";
-import { accountCreate, accountLogin, accountRegister, sessionCreate, sessionGet, sessionLogin } from "#util/auth";
+import { accountActivate, accountCreate, accountLogin, accountRegister, sessionCreate, sessionGet, sessionLogin } from "#util/auth";
 import trace from "#util/logging";
 import { Names } from "#util/names";
 
@@ -30,19 +30,30 @@ addHandler('session create', async (c, data) => {
 
 addHandler('session login', async (c, data) => {
     let token = data.session;
-    trace('session token login: ' + token);
 
     try {
         c.session = await sessionGet(token);
         c.account = await sessionLogin(c.session);
 
         await c.login(c.account);
-        c.send({ cmd: 'session login', success: true, session: c.session.token });
+        c.sendSession(true);
         c.sendLogin(true);
+
+        // another client logged into the same session?
+        let old_client = global.clients.find((client) => client !== c && client.session.token === c.session.token);
+        
+        if (old_client !== undefined) {
+            if (old_client.connected) {
+                old_client.disconnect();
+            }
+            
+            old_client.reconnect(c);
+        }
     }
     catch(reason) {
         trace('error: ' + reason.toString());
-        c.send({ cmd: 'session login', success: false, reason: reason.toString() });
+        c.sendSession(false, reason);
+        // c.send({ cmd: 'session login', success: false, reason: reason.toString() });
     }
 });
 
@@ -53,9 +64,11 @@ addHandler('login', (c, data) => {
 
     accountLogin(username, password)
         .then((account:IAccount) => {
-            // this also sends the message
             c.login(account);
+            c.session = sessionCreate(account);
+
             c.sendLogin(true);
+            c.sendSession(true);
         })
         .catch((reason) => {
             c.sendLogin(false, reason);
@@ -66,10 +79,23 @@ addHandler('register', (c, data) => {
     let { username, password } = data;
     username = username.toLowerCase();
 
-    accountRegister(username, password)
+    let promise: Promise<IAccount>;
+
+    if (c.session && c.account && c.account.temporary) {
+        promise = accountActivate(c.account, username, password);
+    }
+    else {
+        promise = accountRegister(username, password);
+    }
+
+    promise
         .then((account:IAccount) => {
             c.register(account);
+            c.session = sessionCreate(c.account);
+
             c.sendRegister(true);
+            c.sendLogin(true);
+            c.sendSession(true);
         })
         .catch((reason) => {
             c.sendRegister(false, reason);

TypescriptServer/src/cmd/sendStuff.ts

@@ -39,6 +39,9 @@ export abstract class SendStuff implements IClient {
     abstract halfpack: Buffer;
     abstract entity: PlayerEntity;
 
+    abstract bindTCP(socket: net.Socket): void;
+    abstract bindWS(socket: WebSocket): void;
+
 
     abstract ping: number;
 

TypescriptServer/src/cmd/senders/auth.ts

@@ -8,7 +8,7 @@ declare module "#cmd/sendStuff" {
         sendName()
         sendRegister(success:boolean, reason?:string)
         sendLogin(success:boolean, reason?:string)
-        sendSession(session_token:string)
+        sendSession(success:boolean, reason?:string, session_token?:string)
     }
 }
 
@@ -30,4 +30,11 @@ SendStuff.prototype.sendRegister = function(success:boolean, reason:string = '')
  */
 SendStuff.prototype.sendLogin = function(success:boolean, reason:string = ''):void {
     this.send({ cmd: 'login', success, reason, account: getAccountInfo(this.account), profile: getProfileInfo(this.profile) });
+}
+
+SendStuff.prototype.sendSession = function(success, reason:string = '', token = undefined) {
+    if (token === undefined && success) {
+        token = this.session.token;
+    }
+    this.send({ cmd: 'session login', success, reason, session: token });
 }

TypescriptServer/src/concepts/client.ts

@@ -72,17 +72,20 @@ export default class Client extends SendStuff implements IClient {
     // used internally in packet.ts
     /** @type {Buffer} */
     halfpack: Buffer;
-
     /** @type {any[]} */
     packetQueue: any[];
 
+    // used internally in server.ts
+    bindTCP;
+    bindWS;
+
     /** @type {PlayerEntity} */
     entity: PlayerEntity = null;
 
     /** @type {number} */
     ping: number;
 
-    room_join_timer: number = -1; // if >0 - joined a room recently
+    room_join_timer: number = -1; // if >0 - joined a room recently, getting FULL entities list
     reconnect_timer: number = -1;
 
     /** @type {boolean} */
@@ -231,21 +234,14 @@ export default class Client extends SendStuff implements IClient {
         }
     }
 
-    disconnect() {
-        if (this.socket_type === 'ws') {
-            (this.socket as WebSocket).close();
-        }
-        else {
-            (this.socket as TCPSocket).destroy();
-        }
-    }
-
     onDisconnect() {
         this.socket = null;
         this.connected = false;
 
         this.reconnect_timer = config.reconnect_timeout;
 
+        this.matchMakingStop();
+
         // go offline
         if (this.logged_in) {
             this.profile.online = false;
@@ -254,6 +250,29 @@ export default class Client extends SendStuff implements IClient {
         }
     }
 
+    onReconnect() {
+        if (this.lobby)
+            this.sendLobbyJoin(this.lobby);
+        if (this.room && this.entity)
+            this.sendPlay(this.lobby, this.room, this.entity.pos, this.entity.uuid);
+
+        this.room_join_timer = global.config.room.recently_joined_timer;
+    }
+
+    
+    disconnect() {
+        if (this.socket === null) {
+            return;
+        }
+
+        if (this.socket_type === 'ws') {
+            (this.socket as WebSocket).close();
+        }
+        else {
+            (this.socket as TCPSocket).destroy();
+        }
+    }
+
     destroy() {
         // save everything to the DB
         this.save();
@@ -267,31 +286,38 @@ export default class Client extends SendStuff implements IClient {
             this.party.kickMember(this, 'disconnect', true);
 
 
-        global.clients.splice(global.clients.indexOf(this), 1);
+        let idx = global.clients.indexOf(this);
+        if (idx != -1)
+            global.clients.splice(idx, 1);
 
         this.disconnect();
     }
 
-    // insert this socket into a "dead" (disconnected) client
-    replace(old_client: Client) {
-        if (old_client.connected) {
-            return null;
+    // move a new client's socket into this "dead" (disconnected) client
+    // removes the other client from the global.clients list
+    reconnect(new_client: Client) {
+        if (this.connected) {
+            return;
         }
 
-        old_client.socket = this.socket;
-        old_client.socket_type = this.socket_type;
+        this.connected = true;
 
-        // delete self from the list
-        global.clients.splice(global.clients.indexOf(this), 1);
+        this.socket = new_client.socket;
+        this.socket_type = new_client.socket_type;
 
-        return old_client;
-    }
+        this.socket.removeAllListeners();
+        
+        if (this.socket_type === 'tcp')
+            this.bindTCP(this.socket);
+        else
+            this.bindWS(this.socket);
 
-    onReconnect() {
-        if (this.lobby)
-            this.sendLobbyJoin(this.lobby);
-        if (this.room && this.entity)
-            this.sendPlay(this.lobby, this.room, this.entity.pos, this.entity.uuid);
+        // delete self from the list
+        let idx = global.clients.indexOf(new_client);
+        if (idx != -1)
+            global.clients.splice(idx, 1);
+
+        this.onReconnect();
     }
 
 
@@ -517,7 +543,7 @@ export default class Client extends SendStuff implements IClient {
     }
 
     matchMakingStart(req:MatchRequirements):Ticket|string {
-        if (this.ticket) return 'already matchmaking';
+        if (this.ticket !== null) return 'already matchmaking';
         if (this.match) return 'already in a match';
 
         if (this.party) {
@@ -554,9 +580,9 @@ export default class Client extends SendStuff implements IClient {
     /**
      * Save account and profile data to the DB
      */
-    save() {
+    async save() {
         if (this.account !== null) {
-            this.account.save()
+            await this.account.save()
                 .then(() => {
                     // trace('Saved the account successfully');
                 })
@@ -570,7 +596,7 @@ export default class Client extends SendStuff implements IClient {
                 this.profile.state.lobbyid = this.lobby.lobbyid;
             }
 
-            this.profile.save()
+            await this.profile.save()
                 .then(() => {
                     // trace('Saved the profile successfully.');
                 })
@@ -579,7 +605,7 @@ export default class Client extends SendStuff implements IClient {
                 });
         }
         if (this.session !== null) {
-            this.session.save()
+            await this.session.save()
                 .then(() => {
                     // trace('Saved the session successfully');
                 })

TypescriptServer/src/concepts/room.ts

@@ -184,10 +184,10 @@ class Room extends EventEmitter {
         let full_bundle = { cmd: 'entities', room: this.level.room_name, full: true, entities: this.full_bundle };
 
         this.players.forEach(player => {
-            // we will send everything every frame to those who joined recently (so that they 100% get it)
+            // we will send ALL the entities data every frame to those who joined recently (so that they 100% get it)
             if (player.room_join_timer > 0) {
                 player.send(full_bundle);
-                player.room_join_timer--;
+                player.room_join_timer -= 1 / this.tickrate;
             }
             // broadcast the min bundle (only changed entities) to everyone else
             else if (this.bundle.length > 0)
@@ -282,7 +282,7 @@ class Room extends EventEmitter {
             player.entity = player_entity;
         }
         // add to the recently joined list to receive the old entities
-        player.room_join_timer = global.config.room.recently_joined_timer * global.config.tps;
+        player.room_join_timer = global.config.room.recently_joined_timer;
 
         this.emit('player join', player);
     }

TypescriptServer/src/config.ts

@@ -112,7 +112,7 @@ const common_config = {
                             // set to -1 to disable this feature
                             // (!!! setting to 0 might cause problems and unexpected behaviour !!!)
 
-        recently_joined_timer: 2 // (seconds) - time 
+        recently_joined_timer: 2 // (seconds) - time after a client joins to receive ALL entity data
     },
 
     party: {
@@ -163,7 +163,7 @@ const common_config = {
     necessary_login: false, // if true, won't allow a client to join any lobby before logging in
 
     ping_interval: 5 * 1000,
-    reconnect_timeout: 10 * 1000 // keep a "dead" client in all the lobbies after socket disconnecting, waiting to reconnect with the same account
+    reconnect_timeout: 15 * 1000 // keep a "dead" client in all the lobbies after socket disconnecting, waiting to reconnect with the same account
 }
 
 const prod_config = {

TypescriptServer/src/initializers/08_ping.ts

@@ -2,8 +2,11 @@ const ping_interval = setInterval(() => {
     global.clients.forEach((c) => {
         c.sendPing();
 
-        if (c.reconnect_timer < 0) {
-
+        if (!c.connected) {
+            c.reconnect_timer -= global.config.ping_interval;
+            if (c.reconnect_timer < 0) {
+                c.destroy();
+            }
         }
     })
 }, global.config.ping_interval);