@opengis/fastify-table 2.0.106 → 2.0.108

package/dist/server/routes/file/controllers/delete.d.ts

@@ -16,19 +16,5 @@
  * @returns {Object} headers Заголовки HTTP
  * @returns {String} message Повідомлення про успішне виконання або об'єкт з параметрами
  */
-export default function deleteFileAPI(req: any): Promise<{
-    message: string;
-    status: number;
-} | {
-    message: {
-        id: any;
-        filepath: any;
-    };
-    status: number;
-    error?: undefined;
-} | {
-    error: any;
-    status: number;
-    message?: undefined;
-}>;
+export default function deleteFileAPI(req: any, reply: any): Promise<any>;
 //# sourceMappingURL=delete.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/delete.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAA8B,aAAa,CAAC,GAAG,EAAE,GAAG;;;;;;;;;;;;;;GAyFnD"}
+{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/delete.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAA8B,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAoF/D"}

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

@@ -1,5 +1,4 @@
 import { config, dataUpdate, logger, pgClients } from "../../../../utils.js";
-const resp = { message: "File not found", status: 404 };
 /**
  * Апі використовується для видалення файлів за допомогою fs або s3
  *
@@ -18,15 +17,15 @@ const resp = { message: "File not found", status: 404 };
  * @returns {Object} headers Заголовки HTTP
  * @returns {String} message Повідомлення про успішне виконання або об'єкт з параметрами
  */
-export default async function deleteFileAPI(req) {
+export default async function deleteFileAPI(req, reply) {
     const { pg = pgClients.client, params = {}, user = {} } = req;
+    const { uid, user_rnokpp: rnokpp } = user;
     if (!params["*"]) {
-        return resp;
+        return reply.status(404).send({ error: "File not found", code: 404 });
     }
     const filename = params["*"].startsWith("/") || /^[0-9]+$/.test(params["*"])
         ? params["*"]
         : `/${params["*"]}`;
-    const { uid, user_rnokpp: rnokpp } = user;
     if (!filename) {
         logger.file("file", {
             level: "INFO",
@@ -36,7 +35,7 @@ export default async function deleteFileAPI(req) {
             uid,
             rnokpp,
         });
-        return resp;
+        return reply.status(404).send({ error: "File not found", code: 404 });
     }
     if (filename.includes("..")) {
         logger.file("file", {
@@ -47,7 +46,7 @@ export default async function deleteFileAPI(req) {
             uid,
             rnokpp,
         });
-        return resp;
+        return reply.status(404).send({ error: "File not found", code: 404 });
     }
     try {
         const result = await pg
@@ -64,36 +63,30 @@ export default async function deleteFileAPI(req) {
             logger.file("file", {
                 level: "INFO",
                 type: "delete",
-                message: resp.message,
+                message: "file not found",
                 file: params["*"],
                 uid,
                 rnokpp,
             });
-            return resp;
+            return reply.status(404).send({ error: "File not found", code: 404 });
         }
         const message = { id: res.file_id, filepath: res.file_path };
-        logger.file("file", {
-            level: "INFO",
-            type: "delete",
+        logger.file("file/delete", {
             message,
             file: params["*"],
             uid,
             rnokpp,
         });
-        return { message, status: 200 };
+        return message;
     }
     catch (err) {
-        logger.file("file", {
-            level: "ERROR",
-            type: "delete",
-            message: err.toString(),
+        logger.file("file/delete", {
+            error: err.toString(),
             file: params["*"],
             uid,
             rnokpp,
         });
-        return {
-            error: config?.local ? err.toString() : "Помилка видалення файлу",
-            status: 500,
-        };
+        const error = config.local ? err.toString() : "Помилка видалення файлу";
+        return reply.status(500).send({ error, code: 500 });
     }
 }

package/dist/server/routes/file/controllers/download.d.ts

@@ -1,3 +1,4 @@
+import type { FastifyReply } from "fastify";
 /**
  * Апі використовується для скачування файлів за допомогою fs або s3
  *
@@ -15,6 +16,5 @@
  * @returns {Object} headers Заголовки HTTP
  * @returns {String} pipe Шлях до файла для скачування або відображення
  */
-declare function download({ params }: any, reply: any): Promise<any>;
-export default download;
+export default function download({ params, user }: any, reply: FastifyReply): Promise<any>;
 //# sourceMappingURL=download.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/download.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;GAgBG;AAEH,iBAAe,QAAQ,CAAC,EACtB,MAAM,EACP,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAkCjB;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/download.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAgB5C;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAA8B,QAAQ,CACpC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EACrB,KAAK,EAAE,YAAY,gBAgDpB"}

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

@@ -1,6 +1,9 @@
-import path from 'node:path';
-import providers from '../../../plugins/file/providers/index.js';
-import getMimeType from '../../../plugins/file/providers/mime/index.js';
+import path from "node:path";
+import providers from "../../../plugins/file/providers/index.js";
+import getMimeType from "../../../plugins/file/providers/mime/index.js";
+import logger from "../../../plugins/logger/getLogger.js";
+import applyHook from "../../../plugins/hook/applyHook.js";
+const { downloadFile } = providers();
 /* const allowedPublicDirs = [
   'upload', 'page', 'site', 'maps', 'tmp', 'uploads', 'site_slider', 'module', 'product', 'image', 'geo_works_file',
 ]; */
@@ -21,36 +24,42 @@ import getMimeType from '../../../plugins/file/providers/mime/index.js';
  * @returns {Object} headers Заголовки HTTP
  * @returns {String} pipe Шлях до файла для скачування або відображення
  */
-async function download({ params }, reply) {
-    if (!params?.['*'])
-        return { message: 'not enough params', status: 400 };
-    const filename = params['*'].startsWith('/') ? params['*'].slice(1) : params['*'];
-    if (!filename)
-        return { message: "required param 'filename'", status: 400 };
-    if (filename?.includes?.('..'))
-        return { message: 'wrong params', status: 400 };
-    /* const { security } = getSettings();
-    const { enabled: externalAccess } = await pg.one('select enabled from admin.data_api where account_name = $1 and api_key = $2', { args: [account, key] });
-    if ((sid === 35 && !isUser && !externalAccess)
-      || (sid === 1
-        && !allowedPublicDirs.some((dir) => filename?.includes?.(`${dir}/`))
-        && !security?.public_dirs?.split(',')?.some((dir) => filename?.includes?.(`${dir}/`)))
-    ) {
-      return { error: 'Немає доступу', status: 403 };
-    } */
-    const filepath = filename.startsWith('files/')
+export default async function download({ params, user }, reply) {
+    if (!params?.["*"]) {
+        return reply.status(400).send({ error: "not enough params", code: 400 });
+    }
+    const filename = params["*"].startsWith("/")
+        ? params["*"].slice(1)
+        : params["*"];
+    if (!filename) {
+        return reply
+            .status(400)
+            .send({ error: "required param 'filename'", code: 400 });
+    }
+    if (filename.includes?.("../")) {
+        return reply.status(403).send({ error: "wrong params", code: 403 });
+    }
+    const filepath = filename.startsWith("files/")
         ? filename
-        : path.join('files', filename);
-    // download
-    const fp = providers({});
-    const fileStream = await fp.downloadFile(filepath);
-    if (!fileStream)
-        return { error: `Файл не знайдено - ${filename}`, status: 404 };
+        : path.join("files", filename);
+    const hookData = await applyHook("preDownload", {
+        user,
+        relpath: filepath,
+        reply,
+    });
+    if (hookData)
+        return hookData;
+    const fileStream = await downloadFile(filepath);
+    if (!fileStream) {
+        return reply
+            .status(404)
+            .send({ error: `Файл не знайдено - ${filename}`, code: 404 });
+    }
     const headers = {
-        'Content-Disposition': `attachment; filename=${path.basename(filename)}`,
-        'Content-Type': getMimeType(filepath),
+        "Content-Disposition": `attachment; filename=${path.basename(filename)}`,
+        "Content-Type": getMimeType(filepath),
     };
+    logger.file("file/download", { filepath: params["*"], uid: user?.uid });
     reply.headers(headers);
     return fileStream;
 }
-export default download;

package/dist/server/routes/file/controllers/files.d.ts

@@ -17,9 +17,10 @@ import type { FastifyReply } from "fastify";
  * @returns {Object} headers Заголовки HTTP
  * @returns {String} pipe Шлях до файла для скачування або відображення
  */
-export default function getFile({ params }: {
+export default function getFile({ params, user }: {
     params: {
         "*": string;
     };
+    user?: Record<string, any>;
 }, reply: FastifyReply): Promise<any>;
 //# sourceMappingURL=files.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAU5C;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAA8B,OAAO,CACnC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACvC,KAAK,EAAE,YAAY,gBAgDpB"}
+{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAW5C;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAA8B,OAAO,CACnC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAAE,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,EACzE,KAAK,EAAE,YAAY,gBAqDpB"}

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

@@ -2,7 +2,8 @@ import path from "node:path";
 import mime from "../../../plugins/file/providers/mime/index.js";
 import isFileExists from "../../../plugins/file/isFileExists.js";
 import downloadFile from "../../../plugins/file/downloadFile.js";
-import { applyHook } from "../../../../utils.js";
+import logger from "../../../plugins/logger/getLogger.js";
+import applyHook from "../../../plugins/hook/applyHook.js";
 /**
  * Апі використовується для отримання різних файлів і можливістю змінювати їх
  *
@@ -21,31 +22,33 @@ import { applyHook } from "../../../../utils.js";
  * @returns {Object} headers Заголовки HTTP
  * @returns {String} pipe Шлях до файла для скачування або відображення
  */
-export default async function getFile({ params }, reply) {
+export default async function getFile({ params, user }, reply) {
     if (!params?.["*"]) {
-        return { message: "not enough params", status: 400 };
+        return reply.status(400).send({ error: "not enough params", code: 400 });
     }
-    if (params["*"]?.includes("../")) {
-        return { message: "wrong params", status: 403 };
+    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" : "");
     if (!relpath) {
-        return { message: "No required param 'filename'", status: 400 };
+        return reply
+            .status(400)
+            .send({ error: "required param 'filename'", code: 400 });
     }
-    if (relpath.includes("..")) {
-        return { message: "wrong params", status: 400 };
+    if (relpath.includes("../")) {
+        return reply.status(403).send({ error: "wrong params", code: 403 });
     }
-    const hookData = await applyHook("preFile", { relpath, reply });
+    const hookData = await applyHook("preFile", { user, relpath, reply });
     if (hookData)
         return hookData;
     const filepath = path.join("files", relpath);
     const exists = await isFileExists(filepath);
     if (!exists) {
-        return { message: "file not found", status: 404 };
+        return reply.status(404).send({ error: "Файл не знайдено", code: 404 });
     }
     const fileStream = await downloadFile(filepath);
     if (!fileStream) {
-        return { message: "file not found", status: 404 };
+        return reply.status(404).send({ error: "Файл не знайдено", code: 404 });
     }
     const headers = {
         "Content-Disposition": `inline; filename=${path.basename(filepath)}`,
@@ -53,5 +56,6 @@ export default async function getFile({ params }, reply) {
         "Content-Type": `${mime(filepath)}`, // ; charset=utf-8 --- untested
     };
     reply.headers(headers);
+    logger.file("file/files", { filepath: params["*"], uid: user?.uid });
     return fileStream;
 }

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

@@ -2,7 +2,7 @@ import type { FastifyReply } from "fastify";
 /**
  * Апі використовується для зміни розміру фото за шляхом
  */
-export default function resize({ query, unittest, }: {
+export default function resize({ query, }: {
     query: {
         filepath: string;
         quality?: string | number;
@@ -12,6 +12,5 @@ export default function resize({ query, unittest, }: {
         nocache?: any;
         format?: string;
     };
-    unittest?: any;
 }, reply: FastifyReply): Promise<never>;
 //# sourceMappingURL=resize.d.ts.map

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;AA+B5C;;GAEG;AAEH,wBAA8B,MAAM,CAClC,EACE,KAAK,EACL,QAAQ,GACT,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;KACjB,CAAC;IACF,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,kBAsHpB"}
+{"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;AA+B5C;;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;KACjB,CAAC;CACH,EACD,KAAK,EAAE,YAAY,kBAmIpB"}

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

@@ -18,15 +18,19 @@ const { resizeImage } = grpc();
 /**
  * Апі використовується для зміни розміру фото за шляхом
  */
-export default async function resize({ query, unittest, }, reply) {
+export default async function resize({ query, }, reply) {
     const { filepath, quality, size, w, h, nocache, format } = query || {};
     if (!filepath) {
-        return reply.status(400).send("not enough query params: filepath");
+        return reply
+            .status(400)
+            .send({ error: "not enough query params: filepath", code: 400 });
     }
     const basename = path.basename(filepath);
     const mimeType = getMimeType(filepath);
     if (!mimeType) {
-        return reply.status(400).send("invalid query params: filepath");
+        return reply
+            .status(400)
+            .send({ error: "invalid query params: filepath", code: 400 });
     }
     const resizePath1 = size
         ? filepath.replace(basename, `${size}_resized_${basename}`)
@@ -43,7 +47,10 @@ export default async function resize({ query, unittest, }, reply) {
     const resizeData = fileExists
         ? await downloadFile(resizePath, { buffer: true })
         : null;
-    if (resizeData && !config.disableCache && !nocache && !unittest) {
+    if (resizeData &&
+        !config.disableCache &&
+        !nocache &&
+        process.env.NODE_ENV !== "test") {
         return reply
             .headers({
             "Content-Type": format === "webp" ? "image/webp" : mimeType,
@@ -54,7 +61,9 @@ export default async function resize({ query, unittest, }, reply) {
     // get File Data
     const fileData = await downloadFile(filepath, { buffer: true });
     if (!fileData?.length) {
-        return reply.status(404).send(`Файл не знайдено - ${filepath}`);
+        return reply
+            .status(404)
+            .send({ error: `Файл не знайдено - ${filepath}`, code: 400 });
     }
     const resizeQuality = Math.min(+(quality || 75), 100);
     const { width = defaultWidth, height = defaultHeight } = imageSize(fileData) || {};
@@ -63,7 +72,9 @@ export default async function resize({ query, unittest, }, reply) {
         .concat(w || "", h || "")
         .filter((el) => el && +el > maxWidth);
     if (check.length) {
-        return reply.status(400).send({ message: "resize image size too big" });
+        return reply
+            .status(400)
+            .send({ error: "resize image size too big", code: 400 });
     }
     const resizeWidth = (h && !w ? +h * ratio : null) ||
         (size?.toLowerCase?.()?.split?.("x")?.[1] &&

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

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/upload.ts"],"names":[],"mappings":"AAMA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,eA0D5C"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/upload.ts"],"names":[],"mappings":"AAMA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,eA4D5C"}

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

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { applyHook, pgClients, dataInsert } from "../../../../utils.js";
+import { logger, applyHook, pgClients, dataInsert } from "../../../../utils.js";
 import uploadMultiPart from "../../../plugins/file/uploadMultiPart.js";
 export default async function upload(req) {
     const { pg = pgClients.client } = req;
@@ -35,22 +35,23 @@ export default async function upload(req) {
             relativeDirpath: path.dirname(file.relativeFilepath || ""),
             fileName: file.newFilename,
         };
-    // req.log.info('upload', { filepath: file?.filepath, uid: session.passport?.user?.uid });
+    logger.file("file/upload", {
+        filepath: file.relativeFilepath,
+        objectId,
+        uid: req.user?.uid,
+    });
     return {
-        message: {
-            res: "ok",
-            name: file?.originalFilename,
-            result: {
-                file_id: resultInsert?.file_id,
-                format: resultInsert?.ext || file.extension,
-                size: resultInsert?.size || file?.size,
-                entity_id: resultInsert?.entity_id,
-                file_path: resultInsert?.file_path ||
-                    file?.relativeFilepath?.replace(/\\/g, "/"),
-                file_name: file?.originalFilename?.toLocaleLowerCase?.(),
-                dir: relativeDirpath?.replace?.(/\\/g, "/"),
-                native_file_name: fileName,
-            },
+        res: "ok",
+        name: file?.originalFilename,
+        result: {
+            file_id: resultInsert?.file_id,
+            format: resultInsert?.ext || file.extension,
+            size: resultInsert?.size || file?.size,
+            entity_id: resultInsert?.entity_id,
+            file_path: resultInsert?.file_path || file?.relativeFilepath?.replace(/\\/g, "/"),
+            file_name: file?.originalFilename?.toLocaleLowerCase?.(),
+            dir: relativeDirpath?.replace?.(/\\/g, "/"),
+            native_file_name: fileName,
         },
     };
 }

package/dist/server/routes/file/controllers/uploadImage.d.ts

@@ -1,17 +1,15 @@
 export default function uploadImage(req: any): Promise<{
-    message: {
-        res: string;
-        name: string | undefined;
-        result: {
-            file_id: any;
-            format: any;
-            size: any;
-            entity_id: any;
-            file_path: any;
-            file_name: string | undefined;
-            dir: string | undefined;
-            native_file_name: string | undefined;
-        };
+    res: string;
+    name: string | undefined;
+    result: {
+        file_id: any;
+        format: any;
+        size: any;
+        entity_id: any;
+        file_path: any;
+        file_name: string | undefined;
+        dir: string | undefined;
+        native_file_name: string | undefined;
     };
 }>;
 //# sourceMappingURL=uploadImage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"uploadImage.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/uploadImage.ts"],"names":[],"mappings":"AAMA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG;;;;;;;;;;;;;;;GA8CjD"}
+{"version":3,"file":"uploadImage.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/uploadImage.ts"],"names":[],"mappings":"AAMA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG;;;;;;;;;;;;;GA4CjD"}

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

@@ -2,8 +2,8 @@ import path from "node:path";
 import { dataInsert, pgClients } from "../../../../utils.js";
 import uploadMultiPart from "../../../plugins/file/uploadMultiPart.js";
 export default async function uploadImage(req) {
-    const { pg = pgClients.client } = req;
-    const { uid = 1 } = req?.user || {};
+    const { pg = pgClients.client, user } = req;
+    const { uid = 1 } = user || {};
     const file = await uploadMultiPart(req);
     const objectId = req.params["*"]; // ID from token?
     const extName = path
@@ -27,19 +27,17 @@ export default async function uploadImage(req) {
         ? path.parse(resultInsert.file_path)
         : {};
     return {
-        message: {
-            res: "ok",
-            name: file?.originalFilename,
-            result: {
-                file_id: resultInsert.file_id,
-                format: resultInsert.ext || extName,
-                size: resultInsert.size || file?.size,
-                entity_id: resultInsert.entity_id,
-                file_path: resultInsert.file_path || file?.relativeFilepath?.replace(/\\/g, "/"),
-                file_name: file?.originalFilename?.toLocaleLowerCase?.(),
-                dir: relativeDirpath?.replace(/\\/g, "/"),
-                native_file_name: fileName,
-            },
+        res: "ok",
+        name: file?.originalFilename,
+        result: {
+            file_id: resultInsert.file_id,
+            format: resultInsert.ext || extName,
+            size: resultInsert.size || file?.size,
+            entity_id: resultInsert.entity_id,
+            file_path: resultInsert.file_path || file?.relativeFilepath?.replace(/\\/g, "/"),
+            file_name: file?.originalFilename?.toLocaleLowerCase?.(),
+            dir: relativeDirpath?.replace(/\\/g, "/"),
+            native_file_name: fileName,
         },
     };
 }

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

@@ -30,7 +30,7 @@ export default async function loggerFile(req, reply) {
     }
     if (query.full && isFile) {
         if (stat.size > 20 * 1000 * 1000) {
-            return { message: "file size > 20MB" };
+            return reply.status(400).send({ error: "file size > 20MB", code: 400 });
         }
         const buffer = await readFile(filepath);
         return buffer;

package/dist/server/routes/menu/controllers/interfaces.d.ts

@@ -1,11 +1,5 @@
 import type { ExtendedPG } from "../../../types/core.js";
 export default function getInterfaces({ pg, }: {
     pg: ExtendedPG;
-}): Promise<{
-    title: any;
-    alias: any;
-    table: any;
-    route: any;
-    enabled: any;
-}[]>;
+}): Promise<any>;
 //# sourceMappingURL=interfaces.d.ts.map

package/dist/server/routes/menu/controllers/interfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../../server/routes/menu/controllers/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIzD,wBAA8B,aAAa,CAAC,EAC1C,EAAqB,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;CAChB;;;;;;KA6BA"}
+{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../../server/routes/menu/controllers/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIzD,wBAA8B,aAAa,CAAC,EAC1C,EAAqB,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;CAChB,gBA6BA"}

package/dist/server/routes/table/controllers/card.d.ts

@@ -1,2 +1,2 @@
-export default function card(req: any): Promise<{}>;
+export default function card(req: any, reply: any): Promise<any>;
 //# sourceMappingURL=card.d.ts.map

package/dist/server/routes/table/controllers/card.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"card.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/card.ts"],"names":[],"mappings":"AAQA,wBAA8B,IAAI,CAAC,GAAG,EAAE,GAAG,eAuH1C"}
+{"version":3,"file":"card.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/card.ts"],"names":[],"mappings":"AASA,wBAA8B,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAgItD"}

package/dist/server/routes/table/controllers/card.js

@@ -1,14 +1,17 @@
-import { getTemplate, getMeta, metaFormat, getAccess, applyHook, } from "../../../../utils.js";
-export default async function card(req) {
+import { getTemplate, getMeta, metaFormat, getAccess, applyHook, pgClients, } from "../../../../utils.js";
+export default async function card(req, reply) {
     const time = Date.now();
-    const { pg, user, params = {}, query = {} } = req;
+    const { pg = pgClients.client, user, params = {}, query = {} } = req;
     const hookData = (await applyHook("preCard", {
         table: params?.table,
         id: params?.id,
         user,
     }));
     if (hookData?.message && hookData?.status) {
-        return { message: hookData?.message, status: hookData?.status };
+        const response = hookData.status >= 400
+            ? { error: hookData.message, code: hookData.status }
+            : hookData.message;
+        return reply.status(hookData.status).send(response);
     }
     const { actions = [], scope, my, } = (await getAccess({
         table: hookData?.table || params.table,
@@ -16,16 +19,17 @@ export default async function card(req) {
         user,
     })) || {};
     if (!actions.includes("view") || (scope === "my" && !my)) {
-        return { message: "access restricted", status: 403 };
+        return reply.status(403).send({ error: "access restricted", code: 403 });
     }
     const loadTable = await getTemplate("table", hookData?.table || params.table);
     if (!loadTable) {
-        return { message: "template not found", status: 404 };
+        return reply.status(404).send({ error: "table not found", code: 404 });
     }
     const { table, columns, meta, sql, cardSql } = loadTable;
     const { pk, columns: dbColumns = [] } = await getMeta(table);
-    if (!pk)
-        return { message: `table not found: ${table}`, status: 404 };
+    if (!pk) {
+        return reply.status(404).send({ error: "table pk not found", code: 404 });
+    }
     const cols = columns.map((el) => el.name || el).join(",");
     const sqlTable = sql
         ?.filter?.((el) => !el?.disabled && el?.sql?.replace)
@@ -50,7 +54,9 @@ export default async function card(req) {
     if (query.sql === "1") {
         return q;
     }
-    const { rows } = await pg.query(q, [hookData?.id || params.id]);
+    const rows = await pg
+        .query(q, [hookData?.id || params.id])
+        .then((el) => el.rows || []);
     await metaFormat({ rows, table: hookData?.table || params.table });
     const data = meta?.card?.length
         ? meta.card

package/dist/server/routes/table/controllers/filter.d.ts

@@ -5,7 +5,7 @@ interface IFilter {
     inline?: any[] | undefined;
     state?: any[] | undefined;
 }
-export default function filterAPI(req: any, reply: any, iscalled: any): Promise<IFilter | {
+export default function filterAPI(req: any, reply: any, iscalled: number | boolean | undefined | null): Promise<IFilter | {
     message: string;
     status: number;
 } | string | any>;

package/dist/server/routes/table/controllers/filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/filter.ts"],"names":[],"mappings":"AAWA,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;CAC3B;AAED,wBAA8B,SAAS,CACrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,GAAG,GACZ,OAAO,CAAC,OAAO,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,GAAG,CAAC,CA6RvE"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/filter.ts"],"names":[],"mappings":"AAaA,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;CAC3B;AAED,wBAA8B,SAAS,CACrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,GAC5C,OAAO,CAAC,OAAO,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,GAAG,CAAC,CAoSvE"}