@opengis/fastify-table 2.3.5 → 2.4.0

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

@@ -1 +1 @@
-{"version":3,"file":"errorMessage.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/errorMessage.ts"],"names":[],"mappings":"AAQA,iBAAS,YAAY,CAAC,KAAK,EAAE,GAAG,OAsB/B;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"errorMessage.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/errorMessage.ts"],"names":[],"mappings":"AAOA,iBAAS,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,OAuB/C;AAED,eAAe,YAAY,CAAC"}

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

@@ -1,27 +1,26 @@
 import config from "../../../config.js";
 import applyHookSync from "../hook/applyHookSync.js";
-import errorStatus from "./errorStatus.js";
 const defaultMessage = {
     602: "Порушення цілісності бази даних",
 };
-function errorMessage(error) {
+function errorMessage(error, status) {
     const hook = applyHookSync("errorMessage", error);
     if (hook)
         return hook;
+    if (error.validation) {
+        return error.message;
+    }
     if (error.routine === "exec_stmt_raise" && error.file === "pl_exec.c") {
         return error.message;
     }
-    // messgae status
-    const status = errorStatus(error);
+    // message status
     if (config.errorMessage?.[status])
         return config.errorMessage[status.toString()];
-    if (defaultMessage[status])
+    if (defaultMessage[status]) {
         return defaultMessage[status];
-    if (error.statusCode && error.statusCode !== 500 && error.message) {
-        return config.errorMessage?.[error.statusCode] || error.message;
     }
     return config.local
-        ? error.toString()
+        ? error.message || error.toString()
         : config.errorMessage?.[500] || "ServerError";
 }
 export default errorMessage;

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

@@ -1 +1 @@
-{"version":3,"file":"errorStatus.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/errorStatus.ts"],"names":[],"mappings":"AAEA,iBAAS,WAAW,CAAC,KAAK,EAAE,GAAG,OAe9B;AACD,eAAe,WAAW,CAAC"}
+{"version":3,"file":"errorStatus.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/errorStatus.ts"],"names":[],"mappings":"AAEA,iBAAS,WAAW,CAAC,KAAK,EAAE,GAAG,OAuB9B;AACD,eAAe,WAAW,CAAC"}

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

@@ -3,6 +3,9 @@ function errorStatus(error) {
     const hook = applyHookSync("errorStatus", error);
     if (hook)
         return hook;
+    if (error.validation) {
+        return 422;
+    }
     if (error.routine === "exec_stmt_raise" && error.file === "pl_exec.c") {
         return 601;
     }
@@ -12,6 +15,9 @@ function errorStatus(error) {
     if (error.type === "DatabaseError") {
         return 600;
     }
+    if (error.statusCode) {
+        return error.statusCode;
+    }
     return 500;
 }
 export default errorStatus;

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

@@ -1,4 +1,4 @@
 import type { FastifyInstance } from "fastify";
-declare function plugin(fastify: FastifyInstance): Promise<void>;
-export default plugin;
+declare function loggerPlugin(fastify: FastifyInstance): void;
+export default loggerPlugin;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAmD7E,iBAAe,MAAM,CAAC,OAAO,EAAE,eAAe,iBAwC7C;AACD,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAyD7E,iBAAS,YAAY,CAAC,OAAO,EAAE,eAAe,QA+B7C;AACD,eAAe,YAAY,CAAC"}

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

@@ -1,4 +1,5 @@
 import errorMessage from "./errorMessage.js";
+import errorStatus from "./errorStatus.js";
 import logger from "./getLogger.js";
 import pgClients from "../pg/pgClients.js";
 // avoid process exit with exception on network changes: disconnect from db, internet altogether etc
@@ -33,43 +34,40 @@ process.on("unhandledRejection", (err) => {
         console.warn("Ignored fastify reply sent exception:", err.toString());
         return;
     }
+    if (err.message === "sorry, too many clients already") {
+        logger.file("pg", { error: err.message, stack: err.stack });
+        console.warn("Ignored pg pool sent exception:", err.toString());
+        return;
+    }
     logger.file("unhandledRejection", {
         error: err.toString(),
         stack: err.stack,
     });
     throw err;
 });
-async function plugin(fastify) {
+function loggerPlugin(fastify) {
     fastify.addHook("onResponse", async (req, reply) => {
         if (reply?.statusCode && reply.statusCode >= 400) {
             logger.metrics(`error-count:${reply.statusCode}`);
         }
     });
     fastify.setErrorHandler(async (error, request, reply) => {
-        // validation not error
-        if (error.validation) {
-            request.log.warn(request, {
-                code: error?.code,
-                status: 422,
-                error: error.toString(),
-            });
-            return reply.status(422).send({ error: error.toString(), code: 422 });
-        }
-        // logger
-        request.log.error(error, request);
+        logger.error(error, request);
         console.error({
             msg: error.message,
             where: error.where,
             stack: error.stack,
         });
-        // errorMessage
-        const msg = errorMessage(error);
-        return reply
-            .status(error.statusCode || 500)
-            .send({ error: msg, code: error.statusCode || 500 });
+        const statusCode = errorStatus(error) || 500;
+        const message = errorMessage(error, statusCode);
+        return reply.status(statusCode).send({
+            message,
+            error: error.code || "INTERNAL_SERVER_ERROR",
+            statusCode,
+        });
     });
     fastify.addHook("onListen", async () => {
         logger.file("init", { db: pgClients.client?.options?.database });
     });
 }
-export default plugin;
+export default loggerPlugin;

package/dist/server/plugins/pg/funcs/getMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getMeta.ts"],"names":[],"mappings":"AAKA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,gBAuE5D"}
+{"version":3,"file":"getMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getMeta.ts"],"names":[],"mappings":"AAMA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,gBAyE5D"}

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

@@ -1,10 +1,12 @@
 import init from "./init.js";
 import getPG from "./getPG.js";
+import { BadRequestError } from "../../../../errors.js";
 const data = {};
 export default async function getMeta(opt, nocache) {
     const pg = opt?.pg || getPG({ name: "client" });
-    if (!pg)
-        return { error: "pg connection not established", status: 400 };
+    if (!pg) {
+        throw BadRequestError("pg client not found");
+    }
     // reconnect if at start of process connection was unavailable
     if (!pg.pk || nocache) {
         await init(pg);
@@ -15,7 +17,7 @@ export default async function getMeta(opt, nocache) {
         return data[pg.options.database][table];
     if (!pg?.tlist?.includes(table) &&
         !pg?.tlist?.includes(table?.replace?.(/"/g, ""))) {
-        return { error: `${table} - not found`, status: 400 };
+        throw BadRequestError(`table not found: ${table}`);
     }
     const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
     const pks1 = await pg

package/dist/server/plugins/policy/funcs/checkJWT.d.ts

@@ -1,17 +1,8 @@
 import type { ExtendedRequest } from "../../../types/core.js";
 export default function checkJWT(req: ExtendedRequest): Promise<{
-    error: string;
-    code: number;
-    token?: undefined;
-    valid?: undefined;
-    payload?: undefined;
-    redirectURIs?: undefined;
-} | {
     token: any;
     valid: boolean;
     payload: any;
     redirectURIs: any;
-    error?: undefined;
-    code?: undefined;
 } | null>;
 //# sourceMappingURL=checkJWT.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"checkJWT.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkJWT.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAMhC,wBAA8B,QAAQ,CAAC,GAAG,EAAE,eAAe;;;;;;;;;;;;;;UAoG1D"}
+{"version":3,"file":"checkJWT.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkJWT.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAOhC,wBAA8B,QAAQ,CAAC,GAAG,EAAE,eAAe;;;;;UAoG1D"}

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

@@ -1,6 +1,7 @@
 import getIP from "./getIP.js";
 import logger from "../../logger/getLogger.js";
 import { scryptVerify, verify } from "../../auth/funcs/jwt.js";
+import { ForbiddenError, UnauthorizedError } from "../../../../errors.js";
 export default async function checkJWT(req) {
     const { originalUrl: path, headers, method, routeOptions, pg } = req;
     const ip = getIP(req);
@@ -28,10 +29,10 @@ export default async function checkJWT(req) {
             ip,
             uid: user?.uid,
         });
-        return { error: "unauthorized", code: 401 };
+        throw UnauthorizedError("unaothorized");
     }
     if (!pg) {
-        return { error: "empty pg", code: 400 };
+        throw new Error("empty pg");
     }
     const { clientId, tokenHash, isRevoked, isExpired } = await pg
         .query('select client_id as "clientId", token_hash as "tokenHash", revoked_at is not null as "isRevoked", expires_at <= now() as "isExpired" from oauth.tokens where ip=$1 and token_hint=$2', [ip, jwtToken.slice(-6)])
@@ -45,7 +46,7 @@ export default async function checkJWT(req) {
             jwtToken: jwtToken.slice(-6),
             uid: user?.uid,
         });
-        return { error: "forbidden", code: 403 };
+        throw ForbiddenError("forbidden");
     }
     const isValid = await scryptVerify(tokenHash || "", jwtToken);
     if (requireJWT && !isValid) {
@@ -57,7 +58,7 @@ export default async function checkJWT(req) {
             clientId,
             uid: user?.uid,
         });
-        return { error: "forbidden", code: 403 };
+        throw ForbiddenError("forbidden");
     }
     const q = `select client_secret_hash as "secret", redirect_uris as "redirectURIs" from oauth.clients where client_id=$1 and token_endpoint_auth_method=$2`;
     const { secret, redirectURIs } = pg?.pk?.["oauth.clients"]
@@ -76,7 +77,7 @@ export default async function checkJWT(req) {
             clientId,
             uid: user?.uid,
         });
-        return { error: "forbidden", code: 403 };
+        throw ForbiddenError("forbidden");
     }
     return { token: jwtToken, valid: true, payload, redirectURIs };
 }

package/dist/server/plugins/policy/funcs/checkPermissions.d.ts

@@ -1,6 +1,3 @@
 import type { ExtendedRequest } from "../../../types/core.js";
-export default function checkPermissions(req: ExtendedRequest): Promise<{
-    error: string;
-    code: number;
-} | null>;
+export default function checkPermissions(req: ExtendedRequest): Promise<null>;
 //# sourceMappingURL=checkPermissions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"checkPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAMhC,wBAA8B,gBAAgB,CAAC,GAAG,EAAE,eAAe;;;UA4DlE"}
+{"version":3,"file":"checkPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAOhC,wBAA8B,gBAAgB,CAAC,GAAG,EAAE,eAAe,iBA4DlE"}

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

@@ -1,6 +1,7 @@
 import logger from "../../logger/getLogger.js";
 import getUserPermissions from "../../access/funcs/getUserPermissions.js";
 import pgClients from "../../pg/pgClients.js";
+import { ForbiddenError } from "../../../../errors.js";
 export default async function checkPermissions(req) {
     const { originalUrl: path, query, params, method, routeOptions, pg = pgClients.client, } = req;
     const user = req.user || req.session?.passport?.user;
@@ -28,7 +29,7 @@ export default async function checkPermissions(req) {
             message: "access restricted: permissions",
             uid: user?.uid,
         });
-        return { error: "access restricted: permissions", code: 403 };
+        throw ForbiddenError("access restricted: permissions");
     }
     return null;
 }

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

@@ -1,6 +1,3 @@
 import type { ExtendedRequest } from "../../../types/core.js";
-export default function checkPolicy(req: ExtendedRequest, jwt?: any): {
-    error: string;
-    code: number;
-} | null;
+export default function checkPolicy(req: ExtendedRequest, jwt?: any): null;
 //# sourceMappingURL=checkPolicy.d.ts.map

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,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,GAAG;;;SAqKlE"}
+{"version":3,"file":"checkPolicy.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAMhC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,GAAG,QAqKlE"}

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

@@ -1,4 +1,5 @@
 import { config, logger } from "../../../../utils.js";
+import { ConflictError, ForbiddenError } from "../../../../errors.js";
 import block from "../sqlInjection.js";
 export default function checkPolicy(req, jwt) {
     const { originalUrl: path, hostname, query, params, headers, method, routeOptions, } = req;
@@ -31,7 +32,7 @@ export default function checkPolicy(req, jwt) {
             method,
             userRole: user.user_type,
         });
-        return { error: "access restricted: 0", code: 403 };
+        throw ForbiddenError("access restricted: 0");
     }
     // ! role
     if (isRole) {
@@ -45,7 +46,7 @@ export default function checkPolicy(req, jwt) {
             body,
             uid: user?.uid,
         });
-        return { error: "access restricted: 0", code: 403 };
+        throw ForbiddenError("access restricted: 0");
     }
     // ! file injection
     if (JSON.stringify(params || {})?.includes("../") ||
@@ -59,7 +60,7 @@ export default function checkPolicy(req, jwt) {
             body,
             uid: user?.uid,
         });
-        return { error: "access restricted: 1", code: 409 };
+        throw ConflictError("access restricted: 1");
     }
     // ! invalid file extension
     if (path.includes("files/") && allowExtPublic.includes(ext)) {
@@ -77,7 +78,7 @@ export default function checkPolicy(req, jwt) {
             stopWords,
             uid: user?.uid,
         });
-        return { error: "access restricted: 2", code: 409 };
+        throw ConflictError("access restricted: 2");
     }
     // ! user required, but not logged in
     if (requireUser && !user && !jwt?.valid) {
@@ -88,7 +89,7 @@ export default function checkPolicy(req, jwt) {
             query,
             body,
         });
-        return { error: "access restricted: 3", code: 401 };
+        throw ForbiddenError("access restricted: 3");
     }
     // ! referer
     if (requireReferer && !headers?.referer?.includes?.(hostname)) {
@@ -100,7 +101,7 @@ export default function checkPolicy(req, jwt) {
             body,
             uid: user?.uid,
         });
-        return { error: "access restricted: 4", code: 403 };
+        throw ForbiddenError("access restricted: 4");
     }
     // ! public / token
     if (isPublic || config.debug) {
@@ -121,7 +122,7 @@ export default function checkPolicy(req, jwt) {
             message: "access restricted: 6",
             uid: user?.uid,
         });
-        return { error: "access restricted: 6", code: 403 };
+        throw ForbiddenError("access restricted: 6");
     }
     return null;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/policy/index.ts"],"names":[],"mappings":"AAMA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QAqC3B;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/policy/index.ts"],"names":[],"mappings":"AAMA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QA6B3B;AAED,eAAe,MAAM,CAAC"}

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

@@ -19,18 +19,9 @@ function plugin(fastify) {
         if (!isApi) {
             return null;
         }
-        const resp1 = await checkPermissions(request);
-        if (resp1) {
-            return reply.status(resp1.code || 403).send(resp1);
-        }
+        await checkPermissions(request);
         const jwt = await checkJWT(request);
-        if (!jwt?.valid && jwt?.code) {
-            return reply.status(jwt.code).send(jwt);
-        }
-        const resp = checkPolicy(request, jwt);
-        if (resp) {
-            return reply.status(resp.code || 403).send(resp);
-        }
+        checkPolicy(request, jwt);
         return null;
     });
 }

package/dist/server/plugins/table/funcs/getFilterSQL/index.d.ts

@@ -13,28 +13,14 @@ export default function getFilterSQL({ table, filter, pg, search, searchColumn:
     objectId?: string;
     order?: string;
 }): Promise<{
-    error: string;
-    status: number;
-    filterList?: undefined;
-    filters?: undefined;
-    q?: undefined;
-    optimizedSQL?: undefined;
-    sqlTable?: undefined;
-    extraSqlColumns?: undefined;
-    tableCount?: undefined;
-    table?: undefined;
-    searchQuery?: undefined;
-} | {
     filterList: any[] | undefined;
     filters: any;
     q: string;
     optimizedSQL: string;
     sqlTable: any;
-    extraSqlColumns: string | undefined;
+    extraSqlColumns: string | null;
     tableCount: string;
     table: any;
     searchQuery: string;
-    error?: undefined;
-    status?: undefined;
 }>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQL/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAuC5D,wBAA8B,YAAY,CAAC,EACzC,KAAK,EACL,MAAM,EACN,EAAqB,EACrB,MAAM,EACN,YAAY,EAAE,aAAa,EAC3B,UAAU,EACV,KAAK,EACL,MAAM,EACN,KAAK,EACL,GAAG,EACH,QAAQ,EACR,KAAK,GACN,EAAE;IACD,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;;;;;;;;;;;;;;;;;;;;;;GAwRA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQL/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAyC5D,wBAA8B,YAAY,CAAC,EACzC,KAAK,EACL,MAAM,EACN,EAAqB,EACrB,MAAM,EACN,YAAY,EAAE,aAAa,EAC3B,UAAU,EACV,KAAK,EACL,MAAM,EACN,KAAK,EACL,GAAG,EACH,QAAQ,EACR,KAAK,GACN,EAAE;IACD,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;;;;;;;;GA0RA"}

package/dist/server/plugins/table/funcs/getFilterSQL/index.js

@@ -1,3 +1,4 @@
+import { BadRequestError } from "../../../../../errors.js";
 import getTemplate from "../getTemplate.js";
 import getSelect from "../getSelect.js";
 import pgClients from "../../../pg/pgClients.js";
@@ -23,8 +24,9 @@ function getExtraQuery(mainColumns, schema, table, pk) {
     };
 }
 export default async function getFilterSQL({ table, filter, pg = pgClients.client, search, searchColumn: searchColumn1, filterList, query, custom, state, uid, objectId, order, }) {
-    if (!table)
-        return { error: "param table is required", status: 400 };
+    if (!table) {
+        throw BadRequestError("param table is required");
+    }
     const body = await getTemplate("table", table);
     const loadTemplate = body?.form
         ? await getTemplate("form", body?.form)
@@ -42,7 +44,7 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
         : {};
     const { q: extraSqlColumns, extraColumns = [] } = extraDataTable && pg.pk?.[extraDataTable] && pg.pk?.[body.table || table]
         ? getExtraQuery(fieldsModel, loadTemplate?.schema, extraDataTable, pg.pk[body.table || table])
-        : {};
+        : { q: null };
     // console.log('extra getFilterSQL', extraDataTable, pg.pk?.[extraDataTable]);
     // check sql inline fields count
     if (body?.table && !checkInline[body?.table] && body?.sql?.length) {
@@ -147,7 +149,7 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
                             column?.split?.("?")?.pop?.(),
                         pg,
                     })) || {}
-                    : {};
+                    : { arr: null, original: null };
                 const arr1 = arr ||
                     (original && pg?.queryCache
                         ? await pg

package/dist/server/plugins/table/funcs/gisIRColumn.d.ts

@@ -10,36 +10,14 @@ export default function gisIRColumn({ pg, layer, column, sql, query, filter, sta
     search?: string;
     custom?: string;
 }): Promise<string | {
-    error: string;
-    status: number;
-    message?: undefined;
-    count?: undefined;
-    sql?: undefined;
-    rows?: undefined;
-    time?: undefined;
-} | {
-    status: number;
-    message: string;
-    error?: undefined;
-    count?: undefined;
-    sql?: undefined;
-    rows?: undefined;
-    time?: undefined;
-} | {
     count: any;
     sql: string | undefined;
     rows: any;
-    error?: undefined;
-    status?: undefined;
-    message?: undefined;
     time?: undefined;
 } | {
     time: number;
     count: any;
     sql: string | undefined;
     rows: any;
-    error?: undefined;
-    status?: undefined;
-    message?: undefined;
 }>;
 //# sourceMappingURL=gisIRColumn.d.ts.map

package/dist/server/plugins/table/funcs/gisIRColumn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gisIRColumn.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/gisIRColumn.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,wBAA8B,WAAW,CAAC,EACxC,EAAqB,EACrB,KAAK,EACL,MAAM,EACN,GAAG,EACH,KAAU,EACV,MAAM,EACN,KAAK,EACL,MAAM,EACN,MAAM,GACP,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkGA"}
+{"version":3,"file":"gisIRColumn.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/gisIRColumn.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD,wBAA8B,WAAW,CAAC,EACxC,EAAqB,EACrB,KAAK,EACL,MAAM,EACN,GAAG,EACH,KAAU,EACV,MAAM,EACN,KAAK,EACL,MAAM,EACN,MAAM,GACP,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;;;;;;;;;;GAqGA"}

package/dist/server/plugins/table/funcs/gisIRColumn.js

@@ -4,6 +4,7 @@ import getTemplate from "./getTemplate.js";
 import pgClients from "../../pg/pgClients.js";
 import config from "../../../../config.js";
 import getSelectVal from "./metaFormat/getSelectVal.js";
+import { BadRequestError } from "../../../../errors.js";
 export default async function gisIRColumn({ pg = pgClients.client, layer, column, sql, query = {}, filter, state, search, custom, }) {
     const time = Date.now();
     const sel = await getSelect(query.cls || column, pg);
@@ -22,12 +23,13 @@ export default async function gisIRColumn({ pg = pgClients.client, layer, column
         .then((el) => el.rows?.[0] || {});
     const tableName = body?.table || layer;
     if (!tlist.includes(tableName))
-        return { error: `table not found: ${tableName}`, status: 400 };
+        throw BadRequestError(`table not found: ${tableName}`);
     // eslint-disable-next-line max-len
     const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${tableName}`})q limit 0`);
     const col = fields.find((el) => el.name === column);
-    if (!col)
-        return { status: 404, message: "not found" };
+    if (!col) {
+        throw BadRequestError(`column not found: ${column}`);
+    }
     const colField = pg.pgType?.[col.dataTypeID]?.includes("[]")
         ? `unnest(${column})`
         : column;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAW1C,eAAO,MAAM,cAAc,QAE1B,CAAC;AAEF,eAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AAErD,eAAO,MAAM,OAAO,QAEE,CAAC;AAEvB,eAAO,MAAM,OAAO,QAA4B,CAAC;AAKjD,iBAAS,mBAAmB,CAAC,GAAG,EAAE,eAAe,QAIhD;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAW1C,eAAO,MAAM,cAAc,QAE1B,CAAC;AAEF,eAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AAErD,eAAO,MAAM,OAAO,QAEE,CAAC;AAEvB,eAAO,MAAM,OAAO,QAA4B,CAAC;AAOjD,iBAAS,mBAAmB,CAAC,GAAG,EAAE,eAAe,QAWhD;AAED,eAAe,mBAAmB,CAAC"}

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

@@ -10,11 +10,18 @@ export const fileDir = path
     .join(rootDir, uploadChunkDirectory)
     .replace(/\\/g, "/");
 export const metaDir = path.join(fileDir, "tmp");
+// import { close, cleanupMultipartUploads } from "./s3minio.js";
 import { cleanupNonRedisUploads } from "./s3.js";
+// import addCron from "../cron/funcs/addCron.js";
 // w/ out redis - chunked uploads are non-resumable in order to avoid unclosed multiparts (non-discoverable via s3 commands with current version of minio)
 function chunkedUploadPlugin(app) {
+    // addCron(cleanupMultipartUploads, 60 * 5);
     app.addHook("onClose", async () => {
         await cleanupNonRedisUploads();
+        // await cleanupMultipartUploads().catch((err) =>
+        //   console.error("minio upload plugin onClose cleanUp error", err.toString())
+        // );
+        // close();
     });
 }
 export default chunkedUploadPlugin;

package/dist/server/plugins/upload/s3.d.ts

@@ -38,6 +38,12 @@ export declare function startUpload({ Bucket, Key, ContentType, fileSize, }: {
     ContentType?: undefined;
     cache?: undefined;
 }>;
+export declare function savePart(id: string, part: {
+    ETag: string;
+    PartNumber: number;
+}): Promise<void>;
+export declare function getStoredParts(id: string): Promise<any[]>;
+export declare function deleteUploadParts(id: string): Promise<void>;
 export declare function uploadChunk({ id, chunk, partNumber, }: {
     id: string;
     chunk: any;
@@ -55,7 +61,7 @@ export declare function finishUpload({ id, }: {
     id: string;
 }, s3?: any): Promise<{
     finished: boolean;
-    uploaded: any;
+    uploaded: number | undefined;
     filepath: any;
 }>;
 export declare function abortUpload({ id, }: {

package/dist/server/plugins/upload/s3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/s3.ts"],"names":[],"mappings":"AAiGA,wBAAsB,sBAAsB,CAAC,EAAE,MAAW,iBAwCzD;AAED,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,GAAG,EACT,GAAG,SAAqB,iBAazB;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,MAAM,EACV,GAAG,SAAqB,EACxB,EAAE,MAAW,iBAsBd;AAED,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,iBA0B9D;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,MAAM,gBAQ7C;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,MAAM,gBAMrD;AAED,wBAAsB,mBAAmB,CAAC,EAAE,MAAW,iBAyEtD;AAED,wBAAsB,UAAU,CAAC,EAAE,EAAE,EAAE,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,MAAW;;;;;;;;GAsCrE;AAKD,wBAAsB,WAAW,CAC/B,EACE,MAAM,EACN,GAAG,EACH,WAAW,EACX,QAAQ,GACT,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB,EACD,EAAE,MAAW;;;;;;;;;;;;;;;;GAsDd;AAED,wBAAsB,WAAW,CAC/B,EACE,EAAE,EACF,KAAK,EACL,UAAU,GACX,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;CACpB,EACD,EAAE,MAAW;;;;;;;;GA0Bd;AAED,wBAAsB,YAAY,CAChC,EACE,EAAE,GACH,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;CACZ,EACD,EAAE,MAAW;;;;GAuCd;AAED,wBAAsB,WAAW,CAC/B,EACE,EAAE,GACH,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;CACZ,EACD,EAAE,MAAW;;GAwBd;AAED,wBAAsB,eAAe,CACnC,EACE,EAAE,EACF,GAAG,EACH,MAAM,GACP,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,EACD,EAAE,MAAW;;;;;;;;;;;;;;GAoEd"}
+{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../../../../server/plugins/upload/s3.ts"],"names":[],"mappings":"AAiGA,wBAAsB,sBAAsB,CAAC,EAAE,MAAW,iBAwCzD;AAED,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,GAAG,EACT,GAAG,SAAqB,iBAazB;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,MAAM,EACV,GAAG,SAAqB,EACxB,EAAE,MAAW,iBAsBd;AAED,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,iBA2B9D;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,MAAM,gBAQ7C;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,MAAM,gBAMrD;AAED,wBAAsB,mBAAmB,CAAC,EAAE,MAAW,iBAyEtD;AAED,wBAAsB,UAAU,CAAC,EAAE,EAAE,EAAE,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,MAAW;;;;;;;;GAsCrE;AAKD,wBAAsB,WAAW,CAC/B,EACE,MAAM,EACN,GAAG,EACH,WAAW,EACX,QAAQ,GACT,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB,EACD,EAAE,MAAW;;;;;;;;;;;;;;;;GAsDd;AASD,wBAAsB,QAAQ,CAC5B,EAAE,EAAE,MAAM,EACV,IAAI,EAAE;IACJ,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,iBAwBF;AAED,wBAAsB,cAAc,CAAC,EAAE,EAAE,MAAM,kBAY9C;AAED,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,MAAM,iBAQjD;AAED,wBAAsB,WAAW,CAC/B,EACE,EAAE,EACF,KAAK,EACL,UAAU,GACX,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;CACpB,EACD,EAAE,MAAW;;;;;;;;GA+Bd;AAED,wBAAsB,YAAY,CAChC,EACE,EAAE,GACH,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;CACZ,EACD,EAAE,MAAW;;;;GA2Cd;AAED,wBAAsB,WAAW,CAC/B,EACE,EAAE,GACH,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;CACZ,EACD,EAAE,MAAW;;GAwBd;AAED,wBAAsB,eAAe,CACnC,EACE,EAAE,EACF,GAAG,EACH,MAAM,GACP,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,EACD,EAAE,MAAW;;;;;;;;;;;;;;GAqEd"}