pddnsc/sources/ipfy.py

@@ -2,18 +2,20 @@ import httpx
 
 from pddnsc.base import BaseSourceProvider
 
-# https://www.ipify.org/
+
 class IPIFYSource(BaseSourceProvider):
     async def fetch_v4(self) -> str:
         async with httpx.AsyncClient(transport=self.ipv4t) as client:
-            response = await client.get("https://api4.ipify.org")
-            if response.is_success:
-                result = response.text.strip() or None
+            response = await client.get("https://api4.ipify.org/?format=json")
+            if response.status_code == httpx.codes.OK:
+                data = response.json()
+                result = None if not isinstance(data, dict) else data.get("ip")
         return result
 
     async def fetch_v6(self) -> str:
         async with httpx.AsyncClient(transport=self.ipv6t) as client:
-            response = await client.get("https://api6.ipify.org")
-            if response.is_success:
-                result = response.text.strip() or None
+            response = await client.get("https://api6.ipify.org/?format=json")
+            if response.status_code == httpx.codes.OK:
+                data = response.json()
+                result = None if not isinstance(data, dict) else data.get("ip")
         return result

pddnsc/sources/wtfismyip.py

@@ -1,20 +0,0 @@
-import httpx
-
-from pddnsc.base import BaseSourceProvider
-
-# https://wtfismyip.com/
-# https://gitlab.com/wtfismyip/wtfismyip
-class WTFIsMyIP(BaseSourceProvider):
-    async def fetch_v4(self) -> str:
-        async with httpx.AsyncClient(transport=self.ipv4t) as client:
-            response = await client.get("https://text.ipv4.myip.wtf")
-            if response.is_success:
-                result = response.text.strip() or None
-        return result
-
-    async def fetch_v6(self) -> str:
-        async with httpx.AsyncClient(transport=self.ipv6t) as client:
-            response = await client.get("https://text.ipv6.myip.wtf")
-            if response.is_success:
-                result = response.text.strip() or None
-        return result