ddns 4.1.0b3__py2.py3-none-any.whl → 4.1.0b4__py2.py3-none-any.whl

ddns/__init__.py

@@ -6,7 +6,7 @@ ddns Package
 __description__ = "automatically update DNS records to my IP [域名自动指向本机IP]"
 
 # 编译时，版本会被替换
-__version__ = "4.1.0b3"
+__version__ = "4.1.0b4"
 
 # 时间也会被替换掉
-build_date = "2025-08-11T15:00:49Z"
+build_date = "2025-08-16T02:41:26Z"

ddns/__main__.py

@@ -4,16 +4,16 @@ DDNS
 @author: NewFuture, rufengsuixing
 """
 
+import sys
 from io import TextIOWrapper
-from subprocess import check_output
 from logging import getLogger
-import sys
+from subprocess import check_output
 
-from .__init__ import __version__, __description__, build_date
-from .config import load_configs, Config  # noqa: F401
-from .provider import get_provider_class, SimpleProvider  # noqa: F401
 from . import ip
+from .__init__ import __description__, __version__, build_date
 from .cache import Cache
+from .config import Config, load_configs  # noqa: F401
+from .provider import SimpleProvider, get_provider_class  # noqa: F401
 
 logger = getLogger()
 
@@ -102,11 +102,16 @@ def run(config):
 
 
 def main():
-    encode = sys.stdout.encoding
-    if encode is not None and encode.lower() != "utf-8" and hasattr(sys.stdout, "buffer"):
+    stdout = sys.stdout  # pythonw 模式无 stdout
+    if stdout and stdout.encoding and stdout.encoding.lower() != "utf-8" and hasattr(stdout, "buffer"):
         # 兼容windows 和部分ASCII编码的老旧系统
         sys.stdout = TextIOWrapper(sys.stdout.buffer, encoding="utf-8")
         sys.stderr = TextIOWrapper(sys.stderr.buffer, encoding="utf-8")
+
+    # Windows 下输出一个空行
+    if stdout and sys.platform.startswith("win"):
+        stdout.write("\r\n")
+
     logger.name = "ddns"
 
     # 使用多配置加载器，它会自动处理单个和多个配置

ddns/ip.py

@@ -16,6 +16,24 @@ IPV4_REG = r"((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1
 # https://community.helpsystems.com/forums/intermapper/miscellaneous-topics/5acc4fcf-fa83-e511-80cf-0050568460e4
 IPV6_REG = r"((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))"  # noqa: E501
 
+# 公网IPv4 API列表，按优先级排序
+PUBLIC_IPV4_APIS = [
+    "https://api.ipify.cn",
+    "https://api.ipify.org",
+    "https://4.ipw.cn/",
+    "https://ipinfo.io/ip",
+    "https://api-ipv4.ip.sb/ip",
+    "http://checkip.amazonaws.com",
+]
+
+# 公网IPv6 API列表，按优先级排序
+PUBLIC_IPV6_APIS = [
+    "https://api6.ipify.org/",
+    "https://6.ipw.cn/",
+    "https://api-ipv6.ip.sb/ip",
+    "http://ipv6.icanhazip.com",
+]
+
 
 def default_v4():  # 默认连接外网的ipv4
     s = socket(AF_INET, SOCK_DGRAM)
@@ -60,12 +78,40 @@ def _open(url, reg):
         error(e)
 
 
-def public_v4(url="https://api-ipv4.ip.sb/ip", reg=IPV4_REG):  # 公网IPV4地址
-    return _open(url, reg)
+def _try_multiple_apis(api_list, reg, ip_type):
+    """
+    Try multiple API endpoints until one succeeds
+    """
+    for url in api_list:
+        try:
+            debug("Trying %s API: %s", ip_type, url)
+            result = _open(url, reg)
+            if result:
+                debug("Successfully got %s from %s: %s", ip_type, url, result)
+                return result
+            else:
+                debug("No valid IP found from %s", url)
+        except Exception as e:
+            debug("Failed to get %s from %s: %s", ip_type, url, e)
+    return None
+
+
+def public_v4(url=None, reg=IPV4_REG):  # 公网IPV4地址
+    if url:
+        # 使用指定URL
+        return _open(url, reg)
+    else:
+        # 使用多个API自动重试
+        return _try_multiple_apis(PUBLIC_IPV4_APIS, reg, "IPv4")
 
 
-def public_v6(url="https://api-ipv6.ip.sb/ip", reg=IPV6_REG):  # 公网IPV6地址
-    return _open(url, reg)
+def public_v6(url=None, reg=IPV6_REG):  # 公网IPV6地址
+    if url:
+        # 使用指定URL
+        return _open(url, reg)
+    else:
+        # 使用多个API自动重试
+        return _try_multiple_apis(PUBLIC_IPV6_APIS, reg, "IPv6")
 
 
 def _ip_regex_match(parrent_regex, match_regex):

ddns/util/fileio.py

@@ -23,7 +23,7 @@ def _ensure_directory_exists(file_path):  # type: (str) -> None
         os.makedirs(directory)
 
 
-def read_file_safely(file_path, encoding="utf-8", default=None):  # type: (str, str, str|None) -> str | None
+def read_file_safely(file_path, encoding="utf-8", default=None):  # type: (str, str, str|None) -> str
     """
     Safely read file content with UTF-8 encoding, return None if file doesn't exist or can't be read
 
@@ -37,7 +37,7 @@ def read_file_safely(file_path, encoding="utf-8", default=None):  # type: (str,
     try:
         return read_file(file_path, encoding)
     except Exception:
-        return default
+        return default  # type: ignore
 
 
 def write_file_safely(file_path, content, encoding="utf-8"):  # type: (str, str, str) -> bool

ddns/util/try_run.py

@@ -0,0 +1,37 @@
+# -*- coding:utf-8 -*-
+"""
+Utility: Safe command execution wrapper used across the project.
+Provides a single try_run function with consistent behavior.
+"""
+
+import subprocess
+import sys
+
+
+def try_run(command, logger=None, **kwargs):
+    # type: (list, object, **object) -> str | None
+    """Safely run a subprocess command and return decoded output or None on failure.
+
+    Args:
+        command (list): Command array to execute
+        logger (object, optional): Logger instance for debug output
+        **kwargs: Additional arguments passed to subprocess.check_output
+
+    Returns:
+        str or None: Command output as string, or None if command failed
+
+    - Adds a default timeout=60s on Python 3 to avoid hangs
+    - Decodes output as text via universal_newlines=True
+    - Logs at debug level when logger is provided
+    """
+    try:
+        if sys.version_info[0] >= 3 and "timeout" not in kwargs:
+            kwargs["timeout"] = 60
+        return subprocess.check_output(command, universal_newlines=True, **kwargs)  # type: ignore
+    except Exception as e:  # noqa: BLE001 - broad for subprocess safety
+        if logger is not None:
+            try:
+                logger.debug("Command failed: %s", e)  # type: ignore
+            except Exception:
+                pass
+        return None

{ddns-4.1.0b3.dist-info → ddns-4.1.0b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddns
-Version: 4.1.0b3
+Version: 4.1.0b4
 Summary: Dynamic DNS client for multiple providers, supporting IPv4 and IPv6.
 Author-email: NewFuture <python@newfuture.cc>
 License-Expression: MIT
@@ -138,7 +138,7 @@ Dynamic: license-file
   也可使用一键安装脚本自动下载并安装对应平台的二进制：
 
   ```bash
-  curl -fSL https://ddns.newfuture.cc/install.sh | sh
+  curl -#fSL https://ddns.newfuture.cc/install.sh | sh
   ```
   提示：安装到系统目录（如 /usr/local/bin）可能需要 root 或 sudo 权限；若权限不足，可改为 `sudo sh` 运行。
 

{ddns-4.1.0b3.dist-info → ddns-4.1.0b4.dist-info}/RECORD

@@ -1,8 +1,8 @@
 ddns/__builtins__.pyi,sha256=9ZCOh51Aq6nBUZTt_0TBKpzcUeTxi-KBw-9TkXIGSH4,128
-ddns/__init__.py,sha256=vLLUdvQpiifrwKcrJcQ0Qxcb0jIQOtbY4qMRVvek5a8,258
-ddns/__main__.py,sha256=Ie1Lnnh6fjLPJKLayFbVjLxCKw5lm-0JVab1FjeEj2E,5217
+ddns/__init__.py,sha256=KJr4XPaFaRCOLq4Fwvs0mOh6lIRhExsFH6w4ms402u8,258
+ddns/__main__.py,sha256=VgANBMJ01nI5-nRYyKkIcLG0GOO_AKjHRdqVV0cwLrk,5366
 ddns/cache.py,sha256=A1s3rnOJbPrGEjbGbbISrVg46lZFzZ84WPdzHaCtYBk,5971
-ddns/ip.py,sha256=RjHeU54gRV8k8vXbMYFpe6ucq-FCox-KKlAUG3eyy8Q,3886
+ddns/ip.py,sha256=6H5jYv-TT-o0wSoFAGOlTAbf-TAS92Kx6vafi3LXTA4,5151
 ddns/provider/__init__.py,sha256=qAw-R-l7nUA9L96Tmr2n-T7_g8T9Mah7u615yg2zScY,2793
 ddns/provider/_base.py,sha256=q31rqiiqEmM5Kt7SLdRjcREDrlGdRAQX6mNoe8ULPz8,20065
 ddns/provider/_signature.py,sha256=fF8XxMDkXjia96d1gIVYWc72MVVe65AAnD7qr51qKXA,4140
@@ -22,11 +22,12 @@ ddns/provider/noip.py,sha256=RivoLhWJJJuiBzEbtRnnHiBkcLfbvAGglZKKY9s_lcY,4035
 ddns/provider/tencentcloud.py,sha256=aEWqQ00EWUG-JWW2D0IuJDWZ1OdbTPheGeYSlIh7bqQ,7159
 ddns/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ddns/util/comment.py,sha256=_B8sRpCJksNspsdld4ha03W1TAi-MyPRK7pL7ym0j9k,2199
-ddns/util/fileio.py,sha256=5foYm8DeTFC0-T3HumiD9gBNNdowsGqbxj0eX5YEhPc,3160
+ddns/util/fileio.py,sha256=bykJgmdy3gZ79iUQSVpMprRej1PGMJSDSHedIngFdG4,3169
 ddns/util/http.py,sha256=qxfvpN0xt7GZ-GsHFhij4yjH0frWAC52XfaX5ZigFMw,12942
-ddns-4.1.0b3.dist-info/licenses/LICENSE,sha256=MI-ECjp-Vl7WZLiSPY6r5VwrOReNiICVB1QCXiUGt_s,1111
-ddns-4.1.0b3.dist-info/METADATA,sha256=nmFqWzfvMDNOMyDimNU2miZJrajSkabH4RDOO0rH7hM,19635
-ddns-4.1.0b3.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-ddns-4.1.0b3.dist-info/entry_points.txt,sha256=2-VbA-WZcjebkZrGKvUCuBBRYF4xQNMoLIoGaS234WU,44
-ddns-4.1.0b3.dist-info/top_level.txt,sha256=Se0wn3T8Bc4pj55dGwVrCe8BFwmFCBwQVHF1bTyV0o0,5
-ddns-4.1.0b3.dist-info/RECORD,,
+ddns/util/try_run.py,sha256=juDPxvT5xUabK2DiQNtFIyaATehtserHCVkP7_joSyU,1304
+ddns-4.1.0b4.dist-info/licenses/LICENSE,sha256=MI-ECjp-Vl7WZLiSPY6r5VwrOReNiICVB1QCXiUGt_s,1111
+ddns-4.1.0b4.dist-info/METADATA,sha256=CtRAgOz4l9v8t-l5QxIgBWV2tF2jGtglSfeEbbOC4yg,19636
+ddns-4.1.0b4.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+ddns-4.1.0b4.dist-info/entry_points.txt,sha256=2-VbA-WZcjebkZrGKvUCuBBRYF4xQNMoLIoGaS234WU,44
+ddns-4.1.0b4.dist-info/top_level.txt,sha256=Se0wn3T8Bc4pj55dGwVrCe8BFwmFCBwQVHF1bTyV0o0,5
+ddns-4.1.0b4.dist-info/RECORD,,