新增终端大洲分组与移动端卡片 CSS 模块
包含分组标题行、移动端 Tab 隐藏滚动条、信号卡片样式及浅色主题适配。
This commit is contained in:
2569718930@qq.com
@@ -4,7 +4,7 @@ import os
|
||||
import threading
|
||||
import time
|
||||
from dataclasses import dataclass
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from datetime import datetime, timezone
|
||||
from typing import Dict, List, Optional
|
||||
|
||||
import requests
|
||||
@@ -65,27 +65,10 @@ class SupabaseEntitlementService:
|
||||
self.timeout_sec = max(3, _env_int("SUPABASE_HTTP_TIMEOUT_SEC", 8))
|
||||
self.cache_ttl_sec = max(5, _env_int("SUPABASE_AUTH_CACHE_TTL_SEC", 30))
|
||||
self.sub_cache_ttl_sec = max(5, _env_int("SUPABASE_SUB_CACHE_TTL_SEC", 60))
|
||||
self.signup_trial_enabled = _env_bool(
|
||||
"POLYWEATHER_SIGNUP_TRIAL_ENABLED",
|
||||
True,
|
||||
)
|
||||
self.signup_trial_days = max(
|
||||
0,
|
||||
_env_int("POLYWEATHER_SIGNUP_TRIAL_DAYS", 3),
|
||||
)
|
||||
self.signup_trial_plan_code = str(
|
||||
os.getenv("POLYWEATHER_SIGNUP_TRIAL_PLAN_CODE") or "signup_trial_3d"
|
||||
).strip() or "signup_trial_3d"
|
||||
self.signup_trial_source = str(
|
||||
os.getenv("POLYWEATHER_SIGNUP_TRIAL_SOURCE") or "signup_trial"
|
||||
).strip() or "signup_trial"
|
||||
|
||||
self._identity_cache: Dict[str, Dict[str, object]] = {}
|
||||
self._identity_cache_lock = threading.Lock()
|
||||
self._sub_cache: Dict[str, Dict[str, object]] = {}
|
||||
self._sub_cache_lock = threading.Lock()
|
||||
self._trial_locks: Dict[str, threading.Lock] = {}
|
||||
self._trial_locks_guard = threading.Lock()
|
||||
|
||||
def invalidate_subscription_cache(self, user_id: str) -> None:
|
||||
key = str(user_id or "").strip()
|
||||
@@ -375,134 +358,6 @@ class SupabaseEntitlementService:
|
||||
return row
|
||||
return None
|
||||
|
||||
def _get_trial_lock(self, user_id: str) -> threading.Lock:
|
||||
key = str(user_id or "").strip()
|
||||
with self._trial_locks_guard:
|
||||
lock = self._trial_locks.get(key)
|
||||
if lock is None:
|
||||
lock = threading.Lock()
|
||||
self._trial_locks[key] = lock
|
||||
return lock
|
||||
|
||||
def _emit_signup_trial_event(
|
||||
self,
|
||||
*,
|
||||
user_id: str,
|
||||
starts_at: datetime,
|
||||
expires_at: datetime,
|
||||
) -> None:
|
||||
if not self.service_role_key:
|
||||
return
|
||||
try:
|
||||
now_iso = datetime.now(timezone.utc).isoformat()
|
||||
requests.post(
|
||||
self._entitlement_events_endpoint(),
|
||||
headers={
|
||||
**self._request_headers_for_service_role(),
|
||||
"Content-Type": "application/json",
|
||||
"Prefer": "return=minimal",
|
||||
},
|
||||
json={
|
||||
"user_id": user_id,
|
||||
"action": "subscription_granted",
|
||||
"reason": "signup_trial",
|
||||
"detail": f"{self.signup_trial_days}d signup trial granted",
|
||||
"payload": {
|
||||
"plan_code": self.signup_trial_plan_code,
|
||||
"source": self.signup_trial_source,
|
||||
"starts_at": starts_at.isoformat(),
|
||||
"expires_at": expires_at.isoformat(),
|
||||
},
|
||||
"created_at": now_iso,
|
||||
},
|
||||
timeout=self.timeout_sec,
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.warning(f"supabase signup trial event insert failed user_id={user_id}: {exc}")
|
||||
|
||||
def ensure_signup_trial(
|
||||
self,
|
||||
user_id: str,
|
||||
*,
|
||||
created_at: Optional[str] = None,
|
||||
) -> Optional[Dict[str, object]]:
|
||||
normalized_user_id = str(user_id or "").strip()
|
||||
if not normalized_user_id:
|
||||
return None
|
||||
if (
|
||||
not self.signup_trial_enabled
|
||||
or self.signup_trial_days <= 0
|
||||
or not self.service_role_key
|
||||
):
|
||||
return None
|
||||
|
||||
lock = self._get_trial_lock(normalized_user_id)
|
||||
with lock:
|
||||
existing_active = self._query_latest_active_subscription(normalized_user_id)
|
||||
if isinstance(existing_active, dict):
|
||||
return existing_active
|
||||
|
||||
existing_any = self._query_latest_subscription_any_status(normalized_user_id)
|
||||
if isinstance(existing_any, dict):
|
||||
return None
|
||||
|
||||
starts_at = self._parse_iso_datetime(created_at)
|
||||
if starts_at is None:
|
||||
admin_users = self.get_auth_users([normalized_user_id])
|
||||
starts_at = self._parse_iso_datetime(
|
||||
str((admin_users.get(normalized_user_id) or {}).get("created_at") or "")
|
||||
)
|
||||
if starts_at is None:
|
||||
return None
|
||||
|
||||
expires_at = starts_at + timedelta(days=self.signup_trial_days)
|
||||
now = datetime.now(timezone.utc)
|
||||
if expires_at <= now:
|
||||
return None
|
||||
|
||||
payload = {
|
||||
"user_id": normalized_user_id,
|
||||
"plan_code": self.signup_trial_plan_code,
|
||||
"status": "active",
|
||||
"starts_at": starts_at.isoformat(),
|
||||
"expires_at": expires_at.isoformat(),
|
||||
"source": self.signup_trial_source,
|
||||
"created_at": now.isoformat(),
|
||||
"updated_at": now.isoformat(),
|
||||
}
|
||||
try:
|
||||
response = requests.post(
|
||||
self._subscription_endpoint(),
|
||||
headers={
|
||||
**self._request_headers_for_service_role(),
|
||||
"Content-Type": "application/json",
|
||||
"Prefer": "return=representation",
|
||||
},
|
||||
json=payload,
|
||||
timeout=self.timeout_sec,
|
||||
)
|
||||
if response.status_code not in (200, 201):
|
||||
logger.warning(
|
||||
"supabase signup trial insert failed user_id={} status={}",
|
||||
normalized_user_id,
|
||||
response.status_code,
|
||||
)
|
||||
return self._query_latest_active_subscription(normalized_user_id)
|
||||
rows = response.json() if response.content else []
|
||||
row = rows[0] if isinstance(rows, list) and rows else None
|
||||
self.invalidate_subscription_cache(normalized_user_id)
|
||||
self._emit_signup_trial_event(
|
||||
user_id=normalized_user_id,
|
||||
starts_at=starts_at,
|
||||
expires_at=expires_at,
|
||||
)
|
||||
if isinstance(row, dict):
|
||||
return row
|
||||
return self._query_latest_active_subscription(normalized_user_id)
|
||||
except Exception as exc:
|
||||
logger.warning(f"supabase signup trial insert error user_id={normalized_user_id}: {exc}")
|
||||
return self._query_latest_active_subscription(normalized_user_id)
|
||||
|
||||
def _query_active_subscription(self, user_id: str) -> bool:
|
||||
return self._query_latest_active_subscription(user_id) is not None
|
||||
|
||||
|
||||
Reference in New Issue
Block a user