prostgles-server 2.0.173 → 2.0.176

package/dist/PublishParser.js

@@ -0,0 +1,391 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PublishParser = void 0;
+const prostgles_types_1 = require("prostgles-types");
+const DboBuilder_1 = require("./DboBuilder");
+const Prostgles_1 = require("./Prostgles");
+const RULE_TO_METHODS = [
+    {
+        rule: "getColumns",
+        sqlRule: "select",
+        methods: prostgles_types_1.RULE_METHODS.getColumns,
+        no_limits: true,
+        allowed_params: [],
+        table_only: false,
+        hint: ` expecting false | true | undefined`
+    },
+    {
+        rule: "getInfo",
+        sqlRule: "select",
+        methods: prostgles_types_1.RULE_METHODS.getInfo,
+        no_limits: true,
+        allowed_params: [],
+        table_only: false,
+        hint: ` expecting false | true | undefined`
+    },
+    {
+        rule: "insert",
+        sqlRule: "insert",
+        methods: prostgles_types_1.RULE_METHODS.insert,
+        no_limits: { fields: "*" },
+        table_only: true,
+        allowed_params: ["fields", "forcedData", "returningFields", "validate", "preValidate"],
+        hint: ` expecting "*" | true | { fields: string | string[] | {}  }`
+    },
+    {
+        rule: "update",
+        sqlRule: "update",
+        methods: prostgles_types_1.RULE_METHODS.update,
+        no_limits: { fields: "*", filterFields: "*", returningFields: "*" },
+        table_only: true,
+        allowed_params: ["fields", "filterFields", "forcedFilter", "forcedData", "returningFields", "validate", "dynamicFields"],
+        hint: ` expecting "*" | true | { fields: string | string[] | {}  }`
+    },
+    {
+        rule: "select",
+        sqlRule: "select",
+        methods: prostgles_types_1.RULE_METHODS.select,
+        no_limits: { fields: "*", filterFields: "*" },
+        table_only: false,
+        allowed_params: ["fields", "filterFields", "forcedFilter", "validate", "maxLimit"],
+        hint: ` expecting "*" | true | { fields: ( string | string[] | {} )  }`
+    },
+    {
+        rule: "delete",
+        sqlRule: "delete",
+        methods: prostgles_types_1.RULE_METHODS.delete,
+        no_limits: { filterFields: "*" },
+        table_only: true,
+        allowed_params: ["filterFields", "forcedFilter", "returningFields", "validate"],
+        hint: ` expecting "*" | true | { filterFields: ( string | string[] | {} ) } \n Will use "select", "update", "delete" and "insert" rules`
+    },
+    {
+        rule: "sync",
+        sqlRule: "select",
+        methods: prostgles_types_1.RULE_METHODS.sync,
+        no_limits: null,
+        table_only: true,
+        allowed_params: ["id_fields", "synced_field", "sync_type", "allow_delete", "throttle", "batch_size"],
+        hint: ` expecting "*" | true | { id_fields: string[], synced_field: string }`
+    },
+    {
+        rule: "subscribe",
+        sqlRule: "select",
+        methods: prostgles_types_1.RULE_METHODS.subscribe,
+        no_limits: { throttle: 0 },
+        table_only: true,
+        allowed_params: ["throttle"],
+        hint: ` expecting "*" | true | { throttle: number } \n Will use "select" rules`
+    }
+];
+const PubSubManager_1 = require("./PubSubManager");
+class PublishParser {
+    constructor(publish, publishMethods, publishRawSQL, dbo, db, prostgles) {
+        this.publish = publish;
+        this.publishMethods = publishMethods;
+        this.publishRawSQL = publishRawSQL;
+        this.dbo = dbo;
+        this.db = db;
+        this.prostgles = prostgles;
+        if (!this.dbo || !this.publish)
+            throw "INTERNAL ERROR: dbo and/or publish missing";
+    }
+    async getPublishParams(localParams, clientInfo) {
+        if (!this.dbo)
+            throw "dbo missing";
+        return {
+            ...(clientInfo || await this.prostgles.authHandler?.getClientInfo(localParams)),
+            dbo: this.dbo,
+            db: this.db,
+            socket: localParams.socket
+        };
+    }
+    async getMethods(socket) {
+        let methods = {};
+        const publishParams = await this.getPublishParams({ socket });
+        const _methods = await applyParamsIfFunc(this.publishMethods, publishParams);
+        if (_methods && Object.keys(_methods).length) {
+            (0, prostgles_types_1.getKeys)(_methods).map(key => {
+                if (_methods[key] && (typeof _methods[key] === "function" || typeof _methods[key].then === "function")) {
+                    //@ts-ignore
+                    methods[key] = _methods[key];
+                }
+                else {
+                    throw `invalid publishMethods item -> ${key} \n Expecting a function or promise`;
+                }
+            });
+        }
+        return methods;
+    }
+    /**
+     * Parses the first level of publish. (If false then nothing if * then all tables and views)
+     * @param socket
+     * @param user
+     */
+    async getPublish(localParams, clientInfo) {
+        const publishParams = await this.getPublishParams(localParams, clientInfo);
+        let _publish = await applyParamsIfFunc(this.publish, publishParams);
+        if (_publish === "*") {
+            let publish = {};
+            this.prostgles.dboBuilder.tablesOrViews?.map(tov => {
+                publish[tov.name] = "*";
+            });
+            return publish;
+        }
+        return _publish;
+    }
+    async getValidatedRequestRuleWusr({ tableName, command, localParams }) {
+        const clientInfo = await this.prostgles.authHandler.getClientInfo(localParams);
+        return await this.getValidatedRequestRule({ tableName, command, localParams }, clientInfo);
+    }
+    async getValidatedRequestRule({ tableName, command, localParams }, clientInfo) {
+        if (!this.dbo)
+            throw "INTERNAL ERROR: dbo is missing";
+        if (!command || !tableName)
+            throw "command OR tableName are missing";
+        let rtm = RULE_TO_METHODS.find(rtms => rtms.methods.includes(command));
+        if (!rtm) {
+            throw "Invalid command: " + command;
+        }
+        /* Must be local request -> allow everything */
+        if (!localParams || (!localParams.socket && !localParams.httpReq)) {
+            return RULE_TO_METHODS.reduce((a, v) => ({
+                ...a,
+                [v.rule]: v.no_limits
+            }), {});
+        }
+        /* Must be from socket. Must have a publish */
+        if (!this.publish)
+            throw "publish is missing";
+        /* Get any publish errors for socket */
+        const schm = localParams?.socket?.prostgles?.schema?.[tableName]?.[command];
+        if (schm && schm.err)
+            throw schm.err;
+        let table_rule = await this.getTableRules({ tableName, localParams }, clientInfo);
+        if (!table_rule)
+            throw "Invalid or disallowed table: " + tableName;
+        if (command === "upsert") {
+            if (!table_rule.update || !table_rule.insert) {
+                throw `Invalid or disallowed command: upsert`;
+            }
+        }
+        if (rtm && table_rule && table_rule[rtm.rule]) {
+            return table_rule;
+        }
+        else
+            throw `Invalid or disallowed command: ${tableName}.${command}`;
+    }
+    async getTableRules({ tableName, localParams }, clientInfo) {
+        try {
+            if (!localParams || !tableName)
+                throw "publish OR socket OR dbo OR tableName are missing";
+            let _publish = await this.getPublish(localParams, clientInfo);
+            const raw_table_rules = _publish[tableName]; // applyParamsIfFunc(_publish[tableName],  localParams, this.dbo, this.db, user);
+            if (!raw_table_rules)
+                return undefined;
+            let parsed_table = {};
+            /* Get view or table specific rules */
+            const tHandler = this.dbo[tableName];
+            if (!tHandler)
+                throw `${tableName} could not be found in dbo`;
+            const is_view = tHandler.is_view;
+            const MY_RULES = RULE_TO_METHODS.filter(r => {
+                /** Check PG User privileges */
+                const pgUserIsAllowedThis = tHandler.tableOrViewInfo.privileges[r.sqlRule];
+                const result = (!is_view || !r.table_only) && pgUserIsAllowedThis;
+                if (!pgUserIsAllowedThis && (0, DboBuilder_1.isPlainObject)(raw_table_rules) && raw_table_rules[r.sqlRule]) {
+                    throw `Your postgres user is not allowed ${r.sqlRule} on table ${tableName}`;
+                }
+                return result;
+            });
+            /* All methods allowed. Add no limits for table rules */
+            if ([true, "*"].includes(raw_table_rules)) {
+                parsed_table = {};
+                MY_RULES.map(r => {
+                    parsed_table[r.rule] = { ...r.no_limits };
+                });
+                /** Specific rules allowed */
+            }
+            else if ((0, DboBuilder_1.isPlainObject)(raw_table_rules) && (0, prostgles_types_1.getKeys)(raw_table_rules).length) {
+                const allRuleKeys = (0, prostgles_types_1.getKeys)(raw_table_rules);
+                const dissallowedRuleKeys = allRuleKeys.filter(m => !raw_table_rules[m]);
+                MY_RULES.map(r => {
+                    /** Unless specifically disabled these are allowed */
+                    if (["getInfo", "getColumns"].includes(r.rule) && !dissallowedRuleKeys.includes(r.rule)) {
+                        parsed_table[r.rule] = r.no_limits;
+                        return;
+                    }
+                    /** Add no_limit values for implied/ fully allowed methods */
+                    if ([true, "*"].includes(raw_table_rules[r.rule]) && r.no_limits) {
+                        parsed_table[r.rule] = Object.assign({}, r.no_limits);
+                        /** Carry over detailed config */
+                    }
+                    else if ((0, DboBuilder_1.isPlainObject)(raw_table_rules[r.rule])) {
+                        parsed_table[r.rule] = raw_table_rules[r.rule];
+                    }
+                });
+                allRuleKeys.filter(m => parsed_table[m])
+                    .find((method) => {
+                    let rm = MY_RULES.find(r => r.rule === method || r.methods.includes(method));
+                    if (!rm) {
+                        let extraInfo = "";
+                        if (is_view && RULE_TO_METHODS.find(r => !is_view && r.rule === method || r.methods.includes(method))) {
+                            extraInfo = "You've specified table rules to a view\n";
+                        }
+                        throw `Invalid rule in publish.${tableName} -> ${method} \n${extraInfo}Expecting any of: ${MY_RULES.flatMap(r => [r.rule, ...r.methods]).join(", ")}`;
+                    }
+                    /* Check RULES for invalid params */
+                    /* Methods do not have params -> They use them from rules */
+                    if (method === rm.rule) {
+                        let method_params = (0, prostgles_types_1.getKeys)(parsed_table[method]);
+                        let iparam = method_params.find(p => !rm?.allowed_params.includes(p));
+                        if (iparam) {
+                            throw `Invalid setting in publish.${tableName}.${method} -> ${iparam}. \n Expecting any of: ${rm.allowed_params.join(", ")}`;
+                        }
+                    }
+                    /* Add default params (if missing) */
+                    if (method === "sync") {
+                        if ([true, "*"].includes(parsed_table[method])) {
+                            throw "Invalid sync rule. Expecting { id_fields: string[], synced_field: string } ";
+                        }
+                        if (typeof parsed_table[method]?.throttle !== "number") {
+                            parsed_table[method].throttle = 100;
+                        }
+                        if (typeof parsed_table[method]?.batch_size !== "number") {
+                            parsed_table[method].batch_size = PubSubManager_1.DEFAULT_SYNC_BATCH_SIZE;
+                        }
+                    }
+                    /* Enable subscribe if not explicitly disabled */
+                    const subKey = "subscribe";
+                    if (method === "select" && !dissallowedRuleKeys.includes(subKey)) {
+                        const sr = MY_RULES.find(r => r.rule === subKey);
+                        if (sr) {
+                            parsed_table[subKey] = { ...sr.no_limits };
+                            parsed_table.subscribeOne = { ...sr.no_limits };
+                        }
+                    }
+                });
+            }
+            else {
+                throw "Unexpected publish";
+            }
+            const getImpliedMethods = (tableRules) => {
+                let res = { ...tableRules };
+                /* Add implied methods if not specifically dissallowed */
+                MY_RULES.map(r => {
+                    /** THIS IS A MESS -> some methods cannot be dissallowed (unsync, unsubscribe...) */
+                    r.methods.forEach(method => {
+                        var _a;
+                        const isAllowed = tableRules[r.rule] && tableRules[method] === undefined;
+                        if (isAllowed) {
+                            if (method === "updateBatch" && !tableRules.update) {
+                            }
+                            else if (method === "upsert" && (!tableRules.update || !tableRules.insert)) {
+                            }
+                            else {
+                                (_a = res)[method] ?? (_a[method] = true);
+                            }
+                        }
+                    });
+                });
+                return res;
+            };
+            parsed_table = getImpliedMethods(parsed_table);
+            return parsed_table;
+        }
+        catch (e) {
+            throw e;
+        }
+    }
+    /* Prepares schema for client. Only allowed views and commands will be present */
+    async getSchemaFromPublish(socket) {
+        let schema = {};
+        let tables = [];
+        try {
+            /* Publish tables and views based on socket */
+            const clientInfo = await this.prostgles.authHandler?.getClientInfo({ socket });
+            let _publish = await this.getPublish(socket, clientInfo);
+            if (_publish && Object.keys(_publish).length) {
+                let txKey = "tx";
+                if (!this.prostgles.opts.transactions)
+                    txKey = "";
+                if (typeof this.prostgles.opts.transactions === "string")
+                    txKey = this.prostgles.opts.transactions;
+                const tableNames = Object.keys(_publish).filter(k => !txKey || txKey !== k);
+                await Promise.all(tableNames
+                    .map(async (tableName) => {
+                    if (!this.dbo[tableName]) {
+                        throw `Table ${tableName} does not exist
+                          Expecting one of: ${this.prostgles.dboBuilder.tablesOrViews?.map(tov => tov.name).join(", ")}
+                          DBO tables: ${Object.keys(this.dbo).filter(k => this.dbo[k].find).join(", ")}
+                          `;
+                    }
+                    const table_rules = await this.getTableRules({ localParams: { socket }, tableName }, clientInfo);
+                    if (table_rules && Object.keys(table_rules).length) {
+                        schema[tableName] = {};
+                        let methods = [];
+                        let tableInfo;
+                        let tableColumns;
+                        if (typeof table_rules === "object") {
+                            methods = (0, prostgles_types_1.getKeys)(table_rules);
+                        }
+                        await Promise.all(methods.filter(m => m !== "select").map(async (method) => {
+                            if (method === "sync" && table_rules[method]) {
+                                /* Pass sync info */
+                                schema[tableName][method] = table_rules[method];
+                            }
+                            else if (table_rules[method]) {
+                                schema[tableName][method] = {};
+                                /* Test for issues with the common table CRUD methods () */
+                                if (Prostgles_1.TABLE_METHODS.includes(method)) {
+                                    let err = null;
+                                    try {
+                                        let valid_table_command_rules = await this.getValidatedRequestRule({ tableName, command: method, localParams: { socket } }, clientInfo);
+                                        await this.dbo[tableName][method]({}, {}, {}, valid_table_command_rules, { socket, has_rules: true, testRule: true });
+                                    }
+                                    catch (e) {
+                                        err = "INTERNAL PUBLISH ERROR";
+                                        schema[tableName][method] = { err };
+                                        throw `publish.${tableName}.${method}: \n   -> ${e}`;
+                                    }
+                                }
+                                if (method === "getInfo" || method === "getColumns") {
+                                    let tableRules = await this.getValidatedRequestRule({ tableName, command: method, localParams: { socket } }, clientInfo);
+                                    const res = await this.dbo[tableName][method](undefined, undefined, undefined, tableRules, { socket, has_rules: true });
+                                    if (method === "getInfo") {
+                                        tableInfo = res;
+                                    }
+                                    else if (method === "getColumns") {
+                                        tableColumns = res;
+                                    }
+                                }
+                            }
+                        }));
+                        if (tableInfo && tableColumns) {
+                            tables.push({
+                                name: tableName,
+                                info: tableInfo,
+                                columns: tableColumns
+                            });
+                        }
+                    }
+                    return true;
+                }));
+            }
+        }
+        catch (e) {
+            console.error("Prostgles \nERRORS IN PUBLISH: ", JSON.stringify(e));
+            throw e;
+        }
+        return { schema, tables };
+    }
+}
+exports.PublishParser = PublishParser;
+function applyParamsIfFunc(maybeFunc, ...params) {
+    if ((maybeFunc !== null && maybeFunc !== undefined) &&
+        (typeof maybeFunc === "function" || typeof maybeFunc.then === "function")) {
+        return maybeFunc(...params);
+    }
+    return maybeFunc;
+}
+//# sourceMappingURL=PublishParser.js.map

package/dist/PublishParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../lib/PublishParser.ts"],"names":[],"mappings":"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"}

package/dist/QueryBuilder.d.ts

@@ -1,6 +1,6 @@
 import { Filter, LocalParams, TableHandler } from "./DboBuilder";
-import { TableRule } from "./Prostgles";
-import { SelectParamsBasic as SelectParams, FieldFilter, ColumnInfo, PG_COLUMN_UDT_DATA_TYPE } from "prostgles-types";
+import { TableRule } from "./PublishParser";
+import { SelectParams, ColumnInfo, PG_COLUMN_UDT_DATA_TYPE, Select } from "prostgles-types";
 export declare type SelectItem = {
     type: "column" | "function" | "aggregation" | "joinedColumn" | "computed";
     getFields: (args?: any[]) => string[] | "*";
@@ -114,9 +114,25 @@ export declare class SelectItemBuilder {
     private addItem;
     private addFunction;
     addColumn: (fieldName: string, selected: boolean) => void;
-    parseUserSelect: (userSelect: FieldFilter, joinParse?: ((key: string, val: any, throwErr: (msg: string) => any) => any) | undefined) => Promise<never[] | undefined>;
+    parseUserSelect: (userSelect: Select, joinParse?: ((key: string, val: any, throwErr: (msg: string) => any) => any) | undefined) => Promise<never[] | undefined>;
 }
-export declare function getNewQuery(_this: TableHandler, filter: Filter, selectParams: (SelectParams & {
+export declare function getNewQuery(_this: TableHandler, filter: Filter, selectParams: ({
+    limit?: number | undefined;
+    offset?: number | undefined;
+    groupBy?: boolean | undefined;
+    returnType?: "values" | "row" | "value" | undefined;
+} & {
+    select?: import("prostgles-types").AnyObject | ("" | "*") | {
+        [key: string]: string | true | 1 | Record<string, any[]>;
+    } | {
+        [x: string]: string | true | 1 | Record<string, any[]>;
+    } | {
+        [x: string]: false | 0;
+    } | {
+        [x: string]: false | 0;
+    } | undefined;
+    orderBy?: import("prostgles-types").OrderBy<any> | undefined;
+} & {
     alias?: string | undefined;
 }) | undefined, param3_unused: null | undefined, tableRules: TableRule | undefined, localParams: LocalParams | undefined, columns: ColumnInfo[]): Promise<NewQuery>;
 export declare function makeQuery(_this: TableHandler, q: NewQuery, depth?: number, joinFields?: string[], selectParams?: SelectParams): string;

package/dist/QueryBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../lib/QueryBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../lib/QueryBuilder.ts"],"names":[],"mappings":"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"}