@uxf/resizer 11.58.0 → 11.76.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@uxf/resizer",
-    "version": "11.58.0",
+    "version": "11.76.2",
     "main": "index.js",
     "description": "UXF Resizer",
     "author": "UXFans <dev@uxf.cz>",
@@ -16,7 +16,7 @@
     },
     "license": "MIT",
     "dependencies": {
-        "sharp": "^0.33.5"
+        "sharp": "^0.34.3"
     },
     "devDependencies": {
         "@types/express": "4.17.21",

package/src/next-route.js

@@ -74,8 +74,30 @@ async function StaticGET(request) {
 }
 // proxy na dev
 async function ProxyGET(request) {
-    var _a;
+    var _a, _b;
     const url = new URL(request.url);
-    const response = await fetch(`${process.env.NEXT_PUBLIC_API_URL}${url.pathname}`);
-    return new Response(response.body, { headers: { "Content-Type": (_a = response.headers.get("content-type")) !== null && _a !== void 0 ? _a : "" } });
+    const path = url.pathname;
+    const regex = /^\/generated\/(?<namespace>[0-9a-z-_]+)\/(?<p1>[0-9a-f])\/(?<p2>[0-9a-f-])\/(?<filename>[0-9a-f-]+)_(?<width>\d+|x)_(?<height>\d+|x)_(?<fit>[a-z]+)_(?<position>[a-z]+)_(?<background>[0-9a-f]+)_(?<trim>[a-z]+)_(?<quality>\d+|x)_(?<extension>[a-z]+)\.(?<toFormat>[a-z]+)/i;
+    const params = (_a = path.match(regex)) === null || _a === void 0 ? void 0 : _a.groups;
+    if (params === undefined) {
+        return Response.error();
+    }
+    const contentType = (_b = tools_1.CONTENT_TYPES[params.toFormat]) !== null && _b !== void 0 ? _b : "image/jpeg";
+    const generatedFilename = process.cwd() + path;
+    if ((0, fs_1.existsSync)(generatedFilename)) {
+        return sendFile(generatedFilename, contentType);
+    }
+    const generatedDirectory = (0, path_1.dirname)(generatedFilename);
+    if (!(0, fs_1.existsSync)(generatedDirectory)) {
+        (0, fs_1.mkdirSync)(generatedDirectory, { recursive: true });
+    }
+    const sourceUrl = `${process.env.NEXT_PUBLIC_API_URL}/upload/${params.namespace}/${params.p1}/${params.p2}/${params.filename}.${params.extension}`;
+    (0, log_1.log)(`Generated: ${sourceUrl} => ${generatedFilename}`);
+    const sourceFile = await fetch(sourceUrl).then((response) => response.arrayBuffer());
+    if (params.toFormat === "svg") {
+        fs_1.default.writeFileSync(generatedFilename, Buffer.from(sourceFile));
+        return sendFile(generatedFilename, "image/svg+xml");
+    }
+    await (0, image_converter_1.convertImage)(sourceFile, generatedFilename, params);
+    return sendFile(generatedFilename, contentType);
 }

package/src/next-route.ts

@@ -63,6 +63,38 @@ export async function StaticGET(request: Request) {
 // proxy na dev
 export async function ProxyGET(request: Request) {
     const url = new URL(request.url);
-    const response = await fetch(`${process.env.NEXT_PUBLIC_API_URL}${url.pathname}`);
-    return new Response(response.body, { headers: { "Content-Type": response.headers.get("content-type") ?? "" } });
+    const path = url.pathname;
+
+    const regex =
+        /^\/generated\/(?<namespace>[0-9a-z-_]+)\/(?<p1>[0-9a-f])\/(?<p2>[0-9a-f-])\/(?<filename>[0-9a-f-]+)_(?<width>\d+|x)_(?<height>\d+|x)_(?<fit>[a-z]+)_(?<position>[a-z]+)_(?<background>[0-9a-f]+)_(?<trim>[a-z]+)_(?<quality>\d+|x)_(?<extension>[a-z]+)\.(?<toFormat>[a-z]+)/i;
+
+    const params = path.match(regex)?.groups as Params | undefined;
+    if (params === undefined) {
+        return Response.error();
+    }
+
+    const contentType = CONTENT_TYPES[params.toFormat] ?? "image/jpeg";
+    const generatedFilename = process.cwd() + path;
+    if (existsSync(generatedFilename)) {
+        return sendFile(generatedFilename, contentType);
+    }
+
+    const generatedDirectory = dirname(generatedFilename);
+    if (!existsSync(generatedDirectory)) {
+        mkdirSync(generatedDirectory, { recursive: true });
+    }
+
+    const sourceUrl = `${process.env.NEXT_PUBLIC_API_URL}/upload/${params.namespace}/${params.p1}/${params.p2}/${params.filename}.${params.extension}`;
+    log(`Generated: ${sourceUrl} => ${generatedFilename}`);
+
+    const sourceFile = await fetch(sourceUrl).then((response) => response.arrayBuffer());
+
+    if (params.toFormat === "svg") {
+        fs.writeFileSync(generatedFilename, Buffer.from(sourceFile));
+        return sendFile(generatedFilename, "image/svg+xml");
+    }
+
+    await convertImage(sourceFile, generatedFilename, params);
+
+    return sendFile(generatedFilename, contentType);
 }

package/src/utils/tools.d.ts

@@ -11,6 +11,9 @@ export interface Params {
     filename: string;
     extension: string;
     toFormat: string;
+    p1: string | undefined;
+    p2: string | undefined;
+    namespace: string | undefined;
 }
 export declare const getQuality: ({ quality }: Params) => number | undefined;
 export declare const getWidth: ({ width }: Params) => number | undefined;

package/src/utils/tools.ts

@@ -40,6 +40,10 @@ export interface Params {
     filename: string;
     extension: string;
     toFormat: string;
+    //
+    p1: string | undefined;
+    p2: string | undefined;
+    namespace: string | undefined;
 }
 
 export const getQuality = ({ quality }: Params) => (quality && quality !== "x" ? Number(quality) : undefined);