prostgles-server 4.2.533 → 4.2.535
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/Auth/AuthHandler.js +1 -1
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/getClientAuth.js +2 -2
- package/dist/Auth/getClientAuth.js.map +1 -1
- package/dist/DboBuilder/DboBuilderTypes.d.ts +1 -1
- package/dist/DboBuilder/DboBuilderTypes.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getInfo.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getInfo.js +1 -0
- package/dist/DboBuilder/ViewHandler/getInfo.js.map +1 -1
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.d.ts +42 -3
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.d.ts.map +1 -1
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.js +14 -6
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.js.map +1 -1
- package/dist/Filtering/getFilterItemCondition.d.ts.map +1 -1
- package/dist/Filtering/getFilterItemCondition.js +3 -1
- package/dist/Filtering/getFilterItemCondition.js.map +1 -1
- package/dist/PubSubManager/addSync.d.ts.map +1 -1
- package/dist/PubSubManager/addSync.js +5 -1
- package/dist/PubSubManager/addSync.js.map +1 -1
- package/dist/WebsocketAPI/onSocketConnected.js +1 -1
- package/dist/WebsocketAPI/onSocketConnected.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +1 -1
- package/lib/Auth/getClientAuth.ts +2 -2
- package/lib/DboBuilder/DboBuilderTypes.ts +1 -1
- package/lib/DboBuilder/ViewHandler/getInfo.ts +1 -0
- package/lib/DboBuilder/schema/getTablesForSchemaPostgresSQL.ts +17 -10
- package/lib/Filtering/getFilterItemCondition.ts +5 -1
- package/lib/PubSubManager/addSync.ts +6 -2
- package/lib/WebsocketAPI/onSocketConnected.ts +7 -7
- package/package.json +2 -2
package/dist/Auth/AuthHandler.js
CHANGED
|
@@ -188,7 +188,7 @@ class AuthHandler {
|
|
|
188
188
|
const error = "Session has expired";
|
|
189
189
|
if (hasExpired) {
|
|
190
190
|
if (session?.onExpiration === "redirect")
|
|
191
|
-
socket.emit(prostgles_types_1.CHANNELS.
|
|
191
|
+
socket.emit(prostgles_types_1.CHANNELS.AUTH_GUARD, {
|
|
192
192
|
shouldReload: true,
|
|
193
193
|
error,
|
|
194
194
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../../lib/Auth/AuthHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,8 @@ async function getClientAuth(clientReq) {
|
|
|
19
19
|
}
|
|
20
20
|
};
|
|
21
21
|
const { socket } = clientReq;
|
|
22
|
-
socket.removeAllListeners(prostgles_types_1.CHANNELS.
|
|
23
|
-
socket.on(prostgles_types_1.CHANNELS.
|
|
22
|
+
socket.removeAllListeners(prostgles_types_1.CHANNELS.AUTH_GUARD);
|
|
23
|
+
socket.on(prostgles_types_1.CHANNELS.AUTH_GUARD, async (params, cb = (_err, _res) => {
|
|
24
24
|
/** EMPTY */
|
|
25
25
|
}) => {
|
|
26
26
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":";;AAUA,sCAwFC;AA7FD,qDAAgF;AAChF,+CAA8D;AAIvD,KAAK,UAAU,aAAa,CAEjC,SAA4B;IAE5B,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,MAAM,EACJ,cAAc,EACd,eAAe,EACf,cAAc,EACd,KAAK,EACL,YAAY,EACZ,sBAAsB,GACvB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC;IAEtC,IAAI,YAAY,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5C,SAAS,GAAG,IAAI,CAAC;QAEjB;;WAEG;QACH,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,kBAAkB,GAAG,KAAK,EAAE,SAA4B,EAAuB,EAAE;gBACrF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;gBAClE,IAAI,IAAA,0BAAQ,EAAC,UAAU,CAAC,IAAI,UAAU,CAAC,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;oBAC9D,OAAO,UAAU,CAAC;gBACpB,CAAC;YACH,CAAC,CAAC;YACF,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;YAC7B,MAAM,CAAC,kBAAkB,CAAC,0BAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"getClientAuth.js","sourceRoot":"","sources":["../../lib/Auth/getClientAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export type PGIdentifier = {
|
|
|
15
15
|
raw: string;
|
|
16
16
|
escaped: string;
|
|
17
17
|
};
|
|
18
|
-
export type TableSchema = Pick<TableInfo, "uniqueColumnGroups"> & {
|
|
18
|
+
export type TableSchema = Pick<TableInfo, "uniqueColumnGroups" | "qualifiedNameParts"> & {
|
|
19
19
|
schema: string;
|
|
20
20
|
name: string;
|
|
21
21
|
escaped_identifier: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilderTypes.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilderTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,UAAU,EACV,WAAW,EACX,UAAU,EACV,aAAa,EACb,SAAS,IAAI,KAAK,EAClB,QAAQ,EACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,eAAe,EACf,UAAU,EACV,UAAU,EACX,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,GAAG,QAAQ,iCAAiC,CAAC,CAAC;AAEvD,KAAK,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;AAE3C,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG;IAC3C,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,YAAY,GAAG,QAAQ,GAAG,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;CAClF,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,GAAG;
|
|
1
|
+
{"version":3,"file":"DboBuilderTypes.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilderTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInfo.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,wBAAsB,OAAO,CAC3B,IAAI,EAAE,WAAW,EACjB,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,GAAG,EACZ,MAAM,CAAC,EAAE,GAAG,EACZ,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"getInfo.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,wBAAsB,OAAO,CAC3B,IAAI,EAAE,WAAW,EACjB,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,GAAG,EACZ,MAAM,CAAC,EAAE,GAAG,EACZ,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,KAAK,CAAC,CA2DhB"}
|
|
@@ -19,6 +19,7 @@ async function getInfo(lang, param2, param3, tableRules, localParams) {
|
|
|
19
19
|
return {
|
|
20
20
|
oid: this.tableOrViewInfo.oid,
|
|
21
21
|
comment: this.tableOrViewInfo.comment,
|
|
22
|
+
qualifiedNameParts: this.tableOrViewInfo.qualifiedNameParts,
|
|
22
23
|
label,
|
|
23
24
|
isFileTable: !this.is_media ? undefined : ({
|
|
24
25
|
allowedNestedInserts,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInfo.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"getInfo.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":";;AAKA,0BAkEC;AAlEM,KAAK,UAAU,OAAO,CAE3B,IAAa,EACb,MAAY,EACZ,MAAY,EACZ,UAA4B,EAC5B,WAAyB;IAEzB,MAAM,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAE5E,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;IAE1E,MAAM,IAAI,CAAC,IAAI,CAAC;QACd,OAAO,EAAE,SAAS;QAClB,WAAW;QACX,IAAI,EAAE,EAAE,IAAI,EAAE;QACd,QAAQ,EAAE,CAAC;KACZ,CAAC,CAAC;IACH,MAAM,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAChF,MAAM,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,GAAG,UAAU,EAAE,MAAM,IAAI,EAAE,CAAC;IACjF,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,iBAAiB,EAAE,aAAa,CAAC;QACvE,SAAS,EAAE,IAAI,CAAC,IAAI;QACpB,IAAI;KACL,CAAC,CAAC;IACH,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG;QAC7B,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO;QACrC,kBAAkB,EAAE,IAAI,CAAC,eAAe,CAAC,kBAAkB;QAC3D,KAAK;QACL,WAAW,EACT,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3B;YACE,oBAAoB;SACrB,CACF;QACH,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,OAAO,CACf,CAAC,IAAI,CAAC,QAAQ;YACd,aAAa;YACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,CAChF;QACD,aAAa;QACb,YAAY,EAAE;YACZ,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC;SAC3D;QACD;;WAEG;QACH,kBAAkB,EAAE,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,MAAM,CACjE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CACzE;QACD,WAAW,EAAE;YACX,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI;gBACpC,eAAe,EAAE,mBAAmB,CAAC,MAAM,CAAC,cAAc;gBAC1D,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;aACvF;YACD,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI;gBACpC,qBAAqB;gBACrB,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;aAChE;YACD,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI;gBACpC,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc;aACpD;YACD,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI,EAAE;SACzC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { ProstglesInitOptions } from "../../ProstglesTypes";
|
|
2
2
|
import type { DboBuilder } from "../DboBuilder";
|
|
3
|
-
import type { TableSchema } from "../DboBuilderTypes";
|
|
4
3
|
export declare const getSchemaFilter: (schema?: ProstglesInitOptions["schemaFilter"]) => {
|
|
5
4
|
sql: string;
|
|
6
5
|
schemaNames: string[];
|
|
@@ -9,7 +8,47 @@ export declare function getTablesForSchemaPostgresSQL({ db, runSQL }: Pick<DboBu
|
|
|
9
8
|
schemaFilter: ProstglesInitOptions["schemaFilter"];
|
|
10
9
|
ddlWithRollback?: string;
|
|
11
10
|
}): Promise<{
|
|
12
|
-
result:
|
|
13
|
-
|
|
11
|
+
result: {
|
|
12
|
+
qualifiedNameParts: {
|
|
13
|
+
schema: string;
|
|
14
|
+
name: string;
|
|
15
|
+
};
|
|
16
|
+
columns: Omit<import("prostgles-types").ColumnInfo & {
|
|
17
|
+
privileges: Partial<Record<"INSERT" | "REFERENCES" | "SELECT" | "UPDATE", true>>;
|
|
18
|
+
} & {
|
|
19
|
+
table_oid: number;
|
|
20
|
+
}, "table_oid">[];
|
|
21
|
+
parent_tables: string[];
|
|
22
|
+
name: string;
|
|
23
|
+
oid: number;
|
|
24
|
+
uniqueColumnGroups?: string[][] | undefined;
|
|
25
|
+
schema: string;
|
|
26
|
+
privileges: {
|
|
27
|
+
insert: boolean;
|
|
28
|
+
select: boolean;
|
|
29
|
+
update: boolean;
|
|
30
|
+
delete: boolean;
|
|
31
|
+
};
|
|
32
|
+
comment: string;
|
|
33
|
+
view_definition: string | null;
|
|
34
|
+
escaped_identifier: string;
|
|
35
|
+
is_view: boolean;
|
|
36
|
+
view_related_tables: {
|
|
37
|
+
tableName: string;
|
|
38
|
+
refColumns: {
|
|
39
|
+
viewColumn: string;
|
|
40
|
+
tableColumn: string;
|
|
41
|
+
}[];
|
|
42
|
+
}[] | undefined;
|
|
43
|
+
isHyperTable?: boolean | undefined;
|
|
44
|
+
}[];
|
|
45
|
+
durations: {
|
|
46
|
+
matv: number;
|
|
47
|
+
columns: number;
|
|
48
|
+
tablesAndViews: number;
|
|
49
|
+
fkeys: number;
|
|
50
|
+
getHyperTbls: number;
|
|
51
|
+
viewParentTbls: number;
|
|
52
|
+
};
|
|
14
53
|
}>;
|
|
15
54
|
//# sourceMappingURL=getTablesForSchemaPostgresSQL.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTablesForSchemaPostgresSQL.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/schema/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"getTablesForSchemaPostgresSQL.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/schema/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMhD,eAAO,MAAM,eAAe,GAAI,SAAQ,oBAAoB,CAAC,cAAc,CAAiB;;;CAW3F,CAAC;AAIF,wBAAsB,6BAA6B,CACjD,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,QAAQ,CAAC,EACjD,EACE,YAAY,EACZ,eAAe,GAChB,EAAE;IAAE,YAAY,EAAE,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;;;;;uBA8DE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyP5F"}
|
|
@@ -23,6 +23,10 @@ exports.getSchemaFilter = getSchemaFilter;
|
|
|
23
23
|
// TODO: Add a onSocketConnect timeout for this query.
|
|
24
24
|
// Reason: this query gets blocked by prostgles.app_triggers from PubSubManager.addTrigger in some cases (pg_dump locks that table)
|
|
25
25
|
async function getTablesForSchemaPostgresSQL({ db, runSQL }, { schemaFilter, ddlWithRollback, }) {
|
|
26
|
+
// : Promise<{
|
|
27
|
+
// result: TableSchema[];
|
|
28
|
+
// durations: Record<string, number>;
|
|
29
|
+
// }>
|
|
26
30
|
const { sql, schemaNames } = (0, exports.getSchemaFilter)(schemaFilter);
|
|
27
31
|
return db.tx(async (t) => {
|
|
28
32
|
if (ddlWithRollback) {
|
|
@@ -185,7 +189,8 @@ async function getTablesForSchemaPostgresSQL({ db, runSQL }, { schemaFilter, ddl
|
|
|
185
189
|
, obj_description(t.oid::regclass) as comment
|
|
186
190
|
FROM (
|
|
187
191
|
SELECT table_name
|
|
188
|
-
, table_schema
|
|
192
|
+
, table_schema
|
|
193
|
+
, table_type = 'VIEW' as is_view
|
|
189
194
|
, format('%I.%I', table_schema, table_name)::REGCLASS::oid as oid
|
|
190
195
|
FROM information_schema.tables
|
|
191
196
|
WHERE table_schema ${sql}
|
|
@@ -194,13 +199,16 @@ async function getTablesForSchemaPostgresSQL({ db, runSQL }, { schemaFilter, ddl
|
|
|
194
199
|
ORDER BY schema, name
|
|
195
200
|
`;
|
|
196
201
|
const tablesAndViews = (await t.any(query, { schemaNames })).map((table) => {
|
|
197
|
-
|
|
202
|
+
const columns = (0, utils_1.clone)(getTVColumns.data.columns)
|
|
198
203
|
.filter((c) => c.table_oid === table.oid)
|
|
199
204
|
.map((c) => (0, util_1.omitKeys)(c, ["table_oid"]));
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
205
|
+
const parent_tables = getViewParentTables.data?.parent_tables.find((vr) => vr.oid === table.oid)?.table_names ??
|
|
206
|
+
[];
|
|
207
|
+
const qualifiedNameParts = {
|
|
208
|
+
schema: table.schema,
|
|
209
|
+
name: table.name,
|
|
210
|
+
};
|
|
211
|
+
return { ...table, qualifiedNameParts, columns, parent_tables };
|
|
204
212
|
});
|
|
205
213
|
return { tablesAndViews };
|
|
206
214
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTablesForSchemaPostgresSQL.js","sourceRoot":"","sources":["../../../lib/DboBuilder/schema/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":";;;AA0BA,
|
|
1
|
+
{"version":3,"file":"getTablesForSchemaPostgresSQL.js","sourceRoot":"","sources":["../../../lib/DboBuilder/schema/getTablesForSchemaPostgresSQL.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFilterItemCondition.d.ts","sourceRoot":"","sources":["../../lib/Filtering/getFilterItemCondition.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAGnF,eAAO,MAAM,sBAAsB,GAAI,6BAIpC;IACD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,OAAO,CAAC;CACjB,KAAG,
|
|
1
|
+
{"version":3,"file":"getFilterItemCondition.d.ts","sourceRoot":"","sources":["../../lib/Filtering/getFilterItemCondition.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAGnF,eAAO,MAAM,sBAAsB,GAAI,6BAIpC;IACD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,OAAO,CAAC;CACjB,KAAG,MA0LH,CAAC"}
|
|
@@ -67,7 +67,9 @@ const getFilterItemCondition = ({ selItem, leftQ, rightF, }) => {
|
|
|
67
67
|
* - inacurrate results at large envelopes due to the curvature of the earth
|
|
68
68
|
* https://gis.stackexchange.com/questions/78816/maximum-size-on-the-bounding-box-with-st-makeenvelope-and-and-geography-colum
|
|
69
69
|
*/
|
|
70
|
-
if (funcName.toLowerCase() === "st_makeenvelope"
|
|
70
|
+
if (funcName.toLowerCase() === "st_makeenvelope" &&
|
|
71
|
+
selItem.column_udt_type === "geography" &&
|
|
72
|
+
funcArgs?.[4] !== 4326) {
|
|
71
73
|
leftQ += "::geometry";
|
|
72
74
|
}
|
|
73
75
|
return `${leftQ} ${filterOperand} ${funcName}${parseRightVal(funcArgs, "csv")}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFilterItemCondition.js","sourceRoot":"","sources":["../../lib/Filtering/getFilterItemCondition.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getFilterItemCondition.js","sourceRoot":"","sources":["../../lib/Filtering/getFilterItemCondition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addSync.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/addSync.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAiB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGnF;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,aAAa,GACxB,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"addSync.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/addSync.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAiB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGnF;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,aAAa,GACxB,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CA0IlC"}
|
|
@@ -15,7 +15,11 @@ async function addSync(syncParams) {
|
|
|
15
15
|
if (!socket || !table_info)
|
|
16
16
|
throw "socket or table_info missing";
|
|
17
17
|
const { name: table_name } = table_info;
|
|
18
|
-
const channelName =
|
|
18
|
+
const channelName = (0, prostgles_types_1.getSyncChannelName)({
|
|
19
|
+
tableName: table_name,
|
|
20
|
+
filter,
|
|
21
|
+
select: params.select,
|
|
22
|
+
});
|
|
19
23
|
if (!synced_field)
|
|
20
24
|
throw "synced_field missing from table_rules";
|
|
21
25
|
this.upsertSocket(socket);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addSync.js","sourceRoot":"","sources":["../../lib/PubSubManager/addSync.ts"],"names":[],"mappings":";;AASA,
|
|
1
|
+
{"version":3,"file":"addSync.js","sourceRoot":"","sources":["../../lib/PubSubManager/addSync.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ async function onSocketConnected(socket) {
|
|
|
19
19
|
const getUser = async () => {
|
|
20
20
|
const res = await this.authHandler.getSidAndUserFromRequest({ socket });
|
|
21
21
|
if (res === "new-session-redirect") {
|
|
22
|
-
socket.emit(prostgles_types_1.CHANNELS.
|
|
22
|
+
socket.emit(prostgles_types_1.CHANNELS.AUTH_GUARD, {
|
|
23
23
|
shouldReload: true,
|
|
24
24
|
error: res,
|
|
25
25
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onSocketConnected.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/onSocketConnected.ts"],"names":[],"mappings":";;AASA,8CAwIC;AAED,0CAGC;AArJD,qDAA2E;AAC3E,qDAA8D;AAK9D,0DAAwE;AAEjE,KAAK,UAAU,iBAAiB,CAAkB,MAAoB;IAC3E,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC7D,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QACtD,MAAM,CAAC,UAAU,EAAE,CAAC;QACpB,OAAO;IACT,CAAC;IAED,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEnC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,KAAK,IAA6C,EAAE;YAClE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACxE,IAAI,GAAG,KAAK,sBAAsB,EAAE,CAAC;gBACnC,MAAM,CAAC,IAAI,CAAC,0BAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"onSocketConnected.js","sourceRoot":"","sources":["../../lib/WebsocketAPI/onSocketConnected.ts"],"names":[],"mappings":"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"}
|
package/lib/Auth/AuthHandler.ts
CHANGED
|
@@ -238,7 +238,7 @@ export class AuthHandler {
|
|
|
238
238
|
const error = "Session has expired";
|
|
239
239
|
if (hasExpired) {
|
|
240
240
|
if (session?.onExpiration === "redirect")
|
|
241
|
-
socket.emit(CHANNELS.
|
|
241
|
+
socket.emit(CHANNELS.AUTH_GUARD, {
|
|
242
242
|
shouldReload: true,
|
|
243
243
|
error,
|
|
244
244
|
});
|
|
@@ -36,9 +36,9 @@ export async function getClientAuth(
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
const { socket } = clientReq;
|
|
39
|
-
socket.removeAllListeners(CHANNELS.
|
|
39
|
+
socket.removeAllListeners(CHANNELS.AUTH_GUARD);
|
|
40
40
|
socket.on(
|
|
41
|
-
CHANNELS.
|
|
41
|
+
CHANNELS.AUTH_GUARD,
|
|
42
42
|
async (
|
|
43
43
|
params: AuthGuardLocation,
|
|
44
44
|
cb = (_err: any, _res?: AuthGuardLocationResponse) => {
|
|
@@ -35,7 +35,7 @@ export type PGIdentifier = {
|
|
|
35
35
|
escaped: string;
|
|
36
36
|
};
|
|
37
37
|
|
|
38
|
-
export type TableSchema = Pick<TableInfo, "uniqueColumnGroups"> & {
|
|
38
|
+
export type TableSchema = Pick<TableInfo, "uniqueColumnGroups" | "qualifiedNameParts"> & {
|
|
39
39
|
schema: string;
|
|
40
40
|
name: string;
|
|
41
41
|
escaped_identifier: string;
|
|
@@ -30,10 +30,11 @@ export async function getTablesForSchemaPostgresSQL(
|
|
|
30
30
|
schemaFilter,
|
|
31
31
|
ddlWithRollback,
|
|
32
32
|
}: { schemaFilter: ProstglesInitOptions["schemaFilter"]; ddlWithRollback?: string },
|
|
33
|
-
)
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
33
|
+
) {
|
|
34
|
+
// : Promise<{
|
|
35
|
+
// result: TableSchema[];
|
|
36
|
+
// durations: Record<string, number>;
|
|
37
|
+
// }>
|
|
37
38
|
const { sql, schemaNames } = getSchemaFilter(schemaFilter);
|
|
38
39
|
|
|
39
40
|
return db.tx(async (t) => {
|
|
@@ -217,7 +218,8 @@ export async function getTablesForSchemaPostgresSQL(
|
|
|
217
218
|
, obj_description(t.oid::regclass) as comment
|
|
218
219
|
FROM (
|
|
219
220
|
SELECT table_name
|
|
220
|
-
, table_schema
|
|
221
|
+
, table_schema
|
|
222
|
+
, table_type = 'VIEW' as is_view
|
|
221
223
|
, format('%I.%I', table_schema, table_name)::REGCLASS::oid as oid
|
|
222
224
|
FROM information_schema.tables
|
|
223
225
|
WHERE table_schema ${sql}
|
|
@@ -225,16 +227,21 @@ export async function getTablesForSchemaPostgresSQL(
|
|
|
225
227
|
--GROUP BY t.table_schema, t.table_name, t.is_view, t.view_definition, t.oid
|
|
226
228
|
ORDER BY schema, name
|
|
227
229
|
`;
|
|
228
|
-
const tablesAndViews = (
|
|
229
|
-
|
|
230
|
+
const tablesAndViews = (
|
|
231
|
+
await t.any<Omit<TableSchema, "columns" | "parent_tables">>(query, { schemaNames })
|
|
232
|
+
).map((table) => {
|
|
233
|
+
const columns = clone(getTVColumns.data!.columns)
|
|
230
234
|
.filter((c) => c.table_oid === table.oid)
|
|
231
235
|
.map((c) => omitKeys(c, ["table_oid"]));
|
|
232
236
|
|
|
233
|
-
|
|
237
|
+
const parent_tables =
|
|
234
238
|
getViewParentTables.data?.parent_tables.find((vr) => vr.oid === table.oid)?.table_names ??
|
|
235
239
|
[];
|
|
236
|
-
|
|
237
|
-
|
|
240
|
+
const qualifiedNameParts = {
|
|
241
|
+
schema: table.schema,
|
|
242
|
+
name: table.name,
|
|
243
|
+
};
|
|
244
|
+
return { ...table, qualifiedNameParts, columns, parent_tables };
|
|
238
245
|
});
|
|
239
246
|
return { tablesAndViews };
|
|
240
247
|
});
|
|
@@ -91,7 +91,11 @@ export const getFilterItemCondition = ({
|
|
|
91
91
|
* - inacurrate results at large envelopes due to the curvature of the earth
|
|
92
92
|
* https://gis.stackexchange.com/questions/78816/maximum-size-on-the-bounding-box-with-st-makeenvelope-and-and-geography-colum
|
|
93
93
|
*/
|
|
94
|
-
if (
|
|
94
|
+
if (
|
|
95
|
+
funcName.toLowerCase() === "st_makeenvelope" &&
|
|
96
|
+
selItem.column_udt_type === "geography" &&
|
|
97
|
+
funcArgs?.[4] !== 4326
|
|
98
|
+
) {
|
|
95
99
|
leftQ += "::geometry";
|
|
96
100
|
}
|
|
97
101
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { find, getSerialisableError, tryCatchV2 } from "prostgles-types";
|
|
1
|
+
import { find, getSerialisableError, getSyncChannelName, tryCatchV2 } from "prostgles-types";
|
|
2
2
|
import type { onSyncRequestResponse } from "../SyncReplication";
|
|
3
3
|
import type { AddSyncParams, BasicCallback, PubSubManager } from "./PubSubManager";
|
|
4
4
|
import { parseCondition } from "./PubSubManagerUtils";
|
|
@@ -26,7 +26,11 @@ export async function addSync(
|
|
|
26
26
|
if (!socket || !table_info) throw "socket or table_info missing";
|
|
27
27
|
|
|
28
28
|
const { name: table_name } = table_info;
|
|
29
|
-
const channelName =
|
|
29
|
+
const channelName = getSyncChannelName({
|
|
30
|
+
tableName: table_name,
|
|
31
|
+
filter,
|
|
32
|
+
select: params.select,
|
|
33
|
+
});
|
|
30
34
|
|
|
31
35
|
if (!synced_field) throw "synced_field missing from table_rules";
|
|
32
36
|
|
|
@@ -22,7 +22,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
|
22
22
|
const getUser = async (): Promise<AuthResultWithSID<SessionUser>> => {
|
|
23
23
|
const res = await this.authHandler.getSidAndUserFromRequest({ socket });
|
|
24
24
|
if (res === "new-session-redirect") {
|
|
25
|
-
socket.emit(CHANNELS.
|
|
25
|
+
socket.emit(CHANNELS.AUTH_GUARD, {
|
|
26
26
|
shouldReload: true,
|
|
27
27
|
error: res,
|
|
28
28
|
});
|
|
@@ -61,7 +61,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
|
61
61
|
const errorInfo = await onUseOrSocketConnected(
|
|
62
62
|
authHandler.getValidatedSid({ socket }),
|
|
63
63
|
getClientRequestIPsInfo({ socket }),
|
|
64
|
-
{ socket }
|
|
64
|
+
{ socket },
|
|
65
65
|
);
|
|
66
66
|
if (errorInfo) {
|
|
67
67
|
socket.emit(CHANNELS.CONNECTION, {
|
|
@@ -98,7 +98,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
|
98
98
|
args: SocketRequestParams,
|
|
99
99
|
cb = (..._callback: any[]) => {
|
|
100
100
|
/* Empty */
|
|
101
|
-
}
|
|
101
|
+
},
|
|
102
102
|
) => {
|
|
103
103
|
runClientRequest
|
|
104
104
|
.bind(this)(args, { socket }, undefined)
|
|
@@ -108,7 +108,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
|
108
108
|
.catch((err) => {
|
|
109
109
|
cb(err);
|
|
110
110
|
});
|
|
111
|
-
}
|
|
111
|
+
},
|
|
112
112
|
);
|
|
113
113
|
|
|
114
114
|
socket.removeAllListeners(CHANNELS.METHOD);
|
|
@@ -118,7 +118,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
|
118
118
|
{ name, input }: SocketFunctionCall,
|
|
119
119
|
cb = (..._callback: any) => {
|
|
120
120
|
/* Empty */
|
|
121
|
-
}
|
|
121
|
+
},
|
|
122
122
|
) => {
|
|
123
123
|
runClientMethod
|
|
124
124
|
.bind(this)(
|
|
@@ -128,7 +128,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
|
128
128
|
},
|
|
129
129
|
{
|
|
130
130
|
socket,
|
|
131
|
-
}
|
|
131
|
+
},
|
|
132
132
|
)
|
|
133
133
|
.then((res) => {
|
|
134
134
|
cb(null, res);
|
|
@@ -136,7 +136,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
|
136
136
|
.catch((err) => {
|
|
137
137
|
makeSocketError(cb, err);
|
|
138
138
|
});
|
|
139
|
-
}
|
|
139
|
+
},
|
|
140
140
|
);
|
|
141
141
|
|
|
142
142
|
await this.pushSocketSchema(socket);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.535",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"pg": "^8.19.0",
|
|
58
58
|
"pg-cursor": "^2.19.0",
|
|
59
59
|
"pg-promise": "^12.6.2",
|
|
60
|
-
"prostgles-types": "^4.0.
|
|
60
|
+
"prostgles-types": "^4.0.246"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
63
|
"@eslint/js": "^9.22.0",
|