@opengis/fastify-table 2.3.6 → 2.4.0

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

@@ -1,8 +1,9 @@
+import { ForbiddenError } from "../../../../errors.js";
 import { getOpt, getToken } from "../../../../utils.js";
 export default async function tokenInfo(req, reply) {
     const { params = {}, user } = req;
     if (user.user_type !== "admin") {
-        return reply.status(403).send("access restricted");
+        throw ForbiddenError("access restricted");
     }
     const tokenData = (await getToken({ uid: user.uid, token: params.token })) ||
         (await getOpt(params.token, user.uid));

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,gBA23Bb"}
+{"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;AAwFzD,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,gBAq3Bb"}

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

@@ -19,6 +19,7 @@ import extraDataGet from "../../../plugins/extra/extraDataGet.js";
 import locales from "../controllers/utils/locales.js";
 import conditions from "../controllers/utils/conditions.js";
 import { resources } from "../../../plugins/access/funcs/getResources.js";
+import { BadRequestError, ForbiddenError, NotFoundError, UnauthorizedError, } from "../../../../errors.js";
 const components = {
     "vs-widget-file": "select 'vs-widget-file' as component, count(*) from crm.files where entity_id=$1 and file_status<>3",
     "vs-widget-comments": "select 'vs-widget-comments' as component, count(*) from crm.communications where entity_id=$1",
@@ -62,9 +63,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     const checkQuery = (item) => user?.user_type === "superadmin" ? !item.includes("{{uid}}") : true;
     const paramsTable = params?.table || table;
     if (!paramsTable) {
-        return reply
-            .status(400)
-            .send({ error: "not enough params: table", code: 400 });
+        throw BadRequestError("not enough params: table");
     }
     const hookData = (await applyHook("preData", {
         pg,
@@ -72,11 +71,12 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         id: params?.id || id,
         user,
     }));
+    // hooks should throw custom errors instead, this is temp solution to avoid breaking changes in hooks
     if (hookData?.message && hookData?.status) {
-        const response = hookData.status >= 400
-            ? { error: hookData.message, code: hookData.status }
-            : hookData.message;
-        return reply.status(hookData.status).send(response);
+        if (hookData.status >= 400) {
+            throw new Error(hookData.message);
+        }
+        return hookData.message;
     }
     /* from tableData START */
     const tokenData1 = await getOpt(paramsTable, uid);
@@ -126,15 +126,18 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     if (query?.sql === "0")
         return loadTable;
     if (!pg) {
-        return reply.status(500).send("empty pg");
+        throw Error("empty pg");
     }
     const pkey = pg.pk?.[resources[paramsTable] || paramsTable] ||
         pg.pk?.[resources[paramsTable] || paramsTable.replace(/"/g, "")] ||
-        (await getMeta({ pg, table: resources[paramsTable] || paramsTable }))?.pk;
+        (await getMeta({
+            pg,
+            table: resources[paramsTable] || loadTable?.table || paramsTable,
+        }))?.pk;
     if (!loadTable &&
         !(tokenData?.table && pg.pk?.[tokenData?.table]) &&
         !(called && pkey)) {
-        return reply.status(404).send("template not found");
+        throw NotFoundError("template not found");
     }
     const objectId = tokenData?.id || hookData?.id || params?.id || id;
     const { actions = [], query: accessQuery, message: accessMessage, } = actionsParam
@@ -151,10 +154,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             method,
         }, pg)) || {};
     if (accessMessage) {
-        return reply.status(403).send({
-            error: accessMessage,
-            code: 403,
-        });
+        throw ForbiddenError(accessMessage);
     }
     // const body = loadTable || hookData || tokenData;
     const { table: table1, columns = [], sql, cardSql, form, meta, sqlColumns, editable = false, } = loadTable || hookData || tokenData || params || { table };
@@ -168,10 +168,10 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         !called &&
         !accessQueryParam &&
         !actionsParam) {
-        return reply.status(401).send({ error: "unauthorized", code: 401 });
+        throw UnauthorizedError("unauthorized");
     }
     if (!ispublic && !actions.includes("view") && !config?.local && !called) {
-        return reply.status(403).send({ error: "access restricted", code: 403 });
+        throw ForbiddenError("access restricted");
     }
     const { list: filters = [] } = objectId
         ? {}
@@ -185,9 +185,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     timeArr.push(Date.now());
     if (tableMeta?.view) {
         if (!loadTable?.key && !tokenData?.key) {
-            return reply
-                .status(404)
-                .send({ error: `key  not found: ${table1}`, code: 404 });
+            throw NotFoundError(`key  not found: ${table1}`);
         }
         Object.assign(tableMeta, { pk: loadTable?.key || tokenData?.key });
     }
@@ -204,9 +202,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         Object.assign(col, locales[`${table1 || paramsTable}.${col.name}`] || {});
     });
     if (!pk) {
-        return reply
-            .status(404)
-            .send({ error: `table not found: ${table1}`, code: 404 });
+        throw NotFoundError(`table not found: ${table1}`);
     }
     const columnList = dbColumns.map((el) => el.name || el).join(",");
     const sqlTable = sql
@@ -371,9 +367,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     if (!rows.length &&
         headers?.referer?.includes?.("/card/") &&
         headers?.referer?.includes?.(templateName)) {
-        return reply
-            .status(403)
-            .send({ error: "access restricted: empty rows", code: 403 });
+        throw ForbiddenError("access restricted: empty rows");
     }
     timeArr.push(Date.now());
     if (uid &&

package/dist/server/routes/templates/controllers/getTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTemplate.d.ts","sourceRoot":"","sources":["../../../../../server/routes/templates/controllers/getTemplate.ts"],"names":[],"mappings":"AAyCA,wBAA8B,cAAc,CAAC,GAAG,EAAE,GAAG,gBAgDpD"}
+{"version":3,"file":"getTemplate.d.ts","sourceRoot":"","sources":["../../../../../server/routes/templates/controllers/getTemplate.ts"],"names":[],"mappings":"AAyCA,wBAA8B,cAAc,CAAC,GAAG,EAAE,GAAG,gBAsDpD"}

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

@@ -32,17 +32,21 @@ function formatSchema(schema, user, opt) {
         .forEach(parseDataTables);
 }
 export default async function getTemplateApi(req) {
-    const { user } = req || {};
-    const { params = {} } = req;
-    const { type, name } = params;
+    const { params, user } = req || {};
+    const { type, name } = params || {};
     const tokenData = (await getToken({ token: name, uid: user?.uid, json: 1 })) || {};
     const hookData = (await applyHook("preTemplate", {
         name: tokenData.name || name,
         type,
         user,
     }));
-    if (hookData?.message && hookData?.status)
-        return hookData;
+    // hooks should throw custom errors instead, this is temp solution to avoid breaking changes in hooks
+    if (hookData?.message && hookData?.status) {
+        if (hookData.status >= 400) {
+            throw new Error(hookData.message);
+        }
+        return hookData.message;
+    }
     const data = await getTemplate(type, hookData?.name || tokenData.form || name);
     if (data && tokenData.obj) {
         const obj = tokenData.obj.split("#").reduce((p, el) => ({

package/dist/server/routes/upload/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/upload/index.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,GAAG,QA2GtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/upload/index.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,GAAG,QAmGtC"}

package/dist/server/routes/upload/index.js

@@ -4,6 +4,7 @@ import { prefix } from "../../plugins/upload/index.js";
 import startUpload from "../../plugins/upload/startUpload.js";
 import uploadChunk from "../../plugins/upload/uploadChunk.js";
 import getUploadStatus from "../../plugins/upload/getUploadStatus.js";
+import { BadRequestError, LengthRequiredError } from "../../../errors.js";
 const policy = "L0"; // public
 const tags = ["core", "upload"];
 export default function plugin(app) {
@@ -13,15 +14,11 @@ export default function plugin(app) {
     }, async (req, reply) => {
         const { fileName, size, subdir, id } = req.body || {};
         if (!fileName || !size) {
-            return reply
-                .code(400)
-                .send({ error: "fileName and size required", code: 400 });
+            throw BadRequestError("fileName and size are required");
         }
         const result = await startUpload({ fileName, size, subdir, id });
-        if (result.code) {
-            return reply
-                .status(result.code)
-                .send({ error: result.error, code: result.code });
+        if (result.error) {
+            throw new Error(result.error);
         }
         return result;
     });
@@ -47,13 +44,11 @@ export default function plugin(app) {
         },
     }, async (req, reply) => {
         if (!req.headers["content-range"]) {
-            return reply
-                .status(411)
-                .send({ error: "Content-Range required", code: 411 });
+            throw LengthRequiredError("Content-Range required");
         }
         const match = req.headers["content-range"].match(/bytes (\d+)-(\d+)\/(\d+)/);
         if (!match) {
-            return { error: "Invalid Content-Range", code: 400 };
+            throw BadRequestError("Invalid Content-Range");
         }
         const offset = parseInt(match[1], 10);
         const end = parseInt(match[2], 10);
@@ -65,10 +60,8 @@ export default function plugin(app) {
             end,
             size,
         });
-        if (result.code) {
-            return reply
-                .status(result.code)
-                .send({ error: result.error, code: result.code });
+        if (result.error) {
+            throw new Error(result.error);
         }
         return result;
     });

package/dist/server/routes/usercls/controllers/addUserCls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/addUserCls.ts"],"names":[],"mappings":"AAUA,wBAA8B,aAAa,CACzC,EAAE,EAAqB,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,EAC1C,KAAK,EAAE,GAAG,gBAqCX"}
+{"version":3,"file":"addUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/addUserCls.ts"],"names":[],"mappings":"AAWA,wBAA8B,aAAa,CACzC,EAAE,EAAqB,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,EAC1C,KAAK,EAAE,GAAG,gBAqCX"}

package/dist/server/routes/usercls/controllers/addUserCls.js

@@ -1,3 +1,4 @@
+import { UnauthorizedError } from "../../../../errors.js";
 import pgClients from "../../../plugins/pg/pgClients.js";
 import getSelectMeta from "../../../plugins/table/funcs/getSelectMeta.js";
 import { addUserCls, addCustomCls, editUserCls, getUserCls, } from "../../../plugins/usercls/index.js";
@@ -5,7 +6,7 @@ export default async function addUserClsApi({ pg = pgClients.client, body, user
     const { name, description, alias, data, table } = body;
     const t1 = Date.now();
     if (!user?.uid) {
-        return reply.status(401).send({ error: "unauthorized", code: 401 });
+        throw UnauthorizedError("unauthorized");
     }
     if (table) {
         await addCustomCls({ name, description, alias, table, uid: user.uid, data }, pg);

package/dist/server/routes/usercls/controllers/deleteUserCls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/deleteUserCls.ts"],"names":[],"mappings":"AAIA,wBAA8B,gBAAgB,CAC5C,EAAE,EAAqB,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAC5C,KAAK,EAAE,GAAG,gBAkBX"}
+{"version":3,"file":"deleteUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/deleteUserCls.ts"],"names":[],"mappings":"AAKA,wBAA8B,gBAAgB,CAC5C,EAAE,EAAqB,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAC5C,KAAK,EAAE,GAAG,gBAkBX"}

package/dist/server/routes/usercls/controllers/deleteUserCls.js

@@ -1,3 +1,4 @@
+import { UnauthorizedError } from "../../../../errors.js";
 import pgClients from "../../../plugins/pg/pgClients.js";
 import getSelectMeta from "../../../plugins/table/funcs/getSelectMeta.js";
 import { deleteUserCls } from "../../../plugins/usercls/index.js";
@@ -5,7 +6,7 @@ export default async function deleteUserClsApi({ pg = pgClients.client, params,
     const { name, code } = params;
     const t1 = Date.now();
     if (!user?.uid) {
-        return reply.status(401).send({ error: "unauthorized", code: 401 });
+        throw UnauthorizedError("unauthorized");
     }
     await getSelectMeta({
         pg,

package/dist/server/routes/usercls/controllers/editUserCls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/editUserCls.ts"],"names":[],"mappings":"AAUA,wBAA8B,cAAc,CAC1C,EAAE,EAAqB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAClD,KAAK,EAAE,GAAG,gBAsCX"}
+{"version":3,"file":"editUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/editUserCls.ts"],"names":[],"mappings":"AAWA,wBAA8B,cAAc,CAC1C,EAAE,EAAqB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAClD,KAAK,EAAE,GAAG,gBAsCX"}

package/dist/server/routes/usercls/controllers/editUserCls.js

@@ -1,3 +1,4 @@
+import { UnauthorizedError } from "../../../../errors.js";
 import pgClients from "../../../plugins/pg/pgClients.js";
 import getSelectMeta from "../../../plugins/table/funcs/getSelectMeta.js";
 import { addUserCls, addCustomCls, editUserCls, getUserCls, } from "../../../plugins/usercls/index.js";
@@ -6,7 +7,7 @@ export default async function editUserClsApi({ pg = pgClients.client, body, para
     const { data, table, description, alias } = body;
     const t1 = Date.now();
     if (!user?.uid) {
-        return reply.status(401).send({ error: "unauthorized", code: 401 });
+        throw UnauthorizedError("unauthorized");
     }
     if (table) {
         await addCustomCls({ name, data, description, alias, table, uid: user.uid }, pg);

package/dist/server/routes/usercls/controllers/getUserCls.d.ts

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

package/dist/server/routes/usercls/controllers/getUserCls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/getUserCls.ts"],"names":[],"mappings":"AAQA,wBAA8B,iBAAiB,CAC7C,EAAE,KAAK,EAAE,IAAI,EAAE,EAAqB,EAAE,EAAE,GAAG,EAC3C,KAAK,EAAE,GAAG,gBA0BX"}
+{"version":3,"file":"getUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/getUserCls.ts"],"names":[],"mappings":"AASA,wBAA8B,iBAAiB,CAAC,EAC9C,KAAK,EACL,IAAI,EACJ,EAAqB,GACtB,EAAE,GAAG,gBAyBL"}

package/dist/server/routes/usercls/controllers/getUserCls.js

@@ -1,15 +1,16 @@
 import config from "../../../../config.js";
+import { UnauthorizedError } from "../../../../errors.js";
 import pgClients from "../../../plugins/pg/pgClients.js";
 import { getUserClsList } from "../../../plugins/usercls/index.js";
 // query.name = cls1,cls2,cls3
 // query.search = substring of cls name
 // data[idx].count - should not depend on either query.name or query.search
-export default async function getUserClsListApi({ query, user, pg = pgClients.client }, reply) {
+export default async function getUserClsListApi({ query, user, pg = pgClients.client, }) {
     if (!user?.uid && !config.local) {
-        return reply.status(401).send({ error: "unauthorized", code: 401 });
+        throw UnauthorizedError("unauthorized");
     }
     if (!pg) {
-        return reply.status(400).send({ error: "empty pg", code: 400 });
+        throw Error("empty pg");
     }
     const t1 = Date.now();
     const result = await getUserClsList({

package/dist/server/routes/util/controllers/code.generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code.generator.d.ts","sourceRoot":"","sources":["../../../../../server/routes/util/controllers/code.generator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA0EzD,wBAA8B,aAAa,CACzC,EACE,EAAqB,EACrB,MAAW,EACX,IAAS,EACT,KAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC;CAC7B,EACD,KAAK,EAAE,YAAY,kBA+GpB"}
+{"version":3,"file":"code.generator.d.ts","sourceRoot":"","sources":["../../../../../server/routes/util/controllers/code.generator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAgFzD,wBAA8B,aAAa,CACzC,EACE,EAAqB,EACrB,MAAW,EACX,IAAS,EACT,KAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC;CAC7B,EACD,KAAK,EAAE,YAAY,kBA+GpB"}

package/dist/server/routes/util/controllers/code.generator.js

@@ -2,6 +2,7 @@ import getTemplate from "../../../plugins/table/funcs/getTemplate.js";
 import pgClients from "../../../plugins/pg/pgClients.js";
 import getToken from "../../../plugins/crud/funcs/getToken.js";
 import { handlebarsSync } from "../../../../utils.js";
+import { BadRequestError, ForbiddenError, NotFoundError, UnauthorizedError, } from "../../../../errors.js";
 function dayOfTheYear(date) {
     const start = new Date(date.getFullYear(), 0, 0);
     const diff = date -
@@ -63,10 +64,10 @@ export default async function codeGenerator({ pg = pgClients.client, params = {}
     const { token, column } = params;
     const data = query.data?.split?.(";") || [];
     if (!token || !column) {
-        return reply.status(400).send("not enough params: token / column");
+        throw BadRequestError("not enough params: token / column");
     }
     if (!user?.uid) {
-        return reply.status(401).send("unauthorized");
+        throw UnauthorizedError("unauthorized");
     }
     const tokenData = (await getToken({ token, uid: user?.uid, json: 1 })) || {};
     const currentYear = new Date().getFullYear();
@@ -94,15 +95,15 @@ export default async function codeGenerator({ pg = pgClients.client, params = {}
         return reply.status(200).send(result);
     }
     if (!tokenData?.form || !tokenData?.table) {
-        return reply.status(401).send("token not allow");
+        throw new ForbiddenError("token not allow");
     }
     const loadTemplate = await getTemplate("form", tokenData.form);
     const schema = loadTemplate?.schema || loadTemplate;
     if (!schema) {
-        return reply.status(404).send("form not found");
+        throw NotFoundError("form not found");
     }
     if (!schema?.[column]?.template) {
-        return reply.status(400).send("template not specified");
+        throw BadRequestError("template not specified");
     }
     const columnValue = data
         .find((el) => el.startsWith(column))
@@ -111,7 +112,7 @@ export default async function codeGenerator({ pg = pgClients.client, params = {}
     const loadTable = await getTemplate("table", tokenData.table);
     const table = loadTable?.table || tokenData.table;
     if (!pg.pk?.[table]) {
-        return reply.status(404).send("table pk not found");
+        throw NotFoundError("table pk not found");
     }
     const count = pg
         ? await pg

package/dist/server/routes/util/controllers/user.tokens.d.ts

@@ -1,8 +1,7 @@
-import type { FastifyReply } from "fastify";
 export default function userTokensAPI({ params, user, }: {
     params: {
         token: string;
     };
     user?: Record<string, any>;
-}, reply: FastifyReply): Promise<any>;
+}): Promise<any>;
 //# sourceMappingURL=user.tokens.d.ts.map

package/dist/server/routes/util/controllers/user.tokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.tokens.d.ts","sourceRoot":"","sources":["../../../../../server/routes/util/controllers/user.tokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAU5C,wBAA8B,aAAa,CACzC,EACE,MAAM,EACN,IAAS,GACV,EAAE;IAAE,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,EAC5D,KAAK,EAAE,YAAY,gBA4CpB"}
+{"version":3,"file":"user.tokens.d.ts","sourceRoot":"","sources":["../../../../../server/routes/util/controllers/user.tokens.ts"],"names":[],"mappings":"AAeA,wBAA8B,aAAa,CAAC,EAC1C,MAAM,EACN,IAAS,GACV,EAAE;IACD,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,gBA2CA"}

package/dist/server/routes/util/controllers/user.tokens.js

@@ -1,16 +1,17 @@
 import { customTokens, userTokens, handlebarsSync, setOpt, getOpt, config, } from "../../../../utils.js";
-export default async function userTokensAPI({ params, user = {}, }, reply) {
+import { BadRequestError, NotFoundError, UnauthorizedError, } from "../../../../errors.js";
+export default async function userTokensAPI({ params, user = {}, }) {
     if (!user?.uid) {
-        return reply.status(403).send("access restricted: user");
+        throw UnauthorizedError("unauthorized");
     }
     if (!params?.token) {
-        return reply.status(400).send("not enough params: token");
+        throw BadRequestError("not enough params: token");
     }
     if (!config.redis) {
-        return reply.status(500).send("empty redis");
+        throw new Error("empty redis");
     }
     if (!customTokens[params.token]) {
-        return reply.status(404).send("token not found");
+        throw NotFoundError("token not found");
     }
     // return from cache
     if (userTokens[user.uid]?.[params.token]) {

package/dist/server/routes/widget/controllers/file.edit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.edit.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/file.edit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAQ5C,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAsDpE"}
+{"version":3,"file":"file.edit.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/file.edit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAS5C,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAsDpE"}

package/dist/server/routes/widget/controllers/file.edit.js

@@ -2,16 +2,17 @@ import path from "node:path";
 import dataUpdate from "../../../plugins/crud/funcs/dataUpdate.js";
 import pgClients from "../../../plugins/pg/pgClients.js";
 import uploadMultiPart from "../../../plugins/file/uploadMultiPart.js";
+import { BadRequestError, NotFoundError } from "../../../../errors.js";
 export default async function widgetSet(req, reply) {
     const { pg = pgClients.client, headers = {}, user = {}, params = {} } = req;
     if (!params?.id) {
-        return reply.status(400).send("not enough params: id");
+        throw BadRequestError("not enough params: id");
     }
     if (!pg.pk?.["crm.files"]) {
-        return reply.status(404).send("table not found");
+        throw NotFoundError("table not found");
     }
     if (headers["content-type"]?.split?.(";")?.shift?.() !== "multipart/form-data") {
-        return reply.status(400).send("invalid payload content type");
+        throw BadRequestError("invalid payload content type");
     }
     const file = await uploadMultiPart(req);
     const extName = path
@@ -36,7 +37,7 @@ export default async function widgetSet(req, reply) {
         uid: user?.uid,
     });
     if (!result?.file_id) {
-        return reply.status(404).send("file not found");
+        throw NotFoundError("file not found");
     }
     return reply.status(200).send({
         rowCount: 1,

package/dist/server/routes/widget/controllers/widget.del.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"widget.del.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/widget.del.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAmB5C;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAiFpE"}
+{"version":3,"file":"widget.del.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/widget.del.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAwB5C;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA+EpE"}

package/dist/server/routes/widget/controllers/widget.del.js

@@ -2,6 +2,7 @@ import config from "../../../../config.js";
 import isFileExists from "../../../plugins/file/isFileExists.js";
 import logChanges from "../../../plugins/crud/funcs/utils/logChanges.js";
 import pgClients from "../../../plugins/pg/pgClients.js";
+import { BadRequestError, ForbiddenError, UnauthorizedError, } from "../../../../errors.js";
 const isAdmin = (req) => process.env.NODE_ENV === "admin" ||
     config.admin ||
     req?.hostname?.split?.(":")?.shift?.() === config.adminDomain ||
@@ -33,23 +34,21 @@ async function checkAccess(pg, objectid, id) {
 export default async function widgetDel(req, reply) {
     const { pg = pgClients.client, params, user = {}, } = req;
     if (!user?.uid) {
-        return reply.status(401).send("access restricted: user not authorized");
+        throw UnauthorizedError("unauthorized");
     }
     const { type, objectid, id } = params || {};
     if (!objectid) {
-        return reply.status(400).send("not enough params: object id");
+        throw BadRequestError("not enough params: object id");
     }
     if (!id && type !== "reaction") {
-        return reply.status(400).send("not enough params: id");
+        throw BadRequestError("not enough params: id");
     }
     // force delete db entry if file not exists
     const { exists, uid } = ["file", "gallery"].includes(type)
         ? await checkAccess(pg, objectid, id)
         : {};
     if (exists && !isAdmin(req) && uid && user?.uid !== uid) {
-        return reply
-            .status(403)
-            .send("access restricted: file exists, not an author");
+        throw ForbiddenError("access restricted: file exists, not an author");
     }
     const sqls = {
         comment: `delete from crm.communications where entity_id=$1 and ${isAdmin(req) ? "$2=$2" : "uid=$2"} and communication_id=$3`,
@@ -67,7 +66,7 @@ export default async function widgetDel(req, reply) {
         reaction: "crm.reactions",
     }[type];
     if (!sql || !table) {
-        return reply.status(400).send("invalid widget type");
+        throw BadRequestError("invalid widget type");
     }
     const { rows = [] } = await pg.query(sql, [objectid, user.uid, id || ""]);
     await logChanges({

package/dist/server/routes/widget/controllers/widget.get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"widget.get.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/widget.get.ts"],"names":[],"mappings":"AAyBA;;;GAGG;AAEH,wBAA8B,SAAS,CACrC,EAAE,EAAqB,EAAE,IAAS,EAAE,MAAW,EAAE,KAAU,EAAE,EAAE,GAAG,EAClE,KAAK,EAAE,GAAG,gBAyLX"}
+{"version":3,"file":"widget.get.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/widget.get.ts"],"names":[],"mappings":"AA0BA;;;GAGG;AAEH,wBAA8B,SAAS,CACrC,EAAE,EAAqB,EAAE,IAAS,EAAE,MAAW,EAAE,KAAU,EAAE,EAAE,GAAG,EAClE,KAAK,EAAE,GAAG,gBAyLX"}

package/dist/server/routes/widget/controllers/widget.get.js

@@ -1,6 +1,7 @@
 import getMeta from "../../../plugins/pg/funcs/getMeta.js";
 import getToken from "../../../plugins/crud/funcs/getToken.js";
 import pgClients from "../../../plugins/pg/pgClients.js";
+import { BadRequestError, NotFoundError } from "../../../../errors.js";
 const galleryExtList = [
     "png",
     "svg",
@@ -34,7 +35,7 @@ export default async function widgetGet({ pg = pgClients.client, user = {}, para
         : null;
     const objectid = param ? JSON.parse(param)?.id : params.objectid;
     if (!objectid) {
-        return reply.status(400).send("not enough params: id");
+        throw BadRequestError("not enough params: id");
     }
     const sqls = {
         comment: pg.pk["admin.users"]
@@ -86,7 +87,7 @@ export default async function widgetGet({ pg = pgClients.client, user = {}, para
     };
     const q = sqls[params.type];
     if (!q) {
-        return reply.status(400).send("invalid widget type");
+        throw BadRequestError("invalid widget type");
     }
     /* rows */
     const rows = await pg
@@ -122,7 +123,7 @@ export default async function widgetGet({ pg = pgClients.client, user = {}, para
         params.type === "history" &&
         process.env.NODE_ENV !== "test" &&
         !process.env.VITEST) {
-        return reply.status(404).send("log table not found");
+        throw NotFoundError("log table not found");
     }
     const cdateColumn = columns.find((col) => ["cdate", "created_at"].includes(col.name))?.name;
     const editorDateColumn = columns.find((col) => ["editor_date", "updated_at"].includes(col.name))?.name;

package/dist/server/routes/widget/controllers/widget.set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"widget.set.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/widget.set.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAoC5C,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY;;;;;;GAqHpE"}
+{"version":3,"file":"widget.set.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/widget.set.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAqC5C,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY;;;;;;GAqHpE"}

package/dist/server/routes/widget/controllers/widget.set.js

@@ -4,6 +4,7 @@ import dataInsert from "../../../plugins/crud/funcs/dataInsert.js";
 import dataUpdate from "../../../plugins/crud/funcs/dataUpdate.js";
 import { applyHook } from "../../../../utils.js";
 import uploadMultiPart from "../../../plugins/file/uploadMultiPart.js";
+import { BadRequestError, NotFoundError } from "../../../../errors.js";
 const tableList = {
     comment: "crm.communications",
     gallery: "crm.files",
@@ -32,10 +33,10 @@ export default async function widgetSet(req, reply) {
     const { pg, params, headers = {}, body = {}, user = {}, } = req;
     const { type, id, objectid } = params || {};
     if (!pkList[type] || !tableList[type]) {
-        return reply.status(400).send("param type not valid");
+        throw BadRequestError("param type not valid");
     }
     if (!objectid) {
-        return reply.status(400).send("not enough params: id");
+        throw BadRequestError("not enough params: id");
     }
     const table = tableList[type];
     // dsadasdad
@@ -58,7 +59,7 @@ export default async function widgetSet(req, reply) {
             entity_id: objectid,
         };
         if (type === "gallery" && !galleryExtList.includes(extName.toLowerCase())) {
-            return reply.status(400).send("invalid file extension");
+            throw BadRequestError("invalid file extension");
         }
         const { rows = [] } = await dataInsert({
             pg,
@@ -82,7 +83,7 @@ export default async function widgetSet(req, reply) {
     }
     const { pk } = await getMeta({ pg, table });
     if (!pk) {
-        return reply.status(404).send("table not found");
+        throw NotFoundError("table not found");
     }
     const data = { ...body, uid: user?.uid, entity_id: objectid };
     await applyHook("onWidgetSet", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.3.6",
+  "version": "2.4.0",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -15,6 +15,7 @@
   "exports": {
     ".": "./dist/index.js",
     "./index.js": "./dist/index.js",
+    "./errors.js": "./dist/errors.js",
     "./utils.js": "./dist/utils.js",
     "./package.json": "./package.json"
   },
@@ -62,6 +63,7 @@
     "ioredis": "5.10.1",
     "js-yaml": "4.1.1",
     "markdown-it": "14.1.1",
+    "minio": "^8.0.7",
     "nodemailer": "8.0.4",
     "otplib": "13.4.0",
     "pg": "8.20.0",