@follenfang/fupload 0.0.11 → 0.0.15

package/fupload/scripts/fupload_cli/schema.py

@@ -17,6 +17,7 @@ JSON_TYPES = {
     "boolean": (bool,),
     "array": (list,),
     "object": (dict,),
+    "identifier": (int, str),
 }
 
 
@@ -98,6 +99,52 @@ class Schema:
         return checked
 
     def _validate_conditionals(self, value: Dict[str, Any]) -> None:
+        if self.name.startswith("fupload.v1.modus.config"):
+            exclude = value.get("exclude_wtf")
+            if exclude == 1 and (value.get("account_name") or value.get("role_name")):
+                raise ValidationError("account_name and role_name must be empty when exclude_wtf=1", path="$.account_name")
+            if exclude == 0 and not str(value.get("account_name") or "").strip():
+                raise ValidationError("account_name is required when exclude_wtf=0", path="$.account_name")
+        if self.name.startswith(("fupload.v1.modus.config", "fupload.v1.modus.wa")):
+            if "title" in value and len(str(value["title"]).strip()) < 6:
+                raise ValidationError("must contain at least 6 characters", path="$.title")
+            if "content_text" in value and len(str(value["content_text"]).strip()) <= 20:
+                raise ValidationError("must contain more than 20 characters", path="$.content_text")
+            if "tags" in value:
+                tags = [item.strip() for item in str(value["tags"]).split(",")]
+                if any(not item for item in tags) or not 1 <= len(tags) <= 3:
+                    raise ValidationError("must contain 1 to 3 comma-delimited tag IDs", path="$.tags")
+                if len(set(tags)) != len(tags):
+                    raise ValidationError("must not contain duplicate tag IDs", path="$.tags")
+            if "image_url" in value:
+                images = [item.strip() for item in str(value["image_url"]).split(",")]
+                if any(not item for item in images) or not 1 <= len(images) <= 10:
+                    raise ValidationError("must contain 1 to 10 comma-delimited image references", path="$.image_url")
+            if value.get("required_tier_id") is not None and (
+                value.get("platform") == 3 or value.get("synchronization_type") == 3
+            ):
+                raise ValidationError(
+                    "required_tier_id cannot be combined with BigFoot synchronization",
+                    path="$.required_tier_id",
+                )
+            if value.get("is_paid", 0) != 0:
+                raise ValidationError("current ModUs form requires is_paid=0", path="$.is_paid")
+            if value.get("price", 0) != 0:
+                raise ValidationError("current ModUs form requires price=0", path="$.price")
+            if value.get("share_type", 0) != 0:
+                raise ValidationError("current ModUs form requires share_type=0", path="$.share_type")
+            platform = value.get("platform")
+            synchronization = value.get("synchronization_type")
+            if (platform is None) != (synchronization is None):
+                raise ValidationError(
+                    "platform and synchronization_type must be provided together",
+                    path="$.synchronization_type" if synchronization is None else "$.platform",
+                )
+            if platform is not None and synchronization is not None and platform != synchronization:
+                raise ValidationError(
+                    "platform and synchronization_type must select the same ModUs/BigFoot targets",
+                    path="$.synchronization_type",
+                )
         if self.name in ("fupload.v1.modus.project.create", "fupload.v1.modus.project.edit"):
             snapshot = value.get("project_state")
             if snapshot is None:
@@ -424,14 +471,28 @@ class Schema:
             if "categories" in value and len(value["categories"]) > 5:
                 raise ValidationError("must contain at most 5 items", path="$.categories")
             if "image_ops" in value:
-                object_array("image_ops", {"op", "name", "base64"}, ("op", "name"))
+                if not isinstance(value["image_ops"], list) or not value["image_ops"]:
+                    raise ValidationError("expected nonempty array", path="$.image_ops")
                 if "images" not in value:
                     raise ValidationError("images is required when image_ops is supplied", path="$.images")
                 for index, operation in enumerate(value["image_ops"]):
-                    if operation["op"] not in ("upload", "delete"):
-                        raise ValidationError("must be upload or delete", path="$.image_ops[%d].op" % index)
-                    if not isinstance(operation["name"], str) or not operation["name"].strip():
-                        raise ValidationError("must not be empty", path="$.image_ops[%d].name" % index)
+                    path = "$.image_ops[%d]" % index
+                    if not isinstance(operation, dict):
+                        raise ValidationError("expected object", path=path)
+                    op = operation.get("op")
+                    if op not in ("upload", "delete", "rename"):
+                        raise ValidationError("must be upload, delete, or rename", path=path + ".op")
+                    allowed = {"op", "from", "to"} if op == "rename" else {"op", "name", "base64"}
+                    unknown = sorted(set(operation) - allowed)
+                    if unknown:
+                        raise ValidationError("unknown field", path=path + "." + unknown[0])
+                    if op == "rename":
+                        for name in ("from", "to"):
+                            if not isinstance(operation.get(name), str) or not operation[name].strip():
+                                raise ValidationError("must not be empty", path=path + "." + name)
+                        continue
+                    if not isinstance(operation.get("name"), str) or not operation["name"].strip():
+                        raise ValidationError("must not be empty", path=path + ".name")
                     if operation["op"] == "upload" and (not isinstance(operation.get("base64"), str) or not operation["base64"].strip()):
                         raise ValidationError("base64 is required for upload", path="$.image_ops[%d].base64" % index)
                     if operation["op"] == "delete" and "base64" in operation:
@@ -439,7 +500,7 @@ class Schema:
             for name in ("version", "type"):
                 if name in value and isinstance(value[name], str) and not value[name].strip():
                     raise ValidationError("must not be empty", path="$.%s" % name)
-            if "file" in value and not zipfile.is_zipfile(value["file"]):
+            if self.name.startswith("fupload.v1.modus.plugin") and "file" in value and not zipfile.is_zipfile(value["file"]):
                 raise ValidationError("file must be a valid ZIP archive", path="$.file")
 
 
@@ -693,6 +754,31 @@ MODUS_RELEASE = {
     "file": f("string", local_file=True),
     "transaction_log": f("string", max_length=1000),
 }
+MODUS_BUILD_ID = f("integer", minimum=0, maximum=4)
+MODUS_SHARE = {
+    "share_id": f("identifier", nonempty=True), "addons_id": f("string", max_length=10000),
+    "account_name": f("string", nullable=True, max_length=120), "backup_id": f("integer", minimum=1),
+    "content": f("string", nonempty=True), "content_text": f("string", nonempty=True),
+    "image_url": f("string", nonempty=True, max_length=1000), "is_paid": f("integer", choices=(0, 1)),
+    "is_public": f("integer", choices=(0, 1)), "price": f("number", minimum=0),
+    "share_type": f("integer", minimum=0), "tags": f("string", nonempty=True, max_length=1000),
+    "title": f("string", nonempty=True, max_length=120), "exclude_wtf": f("integer", choices=(0, 1)),
+    "role_name": f("string", nullable=True, max_length=120), "required_tier_id": f("integer", nullable=True, minimum=1),
+    "sub_type": f("integer", choices=(0, 1)), "platform": f("integer", choices=(1, 3)),
+    "synchronization_type": f("integer", choices=(1, 3)), "server_type": MODUS_BUILD_ID,
+}
+MODUS_IMPORT = {
+    "import_id": f("identifier", nonempty=True), "code_text": f("string", nonempty=True),
+    "content": f("string", nonempty=True), "addons_id": f("string", nonempty=True, max_length=10000),
+    "content_text": f("string", nonempty=True), "file_path": f("string", choices=("",)),
+    "image_url": f("string", nonempty=True, max_length=1000), "is_paid": f("integer", choices=(0, 1)),
+    "is_public": f("integer", choices=(0, 1)), "price": f("number", minimum=0),
+    "share_type": f("integer", minimum=0), "support_addon": f("string", nonempty=True, max_length=120),
+    "tags": f("string", nonempty=True, max_length=1000), "title": f("string", nonempty=True, max_length=120),
+    "version": f("string", nonempty=True, max_length=120), "required_tier_id": f("integer", nullable=True, minimum=1),
+    "sub_type": f("integer", choices=(0, 1)), "platform": f("integer", choices=(1, 3)),
+    "synchronization_type": f("integer", choices=(1, 3)), "server_type": MODUS_BUILD_ID,
+}
 register("modus", "project", "create", required(MODUS_PROJECT_CREATE, ("project_state",)))
 register("modus", "project", "edit", required(with_id(MODUS_PROJECT_EDIT, "project_id"), ("project_id", "project_state")))
 register("modus", "project", "delete", required({"project_id": f("integer", minimum=1), "confirm": f("string", choices=("DELETE",))}, ("project_id", "confirm")))
@@ -701,7 +787,19 @@ register("modus", "plugin", "upload", required(MODUS_RELEASE, ("project_id", "fi
 register("modus", "plugin", "update", required(MODUS_RELEASE, ("project_id", "file_id")))
 register("modus", "plugin", "edit", required(MODUS_RELEASE, ("project_id", "file_id")))
 register("modus", "plugin", "delete", required({"project_id": f("integer", minimum=1), "file_id": f("integer", minimum=1), "confirm": f("string", choices=("DELETE",))}, ("project_id", "file_id", "confirm")))
-
+register("modus", "media", "upload", required({"file": f("string", local_file=True)}, ("file",)))
+register("modus", "config", "create", required(MODUS_SHARE, ("addons_id", "backup_id", "content", "content_text", "image_url", "tags", "title", "exclude_wtf")))
+register("modus", "config", "update", required(MODUS_SHARE, ("share_id",)))
+register("modus", "config", "edit", required(MODUS_SHARE, ("share_id",)))
+register("modus", "config", "delete", required({"share_id": f("identifier", nonempty=True), "confirm": f("string", choices=("DELETE",)), "server_type": MODUS_BUILD_ID}, ("share_id", "confirm")))
+register("modus", "config", "backup-edit", required({"backup_id": f("integer", minimum=1), "backup_name": f("string", nonempty=True, max_length=200), "server_type": MODUS_BUILD_ID}, ("backup_id", "backup_name")))
+register("modus", "config", "backup-delete", required({"backup_id": f("integer", minimum=1), "confirm": f("string", choices=("DELETE",)), "server_type": MODUS_BUILD_ID}, ("backup_id", "confirm")))
+register("modus", "wa", "create", required(MODUS_IMPORT, ("code_text", "content", "addons_id", "content_text", "image_url", "support_addon", "tags", "title", "version")))
+register("modus", "wa", "update", required(MODUS_IMPORT, ("import_id",)))
+register("modus", "wa", "edit", required(MODUS_IMPORT, ("import_id",)))
+register("modus", "wa", "delete", required({"import_id": f("identifier", nonempty=True), "confirm": f("string", choices=("DELETE",)), "server_type": MODUS_BUILD_ID}, ("import_id", "confirm")))
+register("modus", "wa", "version-publish", required({"import_id": f("identifier", nonempty=True), "version": f("string", nonempty=True, max_length=120), "code_text": f("string", nonempty=True), "changelog": f("string", max_length=10000), "server_type": MODUS_BUILD_ID}, ("import_id", "version", "code_text")))
+register("modus", "wa", "version-delete", required({"version_id": f("identifier", nonempty=True), "confirm": f("string", choices=("DELETE",)), "server_type": MODUS_BUILD_ID}, ("version_id", "confirm")))
 register("blackbox", "plugin", "edit", required({
     "id": f("integer"), "name": f("string"), "logo_url": f("string"), "category_ids": f("array"),
     "type": f("integer", choices=(1, 9)), "desc": f("string"), "official": f("string"),

package/fupload/scripts/fupload_cli/transport.py

@@ -14,6 +14,17 @@ from .errors import FuploadError
 from .trust import official_opener, require_official_url
 
 
+_IMAGE_CONTENT_TYPES = {
+    ".bmp": "image/bmp",
+    ".gif": "image/gif",
+    ".jpeg": "image/jpeg",
+    ".jpg": "image/jpeg",
+    ".png": "image/png",
+    ".svg": "image/svg+xml",
+    ".webp": "image/webp",
+}
+
+
 def _http_error_details(raw: bytes, fallback: str) -> tuple[str, Any]:
     """Extract a server error only from a conforming UTF-8 JSON object."""
     try:
@@ -88,7 +99,8 @@ def multipart_request(
             str(value).encode("utf-8"), b"\r\n",
         ])
     filename = os.path.basename(file_path)
-    content_type = mimetypes.guess_type(filename)[0] or "application/octet-stream"
+    suffix = os.path.splitext(filename)[1].lower()
+    content_type = _IMAGE_CONTENT_TYPES.get(suffix) or mimetypes.guess_type(filename)[0] or "application/octet-stream"
     chunks.extend([
         ("--%s\r\n" % boundary).encode(),
         ('Content-Disposition: form-data; name="%s"; filename="%s"\r\n' % (file_field, filename)).encode("utf-8"),

package/npm/skill-manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "fupload.npm-skill-manifest.v1",
   "package_name": "@follenfang/fupload",
-  "package_version": "0.0.11",
-  "skill_version": "0.0.11",
-  "tree_sha256": "a0d589cb5d67c7bfbd34862ee4c3109e88068662ae3b7430c0635e71ace9a8d9",
+  "package_version": "0.0.15",
+  "skill_version": "0.0.15",
+  "tree_sha256": "cfccc3347d2013188a37b120b94282c839ad81eb4fa92f8617e0cfa12dfbbaef",
   "files": [
     {
       "path": "agents/openai.yaml",
@@ -92,8 +92,8 @@
     },
     {
       "path": "references/modus.md",
-      "bytes": 8705,
-      "sha256": "10c2db10ade101c6738d9007865db68da54892da59fc1cc0fc1a422296a4bf07"
+      "bytes": 37142,
+      "sha256": "84e1524bc3404de3c3bc0582d85651b884c616ff009b1d01839fb84e348917b3"
     },
     {
       "path": "references/newbee-official-cli.md",
@@ -113,7 +113,7 @@
     {
       "path": "scripts/fupload_cli/__init__.py",
       "bytes": 50,
-      "sha256": "c7d5308bddd21b0e8042689cdeaba91ba45170a998f42844d42f88b7248fc057"
+      "sha256": "9159fa55aa8ef07864abf206b64aabd44ea78c2e987ead8b51ec9384b5d1cebf"
     },
     {
       "path": "scripts/fupload_cli/blackbox_web.py",
@@ -127,8 +127,8 @@
     },
     {
       "path": "scripts/fupload_cli/cli.py",
-      "bytes": 31958,
-      "sha256": "897c2e7a7fea00125023d7fc977aaa6e3b7729b50a468e7deadfacc04d89f9b8"
+      "bytes": 37420,
+      "sha256": "3a052ec53c29ca95eafc9ba845d448ef45e4bd0231bf41ec1906e55281aa1650"
     },
     {
       "path": "scripts/fupload_cli/curseforge.py",
@@ -137,8 +137,8 @@
     },
     {
       "path": "scripts/fupload_cli/dd_broker.py",
-      "bytes": 25750,
-      "sha256": "48ace5b13687c0d8364c62ee9407ed6ead16946df62ce34d04de1aa83ca44026"
+      "bytes": 26638,
+      "sha256": "a23fb486dd1ca9d0a1d2f2ca642690535a28e05051ce828ce066cdbc67b37b37"
     },
     {
       "path": "scripts/fupload_cli/dd_sidecar.py",
@@ -157,8 +157,8 @@
     },
     {
       "path": "scripts/fupload_cli/io.py",
-      "bytes": 4515,
-      "sha256": "dafcfcaa493def7bc42719f357416208a3cabbb163cf651fb18307b501b46e4b"
+      "bytes": 5319,
+      "sha256": "57af3921d016815ed5747788881f86c8a6ce04a939e9f6f6571bd6a3f7383a4d"
     },
     {
       "path": "scripts/fupload_cli/modus_zip.py",
@@ -167,8 +167,8 @@
     },
     {
       "path": "scripts/fupload_cli/modus.py",
-      "bytes": 42241,
-      "sha256": "ee298b064f4b3c4a25081f76e93d48b18f1b810f647437e78d78a4a20ab5bd5c"
+      "bytes": 74134,
+      "sha256": "9841ce7188083b62c1c217d89436b3c3ddc3ecf726719d3c44c0b83027172fac"
     },
     {
       "path": "scripts/fupload_cli/newbee_auth.py",
@@ -182,8 +182,8 @@
     },
     {
       "path": "scripts/fupload_cli/schema.py",
-      "bytes": 46291,
-      "sha256": "025d6f4af1e8adda87aed14a075028c370e78bf0def6738ab303e2f1798aefd8"
+      "bytes": 54561,
+      "sha256": "17d57a9c9c53e556faf9e415020d47f84965283680c66f3f1c33beef6b83d104"
     },
     {
       "path": "scripts/fupload_cli/state_machine.py",
@@ -192,8 +192,8 @@
     },
     {
       "path": "scripts/fupload_cli/transport.py",
-      "bytes": 4895,
-      "sha256": "0489493c1250c50d460c408394824eba7fc0f6efea9a3c1ec06f3ad67e6b89a7"
+      "bytes": 5195,
+      "sha256": "37eb742c1cf75184d14f4f8ae85117222cad3d0748ab4c211452e78b5da0c279"
     },
     {
       "path": "scripts/fupload_cli/trust.py",
@@ -208,7 +208,7 @@
     {
       "path": "SKILL.md",
       "bytes": 25720,
-      "sha256": "cfc3ce770c3594c5a787b25da03cb2e92e0f6ea6fbd162f26f4b6b3c44295a89"
+      "sha256": "fae17edc0a59ea74dc70a5744b5aef46a057c23a9056e6d6b1e60990fa54782f"
     }
   ]
 }

package/package.json

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