fix(hosts): priority after update hosts

Author: M03ED

app/core/hosts.py

@@ -8,8 +8,8 @@
 from app.core.manager import core_manager
 from app.db import GetDB
 from app.db.crud.host import get_host_by_id, get_hosts, upsert_inbounds
-from app.db.models import ProxyHost, ProxyHostSecurity
-from app.models.host import MuxSettings, TransportSettings, BaseHost
+from app.db.models import ProxyHostSecurity
+from app.models.host import BaseHost
 
 
 def _prepare_host_data(host: BaseHost) -> dict:
@@ -36,6 +36,7 @@ def _prepare_host_data(host: BaseHost) -> dict:
         else {},
         "status": host.status,
         "ech_config_list": host.ech_config_list,
+        "priority": host.priority,
     }
 
 
@@ -108,7 +109,9 @@ async def get_host(self, id: int) -> dict | None:
     @cached()
     async def get_hosts(self) -> dict[int, dict]:
         async with self._lock:
-            return deepcopy(self._hosts)
+            # Return hosts sorted by priority
+            sorted_hosts = dict(sorted(self._hosts.items(), key=lambda x: x[1]["priority"]))
+            return deepcopy(sorted_hosts)
 
 
 host_manager: HostManager = HostManager()

app/db/crud/host.py

@@ -123,20 +123,21 @@ async def get_hosts(
     db: AsyncSession,
     offset: Optional[int] = 0,
     limit: Optional[int] = 0,
-    sort: ProxyHostSortingOptions = "priority",
+    sort: ProxyHostSortingOptions = ProxyHostSortingOptions.priority,
 ) -> list[ProxyHost]:
     """
-    Retrieves hosts.
+    Retrieves hosts sorted by priority (ascending) by default.
 
     Args:
         db (AsyncSession): Database session.
         offset (Optional[int]): Number of records to skip.
         limit (Optional[int]): Number of records to retrieve.
+        sort (ProxyHostSortingOptions): Sorting option. Defaults to priority ascending.
 
     Returns:
-        List[ProxyHost]: List of hosts for the inbound.
+        List[ProxyHost]: List of hosts sorted by the specified option.
     """
-    stmt = select(ProxyHost).order_by(sort)
+    stmt = select(ProxyHost).order_by(sort.value)
 
     if offset:
         stmt = stmt.offset(offset)