prostgles-server 3.0.150 → 3.0.152

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.150",
+  "version": "3.0.152",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/PID.txt

@@ -1 +1 @@
-11319
+18959

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "3.0.149",
+      "version": "3.0.151",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.272.0",