prostgles-server 4.2.41 → 4.2.42

package/dist/SchemaWatch.js

@@ -1,36 +1,127 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SchemaWatch = void 0;
+exports.watchSchemaFallback = exports.getWatchSchemaTagList = exports.SchemaWatch = void 0;
+const Event_Trigger_Tags_1 = require("./Event_Trigger_Tags");
 const prostgles_types_1 = require("prostgles-types");
-const DboBuilder_1 = require("./DboBuilder/DboBuilder");
+const PubSubManager_1 = require("./PubSubManager/PubSubManager");
 class SchemaWatch {
-    schema_checkIntervalMillis;
-    loaded = false;
-    constructor({ watchSchema, watchSchemaType, tsGeneratedTypesDir, currDbuilder, onSchemaChanged }) {
-        if (!watchSchema)
-            return;
-        if (watchSchema === "hotReloadMode" && !tsGeneratedTypesDir) {
-            throw "tsGeneratedTypesDir option is needed for watchSchema: hotReloadMode to work ";
+    dboBuilder;
+    type;
+    constructor(dboBuilder) {
+        this.dboBuilder = dboBuilder;
+        this.type = getValidatedWatchSchemaType(dboBuilder);
+        if (this.type.watchType === "NONE") {
+            this.onSchemaChange = undefined;
+        }
+    }
+    static create = async (dboBuilder) => {
+        const instance = new SchemaWatch(dboBuilder);
+        if (instance.type.watchType === "DDL_trigger") {
+            await dboBuilder.getPubSubManager();
         }
-        else if ((0, prostgles_types_1.isObject)(watchSchemaType) &&
-            "checkIntervalMillis" in watchSchemaType &&
-            typeof watchSchemaType.checkIntervalMillis === "number") {
-            if (this.schema_checkIntervalMillis) {
-                clearInterval(this.schema_checkIntervalMillis);
+        return instance;
+    };
+    onSchemaChange = async (event) => {
+        if (this.type.watchType === "NONE")
+            return;
+        const { watchSchema, onReady, tsGeneratedTypesDir } = this.dboBuilder.prostgles.opts;
+        if (watchSchema && this.dboBuilder.prostgles.loaded) {
+            (0, PubSubManager_1.log)("Schema changed");
+            const { query, command } = event;
+            if (typeof query === "string" && query.includes(PubSubManager_1.PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID)) {
+                (0, PubSubManager_1.log)("Schema change event excluded from triggers due to EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID");
+                return;
+            }
+            if (typeof watchSchema === "function") {
+                /* Only call the provided func */
+                watchSchema(event);
             }
-            this.schema_checkIntervalMillis = setInterval(async () => {
-                if (!this.loaded)
-                    return;
-                const dbuilder = await DboBuilder_1.DboBuilder.create(this);
-                if (dbuilder.tsTypesDefinition !== currDbuilder.tsTypesDefinition) {
-                    onSchemaChanged();
+            else if (watchSchema === "hotReloadMode") {
+                if (tsGeneratedTypesDir) {
+                    /* Hot reload integration. Will only touch tsGeneratedTypesDir */
+                    console.log("watchSchema: Re-writing TS schema");
+                    await this.dboBuilder.prostgles.refreshDBO();
+                    this.dboBuilder.prostgles.writeDBSchema(true);
                 }
-            }, watchSchemaType.checkIntervalMillis);
-        }
-        else if (watchSchemaType === "DDL_trigger") {
-            /** Do nothing */
+            }
+            else if (watchSchema) {
+                /* Full re-init. Sockets must reconnect */
+                console.log("watchSchema: Full re-initialisation", { query });
+                this.dboBuilder.prostgles.init(onReady, { type: "schema change", query, command });
+            }
         }
-    }
+    };
 }
 exports.SchemaWatch = SchemaWatch;
+const getValidatedWatchSchemaType = (dboBuilder) => {
+    const { watchSchema, watchSchemaType, tsGeneratedTypesDir } = dboBuilder.prostgles.opts;
+    if (!watchSchema)
+        return { watchType: "NONE" };
+    if (watchSchema === "hotReloadMode" && !tsGeneratedTypesDir) {
+        throw "tsGeneratedTypesDir option is needed for watchSchema: hotReloadMode to work ";
+    }
+    const onChange = typeof watchSchema === "function" ? watchSchema : undefined;
+    if (watchSchemaType === "DDL_trigger" || !watchSchemaType) {
+        if (!dboBuilder.prostgles.isSuperUser) {
+            if (watchSchemaType === "DDL_trigger") {
+                console.error(`watchSchemaType "DDL_trigger" cannot be used because db user is not a superuser. Will fallback to watchSchemaType "prostgles_queries" `);
+            }
+            else {
+                console.warn(`watchSchema fallback to watchSchemaType "prostgles_queries" due to non-superuser`);
+            }
+            return {
+                watchType: "prostgles_queries",
+                onChange,
+                isFallbackFromDDL: true
+            };
+        }
+        return {
+            watchType: "DDL_trigger",
+            onChange
+        };
+    }
+    return {
+        watchType: watchSchemaType,
+        isFallbackFromDDL: false,
+        onChange
+    };
+};
+const getWatchSchemaTagList = (watchSchema) => {
+    if (!watchSchema)
+        return undefined;
+    if (watchSchema === "*") {
+        return Event_Trigger_Tags_1.EVENT_TRIGGER_TAGS.slice(0);
+    }
+    if ((0, prostgles_types_1.isObject)(watchSchema) && typeof watchSchema !== "function") {
+        const watchSchemaKeys = (0, prostgles_types_1.getKeys)(watchSchema);
+        const isInclusive = Object.values(watchSchema).every(v => v);
+        return Event_Trigger_Tags_1.EVENT_TRIGGER_TAGS
+            .slice(0)
+            .filter(v => {
+            const matches = watchSchemaKeys.includes(v);
+            return isInclusive ? matches : !matches;
+        });
+    }
+    const coreTags = [
+        'COMMENT', 'CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW',
+        'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO', 'CREATE POLICY'
+    ];
+    return coreTags;
+};
+exports.getWatchSchemaTagList = getWatchSchemaTagList;
+/**
+ * Fallback for watchSchema in case of not a superuser (cannot add db event listener)
+ */
+const watchSchemaFallback = async function ({ queryWithoutRLS, command }) {
+    const SCHEMA_ALTERING_COMMANDS = Event_Trigger_Tags_1.EVENT_TRIGGER_TAGS; // ["CREATE", "ALTER", "DROP", "REVOKE", "GRANT"];
+    const isNotPickedUpByDDLTrigger = ["REVOKE", "GRANT"].includes(command);
+    const { watchSchema, watchSchemaType } = this.prostgles?.opts || {};
+    if (watchSchema &&
+        (!this.prostgles.isSuperUser || watchSchemaType === "prostgles_queries" || isNotPickedUpByDDLTrigger)) {
+        if (SCHEMA_ALTERING_COMMANDS.includes(command)) {
+            this.prostgles.schemaWatch?.onSchemaChange?.({ command, query: queryWithoutRLS });
+        }
+    }
+};
+exports.watchSchemaFallback = watchSchemaFallback;
 //# sourceMappingURL=SchemaWatch.js.map

package/dist/SchemaWatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaWatch.js","sourceRoot":"","sources":["../lib/SchemaWatch.ts"],"names":[],"mappings":";;;AAAA,qDAA2C;AAC3C,wDAAqD;AAIrD,MAAa,WAAW;IACtB,0BAA0B,CAAkB;IAC5C,MAAM,GAAG,KAAK,CAAC;IAEf,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,EAAsF;QAClL,IAAG,CAAC,WAAW;YAAE,OAAO;QAExB,IAAI,WAAW,KAAK,eAAe,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC5D,MAAM,8EAA8E,CAAC;QAEvF,CAAC;aAAM,IACL,IAAA,0BAAQ,EAAC,eAAe,CAAC;YACzB,qBAAqB,IAAI,eAAe;YACxC,OAAO,eAAe,CAAC,mBAAmB,KAAK,QAAQ,EACvD,CAAC;YAED,IAAI,IAAI,CAAC,0BAA0B,EAAE,CAAC;gBACpC,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACjD,CAAC;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,CAAC;oBAClE,eAAe,EAAE,CAAC;gBACpB,CAAC;YACH,CAAC,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC;QAE1C,CAAC;aAAM,IAAG,eAAe,KAAK,aAAa,EAAC,CAAC;YAC3C,iBAAiB;QACnB,CAAC;IAEH,CAAC;CAGF;AAlCD,kCAkCC"}
+{"version":3,"file":"SchemaWatch.js","sourceRoot":"","sources":["../lib/SchemaWatch.ts"],"names":[],"mappings":"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"}

package/dist/initProstgles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initProstgles.d.ts","sourceRoot":"","sources":["../lib/initProstgles.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAIjD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,oBAAoB,EAAe,MAAM,aAAa,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAiB,MAAM,+BAA+B,CAAC;AAG3E,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,EAAE,CAAC,qBAAqB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AACzE,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC,SAAS,CAAC;AAE5C,MAAM,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;AAClD,MAAM,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;AAErD,MAAM,MAAM,YAAY,GACpB;IACA,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,GACC;IACA,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,aAAa,GAAG,aAAa,CAAA;CAC9D,CAAC;AAEJ,KAAK,mBAAmB,GAAG;IACzB,EAAE,EAAE,EAAE,CAAC;IACP,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAA;AACD,MAAM,MAAM,kBAAkB,GAAG,mBAAmB,GAAG;IACrD,GAAG,EAAE,eAAe,CAAC;CACtB,CAAA;AACD,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,mBAAmB,GAAG;IACnD,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;CACvB,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;AAC1E,MAAM,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,kBAAkB,KAAK,GAAG,CAAC;AAEvE,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,aAAa,CAAC;IAClB,GAAG,EAAE,EAAE,CAAC;IACR,GAAG,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,MAAM,MAAM,CAAC;IAC1B,MAAM,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,WAAW,GAAG,SAAS,GAAG,aAAa,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxG,OAAO,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;CACpC,CAAA;AAED,eAAO,MAAM,aAAa,SAAwB,SAAS,WAAW,oBAAoB,UAAU,YAAY,KAAG,QAAQ,UAAU,CAoIpI,CAAA"}
+{"version":3,"file":"initProstgles.d.ts","sourceRoot":"","sources":["../lib/initProstgles.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAIjD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,oBAAoB,EAAkB,MAAM,aAAa,CAAC;AAC/F,OAAO,EAAE,WAAW,EAAiB,MAAM,+BAA+B,CAAC;AAI3E,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,EAAE,CAAC,qBAAqB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AACzE,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC,SAAS,CAAC;AAE5C,MAAM,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;AAClD,MAAM,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;AAErD,MAAM,MAAM,YAAY,GACpB;IACA,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,GACC;IACA,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,aAAa,GAAG,aAAa,CAAA;CAC9D,CAAC;AAEJ,KAAK,mBAAmB,GAAG;IACzB,EAAE,EAAE,EAAE,CAAC;IACP,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAA;AACD,MAAM,MAAM,kBAAkB,GAAG,mBAAmB,GAAG;IACrD,GAAG,EAAE,eAAe,CAAC;CACtB,CAAA;AACD,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,mBAAmB,GAAG;IACnD,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;CACvB,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;AAC1E,MAAM,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,kBAAkB,KAAK,GAAG,CAAC;AAEvE,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,aAAa,CAAC;IAClB,GAAG,EAAE,EAAE,CAAC;IACR,GAAG,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,MAAM,MAAM,CAAC;IAC1B,MAAM,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,WAAW,GAAG,SAAS,GAAG,aAAa,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxG,OAAO,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;CACpC,CAAA;AAED,eAAO,MAAM,aAAa,SAAwB,SAAS,WAAW,oBAAoB,UAAU,YAAY,KAAG,QAAQ,UAAU,CAqIpI,CAAA"}

package/dist/initProstgles.js

@@ -9,9 +9,9 @@ const DBEventsManager_1 = require("./DBEventsManager");
 const Prostgles_1 = require("./Prostgles");
 const PublishParser_1 = require("./PublishParser/PublishParser");
 const utils_1 = require("./utils");
+const SchemaWatch_1 = require("./SchemaWatch/SchemaWatch");
 const initProstgles = async function (onReady, reason) {
     this.loaded = false;
-    this.initWatchSchema(onReady);
     /* 1. Connect to db */
     if (!this.db) {
         const { db, pgp } = getDbConnection(this.opts.dbConnection, this.opts.dbOptions, this.opts.DEBUG_MODE, notice => {
@@ -23,7 +23,7 @@ const initProstgles = async function (onReady, reason) {
         });
         this.db = db;
         this.pgp = pgp;
-        this.isSuperUser = await (0, Prostgles_1.isSuperUser)(db);
+        this.isSuperUser = await (0, Prostgles_1.getIsSuperUser)(db);
     }
     this.checkDb();
     const db = this.db;
@@ -37,6 +37,7 @@ const initProstgles = async function (onReady, reason) {
         await this.initTableConfig(reason);
         await this.initFileTable();
         await this.initRestApi();
+        this.schemaWatch = await SchemaWatch_1.SchemaWatch.create(this.dboBuilder);
         if (this.opts.publish) {
             if (!this.opts.io)
                 console.warn("IO missing. Publish has no effect without io");

package/dist/initProstgles.js.map

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

package/lib/DboBuilder/DboBuilder.ts

@@ -26,10 +26,11 @@ import { QueryStreamer } from "./QueryStreamer";
 import { TableHandler } from "./TableHandler/TableHandler";
 import { JoinPaths, ViewHandler } from "./ViewHandler/ViewHandler";
 import { parseJoinPath } from "./ViewHandler/parseJoinPath";
-import { PGConstraint, canEXECUTE, getConstraints, getSerializedClientErrorFromPGError } from "./dboBuilderUtils";
+import { PGConstraint, getCanExecute, getConstraints, getSerializedClientErrorFromPGError } from "./dboBuilderUtils";
 import { getTablesForSchemaPostgresSQL } from "./getTablesForSchemaPostgresSQL";
 import { prepareShortestJoinPaths } from "./prepareShortestJoinPaths";
 import { runSQL } from "./runSQL";
+import { PostgresNotifListenManager } from "../PostgresNotifListenManager";
 
 export * from "./DboBuilderTypes";
 export * from "./dboBuilderUtils";
@@ -64,7 +65,11 @@ export class DboBuilder {
   db: DB;
 
   dbo: DBHandlerServer;
-  _pubSubManager?: PubSubManager;
+
+  /**
+   * Undefined if cannot create table triggers
+   */
+  private _pubSubManager?: PubSubManager;
 
   /**
    * Used for db.sql field type details
@@ -85,24 +90,12 @@ export class DboBuilder {
 
   getPubSubManager = async (): Promise<PubSubManager> => {
     if (!this._pubSubManager) {
-      let onSchemaChange;
-
-      const { isSuperUs } = await PubSubManager.canCreate(this.db);
-      if (!canEXECUTE) throw "PubSubManager based subscriptions not possible: Cannot run EXECUTE statements on this connection";
-
-      if (this.prostgles.opts.watchSchema && this.prostgles.opts.watchSchemaType === "DDL_trigger") {
-        if (!isSuperUs) {
-          console.warn(`watchSchemaType "${this.prostgles.opts.watchSchemaType}" cannot be used because db user is not a superuser. Will fallback to watchSchemaType "prostgles_queries" `)
-        } else {
-          onSchemaChange = (event: { command: string; query: string }) => {
-            this.prostgles.onSchemaChange(event)
-          }
-        }
-      }
+
+      const canExecute = await getCanExecute(this.db)
+      if (!canExecute) throw "PubSubManager based subscriptions not possible: Cannot run EXECUTE statements on this connection";
 
       this._pubSubManager = await PubSubManager.create({
         dboBuilder: this,
-        onSchemaChange
       });
     }
     if (!this._pubSubManager) {
@@ -132,12 +125,10 @@ export class DboBuilder {
 
   private init = async () => {
 
-    /* If watchSchema is enabled then PubSubManager must be created (if possible) */
     await this.build();
+    /* If watchSchema is enabled then PubSubManager must be created (if possible) because it creates the event trigger */
     if (
-      this.prostgles.opts.watchSchema &&
-      (this.prostgles.opts.watchSchemaType === "DDL_trigger" || !this.prostgles.opts.watchSchemaType) &&
-      this.prostgles.isSuperUser
+      this.prostgles.schemaWatch?.type.watchType === "DDL_trigger"
     ) {
       await this.getPubSubManager()
     }

package/lib/DboBuilder/QueryStreamer.ts

@@ -5,9 +5,9 @@ import { DB } from "../initProstgles";
 import { DboBuilder } from "./DboBuilder";
 import { PRGLIOSocket } from "./DboBuilderTypes";
 import { getErrorAsObject, getSerializedClientErrorFromPGError } from "./dboBuilderUtils";
-import { getDetailedFieldInfo, watchSchemaFallback } from "./runSQL";
+import { getDetailedFieldInfo } from "./runSQL";
 import CursorType from 'pg-cursor'
-import { VoidFunction } from "../SchemaWatch";
+import { VoidFunction, watchSchemaFallback } from "../SchemaWatch/SchemaWatch";
 const Cursor: typeof CursorType = require('pg-cursor');
 
 type ClientStreamedRequest = {

package/lib/DboBuilder/dboBuilderUtils.ts

@@ -180,7 +180,7 @@ export const prepareOrderByQuery = (items: SortItem[], tableAlias?: string): str
   }).join(", ")]
 }
 
-export const canEXECUTE = async (db: DB) => {
+export const getCanExecute = async (db: DB) => {
 
   try {
     await db.any(`DO $$ BEGIN  EXECUTE 'select 1'; END $$;`);

package/lib/DboBuilder/runSQL.ts

@@ -1,9 +1,9 @@
 import { ParameterizedQuery as PQ, ParameterizedQuery } from 'pg-promise';
 import pg from "pg-promise/typescript/pg-subset";
 import { AnyObject, SQLOptions, SQLResult, SQLResultInfo } from "prostgles-types";
-import { EVENT_TRIGGER_TAGS } from "../Event_Trigger_Tags";
 import { DB, Prostgles } from "../Prostgles";
 import { DboBuilder, LocalParams, pgp, postgresToTsType } from "./DboBuilder";
+import { watchSchemaFallback } from "../SchemaWatch/SchemaWatch";
 
 
 export async function runSQL(this: DboBuilder, queryWithoutRLS: string, args: undefined | AnyObject | any[], options: SQLOptions | undefined, localParams?: LocalParams) {
@@ -102,23 +102,6 @@ const onSQLResult = async function(this: DboBuilder, queryWithoutRLS: string, {
   }
 }
 
-/**
- * Fallback for watchSchema in case of not a superuser (cannot add db event listener)
- */
-export const watchSchemaFallback = async function(this: DboBuilder, { queryWithoutRLS, command }: { queryWithoutRLS: string; command: string; }){
-  const SCHEMA_ALTERING_COMMANDS = EVENT_TRIGGER_TAGS;// ["CREATE", "ALTER", "DROP", "REVOKE", "GRANT"];
-  const isNotPickedUpByDDLTrigger = ["REVOKE", "GRANT"].includes(command);
-  const { watchSchema, watchSchemaType } = this.prostgles?.opts || {};
-  if (
-    watchSchema &&
-    (!this.prostgles.isSuperUser || watchSchemaType === "prostgles_queries" || isNotPickedUpByDDLTrigger)
-  ) {
-    if (SCHEMA_ALTERING_COMMANDS.includes(command as any)) {
-      this.prostgles.onSchemaChange({ command, query: queryWithoutRLS })
-    }
-  }
-}
-
 export async function cacheDBTypes(this: DboBuilder) {
   this.DATA_TYPES ??= await this.db.any("SELECT oid, typname FROM pg_type") ?? [];
   this.USER_TABLES ??= await this.db.any(`

package/lib/PostgresNotifListenManager.ts

@@ -45,7 +45,7 @@ export class PostgresNotifListenManager {
     return this;
   }
 
-  isReady() {
+  get isReady() {
     return this.isListening;
   }
 

package/lib/Prostgles.ts

@@ -7,7 +7,7 @@ import * as pgPromise from 'pg-promise';
 import AuthHandler, { Auth, AuthRequestParams, SessionUser } from "./AuthHandler";
 import { EventTriggerTagFilter } from "./Event_Trigger_Tags";
 import { CloudClient, FileManager, ImageOptions, LocalConfig } from "./FileManager/FileManager";
-import { SchemaWatch } from "./SchemaWatch";
+import { SchemaWatch } from "./SchemaWatch/SchemaWatch";
 import { DbConnection, DbConnectionOpts, OnInitReason, OnReadyCallback, OnReadyCallbackBasic, initProstgles } from "./initProstgles";
 import { clientCanRunSqlRequest, runClientMethod, runClientRequest, runClientSqlRequest } from "./runClientRequest";
 import pg = require('pg-promise/typescript/pg-subset');
@@ -124,6 +124,7 @@ export type FileTableConfig = {
   imageOptions?: ImageOptions
 };
 
+export type OnSchemaChangeCallback = ((event: { command: string; query: string }) => void);
 
 export type ProstglesInitOptions<S = void, SUser extends SessionUser = SessionUser> = {
   dbConnection: DbConnection;
@@ -160,11 +161,6 @@ export type ProstglesInitOptions<S = void, SUser extends SessionUser = SessionUs
    */
   | "prostgles_queries"
 
-  /**
-   * Schema checked for changes every 'checkIntervalMillis" milliseconds
-   */
-  | { checkIntervalMillis: number };
-
   /**
    * If truthy then DBoGenerated.d.ts will be updated and "onReady" will be called with new schema on both client and server
    */
@@ -188,7 +184,7 @@ export type ProstglesInitOptions<S = void, SUser extends SessionUser = SessionUs
     /**
      * Function called when schema changes. Nothing else triggered
      */
-    | ((event: { command: string; query: string }) => void)
+    | OnSchemaChangeCallback;
 
   keywords?: Keywords;
   onNotice?: (notice: AnyObject, message?: string) => void;
@@ -270,7 +266,10 @@ export class Prostgles {
   dbo?: DBHandlerServer;
   _dboBuilder?: DboBuilder;
   get dboBuilder(): DboBuilder {
-    if (!this._dboBuilder) throw "get dboBuilder: it's undefined"
+    if (!this._dboBuilder) {
+      console.trace(1)
+      throw "get dboBuilder: it's undefined";
+    }
     return this._dboBuilder;
   }
   set dboBuilder(d: DboBuilder) {
@@ -329,37 +328,6 @@ export class Prostgles {
 
   destroyed = false;
 
-  async onSchemaChange(event: { command: string; query: string }) {
-    const { watchSchema, watchSchemaType, onReady, tsGeneratedTypesDir } = this.opts;
-    if (watchSchema && this.loaded) {
-      log("Schema changed");
-      const { query, command } = event;
-      if (typeof query === "string" && query.includes(PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID)) {
-        log("Schema change event excluded from triggers due to EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID");
-        return;
-      }
-
-      if (typeof watchSchema === "function") {
-        /* Only call the provided func */
-        watchSchema(event);
-
-      } else if (watchSchema === "hotReloadMode") {
-        if (tsGeneratedTypesDir) {
-          /* Hot reload integration. Will only touch tsGeneratedTypesDir */
-          console.log("watchSchema: Re-writing TS schema");
-
-          await this.refreshDBO();
-          this.writeDBSchema(true);
-        }
-
-      } else if (watchSchema || isObject(watchSchemaType) && "checkIntervalMillis" in watchSchemaType) {
-        /* Full re-init. Sockets must reconnect */
-        console.log("watchSchema: Full re-initialisation", { query })
-        this.init(onReady as any, { type: "schema change", query, command });
-      }
-    }
-  }
-
   checkDb() {
     if (!this.db || !this.db.connect) throw "something went wrong getting a db connection";
   }
@@ -429,34 +397,6 @@ export class Prostgles {
     return this.dbo;
   }
 
-  initWatchSchema = (onReady: OnReadyCallbackBasic) => {
-
-    if (this.opts.watchSchema === "hotReloadMode" && !this.opts.tsGeneratedTypesDir) {
-      throw "tsGeneratedTypesDir option is needed for watchSchema: hotReloadMode to work ";
-    } else if (
-      this.opts.watchSchema &&
-      typeof this.opts.watchSchemaType === "object" &&
-      "checkIntervalMillis" in this.opts.watchSchemaType &&
-      typeof this.opts.watchSchemaType.checkIntervalMillis === "number"
-    ) {
-
-      if (this.schema_checkIntervalMillis) {
-        clearInterval(this.schema_checkIntervalMillis);
-      }
-      this.schema_checkIntervalMillis = setInterval(async () => {
-        if(!this.loaded) return;
-        const dbuilder = await DboBuilder.create(this);
-        if (dbuilder.tsTypesDefinition !== this.dboBuilder.tsTypesDefinition) {
-          await this.refreshDBO();
-          const reason: OnInitReason = { type: "schema change", command: "", query: "schema_checkIntervalMillis tsTypesDefinition changed" }
-          this.init(onReady, reason);
-        }
-      }, this.opts.watchSchemaType.checkIntervalMillis);
-      
-    }
-
-  }
-
   initRestApi = async () => {
     if (this.opts.restApi) {
       this.restApi = new RestApi({ prostgles: this, ...this.opts.restApi });
@@ -526,7 +466,6 @@ export class Prostgles {
   }
 
   isSuperUser = false;
-  schema_checkIntervalMillis?: NodeJS.Timeout;
 
   init = initProstgles.bind(this);
 
@@ -787,6 +726,6 @@ type SocketMethodRequest = {
 }
 
 
-export async function isSuperUser(db: DB): Promise<boolean> {
+export async function getIsSuperUser(db: DB): Promise<boolean> {
   return db.oneOrNone("select usesuper from pg_user where usename = CURRENT_USER;").then(r => r.usesuper);
 }