@opengis/fastify-table 2.2.3 → 2.2.5

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/plugins/file/uploadMultiPart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadMultiPart.d.ts","sourceRoot":"","sources":["../../../../server/plugins/file/uploadMultiPart.ts"],"names":[],"mappings":"AAqBA,MAAM,WAAW,KAAK;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AA2CD,wBAAsB,eAAe,CACnC,GAAG,EAAE,GAAG,EACR,EACE,UAAU,EACV,GAAG,EACH,MAAM,EACN,gBAAwB,GACzB,GAAE;IACD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CACvB,GACL,OAAO,CAAC,KAAK,CAAC,CAmGhB;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"uploadMultiPart.d.ts","sourceRoot":"","sources":["../../../../server/plugins/file/uploadMultiPart.ts"],"names":[],"mappings":"AAqBA,MAAM,WAAW,KAAK;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AA+DD,wBAAsB,eAAe,CACnC,GAAG,EAAE,GAAG,EACR,EACE,UAAU,EACV,GAAG,EACH,MAAM,EACN,gBAAwB,GACzB,GAAE;IACD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CACvB,GACL,OAAO,CAAC,KAAK,CAAC,CAoGhB;AAED,eAAe,eAAe,CAAC"}

package/dist/server/plugins/file/uploadMultiPart.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 import path from "node:path";
-import { mkdir, writeFile } from "node:fs/promises";
+import { mkdir, writeFile, readdir } from "node:fs/promises";
 import { randomUUID } from "node:crypto";
 import { imageSize } from "image-size";
 import { existsSync } from "node:fs";
@@ -36,6 +36,20 @@ async function writeFileToDisk(file, buffer) {
     await writeFile(file.filepath, buffer);
     return null;
 }
+async function rotate(filename, dirpath) {
+    const { name, ext } = path.parse(filename);
+    // ? read whole dir once, rotate later - better works for large dirs, worse - for small ones
+    // ? in practice, latency is more consistent than w/ multiple existsSync calls
+    const files = new Set(await readdir(dirpath));
+    if (!files.has(filename)) {
+        return filename;
+    }
+    let idx = 1;
+    while (files.has(`${name}_${idx}${ext}`)) {
+        idx++;
+    }
+    return `${name}_${idx}${ext}`;
+}
 export async function uploadMultiPart(req, { extensions, raw, subdir, originalFilename = false, } = {}) {
     const allowedExtensions = req.routeOptions?.url === "/file/upload-image/*" ? images : all;
     const parts = req.parts();
@@ -73,6 +87,7 @@ export async function uploadMultiPart(req, { extensions, raw, subdir, originalFi
             buffer: fileBuffer,
             filename: value.filename,
             extension: ext.substring(1),
+            mimetype: value.mimetype,
             fields: value.fields,
         };
     }
@@ -83,7 +98,7 @@ export async function uploadMultiPart(req, { extensions, raw, subdir, originalFi
     const reldirpath = path.join("/files", dir, yearMonthDay);
     const folder = path.join(rootDir, config.folder || "", reldirpath);
     const newFilename = originalFilename
-        ? value.filename
+        ? await rotate(value.filename, folder)
         : `${randomUUID()}${ext}`;
     if (existsSync(path.join(folder, newFilename).replace(/\\/g, "/"))) {
         throw new BadRequestError("file with specified name already exists in directory");

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/package.json

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