v0.27.0

src/admin/web/web-server.js

@@ -161,6 +161,12 @@
     ]) $(id).disabled = !enabled;
   }
 
+  function syncCompression() {
+    const disabled = $("web-service-compression").value === "off";
+    $("web-service-compression-options").hidden = disabled;
+    for (const name of ["zstd", "br", "gzip", "deflate"]) $( `web-service-compression-${name}` ).disabled = disabled;
+  }
+
   function syncPrecompressed() {
     const enabled = $("web-service-precompressed").checked;
     $("web-service-precompressed-br").disabled = !enabled;
@@ -186,7 +192,7 @@
     return {
       id: "", name: "", document_root: "", index: ["index.html", "index.htm"], directory_listing: false,
       mime_types: {}, default_mime_type: "application/octet-stream", cache_control: null, cache_rules: [], response_headers: {},
-      try_files: [], rewrites: [], precompressed: { enabled: false, brotli: true, gzip: true }, download_extensions: [],
+      try_files: [], rewrites: [], compression: { enabled: null, gzip: null, br: null, zstd: null, deflate: null }, precompressed: { enabled: false, brotli: true, gzip: true }, download_extensions: [],
       symlink_policy: "deny", php: {
         enabled: false, extensions: ["php"], endpoint: "unix:/run/php/php-fpm.sock", connect_timeout_ms: 1000,
         request_timeout_ms: 30000, max_concurrent_requests: 64, pass_authorization: true, max_request_body_bytes: 0,
@@ -228,6 +234,8 @@
     $("web-service-cache-control").value = item.cache_control || "";
     $("web-service-cache-rules").value = cacheLines(item.cache_rules);
     $("web-service-response-headers").value = mapLines(item.response_headers);
+    $("web-service-compression").value = item.compression?.enabled === true ? "on" : item.compression?.enabled === false ? "off" : "";
+    for (const name of ["zstd", "br", "gzip", "deflate"]) $( `web-service-compression-${name}` ).value = item.compression?.[name] === true ? "on" : item.compression?.[name] === false ? "off" : "";
     $("web-service-precompressed").checked = item.precompressed?.enabled === true;
     $("web-service-precompressed-br").checked = item.precompressed?.brotli !== false;
     $("web-service-precompressed-gzip").checked = item.precompressed?.gzip !== false;
@@ -252,6 +260,7 @@
     $("web-service-hardening-attacks").checked = item.hardening?.block_common_attacks === true;
     $("web-service-hardening-headers").checked = item.hardening?.strip_unnecessary_headers === true;
     syncPhp();
+    syncCompression();
     syncPrecompressed();
     syncHtaccess();
   }
@@ -297,6 +306,7 @@
 
   function open(value = null) {
     const item = Object.assign(defaults(), structuredClone(value || {}));
+    item.compression = Object.assign(defaults().compression, item.compression || {});
     item.precompressed = Object.assign(defaults().precompressed, item.precompressed || {});
     item.php = Object.assign(defaults().php, item.php || {});
     item.htaccess = Object.assign(defaults().htaccess, item.htaccess || {});
@@ -357,6 +367,7 @@
         ["webServiceTryFiles", (service.try_files || []).length ? String(service.try_files.length) : "-"],
         ["webServiceHtaccessEnabled", t(service.htaccess?.enabled ? "enabled" : "notEnabled")],
         ["webServicePhpEnabled", t(service.php?.enabled ? "enabled" : "notEnabled")],
+        ["webServiceCompression", service.compression?.enabled === true ? t("enabled") : service.compression?.enabled === false ? t("notEnabled") : t("inherit")],
         ["webServicePrecompressed", t(service.precompressed?.enabled ? "enabled" : "notEnabled")],
         ["webServiceHardeningTitle", t((service.hardening?.block_common_attacks || service.hardening?.strip_unnecessary_headers) ? "enabled" : "notEnabled")],
         ["webServiceCacheControl", service.cache_control || t("inherit")],
@@ -390,6 +401,13 @@
         response_headers: parseKeyValueLines($("web-service-response-headers").value, "webServiceResponseHeadersInvalid", key => key.toLowerCase()),
         try_files: strictLines($("web-service-try-files").value),
         rewrites: parseRewrites($("web-service-rewrites").value),
+        compression: {
+          enabled: $("web-service-compression").value === "" ? null : $("web-service-compression").value === "on",
+          zstd: $("web-service-compression-zstd").value === "" ? null : $("web-service-compression-zstd").value === "on",
+          br: $("web-service-compression-br").value === "" ? null : $("web-service-compression-br").value === "on",
+          gzip: $("web-service-compression-gzip").value === "" ? null : $("web-service-compression-gzip").value === "on",
+          deflate: $("web-service-compression-deflate").value === "" ? null : $("web-service-compression-deflate").value === "on"
+        },
         precompressed: { enabled: $("web-service-precompressed").checked, brotli: $("web-service-precompressed-br").checked, gzip: $("web-service-precompressed-gzip").checked },
         download_extensions: lines($("web-service-download-extensions").value).map(value => value.replace(/^\./, "").toLowerCase()),
         symlink_policy: $("web-service-symlink-policy").value,
@@ -435,6 +453,7 @@
   form.addEventListener("input", () => { dirty = true; });
   form.addEventListener("change", () => { dirty = true; });
   $("web-service-php-enabled").addEventListener("change", syncPhp);
+  $("web-service-compression").addEventListener("change", syncCompression);
   $("web-service-precompressed").addEventListener("change", syncPrecompressed);
   $("web-service-htaccess-enabled").addEventListener("change", syncHtaccess);
   $("web-service-preset").addEventListener("change", presetChanged);