prostgles-server 3.0.50 → 3.0.51

package/lib/PubSubManager.ts

@@ -75,6 +75,17 @@ type SubscriptionParams = {
   channel_name: string;
   table_name: string;
   socket: PRGLIOSocket | undefined;
+
+  /** 
+   * If this is a view then an array with all related tables will be  
+   * */
+  relatedTableSubscriptions?: {
+    tableName: string;
+    tableNameEscaped: string;
+    condition: string;
+  }[];
+  parentSubParams: Omit<SubscriptionParams, "parentSubParams"> | undefined;
+
   table_info: TableOrViewInfo;
   table_rules?: TableRule;
   filter: object;
@@ -342,8 +353,8 @@ export class PubSubManager {
 
                         -- Force table into cache
                         IF EXISTS (select * from pg_extension where extname = 'pg_prewarm') THEN
-                            CREATE EXTENSION IF NOT EXISTS pg_prewarm;
-                            PERFORM pg_prewarm('prostgles.app_triggers');
+                          CREATE EXTENSION IF NOT EXISTS pg_prewarm;
+                          PERFORM pg_prewarm('prostgles.app_triggers');
                         END IF;
                     */
 
@@ -369,20 +380,24 @@ export class PubSubManager {
                                 -- PERFORM pg_notify('debug', concat_ws(' ', 'TABLE', TG_TABLE_NAME, TG_OP));
 
                                 SELECT string_agg(
-                                    concat_ws(
-                                        E' UNION \n ',
-                                        CASE WHEN (TG_OP = 'DELETE' OR TG_OP = 'UPDATE') THEN (p1 || ' old_table ' || p2) END,
-                                        CASE WHEN (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN (p1 || ' new_table ' || p2) END 
-                                    ),
-                                    E' UNION \n '::text
+                                  concat_ws(
+                                    E' UNION \n ',
+                                    CASE WHEN (TG_OP = 'DELETE' OR TG_OP = 'UPDATE') THEN (p1 || ' old_table ' || p2) END,
+                                    CASE WHEN (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN (p1 || ' new_table ' || p2) END 
+                                  ),
+                                  E' UNION \n '::text
                                 )
                                 INTO unions
                                 FROM (
                                     SELECT 
-                                        $z$ SELECT CASE WHEN EXISTS( SELECT 1 FROM $z$     AS p1,
+                                        $z$ 
+                                          SELECT CASE WHEN EXISTS( SELECT 1 FROM 
+                                        $z$ AS p1,
                                         format( 
-                                            $c$ as %I WHERE %s ) THEN %s::text END AS t_ids $c$
-                                            , table_name, condition, id 
+                                          $c$ 
+                                            as %I WHERE %s ) THEN %s::text END AS t_ids 
+                                          $c$, 
+                                          table_name, condition, id 
                                         ) AS p2
                                     FROM prostgles.v_triggers
                                     WHERE table_name = TG_TABLE_NAME
@@ -390,15 +405,15 @@ export class PubSubManager {
                                 
                                 /*
                                 PERFORM pg_notify( 
-                                    ${asValue(this.NOTIF_CHANNEL.preffix)} || (SELECT id FROM prostgles.apps LIMIT 1) , 
-                                    concat_ws(
-                                        ${asValue(PubSubManager.DELIMITER)},
-
-                                        ${asValue(this.NOTIF_TYPE.data)}, 
-                                        COALESCE(TG_TABLE_NAME, 'MISSING'), 
-                                        COALESCE(TG_OP, 'MISSING'), 
-                                        unions
-                                    )
+                                  ${asValue(this.NOTIF_CHANNEL.preffix)} || (SELECT id FROM prostgles.apps LIMIT 1) , 
+                                  concat_ws(
+                                    ${asValue(PubSubManager.DELIMITER)},
+
+                                    ${asValue(this.NOTIF_TYPE.data)}, 
+                                    COALESCE(TG_TABLE_NAME, 'MISSING'), 
+                                    COALESCE(TG_OP, 'MISSING'), 
+                                    unions
+                                  )
                                 );
                                 RAISE 'unions: % , cids: %', unions, c_ids;
                                 */
@@ -406,25 +421,25 @@ export class PubSubManager {
                                 IF unions IS NOT NULL THEN
                                     query = format(
                                         $s$
-                                            SELECT ARRAY_AGG(DISTINCT t.t_ids)
-                                            FROM ( %s ) t
+                                          SELECT ARRAY_AGG(DISTINCT t.t_ids)
+                                          FROM ( %s ) t
                                         $s$, 
                                         unions
                                     );
 
                                     BEGIN
-                                        EXECUTE query INTO t_ids;
+                                      EXECUTE query INTO t_ids;
 
-                                        --RAISE NOTICE 'trigger fired ok';
+                                      --RAISE NOTICE 'trigger fired ok';
 
                                     EXCEPTION WHEN OTHERS THEN
-                                        
-                                        has_errors := TRUE;
+                                      
+                                      has_errors := TRUE;
 
-                                        GET STACKED DIAGNOSTICS 
-                                            err_text = MESSAGE_TEXT,
-                                            err_detail = PG_EXCEPTION_DETAIL,
-                                            err_hint = PG_EXCEPTION_HINT;
+                                      GET STACKED DIAGNOSTICS 
+                                        err_text = MESSAGE_TEXT,
+                                        err_detail = PG_EXCEPTION_DETAIL,
+                                        err_hint = PG_EXCEPTION_HINT;
 
 
                                     END;
@@ -986,7 +1001,7 @@ export class PubSubManager {
   }
 
   getSubs(table_name: string, condition: string): SubscriptionParams[] {
-    return get(this.subs, [table_name, condition, "subs"])
+    return this.subs?.[table_name]?.[condition]?.subs
   }
 
   getSyncs(table_name: string, condition: string) {
@@ -1185,7 +1200,7 @@ export class PubSubManager {
       params, condition = "", throttle = 0
     } = syncParams || {};
 
-    let conditionParsed = this.parseCondition(condition);
+    let conditionParsed = parseCondition(condition);
     if (!socket || !table_info) throw "socket or table_info missing";
 
 
@@ -1289,16 +1304,16 @@ export class PubSubManager {
     await this.addTrigger({ table_name, condition: conditionParsed });
 
     return channel_name;
-  }
-
-  parseCondition = (condition: string): string => Boolean(condition && condition.trim().length) ? condition : "TRUE"
+  } 
+  
 
   /* Must return a channel for socket */
   /* The distinct list of channel names must have a corresponding trigger in the database */
-  async addSub(subscriptionParams: Omit<AddSubscriptionParams, "channel_name">) {
+  async addSub(subscriptionParams: Omit<AddSubscriptionParams, "channel_name" | "parentSubParams">) {
     const {
       socket, func = null, table_info = null, table_rules, filter = {},
-      params = {}, condition = "", throttle = 0  //subOne = false, 
+      params = {}, condition = "", throttle = 0,  //subOne = false, 
+      relatedTableSubscriptions
     } = subscriptionParams || {};
 
     let validated_throttle = subscriptionParams.throttle || 10;
@@ -1312,13 +1327,13 @@ export class PubSubManager {
       validated_throttle = throttle;
     }
 
-    let channel_name = `${this.socketChannelPreffix}.${table_info.name}.${JSON.stringify(filter)}.${JSON.stringify(params)}.${"m"}.sub`;  //.${subOne? "o" : "m"}.sub`;
+    const channel_name = `${this.socketChannelPreffix}.${table_info.name}.${JSON.stringify(filter)}.${JSON.stringify(params)}.${"m"}.sub`;
 
     this.upsertSocket(socket, channel_name);
 
-    const upsertSub = (newSubData: { table_name: string, condition: string, is_ready: boolean }) => {
-      const { table_name, condition: _cond, is_ready = false } = newSubData,
-        condition = this.parseCondition(_cond),
+    const upsertSub = (newSubData: { table_name: string; condition: string; is_ready: boolean; parentSubParams: SubscriptionParams["parentSubParams"] }) => {
+      const { table_name, condition: _cond, is_ready = false, parentSubParams } = newSubData,
+        condition = parseCondition(_cond),
         newSub: SubscriptionParams = {
           socket,
           table_name: table_info.name,
@@ -1327,18 +1342,18 @@ export class PubSubManager {
           params,
           table_rules,
           channel_name,
-          func: func ? func : undefined,
+          parentSubParams,
+          func: func ?? undefined,
           socket_id: socket?.id,
           throttle: validated_throttle,
           is_throttling: null,
           last_throttled: 0,
           is_ready,
-          // subOne
         };
 
-      this.subs[table_name] = this.subs[table_name] || {};
-      this.subs[table_name][condition] = this.subs[table_name][condition] || { subs: [] };
-      this.subs[table_name][condition].subs = this.subs[table_name][condition].subs || [];
+      this.subs[table_name] = this.subs[table_name] ?? {};
+      this.subs[table_name][condition] = this.subs[table_name][condition] ?? { subs: [] };
+      this.subs[table_name][condition].subs = this.subs[table_name][condition].subs ?? [];
 
       // console.log("1034 upsertSub", this.subs)
       const sub_idx = this.subs[table_name][condition].subs.findIndex(s =>
@@ -1368,26 +1383,28 @@ export class PubSubManager {
     };
 
 
-    if (table_info.is_view && table_info.parent_tables) {
-      if (table_info.parent_tables.length) {
-
-        let _condition = "TRUE";
-        table_info.parent_tables.map(async table_name => {
-
+    if (table_info.is_view && relatedTableSubscriptions) {
+      if (relatedTableSubscriptions.length) {
+ 
+        relatedTableSubscriptions.map(async relatedTable => {
+          const params: Omit<Parameters<typeof upsertSub>[0], "is_ready"> = {
+            table_name: relatedTable.tableNameEscaped,
+            condition: relatedTable.condition,
+            parentSubParams: {
+              ...subscriptionParams,
+              channel_name
+            },
+          } 
+          
           upsertSub({
-            table_name,
-            condition: _condition,
-            is_ready: true
+            ...params,
+            is_ready: false
           });
 
-          await this.addTrigger({
-            table_name,
-            condition: _condition
-          });
+          await this.addTrigger(params);
 
           upsertSub({
-            table_name,
-            condition: _condition,
+            ...params,
             is_ready: true
           });
         });
@@ -1403,16 +1420,18 @@ export class PubSubManager {
 
       upsertSub({
         table_name: table_info.name,
-        condition: this.parseCondition(condition),
+        condition: parseCondition(condition),
+        parentSubParams: undefined,
         is_ready: false
       });
       await this.addTrigger({
         table_name: table_info.name,
-        condition: this.parseCondition(condition),
+        condition: parseCondition(condition),
       });
       upsertSub({
         table_name: table_info.name,
-        condition: this.parseCondition(condition),
+        condition: parseCondition(condition),
+        parentSubParams: undefined,
         is_ready: true
       });
 
@@ -1421,7 +1440,7 @@ export class PubSubManager {
   }
 
   removeLocalSub(table_name: string, condition: string, func: (items: object[]) => any) {
-    let cond = this.parseCondition(condition);
+    let cond = parseCondition(condition);
     if (get(this.subs, [table_name, cond, "subs"])) {
       this.subs[table_name][cond].subs.map((sub, i) => {
         if (
@@ -1538,11 +1557,11 @@ export class PubSubManager {
 
   getMyTriggerQuery = async () => {
     return pgp.as.format(` 
-            SELECT * --, ROW_NUMBER() OVER(PARTITION BY table_name ORDER BY table_name, condition ) - 1 as id
-            FROM prostgles.v_triggers
-            WHERE app_id = $1
-            ORDER BY table_name, condition
-        `, [this.appID]
+      SELECT * --, ROW_NUMBER() OVER(PARTITION BY table_name ORDER BY table_name, condition ) - 1 as id
+      FROM prostgles.v_triggers
+      WHERE app_id = $1
+      ORDER BY table_name, condition
+    `, [this.appID]
     )
   }
 
@@ -1556,9 +1575,9 @@ export class PubSubManager {
       if (!table_name) throw "MISSING table_name";
       if (!this.appID) throw "MISSING appID";
 
-      if (!condition || !condition.trim().length) condition = "TRUE";
-
-      const app_id = this.appID;
+      if (!condition || !condition.trim().length) {
+        condition = "TRUE";
+      }
 
       // console.log(1623, { app_id, addTrigger: { table_name, condition } });
 
@@ -1567,18 +1586,18 @@ export class PubSubManager {
       const trgVals = {
         tbl: asValue(table_name),
         cond: asValue(condition),
-      }
+      };
 
       await this.db.any(`
-                BEGIN WORK;
-                LOCK TABLE prostgles.app_triggers IN ACCESS EXCLUSIVE MODE;
+        BEGIN WORK;
+        LOCK TABLE prostgles.app_triggers IN ACCESS EXCLUSIVE MODE;
 
-                INSERT INTO prostgles.app_triggers (table_name, condition, app_id) 
-                    VALUES (${trgVals.tbl}, ${trgVals.cond}, ${asValue(this.appID)})
-                ON CONFLICT DO NOTHING;
-                     
-                COMMIT WORK;
-            `);
+        INSERT INTO prostgles.app_triggers (table_name, condition, app_id) 
+          VALUES (${trgVals.tbl}, ${trgVals.cond}, ${asValue(this.appID)})
+        ON CONFLICT DO NOTHING;
+              
+        COMMIT WORK;
+      `);
 
       log("addTrigger.. ", { table_name, condition });
 
@@ -1611,6 +1630,9 @@ export class PubSubManager {
   }
 }
 
+
+const parseCondition = (condition: string): string => Boolean(condition && condition.trim().length) ? condition : "TRUE"
+
 export function omitKeys<T extends AnyObject, Exclude extends keyof T>(obj: T, exclude: Exclude[]): Omit<T, Exclude> {
   return pickKeys(obj, getKeys(obj).filter(k => !exclude.includes(k as any)))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.50",
+  "version": "3.0.51",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -38,7 +38,7 @@
     "check-disk-space": "^3.3.1",
     "file-type": "^17.1.4",
     "pg-promise": "^10.11.1",
-    "prostgles-types": "^3.0.13",
+    "prostgles-types": "^3.0.16",
     "sharp": "^0.31.0"
   },
   "devDependencies": {

package/tests/client/PID.txt

@@ -1 +1 @@
-138572
+152901

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "3.0.49",
+      "version": "3.0.50",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.121.0",
@@ -31,7 +31,7 @@
         "check-disk-space": "^3.3.1",
         "file-type": "^17.1.4",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^3.0.13",
+        "prostgles-types": "^3.0.16",
         "sharp": "^0.31.0"
       },
       "devDependencies": {
@@ -1510,7 +1510,7 @@
         "check-disk-space": "^3.3.1",
         "file-type": "^17.1.4",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^3.0.13",
+        "prostgles-types": "^3.0.16",
         "sharp": "^0.31.0",
         "typescript": "^4.8.4"
       }