ddns 2.13.3__tar.gz → 3.0.2__tar.gz

{ddns-2.13.3 → ddns-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddns
-Version: 2.13.3
+Version: 3.0.2
 Summary: automatically update DNS records to dynamic local IP [自动更新DNS记录指向本地IP]
 Home-page: https://ddns.newfuture.cc
 Author: NewFuture
@@ -14,7 +14,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=2.5, <4
 Description-Content-Type: text/markdown
@@ -36,7 +35,7 @@ License-File: LICENSE
 - 兼容和跨平台:
   - [x] 可执行文件(无需 python 环境)
   - [x] 多系统兼容 ![cross platform](https://img.shields.io/badge/platform-windows_%7C%20linux_%7C%20osx-success.svg?style=social)
-  - [x] python2 和 python3 支持 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ddns.svg?style=social)
+  - [x] python3 支持 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ddns.svg?style=social)(2.x支持python2和python3)
   - [x] PIP 安装 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/ddns.svg?style=social)
   - [x] Docker 支持(@NN708)
 - 域名支持:
@@ -143,7 +142,7 @@ python run.py -c /path/to/config.json
 
 |  key   |        type        | required |   default   |    description    | tips                                                                                                        |
 | :----: | :----------------: | :------: | :---------: | :---------------: | ----------------------------------------------------------------------------------------------------------- |
-|   id   |       string       |    √     |     无      |    api 访问 ID    | Cloudflare 为邮箱(使用 Token 时留空)<br>HE.net 可留空                                                       |
+|   id   |       string       |    √     |     无      |    api 访问 ID    | Cloudflare 为邮箱(使用 Token 时留空)<br>HE.net 可留空<br>华为云为 Access Key ID (AK)                                                       |
 | token  |       string       |    √     |     无      |  api 授权 token   | 部分平台叫 secret key , **反馈粘贴时删除**                                                                  |
 |  dns   |       string       |    No    | `"dnspod"`  |    dns 服务商     | 阿里 DNS 为`alidns`,<br>Cloudflare 为 `cloudflare`,<br>dns.com 为 `dnscom`,<br>DNSPOD 国内为 `dnspod`,<br>DNSPOD 国际版为 `dnspod_com`,<br>HE.net 为`he`,<br>华为 DNS 为`huaweidns`,<br>自定义回调为`callback` |
 |  ipv4  |       array        |    No    |    `[]`     |   ipv4 域名列表   | 为`[]`时,不会获取和更新 IPv4 地址                                                                           |

{ddns-2.13.3 → ddns-3.0.2}/README.md

@@ -14,7 +14,7 @@
 - 兼容和跨平台:
   - [x] 可执行文件(无需 python 环境)
   - [x] 多系统兼容 ![cross platform](https://img.shields.io/badge/platform-windows_%7C%20linux_%7C%20osx-success.svg?style=social)
-  - [x] python2 和 python3 支持 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ddns.svg?style=social)
+  - [x] python3 支持 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ddns.svg?style=social)(2.x支持python2和python3)
   - [x] PIP 安装 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/ddns.svg?style=social)
   - [x] Docker 支持(@NN708)
 - 域名支持:
@@ -121,7 +121,7 @@ python run.py -c /path/to/config.json
 
 |  key   |        type        | required |   default   |    description    | tips                                                                                                        |
 | :----: | :----------------: | :------: | :---------: | :---------------: | ----------------------------------------------------------------------------------------------------------- |
-|   id   |       string       |    √     |     无      |    api 访问 ID    | Cloudflare 为邮箱(使用 Token 时留空)<br>HE.net 可留空                                                       |
+|   id   |       string       |    √     |     无      |    api 访问 ID    | Cloudflare 为邮箱(使用 Token 时留空)<br>HE.net 可留空<br>华为云为 Access Key ID (AK)                                                       |
 | token  |       string       |    √     |     无      |  api 授权 token   | 部分平台叫 secret key , **反馈粘贴时删除**                                                                  |
 |  dns   |       string       |    No    | `"dnspod"`  |    dns 服务商     | 阿里 DNS 为`alidns`,<br>Cloudflare 为 `cloudflare`,<br>dns.com 为 `dnscom`,<br>DNSPOD 国内为 `dnspod`,<br>DNSPOD 国际版为 `dnspod_com`,<br>HE.net 为`he`,<br>华为 DNS 为`huaweidns`,<br>自定义回调为`callback` |
 |  ipv4  |       array        |    No    |    `[]`     |   ipv4 域名列表   | 为`[]`时,不会获取和更新 IPv4 地址                                                                           |

{ddns-2.13.3 → ddns-3.0.2}/ddns.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddns
-Version: 2.13.3
+Version: 3.0.2
 Summary: automatically update DNS records to dynamic local IP [自动更新DNS记录指向本地IP]
 Home-page: https://ddns.newfuture.cc
 Author: NewFuture
@@ -14,7 +14,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=2.5, <4
 Description-Content-Type: text/markdown
@@ -36,7 +35,7 @@ License-File: LICENSE
 - 兼容和跨平台:
   - [x] 可执行文件(无需 python 环境)
   - [x] 多系统兼容 ![cross platform](https://img.shields.io/badge/platform-windows_%7C%20linux_%7C%20osx-success.svg?style=social)
-  - [x] python2 和 python3 支持 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ddns.svg?style=social)
+  - [x] python3 支持 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/ddns.svg?style=social)(2.x支持python2和python3)
   - [x] PIP 安装 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/ddns.svg?style=social)
   - [x] Docker 支持(@NN708)
 - 域名支持:
@@ -143,7 +142,7 @@ python run.py -c /path/to/config.json
 
 |  key   |        type        | required |   default   |    description    | tips                                                                                                        |
 | :----: | :----------------: | :------: | :---------: | :---------------: | ----------------------------------------------------------------------------------------------------------- |
-|   id   |       string       |    √     |     无      |    api 访问 ID    | Cloudflare 为邮箱(使用 Token 时留空)<br>HE.net 可留空                                                       |
+|   id   |       string       |    √     |     无      |    api 访问 ID    | Cloudflare 为邮箱(使用 Token 时留空)<br>HE.net 可留空<br>华为云为 Access Key ID (AK)                                                       |
 | token  |       string       |    √     |     无      |  api 授权 token   | 部分平台叫 secret key , **反馈粘贴时删除**                                                                  |
 |  dns   |       string       |    No    | `"dnspod"`  |    dns 服务商     | 阿里 DNS 为`alidns`,<br>Cloudflare 为 `cloudflare`,<br>dns.com 为 `dnscom`,<br>DNSPOD 国内为 `dnspod`,<br>DNSPOD 国际版为 `dnspod_com`,<br>HE.net 为`he`,<br>华为 DNS 为`huaweidns`,<br>自定义回调为`callback` |
 |  ipv4  |       array        |    No    |    `[]`     |   ipv4 域名列表   | 为`[]`时,不会获取和更新 IPv4 地址                                                                           |

{ddns-2.13.3 → ddns-3.0.2}/dns/huaweidns.py

@@ -143,12 +143,19 @@ def request(method, path, param=None, body=None, **params):
 
 def get_zone_id(domain):
     """
-    切割域名获取主域名和对应ID https://support.huaweicloud.com/api-dns/zh-cn_topic_0037134402.html
+    切割域名获取主域名和对应ID https://support.huaweicloud.com/api-dns/dns_api_62003.html
+    优先匹配级数最长的主域名
     """
-    zones = request('GET', '/v2/zones', limit=500)['zones']
-    domain += '.'
-    zone = next((z for z in zones if domain.endswith(z.get('name'))), None)
-    zoneid = zone and zone['id']
+    zoneid = None
+    domain_slice = domain.split('.')
+    index = len(domain_slice)
+    root_domain = '.'.join(domain_slice[-2:])
+    zones = request('GET', '/v2/zones', limit=500, name=root_domain)['zones']
+    while (not zoneid) and (index >= 2):
+        domain = '.'.join(domain_slice[-index:]) + '.'
+        zone = next((z for z in zones if domain == (z.get('name'))), None)
+        zoneid = zone and zone['id']
+        index -= 1
     return zoneid
 
 
@@ -156,7 +163,7 @@ def get_records(zoneid, **conditions):
     """
         获取记录ID
         返回满足条件的所有记录[]
-        https://support.huaweicloud.com/api-dns/zh-cn_topic_0037129970.html
+        https://support.huaweicloud.com/api-dns/dns_api_64004.html
         TODO 大于500翻页
     """
     cache_key = zoneid + "_" + \
@@ -187,13 +194,13 @@ def get_records(zoneid, **conditions):
     return records
 
 
-def update_record(domain, value, record_type='A', name=None):
+def update_record(domain, value, record_type='A'):
     """
         更新记录
         update
-        https://support.huaweicloud.com/api-dns/dns_api_64006.html
+        https://support.huaweicloud.com/api-dns/UpdateRecordSet.html
         add
-        https://support.huaweicloud.com/api-dns/zh-cn_topic_0037134404.html
+        https://support.huaweicloud.com/api-dns/dns_api_64001.html
     """
     info(">>>>>%s(%s)", domain, record_type)
     zoneid = get_zone_id(domain)
@@ -207,20 +214,27 @@ def update_record(domain, value, record_type='A', name=None):
         for (rid, record) in records.items():
             if record['records'] != value:
                 """
+                PUT https://{endpoint}/v2/zones/{zone_id}/recordsets/{recordset_id}
+
                 {
-                    "description": "This is an example record set.",
-                    "ttl": 3600,
-                    "records": [
-                        "192.168.10.1",
-                        "192.168.10.2"
-                    ]
+                    "name" : "www.example.com.",
+                    "description" : "This is an example record set.",
+                    "type" : "A",
+                    "ttl" : 3600,
+                    "records" : [ "192.168.10.1", "192.168.10.2" ]
                 }
                 """
                 body = {
+                    "name": domain,
+                    "description": "Managed by DDNS.",
+                    "type": record_type,
                     "records": [
                         value
                     ]
                 }
+                # 如果TTL不为空，则添加到字典中
+                if Config.TTL is not None:
+                    body['ttl'] = Config.TTL
                 res = request('PUT', '/v2/zones/' + zoneid + '/recordsets/' + record['id'],
                               body=str(jsonencode(body)))
                 if res:
@@ -231,14 +245,17 @@ def update_record(domain, value, record_type='A', name=None):
             else:
                 result[rid] = domain
     else:  # create
-        print(domain)
         body = {
             "name": domain,
+            "description": "Managed by DDNS.",
             "type": record_type,
             "records": [
                 value
             ]
         }
+        # 如果TTL不为空，则添加到字典中
+        if Config.TTL is not None:
+            body['ttl'] = Config.TTL
         res = request('POST', '/v2/zones/' + zoneid + '/recordsets',
                       body=str(jsonencode(body)))
         if res:

{ddns-2.13.3 → ddns-3.0.2}/run.py

@@ -18,7 +18,7 @@ from util import ip
 from util.cache import Cache
 from util.config import init_config, get_config
 
-__version__ = "v2.13.3@2023-04-19T11:45:22+00:00"  # CI 时会被Tag替换
+__version__ = "v3.0.2@2024-06-13T12:25:13+00:00"  # CI 时会被Tag替换
 __description__ = "automatically update DNS records to dynamic local IP [自动更新DNS记录指向本地IP]"
 __doc__ = """
 ddns[%s]
@@ -27,7 +27,7 @@ ddns[%s]
 Copyright (c) New Future (MIT License)
 """ % (__version__)
 
-environ["DDNS_VERSION"] = "v2.13.3"
+environ["DDNS_VERSION"] = "v3.0.2"
 
 if getattr(sys, 'frozen', False):
     # https://github.com/pyinstaller/pyinstaller/wiki/Recipe-OpenSSL-Certificate
@@ -41,7 +41,7 @@ def get_ip(ip_type, index="default"):
     """
     if index is False:  # disabled
         return False
-    elif type(index) == list:  # 如果获取到的规则是列表，则依次判断列表中每一个规则，直到找到一个可以正确获取到的IP
+    elif type(index) is list:  # 如果获取到的规则是列表，则依次判断列表中每一个规则，直到找到一个可以正确获取到的IP
         value = None
         for i in index:
             value = get_ip(ip_type, i)
@@ -69,9 +69,9 @@ def get_ip(ip_type, index="default"):
 def change_dns_record(dns, proxy_list, **kw):
     for proxy in proxy_list:
         if not proxy or (proxy.upper() in ['DIRECT', 'NONE']):
-            dns.PROXY = None
+            dns.Config.PROXY = None
         else:
-            dns.PROXY = proxy
+            dns.Config.PROXY = proxy
         record_type, domain = kw['record_type'], kw['domain']
         print('\n%s %s(%s) ==> %s [via %s]' %
               (asctime(), domain, record_type, kw['ip'], proxy))
@@ -104,6 +104,7 @@ def update_ip(ip_type, cache, dns, proxy_list):
     record_type = (ip_type == '4') and 'A' or 'AAAA'
     update_fail = False  # https://github.com/NewFuture/DDNS/issues/16
     for domain in domains:
+        domain = domain.lower()  # https://github.com/NewFuture/DDNS/issues/431
         if change_dns_record(dns, proxy_list, domain=domain, ip=address, record_type=record_type):
             update_fail = True
     if cache is not False:

{ddns-2.13.3 → ddns-3.0.2}/setup.py

@@ -135,7 +135,7 @@ setup(
         # that you indicate whether you support Python 2, Python 3 or both.
         # These classifiers are *not* checked by 'pip install'. See instead
         # 'python_requires' below.
-        'Programming Language :: Python :: 2.7',
+        # 'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
     ],
 

{ddns-2.13.3 → ddns-3.0.2}/util/ip.py

@@ -50,7 +50,7 @@ def _open(url, reg):
     try:
         debug("open: %s", url)
         res = urlopen(
-            Request(url, headers={'User-Agent': 'curl/7.63.0-ddns'}),  timeout=60
+            Request(url, headers={'User-Agent': 'Mozilla/5.0 ddns'}),  timeout=60
         ).read().decode('utf8', 'ignore')
         debug("response: %s",  res)
         return compile(reg).search(res).group()
@@ -58,11 +58,11 @@ def _open(url, reg):
         error(e)
 
 
-def public_v4(url="https://myip4.ipip.net", reg=IPV4_REG):  # 公网IPV4地址
+def public_v4(url="https://api-ipv4.ip.sb/ip", reg=IPV4_REG):  # 公网IPV4地址
     return _open(url, reg)
 
 
-def public_v6(url="https://myip6.ipip.net", reg=IPV6_REG):  # 公网IPV6地址
+def public_v6(url="https://api-ipv6.ip.sb/ip", reg=IPV6_REG):  # 公网IPV6地址
     return _open(url, reg)