prostgles-server 4.2.74 → 4.2.76

package/dist/PubSubManager/initPubSubManager.js

@@ -36,7 +36,7 @@ async function initPubSubManager() {
         WHERE app_id = ${(0, PubSubManager_1.asValue)(this.appId)}
       `);
             console.log("REMOVE app check disabled");
-            if (!this.appCheck && Math.random() < 12) {
+            if (!this.appCheck && Math.random() > 12) {
                 this.appCheck = setInterval(async () => {
                     let checkForStaleTriggers = "";
                     try {

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

@@ -1 +1 @@
-{"version":3,"file":"orphanTriggerCheck.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/orphanTriggerCheck.ts"],"names":[],"mappings":"AAsBA,+EAA+E;AAC/E,eAAO,MAAM,gBAAgB,cA8C5B,CAAC"}
+{"version":3,"file":"orphanTriggerCheck.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/orphanTriggerCheck.ts"],"names":[],"mappings":"AAsBA,+EAA+E;AAC/E,eAAO,MAAM,gBAAgB,cAqD5B,CAAC"}

package/dist/PubSubManager/orphanTriggerCheck.js

@@ -39,6 +39,13 @@ const getAppCheckQuery = () => `
       NULLIF(current_setting('${LAST_CHECKED_SETTING_NAME}', true), '') IS NULL
       OR current_setting('${LAST_CHECKED_SETTING_NAME}', true)::timestamp < NOW() - INTERVAL '1 minute'
     )
+    /* Ensure we don't check in paralel */
+    AND NOT EXISTS (
+      SELECT 1
+      FROM pg_catalog.pg_stat_activity s
+      WHERE s.query ilike '%${queryIdentifier}%'
+      AND s.state = 'active'
+    )
   THEN
     EXECUTE format('SET LOCAL ${LAST_CHECKED_SETTING_NAME} TO %L', now());
     --USED FOR DEBUG REMOVE
@@ -68,11 +75,4 @@ const getAppCheckQuery = () => `
   END IF;
 `;
 exports.getAppCheckQuery = getAppCheckQuery;
-// /* Ensure we don't check in paralel */
-// AND NOT EXISTS (
-//   SELECT 1
-//   FROM pg_catalog.pg_stat_activity
-//   WHERE query ilike '%${queryIdentifier}%'
-//   AND state = 'active'
-// )
 //# sourceMappingURL=orphanTriggerCheck.js.map

package/dist/PubSubManager/orphanTriggerCheck.js.map

@@ -1 +1 @@
-{"version":3,"file":"orphanTriggerCheck.js","sourceRoot":"","sources":["../../lib/PubSubManager/orphanTriggerCheck.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,2DAAmE;AAEnE;;;;GAIG;AAEH,MAAM,eAAe,GAAG,sFAAsF,CAAC;AAC/G,MAAM,8BAA8B,GAAG;;;;;;;;CAQtC,CAAC;AAEF,MAAM,yBAAyB,GAAG,wBAAwB,CAAC;AAE3D,+EAA+E;AACxE,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC;;MAEhC,eAAe;MACf,gDAA4B;MAC5B,6BAAa,CAAC,kCAAkC;;;;;;;;;;;;gCAYtB,yBAAyB;4BAC7B,yBAAyB;;;gCAGrB,yBAAyB;;sDAEH,yBAAyB;;;QAGvE,8BAA8B;;;;;;;;;;;;;;;;;;;;;CAqBrC,CAAC;AA9CW,QAAA,gBAAgB,oBA8C3B;AAGE,yCAAyC;AACzC,mBAAmB;AACnB,aAAa;AACb,qCAAqC;AACrC,6CAA6C;AAC7C,yBAAyB;AACzB,IAAI"}
+{"version":3,"file":"orphanTriggerCheck.js","sourceRoot":"","sources":["../../lib/PubSubManager/orphanTriggerCheck.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,2DAAmE;AAEnE;;;;GAIG;AAEH,MAAM,eAAe,GAAG,sFAAsF,CAAC;AAC/G,MAAM,8BAA8B,GAAG;;;;;;;;CAQtC,CAAC;AAEF,MAAM,yBAAyB,GAAG,wBAAwB,CAAC;AAE3D,+EAA+E;AACxE,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC;;MAEhC,eAAe;MACf,gDAA4B;MAC5B,6BAAa,CAAC,kCAAkC;;;;;;;;;;;;gCAYtB,yBAAyB;4BAC7B,yBAAyB;;;;;;8BAMvB,eAAe;;;;gCAIb,yBAAyB;;sDAEH,yBAAyB;;;QAGvE,8BAA8B;;;;;;;;;;;;;;;;;;;;;CAqBrC,CAAC;AArDW,QAAA,gBAAgB,oBAqD3B"}

package/lib/PubSubManager/initPubSubManager.ts

@@ -41,7 +41,7 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
       `);
       
       console.log("REMOVE app check disabled");
-      if (!this.appCheck && Math.random() < 12) {
+      if (!this.appCheck && Math.random() > 12) {
 
         this.appCheck = setInterval(async () => {
           let checkForStaleTriggers = "";

package/lib/PubSubManager/orphanTriggerCheck.ts

@@ -40,6 +40,13 @@ export const getAppCheckQuery = () => `
       NULLIF(current_setting('${LAST_CHECKED_SETTING_NAME}', true), '') IS NULL
       OR current_setting('${LAST_CHECKED_SETTING_NAME}', true)::timestamp < NOW() - INTERVAL '1 minute'
     )
+    /* Ensure we don't check in paralel */
+    AND NOT EXISTS (
+      SELECT 1
+      FROM pg_catalog.pg_stat_activity s
+      WHERE s.query ilike '%${queryIdentifier}%'
+      AND s.state = 'active'
+    )
   THEN
     EXECUTE format('SET LOCAL ${LAST_CHECKED_SETTING_NAME} TO %L', now());
     --USED FOR DEBUG REMOVE
@@ -68,12 +75,3 @@ export const getAppCheckQuery = () => `
     END IF;
   END IF;
 `;
-
-
-    // /* Ensure we don't check in paralel */
-    // AND NOT EXISTS (
-    //   SELECT 1
-    //   FROM pg_catalog.pg_stat_activity
-    //   WHERE query ilike '%${queryIdentifier}%'
-    //   AND state = 'active'
-    // )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.74",
+  "version": "4.2.76",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/isomorphicQueries.spec.ts

@@ -486,10 +486,12 @@ export const isomorphicQueries = async (db: DBOFullyTyped | DBHandlerClient, log
           { returnType: "rows" }
         ) as { tgname: string; enabled: boolean; }[];
       }
-      await sub.unsubscribe();
       let validTriggers = await getTableTriggers(table_name);
+      console.log("unsubscribe start")
+      await sub.unsubscribe();
+      console.log("unsubscribe end")
       assert.equal(validTriggers.filter(t => t.enabled).length, 3, '3 Triggers should be enabled');
-      await db.sql?.(`DELETE FROM prostgles.app_triggers`, []); //  WHERE table_name = $1
+      await db.sql?.(`DELETE FROM prostgles.app_triggers`, []);
       validTriggers = await getTableTriggers(table_name);
       assert.equal(validTriggers.length, 3, '3 Triggers should exist but be disabled');
       assert.equal(validTriggers.filter(t => t.enabled).length, 0);

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "4.2.73",
+      "version": "4.2.75",
       "license": "MIT",
       "dependencies": {
         "bluebird": "^3.7.2",