ddns 4.0.0b6__py2.py3-none-any.whl → 4.0.0b8__py2.py3-none-any.whl

ddns/__init__.py

@@ -0,0 +1,19 @@
+# -*- coding:utf-8 -*-
+"""
+ddns Package
+"""
+
+__description__ = "automatically update DNS records to my IP [域名自动指向本机IP]"
+
+# 编译时，版本会被替换
+__version__ = "4.0.0b8"
+
+# 时间也会被替换掉
+build_date = "2025-06-19T10:36:16Z"
+
+__doc__ = """
+ddns[{}@{}]
+(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)

run.py → ddns/__main__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
 DDNS
@@ -10,24 +9,16 @@ 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
+from logging import basicConfig, info, warning, error, debug, DEBUG, NOTSET
 
 import sys
 
-from util import ip
-from util.cache import Cache
-from util.config import init_config, get_config
+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
 
-__version__ = "v4.0.0-beta6@2025-06-12T17:22:06+00:00"  # CI 时会被Tag替换
-__description__ = "automatically update DNS records to my IP [域名自动指向本机IP]"
-__doc__ = """
-ddns[%s]
-(i) homepage or docs [文档主页]: https://ddns.newfuture.cc/
-(?) issues or bugs [问题和帮助]: https://github.com/NewFuture/DDNS/issues
-Copyright (c) New Future (MIT License)
-""" % (__version__)
-
-environ["DDNS_VERSION"] = "v4.0.0-beta6"
+environ["DDNS_VERSION"] = __version__
 
 
 def is_false(value):
@@ -99,44 +90,62 @@ def update_ip(ip_type, cache, dns, proxy_list):
     if not domains:
         return None
     if not isinstance(domains, list):
-        domains = domains.strip('; ').replace(
-            ',', ';').replace(' ', ';').split(';')
-    index_rule = get_config('index' + ip_type, "default")  # 从配置中获取index配置
+        domains = domains.strip('; ').replace(',', ';').replace(' ', ';').split(';')
+
+    index_rule = get_config('index' + ip_type, "default")
     address = get_ip(ip_type, index_rule)
     if not address:
         error('Fail to get %s address!', ipname)
         return False
-    elif cache and (address == cache[ipname]):
+
+    if cache and (address == cache.get(ipname)):
         info('%s address not changed, using cache.', ipname)
         return True
-    record_type = (ip_type == '4') and 'A' or 'AAAA'
-    update_fail = False  # https://github.com/NewFuture/DDNS/issues/16
+
+    record_type = 'A' if ip_type == '4' else 'AAAA'
+    update_success = False
     for domain in domains:
-        domain = domain.lower()  # https://github.com/NewFuture/DDNS/issues/431
+        domain = domain.lower()
         if change_dns_record(dns, proxy_list, domain=domain, ip=address, record_type=record_type):
-            update_fail = True
-    if cache is not False:
-        # 如果更新失败删除缓存
-        cache[ipname] = update_fail and address
+            update_success = True
+
+    if isinstance(cache, dict):
+        cache[ipname] = update_success and address
+
+    return update_success
 
 
 def main():
     """
     更新
     """
-    init_config(__description__, __doc__, __version__)
+    encode = sys.stdout.encoding
+    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')
+    init_config(__description__, __doc__, __version__, build_date)
 
+    log_level = get_config('log.level')
+    log_format = get_config('log.format', '%(asctime)s %(levelname)s [%(module)s]: %(message)s')
+    # Override log format in debug mode to include filename and line number for detailed debugging
+    if (log_level == DEBUG or log_level == NOTSET) and not log_format:
+        log_format = '%(asctime)s %(levelname)s [%(filename)s:%(lineno)d]: %(message)s'
     basicConfig(
-        level=get_config('log.level'),
-        format='%(asctime)s [%(levelname)s] %(message)s',
-        datefmt='%m-%d %H:%M:%S',
+        level=log_level,
+        format=log_format,
+        datefmt=get_config('log.datefmt', '%Y-%m-%dT%H:%M:%S'),
         filename=get_config('log.file'),
     )
+
     info("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 = getattr(__import__('dns', fromlist=[dns_provider]), dns_provider)
+    # 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')
@@ -168,23 +177,4 @@ def main():
 
 
 if __name__ == '__main__':
-    encode = sys.stdout.encoding
-    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')
     main()
-
-# Nuitka Project Configuration
-# nuitka-project: --mode=onefile
-# nuitka-project: --output-filename=ddns
-# nuitka-project: --product-name=DDNS
-# nuitka-project: --product-version=0.0.0
-# nuitka-project: --onefile-tempdir-spec="{TEMP}/{PRODUCT}_{VERSION}"
-# nuitka-project: --no-deployment-flag=self-execution
-# nuitka-project: --company-name="New Future"
-# nuitka-project: --copyright=https://ddns.newfuture.cc
-# nuitka-project: --assume-yes-for-downloads
-# nuitka-project: --python-flag=no_site,no_asserts,no_docstrings,isolated,static_hashes
-# nuitka-project: --nofollow-import-to=tkinter,unittest,pydoc,doctest,distutils,setuptools,lib2to3,test,idlelib,lzma
-# nuitka-project: --noinclude-dlls=liblzma.*

{dns → ddns/provider}/dnspod_com.py

@@ -6,7 +6,7 @@ http://www.dnspod.com/docs/domains.html
 @author: New Future
 """
 
-from dns.dnspod import *  # noqa: F403
+from .dnspod import *  # noqa: F403
 
 API.SITE = "api.dnspod.com"  # noqa: F405
 API.DEFAULT = "default"  # noqa: F405

ddns/util/config.py

@@ -0,0 +1,313 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+from argparse import Action, ArgumentParser, Namespace, RawTextHelpFormatter
+from json import load as loadjson, dump as dumpjson
+from os import stat, environ, path
+from logging import error, getLevelName
+from ast import literal_eval
+
+import platform
+import sys
+
+
+__cli_args = Namespace()
+__config = {}  # type: dict
+log_levels = [
+    "CRITICAL",
+    "FATAL",
+    "ERROR",
+    "WARN",
+    "WARNING",
+    "INFO",
+    "DEBUG",
+    "NOTSET",
+]
+
+# 支持数组的参数列表
+ARRAY_PARAMS = ["index4", "index6", "ipv4", "ipv6", "proxy"]
+# 简单数组，支持’,’, ‘;’ 分隔的参数列表
+SIMPLE_ARRAY_PARAMS = ["ipv4", "ipv6", "proxy"]
+
+
+def str2bool(v):
+    """
+    parse string to boolean
+    """
+    if isinstance(v, bool):
+        return v
+    if v.lower() in ("yes", "true", "t", "y", "1"):
+        return True
+    elif v.lower() in ("no", "false", "f", "n", "0"):
+        return False
+    else:
+        return v
+
+
+def log_level(value):
+    """
+    parse string to log level
+    """
+    return getLevelName(value.upper())
+
+
+def parse_array_string(value, enable_simple_split):
+    """
+    解析数组字符串
+    仅当 trim 之后以 '[' 开头以 ']' 结尾时，才尝试使用 ast.literal_eval 解析
+    默认返回原始字符串
+    """
+    if not isinstance(value, str):
+        return value
+
+    trimmed = value.strip()
+    if trimmed.startswith("[") and trimmed.endswith("]"):
+        try:
+            # 尝试使用 ast.literal_eval 解析数组
+            parsed_value = literal_eval(trimmed)
+            # 确保解析结果是列表或元组
+            if isinstance(parsed_value, (list, tuple)):
+                return list(parsed_value)
+        except (ValueError, SyntaxError) as e:
+            # 解析失败时返回原始字符串
+            error("Failed to parse array string: %s. Exception: %s", value, e)
+    elif enable_simple_split and "," in trimmed:
+        # 尝试使用逗号或分号分隔符解析
+        return [item.strip() for item in trimmed.split(",") if item.strip()]
+    return value
+
+
+def get_system_info_str():
+    system = platform.system()
+    release = platform.release()
+    machine = platform.machine()
+    arch = platform.architecture()[0]  # '64bit' or '32bit'
+
+    return "{}-{} {} ({})".format(system, release, machine, arch)
+
+
+def get_python_info_str():
+    version = platform.python_version()
+    branch, py_build_date = platform.python_build()
+    return "Python-{} {} ({})".format(version, branch, py_build_date)
+
+
+def init_config(description, doc, version, date):
+    """
+    配置
+    """
+    global __cli_args
+    parser = ArgumentParser(
+        description=description, epilog=doc, formatter_class=RawTextHelpFormatter
+    )
+    sysinfo = get_system_info_str()
+    pyinfo = get_python_info_str()
+    version_str = "v{} ({})\n{}\n{}".format(version, date, pyinfo, sysinfo)
+    parser.add_argument("-v", "--version", action="version", version=version_str)
+    parser.add_argument(
+        "-c", "--config", metavar="FILE", help="load config file [配置文件路径]"
+    )
+    parser.add_argument(
+        "--debug",
+        action="store_true",
+        help="debug mode [调试模式等效 --log.level=DEBUG]",
+    )
+
+    # 参数定义
+    parser.add_argument(
+        "--dns",
+        help="DNS provider [DNS服务提供商]",
+        choices=[
+            "alidns",
+            "cloudflare",
+            "dnscom",
+            "dnspod",
+            "dnspod_com",
+            "he",
+            "huaweidns",
+            "callback",
+        ],
+    )
+    parser.add_argument("--id", help="API ID or email [对应账号ID或邮箱]")
+    parser.add_argument("--token", help="API token or key [授权凭证或密钥]")
+    parser.add_argument(
+        "--index4",
+        nargs="*",
+        action=ExtendAction,
+        metavar="RULE",
+        help="IPv4 rules [获取IPv4方式, 多次可配置多规则]",
+    )
+    parser.add_argument(
+        "--index6",
+        nargs="*",
+        action=ExtendAction,
+        metavar="RULE",
+        help="IPv6 rules [获取IPv6方式, 多次可配置多规则]",
+    )
+    parser.add_argument(
+        "--ipv4",
+        nargs="*",
+        action=ExtendAction,
+        metavar="DOMAIN",
+        help="IPv4 domains [IPv4域名列表, 可配置多个域名]",
+    )
+    parser.add_argument(
+        "--ipv6",
+        nargs="*",
+        action=ExtendAction,
+        metavar="DOMAIN",
+        help="IPv6 domains [IPv6域名列表, 可配置多个域名]",
+    )
+    parser.add_argument("--ttl", type=int, help="DNS TTL(s) [设置域名解析过期时间]")
+    parser.add_argument(
+        "--proxy",
+        nargs="*",
+        action=ExtendAction,
+        help="HTTP proxy [设置http代理，可配多个代理连接]",
+    )
+    parser.add_argument(
+        "--cache",
+        type=str2bool,
+        nargs="?",
+        const=True,
+        help="set cache [启用缓存开关，或传入保存路径]",
+    )
+    parser.add_argument(
+        "--no-cache",
+        dest="cache",
+        action="store_const",
+        const=False,
+        help="disable cache [关闭缓存等效 --cache=false]",
+    )
+    parser.add_argument(
+        "--log.file", metavar="FILE", help="log file [日志文件，默认标准输出]"
+    )
+    parser.add_argument("--log.level", type=log_level, metavar="|".join(log_levels))
+    parser.add_argument(
+        "--log.format", metavar="FORMAT", help="log format [设置日志打印格式]"
+    )
+    parser.add_argument(
+        "--log.datefmt", metavar="FORMAT", help="date format [日志时间打印格式]"
+    )
+
+    __cli_args = parser.parse_args()
+    if __cli_args.debug:
+        # 如果启用调试模式，则设置日志级别为 DEBUG
+        setattr(__cli_args, "log.level", log_level("DEBUG"))
+
+    is_configfile_required = not get_config("token") and not get_config("id")
+    config_file = get_config("config")
+    if not config_file:
+        # 未指定配置文件且需要读取文件时，依次查找
+        cfgs = [
+            path.abspath("config.json"),
+            path.expanduser("~/.ddns/config.json"),
+            "/etc/ddns/config.json",
+        ]
+        config_file = next((cfg for cfg in cfgs if path.isfile(cfg)), cfgs[0])
+
+    if path.isfile(config_file):
+        __load_config(config_file)
+        __cli_args.config = config_file
+    elif is_configfile_required:
+        error("Config file is required, but not found: %s", config_file)
+        # 如果需要配置文件但没有指定，则自动生成
+        if generate_config(config_file):
+            sys.stdout.write("Default configure file %s is generated.\n" % config_file)
+            sys.exit(1)
+        else:
+            sys.exit("fail to load config from file: %s\n" % config_file)
+
+
+def __load_config(config_path):
+    """
+    加载配置
+    """
+    global __config
+    try:
+        with open(config_path, "r") as configfile:
+            __config = loadjson(configfile)
+            __config["config_modified_time"] = stat(config_path).st_mtime
+            if "log" in __config:
+                if "level" in __config["log"] and __config["log"]["level"] is not None:
+                    __config["log.level"] = log_level(__config["log"]["level"])
+                if "file" in __config["log"]:
+                    __config["log.file"] = __config["log"]["file"]
+                if "format" in __config["log"]:
+                    __config["log.format"] = __config["log"]["format"]
+                if "datefmt" in __config["log"]:
+                    __config["log.datefmt"] = __config["log"]["datefmt"]
+            elif "log.level" in __config:
+                __config["log.level"] = log_level(__config["log.level"])
+    except Exception as e:
+        error("Failed to load config file `%s`: %s", config_path, e)
+        raise
+        # 重新抛出异常
+
+
+def get_config(key, default=None):
+    """
+    读取配置
+    1. 命令行参数
+    2. 配置文件
+    3. 环境变量
+    """
+    if hasattr(__cli_args, key) and getattr(__cli_args, key) is not None:
+        return getattr(__cli_args, key)
+    if key in __config:
+        return __config.get(key)
+    # 检查环境变量
+    env_name = "DDNS_" + key.replace(".", "_")  # type:str
+    variations = [env_name, env_name.upper(), env_name.lower()]
+    value = next((environ.get(v) for v in variations if v in environ), None)
+
+    # 如果找到环境变量值且参数支持数组，尝试解析为数组
+    if value is not None and key in ARRAY_PARAMS:
+        return parse_array_string(value, key in SIMPLE_ARRAY_PARAMS)
+
+    return value if value is not None else default
+
+
+class ExtendAction(Action):
+    """
+    兼容 Python <3.8 的 extend action
+    """
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        items = getattr(namespace, self.dest, None)
+        if items is None:
+            items = []
+        # values 可能是单个值或列表
+        if isinstance(values, list):
+            items.extend(values)
+        else:
+            items.append(values)
+        setattr(namespace, self.dest, items)
+
+
+def generate_config(config_path):
+    """
+    生成配置文件
+    """
+    configure = {
+        "$schema": "https://ddns.newfuture.cc/schema/v4.0.json",
+        "id": "YOUR ID or EMAIL for DNS Provider",
+        "token": "YOUR TOKEN or KEY for DNS Provider",
+        "dns": "dnspod",
+        "ipv4": ["newfuture.cc", "ddns.newfuture.cc"],
+        "ipv6": ["newfuture.cc", "ipv6.ddns.newfuture.cc"],
+        "index4": "default",
+        "index6": "default",
+        "ttl": None,
+        "proxy": None,
+        "log": {"level": "INFO"},
+    }
+    try:
+        with open(config_path, "w") as f:
+            dumpjson(configure, f, indent=2, sort_keys=True)
+            return True
+    except IOError:
+        error("Cannot open config file to write: `%s`!", config_path)
+        return False
+    except Exception as e:
+        error("Failed to write config file `%s`: %s", config_path, e)
+        return False

{ddns-4.0.0b6.dist-info → ddns-4.0.0b8.dist-info}/METADATA

@@ -1,14 +1,15 @@
 Metadata-Version: 2.4
 Name: ddns
-Version: 4.0.0b6
-Summary: automatically update DNS records to my IP [域名自动指向本机IP]
-Home-page: https://ddns.newfuture.cc
-Author: NewFuture
-Author-email: python@newfuture.cc
-License: MIT
-Project-URL: Bug Reports, https://github.com/NewFuture/DDNS/issues
+Version: 4.0.0b8
+Summary: Dynamic DNS client for multiple providers, supporting IPv4 and IPv6.
+Author-email: NewFuture <python@newfuture.cc>
+License-Expression: MIT
+Project-URL: Homepage, https://ddns.newfuture.cc
+Project-URL: Documentation, https://ddns.newfuture.cc
+Project-URL: Repository, https://github.com/NewFuture/DDNS
+Project-URL: Bug Tracker, https://github.com/NewFuture/DDNS/issues
 Project-URL: Source, https://github.com/NewFuture/DDNS
-Keywords: ddns ipv6 ipv4 dns dnspod alidns cloudflare
+Keywords: ddns,ipv6,ipv4,dns,dnspod,alidns,cloudflare
 Platform: any
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -19,27 +20,25 @@ Classifier: Topic :: Internet
 Classifier: Topic :: Internet :: Name Service (DNS)
 Classifier: Topic :: System :: Networking
 Classifier: Topic :: Software Development
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=2.5, <4
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=2.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
+Provides-Extra: dev
+Requires-Dist: black; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
 Dynamic: license-file
-Dynamic: platform
-Dynamic: project-url
-Dynamic: requires-python
-Dynamic: summary
 
-# [<img src="doc/img/ddns.svg" width="32px" height="32px"/>](https://ddns.newfuture.cc) [DDNS](https://github.com/NewFuture/DDNS)
+# [<img src="https://ddns.newfuture.cc/doc/img/ddns.svg" width="32px" height="32px"/>](https://ddns.newfuture.cc) [DDNS](https://github.com/NewFuture/DDNS)
 
 > 自动更新 DNS 解析 到本机 IP 地址，支持 IPv4 和 IPv6，本地（内网）IP 和公网 IP。
 > 代理模式，支持自动创建 DNS 记录。
@@ -60,9 +59,9 @@ Dynamic: summary
   - [二进制文件](https://github.com/NewFuture/DDNS/releases/latest) ![cross platform](https://img.shields.io/badge/system-windows_%7C%20linux_%7C%20mac-success.svg?style=social)
   
 - 配置方式:
-  - [命令行参数](#详细配置)
-  - [JSON 配置文件](#详细配置)
-  - [环境变量配置](doc/env.md) 📖
+  - [命令行参数](https://ddns.newfuture.cc/doc/cli.html)
+  - [JSON 配置文件](https://ddns.newfuture.cc/doc/json.html)
+  - [环境变量配置](https://ddns.newfuture.cc/doc/env.html)
 
 - 域名支持:
   - 多个域名支持
@@ -138,6 +137,8 @@ Dynamic: summary
       newfuture/ddns
     ```
 
+  更多详细说明和高级用法请查看 [Docker 使用文档](doc/docker.md)。
+
 ### ② 快速配置
 
 1. 申请 api `token`，填写到对应的 `id` 和 `token` 字段:
@@ -155,12 +156,27 @@ Dynamic: summary
 
 ## 详细配置
 
-所有字段可通过三种方式进行配置
+所有字段可通过三种方式进行配置，优先级为：**命令行参数 > JSON配置文件 > 环境变量**
 
-1. 命令行参数 `ddns --key=value`（`ddns -h` 查看详情），优先级最高
-2. JSON 配置文件（值为 null 认为是有效值，会覆盖环境变量的设置，如果没有对应的 key 则会尝试使用环境变量）
+1. [命令行参数](doc/cli.md) `ddns --key=value`（`ddns -h` 查看详情），优先级最高
+2. [JSON 配置文件](doc/json.md)（值为 null 认为是有效值，会覆盖环境变量的设置，如果没有对应的 key 则会尝试使用环境变量）
 3. 环境变量 DDNS_ 前缀加上 key 全大写或者全小写，点转下划线（`${ddns_id}` 或 `${DDNS_ID}`，`${DDNS_LOG_LEVEL}`）
 
+### 配置优先级和字段覆盖关系
+
+如果同一个配置项在多个地方设置，将按照以下优先级规则生效：
+
+- **命令行参数**：优先级最高，会覆盖其他所有设置
+- **JSON配置文件**：介于命令行和环境变量之间，会覆盖环境变量中的设置
+- **环境变量**：优先级最低，当其他方式未设置时使用
+
+**特殊情况**：
+- JSON配置中明确设为`null`的值会覆盖环境变量设置
+- `debug`参数只在命令行中有效，JSON配置文件中的同名设置无效
+- 多值参数（如`ipv4`、`ipv6`等）在命令行中使用方式为重复使用参数，如`--ipv4 domain1 --ipv4 domain2`
+
+各配置方式的详细说明请查看对应文档：[命令行](doc/cli.md)、[JSON配置](doc/json.md)、[环境变量](doc/env.md)
+
 > 📖 **环境变量详细配置**: 查看 [环境变量配置文档](doc/env.md) 了解所有环境变量的详细用法和示例
 
 <details open>
@@ -169,6 +185,7 @@ Dynamic: summary
 - 首次运行会自动生成一个模板配置文件
 - 可以使用 `-c` 使用指定的配置文件（默认读取当前目录的 config.json）
 - 推荐使用 vscode 等支持 JsonSchema 的编辑器编辑配置文件
+- 查看 [JSON配置文件详细文档](doc/json.md) 了解完整的配置选项和示例
 
 ```bash
 ddns -c path/to/config.json
@@ -189,9 +206,9 @@ python run.py -c /path/to/config.json
 | index6   | string\|int\|array |    No    | `"default"` |   ipv6 获取方式   | 可设置 `网卡`、`内网`、`公网`、`正则` 等方式                                                                |
 |  ttl     |       number       |    No    |   `null`    | DNS 解析 TTL 时间 | 不设置采用 DNS 默认策略                                                                                     |
 |  proxy   |       string\|array       |    No    |     无      | http 代理 `;` 分割 | 多代理逐个尝试直到成功，`DIRECT` 为直连                                                                     |
-| ~~debug~~|        bool        |    No    |   `false`   |   是否开启调试    | v4 中弃用，请改用 log.level=DEBUG                                                                           |
+|  debug  |        bool        |    No    |   `false`   |   是否开启调试    | 等同于设置 log.level=DEBUG，仅命令行参数`--debug`有效                                                  |
 |  cache   |    string\|bool    |    No    |   `true`    |   是否缓存记录    | 正常情况打开避免频繁更新，默认位置为临时目录下 `ddns.cache`，也可以指定一个具体路径                          |
-|  log     | {"level":string,"file":string} | No | `null` | 日志配置（可选） | 日志配置，日志级别和路径（默认命令行），例如：`{ "level": "DEBUG", "file": "dns.log" }`                    |
+|  log     | object | No | `null` | 日志配置（可选） | 日志配置对象，支持`level`、`file`、`format`、`datefmt`参数                   |
 
 #### index4 和 index6 参数说明
 
@@ -237,7 +254,9 @@ python run.py -c /path/to/config.json
   "proxy": "127.0.0.1:1080;DIRECT",
   "log": {
     "level": "DEBUG",
-    "file": "dns.log"
+    "file": "dns.log",
+    "format": "%(asctime)s %(levelname)s [%(module)s]: %(message)s",
+    "datefmt": "%Y-%m-%dT%H:%M:%S"
   }
 }
 ```

ddns-4.0.0b8.dist-info/RECORD

@@ -0,0 +1,21 @@
+ddns/__init__.py,sha256=7htaDQyYxKJKmhu_wVr2juILqhNO9dENXmJPvPKpkyo,503
+ddns/__main__.py,sha256=TIoMSOmdHay9k4m4rr5449y3tk8I60ruub_rBOxjh4M,6148
+ddns/provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ddns/provider/alidns.py,sha256=fD8mzr7FJ5QxOWLA3ekoOhjeU1IFepOpxybrgZv2c9k,5782
+ddns/provider/callback.py,sha256=V8AG7kxtS0jIkyD9F7xnGJpu1L3E5KUcNDwOnQjcJKs,3208
+ddns/provider/cloudflare.py,sha256=OBq4TJwVHHiPMM6FJo-bz20FOHPvA-RSFbuGilw3tVw,5647
+ddns/provider/dnscom.py,sha256=Nhyl70JGnZY2IV0j5Ebgy_gYQGFb8hXTshaRG_rC0Ww,5297
+ddns/provider/dnspod.py,sha256=52Hstd92-BkyEAicW5DkexfJiTww5KcNZkKs20HUIFE,6211
+ddns/provider/dnspod_com.py,sha256=touJksX1aPDAaP9yWRLVzbbbCtP8jzrDZSMSqtRlc0s,336
+ddns/provider/he.py,sha256=X_WODK6vDTpHdAvPP_vUltaeAlHeG2jMPbzFkfYxWOg,2142
+ddns/provider/huaweidns.py,sha256=0A2jxcJ5zGaMxMMh7C9SsDewhP2zVRLI8FznB9BBBEc,8748
+ddns/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ddns/util/cache.py,sha256=LVH5jGZFimXmD7XCQCtZULhagybM7gSjMo-73yqttiA,3338
+ddns/util/config.py,sha256=tmOf0uR2jEqWakCgihGP8oCmpT3jS2HP8F6kVM9_neI,9999
+ddns/util/ip.py,sha256=GZzqrl_nq9JuGHTWhPB0fffpr94ITJA6BCVlS5KlWcE,3836
+ddns-4.0.0b8.dist-info/licenses/LICENSE,sha256=MI-ECjp-Vl7WZLiSPY6r5VwrOReNiICVB1QCXiUGt_s,1111
+ddns-4.0.0b8.dist-info/METADATA,sha256=HjETN-YPVmwJ5oMg0wvWxrLzYJgR4a2IXLDAqzFO9sE,16834
+ddns-4.0.0b8.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+ddns-4.0.0b8.dist-info/entry_points.txt,sha256=2-VbA-WZcjebkZrGKvUCuBBRYF4xQNMoLIoGaS234WU,44
+ddns-4.0.0b8.dist-info/top_level.txt,sha256=Se0wn3T8Bc4pj55dGwVrCe8BFwmFCBwQVHF1bTyV0o0,5
+ddns-4.0.0b8.dist-info/RECORD,,

ddns-4.0.0b8.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+ddns = ddns.__main__:main

ddns-4.0.0b8.dist-info/top_level.txt

@@ -0,0 +1 @@
+ddns

ddns-4.0.0b6.dist-info/RECORD

@@ -1,20 +0,0 @@
-run.py,sha256=-rJYm36hjdAHhOpxQBAWa7-l2IAZsOqwUnaDNecCeyo,6779
-ddns-4.0.0b6.dist-info/licenses/LICENSE,sha256=MI-ECjp-Vl7WZLiSPY6r5VwrOReNiICVB1QCXiUGt_s,1111
-dns/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dns/alidns.py,sha256=fD8mzr7FJ5QxOWLA3ekoOhjeU1IFepOpxybrgZv2c9k,5782
-dns/callback.py,sha256=V8AG7kxtS0jIkyD9F7xnGJpu1L3E5KUcNDwOnQjcJKs,3208
-dns/cloudflare.py,sha256=OBq4TJwVHHiPMM6FJo-bz20FOHPvA-RSFbuGilw3tVw,5647
-dns/dnscom.py,sha256=Nhyl70JGnZY2IV0j5Ebgy_gYQGFb8hXTshaRG_rC0Ww,5297
-dns/dnspod.py,sha256=52Hstd92-BkyEAicW5DkexfJiTww5KcNZkKs20HUIFE,6211
-dns/dnspod_com.py,sha256=9DW7Oz1f2fYSLDDGdwQKMp9OhRJ_CYB8bfzGhf0fIMI,339
-dns/he.py,sha256=X_WODK6vDTpHdAvPP_vUltaeAlHeG2jMPbzFkfYxWOg,2142
-dns/huaweidns.py,sha256=0A2jxcJ5zGaMxMMh7C9SsDewhP2zVRLI8FznB9BBBEc,8748
-util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-util/cache.py,sha256=LVH5jGZFimXmD7XCQCtZULhagybM7gSjMo-73yqttiA,3338
-util/config.py,sha256=hjwkNYjx9tn1augpsBwqA58dATWnKoLS8MZtVdxsav4,8182
-util/ip.py,sha256=GZzqrl_nq9JuGHTWhPB0fffpr94ITJA6BCVlS5KlWcE,3836
-ddns-4.0.0b6.dist-info/METADATA,sha256=8KxSp1hF6UyrmHWutNRvb4J4HLXxWtz_TNTD9lZ-fNw,15284
-ddns-4.0.0b6.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-ddns-4.0.0b6.dist-info/entry_points.txt,sha256=vpxxBE6Kepc-SHatr-FRRLmZecrTupYejyDB8ovJbLg,34
-ddns-4.0.0b6.dist-info/top_level.txt,sha256=dS3_ClQTIG1ousHykZ1P3AzQa-MKq4jT_rbm21D-KxE,13
-ddns-4.0.0b6.dist-info/RECORD,,

ddns-4.0.0b6.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-ddns = run:main

ddns-4.0.0b6.dist-info/top_level.txt

@@ -1,3 +0,0 @@
-dns
-run
-util

util/config.py

@@ -1,227 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-from argparse import Action, ArgumentParser, Namespace, RawTextHelpFormatter
-from json import load as loadjson, dump as dumpjson
-from os import stat, environ, path
-from logging import error, getLevelName
-from ast import literal_eval
-
-import sys
-
-
-__cli_args = Namespace()
-__config = {}  # type: dict
-log_levels = ['CRITICAL', 'FATAL', 'ERROR',
-              'WARN', 'WARNING', 'INFO', 'DEBUG', 'NOTSET']
-
-# 支持数组的参数列表
-ARRAY_PARAMS = ['index4', 'index6', 'ipv4', 'ipv6', 'proxy']
-# 简单数组，支持’,’, ‘;’ 分隔的参数列表
-SIMPLE_ARRAY_PARAMS = ['ipv4', 'ipv6', 'proxy']
-
-
-def str2bool(v):
-    """
-    parse string to boolean
-    """
-    if isinstance(v, bool):
-        return v
-    if v.lower() in ('yes', 'true', 't', 'y', '1'):
-        return True
-    elif v.lower() in ('no', 'false', 'f', 'n', '0'):
-        return False
-    else:
-        return v
-
-
-def log_level(value):
-    """
-    parse string to log level
-    """
-    return getLevelName(value.upper())
-
-
-def parse_array_string(value, enable_simple_split):
-    """
-    解析数组字符串
-    仅当 trim 之后以 '[' 开头以 ']' 结尾时，才尝试使用 ast.literal_eval 解析
-    默认返回原始字符串
-    """
-    if not isinstance(value, str):
-        return value
-
-    trimmed = value.strip()
-    if trimmed.startswith('[') and trimmed.endswith(']'):
-        try:
-            # 尝试使用 ast.literal_eval 解析数组
-            parsed_value = literal_eval(trimmed)
-            # 确保解析结果是列表或元组
-            if isinstance(parsed_value, (list, tuple)):
-                return list(parsed_value)
-        except (ValueError, SyntaxError) as e:
-            # 解析失败时返回原始字符串
-            error('Failed to parse array string: %s. Exception: %s', value, e)
-    elif enable_simple_split and ',' in trimmed:
-        # 尝试使用逗号或分号分隔符解析
-        return [item.strip() for item in trimmed.split(',') if item.strip()]
-    return value
-
-
-def init_config(description, doc, version):
-    """
-    配置
-    """
-    global __cli_args
-    parser = ArgumentParser(description=description,
-                            epilog=doc, formatter_class=RawTextHelpFormatter)
-    parser.add_argument('-v', '--version',
-                        action='version', version=version)
-    parser.add_argument('-c', '--config', help='run with config file [配置文件路径]')
-
-    # 参数定义
-    parser.add_argument('--dns', help='DNS Provider [DNS服务提供商]', choices=[
-                        'alidns', 'cloudflare', 'dnscom', 'dnspod', 'dnspod_com', 'he', 'huaweidns', 'callback'])
-    parser.add_argument('--id', help='api ID [授权账户]')
-    parser.add_argument('--token', help='api token or Secret key [授权访问凭证或密钥]')
-    parser.add_argument('--index4', nargs='*', action=ExtendAction,
-                        help='list to get ipv4 [IPV4 获取方式]')
-    parser.add_argument('--index6', nargs='*', action=ExtendAction,
-                        help='list to get ipv6 [IPV6获取方式]')
-    parser.add_argument('--ipv4', nargs='*', action=ExtendAction,
-                        help='ipv4 domain list [IPV4域名列表]')
-    parser.add_argument('--ipv6', nargs='*', action=ExtendAction,
-                        help='ipv6 domain list [IPV6域名列表]')
-    parser.add_argument('--ttl', type=int, help='ttl for DNS [DNS 解析 TTL 时间]')
-    parser.add_argument('--proxy', nargs='*', action=ExtendAction,
-                        help='https proxy [设置http 代理，多代理逐个尝试直到成功]')
-    parser.add_argument('--cache',  type=str2bool, nargs='?',
-                        const=True, help='cache flag [启用缓存，可配配置路径或开关]')
-    parser.add_argument('--log.file', metavar='LOG_FILE',
-                        help='log file [日志文件，默认标准输出]')
-    parser.add_argument('--log.level', type=log_level,
-                        metavar='|'.join(log_levels))
-
-    __cli_args = parser.parse_args()
-    is_configfile_required = not get_config("token") and not get_config("id")
-    config_file = get_config("config")
-    if not config_file:
-        # 未指定配置文件且需要读取文件时，依次查找
-        cfgs = [
-            path.abspath('config.json'),
-            path.expanduser('~/.ddns/config.json'),
-            '/etc/ddns/config.json'
-        ]
-        config_file = next((cfg for cfg in cfgs if path.isfile(cfg)), cfgs[0])
-
-    if path.isfile(config_file):
-        __load_config(config_file)
-        __cli_args.config = config_file
-    elif is_configfile_required:
-        error('Config file is required, but not found: %s', config_file)
-        # 如果需要配置文件但没有指定，则自动生成
-        if generate_config(config_file):
-            sys.stdout.write(
-                'Default configure file %s is generated.\n' % config_file)
-            sys.exit(1)
-        else:
-            sys.exit('fail to load config from file: %s\n' % config_file)
-
-
-def __load_config(config_path):
-    """
-    加载配置
-    """
-    global __config
-    try:
-        with open(config_path, 'r') as configfile:
-            __config = loadjson(configfile)
-            __config["config_modified_time"] = stat(config_path).st_mtime
-            if 'log' in __config:
-                if 'level' in __config['log'] and __config['log']['level'] is not None:
-                    __config['log.level'] = log_level(__config['log']['level'])
-                if 'file' in __config['log']:
-                    __config['log.file'] = __config['log']['file']
-            elif 'log.level' in __config:
-                __config['log.level'] = log_level(__config['log.level'])
-    except Exception as e:
-        error('Failed to load config file `%s`: %s', config_path, e)
-        raise
-        # 重新抛出异常
-
-
-def get_config(key, default=None):
-    """
-    读取配置
-    1. 命令行参数
-    2. 配置文件
-    3. 环境变量
-    """
-    if hasattr(__cli_args, key) and getattr(__cli_args, key) is not None:
-        return getattr(__cli_args, key)
-    if key in __config:
-        return __config.get(key)
-    # 检查环境变量
-    env_name = 'DDNS_' + key.replace('.', '_')  # type:str
-    variations = [env_name, env_name.upper(), env_name.lower()]
-    value = next((environ.get(v) for v in variations if v in environ), None)
-
-    # 如果找到环境变量值且参数支持数组，尝试解析为数组
-    if value is not None and key in ARRAY_PARAMS:
-        return parse_array_string(value, key in SIMPLE_ARRAY_PARAMS)
-
-    return value if value is not None else default
-
-
-class ExtendAction(Action):
-    """
-    兼容 Python <3.8 的 extend action
-    """
-
-    def __call__(self, parser, namespace, values, option_string=None):
-        items = getattr(namespace, self.dest, None)
-        if items is None:
-            items = []
-        # values 可能是单个值或列表
-        if isinstance(values, list):
-            items.extend(values)
-        else:
-            items.append(values)
-        setattr(namespace, self.dest, items)
-
-
-def generate_config(config_path):
-    """
-    生成配置文件
-    """
-    configure = {
-        '$schema': 'https://ddns.newfuture.cc/schema/v4.0.json',
-        'id': 'YOUR ID or EMAIL for DNS Provider',
-        'token': 'YOUR TOKEN or KEY for DNS Provider',
-        'dns': 'dnspod',
-        'ipv4': [
-            'newfuture.cc',
-            'ddns.newfuture.cc'
-        ],
-        'ipv6': [
-            'newfuture.cc',
-            'ipv6.ddns.newfuture.cc'
-        ],
-        'index4': 'default',
-        'index6': 'default',
-        'ttl': None,
-        'proxy': None,
-        'log': {
-            'level': 'INFO',
-            'file': None
-        }
-    }
-    try:
-        with open(config_path, 'w') as f:
-            dumpjson(configure, f, indent=2, sort_keys=True)
-            return True
-    except IOError:
-        error('Cannot open config file to write: `%s`!', config_path)
-        return False
-    except Exception as e:
-        error('Failed to write config file `%s`: %s', config_path, e)
-        return False