prostgles-server 4.2.42 → 4.2.43
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.
- package/dist/DboBuilder/QueryStreamer.d.ts +2 -2
- package/dist/DboBuilder/QueryStreamer.d.ts.map +1 -1
- package/dist/DboBuilder/QueryStreamer.js +1 -2
- package/dist/DboBuilder/QueryStreamer.js.map +1 -1
- package/dist/DboBuilder/runSQL.d.ts.map +1 -1
- package/dist/DboBuilder/runSQL.js +1 -2
- package/dist/DboBuilder/runSQL.js.map +1 -1
- package/dist/SchemaWatch/SchemaWatch.d.ts +4 -7
- package/dist/SchemaWatch/SchemaWatch.d.ts.map +1 -1
- package/dist/SchemaWatch/SchemaWatch.js +11 -16
- package/dist/SchemaWatch/SchemaWatch.js.map +1 -1
- package/lib/DboBuilder/QueryStreamer.ts +3 -3
- package/lib/DboBuilder/runSQL.ts +1 -2
- package/lib/SchemaWatch/SchemaWatch.ts +13 -18
- package/package.json +1 -1
- package/tests/client/hooks.spec.ts +2 -3
- package/tests/client/index.ts +2 -1
- package/tests/client/useProstgles.spec.ts +9 -9
- package/tests/server/package-lock.json +1 -1
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import * as pg from "pg";
|
|
2
|
+
import CursorType from 'pg-cursor';
|
|
2
3
|
import { SQLOptions, SocketSQLStreamServer } from "prostgles-types";
|
|
4
|
+
import { VoidFunction } from "../SchemaWatch/SchemaWatch";
|
|
3
5
|
import { DB } from "../initProstgles";
|
|
4
6
|
import { DboBuilder } from "./DboBuilder";
|
|
5
7
|
import { PRGLIOSocket } from "./DboBuilderTypes";
|
|
6
|
-
import CursorType from 'pg-cursor';
|
|
7
|
-
import { VoidFunction } from "../SchemaWatch/SchemaWatch";
|
|
8
8
|
type ClientStreamedRequest = {
|
|
9
9
|
socket: PRGLIOSocket;
|
|
10
10
|
query: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryStreamer.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/QueryStreamer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAY,UAAU,EAAyB,qBAAqB,EAAsB,MAAM,iBAAiB,CAAC;AAEzH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"QueryStreamer.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/QueryStreamer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,UAAU,MAAM,WAAW,CAAC;AACnC,OAAO,EAAY,UAAU,EAAyB,qBAAqB,EAAsB,MAAM,iBAAiB,CAAC;AAEzH,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKjD,KAAK,qBAAqB,GAAG;IAC3B,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAA;AACD,KAAK,aAAa,GAAG,qBAAqB,GAAG;IAC3C,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAC/B,MAAM,EAAE,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC;IAC9B,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC;CACjC,CAAA;AAiBD,qBAAa,aAAa;IACxB,EAAE,EAAE,EAAE,CAAC;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAM;IAClE,WAAW,EAAE,EAAE,CAAC,MAAM,CAAC;gBACX,UAAU,EAAE,UAAU;IAelC,aAAa,mBAAoB,GAAG,KAAK,IAAI,8BAA8B,GAAG,YAAY,eAOzF;IAED,YAAY,aAAc,MAAM,UAS/B;IAED,MAAM,UAAiB,qBAAqB,KAAG,QAAQ,qBAAqB,CAAC,CAyK5E;CACF"}
|
|
@@ -5,7 +5,6 @@ const pg = require("pg");
|
|
|
5
5
|
const prostgles_types_1 = require("prostgles-types");
|
|
6
6
|
const dboBuilderUtils_1 = require("./dboBuilderUtils");
|
|
7
7
|
const runSQL_1 = require("./runSQL");
|
|
8
|
-
const SchemaWatch_1 = require("../SchemaWatch/SchemaWatch");
|
|
9
8
|
const Cursor = require('pg-cursor');
|
|
10
9
|
const shortSocketIds = {};
|
|
11
10
|
const getSetShortSocketId = (socketId) => {
|
|
@@ -97,7 +96,7 @@ class QueryStreamer {
|
|
|
97
96
|
const packet = { type: "data", rows, fields: fieldsWereSent ? undefined : fields, info: reachedEnd ? info : undefined, ended: reachedEnd, processId: processID };
|
|
98
97
|
socket.emit(channel, packet);
|
|
99
98
|
if (reachedEnd) {
|
|
100
|
-
|
|
99
|
+
this.dboBuilder.prostgles.schemaWatch?.onSchemaChangeFallback?.({ command: info.command, query: query.query });
|
|
101
100
|
}
|
|
102
101
|
fieldsWereSent = true;
|
|
103
102
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryStreamer.js","sourceRoot":"","sources":["../../lib/DboBuilder/QueryStreamer.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;
|
|
1
|
+
{"version":3,"file":"QueryStreamer.js","sourceRoot":"","sources":["../../lib/DboBuilder/QueryStreamer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,UAAU,EAA4B,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,UAAU,EAA4B,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,cAAc,CAAC;AAG9E,wBAAsB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,GAAG,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,gBAkFtK;AAcD,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,iBAyBlD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE;;;;;;;;;;;;;;;IAiB1E;AAED,eAAO,MAAM,SAAS,cAAqB,SAAS,gBAAgB,WAAW,KAAG,QAAQ,OAAO,CAQhG,CAAA;AAED,eAAO,MAAM,eAAe,cAAmB,QAAQ,OAAO,CAE7D,CAAA"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.canCreateTables = exports.canRunSQL = exports.getDetailedFieldInfo = exports.cacheDBTypes = exports.runSQL = void 0;
|
|
4
4
|
const pg_promise_1 = require("pg-promise");
|
|
5
5
|
const DboBuilder_1 = require("./DboBuilder");
|
|
6
|
-
const SchemaWatch_1 = require("../SchemaWatch/SchemaWatch");
|
|
7
6
|
async function runSQL(queryWithoutRLS, args, options, localParams) {
|
|
8
7
|
const queryWithRLS = queryWithoutRLS;
|
|
9
8
|
if (queryWithRLS?.replace(/\s\s+/g, ' ').toLowerCase().includes("create extension pg_stat_statements")) {
|
|
@@ -81,7 +80,7 @@ async function runSQL(queryWithoutRLS, args, options, localParams) {
|
|
|
81
80
|
}
|
|
82
81
|
exports.runSQL = runSQL;
|
|
83
82
|
const onSQLResult = async function (queryWithoutRLS, { command }, allowListen, localParams) {
|
|
84
|
-
|
|
83
|
+
this.prostgles.schemaWatch?.onSchemaChangeFallback?.({ command, query: queryWithoutRLS });
|
|
85
84
|
if (command === "LISTEN") {
|
|
86
85
|
const { socket } = localParams || {};
|
|
87
86
|
if (!allowListen)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":";;;AAAA,2CAA0E;AAI1E,6CAA8E;
|
|
1
|
+
{"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,10 @@ export declare class SchemaWatch {
|
|
|
7
7
|
type: ValidatedWatchSchemaType;
|
|
8
8
|
private constructor();
|
|
9
9
|
static create: (dboBuilder: DboBuilder) => Promise<SchemaWatch>;
|
|
10
|
+
/**
|
|
11
|
+
* Fallback for watchSchema in case of not a superuser (cannot add db event listener)
|
|
12
|
+
*/
|
|
13
|
+
onSchemaChangeFallback: OnSchemaChangeCallback;
|
|
10
14
|
onSchemaChange: OnSchemaChangeCallback | undefined;
|
|
11
15
|
}
|
|
12
|
-
/**
|
|
13
|
-
* Fallback for watchSchema in case of not a superuser (cannot add db event listener)
|
|
14
|
-
*/
|
|
15
|
-
export declare const watchSchemaFallback: (this: DboBuilder, { queryWithoutRLS, command }: {
|
|
16
|
-
queryWithoutRLS: string;
|
|
17
|
-
command: string;
|
|
18
|
-
}) => Promise<void>;
|
|
19
16
|
//# sourceMappingURL=SchemaWatch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaWatch.d.ts","sourceRoot":"","sources":["../../lib/SchemaWatch/SchemaWatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAA+B,MAAM,+BAA+B,CAAC;AAEtG,MAAM,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC;AAEtC,qBAAa,WAAW;IAEtB,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO;IAQP,MAAM,CAAC,MAAM,eAAsB,UAAU,0BAM5C;IAED,cAAc,EAAE,sBAAsB,GAAG,SAAS,CA+BhD;CACH
|
|
1
|
+
{"version":3,"file":"SchemaWatch.d.ts","sourceRoot":"","sources":["../../lib/SchemaWatch/SchemaWatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAA+B,MAAM,+BAA+B,CAAC;AAEtG,MAAM,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC;AAEtC,qBAAa,WAAW;IAEtB,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO;IAQP,MAAM,CAAC,MAAM,eAAsB,UAAU,0BAM5C;IAED;;OAEG;IACH,sBAAsB,EAAE,sBAAsB,CAQ7C;IAED,cAAc,EAAE,sBAAsB,GAAG,SAAS,CA+BhD;CACH"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.SchemaWatch = void 0;
|
|
4
4
|
const Event_Trigger_Tags_1 = require("../Event_Trigger_Tags");
|
|
5
5
|
const PubSubManager_1 = require("../PubSubManager/PubSubManager");
|
|
6
6
|
const getValidatedWatchSchemaType_1 = require("./getValidatedWatchSchemaType");
|
|
@@ -21,6 +21,16 @@ class SchemaWatch {
|
|
|
21
21
|
}
|
|
22
22
|
return instance;
|
|
23
23
|
};
|
|
24
|
+
/**
|
|
25
|
+
* Fallback for watchSchema in case of not a superuser (cannot add db event listener)
|
|
26
|
+
*/
|
|
27
|
+
onSchemaChangeFallback = async ({ command, query }) => {
|
|
28
|
+
if (this.type.watchType !== "prostgles_queries" ||
|
|
29
|
+
!this.onSchemaChange ||
|
|
30
|
+
!Event_Trigger_Tags_1.EVENT_TRIGGER_TAGS.includes(command))
|
|
31
|
+
return;
|
|
32
|
+
this.onSchemaChange({ command, query });
|
|
33
|
+
};
|
|
24
34
|
onSchemaChange = async (event) => {
|
|
25
35
|
if (this.type.watchType === "NONE")
|
|
26
36
|
return;
|
|
@@ -53,19 +63,4 @@ class SchemaWatch {
|
|
|
53
63
|
};
|
|
54
64
|
}
|
|
55
65
|
exports.SchemaWatch = SchemaWatch;
|
|
56
|
-
/**
|
|
57
|
-
* Fallback for watchSchema in case of not a superuser (cannot add db event listener)
|
|
58
|
-
*/
|
|
59
|
-
const watchSchemaFallback = async function ({ queryWithoutRLS, command }) {
|
|
60
|
-
const SCHEMA_ALTERING_COMMANDS = Event_Trigger_Tags_1.EVENT_TRIGGER_TAGS; // ["CREATE", "ALTER", "DROP", "REVOKE", "GRANT"];
|
|
61
|
-
const isNotPickedUpByDDLTrigger = ["REVOKE", "GRANT"].includes(command);
|
|
62
|
-
const { watchSchema, watchSchemaType } = this.prostgles?.opts || {};
|
|
63
|
-
if (watchSchema &&
|
|
64
|
-
(!this.prostgles.isSuperUser || watchSchemaType === "prostgles_queries" || isNotPickedUpByDDLTrigger)) {
|
|
65
|
-
if (SCHEMA_ALTERING_COMMANDS.includes(command)) {
|
|
66
|
-
this.prostgles.schemaWatch?.onSchemaChange?.({ command, query: queryWithoutRLS });
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
};
|
|
70
|
-
exports.watchSchemaFallback = watchSchemaFallback;
|
|
71
66
|
//# sourceMappingURL=SchemaWatch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaWatch.js","sourceRoot":"","sources":["../../lib/SchemaWatch/SchemaWatch.ts"],"names":[],"mappings":";;;AACA,8DAA2D;AAE3D,kEAAoE;AACpE,+EAAsG;AAItG,MAAa,WAAW;IAEtB,UAAU,CAAa;IACvB,IAAI,CAA2B;IAC/B,YAAoB,UAAsB;QACxC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAA,yDAA2B,EAAC,UAAU,CAAC,CAAC;QACpD,IAAG,IAAI,CAAC,IAAI,CAAC,SAAS,KAAK,MAAM,EAAE,CAAC;YAClC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAClC,CAAC;IACH,CAAC;IAED,MAAM,CAAC,MAAM,GAAG,KAAK,EAAE,UAAsB,EAAE,EAAE;QAC/C,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC;QAC7C,IAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,KAAK,aAAa,EAAE,CAAC;YAC7C,MAAM,UAAU,CAAC,gBAAgB,EAAE,CAAA;QACrC,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAA;IAED,cAAc,GAAuC,KAAK,EAAE,KAAK,EAAE,EAAE;QACnE,IAAG,IAAI,CAAC,IAAI,CAAC,SAAS,KAAK,MAAM;YAAE,OAAO;QAE1C,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC;QACrF,IAAI,WAAW,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACpD,IAAA,mBAAG,EAAC,gBAAgB,CAAC,CAAC;YACtB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;YACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,6BAAa,CAAC,kCAAkC,CAAC,EAAE,CAAC;gBAClG,IAAA,mBAAG,EAAC,sFAAsF,CAAC,CAAC;gBAC5F,OAAO;YACT,CAAC;YAED,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE,CAAC;gBACtC,iCAAiC;gBACjC,WAAW,CAAC,KAAK,CAAC,CAAC;YAErB,CAAC;iBAAM,IAAI,WAAW,KAAK,eAAe,EAAE,CAAC;gBAC3C,IAAI,mBAAmB,EAAE,CAAC;oBACxB,iEAAiE;oBACjE,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;oBAEjD,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;oBAC7C,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBAChD,CAAC;YAEH,CAAC;iBAAM,IAAI,WAAW,EAAE,CAAC;gBACvB,0CAA0C;gBAC1C,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC7D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,OAAc,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YAC5F,CAAC;QACH,CAAC;IACH,CAAC,CAAC;;
|
|
1
|
+
{"version":3,"file":"SchemaWatch.js","sourceRoot":"","sources":["../../lib/SchemaWatch/SchemaWatch.ts"],"names":[],"mappings":";;;AACA,8DAA2D;AAE3D,kEAAoE;AACpE,+EAAsG;AAItG,MAAa,WAAW;IAEtB,UAAU,CAAa;IACvB,IAAI,CAA2B;IAC/B,YAAoB,UAAsB;QACxC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAA,yDAA2B,EAAC,UAAU,CAAC,CAAC;QACpD,IAAG,IAAI,CAAC,IAAI,CAAC,SAAS,KAAK,MAAM,EAAE,CAAC;YAClC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAClC,CAAC;IACH,CAAC;IAED,MAAM,CAAC,MAAM,GAAG,KAAK,EAAE,UAAsB,EAAE,EAAE;QAC/C,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC;QAC7C,IAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,KAAK,aAAa,EAAE,CAAC;YAC7C,MAAM,UAAU,CAAC,gBAAgB,EAAE,CAAA;QACrC,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAA;IAED;;OAEG;IACH,sBAAsB,GAA2B,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;QAC5E,IACE,IAAI,CAAC,IAAI,CAAC,SAAS,KAAK,mBAAmB;YAC3C,CAAC,IAAI,CAAC,cAAc;YACpB,CAAC,uCAAkB,CAAC,QAAQ,CAAC,OAAc,CAAC;YAC5C,OAAO;QAET,IAAI,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;IACzC,CAAC,CAAA;IAED,cAAc,GAAuC,KAAK,EAAE,KAAK,EAAE,EAAE;QACnE,IAAG,IAAI,CAAC,IAAI,CAAC,SAAS,KAAK,MAAM;YAAE,OAAO;QAE1C,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC;QACrF,IAAI,WAAW,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACpD,IAAA,mBAAG,EAAC,gBAAgB,CAAC,CAAC;YACtB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;YACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,6BAAa,CAAC,kCAAkC,CAAC,EAAE,CAAC;gBAClG,IAAA,mBAAG,EAAC,sFAAsF,CAAC,CAAC;gBAC5F,OAAO;YACT,CAAC;YAED,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE,CAAC;gBACtC,iCAAiC;gBACjC,WAAW,CAAC,KAAK,CAAC,CAAC;YAErB,CAAC;iBAAM,IAAI,WAAW,KAAK,eAAe,EAAE,CAAC;gBAC3C,IAAI,mBAAmB,EAAE,CAAC;oBACxB,iEAAiE;oBACjE,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;oBAEjD,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;oBAC7C,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBAChD,CAAC;YAEH,CAAC;iBAAM,IAAI,WAAW,EAAE,CAAC;gBACvB,0CAA0C;gBAC1C,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC7D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,OAAc,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YAC5F,CAAC;QACH,CAAC;IACH,CAAC,CAAC;;AAhEJ,kCAiEC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import * as pg from "pg";
|
|
2
|
+
import CursorType from 'pg-cursor';
|
|
2
3
|
import { CHANNELS, SQLOptions, SocketSQLStreamPacket, SocketSQLStreamServer, omitKeys, pickKeys } from "prostgles-types";
|
|
3
4
|
import { BasicCallback } from "../PubSubManager/PubSubManager";
|
|
5
|
+
import { VoidFunction } from "../SchemaWatch/SchemaWatch";
|
|
4
6
|
import { DB } from "../initProstgles";
|
|
5
7
|
import { DboBuilder } from "./DboBuilder";
|
|
6
8
|
import { PRGLIOSocket } from "./DboBuilderTypes";
|
|
7
9
|
import { getErrorAsObject, getSerializedClientErrorFromPGError } from "./dboBuilderUtils";
|
|
8
10
|
import { getDetailedFieldInfo } from "./runSQL";
|
|
9
|
-
import CursorType from 'pg-cursor'
|
|
10
|
-
import { VoidFunction, watchSchemaFallback } from "../SchemaWatch/SchemaWatch";
|
|
11
11
|
const Cursor: typeof CursorType = require('pg-cursor');
|
|
12
12
|
|
|
13
13
|
type ClientStreamedRequest = {
|
|
@@ -123,7 +123,7 @@ export class QueryStreamer {
|
|
|
123
123
|
const packet: SocketSQLStreamPacket = { type: "data", rows, fields: fieldsWereSent? undefined : fields, info: reachedEnd? info : undefined, ended: reachedEnd, processId: processID };
|
|
124
124
|
socket.emit(channel, packet);
|
|
125
125
|
if(reachedEnd){
|
|
126
|
-
|
|
126
|
+
this.dboBuilder.prostgles.schemaWatch?.onSchemaChangeFallback?.({ command: info.command, query: query.query });
|
|
127
127
|
}
|
|
128
128
|
fieldsWereSent = true;
|
|
129
129
|
}
|
package/lib/DboBuilder/runSQL.ts
CHANGED
|
@@ -3,7 +3,6 @@ import pg from "pg-promise/typescript/pg-subset";
|
|
|
3
3
|
import { AnyObject, SQLOptions, SQLResult, SQLResultInfo } from "prostgles-types";
|
|
4
4
|
import { DB, Prostgles } from "../Prostgles";
|
|
5
5
|
import { DboBuilder, LocalParams, pgp, postgresToTsType } from "./DboBuilder";
|
|
6
|
-
import { watchSchemaFallback } from "../SchemaWatch/SchemaWatch";
|
|
7
6
|
|
|
8
7
|
|
|
9
8
|
export async function runSQL(this: DboBuilder, queryWithoutRLS: string, args: undefined | AnyObject | any[], options: SQLOptions | undefined, localParams?: LocalParams) {
|
|
@@ -92,7 +91,7 @@ export async function runSQL(this: DboBuilder, queryWithoutRLS: string, args: un
|
|
|
92
91
|
|
|
93
92
|
const onSQLResult = async function(this: DboBuilder, queryWithoutRLS: string, { command }: Omit<SQLResultInfo, "duration">, allowListen: boolean | undefined, localParams?: LocalParams) {
|
|
94
93
|
|
|
95
|
-
|
|
94
|
+
this.prostgles.schemaWatch?.onSchemaChangeFallback?.({ command, query: queryWithoutRLS });
|
|
96
95
|
|
|
97
96
|
if (command === "LISTEN") {
|
|
98
97
|
const { socket } = localParams || {};
|
|
@@ -25,6 +25,19 @@ export class SchemaWatch {
|
|
|
25
25
|
}
|
|
26
26
|
return instance;
|
|
27
27
|
}
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Fallback for watchSchema in case of not a superuser (cannot add db event listener)
|
|
31
|
+
*/
|
|
32
|
+
onSchemaChangeFallback: OnSchemaChangeCallback = async ({ command, query }) => {
|
|
33
|
+
if(
|
|
34
|
+
this.type.watchType !== "prostgles_queries" ||
|
|
35
|
+
!this.onSchemaChange ||
|
|
36
|
+
!EVENT_TRIGGER_TAGS.includes(command as any)
|
|
37
|
+
) return;
|
|
38
|
+
|
|
39
|
+
this.onSchemaChange({ command, query })
|
|
40
|
+
}
|
|
28
41
|
|
|
29
42
|
onSchemaChange: OnSchemaChangeCallback | undefined = async (event) => {
|
|
30
43
|
if(this.type.watchType === "NONE") return;
|
|
@@ -58,22 +71,4 @@ export class SchemaWatch {
|
|
|
58
71
|
}
|
|
59
72
|
}
|
|
60
73
|
};
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
/**
|
|
65
|
-
* Fallback for watchSchema in case of not a superuser (cannot add db event listener)
|
|
66
|
-
*/
|
|
67
|
-
export const watchSchemaFallback = async function(this: DboBuilder, { queryWithoutRLS, command }: { queryWithoutRLS: string; command: string; }){
|
|
68
|
-
const SCHEMA_ALTERING_COMMANDS = EVENT_TRIGGER_TAGS;// ["CREATE", "ALTER", "DROP", "REVOKE", "GRANT"];
|
|
69
|
-
const isNotPickedUpByDDLTrigger = ["REVOKE", "GRANT"].includes(command);
|
|
70
|
-
const { watchSchema, watchSchemaType } = this.prostgles?.opts || {};
|
|
71
|
-
if (
|
|
72
|
-
watchSchema &&
|
|
73
|
-
(!this.prostgles.isSuperUser || watchSchemaType === "prostgles_queries" || isNotPickedUpByDDLTrigger)
|
|
74
|
-
) {
|
|
75
|
-
if (SCHEMA_ALTERING_COMMANDS.includes(command as any)) {
|
|
76
|
-
this.prostgles.schemaWatch?.onSchemaChange?.({ command, query: queryWithoutRLS })
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
74
|
}
|
package/package.json
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { strict as assert } from "assert";
|
|
2
2
|
import { describe, test } from "node:test";
|
|
3
|
-
import type { DBHandlerClient } from "./index";
|
|
4
|
-
import { renderReactHook, renderReactHookManual } from "./renderReactHook";
|
|
5
3
|
import { AnyObject, pickKeys } from "prostgles-types";
|
|
6
|
-
import {
|
|
4
|
+
import type { DBHandlerClient } from "./index";
|
|
5
|
+
import { renderReactHook } from "./renderReactHook";
|
|
7
6
|
|
|
8
7
|
export const clientHooks = async (db: DBHandlerClient, getSocketOptions: (watchSchema?: boolean) => AnyObject) => {
|
|
9
8
|
|
package/tests/client/index.ts
CHANGED
|
@@ -8,7 +8,7 @@ import { clientFileTests } from "../clientFileTests.spec";
|
|
|
8
8
|
import type { Auth, DBHandlerClient, MethodHandler } from "prostgles-client/dist/prostgles";
|
|
9
9
|
export { DBHandlerClient, Auth } from "prostgles-client/dist/prostgles";
|
|
10
10
|
import { clientHooks } from "./hooks.spec";
|
|
11
|
-
import { useProstglesTest } from "./useProstgles.spec";
|
|
11
|
+
import { newly_created_table, useProstglesTest } from "./useProstgles.spec";
|
|
12
12
|
import { DBSchemaTable } from "prostgles-types";
|
|
13
13
|
|
|
14
14
|
const start = Date.now();
|
|
@@ -40,6 +40,7 @@ type ClientTestSpecV2 = (args: {
|
|
|
40
40
|
|
|
41
41
|
const tests: Record<string, ClientTestSpecV2> = {
|
|
42
42
|
main: async ({ db, methods, tableSchema, auth }) => {
|
|
43
|
+
await db.sql(`DROP TABLE IF EXISTS ${newly_created_table}`);
|
|
43
44
|
await isomorphicQueries(db, log);
|
|
44
45
|
await clientOnlyQueries(db, auth, log, methods, tableSchema, TEST_NAME);
|
|
45
46
|
await clientHooks(db, getSocketOptions);
|
|
@@ -5,6 +5,7 @@ import { AnyObject } from "prostgles-types";
|
|
|
5
5
|
import type { DBHandlerClient } from "./index";
|
|
6
6
|
import { renderReactHook, renderReactHookManual } from "./renderReactHook";
|
|
7
7
|
|
|
8
|
+
export const newly_created_table = "newly_created_table";
|
|
8
9
|
export const useProstglesTest = async (db: DBHandlerClient, getSocketOptions: (watchSchema?: boolean) => AnyObject) => {
|
|
9
10
|
await describe("useProstgles hook", async (t) => {
|
|
10
11
|
const socketOptions = getSocketOptions();
|
|
@@ -24,9 +25,8 @@ export const useProstglesTest = async (db: DBHandlerClient, getSocketOptions: (w
|
|
|
24
25
|
);
|
|
25
26
|
});
|
|
26
27
|
|
|
27
|
-
const newTableName = "newly_created_table";
|
|
28
28
|
await test("useProstglesClient with schema reload", async (t) => {
|
|
29
|
-
await db.sql(`DROP TABLE IF EXISTS ${
|
|
29
|
+
await db.sql(`DROP TABLE IF EXISTS ${newly_created_table}; DROP TABLE IF EXISTS will_delete;`);
|
|
30
30
|
await db.sql(`select pg_sleep(1)`);
|
|
31
31
|
let rerenders = 0
|
|
32
32
|
const { results: [res1, res2, res3], rerender } = await renderReactHook({
|
|
@@ -37,7 +37,7 @@ export const useProstglesTest = async (db: DBHandlerClient, getSocketOptions: (w
|
|
|
37
37
|
rerenders++;
|
|
38
38
|
if(rerenders < 2) return;
|
|
39
39
|
rerenders = -2;
|
|
40
|
-
db.sql(`CREATE TABLE ${
|
|
40
|
+
db.sql(`CREATE TABLE ${newly_created_table}(id integer);`);
|
|
41
41
|
}
|
|
42
42
|
});
|
|
43
43
|
assert.deepStrictEqual(
|
|
@@ -49,15 +49,15 @@ export const useProstglesTest = async (db: DBHandlerClient, getSocketOptions: (w
|
|
|
49
49
|
false
|
|
50
50
|
);
|
|
51
51
|
assert.equal(
|
|
52
|
-
typeof (res2 as any)?.dbo[
|
|
52
|
+
typeof (res2 as any)?.dbo[newly_created_table]?.useFind,
|
|
53
53
|
"undefined"
|
|
54
54
|
);
|
|
55
55
|
assert.equal(
|
|
56
|
-
typeof (res3 as any)?.dbo[
|
|
56
|
+
typeof (res3 as any)?.dbo[newly_created_table].useFind,
|
|
57
57
|
"function"
|
|
58
58
|
);
|
|
59
59
|
|
|
60
|
-
const count = await (res3 as any)?.dbo[
|
|
60
|
+
const count = await (res3 as any)?.dbo[newly_created_table].count();
|
|
61
61
|
assert.equal(count, 0);
|
|
62
62
|
});
|
|
63
63
|
|
|
@@ -80,7 +80,7 @@ export const useProstglesTest = async (db: DBHandlerClient, getSocketOptions: (w
|
|
|
80
80
|
assert.equal(res3.isLoading, false);
|
|
81
81
|
if("error" in res3) throw res3.error;
|
|
82
82
|
assert.equal(
|
|
83
|
-
typeof res3.dbo[
|
|
83
|
+
typeof res3.dbo[newly_created_table]?.useFind,
|
|
84
84
|
"undefined"
|
|
85
85
|
);
|
|
86
86
|
}
|
|
@@ -98,10 +98,10 @@ export const useProstglesTest = async (db: DBHandlerClient, getSocketOptions: (w
|
|
|
98
98
|
assert.equal(count, 0);
|
|
99
99
|
|
|
100
100
|
assert.equal(
|
|
101
|
-
typeof res5.dbo[
|
|
101
|
+
typeof res5.dbo[newly_created_table].useFind,
|
|
102
102
|
"function"
|
|
103
103
|
);
|
|
104
|
-
const count0 = await res5.dbo[
|
|
104
|
+
const count0 = await res5.dbo[newly_created_table].count();
|
|
105
105
|
assert.equal(count0, 0);
|
|
106
106
|
}
|
|
107
107
|
});
|