trucoshi 0.3.51 → 0.3.52

package/dist/lib/classes/Lobby.d.ts

@@ -2,21 +2,25 @@ import { IGameLoop } from "./GameLoop";
 import { IPlayer } from "./Player";
 import { ITable } from "./Table";
 import { ITeam } from "./Team";
+import { IQueue } from "./Queue";
 export interface IPrivateLobby {
     gameLoop?: IGameLoop;
     lastTeamIdx: 0 | 1;
     _players: Array<IPlayer | {
         id?: undefined;
         session?: undefined;
+        teamIdx?: undefined;
     }>;
     get players(): Array<IPlayer>;
     teams: Array<ITeam>;
     maxPlayers: number;
     table: ITable | null;
+    queue: IQueue;
     full: boolean;
     ready: boolean;
     started: boolean;
-    addPlayer(key: string, id: string, session: string, teamIdx?: 0 | 1, isOwner?: boolean): IPlayer;
+    _addPlayer(key: string, id: string, session: string, teamIdx?: 0 | 1, isOwner?: boolean): IPlayer;
+    addPlayer(key: string, id: string, session: string, teamIdx?: 0 | 1, isOwner?: boolean): Promise<IPlayer>;
     removePlayer(session: string): ILobby;
     calculateReady(): boolean;
     calculateFull(): boolean;

package/dist/lib/classes/Lobby.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Lobby = void 0;
 const constants_1 = require("../constants");
@@ -8,6 +17,7 @@ const Match_1 = require("./Match");
 const Player_1 = require("./Player");
 const Table_1 = require("./Table");
 const Team_1 = require("./Team");
+const Queue_1 = require("./Queue");
 function Lobby(teamSize) {
     const lobby = {
         lastTeamIdx: 1,
@@ -16,6 +26,7 @@ function Lobby(teamSize) {
             return lobby._players.filter((player) => Boolean(player && player.id));
         },
         teams: [],
+        queue: (0, Queue_1.Queue)(),
         table: null,
         maxPlayers: teamSize ? teamSize * 2 : 6,
         full: false,
@@ -34,8 +45,14 @@ function Lobby(teamSize) {
             lobby.full = lobby.players.length >= lobby.maxPlayers;
             return lobby.full;
         },
-        addPlayer(key, id, session, teamIdx, isOwner) {
+        addPlayer(...params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return lobby.queue.queue(() => lobby._addPlayer(...params));
+            });
+        },
+        _addPlayer(key, id, session, teamIdx, isOwner) {
             const exists = lobby.players.find((player) => player.session === session);
+            const hasMovedSlots = Boolean(exists);
             if (exists) {
                 if (exists.teamIdx === teamIdx) {
                     return exists;
@@ -56,7 +73,8 @@ function Lobby(teamSize) {
             }
             const player = (0, Player_1.Player)(key, id, teamIdx !== undefined ? teamIdx : Number(!lobby.lastTeamIdx), isOwner);
             player.setSession(session);
-            lobby.lastTeamIdx = Number(!lobby.lastTeamIdx);
+            lobby.lastTeamIdx = player.teamIdx;
+            // Find team available slot
             for (let i = 0; i < lobby._players.length; i++) {
                 if (!lobby._players[i].id) {
                     if (player.teamIdx === 0 && i % 2 === 0) {
@@ -69,6 +87,21 @@ function Lobby(teamSize) {
                     }
                 }
             }
+            if (hasMovedSlots) {
+                // Reorder other players to fit possible empty slot left by this player
+                for (let i = 0; i < lobby._players.length; i++) {
+                    if (!lobby._players[i].id) {
+                        for (let j = i + 2; j < lobby._players.length; j = j + 2) {
+                            if (lobby._players[j].id) {
+                                const p = Object.assign({}, lobby._players[j]);
+                                lobby._players[j] = {};
+                                lobby._players[i] = p;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
             lobby.calculateFull();
             lobby.calculateReady();
             return player;

package/dist/lib/classes/Queue.d.ts

@@ -0,0 +1,5 @@
+export interface IQueue {
+    promise: Promise<any>;
+    queue(operation: () => any): Promise<any>;
+}
+export declare const Queue: () => IQueue;

package/dist/lib/classes/Queue.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Queue = void 0;
+const Queue = () => {
+    const queue = {
+        promise: Promise.resolve(true),
+        queue(operation) {
+            return new Promise((resolve) => {
+                queue.promise = queue.promise.then(operation).then(resolve).catch(resolve);
+            });
+        },
+    };
+    return queue;
+};
+exports.Queue = Queue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trucoshi",
-  "version": "0.3.51",
+  "version": "0.3.52",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "scripts": {