@uxf/resizer 2.2.0 → 2.3.0

package/.resizer-config.json

@@ -8,7 +8,7 @@
     "source": "/Users/vejvis/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
   },
   {
-    "route": "/generated/opentopo/:width(\\d+)_:height(\\d+)/:filename",
-    "source": "https://opentopo.app/:filename"
+    "route": "/generated/static/:width(\\d+)_:height(\\d+)/:filename(*).:extension.:toFormat",
+    "source": "https://www.uxf.cz/:filename+.:extension"
   }
 ]

package/README.md

@@ -21,7 +21,7 @@ You can use configuration file `.resizer-config.json` or environment variable `U
 ```json
 [
     {
-        "route": "/generated/:namespace/:p1/:p2/:filename([a-f0-9\\-]+)_:width(\\d+)_:height(\\d+)_:fit([a-z]+)_:position([a-z]+)_:background([a-z]+)_:trim([a-z]+)_:extension.:toFormat",
+        "route": "/generated/:namespace/:p1/:p2/:filename([a-f0-9\\-]+)_:width(\\d+)_:height(\\d+)_:fit([a-z]+)_:position([a-z]+)_:background([a-z]+)_:trim([a-z]+)_:quality(\\d+)_:extension.:toFormat",
         "source": "/var/www/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
     },
     {
@@ -29,8 +29,22 @@ You can use configuration file `.resizer-config.json` or environment variable `U
         "source": "/var/www/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
     },
     {
-        "route": "/generated/opentopo/:width(\\d+)_:height(\\d+)_:fit([a-z]+)/:filename",
-        "source": "https://opentopo.app/:filename"
+        "route": "/generated/static/:width(\\d+)_:height(\\d+)/:filename(*).:extension.:toExtension",
+        "source": "https://www.uxf.cz/:filename+"
+    }
+]
+```
+
+### UXF Basic configuration
+```json
+[
+    {
+        "route": "/generated/static/:width(\\d+|x)_:height(\\d+|x)_:fit([a-z]+)_:position([a-z]+)_:background([a-z]+)_:trim([a-z]+)/:version/:filename(*).:extension.:toFormat",
+        "source": "https://uxf-base.uxf.dev/:filename+.:extension"
+    },
+    {
+        "route": "/generated/:namespace/:p1/:p2/:filename([a-f0-9\\-]+)_:width(\\d+|x)_:height(\\d+|x)_:fit([a-z]+)_:position([a-z]+)_:background([a-z]+)_:trim([a-z]+)_:quality(\\d+)_:extension.:toFormat",
+        "source": "https://s3.uxf.dev/${APP_NAME}-${APP_ENV}/:namespace/:p1/:p2/:filename.:extension"
     }
 ]
 ```
@@ -45,6 +59,7 @@ You can use configuration file `.resizer-config.json` or environment variable `U
 | background     | `FFFFFF` or `t` (transparent) |                     |
 | toFormat       | `webp`, `png`, `avif`, `jpg`  | `jpg`               |
 | trim           | `number` or `nt` (not trim)   |                     |
+| quality        | `number` (min: 1, max: 100)   | 60                  |
 
 #### Fit
 - `cv`: cover,

package/index.js

@@ -66,6 +66,10 @@ var POSITION_OPTIONS = {
     rt: "right top",
     t: "top",
 };
+var getQuality = function (_a) {
+    var quality = _a.quality;
+    return (quality ? Number(quality) : 60);
+};
 var getWidth = function (_a) {
     var width = _a.width;
     return (width && width !== "x" ? Number(width) : undefined);
@@ -100,6 +104,21 @@ function log(message) {
     // eslint-disable-next-line no-console
     console.log(message);
 }
+/**
+ * TODO @vejvis HACK
+ *
+ * pro odchycení celé cesty i s lomítkama je potřeba udělat hack: /generated/:restPath(*) => restPath bude string
+ * pro zpětné složení pomocí pathToRegexp::compile() se používá: /generated/:restPath+ => restPath musí být string[]
+ * Tato funkce projde celý objekt a pokud v hodnotě atributu najde "/" tak tento atribut převede na pole
+ */
+var repairParams = function (params) {
+    var obj = {};
+    Object.keys(params).forEach(function (key) {
+        var value = params[key];
+        obj[key] = value.includes("/") ? value.split("/") : value;
+    });
+    return obj;
+};
 var resizerMiddleware = function (config) {
     var middleware = (0, express_1.Router)();
     config.forEach(function (c, i) {
@@ -107,20 +126,21 @@ var resizerMiddleware = function (config) {
         log("    Route:  ".concat(c.route));
         log("    Source: ".concat(c.source));
         middleware.get(c.route, function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-            var url, domain, sourceFilename, generatedFilename, generatedDirectory, params, sourceFile, _a, pipeline, trim;
+            var url, domain, repairedParams, sourceFilename, generatedFilename, generatedDirectory, params, sourceFile, _a, pipeline, trim, quality;
             var _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         url = c.source.startsWith("http") ? new URL(c.source) : null;
                         domain = url === null || url === void 0 ? void 0 : url.origin;
-                        sourceFilename = (0, path_to_regexp_1.compile)((_b = url === null || url === void 0 ? void 0 : url.pathname) !== null && _b !== void 0 ? _b : c.source, {})(req.params);
+                        repairedParams = repairParams(req.params);
+                        sourceFilename = (0, path_to_regexp_1.compile)((_b = url === null || url === void 0 ? void 0 : url.pathname) !== null && _b !== void 0 ? _b : c.source, {})(repairedParams);
                         generatedFilename = ((_c = process.env.UXF_RESIZER_GENERATE_PATH) !== null && _c !== void 0 ? _c : process.cwd()) + req.path;
                         if ((0, fs_1.existsSync)(generatedFilename)) {
                             return [2 /*return*/, res.sendFile(generatedFilename)];
                         }
                         log("----------------------------------------");
-                        log(req.params);
+                        log(repairedParams);
                         log("Source filename:    ".concat(sourceFilename));
                         log("Generated filename: ".concat(generatedFilename));
                         generatedDirectory = (0, path_1.dirname)(generatedFilename);
@@ -156,13 +176,14 @@ var resizerMiddleware = function (config) {
                         if (trim !== undefined) {
                             pipeline.trim(trim);
                         }
+                        quality = getQuality(params);
                         switch (params.toFormat) {
                             case "webp":
-                                pipeline.webp({ quality: 60 });
+                                pipeline.webp({ quality: quality });
                                 res.setHeader("Content-Type", "image/webp");
                                 break;
                             case "png":
-                                pipeline.png({ progressive: true, quality: 60 });
+                                pipeline.png({ progressive: true, quality: quality });
                                 res.setHeader("Content-Type", "image/png");
                                 break;
                             case "avif":
@@ -170,7 +191,7 @@ var resizerMiddleware = function (config) {
                                 res.setHeader("Content-Type", "image/avif");
                                 break;
                             default:
-                                pipeline.jpeg({ progressive: true, quality: 60 });
+                                pipeline.jpeg({ progressive: true, quality: quality });
                                 res.setHeader("Content-Type", "image/jpeg");
                                 break;
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/resizer",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "main": "index.js",
   "description": "UXF Resizer",
   "author": "UXFans <dev@uxf.cz>",