Add placeholder server sleeping IP environment

variable

app/app.py

@@ -1,68 +1,20 @@
-import socket
-import threading
-import os
+from requestHandler import RequestHandler
+from utils import docker_container_mapping
 from dockerHandler import DockerHandler
 from nginxHandler import NginxHandler
 
 
-def docker_container_mapping():
-    port_ip_map_str = os.environ.get('PORT_IP_MAP')
-    # Convert the environment variable to a Python dictionary
-    port_ip_map = {}
-    for line in port_ip_map_str.split('\n'):
-        if line:  # ignore empty lines
-            port, ip = line.split(':')
-            port_ip_map[port.strip()] = ip.strip()
-
-    return port_ip_map
-
-
-class RequestHandler(threading.Thread):
-    def __init__(self, port, docker_handler):
-        super().__init__()
-        self.port = port
-        self.docker_handler = docker_handler
-        # Create a TCP/IP socket
-        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        # Bind the socket to the port
-        server_address = ('localhost', self.port)
-        print('starting up on {} port {}'.format(*server_address))
-        self.sock.bind(server_address)
-        # Listen for incoming connections
-        self.sock.listen(1)
-
-    def run(self):
-        while True:
-            print('waiting for a connection on port {}'.format(self.port))
-            self.connection, self.client_address = self.sock.accept()
-            try:
-                print('connection from', self.client_address)
-                self.handle_request()
-            finally:
-                self.connection.close()
-
-    def handle_request(self):
-        print('handling request on port {}'.format(self.port))
-        # Get the Docker container name for this port
-        container_ip = docker_container_mapping().get(str(self.port))
-        if container_ip:
-            # Start the Docker container
-            print('starting docker container {}'.format(container_ip))
-            self.docker_handler.get_container_by_ip(container_ip).start()
-            # Send a response
-            self.connection.sendall("Server starting...".encode('utf-8'))
-        else:
-            print('no docker container mapped to this port')
-
-
 def main():
+    # Create a DockerHandler instance
     docker_handler = DockerHandler(
         'unix://var/run/docker.sock', docker_container_mapping())
 
+    # Create a RequestHandler instance for each port
     for port in range(25560, 25571):
         request_handler = RequestHandler(port, docker_handler)
         request_handler.start()
 
+    # Create an NginxHandler instance
     nginx_handler = NginxHandler('/etc/nginx/nginx.conf')
     nginx_handler.setup_config_file(
         docker_container_mapping(), docker_handler.get_current_container_ip())

app/dockerHandler.py

@@ -32,13 +32,6 @@ class DockerHandler:
         containers = self.client.containers.list(all=True)
 
         for container in containers:
-            print('current network: {}'.format(self.current_network))
-            print('checking container {}'.format(container.name))
-            print('container networks: {}'.format(
-                container.attrs['NetworkSettings']['Networks']))
-            print('container ip: {}'.format(
-                container.attrs['NetworkSettings']['Networks'][self.current_network]['IPAMConfig']['IPv4Address']))
-
             networks = container.attrs['NetworkSettings']['Networks']
             if self.current_network in networks and networks[self.current_network]['IPAMConfig']['IPv4Address'] == ip:
                 print('found docker container {} with ip {} in network {}'.format(

app/nginxHandler.py

@@ -1,4 +1,5 @@
 import os
+import time
 
 
 class NginxHandler:
@@ -24,7 +25,8 @@ class NginxHandler:
             print(f.read())
 
     def setup_config_file(self, port_ip_map, current_container_ip):
-        proxy_timeout = "300ms"
+        placeholder_ip = os.environ.get('PLACEHOLDER_SERVER_SLEEPING_IP')
+        proxy_timeout = "5s"
         self.stop()
         print('Setting up NGINX config file...')
         print('port_ip_map: {}'.format(port_ip_map))
@@ -39,6 +41,10 @@ class NginxHandler:
                 port_ip_map[port]))
             nginx_conf.write(
                 '        server 127.0.0.1:{} backup;\n'.format(port))
+
+            nginx_conf.write(
+                '        server {}:25565 backup;\n'.format(placeholder_ip))
+
             nginx_conf.write('    }\n')
 
             nginx_conf.write('    server {\n')

app/requestHandler.py

@@ -0,0 +1,58 @@
+import json
+import socket
+import threading
+from utils import docker_container_mapping
+
+
+class RequestHandler(threading.Thread):
+    def __init__(self, port, docker_handler):
+        super().__init__()
+        self.port = port
+        self.docker_handler = docker_handler
+        # Create a TCP/IP socket
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        # Bind the socket to the port
+        server_address = ('localhost', self.port)
+        print('starting up on {} port {}'.format(*server_address))
+        self.sock.bind(server_address)
+        # Listen for incoming connections
+        self.sock.listen(1)
+
+    def run(self):
+        while True:
+            print('waiting for a connection on port {}'.format(self.port))
+            self.connection, self.client_address = self.sock.accept()
+            try:
+                print('connection from', self.client_address)
+                self.handle_request()
+            finally:
+                self.connection.close()
+
+    def handle_request(self):
+        print('handling request on port {}'.format(self.port))
+        container_ip = docker_container_mapping().get(str(self.port))
+        if container_ip:
+            request = self.connection.recv(1024)
+            print('---------------------------')
+            print(request)
+            print('---------------------------')
+
+            if request[0] == 0x10:
+                if b'\x01' in request:
+                    print('ping')
+                    self.redirect_to_placeholder()
+                elif b'\x02' in request:
+                    print('join')
+                    print('starting docker container {}'.format(container_ip))
+                    self.docker_handler.get_container_by_ip(
+                        container_ip).start()
+
+            elif request[0] == 0xFE:
+                print('legacy server list ping')
+                self.redirect_to_placeholder()
+
+            else:
+                print('no docker container mapped to this port')
+
+    def redirect_to_placeholder(self):
+        print('redirecting to placeholder')

app/utils.py

@@ -0,0 +1,13 @@
+import os
+
+
+def docker_container_mapping():
+    port_ip_map_str = os.environ.get('PORT_IP_MAP')
+    # Convert the environment variable to a Python dictionary
+    port_ip_map = {}
+    for line in port_ip_map_str.split('\n'):
+        if line:  # ignore empty lines
+            port, ip = line.split(':')
+            port_ip_map[port.strip()] = ip.strip()
+
+    return port_ip_map