ddns 4.0.2__py2.py3-none-any.whl → 4.1.0b1__py2.py3-none-any.whl

ddns/__builtins__.pyi

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

ddns/__init__.py

@@ -6,14 +6,16 @@ ddns Package
 __description__ = "automatically update DNS records to my IP [域名自动指向本机IP]"
 
 # 编译时，版本会被替换
-__version__ = "4.0.2"
+__version__ = "4.1.0b1"
 
 # 时间也会被替换掉
-build_date = "2025-06-25T01:07:58Z"
+build_date = "2025-07-03T13:20:03Z"
 
 __doc__ = """
 ddns [v{}@{}]
 (i) homepage or docs [文档主页]: https://ddns.newfuture.cc/
 (?) issues or bugs [问题和反馈]: https://github.com/NewFuture/DDNS/issues
-Copyright (c) New Future (MIT License)
-""".format(__version__, build_date)
+Copyright (c) NewFuture (MIT License)
+""".format(
+    __version__, build_date
+)

ddns/__main__.py

@@ -1,15 +1,14 @@
 # -*- coding:utf-8 -*-
 """
 DDNS
-@author: New Future
-@modified: rufengsuixing
+@author: NewFuture, rufengsuixing
 """
 
 from os import path, environ, name as os_name
 from io import TextIOWrapper
 from subprocess import check_output
 from tempfile import gettempdir
-from logging import basicConfig, info, warning, error, debug, INFO
+from logging import basicConfig, getLogger, info, error, debug, warning, INFO
 
 import sys
 
@@ -17,6 +16,7 @@ from .__init__ import __version__, __description__, __doc__, build_date
 from .util import ip
 from .util.cache import Cache
 from .util.config import init_config, get_config
+from .provider import get_provider_class, SimpleProvider  # noqa: F401
 
 environ["DDNS_VERSION"] = __version__
 
@@ -27,8 +27,8 @@ def is_false(value):
     字符串 'false', 或者 False, 或者 'none';
     0 不是 False
     """
-    if isinstance(value, str):
-        return value.strip().lower() in ['false', 'none']
+    if hasattr(value, "strip"):  # 字符串
+        return value.strip().lower() in ["false", "none"]
     return value is False
 
 
@@ -50,14 +50,13 @@ def get_ip(ip_type, index="default"):
                     break
         elif str(index).isdigit():  # 数字 local eth
             value = getattr(ip, "local_v" + ip_type)(index)
-        elif index.startswith('cmd:'):  # cmd
-            value = str(check_output(index[4:]).strip().decode('utf-8'))
-        elif index.startswith('shell:'):  # shell
-            value = str(check_output(
-                index[6:], shell=True).strip().decode('utf-8'))
-        elif index.startswith('url:'):  # 自定义 url
+        elif index.startswith("cmd:"):  # cmd
+            value = str(check_output(index[4:]).strip().decode("utf-8"))
+        elif index.startswith("shell:"):  # shell
+            value = str(check_output(index[6:], shell=True).strip().decode("utf-8"))
+        elif index.startswith("url:"):  # 自定义 url
             value = getattr(ip, "public_v" + ip_type)(index[4:])
-        elif index.startswith('regex:'):  # 正则 regex
+        elif index.startswith("regex:"):  # 正则 regex
             value = getattr(ip, "regex_v" + ip_type)(index[6:])
         else:
             value = getattr(ip, index + "_v" + ip_type)()
@@ -67,50 +66,56 @@ def get_ip(ip_type, index="default"):
 
 
 def change_dns_record(dns, proxy_list, **kw):
+    # type: (SimpleProvider, list, **(str)) -> bool
     for proxy in proxy_list:
-        if not proxy or (proxy.upper() in ['DIRECT', 'NONE']):
-            dns.Config.PROXY = None
+        if not proxy or (proxy.upper() in ["DIRECT", "NONE"]):
+            dns.set_proxy(None)
         else:
-            dns.Config.PROXY = proxy
-        record_type, domain = kw['record_type'], kw['domain']
-        info("%s(%s) ==> %s [via %s]", domain, record_type, kw['ip'], proxy)
+            dns.set_proxy(proxy)
+        record_type, domain = kw["record_type"], kw["domain"]
         try:
-            return dns.update_record(domain, kw['ip'], record_type=record_type)
+            return dns.set_record(domain, kw["ip"], record_type=record_type, ttl=kw["ttl"], line=kw.get("line"))
         except Exception as e:
             error("Failed to update %s record for %s: %s", record_type, domain, e)
     return False
 
 
-def update_ip(ip_type, cache, dns, proxy_list):
+def update_ip(ip_type, cache, dns, ttl, line, proxy_list):
+    # type: (str, Cache | None, SimpleProvider, str, str | None, list[str]) -> bool | None
     """
     更新IP
     """
-    ipname = 'ipv' + ip_type
+    ipname = "ipv" + ip_type
     domains = get_config(ipname)
     if not domains:
         return None
     if not isinstance(domains, list):
-        domains = domains.strip('; ').replace(',', ';').replace(' ', ';').split(';')
+        domains = domains.strip("; ").replace(",", ";").replace(" ", ";").split(";")
 
-    index_rule = get_config('index' + ip_type, "default")
+    index_rule = get_config("index" + ip_type, "default")  # type: str # type: ignore
     address = get_ip(ip_type, index_rule)
     if not address:
-        error('Fail to get %s address!', ipname)
+        error("Fail to get %s address!", ipname)
         return False
 
-    if cache and (address == cache.get(ipname)):
-        info('%s address not changed, using cache.', ipname)
-        return True
-
-    record_type = 'A' if ip_type == '4' else 'AAAA'
+    record_type = "A" if ip_type == "4" else "AAAA"
     update_success = False
+
+    # Check cache and update each domain individually
     for domain in domains:
         domain = domain.lower()
-        if change_dns_record(dns, proxy_list, domain=domain, ip=address, record_type=record_type):
-            update_success = True
-
-    if isinstance(cache, dict):
-        cache[ipname] = update_success and address
+        cache_key = "{}:{}".format(domain, record_type)
+        if cache and cache.get(cache_key) == address:
+            info("%s[%s] address not changed, using cache: %s", domain, record_type, address)
+            update_success = True  # At least one domain is successfully cached
+        else:
+            # Update domain that is not cached or has different IP
+            if change_dns_record(dns, proxy_list, domain=domain, ip=address, record_type=record_type, ttl=ttl, line=line):
+                warning("set %s[IPv%s]: %s successfully.", domain, ip_type, address)
+                update_success = True
+                # Cache successful update immediately
+                if isinstance(cache, dict):
+                    cache[cache_key] = address
 
     return update_success
 
@@ -120,68 +125,69 @@ def main():
     更新
     """
     encode = sys.stdout.encoding
-    if encode is not None and encode.lower() != 'utf-8' and hasattr(sys.stdout, 'buffer'):
+    if encode is not None and encode.lower() != "utf-8" and hasattr(sys.stdout, "buffer"):
         # 兼容windows 和部分ASCII编码的老旧系统
-        sys.stdout = TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
-        sys.stderr = TextIOWrapper(sys.stderr.buffer, encoding='utf-8')
+        sys.stdout = TextIOWrapper(sys.stdout.buffer, encoding="utf-8")
+        sys.stderr = TextIOWrapper(sys.stderr.buffer, encoding="utf-8")
     init_config(__description__, __doc__, __version__, build_date)
 
-    log_level = get_config('log.level', INFO)
-    log_format = get_config('log.format')
+    log_level = get_config("log.level", INFO)  # type: int # type: ignore
+    log_format = get_config("log.format")  # type: str | None # type: ignore
     if log_format:
         # A custom log format is already set; no further action is required.
         pass
     elif log_level < INFO:
         # Override log format in debug mode to include filename and line number for detailed debugging
-        log_format = '%(asctime)s %(levelname)s [%(module)s.%(funcName)s](%(filename)s:%(lineno)d): %(message)s'
+        log_format = "%(asctime)s %(levelname)s [%(name)s.%(funcName)s](%(filename)s:%(lineno)d): %(message)s"
     elif log_level > INFO:
-        log_format = '%(asctime)s %(levelname)s: %(message)s'
+        log_format = "%(asctime)s %(levelname)s: %(message)s"
     else:
-        log_format = '%(asctime)s %(levelname)s [%(module)s]: %(message)s'
+        log_format = "%(asctime)s %(levelname)s [%(name)s]: %(message)s"
     basicConfig(
         level=log_level,
         format=log_format,
-        datefmt=get_config('log.datefmt', '%Y-%m-%dT%H:%M:%S'),
-        filename=get_config('log.file'),
+        datefmt=get_config("log.datefmt", "%Y-%m-%dT%H:%M:%S"),  # type: ignore
+        filename=get_config("log.file"),  # type: ignore
     )
+    logger = getLogger()
+    logger.name = "ddns"
 
-    info("DDNS[ %s ] run: %s %s", __version__, os_name, sys.platform)
+    debug("DDNS[ %s ] run: %s %s", __version__, os_name, sys.platform)
 
-    # Dynamically import the dns module as configuration
-    dns_provider = str(get_config('dns', 'dnspod').lower())
-    # dns_module = __import__(
-    #     '.dns', fromlist=[dns_provider], package=__package__)
-    dns = getattr(__import__('ddns.provider', fromlist=[dns_provider]), dns_provider)
-    # dns = getattr(dns_module, dns_provider)
-    dns.Config.ID = get_config('id')
-    dns.Config.TOKEN = get_config('token')
-    dns.Config.TTL = get_config('ttl')
+    # dns provider class
+    dns_name = get_config("dns", "debug")  # type: str # type: ignore
+    provider_class = get_provider_class(dns_name)
+    ssl_config = get_config("ssl", "auto")  # type: str | bool # type: ignore
+    dns = provider_class(get_config("id"), get_config("token"), logger=logger, verify_ssl=ssl_config)  # type: ignore
 
     if get_config("config"):
-        info('loaded Config from: %s', path.abspath(get_config('config')))
+        info("loaded Config from: %s", path.abspath(get_config("config")))  # type: ignore
 
-    proxy = get_config('proxy') or 'DIRECT'
-    proxy_list = proxy if isinstance(
-        proxy, list) else proxy.strip(';').replace(',', ';').split(';')
+    proxy = get_config("proxy") or "DIRECT"
+    proxy_list = proxy if isinstance(proxy, list) else proxy.strip(";").replace(",", ";").split(";")
 
-    cache_config = get_config('cache', True)
+    cache_config = get_config("cache", True)  # type: bool | str  # type: ignore
     if cache_config is False:
-        cache = cache_config
+        cache = None
     elif cache_config is True:
-        cache = Cache(path.join(gettempdir(), 'ddns.cache'))
+        cache = Cache(path.join(gettempdir(), "ddns.cache"), logger)
     else:
-        cache = Cache(cache_config)
+        cache = Cache(cache_config, logger)
 
-    if cache is False:
-        info('Cache is disabled!')
-    elif not get_config('config_modified_time') or get_config('config_modified_time') >= cache.time:
-        warning('Cache file is outdated.')
+    if cache is None:
+        info("Cache is disabled!")
+    elif get_config("config_modified_time", float("inf")) >= cache.time:  # type: ignore
+        info("Cache file is outdated.")
         cache.clear()
+    elif len(cache) == 0:
+        debug("Cache is empty.")
     else:
-        debug('Cache is empty.')
-    update_ip('4', cache, dns, proxy_list)
-    update_ip('6', cache, dns, proxy_list)
+        debug("Cache loaded with %d entries.", len(cache))
+    ttl = get_config("ttl")  # type: str # type: ignore
+    line = get_config("line")  # type: str | None # type: ignore
+    update_ip("4", cache, dns, ttl, line, proxy_list)
+    update_ip("6", cache, dns, ttl, line, proxy_list)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

ddns/provider/__init__.py

@@ -0,0 +1,59 @@
+# coding=utf-8
+from ._base import SimpleProvider  # noqa: F401
+from .alidns import AlidnsProvider
+from .callback import CallbackProvider
+from .cloudflare import CloudflareProvider
+from .dnscom import DnscomProvider
+from .dnspod import DnspodProvider
+from .dnspod_com import DnspodComProvider
+from .he import HeProvider
+from .huaweidns import HuaweiDNSProvider
+from .tencentcloud import TencentCloudProvider
+from .debug import DebugProvider
+
+
+def get_provider_class(provider_name):
+    # type: (str) -> type[SimpleProvider]
+    """
+    获取指定的DNS提供商类
+
+    :param provider_name: 提供商名称
+    :return: 对应的DNS提供商类
+    """
+    provider_name = str(provider_name).lower()
+    mapping = {
+        # dnspod.cn
+        "dnspod": DnspodProvider,
+        "dnspod_cn": DnspodProvider,  # 兼容旧的dnspod_cn
+        # dnspod.com
+        "dnspod_com": DnspodComProvider,
+        "dnspod_global": DnspodComProvider,  # 兼容旧的dnspod_global
+        # tencent cloud dnspod
+        "tencentcloud": TencentCloudProvider,
+        "tencent": TencentCloudProvider,  # 兼容tencent
+        "qcloud": TencentCloudProvider,  # 兼容qcloud
+        # cloudflare
+        "cloudflare": CloudflareProvider,
+        # aliyun alidns
+        "alidns": AlidnsProvider,
+        "aliyun": AlidnsProvider,  # 兼容aliyun
+        # dns.com
+        "dnscom": DnscomProvider,
+        "51dns": DnscomProvider,  # 兼容旧的51dns
+        "dns_com": DnscomProvider,  # 兼容旧的dns_com
+        # he.net
+        "he": HeProvider,
+        "he_net": HeProvider,  # 兼容he.net
+        # huawei
+        "huaweidns": HuaweiDNSProvider,
+        "huawei": HuaweiDNSProvider,  # 兼容huawei
+        "huaweicloud": HuaweiDNSProvider,
+        # callback
+        "callback": CallbackProvider,
+        "webhook": CallbackProvider,  # 兼容
+        "http": CallbackProvider,  # 兼容
+        # debug
+        "print": DebugProvider,
+        "debug": DebugProvider,  # 兼容print
+    }
+    return mapping.get(provider_name)  # type: ignore[return-value]