@opengis/fastify-table 2.5.14 → 2.5.16

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AA8FA,iBAAe,MAAM,CAAC,OAAO,EAAE,GAAG,iBAkOjC;;AACD,wBAEG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AA8FA,iBAAe,MAAM,CAAC,OAAO,EAAE,GAAG,iBA2OjC;;AACD,wBAEG"}

package/dist/index.js

@@ -164,13 +164,21 @@ async function plugin(fastify) {
     if (config.dblist) {
         fastify.register(dblistRoutes, opt);
     }
-    fastify.addHook('preHandler', async (request, reply) => {
+    fastify.addHook("preValidation", async (request) => {
+        Object.keys(request.query || {})
+            .filter((key) => request.query[key] === "")
+            .forEach((key) => delete request.query[key]);
+        Object.keys(request.body || {})
+            .filter((key) => request.body[key] === "")
+            .forEach((key) => delete request.body[key]);
+    });
+    fastify.addHook("preHandler", async (request, reply) => {
         const q = request.query;
         if (q?.limit !== undefined) {
             const limit = Number(q.limit);
             if (!Number.isInteger(limit) || limit < 1 || limit > 1000) {
                 reply.code(400).send({
-                    error: 'Invalid limit (1-100)'
+                    error: "Invalid limit (1-100)",
                 });
             }
         }
@@ -178,7 +186,7 @@ async function plugin(fastify) {
             const offset = Number(q.offset);
             if (!Number.isInteger(offset) || offset < 0) {
                 reply.code(400).send({
-                    error: 'Invalid offset (>=0)'
+                    error: "Invalid offset (>=0)",
                 });
             }
         }
@@ -186,7 +194,7 @@ async function plugin(fastify) {
             const page = Number(q.page);
             if (!Number.isInteger(page) || page > 100000) {
                 reply.code(400).send({
-                    error: 'Invalid page (<=100000)'
+                    error: "Invalid page (<=100000)",
                 });
             }
         }

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":"AA6BA,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,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,mBAkBvE;AAED,wBAAsB,gBAAgB,CACpC,EACE,IAAI,EAAE,QAAQ,EACd,MAA2C,EAC3C,MAAM,GACP,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACpD,MAAM,MAAW,mBA+BlB;AAED,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,CAiHhB;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"uploadMultiPart.d.ts","sourceRoot":"","sources":["../../../../server/plugins/file/uploadMultiPart.ts"],"names":[],"mappings":"AA6BA,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,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,mBAkBvE;AAED,wBAAsB,gBAAgB,CACpC,EACE,IAAI,EAAE,QAAQ,EACd,MAA2C,EAC3C,MAAM,GACP,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACpD,MAAM,MAAW,mBA+BlB;AAED,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,CAmHhB;AAED,eAAe,eAAe,CAAC"}

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

@@ -105,9 +105,7 @@ export async function uploadMultiPart(req, { extensions, raw, subdir, originalFi
         throw new BadRequestError("file buffer is empty");
     }
     const { ext: fileExtension } = (await fileTypeFromBuffer(fileBuffer)) || {};
-    if (fileExtension !== ext.substring(1)) {
-        throw new ConflictError("file type spoofing attempt detected");
-    }
+    const nameExt = ext.substring(1);
     // return buffer for custom upload
     if (raw) {
         return {
@@ -118,6 +116,9 @@ export async function uploadMultiPart(req, { extensions, raw, subdir, originalFi
             fields: value.fields,
         };
     }
+    if (fileExtension !== nameExt) {
+        throw new ConflictError("file type spoofing attempt detected");
+    }
     const dir = subdir != null ? subdir : req.params?.["*"] || "uploads";
     const yearMonthDay = subdir != null ? "" : new Date().toISOString().split("T")[0];
     const dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params

package/dist/server/plugins/file/utils/allowedExtensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"allowedExtensions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/utils/allowedExtensions.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,GAAG,EAAE,MAAM,EAwBhB,CAAC;AAEF,QAAA,MAAM,MAAM,EAAE,MAAM,EAInB,CAAC;AAEF,QAAA,MAAM,MAAM,EAAE,MAAM,EAEnB,CAAC;AAEF,QAAA,MAAM,SAAS,EAAE,MAAM,EActB,CAAC;AAEF,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;;;;;;;AAE1C,wBAKE"}
+{"version":3,"file":"allowedExtensions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/utils/allowedExtensions.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,GAAG,EAAE,MAAM,EAyBhB,CAAC;AAEF,QAAA,MAAM,MAAM,EAAE,MAAM,EAInB,CAAC;AAEF,QAAA,MAAM,MAAM,EAAE,MAAM,EAEnB,CAAC;AAEF,QAAA,MAAM,SAAS,EAAE,MAAM,EAetB,CAAC;AAEF,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;;;;;;;AAE1C,wBAKE"}

package/dist/server/plugins/file/utils/allowedExtensions.js

@@ -25,6 +25,7 @@ const all = envExtensions || [
     "mp4",
     "mov",
     "xml",
+    "p7s"
 ];
 const images = all.filter((ext) => ["jpg", "jpeg", "png", "tiff", "tif", "ico", "svg", "heic", "webp"].includes(ext));
 const videos = all.filter((ext) => ["mp4", "mov", "avi"].includes(ext));
@@ -40,6 +41,7 @@ const documents = all.filter((ext) => [
     "xml",
     "ppt",
     "pptx",
+    "p7s"
 ].includes(ext));
 export { all, images, videos, documents };
 export default {

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

@@ -1 +1 @@
-{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAwBpD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,GAAG,EACH,EAAqB,GACtB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB;;;;;UAwFA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBAuX7C"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAwBpD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,GAAG,EACH,EAAqB,GACtB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB;;;;;UAwFA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBAuY7C"}

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

@@ -141,9 +141,6 @@ export default async function suggest(req) {
         (metaColumns || []).find((col) => col?.name === column) ||
         {};
     const { dataTypeID } = (metaColumns || []).find((col) => col?.name === column) || {};
-    // const filters =
-    //   hookBody?.filters ||
-    //   (body ? await getFilter({ pg, table }).then((el) => el.list) : null);
     if (table && (!column || !columnName)) {
         throw BadRequestError("param name is invalid: 2");
     }
@@ -239,32 +236,57 @@ export default async function suggest(req) {
             data,
         };
     }
+    const args = [];
+    const where = [];
     // select, with search by text support
-    const search = query.key && typeof query.key === "string" ? searchQuery : null;
+    if (query.key && typeof query.key === "string") {
+        args.push(query.key.toLowerCase());
+        where.push(searchQuery);
+    }
+    // pk
+    if (meta.pk) {
+        where.push(`${meta.pk} is not null`);
+    }
     // filter by value
-    const val = query.val
-        ? `${meta.pk}=any('{${query.val.replace(/'/g, "''")}}')`
-        : "";
-    const filter = tableName && pg.pk?.[tableName] && columnName && dataTypeID
-        ? `id in (select ${pg.pgType[dataTypeID]?.includes("[]")
+    if (meta.pk && typeof query.val === "string") {
+        args.push(query.val.split(","));
+        where.push(`${meta.pk}=any($${args.length})`);
+    }
+    // filter
+    if (tableName && pg.pk?.[tableName] && columnName && dataTypeID) {
+        where.push(`id in (select ${pg.pgType[dataTypeID]?.includes("[]")
             ? `unnest(${columnName})`
-            : columnName} from ${tableName.replace(/'/g, "''")})`
-        : "true";
-    const where = [search, val, filter, meta.pk ? `${meta.pk} is not null` : null]
-        .filter(Boolean)
-        .join(" and ") || "true";
-    const sqlSuggest = tableName && column
+            : columnName} from ${tableName.replace(/'/g, "''")})`);
+    }
+    // order by value if not specified explicitly
+    const order = meta.original.toLowerCase().includes("order by")
+        ? ""
+        : "order by 2";
+    const whereQuery = where.filter(Boolean).join(" and ") || "true";
+    args.push(Math.min(query.limit || meta.limit || limit, limit));
+    let sqlSuggest = tableName && column
         ? `${meta.original}
-          WHERE EXISTS ( SELECT 1 FROM ${tableName} o WHERE o.${column} IS NOT DISTINCT FROM c.id ) and ${val || "true"} and ${search || "true"}
-          ${meta.original.toLowerCase().includes("order by") ? "" : "order by 2"}
-          LIMIT ${Math.min(query.limit || meta.limit || limit, limit)}`
-            .replace(/{{parent}}/gi, parent)
-            .replace(/{{uid}}/g, user?.uid || "0")
-        : `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} ${meta.original.toLowerCase().includes("order by") ? "" : "order by 2"}) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || "0");
+          WHERE EXISTS ( SELECT 1 FROM ${tableName} o 
+            WHERE o.${column} IS NOT DISTINCT FROM c.id ) and ${whereQuery || "true"}
+          ${order} LIMIT $${args.length}::int`
+        : `with c(id,text) as ( ${meta.original} where ${whereQuery} ${order}) select * from c LIMIT $${args.length}::int`;
+    if (sqlSuggest.includes("{{parent}}")) {
+        args.push(parent || "");
+        sqlSuggest = sqlSuggest.replace(/(['"]?){{parent}}\1/gi, `$${args.length}`);
+    }
+    if (sqlSuggest.includes("{{uid}}")) {
+        args.push(user?.uid || "0");
+        sqlSuggest = sqlSuggest.replace(/(['"]?){{uid}}\1/gi, `$${args.length}`);
+    }
     if (query.sql && debugMode) {
         return sqlSuggest;
     }
-    const { rows: dataNew } = await pg.query(sqlSuggest, query.key && typeof query.key === "string" ? [query.key.toLowerCase()] : []);
+    if (config.trace) {
+        console.log("suggest", sqlSuggest, where, args);
+    }
+    const dataNew = await pg
+        .query(sqlSuggest, args)
+        .then((r) => r.rows || []);
     // in case id / text = Boolean
     const data = dataNew.filter((el) => Object.hasOwn(el, "id") && Object.hasOwn(el, "text"));
     data

package/package.json

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