GithubBackup/cloudflare_temp_email
1
0
Fork 0
mirror of https://github.com/dreamhunter2333/cloudflare_temp_email.git synced 2026-09-05 15:38:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: smtp_proxy_server use httpx (#265)

Browse Source
This commit is contained in:
Dream Hunter
2024-05-22 22:24:59 +08:00
committed by GitHub
parent 02e3e755e7
commit aa04dc4efa
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
smtp_proxy_server/imap_server.py
+8 -6
View File
@@ -1,6 +1,6 @@
import json import json
import logging import logging
import requests import httpx
from io import BytesIO from io import BytesIO
from twisted.mail import imap4 from twisted.mail import imap4
@@ -117,8 +117,9 @@ class SimpleMailbox:
limit = min(20, end - start + 1) if end and end >= start else 20 limit = min(20, end - start + 1) if end and end >= start else 20
if self.message_count > 0 and start > self.message_count: if self.message_count > 0 and start > self.message_count:
return [] return []
res = requests.get( res = httpx.get(
f"{settings.proxy_url}/api/mails?limit={limit}&offset={start - 1}", headers={ f"{settings.proxy_url}/api/mails?limit={limit}&offset={start - 1}",
headers={
"Authorization": f"Bearer {self.password}", "Authorization": f"Bearer {self.password}",
"Content-Type": "application/json" "Content-Type": "application/json"
} }
@@ -139,11 +140,12 @@ class SimpleMailbox:
def fetchSENT(self, messages): def fetchSENT(self, messages):
start, end = messages.ranges[0] start, end = messages.ranges[0]
start = max(start, 1) start = max(start, 1)
limit = min(20, end - start + 1) if end >= start else 20 limit = min(20, end - start + 1) if end and end >= start else 20
if self.message_count > 0 and start > self.message_count: if self.message_count > 0 and start > self.message_count:
return [] return []
res = requests.get( res = httpx.get(
f"{settings.proxy_url}/api/sendbox?limit={limit}&offset={start - 1}", headers={ f"{settings.proxy_url}/api/sendbox?limit={limit}&offset={start - 1}",
headers={
"Authorization": f"Bearer {self.password}", "Authorization": f"Bearer {self.password}",
"Content-Type": "application/json" "Content-Type": "application/json"
} }
smtp_proxy_server/requirements.txt
+1
View File
@@ -2,3 +2,4 @@ aiosmtpd==1.4.6
pydantic-settings==2.2.1 pydantic-settings==2.2.1
requests==2.32.0 requests==2.32.0
twisted==24.3.0 twisted==24.3.0
httpx==0.27.0
smtp_proxy_server/smtp_server.py
+2 -2
View File
@@ -1,7 +1,7 @@
import asyncio import asyncio
import logging import logging
import email import email
import requests import httpx
from aiosmtpd.controller import Controller from aiosmtpd.controller import Controller
from aiosmtpd.smtp import SMTP, Session, Envelope, AuthResult, LoginPassword from aiosmtpd.smtp import SMTP, Session, Envelope, AuthResult, LoginPassword
@@ -102,7 +102,7 @@ class CustomSMTPHandler:
} }
_logger.info(f"Send mail {dict(send_body, token='***')}") _logger.info(f"Send mail {dict(send_body, token='***')}")
try: try:
res = requests.post( res = httpx.post(
f"{settings.proxy_url}/external/api/send_mail", f"{settings.proxy_url}/external/api/send_mail",
json=send_body, headers={ json=send_body, headers={
"Content-Type": "application/json" "Content-Type": "application/json"