prostgles-server 2.0.106 → 2.0.111

package/lib/Prostgles.ts

@@ -393,23 +393,47 @@ export type ProstglesInitOptions<DBO = DbHandler> = {
     onSocketDisconnect?(socket: Socket, dbo: DBO, db?: DB): any;
     auth?: Auth<DBO>;
     DEBUG_MODE?: boolean;
-    watchSchema?: boolean | "hotReloadMode" | ((event: { command: string; query: string }) => void);
+    watchSchemaType?: 
+
+    /**
+     * Will check client queries for schema changes
+     * Default
+     */
+    | "events" 
+
+    /**
+     * Will set database event trigger for schema changes. Requires superuser
+     */
+    | "queries";
+    
+    watchSchema?: 
+
+        /**
+         * If true then DBoGenerated.d.ts will be updated and "onReady" will be called with new schema on both client and server
+         */
+        | boolean 
+
+        /**
+         * "hotReloadMode" will only rewrite the DBoGenerated.d.ts found in tsGeneratedTypesDir
+         * This is meant to be used in development when server restarts on file change
+         */
+        | "hotReloadMode" 
+
+        /**
+         * Function called when schema changes. Nothing else triggered
+         */
+        | ((event: { command: string; query: string }) => void) 
+
+        /**
+         * Schema checked for changes every 'checkIntervalMillis" milliseconds
+         */
+        | { checkIntervalMillis: number };
     keywords?: Keywords;
     onNotice?: (notice: AnyObject, message?: string) => void;
     fileTable?: FileTableConfig;
     tableConfig?: TableConfig;
 }
 
-// interface ISocketSetup {
-//     db: DB;
-//     dbo: DbHandler;
-//     io: any;
-//     onSocketConnect?(socket: Socket, dbo: any);
-//     onSocketDisconnect?(socket: Socket, dbo: any);
-//     publish: Publish,
-//     publishMethods: any;
-//     publishRawSQL?: any,
-// }
 /*
     1. Connect to db
     2. Execute any SQL file if provided
@@ -443,6 +467,7 @@ export class Prostgles<DBO = DbHandler> {
         onReady: () => {},
         schema: "public",
         watchSchema: false,
+        watchSchemaType: "queries",
     };
 
     // dbConnection: DbConnection = {
@@ -490,7 +515,7 @@ export class Prostgles<DBO = DbHandler> {
             "transactions", "joins", "tsGeneratedTypesDir",
             "onReady", "dbConnection", "dbOptions", "publishMethods", "io", 
             "publish", "schema", "publishRawSQL", "wsChannelNamePrefix", "onSocketConnect", 
-            "onSocketDisconnect", "sqlFilePath", "auth", "DEBUG_MODE", "watchSchema", 
+            "onSocketDisconnect", "sqlFilePath", "auth", "DEBUG_MODE", "watchSchema", "watchSchemaType",
             "fileTable", "tableConfig"
         ];
         const unknownParams = Object.keys(params).filter((key: string) => !(config as string[]).includes(key))
@@ -518,6 +543,11 @@ export class Prostgles<DBO = DbHandler> {
         const { watchSchema, onReady, tsGeneratedTypesDir } = this.opts;
         if(watchSchema && this.loaded){
             console.log("Schema changed");
+            const { query } = event;
+            if(query && query.includes(PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID)){
+                console.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 */
@@ -532,7 +562,7 @@ export class Prostgles<DBO = DbHandler> {
                     this.writeDBSchema(true);
                 }
 
-            } else if(watchSchema === true){
+            } else if(watchSchema === true || "checkIntervalMillis" in watchSchema){
                 /* Full re-init. Sockets must reconnect */
                 console.log("watchSchema: Full re-initialisation")
                 this.init(onReady);
@@ -586,6 +616,8 @@ export class Prostgles<DBO = DbHandler> {
         return this.dbo;
     }
 
+    isSuperUser = false;
+    schema_checkIntervalMillis: any;
     async init(onReady: (dbo: DBO, db: DB) => any): Promise<{
         db: DbHandler;
         _db: DB;
@@ -598,18 +630,38 @@ export class Prostgles<DBO = DbHandler> {
 
         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.watchSchema === "object" && 
+            "checkIntervalMillis" in this.opts.watchSchema && 
+            typeof this.opts.watchSchema.checkIntervalMillis === "number"
+        ){
+
+            if(this.schema_checkIntervalMillis){
+                clearInterval(this.schema_checkIntervalMillis);
+                this.schema_checkIntervalMillis = setInterval(async () => {
+                    const dbuilder = await DboBuilder.create(this as any);
+                    if(dbuilder.tsTypesDefinition !== this.dboBuilder.tsTypesDefinition){
+                        this.refreshDBO();
+                        this.init(onReady);
+                    }
+                }, this.opts.watchSchema.checkIntervalMillis)
+            }
         }
 
         /* 1. Connect to db */
         if(!this.db){
-            const { db, pgp } = getDbConnection(this.opts.dbConnection, this.opts.dbOptions, this.opts.DEBUG_MODE, notice => { 
-                if(this.opts.onNotice) this.opts.onNotice(notice);
-                if(this.dbEventsManager){
-                    this.dbEventsManager.onNotice(notice)
+            const { db, pgp } = getDbConnection(this.opts.dbConnection, this.opts.dbOptions, this.opts.DEBUG_MODE, 
+                notice => { 
+                    if(this.opts.onNotice) this.opts.onNotice(notice);
+                    if(this.dbEventsManager){
+                        this.dbEventsManager.onNotice(notice)
+                    }
                 }
-            });
+            );
             this.db = db;
             this.pgp = pgp;
+            this.isSuperUser = await isSuperUser(db);
         }
         this.checkDb();
         const { db, pgp } = this;

package/lib/PubSubManager.ts

@@ -997,7 +997,7 @@ export class PubSubManager {
                     event_type = dataArr[2],
                     query = dataArr[3];
 
-                if(query && !query.includes(PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID)){
+                if(query){
                     this.onSchemaChange({ command, query })
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.106",
+  "version": "2.0.111",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,7 +31,7 @@
     "i": "^0.3.7",
     "npm": "^8.1.4",
     "pg-promise": "^10.9.5",
-    "prostgles-types": "^1.5.120",
+    "prostgles-types": "^1.5.121",
     "sharp": "^0.29.3"
   },
   "devDependencies": {

package/tests/client/PID.txt

@@ -1 +1 @@
-10129
+3396

package/tests/isomorphic_queries.js

@@ -322,7 +322,7 @@ async function isomorphic(db) {
         assert_1.strict.equal(res, 1);
     });
     await tryRun("Order by", async () => {
-        const res = await db.items.find({}, { select: { name: 1 }, orderBy: [{ key: "name", asc: false, nulls: "first" }] });
+        const res = await db.items.find({}, { select: { name: 1 }, orderBy: [{ key: "name", asc: false, nulls: "first", nullEmpty: true }] });
         assert_1.strict.deepStrictEqual(res, [{ name: 'b' }, { name: 'a' }, { name: 'a' }]);
     });
     await tryRun("Order by aliased func", async () => {

package/tests/isomorphic_queries.ts

@@ -358,7 +358,7 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
   });
 
   await tryRun("Order by", async () => {
-    const res = await db.items.find({}, { select: { name: 1 }, orderBy: [{ key: "name", asc: false, nulls: "first" }] });
+    const res = await db.items.find({}, { select: { name: 1 }, orderBy: [{ key: "name", asc: false, nulls: "first", nullEmpty: true }] });
     assert.deepStrictEqual(res, [{ name: 'b'}, { name: 'a'}, { name: 'a'}]);
   });
 

package/tests/server/package-lock.json

@@ -23,7 +23,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.105",
+      "version": "2.0.110",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.32.0",
@@ -33,7 +33,7 @@
         "i": "^0.3.7",
         "npm": "^8.1.4",
         "pg-promise": "^10.9.5",
-        "prostgles-types": "^1.5.120",
+        "prostgles-types": "^1.5.121",
         "sharp": "^0.29.3"
       },
       "devDependencies": {
@@ -1456,7 +1456,7 @@
         "i": "^0.3.7",
         "npm": "^8.1.4",
         "pg-promise": "^10.9.5",
-        "prostgles-types": "^1.5.120",
+        "prostgles-types": "^1.5.121",
         "sharp": "^0.29.3",
         "typescript": "^3.9.7"
       }