prostgles-server 4.2.79 → 4.2.81

package/dist/PubSubManager/initPubSubManager.js

@@ -1,17 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initPubSubManager = exports.REALTIME_TRIGGER_CHECK_QUERY = void 0;
+exports.initPubSubManager = exports.tout = exports.REALTIME_TRIGGER_CHECK_QUERY = void 0;
+const prostgles_types_1 = require("prostgles-types");
 const PostgresNotifListenManager_1 = require("../PostgresNotifListenManager");
 const getWatchSchemaTagList_1 = require("../SchemaWatch/getWatchSchemaTagList");
 const PubSubManager_1 = require("./PubSubManager");
-const getInitQuery_1 = require("./getInitQuery");
+const getPubSubManagerInitQuery_1 = require("./getPubSubManagerInitQuery");
 exports.REALTIME_TRIGGER_CHECK_QUERY = "prostgles-server internal query used to manage realtime triggers";
+const tout = (ms) => new Promise(res => setTimeout(res, ms));
+exports.tout = tout;
 async function initPubSubManager() {
     if (!this.getIsDestroyed())
         return undefined;
     try {
-        const initQuery = await getInitQuery_1.getInitQuery.bind(this)();
-        await this.db.any(initQuery);
+        const initQuery = await getPubSubManagerInitQuery_1.getPubSubManagerInitQuery.bind(this)();
+        /**
+         * High database activity might cause deadlocks.
+         * Must retry
+        */
+        let didDeadlock = false;
+        let tries = 3;
+        let error;
+        while ((0, prostgles_types_1.isDefined)(initQuery) && tries > 0) {
+            try {
+                /** Try to reduce race condition deadlocks due to multiple clients connecting at the same time */
+                await (0, exports.tout)(Math.random());
+                await this.db.any(initQuery);
+                error = undefined;
+                tries = 0;
+            }
+            catch (e) {
+                if (!didDeadlock && (0, prostgles_types_1.isObject)(e) && e.code === "40P01") {
+                    didDeadlock = true;
+                    tries = 5;
+                    console.error("Deadlock detected. Retrying...");
+                }
+                error = e;
+                tries--;
+            }
+        }
+        if (error) {
+            throw error;
+        }
         if (!this.getIsDestroyed())
             return;
         /* Prepare App id */

package/dist/PubSubManager/initPubSubManager.js.map

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

package/lib/PubSubManager/PubSubManager.ts

@@ -22,7 +22,7 @@ import { EventTypes } from "../Logging";
 import { TableRule } from "../PublishParser/PublishParser";
 import { syncData } from "../SyncReplication";
 import { addSub } from "./addSub";
-import { DB_OBJ_NAMES } from "./getInitQuery";
+import { DB_OBJ_NAMES } from "./getPubSubManagerInitQuery";
 import { notifListener } from "./notifListener";
 import { pushSubData } from "./pushSubData";
 

package/lib/PubSubManager/{getInitQuery.ts → getPubSubManagerInitQuery.ts}

@@ -1,4 +1,6 @@
 
+import { tryCatch } from "prostgles-types";
+import { pgp } from "../DboBuilder/DboBuilderTypes";
 import { asValue, NOTIF_CHANNEL, NOTIF_TYPE, PubSubManager } from "./PubSubManager";
 const { version } = require("../../package.json");
 import { getAppCheckQuery } from "./orphanTriggerCheck";
@@ -10,14 +12,23 @@ export const DB_OBJ_NAMES = {
   schema_watch_trigger: "prostgles_schema_watch_trigger_new"
 } as const;
 
-export const getInitQuery = async function(this: PubSubManager): Promise<string> { 
-
-  const getQuery = async (withoutHash = false): Promise<string> => {
-    const { schema_md5 = "none" } = withoutHash? {} : await this.db.oneOrNone("SELECT md5($1) as schema_md5", [await getQuery(true)]);
-    
-    return `
-
-BEGIN; --  ISOLATION LEVEL SERIALIZABLE;-- TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+const PROSTGLES_SCHEMA_EXISTS_QUERY = `
+  SELECT 1 
+  FROM information_schema.columns 
+  WHERE table_schema = 'prostgles'
+  AND   table_name   = 'versions'
+  AND   column_name   = 'schema_md5'
+`;
+const PROSTGLES_SCHEMA_VERSION_OK_QUERY = `
+  SELECT 1 
+  FROM prostgles.versions
+  WHERE (string_to_array(version, '.')::int[] > string_to_array(\${version}, '.')::int[])
+  OR (string_to_array(version, '.')::int[] = string_to_array(\${version}, '.')::int[])
+  AND schema_md5 = \${schema_md5}
+`;
+
+const getInitQuery = (debugMode: boolean | undefined) => `
+BEGIN; -- TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 
 --SET  TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 
@@ -29,9 +40,6 @@ DO
 $do$
 BEGIN
 
-    /* Reduce deadlocks */
-    PERFORM pg_sleep(random());
-
     /* Drop older version.  */
     IF EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = 'prostgles') THEN
 
@@ -39,23 +47,14 @@ BEGIN
       IF
         /* Backwards compatibility. Cannot check schema version */
         NOT EXISTS(
-          SELECT 1 
-          FROM information_schema.columns 
-          WHERE table_schema = 'prostgles'
-          AND   table_name   = 'versions'
-          AND   column_name   = 'schema_md5'
+          ${PROSTGLES_SCHEMA_EXISTS_QUERY}
         )
       THEN
         DROP SCHEMA IF EXISTS prostgles CASCADE;
       ELSIF
         /* There is no newer version or same same version but different schema */
         NOT EXISTS (
-          SELECT 1 
-          FROM prostgles.versions
-          WHERE 
-            (string_to_array(version, '.')::int[] > string_to_array(${asValue(version)}, '.')::int[])
-            OR (string_to_array(version, '.')::int[] = string_to_array(${asValue(version)}, '.')::int[])
-            AND schema_md5 = ${asValue(schema_md5)}
+          ${PROSTGLES_SCHEMA_VERSION_OK_QUERY}
         )
       THEN
         DROP SCHEMA IF EXISTS prostgles CASCADE;
@@ -83,7 +82,7 @@ BEGIN
         COMMENT ON TABLE prostgles.versions IS 'Stores the prostgles schema creation query hash and package version number to identify when a newer schema needs to be re-created';
 
         INSERT INTO prostgles.versions(version, schema_md5) 
-        VALUES(${asValue(version)}, ${asValue(schema_md5)}) 
+        VALUES(${asValue(version)}, \${schema_md5}) 
         ON CONFLICT DO NOTHING;
 
 
@@ -307,7 +306,7 @@ BEGIN
                                   THEN concat_ws('; ', 'error', err_text, err_detail, err_hint, 'query: ' || query ) 
                                   ELSE COALESCE(v_trigger.cids, '') 
                                 END
-                                ${this.dboBuilder.prostgles.opts.DEBUG_MODE? (", COALESCE(current_query(), 'current_query ??'), ' ', query") : ""}
+                                ${debugMode? (", COALESCE(current_query(), 'current_query ??'), ' ', query") : ""}
                               ), 7999/4) -- Some chars are 2bytes -> 'Ω'
                             );
                         END LOOP;
@@ -506,7 +505,7 @@ BEGIN
                         json_build_object(
                           'TG_OP', TG_OP, 
                           'duration', (EXTRACT(EPOCH FROM now()) * 1000) - start_time,
-                          'query', ${this.dboBuilder.prostgles.opts.DEBUG_MODE? 'LEFT(current_query(), 400)' : "'Only shown in debug mode'"}
+                          'query', ${debugMode? 'LEFT(current_query(), 400)' : "'Only shown in debug mode'"}
                         )
                       )::TEXT, 7999/4)
                     );
@@ -568,7 +567,7 @@ BEGIN
                           ${asValue(NOTIF_TYPE.schema)}, 
                           tg_tag , 
                           TG_event, 
-                          ${this.dboBuilder.prostgles.opts.DEBUG_MODE? 'curr_query' : "'Only shown in debug mode'"}
+                          ${debugMode? 'curr_query' : "'Only shown in debug mode'"}
                         ), 7999/4)
                       );
                     END LOOP;
@@ -589,11 +588,31 @@ BEGIN
 END
 $do$;
 
-
 COMMIT;
-`};
-
-  const res = getQuery();
+`
+
+/**
+ * Initialize the prostgles schema and functions needed for realtime data and schema changes
+ * undefined returned if the database contains the apropriate prostgles schema
+ */
+export const getPubSubManagerInitQuery = async function(this: PubSubManager): Promise<string | undefined> { 
+
+  const initQuery = getInitQuery(this.dboBuilder.prostgles.opts.DEBUG_MODE);
+  const { schema_md5 = "none" } = await this.db.oneOrNone("SELECT md5($1) as schema_md5", [initQuery.trim()]);
+  const query = pgp.as.format(initQuery, { schema_md5, version });
+  const existingSchema = await this.db.any(PROSTGLES_SCHEMA_EXISTS_QUERY);
+  if(!existingSchema.length){
+    return query;
+  }
+  const { existingSchemaVersions } = await tryCatch(async () => {
+    const existingSchemaVersions = await this.db.any(PROSTGLES_SCHEMA_VERSION_OK_QUERY, { schema_md5, version });
+    return {
+      existingSchemaVersions
+    }
+  });
+  if(!existingSchemaVersions?.length){
+    return query;
+  }
   
-  return res;
+  return undefined;
 }

package/lib/PubSubManager/initPubSubManager.ts

@@ -1,16 +1,48 @@
+import { isDefined, isObject } from "prostgles-types";
 import { PostgresNotifListenManager } from "../PostgresNotifListenManager";
 import { getWatchSchemaTagList } from "../SchemaWatch/getWatchSchemaTagList";
 import { NOTIF_CHANNEL, PubSubManager, asValue } from "./PubSubManager";
-import { getInitQuery } from "./getInitQuery";
+import { getPubSubManagerInitQuery } from "./getPubSubManagerInitQuery";
 export const REALTIME_TRIGGER_CHECK_QUERY = "prostgles-server internal query used to manage realtime triggers" as const;  
 
+export const tout = (ms: number) => new Promise(res => setTimeout(res, ms));
+
 export async function initPubSubManager(this: PubSubManager): Promise<PubSubManager | undefined> {
   if (!this.getIsDestroyed()) return undefined;
 
   try {
 
-    const initQuery = await getInitQuery.bind(this)()
-    await this.db.any(initQuery);
+    const initQuery = await getPubSubManagerInitQuery.bind(this)();
+
+    /**
+     * High database activity might cause deadlocks.
+     * Must retry
+    */
+    let didDeadlock = false;
+    let tries = 3;
+    let error: any;
+    while (isDefined(initQuery) && tries > 0) {
+      try {
+        /** Try to reduce race condition deadlocks due to multiple clients connecting at the same time */
+        await tout(Math.random());
+
+        await this.db.any(initQuery);
+        error = undefined;
+        tries = 0;
+      } catch (e: any) {
+        if(!didDeadlock && isObject(e) && e.code === "40P01"){
+          didDeadlock = true;
+          tries = 5;
+          console.error("Deadlock detected. Retrying...");
+        }
+        error = e;
+        tries --;
+      }
+    }
+    if(error){
+      throw error;
+    }
+
     if (!this.getIsDestroyed()) return;
 
     /* Prepare App id */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.79",
+  "version": "4.2.81",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -40,8 +40,8 @@
     "check-disk-space": "^3.4.0",
     "file-type": "^18.5.0",
     "pg": "^8.11.5",
-    "pg-cursor": "^2.10.5",
-    "pg-promise": "^11.6.0",
+    "pg-cursor": "^2.11.0",
+    "pg-promise": "^11.8.0",
     "prostgles-client": "^4.0.53",
     "prostgles-types": "^4.0.87"
   },

package/tests/client/package-lock.json

@@ -121,14 +121,14 @@
       }
     },
     "node_modules/engine.io-client": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz",
-      "integrity": "sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.4.tgz",
+      "integrity": "sha512-GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ==",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1",
         "engine.io-parser": "~5.2.1",
-        "ws": "~8.11.0",
+        "ws": "~8.17.1",
         "xmlhttprequest-ssl": "~2.0.0"
       }
     },
@@ -268,27 +268,6 @@
         }
       }
     },
-    "node_modules/jsdom/node_modules/ws": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
-      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
@@ -615,15 +594,15 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {

package/tests/clientOnlyQueries.spec.ts

@@ -8,6 +8,33 @@ import { describe, test } from "node:test";
 export const clientOnlyQueries = async (db: DBHandlerClient, auth: Auth, log: (...args: any[]) => any, methods, tableSchema: DBSchemaTable[], token: string) => {
 
   await describe("Client only queries", async (t) => {
+
+    await test("SQL Stream more than 1k records", async ( ) => {
+      const expectedRowCount = 2e3;
+      await tryRunP("", async (resolve, reject) => {
+        let rows: any[] = [];
+        const res = await db.sql!(`SELECT * FROM generate_series(1, ${expectedRowCount})`, {}, { returnType: "stream" });
+        const listener = async (packet: SocketSQLStreamPacket) => { 
+          if(packet.type === "error"){
+            reject(packet.error);
+          } else {
+            if(packet.rows){
+              rows = [
+                ...rows,
+                ...packet.rows
+              ]
+            }
+            if(packet.ended){
+              assert.equal(packet.ended, true);
+              assert.equal(rows.length, expectedRowCount);
+              resolve("ok");
+            }
+          }
+        };
+        await res.start(listener);
+      });
+    });
+
     await test("SQL Stream persistedConnection with streamLimit works for subsequent queries", async () => {
       await tryRunP("", async (resolve, reject) => {
         const query = "SELECT * FROM generate_series(1, 100)";