@opengis/fastify-table 2.3.5 → 2.4.0

package/dist/errors.d.ts

@@ -0,0 +1,38 @@
+import createError from "@fastify/error";
+export declare const BadRequestError: createError.FastifyErrorConstructor<{
+    code: "BAD_REQUEST_ERROR";
+    statusCode: 400;
+}, [any?, any?, any?]>;
+export declare const UnauthorizedError: createError.FastifyErrorConstructor<{
+    code: "UNAUTHORIZED_ERROR";
+    statusCode: 401;
+}, [any?, any?, any?]>;
+export declare const ForbiddenError: createError.FastifyErrorConstructor<{
+    code: "FORBIDDEN_ERROR";
+    statusCode: 403;
+}, [any?, any?, any?]>;
+export declare const NotFoundError: createError.FastifyErrorConstructor<{
+    code: "NOT_FOUND_ERROR";
+    statusCode: 404;
+}, [any?, any?, any?]>;
+export declare const ConflictError: createError.FastifyErrorConstructor<{
+    code: "CONFLICT_ERROR";
+    statusCode: 409;
+}, [any?, any?, any?]>;
+export declare const LengthRequiredError: createError.FastifyErrorConstructor<{
+    code: "LENGTH_REQUIRED_ERROR";
+    statusCode: 411;
+}, [any?, any?, any?]>;
+export declare const PayloadTooLargeError: createError.FastifyErrorConstructor<{
+    code: "PAYLOAD_TOO_LARGE_ERROR";
+    statusCode: 413;
+}, [any?, any?, any?]>;
+export declare const UnsupportedMediaTypeError: createError.FastifyErrorConstructor<{
+    code: "UNSUPPORTED_MEDIA_TYPE_ERROR";
+    statusCode: 415;
+}, [any?, any?, any?]>;
+export declare const NotImplementedError: createError.FastifyErrorConstructor<{
+    code: "NOT_IMPLEMENTED_ERROR";
+    statusCode: 501;
+}, [any?, any?, any?]>;
+//# sourceMappingURL=errors.d.ts.map

package/dist/errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../errors.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAEzC,eAAO,MAAM,eAAe;;;sBAI3B,CAAC;AACF,eAAO,MAAM,iBAAiB;;;sBAI7B,CAAC;AACF,eAAO,MAAM,cAAc;;;sBAI1B,CAAC;AACF,eAAO,MAAM,aAAa;;;sBAIzB,CAAC;AACF,eAAO,MAAM,aAAa;;;sBAIzB,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;sBAI/B,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;sBAIhC,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;sBAIrC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;sBAI/B,CAAC"}

package/dist/errors.js

@@ -0,0 +1,10 @@
+import createError from "@fastify/error";
+export const BadRequestError = createError("BAD_REQUEST_ERROR", "Bad request: %s", 400);
+export const UnauthorizedError = createError("UNAUTHORIZED_ERROR", "Authorization required: %s", 401);
+export const ForbiddenError = createError("FORBIDDEN_ERROR", "Access restricted: %s", 403);
+export const NotFoundError = createError("NOT_FOUND_ERROR", "Resource not found: %s", 404);
+export const ConflictError = createError("CONFLICT_ERROR", "Injection attempt: %s", 409);
+export const LengthRequiredError = createError("LENGTH_REQUIRED_ERROR", "Length Required: %s", 411);
+export const PayloadTooLargeError = createError("PAYLOAD_TOO_LARGE_ERROR", "Payload Too Large: %s", 413);
+export const UnsupportedMediaTypeError = createError("UNSUPPORTED_MEDIA_TYPE_ERROR", "Unsupported Media Type: %s", 415);
+export const NotImplementedError = createError("NOT_IMPLEMENTED_ERROR", "Not implemented: %s", 501);

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -56,6 +56,7 @@ import uploadChunkRoutes from "./server/routes/upload/index.js";
 import grpcRoutes from "./server/routes/grpc/index.js";
 import notificationsRoutes from "./server/routes/notifications/index.js";
 import userClsRoutes from "./server/routes/usercls/index.js";
+import apiListService from "./server/routes/util/controllers/api.list.js";
 addHook("preForm", preForm);
 addHook("afterTable", afterTable);
 addHook("preTemplate", preTemplate);
@@ -70,16 +71,35 @@ async function plugin(fastify) {
             reply.header("Access-Control-Allow-Origin", "*");
         });
     }
+    const apiListSchema = {
+        querystring: {
+            type: "object",
+            properties: {
+                package: { type: "string" },
+                subdir: { type: "string" },
+                md: { type: "string", pattern: "^1$" },
+                tags: { type: "string", pattern: "^[a-zA-Z0-9_,]+$" },
+                exclude_tags: { type: "string", pattern: "^[a-zA-Z0-9_,]+$" },
+            },
+        },
+    };
     if (!fastify.hasRoute({ method: "GET", url: "/api/list" })) {
-        fastify.get(`${opt.prefix}/list`, { config: { role: "admin" } }, ({ query }) => {
-            const { package: packageName, subdir } = query;
-            if (packageName) {
-                return { rows: routes.filter((r) => r.package === packageName) };
-            }
-            if (subdir) {
-                return { rows: routes.filter((r) => r.subdir === subdir) };
+        fastify.get(`${opt.prefix || "/api"}/list`, {
+            config: { tags: ["core", "util"], role: "admin" },
+            schema: apiListSchema,
+        }, function apiList(req, reply) {
+            const result = apiListService({
+                includeTags: req.query.tags,
+                excludeTags: req.query.exclude_tags,
+                packageName: req.query.package,
+                subdir: req.query.subdir,
+                md: req.query.md,
+                routes,
+            });
+            if (result.headers) {
+                return reply.headers(result.headers).send(result.data);
             }
-            return { rows: routes };
+            return result;
         });
     }
     fastify.addHook("onRoute", (r) => {
@@ -96,9 +116,10 @@ async function plugin(fastify) {
         r.config.package = r.config.package || "fastify-table";
         routes.push({
             method,
-            route: r.url,
+            endpoint: r.url,
             subdir: r.config?.subdir,
             package: r.config?.package,
+            tags: Array.isArray(r.config?.tags) ? r.config?.tags : undefined,
             description: r.config?.description,
             query,
             roles: r.config?.role?.split?.("|"),

package/dist/server/plugins/access/funcs/getAdminAccess.d.ts

@@ -1,8 +1,5 @@
 export default function getAdminAccess({ id, user, }: {
     id?: string;
     user?: Record<string, string> | undefined;
-}): Promise<{
-    message: string;
-    status: number;
-} | null>;
+}): Promise<null>;
 //# sourceMappingURL=getAdminAccess.d.ts.map

package/dist/server/plugins/access/funcs/getAdminAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAdminAccess.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/access/funcs/getAdminAccess.ts"],"names":[],"mappings":"AAEA,wBAA8B,cAAc,CAAC,EAC3C,EAAE,EACF,IAAI,GACL,EAAE;IACD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;CAC3C;;;UAYA"}
+{"version":3,"file":"getAdminAccess.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/access/funcs/getAdminAccess.ts"],"names":[],"mappings":"AAGA,wBAA8B,cAAc,CAAC,EAC3C,EAAE,EACF,IAAI,GACL,EAAE;IACD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;CAC3C,iBAYA"}

package/dist/server/plugins/access/funcs/getAdminAccess.js

@@ -1,11 +1,12 @@
 import config from "../../../../config.js";
+import { BadRequestError, ForbiddenError } from "../../../../errors.js";
 export default async function getAdminAccess({ id, user, }) {
     if (!id) {
-        return { message: "not enough params: id", status: 400 };
+        throw BadRequestError("not enough params: id");
     }
     if (!config?.local &&
         !["admin"].includes(user?.user_type || user?.type || "")) {
-        return { message: "access restricted: admin", status: 403 };
+        throw new ForbiddenError("access restricted: admin");
     }
     return null;
 }

package/dist/server/plugins/auth/funcs/getQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getQuery.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/getQuery.ts"],"names":[],"mappings":"AA4BA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGpD,wBAA8B,QAAQ,CAAC,EACrC,EAAE,EACF,IAAI,GACL,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,gBAkIA"}
+{"version":3,"file":"getQuery.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/getQuery.ts"],"names":[],"mappings":"AA6BA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGpD,wBAA8B,QAAQ,CAAC,EACrC,EAAE,EACF,IAAI,GACL,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,gBAkIA"}

package/dist/server/plugins/auth/funcs/getQuery.js

@@ -22,6 +22,7 @@ father_name=coalesce($4, father_name), email=$5, social_auth_id=$6,
 social_auth_type=$7 where uid=$8 returning uid`;
 const deleteSocialIdSQL = `delete from admin.users_social_auth where social_auth_id=$1 or email=$2`;
 import config from "../../../../config.js";
+import { NotImplementedError } from "../../../../errors.js";
 import logger from "../../logger/getLogger.js";
 export default async function getQuery({ pg, data, }) {
     if (typeof data !== "object") {
@@ -114,7 +115,7 @@ export default async function getQuery({ pg, data, }) {
             socialUserId,
             stack: err.stack,
         });
-        throw new Error("Помилка авторизації. Зверніться до адміністратора");
+        throw new NotImplementedError("Помилка авторизації. Зверніться до адміністратора");
     }
     finally {
         client.release();

package/dist/server/plugins/auth/funcs/loginFile.d.ts

@@ -1,6 +1,3 @@
 import { FastifyReply } from "fastify";
-export default function loginFile(req: any, reply: FastifyReply): Promise<{
-    error: string;
-    status: number;
-}>;
+export default function loginFile(req: any, reply: FastifyReply): Promise<never>;
 //# sourceMappingURL=loginFile.d.ts.map

package/dist/server/plugins/auth/funcs/loginFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loginFile.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/loginFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYvC,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY;;;GA6CpE"}
+{"version":3,"file":"loginFile.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/loginFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAcvC,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAkDpE"}

package/dist/server/plugins/auth/funcs/loginFile.js

@@ -4,14 +4,16 @@ import { createHash } from "node:crypto";
 import config from "../../../../config.js";
 import users from "./users.js";
 import authorizeUser from "./authorizeUser.js";
+import { BadRequestError } from "../../../../errors.js";
+import logger from "../../logger/getLogger.js";
 export default async function loginFile(req, reply) {
     const { username, password } = req.method === "POST" ? req.body : req.query;
     const filepath = path.join(process.cwd(), "passwd");
     if (!users?.length) {
         const fileExists = existsSync(filepath);
         if (!fileExists) {
-            req.log.error(req, "passwd file not exists");
-            return { error: "login error", status: 500 };
+            logger.error(req, "passwd file not exists");
+            throw new Error("passwd file not exists");
         }
         // parse file on start up
         const data = readFileSync(filepath, "utf8");
@@ -29,9 +31,12 @@ export default async function loginFile(req, reply) {
         .digest("hex");
     if (!user?.password || user.password !== hashPasswd) {
         const txt = "Invalid user or password";
-        return req.method === "GET"
-            ? reply.status(302).redirect(`/login?confirm=wrong_pass&message=${txt}`)
-            : reply.status(400).send({ message: txt });
+        if (req.method !== "GET") {
+            throw BadRequestError(txt);
+        }
+        return reply
+            .status(302)
+            .redirect(`/login?confirm=wrong_pass&message=${txt}`);
     }
     const resultUser = {
         uid: user?.uid || config?.auth?.uid || username,

package/dist/server/plugins/auth/funcs/loginUser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loginUser.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/loginUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAUvC,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAiDpE"}
+{"version":3,"file":"loginUser.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/loginUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAWvC,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAuDpE"}

package/dist/server/plugins/auth/funcs/loginUser.js

@@ -3,20 +3,25 @@ import pgClients from "../../pg/pgClients.js";
 import logger from "../../logger/getLogger.js";
 import verifyPassword from "./verifyPassword.js";
 import authorizeUser from "./authorizeUser.js";
+import { BadRequestError } from "../../../../errors.js";
 export default async function loginUser(req, reply) {
     const { username, password } = (req.method === "POST" ? req.body : req.query) || {};
     const { pg = pgClients.client } = req;
     if (!config.pg) {
-        return req.method === "GET"
-            ? reply.status(302).redirect("/login?confirm=wrong_pass&message=empty pg")
-            : reply.status(400).send({ error: "empty pg", code: 400 });
+        if (req.method !== "GET") {
+            throw Error("empty pg");
+        }
+        return reply
+            .status(302)
+            .redirect("/login?confirm=wrong_pass&message=empty pg");
     }
     if (!config.redis) {
-        return req.method === "GET"
-            ? reply
-                .status(302)
-                .redirect("/login?confirm=wrong_pass&message=empty redis")
-            : reply.status(400).send({ error: "empty redis", code: 400 });
+        if (req.method !== "GET") {
+            throw Error("empty redis");
+        }
+        return reply
+            .status(302)
+            .redirect("/login?confirm=wrong_pass&message=empty redis");
     }
     const { user, message = "invalid user" } = (await verifyPassword({
         pg,
@@ -24,18 +29,20 @@ export default async function loginUser(req, reply) {
         password,
     })) || {};
     if (!user) {
-        return req.method === "GET"
-            ? reply
-                .status(302)
-                .redirect(`/login?confirm=wrong_pass&message=${message}`)
-            : reply.status(400).send({ error: message, code: 400 });
+        if (req.method !== "GET") {
+            throw BadRequestError(message);
+        }
+        return reply
+            .status(302)
+            .redirect(`/login?confirm=wrong_pass&message=${message}`);
     }
     if (!user && (req.query?.username || req.body?.username)) {
-        return req.method === "GET"
-            ? reply
-                .status(302)
-                .redirect(`/login?confirm=wrong_pass&message=${message}`)
-            : reply.status(400).send({ error: message, code: 400 });
+        if (req.method !== "GET") {
+            throw BadRequestError(message);
+        }
+        return reply
+            .status(302)
+            .redirect(`/login?confirm=wrong_pass&message=${message}`);
     }
     logger.metrics("user.login");
     const authType = "creds-" + (user.user_type === "admin" ? "admin" : "user");

package/dist/server/plugins/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAMtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBA+HxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAmCvC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAOtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBA6HxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAmCvC;AAED,eAAe,MAAM,CAAC"}

package/dist/server/plugins/auth/index.js

@@ -5,6 +5,7 @@ import { Authenticator } from "@fastify/passport";
 import RedisStore from "fastify-session-redis-store";
 import config from "../../../config.js";
 import getRedis from "../redis/funcs/getRedis.js";
+import { ForbiddenError, UnauthorizedError } from "../../../errors.js";
 const fastifyPassport = new Authenticator();
 const { prefix = "/api" } = config;
 export async function onRequest(req, reply) {
@@ -66,7 +67,7 @@ export async function onRequest(req, reply) {
         !req.url.includes(".") &&
         !req.url.includes("@")) {
         if (isApi) {
-            return reply.status(401).send({ error: "unauthorized", code: 401 });
+            throw UnauthorizedError("unauthorized");
         }
         return reply.redirect(`${loginPageUrl}` + `?redirect=${req.url}`);
     }
@@ -101,9 +102,7 @@ export async function onRequest(req, reply) {
         !routeOptions.url?.includes?.("/2fa") &&
         !routeOptions.url?.includes?.("/assets")) {
         if (isApi) {
-            return reply
-                .status(403)
-                .send({ error: "access restricted: twofa", code: 403 });
+            throw ForbiddenError("access restricted: twofa");
         }
         return reply.redirect(login2faPage);
     }

package/dist/server/plugins/crud/funcs/dataInsert.js

@@ -116,9 +116,9 @@ export default async function dataInsert({ id, table: table1, referer, data, pg:
         return {
             rowCount: res.rowCount,
             command: res.command,
+            ...res.rows[0],
             id: id1,
             data: res.rows[0],
-            ...res.rows[0],
             rows: res.rows,
         };
     }

package/dist/server/plugins/extra/extraData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extraData.d.ts","sourceRoot":"","sources":["../../../../server/plugins/extra/extraData.ts"],"names":[],"mappings":"AAmBA,wBAA8B,SAAS,CACrC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAQ,EAAE,EAAE,GAAG,EAC7C,EAAE,MAAmB,gBA2GtB"}
+{"version":3,"file":"extraData.d.ts","sourceRoot":"","sources":["../../../../server/plugins/extra/extraData.ts"],"names":[],"mappings":"AAoBA,wBAA8B,SAAS,CACrC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAQ,EAAE,EAAE,GAAG,EAC7C,EAAE,MAAmB,gBA2GtB"}

package/dist/server/plugins/extra/extraData.js

@@ -3,6 +3,7 @@ import getTemplate from "../table/funcs/getTemplate.js";
 import getMeta from "../pg/funcs/getMeta.js";
 import pgClients from "../pg/pgClients.js";
 import getInsertQuery from "../crud/funcs/utils/getInsertQuery.js";
+import { NotFoundError } from "../../../errors.js";
 const defaultTable = "crm.extra_data";
 function format(key, value, schema) {
     if (!key || !schema?.[key])
@@ -30,10 +31,10 @@ export default async function extraData({ table, form, id, data, uid, row = {} }
         table,
     });
     if (!mainPK) {
-        return { error: `table pk not found: ${table}`, status: 404 };
+        throw NotFoundError(`table pk not found: ${table}`);
     }
     if (!pg.pk?.[extraTable]) {
-        return { error: `extra table pk not found: ${extraTable}`, status: 404 };
+        throw NotFoundError(`extra table pk not found: ${extraTable}`);
     }
     Object.assign(data || {}, { object_id: id });
     const deleteRes = await pg.query(`delete from ${extraTable} where object_id=$1 and property_key = any($2::text[]) returning *`, [id, Object.keys(loadTemplate?.schema || {})]);

package/dist/server/plugins/extra/extraDataGet.d.ts

@@ -1,5 +1,2 @@
-export default function extraDataGet({ rows, table, form }: any, pg?: any): Promise<{
-    error: string;
-    status: number;
-} | null>;
+export default function extraDataGet({ rows, table, form }: any, pg?: any): Promise<null>;
 //# sourceMappingURL=extraDataGet.d.ts.map

package/dist/server/plugins/extra/extraDataGet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extraDataGet.d.ts","sourceRoot":"","sources":["../../../../server/plugins/extra/extraDataGet.ts"],"names":[],"mappings":"AAmBA,wBAA8B,YAAY,CACxC,EAAE,IAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAC/B,EAAE,MAAmB;;;UAwDtB"}
+{"version":3,"file":"extraDataGet.d.ts","sourceRoot":"","sources":["../../../../server/plugins/extra/extraDataGet.ts"],"names":[],"mappings":"AAoBA,wBAA8B,YAAY,CACxC,EAAE,IAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAC/B,EAAE,MAAmB,iBAqDtB"}

package/dist/server/plugins/extra/extraDataGet.js

@@ -1,4 +1,5 @@
 import config from "../../../config.js";
+import { NotFoundError } from "../../../errors.js";
 import pgClients from "../pg/pgClients.js";
 import getTemplate from "../table/funcs/getTemplate.js";
 const defaultTable = "crm.extra_data";
@@ -27,15 +28,12 @@ export default async function extraDataGet({ rows = [], table, form }, pg = pgCl
         config.extraData ||
         defaultTable;
     if (!pg.pk?.[table]) {
-        return { error: `table pk not found: ${table}`, status: 404 };
+        throw NotFoundError(`table pk not found: ${table}`);
     }
     if (!pg.pk?.[extraDataTable]) {
-        return {
-            error: `extra table pk not found: ${extraDataTable}`,
-            status: 404,
-        };
+        throw NotFoundError(`extra table pk not found: ${extraDataTable}`);
     }
-    const { rows: extraRows = [] } = await pg.query(`select * from ${extraDataTable} where object_id=any($1::text[])`, [ids]);
+    const extraRows = await pg.query(`select * from ${extraDataTable} where object_id=any($1::text[])`, [ids]).then((el) => el.rows || []);
     if (rows?.length && extraRows?.length) {
         rows.forEach((row) => {
             Object.assign(row, {

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

@@ -11,7 +11,7 @@ import providers from "./providers/index.js";
 import { all, images } from "./utils/allowedExtensions.js";
 import grpc from "../grpc/grpc.js";
 import getFileType from "./utils/getFileType.js";
-import { BadRequestError, PayloadTooLargeError } from "../../types/errors.js";
+import { BadRequestError, PayloadTooLargeError } from "../../../errors.js";
 const { resizeImage } = grpc();
 const { resizeImageMinSize = 5 } = config; // resize images >= 5 MB by default
 async function writeFileToDisk(file, buffer) {

package/dist/server/plugins/grpc/utils/html2doc.d.ts

@@ -3,11 +3,5 @@ export default function htmlTodoc({ html, filepath, }: {
     filepath: string;
 }): Promise<{
     filepath: string;
-    err?: undefined;
-    status?: undefined;
-} | {
-    err: any;
-    status: number;
-    filepath?: undefined;
 }>;
 //# sourceMappingURL=html2doc.d.ts.map

package/dist/server/plugins/grpc/utils/html2doc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html2doc.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/grpc/utils/html2doc.ts"],"names":[],"mappings":"AAOA,wBAA8B,SAAS,CAAC,EACtC,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;;;;;;;;GAUA"}
+{"version":3,"file":"html2doc.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/grpc/utils/html2doc.ts"],"names":[],"mappings":"AAOA,wBAA8B,SAAS,CAAC,EACtC,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;;GAQA"}

package/dist/server/plugins/grpc/utils/html2doc.js

@@ -6,12 +6,7 @@ export default async function htmlTodoc({ html, filepath, }) {
     const result = await html2Doc({ html });
     if (result.err)
         throw new Error(result.err);
-    try {
-        await mkdir(path.dirname(filepath), { recursive: true });
-        await writeFile(filepath, result.result, "base64");
-        return { filepath };
-    }
-    catch (err) {
-        return { err: err.toString(), status: 500 };
-    }
+    await mkdir(path.dirname(filepath), { recursive: true });
+    await writeFile(filepath, result.result, "base64");
+    return { filepath };
 }

package/dist/server/plugins/grpc/utils/html2img.d.ts

@@ -3,11 +3,5 @@ export default function html2pdf({ html, filepath, }: {
     filepath: string;
 }): Promise<{
     filepath: string;
-    err?: undefined;
-    status?: undefined;
-} | {
-    err: any;
-    status: number;
-    filepath?: undefined;
 }>;
 //# sourceMappingURL=html2img.d.ts.map

package/dist/server/plugins/grpc/utils/html2img.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html2img.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/grpc/utils/html2img.ts"],"names":[],"mappings":"AAOA,wBAA8B,QAAQ,CAAC,EACrC,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;;;;;;;;GAUA"}
+{"version":3,"file":"html2img.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/grpc/utils/html2img.ts"],"names":[],"mappings":"AAOA,wBAA8B,QAAQ,CAAC,EACrC,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;;GAQA"}

package/dist/server/plugins/grpc/utils/html2img.js

@@ -6,12 +6,7 @@ export default async function html2pdf({ html, filepath, }) {
     const result = await htmlToImg({ html });
     if (result.err)
         throw new Error(result.err);
-    try {
-        await mkdir(path.dirname(filepath), { recursive: true });
-        await writeFile(filepath, result.result, "base64");
-        return { filepath };
-    }
-    catch (err) {
-        return { err: err.toString(), status: 500 };
-    }
+    await mkdir(path.dirname(filepath), { recursive: true });
+    await writeFile(filepath, result.result, "base64");
+    return { filepath };
 }

package/dist/server/plugins/grpc/utils/html2pdf.d.ts

@@ -1,10 +1,4 @@
 export default function html2pdf({ html, filepath, logger }: any): Promise<{
     filepath: any;
-    err?: undefined;
-    status?: undefined;
-} | {
-    err: any;
-    status: number;
-    filepath?: undefined;
 }>;
 //# sourceMappingURL=html2pdf.d.ts.map

package/dist/server/plugins/grpc/utils/html2pdf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html2pdf.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/grpc/utils/html2pdf.ts"],"names":[],"mappings":"AAOA,wBAA8B,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG;;;;;;;;GAcrE"}
+{"version":3,"file":"html2pdf.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/grpc/utils/html2pdf.ts"],"names":[],"mappings":"AAOA,wBAA8B,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG;;GAYrE"}

package/dist/server/plugins/grpc/utils/html2pdf.js

@@ -4,16 +4,11 @@ import grpc from "../grpc.js";
 const { htmlToPdf } = grpc();
 export default async function html2pdf({ html, filepath, logger }) {
     const time = Date.now();
-    try {
-        const result = await htmlToPdf({ html });
-        logger.file("format/pdf", { msec: Date.now() - time, resp_code: 200 });
-        if (result.err)
-            throw new Error(result.err);
-        await mkdir(path.dirname(filepath), { recursive: true });
-        await writeFile(filepath, result.result, "base64");
-        return { filepath };
-    }
-    catch (err) {
-        return { err: err.toString(), status: 500 };
-    }
+    const result = await htmlToPdf({ html });
+    logger.file("format/pdf", { msec: Date.now() - time, resp_code: 200 });
+    if (result.err)
+        throw new Error(result.err);
+    await mkdir(path.dirname(filepath), { recursive: true });
+    await writeFile(filepath, result.result, "base64");
+    return { filepath };
 }

package/dist/server/plugins/grpc/utils/mergePdf.d.ts

@@ -1,12 +1,5 @@
 export default function mergePdf({ pdfStringList, pathToSave, filename, }: any): Promise<{
-    err: any;
-    status: number;
-    filename?: undefined;
-    filepath?: undefined;
-} | {
     filename: string;
     filepath: any;
-    err?: undefined;
-    status?: undefined;
 }>;
 //# sourceMappingURL=mergePdf.d.ts.map

package/dist/server/plugins/grpc/utils/mergePdf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergePdf.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/grpc/utils/mergePdf.ts"],"names":[],"mappings":"AAOA,wBAA8B,QAAQ,CAAC,EACrC,aAAa,EACb,UAAU,EACV,QAAQ,GACT,EAAE,GAAG;;;;;;;;;;GAWL"}
+{"version":3,"file":"mergePdf.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/grpc/utils/mergePdf.ts"],"names":[],"mappings":"AAOA,wBAA8B,QAAQ,CAAC,EACrC,aAAa,EACb,UAAU,EACV,QAAQ,GACT,EAAE,GAAG;;;GASL"}

package/dist/server/plugins/grpc/utils/mergePdf.js

@@ -6,13 +6,8 @@ export default async function mergePdf({ pdfStringList, pathToSave, filename, })
     const filename1 = filename || path.basename(pathToSave);
     const result = pdfMerge(pdfStringList);
     if (result.err)
-        return { err: result.err, status: 500 };
-    try {
-        await mkdir(path.dirname(pathToSave), { recursive: true });
-        await writeFile(pathToSave, result.result, "base64");
-        return { filename: `${filename1}.pdf`, filepath: pathToSave };
-    }
-    catch (err) {
-        return { err: err.toString(), status: 500 };
-    }
+        throw new Error(result.err);
+    await mkdir(path.dirname(pathToSave), { recursive: true });
+    await writeFile(pathToSave, result.result, "base64");
+    return { filename: `${filename1}.pdf`, filepath: pathToSave };
 }

package/dist/server/plugins/logger/checkUserAccess.d.ts

@@ -6,8 +6,5 @@
 export default function checkUserAccess({ user, token, }: {
     user: Record<string, any>;
     token?: string;
-}): {
-    message: string;
-    status: number;
-};
+}): null;
 //# sourceMappingURL=checkUserAccess.d.ts.map

package/dist/server/plugins/logger/checkUserAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkUserAccess.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/checkUserAccess.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,IAAI,EACJ,KAAK,GACN,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;EAiBA"}
+{"version":3,"file":"checkUserAccess.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/checkUserAccess.ts"],"names":[],"mappings":"AAKA;;;;GAIG;AAEH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,IAAI,EACJ,KAAK,GACN,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,QAcA"}

package/dist/server/plugins/logger/checkUserAccess.js

@@ -1,4 +1,5 @@
 import config from "../../../config.js";
+import { ForbiddenError } from "../../../errors.js";
 const { accessToken = "0NWcGQxKRP8AsRxD" } = config.auth || {};
 /**
  *
@@ -7,16 +8,13 @@ const { accessToken = "0NWcGQxKRP8AsRxD" } = config.auth || {};
  */
 export default function checkUserAccess({ user, token, }) {
     if (token && token === accessToken) {
-        return { message: "access granted", status: 200 };
+        return null;
     }
     // console.log(user);
     if ((!user || !user.user_type?.includes?.("admin")) &&
         !config?.local &&
         !config.auth?.disable) {
-        return { message: "access restricted", status: 403 };
+        throw ForbiddenError("access restricted");
     }
-    /* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
-      return { message: 'access restricted', status: 403 };
-    } */
-    return { message: "access granted", status: 200 };
+    return null;
 }

package/dist/server/plugins/logger/errorMessage.d.ts

@@ -1,3 +1,3 @@
-declare function errorMessage(error: any): any;
+declare function errorMessage(error: any, status: number): any;
 export default errorMessage;
 //# sourceMappingURL=errorMessage.d.ts.map