prostgles-server 4.1.90 → 4.1.92
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -54,10 +54,12 @@ async function initPubSubManager() {
|
|
|
54
54
|
|
|
55
55
|
`;
|
|
56
56
|
}
|
|
57
|
+
const queryIdentifier = "prostgles query used to keep track of which prgl backend clients are still connected";
|
|
57
58
|
checkForStaleTriggers = `
|
|
58
59
|
DO $$
|
|
59
60
|
BEGIN
|
|
60
61
|
/*
|
|
62
|
+
${queryIdentifier}
|
|
61
63
|
${REALTIME_TRIGGER_CHECK_QUERY}
|
|
62
64
|
${PubSubManager_1.PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
|
|
63
65
|
*/
|
|
@@ -81,23 +83,21 @@ async function initPubSubManager() {
|
|
|
81
83
|
|
|
82
84
|
END $$;`;
|
|
83
85
|
const queryTimeoutMillis = Math.min(5e3, Math.round(this.appCheckFrequencyMS / 2));
|
|
84
|
-
this.db.any(`
|
|
85
|
-
|
|
86
|
+
this.db.any(`
|
|
87
|
+
/*
|
|
88
|
+
${queryIdentifier}
|
|
89
|
+
${REALTIME_TRIGGER_CHECK_QUERY}
|
|
90
|
+
${PubSubManager_1.PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
|
|
91
|
+
*/
|
|
92
|
+
DO $$
|
|
86
93
|
BEGIN
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
BEGIN
|
|
93
|
-
PERFORM pg_sleep(\${queryTimeoutMillis}/1e3);
|
|
94
|
-
SELECT pg_cancel_backend(pid)
|
|
95
|
-
FROM pg_catalog.pg_stat_activity
|
|
96
|
-
WHERE pid <> pg_backend_pid()
|
|
97
|
-
AND query = \${checkForStaleTriggers};
|
|
98
|
-
END $$;
|
|
94
|
+
PERFORM pg_sleep(\${queryTimeoutMillis}/1e3);
|
|
95
|
+
SELECT pg_cancel_backend(pid)
|
|
96
|
+
FROM pg_catalog.pg_stat_activity
|
|
97
|
+
WHERE pid <> pg_backend_pid()
|
|
98
|
+
AND query = \${queryIdentifier};
|
|
99
99
|
END $$;
|
|
100
|
-
`, { queryTimeoutMillis,
|
|
100
|
+
`, { queryTimeoutMillis, queryIdentifier });
|
|
101
101
|
await this.db.any(checkForStaleTriggers);
|
|
102
102
|
tries = 5;
|
|
103
103
|
(0, PubSubManager_1.log)("updated last_check");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initPubSubManager.js","sourceRoot":"","sources":["../../lib/PubSubManager/initPubSubManager.ts"],"names":[],"mappings":";;;AAAA,8EAA2E;AAC3E,mDAA8D;AAC9D,MAAM,4BAA4B,GAAG,kEAA2E,CAAC;AACjH,iDAA8C;AAEvC,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QAAE,OAAO,SAAS,CAAC;IAE1C,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI;QAEF,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,2BAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YAAE,OAAO;QAGhC,oBAAoB;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC3B,sJAAsJ,EACpJ,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAC3D,CAAC;YACF,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;YAEpB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAElB,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;oBACrC,IAAI,qBAAqB,GAAG,EAAE,CAAC;oBAC/B,IAAI,EAAI,qBAAqB;wBAE3B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;wBAExB,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;wBAC5C,MAAM,wBAAwB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;wBACtF,IAAI,qBAAqB,GAAG,EAAE,CAAC;wBAC/B,IAAG,IAAI,CAAC,wBAAwB,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,wBAAwB,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAC;4BACzF,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;4BACzD,qBAAqB,GAAG;;;;;;;;;;sBAUhB,CAAC,SAAS,CAAC,MAAM,CAAA,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;;;0BAGpB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,IAAA,uBAAO,EAAC,CAAC,CAAC,UAAU,CAAC,KAAK,IAAA,uBAAO,EAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;uCAE3E,IAAA,uBAAO,EAAC,IAAI,CAAC,KAAK,CAAC;qBACrC;;;;qCAIgB,IAAA,uBAAO,EAAC,IAAI,CAAC,KAAK,CAAC;kDACN,IAAA,uBAAO,EAAC,IAAI,CAAC,mBAAmB,CAAC;;;;eAIpE,CAAA;yBACF;wBAED,qBAAqB,GAAG;;;;oBAIhB,4BAA4B;oBAC5B,6BAAa,CAAC,kCAAkC;;;;;;;;;;;;;;;iCAenC,IAAA,uBAAO,EAAC,IAAI,CAAC,KAAK,CAAC;;sBAE9B,qBAAqB;;;sBAGrB,CAAA;wBAEV,MAAM,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,GAAC,CAAC,CAAC,CAAC,CAAC;wBACjF,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC
|
|
1
|
+
{"version":3,"file":"initPubSubManager.js","sourceRoot":"","sources":["../../lib/PubSubManager/initPubSubManager.ts"],"names":[],"mappings":";;;AAAA,8EAA2E;AAC3E,mDAA8D;AAC9D,MAAM,4BAA4B,GAAG,kEAA2E,CAAC;AACjH,iDAA8C;AAEvC,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QAAE,OAAO,SAAS,CAAC;IAE1C,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI;QAEF,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,2BAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YAAE,OAAO;QAGhC,oBAAoB;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC3B,sJAAsJ,EACpJ,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAC3D,CAAC;YACF,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;YAEpB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAElB,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;oBACrC,IAAI,qBAAqB,GAAG,EAAE,CAAC;oBAC/B,IAAI,EAAI,qBAAqB;wBAE3B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;wBAExB,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;wBAC5C,MAAM,wBAAwB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;wBACtF,IAAI,qBAAqB,GAAG,EAAE,CAAC;wBAC/B,IAAG,IAAI,CAAC,wBAAwB,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,wBAAwB,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAC;4BACzF,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;4BACzD,qBAAqB,GAAG;;;;;;;;;;sBAUhB,CAAC,SAAS,CAAC,MAAM,CAAA,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;;;0BAGpB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,IAAA,uBAAO,EAAC,CAAC,CAAC,UAAU,CAAC,KAAK,IAAA,uBAAO,EAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;uCAE3E,IAAA,uBAAO,EAAC,IAAI,CAAC,KAAK,CAAC;qBACrC;;;;qCAIgB,IAAA,uBAAO,EAAC,IAAI,CAAC,KAAK,CAAC;kDACN,IAAA,uBAAO,EAAC,IAAI,CAAC,mBAAmB,CAAC;;;;eAIpE,CAAA;yBACF;wBAED,MAAM,eAAe,GAAG,sFAAsF,CAAA;wBAC9G,qBAAqB,GAAG;;;;oBAIhB,eAAe;oBACf,4BAA4B;oBAC5B,6BAAa,CAAC,kCAAkC;;;;;;;;;;;;;;;iCAenC,IAAA,uBAAO,EAAC,IAAI,CAAC,KAAK,CAAC;;sBAE9B,qBAAqB;;;sBAGrB,CAAA;wBAEV,MAAM,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,GAAC,CAAC,CAAC,CAAC,CAAC;wBACjF,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;;kBAEN,eAAe;kBACf,4BAA4B;kBAC5B,6BAAa,CAAC,kCAAkC;;;;;;;;;;aAUrD,EAAE,EAAE,kBAAkB,EAAE,eAAe,EAAE,CAAC,CAAA;wBAC3C,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;wBACzC,KAAK,GAAG,CAAC,CAAC;wBACV,IAAA,mBAAG,EAAC,oBAAoB,CAAC,CAAC;qBAC3B;oBAAC,OAAO,CAAM,EAAE;wBACf,KAAK,EAAG,CAAC;wBAET,4FAA4F;wBAC5F,IAAI,CAAC,EAAE,CAAC,GAAG,CACT,sHAAsH,EACtH,EAAE,GAAG,EAAE,GAAG,GAAG,4BAA4B,GAAG,GAAG,EAAE,CAClD,CAAC;wBAEF;;;;;6BAKK;wBACL,IAAG,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,KAAK,OAAO,EAAC,EAAE,+CAA+C;4BACpF,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;yBAC9B;wBACD,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC,EAAE,qBAAqB,CAAC,CAAC;qBAChE;oBAED,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;gBAC3B,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;aACpC;SACF;QAED,IAAI,CAAC,0BAA0B,GAAG,IAAI,uDAA0B,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5H,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAA;QAEpC,OAAO,IAAI,CAAC;KAEb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;KACjD;AACH,CAAC;AA9ID,8CA8IC"}
|
|
@@ -62,10 +62,12 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
|
|
|
62
62
|
`
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
+
const queryIdentifier = "prostgles query used to keep track of which prgl backend clients are still connected"
|
|
65
66
|
checkForStaleTriggers = `
|
|
66
67
|
DO $$
|
|
67
68
|
BEGIN
|
|
68
69
|
/*
|
|
70
|
+
${queryIdentifier}
|
|
69
71
|
${REALTIME_TRIGGER_CHECK_QUERY}
|
|
70
72
|
${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
|
|
71
73
|
*/
|
|
@@ -90,23 +92,21 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
|
|
|
90
92
|
END $$;`
|
|
91
93
|
|
|
92
94
|
const queryTimeoutMillis = Math.min(5e3, Math.round(this.appCheckFrequencyMS/2));
|
|
93
|
-
this.db.any(`
|
|
94
|
-
|
|
95
|
+
this.db.any(`
|
|
96
|
+
/*
|
|
97
|
+
${queryIdentifier}
|
|
98
|
+
${REALTIME_TRIGGER_CHECK_QUERY}
|
|
99
|
+
${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
|
|
100
|
+
*/
|
|
101
|
+
DO $$
|
|
95
102
|
BEGIN
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
BEGIN
|
|
102
|
-
PERFORM pg_sleep(\${queryTimeoutMillis}/1e3);
|
|
103
|
-
SELECT pg_cancel_backend(pid)
|
|
104
|
-
FROM pg_catalog.pg_stat_activity
|
|
105
|
-
WHERE pid <> pg_backend_pid()
|
|
106
|
-
AND query = \${checkForStaleTriggers};
|
|
107
|
-
END $$;
|
|
103
|
+
PERFORM pg_sleep(\${queryTimeoutMillis}/1e3);
|
|
104
|
+
SELECT pg_cancel_backend(pid)
|
|
105
|
+
FROM pg_catalog.pg_stat_activity
|
|
106
|
+
WHERE pid <> pg_backend_pid()
|
|
107
|
+
AND query = \${queryIdentifier};
|
|
108
108
|
END $$;
|
|
109
|
-
`, { queryTimeoutMillis,
|
|
109
|
+
`, { queryTimeoutMillis, queryIdentifier })
|
|
110
110
|
await this.db.any(checkForStaleTriggers);
|
|
111
111
|
tries = 5;
|
|
112
112
|
log("updated last_check");
|
package/package.json
CHANGED
package/tests/client/PID.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
2611629
|