prostgles-server 3.0.99 → 3.0.100

package/dist/PubSubManager/initPubSubManager.js.map

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

package/dist/SchemaWatch.js

@@ -27,6 +27,7 @@ class SchemaWatch {
             }, watchSchemaType.checkIntervalMillis);
         }
         else if (watchSchemaType === "DDL_trigger") {
+            /** Do nothing */
         }
     }
 }

package/dist/SchemaWatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaWatch.js","sourceRoot":"","sources":["../lib/SchemaWatch.ts"],"names":[],"mappings":";;;AAAA,qDAA2C;AAC3C,6CAA0C;AAI1C,MAAa,WAAW;IAItB,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,EAAsF;QAFpL,WAAM,GAAG,KAAK,CAAC;QAGb,IAAG,CAAC,WAAW;YAAE,OAAO;QAExB,IAAI,WAAW,KAAK,eAAe,IAAI,CAAC,mBAAmB,EAAE;YAC3D,MAAM,8EAA8E,CAAC;SAEtF;aAAM,IACL,IAAA,0BAAQ,EAAC,eAAe,CAAC;YACzB,qBAAqB,IAAI,eAAe;YACxC,OAAO,eAAe,CAAC,mBAAmB,KAAK,QAAQ,EACvD;YAEA,IAAI,IAAI,CAAC,0BAA0B,EAAE;gBACnC,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;aAChD;YACD,IAAI,CAAC,0BAA0B,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;gBACvD,IAAG,CAAC,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACxB,MAAM,QAAQ,GAAG,MAAM,uBAAU,CAAC,MAAM,CAAC,IAAW,CAAC,CAAC;gBACtD,IAAI,QAAQ,CAAC,iBAAiB,KAAK,YAAY,CAAC,iBAAiB,EAAE;oBACjE,eAAe,EAAE,CAAC;iBACnB;YACH,CAAC,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC;SAEzC;aAAM,IAAG,eAAe,KAAK,aAAa,EAAC;SAE3C;IAEH,CAAC;CAGF;AAlCD,kCAkCC"}
+{"version":3,"file":"SchemaWatch.js","sourceRoot":"","sources":["../lib/SchemaWatch.ts"],"names":[],"mappings":";;;AAAA,qDAA2C;AAC3C,6CAA0C;AAI1C,MAAa,WAAW;IAItB,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,EAAsF;QAFpL,WAAM,GAAG,KAAK,CAAC;QAGb,IAAG,CAAC,WAAW;YAAE,OAAO;QAExB,IAAI,WAAW,KAAK,eAAe,IAAI,CAAC,mBAAmB,EAAE;YAC3D,MAAM,8EAA8E,CAAC;SAEtF;aAAM,IACL,IAAA,0BAAQ,EAAC,eAAe,CAAC;YACzB,qBAAqB,IAAI,eAAe;YACxC,OAAO,eAAe,CAAC,mBAAmB,KAAK,QAAQ,EACvD;YAEA,IAAI,IAAI,CAAC,0BAA0B,EAAE;gBACnC,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;aAChD;YACD,IAAI,CAAC,0BAA0B,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;gBACvD,IAAG,CAAC,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACxB,MAAM,QAAQ,GAAG,MAAM,uBAAU,CAAC,MAAM,CAAC,IAAW,CAAC,CAAC;gBACtD,IAAI,QAAQ,CAAC,iBAAiB,KAAK,YAAY,CAAC,iBAAiB,EAAE;oBACjE,eAAe,EAAE,CAAC;iBACnB;YACH,CAAC,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC;SAEzC;aAAM,IAAG,eAAe,KAAK,aAAa,EAAC;YAC1C,iBAAiB;SAClB;IAEH,CAAC;CAGF;AAlCD,kCAkCC"}

package/lib/AuthHandler.js

@@ -250,11 +250,11 @@ class AuthHandler {
     };
     throttledFunc = (func, throttle = 500) => {
         return new Promise(async (resolve, reject) => {
-            let interval, result, error, finished = false;
+            let result, error, finished = false;
             /**
              * Throttle response times to prevent timing attacks
              */
-            interval = setInterval(() => {
+            const interval = setInterval(() => {
                 if (finished) {
                     clearInterval(interval);
                     if (error) {
@@ -280,7 +280,7 @@ class AuthHandler {
             throw "Auth login config missing";
         const { responseThrottle = 500 } = this.opts;
         return this.throttledFunc(async () => {
-            let result = await this.opts?.login?.(params, this.dbo, this.db, client);
+            const result = await this.opts?.login?.(params, this.dbo, this.db, client);
             const err = {
                 msg: "Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number } but got: " + JSON.stringify(result)
             };
@@ -402,11 +402,11 @@ class AuthHandler {
     makeSocketAuth = async (socket) => {
         if (!this.opts)
             return {};
-        let auth = {};
+        const auth = {};
         if (this.opts.expressConfig?.publicRoutes && !this.opts.expressConfig?.disableSocketAuthGuard) {
             auth.pathGuard = true;
             socket.removeAllListeners(prostgles_types_1.CHANNELS.AUTHGUARD);
-            socket.on(prostgles_types_1.CHANNELS.AUTHGUARD, async (params, cb = (err, res) => { }) => {
+            socket.on(prostgles_types_1.CHANNELS.AUTHGUARD, async (params, cb = (_err, _res) => { }) => {
                 try {
                     const { pathname, origin } = typeof params === "string" ? JSON.parse(params) : (params || {});
                     if (pathname && typeof pathname !== "string") {
@@ -442,7 +442,7 @@ class AuthHandler {
         handlers.map(({ func, ch, name }) => {
             auth[name] = true;
             socket.removeAllListeners(ch);
-            socket.on(ch, async (params, cb = (...callback) => { }) => {
+            socket.on(ch, async (params, cb = (..._callback) => { }) => {
                 try {
                     if (!socket)
                         throw "socket missing??!!";

package/lib/AuthHandler.ts

@@ -241,7 +241,7 @@ export default class AuthHandler {
         httpOnly: true, // The cookie only accessible by the web server
         //signed: true // Indicates if the cookie should be signed
         secure: true, 
-        sameSite: "strict" as "strict", 
+        sameSite: "strict" as const, 
         ...(this.opts?.expressConfig?.cookieOptions || {}) 
       };
       const cookieData = sid;
@@ -437,12 +437,12 @@ export default class AuthHandler {
 
     return new Promise(async (resolve, reject) => {
 
-      let interval: NodeJS.Timeout, result: any, error: any, finished = false;
+      let result: any, error: any, finished = false;
 
       /**
        * Throttle response times to prevent timing attacks
        */
-      interval = setInterval(() => {
+      const interval = setInterval(() => {
         if (finished) {
           clearInterval(interval);
           if (error) {
@@ -470,7 +470,7 @@ export default class AuthHandler {
     const { responseThrottle = 500 } = this.opts;
 
     return this.throttledFunc(async () => {
-      let result = await this.opts?.login?.(params, this.dbo as any, this.db, client);
+      const result = await this.opts?.login?.(params, this.dbo, this.db, client);
       const err = {
         msg: "Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number } but got: " + JSON.stringify(result) 
       }
@@ -603,14 +603,14 @@ export default class AuthHandler {
   makeSocketAuth = async (socket: PRGLIOSocket): Promise<{ auth: AuthSocketSchema; userData: AuthResult; } | Record<string, never>> => {
     if (!this.opts) return {};
 
-    let auth: Partial<Record<keyof Omit<AuthSocketSchema, "user">, boolean | undefined>> & { user?: AnyObject | undefined } = {};
+    const auth: Partial<Record<keyof Omit<AuthSocketSchema, "user">, boolean | undefined>> & { user?: AnyObject | undefined } = {};
 
     if (this.opts.expressConfig?.publicRoutes && !this.opts.expressConfig?.disableSocketAuthGuard) {
 
       auth.pathGuard = true;
 
       socket.removeAllListeners(CHANNELS.AUTHGUARD)
-      socket.on(CHANNELS.AUTHGUARD, async (params: AuthGuardLocation, cb = (err: any, res?: AuthGuardLocationResponse) => { }) => {
+      socket.on(CHANNELS.AUTHGUARD, async (params: AuthGuardLocation, cb = (_err: any, _res?: AuthGuardLocationResponse) => { /** EMPTY */ }) => {
 
         try {
 
@@ -660,7 +660,7 @@ export default class AuthHandler {
       auth[name] = true;
 
       socket.removeAllListeners(ch)
-      socket.on(ch, async (params: any, cb = (...callback: any) => { }) => {
+      socket.on(ch, async (params: any, cb = (..._callback: any) => { /** Empty */ }) => {
 
         try {
           if (!socket) throw "socket missing??!!";

package/lib/DboBuilder/ViewHandler.js

@@ -300,7 +300,6 @@ class ViewHandler {
             const jo = this.joins.find(j => j.tables.includes(t1) && j.tables.includes(t2));
             if (!jo)
                 throw `Joining ${t1} <-> ${t2} dissallowed or missing`;
-            ;
             const on = [];
             jo.on.map(cond => {
                 const condArr = [];

package/lib/DboBuilder/ViewHandler.ts

@@ -373,7 +373,7 @@ export class ViewHandler {
 
       /* Get join options */
       const jo = this.joins.find(j => j.tables.includes(t1) && j.tables.includes(t2));
-      if (!jo) throw `Joining ${t1} <-> ${t2} dissallowed or missing`;;
+      if (!jo) throw `Joining ${t1} <-> ${t2} dissallowed or missing`;
 
       const on: [string, string][][] = [];
 

package/lib/DboBuilder/subscribe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAoC,MAAM,eAAe,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,CAAC;AAEpD,iBAAe,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC,CAAA;AAC/I,iBAAe,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,GAAG,SAAS,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AA4NzL,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAoC,MAAM,eAAe,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,CAAC;AAEpD,iBAAe,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC,CAAA;AAC/I,iBAAe,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,GAAG,SAAS,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAmMzL,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/lib/DboBuilder/subscribe.js

@@ -170,20 +170,3 @@ async function subscribe(filter, params, localFunc, table_rules, localParams) {
     }
 }
 exports.subscribe = subscribe;
-async function _subscribe(localFunc, table_rules, localParams) {
-    if (localFunc && !localParams) {
-        return {
-            unsubscribe: () => { }
-        };
-    }
-    if (localParams) {
-        return "";
-    }
-    return {
-        unsubscribe: () => { }
-    };
-}
-const d = async () => {
-    const res = await _subscribe(() => { });
-    const res2 = await _subscribe(undefined, {}, {});
-};

package/lib/DboBuilder/subscribe.ts

@@ -202,29 +202,4 @@ async function subscribe(this: ViewHandler, filter: Filter, params: SubscribePar
   }
 }
 
-
-async function _subscribe(localFunc: LocalFunc): Promise<string>
-async function _subscribe(localFunc: undefined, table_rules: TableRule, localParams: LocalParams): Promise<{ unsubscribe: () => any }>
-  async function _subscribe(localFunc: LocalFunc | undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<{ unsubscribe: () => any } | string> {
-  if(localFunc && !localParams){
-    return {
-      unsubscribe: () => {}
-    }
-  }
-
-  if(localParams){
-    return ""
-  }
-
-  return {
-    unsubscribe: () => {}
-  }
-}
-
-const d = async () => {
-
-  const res = await _subscribe(()=>{})
-  const res2 = await _subscribe(undefined, {}, {})
-}
-
 export { subscribe }

package/lib/JSONBValidation/validate_jsonb_schema_sql.d.ts

@@ -1,3 +1,3 @@
-export declare const VALIDATE_SCHEMA_FUNCNAME: "prostgles.validate_jsonb_schema";
+export declare const VALIDATE_SCHEMA_FUNCNAME: "validate_jsonb_schema";
 export declare const validate_jsonb_schema_sql: string;
 //# sourceMappingURL=validate_jsonb_schema_sql.d.ts.map

package/lib/JSONBValidation/validate_jsonb_schema_sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate_jsonb_schema_sql.d.ts","sourceRoot":"","sources":["validate_jsonb_schema_sql.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,wBAAwB,mCAA6C,CAAC;AACnF,eAAO,MAAM,yBAAyB,QA0VrC,CAAC"}
+{"version":3,"file":"validate_jsonb_schema_sql.d.ts","sourceRoot":"","sources":["validate_jsonb_schema_sql.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,yBAAmC,CAAC;AACzE,eAAO,MAAM,yBAAyB,QA+VrC,CAAC"}

package/lib/JSONBValidation/validate_jsonb_schema_sql.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validate_jsonb_schema_sql = exports.VALIDATE_SCHEMA_FUNCNAME = void 0;
-exports.VALIDATE_SCHEMA_FUNCNAME = "prostgles.validate_jsonb_schema";
+const PubSubManager_1 = require("../PubSubManager/PubSubManager");
+exports.VALIDATE_SCHEMA_FUNCNAME = "validate_jsonb_schema";
 exports.validate_jsonb_schema_sql = `
 
+/* 
+* ${PubSubManager_1.PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
+*/
+
 DROP FUNCTION IF EXISTS ${exports.VALIDATE_SCHEMA_FUNCNAME}(jsonb_schema text, data jsonb, checked_path text[]);
 
 CREATE OR REPLACE FUNCTION ${exports.VALIDATE_SCHEMA_FUNCNAME}(jsonb_schema TEXT, data JSONB, checked_path TEXT[] DEFAULT ARRAY[]::TEXT[]) RETURNS boolean AS 
@@ -281,7 +286,8 @@ END;
 $f$ LANGUAGE 'plpgsql' IMMUTABLE;
 
 COMMENT ON FUNCTION ${exports.VALIDATE_SCHEMA_FUNCNAME}  
-IS $$Used to validate jsonb data against a schema:
+IS $$prostgles-server internal function used in column CHECK conditions to validate jsonb data against a column schema specified in tableConfig.
+Example usage:
 validate_jsonb_schema(
   '{ "type": { "a": "number[]" } }', 
   '{ "a": [2] }'

package/lib/JSONBValidation/validate_jsonb_schema_sql.ts

@@ -1,8 +1,13 @@
+import { PubSubManager } from "../PubSubManager/PubSubManager";
 
 
-export const VALIDATE_SCHEMA_FUNCNAME = "prostgles.validate_jsonb_schema" as const;
+export const VALIDATE_SCHEMA_FUNCNAME = "validate_jsonb_schema" as const;
 export const validate_jsonb_schema_sql = `
 
+/* 
+* ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
+*/
+
 DROP FUNCTION IF EXISTS ${VALIDATE_SCHEMA_FUNCNAME}(jsonb_schema text, data jsonb, checked_path text[]);
 
 CREATE OR REPLACE FUNCTION ${VALIDATE_SCHEMA_FUNCNAME}(jsonb_schema TEXT, data JSONB, checked_path TEXT[] DEFAULT ARRAY[]::TEXT[]) RETURNS boolean AS 
@@ -280,7 +285,8 @@ END;
 $f$ LANGUAGE 'plpgsql' IMMUTABLE;
 
 COMMENT ON FUNCTION ${VALIDATE_SCHEMA_FUNCNAME}  
-IS $$Used to validate jsonb data against a schema:
+IS $$prostgles-server internal function used in column CHECK conditions to validate jsonb data against a column schema specified in tableConfig.
+Example usage:
 validate_jsonb_schema(
   '{ "type": { "a": "number[]" } }', 
   '{ "a": [2] }'

package/lib/PubSubManager/PubSubManager.d.ts

@@ -114,6 +114,9 @@ export declare class PubSubManager {
         preffix: string;
         getFull: (appID?: string) => string;
     };
+    /**
+     * Used facilitate concurrent prostgles connections to the same database
+     */
     appID?: string;
     appCheckFrequencyMS: number;
     appCheck?: ReturnType<typeof setInterval>;
@@ -128,12 +131,6 @@ export declare class PubSubManager {
     canContinue: () => boolean;
     appChecking: boolean;
     init: any;
-    DB_OBJ_NAMES: {
-        readonly trigger_add_remove_func: "prostgles.trigger_add_remove_func";
-        readonly data_watch_func: "prostgles.prostgles_trigger_function";
-        readonly schema_watch_func: "prostgles.schema_watch_func";
-        readonly schema_watch_trigger: "prostgles_schema_watch_trigger_new";
-    };
     static SCHEMA_ALTERING_QUERIES: string[];
     static EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID: string;
     prepareTriggers: () => Promise<boolean>;
@@ -144,7 +141,7 @@ export declare class PubSubManager {
         payload: string;
     }) => Promise<void>;
     pushSubData(sub: SubscriptionParams, err?: any): true | Promise<unknown>;
-    upsertSocket(socket: any, channel_name: string): void;
+    upsertSocket(socket: any): void;
     syncTimeout?: ReturnType<typeof setTimeout>;
     syncData(sync: SyncParams, clientData: ClientExpressData | undefined, source: "trigger" | "client"): Promise<void>;
     /**

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

@@ -1 +1 @@
-{"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,EAAE,MAAM,iBAAiB,CAAC;AAE7F,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;CA6D3G;AAKD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA"}
+{"version":3,"file":"PubSubManager.d.ts","sourceRoot":"","sources":["PubSubManager.ts"],"names":[],"mappings":"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"}

package/lib/PubSubManager/PubSubManager.js

@@ -37,6 +37,7 @@ const pgPromise = __importStar(require("pg-promise"));
 const prostgles_types_1 = require("prostgles-types");
 const SyncReplication_1 = require("../SyncReplication");
 const util_1 = require("prostgles-types/dist/util");
+const getInitQuery_1 = require("./getInitQuery");
 const pgp = pgPromise({
     promiseLib: Bluebird
 });
@@ -66,7 +67,7 @@ class PubSubManager {
     onSchemaChange = undefined;
     postgresNotifListenManager;
     constructor(options) {
-        const { wsChannelNamePrefix, pgChannelName, onSchemaChange, dboBuilder } = options;
+        const { wsChannelNamePrefix, onSchemaChange, dboBuilder } = options;
         if (!dboBuilder.db || !dboBuilder.dbo) {
             throw 'MISSING: db_pg, db';
         }
@@ -91,6 +92,9 @@ class PubSubManager {
             return this.NOTIF_CHANNEL.preffix + finalAppId;
         }
     };
+    /**
+     * Used facilitate concurrent prostgles connections to the same database
+     */
     appID;
     appCheckFrequencyMS = 10 * 1000;
     appCheck;
@@ -123,11 +127,9 @@ class PubSubManager {
             clearInterval(this.appCheck);
         }
         this.onSocketDisconnected();
-        // if(this.postgresNotifListenManager){
-        //     this.postgresNotifListenManager.stopListening();
-        // }
-        if (!this.postgresNotifListenManager)
+        if (!this.postgresNotifListenManager) {
             throw "this.postgresNotifListenManager missing";
+        }
         this.postgresNotifListenManager.destroy();
     };
     canContinue = () => {
@@ -139,12 +141,6 @@ class PubSubManager {
     };
     appChecking = false;
     init = initPubSubManager_1.initPubSubManager.bind(this);
-    DB_OBJ_NAMES = {
-        trigger_add_remove_func: "prostgles.trigger_add_remove_func",
-        data_watch_func: "prostgles.prostgles_trigger_function",
-        schema_watch_func: "prostgles.schema_watch_func",
-        schema_watch_trigger: "prostgles_schema_watch_trigger_new"
-    };
     static SCHEMA_ALTERING_QUERIES = ['CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO'];
     static EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID = "prostgles internal query that should be excluded from ";
     prepareTriggers = async () => {
@@ -189,6 +185,7 @@ class PubSubManager {
                     );
   
                     is_super_user := EXISTS (select 1 from pg_user where usename = CURRENT_USER AND usesuper IS TRUE);
+
                     /**
                      *  Delete stale app records
                      * */
@@ -210,7 +207,7 @@ class PubSubManager {
                     ev_trg_needed := EXISTS (SELECT 1 FROM prostgles.apps WHERE watching_schema IS TRUE);
                     ev_trg_exists := EXISTS (
                         SELECT 1 FROM pg_catalog.pg_event_trigger
-                        WHERE evtname = ${(0, exports.asValue)(this.DB_OBJ_NAMES.schema_watch_trigger)}
+                        WHERE evtname = ${(0, exports.asValue)(getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger)}
                     );
 
                      -- RAISE NOTICE ' ev_trg_needed %, ev_trg_exists %', ev_trg_needed, ev_trg_exists;
@@ -222,7 +219,7 @@ class PubSubManager {
 
                         SELECT format(
                             $$ DROP EVENT TRIGGER IF EXISTS %I ; $$
-                            , ${(0, exports.asValue)(this.DB_OBJ_NAMES.schema_watch_trigger)}
+                            , ${(0, exports.asValue)(getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger)}
                         )
                         INTO q;
 
@@ -239,11 +236,11 @@ class PubSubManager {
                         AND ev_trg_exists IS FALSE 
                     THEN
 
-                        DROP EVENT TRIGGER IF EXISTS ${this.DB_OBJ_NAMES.schema_watch_trigger};
-                        CREATE EVENT TRIGGER ${this.DB_OBJ_NAMES.schema_watch_trigger} ON ddl_command_end
+                        DROP EVENT TRIGGER IF EXISTS ${getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger};
+                        CREATE EVENT TRIGGER ${getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger} ON ddl_command_end
                         WHEN TAG IN ('COMMENT', 'CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO')
                         --WHEN TAG IN ('CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE TRIGGER', 'DROP TRIGGER')
-                        EXECUTE PROCEDURE ${this.DB_OBJ_NAMES.schema_watch_func}();
+                        EXECUTE PROCEDURE ${getInitQuery_1.DB_OBJ_NAMES.schema_watch_func}();
 
                         --RAISE NOTICE ' CREATED EVENT TRIGGER %', q;
                     END IF;
@@ -409,7 +406,7 @@ class PubSubManager {
             });
         });
     }
-    upsertSocket(socket, channel_name) {
+    upsertSocket(socket) {
         if (socket && !this.sockets[socket.id]) {
             this.sockets[socket.id] = socket;
             socket.on("disconnect", () => this.onSocketDisconnected(socket));
@@ -431,7 +428,7 @@ class PubSubManager {
         const { name: table_name } = table_info, channel_name = `${this.socketChannelPreffix}.${table_name}.${JSON.stringify(filter)}.sync`;
         if (!synced_field)
             throw "synced_field missing from table_rules";
-        this.upsertSocket(socket, channel_name);
+        this.upsertSocket(socket);
         const upsertSync = () => {
             const newSync = {
                 channel_name,
@@ -529,7 +526,7 @@ class PubSubManager {
             validated_throttle = throttle;
         }
         const channel_name = `${this.socketChannelPreffix}.${table_info.name}.${JSON.stringify(filter)}.${JSON.stringify(params)}.${"m"}.sub`;
-        this.upsertSocket(socket, channel_name);
+        this.upsertSocket(socket);
         const upsertSub = (newSubData, isReadyOverride) => {
             const { table_name, condition: _cond, is_ready = false, parentSubParams } = newSubData, condition = parseCondition(_cond), newSub = {
                 socket,

package/lib/PubSubManager/PubSubManager.ts

@@ -18,6 +18,7 @@ import { SelectParams, FieldFilter, asName, WAL, isEmpty, AnyObject } from "pros
 import { ClientExpressData, syncData } from "../SyncReplication";
 import { TableRule } from "../PublishParser";
 import { find } from "prostgles-types/dist/util";
+import { DB_OBJ_NAMES } from "./getInitQuery";
 
 
 type PGP = pgPromise.IMain<{}, pg.IClient>;
@@ -138,7 +139,7 @@ export class PubSubManager {
   postgresNotifListenManager?: PostgresNotifListenManager;
 
   private constructor(options: PubSubManagerOptions) {
-    const { wsChannelNamePrefix, pgChannelName, onSchemaChange, dboBuilder } = options;
+    const { wsChannelNamePrefix, onSchemaChange, dboBuilder } = options;
     if (!dboBuilder.db || !dboBuilder.dbo) {
       throw 'MISSING: db_pg, db';
     }
@@ -167,6 +168,9 @@ export class PubSubManager {
     }
   }
 
+  /**
+   * Used facilitate concurrent prostgles connections to the same database
+   */
   appID?: string;
 
   appCheckFrequencyMS = 10 * 1000;
@@ -207,11 +211,10 @@ export class PubSubManager {
     if (this.appCheck) {
       clearInterval(this.appCheck);
     }
-    this.onSocketDisconnected();
-    // if(this.postgresNotifListenManager){
-    //     this.postgresNotifListenManager.stopListening();
-    // }
-    if (!this.postgresNotifListenManager) throw "this.postgresNotifListenManager missing"
+    this.onSocketDisconnected(); 
+    if (!this.postgresNotifListenManager) {
+      throw "this.postgresNotifListenManager missing"
+    }
     this.postgresNotifListenManager.destroy();
   }
 
@@ -226,12 +229,6 @@ export class PubSubManager {
   appChecking = false;
   init = initPubSubManager.bind(this);
 
-  DB_OBJ_NAMES = {
-    trigger_add_remove_func: "prostgles.trigger_add_remove_func",
-    data_watch_func: "prostgles.prostgles_trigger_function",
-    schema_watch_func: "prostgles.schema_watch_func",
-    schema_watch_trigger: "prostgles_schema_watch_trigger_new"
-  } as const;
 
   static SCHEMA_ALTERING_QUERIES = ['CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO'];
 
@@ -279,6 +276,7 @@ export class PubSubManager {
                     );
   
                     is_super_user := EXISTS (select 1 from pg_user where usename = CURRENT_USER AND usesuper IS TRUE);
+
                     /**
                      *  Delete stale app records
                      * */
@@ -300,7 +298,7 @@ export class PubSubManager {
                     ev_trg_needed := EXISTS (SELECT 1 FROM prostgles.apps WHERE watching_schema IS TRUE);
                     ev_trg_exists := EXISTS (
                         SELECT 1 FROM pg_catalog.pg_event_trigger
-                        WHERE evtname = ${asValue(this.DB_OBJ_NAMES.schema_watch_trigger)}
+                        WHERE evtname = ${asValue(DB_OBJ_NAMES.schema_watch_trigger)}
                     );
 
                      -- RAISE NOTICE ' ev_trg_needed %, ev_trg_exists %', ev_trg_needed, ev_trg_exists;
@@ -312,7 +310,7 @@ export class PubSubManager {
 
                         SELECT format(
                             $$ DROP EVENT TRIGGER IF EXISTS %I ; $$
-                            , ${asValue(this.DB_OBJ_NAMES.schema_watch_trigger)}
+                            , ${asValue(DB_OBJ_NAMES.schema_watch_trigger)}
                         )
                         INTO q;
 
@@ -329,11 +327,11 @@ export class PubSubManager {
                         AND ev_trg_exists IS FALSE 
                     THEN
 
-                        DROP EVENT TRIGGER IF EXISTS ${this.DB_OBJ_NAMES.schema_watch_trigger};
-                        CREATE EVENT TRIGGER ${this.DB_OBJ_NAMES.schema_watch_trigger} ON ddl_command_end
+                        DROP EVENT TRIGGER IF EXISTS ${DB_OBJ_NAMES.schema_watch_trigger};
+                        CREATE EVENT TRIGGER ${DB_OBJ_NAMES.schema_watch_trigger} ON ddl_command_end
                         WHEN TAG IN ('COMMENT', 'CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO')
                         --WHEN TAG IN ('CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE TRIGGER', 'DROP TRIGGER')
-                        EXECUTE PROCEDURE ${this.DB_OBJ_NAMES.schema_watch_func}();
+                        EXECUTE PROCEDURE ${DB_OBJ_NAMES.schema_watch_func}();
 
                         --RAISE NOTICE ' CREATED EVENT TRIGGER %', q;
                     END IF;
@@ -540,7 +538,7 @@ export class PubSubManager {
     });
   }
 
-  upsertSocket(socket: any, channel_name: string) {
+  upsertSocket(socket: any) {
     if (socket && !this.sockets[socket.id]) {
       this.sockets[socket.id] = socket;
       socket.on("disconnect", () => this.onSocketDisconnected(socket));
@@ -572,7 +570,7 @@ export class PubSubManager {
 
     if (!synced_field) throw "synced_field missing from table_rules";
 
-    this.upsertSocket(socket, channel_name);
+    this.upsertSocket(socket);
 
     const upsertSync = () => {
       const newSync = {
@@ -692,7 +690,7 @@ export class PubSubManager {
 
     const channel_name = `${this.socketChannelPreffix}.${table_info.name}.${JSON.stringify(filter)}.${JSON.stringify(params)}.${"m"}.sub`;
 
-    this.upsertSocket(socket, channel_name);
+    this.upsertSocket(socket);
 
     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,

package/lib/PubSubManager/getInitQuery.d.ts

@@ -0,0 +1,9 @@
+import { PubSubManager } from "./PubSubManager";
+export declare const DB_OBJ_NAMES: {
+    readonly trigger_add_remove_func: "prostgles.trigger_add_remove_func";
+    readonly data_watch_func: "prostgles.prostgles_trigger_function";
+    readonly schema_watch_func: "prostgles.schema_watch_func";
+    readonly schema_watch_trigger: "prostgles_schema_watch_trigger_new";
+};
+export declare const getInitQuery: (this: PubSubManager) => Promise<string>;
+//# sourceMappingURL=getInitQuery.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getInitQuery.d.ts","sourceRoot":"","sources":["getInitQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG9D,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAEX,eAAO,MAAM,YAAY,SAAwB,aAAa,KAAG,QAAQ,MAAM,CA6gB9E,CAAA"}