ddns 4.0.0b3__tar.gz → 4.0.0b5__tar.gz

{ddns-4.0.0b3 → ddns-4.0.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddns
-Version: 4.0.0b3
+Version: 4.0.0b5
 Summary: automatically update DNS records to dynamic local IP [自动更新DNS记录指向本地IP]
 Home-page: https://ddns.newfuture.cc
 Author: NewFuture
@@ -57,8 +57,12 @@ Dynamic: summary
 
 - 兼容和跨平台:
   - [Docker (@NN708)](https://hub.docker.com/r/newfuture/ddns) [![Docker Image Size](https://img.shields.io/docker/image-size/newfuture/ddns/latest?logo=docker&style=social)](https://hub.docker.com/r/newfuture/ddns)[![Docker Platforms](https://img.shields.io/badge/arch-amd64%20%7C%20arm64%20%7C%20arm%2Fv7%20%7C%20arm%2Fv6%20%7C%20ppc64le%20%7C%20s390x%20%7C%20386%20%7C%20mips64le-blue?style=social)](https://hub.docker.com/r/newfuture/ddns)
-  - [PIP 安装 (兼容Python2)](https://pypi.org/project/ddns/) ![PyPI - Wheel](https://img.shields.io/pypi/wheel/ddns.svg?logo=pypi&style=social) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ddns.svg?style=social)
   - [二进制文件](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) 📖
 
 - 域名支持:
   - 多个域名支持
@@ -157,6 +161,8 @@ Dynamic: summary
 2. JSON 配置文件（值为 null 认为是有效值，会覆盖环境变量的设置，如果没有对应的 key 则会尝试使用环境变量）
 3. 环境变量 DDNS_ 前缀加上 key 全大写或者全小写，点转下划线（`${ddns_id}` 或 `${DDNS_ID}`，`${DDNS_LOG_LEVEL}`）
 
+> 📖 **环境变量详细配置**: 查看 [环境变量配置文档](doc/env.md) 了解所有环境变量的详细用法和示例
+
 <details open>
 <summary markdown="span">config.json 配置文件</summary>
 

{ddns-4.0.0b3 → ddns-4.0.0b5}/README.md

@@ -16,8 +16,12 @@
 
 - 兼容和跨平台:
   - [Docker (@NN708)](https://hub.docker.com/r/newfuture/ddns) [![Docker Image Size](https://img.shields.io/docker/image-size/newfuture/ddns/latest?logo=docker&style=social)](https://hub.docker.com/r/newfuture/ddns)[![Docker Platforms](https://img.shields.io/badge/arch-amd64%20%7C%20arm64%20%7C%20arm%2Fv7%20%7C%20arm%2Fv6%20%7C%20ppc64le%20%7C%20s390x%20%7C%20386%20%7C%20mips64le-blue?style=social)](https://hub.docker.com/r/newfuture/ddns)
-  - [PIP 安装 (兼容Python2)](https://pypi.org/project/ddns/) ![PyPI - Wheel](https://img.shields.io/pypi/wheel/ddns.svg?logo=pypi&style=social) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ddns.svg?style=social)
   - [二进制文件](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) 📖
 
 - 域名支持:
   - 多个域名支持
@@ -116,6 +120,8 @@
 2. JSON 配置文件（值为 null 认为是有效值，会覆盖环境变量的设置，如果没有对应的 key 则会尝试使用环境变量）
 3. 环境变量 DDNS_ 前缀加上 key 全大写或者全小写，点转下划线（`${ddns_id}` 或 `${DDNS_ID}`，`${DDNS_LOG_LEVEL}`）
 
+> 📖 **环境变量详细配置**: 查看 [环境变量配置文档](doc/env.md) 了解所有环境变量的详细用法和示例
+
 <details open>
 <summary markdown="span">config.json 配置文件</summary>
 

{ddns-4.0.0b3 → ddns-4.0.0b5}/ddns.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddns
-Version: 4.0.0b3
+Version: 4.0.0b5
 Summary: automatically update DNS records to dynamic local IP [自动更新DNS记录指向本地IP]
 Home-page: https://ddns.newfuture.cc
 Author: NewFuture
@@ -57,8 +57,12 @@ Dynamic: summary
 
 - 兼容和跨平台:
   - [Docker (@NN708)](https://hub.docker.com/r/newfuture/ddns) [![Docker Image Size](https://img.shields.io/docker/image-size/newfuture/ddns/latest?logo=docker&style=social)](https://hub.docker.com/r/newfuture/ddns)[![Docker Platforms](https://img.shields.io/badge/arch-amd64%20%7C%20arm64%20%7C%20arm%2Fv7%20%7C%20arm%2Fv6%20%7C%20ppc64le%20%7C%20s390x%20%7C%20386%20%7C%20mips64le-blue?style=social)](https://hub.docker.com/r/newfuture/ddns)
-  - [PIP 安装 (兼容Python2)](https://pypi.org/project/ddns/) ![PyPI - Wheel](https://img.shields.io/pypi/wheel/ddns.svg?logo=pypi&style=social) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ddns.svg?style=social)
   - [二进制文件](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) 📖
 
 - 域名支持:
   - 多个域名支持
@@ -157,6 +161,8 @@ Dynamic: summary
 2. JSON 配置文件（值为 null 认为是有效值，会覆盖环境变量的设置，如果没有对应的 key 则会尝试使用环境变量）
 3. 环境变量 DDNS_ 前缀加上 key 全大写或者全小写，点转下划线（`${ddns_id}` 或 `${DDNS_ID}`，`${DDNS_LOG_LEVEL}`）
 
+> 📖 **环境变量详细配置**: 查看 [环境变量配置文档](doc/env.md) 了解所有环境变量的详细用法和示例
+
 <details open>
 <summary markdown="span">config.json 配置文件</summary>
 

{ddns-4.0.0b3 → ddns-4.0.0b5}/dns/dnspod.py

@@ -106,10 +106,11 @@ def get_domain_id(domain):
         return get_domain_id.domain_list[domain]
     else:
         try:
-            info = request('Domain.Info', domain=domain)
-        except Exception:
+            d_info = request('Domain.Info', domain=domain)
+        except Exception as e:
+            info("get_domain_id(%s) error: %s", domain, e)
             return
-        did = info.get("domain", {}).get("id")
+        did = d_info.get("domain", {}).get("id")
         if did:
             get_domain_id.domain_list[domain] = did
             return did

{ddns-4.0.0b3 → ddns-4.0.0b5}/run.py

@@ -9,9 +9,10 @@ DDNS
 # nuitka-project: --product-version=0.0.0
 
 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 subprocess import check_output
 
 import sys
 
@@ -19,7 +20,7 @@ from util import ip
 from util.cache import Cache
 from util.config import init_config, get_config
 
-__version__ = "v4.0.0-beta3@2025-06-04T17:36:22+00:00"  # CI 时会被Tag替换
+__version__ = "v4.0.0-beta5@2025-06-12T01:13:18+00:00"  # CI 时会被Tag替换
 __description__ = "automatically update DNS records to dynamic local IP [自动更新DNS记录指向本地IP]"
 __doc__ = """
 ddns[%s]
@@ -28,12 +29,18 @@ ddns[%s]
 Copyright (c) New Future (MIT License)
 """ % (__version__)
 
-environ["DDNS_VERSION"] = "v4.0.0-beta3"
+environ["DDNS_VERSION"] = "v4.0.0-beta5"
+
 
-if getattr(sys, 'frozen', False):
-    # https://github.com/pyinstaller/pyinstaller/wiki/Recipe-OpenSSL-Certificate
-    environ['SSL_CERT_FILE'] = path.join(
-        getattr(sys, '_MEIPASS'), 'lib', 'cert.pem')
+def is_false(value):
+    """
+    判断值是否为 False
+    字符串 'false', 或者 False, 或者 'none';
+    0 不是 False
+    """
+    if isinstance(value, str):
+        return value.strip().lower() in ['false', 'none']
+    return value is False
 
 
 def get_ip(ip_type, index="default"):
@@ -45,7 +52,7 @@ def get_ip(ip_type, index="default"):
     value = None
     try:
         debug("get_ip(%s, %s)", ip_type, index)
-        if index is False:  # disabled
+        if is_false(index):  # disabled
             return False
         elif isinstance(index, list):  # 如果获取到的规则是列表，则依次判断列表中每一个规则，直到获取到IP
             for i in index:
@@ -153,7 +160,7 @@ def main():
     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 out of dated.')
+        warning('Cache file is outdated.')
         cache.clear()
     else:
         debug('Cache is empty.')
@@ -162,8 +169,9 @@ def main():
 
 
 if __name__ == '__main__':
-    if sys.version_info.major == 3 and os_name == 'nt':
-        from io import TextIOWrapper
-        sys.stdout = TextIOWrapper(sys.stdout.detach(), encoding='utf-8')
-        sys.stderr = TextIOWrapper(sys.stderr.detach(), encoding='utf-8')
+    encoding = sys.stdout.encoding
+    if encoding is not None and encoding.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()

{ddns-4.0.0b3 → ddns-4.0.0b5}/setup.py

@@ -38,7 +38,7 @@ elif 'BUILD_SOURCEBRANCHNAME' in environ:
 elif 'GITHUB_REF_NAME' in environ:  # github actions
     ref = environ['GITHUB_REF_NAME']
     if ref == 'master' or ref == 'main':  # CI
-        version = '0.0.b' + str(int(time()))
+        version = '4.0.b' + str(int(time()))
     elif ref.startswith('v') or ref.startswith('V'):  # Tag
         version = ref
     else:  # PR

{ddns-4.0.0b3 → ddns-4.0.0b5}/util/cache.py

@@ -11,10 +11,9 @@ from time import time
 
 from logging import info, debug, warning
 
-try:
+try:  # python 3
     from collections.abc import MutableMapping
-except ImportError:
-    # Python 2 imports
+except ImportError:  # python 2
     from collections import MutableMapping
 
 

{ddns-4.0.0b3 → ddns-4.0.0b5}/util/config.py

@@ -4,6 +4,7 @@ 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
 
@@ -13,6 +14,11 @@ __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):
     """
@@ -35,6 +41,32 @@ def log_level(value):
     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):
     """
     配置
@@ -128,14 +160,16 @@ def get_config(key, default=None):
         return getattr(__cli_args, key)
     if key in __config:
         return __config.get(key)
+    # 检查环境变量
     env_name = 'DDNS_' + key.replace('.', '_')  # type:str
-    if env_name in environ:  # 环境变量
-        return environ.get(env_name)
-    elif env_name.upper() in environ:  # 大写环境变量
-        return environ.get(env_name.upper())
-    elif env_name.lower() in environ:  # 小写环境变量
-        return environ.get(env_name.lower())
-    return default
+    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):