@danhachuel/thunderbolt 0.2.47 → 0.2.49

package/integrations/youtube_batch.py

@@ -11,6 +11,36 @@ from typing import Any
 from integrations.platforms import IntegrationResult
 
 BATCH_SCOPES = ["https://www.googleapis.com/auth/youtube.readonly"]
+DEFAULT_LOOPBACK_HOST = "127.0.0.1"
+DEFAULT_LOOPBACK_PORT = 8765
+
+
+def loopback_host() -> str:
+    return _text(os.getenv("THUNDERBOLT_OAUTH_LOOPBACK_HOST")) or DEFAULT_LOOPBACK_HOST
+
+
+def loopback_port() -> int:
+    try:
+        port = int(os.getenv("THUNDERBOLT_OAUTH_LOOPBACK_PORT", str(DEFAULT_LOOPBACK_PORT)))
+    except (TypeError, ValueError):
+        port = DEFAULT_LOOPBACK_PORT
+    return port if 1024 <= port <= 65535 else DEFAULT_LOOPBACK_PORT
+
+
+def loopback_redirect_uri() -> str:
+    return f"http://{loopback_host()}:{loopback_port()}/"
+
+
+def _authorization_error_message(email: str, exc: Exception) -> str:
+    detail = str(exc)
+    if "redirect_uri_mismatch" in detail.lower():
+        return (
+            f"A autorização da conta {email} foi rejeitada pelo Google (redirect_uri_mismatch). "
+            f"Use um cliente OAuth do tipo Desktop app ou adicione exactamente {loopback_redirect_uri()} "
+            "em Google Cloud > APIs e serviços > Credenciais > URIs de redireccionamento autorizados. "
+            "Não use uma URI sem a porta, com localhost diferente ou sem a barra final."
+        )
+    return f"A autorização da conta {email} falhou: {detail}"
 
 
 def _text(value: Any) -> str:
@@ -35,7 +65,7 @@ def _client_config(account: dict[str, Any]) -> dict[str, Any]:
             "client_secret": _text(account.get("client_secret")),
             "auth_uri": "https://accounts.google.com/o/oauth2/auth",
             "token_uri": "https://oauth2.googleapis.com/token",
-            "redirect_uris": ["http://localhost"],
+            "redirect_uris": [loopback_redirect_uri()],
         }
     }
 
@@ -84,8 +114,8 @@ def authorize_account(account: dict[str, Any], storage_root: Path, *, open_brows
     try:
         flow = InstalledAppFlow.from_client_config(_client_config(account), BATCH_SCOPES)
         credentials = flow.run_local_server(
-            host="localhost",
-            port=0,
+            host=loopback_host(),
+            port=loopback_port(),
             open_browser=open_browser,
             access_type="offline",
             prompt="consent",
@@ -95,7 +125,7 @@ def authorize_account(account: dict[str, Any], storage_root: Path, *, open_brows
         _save_credentials(path, credentials)
         return IntegrationResult(True, f"Conta Google autorizada para listagem de canais: {email}.", {"status": "authorized", "email": email, "token_path": str(path)})
     except Exception as exc:
-        return IntegrationResult(False, f"A autorização da conta {email} falhou: {exc}", {"status": "authorization_failed", "email": email})
+        return IntegrationResult(False, _authorization_error_message(email, exc), {"status": "authorization_failed", "email": email, "redirect_uri": loopback_redirect_uri()})
 
 
 def delete_account_token(account: dict[str, Any], storage_root: Path) -> None:

package/integrations/youtube_direct_credentials.py

@@ -4,6 +4,7 @@ import json
 import os
 import re
 import secrets
+import shutil
 from pathlib import Path
 from typing import Any
 
@@ -78,14 +79,16 @@ def parse_cookie_file(content: bytes, filename: str = "cookies.json") -> dict[st
     return {key: pairs[key] for key in COOKIE_KEYS}
 
 
-def parse_credentials_document(content: bytes, filename: str = DIRECT_DOCUMENT_NAME) -> dict[str, Any]:
+def parse_credentials_document(content: bytes, filename: str = DIRECT_DOCUMENT_NAME, *, session_info_override: str = "") -> dict[str, Any]:
     try:
         raw = json.loads(content.decode("utf-8-sig", errors="replace"))
     except (UnicodeDecodeError, json.JSONDecodeError) as exc:
         raise ValueError(f"O documento de credenciais {filename} deve ser JSON válido.") from exc
     if not isinstance(raw, dict):
         raise ValueError(f"O documento de credenciais {filename} deve conter um objecto JSON.")
-    document = _normalise_document(raw, {"id": raw.get("account_id", ""), "email": raw.get("email", "")})
+    document = _normalise_document(raw, {"id": raw.get("account_id", ""), "email": raw.get("email", ""), "sessionInfo": session_info_override})
+    if session_info_override.strip():
+        document["sessionInfo"] = session_info_override.strip()
     missing = [key for key in COOKIE_KEYS if not document["cookies"].get(key)]
     if missing:
         raise ValueError(f"Faltam cookies obrigatórios no documento {filename}: {', '.join(missing)}.")
@@ -114,6 +117,10 @@ def _channel_keys(channel: dict[str, Any]) -> list[str]:
     return keys
 
 
+def _account_session_info(account: dict[str, Any]) -> str:
+    return str(account.get("sessionInfo") or account.get("session_info") or account.get("direct_session_info") or "").strip()
+
+
 def _normalise_document(raw: Any, account: dict[str, Any]) -> dict[str, Any]:
     raw = raw if isinstance(raw, dict) else {}
     cookies = _normalise_pairs(raw.get("cookies", raw))
@@ -129,7 +136,7 @@ def _normalise_document(raw: Any, account: dict[str, Any]) -> dict[str, Any]:
     return {
         "account_id": str(raw.get("account_id") or account.get("id") or "").strip(),
         "email": str(raw.get("email") or account.get("email") or "").strip(),
-        "sessionInfo": str(raw.get("sessionInfo") or raw.get("session_info") or raw.get("direct_session_info") or "").strip(),
+        "sessionInfo": str(raw.get("sessionInfo") or raw.get("session_info") or raw.get("direct_session_info") or _account_session_info(account)).strip(),
         "cookies": {key: cookies.get(key, "") for key in COOKIE_KEYS},
         "INNERTUBE_API_KEY": str(raw.get("INNERTUBE_API_KEY") or raw.get("innertube_api_key") or raw.get("direct_innertube_api_key") or "").strip(),
         "chunk_size": _safe_chunk_size(raw.get("chunk_size", raw.get("direct_chunk_size", DEFAULT_CHUNK_SIZE))),
@@ -156,7 +163,7 @@ def _legacy_document(storage_root: Path, account: dict[str, Any], settings: dict
     return _normalise_document({
         "account_id": account.get("id"),
         "email": account.get("email"),
-        "sessionInfo": account.get("direct_session_info") or settings.get("direct_session_info"),
+        "sessionInfo": _account_session_info(account) or settings.get("direct_session_info"),
         "cookies": legacy_cookies,
         "INNERTUBE_API_KEY": settings.get("direct_innertube_api_key"),
         "chunk_size": settings.get("direct_chunk_size", DEFAULT_CHUNK_SIZE),
@@ -191,6 +198,30 @@ def save_credentials_document(storage_root: Path, account: dict[str, Any], docum
     return destination
 
 
+def update_credentials_document_session_info(storage_root: Path, account: dict[str, Any], session_info: str) -> Path | None:
+    """Update only sessionInfo in an existing credentials document."""
+    path = credentials_document_path(storage_root, account)
+    if not path.exists():
+        return None
+    raw = _read_json_document(path) or {}
+    document = _normalise_document(raw, {**account, "sessionInfo": session_info})
+    document["sessionInfo"] = str(session_info or "").strip()
+    return save_credentials_document(storage_root, account, document)
+
+
+def delete_credentials_document(storage_root: Path, account: dict[str, Any]) -> None:
+    """Remove all direct-upload credentials belonging only to one Google account."""
+    if not str(account.get("id") or "").strip():
+        return
+    directory = account_directory(storage_root, account)
+    try:
+        shutil.rmtree(directory)
+    except FileNotFoundError:
+        pass
+    except OSError:
+        pass
+
+
 def _read_json_document(path: Path) -> dict[str, Any] | None:
     try:
         raw = json.loads(path.read_text(encoding="utf-8"))

package/integrations/youtube_upload.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from typing import Any, Callable
 
 from integrations.platforms import IntegrationResult
+from integrations.youtube_batch import loopback_host, loopback_port, loopback_redirect_uri
 
 
 # Mantemos os mesmos escopos usados pelo youtube-automation-agent.
@@ -111,7 +112,7 @@ class _GoogleYouTubeBase:
                 "client_secret": self.client_secret,
                 "auth_uri": "https://accounts.google.com/o/oauth2/auth",
                 "token_uri": "https://oauth2.googleapis.com/token",
-                "redirect_uris": ["http://localhost"],
+                "redirect_uris": [loopback_redirect_uri()],
             }
         }
 
@@ -167,8 +168,8 @@ class _GoogleYouTubeBase:
         try:
             flow = InstalledAppFlow.from_client_config(self._client_config(), self.scopes)
             credentials = flow.run_local_server(
-                host="localhost",
-                port=0,
+                host=loopback_host(),
+                port=loopback_port(),
                 open_browser=open_browser,
                 access_type="offline",
                 prompt="consent",
@@ -177,7 +178,17 @@ class _GoogleYouTubeBase:
             self._save_credentials(credentials, nested=self.__class__.__name__ == "YouTubeAutomationAgentUploader")
             return IntegrationResult(True, "Conta YouTube autorizada com sucesso.", {"status": "authorized", "token_path": str(self.token_path)})
         except Exception as exc:
-            return IntegrationResult(False, f"A autorização Google falhou: {exc}", {"status": "authorization_failed"})
+            detail = str(exc)
+            if "redirect_uri_mismatch" in detail.lower():
+                message = (
+                    "A autorização Google foi rejeitada (redirect_uri_mismatch). "
+                    f"Use um cliente OAuth do tipo Desktop app ou adicione exactamente {loopback_redirect_uri()} "
+                    "em Google Cloud > APIs e serviços > Credenciais > URIs de redireccionamento autorizados. "
+                    "Não use uma URI sem a porta, com localhost diferente ou sem a barra final."
+                )
+            else:
+                message = f"A autorização Google falhou: {detail}"
+            return IntegrationResult(False, message, {"status": "authorization_failed", "redirect_uri": loopback_redirect_uri()})
 
     def status(self) -> IntegrationResult:
         if not self.configured:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danhachuel/thunderbolt",
-  "version": "0.2.47",
+  "version": "0.2.49",
   "description": "Thunderbolt — interface local para operação de canais faceless e motor MoneyPrinterTurbo",
   "main": "scripts/cli.mjs",
   "type": "module",