@opengis/fastify-table 2.0.14 → 2.0.16

package/dist/index.js

@@ -311,6 +311,12 @@ function plugin(fastify) {
             keyGenerator: (req) => `${req.ip}-${req.raw.url.split("?")[0]}`,
         });
     }
+    // add multipart parser before any route registration
+    fastify.register(import("@fastify/multipart"), {
+        limits: {
+            fileSize: maxFileSize * 1024 * 1024,
+        },
+    });
     if (config.dblist) {
         fastify.register(dblistRoutes, opt);
     }
@@ -327,11 +333,6 @@ function plugin(fastify) {
     fastify.register(templatesRoutes, opt);
     fastify.register(authRoutes); // from fastify-auth
     // from fastify-file
-    fastify.register(import("@fastify/multipart"), {
-        limits: {
-            fileSize: maxFileSize * 1024 * 1024,
-        },
-    }); // content parser, await before adding upload routes
     fastify.register(fileRoutes);
     fastify.register(grpcRoutes, opt);
     config.proxy?.forEach?.((el) => {

package/dist/server/plugins/pg/funcs/init.js

@@ -68,27 +68,32 @@ async function init(client) {
     WHERE
       relkind IN ('r', 'v')`);
     const relkinds = rows.reduce((acc, curr) => Object.assign(acc, { [curr.tname]: curr.relkind }), {});
-    async function query(q, args = [], isstream = false) {
+    async function query(q, args = [], isstream = false, timeout = 100000000) {
+        let timeoutWasSet;
         try {
             if (isstream) {
-                await client.query("set statement_timeout to 100000000");
+                await client.query(`set statement_timeout to ${timeout}`);
+                timeoutWasSet = true;
             }
             const data = await client.query(q, args);
-            await client.query("set statement_timeout to 0");
             return data;
         }
         catch (err) {
-            await client.query("set statement_timeout to 0");
             if (err.message === "canceling statement due to statement timeout") {
                 logger.file("timeout/query", { q, stack: err.stack });
                 return { rows: [], timeout: true };
             }
             throw new Error(err);
         }
+        finally {
+            if (timeoutWasSet) {
+                await client.query("RESET statement_timeout");
+            }
+        }
     }
     async function querySafe(q, param) {
         const args = Array.isArray(param) ? param : param?.args || [];
-        const data = await query(q, args, true);
+        const data = await query(q, args, true, param?.timeout);
         return data;
     }
     async function one(q, param) {

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

@@ -28,10 +28,10 @@ export default async function getForm({ pg = pgClients.client, params, user = {}
         (await getTemplate("table", table).then((el) => el?.form)) ||
         {};
     if (!form) {
-        return reply.status(404).send("form not found");
+        // return reply.status(404).send("form not found");
     }
     const { actions = [] } = (await getAccess({ table, form, user }, pg)) || {};
-    const loadTemplate = form ? await getTemplate("form", form) : null;
+    const loadTemplate = await getTemplate("form", form || params.name);
     if (!loadTemplate) {
         return reply.status(404).send("form template not found");
     }
@@ -56,7 +56,8 @@ export default async function getForm({ pg = pgClients.client, params, user = {}
         if (!isAllowedByTemplate &&
             !config.local &&
             process.env.NODE_ENV !== "test" &&
-            !(tokenData?.form || hookData?.form)) {
+            !(tokenData?.form || hookData?.form) &&
+            form) {
             return reply.status(403).send("access restricted: actions");
         }
         const token = setToken({

package/dist/server/routes/templates/controllers/getTemplate.js

@@ -61,5 +61,8 @@ export default async function getTemplateApi(req) {
         data,
         user,
     });
+    if (type === "form" && data && !data?.schema) {
+        return { schema: data };
+    }
     return data?.html || data || `template not found "${tokenData.form || name}"`;
 }

package/package.json

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