diff --git a/.github/workflows/update_url.yml b/.github/workflows/update_url.yml index 56743ff..14b4a2c 100644 --- a/.github/workflows/update_url.yml +++ b/.github/workflows/update_url.yml @@ -11,8 +11,9 @@ jobs: with: python-version: '3.10' - name: Prepare - run: pip install requests + run: pip install requests beautifulsoup4 - name: Run update_url.py env: - API_KEY: ${{ secrets.API_KEY }} + DDAL_EMAIL: ${{ secrets.DDAL_EMAIL }} + DDAL_PASSWORD: ${{ secrets.DDAL_PASSWORD }} run: python update_url.py diff --git a/ACL4SSR_Online_Full_Mannix.ini b/ACL4SSR_Online_Full_Mannix.ini index 1fc7c88..e04fa14 100644 --- a/ACL4SSR_Online_Full_Mannix.ini +++ b/ACL4SSR_Online_Full_Mannix.ini @@ -1,13 +1,13 @@ [custom] -;自定义 Clash 配置模板 https://goo.gs/config +;自定义 Clash 配置模板 https://dd.al/config ;可作为 订阅转换 配置转换 规则转换 的远程配置 ;修改自 https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full.ini ;V2 ;自带旗帜 emoji 添加逻辑，原名不包含旗帜 emoji 才添加，原名已包含旗帜 emoji 则不添加 ;需去除订阅转换链接中的参数 emoji=true/false 才能生效，参考例子： -;https://api.dler.io/sub?target=clash&udp=true&scv=true&config=https://goo.gs/config&url={原订阅链接} -;短链：https://goo.gs/dler?url={原订阅链接} +;https://api.dler.io/sub?target=clash&udp=true&scv=true&config=https://dd.al/config&url={原订阅链接} +;短链：https://dd.al/dler?url={原订阅链接} ;--- diff --git a/README.md b/README.md index 985be5d..4d04258 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## ACL4SSR_Online_Full_Mannix.ini -自定义 Clash 配置模板 https://goo.gs/config +自定义 Clash 配置模板 https://dd.al/config 可作为 订阅转换 配置转换 规则转换 的远程配置 @@ -14,9 +14,9 @@ **需去除订阅转换链接中的参数 `emoji=true/false` 才能生效**，参考例子： -`https://api.dler.io/sub?target=clash&udp=true&scv=true&config=https://goo.gs/config&url={原订阅链接}` +`https://api.dler.io/sub?target=clash&udp=true&scv=true&config=https://dd.al/config&url={原订阅链接}` -短链：`https://goo.gs/dler?url={原订阅链接}` +短链：`https://dd.al/dler?url={原订阅链接}` --- diff --git a/update_url.py b/update_url.py index a511adb..413d2d3 100644 --- a/update_url.py +++ b/update_url.py @@ -1,40 +1,125 @@ +from concurrent.futures import ThreadPoolExecutor import os +import re +from threading import RLock +from urllib.parse import urlsplit import requests +from bs4 import BeautifulSoup GITHUB_REPOSITORY = os.getenv('GITHUB_REPOSITORY') - -if GITHUB_REPOSITORY == 'zsokami/ACL4SSR': - API_KEY = os.getenv('API_KEY') - alias = 'config' - alias_sc = 'dler' -else: - API_KEY = 'wMZJfKSns5lLIZ7if32owHe9w06EVAV6ZjbnCoeFs65PNN95lrwDxnKSGAMV' - repo = GITHUB_REPOSITORY.replace('/', '__') - alias = f"gh__{repo}" - alias_sc = f"gh__{repo}__sc" +GITHUB_REF_NAME = os.getenv('GITHUB_REF_NAME') +GITHUB_SHA = os.getenv('GITHUB_SHA') +DDAL_EMAIL = os.getenv('DDAL_EMAIL') +DDAL_PASSWORD = os.getenv('DDAL_PASSWORD') ini_file_name = next(f for f in os.listdir() if f.endswith('.ini')) -url = f"https://cdn.jsdelivr.net/gh/{GITHUB_REPOSITORY}@{os.getenv('GITHUB_SHA')}/{ini_file_name}" -url_sc = f"https://api.dler.io/sub?target=clash&udp=true&scv=true&config={url}" -session = requests.Session() -session.headers['Authorization'] = f"Bearer {API_KEY}" -api = 'https://goo.gs/api/v1/links' +if DDAL_EMAIL and DDAL_PASSWORD: + re_ddal_alias = re.compile(r'[\da-z]+(?:-[\da-z]+)*', re.I) + class DDAL: + def __init__(self): + self.__session = requests.Session() + self.__session.headers['User-Agent'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36' + self.__token_lock = RLock() -def upsert(alias, url): - items = session.get(api, params={'search': alias, 'by': 'alias'}).json()['data'] - item = next((item for item in items if item['alias'] == alias), None) - if item: - r = session.put(f"{api}/{item['id']}", data={'url': url}) + @staticmethod + def raise_for_alias(alias): + if not re_ddal_alias.fullmatch(alias): + raise Exception(f'非法 alias: {alias}') + + def login(self, email, password): + with self.__token_lock: + bs = BeautifulSoup(self.__session.get('https://dd.al/user/login').text, 'html.parser') + token = bs.find('input', {'name': 'token'}) + if not token: + raise Exception('未找到 token (https://dd.al/user/login)') + token = token['value'] + r = self.__session.post('https://dd.al/user/login', data={ + 'email': email, + 'password': password, + 'token': token + }, allow_redirects=False) + loc = r.headers.get('Location') + if not (loc and urlsplit(loc).path == '/user'): + raise Exception(f'loc = {repr(loc)}') + + def search(self, q) -> list[dict]: + html = self.__session.post('https://dd.al/user/search', data={ + 'q': q, + 'token': 'd2172161243aedc5da47e41227f37add' + }).text + bs = BeautifulSoup(html, 'html.parser') + return [{ + 'id': item['data-id'], + 'short': item.select_one('.short-url>a')['href'], + 'original': item.select_one('.title>a')['href'] + } for item in bs.find_all(class_='url-list')] + + def insert(self, alias, url) -> str: + self.raise_for_alias(alias) + r = self.__session.post('https://dd.al/shorten', data={ + 'url': url, + 'custom': alias + }).json() + if r['error']: + raise Exception(f"{r['msg']} (alias = {repr(alias)}, url = {repr(url)})") + return r['short'] + + def update(self, id, url) -> str: + while True: + with self.__token_lock: + bs = BeautifulSoup(self.__session.get(f'https://dd.al/user/edit/{id}').text, 'html.parser') + token = bs.find('input', {'name': 'token'}) + if not token: + raise Exception(f'未找到 token (https://dd.al/user/edit/{id})') + token = token['value'] + r = self.__session.post(f'https://dd.al/user/edit/{id}', data={ + 'url': url, + 'token': token + }, allow_redirects=False) + loc = r.headers.get('Location') + if not (loc and urlsplit(loc).path != '/user'): + raise Exception(f'loc = {repr(loc)}') + short = next((item['short'] for item in self.search(url) if item['id'] == id), None) + if short: + break + return short + + def upsert(self, alias, url) -> str: + self.raise_for_alias(alias) + id = next((item['id'] for item in self.search(alias) if urlsplit(item['short']).path[1:] == alias), None) + if id: + return self.update(id, url) + else: + return self.insert(alias, url) + + if GITHUB_REPOSITORY == 'zsokami/ACL4SSR': + alias = 'config' + alias_sc = 'dler' else: - r = session.post(api, data={'url': url, 'alias': alias}) - if r.ok: - print(r.json()['data']['short_url']) - else: - print(r.text) + repo = GITHUB_REPOSITORY.replace('/', '-') + alias = f"gh-{repo}" + alias_sc = f"gh-{repo}-sc" + url = f"https://cdn.jsdelivr.net/gh/{GITHUB_REPOSITORY}@{GITHUB_SHA}/{ini_file_name}" + url_sc = f"https://api.dler.io/sub?target=clash&udp=true&scv=true&config={url}" -upsert(alias, url) -upsert(alias_sc, url_sc) + ddal = DDAL() + ddal.login(DDAL_EMAIL, DDAL_PASSWORD) + + upsert_args = [ + (alias, url), + (alias_sc, url_sc) + ] + + with ThreadPoolExecutor(len(upsert_args)) as executor: + url, url_sc = executor.map(ddal.upsert, *zip(*upsert_args)) + print(url) + print(f'{url_sc}?url=') +else: + url = f"https://cdn.staticaly.com/gh/{GITHUB_REPOSITORY}/{GITHUB_REF_NAME}/{ini_file_name}" + url_sc = f"https://api.dler.io/sub?target=clash&udp=true&scv=true&config={url}&url=" + print(url) + print(url_sc)