prostgles-server 3.0.78 → 3.0.80

package/lib/PubSubManager/initPubSubManager.js

@@ -7,6 +7,7 @@ const REALTIME_TRIGGER_CHECK_QUERY = "prostgles-server internal query used to ma
 async function initPubSubManager() {
     if (!this.canContinue())
         return undefined;
+    let tries = 5;
     try {
         const schema_version = 10;
         const initQuery = `
@@ -605,13 +606,20 @@ async function initPubSubManager() {
                               END $$;
                           `;
                         await this.db.any(appQ);
+                        tries = 5;
                         (0, PubSubManager_1.log)("updated last_check");
                     }
                     catch (e) {
+                        tries--;
                         /** In some cases a query idles and blocks everything else. Terminate all similar queries */
                         this.db.any("SELECT state, pg_terminate_backend(pid) from pg_stat_activity WHERE query ilike ${qid} and pid <>  pg_backend_pid();", { qid: "%" + REALTIME_TRIGGER_CHECK_QUERY + "%" });
-                        /** If this database was dropped then stop interval */
-                        if (e?.code === "3D000") { //  && e.message.includes(this.db.$cn.database)
+                        /** If no tries left
+                         * OR
+                         * If this database was dropped
+                         *
+                         * then stop interval
+                         * */
+                        if (tries <= 0 || e?.code === "3D000") { //  && e.message.includes(this.db.$cn.database)
                             clearInterval(this.appCheck);
                         }
                         console.error("appCheck FAILED: \n", e, appQ);

package/lib/PubSubManager/initPubSubManager.ts

@@ -5,6 +5,7 @@ const REALTIME_TRIGGER_CHECK_QUERY = "prostgles-server internal query used to ma
 export async function initPubSubManager(this: PubSubManager): Promise<PubSubManager | undefined> {
   if (!this.canContinue()) return undefined;
 
+  let tries = 5;
   try {
     const schema_version = 10;
 
@@ -617,13 +618,21 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
                               END $$;
                           `
             await this.db.any(appQ);
+            tries = 5;
             log("updated last_check");
           } catch (e: any) {
+            tries --;
+
             /** In some cases a query idles and blocks everything else. Terminate all similar queries */
             this.db.any("SELECT state, pg_terminate_backend(pid) from pg_stat_activity WHERE query ilike ${qid} and pid <>  pg_backend_pid();", { qid: "%" + REALTIME_TRIGGER_CHECK_QUERY + "%" });
 
-            /** If this database was dropped then stop interval */
-            if(e?.code === "3D000"){ //  && e.message.includes(this.db.$cn.database)
+            /** If no tries left
+             * OR
+             * If this database was dropped 
+             * 
+             * then stop interval 
+             * */
+            if(tries <= 0 || e?.code === "3D000"){ //  && e.message.includes(this.db.$cn.database)
               clearInterval(this.appCheck);
             }
             console.error("appCheck FAILED: \n", e, appQ);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.78",
+  "version": "3.0.80",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,15 +31,15 @@
   ],
   "homepage": "https://prostgles.com",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.121.0",
+    "@aws-sdk/client-s3": "^3.272.0",
     "@types/express": "^4.17.13",
-    "aws-sdk": "^2.1256.0",
+    "aws-sdk": "^2.1318.0",
     "bluebird": "^3.7.2",
     "check-disk-space": "^3.3.1",
     "file-type": "^17.1.4",
     "g": "^2.0.1",
     "pg-promise": "^10.11.1",
-    "prostgles-types": "^3.0.18",
+    "prostgles-types": "^3.0.23",
     "sharp": "^0.31.0",
     "typescript": "^4.9.5"
   },

package/tests/client/PID.txt

@@ -1 +1 @@
-99494
+73502

package/tests/server/package-lock.json

@@ -21,18 +21,18 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "3.0.77",
+      "version": "3.0.79",
       "license": "MIT",
       "dependencies": {
-        "@aws-sdk/client-s3": "^3.121.0",
+        "@aws-sdk/client-s3": "^3.272.0",
         "@types/express": "^4.17.13",
-        "aws-sdk": "^2.1256.0",
+        "aws-sdk": "^2.1318.0",
         "bluebird": "^3.7.2",
         "check-disk-space": "^3.3.1",
         "file-type": "^17.1.4",
         "g": "^2.0.1",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^3.0.18",
+        "prostgles-types": "^3.0.23",
         "sharp": "^0.31.0",
         "typescript": "^4.9.5"
       },
@@ -1500,19 +1500,19 @@
     "prostgles-server": {
       "version": "file:../..",
       "requires": {
-        "@aws-sdk/client-s3": "^3.121.0",
+        "@aws-sdk/client-s3": "^3.272.0",
         "@aws-sdk/types": "^3.110.0",
         "@types/bluebird": "^3.5.36",
         "@types/express": "^4.17.13",
         "@types/node": "^18.0.3",
         "@types/sharp": "^0.30.4",
-        "aws-sdk": "^2.1256.0",
+        "aws-sdk": "^2.1318.0",
         "bluebird": "^3.7.2",
         "check-disk-space": "^3.3.1",
         "file-type": "^17.1.4",
         "g": "^2.0.1",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^3.0.18",
+        "prostgles-types": "^3.0.23",
         "sharp": "^0.31.0",
         "typescript": "^4.9.5"
       }