feat: check and only update tokens that are installed from the same system

Author: TimilsinaBimal

app/services/catalog_updater.py

@@ -29,11 +29,11 @@ async def refresh_catalogs_for_credentials(token: str, credentials: dict[str, An
     try:
         addon_installed = await stremio_service.is_addon_installed(auth_key)
         if not addon_installed:
-            logger.info("User has not installed addon. Removing token from redis")
+            logger.info(f"[{redact_token(token)}] User has not installed addon. Removing token from redis")
             await token_store.delete_token(key=token)
             return True
     except Exception as e:
-        logger.exception(f"Failed to check if addon is installed: {e}")
+        logger.exception(f"[{redact_token(token)}] Failed to check if addon is installed: {e}")
 
     try:
         library_items = await stremio_service.get_library_items()
@@ -45,15 +45,15 @@ async def refresh_catalogs_for_credentials(token: str, credentials: dict[str, An
                 user_settings = UserSettings(**credentials["settings"])
             except Exception as e:
                 user_settings = get_default_settings()
-                logger.warning(f"Failed to parse user settings from credentials: {e}")
+                logger.warning(f"[{redact_token(token)}] Failed to parse user settings from credentials: {e}")
 
         catalogs = await dynamic_catalog_service.get_dynamic_catalogs(
             library_items=library_items, user_settings=user_settings
         )
         logger.info(f"[{redact_token(token)}] Prepared {len(catalogs)} catalogs")
         return await stremio_service.update_catalogs(catalogs, auth_key)
     except Exception as e:
-        logger.exception(f"Failed to update catalogs: {e}", exc_info=True)
+        logger.exception(f"[{redact_token(token)}] Failed to update catalogs: {e}", exc_info=True)
         raise e
     finally:
         await stremio_service.close()

app/services/stremio_service.py

@@ -1,4 +1,5 @@
 import asyncio
+from urllib.parse import urlparse
 
 import httpx
 from async_lru import alru_cache
@@ -12,6 +13,14 @@
 ]
 
 
+def match_hostname(url: str, hostname: str) -> bool:
+    """
+    Checks if the hostname extracted from a URL matches a given hostname string.
+    """
+    parsed_url = urlparse(url)
+    return parsed_url.hostname == hostname
+
+
 class StremioService:
     """Service for interacting with Stremio API to fetch user library."""
 
@@ -340,7 +349,9 @@ async def update_catalogs(self, catalogs: list[dict], auth_key: str | None = Non
         logger.info(f"Found {len(addons)} addons")
         # find addon with id "com.watchly"
         for addon in addons:
-            if addon.get("manifest", {}).get("id") == settings.ADDON_ID:
+            if addon.get("manifest", {}).get("id") == settings.ADDON_ID and match_hostname(
+                addon.get("transportUrl"), settings.HOST_NAME
+            ):
                 logger.info(f"Found addon with id {settings.ADDON_ID}")
                 addon["manifest"]["catalogs"] = catalogs
                 break
@@ -350,6 +361,8 @@ async def is_addon_installed(self, auth_key: str | None = None):
         auth_key = auth_key or await self.get_auth_key()
         addons = await self.get_addons(auth_key)
         for addon in addons:
-            if addon.get("manifest", {}).get("id") == settings.ADDON_ID:
+            if addon.get("manifest", {}).get("id") == settings.ADDON_ID and match_hostname(
+                addon.get("transportUrl"), settings.HOST_NAME
+            ):
                 return True
         return False