@uxf/resizer 10.0.0-beta.80 → 10.0.0-beta.85

package/README.md

@@ -31,11 +31,22 @@ You can use configuration file `.resizer-config.json` or environment variable `U
     {
         "route": "/generated/static/:width(\\d+)_:height(\\d+)/:filename(*).:extension.:toExtension",
         "source": "https://www.uxf.cz/:filename+"
+    },
+    {
+        "route": "/:appName/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+|x)_:extension.:toFormat",
+        "source": "https://s3.uxf.dev/:appName/:namespace/:p1/:p2/:filename.:extension"
+    },
+    {
+        "route": "/:url/generated/static/:width(\\d+|x)_:height(\\d+|x)_:fit([a-z]+)_:position([a-z]+)_:background([a-z]+)_:trim([a-z]+)_:quality(\\d+|x)/:version/:filename(*).:extension.:toFormat",
+        "source": "https://:url/:filename+.:extension"
     }
 ]
 ```
 
 ### UXF Basic configuration
+
+This is deprecated. Please use our global resizer for all projects.
+
 ```json
 [
     {

package/index.js

@@ -32,8 +32,9 @@ const fs = __importStar(require("fs"));
 const fs_1 = require("fs");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const path_1 = require("path");
-const path_to_regexp_1 = require("path-to-regexp");
 const sharp_1 = __importDefault(require("sharp"));
+const get_source_filename_1 = require("./utils/get-source-filename");
+const log_1 = require("./utils/log");
 const FIT_OPTIONS = {
     cv: "cover",
     f: "fill",
@@ -62,51 +63,30 @@ const getFit = ({ fit }) => { var _a; return (fit ? (_a = FIT_OPTIONS[fit]) !==
 const getPosition = ({ position }) => { var _a; return (position ? (_a = POSITION_OPTIONS[position]) !== null && _a !== void 0 ? _a : "centre" : undefined); };
 const getWithoutEnlargement = ({ extension }) => extension !== "svg";
 const getTrim = ({ trim }) => (trim === undefined || trim === "nt" ? undefined : Number(trim));
-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
- */
-const repairParams = (params) => {
-    const obj = {};
-    Object.keys(params).forEach((key) => {
-        const value = params[key];
-        obj[key] = value.includes("/") ? value.split("/") : value;
-    });
-    return obj;
-};
 const resizerMiddleware = (config) => {
     const middleware = (0, express_1.Router)();
     config.forEach((c, i) => {
-        log(`Config #${i + 1}:`);
-        log(`    Route:  ${c.route}`);
-        log(`    Source: ${c.source}`);
+        (0, log_1.log)(`Config #${i + 1}:`);
+        (0, log_1.log)(`    Route:  ${c.route}`);
+        (0, log_1.log)(`    Source: ${c.source}`);
         middleware.get(c.route, async (req, res) => {
-            var _a, _b;
-            const url = c.source.startsWith("http") ? new URL(c.source) : null;
-            const domain = url === null || url === void 0 ? void 0 : url.origin;
-            const repairedParams = repairParams(req.params);
-            const sourceFilename = (0, path_to_regexp_1.compile)((_a = url === null || url === void 0 ? void 0 : url.pathname) !== null && _a !== void 0 ? _a : c.source, {})(repairedParams);
-            const generatedFilename = ((_b = process.env.UXF_RESIZER_GENERATE_PATH) !== null && _b !== void 0 ? _b : process.cwd()) + req.path;
+            var _a;
+            (0, log_1.log)("----------------------------------------");
+            const params = req.params;
+            const generatedFilename = ((_a = process.env.UXF_RESIZER_GENERATE_PATH) !== null && _a !== void 0 ? _a : process.cwd()) + req.path;
+            (0, log_1.log)(`Generated filename: ${generatedFilename}`);
             if ((0, fs_1.existsSync)(generatedFilename)) {
                 return res.sendFile(generatedFilename);
             }
-            log("----------------------------------------");
-            log(repairedParams);
-            log(`Source filename:    ${sourceFilename}`);
-            log(`Generated filename: ${generatedFilename}`);
             const generatedDirectory = (0, path_1.dirname)(generatedFilename);
             if (!(0, fs_1.existsSync)(generatedDirectory)) {
                 (0, fs_1.mkdirSync)(generatedDirectory, { recursive: true });
             }
-            const params = req.params;
-            const sourceFile = domain ? await (await (0, node_fetch_1.default)(domain + sourceFilename)).buffer() : sourceFilename;
+            const sourceFilename = (0, get_source_filename_1.getSourceFilename)(c.source, params);
+            (0, log_1.log)(`Source filename:    ${sourceFilename}`);
+            const sourceFile = /^(http|https)/.test(sourceFilename)
+                ? await (0, node_fetch_1.default)(sourceFilename).then((response) => response.buffer())
+                : sourceFilename;
             if (params.toFormat === "svg") {
                 fs.writeFileSync(generatedFilename, sourceFile);
                 return res.sendFile(generatedFilename);
@@ -151,7 +131,7 @@ const resizerMiddleware = (config) => {
                 .toFile(generatedFilename)
                 .then(() => res.sendFile(generatedFilename))
                 .catch((e) => {
-                log(e);
+                (0, log_1.log)(e);
                 return res.sendStatus(404);
             });
         });

package/index.ts

@@ -3,8 +3,9 @@ import * as fs from "fs";
 import { existsSync, mkdirSync } from "fs";
 import fetch from "node-fetch";
 import { dirname } from "path";
-import { compile } from "path-to-regexp";
 import sharp, { FitEnum, ResizeOptions } from "sharp";
+import { getSourceFilename } from "./utils/get-source-filename";
+import { log } from "./utils/log";
 
 const FIT_OPTIONS: Record<string, ResizeOptions["fit"]> = {
     cv: "cover",
@@ -43,27 +44,6 @@ const getPosition = ({ position }: any) => (position ? POSITION_OPTIONS[position
 const getWithoutEnlargement = ({ extension }: any) => extension !== "svg";
 const getTrim = ({ trim }: any) => (trim === undefined || trim === "nt" ? undefined : Number(trim));
 
-function log(message: any) {
-    // 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
- */
-const repairParams = (params: any) => {
-    const obj: any = {};
-    Object.keys(params).forEach((key) => {
-        const value: string = params[key];
-        obj[key] = value.includes("/") ? value.split("/") : value;
-    });
-    return obj;
-};
-
 export const resizerMiddleware = (config: Config) => {
     const middleware = Router();
 
@@ -73,29 +53,27 @@ export const resizerMiddleware = (config: Config) => {
         log(`    Source: ${c.source}`);
 
         middleware.get(c.route, async (req, res) => {
-            const url = c.source.startsWith("http") ? new URL(c.source) : null;
-            const domain = url?.origin;
-            const repairedParams = repairParams(req.params);
-            const sourceFilename = compile(url?.pathname ?? c.source, {})(repairedParams);
+            log("----------------------------------------");
+            const params = req.params;
+
             const generatedFilename = (process.env.UXF_RESIZER_GENERATE_PATH ?? process.cwd()) + req.path;
+            log(`Generated filename: ${generatedFilename}`);
 
             if (existsSync(generatedFilename)) {
                 return res.sendFile(generatedFilename);
             }
 
-            log("----------------------------------------");
-            log(repairedParams);
-            log(`Source filename:    ${sourceFilename}`);
-            log(`Generated filename: ${generatedFilename}`);
-
             const generatedDirectory = dirname(generatedFilename);
             if (!existsSync(generatedDirectory)) {
                 mkdirSync(generatedDirectory, { recursive: true });
             }
 
-            const params = req.params;
+            const sourceFilename = getSourceFilename(c.source, params);
+            log(`Source filename:    ${sourceFilename}`);
 
-            const sourceFile = domain ? await (await fetch(domain + sourceFilename)).buffer() : sourceFilename;
+            const sourceFile = /^(http|https)/.test(sourceFilename)
+                ? await fetch(sourceFilename).then((response) => response.buffer())
+                : sourceFilename;
 
             if (params.toFormat === "svg") {
                 fs.writeFileSync(generatedFilename, sourceFile);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/resizer",
-  "version": "10.0.0-beta.80",
+  "version": "10.0.0-beta.85",
   "main": "index.js",
   "description": "UXF Resizer",
   "author": "UXFans <dev@uxf.cz>",
@@ -17,7 +17,7 @@
   "license": "MIT",
   "dependencies": {
     "express": "4.18.2",
-    "node-fetch": "3.3.2",
+    "node-fetch": "^2.6.7",
     "path-to-regexp": "6.2.1",
     "process": "0.11.10",
     "sharp": "0.32.6",
@@ -25,6 +25,7 @@
   },
   "devDependencies": {
     "@types/express": "4.17.18",
+    "@types/node-fetch": "^2.5.12",
     "concurrently": "8.2.1",
     "crypto-js": "4.1.1"
   },

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

@@ -0,0 +1 @@
+export declare function getSourceFilename(source: string, params: Record<string, any>): string;

package/utils/get-source-filename.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSourceFilename = void 0;
+const path_to_regexp_1 = require("path-to-regexp");
+const log_1 = require("./log");
+const parse_http_source_1 = require("./parse-http-source");
+const repair_params_1 = require("./repair-params");
+function getSourceFilename(source, params) {
+    const parsedHttpSource = (0, parse_http_source_1.parseHttpSource)(source);
+    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);
+        return `${parsedHttpSource.protocol}:/${compiled}`;
+    }
+    return (0, path_to_regexp_1.compile)(source, {})(repairedParams);
+}
+exports.getSourceFilename = getSourceFilename;

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const get_source_filename_1 = require("./get-source-filename");
+test("get source filename", () => {
+    expect((0, get_source_filename_1.getSourceFilename)("https://domain.uxf.dev/:filename+.:extension", {
+        filename: ["path", "to", "file"],
+        extension: "jpg",
+    })).toStrictEqual("https://domain.uxf.dev/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"],
+        extension: "jpg",
+    })).toStrictEqual("https://domain-as-parameter.uxf.dev/path/to/file.jpg");
+    expect((0, get_source_filename_1.getSourceFilename)("/var/www/:filename+.:extension", {
+        filename: ["path", "to", "file"],
+        extension: "jpg",
+    })).toStrictEqual("/var/www/path/to/file.jpg");
+});

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

@@ -0,0 +1,25 @@
+import { getSourceFilename } from "./get-source-filename";
+
+test("get source filename", () => {
+    expect(
+        getSourceFilename("https://domain.uxf.dev/:filename+.:extension", {
+            filename: ["path", "to", "file"],
+            extension: "jpg",
+        }),
+    ).toStrictEqual("https://domain.uxf.dev/path/to/file.jpg");
+
+    expect(
+        getSourceFilename("https://:url/:filename+.:extension", {
+            url: "domain-as-parameter.uxf.dev",
+            filename: ["path", "to", "file"],
+            extension: "jpg",
+        }),
+    ).toStrictEqual("https://domain-as-parameter.uxf.dev/path/to/file.jpg");
+
+    expect(
+        getSourceFilename("/var/www/:filename+.:extension", {
+            filename: ["path", "to", "file"],
+            extension: "jpg",
+        }),
+    ).toStrictEqual("/var/www/path/to/file.jpg");
+});

package/utils/get-source-filename.ts

@@ -0,0 +1,17 @@
+import { compile } from "path-to-regexp";
+import { log } from "./log";
+import { parseHttpSource } from "./parse-http-source";
+import { repairParams } from "./repair-params";
+
+export function getSourceFilename(source: string, params: Record<string, any>): string {
+    const parsedHttpSource = parseHttpSource(source);
+    const repairedParams = repairParams(params);
+    log(repairedParams);
+
+    if (parsedHttpSource) {
+        const compiled = compile(`/${parsedHttpSource.domain}/${parsedHttpSource.path}`, {})(repairedParams);
+        return `${parsedHttpSource.protocol}:/${compiled}`;
+    }
+
+    return compile(source, {})(repairedParams);
+}

package/utils/log.d.ts

@@ -0,0 +1 @@
+export declare function log(message: any): void;

package/utils/log.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.log = void 0;
+function log(message) {
+    // eslint-disable-next-line no-console
+    console.log(message);
+}
+exports.log = log;

package/utils/log.ts

@@ -0,0 +1,4 @@
+export function log(message: any) {
+    // eslint-disable-next-line no-console
+    console.log(message);
+}

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

@@ -0,0 +1,7 @@
+interface Result {
+    protocol: string;
+    path: string;
+    domain: string;
+}
+export declare function parseHttpSource(source: string): Result | undefined;
+export {};

package/utils/parse-http-source.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseHttpSource = void 0;
+function parseHttpSource(source) {
+    var _a;
+    return (_a = /^(?<protocol>http|https):\/\/(?<domain>.*)\/(?<path>.*)$/.exec(source)) === null || _a === void 0 ? void 0 : _a.groups;
+}
+exports.parseHttpSource = parseHttpSource;

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const parse_http_source_1 = require("./parse-http-source");
+test("parse source", () => {
+    expect((0, parse_http_source_1.parseHttpSource)("https://domain.uxf.dev/:filename+.:extension")).toEqual({
+        protocol: "https",
+        domain: "domain.uxf.dev",
+        path: ":filename+.:extension",
+    });
+    expect((0, parse_http_source_1.parseHttpSource)("https://:url/:filename+.:extension")).toEqual({
+        protocol: "https",
+        domain: ":url",
+        path: ":filename+.:extension",
+    });
+    expect((0, parse_http_source_1.parseHttpSource)("/var/www/:filename+.:extension")).toBeUndefined();
+});

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

@@ -0,0 +1,15 @@
+import { parseHttpSource } from "./parse-http-source";
+
+test("parse source", () => {
+    expect(parseHttpSource("https://domain.uxf.dev/:filename+.:extension")).toEqual({
+        protocol: "https",
+        domain: "domain.uxf.dev",
+        path: ":filename+.:extension",
+    });
+    expect(parseHttpSource("https://:url/:filename+.:extension")).toEqual({
+        protocol: "https",
+        domain: ":url",
+        path: ":filename+.:extension",
+    });
+    expect(parseHttpSource("/var/www/:filename+.:extension")).toBeUndefined();
+});

package/utils/parse-http-source.ts

@@ -0,0 +1,9 @@
+interface Result {
+    protocol: string;
+    path: string;
+    domain: string;
+}
+
+export function parseHttpSource(source: string): Result | undefined {
+    return /^(?<protocol>http|https):\/\/(?<domain>.*)\/(?<path>.*)$/.exec(source)?.groups as Result | undefined;
+}

package/utils/repair-params.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 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
+ */
+export declare const repairParams: (params: any) => any;

package/utils/repair-params.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.repairParams = void 0;
+/**
+ * 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
+ */
+const repairParams = (params) => {
+    const obj = {};
+    Object.keys(params).forEach((key) => {
+        const value = params[key];
+        obj[key] = value.includes("/") ? value.split("/") : value;
+    });
+    return obj;
+};
+exports.repairParams = repairParams;

package/utils/repair-params.ts

@@ -0,0 +1,15 @@
+/**
+ * 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
+ */
+export const repairParams = (params: any) => {
+    const obj: any = {};
+    Object.keys(params).forEach((key) => {
+        const value: string = params[key];
+        obj[key] = value.includes("/") ? value.split("/") : value;
+    });
+    return obj;
+};