From 1f0846297f9a3b189678311596bcb1c499910d87 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 15 Mar 2025 02:43:11 +0100
Subject: [PATCH] websocket is our default port/connection (#5679)

---
 Dockerfile                        | 2 +-
 README.md                         | 6 +++---
 docker-compose.yml                | 1 -
 docker-compose.yml.windows        | 1 -
 servatrice/scripts/register.py    | 2 +-
 servatrice/servatrice.ini.example | 5 +++--
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 31b84f026..330c51b4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,6 @@ RUN cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=
 
 WORKDIR /home/servatrice
 
-EXPOSE 4747 4748
+EXPOSE 4748
 
 ENTRYPOINT [ "servatrice", "--log-to-console" ]
diff --git a/README.md b/README.md
index 86c669763..f7fffdedf 100644
--- a/README.md
+++ b/README.md
@@ -128,9 +128,9 @@ First, create an image from the Dockerfile<br>
 `cd /path/to/Cockatrice-Repo/`
 `docker build -t servatrice .`<br>
 And then run it<br>
-`docker run -i -p 4747:4747/tcp -t servatrice:latest`<br>
+`docker run -i -p 4748:4748 -t servatrice:latest`<br>
 
->Note: Running this command exposes the TCP port 4747 of the docker container<br>
+>Note: Running this command exposes the port 4748 of the docker container<br>
 to permit connections to the server.
 
 Find more information on how to use Servatrice with Docker in our [wiki](https://github.com/Cockatrice/Cockatrice/wiki/Setting-up-Servatrice#using-docker).
@@ -145,7 +145,7 @@ docker-compose build    # Build the Servatrice image using the same Dockerfile a
 docker-compose up       # Setup and run both the MySQL server and Servatrice.
 ```
 
->Note: Similar to the above Docker setup, this will expose TCP ports 4747 and 4748.
+>Note: Similar to the above Docker setup, this will expose port 4748.
 
 >Note: The first time running the docker-compose setup, the MySQL server will take a little time to run the initial setup scripts. Due to this, the Servatrice instance may fail the first few attempts to connect to the database. Servatrice is set to `restart: always` in the docker-compose.yml, which will allow it to continue attempting to start up. Once the MySQL scripts have completed, Servatrice should then connect automatically on the next attempt.
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 7cef0ffe0..3d9f9f38f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,6 @@ services:
     depends_on:
       - mysql
     ports:
-      - "4747:4747"
       - "4748:4748"
     entrypoint: "/bin/bash -c 'sleep 10; servatrice --config /tmp/servatrice.ini --log-to-console'"
     restart: always
diff --git a/docker-compose.yml.windows b/docker-compose.yml.windows
index 8634e0241..6663c90fd 100644
--- a/docker-compose.yml.windows
+++ b/docker-compose.yml.windows
@@ -20,7 +20,6 @@ services:
     depends_on:
       - mysql
     ports:
-      - "4747:4747"
       - "4748:4748"
     entrypoint: "/bin/bash -c 'sleep 10; servatrice --config /tmp/servatrice.ini --log-to-console'"
     restart: always
diff --git a/servatrice/scripts/register.py b/servatrice/scripts/register.py
index 427c9e72b..d33db2e21 100755
--- a/servatrice/scripts/register.py
+++ b/servatrice/scripts/register.py
@@ -9,7 +9,7 @@ from pypb.event_server_identification_pb2 import Event_ServerIdentification as S
 from pypb.response_pb2 import Response
 
 HOST = "localhost"
-PORT = 4747
+PORT = 4748
 
 CMD_ID = 1
 
diff --git a/servatrice/servatrice.ini.example b/servatrice/servatrice.ini.example
index 8a214f39d..fac743c39 100644
--- a/servatrice/servatrice.ini.example
+++ b/servatrice/servatrice.ini.example
@@ -20,7 +20,8 @@ id=1
 
 host=any
 
-; The TCP port number servatrice will listen on for clients; default is 4747
+; The TCP port number Servatrice will listen on for clients; default is 4747;
+; Will be removed in the future, use websocket connection instead
 port=4747
 
 ; Servatrice can scale up to serve big number of users using more than one parallel thread of execution;
@@ -421,7 +422,7 @@ enable_forgotpassword_audit=true
 ; "servers" table of the database. Default is 0 (disabled)
 active=0
 
-; The TCP port number servatrice will listen on for other servers; default is 14747
+; The TCP port number Servatrice will listen on for other servers; default is 14747
 port=14747
 
 ; Server-to-server communication needs a valid certificate in PEM format. Enter its filename in this setting