prostgles-server 3.0.151 → 3.0.153

package/lib/DboBuilder/subscribe.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribe = void 0;
-const prostgles_types_1 = require("prostgles-types");
 const DboBuilder_1 = require("../DboBuilder");
 const PubSubManager_1 = require("../PubSubManager/PubSubManager");
+const getSubscribeRelatedTables_1 = require("./getSubscribeRelatedTables");
 async function subscribe(filter, params, localFunc, table_rules, localParams) {
     try {
         // if (this.is_view) throw "Cannot subscribe to a view";
@@ -25,186 +25,40 @@ async function subscribe(filter, params, localFunc, table_rules, localParams) {
         if (filterSize * 4 > 2704) {
             throw "filter too big. Might exceed the btree version 4 maximum 2704. Use a primary key or a $rowhash filter instead";
         }
+        if (!this.dboBuilder.prostgles.isSuperUser) {
+            throw "Subscribe not possible. Must be superuser to add triggers 1856";
+        }
+        /** Ensure request is valid */
+        await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, localParams);
+        const viewOptions = await getSubscribeRelatedTables_1.getSubscribeRelatedTables.bind(this)({ filter, selectParams, table_rules, localParams, condition, filterOpts });
+        const commonSubOpts = {
+            table_info: this.tableOrViewInfo,
+            viewOptions,
+            table_rules,
+            condition,
+            table_name: this.name,
+            filter: { ...filter },
+            params: { ...selectParams },
+            throttle,
+            last_throttled: 0,
+        };
         if (!localFunc) {
-            if (!this.dboBuilder.prostgles.isSuperUser) {
-                throw "Subscribe not possible. Must be superuser to add triggers 1856";
-            }
-            return await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, localParams)
-                .then(async (_isValid) => {
-                let viewOptions = undefined;
-                if (this.is_view) {
-                    const viewName = this.name;
-                    const viewNameEscaped = this.escapedName;
-                    const { current_schema } = await this.db.oneOrNone("SELECT current_schema");
-                    /** Get list of used columns and their parent tables */
-                    let { def } = (await this.db.oneOrNone("SELECT pg_get_viewdef(${viewName}) as def", { viewName }));
-                    def = def.trim();
-                    if (def.endsWith(";")) {
-                        def = def.slice(0, -1);
-                    }
-                    if (!def || typeof def !== "string") {
-                        throw (0, DboBuilder_1.makeErrorFromPGError)("Could get view definition");
-                    }
-                    const { fields } = await this.dboBuilder.dbo.sql(`SELECT * FROM ( \n ${def} \n ) prostgles_subscribe_view_definition LIMIT 0`, {});
-                    const tableColumns = fields.filter(f => f.tableName && f.columnName);
-                    /** Create exists filters for each table */
-                    const tableIds = Array.from(new Set(tableColumns.map(tc => tc.tableID.toString())));
-                    viewOptions = {
-                        type: "view",
-                        viewName,
-                        definition: def,
-                        relatedTables: []
-                    };
-                    viewOptions.relatedTables = await Promise.all(tableIds.map(async (tableID) => {
-                        const table = this.dboBuilder.USER_TABLES.find(t => t.relid === +tableID);
-                        let tableCols = tableColumns.filter(tc => tc.tableID.toString() === tableID);
-                        /** If table has primary keys and they are all in this view then use only primary keys */
-                        if (table?.pkey_columns?.every(pkey => tableCols.some(c => c.columnName === pkey))) {
-                            tableCols = tableCols.filter(c => table?.pkey_columns?.includes(c.columnName));
-                        }
-                        else {
-                            /** Exclude non comparable data types */
-                            tableCols = tableCols.filter(c => !["json", "xml"].includes(c.udt_name));
-                        }
-                        const { relname: tableName, schemaname: tableSchema } = table;
-                        if (tableCols.length) {
-                            const tableNameEscaped = tableSchema === current_schema ? table.relname : [tableSchema, tableName].map(v => JSON.stringify(v)).join(".");
-                            const fullCondition = `EXISTS (
-                  SELECT 1
-                  FROM ${viewNameEscaped}
-                  WHERE ${tableCols.map(c => `${tableNameEscaped}.${JSON.stringify(c.columnName)} = ${viewNameEscaped}.${JSON.stringify(c.name)}`).join(" AND \n")}
-                  AND ${condition || "TRUE"}
-                )`;
-                            try {
-                                const { count } = await this.db.oneOrNone(`
-                    WITH ${(0, prostgles_types_1.asName)(tableName)} AS (
-                      SELECT * 
-                      FROM ${(0, prostgles_types_1.asName)(tableName)}
-                      LIMIT 0
-                    )
-
-                    SELECT COUNT(*) as count
-                    FROM (
-                      ${def}
-                    ) prostgles_view_ref_table_test
-                  `);
-                                const relatedTableSubscription = {
-                                    tableName: tableName,
-                                    tableNameEscaped,
-                                    condition: fullCondition,
-                                };
-                                if (count.toString() === '0') {
-                                    return relatedTableSubscription;
-                                }
-                            }
-                            catch (e) {
-                                (0, PubSubManager_1.log)(`Could not not override subscribed view (${this.name}) table (${tableName}). Will not check condition`, e);
-                            }
-                        }
-                        return {
-                            tableName,
-                            tableNameEscaped: JSON.stringify(tableName),
-                            condition: "TRUE"
-                        };
-                    }));
-                    /** Get list of remaining used inner tables */
-                    const allUsedTables = await this.db.any("SELECT distinct table_name, table_schema FROM information_schema.view_column_usage WHERE view_name = ${viewName}", { viewName });
-                    /** Remaining tables will have listeners on all records (condition = "TRUE") */
-                    const remainingInnerTables = allUsedTables.filter(at => !tableColumns.some(dc => dc.tableName === at.table_name && dc.tableSchema === at.table_schema));
-                    viewOptions.relatedTables = [
-                        ...viewOptions.relatedTables,
-                        ...remainingInnerTables.map(t => ({
-                            tableName: t.table_name,
-                            tableNameEscaped: [t.table_name, t.table_schema].map(v => JSON.stringify(v)).join("."),
-                            condition: "TRUE"
-                        }))
-                    ];
-                    if (!viewOptions.relatedTables.length) {
-                        throw "Could not subscribe to this view: no related tables found";
-                    }
-                }
-                /** Any joined table used within select or filter must also be added a trigger for this recordset */
-                if (!this.is_view) {
-                    const newQuery = await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, { ...localParams, returnNewQuery: true });
-                    viewOptions = {
-                        type: "table",
-                        relatedTables: []
-                    };
-                    /**
-                     * Avoid nested exists error. Will affect performance
-                     */
-                    const nonExistsFilter = filterOpts.exists.length ? {} : filter;
-                    for await (const j of (newQuery.joins ?? [])) {
-                        if (!viewOptions.relatedTables.find(rt => rt.tableName === j.table)) {
-                            viewOptions.relatedTables.push({
-                                tableName: j.table,
-                                tableNameEscaped: (0, prostgles_types_1.asName)(j.table),
-                                condition: (await this.dboBuilder.dbo[j.table].prepareWhere({
-                                    filter: {
-                                        $existsJoined: {
-                                            [[this.name, ...j.$path ?? [].slice(0).reverse()].join(".")]: nonExistsFilter
-                                        }
-                                    },
-                                    addKeywords: false,
-                                    localParams: undefined,
-                                    tableRule: undefined
-                                })).where
-                            });
-                        }
-                    }
-                    for await (const e of newQuery.whereOpts.exists) {
-                        const eTable = e.tables.at(-1);
-                        viewOptions.relatedTables.push({
-                            tableName: eTable,
-                            tableNameEscaped: (0, prostgles_types_1.asName)(eTable),
-                            condition: (await this.dboBuilder.dbo[eTable].prepareWhere({
-                                filter: {
-                                    $existsJoined: {
-                                        [[this.name, ...e.tables ?? [].slice(0, -1).reverse()].join(".")]: nonExistsFilter
-                                    }
-                                },
-                                addKeywords: false,
-                                localParams: undefined,
-                                tableRule: undefined
-                            })).where
-                        });
-                    }
-                    if (!viewOptions.relatedTables.length) {
-                        viewOptions = undefined;
-                    }
-                }
-                const { socket } = localParams ?? {};
-                const pubSubManager = await this.dboBuilder.getPubSubManager();
-                return pubSubManager.addSub({
-                    table_info: this.tableOrViewInfo,
-                    socket,
-                    table_rules,
-                    table_name: this.name,
-                    condition: condition,
-                    viewOptions,
-                    func: undefined,
-                    filter: { ...filter },
-                    params: { ...selectParams },
-                    socket_id: socket?.id,
-                    throttle,
-                    last_throttled: 0,
-                }).then(channelName => ({ channelName }));
-            });
+            const { socket } = localParams ?? {};
+            const pubSubManager = await this.dboBuilder.getPubSubManager();
+            return pubSubManager.addSub({
+                ...commonSubOpts,
+                socket,
+                func: undefined,
+                socket_id: socket?.id,
+            }).then(channelName => ({ channelName }));
         }
         else {
             const pubSubManager = await this.dboBuilder.getPubSubManager();
             pubSubManager.addSub({
-                table_info: this.tableOrViewInfo,
+                ...commonSubOpts,
                 socket: undefined,
-                table_rules,
-                condition,
                 func: localFunc,
-                filter: { ...filter },
-                params: { ...selectParams },
                 socket_id: undefined,
-                table_name: this.name,
-                throttle,
-                last_throttled: 0,
             }).then(channelName => ({ channelName }));
             const unsubscribe = async () => {
                 const pubSubManager = await this.dboBuilder.getPubSubManager();

package/lib/DboBuilder/subscribe.ts

@@ -1,9 +1,9 @@
-import { AnyObject, asName, SubscribeParams } from "prostgles-types";
-import { Filter, LocalParams, makeErrorFromPGError, parseError } from "../DboBuilder";
+import { AnyObject, SubscribeParams } from "prostgles-types";
+import { Filter, LocalParams, parseError } from "../DboBuilder";
 import { TableRule } from "../PublishParser";
-import { log, omitKeys, ViewSubscriptionOptions } from "../PubSubManager/PubSubManager";
-import { NewQuery } from "./QueryBuilder/QueryBuilder";
+import { omitKeys } from "../PubSubManager/PubSubManager"; 
 import { ViewHandler } from "./ViewHandler";
+import { getSubscribeRelatedTables } from "./getSubscribeRelatedTables";
 
 export type LocalFunc = (items: AnyObject[]) => any;
 
@@ -39,210 +39,48 @@ async function subscribe(this: ViewHandler, filter: Filter, params: SubscribePar
     if (filterSize * 4 > 2704) {
       throw "filter too big. Might exceed the btree version 4 maximum 2704. Use a primary key or a $rowhash filter instead"
     }
+    if (!this.dboBuilder.prostgles.isSuperUser) {
+      throw "Subscribe not possible. Must be superuser to add triggers 1856";
+    }
 
-    if (!localFunc) {
- 
-      if (!this.dboBuilder.prostgles.isSuperUser) {
-        throw "Subscribe not possible. Must be superuser to add triggers 1856";
-      }
-      
-      return await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, localParams)
-        .then(async _isValid => {
-
-          let viewOptions: ViewSubscriptionOptions | undefined = undefined;
-
-          if (this.is_view) {
-            const viewName = this.name;
-            const viewNameEscaped = this.escapedName;
-            const { current_schema } = await this.db.oneOrNone("SELECT current_schema")
-
-            /** Get list of used columns and their parent tables */
-            let { def } = (await this.db.oneOrNone("SELECT pg_get_viewdef(${viewName}) as def", { viewName })) as { def: string };
-            def = def.trim();
-            if (def.endsWith(";")) {
-              def = def.slice(0, -1);
-            }
-            if (!def || typeof def !== "string") {
-              throw makeErrorFromPGError("Could get view definition");
-            }
-            const { fields } = await this.dboBuilder.dbo.sql!(`SELECT * FROM ( \n ${def} \n ) prostgles_subscribe_view_definition LIMIT 0`, {});
-            const tableColumns = fields.filter(f => f.tableName && f.columnName);
-
-            /** Create exists filters for each table */
-            const tableIds: string[] = Array.from(new Set(tableColumns.map(tc => tc.tableID!.toString())));
-            viewOptions = {
-              type: "view",
-              viewName,
-              definition: def,
-              relatedTables: []
-            }
-            viewOptions.relatedTables = await Promise.all(tableIds.map(async tableID => {
-              const table = this.dboBuilder.USER_TABLES!.find(t => t.relid === +tableID)!;
-              let tableCols = tableColumns.filter(tc => tc.tableID!.toString() === tableID);
-
-              /** If table has primary keys and they are all in this view then use only primary keys */
-              if (table?.pkey_columns?.every(pkey => tableCols.some(c => c.columnName === pkey))) {
-                tableCols = tableCols.filter(c => table?.pkey_columns?.includes(c.columnName!))
-              } else {
-                /** Exclude non comparable data types */
-                tableCols = tableCols.filter(c => !["json", "xml"].includes(c.udt_name))
-              }
-
-              const { relname: tableName, schemaname: tableSchema } = table;
-
-              if(tableCols.length){
-
-                const tableNameEscaped = tableSchema === current_schema ? table.relname : [tableSchema, tableName].map(v => JSON.stringify(v)).join(".");
-
-                const fullCondition = `EXISTS (
-                  SELECT 1
-                  FROM ${viewNameEscaped}
-                  WHERE ${tableCols.map(c => `${tableNameEscaped}.${JSON.stringify(c.columnName)} = ${viewNameEscaped}.${JSON.stringify(c.name)}`).join(" AND \n")}
-                  AND ${condition || "TRUE"}
-                )`;
-
-                try {
-                  const { count } = await this.db.oneOrNone(`
-                    WITH ${asName(tableName)} AS (
-                      SELECT * 
-                      FROM ${asName(tableName)}
-                      LIMIT 0
-                    )
-
-                    SELECT COUNT(*) as count
-                    FROM (
-                      ${def}
-                    ) prostgles_view_ref_table_test
-                  `);
-
-                  const relatedTableSubscription = {
-                    tableName: tableName!,
-                    tableNameEscaped,
-                    condition: fullCondition,
-                  }
-  
-                  if(count.toString() === '0'){
-                    return relatedTableSubscription;
-                  }
-                } catch(e){
-                  log(`Could not not override subscribed view (${this.name}) table (${tableName}). Will not check condition`, e);
-                }
-              }
-
-              return {
-                tableName,
-                tableNameEscaped: JSON.stringify(tableName),// [table.schemaname, table.relname].map(v => JSON.stringify(v)).join("."),
-                condition: "TRUE"
-              }
-
-            }))
-
-            /** Get list of remaining used inner tables */
-            const allUsedTables: { table_name: string; table_schema: string; }[] = await this.db.any(
-              "SELECT distinct table_name, table_schema FROM information_schema.view_column_usage WHERE view_name = ${viewName}",
-              { viewName }
-            );
+    /** Ensure request is valid */
+    await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, localParams);
 
-            /** Remaining tables will have listeners on all records (condition = "TRUE") */
-            const remainingInnerTables = allUsedTables.filter(at => !tableColumns.some(dc => dc.tableName === at.table_name && dc.tableSchema === at.table_schema));
-            viewOptions.relatedTables = [
-              ...viewOptions.relatedTables,
-              ...remainingInnerTables.map(t => ({
-                tableName: t.table_name,
-                tableNameEscaped: [t.table_name, t.table_schema].map(v => JSON.stringify(v)).join("."),
-                condition: "TRUE"
-              }))
-            ];
+    const viewOptions = await getSubscribeRelatedTables.bind(this)({ filter, selectParams, table_rules, localParams, condition, filterOpts })
 
-            if (!viewOptions.relatedTables.length) {
-              throw "Could not subscribe to this view: no related tables found";
-            }
-          }
+    const commonSubOpts = {
+      table_info: this.tableOrViewInfo,
+      viewOptions,
+      table_rules,
+      condition,
+      table_name: this.name,
+      filter: { ...filter },
+      params: { ...selectParams },
+      throttle,
+      last_throttled: 0,
+    } as const;
 
-          /** Any joined table used within select or filter must also be added a trigger for this recordset */
-          if(!this.is_view){
-            const newQuery = await this.find(filter, { ...selectParams, limit: 0 }, undefined, table_rules, { ...localParams, returnNewQuery: true }) as unknown as NewQuery;
-            viewOptions = {
-              type: "table",
-              relatedTables: []
-            }
-            /**
-             * Avoid nested exists error. Will affect performance
-             */
-            const nonExistsFilter = filterOpts.exists.length? {} : filter;
-            for await (const j of (newQuery.joins ?? [])) {
-              if(!viewOptions!.relatedTables.find(rt => rt.tableName === j.table)){
-                viewOptions.relatedTables.push({
-                  tableName: j.table,
-                  tableNameEscaped: asName(j.table),
-                  condition: (await this.dboBuilder.dbo[j.table]!.prepareWhere!({ 
-                    filter: { 
-                      $existsJoined: { 
-                        
-                        [[this.name, ...j.$path ?? [].slice(0).reverse()].join(".")]: nonExistsFilter
-                      } 
-                    },
-                    addKeywords: false,
-                    localParams: undefined, 
-                    tableRule: undefined 
-                  })).where
-                })
-              }
-            }
-            for await(const e of newQuery.whereOpts.exists) {              
-              const eTable = e.tables.at(-1)!
-              viewOptions.relatedTables.push({
-                tableName: eTable,
-                tableNameEscaped: asName(eTable),
-                condition: (await this.dboBuilder.dbo[eTable]!.prepareWhere!({ 
-                  filter: { 
-                    $existsJoined: { 
-                      [[this.name, ...e.tables ?? [].slice(0, -1).reverse()].join(".")]: nonExistsFilter
-                    }
-                  },
-                  addKeywords: false,
-                  localParams: undefined, 
-                  tableRule: undefined 
-                })).where
-              });
-            }
-            if(!viewOptions.relatedTables.length){
-              viewOptions = undefined;
-            }
-          }
+    if (!localFunc) {    
 
-          const { socket } = localParams ?? {};
-          const pubSubManager = await this.dboBuilder.getPubSubManager();
-          return pubSubManager.addSub({
-            table_info: this.tableOrViewInfo,
-            socket,
-            table_rules,
-            table_name: this.name,
-            condition: condition,
-            viewOptions,
-            func: undefined,
-            filter: { ...filter },
-            params: { ...selectParams },
-            socket_id: socket?.id,
-            throttle,
-            last_throttled: 0,
-          }).then(channelName => ({ channelName }));
-        }) as any;
+      const { socket } = localParams ?? {};
+      const pubSubManager = await this.dboBuilder.getPubSubManager();
+      return pubSubManager.addSub({
+        ...commonSubOpts,
+        socket, 
+        func: undefined,
+        socket_id: socket?.id, 
+      }).then(channelName => ({ channelName })) as any;
+      
     } else {
+
       const pubSubManager = await this.dboBuilder.getPubSubManager();
-      pubSubManager.addSub({
-        table_info: this.tableOrViewInfo,
-        socket: undefined,
-        table_rules,
-        condition,
-        func: localFunc,
-        filter: { ...filter },
-        params: { ...selectParams },
-        socket_id: undefined,
-        table_name: this.name,
-        throttle,
-        last_throttled: 0,
+      pubSubManager.addSub({ 
+        ...commonSubOpts,
+        socket: undefined,  
+        func: localFunc, 
+        socket_id: undefined, 
       }).then(channelName => ({ channelName }));
+
       const unsubscribe = async () => {
         const pubSubManager = await this.dboBuilder.getPubSubManager();
         pubSubManager.removeLocalSub(this.name, condition, localFunc)

package/lib/PubSubManager/PubSubManager.d.ts.map

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

package/lib/PubSubManager/PubSubManager.js

@@ -268,7 +268,28 @@ class PubSubManager {
         return this.postgresNotifListenManager.isListening();
     }
     getSubs(table_name, condition) {
-        return this.subs?.[table_name]?.[condition]?.subs;
+        const subs = this.subs?.[table_name]?.[condition]?.subs ?? [];
+        // if(!subs){
+        //   log("Subs not found:", { table_name, condition }, this.subs)
+        // }
+        return subs.flatMap(s => {
+            /* Return parentSubs to ensure throttling works */
+            if (s.parentSubParams) {
+                const parentSubs = [];
+                const parentChannel = s.parentSubParams.channel_name;
+                for (const tableName in (0, util_1.getKeys)(this.subs)) {
+                    for (const condition in (0, util_1.getKeys)(this.subs[tableName])) {
+                        this.subs[tableName][condition].subs.forEach(parentSub => {
+                            if (!parentSub.parentSubParams && parentSub.channel_name === parentChannel) {
+                                parentSubs.push(parentSub);
+                            }
+                        });
+                    }
+                }
+                return parentSubs ?? s;
+            }
+            return s;
+        });
     }
     getSyncs(table_name, condition) {
         return (this.syncs || [])
@@ -296,12 +317,19 @@ class PubSubManager {
             console.error("Unexpected notif type: ", notifType);
             return;
         }
+        if (dataArr.length < 3) {
+            throw "dataArr length < 3";
+        }
         const table_name = dataArr[1], op_name = dataArr[2], condition_ids_str = dataArr[3];
         // const triggers = await this.db.any("SELECT * FROM prostgles.triggers WHERE table_name = $1 AND id IN ($2:csv)", [table_name, condition_ids_str.split(",").map(v => +v)]);
         // const conditions: string[] = triggers.map(t => t.condition);
+        /**
+         * Trigger error
+         */
         (0, exports.log)("PG Trigger ->", dataArr.join("__"));
         if (condition_ids_str && condition_ids_str.startsWith("error") &&
-            this._triggers && this._triggers[table_name] && this._triggers[table_name].length) {
+            this._triggers &&
+            this._triggers[table_name]?.length) {
             const pref = "INTERNAL ERROR";
             console.error(`${pref}: condition_ids_str: ${condition_ids_str}`);
             this._triggers[table_name].map(c => {
@@ -310,6 +338,9 @@ class PubSubManager {
                     this.pushSubData(s, pref + ". Check server logs. Schema might have changed");
                 });
             });
+            /**
+             * Trigger ok
+             */
         }
         else if (condition_ids_str?.split(",").length &&
             condition_ids_str?.split(",").every((c) => Number.isInteger(+c)) &&
@@ -762,8 +793,8 @@ class PubSubManager {
             triggers.map(t => {
                 this._triggers = this._triggers || {};
                 this._triggers[t.table_name] = this._triggers[t.table_name] || [];
-                if (!this._triggers[t.table_name].includes(t.condition)) {
-                    this._triggers[t.table_name].push(t.condition);
+                if (!this._triggers[t.table_name]?.includes(t.condition)) {
+                    this._triggers[t.table_name]?.push(t.condition);
                 }
             });
             (0, exports.log)("trigger added.. ", { table_name, condition });