prostgles-server 4.2.234 → 4.2.236

package/dist/PubSubManager/initialiseEventTriggers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"initialiseEventTriggers.js","sourceRoot":"","sources":["../../lib/PubSubManager/initialiseEventTriggers.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,mDAAgD;AAChD,4CAA8C;AAC9C,8DAA2D;AAC3D,6DAAsE;AACtE,2EAA2D;AAE3D,MAAM,OAAO,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9C,KAAK,UAAU,uBAAuB;IAC3C,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC;IACvD,IAAI,WAAW,IAAI,CAAC,CAAC,MAAM,IAAA,0BAAc,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACpD,OAAO,CAAC,IAAI,CACV,uFAAuF,CACxF,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,qEAAqE;QACrE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;QACxF,MAAM,gBAAgB,GACpB,aAAa,CAAC,MAAM,CAAC,CAAC;YACpB,yBAAyB,aAAa,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YACzF,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC,MAAM,CACzB;;;;aAIO,6BAAa,CAAC,kCAAkC;;;;;;;;;;;;;;;cAe/C,mDAA8B;;;;cAI9B,gBAAgB;;;;;;;;;;;;;;;;;;;kBAmBZ,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC;;;cAGrC,gCAAgC;;;;;;;OAOvC,EACD,EAAE,kBAAkB,EAAlB,uCAAkB,EAAE,CACvB,CAAC;QAEF,MAAM,IAAI,CAAC,EAAE;aACV,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aACvB,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE;YAChB,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;YAC7C,MAAM,CAAC,CAAC;QACV,CAAC,CAAC,CAAC;QAEL,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;QAC7C,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC;AApFD,0DAoFC;AAED,MAAM,gCAAgC,GAAG;;;;;;;;;;;;;;;;;;;sBAmBnB,OAAO,CAAC,wCAAY,CAAC,oBAAoB,CAAC;;;;;;;;;;;;;;;YAepD,OAAO,CAAC,wCAAY,CAAC,oBAAoB,CAAC;YAC1C,OAAO,CAAC,wCAAY,CAAC,yBAAyB,CAAC;;;;;;;;;;;;qCAYtB,wCAAY,CAAC,oBAAoB;6BACzC,wCAAY,CAAC,oBAAoB;;;0BAGpC,wCAAY,CAAC,iBAAiB;;qCAEnB,wCAAY,CAAC,yBAAyB;6BAC9C,wCAAY,CAAC,yBAAyB;;;0BAGzC,wCAAY,CAAC,iBAAiB;;;CAGvD,CAAC"}

package/dist/PubSubManager/notifListener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notifListener.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/notifListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG1F,wBAAsB,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,iBAkMjF"}
+{"version":3,"file":"notifListener.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/notifListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG1F,wBAAsB,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,iBA0KjF"}

package/dist/PubSubManager/notifListener.js

@@ -62,11 +62,11 @@ async function notifListener(data) {
     if (!table_name) {
         throw "table_name undef";
     }
-    const tableTriggerConditions = this._triggers?.[table_name]?.map((condition, idx) => ({
+    const tableTriggerConditions = this._triggers?.[table_name]?.map((cond, idx) => ({
         idx,
-        condition,
-        subs: this.getTriggerSubs(table_name, condition),
-        syncs: this.getSyncs(table_name, condition),
+        ...cond,
+        subs: this.getTriggerSubs(table_name, cond.condition),
+        syncs: this.getSyncs(table_name, cond.condition),
     }));
     let state = "ok";
     // 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)]);
@@ -95,28 +95,7 @@ async function notifListener(data) {
             return !tc || (tc.subs.length === 0 && tc.syncs.length === 0);
         });
         if (orphanedTableConditions.length) {
-            this.db
-                .any(`
-          /* Delete removed subscriptions */
-          /* ${PubSubManager_1.PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */
-          DELETE FROM prostgles.app_triggers at
-          WHERE EXISTS (
-            SELECT 1
-            FROM prostgles.v_triggers t
-            WHERE t.table_name = $1 
-            AND t.c_id IN ($2:csv) 
-            AND t.app_id = $3
-            AND at.app_id = t.app_id
-            AND at.table_name = t.table_name
-            AND at.condition = t.condition
-          ) 
-          `, [table_name, orphanedTableConditions, this.appId])
-                .then(() => {
-                return this.refreshTriggers();
-            })
-                .catch((e) => {
-                console.error("Error deleting orphaned triggers", e);
-            });
+            void this.deleteOrphanedTriggers.bind(this)(table_name);
         }
         firedTableConditions.map(({ subs, syncs }) => {
             (0, PubSubManager_1.log)("notifListener", subs.map((s) => s.channel_name), syncs.map((s) => s.channel_name));

package/dist/PubSubManager/notifListener.js.map

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

package/dist/PubSubManager/refreshTriggers.d.ts

@@ -0,0 +1,3 @@
+import type { PubSubManager } from "./PubSubManager";
+export declare function refreshTriggers(this: PubSubManager): Promise<void>;
+//# sourceMappingURL=refreshTriggers.d.ts.map

package/dist/PubSubManager/refreshTriggers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"refreshTriggers.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/refreshTriggers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,wBAAsB,eAAe,CAAC,IAAI,EAAE,aAAa,iBAmCxD"}

package/dist/PubSubManager/refreshTriggers.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.refreshTriggers = void 0;
+async function refreshTriggers() {
+    const start = Date.now();
+    const triggers = await this.db.any(`
+        SELECT *
+        FROM prostgles.v_triggers
+        WHERE app_id = $1
+        ORDER BY table_name, condition
+      `, [this.dboBuilder.prostgles.appId]);
+    const oldTriggers = { ...this._triggers };
+    this._triggers = {};
+    triggers.map((t) => {
+        this._triggers ??= {};
+        this._triggers[t.table_name] ??= [];
+        if (!this._triggers[t.table_name]?.map((t) => t.condition).includes(t.condition)) {
+            this._triggers[t.table_name]?.push({ condition: t.condition, hash: t.condition_hash });
+        }
+    });
+    await this._log({
+        type: "syncOrSub",
+        command: "refreshTriggers",
+        duration: Date.now() - start,
+        connectedSocketIds: this.connectedSocketIds,
+        triggers: this._triggers,
+        oldTriggers,
+    });
+}
+exports.refreshTriggers = refreshTriggers;
+//# sourceMappingURL=refreshTriggers.js.map

package/dist/PubSubManager/refreshTriggers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"refreshTriggers.js","sourceRoot":"","sources":["../../lib/PubSubManager/refreshTriggers.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,eAAe;IACnC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,MAAM,QAAQ,GAIR,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CACrB;;;;;OAKG,EACH,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAClC,CAAC;IAEF,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IAE1C,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACpB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACjB,IAAI,CAAC,SAAS,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;YACjF,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC;QACzF,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,CAAC,IAAI,CAAC;QACd,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,iBAAiB;QAC1B,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;QAC5B,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;QAC3C,QAAQ,EAAE,IAAI,CAAC,SAAS;QACxB,WAAW;KACZ,CAAC,CAAC;AACL,CAAC;AAnCD,0CAmCC"}

package/lib/Auth/AuthTypes.ts

@@ -343,8 +343,8 @@ export type LoginResponse =
   | AuthResponse.MagicLinkAuthFailure["code"];
 
 export type MagicLinkOrOTPData =
-  | { type: "magic-link"; id: string; returnToken?: boolean }
-  | { type: "otp"; code: string; email: string; returnToken?: boolean };
+  | { type: "magic-link"; id: string; returnToken: boolean }
+  | { type: "otp"; code: string; email: string; returnToken: boolean };
 
 export const getMagicLinkUrl = (websiteUrl: string, data: MagicLinkOrOTPData) => {
   if (data.type === "magic-link") {

package/lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts

@@ -62,61 +62,61 @@ export function setMagicLinkOrOTPRequestHandler(
         .status(HTTP_FAIL_CODES.BAD_REQUEST)
         .json({ success: false, code: "invalid-magic-link", message: "Invalid magic link" });
     }
-    return handler(req, res, { type: "magic-link", id: id });
+    return handler(req, res, { type: "magic-link", id, returnToken: false });
   });
 
   app.get(AUTH_ROUTES_AND_PARAMS.magicLinks, (req, res: MagicLinkResponseHandler) => {
-    const { id, code, email, returnToken = false } = req.query;
+    const data = parseMagicLinkOrOTPData(res, req.query);
+    if (!data) return;
+    return handler(req, res, data);
+  });
 
-    if (typeof returnToken !== "boolean") {
-      return res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({
+  app.post(AUTH_ROUTES_AND_PARAMS.magicLinks, (req, res: MagicLinkResponseHandler) => {
+    const data = parseMagicLinkOrOTPData(res, req.body);
+    if (!data) return;
+    return handler(req, res, data);
+  });
+}
+
+const parseMagicLinkOrOTPData = (res: Response, data: any): MagicLinkOrOTPData | undefined => {
+  const { id, code, email, returnToken = false } = data;
+
+  if (typeof returnToken !== "boolean") {
+    res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({
+      success: false,
+      code: "something-went-wrong",
+      message: "Invalid magic link request. Must provide returnToken must be of type boolean",
+    });
+    return;
+  }
+  const noCode = typeof code !== "string" || !code;
+  const noEmail = typeof email !== "string" || !email;
+  if (typeof id !== "string" || !id) {
+    if (noCode && noEmail) {
+      res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({
         success: false,
         code: "something-went-wrong",
-        message: "Invalid magic link request. Must provide returnToken must be of type boolean",
+        message: "Invalid magic link. Must provide id or email and code",
       });
+      return;
     }
-    const noCode = typeof code !== "string" || !code;
-    const noEmail = typeof email !== "string" || !email;
-    if (typeof id !== "string" || !id) {
-      if (noCode && noEmail) {
-        return res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({
-          success: false,
-          code: "something-went-wrong",
-          message: "Invalid magic link. Must provide id or email and code",
-        });
-      }
-      if (noCode) {
-        return res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({
-          success: false,
-          code: "invalid-otp-code",
-          message: "Invalid or empty code",
-        });
-      }
-      if (noEmail) {
-        return res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({
-          success: false,
-          code: "invalid-email",
-          message: "Invalid or empty email",
-        });
-      }
-      return handler(req, res, { type: "otp", code, email, returnToken });
-    }
-    return handler(req, res, { type: "magic-link", id, returnToken });
-  });
-
-  app.post(AUTH_ROUTES_AND_PARAMS.magicLinks, (req, res: MagicLinkResponseHandler) => {
-    const { code, email } = req.body;
-
-    if (typeof code !== "string" || !code) {
-      res
-        .status(HTTP_FAIL_CODES.BAD_REQUEST)
-        .json({ success: false, code: "invalid-otp-code", message: "Invalid or empty code" });
+    if (noCode) {
+      res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({
+        success: false,
+        code: "invalid-otp-code",
+        message: "Invalid or empty code",
+      });
+      return;
     }
-    if (typeof email !== "string" || !email) {
-      res
-        .status(HTTP_FAIL_CODES.BAD_REQUEST)
-        .json({ success: false, code: "invalid-email", message: "Invalid or empty email" });
+    if (noEmail) {
+      res.status(HTTP_FAIL_CODES.BAD_REQUEST).json({
+        success: false,
+        code: "invalid-email",
+        message: "Invalid or empty email",
+      });
+      return;
     }
-    return handler(req, res, { type: "otp", code, email });
-  });
-}
+    return { type: "otp", code, email, returnToken };
+  }
+  return { type: "magic-link", id, returnToken };
+};

package/lib/Auth/endpoints/setRegisterRequestHandler.ts

@@ -50,7 +50,7 @@ export const setRegisterRequestHandler = (
         email: username,
         password,
         getConfirmationUrl: ({ code, websiteUrl }) =>
-          getMagicLinkUrl(websiteUrl, { type: "otp", code, email: username }),
+          getMagicLinkUrl(websiteUrl, { type: "otp", code, email: username, returnToken: false }),
         clientInfo,
         req,
       });

package/lib/DboBuilder/ViewHandler/subscribe.ts

@@ -3,7 +3,6 @@ import { TableRule } from "../../PublishParser/PublishParser";
 import {
   Filter,
   LocalParams,
-  getClientErrorFromPGError,
   getErrorAsObject,
   getSerializedClientErrorFromPGError,
 } from "../DboBuilder";

package/lib/Logging.ts

@@ -1,6 +1,6 @@
 import { AnyObject, ClientSchema, TableHandler } from "prostgles-types";
 import { LocalParams } from "./DboBuilder/DboBuilder";
-import { NotifTypeName } from "./PubSubManager/PubSubManager";
+import { NotifTypeName, PubSubManagerTriggers } from "./PubSubManager/PubSubManager";
 
 type ClientInfo = {
   socketId: string | undefined;
@@ -60,7 +60,7 @@ export namespace EventTypes {
   export type SyncOrSub = DebugInfo & {
     type: "syncOrSub";
     connectedSocketIds: string[];
-    triggers: Record<string, string[]> | undefined;
+    triggers: PubSubManagerTriggers | undefined;
   } & (
       | (SyncOrSubWithClientInfo & {
           command: "addTrigger";
@@ -82,7 +82,7 @@ export namespace EventTypes {
           command: "notifListener.Finished";
           op_name: string | undefined;
           condition_ids_str: string | undefined;
-          tableTriggers: string[] | undefined;
+          tableTriggers: PubSubManagerTriggers[string] | undefined;
           tableSyncs: string;
           state: "ok" | "error" | "no-triggers" | "invalid_condition_ids";
         })
@@ -100,6 +100,10 @@ export namespace EventTypes {
       | {
           command: "postgresNotifListenManager.create" | "postgresNotifListenManager.destroy";
         }
+      | {
+          command: "refreshTriggers";
+          oldTriggers: PubSubManagerTriggers;
+        }
     );
 
   export type Connection =

package/lib/PubSubManager/PubSubManager.ts

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as crypto from "crypto";
 import {
   DBHandlerServer,
   DboBuilder,
@@ -12,9 +11,13 @@ import {
   TableOrViewInfo,
 } from "../DboBuilder/DboBuilder";
 import { PostgresNotifListenManager } from "../PostgresNotifListenManager";
-import { DB, getIsSuperUser } from "../Prostgles";
+import { DB } from "../Prostgles";
 import { addSync } from "./addSync";
+import { addTrigger } from "./addTrigger";
+import { initialiseEventTriggers } from "./initialiseEventTriggers";
 import { initPubSubManager } from "./initPubSubManager";
+import { refreshTriggers } from "./refreshTriggers";
+import { deleteOrphanedTriggers } from "./deleteOrphanedTriggers";
 
 import * as pgPromise from "pg-promise";
 import pg from "pg-promise/typescript/pg-subset";
@@ -28,20 +31,17 @@ import {
   WAL,
 } from "prostgles-types";
 
-import { find, pickKeys, tryCatch, tryCatchV2 } from "prostgles-types/dist/util";
+import { find, pickKeys } from "prostgles-types/dist/util";
 import { LocalFuncs, getOnDataFunc, matchesLocalFuncs } from "../DboBuilder/ViewHandler/subscribe";
-import { EVENT_TRIGGER_TAGS } from "../Event_Trigger_Tags";
 import { EventTypes } from "../Logging";
 import { TableRule } from "../PublishParser/PublishParser";
 import { syncData } from "../SyncReplication";
 import { addSub } from "./addSub";
-import { DB_OBJ_NAMES } from "./getPubSubManagerInitQuery";
 import { notifListener } from "./notifListener";
-import { DELETE_DISCONNECTED_APPS_QUERY } from "./orphanTriggerCheck";
 import { pushSubData } from "./pushSubData";
 
 type PGP = pgPromise.IMain<{}, pg.IClient>;
-const pgp: PGP = pgPromise({});
+export const pgp: PGP = pgPromise({});
 export const asValue = (v: any) => pgp.as.format("$1", [v]);
 export const DEFAULT_SYNC_BATCH_SIZE = 50;
 
@@ -156,6 +156,8 @@ export type Subscription = Pick<
   }[];
 };
 
+export type PubSubManagerTriggers = Record<string, { condition: string; hash: string }[]>;
+
 /**
  * Used to facilitate table subscribe and sync
  */
@@ -183,7 +185,7 @@ export class PubSubManager {
   }
 
   dboBuilder: DboBuilder;
-  _triggers: Record<string, string[]> | undefined;
+  _triggers: PubSubManagerTriggers | undefined;
   sockets: AnyObject = {};
 
   subs: Subscription[] = [];
@@ -232,92 +234,7 @@ export class PubSubManager {
 
   appChecking = false;
   checkedListenerTableCond?: string[];
-
-  initialiseEventTriggers = async () => {
-    const { watchSchema } = this.dboBuilder.prostgles.opts;
-    if (watchSchema && !(await getIsSuperUser(this.db))) {
-      console.warn(
-        "prostgles watchSchema requires superuser db user. Will not watch using event triggers"
-      );
-    }
-
-    try {
-      /** We use these names because they include schema where necessary */
-      const allTableNames = Object.keys(this.dbo).filter((k) => this.dbo[k]?.tableOrViewInfo);
-      const tableFilterQuery =
-        allTableNames.length ?
-          `OR table_name NOT IN (${allTableNames.map((tblName) => asValue(tblName)).join(", ")})`
-        : "";
-      const query = pgp.as.format(
-        `
-        BEGIN;--  ISOLATION LEVEL SERIALIZABLE;
-        
-        /**                                 
-         * ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
-         *  Drop stale triggers
-         * */
-        DO
-        $do$
-          DECLARE trg RECORD;
-            q   TEXT;
-            ev_trg_needed BOOLEAN := FALSE;
-            ev_trg_exists BOOLEAN := FALSE;
-            is_super_user BOOLEAN := FALSE;
-        BEGIN
-
-            /**
-             *  Delete disconnected app records, this will delete related triggers
-             * */
-            ${DELETE_DISCONNECTED_APPS_QUERY};
-
-            DELETE FROM prostgles.app_triggers
-            WHERE app_id NOT IN (SELECT id FROM prostgles.apps)
-            ${tableFilterQuery}
-            ;
-            
-            /** IS THIS STILL NEEDED? Delete existing triggers without locking 
-            */
-              LOCK TABLE prostgles.app_triggers IN ACCESS EXCLUSIVE MODE;
-              EXECUTE format(
-                $q$
-
-                  CREATE TEMP TABLE %1$I AS --ON COMMIT DROP AS
-                  SELECT * FROM prostgles.app_triggers;
-
-                  DELETE FROM prostgles.app_triggers;
-
-                  INSERT INTO prostgles.app_triggers
-                  SELECT * FROM %1$I;
-
-                  DROP TABLE IF EXISTS %1$I;
-                $q$, 
-                ${asValue("triggers_" + this.appId)}
-              );
-            
-            ${SCHEMA_WATCH_EVENT_TRIGGER_QUERY}
-            
-        END
-        $do$; 
-
-
-        COMMIT;
-      `,
-        { EVENT_TRIGGER_TAGS }
-      );
-
-      await this.db
-        .tx((t) => t.any(query))
-        .catch((e: any) => {
-          console.error("prepareTriggers failed: ", e);
-          throw e;
-        });
-
-      return true;
-    } catch (e) {
-      console.error("prepareTriggers failed: ", e);
-      throw e;
-    }
-  };
+  initialiseEventTriggers = initialiseEventTriggers.bind(this);
 
   getClientSubs({
     channel_name,
@@ -457,184 +374,15 @@ export class PubSubManager {
   /**
    * Sync triggers with database
    *  */
-  refreshTriggers = async () => {
-    const triggers: {
-      table_name: string;
-      condition: string;
-    }[] = await this.db.any(
-      `
-        SELECT *
-        FROM prostgles.v_triggers
-        WHERE app_id = $1
-        ORDER BY table_name, condition
-      `,
-      [this.dboBuilder.prostgles.appId]
-    );
+  refreshTriggers = refreshTriggers.bind(this);
 
-    this._triggers = {};
-    triggers.map((t) => {
-      this._triggers ??= {};
-      this._triggers[t.table_name] ??= [];
-      if (!this._triggers[t.table_name]?.includes(t.condition)) {
-        this._triggers[t.table_name]?.push(t.condition);
-      }
-    });
-  };
+  deleteOrphanedTriggers = debounce(deleteOrphanedTriggers.bind(this), 1000);
 
   addingTrigger: any;
   addTriggerPool?: Record<string, string[]> = undefined;
-  async addTrigger(
-    params: { table_name: string; condition: string },
-    viewOptions: ViewSubscriptionOptions | undefined,
-    socket: PRGLIOSocket | undefined
-  ) {
-    const addedTrigger = await tryCatchV2(async () => {
-      const { table_name } = { ...params };
-      let { condition } = { ...params };
-      if (!table_name) throw "MISSING table_name";
-
-      if (!condition || !condition.trim().length) {
-        condition = "TRUE";
-      }
-
-      if (this.dbo[table_name]?.tableOrViewInfo?.isHyperTable) {
-        throw "Triggers do not work on timescaledb hypertables due to bug:\nhttps://github.com/timescale/timescaledb/issues/1084";
-      }
-
-      const trgVals = {
-        tbl: asValue(table_name),
-        cond: asValue(condition),
-        condHash: asValue(crypto.createHash("md5").update(condition).digest("hex")),
-      };
-
-      await this.db.tx((t) =>
-        t.any(`
-        BEGIN WORK;
-        /* ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */
-        /* why is this lock level needed? */
-        --LOCK TABLE prostgles.app_triggers IN ACCESS EXCLUSIVE MODE;
-
-        /** app_triggers is not refreshed when tables are dropped */
-        DELETE FROM prostgles.app_triggers at
-        WHERE app_id = ${asValue(this.appId)} 
-        AND NOT EXISTS (
-          SELECT 1  
-          FROM pg_catalog.pg_trigger t
-          WHERE tgname like format('prostgles_triggers_%s_', at.table_name) || '%'
-          AND tgenabled = 'O'
-        );
-
-        INSERT INTO prostgles.app_triggers (
-          table_name, 
-          condition, 
-          condition_hash, 
-          app_id, 
-          related_view_name, 
-          related_view_def
-        ) 
-        VALUES (
-          ${trgVals.tbl}, 
-          ${trgVals.cond},
-          ${trgVals.condHash},
-          ${asValue(this.appId)}, 
-          ${asValue(viewOptions?.viewName ?? null)}, 
-          ${asValue(viewOptions?.definition ?? null)}
-        )
-        ON CONFLICT DO NOTHING;
-
-        COMMIT WORK;
-      `)
-      );
-
-      /** This might be redundant due to trigger on app_triggers */
-      await this.refreshTriggers();
-
-      return trgVals;
-    });
-
-    await this._log({
-      type: "syncOrSub",
-      command: "addTrigger",
-      condition: addedTrigger.data?.cond ?? params.condition,
-      duration: addedTrigger.duration,
-      socketId: socket?.id,
-      state: !addedTrigger.data?.tbl ? "fail" : "ok",
-      error: addedTrigger.error,
-      sid: socket && this.dboBuilder.prostgles.authHandler?.getSIDNoError({ socket }),
-      tableName: addedTrigger.data?.tbl ?? params.table_name,
-      connectedSocketIds: this.dboBuilder.prostgles.connectedSockets.map((s) => s.id),
-      localParams: socket && { clientReq: { socket } },
-      triggers: this._triggers,
-    });
-
-    if (addedTrigger.error) throw addedTrigger.error;
-
-    return addedTrigger;
-  }
+  addTrigger = addTrigger.bind(this);
 }
 
-const SCHEMA_WATCH_EVENT_TRIGGER_QUERY = `
-
-  is_super_user := EXISTS (select 1 from pg_user where usename = CURRENT_USER AND usesuper IS TRUE);
-
-  /* DROP the old buggy schema watch trigger */
-  IF EXISTS (
-    SELECT 1 FROM pg_catalog.pg_event_trigger
-    WHERE evtname = 'prostgles_schema_watch_trigger'
-  ) AND is_super_user IS TRUE 
-  THEN
-    DROP EVENT TRIGGER IF EXISTS prostgles_schema_watch_trigger;
-  END IF;
-
-  ev_trg_needed := EXISTS (
-    SELECT 1 FROM prostgles.apps 
-    WHERE watching_schema_tag_names IS NOT NULL
-  );
-  ev_trg_exists := EXISTS (
-    SELECT 1 FROM pg_catalog.pg_event_trigger
-    WHERE evtname = ${asValue(DB_OBJ_NAMES.schema_watch_trigger)}
-  );
-
-  /* DROP stale event trigger */
-  IF 
-    is_super_user IS TRUE 
-    AND ev_trg_needed IS FALSE 
-    AND ev_trg_exists IS TRUE 
-  THEN
-
-      SELECT format(
-        $$ 
-          DROP EVENT TRIGGER IF EXISTS %I ; 
-          DROP EVENT TRIGGER IF EXISTS %I ; 
-        $$
-        , ${asValue(DB_OBJ_NAMES.schema_watch_trigger)}
-        , ${asValue(DB_OBJ_NAMES.schema_watch_trigger_drop)}
-      )
-      INTO q;
-      EXECUTE q;
-
-  /* CREATE event trigger */
-  ELSIF 
-      is_super_user IS TRUE 
-      AND ev_trg_needed IS TRUE 
-      AND ev_trg_exists IS FALSE 
-  THEN
-
-      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 (\${EVENT_TRIGGER_TAGS:csv})
-      EXECUTE PROCEDURE ${DB_OBJ_NAMES.schema_watch_func}();
-
-      DROP EVENT TRIGGER IF EXISTS ${DB_OBJ_NAMES.schema_watch_trigger_drop};
-      CREATE EVENT TRIGGER ${DB_OBJ_NAMES.schema_watch_trigger_drop} 
-      ON sql_drop
-      --WHEN TAG IN (\${EVENT_TRIGGER_TAGS:csv})
-      EXECUTE PROCEDURE ${DB_OBJ_NAMES.schema_watch_func}();
-
-  END IF;
-`;
-
 export const NOTIF_TYPE = {
   data: "data_has_changed",
   data_trigger_change: "data_watch_triggers_have_changed",
@@ -650,6 +398,19 @@ export const NOTIF_CHANNEL = {
   },
 };
 
+function debounce<Params extends any[]>(
+  func: (...args: Params) => any,
+  timeout: number
+): (...args: Params) => void {
+  let timer: NodeJS.Timeout;
+  return (...args: Params) => {
+    clearTimeout(timer);
+    timer = setTimeout(() => {
+      func(...args);
+    }, timeout);
+  };
+}
+
 export const parseCondition = (condition: string): string =>
   condition && condition.trim().length ? condition : "TRUE";