@opengis/fastify-table 2.6.1 → 2.6.3

package/dist/helper.d.ts

@@ -1,26 +1,7 @@
 import config from "./config.js";
 import { pgClients } from "./utils.js";
 declare const prefix: any;
-export declare function injectWithHeaders(opts: any): Promise<{
-    json: () => unknown;
-    body: unknown;
-    headers: {
-        [k: string]: string;
-    };
-    statusCode: number;
-    ok: boolean;
-    status: number;
-    statusText: string;
-    type: import("undici-types").ResponseType;
-    url: string;
-    redirected: boolean;
-    bodyUsed: boolean;
-    arrayBuffer: () => Promise<ArrayBuffer>;
-    blob: () => Promise<import("node:buffer").Blob>;
-    bytes: () => Promise<Uint8Array>;
-    formData: () => Promise<import("undici-types").FormData>;
-    text: () => Promise<string>;
-}>;
+export declare function injectWithHeaders(opts: any): Promise<any>;
 export declare function setup(): Promise<void>;
 export declare function teardown(): Promise<void>;
 export declare function build(): Promise<any>;

package/dist/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../helper.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,QAAA,MAAQ,MAAM,KAAoB,CAAC;AAInC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG;;;;;;;;;;;;;;;;;;;GAiChD;AAED,wBAAsB,KAAK,kBAI1B;AAGD,wBAAsB,QAAQ,kBAW7B;AAED,wBAAsB,KAAK,iBA+B1B;AAED,OAAO,EAEL,MAAM,EACN,MAAM,EACN,SAAS,GACV,CAAC"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../helper.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,QAAA,MAAQ,MAAM,KAAoB,CAAC;AAInC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAiC/D;AAED,wBAAsB,KAAK,kBAI1B;AAGD,wBAAsB,QAAQ,kBAW7B;AAED,wBAAsB,KAAK,iBA+B1B;AAED,OAAO,EAEL,MAAM,EACN,MAAM,EACN,SAAS,GACV,CAAC"}

package/dist/server/migrations/roles.sql

@@ -130,6 +130,7 @@ ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS access_granted_time timest
 ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS actions text [];
 
 ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_pkey PRIMARY KEY (ugr_id);
+delete from admin.user_roles where user_uid not in (select uid from admin.users); -- prevent migration errors caused by missing users
 ALTER TABLE admin.user_roles ADD CONSTRAINT user_roles_user_uid_fkey FOREIGN KEY (user_uid) REFERENCES admin.users (uid) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE CASCADE;
 ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_role_id_fkey FOREIGN KEY (role_id) REFERENCES admin.roles (role_id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE CASCADE;
 ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_user_uid_role_id_key UNIQUE (user_uid, role_id);

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

@@ -7,8 +7,8 @@ import config from "../../../config.js";
 import getRedis from "../redis/funcs/getRedis.js";
 import { ForbiddenError } from "../../../errors.js";
 const { prefix = "/api" } = config;
-const { secret } = config.auth || {};
-if (!secret) {
+const { auth } = config || {};
+if (!auth?.secret && process.platform !== 'win32') {
     throw new Error("environment variable auth.secret not set");
 }
 const fastifyPassport = new Authenticator();
@@ -127,7 +127,7 @@ function plugin(fastify) {
         parseOptions: config?.auth?.cookieOptions || { secure: false },
     });
     fastify.register(session, {
-        secret: secret,
+        secret: auth?.secret || 'fastify-session-redis-store-secret',
         cookieName: "session_auth",
         cookie: config?.auth?.cookieOptions || { secure: false },
         store: new RedisStore({

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

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

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

@@ -13,7 +13,7 @@ export async function getTableColumnMeta({ table, template, column, selectName,
         table,
     }).then((el) => el?.columns || []);
     const { dataTypeID } = (metaColumns || []).find((col) => col?.name === column) || {};
-    const { columns, table: tableName, sql, } = template ? await getTemplate("table", template) : { table, columns: [] };
+    const { columns, table: tableName, sql, } = template ? await getTemplate("table", template) : { sql: [], table, columns: [] };
     const filters = template
         ? await getFilter({ pg, table: template }).then((el) => el.list)
         : null;
@@ -83,7 +83,7 @@ export async function getTableColumnMeta({ table, template, column, selectName,
 export default async function suggest(req) {
     const time = Date.now();
     const { params, user, query = {}, pg: pg1 = pgClients.client } = req;
-    const { lang = "ua", parent } = query;
+    const { lang = "ua", parent, page = 0 } = query;
     const debugMode = config.local ||
         user?.user_type?.includes?.("admin") ||
         process.env.NODE_ENV === "test" ||
@@ -258,7 +258,9 @@ export default async function suggest(req) {
             const data2 = data1.filter((el) => el.id === "null"
                 ? vals.includes(null)
                 : el.id && vals.includes(el.id.toString()));
-            const data = data2.slice(0, Math.min(query.limit || limit, limit));
+            const limit1 = Math.min(query.limit || limit, limit);
+            const offset = page && page > 0 ? (page - 1) * limit1 : 0;
+            const data = data2.slice(offset, limit1 + offset);
             if (data.length && query.count) {
                 const counts = qRes.rows?.reduce?.((acc, curr) => ({
                     ...acc,
@@ -280,7 +282,8 @@ export default async function suggest(req) {
             }
             return {
                 time: Date.now() - time,
-                limit: Math.min(query.limit || limit, limit),
+                limit: limit1,
+                offset,
                 count: data.length,
                 total: arr.length,
                 mode: "array",
@@ -298,7 +301,9 @@ export default async function suggest(req) {
                 (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1)
                 ?.filter((el) => !query.val || query.val?.split?.(",")?.includes?.(el.id))
             : arr;
-        const data = data1.slice(0, Math.min(query.limit || limit, limit));
+        const limit1 = Math.min(query.limit || limit, limit);
+        const offset = page && page > 0 ? (page - 1) * limit1 : 0;
+        const data = data1.slice(offset, limit1 + offset);
         if (config.debug) {
             logger.file("suggest/debug", {
                 type: 2,
@@ -309,11 +314,12 @@ export default async function suggest(req) {
         }
         return {
             time: Date.now() - time,
-            limit: Math.min(query.limit || limit, limit),
+            limit: limit1,
+            offset,
             count: data.length,
             total: arr.length,
             mode: "array",
-            data,
+            data
         };
     }
     const args = [];
@@ -343,15 +349,18 @@ export default async function suggest(req) {
         ? ""
         : "order by 2";
     const whereQuery = where.filter(Boolean).join(" and ") || "true";
-    args.push(Math.min(query.limit || meta.limit || limit, limit));
+    const limit1 = Math.min(query.limit || meta.limit || limit, limit);
+    const offset = page && page > 0 ? (page - 1) * limit1 : 0;
+    args.push(limit1);
+    args.push(offset);
     let sqlSuggest = tableName && column
         ? `${meta.original}
           WHERE EXISTS ( SELECT 1 FROM ${tableName} o 
             WHERE ${pg.pgType[dataTypeID]?.includes("[]")
             ? `c.id = ANY(o."${column}")`
             : `o."${column}" IS NOT DISTINCT FROM c.id`} ) and ${whereQuery || "true"}
-          ${order} LIMIT $${args.length}::int`
-        : `with c(id,text) as ( ${meta.original} where ${whereQuery} ${order}) select * from c LIMIT $${args.length}::int`;
+          ${order} LIMIT $${args.length - 1}::int OFFSET $${args.length}::int`
+        : `with c(id,text) as ( ${meta.original} where ${whereQuery} ${order}) select * from c LIMIT $${args.length - 1}::int OFFSET $${args.length}::int`;
     if (sqlSuggest.includes("{{parent}}")) {
         args.push(parent || "");
         sqlSuggest = sqlSuggest.replace(/(['"]?){{parent}}\1/gi, `$${args.length}`);
@@ -385,7 +394,8 @@ export default async function suggest(req) {
         });
         return {
             time: Date.now() - time,
-            limit: Math.min(query.limit || meta.limit || limit, limit),
+            limit: limit1,
+            offset,
             count: data.length,
             total: meta.count - 0,
             mode: type === "cls" ? "array" : "sql",
@@ -418,7 +428,8 @@ export default async function suggest(req) {
     }
     const message = {
         time: Date.now() - time,
-        limit: Math.min(query.limit || meta.limit || limit, limit),
+        limit: limit1,
+        offset,
         count: data.length,
         total: meta.count - 0,
         mode: "sql",

package/dist/server/routes/table/schema.d.ts

@@ -153,6 +153,11 @@ declare const suggestSchema: {
                 minimum: number;
                 maximum: number;
             };
+            page: {
+                type: string;
+                minimum: number;
+                maximum: number;
+            };
             parent: {
                 type: string;
                 pattern: string;

package/dist/server/routes/table/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../server/routes/table/schema.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyBpB,CAAC;AAEF,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BhB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAajB,CAAC;AAEF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuBlB,CAAC;AAEF,QAAA,MAAM,UAAU;;;;;;;;;;;;;;CAQf,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;CAOjB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;CAatB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;CAQtB,CAAC;AAEF,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,UAAU,EACV,YAAY,EACZ,iBAAiB,GAClB,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../server/routes/table/schema.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyBpB,CAAC;AAEF,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BhB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAajB,CAAC;AAEF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwBlB,CAAC;AAEF,QAAA,MAAM,UAAU;;;;;;;;;;;;;;CAQf,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;CAOjB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;CAatB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;CAQtB,CAAC;AAEF,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,UAAU,EACV,YAAY,EACZ,iBAAiB,GAClB,CAAC"}

package/dist/server/routes/table/schema.js

@@ -76,6 +76,7 @@ const suggestSchema = {
         properties: {
             lang: { type: "string", pattern: "^([\\w]+)$" },
             limit: { type: "integer", minimum: 1, maximum: 200 },
+            page: { type: "integer", minimum: 1, maximum: 1000 },
             parent: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
             sel: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
             name: { type: "string", pattern: "^([\\d\\w_.-]+)$" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -51,11 +51,11 @@
     "@fastify/passport": "3.0.2",
     "@fastify/rate-limit": "11.1.0",
     "@fastify/session": "11.1.1",
-    "@grpc/grpc-js": "1.14.4",
+    "@grpc/grpc-js": "1.14.5",
     "@grpc/proto-loader": "0.8.1",
     "apache-crypt": "1.2.6",
     "dotenv": "17.4.2",
-    "fastify": "5.9.0",
+    "fastify": "5.12.5",
     "fastify-plugin": "6.0.0",
     "fastify-session-redis-store": "7.1.2",
     "file-type": "^22.0.1",

package/dist/module/core/select/core.user_mentioned.json

@@ -1,3 +0,0 @@
-{
-    "public": true
-}