Fix Epic Online Services (EOS) Protocol

Resolve the issue with the Epic Online Services (EOS) Protocol domain name not functioning properly

Author: BattlefieldDuck

opengsq/protocols/eos.py

@@ -4,6 +4,7 @@
 
 from opengsq.exceptions import ServerNotFoundException
 from opengsq.protocol_base import ProtocolBase
+from opengsq.socket_async import SocketAsync
 
 
 class EOS(ProtocolBase):
@@ -59,17 +60,20 @@ async def _get_matchmaking(self, data: dict):
         return data
 
     async def get_info(self) -> dict:
+        address = await SocketAsync.gethostbyname(self._host)
+        address_bound_port = f':{self._port}'
+
         data = await self._get_matchmaking({
             "criteria": [
                 {
                     "key": "attributes.ADDRESS_s",
                     "op": "EQUAL",
-                    "value": self._host
+                    "value": address
                 },
                 {
                     "key": "attributes.ADDRESSBOUND_s",
                     "op": "CONTAINS",
-                    "value": f':{self._port}'
+                    "value": address_bound_port
                 },
             ]
         })

opengsq/protocols/samp.py

@@ -50,7 +50,7 @@ async def get_rules(self):
 
     async def __send_and_receive(self, data: bytes):
         # Format the address
-        host = SocketAsync.gethostbyname(self._host)
+        host = await SocketAsync.gethostbyname(self._host)
         packet_header = struct.pack('BBBBH', *map(int, host.split('.') + [self._port])) + data
         request = self._request_header + packet_header
 

opengsq/protocols/scum.py

@@ -16,7 +16,7 @@ async def get_status(self, master_servers: list = None) -> dict:
         you may need to cache the master servers if you had
         lots of servers to query.
         """
-        ip = SocketAsync.gethostbyname(self._host)
+        ip = await SocketAsync.gethostbyname(self._host)
 
         if master_servers is None:
             master_servers = await Scum.query_master_servers()

opengsq/protocols/vcmp.py

@@ -41,7 +41,7 @@ async def get_players(self):
 
     async def __send_and_receive(self, data: bytes):
         # Format the address
-        host = SocketAsync.gethostbyname(self._host)
+        host = await SocketAsync.gethostbyname(self._host)
         packet_header = struct.pack('BBBBH', *map(int, host.split('.') + [self._port])) + data
         request = self._request_header + packet_header
 

opengsq/socket_async.py

@@ -1,4 +1,5 @@
 import asyncio
+from concurrent.futures import ThreadPoolExecutor
 import socket
 from enum import Enum, auto
 
@@ -18,8 +19,8 @@ async def send_and_receive(host: str, port: int, timeout: float, data: bytes, ki
             return await sock.recv()
 
     @staticmethod
-    def gethostbyname(hostname: str) -> str:
-        return socket.gethostbyname(hostname)
+    async def gethostbyname(hostname: str):
+        return await asyncio.get_running_loop().run_in_executor(None, socket.gethostbyname, hostname)
 
     def __init__(self, kind: SocketKind = SocketKind.SOCK_DGRAM):
         self.__timeout = None

opengsq/version.py

@@ -1 +1 @@
-__version__ = '2.2.2'
+__version__ = '2.2.3'