prostgles-server 3.0.86 → 3.0.88

package/lib/Prostgles.ts

@@ -9,10 +9,8 @@ import pg = require('pg-promise/typescript/pg-subset');
 import FileManager, { ImageOptions, LocalConfig, S3Config } from "./FileManager";
 import { SchemaWatch } from "./SchemaWatch";
 
-const pkgj = require('../package.json');
-const version = pkgj.version;
-import AuthHandler, { Auth, SessionUser, AuthRequestParams } from "./AuthHandler";
-console.log("Add a basic auth mode where user and sessions table are created");
+const { version } = require('../package.json');
+import AuthHandler, { Auth, SessionUser, AuthRequestParams } from "./AuthHandler"; 
 
 import TableConfigurator, { TableConfig } from "./TableConfig";
 
@@ -31,7 +29,7 @@ type DbConnection = string | pg.IConnectionParameters<pg.IClient>;
 type DbConnectionOpts = pg.IDefaults;
 export const TABLE_METHODS = ["update", "find", "findOne", "insert", "delete", "upsert"] as const;
 function getDbConnection(dbConnection: DbConnection, options: DbConnectionOpts | undefined, debugQueries = false, onNotice: ProstglesInitOptions["onNotice"]): { db: DB, pgp: PGP } {
-  let pgp: PGP = pgPromise({
+  const pgp: PGP = pgPromise({
 
     promiseLib: promise,
     ...(debugQueries ? {
@@ -48,7 +46,8 @@ function getDbConnection(dbConnection: DbConnection, options: DbConnectionOpts |
       }
     } : {}),
     ...((onNotice || debugQueries) ? {
-      connect: function (client, dc, isFresh) {
+      connect: function ({ client, dc, useCount }) {
+        const isFresh = !useCount;
         if (isFresh && !client.listeners('notice').length) {
           client.on('notice', function (msg) {
             if (onNotice) {
@@ -333,7 +332,9 @@ export class Prostgles {
       port: 5432,
       application_name: "prostgles_app"
     },
-    onReady: () => { },
+    onReady: () => { 
+      //empty 
+    },
     schema: "public",
     watchSchema: false,
     watchSchemaType: "DDL_trigger",
@@ -381,7 +382,7 @@ export class Prostgles {
     if (!params.io) console.warn("io missing. WebSockets will not be set up");
 
     // TODO: find an exact keyof T<->arr TS matching method
-    let config: Array<keyof ProstglesInitOptions> = [
+    const config: Array<keyof ProstglesInitOptions> = [
       "transactions", "joins", "tsGeneratedTypesDir",
       "onReady", "dbConnection", "dbOptions", "publishMethods", "io",
       "publish", "schema", "publishRawSQL", "wsChannelNamePrefix", "onSocketConnect",
@@ -715,7 +716,7 @@ export class Prostgles {
 
     if (!this.dbo) throw "dbo missing";
 
-    let publishParser = new PublishParser(this.opts.publish, this.opts.publishMethods, this.opts.publishRawSQL, this.dbo, this.db!, this as any);
+    const publishParser = new PublishParser(this.opts.publish, this.opts.publishMethods, this.opts.publishRawSQL, this.dbo, this.db!, this as any);
     this.publishParser = publishParser;
 
     if (!this.opts.io) return;
@@ -739,7 +740,7 @@ export class Prostgles {
       this.connectedSockets.push(socket);
 
       if (!this.db || !this.dbo) throw new Error("db/dbo missing");
-      let { dbo, db, pgp } = this;
+      const { dbo, db } = this;
 
       try {
         if (this.opts.onSocketConnect) {
@@ -759,7 +760,7 @@ export class Prostgles {
             Checks request against publish and if OK run it with relevant publish functions. Local (server) requests do not check the policy 
         */
         socket.removeAllListeners(CHANNELS.DEFAULT)
-        socket.on(CHANNELS.DEFAULT, async ({ tableName, command, param1, param2, param3 }: SocketRequestParams, cb = (...callback: any[]) => { }) => {
+        socket.on(CHANNELS.DEFAULT, async ({ tableName, command, param1, param2, param3 }: SocketRequestParams, cb = (..._callback: any[]) => { /* Empty */}) => {
 
           try { /* Channel name will only include client-sent params so we ignore table_rules enforced params */
             if (!socket || !this.authHandler || !this.publishParser || !this.dbo) {
@@ -768,9 +769,9 @@ export class Prostgles {
             }
 
             const clientInfo = await this.authHandler.getClientInfo({ socket });
-            let valid_table_command_rules = await this.publishParser.getValidatedRequestRule({ tableName, command, localParams: { socket } }, clientInfo);
+            const valid_table_command_rules = await this.publishParser.getValidatedRequestRule({ tableName, command, localParams: { socket } }, clientInfo);
             if (valid_table_command_rules) {
-              let res = await this.dbo[tableName][command]!(param1, param2, param3, valid_table_command_rules, { socket, isRemoteRequest: true });
+              const res = await this.dbo[tableName][command]!(param1, param2, param3, valid_table_command_rules, { socket, isRemoteRequest: true });
               cb(null, res);
             } else throw `Invalid OR disallowed request: ${tableName}.${command} `;
 
@@ -791,11 +792,11 @@ export class Prostgles {
           if (this.opts.onSocketDisconnect) {
             const getUser = async () => { return await this.authHandler?.getClientInfo({ socket }); }
             this.opts.onSocketDisconnect({ socket, dbo: dbo as any, db, getUser });
-          };
+          }
         });
 
         socket.removeAllListeners(CHANNELS.METHOD)
-        socket.on(CHANNELS.METHOD, async ({ method, params }: SocketMethodRequest, cb = (...callback: any) => { }) => {
+        socket.on(CHANNELS.METHOD, async ({ method, params }: SocketMethodRequest, cb = (..._callback: any) => { /* Empty */ }) => {
           try {
             const methods = await this.publishParser?.getAllowedMethods(socket);
 
@@ -827,13 +828,13 @@ export class Prostgles {
   pushSocketSchema = async (socket: any) => {
 
     try {
-      let { auth, userData } = await this.authHandler?.makeSocketAuth(socket) || {};
+      const { auth, userData } = await this.authHandler?.makeSocketAuth(socket) || {};
 
       // let needType = this.publishRawSQL && typeof this.publishRawSQL === "function";
       // let DATA_TYPES = !needType? [] : await this.db.any("SELECT oid, typname FROM pg_type");
       // let USER_TABLES = !needType? [] :  await this.db.any("SELECT relid, relname FROM pg_catalog.pg_statio_user_tables");
   
-      const { dbo, db, pgp, publishParser } = this;
+      const { db, publishParser } = this;
       let fullSchema: {
         schema: TableSchemaForClient;
         tables: DBSchemaTable[];
@@ -856,13 +857,13 @@ export class Prostgles {
       if (this.opts.publishRawSQL && typeof this.opts.publishRawSQL === "function") {
         const canRunSQL = async () => {
           const publishParams = await this.publishParser?.getPublishParams({ socket })
-          let res = await this.opts.publishRawSQL?.(publishParams as any);
+          const res = await this.opts.publishRawSQL?.(publishParams as any);
           return Boolean(res && typeof res === "boolean" || res === "*");
         }
   
         if (await canRunSQL()) {
           socket.removeAllListeners(CHANNELS.SQL)
-          socket.on(CHANNELS.SQL, async ({ query, params, options }: SQLRequest, cb = (...callback: any) => { }) => {
+          socket.on(CHANNELS.SQL, async ({ query, params, options }: SQLRequest, cb = (..._callback: any) => { /* Empty */ }) => {
   
             if (!this.dbo?.sql) throw "Internal error: sql handler missing";
   
@@ -881,9 +882,9 @@ export class Prostgles {
       }
   
       const { schema, tables } = fullSchema ?? { schema: {}, tables: [] };
-      let joinTables2: string[][] = [];
+      const joinTables2: string[][] = [];
       if (this.opts.joins) {
-        let _joinTables2 = this.dboBuilder.getJoinPaths()
+        const _joinTables2 = this.dboBuilder.getJoinPaths()
           .filter(jp =>
             ![jp.t1, jp.t2].find(t => !schema[t] || !schema[t].findOne)
           ).map(jp => [jp.t1, jp.t2].sort());

package/lib/PubSubManager/PubSubManager.d.ts

@@ -8,8 +8,8 @@ import { TableRule } from "../PublishParser";
 export declare const asValue: (v: any) => string;
 export declare const DEFAULT_SYNC_BATCH_SIZE = 50;
 export declare const log: (...args: any[]) => void;
-export declare type BasicCallback = (err?: any, res?: any) => void;
-export declare type SyncParams = {
+export type BasicCallback = (err?: any, res?: any) => void;
+export type SyncParams = {
     socket_id: string;
     channel_name: string;
     table_name: string;
@@ -29,7 +29,7 @@ export declare type SyncParams = {
     last_synced: number;
     is_syncing: boolean;
 };
-declare type AddSyncParams = {
+type AddSyncParams = {
     socket: any;
     table_info: TableInfo;
     table_rules: TableRule;
@@ -43,7 +43,7 @@ declare type AddSyncParams = {
     condition: string;
     throttle?: number;
 };
-export declare type ViewSubscriptionOptions = {
+export type ViewSubscriptionOptions = {
     viewName: string;
     definition: string;
     relatedTables: {
@@ -52,7 +52,7 @@ export declare type ViewSubscriptionOptions = {
         condition: string;
     }[];
 };
-declare type SubscriptionParams = {
+type SubscriptionParams = {
     socket_id?: string;
     channel_name: string;
     table_name: string;
@@ -72,10 +72,10 @@ declare type SubscriptionParams = {
     is_throttling?: any;
     is_ready?: boolean;
 };
-declare type AddSubscriptionParams = SubscriptionParams & {
+type AddSubscriptionParams = SubscriptionParams & {
     condition: string;
 };
-export declare type PubSubManagerOptions = {
+export type PubSubManagerOptions = {
     dboBuilder: DboBuilder;
     wsChannelNamePrefix?: string;
     pgChannelName?: string;

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":";AAKA,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAE3E,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAc,MAAM,eAAe,CAAC;AAClH,OAAO,EAAE,EAAE,EAAe,MAAM,cAAc,CAAC;AAO/C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAU,GAAG,EAAW,SAAS,EAAW,MAAM,iBAAiB,CAAC;AAEtG,OAAO,EAAE,iBAAiB,EAAY,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAQ7C,eAAO,MAAM,OAAO,MAAO,GAAG,WAA6B,CAAC;AAC5D,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAE1C,eAAO,MAAM,GAAG,YAAa,GAAG,EAAE,SAIjC,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,CAAA;AAE1D,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,MAAM,EAAE,WAAW,CAAA;KACpB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,SAAS,CAAC;IACtB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,MAAM,EAAE,WAAW,CAAA;KACpB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,gBAAgB,EAAE,MAAM,CAAC;QACzB,SAAS,EAAE,MAAM,CAAC;KACnB,EAAE,CAAC;CACL,CAAA;AAED,KAAK,kBAAkB,GAAG;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IAEjC;;SAEK;IACL,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC,eAAe,EAAE,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,GAAG,SAAS,CAAC;IAEzE,UAAU,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CAEpB,CAAA;AACD,KAAK,qBAAqB,GAAG,kBAAkB,GAAG;IAChD,SAAS,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,UAAU,CAAC;IAGvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACtE,CAAA;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,SAAS,SAAiB;IAEjC,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,IAAI,EAAE,CAEX;IACD,IAAI,GAAG,IAAI,eAAe,CAEzB;IAED,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACrC,OAAO,EAAE,GAAG,CAAC;IACb,IAAI,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG;YAAE,CAAC,EAAE,EAAE,MAAM,GAAG;gBAAE,IAAI,EAAE,kBAAkB,EAAE,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC;IACzE,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC,CAAa;IAEnF,0BAA0B,CAAC,EAAE,0BAA0B,CAAC;IAExD,OAAO;IAiBP,UAAU;;;MAGT;IACD,aAAa;;0BAEO,MAAM;MAKzB;IAED,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,mBAAmB,SAAa;IAChC,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;IAmB1C,OAAc,SAAS;;;;OAKtB;IAED,OAAc,MAAM,YAAmB,oBAAoB,kBAG1D;IAED,SAAS,UAAS;IAClB,OAAO,aAWN;IAED,WAAW,gBAMV;IAED,WAAW,UAAS;IACpB,IAAI,MAAgC;IAEpC,YAAY;;;;;MAKD;IAEX,MAAM,CAAC,uBAAuB,WAA6H;IAE3J,MAAM,CAAC,kCAAkC,SAA2D;IACpG,eAAe,yBAuHd;IAED,OAAO;IAKP,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,kBAAkB,EAAE;IAIpE,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAM9C,aAAa,SAAgB;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,mBAqH/C;IAGD,WAAW,CAAC,GAAG,EAAE,kBAAkB,EAAE,GAAG,CAAC,EAAE,GAAG;IAgD9C,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM;IAO9C,WAAW,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,GAAG,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,QAAQ;IAIxG;;;OAGG;IACG,OAAO,CAAC,UAAU,EAAE,aAAa;IAoHjC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,qBAAqB,EAAE,cAAc,GAAG,iBAAiB,CAAC;IAuIhG,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAG;IAepF,kBAAkB,QAAO;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAmBnE;IAED,oBAAoB,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM;IAwDjE,mBAAmB,eAAsB,MAAM,sBAgB9C;IAQD,iBAAiB,wBAQhB;IAGD,aAAa,EAAE,GAAG,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAa;IAChD,UAAU,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;KAAE,EAAE,WAAW,CAAC,EAAE,uBAAuB;CA4D3G;AAKD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA"}

package/lib/PubSubManager/PubSubManager.js

@@ -530,7 +530,7 @@ class PubSubManager {
         }
         const channel_name = `${this.socketChannelPreffix}.${table_info.name}.${JSON.stringify(filter)}.${JSON.stringify(params)}.${"m"}.sub`;
         this.upsertSocket(socket, channel_name);
-        const upsertSub = (newSubData) => {
+        const upsertSub = (newSubData, isReadyOverride) => {
             const { table_name, condition: _cond, is_ready = false, parentSubParams } = newSubData, condition = parseCondition(_cond), newSub = {
                 socket,
                 table_name: table_info.name,
@@ -568,13 +568,13 @@ class PubSubManager {
             else {
                 this.subs[table_name][condition].subs[sub_idx] = newSub;
             }
-            if (is_ready) {
+            if (isReadyOverride ?? is_ready) {
                 this.pushSubData(newSub);
             }
         };
         if (table_info.is_view) {
             if (viewOptions?.relatedTables.length) {
-                viewOptions?.relatedTables.map(async (relatedTable) => {
+                viewOptions?.relatedTables.map(async (relatedTable, relatedTableIdx) => {
                     const params = {
                         table_name: relatedTable.tableName,
                         condition: relatedTable.condition,
@@ -585,13 +585,15 @@ class PubSubManager {
                     };
                     upsertSub({
                         ...params,
-                        is_ready: false
-                    });
+                        is_ready: false,
+                    }, false);
                     await this.addTrigger(params, viewOptions);
+                    /** Trigger pushSubData only on last related table to prevent duplicate firings */
+                    const isLast = relatedTableIdx === viewOptions.relatedTables.length - 1;
                     upsertSub({
                         ...params,
                         is_ready: true
-                    });
+                    }, isLast);
                 });
                 return channel_name;
             }
@@ -608,7 +610,7 @@ class PubSubManager {
                 condition: parseCondition(condition),
                 parentSubParams: undefined,
                 is_ready: false
-            });
+            }, undefined);
             await this.addTrigger({
                 table_name: table_info.name,
                 condition: parseCondition(condition),
@@ -618,7 +620,7 @@ class PubSubManager {
                 condition: parseCondition(condition),
                 parentSubParams: undefined,
                 is_ready: true
-            });
+            }, undefined);
             return channel_name;
         }
     }

package/lib/PubSubManager/PubSubManager.ts

@@ -694,7 +694,7 @@ export class PubSubManager {
 
     this.upsertSocket(socket, channel_name);
 
-    const upsertSub = (newSubData: { table_name: string; condition: string; is_ready: boolean; parentSubParams: SubscriptionParams["parentSubParams"] }) => {
+    const upsertSub = (newSubData: { table_name: string; condition: string; is_ready: boolean; parentSubParams: SubscriptionParams["parentSubParams"] }, isReadyOverride: boolean | undefined) => {
       const { table_name, condition: _cond, is_ready = false, parentSubParams } = newSubData,
         condition = parseCondition(_cond),
         newSub: SubscriptionParams = {
@@ -740,7 +740,7 @@ export class PubSubManager {
         this.subs[table_name][condition].subs[sub_idx] = newSub;
       }
 
-      if (is_ready) {
+      if (isReadyOverride ?? is_ready) {
         this.pushSubData(newSub);
       }
     };
@@ -749,7 +749,9 @@ export class PubSubManager {
     if (table_info.is_view) {
       if (viewOptions?.relatedTables.length) {
  
-        viewOptions?.relatedTables.map(async relatedTable => {
+        viewOptions?.relatedTables.map(async (relatedTable, relatedTableIdx) => {
+
+
           const params: Omit<Parameters<typeof upsertSub>[0], "is_ready"> = {
             table_name: relatedTable.tableName,
             condition: relatedTable.condition,
@@ -761,15 +763,18 @@ export class PubSubManager {
           
           upsertSub({
             ...params,
-            is_ready: false
-          });
+            is_ready: false,
+            
+          }, false);
 
           await this.addTrigger(params, viewOptions);
 
+          /** Trigger pushSubData only on last related table to prevent duplicate firings */
+          const isLast = relatedTableIdx === viewOptions.relatedTables.length - 1;
           upsertSub({
             ...params,
             is_ready: true
-          });
+          }, isLast);
         });
 
         return channel_name
@@ -786,7 +791,7 @@ export class PubSubManager {
         condition: parseCondition(condition),
         parentSubParams: undefined,
         is_ready: false
-      });
+      }, undefined);
       await this.addTrigger({
         table_name: table_info.name,
         condition: parseCondition(condition),
@@ -796,7 +801,7 @@ export class PubSubManager {
         condition: parseCondition(condition),
         parentSubParams: undefined,
         is_ready: true
-      });
+      }, undefined);
 
       return channel_name
     }

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

@@ -1 +1 @@
-{"version":3,"file":"initPubSubManager.d.ts","sourceRoot":"","sources":["initPubSubManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG9D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA0oB/F"}
+{"version":3,"file":"initPubSubManager.d.ts","sourceRoot":"","sources":["initPubSubManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAM9D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA4oB/F"}

package/lib/PubSubManager/initPubSubManager.js

@@ -4,6 +4,7 @@ exports.initPubSubManager = void 0;
 const PostgresNotifListenManager_1 = require("../PostgresNotifListenManager");
 const PubSubManager_1 = require("./PubSubManager");
 const REALTIME_TRIGGER_CHECK_QUERY = "prostgles-server internal query used to manage realtime triggers";
+const validate_jsonb_schema_sql_1 = require("../JSONBValidation/validate_jsonb_schema_sql");
 async function initPubSubManager() {
     if (!this.canContinue())
         return undefined;
@@ -30,14 +31,14 @@ async function initPubSubManager() {
                   IF EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = 'prostgles') THEN
 
                       IF
-                          NOT EXISTS (
-                              SELECT 1 
-                              FROM information_schema.tables 
-                              WHERE  table_schema = 'prostgles'
-                              AND    table_name   = 'versions'
-                          )
+                        NOT EXISTS (
+                          SELECT 1 
+                          FROM information_schema.tables 
+                          WHERE  table_schema = 'prostgles'
+                          AND    table_name   = 'versions'
+                        )
                       THEN
-                          DROP SCHEMA IF EXISTS prostgles CASCADE;
+                        DROP SCHEMA IF EXISTS prostgles CASCADE;
                       ELSE 
                           IF NOT EXISTS(SELECT 1 FROM prostgles.versions WHERE version >= ${schema_version}) THEN
                             DROP SCHEMA IF EXISTS prostgles CASCADE;
@@ -58,6 +59,8 @@ async function initPubSubManager() {
                       );
                       INSERT INTO prostgles.versions(version) VALUES(${schema_version}) ON CONFLICT DO NOTHING;
 
+                      ${validate_jsonb_schema_sql_1.validate_jsonb_schema_sql}
+
                       CREATE OR REPLACE FUNCTION prostgles.random_string(length INTEGER DEFAULT 33) RETURNS TEXT AS $$
                           DECLARE
                               chars TEXT[] := '{0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}';

package/lib/PubSubManager/initPubSubManager.ts

@@ -1,6 +1,9 @@
 import { PostgresNotifListenManager } from "../PostgresNotifListenManager";
 import { asValue, log, PubSubManager } from "./PubSubManager";
 const REALTIME_TRIGGER_CHECK_QUERY = "prostgles-server internal query used to manage realtime triggers" as const; 
+import * as fs from "fs";
+import * as path from "path";
+import { validate_jsonb_schema_sql } from "../JSONBValidation/validate_jsonb_schema_sql";
 
 export async function initPubSubManager(this: PubSubManager): Promise<PubSubManager | undefined> {
   if (!this.canContinue()) return undefined;
@@ -29,14 +32,14 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
                   IF EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = 'prostgles') THEN
 
                       IF
-                          NOT EXISTS (
-                              SELECT 1 
-                              FROM information_schema.tables 
-                              WHERE  table_schema = 'prostgles'
-                              AND    table_name   = 'versions'
-                          )
+                        NOT EXISTS (
+                          SELECT 1 
+                          FROM information_schema.tables 
+                          WHERE  table_schema = 'prostgles'
+                          AND    table_name   = 'versions'
+                        )
                       THEN
-                          DROP SCHEMA IF EXISTS prostgles CASCADE;
+                        DROP SCHEMA IF EXISTS prostgles CASCADE;
                       ELSE 
                           IF NOT EXISTS(SELECT 1 FROM prostgles.versions WHERE version >= ${schema_version}) THEN
                             DROP SCHEMA IF EXISTS prostgles CASCADE;
@@ -57,6 +60,8 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
                       );
                       INSERT INTO prostgles.versions(version) VALUES(${schema_version}) ON CONFLICT DO NOTHING;
 
+                      ${validate_jsonb_schema_sql}
+
                       CREATE OR REPLACE FUNCTION prostgles.random_string(length INTEGER DEFAULT 33) RETURNS TEXT AS $$
                           DECLARE
                               chars TEXT[] := '{0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}';

package/lib/PublishParser.d.ts

@@ -3,56 +3,56 @@ import { AuthResult, SessionUser } from "./AuthHandler";
 import { CommonTableRules, LocalParams, PRGLIOSocket, TableOrViewInfo, TableSchemaColumn } from "./DboBuilder";
 import { Prostgles, DBHandlerServer, DB } from "./Prostgles";
 import type { DBOFullyTyped, PublishFullyTyped } from "./DBSchemaBuilder";
-export declare type PublishMethods<S = void, SUser extends SessionUser = SessionUser> = (params: PublishParams<S, SUser>) => {
+export type PublishMethods<S = void, SUser extends SessionUser = SessionUser> = (params: PublishParams<S, SUser>) => {
     [key: string]: Method;
 } | Promise<{
     [key: string]: Method;
 } | null>;
-export declare type Awaitable<T> = T | Promise<T>;
-declare type Request = {
+export type Awaitable<T> = T | Promise<T>;
+type Request = {
     socket?: any;
     httpReq?: any;
 };
-declare type DboTable = Request & {
+type DboTable = Request & {
     tableName: string;
     localParams: LocalParams;
 };
-declare type DboTableCommand = Request & DboTable & {
+type DboTableCommand = Request & DboTable & {
     command: string;
     localParams: LocalParams;
 };
 import { FieldFilter, SelectParams } from "prostgles-types";
-export declare type InsertRequestData = {
+export type InsertRequestData = {
     data: object | object[];
     returning: FieldFilter;
 };
-export declare type SelectRequestData = {
+export type SelectRequestData = {
     filter: object;
     params: SelectParams;
 };
-export declare type DeleteRequestData = {
+export type DeleteRequestData = {
     filter: object;
     returning: FieldFilter;
 };
-export declare type UpdateRequestDataOne<R extends AnyObject> = {
+export type UpdateRequestDataOne<R extends AnyObject> = {
     filter: FullFilter<R>;
     data: Partial<R>;
     returning: FieldFilter<R>;
 };
-export declare type UpdateReq<R extends AnyObject> = {
+export type UpdateReq<R extends AnyObject> = {
     filter: FullFilter<R>;
     data: Partial<R>;
 };
-export declare type UpdateRequestDataBatch<R extends AnyObject> = {
+export type UpdateRequestDataBatch<R extends AnyObject> = {
     data: UpdateReq<R>[];
 };
-export declare type UpdateRequestData<R extends AnyObject = AnyObject> = UpdateRequestDataOne<R> | UpdateRequestDataBatch<R>;
-export declare type ValidateRow<R extends AnyObject = AnyObject, S = void> = (row: R, dbx: DBOFullyTyped<S>) => R | Promise<R>;
-export declare type ValidateUpdateRow<R extends AnyObject = AnyObject, S = void> = (args: {
+export type UpdateRequestData<R extends AnyObject = AnyObject> = UpdateRequestDataOne<R> | UpdateRequestDataBatch<R>;
+export type ValidateRow<R extends AnyObject = AnyObject, S = void> = (row: R, dbx: DBOFullyTyped<S>) => R | Promise<R>;
+export type ValidateUpdateRow<R extends AnyObject = AnyObject, S = void> = (args: {
     update: Partial<R>;
     filter: FullFilter<R>;
 }, dbx: DBOFullyTyped<S>) => R | Promise<R>;
-export declare type SelectRule<Cols extends AnyObject = AnyObject, S = void> = {
+export type SelectRule<Cols extends AnyObject = AnyObject, S = void> = {
     /**
      * Fields allowed to be selected.
      * Tip: Use false to exclude field
@@ -80,7 +80,7 @@ export declare type SelectRule<Cols extends AnyObject = AnyObject, S = void> = {
      */
     validate?(args: SelectRequestData): SelectRequestData | Promise<SelectRequestData>;
 };
-export declare type InsertRule<Cols extends AnyObject = AnyObject, S = void> = {
+export type InsertRule<Cols extends AnyObject = AnyObject, S = void> = {
     /**
      * Fields allowed to be inserted.   Tip: Use false to exclude field
      */
@@ -107,7 +107,7 @@ export declare type InsertRule<Cols extends AnyObject = AnyObject, S = void> = {
      */
     postValidate?: ValidateRow<Required<Cols>, S>;
 };
-export declare type UpdateRule<Cols extends AnyObject = AnyObject, S = void> = {
+export type UpdateRule<Cols extends AnyObject = AnyObject, S = void> = {
     /**
      * Fields allowed to be updated.   Tip: Use false/0 to exclude field
      */
@@ -150,7 +150,7 @@ export declare type UpdateRule<Cols extends AnyObject = AnyObject, S = void> = {
      */
     postValidate?: ValidateRow<Required<Cols>, S>;
 };
-export declare type DeleteRule<Cols extends AnyObject = AnyObject, S = void> = {
+export type DeleteRule<Cols extends AnyObject = AnyObject, S = void> = {
     /**
      * Filter added to every query (e.g. user_id) to restrict access
      */
@@ -168,7 +168,7 @@ export declare type DeleteRule<Cols extends AnyObject = AnyObject, S = void> = {
      */
     validate?(...args: any[]): Awaitable<void>;
 };
-export declare type SyncRule<Cols extends AnyObject = AnyObject> = {
+export type SyncRule<Cols extends AnyObject = AnyObject> = {
     /**
      * Primary keys used in updating data
      */
@@ -190,35 +190,35 @@ export declare type SyncRule<Cols extends AnyObject = AnyObject> = {
      */
     batch_size?: number;
 };
-export declare type SubscribeRule = {
+export type SubscribeRule = {
     throttle?: number;
 };
-export declare type ViewRule<S extends AnyObject = AnyObject> = CommonTableRules & {
+export type ViewRule<S extends AnyObject = AnyObject> = CommonTableRules & {
     /**
      * What can be read from the table
      */
     select?: SelectRule<S>;
 };
-export declare type TableRule<RowType extends AnyObject = AnyObject, S = void> = ViewRule<RowType> & {
+export type TableRule<RowType extends AnyObject = AnyObject, S = void> = ViewRule<RowType> & {
     insert?: InsertRule<RowType, S>;
     update?: UpdateRule<RowType, S>;
     delete?: DeleteRule<RowType, S>;
     sync?: SyncRule<RowType>;
     subscribe?: SubscribeRule;
 };
-export declare type PublishViewRule<Col extends AnyObject = AnyObject, S = void> = {
+export type PublishViewRule<Col extends AnyObject = AnyObject, S = void> = {
     select?: SelectRule<Col, S> | PublishAllOrNothing;
     getColumns?: PublishAllOrNothing;
     getInfo?: PublishAllOrNothing;
 };
-export declare type PublishTableRule<Col extends AnyObject = AnyObject, S = void> = PublishViewRule<Col, S> & {
+export type PublishTableRule<Col extends AnyObject = AnyObject, S = void> = PublishViewRule<Col, S> & {
     insert?: InsertRule<Col, S> | PublishAllOrNothing;
     update?: UpdateRule<Col, S> | PublishAllOrNothing;
     delete?: DeleteRule<Col, S> | PublishAllOrNothing;
     sync?: SyncRule<Col>;
     subscribe?: SubscribeRule | PublishAllOrNothing;
 };
-export declare type ParsedPublishTable = {
+export type ParsedPublishTable = {
     select?: SelectRule;
     getColumns?: true;
     getInfo?: true;
@@ -229,7 +229,7 @@ export declare type ParsedPublishTable = {
     subscribe?: SubscribeRule;
     subscribeOne?: SubscribeRule;
 };
-export declare type PublishParams<S = void, SUser extends SessionUser = SessionUser> = {
+export type PublishParams<S = void, SUser extends SessionUser = SessionUser> = {
     sid?: string;
     dbo: DBOFullyTyped<S>;
     db: DB;
@@ -241,19 +241,19 @@ export declare type PublishParams<S = void, SUser extends SessionUser = SessionU
         columns: TableSchemaColumn[];
     }[];
 };
-export declare type RequestParams = {
+export type RequestParams = {
     dbo?: DBHandlerServer;
     socket?: any;
 };
-export declare type PublishAllOrNothing = true | "*" | false | null;
-declare type PublishObject = {
+export type PublishAllOrNothing = true | "*" | false | null;
+type PublishObject = {
     [table_name: string]: (PublishTableRule | PublishViewRule | PublishAllOrNothing);
 };
-export declare type ParsedPublishTables = {
+export type ParsedPublishTables = {
     [table_name: string]: ParsedPublishTable;
 };
-export declare type PublishedResult<Schema = void> = PublishAllOrNothing | PublishFullyTyped<Schema>;
-export declare type Publish<Schema = void, SUser extends SessionUser = SessionUser> = PublishedResult<Schema> | ((params: PublishParams<Schema, SUser>) => Awaitable<PublishedResult<Schema>>);
+export type PublishedResult<Schema = void> = PublishAllOrNothing | PublishFullyTyped<Schema>;
+export type Publish<Schema = void, SUser extends SessionUser = SessionUser> = PublishedResult<Schema> | ((params: PublishParams<Schema, SUser>) => Awaitable<PublishedResult<Schema>>);
 export declare class PublishParser {
     publish: any;
     publishMethods?: PublishMethods<void, SessionUser<AnyObject, AnyObject>> | undefined;