@follenfang/fupload 0.0.17 → 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.17"
+  version: "0.0.18"
 ---
 
 # Fupload

package/fupload/scripts/fupload_cli/__init__.py

@@ -1,3 +1,3 @@
 """Fupload Python CLI."""
 
-__version__ = "0.0.17"
+__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"},
@@ -326,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]:
@@ -377,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,
@@ -1950,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})
@@ -1983,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")
@@ -1996,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")
@@ -2105,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

@@ -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():
@@ -545,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]:

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",
@@ -831,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()

package/npm/skill-manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "fupload.npm-skill-manifest.v1",
   "package_name": "@follenfang/fupload",
-  "package_version": "0.0.17",
-  "skill_version": "0.0.17",
-  "tree_sha256": "064aeb1a1291d240a3bea7e71458846395abe29c6e91f682d269ec0e684c4294",
+  "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": "8e72acb94a18f173cf9cbbf0436b20f64e1991f54a3537b7e930b4196bab8439"
+      "sha256": "b899101a4de87efa255361fb768398e6f03a68740eca391ba57991984bd77c55"
     },
     {
       "path": "scripts/fupload_cli/blackbox_web.py",
@@ -137,18 +137,18 @@
     },
     {
       "path": "scripts/fupload_cli/dd_broker.py",
-      "bytes": 28248,
-      "sha256": "6bbae4ed7aef4feca552816d7dbefa6069dc3d1d9a39a4af35582a06db4ce2d5"
+      "bytes": 28353,
+      "sha256": "1b05604c27253cd77b40bb2b549a5cd1c99434245ccb60959f989ec690e3c70f"
     },
     {
       "path": "scripts/fupload_cli/dd_sidecar.py",
-      "bytes": 39150,
-      "sha256": "42791c82e5518838aedbe209823b94deb7de09b2f3eccb4fe563364f58becc6c"
+      "bytes": 39206,
+      "sha256": "722038884c5b050c2c6030f5d4e7b1088c1fb9b614e99c3b241b539631cbc3e3"
     },
     {
       "path": "scripts/fupload_cli/dd.py",
-      "bytes": 114434,
-      "sha256": "cf808efdd4a93d80bddb533af4ac14696e889e0fd359acdacd58a7a49ce050b0"
+      "bytes": 115318,
+      "sha256": "588102eb959e9f4737c39311cd689e400e2b0a8197abc231a145f342c03dbd68"
     },
     {
       "path": "scripts/fupload_cli/errors.py",
@@ -208,7 +208,7 @@
     {
       "path": "SKILL.md",
       "bytes": 28383,
-      "sha256": "9aebce883e6d83f0e3c8b36f497e59eb6f4df5e1e4af231df60ca3299188fb86"
+      "sha256": "512d6d5b7d34987009c12675e4cee4c540950e32ac808fbf4081d8db6c3157f0"
     }
   ]
 }

package/package.json

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