@follenfang/fupload 0.0.16 → 0.0.18

package/fupload/SKILL.md

@@ -2,7 +2,7 @@
 name: fupload
 description: Explicit author-publishing workflow for World of Warcraft plugins, configuration shares, and WA/strings on NewBeeBox, NetEase DD, CurseForge, Heybox Workshop, and ModUs.Creator, including local Creator login reuse and plugin ZIP publishing. Use only when the user explicitly invokes `$fupload`, explicitly asks to use the Fupload Skill, or loads this Skill by path. Do not trigger from ordinary mentions of publishing, NewBeeBox, DD, CurseForge, Heybox, ModUs, plugins, configurations, or WA.
 metadata:
-  version: "0.0.16"
+  version: "0.0.18"
 ---
 
 # Fupload

package/fupload/scripts/fupload_cli/__init__.py

@@ -1,3 +1,3 @@
 """Fupload Python CLI."""
 
-__version__ = "0.0.16"
+__version__ = "0.0.18"

package/fupload/scripts/fupload_cli/dd.py

@@ -20,6 +20,8 @@ from .trust import trusted_local_dir, trusted_roaming_dir, verify_dd_executable
 
 
 EXPECTED_DD_VERSION = os.environ.get("FUPLOAD_DD_EXPECTED_VERSION", "any")
+SIDECAR_DEFAULT_RESPONSE_TIMEOUT_SECONDS = 180
+SIDECAR_UPLOAD_RESPONSE_TIMEOUT_SECONDS = 660
 LIFE_TYPES = [
     {"name": "7 days", "value": "seven_day"},
     {"name": "14 days", "value": "fourteen_day"},
@@ -240,6 +242,20 @@ def state_dir() -> Path:
     return result
 
 
+def _sidecar_startup_error(error: Mapping[str, Any]) -> FuploadError:
+    message = str(error.get("message") or "DD sidecar failed to start")
+    return FuploadError(
+        message,
+        kind=str(error.get("kind") or "authentication_error"),
+        stage=str(error.get("stage") or "session"),
+        endpoint=error.get("endpoint"),
+        http_status=error.get("http_status"),
+        business_code=error.get("business_code"),
+        verification_required=bool(error.get("verification_required")),
+        details=error.get("details") if isinstance(error.get("details"), dict) else None,
+    )
+
+
 class Sidecar:
     def __init__(self) -> None:
         self.dd_dir, self.signature = discover_dd_info()
@@ -272,11 +288,8 @@ class Sidecar:
             raise
         if not ready.get("ready"):
             self.close()
-            raise FuploadError(
-                str((ready.get("error") or {}).get("message") or "DD sidecar failed to start"),
-                kind="authentication_error",
-                stage="session",
-            )
+            error = ready.get("error") if isinstance(ready.get("error"), dict) else {}
+            raise _sidecar_startup_error(error)
         credential_kind = ready.get("credential_kind")
         if credential_kind not in ("email", "mobile"):
             self.close()
@@ -315,7 +328,7 @@ class Sidecar:
             self.responses.put(FuploadError("DD sidecar exited without a result", kind="sidecar_error"))
 
     def _next_result(
-        self, *, timeout: float = 180, endpoint: Optional[str] = None,
+        self, *, timeout: float = SIDECAR_DEFAULT_RESPONSE_TIMEOUT_SECONDS, endpoint: Optional[str] = None,
         stage: Optional[str] = None,
         verification_required: bool = False,
     ) -> Dict[str, Any]:
@@ -366,6 +379,11 @@ class Sidecar:
         else:
             expected_stage, uncertain = "dependency_get", False
         response = self._next_result(
+            timeout=(
+                SIDECAR_UPLOAD_RESPONSE_TIMEOUT_SECONDS
+                if action == "upload"
+                else SIDECAR_DEFAULT_RESPONSE_TIMEOUT_SECONDS
+            ),
             endpoint=endpoint,
             stage=expected_stage,
             verification_required=uncertain,
@@ -1939,7 +1957,10 @@ class DD:
         if available and any(str(value) not in available for value in values):
             raise ValidationError("selection contains an unavailable live option", path=path)
 
-    def _validate_options(self, session: Sidecar, resource: str, form: Mapping[str, Any]) -> None:
+    def _validate_options(
+        self, session: Sidecar, resource: str, form: Mapping[str, Any], *,
+        validate_optional_dependencies: bool = True,
+    ) -> None:
         game_type = form.get("game_type")
         if resource == "plugin":
             versions = session.get("/game_versions/list", {"game_type": game_type})
@@ -1972,11 +1993,11 @@ class DD:
         if form.get("share_code_life_type"):
             self._validate_choices(LIFE_TYPES, [form.get("share_code_life_type")], ("value",), "$.share_code_life_type")
 
-        if form.get("need_anchor_vip"):
+        if validate_optional_dependencies and form.get("need_anchor_vip"):
             vip_levels = session.get("/anchor_vip/level/list", {"enrich_acts": "false"})
             self._validate_choices(vip_levels, form.get("vip_levels") or [], ("id", "level", "value"), "$.vip_levels")
 
-        if form.get("jump_room"):
+        if validate_optional_dependencies and form.get("jump_room"):
             channels = safe_channels(session.cc_get("https://api.cc.163.com/v1/mixteammsgproxy/channelList?source=pluginPublish"))
             if not channels["items"]:
                 raise FuploadError("live channel response contained no selectable values", kind="platform_data_error")
@@ -1985,7 +2006,7 @@ class DD:
             if wanted not in available:
                 raise ValidationError("room/channel selection is unavailable", path="$.channel_id")
 
-        if form.get("with_associate"):
+        if validate_optional_dependencies and form.get("with_associate"):
             references = self._associated_refs(session, game_type)
             if not references:
                 raise FuploadError("live association response contained no selectable values", kind="platform_data_error")
@@ -2094,7 +2115,14 @@ class DD:
         validate_locked_usage_mode(current, form, doc)
         normalize_commercial(form, "plugin", create=action == "create")
         validate_plugin_submission(form, doc)
-        self._validate_options(session, "plugin", form)
+        # A version-only update cannot change these optional metadata fields.
+        # Validate their live dependencies on create/edit, but do not block a
+        # release merely because an already-saved room, VIP, or association is
+        # temporarily absent from an auxiliary option endpoint.
+        self._validate_options(
+            session, "plugin", form,
+            validate_optional_dependencies=action != "update",
+        )
         validate_no_display_objects(form, "plugin")
         if doc.get("logo_file"):
             form["logo"] = session.upload(doc["logo_file"], "addon", file_name="", media=True, max_bytes=10 * 1024 * 1024)

package/fupload/scripts/fupload_cli/dd_broker.py

@@ -13,7 +13,7 @@ import time
 import uuid
 from pathlib import Path
 from types import SimpleNamespace
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Mapping, Optional
 
 from .errors import FuploadError, redact
 from .trust import verify_dd_executable
@@ -23,6 +23,7 @@ STATE_NAME = "broker.json"
 STARTUP_NAME = "broker.starting.json"
 MAX_REQUEST_BYTES = 64 * 1024 * 1024
 IDLE_SECONDS = 10 * 60
+BROKER_WRITE_TIMEOUT_SECONDS = 15 * 60
 
 
 def _dd_module():
@@ -406,6 +407,17 @@ def _send(value: Dict[str, Any], timeout: float = 300) -> Dict[str, Any]:
     return response.get("data")
 
 
+def _startup_error(pending: Mapping[str, Any]) -> FuploadError:
+    error = pending.get("error")
+    if isinstance(error, dict):
+        return FuploadError.from_dict(error)
+    return FuploadError(
+        str(error or "DD task session failed to start"),
+        kind="session_start_failed",
+        stage="session",
+    )
+
+
 def start(confirm_close_gui: bool) -> Dict[str, Any]:
     existing = _load_live_state()
     if existing:
@@ -447,7 +459,7 @@ def start(confirm_close_gui: bool) -> Dict[str, Any]:
         creationflags=flags,
     )
     deadline = time.time() + 90
-    last_error = ""
+    last_error: Any = ""
     while time.time() < deadline:
         state = _load_live_state()
         if state and state.get("startup_id") == startup_id:
@@ -465,7 +477,7 @@ def start(confirm_close_gui: bool) -> Dict[str, Any]:
         if startup.exists():
             try:
                 pending = _read_json(startup)
-                last_error = str(pending.get("error") or "")
+                last_error = pending.get("error") or ""
             except FuploadError:
                 pass
         if process.poll() is not None:
@@ -487,10 +499,11 @@ def start(confirm_close_gui: bool) -> Dict[str, Any]:
     try:
         pending = _read_json(startup)
         if pending.get("startup_id") == startup_id:
+            last_error = pending.get("error") or last_error
             startup.unlink()
     except (FuploadError, OSError):
         pass
-    raise FuploadError(last_error or "DD task session failed to start", kind="session_start_failed", stage="session")
+    raise _startup_error({"error": last_error})
 
 
 def status(session_id: Optional[str] = None) -> Dict[str, Any]:
@@ -533,7 +546,7 @@ def execute(session_id: str, kind: str, resource: str, action: str, payload: Dic
         "resource": resource,
         "action": action,
         "payload": payload,
-    })
+    }, timeout=BROKER_WRITE_TIMEOUT_SECONDS if kind == "write" else 300)
 
 
 def _read_request(connection: socket.socket) -> Dict[str, Any]:
@@ -655,9 +668,17 @@ def _serve(startup_id: str) -> int:
                 connection.sendall((json.dumps(response, ensure_ascii=False, separators=(",", ":")) + "\n").encode("utf-8"))
         return 0
     except Exception as exc:
+        if isinstance(exc, FuploadError):
+            error = exc.as_dict()
+        else:
+            error = FuploadError(
+                redact(str(exc))[:400] or "DD task session failed to start",
+                kind="session_start_failed",
+                stage="session",
+            ).as_dict()
         _atomic_json(startup_path, {
             "startup_id": startup_id,
-            "error": redact(str(exc))[:400],
+            "error": error,
         })
         return 1
     finally:

package/fupload/scripts/fupload_cli/dd_sidecar.py

@@ -42,6 +42,7 @@ _SENSITIVE_KEYS = {
     "presigneduri", "presigned_uri", "signature", "client_secret", "api_key", "auth_key", "password", "secret",
 }
 _MAX_LOG_BODY = 1024 * 1024
+OBJECT_PUT_TIMEOUT_SECONDS = 600
 _CONFIG_CONTENT_KEYS = {
     "known_addon", "unknown_addon", "wtf", "material", "font",
     "known_wa", "unknown_wa", "retail_ui_config",
@@ -362,12 +363,13 @@ def _validation_details(probe):
     return result
 
 
-def install_response_probe(client):
+def install_response_probe(client, capture_success=False):
     """Capture response objects and HTTPError bodies without changing DD behavior."""
     session = getattr(client, "_session", None)
     restore = getattr(client, "_fupload_restore_response_probe", None)
     if callable(restore):
         restore()
+    client._fupload_capture_success = bool(capture_success)
     original_opener_open = urllib.request.OpenerDirector.open
 
     def opener_open(opener, *args, **kwargs):
@@ -400,6 +402,7 @@ def install_response_probe(client):
         if getattr(urllib.request.OpenerDirector, "open", None) is opener_open:
             urllib.request.OpenerDirector.open = original_opener_open
         client._fupload_restore_response_probe = None
+        client._fupload_capture_success = False
 
     client._fupload_restore_response_probe = restore_probe
     for method_name in ("get", "post"):
@@ -415,7 +418,7 @@ def install_response_probe(client):
                     status = int(getattr(response, "status_code", 0) or 0)
                 except (TypeError, ValueError):
                     status = 0
-                if status >= 400:
+                if status >= 400 or getattr(client, "_fupload_capture_success", False):
                     try:
                         body = str(getattr(response, "text", "") or "")
                     except Exception:
@@ -507,6 +510,59 @@ def failure_from_exception(exc, stage, response=None):
     )
 
 
+def author_login_failure(client):
+    probe = getattr(client, "_fupload_last_response_error", None)
+    return failure_from_exception(
+        RuntimeError("DD author API login failed"), "session", probe,
+    )
+
+
+def _last_response_payload(client):
+    probe = getattr(client, "_fupload_last_response_error", None)
+    if not isinstance(probe, dict) or not probe.get("body"):
+        return None
+    try:
+        payload = json.loads(probe["body"])
+    except (TypeError, ValueError):
+        return None
+    return payload if isinstance(payload, dict) else None
+
+
+def login_author_client(client):
+    try:
+        if client.login():
+            return
+        if _retryable_get_signature_rejection(_last_response_payload(client)):
+            client._fupload_last_response_error = None
+            if client.login():
+                return
+        raise author_login_failure(client)
+    finally:
+        client._fupload_capture_success = False
+
+
+def author_session_or_cleanup(qt, container, flow, jwt_helper, client):
+    session = (qt, container, flow, jwt_helper, client)
+    try:
+        login_author_client(client)
+    except Exception:
+        try:
+            close_session(session)
+        except Exception:
+            pass
+        raise
+    return session
+
+
+def startup_error_payload(exc):
+    if isinstance(exc, SidecarFailure):
+        return exc.as_dict()
+    return {
+        "type": type(exc).__name__,
+        "message": safe_exception_message(exc)[:400],
+    }
+
+
 def bootstrap():
     resource = os.path.join(DD_DIR, "ccvoicehub.res")
     pyqt_dir = os.path.join(DD_DIR, "ccsub64", "PyQt5")
@@ -643,10 +699,8 @@ def open_session(timeout=45):
         raise RuntimeError("DD NEP module is not initialized")
     client = UiApiClient(nep, login_cookie=getattr(controller, "_cookie", None))
     client._session.headers["User-Agent"] = USER_AGENT
-    if not client.login():
-        raise RuntimeError("DD author API login failed")
-    install_response_probe(client)
-    return qt, container, flow, jwt_helper, client
+    install_response_probe(client, capture_success=True)
+    return author_session_or_cleanup(qt, container, flow, jwt_helper, client)
 
 
 def api_result(payload):
@@ -778,7 +832,7 @@ def run_command(session, command):
                 request = urllib.request.Request(
                     info["url"], data=data, method="PUT", headers=headers,
                 )
-                with urllib.request.urlopen(request, timeout=180) as response:
+                with urllib.request.urlopen(request, timeout=OBJECT_PUT_TIMEOUT_SECONDS) as response:
                     if response.status != 200:
                         try:
                             response_body = response.read()
@@ -905,10 +959,7 @@ def main():
                         "error": error})
         return 0
     except Exception as exc:
-        output({"ready": False, "error": {
-            "type": type(exc).__name__,
-            "message": safe_exception_message(exc)[:400],
-        }})
+        output({"ready": False, "error": startup_error_payload(exc)})
         return 1
     finally:
         machine_data.clientNo = original

package/npm/skill-manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "fupload.npm-skill-manifest.v1",
   "package_name": "@follenfang/fupload",
-  "package_version": "0.0.16",
-  "skill_version": "0.0.16",
-  "tree_sha256": "aba774b14679854ac01a09711aa10b2f7266af2c43e8220cc67c64b9559bfb51",
+  "package_version": "0.0.18",
+  "skill_version": "0.0.18",
+  "tree_sha256": "36d839247defb278814b13da703acef8766aeb4f01efb8bda4c3d104367ac13b",
   "files": [
     {
       "path": "agents/openai.yaml",
@@ -113,7 +113,7 @@
     {
       "path": "scripts/fupload_cli/__init__.py",
       "bytes": 50,
-      "sha256": "f0d2cbd76206a61d5fd78eef58ad808108f9538963da2c0ea67df79c8a41e104"
+      "sha256": "b899101a4de87efa255361fb768398e6f03a68740eca391ba57991984bd77c55"
     },
     {
       "path": "scripts/fupload_cli/blackbox_web.py",
@@ -137,18 +137,18 @@
     },
     {
       "path": "scripts/fupload_cli/dd_broker.py",
-      "bytes": 27637,
-      "sha256": "1ba00dcaea80905769bb2e00a6e965f2a1e9bb46a33534d1e77a6564158605a8"
+      "bytes": 28353,
+      "sha256": "1b05604c27253cd77b40bb2b549a5cd1c99434245ccb60959f989ec690e3c70f"
     },
     {
       "path": "scripts/fupload_cli/dd_sidecar.py",
-      "bytes": 37603,
-      "sha256": "6ad1ab9e2145757f44b410d87d554485566812d9584820180ff3bb7b5bc7763a"
+      "bytes": 39206,
+      "sha256": "722038884c5b050c2c6030f5d4e7b1088c1fb9b614e99c3b241b539631cbc3e3"
     },
     {
       "path": "scripts/fupload_cli/dd.py",
-      "bytes": 113914,
-      "sha256": "31e349cfee243c1ae8afefd74acfe3f5d79771a1c23ed1892aaf9d8e9b416922"
+      "bytes": 115318,
+      "sha256": "588102eb959e9f4737c39311cd689e400e2b0a8197abc231a145f342c03dbd68"
     },
     {
       "path": "scripts/fupload_cli/errors.py",
@@ -208,7 +208,7 @@
     {
       "path": "SKILL.md",
       "bytes": 28383,
-      "sha256": "2477e603ca826b9bd31533995f2217bfd9239c070adbaa2aa4b829fb6a89fb7f"
+      "sha256": "512d6d5b7d34987009c12675e4cee4c540950e32ac808fbf4081d8db6c3157f0"
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@follenfang/fupload",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "Install and run the Fuploader Agent Skill and Python CLI.",
   "type": "module",
   "bin": {