@uxf/resizer 11.41.2 → 11.42.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +2 -2
  2. package/src/middleware.js +12 -10
  3. package/src/middleware.ts +16 -13
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@uxf/resizer",
3
- "version": "11.41.2",
3
+ "version": "11.42.0",
4
4
  "main": "index.js",
5
5
  "description": "UXF Resizer",
6
6
  "author": "UXFans <dev@uxf.cz>",
@@ -16,7 +16,7 @@
16
16
  },
17
17
  "license": "MIT",
18
18
  "dependencies": {
19
- "sharp": "0.32.6"
19
+ "sharp": "^0.33.5"
20
20
  },
21
21
  "devDependencies": {
22
22
  "@types/express": "4.17.21",
package/src/middleware.js CHANGED
@@ -39,7 +39,7 @@ const resizerMiddleware = (config) => {
39
39
  (0, log_1.log)(` Route: ${c.route}`);
40
40
  (0, log_1.log)(` Source: ${c.source}`);
41
41
  middleware.get(c.route, async (req, res) => {
42
- var _a;
42
+ var _a, _b;
43
43
  (0, log_1.log)("----------------------------------------");
44
44
  const params = req.params;
45
45
  const generatedFilename = ((_a = process.env.UXF_RESIZER_GENERATE_PATH) !== null && _a !== void 0 ? _a : process.cwd()) + req.path;
@@ -58,21 +58,23 @@ const resizerMiddleware = (config) => {
58
58
  : sourceFilename;
59
59
  if (params.toFormat === "svg") {
60
60
  fs.writeFileSync(generatedFilename, sourceFile instanceof ArrayBuffer ? Buffer.from(sourceFile) : sourceFile);
61
- return res.sendFile(generatedFilename);
62
- }
63
- (0, image_converter_1.convertImage)(sourceFile, generatedFilename, params)
64
- .then(() => {
65
- var _a;
66
61
  return res.sendFile(generatedFilename, {
67
62
  headers: {
68
- "Content-Type": (_a = tools_1.CONTENT_TYPES[params.toFormat]) !== null && _a !== void 0 ? _a : "image/jpeg",
63
+ "Content-Type": "image/svg+xml",
69
64
  },
70
65
  });
71
- })
72
- .catch((e) => {
66
+ }
67
+ try {
68
+ const headers = {
69
+ "Content-Type": (_b = tools_1.CONTENT_TYPES[params.toFormat]) !== null && _b !== void 0 ? _b : "image/jpeg",
70
+ };
71
+ await (0, image_converter_1.convertImage)(sourceFile, generatedFilename, params);
72
+ return res.sendFile(generatedFilename, { headers });
73
+ }
74
+ catch (e) {
73
75
  (0, log_1.log)(e, "error");
74
76
  return res.sendStatus(404);
75
- });
77
+ }
76
78
  });
77
79
  });
78
80
  return middleware;
package/src/middleware.ts CHANGED
@@ -48,21 +48,24 @@ export const resizerMiddleware = (config: Config) => {
48
48
  generatedFilename,
49
49
  sourceFile instanceof ArrayBuffer ? Buffer.from(sourceFile) : sourceFile,
50
50
  );
51
- return res.sendFile(generatedFilename);
51
+ return res.sendFile(generatedFilename, {
52
+ headers: {
53
+ "Content-Type": "image/svg+xml",
54
+ },
55
+ });
52
56
  }
53
57
 
54
- convertImage(sourceFile, generatedFilename, params)
55
- .then(() =>
56
- res.sendFile(generatedFilename, {
57
- headers: {
58
- "Content-Type": CONTENT_TYPES[params.toFormat] ?? "image/jpeg",
59
- },
60
- }),
61
- )
62
- .catch((e) => {
63
- log(e, "error");
64
- return res.sendStatus(404);
65
- });
58
+ try {
59
+ const headers = {
60
+ "Content-Type": CONTENT_TYPES[params.toFormat] ?? "image/jpeg",
61
+ };
62
+
63
+ await convertImage(sourceFile, generatedFilename, params);
64
+ return res.sendFile(generatedFilename, { headers });
65
+ } catch (e) {
66
+ log(e, "error");
67
+ return res.sendStatus(404);
68
+ }
66
69
  });
67
70
  });
68
71