Merge pull request #16 from kaiden694/dev

feat(mail): add Cloud Mail provider + fix registration HTTP timeout

Author: HM2899

.env.example

@@ -194,7 +194,7 @@ GROK2API_DELETE_INVALID_REFRESH=1
 # GROK2API_SSO_HTTP_TIMEOUT=12
 
 # ── Protocol registration (optional) ──────────────────
-# Mail provider: moemail | yyds | gptmail  (keys are stored separately in DB)
+# Mail provider: moemail | yyds | gptmail | cfmail | tempmail | cloudmail  (keys are stored separately in DB)
 # GROK2API_MAIL_PROVIDER=moemail
 # MoeMail (self-hosted base URL required):
 # GROK2API_MOEMAIL_API_KEY=
@@ -210,6 +210,12 @@ GROK2API_DELETE_INVALID_REFRESH=1
 # GROK2API_CFMAIL_BASE_URL=https://your-worker.example.workers.dev
 # GROK2API_CFMAIL_API_KEY=your-admin-password
 # GROK2API_CFMAIL_DOMAIN=example.com
+# Cloud Mail (maillab/cloud-mail — self-hosted Worker origin + admin_email:password):
+# https://github.com/maillab/cloud-mail
+# GROK2API_MAIL_PROVIDER=cloudmail
+# GROK2API_CLOUDMAIL_BASE_URL=https://skymail.example.com
+# GROK2API_CLOUDMAIL_API_KEY=admin@example.com:your-admin-password
+# GROK2API_CLOUDMAIL_DOMAIN=example.com
 # Captcha provider: local (inline in main container) | yescaptcha
 # GROK2API_CAPTCHA_PROVIDER=local
 # Inline solver default (same container loopback):

grok2api/admin/settings_store.py

@@ -1833,19 +1833,22 @@ def apply_runtime_settings_to_modules() -> None:
     # Per-provider base URLs for self-hosted services (do not share one field).
     "moemail_base_url",
     "cfmail_base_url",
+    "cloudmail_base_url",
     # Active key (derived from selected provider). Kept for adapter/env compat.
     "api_key",
     # Per-provider secrets — all persist in DB so switching provider keeps keys.
     "moemail_api_key",
     "yyds_api_key",
     "gptmail_api_key",
     "cfmail_api_key",
+    "cloudmail_api_key",
     # Active domain + per-provider domains (same pattern as keys).
     "domain",
     "moemail_domain",
     "yyds_domain",
     "gptmail_domain",
     "cfmail_domain",
+    "cloudmail_domain",
     "prefix",
     "expiry_ms",
     "captcha_provider",
@@ -1868,6 +1871,7 @@ def apply_runtime_settings_to_modules() -> None:
         "yyds_api_key",
         "gptmail_api_key",
         "cfmail_api_key",
+        "cloudmail_api_key",
         "yescaptcha_key",
         "proxy_password",
     }
@@ -1878,20 +1882,23 @@ def apply_runtime_settings_to_modules() -> None:
     "yyds": "yyds_api_key",
     "gptmail": "gptmail_api_key",
     "cfmail": "cfmail_api_key",
+    "cloudmail": "cloudmail_api_key",
 }
 
 _MAIL_PROVIDER_DOMAIN_FIELDS = {
     "moemail": "moemail_domain",
     "yyds": "yyds_domain",
     "gptmail": "gptmail_domain",
     "cfmail": "cfmail_domain",
+    "cloudmail": "cloudmail_domain",
 }
 
 # Self-hosted providers keep independent base URLs so switching never overwrites
-# another provider's host (MoeMail vs Cloudflare Temp Email).
+# another provider's host (MoeMail vs Cloudflare Temp Email vs Cloud Mail).
 _MAIL_PROVIDER_BASE_URL_FIELDS = {
     "moemail": "moemail_base_url",
     "cfmail": "cfmail_base_url",
+    "cloudmail": "cloudmail_base_url",
 }
 
 
@@ -1983,6 +1990,27 @@ def _env_registration_defaults() -> dict[str, Any]:
         if cf_base:
             # Dedicated CF host only — never overwrite MoeMail base_url.
             out["cfmail_base_url"] = cf_base
+        cm_key = (
+            os.environ.get("GROK2API_CLOUDMAIL_API_KEY")
+            or os.environ.get("CLOUDMAIL_API_KEY")
+            or ""
+        ).strip()
+        if cm_key:
+            out["cloudmail_api_key"] = cm_key
+        cm_base = (
+            os.environ.get("GROK2API_CLOUDMAIL_BASE_URL")
+            or os.environ.get("CLOUDMAIL_BASE_URL")
+            or ""
+        ).strip()
+        if cm_base:
+            out["cloudmail_base_url"] = cm_base
+        cm_dom = (
+            os.environ.get("GROK2API_CLOUDMAIL_DOMAIN")
+            or os.environ.get("CLOUDMAIL_DOMAIN")
+            or ""
+        ).strip().lstrip("@").strip(".")
+        if cm_dom:
+            out["cloudmail_domain"] = cm_dom
         # Prefer multi-line pool env when present; keep single-proxy fallback.
         pool_env = (
             os.environ.get("GROK2API_XAI_PROXY_POOL")
@@ -2078,11 +2106,13 @@ def _pick_domain(key: str) -> str:
     legacy_base_url = _pick_str("base_url", 256)
     cfg["moemail_base_url"] = _pick_str("moemail_base_url", 256)
     cfg["cfmail_base_url"] = _pick_str("cfmail_base_url", 256)
+    cfg["cloudmail_base_url"] = _pick_str("cloudmail_base_url", 256)
     legacy_api_key = _pick_str("api_key", 512)
     cfg["moemail_api_key"] = _pick_str("moemail_api_key", 512)
     cfg["yyds_api_key"] = _pick_str("yyds_api_key", 512)
     cfg["gptmail_api_key"] = _pick_str("gptmail_api_key", 512)
     cfg["cfmail_api_key"] = _pick_str("cfmail_api_key", 512)
+    cfg["cloudmail_api_key"] = _pick_str("cloudmail_api_key", 512)
     # Do NOT env-fill legacy domain into every provider — only use explicit src.
     if "domain" in src:
         legacy_domain = str(src.get("domain") or "").strip().lstrip("@").strip(".")[:128]
@@ -2092,10 +2122,12 @@ def _pick_domain(key: str) -> str:
     cfg["yyds_domain"] = _pick_domain("yyds_domain")
     cfg["gptmail_domain"] = _pick_domain("gptmail_domain")
     cfg["cfmail_domain"] = _pick_domain("cfmail_domain")
+    cfg["cloudmail_domain"] = _pick_domain("cloudmail_domain")
     cfg["prefix"] = _pick_str("prefix", 64)
     try:
         from grok2api.upstream.moemail import (
             normalize_cfmail_base_url,
+            normalize_cloudmail_base_url,
             normalize_gptmail_base_url,
             normalize_mail_provider,
             normalize_yyds_base_url,
@@ -2105,13 +2137,15 @@ def _pick_domain(key: str) -> str:
         normalize_yyds_base_url = None  # type: ignore[assignment]
         normalize_gptmail_base_url = None  # type: ignore[assignment]
         normalize_cfmail_base_url = None  # type: ignore[assignment]
+        normalize_cloudmail_base_url = None  # type: ignore[assignment]
 
     mail_raw = _pick_str("mail_provider", 32).lower()
     # Prefer explicit mail_provider; only use base_url as a hint when empty.
     if normalize_mail_provider is not None:
         cfg["mail_provider"] = normalize_mail_provider(
             mail_raw or None,
             base_url=legacy_base_url
+            or cfg.get("cloudmail_base_url")
             or cfg.get("cfmail_base_url")
             or cfg.get("moemail_base_url")
             or None,
@@ -2123,10 +2157,12 @@ def _pick_domain(key: str) -> str:
             cfg["mail_provider"] = "gptmail"
         elif mail_raw in {"cfmail", "cloudflare", "cloudflare_temp_email", "awsl"}:
             cfg["mail_provider"] = "cfmail"
+        elif mail_raw in {"cloudmail", "cloud-mail", "skymail", "maillab"}:
+            cfg["mail_provider"] = "cloudmail"
         else:
             cfg["mail_provider"] = (
                 mail_raw
-                if mail_raw in {"moemail", "yyds", "gptmail", "cfmail"}
+                if mail_raw in {"moemail", "yyds", "gptmail", "cfmail", "cloudmail"}
                 else "moemail"
             )
 
@@ -2179,11 +2215,13 @@ def _pick_domain(key: str) -> str:
     # selected self-hosted provider so adapter/env keep working.
     if normalize_cfmail_base_url is not None and cfg.get("cfmail_base_url"):
         cfg["cfmail_base_url"] = normalize_cfmail_base_url(cfg["cfmail_base_url"])
+    if normalize_cloudmail_base_url is not None and cfg.get("cloudmail_base_url"):
+        cfg["cloudmail_base_url"] = normalize_cloudmail_base_url(cfg["cloudmail_base_url"])
     if cfg.get("moemail_base_url"):
         cfg["moemail_base_url"] = str(cfg["moemail_base_url"]).strip().rstrip("/")
 
     # YYDS / GPTMail use fixed official hosts — no user URL required.
-    # CF Temp Email / MoeMail are self-hosted and keep independent slots.
+    # CF Temp Email / MoeMail / Cloud Mail are self-hosted and keep independent slots.
     if cfg["mail_provider"] == "yyds":
         cfg["base_url"] = (
             normalize_yyds_base_url(None)
@@ -2204,6 +2242,15 @@ def _pick_domain(key: str) -> str:
             else (str(raw_base).strip() or "https://temp-email-api.awsl.uk")
         )
         cfg["base_url"] = cfg["cfmail_base_url"]
+    elif cfg["mail_provider"] == "cloudmail":
+        raw_base = cfg.get("cloudmail_base_url") or ""
+        if normalize_cloudmail_base_url is not None:
+            cfg["cloudmail_base_url"] = normalize_cloudmail_base_url(
+                str(raw_base) if raw_base else None
+            )
+        else:
+            cfg["cloudmail_base_url"] = str(raw_base).strip().rstrip("/")
+        cfg["base_url"] = cfg["cloudmail_base_url"]
     else:
         # MoeMail: active base_url mirrors moemail_base_url.
         cfg["base_url"] = str(cfg.get("moemail_base_url") or "").strip()
@@ -2314,13 +2361,15 @@ def get_registration_config(*, include_secrets: bool = True) -> dict[str, Any]:
     has_yyds = bool(cfg.get("yyds_api_key"))
     has_gpt = bool(cfg.get("gptmail_api_key"))
     has_cf = bool(cfg.get("cfmail_api_key"))
+    has_cm = bool(cfg.get("cloudmail_api_key"))
     has_active = bool(cfg.get("api_key"))
     public["configured"] = {
         "moemail": has_moemail,
         "yyds": has_yyds,
         "gptmail": has_gpt,
         "cfmail": has_cf,
-        "mail": has_active or has_moemail or has_yyds or has_gpt or has_cf,
+        "cloudmail": has_cm,
+        "mail": has_active or has_moemail or has_yyds or has_gpt or has_cf or has_cm,
         "yescaptcha": bool(cfg.get("yescaptcha_key")),
         "local_solver": bool(cfg.get("local_solver_url")),
         "captcha": (
@@ -2537,14 +2586,17 @@ def set_registration_config(
         "yyds_domain",
         "gptmail_domain",
         "cfmail_domain",
+        "cloudmail_domain",
         "api_key",
         "moemail_api_key",
         "yyds_api_key",
         "gptmail_api_key",
         "cfmail_api_key",
+        "cloudmail_api_key",
         "base_url",
         "moemail_base_url",
         "cfmail_base_url",
+        "cloudmail_base_url",
         # Proxy pool: empty means "cleared" so env cannot revive a deleted list.
         "proxy",
         "proxy_username",
@@ -2560,13 +2612,13 @@ def set_registration_config(
     for k in ("expiry_ms", "count", "concurrency", "stagger_ms", "probe_delay_sec"):
         cleaned[k] = cfg[k]
     # Always persist active + per-provider domain slots (including empty).
-    for k in ("domain", "moemail_domain", "yyds_domain", "gptmail_domain", "cfmail_domain"):
+    for k in ("domain", "moemail_domain", "yyds_domain", "gptmail_domain", "cfmail_domain", "cloudmail_domain"):
         cleaned[k] = str(cfg.get(k) or "").strip().lstrip("@").strip(".")
     # Always persist active + per-provider keys (including empty after clear).
-    for k in ("api_key", "moemail_api_key", "yyds_api_key", "gptmail_api_key", "cfmail_api_key"):
+    for k in ("api_key", "moemail_api_key", "yyds_api_key", "gptmail_api_key", "cfmail_api_key", "cloudmail_api_key"):
         cleaned[k] = str(cfg.get(k) or "").strip()
     # Always persist active + per-provider base URLs (including empty after clear).
-    for k in ("base_url", "moemail_base_url", "cfmail_base_url"):
+    for k in ("base_url", "moemail_base_url", "cfmail_base_url", "cloudmail_base_url"):
         cleaned[k] = str(cfg.get(k) or "").strip().rstrip("/")
 
     _set_setting_value("registration_config", cleaned)
@@ -2590,19 +2642,22 @@ def _set_env(name: str, value: str) -> None:
             os.environ.pop(name, None)
 
     mail_provider = str(cfg.get("mail_provider") or "moemail").strip().lower()
-    if mail_provider not in {"moemail", "yyds", "gptmail", "cfmail"}:
+    if mail_provider not in {"moemail", "yyds", "gptmail", "cfmail", "cloudmail"}:
         mail_provider = "moemail"
     # Prefer per-provider key; fall back to legacy api_key.
     slot = _MAIL_PROVIDER_KEY_FIELDS.get(mail_provider, "moemail_api_key")
     api_key = str(cfg.get(slot) or cfg.get("api_key") or "").strip()
     moe_base = str(cfg.get("moemail_base_url") or "").strip().rstrip("/")
     cf_base = str(cfg.get("cfmail_base_url") or "").strip().rstrip("/")
+    cm_base = str(cfg.get("cloudmail_base_url") or "").strip().rstrip("/")
     if mail_provider == "yyds":
         base_url = "https://maliapi.215.im"
     elif mail_provider == "gptmail":
         base_url = "https://mail.chatgpt.org.uk"
     elif mail_provider == "cfmail":
         base_url = cf_base or str(cfg.get("base_url") or "").strip().rstrip("/")
+    elif mail_provider == "cloudmail":
+        base_url = cm_base or str(cfg.get("base_url") or "").strip().rstrip("/")
     else:
         base_url = moe_base or str(cfg.get("base_url") or "").strip().rstrip("/")
     dslot = _MAIL_PROVIDER_DOMAIN_FIELDS.get(mail_provider, "moemail_domain")
@@ -2631,28 +2686,41 @@ def _set_env(name: str, value: str) -> None:
     ykey = str(cfg.get("yyds_api_key") or "").strip()
     gkey = str(cfg.get("gptmail_api_key") or "").strip()
     ckey = str(cfg.get("cfmail_api_key") or "").strip()
+    cmkey = str(cfg.get("cloudmail_api_key") or "").strip()
     _set_env("GROK2API_MOEMAIL_ONLY_API_KEY", mkey)
     _set_env("GROK2API_YYDS_API_KEY", ykey)
     _set_env("YYDS_API_KEY", ykey)
     _set_env("GROK2API_GPTMAIL_API_KEY", gkey)
     _set_env("GPTMAIL_API_KEY", gkey)
     _set_env("GROK2API_CFMAIL_API_KEY", ckey)
     _set_env("CFMAIL_API_KEY", ckey)
-    # Keep MoeMail / CF hosts in dedicated env slots — never overwrite one with
-    # the other when switching the active provider.
+    _set_env("GROK2API_CLOUDMAIL_API_KEY", cmkey)
+    _set_env("CLOUDMAIL_API_KEY", cmkey)
+    # Keep MoeMail / CF / Cloud Mail hosts in dedicated env slots — never
+    # overwrite one with the other when switching the active provider.
     _set_env("GROK2API_MOEMAIL_BASE_URL", moe_base if mail_provider == "moemail" else moe_base)
     _set_env("GROK2API_CFMAIL_BASE_URL", cf_base)
     _set_env("CFMAIL_BASE_URL", cf_base)
+    _set_env("GROK2API_CLOUDMAIL_BASE_URL", cm_base)
+    _set_env("CLOUDMAIL_BASE_URL", cm_base)
     if base_url:
         # Active adapter host (helpers still read MOEMAIL_BASE_URL historically).
-        _set_env("GROK2API_MOEMAIL_BASE_URL", base_url if mail_provider != "cfmail" else moe_base)
+        _set_env("GROK2API_MOEMAIL_BASE_URL", base_url if mail_provider not in {"cfmail", "cloudmail"} else moe_base)
         if mail_provider == "cfmail":
             _set_env("GROK2API_CFMAIL_BASE_URL", base_url)
             _set_env("CFMAIL_BASE_URL", base_url)
             # Active helpers fall back to MOEMAIL_BASE_URL — mirror CF host only
             # while CF is selected so create/fetch hit the right Workers URL.
             _set_env("GROK2API_MOEMAIL_BASE_URL", base_url)
             _set_env("MOEMAIL_BASE_URL", base_url)
+        elif mail_provider == "cloudmail":
+            _set_env("GROK2API_CLOUDMAIL_BASE_URL", base_url)
+            _set_env("CLOUDMAIL_BASE_URL", base_url)
+            # Active helpers fall back to MOEMAIL_BASE_URL — mirror Cloud Mail
+            # host only while Cloud Mail is selected so create/fetch hit the
+            # right Worker origin.
+            _set_env("GROK2API_MOEMAIL_BASE_URL", base_url)
+            _set_env("MOEMAIL_BASE_URL", base_url)
         elif mail_provider == "moemail":
             _set_env("MOEMAIL_BASE_URL", base_url)
     _set_env("GROK2API_MOEMAIL_DOMAIN", domain if mail_provider == "moemail" else str(cfg.get("moemail_domain") or "").strip())
@@ -2663,6 +2731,13 @@ def _set_env(name: str, value: str) -> None:
         # Keep dedicated CF domain env in sync with stored slot even when inactive.
         _set_env("GROK2API_CFMAIL_DOMAIN", str(cfg.get("cfmail_domain") or "").strip())
         _set_env("CFMAIL_DOMAIN", str(cfg.get("cfmail_domain") or "").strip())
+    if mail_provider == "cloudmail":
+        _set_env("GROK2API_CLOUDMAIL_DOMAIN", domain)
+        _set_env("CLOUDMAIL_DOMAIN", domain)
+    else:
+        # Keep dedicated Cloud Mail domain env in sync with stored slot even when inactive.
+        _set_env("GROK2API_CLOUDMAIL_DOMAIN", str(cfg.get("cloudmail_domain") or "").strip())
+        _set_env("CLOUDMAIL_DOMAIN", str(cfg.get("cloudmail_domain") or "").strip())
     try:
         probe_delay = int(cfg.get("probe_delay_sec", 30))
     except (TypeError, ValueError):

grok2api/upstream/grok_build_adapter.py

@@ -402,6 +402,15 @@ def _resolve_mail_credentials(
         if cfg.get("cfmail_domain") not in (None, ""):
             dom = str(cfg.get("cfmail_domain") or "").strip()
         base = str(cfg.get("cfmail_base_url") or base).strip()
+    elif prov == "cloudmail":
+        # Cloud Mail (maillab/cloud-mail): admin_email:password credential +
+        # self-hosted Worker origin. The active key/base were mirrored into
+        # moemail_* slots by registration_service.start_job; on resume, also
+        # consult the dedicated cloudmail_* slots in the reg_config snapshot.
+        key = str(cfg.get("cloudmail_api_key") or key).strip()
+        if cfg.get("cloudmail_domain") not in (None, ""):
+            dom = str(cfg.get("cloudmail_domain") or "").strip()
+        base = str(cfg.get("cloudmail_base_url") or base).strip()
     elif prov == "tempmail":
         # Free tier: no key. Optional Bearer key for Plus/Ultra.
         key = str(cfg.get("tempmail_api_key") or key).strip()
@@ -1336,17 +1345,19 @@ def _make_email_receiver(
             "Save the key in 协议注册配置 (each provider keeps its own key; TempMail.lol free needs none)."
         )
     # Multi-domain config (newlines/commas): rotate by domain_index in batch jobs.
-    # Empty list => provider auto-pick (YYDS/GPTMail/CF) or MOEMAIL_DOMAIN fallback.
+    # Empty list => provider auto-pick (YYDS/GPTMail/CF/Cloud Mail) or MOEMAIL_DOMAIN fallback.
     domains = parse_domain_list(domain)
     if domains:
         if domain_index is not None:
             dom = pick_domain_from_list(domain, index=domain_index, strategy="round_robin")
         else:
             dom = pick_domain_from_list(domain, strategy="random")
     else:
-        # YYDS/GPTMail/CFMail: empty domain means provider-side auto/random pick.
-        # Never bleed MoeMail's MOEMAIL_DOMAIN (default example.com) into them.
-        if prov in {"yyds", "gptmail", "cfmail", "tempmail"}:
+        # YYDS/GPTMail/CFMail/Cloud Mail: empty domain means provider-side
+        # auto/random pick (Cloud Mail calls /setting/websiteConfig inside
+        # cloudmail_create_mailbox). Never bleed MoeMail's MOEMAIL_DOMAIN
+        # (default example.com) into them.
+        if prov in {"yyds", "gptmail", "cfmail", "tempmail", "cloudmail"}:
             dom = ""
         else:
             dom = (domain or MOEMAIL_DOMAIN or "").strip().lstrip("@").strip(".")
@@ -1390,6 +1401,12 @@ def __init__(
                 default_base = "https://temp-email-api.awsl.uk"
             elif provider == "tempmail":
                 default_base = "https://api.tempmail.lol"
+            elif provider == "cloudmail":
+                # Cloud Mail is self-hosted; base_url is required and validated
+                # upstream. Empty default here keeps the receiver honest if the
+                # caller forgot to pass base_url (will surface as a network error
+                # rather than silently hitting the wrong host).
+                default_base = ""
             else:
                 default_base = "https://moemail.521884.xyz"
             self.base_url = base_url or default_base