@opengis/fastify-table 2.2.0 → 2.2.2

package/dist/server/plugins/file/providers/fs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/providers/fs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAoGzB,MAAM,CAAC,OAAO,UAAU,SAAS;qBArFG,MAAM;uBAsB7B,MAAM,YAAW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;qBAwBpC,MAAM,QAAQ,GAAG;2BALX,GAAG,QAAO,GAAG;qBAgCI,MAAM;mBAjER,MAAM,gBAAgB,MAAM;4BAoEnB,GAAG;yBAGN,GAAG;wBAGJ,GAAG;EAezC"}
+{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/providers/fs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAuGzB,MAAM,CAAC,OAAO,UAAU,SAAS;qBAtFG,MAAM;uBAsB7B,MAAM,YAAW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;qBAyBpC,MAAM,QAAQ,GAAG;2BALX,GAAG,QAAO,GAAG;qBAgCI,MAAM;mBAlER,MAAM,gBAAgB,MAAM;4BAqEnB,GAAG;yBAGN,GAAG;wBAGJ,GAAG;EAezC"}

package/dist/server/plugins/file/providers/fs.js

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import fsp from "node:fs/promises";
 import path from "node:path";
 import isFileExists from "../utils/isFileExists.js";
+import logger from "../../logger/getLogger.js";
 import isBuffer from "./utils/typeguards/isBuffer.js";
 import isReadableStream from "./utils/typeguards/isReadableStream.js";
 import getValidData from "./utils/getValidData.js";
@@ -36,6 +37,7 @@ const downloadFile = () => async (fp, options = {}) => {
         return fsp.readFile(filepath);
     }
     const fileStream = fs.createReadStream(filepath);
+    logger.file("file/download", { provider: "fs", relpath: fp, filepath });
     return fileStream;
 };
 const fileExists = () => async (filepath, opt = {}) => isFileExists(getPath(filepath, opt));

package/dist/server/plugins/file/providers/s3/funcs/downloadFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"downloadFile.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/file/providers/s3/funcs/downloadFile.ts"],"names":[],"mappings":"AAgBA,QAAA,MAAM,aAAa,GAChB,aAAa,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAC1B,IAAI,MAAM,EAAE,UAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,iBA0CnD,CAAC;AAEJ,eAAe,aAAa,CAAC"}
+{"version":3,"file":"downloadFile.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/file/providers/s3/funcs/downloadFile.ts"],"names":[],"mappings":"AAiBA,QAAA,MAAM,aAAa,GAChB,aAAa,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAC1B,IAAI,MAAM,EAAE,UAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,iBAgDnD,CAAC;AAEJ,eAAe,aAAa,CAAC"}

package/dist/server/plugins/file/providers/s3/funcs/downloadFile.js

@@ -3,6 +3,7 @@ import { readFile } from "node:fs/promises";
 import { createReadStream } from "node:fs";
 import s3Client from "../client.js";
 import config from "../../../../../../config.js";
+import logger from "../../../../logger/getLogger.js";
 import streamToBuffer from "../../utils/streamToBuffer.js";
 // if not found on s3 => fs
 import fsFuncs from "../../fs.js";
@@ -17,6 +18,7 @@ const getFileStream = (s3Settings) => async (fp, options = {}) => {
     };
     try {
         const data = await s3Client.send(new GetObjectCommand(bucketParams));
+        logger.file("file/download", { provider: "s3", filepath });
         if (options.buffer) {
             return streamToBuffer(data.Body);
         }
@@ -36,6 +38,11 @@ const getFileStream = (s3Settings) => async (fp, options = {}) => {
         if (!exists) {
             return null;
         }
+        logger.file("file/download", {
+            provider: "fs/fallback",
+            relpath: fp,
+            filepath: filepath1,
+        });
         if (options.buffer) {
             return readFile(filepath1);
         }

package/dist/server/routes/cron/controllers/cronApi.js

@@ -13,6 +13,6 @@ export default async function cronApi(req, reply) {
             .status(404)
             .send({ error: `cron not found: ${params.name}`, code: 404 });
     }
-    const result = await cronList[params.name]?.(req);
+    const result = await cronList[params.name]?.(req, reply);
     return result;
 }

package/dist/server/routes/file/controllers/files.js

@@ -30,7 +30,7 @@ export default async function getFile({ params, user }, reply) {
     if (params["*"].includes("../")) {
         return reply.status(403).send({ error: "wrong params", code: 403 });
     }
-    const relpath = (params["*"].startsWith("/") ? params["*"].slice(1) : params["*"]).replace(/files\//g, "") + (params["*"].endsWith("/") ? "index.html" : "");
+    const relpath = (params["*"].startsWith("/") ? params["*"].slice(1) : params["*"]).replace(/^files\//g, "") + (params["*"].endsWith("/") ? "index.html" : "");
     if (!relpath) {
         return reply
             .status(400)

package/dist/server/routes/file/controllers/resize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resize.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAoC5C;;GAEG;AAEH,wBAA8B,MAAM,CAClC,EACE,KAAK,GACN,EAAE;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC;QACb,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;CACH,EACD,KAAK,EAAE,YAAY,kBAyIpB"}
+{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resize.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAwC5C;;GAEG;AAEH,wBAA8B,MAAM,CAClC,EACE,KAAK,GACN,EAAE;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC;QACb,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;CACH,EACD,KAAK,EAAE,YAAY,kBA8IpB"}

package/dist/server/routes/file/controllers/resize.js

@@ -1,12 +1,16 @@
 import path from "node:path";
+import { writeFile } from "node:fs/promises";
 import sharp from "sharp";
 import { imageSize } from "image-size";
-import { config, downloadFile, uploadFile, isFileExists, } from "../../../../utils.js";
+import { config, downloadFile, 
+// uploadFile,
+isFileExists, getFolder, } from "../../../../utils.js";
 import grpc from "../../../plugins/grpc/grpc.js";
 import getMimeType from "../../../plugins/file/providers/mime/index.js";
 const defaultWidth = 400;
 const defaultHeight = 240;
 const maxWidth = 2000;
+const rootDir = getFolder(config, "local");
 const getHeight = (width, size, ratio = 1) => {
     if (size && size.toLowerCase().split("x")[1])
         return size.toLowerCase().split("x")[1];
@@ -102,12 +106,14 @@ export default async function resize({ query, }, reply) {
         height: resizeHeight,
         quality: resizeQuality,
     });
-    await uploadFile(resizePath, Buffer.from(result, "base64"));
+    // await uploadFile(resizePath, Buffer.from(result, "base64"));
+    await writeFile(path.join(rootDir, resizePath), Buffer.from(result, "base64"));
     if (format === "webp") {
         const buffer = await sharp(Buffer.from(result, "base64"))
             .webp({ quality: resizeQuality })
             .toBuffer({ resolveWithObject: false });
-        await uploadFile(resizePath2, buffer);
+        await writeFile(path.join(rootDir, resizePath2), buffer);
+        // await uploadFile(resizePath2, buffer);
         return reply.headers({ "Content-Type": "image/webp" }).send(buffer);
     }
     return reply

package/dist/server/routes/file/controllers/resizeAll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resizeAll.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resizeAll.ts"],"names":[],"mappings":"AAkHA,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsH3D"}
+{"version":3,"file":"resizeAll.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resizeAll.ts"],"names":[],"mappings":"AAyHA,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsH3D"}

package/dist/server/routes/file/controllers/resizeAll.js

@@ -1,9 +1,12 @@
 /* eslint-disable no-console */
+import path from "node:path";
+import { writeFile } from "node:fs/promises";
 import { imageSize } from "image-size";
-import { pgClients, eventStream, logger, isFileExists, downloadFile, uploadFile, } from "../../../../utils.js";
+import { config, pgClients, eventStream, logger, isFileExists, downloadFile, uploadFile, getFolder, } from "../../../../utils.js";
 import grpc from "../../../plugins/grpc/grpc.js";
 import { images } from "../../../plugins/file/utils/allowedExtensions.js";
 const { resizeImage } = grpc();
+const rootDir = getFolder(config, "local");
 async function resizeOne({ relpath: relpath1, resizeQuality = 80, maxWidth = 2048, errors = [], success = [], notfound = [], equalwidth = [], send = () => { }, }) {
     const exists = await isFileExists(relpath1);
     const existsOriginal = await isFileExists(relpath1.replace("files/", "files/original/"));
@@ -55,7 +58,8 @@ async function resizeOne({ relpath: relpath1, resizeQuality = 80, maxWidth = 204
         height: resizeHeight,
         quality: resizeQuality,
     });
-    await uploadFile(relpath1, Buffer.from(result, "base64"));
+    // await uploadFile(relpath1, Buffer.from(result, "base64"));
+    await writeFile(path.join(rootDir, relpath1), Buffer.from(result, "base64"));
     send(`resize ${relpath1} success`);
     success.push(relpath1);
     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "type": "module",
   "description": "core-plugins",
   "keywords": [