prostgles-server 3.0.153 → 3.0.155

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":"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"}

package/lib/PubSubManager/PubSubManager.js

@@ -27,8 +27,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 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");
+exports.omitKeys = exports.pickKeys = exports.parseCondition = exports.PubSubManager = exports.log = exports.DEFAULT_SYNC_BATCH_SIZE = exports.asValue = void 0;
+const addSync_1 = require("./addSync");
 const DboBuilder_1 = require("../DboBuilder");
 const Prostgles_1 = require("../Prostgles");
 const initPubSubManager_1 = require("./initPubSubManager");
@@ -38,6 +38,8 @@ 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 addSub_1 = require("./addSub");
+const notifListener_1 = require("./notifListener");
 const pgp = pgPromise({
     promiseLib: Bluebird
 });
@@ -60,9 +62,10 @@ class PubSubManager {
         return this.dboBuilder.dbo;
     }
     _triggers;
-    sockets;
-    subs;
-    syncs;
+    sockets = {};
+    // subs: { [ke: string]: { [ke: string]: { subs: SubscriptionParams[] } } };
+    subs = [];
+    syncs = [];
     socketChannelPreffix;
     onSchemaChange = undefined;
     postgresNotifListenManager;
@@ -73,9 +76,6 @@ class PubSubManager {
         }
         this.onSchemaChange = onSchemaChange;
         this.dboBuilder = dboBuilder;
-        this.sockets = {};
-        this.subs = {};
-        this.syncs = [];
         this.socketChannelPreffix = wsChannelNamePrefix || "_psqlWS_";
         (0, exports.log)("Created PubSubManager");
     }
@@ -126,7 +126,8 @@ class PubSubManager {
         if (this.appCheck) {
             clearInterval(this.appCheck);
         }
-        this.onSocketDisconnected();
+        this.subs = [];
+        this.syncs = [];
         if (!this.postgresNotifListenManager) {
             throw "this.postgresNotifListenManager missing";
         }
@@ -267,135 +268,32 @@ class PubSubManager {
             throw "this.postgresNotifListenManager missing";
         return this.postgresNotifListenManager.isListening();
     }
-    getSubs(table_name, condition) {
-        const subs = this.subs?.[table_name]?.[condition]?.subs ?? [];
-        // if(!subs){
-        //   log("Subs not found:", { table_name, condition }, this.subs)
-        // }
-        return subs.flatMap(s => {
-            /* Return parentSubs to ensure throttling works */
-            if (s.parentSubParams) {
-                const parentSubs = [];
-                const parentChannel = s.parentSubParams.channel_name;
-                for (const tableName in (0, util_1.getKeys)(this.subs)) {
-                    for (const condition in (0, util_1.getKeys)(this.subs[tableName])) {
-                        this.subs[tableName][condition].subs.forEach(parentSub => {
-                            if (!parentSub.parentSubParams && parentSub.channel_name === parentChannel) {
-                                parentSubs.push(parentSub);
-                            }
-                        });
-                    }
-                }
-                return parentSubs ?? s;
-            }
-            return s;
-        });
+    getSubs(table_name, condition, client) {
+        const subs = this.subs.filter(s => (0, util_1.find)(s.triggers, { table_name, condition }));
+        if (client) {
+            return subs.filter(s => client.func && s.func === client.func || client.socket_id && s.socket_id === client.socket_id);
+        }
+        return subs;
+    }
+    removeLocalSub(tableName, conditionRaw, func) {
+        const condition = (0, exports.parseCondition)(conditionRaw);
+        if (this.getSubs(tableName, condition, { func }).length) {
+            this.subs = this.subs.filter(s => s.func !== func && !(0, util_1.find)(s.triggers, { tableName, condition }));
+        }
+        else {
+            console.error("Could not unsubscribe. Subscription might not have initialised yet", { tableName, condition });
+        }
     }
     getSyncs(table_name, condition) {
         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;
-        }
-        if (dataArr.length < 3) {
-            throw "dataArr length < 3";
-        }
-        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);
-        /**
-         * Trigger error
-         */
-        (0, exports.log)("PG Trigger ->", dataArr.join("__"));
-        if (condition_ids_str && condition_ids_str.startsWith("error") &&
-            this._triggers &&
-            this._triggers[table_name]?.length) {
-            const pref = "INTERNAL ERROR";
-            console.error(`${pref}: condition_ids_str: ${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. Schema might have changed");
-                });
-            });
-            /**
-             * Trigger ok
-             */
-        }
-        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 (let i = 0; i < subs.length; i++) {
-                    const 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);
-        }
-    };
+    notifListener = notifListener_1.notifListener.bind(this);
     pushSubData(sub, err) {
         if (!sub)
             throw "pushSubData: invalid sub";
-        const { table_name, filter, params, table_rules, socket_id, channel_name, func } = sub; //, subOne = false 
+        const { table_info, filter, params, table_rules, socket_id, channel_name, func } = sub; //, subOne = false 
+        const { name: table_name } = table_info;
         sub.last_throttled = Date.now();
         if (err) {
             if (socket_id) {
@@ -440,226 +338,24 @@ class PubSubManager {
     upsertSocket(socket) {
         if (socket && !this.sockets[socket.id]) {
             this.sockets[socket.id] = socket;
-            socket.on("disconnect", () => this.onSocketDisconnected(socket));
+            socket.on("disconnect", () => {
+                this.subs = this.subs.filter(s => {
+                    return !(s.socket && s.socket.id === socket.id);
+                });
+                this.syncs = this.syncs.filter(s => {
+                    return !(s.socket_id && s.socket_id === socket.id);
+                });
+                delete this.sockets[socket.id];
+                return "ok";
+            });
         }
     }
     syncTimeout;
     async syncData(sync, clientData, source) {
         return await (0, SyncReplication_1.syncData)(this, sync, clientData, source);
     }
-    /**
-     * Returns a sync channel
-     * A sync channel is unique per socket for each filter
-     */
-    async addSync(syncParams) {
-        const { socket = null, table_info = null, table_rules, synced_field = null, allow_delete = false, id_fields = [], filter = {}, params, condition = "", throttle = 0 } = syncParams || {};
-        const conditionParsed = parseCondition(condition);
-        if (!socket || !table_info)
-            throw "socket or table_info missing";
-        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);
-        const upsertSync = () => {
-            const newSync = {
-                channel_name,
-                table_name,
-                filter,
-                condition: conditionParsed,
-                synced_field,
-                id_fields,
-                allow_delete,
-                table_rules,
-                throttle: Math.max(throttle || 0, table_rules?.sync?.throttle || 0),
-                batch_size: (0, utils_1.get)(table_rules, "sync.batch_size") || exports.DEFAULT_SYNC_BATCH_SIZE,
-                last_throttled: 0,
-                socket_id: socket.id,
-                is_sync: true,
-                last_synced: 0,
-                lr: undefined,
-                table_info,
-                is_syncing: false,
-                wal: undefined,
-                socket,
-                params
-            };
-            /* Only a sync per socket per table per condition allowed */
-            this.syncs = this.syncs || [];
-            const existing = (0, util_1.find)(this.syncs, { socket_id: socket.id, channel_name });
-            if (!existing) {
-                this.syncs.push(newSync);
-                // console.log("Added SYNC");
-                socket.removeAllListeners(channel_name + "unsync");
-                socket.once(channel_name + "unsync", (_data, cb) => {
-                    this.onSocketDisconnected(socket, channel_name);
-                    cb(null, { res: "ok" });
-                });
-                socket.removeAllListeners(channel_name);
-                socket.on(channel_name, (data, cb) => {
-                    if (!data) {
-                        cb({ err: "Unexpected request. Need data or onSyncRequest" });
-                        return;
-                    }
-                    /*
-                    */
-                    /* Server will:
-                        1. Ask for last_synced  emit(onSyncRequest)
-                        2. Ask for data >= server_synced    emit(onPullRequest)
-                            -> Upsert that data
-                        2. Push data >= last_synced     emit(data.data)
-          
-                       Client will:
-                        1. Send last_synced     on(onSyncRequest)
-                        2. Send data >= server_synced   on(onPullRequest)
-                        3. Send data on CRUD    emit(data.data | data.deleted)
-                        4. Upsert data.data | deleted     on(data.data | data.deleted)
-                    */
-                    // if(data.data){
-                    //     console.error("THIS SHOUKD NEVER FIRE !! NEW DATA FROM SYNC");
-                    //     this.upsertClientData(newSync, data.data);
-                    // } else 
-                    if (data.onSyncRequest) {
-                        // console.log("syncData from socket")
-                        this.syncData(newSync, data.onSyncRequest, "client");
-                        // console.log("onSyncRequest ", socket._user)
-                    }
-                    else {
-                        console.error("Unexpected sync request data from client: ", data);
-                    }
-                });
-                // socket.emit(channel_name, { onSyncRequest: true }, (response) => {
-                //     console.log(response)
-                // });
-            }
-            else {
-                console.warn("UNCLOSED DUPLICATE SYNC FOUND", existing.channel_name);
-            }
-            return newSync;
-        };
-        // const { min_id, max_id, count, max_synced } = params;
-        const _sync = upsertSync();
-        await this.addTrigger({ table_name, condition: conditionParsed });
-        return channel_name;
-    }
-    /* Must return a channel for socket */
-    /* The distinct list of channel names must have a corresponding trigger in the database */
-    async addSub(subscriptionParams) {
-        const { socket, func = null, table_info = null, table_rules, filter = {}, params = {}, condition = "", throttle = 0, //subOne = false, 
-        viewOptions } = subscriptionParams || {};
-        let validated_throttle = subscriptionParams.throttle || 10;
-        if ((!socket && !func) || !table_info)
-            throw "socket/func or table_info missing";
-        const pubThrottle = (0, utils_1.get)(table_rules, ["subscribe", "throttle"]) || 0;
-        if (pubThrottle && Number.isInteger(pubThrottle) && pubThrottle > 0) {
-            validated_throttle = pubThrottle;
-        }
-        if (throttle && Number.isInteger(throttle) && throttle >= pubThrottle) {
-            validated_throttle = throttle;
-        }
-        const channel_name = `${this.socketChannelPreffix}.${table_info.name}.${JSON.stringify(filter)}.${JSON.stringify(params)}.${"m"}.sub`;
-        this.upsertSocket(socket);
-        const upsertSub = (newSubData, isReadyOverride) => {
-            const { table_name, condition: _cond, is_ready = false, parentSubParams } = newSubData, condition = parseCondition(_cond), newSub = {
-                socket,
-                table_name: table_info.name,
-                table_info,
-                filter,
-                params,
-                table_rules,
-                channel_name,
-                parentSubParams,
-                func: func ?? undefined,
-                socket_id: socket?.id,
-                throttle: validated_throttle,
-                is_throttling: null,
-                last_throttled: 0,
-                is_ready,
-            };
-            this.subs[table_name] = this.subs[table_name] ?? {};
-            this.subs[table_name][condition] = this.subs[table_name][condition] ?? { subs: [] };
-            this.subs[table_name][condition].subs = this.subs[table_name][condition].subs ?? [];
-            // console.log("1034 upsertSub", this.subs)
-            const sub_idx = this.subs[table_name][condition].subs.findIndex(s => s.channel_name === channel_name &&
-                (socket && s.socket_id === socket.id ||
-                    func && s.func === func));
-            if (sub_idx < 0) {
-                this.subs[table_name][condition].subs.push(newSub);
-                if (socket) {
-                    const chnUnsub = channel_name + "unsubscribe";
-                    socket.removeAllListeners(chnUnsub);
-                    socket.once(chnUnsub, (_data, cb) => {
-                        const res = this.onSocketDisconnected(socket, channel_name);
-                        cb(null, { res });
-                    });
-                }
-            }
-            else {
-                this.subs[table_name][condition].subs[sub_idx] = newSub;
-            }
-            if (isReadyOverride ?? is_ready) {
-                this.pushSubData(newSub);
-            }
-        };
-        viewOptions?.relatedTables.map(async (relatedTable, relatedTableIdx) => {
-            const params = {
-                table_name: relatedTable.tableName,
-                condition: relatedTable.condition,
-                parentSubParams: {
-                    ...subscriptionParams,
-                    channel_name
-                },
-            };
-            upsertSub({
-                ...params,
-                is_ready: false,
-            }, false);
-            await this.addTrigger(params, viewOptions);
-            /** Trigger pushSubData only on last related table (if it's a view) to prevent duplicate firings */
-            const isLast = relatedTableIdx === viewOptions.relatedTables.length - 1;
-            upsertSub({
-                ...params,
-                is_ready: true
-            }, isLast && !table_info.is_view);
-        });
-        if (table_info.is_view) {
-            if (!viewOptions?.relatedTables.length) {
-                throw "PubSubManager: view parent_tables missing";
-            }
-            return channel_name;
-        }
-        /* Just a table, add table + condition trigger */
-        // console.log(table_info, 202);
-        upsertSub({
-            table_name: table_info.name,
-            condition: parseCondition(condition),
-            parentSubParams: undefined,
-            is_ready: false
-        }, undefined);
-        await this.addTrigger({
-            table_name: table_info.name,
-            condition: parseCondition(condition),
-        });
-        upsertSub({
-            table_name: table_info.name,
-            condition: parseCondition(condition),
-            parentSubParams: undefined,
-            is_ready: true
-        }, undefined);
-        return channel_name;
-    }
-    removeLocalSub(table_name, condition, func) {
-        const cond = parseCondition(condition);
-        if ((0, utils_1.get)(this.subs, [table_name, cond, "subs"])) {
-            this.subs[table_name][cond].subs.map((sub, i) => {
-                if (sub.func && sub.func === func) {
-                    this.subs[table_name][cond].subs.splice(i, 1);
-                }
-            });
-        }
-        else {
-            console.error("Could not unsubscribe. Subscription might not have initialised yet");
-        }
-    }
+    addSync = addSync_1.addSync.bind(this);
+    addSub = addSub_1.addSub.bind(this);
     getActiveListeners = () => {
         const result = [];
         const upsert = (t, c) => {
@@ -670,63 +366,13 @@ class PubSubManager {
         (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);
-                }
+        this.subs.forEach(s => {
+            s.triggers.forEach(trg => {
+                upsert(trg.table_name, trg.condition);
             });
         });
         return result;
     };
-    onSocketDisconnected(socket, channel_name) {
-        // process.on('warning', e => {
-        //     console.warn(e.stack)
-        // });
-        // console.log("onSocketDisconnected", channel_name, this.syncs)
-        if (this.subs) {
-            Object.keys(this.subs).map(table_name => {
-                Object.keys(this.subs[table_name]).map(condition => {
-                    this.subs[table_name][condition].subs.map((sub, i) => {
-                        /**
-                         * If a channel name is specified then delete triggers
-                         */
-                        if ((socket && sub.socket_id === socket.id) &&
-                            (!channel_name || sub.channel_name === channel_name)) {
-                            this.subs[table_name][condition].subs.splice(i, 1);
-                            if (!this.subs[table_name][condition].subs.length) {
-                                delete this.subs[table_name][condition];
-                                if ((0, prostgles_types_1.isEmpty)(this.subs[table_name])) {
-                                    delete this.subs[table_name];
-                                }
-                            }
-                        }
-                    });
-                });
-            });
-        }
-        if (this.syncs) {
-            this.syncs = this.syncs.filter(s => {
-                const matchesSocket = Boolean(socket && s.socket_id !== socket.id);
-                if (channel_name) {
-                    return matchesSocket || s.channel_name !== channel_name;
-                }
-                return matchesSocket;
-            });
-        }
-        if (!socket) {
-            // Do nothing
-        }
-        else if (!channel_name) {
-            delete this.sockets[socket.id];
-        }
-        else {
-            socket.removeAllListeners(channel_name);
-            socket.removeAllListeners(channel_name + "unsync");
-            socket.removeAllListeners(channel_name + "unsubscribe");
-        }
-        return "ok";
-    }
     checkIfTimescaleBug = async (table_name) => {
         const schema = "_timescaledb_catalog", res = await this.db.oneOrNone("SELECT EXISTS( \
             SELECT * \
@@ -810,6 +456,7 @@ class PubSubManager {
 }
 exports.PubSubManager = PubSubManager;
 const parseCondition = (condition) => condition && condition.trim().length ? condition : "TRUE";
+exports.parseCondition = parseCondition;
 var prostgles_types_2 = require("prostgles-types");
 Object.defineProperty(exports, "pickKeys", { enumerable: true, get: function () { return prostgles_types_2.pickKeys; } });
 Object.defineProperty(exports, "omitKeys", { enumerable: true, get: function () { return prostgles_types_2.omitKeys; } });