prostgles-server 3.0.70 → 3.0.72

package/lib/PubSubManager/PubSubManager.js

@@ -26,7 +26,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.omitKeys = exports.pickKeys = exports.PubSubManager = exports.log = exports.DEFAULT_SYNC_BATCH_SIZE = exports.asValue = void 0;
 const utils_1 = require("../utils");
@@ -50,60 +49,112 @@ const log = (...args) => {
 };
 exports.log = log;
 class PubSubManager {
+    static DELIMITER = '|$prstgls$|';
+    dboBuilder;
+    get db() {
+        return this.dboBuilder.db;
+    }
+    get dbo() {
+        return this.dboBuilder.dbo;
+    }
+    _triggers;
+    sockets;
+    subs;
+    syncs;
+    socketChannelPreffix;
+    onSchemaChange = undefined;
+    postgresNotifListenManager;
     constructor(options) {
-        this.onSchemaChange = undefined;
-        this.NOTIF_TYPE = {
-            data: "data_has_changed",
-            schema: "schema_has_changed"
-        };
-        this.NOTIF_CHANNEL = {
-            preffix: 'prostgles_',
-            getFull: (appID) => {
-                const finalAppId = appID ?? this.appID;
-                if (!finalAppId)
-                    throw "No appID";
-                return this.NOTIF_CHANNEL.preffix + finalAppId;
-            }
-        };
-        this.appCheckFrequencyMS = 10 * 1000;
-        this.destroyed = false;
-        this.destroy = () => {
-            this.destroyed = true;
-            if (this.appCheck) {
-                clearInterval(this.appCheck);
-            }
-            this.onSocketDisconnected();
-            // if(this.postgresNotifListenManager){
-            //     this.postgresNotifListenManager.stopListening();
-            // }
-            if (!this.postgresNotifListenManager)
-                throw "this.postgresNotifListenManager missing";
-            this.postgresNotifListenManager.destroy();
-        };
-        this.canContinue = () => {
-            if (this.destroyed) {
-                console.trace("Could not start destroyed instance");
-                return false;
-            }
-            return true;
-        };
-        this.appChecking = false;
-        this.init = initPubSubManager_1.initPubSubManager.bind(this);
-        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"
-        };
-        this.prepareTriggers = async () => {
-            // SELECT * FROM pg_catalog.pg_event_trigger WHERE evtname
-            if (!this.appID)
-                throw "prepareTriggers failed: this.appID missing";
-            if (this.dboBuilder.prostgles.opts.watchSchema && !(await (0, Prostgles_1.isSuperUser)(this.db))) {
-                console.warn("prostgles watchSchema requires superuser db user. Will not watch using event triggers");
-            }
-            try {
-                await this.db.any(`
+        const { wsChannelNamePrefix, pgChannelName, onSchemaChange, dboBuilder } = options;
+        if (!dboBuilder.db || !dboBuilder.dbo) {
+            throw 'MISSING: db_pg, db';
+        }
+        this.onSchemaChange = onSchemaChange;
+        this.dboBuilder = dboBuilder;
+        this.sockets = {};
+        this.subs = {};
+        this.syncs = [];
+        this.socketChannelPreffix = wsChannelNamePrefix || "_psqlWS_";
+        (0, exports.log)("Created PubSubManager");
+    }
+    NOTIF_TYPE = {
+        data: "data_has_changed",
+        schema: "schema_has_changed"
+    };
+    NOTIF_CHANNEL = {
+        preffix: 'prostgles_',
+        getFull: (appID) => {
+            const finalAppId = appID ?? this.appID;
+            if (!finalAppId)
+                throw "No appID";
+            return this.NOTIF_CHANNEL.preffix + finalAppId;
+        }
+    };
+    appID;
+    appCheckFrequencyMS = 10 * 1000;
+    appCheck;
+    //     ,datname
+    //     ,usename
+    //     ,client_hostname
+    //     ,client_port
+    //     ,backend_start
+    //     ,query_start
+    //     ,query
+    //     ,state
+    //     console.log(await _db.any(`
+    //         SELECT pid, application_name, state
+    //         FROM pg_stat_activity
+    //         WHERE application_name IS NOT NULL AND application_name != '' -- state = 'active';
+    //     `))
+    static canCreate = async (db) => {
+        const canExecute = await (0, DboBuilder_1.canEXECUTE)(db);
+        const isSuperUs = await (0, Prostgles_1.isSuperUser)(db);
+        return { canExecute, isSuperUs, yes: canExecute && isSuperUs };
+    };
+    static create = async (options) => {
+        const res = new PubSubManager(options);
+        return await res.init();
+    };
+    destroyed = false;
+    destroy = () => {
+        this.destroyed = true;
+        if (this.appCheck) {
+            clearInterval(this.appCheck);
+        }
+        this.onSocketDisconnected();
+        // if(this.postgresNotifListenManager){
+        //     this.postgresNotifListenManager.stopListening();
+        // }
+        if (!this.postgresNotifListenManager)
+            throw "this.postgresNotifListenManager missing";
+        this.postgresNotifListenManager.destroy();
+    };
+    canContinue = () => {
+        if (this.destroyed) {
+            console.trace("Could not start destroyed instance");
+            return false;
+        }
+        return true;
+    };
+    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 () => {
+        // SELECT * FROM pg_catalog.pg_event_trigger WHERE evtname
+        if (!this.appID)
+            throw "prepareTriggers failed: this.appID missing";
+        if (this.dboBuilder.prostgles.opts.watchSchema && !(await (0, Prostgles_1.isSuperUser)(this.db))) {
+            console.warn("prostgles watchSchema requires superuser db user. Will not watch using event triggers");
+        }
+        try {
+            await this.db.any(`
                 BEGIN;--  ISOLATION LEVEL SERIALIZABLE;
                 
                 /**                                 ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
@@ -203,170 +254,16 @@ class PubSubManager {
 
                 COMMIT;
             `).catch(e => {
-                    console.error("prepareTriggers failed: ", e);
-                    throw e;
-                });
-                return true;
-            }
-            catch (e) {
                 console.error("prepareTriggers failed: ", e);
                 throw e;
-            }
-        };
-        /* Relay relevant data to relevant subscriptions */
-        this.notifListener = async (data) => {
-            const str = data.payload;
-            if (!str) {
-                console.error("Empty notif?");
-                return;
-            }
-            const dataArr = str.split(PubSubManager.DELIMITER), notifType = dataArr[0];
-            (0, exports.log)(str);
-            if (notifType === this.NOTIF_TYPE.schema) {
-                if (this.onSchemaChange) {
-                    const command = dataArr[1], event_type = dataArr[2], query = dataArr[3];
-                    if (query) {
-                        this.onSchemaChange({ command, query });
-                    }
-                }
-                return;
-            }
-            if (notifType !== this.NOTIF_TYPE.data) {
-                console.error("Unexpected notif type: ", notifType);
-                return;
-            }
-            const table_name = dataArr[1], op_name = dataArr[2], condition_ids_str = dataArr[3];
-            // const triggers = await this.db.any("SELECT * FROM prostgles.triggers WHERE table_name = $1 AND id IN ($2:csv)", [table_name, condition_ids_str.split(",").map(v => +v)]);
-            // const conditions: string[] = triggers.map(t => t.condition);
-            (0, exports.log)("PG Trigger ->", dataArr.join("__"));
-            if (condition_ids_str && condition_ids_str.startsWith("error") &&
-                this._triggers && this._triggers[table_name] && this._triggers[table_name].length) {
-                const pref = "INTERNAL ERROR. Schema might have changed";
-                console.error(`${pref}: ${condition_ids_str}`);
-                this._triggers[table_name].map(c => {
-                    const subs = this.getSubs(table_name, c);
-                    subs.map(s => {
-                        this.pushSubData(s, pref + ". Check server logs");
-                    });
-                });
-            }
-            else if (condition_ids_str?.split(",").length &&
-                condition_ids_str?.split(",").every((c) => Number.isInteger(+c)) &&
-                this._triggers?.[table_name]?.length) {
-                const idxs = condition_ids_str.split(",").map(v => +v);
-                const conditions = this._triggers[table_name].filter((c, i) => idxs.includes(i));
-                (0, exports.log)("PG Trigger -> ", { table_name, op_name, condition_ids_str, conditions }, this._triggers[table_name]);
-                conditions.map(condition => {
-                    const subs = this.getSubs(table_name, condition);
-                    const syncs = this.getSyncs(table_name, condition);
-                    syncs.map((s) => {
-                        this.syncData(s, undefined, "trigger");
-                    });
-                    if (!subs) {
-                        // console.error(`sub missing for ${table_name} ${condition}`, this.triggers);
-                        // console.log(this.subs)
-                        return;
-                    }
-                    /* Throttle the subscriptions */
-                    for (var i = 0; i < subs.length; i++) {
-                        var sub = subs[i];
-                        if (this.dbo[sub.table_name] &&
-                            sub.is_ready &&
-                            (sub.socket_id && this.sockets[sub.socket_id]) || sub.func) {
-                            const throttle = sub.throttle || 0;
-                            if (sub.last_throttled <= Date.now() - throttle) {
-                                /* It is assumed the policy was checked before this point */
-                                this.pushSubData(sub);
-                                // sub.last_throttled = Date.now();
-                            }
-                            else if (!sub.is_throttling) {
-                                (0, exports.log)("throttling sub");
-                                sub.is_throttling = setTimeout(() => {
-                                    (0, exports.log)("throttling finished. pushSubData...");
-                                    sub.is_throttling = null;
-                                    this.pushSubData(sub);
-                                }, throttle); // sub.throttle);
-                            }
-                        }
-                    }
-                });
-            }
-            else {
-                // if(!this._triggers || !this._triggers[table_name] || !this._triggers[table_name].length){
-                //     console.warn(190, "Trigger sub not found. DROPPING TRIGGER", table_name, condition_ids_str, this._triggers);
-                //     this.dropTrigger(table_name);
-                // } else {
-                // }
-                console.warn(190, "Trigger sub issue: ", table_name, condition_ids_str, this._triggers);
-            }
-        };
-        this.getActiveListeners = () => {
-            let result = [];
-            const upsert = (t, c) => {
-                if (!result.find(r => r.table_name === t && r.condition === c)) {
-                    result.push({ table_name: t, condition: c });
-                }
-            };
-            (this.syncs || []).map(s => {
-                upsert(s.table_name, s.condition);
-            });
-            Object.keys(this.subs || {}).map(table_name => {
-                Object.keys(this.subs[table_name] || {}).map(condition => {
-                    if (this.subs[table_name][condition].subs.length) {
-                        upsert(table_name, condition);
-                    }
-                });
             });
-            return result;
-        };
-        this.checkIfTimescaleBug = async (table_name) => {
-            const schema = "_timescaledb_catalog", res = await this.db.oneOrNone("SELECT EXISTS( \
-            SELECT * \
-            FROM information_schema.tables \
-            WHERE 1 = 1 \
-                AND table_schema = ${schema} \
-                AND table_name = 'hypertable' \
-        );", { schema });
-            if (res.exists) {
-                let isHyperTable = await this.db.any("SELECT * FROM " + (0, prostgles_types_1.asName)(schema) + ".hypertable WHERE table_name = ${table_name};", { table_name, schema });
-                if (isHyperTable && isHyperTable.length) {
-                    throw "Triggers do not work on timescaledb hypertables due to bug:\nhttps://github.com/timescale/timescaledb/issues/1084";
-                }
-            }
             return true;
-        };
-        /*
-            A table will only have a trigger with all conditions (for different subs)
-                conditions = ["user_id = 1"]
-                fields = ["user_id"]
-        */
-        this.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]);
-        };
-        this.addTriggerPool = undefined;
-        const { wsChannelNamePrefix, pgChannelName, onSchemaChange, dboBuilder } = options;
-        if (!dboBuilder.db || !dboBuilder.dbo) {
-            throw 'MISSING: db_pg, db';
         }
-        this.onSchemaChange = onSchemaChange;
-        this.dboBuilder = dboBuilder;
-        this.sockets = {};
-        this.subs = {};
-        this.syncs = [];
-        this.socketChannelPreffix = wsChannelNamePrefix || "_psqlWS_";
-        (0, exports.log)("Created PubSubManager");
-    }
-    get db() {
-        return this.dboBuilder.db;
-    }
-    get dbo() {
-        return this.dboBuilder.dbo;
-    }
+        catch (e) {
+            console.error("prepareTriggers failed: ", e);
+            throw e;
+        }
+    };
     isReady() {
         if (!this.postgresNotifListenManager)
             throw "this.postgresNotifListenManager missing";
@@ -379,6 +276,93 @@ class PubSubManager {
         return (this.syncs || [])
             .filter((s) => s.table_name === table_name && s.condition === condition);
     }
+    /* Relay relevant data to relevant subscriptions */
+    notifListener = async (data) => {
+        const str = data.payload;
+        if (!str) {
+            console.error("Empty notif?");
+            return;
+        }
+        const dataArr = str.split(PubSubManager.DELIMITER), notifType = dataArr[0];
+        (0, exports.log)(str);
+        if (notifType === this.NOTIF_TYPE.schema) {
+            if (this.onSchemaChange) {
+                const command = dataArr[1], event_type = dataArr[2], query = dataArr[3];
+                if (query) {
+                    this.onSchemaChange({ command, query });
+                }
+            }
+            return;
+        }
+        if (notifType !== this.NOTIF_TYPE.data) {
+            console.error("Unexpected notif type: ", notifType);
+            return;
+        }
+        const table_name = dataArr[1], op_name = dataArr[2], condition_ids_str = dataArr[3];
+        // const triggers = await this.db.any("SELECT * FROM prostgles.triggers WHERE table_name = $1 AND id IN ($2:csv)", [table_name, condition_ids_str.split(",").map(v => +v)]);
+        // const conditions: string[] = triggers.map(t => t.condition);
+        (0, exports.log)("PG Trigger ->", dataArr.join("__"));
+        if (condition_ids_str && condition_ids_str.startsWith("error") &&
+            this._triggers && this._triggers[table_name] && this._triggers[table_name].length) {
+            const pref = "INTERNAL ERROR. Schema might have changed";
+            console.error(`${pref}: ${condition_ids_str}`);
+            this._triggers[table_name].map(c => {
+                const subs = this.getSubs(table_name, c);
+                subs.map(s => {
+                    this.pushSubData(s, pref + ". Check server logs");
+                });
+            });
+        }
+        else if (condition_ids_str?.split(",").length &&
+            condition_ids_str?.split(",").every((c) => Number.isInteger(+c)) &&
+            this._triggers?.[table_name]?.length) {
+            const idxs = condition_ids_str.split(",").map(v => +v);
+            const conditions = this._triggers[table_name].filter((c, i) => idxs.includes(i));
+            (0, exports.log)("PG Trigger -> ", { table_name, op_name, condition_ids_str, conditions }, this._triggers[table_name]);
+            conditions.map(condition => {
+                const subs = this.getSubs(table_name, condition);
+                const syncs = this.getSyncs(table_name, condition);
+                syncs.map((s) => {
+                    this.syncData(s, undefined, "trigger");
+                });
+                if (!subs) {
+                    // console.error(`sub missing for ${table_name} ${condition}`, this.triggers);
+                    // console.log(this.subs)
+                    return;
+                }
+                /* Throttle the subscriptions */
+                for (var i = 0; i < subs.length; i++) {
+                    var sub = subs[i];
+                    if (this.dbo[sub.table_name] &&
+                        sub.is_ready &&
+                        (sub.socket_id && this.sockets[sub.socket_id]) || sub.func) {
+                        const throttle = sub.throttle || 0;
+                        if (sub.last_throttled <= Date.now() - throttle) {
+                            /* It is assumed the policy was checked before this point */
+                            this.pushSubData(sub);
+                            // sub.last_throttled = Date.now();
+                        }
+                        else if (!sub.is_throttling) {
+                            (0, exports.log)("throttling sub");
+                            sub.is_throttling = setTimeout(() => {
+                                (0, exports.log)("throttling finished. pushSubData...");
+                                sub.is_throttling = null;
+                                this.pushSubData(sub);
+                            }, throttle); // sub.throttle);
+                        }
+                    }
+                }
+            });
+        }
+        else {
+            // if(!this._triggers || !this._triggers[table_name] || !this._triggers[table_name].length){
+            //     console.warn(190, "Trigger sub not found. DROPPING TRIGGER", table_name, condition_ids_str, this._triggers);
+            //     this.dropTrigger(table_name);
+            // } else {
+            // }
+            console.warn(190, "Trigger sub issue: ", table_name, condition_ids_str, this._triggers);
+        }
+    };
     pushSubData(sub, err) {
         if (!sub)
             throw "pushSubData: invalid sub";
@@ -430,6 +414,7 @@ class PubSubManager {
             socket.on("disconnect", () => this.onSocketDisconnected(socket));
         }
     }
+    syncTimeout;
     async syncData(sync, clientData, source) {
         return await (0, SyncReplication_1.syncData)(this, sync, clientData, source);
     }
@@ -649,6 +634,25 @@ class PubSubManager {
             console.error("Could not unsubscribe. Subscription might not have initialised yet");
         }
     }
+    getActiveListeners = () => {
+        let result = [];
+        const upsert = (t, c) => {
+            if (!result.find(r => r.table_name === t && r.condition === c)) {
+                result.push({ table_name: t, condition: c });
+            }
+        };
+        (this.syncs || []).map(s => {
+            upsert(s.table_name, s.condition);
+        });
+        Object.keys(this.subs || {}).map(table_name => {
+            Object.keys(this.subs[table_name] || {}).map(condition => {
+                if (this.subs[table_name][condition].subs.length) {
+                    upsert(table_name, condition);
+                }
+            });
+        });
+        return result;
+    };
     onSocketDisconnected(socket, channel_name) {
         // process.on('warning', e => {
         //     console.warn(e.stack)
@@ -696,6 +700,38 @@ class PubSubManager {
         }
         return "ok";
     }
+    checkIfTimescaleBug = async (table_name) => {
+        const schema = "_timescaledb_catalog", res = await this.db.oneOrNone("SELECT EXISTS( \
+            SELECT * \
+            FROM information_schema.tables \
+            WHERE 1 = 1 \
+                AND table_schema = ${schema} \
+                AND table_name = 'hypertable' \
+        );", { schema });
+        if (res.exists) {
+            let isHyperTable = await this.db.any("SELECT * FROM " + (0, prostgles_types_1.asName)(schema) + ".hypertable WHERE table_name = ${table_name};", { table_name, schema });
+            if (isHyperTable && isHyperTable.length) {
+                throw "Triggers do not work on timescaledb hypertables due to bug:\nhttps://github.com/timescale/timescaledb/issues/1084";
+            }
+        }
+        return true;
+    };
+    /*
+        A table will only have a trigger with all conditions (for different subs)
+            conditions = ["user_id = 1"]
+            fields = ["user_id"]
+    */
+    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]);
+    };
+    // waitingTriggers: { [key: string]: string[] } = undefined;
+    addingTrigger;
+    addTriggerPool = undefined;
     async addTrigger(params, viewOptions) {
         try {
             let { table_name, condition } = { ...params };
@@ -744,32 +780,6 @@ class PubSubManager {
     }
 }
 exports.PubSubManager = PubSubManager;
-_a = PubSubManager;
-PubSubManager.DELIMITER = '|$prstgls$|';
-//     ,datname
-//     ,usename
-//     ,client_hostname
-//     ,client_port
-//     ,backend_start
-//     ,query_start
-//     ,query
-//     ,state
-//     console.log(await _db.any(`
-//         SELECT pid, application_name, state
-//         FROM pg_stat_activity
-//         WHERE application_name IS NOT NULL AND application_name != '' -- state = 'active';
-//     `))
-PubSubManager.canCreate = async (db) => {
-    const canExecute = await (0, DboBuilder_1.canEXECUTE)(db);
-    const isSuperUs = await (0, Prostgles_1.isSuperUser)(db);
-    return { canExecute, isSuperUs, yes: canExecute && isSuperUs };
-};
-PubSubManager.create = async (options) => {
-    const res = new PubSubManager(options);
-    return await res.init();
-};
-PubSubManager.SCHEMA_ALTERING_QUERIES = ['CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO'];
-PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID = "prostgles internal query that should be excluded from ";
 const parseCondition = (condition) => Boolean(condition && condition.trim().length) ? condition : "TRUE";
 var prostgles_types_2 = require("prostgles-types");
 Object.defineProperty(exports, "pickKeys", { enumerable: true, get: function () { return prostgles_types_2.pickKeys; } });

package/lib/PubSubManager/PubSubManager.ts

@@ -230,7 +230,7 @@ export class PubSubManager {
     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'];
 

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,CAinB/F"}
+{"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,CAioB/F"}