prostgles-server 4.2.293 → 4.2.295

package/lib/PubSubManager/getPubSubManagerInitQuery.ts

@@ -9,7 +9,8 @@ import {
   NOTIF_TYPE,
 } from "./PubSubManagerUtils";
 import { getAppCheckQuery } from "./orphanTriggerCheck";
-const { version } = require("../../package.json");
+import { version } from "../../package.json";
+import { getDataWatchFunctionQuery } from "./init/getDataWatchFunctionQuery";
 
 export const DB_OBJ_NAMES = {
   trigger_add_remove_func: "prostgles.trigger_add_remove_func",
@@ -195,6 +196,9 @@ BEGIN
           table_name      TEXT NOT NULL,
           condition       TEXT NOT NULL,
           condition_hash  TEXT NOT NULL,
+          
+          /** If defined, will check the provided fields for changes */
+          fields          _TEXT ,
 
           /* The view from the root subscription, found in the condition.
               We need this because old_table/new_table data is not reflected in the view inside the AFTER trigger
@@ -216,153 +220,7 @@ BEGIN
         FROM prostgles.app_triggers;
         COMMENT ON VIEW prostgles.v_triggers IS 'Augment trigger table with natural IDs and per app IDs';
 
-
-        CREATE OR REPLACE FUNCTION ${DB_OBJ_NAMES.data_watch_func}() RETURNS TRIGGER 
-        AS $$
-
-            DECLARE t_ids TEXT[];
-            DECLARE c_ids INTEGER[];  
-            DECLARE err_c_ids INTEGER[]; 
-            DECLARE unions TEXT := '';          
-            DECLARE query TEXT := '';            
-            DECLARE v_trigger RECORD;
-            DECLARE has_errors BOOLEAN := FALSE;
-            
-            DECLARE err_text    TEXT;
-            DECLARE err_detail  TEXT;
-            DECLARE err_hint    TEXT;
-                    
-            DECLARE view_def_query TEXT := '';   
-
-            DECLARE escaped_table  TEXT;
-
-            BEGIN
-
-                --PERFORM pg_notify('debug', concat_ws(' ', 'TABLE', TG_TABLE_NAME, TG_OP));
-            
-                escaped_table := concat_ws('.', CASE WHEN TG_TABLE_SCHEMA <> CURRENT_SCHEMA THEN format('%I', TG_TABLE_SCHEMA) END, format('%I', TG_TABLE_NAME));
-
-                SELECT string_agg(
-                  format(
-                    $c$ 
-                      SELECT CASE WHEN EXISTS( 
-                        SELECT 1 
-                        FROM %s 
-                        WHERE %s 
-                      ) THEN %s::text END AS t_ids 
-                    $c$, 
-                    table_name, 
-                    condition, 
-                    id 
-                  ),
-                  E' UNION \n ' 
-                ) 
-                INTO unions
-                FROM prostgles.v_triggers
-                WHERE table_name = escaped_table;
-
-
-                /* unions = 'old_table union new_table' or any one of the tables */
-                IF unions IS NOT NULL THEN
-
-                    SELECT  
-                      format(
-                        E'WITH %I AS (\n %s \n) ', 
-                        TG_TABLE_NAME, 
-                        concat_ws(
-                          E' UNION ALL \n ',
-                          CASE WHEN (TG_OP = 'DELETE' OR TG_OP = 'UPDATE') THEN ' SELECT * FROM old_table ' END,
-                          CASE WHEN (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN ' SELECT * FROM new_table ' END 
-                        )
-                      ) 
-                      || 
-                      COALESCE((
-                        SELECT ', ' || string_agg(format(E' %s AS ( \n %s \n ) ', related_view_name, related_view_def), ', ')
-                        FROM (
-                          SELECT DISTINCT related_view_name, related_view_def 
-                          FROM prostgles.v_triggers
-                          WHERE table_name = escaped_table
-                          AND related_view_name IS NOT NULL
-                          AND related_view_def  IS NOT NULL
-                        ) t
-                      ), '')
-                      || 
-                      format(
-                        $c$
-                            SELECT ARRAY_AGG(DISTINCT t.t_ids)
-                            FROM ( 
-                              %s 
-                            ) t
-                        $c$, 
-                        unions
-                      )
-                    INTO query; 
-
-                    BEGIN
-                      EXECUTE query INTO t_ids;
-
-                      --RAISE NOTICE 'trigger fired ok';
-
-                    EXCEPTION WHEN OTHERS THEN
-                      
-                      has_errors := TRUE;
-
-                      GET STACKED DIAGNOSTICS 
-                        err_text = MESSAGE_TEXT,
-                        err_detail = PG_EXCEPTION_DETAIL,
-                        err_hint = PG_EXCEPTION_HINT;
-
-                    END;
-
-                    --RAISE NOTICE 'has_errors: % ', has_errors;
-                    --RAISE NOTICE 'unions: % , cids: %', unions, c_ids;
-
-                    IF (t_ids IS NOT NULL OR has_errors) THEN
-
-                        FOR v_trigger IN
-                            SELECT app_id, string_agg(c_id::text, ',') as cids
-                            FROM prostgles.v_triggers
-                            WHERE id = ANY(t_ids) 
-                            OR has_errors
-                            GROUP BY app_id
-                        LOOP
-                            
-                            PERFORM pg_notify( 
-                              ${asValue(NOTIF_CHANNEL.preffix)} || v_trigger.app_id , 
-                              LEFT(concat_ws(
-                                ${asValue(DELIMITER)},
-
-                                ${asValue(NOTIF_TYPE.data)}, 
-                                COALESCE(escaped_table, 'MISSING'), 
-                                COALESCE(TG_OP, 'MISSING'), 
-                                CASE WHEN has_errors 
-                                  THEN concat_ws('; ', 'error', err_text, err_detail, err_hint, 'query: ' || query ) 
-                                  ELSE COALESCE(v_trigger.cids, '') 
-                                END
-                                ${debugMode ? ", COALESCE(current_query(), 'current_query ??'), ' ', query" : ""}
-                              ), 7999/4) -- Some chars are 2bytes -> 'Ω'
-                            );
-                        END LOOP;
-
-
-                        IF has_errors THEN
-
-                          DELETE FROM prostgles.app_triggers;
-                          RAISE NOTICE 'trigger dropped due to exception: % % %', err_text, err_detail, err_hint;
-
-                        END IF;
-                        
-                    END IF;
-                END IF;
-
-                ${getAppCheckQuery()}
-
-                RETURN NULL;
-               
-            END;
-
-        $$ LANGUAGE plpgsql;
-        COMMENT ON FUNCTION ${DB_OBJ_NAMES.data_watch_func} IS 'Prostgles internal function used to notify when data in the table changed';
+        ${getDataWatchFunctionQuery(debugMode)}
 
         CREATE OR REPLACE FUNCTION ${DB_OBJ_NAMES.trigger_add_remove_func}() RETURNS TRIGGER 
         AS $$

package/lib/PubSubManager/init/getDataWatchFunctionQuery.ts

@@ -0,0 +1,183 @@
+import { DB_OBJ_NAMES } from "../getPubSubManagerInitQuery";
+import { getAppCheckQuery } from "../orphanTriggerCheck";
+import { asValue, DELIMITER, NOTIF_CHANNEL, NOTIF_TYPE } from "../PubSubManagerUtils";
+
+export const getDataWatchFunctionQuery = (debugMode: boolean | undefined) => {
+  return `
+  
+        CREATE OR REPLACE FUNCTION ${DB_OBJ_NAMES.data_watch_func}() RETURNS TRIGGER 
+        AS $$
+
+            DECLARE t_ids TEXT[];
+            DECLARE c_ids INTEGER[];  
+            DECLARE err_c_ids INTEGER[]; 
+            DECLARE unions TEXT := '';          
+            DECLARE query TEXT := '';            
+            DECLARE v_trigger RECORD;
+            DECLARE has_errors BOOLEAN := FALSE;
+            
+            DECLARE err_text    TEXT;
+            DECLARE err_detail  TEXT;
+            DECLARE err_hint    TEXT;
+                    
+            DECLARE view_def_query TEXT := '';   
+
+            DECLARE escaped_table  TEXT;
+
+            DECLARE changed_columns TEXT := NULL;
+
+            BEGIN
+
+                --PERFORM pg_notify('debug', concat_ws(' ', 'TABLE', TG_TABLE_NAME, TG_OP));
+            
+
+                -- Determine changed columns for UPDATE operations
+                IF TG_OP = 'UPDATE' THEN
+                  WITH cols AS (
+                    SELECT column_name::text 
+                    FROM information_schema.columns 
+                    WHERE table_schema = TG_TABLE_SCHEMA 
+                    AND table_name = TG_TABLE_NAME
+                  ),
+                  changed AS (
+                    SELECT column_name
+                    FROM cols
+                    WHERE EXISTS (
+                      SELECT 1 FROM new_table n 
+                      JOIN old_table o ON TRUE 
+                      WHERE n.* IS DISTINCT FROM o.*
+                      LIMIT 1
+                    )
+                  )
+                  SELECT string_agg(column_name, ',') INTO changed_columns
+                  FROM changed;
+                END IF;
+
+
+                escaped_table := concat_ws('.', CASE WHEN TG_TABLE_SCHEMA <> CURRENT_SCHEMA THEN format('%I', TG_TABLE_SCHEMA) END, format('%I', TG_TABLE_NAME));
+
+                SELECT string_agg(
+                  format(
+                    $c$ 
+                      SELECT CASE WHEN EXISTS( 
+                        SELECT 1 
+                        FROM %s 
+                        WHERE %s 
+                      ) THEN %s::text END AS t_ids 
+                    $c$, 
+                    table_name, 
+                    condition, 
+                    id 
+                  ),
+                  E' UNION \n ' 
+                ) 
+                INTO unions
+                FROM prostgles.v_triggers
+                WHERE table_name = escaped_table; 
+
+
+                /* unions = 'old_table union new_table' or any one of the tables */
+                IF unions IS NOT NULL THEN
+
+                    SELECT  
+                      format(
+                        E'WITH %I AS (\n %s \n) ', 
+                        TG_TABLE_NAME, 
+                        concat_ws(
+                          E' UNION ALL \n ',
+                          CASE WHEN (TG_OP = 'DELETE' OR TG_OP = 'UPDATE') THEN ' SELECT * FROM old_table ' END,
+                          CASE WHEN (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN ' SELECT * FROM new_table ' END 
+                        )
+                      ) 
+                      || 
+                      COALESCE((
+                        SELECT ', ' || string_agg(format(E' %s AS ( \n %s \n ) ', related_view_name, related_view_def), ', ')
+                        FROM (
+                          SELECT DISTINCT related_view_name, related_view_def 
+                          FROM prostgles.v_triggers
+                          WHERE table_name = escaped_table
+                          AND related_view_name IS NOT NULL
+                          AND related_view_def  IS NOT NULL
+                        ) t
+                      ), '')
+                      || 
+                      format(
+                        $c$
+                            SELECT ARRAY_AGG(DISTINCT t.t_ids)
+                            FROM ( 
+                              %s 
+                            ) t
+                        $c$, 
+                        unions
+                      )
+                    INTO query; 
+
+                    BEGIN
+                      EXECUTE query INTO t_ids;
+
+                      --RAISE NOTICE 'trigger fired ok';
+
+                    EXCEPTION WHEN OTHERS THEN
+                      
+                      has_errors := TRUE;
+
+                      GET STACKED DIAGNOSTICS 
+                        err_text = MESSAGE_TEXT,
+                        err_detail = PG_EXCEPTION_DETAIL,
+                        err_hint = PG_EXCEPTION_HINT;
+
+                    END;
+
+                    --RAISE NOTICE 'has_errors: % ', has_errors;
+                    --RAISE NOTICE 'unions: % , cids: %', unions, c_ids;
+
+                    IF (t_ids IS NOT NULL OR has_errors) THEN
+
+                        FOR v_trigger IN
+                            SELECT app_id, string_agg(c_id::text, ',') as cids
+                            FROM prostgles.v_triggers
+                            WHERE id = ANY(t_ids) 
+                            OR has_errors
+                            GROUP BY app_id
+                        LOOP
+                            
+                            PERFORM pg_notify( 
+                              ${asValue(NOTIF_CHANNEL.preffix)} || v_trigger.app_id , 
+                              LEFT(concat_ws(
+                                ${asValue(DELIMITER)},
+
+                                ${asValue(NOTIF_TYPE.data)}, 
+                                COALESCE(escaped_table, 'MISSING'), 
+                                COALESCE(TG_OP, 'MISSING'), 
+                                CASE WHEN has_errors 
+                                  THEN concat_ws('; ', 'error', err_text, err_detail, err_hint, 'query: ' || query ) 
+                                  ELSE COALESCE(v_trigger.cids, '') 
+                                END,
+                                COALESCE(changed_columns, '')
+                                ${debugMode ? ", COALESCE(current_query(), 'current_query ??'), ' ', query" : ""}
+                              ), 7999/4) -- Some chars are 2bytes -> 'Ω'
+                            );
+                        END LOOP;
+
+
+                        IF has_errors THEN
+
+                          DELETE FROM prostgles.app_triggers;
+                          RAISE NOTICE 'trigger dropped due to exception: % % %', err_text, err_detail, err_hint;
+
+                        END IF;
+                        
+                    END IF;
+                END IF;
+
+                ${getAppCheckQuery()}
+
+                RETURN NULL;
+               
+            END;
+
+        $$ LANGUAGE plpgsql;
+        COMMENT ON FUNCTION ${DB_OBJ_NAMES.data_watch_func} IS 'Prostgles internal function used to notify when data in the table changed';
+
+  `;
+};

package/lib/PubSubManager/initPubSubManager.ts

@@ -60,8 +60,11 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
       [this.appId, check_frequency_ms, watching_schema_tag_names]
     );
 
-    const appRecord = await this.db.one("SELECT * FROM prostgles.apps WHERE id = $1", [this.appId]);
-    if (!appRecord || !appRecord.application_name?.includes(this.appId)) {
+    const appRecord = await this.db.one<{ application_name: string | null }>(
+      "SELECT * FROM prostgles.apps WHERE id = $1",
+      [this.appId]
+    );
+    if (!appRecord.application_name?.includes(this.appId)) {
       throw `initPubSubManager error: App record with application_name containing appId (${this.appId}) not found`;
     }
 

package/lib/PubSubManager/notifListener.ts

@@ -1,7 +1,8 @@
-import { includes, pickKeys } from "prostgles-types";
+import { includes, pickKeys, tryCatchV2 } from "prostgles-types";
 import { parseFieldFilter } from "../DboBuilder/ViewHandler/parseFieldFilter";
 import { PubSubManager } from "./PubSubManager";
 import { DELIMITER, log, NOTIF_TYPE, type NotifTypeName } from "./PubSubManagerUtils";
+import { getJSONBObjectSchemaValidationError } from "../JSONBValidation/JSONBValidation";
 
 /* Relay relevant data to relevant subscriptions */
 export async function notifListener(this: PubSubManager, data: { payload: string }) {
@@ -68,7 +69,7 @@ export async function notifListener(this: PubSubManager, data: { payload: string
     throw "notifListener: dataArr length < 3";
   }
 
-  const [_, table_name, op_name, condition_ids_str] = dataArr;
+  const [_, table_name, op_name, condition_ids_str, changed_columns_str = "[]"] = dataArr;
   const condition_ids = condition_ids_str?.split(",").map((v) => +v);
 
   if (!table_name) {
@@ -130,9 +131,23 @@ export async function notifListener(this: PubSubManager, data: { payload: string
             ((sub.socket_id && this.sockets[sub.socket_id]) || sub.localFuncs)
         )
       );
+      const { data: changedColValidation } = tryCatchV2(() =>
+        getJSONBObjectSchemaValidationError(
+          { cols: "string[]" },
+          { cols: JSON.parse(changed_columns_str || "[]") as string[] },
+          "cols"
+        )
+      );
+      const changedColumns = changedColValidation?.data?.cols;
+
       activeAndReadySubs.forEach((sub) => {
         const { throttle = 0, throttleOpts, actions } = sub.subscribeOptions;
-
+        if (changedColumns?.length) {
+          const subFieldsHaveChanged = changedColumns.some((changedColumn) =>
+            sub.newQuery.select.some((f) => f.fields.includes(changedColumn))
+          );
+          if (!subFieldsHaveChanged) return;
+        }
         const commandLowerCase = (op_name?.toLowerCase() || "insert") as keyof NonNullable<
           typeof actions
         >;

package/lib/WebsocketAPI/onSocketConnected.ts

@@ -59,7 +59,9 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
     const { onUseOrSocketConnected } = this.opts.auth ?? {};
     const { authHandler } = this;
     if (onUseOrSocketConnected) {
-      if (!authHandler) throw "authHandler missing";
+      if (!authHandler) {
+        throw "authHandler missing";
+      }
       const errorInfo = await onUseOrSocketConnected(
         authHandler.getValidatedSid({ socket }),
         getClientRequestIPsInfo({ socket }),

package/lib/initProstgles.ts

@@ -1,6 +1,6 @@
 import * as pgPromise from "pg-promise";
 import pg from "pg-promise/typescript/pg-subset";
-import { getKeys, isEmpty } from "prostgles-types";
+import { getKeys, isEmpty, isEqual } from "prostgles-types";
 import { DBEventsManager } from "./DBEventsManager";
 import { DBOFullyTyped } from "./DBSchemaBuilder";
 import { DBHandlerServer, Prostgles, getIsSuperUser } from "./Prostgles";
@@ -159,7 +159,7 @@ export const initProstgles = async function (
       this.dboBuilder.publishParser = this.publishParser;
 
       /* 4. Set publish and auth listeners */
-      this.setSocketEvents();
+      this.setupSocketIO();
     } else if (this.opts.auth) {
       throw "Auth config does not work without publish";
     }
@@ -193,10 +193,18 @@ export const initProstgles = async function (
       getTSSchema: this.getTSFileContent,
       options: this.opts,
       update: async (newOpts) => {
+        let optsHaveChanged = false as boolean;
         getKeys(newOpts).forEach((k) => {
-          //@ts-ignore
-          this.opts[k] = newOpts[k];
+          if (!isEqual(this.opts[k], newOpts[k])) {
+            optsHaveChanged = true;
+            //@ts-ignore
+            this.opts[k] = newOpts[k];
+          }
         });
+        if (!optsHaveChanged) {
+          console.warn("No options changed");
+          return;
+        }
 
         if ("fileTable" in newOpts) {
           await this.initFileTable();
@@ -225,7 +233,7 @@ export const initProstgles = async function (
             clientOnlyUpdateKeys.some((key) => key === updatedKey)
           )
         ) {
-          this.setSocketEvents();
+          this.setupSocketIO();
         } else {
           await this.init(onReady, { type: "prgl.update", newOpts });
         }

package/lib/runClientRequest.ts

@@ -67,7 +67,7 @@ export const runClientRequest = async function (
 
   const { tableName, command: nonValidatedCommand, param1, param2, param3 } = args;
   if (!TABLE_METHODS_KEYS.some((v) => v === nonValidatedCommand)) {
-    throw `Invalid command: ${nonValidatedCommand}. Expecting one of: ${TABLE_METHODS_KEYS};`;
+    throw `Invalid command: ${nonValidatedCommand}. Expecting one of: ${TABLE_METHODS_KEYS.join(", ")};`;
   }
   const command = nonValidatedCommand as keyof TableHandler;
   if (!clientReq.socket && SOCKET_ONLY_COMMANDS.some((v) => v === command)) {

package/package.json

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