remove postgres

Makefile

@@ -1,7 +1,7 @@
-.PHONY: start stop restart up-server up-web up-postgres ssh logs
+.PHONY: start stop restart up-server up-web ssh logs
 
 # Start all services
-start: | up-web up-server up-postgres
+start: | up-web up-server
 
 # Kill all services
 stop:
@@ -18,10 +18,6 @@ up-server:
 up-web:
 	@docker-compose up -d web
 
-# Start the postgres container
-up-postgres:
-	@docker-compose up -d postgres
-
 # Clears the build cache and rebuilds the container
 build-server-fresh:
 	@docker-compose build --no-cache server
@@ -30,10 +26,6 @@ build-server-fresh:
 build-web-fresh:
 	@docker-compose build --no-cache web
 
-# Clears the build cache and rebuilds the container
-build-postgres-fresh:
-	@docker-compose build --no-cache postgres
-
 # SSH into a container
 # EXAMPLE: make ssh tar=web
 ssh:
@@ -49,7 +41,3 @@ logs:
 # Same as "logs" but with timestamps
 logst:
 	@docker logs -t -f deuces-$${tar} --tail ${tail}
-
-# Enter Postgres console
-psql:
-	@docker exec -it deuces-postgres psql -U deuces_dev deuces

docker-compose.yml

@@ -7,17 +7,10 @@ services:
     container_name: deuces-server
     build: ./server
     network_mode: "host"
-    depends_on:
-      - postgres
     volumes:
       - "./server:/opt/server/"
     ports:
       - "3012:3012"
-    environment:
-      POSTGRES_HOST: localhost
-      POSTGRES_USER: deuces_dev
-      POSTGRES_PASSWORD: deuces_dev
-      POSTGRES_DB: deuces
 
   # Frontend website
   web:
@@ -33,14 +26,3 @@ services:
       - "3000:3000"
     environment:
       - TBD=for_later
-
-  postgres:
-    image: postgres:10.4
-    container_name: deuces-postgres
-    network_mode: "host"
-    ports:
-      - "5432:5432"
-    environment:
-      POSTGRES_USER: deuces_dev
-      POSTGRES_PASSWORD: deuces_dev
-      POSTGRES_DB: deuces

server/deuces.js

@@ -291,23 +291,6 @@ class Deuces {
 	setPlayerName(playerIdx, name) {
 		this.players[playerIdx].name = name;
 	}
-
-	load(data) {
-		Object.assign(this, data);
-		this.players = this.players.map(Player.deserialize);
-	}
-
-	serialize() {
-		const data = Object.assign(
-			{},
-			this,
-			{ players: this.players.map(player => player.serialize()) },
-		);
-
-		// delete data.emitter;
-		data.emitter = undefined;
-		return data;
-	}
 }
 
 module.exports = Deuces;

server/game.js

@@ -74,7 +74,6 @@ class Game {
 	}
 
 	onUpdate() {
-		this.saveToDB();
 		this.updateAllClients();
 	}
 
@@ -83,36 +82,6 @@ class Game {
 			client.emit('game_update', this.deuces.getGameStateForPlayer(client.player));
 		});
 	}
-
-	loadFromDBRecord(record) {
-		this.deuces = Deuces.fromDBRecord(record.deuces);
-	}
-
-	async createDBRecord() {
-		await db.games.insert({
-			id: this.id,
-			numplayers: this.numPlayers,
-		});
-
-		this.saveToDB();
-	}
-
-	saveToDB() {
-		return db.games.update({
-			id: this.id,
-		}, {
-			active: !this.deuces.hasWinner(),
-			deuces: this.deuces,
-		});
-	}
-
-	static fromDBRecord(record) {
-		const { id, numplayers } = record;
-
-		const game = new Game(id, numplayers);
-		game.deuces.load(record.deuces);
-		return game;
-	}
 }
 
 module.exports = Game;

server/package.json

@@ -15,7 +15,6 @@
     "deasync": "^0.1.15",
     "dotenv": "^8.0.0",
     "express": "^4.17.1",
-    "massive": "^5.11.2",
     "pokersolver": "^2.1.3",
     "shortid": "^2.2.14",
     "socket.io": "^2.2.0"

server/server.js

@@ -4,7 +4,6 @@ const express = require('express');
 const bodyParser = require('body-parser');
 const cors = require('cors');
 
-const theDbToConnect = require('./db');
 const Game = require('./game');
 const loudSocket = require('./loud_socket');
 const shortid = require('shortid');
@@ -13,21 +12,6 @@ const games = new Map();
 const port = 3012;
 
 (async function main() {
-	global.db = await theDbToConnect;
-
-	if(typeof db.games === 'undefined') {
-		await db.query(`CREATE TABLE IF NOT EXISTS games(
-			id VARCHAR(100) PRIMARY KEY,
-			numPlayers INTEGER,
-			active BOOLEAN,
-			deuces jsonb
-		)`);
-
-		global.db = await db.reload();
-	}
-
-	recoverGames(db);
-
 	// Listen for clients
 	const app = express();
 	app.use(bodyParser.urlencoded({ extended: true }));
@@ -64,7 +48,6 @@ function createGame(numPlayers) {
 	}
 
 	const game = new Game(id, numPlayers, createSimilarGame);
-	game.createDBRecord();
 	games.set(id, game);
 	return id;
 }
@@ -91,14 +74,3 @@ function routeToGame(socket) {
 
 	game.onClientConnect(socket);
 }
-
-async function recoverGames(db) {
-	const activeGames = await db.games.find({ active: true });
-	activeGames.forEach(recoverGame);
-}
-
-function recoverGame(gameRecord) {
-	// console.log('recoverGame', gameRecord);
-	const game = Game.fromDBRecord(gameRecord);
-	games.set(game.id, game);
-}