@opengis/fastify-table 2.0.43 → 2.0.45

package/dist/server/migrations/users.sql

@@ -6,6 +6,7 @@ ALTER TABLE admin.users add column if not exists uid text NOT NULL DEFAULT next_
 ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_uid_pkey cascade;
 ALTER TABLE admin.users DROP CONSTRAINT if exists user_pk cascade;
 ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_user_rnokpp;
+ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_type_check;
 
 ALTER TABLE admin.users add column if not exists login text;
 ALTER TABLE admin.users add column if not exists password text NOT NULL DEFAULT ''::text;
@@ -32,6 +33,11 @@ ALTER TABLE admin.users add column if not exists twofa boolean not null DEFAULT
 ALTER TABLE admin.users add CONSTRAINT admin_user_uid_pkey PRIMARY KEY (uid);
 ALTER TABLE admin.users add CONSTRAINT admin_user_user_rnokpp UNIQUE (user_rnokpp);
 
+update admin.users set user_type='regular' where user_type not in ('viewer', 'regular','admin','superadmin');
+ALTER TABLE admin.users add constraint admin_user_type_check CHECK (user_type=any(array['viewer', 'regular','admin','superadmin']));
+insert into admin.users (uid,login,password,user_type,enabled)values('viewer','viewer','viewer','viewer', false) on conflict (uid) do update set enabled=excluded.enabled;
+-- update admin.users set enabled=true where uid='viewer';
+
 COMMENT ON TABLE admin.users IS 'Користувачі';
 
 COMMENT ON COLUMN admin.users.uid IS 'ID користувача';

package/dist/server/plugins/crud/funcs/getAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAccess.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/getAccess.ts"],"names":[],"mappings":"AAsBA;;;;;;;;;GASG;AAEH,wBAA8B,SAAS,CACrC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAS,EAAE,EAAE,GAAG,EAC/B,EAAE,MAAmB,sBAmEtB"}
+{"version":3,"file":"getAccess.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/getAccess.ts"],"names":[],"mappings":"AAsBA;;;;;;;;;GASG;AAEH,wBAA8B,SAAS,CACrC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAS,EAAE,EAAE,GAAG,EAC/B,EAAE,MAAmB,sBAuEtB"}

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

@@ -37,6 +37,9 @@ export default async function getAccess({ table, form, user = {} }, pg = pgClien
     if (userType === "superadmin") {
         return { actions: allActions, query: "1=1" };
     }
+    if (userType === "viewer") {
+        return { actions: ["view"], query: "1=1" };
+    }
     const body = await getTemplate("table", table);
     const tableActions = !body && form
         ? allActions // if db table and form => full access (token)

package/dist/server/plugins/policy/funcs/checkPolicy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkPolicy.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,oSAiK5E"}
+{"version":3,"file":"checkPolicy.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,oSA6K5E"}

package/dist/server/plugins/policy/funcs/checkPolicy.js

@@ -3,8 +3,10 @@ import block from "../sqlInjection.js";
 export default function checkPolicy(req, reply) {
     const { originalUrl: path, hostname, query, params, headers, method, routeOptions, unittest, // legacy
      } = req;
+    const user = req.user || req.session?.passport?.user;
     // ! skip locally, skip tests
-    if (config.local || unittest || process.env.NODE_ENV === "test") {
+    if ((config.local || unittest || process.env.NODE_ENV === "test") &&
+        user?.user_type !== "viewer") {
         return null;
     }
     // ! skip non-API Requests
@@ -19,8 +21,6 @@ export default function checkPolicy(req, reply) {
         hostname.split(":").shift() === config.adminDomain ||
         config.admin ||
         hostname.startsWith("admin");
-    const user = req.user || req.session?.passport?.user;
-    // const isServer = process.argv[2];
     const { role, referer, policy = [], } = (routeOptions?.config || {});
     const isRole = (role && user?.user_type !== role) ||
         (policy.includes("admin") && user?.user_type !== "admin");
@@ -35,9 +35,19 @@ export default function checkPolicy(req, reply) {
     const requireReferer = Array.isArray(policy)
         ? policy.includes("referer")
         : referer;
+    if (method !== "GET" && user?.user_type === "viewer") {
+        logger.file("policy/role", {
+            path,
+            method,
+            userRole: user.user_type,
+        });
+        return reply.status(403).send("access restricted: 0");
+    }
     // ! role
     if (isRole) {
         logger.file("policy/role", {
+            role,
+            userRole: user?.user_type || "none",
             path,
             method,
             params,

package/dist/server/plugins/table/funcs/getFilterSQL/util/formatValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatValue.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/table/funcs/getFilterSQL/util/formatValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAK/D,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,EAAE,EACF,KAAK,EACL,MAAW,EACX,IAAI,EACJ,KAAK,EACL,UAAU,EACV,GAAO,EACP,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,OAyLA"}
+{"version":3,"file":"formatValue.d.ts","sourceRoot":"","sources":["../../../../../../../server/plugins/table/funcs/getFilterSQL/util/formatValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAe/D,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,EAAE,EACF,KAAK,EACL,MAAW,EACX,IAAI,EACJ,KAAK,EACL,UAAU,EACV,GAAO,EACP,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,OAmLA"}

package/dist/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -1,5 +1,14 @@
 import applyHookSync from "../../../../hook/applyHookSync.js";
 import getRangeQuery from "./getRangeQuery.js";
+const selectFilterTypes = [
+    "check",
+    "autocomplete",
+    "tags",
+    "avatar",
+    "radio",
+    "select",
+    "button",
+];
 export default function formatValue({ pg, table, filter = {}, name, value, dataTypeID, uid = 1, optimize, }) {
     const { extra, sql, select, strict, options /* default: defaultValue, */ } = filter;
     const pk = pg?.pk && table ? pg.pk[table] : undefined;
@@ -33,7 +42,7 @@ export default function formatValue({ pg, table, filter = {}, name, value, dataT
         !value ||
         (!dataTypeID && !extra && !sql && !options) ||
         extra?.input?.toLowerCase?.() === "datatable" ||
-        (!["check", "autocomplete", "tags", "avatar", "radio"].includes(filterType) &&
+        (!selectFilterTypes.includes(filterType) &&
             options?.find?.((el) => el?.sql))) {
         return {};
     }
@@ -105,11 +114,11 @@ export default function formatValue({ pg, table, filter = {}, name, value, dataT
         return { op: "between", query };
     }
     /* select query - from admin.cls / filter options */
-    if (["check", "autocomplete", "tags", "avatar", "radio", "select"].includes(filterType)) {
+    if (selectFilterTypes.includes(filterType)) {
         // multiple checks with predefined query
         if (options?.find?.((el) => el?.sql)) {
             const query = options
-                .filter((el) => value.split(",").includes(el.id))
+                .filter((el) => value.split(",").includes(el.id?.toString?.()))
                 .map((el) => el.sql || "false")
                 .join(" and ") || "false";
             return { op: "=", query };

package/dist/server/routes/menu/controllers/getMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMenu.d.ts","sourceRoot":"","sources":["../../../../../server/routes/menu/controllers/getMenu.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4CzD,wBAA8B,SAAS,CACrC,EACE,IAAS,EACT,OAAO,EACP,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,EAAE,EAAE,UAAU,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,GAAG,IAAI;;;;;;;;;;;;GAuG3B"}
+{"version":3,"file":"getMenu.d.ts","sourceRoot":"","sources":["../../../../../server/routes/menu/controllers/getMenu.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4CzD,wBAA8B,SAAS,CACrC,EACE,IAAS,EACT,OAAO,EACP,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,EAAE,EAAE,UAAU,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,GAAG,IAAI;;;;;;;;;;;;GAwG3B"}

package/dist/server/routes/menu/controllers/getMenu.js

@@ -66,6 +66,7 @@ export default async function adminMenu({ user = {}, session, pg = pgClients.cli
         user?.uid &&
         !user.user_type?.includes?.("admin") &&
         !user.type?.includes?.("admin") &&
+        user.user_type !== "viewer" &&
         pg.pk?.["admin.role_access"]) {
         const { type, gl = [], routes = [], } = await pg
             .query(`select user_type as type, b.gl,routes from admin.users a

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;AA4DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,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,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,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;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAkzBb"}
+{"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;AA4DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,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,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,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;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAgzBb"}

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

@@ -48,11 +48,10 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     if (!paramsTable) {
         return { message: "not enough params: table", status: 400 };
     }
-    const paramsId = params?.id || id;
     const hookData = (await applyHook("preData", {
         pg,
         table: paramsTable,
-        id: paramsId,
+        id: params?.id || id,
         user,
     }));
     if (hookData?.message && hookData?.status) {
@@ -108,10 +107,10 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         !(called && pkey)) {
         return reply.status(404).send("template not found");
     }
-    const id1 = tokenData?.id || hookData?.id || paramsId;
+    const objectId = tokenData?.id || hookData?.id || params?.id || id;
     const { actions = [], query: accessQuery } = (await getAccess({
         table: templateName,
-        id: id1,
+        id: objectId,
         user,
     }, pg));
     if (!actions.includes("view") && !config?.local && !called) {
@@ -130,7 +129,6 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         // console.warn('invalid filters in template: filter_list / filterList');
         // logger.file('crud/warning', { msg: 'invalid filters', template: templateName });
     }
-    const objectId = tokenData?.id || hookData?.id || paramsId;
     const { list: filters = [] } = objectId
         ? {}
         : (await getFilter({
@@ -166,7 +164,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         (!el.sql.includes("{{uid}}") || uid))
         .map((el, i) => ` left join lateral (${el.sql.replace("{{uid}}", uid)}) ${el.name || `t${i}`} on 1=1 `)
         ?.join("") || "";
-    const cardSqlFiltered = hookData?.id || paramsId
+    const cardSqlFiltered = objectId
         ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []
         : [];
     const cardSqlTable = cardSqlFiltered.length
@@ -191,11 +189,11 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             ?.filter((el) => !cols.includes(el))
             .join(",")}`
         : "";
-    if (paramsId && columnList.includes(paramsId)) {
+    if (objectId && columnList.includes(objectId)) {
         return gisIRColumn({
             pg,
             layer: paramsTable,
-            column: paramsId,
+            column: objectId,
             sql: query.sql,
             filter: query.filter,
             search: query.search,
@@ -269,7 +267,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         ? await handlebars.compile(params?.query)({ user, uid })
         : undefined;
     const where = [
-        id1 ? ` "${pk}" = $1` : null,
+        objectId ? ` "${pk}" = $1` : null,
         keyQuery,
         loadTable?.query,
         tokenData?.query,
@@ -285,7 +283,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         .filter(Boolean)
         .filter((el) => checkQuery(el));
     const q = `select  ${pk ? `"${pk}" as id,` : ""} 
-                     ${paramsId || query.key ? "*" : sqlColumns || cols || "*"} 
+                     ${objectId || query.key ? "*" : sqlColumns || cols || "*"} 
                      ${metaCols} 
                      
                      ${dbColumns.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry").length
@@ -299,7 +297,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         .map((el) => `,(${el.sql})`)
         .join("") || ""} from ${table1} t  ${sqlTable} ) t 
                       
-                     ${paramsId ? cardSqlTable : ""} 
+                     ${objectId ? cardSqlTable : ""} 
                      where ${where.join(" and ") || "true"} 
                      ${order} ${offset} limit ${limit}`.replace(/{{uid}}/g, uid);
     if (config.trace)
@@ -308,7 +306,8 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         return q;
     }
     const { rows = [] } = await pg
-        .query(q, (id1 ? [id1] : null) || (query.key && loadTable.key ? [query.key] : []))
+        .query(q, (objectId ? [objectId] : null) ||
+        (query.key && loadTable.key ? [query.key] : []))
         .catch((err) => {
         console.error(err.toString());
         throw err;
@@ -382,7 +381,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     if (query.sql === "2") {
         return qCount;
     }
-    const counts = keyQuery || id1
+    const counts = keyQuery || objectId
         ? { total: rows.length, filtered: rows.length }
         : await pg
             .queryCache?.(qCount, {
@@ -428,6 +427,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                 .filter((key) => index?.tokens[key]?.public ||
                 actions?.includes?.("edit") ||
                 actions?.includes?.("add") ||
+                user?.user_type === "viewer" ||
                 !index?.tokens[key]?.table)
                 .forEach((key) => {
                 const item = index?.tokens[key];
@@ -437,7 +437,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                     item[el] = handlebarsSync.compile(item[el])({
                         user,
                         uid,
-                        id,
+                        id: objectId,
                         data: rows[0],
                     });
                 });
@@ -469,7 +469,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             .map(async (el) => {
             const filtered1 = el.items.filter((item) => item.count?.toLowerCase?.().includes("select"));
             const data = await Promise.all(filtered1.map(async (item) => pg
-                .query(item.count.replace(/{{id}}/g, paramsId))
+                .query(item.count.replace(/{{id}}/g, objectId))
                 .then((item1) => item1.rows[0] || {})));
             filtered1.forEach((el1, i) => {
                 // el1.title = data[i].title;
@@ -479,9 +479,9 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                 .map((item) => item.component ? components[item.component] : null)
                 .filter((item) => item)
                 .join(" union all ");
-            const counts1 = q1 && id
+            const counts1 = q1 && objectId
                 ? await pg
-                    .query(q1, [id1])
+                    .query(q1, [objectId])
                     .then((e) => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
                 : {};
             el.items
@@ -498,7 +498,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                     data: rows[0],
                     user,
                     uid,
-                    id: id1,
+                    id: objectId,
                 });
                 const { rows: sqlData } = await pg.query(q2);
                 data[el.name] = sqlData;
@@ -528,7 +528,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                 const name = el[0].substring(0, el[0].lastIndexOf("."));
                 logger.file("handlebars/error", {
                     table,
-                    id: paramsId,
+                    id: objectId,
                     error: err.toString(),
                     stack: err.stack,
                 });
@@ -602,7 +602,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     const result = await applyHook("afterData", {
         pg,
         table: loadTable?.table || tokenData?.table,
-        id: id1,
+        id: objectId,
         template: templateName,
         payload: res,
         user,

package/package.json

@@ -1,88 +1,88 @@
-{
-  "name": "@opengis/fastify-table",
-  "version": "2.0.43",
-  "type": "module",
-  "description": "core-plugins",
-  "keywords": [
-    "fastify",
-    "table",
-    "crud",
-    "auth",
-    "pg",
-    "backend"
-  ],
-  "main": "dist/index.js",
-  "exports": {
-    ".": "./dist/index.js",
-    "./index.js": "./dist/index.js",
-    "./utils.js": "./dist/utils.js"
-  },
-  "files": [
-    "dist/*"
-  ],
-  "scripts": {
-    "prepublishOnly": "npm run build",
-    "clean": "tsc -b --clean",
-    "build": "tsc -b --clean && tsc && copyfiles server/plugins/grpc/utils/*.proto dist && copyfiles server/migrations/*.sql dist && copyfiles server/templates/**/*.html dist",
-    "prod": "NODE_ENV=production bun dist/server",
-    "patch": "npm version patch && git push && npm publish",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "test": "bun test",
-    "compress": "node compress.js",
-    "dev1": "bun --hot dist/server",
-    "dev": "NODE_ENV=production bun start",
-    "start": "bun server"
-  },
-  "dependencies": {
-    "@aws-sdk/client-s3": "3.879.0",
-    "@aws-sdk/lib-storage": "3.879.0",
-    "@fastify/cookie": "11.0.2",
-    "@fastify/http-proxy": "11.1.2",
-    "@fastify/multipart": "9.0.3",
-    "@fastify/passport": "3.0.2",
-    "@fastify/rate-limit": "10.3.0",
-    "@fastify/session": "11.1.0",
-    "@grpc/grpc-js": "1.10.11",
-    "@grpc/proto-loader": "0.7.15",
-    "apache-crypt": "1.2.6",
-    "better-sqlite3": "12.2.0",
-    "dotenv": "16.5.0",
-    "fastify": "5.3.3",
-    "fastify-plugin": "5.0.1",
-    "fastify-session-redis-store": "7.1.2",
-    "handlebars": "4.7.8",
-    "image-size": "1.2.0",
-    "ioredis": "5.3.2",
-    "js-yaml": "4.1.0",
-    "markdown-it": "14.1.0",
-    "nodemailer": "7.0.6",
-    "otplib": "12.0.1",
-    "pg": "8.11.6",
-    "pino": "9.5.0",
-    "pino-abstract-transport": "2.0.0",
-    "promised-handlebars": "2.0.1",
-    "qrcode": "1.5.4",
-    "uglify-js": "3.19.3",
-    "undici": "7.16.0"
-  },
-  "devDependencies": {
-    "@types/better-sqlite3": "^7.6.13",
-    "@types/bun": "^1.2.21",
-    "@types/js-yaml": "^4.0.9",
-    "@types/markdown-it": "^14.1.2",
-    "@types/node": "^24.3.1",
-    "@types/nodemailer": "^7.0.1",
-    "@types/passport": "^1.0.17",
-    "@types/passport-local": "^1.0.38",
-    "@types/pg": "^8.15.5",
-    "@types/qrcode": "^1.5.5",
-    "copyfiles": "^2.4.1",
-    "eslint": "^9.35.0",
-    "eslint-config-airbnb-extended": "^2.3.1",
-    "ts-migrate": "^0.1.35",
-    "typescript": "^5.9.2",
-    "vitest": "^3.2.4"
-  },
-  "author": "Softpro",
-  "license": "ISC"
-}
+{
+  "name": "@opengis/fastify-table",
+  "version": "2.0.45",
+  "type": "module",
+  "description": "core-plugins",
+  "keywords": [
+    "fastify",
+    "table",
+    "crud",
+    "auth",
+    "pg",
+    "backend"
+  ],
+  "main": "dist/index.js",
+  "exports": {
+    ".": "./dist/index.js",
+    "./index.js": "./dist/index.js",
+    "./utils.js": "./dist/utils.js"
+  },
+  "files": [
+    "dist/*"
+  ],
+  "scripts": {
+    "prepublishOnly": "npm run build",
+    "clean": "tsc -b --clean",
+    "build": "tsc -b --clean && tsc && copyfiles server/plugins/grpc/utils/*.proto dist && copyfiles server/migrations/*.sql dist && copyfiles server/templates/**/*.html dist",
+    "prod": "NODE_ENV=production bun dist/server",
+    "patch": "npm version patch && git push && npm publish",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "test": "bun test",
+    "compress": "node compress.js",
+    "dev1": "bun --hot dist/server",
+    "dev": "NODE_ENV=production bun start",
+    "start": "bun server"
+  },
+  "dependencies": {
+    "@aws-sdk/client-s3": "3.879.0",
+    "@aws-sdk/lib-storage": "3.879.0",
+    "@fastify/cookie": "11.0.2",
+    "@fastify/http-proxy": "11.1.2",
+    "@fastify/multipart": "9.0.3",
+    "@fastify/passport": "3.0.2",
+    "@fastify/rate-limit": "10.3.0",
+    "@fastify/session": "11.1.0",
+    "@grpc/grpc-js": "1.10.11",
+    "@grpc/proto-loader": "0.7.15",
+    "apache-crypt": "1.2.6",
+    "better-sqlite3": "12.2.0",
+    "dotenv": "16.5.0",
+    "fastify": "5.3.3",
+    "fastify-plugin": "5.0.1",
+    "fastify-session-redis-store": "7.1.2",
+    "handlebars": "4.7.8",
+    "image-size": "1.2.0",
+    "ioredis": "5.3.2",
+    "js-yaml": "4.1.0",
+    "markdown-it": "14.1.0",
+    "nodemailer": "7.0.6",
+    "otplib": "12.0.1",
+    "pg": "8.11.6",
+    "pino": "9.5.0",
+    "pino-abstract-transport": "2.0.0",
+    "promised-handlebars": "2.0.1",
+    "qrcode": "1.5.4",
+    "uglify-js": "3.19.3",
+    "undici": "7.16.0"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/bun": "^1.2.21",
+    "@types/js-yaml": "^4.0.9",
+    "@types/markdown-it": "^14.1.2",
+    "@types/node": "^24.3.1",
+    "@types/nodemailer": "^7.0.1",
+    "@types/passport": "^1.0.17",
+    "@types/passport-local": "^1.0.38",
+    "@types/pg": "^8.15.5",
+    "@types/qrcode": "^1.5.5",
+    "copyfiles": "^2.4.1",
+    "eslint": "^9.35.0",
+    "eslint-config-airbnb-extended": "^2.3.1",
+    "ts-migrate": "^0.1.35",
+    "typescript": "^5.9.2",
+    "vitest": "^3.2.4"
+  },
+  "author": "Softpro",
+  "license": "ISC"
+}

package/dist/server/plugins/grpc/utils/server/plugins/grpc/utils/convertp.proto

@@ -1,137 +0,0 @@
-syntax = "proto3";
-
-service Convert {
-  rpc csvToXls(csvToXlsParams) returns (FileBase64) {}
-  rpc jsonToXls(jsonToXlsParams) returns (FileBase64) {}
-  rpc pdfMerge(pdfMergeParams) returns (FileBase64) {}
-  rpc htmlToPdf(htmlToPdfParams) returns (FileBase64) {}
-  rpc excelToJson(excelToJsonParams) returns (FileBase64) {}
-  rpc xmlToJson(xmlToJsonParams) returns (FileBase64) {}
-  rpc htmlToDoc(htmlToDocParams) returns (FileBase64) {}
-  rpc htmlToImage(htmlToImageParams) returns (FileBase64) {}
-  rpc geojsonToShp(geojsonToShpParams) returns (FileBase64) {}
-  rpc shpToGeojson(shpToGeojsonParams) returns (FileBase64) {}
-  rpc docToPDF(docToPDFParams) returns (FileBase64) {}
-  rpc mergeImages(mergeImagesIn) returns (FileBase64) {}
-  rpc resizeImage(resizeImageIn) returns (FileBase64) {}
-  rpc jsonToYaml(jsonToYamlIn) returns (FileBase64) {}
-  rpc yamlToJson(yamlToJsonIn) returns (FileBase64) {}
-  rpc log(log_in) returns (log_out) {}
-  rpc geojsonToGpkg(geojsonToShpParams) returns (FileBase64) {}
-}
-
-message jsonToYamlIn {
-  string json = 1;
-}
-
-message yamlToJsonIn {
-  string yaml = 1;
-}
-
-message resizeImageIn {
-  string base64 = 1;
-  uint64 width = 2;
-  uint64 height = 3;
-  uint32 quality = 4;
-  uint32 subsampling = 5;
-}
-
-message pdfToImgIn {
-  string pdfPath = 1;
-  string imgPath = 2;
-}
-
-message pdfToImgOut {
-  string imgPath = 1;
-}
-
-message log_in {
-	uint32 rows = 1;
-	string level = 2;
-}
-
-message log_out {
-	repeated string logs = 1;
-}
-
-enum mergeImageFormat {
-  VERTICAL = 0;
-  HORIZONTAL = 1;
-  OVERLAY = 2;
-}
-
-message imageMeta {
-  string base64 = 1;
-  mergeImageFormat mergeFormat = 2;
-}
-
-message mergeImagesIn {
-  repeated string images = 1;
-  repeated imageMeta imagesMeta = 2;
-  string background = 3;
-  string mergeFormat = 4;
-}
-
-message docToPDFParams {
-  string base64 = 1;
-  string to = 2;
-  string ext = 3;
-}
-
-message shpToGeojsonParams {
-  string base64 = 1;
-}
-
-message geojsonToShpParams {
-  string geojson = 1;
-  string proj = 2;
-}
-
-message xmlToJsonParams {
-  string xml = 1;
-}
-
-message jsonToXlsParams {
-  string json = 1;
-  string header = 2;
-  string subheader = 3;
-  string colmodel = 4;
-}
-
-message csvToXlsParams {
-  string csv = 1;
-  string header = 2;
-  string subheader = 3;
-  string separator = 4;
-}
-
-message excelToJsonParams {
-  string base64 = 1;
-  string type = 2;
-  string delimiter = 3;
-  string encoding = 4;
-}
-
-message htmlToPdfParams {
-  string html = 1;
-  string pdfPageConfig = 2;
-}
-
-message pdfMergeParams {
-  repeated string mergeFiles = 1;
-}
-
-message htmlToImageParams {
-  string html = 1;
-  string format = 2;
-  uint64 width = 3;
-  uint64 height = 4;
-}
-
-message htmlToDocParams {
-  string html = 1;
-}
-
-message FileBase64 {
-  string result = 1;
-}

package/dist/server/plugins/grpc/utils/server/plugins/grpc/utils/office2pdf.proto

@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-service OfficeConverterService {
-  rpc OfficeToPdf(OfficeToPdfRequest) returns (OfficeToPdfResponse) {}
-}
-
-message OfficeToPdfRequest {
-  string file = 1;
-  string ext = 2;
-}
-
-message OfficeToPdfResponse {
-  string file = 1;
-}

package/dist/server/plugins/hook/funcs/addHook.js

@@ -1,7 +0,0 @@
-import hookList from "../hookList.js";
-export default function addHook(name, fn) {
-    if (!hookList[name]) {
-        hookList[name] = [];
-    }
-    hookList[name].push(fn);
-}

package/dist/server/plugins/hook/funcs/applyHook.js

@@ -1,25 +0,0 @@
-/* eslint-disable no-console */
-import config from "../../../../config.js";
-import hookList from "../hookList.js";
-export default async function applyHook(name, data) {
-    const { trace } = config;
-    if (trace)
-        console.log("applyHook", name);
-    if (!hookList[name]?.length)
-        return null;
-    const result = {};
-    await Promise.all(hookList[name].map(async (hook) => {
-        const hookData = await hook({ ...data, config });
-        if (hookData) {
-            if (trace)
-                console.log("applyHook", name, hookData);
-            Object.assign(result, hookData);
-        }
-    })).catch((err) => {
-        console.error("applyHook", name, err.toString());
-    });
-    if (Object.keys(result).length) {
-        return result;
-    }
-    return null;
-}

package/dist/server/plugins/hook/funcs/applyHookSync.js

@@ -1,7 +0,0 @@
-import hookList from "../hookList.js";
-export default function applyHookSync(name, data) {
-    if (!hookList[name]?.length)
-        return null;
-    const hookData = hookList[name].map((hook) => hook(data))[0];
-    return hookData;
-}

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

@@ -1,7 +0,0 @@
-// import addHook from './funcs/addHook.js';
-// import applyHook from './funcs/applyHook.js';
-async function plugin() {
-    //   fastify.decorate('addHook', addHook);
-    //   fastify.decorate('applyHook', applyHook);
-}
-export default plugin;

package/dist/server/routes/logger/controllers/utils/checkUserAccess.js

@@ -1,22 +0,0 @@
-import config from "../../../../../config.js";
-const { accessToken = "0NWcGQxKRP8AsRxD" } = config.auth || {};
-/**
- *
- * @summary check user access to logger interface - per admin user type or user group
- * @returns {Object} message, status
- */
-export default function checkUserAccess({ user = {}, token, }) {
-    if (token && token === accessToken) {
-        return { message: "access granted", status: 200 };
-    }
-    // console.log(user);
-    if (!user.user_type?.includes?.("admin") &&
-        !config?.local &&
-        !config.auth?.disable) {
-        return { message: "access restricted", status: 403 };
-    }
-    /* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
-      return { message: 'access restricted', status: 403 };
-    } */
-    return { message: "access granted", status: 200 };
-}

package/dist/server/routes/logger/controllers/utils/getRootDir.js

@@ -1,25 +0,0 @@
-/* eslint-disable no-console */
-import fs from "node:fs";
-import path from "node:path";
-import config from "../../../../../config.js";
-// import { existsSync } from 'fs';
-let logDir = null;
-export default function getRootDir() {
-    // absolute / relative path
-    if (logDir)
-        return logDir;
-    const file = ["config.json", "/data/local/config.json"].find((el) => fs.existsSync(el) ? el : null);
-    const root = file === "config.json" ? process.cwd() : "/data/local";
-    logDir = config.logDir || path.join(root, config.log?.dir || "log");
-    console.log({ logDir });
-    return logDir;
-    // windows debug support
-    /* const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
-    // docker default path
-    if (existsSync(customLogDir)) {
-      return path.join(customLogDir, config.folder || '', 'log');
-    }
-  
-    // non-docker default path
-    return path.join(config.root || '/data/local', config.folder || '', 'log'); */
-}