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

ddns/__builtins__.pyi

@@ -1,5 +1,6 @@
 # coding=utf-8
 # flake8: noqa: F401
+# ruff: noqa: F403
 from typing import *
 from .provider import SimpleProvider
 import logging

ddns/__init__.py

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

ddns/__main__.py

@@ -4,20 +4,18 @@ 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_config, Config  # noqa: F401
-from .provider import get_provider_class, SimpleProvider
 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()
-# Set user agent for All Providers
-SimpleProvider.user_agent = SimpleProvider.user_agent.format(version=__version__)
 
 
 def get_ip(ip_type, rules):
@@ -94,7 +92,7 @@ def run(config):
     # dns provider class
     provider_class = get_provider_class(config.dns)
     dns = provider_class(
-        config.id, config.token, endpoint=config.endpoint, logger=logger, proxy=config.proxy, verify_ssl=config.ssl
+        config.id, config.token, endpoint=config.endpoint, logger=logger, proxy=config.proxy, ssl=config.ssl
     )
     cache = Cache.new(config.cache, config.md5(), logger)
     return (
@@ -104,14 +102,49 @@ 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"
-    config = load_config(__description__, __version__, build_date)
-    run(config)
+
+    # 使用多配置加载器，它会自动处理单个和多个配置
+    configs = load_configs(__description__, __version__, build_date)
+
+    if len(configs) == 1:
+        # 单个配置，使用原有逻辑（向后兼容）
+        config = configs[0]
+        success = run(config)
+        if not success:
+            sys.exit(1)
+    else:
+        # 多个配置，使用新的批处理逻辑
+        overall_success = True
+        for i, config in enumerate(configs):
+            # 如果log_level有值则设置setLevel
+            if hasattr(config, "log_level") and config.log_level:
+                logger.setLevel(config.log_level)
+            logger.info("Running configuration %d/%d", i + 1, len(configs))
+            # 记录当前provider
+            logger.info("Using DNS provider: %s", config.dns)
+            success = run(config)
+            if not success:
+                overall_success = False
+                logger.error("Configuration %d failed", i + 1)
+            else:
+                logger.info("Configuration %d completed successfully", i + 1)
+
+        if not overall_success:
+            logger.error("Some configurations failed")
+            sys.exit(1)
+        else:
+            logger.info("All configurations completed successfully")
 
 
 if __name__ == "__main__":

ddns/ip.py

@@ -5,7 +5,7 @@ from os import name as os_name, popen
 from socket import socket, getaddrinfo, gethostname, AF_INET, AF_INET6, SOCK_DGRAM
 from logging import debug, error
 
-from .util.http import send_http_request
+from .util.http import request
 
 # 模块级别的SSL验证配置，默认使用auto模式
 ssl_verify = "auto"
@@ -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)
@@ -48,9 +66,8 @@ def local_v4(i=0):  # 本地ipv4地址
 def _open(url, reg):
     try:
         debug("open: %s", url)
-        response = send_http_request(
-            method="GET", url=url, headers={"User-Agent": "Mozilla/5.0 ddns"}, verify_ssl=ssl_verify
-        )
+        # IP 模块重试3次
+        response = request("GET", url, verify=ssl_verify, retries=2)
         res = response.body
         debug("response: %s", res)
         match = compile(reg).search(res)
@@ -61,16 +78,43 @@ 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):
-
     ip_pattern = compile(parrent_regex)
     matcher = compile(match_regex)
 

ddns/provider/_base.py

@@ -58,7 +58,7 @@ Defines a unified interface to support extension and adaptation across providers
 from abc import ABCMeta, abstractmethod
 from json import loads as jsondecode, dumps as jsonencode
 from logging import Logger, getLogger  # noqa:F401 # type: ignore[no-redef]
-from ..util.http import send_http_request, quote, urlencode
+from ..util.http import request, quote, urlencode
 
 TYPE_FORM = "application/x-www-form-urlencoded"
 TYPE_JSON = "application/json"
@@ -102,13 +102,11 @@ class SimpleProvider(object):
     accept = TYPE_JSON  # type: str | None
     # Decode Response as JSON by default
     decode_response = True  # type: bool
-    # UA 可自定义, 可在子类中覆盖，空则不设置
-    user_agent = "DDNS/{version} (ddns@newfuture.cc)"
     # Description
     remark = "Managed by [DDNS](https://ddns.newfuture.cc)"
 
-    def __init__(self, id, token, logger=None, verify_ssl="auto", proxy=None, endpoint=None, **options):
-        # type: (str, str, Logger | None, bool|str, Sequence[str|None]|None, str|None, **object) -> None
+    def __init__(self, id, token, logger=None, ssl="auto", proxy=None, endpoint=None, **options):
+        # type: (str, str, Logger | None, bool|str, list[str]|None, str|None, **object) -> None
         """
         初始化服务商对象
 
@@ -117,14 +115,18 @@ class SimpleProvider(object):
         Args:
             id (str): 身份认证 ID / Authentication ID
             token (str): 密钥 / Authentication Token
+            proxy (list[str | None] | None): 代理配置，支持代理列表
             options (dict): 其它参数 / Additional options
         """
         self.id = id
         self.token = token
         if endpoint:
             self.endpoint = endpoint
-        self._proxy = proxy if proxy and len(proxy) else [None]
-        self._ssl = verify_ssl
+
+        # 处理代理配置
+        self._proxy = proxy  # 代理列表或None
+
+        self._ssl = ssl
 
         self.options = options
         name = self.__class__.__name__
@@ -227,26 +229,11 @@ class SimpleProvider(object):
         # 处理headers
         if self.accept and "accept" not in headers and "Accept" not in headers:
             headers["accept"] = self.accept
-        if "user-agent" not in headers and "User-Agent" not in headers and self.user_agent:
-            headers["user-agent"] = self.user_agent
-        if len(headers) > 3:
+        if len(headers) > 2:
             self.logger.debug("headers:\n%s", {k: self._mask_sensitive_data(v) for k, v in headers.items()})
 
-        response = None  # type: Any
-        for p in self._proxy:
-            if p:
-                self.logger.debug("Using proxy: %s", p)
-            try:
-                response = send_http_request(
-                    method, url, body=body_data, headers=headers, proxy=p, verify_ssl=self._ssl
-                )
-                break  # 成功发送请求，跳出循环
-            except Exception as e:
-                self.logger.warning("Failed to send request: %s", e)
-        if not response:
-            if len(self._proxy) > 1:
-                self.logger.error("Failed to send request via all proxies: %s", self._proxy)
-            raise RuntimeError("Failed to send request to {}".format(url))
+        # 直接传递代理列表给request函数
+        response = request(method, url, body_data, headers=headers, proxies=self._proxy, verify=self._ssl, retries=2)
         # 处理响应
         status_code = response.status
         if not (200 <= status_code < 300):
@@ -257,7 +244,7 @@ class SimpleProvider(object):
         if status_code >= 500 or status_code in (400, 401, 403):
             self.logger.error("HTTP error:\n%s", res)
             if status_code == 400:
-                raise RuntimeError("请求参数错误 [400]: " + response.reason)
+                raise RuntimeError("参数错误 [400]: " + response.reason)
             elif status_code == 401:
                 raise RuntimeError("认证失败 [401]: " + response.reason)
             elif status_code == 403:

ddns/provider/alidns.py

@@ -5,9 +5,10 @@ AliDNS API
 @author: NewFuture
 """
 
-from ._base import TYPE_FORM, BaseProvider, join_domain, encode_params
+from time import gmtime, strftime, time
+
+from ._base import TYPE_FORM, BaseProvider, encode_params, join_domain
 from ._signature import hmac_sha256_authorization, sha256_hash
-from time import strftime, gmtime, time
 
 
 class AliBaseProvider(BaseProvider):
@@ -116,7 +117,7 @@ class AlidnsProvider(AliBaseProvider):
             TTL=ttl,
             Line=line,
             **extra
-        )
+        )  # fmt: skip
         if data and data.get("RecordId"):
             self.logger.info("Record created: %s", data)
             return True
@@ -143,7 +144,7 @@ class AlidnsProvider(AliBaseProvider):
             TTL=ttl,
             Line=line or old_record.get("Line"),
             **extra
-        )
+        )  # fmt: skip
         if data and data.get("RecordId"):
             self.logger.info("Record updated: %s", data)
             return True

ddns/provider/aliesa.py

@@ -5,10 +5,11 @@ AliESA API
 @author: NewFuture, GitHub Copilot
 """
 
-from .alidns import AliBaseProvider
-from ._base import join_domain, TYPE_JSON
 from time import strftime
 
+from ._base import TYPE_JSON, join_domain
+from .alidns import AliBaseProvider
+
 
 class AliesaProvider(AliBaseProvider):
     """阿里云边缘安全加速(ESA) DNS Provider"""
@@ -82,7 +83,7 @@ class AliesaProvider(AliBaseProvider):
             Data={"Value": value},
             Ttl=ttl or 1,
             **extra
-        )
+        )  # fmt: skip
 
         if data and data.get("RecordId"):
             self.logger.info("Record created: %s", data)
@@ -115,7 +116,7 @@ class AliesaProvider(AliBaseProvider):
             Data={"Value": value},
             Ttl=ttl,
             **extra
-        )
+        )  # fmt: skip
 
         if data and data.get("RecordId"):
             self.logger.info("Record updated: %s", data)

ddns/provider/callback.py

@@ -5,6 +5,7 @@ Custom Callback API
 
 @author: 老周部落, NewFuture
 """
+
 from ._base import TYPE_JSON, SimpleProvider
 from time import time
 from json import loads as jsondecode

ddns/provider/cloudflare.py

@@ -4,7 +4,7 @@ CloudFlare API
 @author: TongYifan, NewFuture
 """
 
-from ._base import BaseProvider, TYPE_JSON, join_domain
+from ._base import TYPE_JSON, BaseProvider, join_domain
 
 
 class CloudflareProvider(BaseProvider):
@@ -92,7 +92,7 @@ class CloudflareProvider(BaseProvider):
             content=value,
             ttl=ttl,
             **extra
-        )
+        )  # fmt: skip
         self.logger.debug("Record updated: %s", data)
         if data:
             return True

ddns/provider/debug.py

@@ -8,7 +8,6 @@ from ._base import SimpleProvider
 
 
 class DebugProvider(SimpleProvider):
-
     def _validate(self):
         """无需任何验证"""
         pass

ddns/provider/dnscom.py

@@ -5,10 +5,11 @@ www.51dns.com (原dns.com)
 @author: Bigjin<i@bigjin.com>, NewFuture
 """
 
-from ._base import BaseProvider, TYPE_FORM, encode_params
 from hashlib import md5
 from time import time
 
+from ._base import TYPE_FORM, BaseProvider, encode_params
+
 
 class DnscomProvider(BaseProvider):
     """
@@ -82,7 +83,7 @@ class DnscomProvider(BaseProvider):
             TTL=ttl,
             viewID=line,
             **extra
-        )
+        )  # fmt: skip
         if res and res.get("recordID"):
             self.logger.info("Record created: %s", res)
             return True

ddns/provider/dnspod.py

@@ -101,9 +101,7 @@ class DnspodProvider(BaseProvider):
     def _query_record(self, zone_id, subdomain, main_domain, record_type, line, extra):
         # type: (str, str, str, str, str | None, dict) -> dict | None
         """查询记录 list 然后逐个查找 https://docs.dnspod.cn/api/record-list/"""
-        res = self._request(
-            "Record.List", domain_id=zone_id, sub_domain=subdomain, record_type=record_type, line=line
-        )
+        res = self._request("Record.List", domain_id=zone_id, sub_domain=subdomain, record_type=record_type, line=line)
         # length="3000"
         records = res.get("records", [])
         n = len(records)

ddns/provider/edgeone.py

@@ -5,6 +5,7 @@ Tencent Cloud EdgeOne API
 API Documentation: https://cloud.tencent.com/document/api/1552/80731
 @author: NewFuture
 """
+
 from ddns.provider._base import join_domain
 from .tencentcloud import TencentCloudProvider
 

ddns/provider/huaweidns.py

@@ -5,9 +5,10 @@ HuaweiDNS API
 @author: NewFuture
 """
 
-from ._base import BaseProvider, TYPE_JSON, join_domain, encode_params
+from time import gmtime, strftime
+
+from ._base import TYPE_JSON, BaseProvider, encode_params, join_domain
 from ._signature import hmac_sha256_authorization, sha256_hash
-from time import strftime, gmtime
 
 
 class HuaweiDNSProvider(BaseProvider):
@@ -114,7 +115,7 @@ class HuaweiDNSProvider(BaseProvider):
             ttl=ttl,
             line=line,
             **extra
-        )
+        )  # fmt: skip
         if res and res.get("id"):
             self.logger.info("Record created: %s", res)
             return True
@@ -134,7 +135,7 @@ class HuaweiDNSProvider(BaseProvider):
             records=[value],
             ttl=ttl if ttl is not None else old_record.get("ttl"),
             **extra
-        )
+        )  # fmt: skip
         if res and res.get("id"):
             self.logger.info("Record updated: %s", res)
             return True

ddns/provider/noip.py

@@ -4,8 +4,7 @@ No-IP (noip.com) Dynamic DNS API
 @author: GitHub Copilot
 """
 
-import base64
-from ._base import SimpleProvider, TYPE_FORM
+from ._base import SimpleProvider, TYPE_FORM, quote
 
 
 class NoipProvider(SimpleProvider):
@@ -24,13 +23,23 @@ class NoipProvider(SimpleProvider):
 
     def _validate(self):
         """
-        Validate authentication credentials for No-IP
+        Validate authentication credentials for No-IP and update endpoint with auth
         """
+        # Check endpoint first
+        if not self.endpoint or "://" not in self.endpoint:
+            raise ValueError("API endpoint must be defined and contain protocol")
+
         if not self.id:
             raise ValueError("No-IP requires username as 'id'")
         if not self.token:
             raise ValueError("No-IP requires password as 'token'")
 
+        # Update endpoint with URL-encoded auth credentials
+        protocol, domain = self.endpoint.split("://", 1)
+        self.endpoint = "{0}://{1}:{2}@{3}".format(
+            protocol, quote(self.id, safe=""), quote(self.token, safe=""), domain
+        )
+
     def set_record(self, domain, value, record_type="A", ttl=None, line=None, **extra):
         """
         Update DNS record using No-IP Dynamic Update API
@@ -59,21 +68,10 @@ class NoipProvider(SimpleProvider):
         # Prepare request parameters
         params = {"hostname": domain, "myip": value}
 
-        # Prepare HTTP Basic Authentication headers
-        auth_string = "{0}:{1}".format(self.id, self.token)
-        if not isinstance(auth_string, bytes):  # Python 3
-            auth_bytes = auth_string.encode("utf-8")
-        else:  # Python 2
-            auth_bytes = auth_string
-
-        auth_b64 = base64.b64encode(auth_bytes).decode("ascii")
-        headers = {
-            "Authorization": "Basic {0}".format(auth_b64),
-        }
-
         try:
             # Use GET request as it's the most common method for DDNS
-            response = self._http("GET", "/nic/update", queries=params, headers=headers)
+            # Endpoint already includes auth credentials from _validate()
+            response = self._http("GET", "/nic/update", queries=params)
 
             if response is not None:
                 response_str = str(response).strip()

ddns/provider/tencentcloud.py

@@ -5,9 +5,11 @@ Tencent Cloud DNSPod API
 
 @author: NewFuture
 """
-from ._base import BaseProvider, TYPE_JSON
-from ._signature import hmac_sha256_authorization, sha256_hash, hmac_sha256
-from time import time, strftime, gmtime
+
+from time import gmtime, strftime, time
+
+from ._base import TYPE_JSON, BaseProvider
+from ._signature import hmac_sha256, hmac_sha256_authorization, sha256_hash
 
 
 class TencentCloudProvider(BaseProvider):
@@ -45,10 +47,7 @@ class TencentCloudProvider(BaseProvider):
         body = self._encode_body(params)
 
         # 构建请求头,小写 腾讯云只签名特定头部
-        headers = {
-            "content-type": self.content_type,
-            "host": self.endpoint.split("://", 1)[1].strip("/"),
-        }
+        headers = {"content-type": self.content_type, "host": self.endpoint.split("://", 1)[1].strip("/")}
 
         # 腾讯云特殊的密钥派生过程
         date = strftime("%Y-%m-%d", gmtime())
@@ -132,7 +131,7 @@ class TencentCloudProvider(BaseProvider):
             RecordType=record_type,
             RecordLine=line,
             **extra
-        )
+        )  # fmt: skip
         if not response or "RecordList" not in response:
             self.logger.debug("No records found or query failed")
             return None
@@ -165,7 +164,7 @@ class TencentCloudProvider(BaseProvider):
             RecordLine=line or "默认",
             TTL=int(ttl) if ttl else None,
             **extra
-        )
+        )  # fmt: skip
         if response and "RecordId" in response:
             self.logger.info("Record created successfully with ID: %s", response["RecordId"])
             return True
@@ -186,7 +185,7 @@ class TencentCloudProvider(BaseProvider):
             Value=value,
             TTL=int(ttl) if ttl else None,
             **extra
-        )
+        )  # fmt: skip
         if response and "RecordId" in response:
             self.logger.info("Record updated successfully")
             return True