@opengis/fastify-table 2.2.2 → 2.2.4

package/dist/server/plugins/file/isFileExists.d.ts

@@ -1,3 +1,3 @@
-declare function isFileExists(filePath: string, options?: Record<string, string>): Promise<any>;
+declare function isFileExists(filePath: string, options?: Record<string, any>): Promise<any>;
 export default isFileExists;
 //# sourceMappingURL=isFileExists.d.ts.map

package/dist/server/plugins/file/isFileExists.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isFileExists.d.ts","sourceRoot":"","sources":["../../../../server/plugins/file/isFileExists.ts"],"names":[],"mappings":"AAGA,iBAAe,YAAY,CACzB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,gBAcrC;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"isFileExists.d.ts","sourceRoot":"","sources":["../../../../server/plugins/file/isFileExists.ts"],"names":[],"mappings":"AAGA,iBAAe,YAAY,CACzB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,gBAclC;AAED,eAAe,YAAY,CAAC"}

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

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 export default function fsStorage(): {
+    name: string;
     deleteFile: (fp: string) => Promise<void>;
     downloadFile: (fp: string, options?: Record<string, any>) => Promise<NonSharedBuffer | fs.ReadStream | {
         original: string;

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;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"}
+{"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;EAgBzC"}

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

@@ -75,6 +75,7 @@ const getMDate = () => async (filepath) => new Date((await fsp.stat(getPath(file
 const readdir = () => async (filepath) => fsp.readdir(getPath(filepath) || "");
 export default function fsStorage() {
     return {
+        name: "fs",
         deleteFile: deleteFile(),
         downloadFile: downloadFile(),
         uploadFile: uploadFile(),

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

@@ -17,10 +17,13 @@ import type { FastifyReply } from "fastify";
  * @returns {Object} headers Заголовки HTTP
  * @returns {String} pipe Шлях до файла для скачування або відображення
  */
-export default function getFile({ params, user }: {
+export default function getFile({ params, query, user, }: {
     params: {
         "*": string;
     };
+    query: {
+        debug: 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;AAgB5C;;;;;;;;;;;;;;;;;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,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;AAkB5C;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAA8B,OAAO,CACnC,EACE,MAAM,EACN,KAAK,EACL,IAAI,GACL,EAAE;IACD,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACxB,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,EACD,KAAK,EAAE,YAAY,gBA+DpB"}

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

@@ -2,8 +2,10 @@ 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 config from "../../../../config.js";
 import logger from "../../../plugins/logger/getLogger.js";
 import applyHook from "../../../plugins/hook/applyHook.js";
+import providers from "../../../plugins/file/providers/index.js";
 const grayGif = Buffer.from("R0lGODdhAwADAIEAAICAgAAAAAAAAAAAACwAAAAAAwADAAAIBwABCBw4MCAAOw==", "base64");
 /**
  * Апі використовується для отримання різних файлів і можливістю змінювати їх
@@ -23,7 +25,7 @@ const grayGif = Buffer.from("R0lGODdhAwADAIEAAICAgAAAAAAAAAAAACwAAAAAAwADAAAIBwA
  * @returns {Object} headers Заголовки HTTP
  * @returns {String} pipe Шлях до файла для скачування або відображення
  */
-export default async function getFile({ params, user }, reply) {
+export default async function getFile({ params, query, user, }, reply) {
     if (!params?.["*"]) {
         return reply.status(400).send({ error: "not enough params", code: 400 });
     }
@@ -43,6 +45,18 @@ export default async function getFile({ params, user }, reply) {
     if (hookData)
         return hookData;
     const filepath = path.join("files", relpath);
+    if ((config.local || user?.user_type?.includes?.("admin")) && query.debug) {
+        const fp = providers();
+        const existsS3 = fp.name === "s3"
+            ? await fp
+                .fileExists(filepath, { fallback: false })
+                .catch(() => false)
+                .then((el) => !!el)
+            : undefined;
+        const { fileExists } = providers({ provider: "fs" });
+        const existsFS = await fileExists(filepath);
+        return reply.status(200).send({ provider: fp.name, existsS3, existsFS });
+    }
     const fileStream = await downloadFile(filepath).catch();
     if (!fileStream) {
         // return reply.status(404).send({ error: "Файл не знайдено", code: 404 });

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;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"}
+{"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;AAyC5C;;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,kBAoJpB"}

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

@@ -7,6 +7,7 @@ import { config, downloadFile,
 isFileExists, getFolder, } from "../../../../utils.js";
 import grpc from "../../../plugins/grpc/grpc.js";
 import getMimeType from "../../../plugins/file/providers/mime/index.js";
+import { mkdir } from "node:fs/promises";
 const defaultWidth = 400;
 const defaultHeight = 240;
 const maxWidth = 2000;
@@ -107,13 +108,19 @@ export default async function resize({ query, }, reply) {
         quality: resizeQuality,
     });
     // await uploadFile(resizePath, Buffer.from(result, "base64"));
+    await mkdir(path.dirname(path.join(rootDir, resizePath)), {
+        recursive: true,
+    });
     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 writeFile(path.join(rootDir, resizePath2), buffer);
         // await uploadFile(resizePath2, buffer);
+        await mkdir(path.dirname(path.join(rootDir, resizePath2)), {
+            recursive: true,
+        });
+        await writeFile(path.join(rootDir, 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":"AAyHA,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":"AA0HA,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsH3D"}

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

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 import path from "node:path";
-import { writeFile } from "node:fs/promises";
+import { writeFile, mkdir } from "node:fs/promises";
 import { imageSize } from "image-size";
 import { config, pgClients, eventStream, logger, isFileExists, downloadFile, uploadFile, getFolder, } from "../../../../utils.js";
 import grpc from "../../../plugins/grpc/grpc.js";
@@ -59,6 +59,7 @@ async function resizeOne({ relpath: relpath1, resizeQuality = 80, maxWidth = 204
         quality: resizeQuality,
     });
     // await uploadFile(relpath1, Buffer.from(result, "base64"));
+    await mkdir(path.dirname(path.join(rootDir, relpath1)), { recursive: true });
     await writeFile(path.join(rootDir, relpath1), Buffer.from(result, "base64"));
     send(`resize ${relpath1} success`);
     success.push(relpath1);

package/dist/server/routes/table/functions/getData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAkFzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBAo3Bb"}
+{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAkFzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBA23Bb"}

package/dist/server/routes/table/functions/getData.js

@@ -391,6 +391,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                             id: row.id,
                             table: templateName,
                             form: loadTable?.form,
+                            resource,
                             obj: tokenData?.obj || hookData?.obj,
                         }),
                     ],
@@ -502,7 +503,12 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                 });
                 const token = item.form && item.table
                     ? setToken({
-                        ids: [JSON.stringify(item)],
+                        ids: [
+                            JSON.stringify({
+                                ...item,
+                                resource,
+                            }),
+                        ],
                         uid,
                         array: 1,
                     })[0]
@@ -654,6 +660,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         const addTokens = setToken({
             ids: [
                 JSON.stringify({
+                    resource,
                     table: templateName,
                     form: loadTable?.form,
                     obj: tokenData?.obj || hookData?.obj,

package/package.json

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