fix: keep mail and CPA traffic direct

This commit is contained in:
mmc
2026-03-19 11:44:39 +08:00
parent e312a62b08
commit fdada7c8db
5 changed files with 48 additions and 17 deletions

View File

@@ -1325,17 +1325,17 @@ def run(
emitter.info("正在创建临时邮箱...", step="create_email")
try:
email, dev_token = mail_provider.create_mailbox(
proxy=static_proxy,
proxy_selector=mail_proxy_selector,
proxy="",
proxy_selector=None,
)
except TypeError:
email, dev_token = mail_provider.create_mailbox(proxy=static_proxy)
email, dev_token = mail_provider.create_mailbox(proxy="")
else:
emitter.info("正在创建 Mail.tm 临时邮箱...", step="create_email")
email, dev_token = get_email_and_token(
static_proxies,
None,
emitter,
proxy_selector=mail_proxies_selector,
proxy_selector=None,
)
if not email or not dev_token:
emitter.error("临时邮箱创建失败", step="create_email")
@@ -1487,25 +1487,25 @@ def run(
code = mail_provider.wait_for_otp(
dev_token,
email,
proxy=static_proxy,
proxy_selector=mail_proxy_selector,
proxy="",
proxy_selector=None,
stop_event=stop_event,
)
except TypeError:
code = mail_provider.wait_for_otp(
dev_token,
email,
proxy=static_proxy,
proxy="",
stop_event=stop_event,
)
else:
code = get_oai_code(
dev_token,
email,
static_proxies,
None,
emitter,
stop_event,
proxy_selector=mail_proxies_selector,
proxy_selector=None,
)
if not code:
return None
@@ -1765,12 +1765,12 @@ def run(
return None
try:
_otp_code2 = mail_provider.wait_for_otp(
dev_token, email, proxy=static_proxy,
proxy_selector=mail_proxy_selector, stop_event=stop_event,
dev_token, email, proxy="",
proxy_selector=None, stop_event=stop_event,
)
except TypeError:
_otp_code2 = mail_provider.wait_for_otp(
dev_token, email, proxy=static_proxy, stop_event=stop_event,
dev_token, email, proxy="", stop_event=stop_event,
)
if not _otp_code2 or _otp_code2 in _tried_codes:
time.sleep(2)