@uxf/resizer 10.0.0 → 11.7.0

package/index.js

@@ -103,7 +103,9 @@ const resizerMiddleware = (config) => {
             });
             const trim = getTrim(params);
             if (trim !== undefined) {
-                pipeline.trim(trim);
+                pipeline.trim({
+                    threshold: trim,
+                });
             }
             const quality = getQuality(params);
             switch (params.toFormat) {

package/index.ts

@@ -96,7 +96,9 @@ export const resizerMiddleware = (config: Config) => {
 
             const trim = getTrim(params);
             if (trim !== undefined) {
-                pipeline.trim(trim);
+                pipeline.trim({
+                    threshold: trim,
+                });
             }
 
             const quality = getQuality(params);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/resizer",
-  "version": "10.0.0",
+  "version": "11.7.0",
   "main": "index.js",
   "description": "UXF Resizer",
   "author": "UXFans <dev@uxf.cz>",
@@ -19,7 +19,7 @@
     "express": "4.18.2",
     "path-to-regexp": "6.2.1",
     "process": "0.11.10",
-    "sharp": "0.32.6",
+    "sharp": "0.33.1",
     "yargs": "17.7.2"
   },
   "devDependencies": {

package/utils/get-source-filename.js

@@ -10,7 +10,11 @@ function getSourceFilename(source, params) {
     const repairedParams = (0, repair_params_1.repairParams)(params);
     (0, log_1.log)(repairedParams);
     if (parsedHttpSource) {
-        const compiled = (0, path_to_regexp_1.compile)(`/${parsedHttpSource.domain}/${parsedHttpSource.path}`, {})(repairedParams);
+        // escape port
+        const domain = parsedHttpSource.domain.startsWith(":")
+            ? parsedHttpSource.domain
+            : parsedHttpSource.domain.replace(":", "\\:");
+        const compiled = (0, path_to_regexp_1.compile)(`/${domain}/${parsedHttpSource.path}`, {})(repairedParams);
         return `${parsedHttpSource.protocol}:/${compiled}`;
     }
     return (0, path_to_regexp_1.compile)(source, {})(repairedParams);

package/utils/get-source-filename.test.js

@@ -6,6 +6,10 @@ test("get source filename", () => {
         filename: ["path", "to", "file"],
         extension: "jpg",
     })).toStrictEqual("https://domain.uxf.dev/path/to/file.jpg");
+    expect((0, get_source_filename_1.getSourceFilename)("http://localhost:3000/:filename+.:extension", {
+        filename: ["path", "to", "file"],
+        extension: "jpg",
+    })).toStrictEqual("http://localhost:3000/path/to/file.jpg");
     expect((0, get_source_filename_1.getSourceFilename)("https://:url/:filename+.:extension", {
         url: "domain-as-parameter.uxf.dev",
         filename: ["path", "to", "file"],

package/utils/get-source-filename.test.ts

@@ -8,6 +8,13 @@ test("get source filename", () => {
         }),
     ).toStrictEqual("https://domain.uxf.dev/path/to/file.jpg");
 
+    expect(
+        getSourceFilename("http://localhost:3000/:filename+.:extension", {
+            filename: ["path", "to", "file"],
+            extension: "jpg",
+        }),
+    ).toStrictEqual("http://localhost:3000/path/to/file.jpg");
+
     expect(
         getSourceFilename("https://:url/:filename+.:extension", {
             url: "domain-as-parameter.uxf.dev",

package/utils/get-source-filename.ts

@@ -9,7 +9,11 @@ export function getSourceFilename(source: string, params: Record<string, any>):
     log(repairedParams);
 
     if (parsedHttpSource) {
-        const compiled = compile(`/${parsedHttpSource.domain}/${parsedHttpSource.path}`, {})(repairedParams);
+        // escape port
+        const domain = parsedHttpSource.domain.startsWith(":")
+            ? parsedHttpSource.domain
+            : parsedHttpSource.domain.replace(":", "\\:");
+        const compiled = compile(`/${domain}/${parsedHttpSource.path}`, {})(repairedParams);
         return `${parsedHttpSource.protocol}:/${compiled}`;
     }
 

package/utils/parse-http-source.test.js

@@ -7,6 +7,11 @@ test("parse source", () => {
         domain: "domain.uxf.dev",
         path: ":filename+.:extension",
     });
+    expect((0, parse_http_source_1.parseHttpSource)("http://localhost:3000/:filename+.:extension")).toEqual({
+        protocol: "http",
+        domain: "localhost:3000",
+        path: ":filename+.:extension",
+    });
     expect((0, parse_http_source_1.parseHttpSource)("https://:url/:filename+.:extension")).toEqual({
         protocol: "https",
         domain: ":url",

package/utils/parse-http-source.test.ts

@@ -6,6 +6,11 @@ test("parse source", () => {
         domain: "domain.uxf.dev",
         path: ":filename+.:extension",
     });
+    expect(parseHttpSource("http://localhost:3000/:filename+.:extension")).toEqual({
+        protocol: "http",
+        domain: "localhost:3000",
+        path: ":filename+.:extension",
+    });
     expect(parseHttpSource("https://:url/:filename+.:extension")).toEqual({
         protocol: "https",
         domain: ":url",