prostgles-server 4.2.558 → 4.2.560
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/DboBuilder.d.ts +4 -4
- package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilder.js +18 -29
- package/dist/DboBuilder/DboBuilder.js.map +1 -1
- package/dist/DboBuilder/TableHandler/DataValidator.js +18 -12
- package/dist/DboBuilder/TableHandler/DataValidator.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +17 -4
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js +16 -2
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.d.ts +2 -1
- package/dist/DboBuilder/ViewHandler/count.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.js +5 -2
- package/dist/DboBuilder/ViewHandler/count.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.d.ts +4 -1
- package/dist/DboBuilder/ViewHandler/find.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.js +9 -5
- package/dist/DboBuilder/ViewHandler/find.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.d.ts +9 -0
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.d.ts.map +1 -0
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.js +73 -0
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.js.map +1 -0
- package/dist/DboBuilder/ViewHandler/size.d.ts +2 -1
- package/dist/DboBuilder/ViewHandler/size.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/size.js +7 -5
- package/dist/DboBuilder/ViewHandler/size.js.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.d.ts +1 -0
- package/dist/DboBuilder/dboBuilderUtils.d.ts.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.js +4 -2
- package/dist/DboBuilder/dboBuilderUtils.js.map +1 -1
- package/dist/DboBuilder/{QueryStreamer.d.ts → runSql/QueryStreamer.d.ts} +4 -6
- package/dist/DboBuilder/runSql/QueryStreamer.d.ts.map +1 -0
- package/dist/DboBuilder/{QueryStreamer.js → runSql/QueryStreamer.js} +5 -22
- package/dist/DboBuilder/runSql/QueryStreamer.js.map +1 -0
- package/dist/DboBuilder/runSql/getAdminClient.d.ts +26 -0
- package/dist/DboBuilder/runSql/getAdminClient.d.ts.map +1 -0
- package/dist/DboBuilder/runSql/getAdminClient.js +32 -0
- package/dist/DboBuilder/runSql/getAdminClient.js.map +1 -0
- package/dist/DboBuilder/runSql/runSqlUtils.d.ts +1 -1
- package/dist/Prostgles.d.ts +2 -0
- package/dist/Prostgles.d.ts.map +1 -1
- package/dist/Prostgles.js +3 -1
- package/dist/Prostgles.js.map +1 -1
- package/dist/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js +2 -1
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/dist/WebsocketAPI/onSocketConnected.d.ts.map +1 -1
- package/dist/WebsocketAPI/onSocketConnected.js +14 -6
- package/dist/WebsocketAPI/onSocketConnected.js.map +1 -1
- package/dist/initProstgles.d.ts.map +1 -1
- package/dist/initProstgles.js +2 -0
- package/dist/initProstgles.js.map +1 -1
- package/dist/runClientRequest.d.ts +1 -1
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js +28 -6
- package/dist/runClientRequest.js.map +1 -1
- package/lib/DboBuilder/DboBuilder.ts +20 -31
- package/lib/DboBuilder/TableHandler/DataValidator.ts +19 -14
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +27 -3
- package/lib/DboBuilder/ViewHandler/count.ts +6 -2
- package/lib/DboBuilder/ViewHandler/find.ts +16 -7
- package/lib/DboBuilder/ViewHandler/getDbHandlerWithAbort.ts +98 -0
- package/lib/DboBuilder/ViewHandler/size.ts +8 -5
- package/lib/DboBuilder/dboBuilderUtils.ts +4 -1
- package/lib/DboBuilder/{QueryStreamer.ts → runSql/QueryStreamer.ts} +10 -32
- package/lib/DboBuilder/runSql/getAdminClient.ts +31 -0
- package/lib/Prostgles.ts +4 -1
- package/lib/PublishParser/PublishParser.ts +3 -1
- package/lib/WebsocketAPI/onSocketConnected.ts +15 -7
- package/lib/initProstgles.ts +3 -0
- package/lib/runClientRequest.ts +49 -10
- package/package.json +2 -2
- package/dist/DboBuilder/QueryStreamer.d.ts.map +0 -1
- package/dist/DboBuilder/QueryStreamer.js.map +0 -1
|
@@ -6,7 +6,7 @@ import { PubSubManager } from "../PubSubManager/PubSubManager";
|
|
|
6
6
|
import type { PublishParser } from "../PublishParser/PublishParser";
|
|
7
7
|
import type { Graph } from "../shortestPath";
|
|
8
8
|
import type { DBHandlerServer, DbTxTableHandlers, SQLHandlerServer, TableSchema, TxCB } from "./DboBuilderTypes";
|
|
9
|
-
import { QueryStreamer } from "./QueryStreamer";
|
|
9
|
+
import { QueryStreamer } from "./runSql/QueryStreamer";
|
|
10
10
|
import { TableHandler } from "./TableHandler/TableHandler";
|
|
11
11
|
import type { JoinPaths } from "./ViewHandler/ViewHandler";
|
|
12
12
|
import type { PGConstraint } from "./dboBuilderUtils";
|
|
@@ -36,9 +36,11 @@ export declare class DboBuilder {
|
|
|
36
36
|
dbTypesCache?: Awaited<ReturnType<typeof getDbTypes>>;
|
|
37
37
|
DATA_TYPES_DBKEY: string;
|
|
38
38
|
queryStreamer: QueryStreamer;
|
|
39
|
+
private constructor();
|
|
40
|
+
private init;
|
|
39
41
|
get tables(): TableSchema[];
|
|
40
42
|
getDetailedFieldInfo: (fields: pg.IColumn[]) => Promise<{
|
|
41
|
-
tsDataType: "string" | "number" | "boolean" | "any" | "string[]" | "number[]" | "boolean[]" | "any[]";
|
|
43
|
+
tsDataType: "string" | "number" | "boolean" | "any" | "string[]" | "number[]" | "boolean[]" | "any[]" | "ArrayBuffer";
|
|
42
44
|
dataType: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
|
|
43
45
|
udt_name: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
|
|
44
46
|
tableName: string | undefined;
|
|
@@ -65,8 +67,6 @@ export declare class DboBuilder {
|
|
|
65
67
|
command: string;
|
|
66
68
|
query: string;
|
|
67
69
|
}) => void;
|
|
68
|
-
private constructor();
|
|
69
|
-
private init;
|
|
70
70
|
static create: (prostgles: Prostgles) => Promise<DboBuilder>;
|
|
71
71
|
destroy: () => Promise<void | undefined>;
|
|
72
72
|
_joins?: Join[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,iBAAiB,CAAC;AAI9D,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGpE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EAEjB,gBAAgB,EAChB,WAAW,EACX,IAAI,EACL,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ const PubSubManager_1 = require("../PubSubManager/PubSubManager");
|
|
|
22
22
|
const getCreatePubSubManagerError_1 = require("../PubSubManager/getCreatePubSubManagerError");
|
|
23
23
|
const runSQLFile_1 = require("../TableConfig/runSQLFile");
|
|
24
24
|
const utils_1 = require("../utils/utils");
|
|
25
|
-
const QueryStreamer_1 = require("./QueryStreamer");
|
|
25
|
+
const QueryStreamer_1 = require("./runSql/QueryStreamer");
|
|
26
26
|
const TableHandler_1 = require("./TableHandler/TableHandler");
|
|
27
27
|
const parseJoinPath_1 = require("./ViewHandler/parseJoinPath");
|
|
28
28
|
const dboBuilderUtils_1 = require("./dboBuilderUtils");
|
|
@@ -55,18 +55,25 @@ class DboBuilder {
|
|
|
55
55
|
dbTypesCache;
|
|
56
56
|
DATA_TYPES_DBKEY = "";
|
|
57
57
|
queryStreamer;
|
|
58
|
+
constructor(prostgles) {
|
|
59
|
+
this.prostgles = prostgles;
|
|
60
|
+
if (!this.prostgles.db)
|
|
61
|
+
throw "db missing";
|
|
62
|
+
this.db = this.prostgles.db;
|
|
63
|
+
this.dbo = {};
|
|
64
|
+
this.dboMap = new Map();
|
|
65
|
+
this.queryStreamer = new QueryStreamer_1.QueryStreamer(this);
|
|
66
|
+
}
|
|
67
|
+
init = async () => {
|
|
68
|
+
await this.build();
|
|
69
|
+
/* If watchSchema is enabled then PubSubManager must be created (if possible) because it creates the event trigger */
|
|
70
|
+
if (this.prostgles.schemaWatch?.type.watchType === "DDL_trigger") {
|
|
71
|
+
await this.getPubSubManager();
|
|
72
|
+
}
|
|
73
|
+
return this;
|
|
74
|
+
};
|
|
58
75
|
get tables() {
|
|
59
76
|
return this.tablesOrViews ?? [];
|
|
60
|
-
// .map(({ name, columns }) => {
|
|
61
|
-
// const info = this.dboMap.get(name)?.tableOrViewInfo;
|
|
62
|
-
// if (!info) return undefined;
|
|
63
|
-
// return {
|
|
64
|
-
// name,
|
|
65
|
-
// info,
|
|
66
|
-
// columns,
|
|
67
|
-
// } satisfies DbTableInfo;
|
|
68
|
-
// })
|
|
69
|
-
// .filter(isDefined);
|
|
70
77
|
}
|
|
71
78
|
getDetailedFieldInfo = async (fields) => {
|
|
72
79
|
return (0, runSqlUtils_1.getDetailedFieldInfo)(await this.cacheDBTypes(), fields);
|
|
@@ -105,29 +112,11 @@ class DboBuilder {
|
|
|
105
112
|
prostgles;
|
|
106
113
|
publishParser;
|
|
107
114
|
onSchemaChange;
|
|
108
|
-
constructor(prostgles) {
|
|
109
|
-
this.prostgles = prostgles;
|
|
110
|
-
if (!this.prostgles.db)
|
|
111
|
-
throw "db missing";
|
|
112
|
-
this.db = this.prostgles.db;
|
|
113
|
-
this.dbo = {};
|
|
114
|
-
this.dboMap = new Map();
|
|
115
|
-
this.queryStreamer = new QueryStreamer_1.QueryStreamer(this);
|
|
116
|
-
}
|
|
117
|
-
init = async () => {
|
|
118
|
-
await this.build();
|
|
119
|
-
/* If watchSchema is enabled then PubSubManager must be created (if possible) because it creates the event trigger */
|
|
120
|
-
if (this.prostgles.schemaWatch?.type.watchType === "DDL_trigger") {
|
|
121
|
-
await this.getPubSubManager();
|
|
122
|
-
}
|
|
123
|
-
return this;
|
|
124
|
-
};
|
|
125
115
|
static create = async (prostgles) => {
|
|
126
116
|
const res = new DboBuilder(prostgles);
|
|
127
117
|
return await res.init();
|
|
128
118
|
};
|
|
129
119
|
destroy = async () => {
|
|
130
|
-
await this.queryStreamer.destroy().catch(console.error);
|
|
131
120
|
return this._pubSubManager?.destroy();
|
|
132
121
|
};
|
|
133
122
|
_joins;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilder.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,qDAAmE;AACnE,kFAA+E;AAC/E,kGAA+F;AAG/F,kEAA+D;AAC/D,8FAA2F;AAG3F,0DAAsE;AAEtE,0CAAuC;AASvC,
|
|
1
|
+
{"version":3,"file":"DboBuilder.js","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -131,8 +131,8 @@ const getValidatedRowFieldData = async ({ allowedCols, rows, validationOptions,
|
|
|
131
131
|
if (!allowedCols.length && command === "update") {
|
|
132
132
|
throw "allowedColumns cannot be empty";
|
|
133
133
|
}
|
|
134
|
-
const rowFieldData = await Promise.all(rows.map(async (
|
|
135
|
-
let row = (0, dist_1.pickKeys)(
|
|
134
|
+
const rowFieldData = await Promise.all(rows.map(async (nonValidatedRow) => {
|
|
135
|
+
let row = (0, dist_1.pickKeys)(nonValidatedRow, allowedCols);
|
|
136
136
|
const initialRowKeys = Object.keys(row);
|
|
137
137
|
if (validationOptions.validate) {
|
|
138
138
|
if (!validationOptions.localParams) {
|
|
@@ -150,7 +150,7 @@ const getValidatedRowFieldData = async ({ allowedCols, rows, validationOptions,
|
|
|
150
150
|
const keysAddedDuringValidate = Object.keys(row).filter((newKey) => !initialRowKeys.includes(newKey));
|
|
151
151
|
const getColumn = (fieldName) => {
|
|
152
152
|
if (!allowedCols.concat(keysAddedDuringValidate).includes(fieldName)) {
|
|
153
|
-
throw `Unexpected/
|
|
153
|
+
throw `Unexpected/Disallowed column name: ${fieldName}`;
|
|
154
154
|
}
|
|
155
155
|
const column = tableHandler.columns.find((c) => c.name === fieldName);
|
|
156
156
|
if (!column) {
|
|
@@ -169,9 +169,9 @@ const getValidatedRowFieldData = async ({ allowedCols, rows, validationOptions,
|
|
|
169
169
|
// fieldValue: textPatch,
|
|
170
170
|
// } satisfies RowFieldData;
|
|
171
171
|
// }
|
|
172
|
-
const [firstKey, ...
|
|
173
|
-
const func = firstKey && !
|
|
174
|
-
|
|
172
|
+
const [firstKey, ...remainingKeys] = Object.keys(fieldValue);
|
|
173
|
+
const func = firstKey && !remainingKeys.length ?
|
|
174
|
+
conversionFunctions.some((f) => `$${f.name}` === firstKey)
|
|
175
175
|
: undefined;
|
|
176
176
|
if (func) {
|
|
177
177
|
const { funcName, args } = (0, QueryBuilder_1.parseFunctionObject)(fieldValue);
|
|
@@ -228,9 +228,9 @@ const getValidatedRowFieldData = async ({ allowedCols, rows, validationOptions,
|
|
|
228
228
|
// return undefined;
|
|
229
229
|
// };
|
|
230
230
|
const getParsedRowFieldDataFunction = (rowPart, args) => {
|
|
231
|
-
const func =
|
|
231
|
+
const func = conversionFunctions.find((f) => `$${f.name}` === rowPart.funcName);
|
|
232
232
|
if (!func) {
|
|
233
|
-
throw `Unknown function: ${rowPart.funcName}. Expecting one of: ${
|
|
233
|
+
throw `Unknown function: ${rowPart.funcName}. Expecting one of: ${conversionFunctions.map((f) => f.name).join(", ")}`;
|
|
234
234
|
}
|
|
235
235
|
if (func.onlyAllowedFor && func.onlyAllowedFor !== args.command) {
|
|
236
236
|
throw `Function ${rowPart.funcName} is only allowed for ${func.onlyAllowedFor} but not ${args.command}`;
|
|
@@ -245,9 +245,15 @@ const getParsedRowFieldData = (rowFieldData, args) => {
|
|
|
245
245
|
escapedVal = getParsedRowFieldDataFunction(rowPart, args);
|
|
246
246
|
}
|
|
247
247
|
else {
|
|
248
|
-
/**
|
|
249
|
-
|
|
250
|
-
|
|
248
|
+
/** Convert ArrayBuffer to node Buffer */
|
|
249
|
+
if (rowPart.column.udt_name === "bytea" && rowPart.fieldValue instanceof ArrayBuffer) {
|
|
250
|
+
escapedVal = DboBuilder_1.pgp.as.format("$1", [Buffer.from(rowPart.fieldValue)]);
|
|
251
|
+
}
|
|
252
|
+
else {
|
|
253
|
+
/** Prevent pg-promise formatting jsonb */
|
|
254
|
+
const colIsJSON = ["json", "jsonb"].includes(rowPart.column.data_type);
|
|
255
|
+
escapedVal = DboBuilder_1.pgp.as.format(colIsJSON ? "$1:json" : "$1", [rowPart.fieldValue]);
|
|
256
|
+
}
|
|
251
257
|
}
|
|
252
258
|
/**
|
|
253
259
|
* Cast to type to avoid array errors (they do not cast automatically)
|
|
@@ -261,7 +267,7 @@ const getParsedRowFieldData = (rowFieldData, args) => {
|
|
|
261
267
|
});
|
|
262
268
|
return parsedRowFieldData;
|
|
263
269
|
};
|
|
264
|
-
const
|
|
270
|
+
const conversionFunctions = [
|
|
265
271
|
...[
|
|
266
272
|
"ST_GeomFromText",
|
|
267
273
|
"ST_Point",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataValidator.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/DataValidator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DataValidator.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/DataValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,10 @@ import type { ParsedTableRule } from "../../PublishParser/PublishParser";
|
|
|
7
7
|
import type { Graph } from "../../shortestPath";
|
|
8
8
|
import type { DboBuilder, Filter, LocalParams, TableHandlers } from "../DboBuilder";
|
|
9
9
|
import type { TableSchema } from "../DboBuilderTypes";
|
|
10
|
+
import { type Param3 } from "./find";
|
|
10
11
|
import type { OnData } from "./subscribe";
|
|
11
12
|
import type { TableDefinition } from "../../TableConfig/TableConfig";
|
|
13
|
+
import type { VoidFunction } from "../../SchemaWatch/SchemaWatch";
|
|
12
14
|
export type JoinPaths = {
|
|
13
15
|
t1: string;
|
|
14
16
|
t2: string;
|
|
@@ -52,6 +54,17 @@ export declare class ViewHandler {
|
|
|
52
54
|
dbTX: TableHandlers;
|
|
53
55
|
t: pgPromise.ITask<{}>;
|
|
54
56
|
} | undefined;
|
|
57
|
+
abortRemoteQuery: (abortSignalId: string, localParams: LocalParams) => void;
|
|
58
|
+
activeQueries: Map<string, {
|
|
59
|
+
abort: VoidFunction;
|
|
60
|
+
query: string;
|
|
61
|
+
start: number;
|
|
62
|
+
sid: string | undefined;
|
|
63
|
+
}>;
|
|
64
|
+
getDbHandlerWithAbort: (localParams: LocalParams | undefined, params: {
|
|
65
|
+
abortSignal: AbortSignal | undefined;
|
|
66
|
+
abortSignalId: string | undefined;
|
|
67
|
+
}) => Pick<pgPromise.ITask<{}> | import("../..").DB, "any" | "one" | "many" | "manyOrNone" | "none" | "oneOrNone">;
|
|
55
68
|
_log: ({ command, data, localParams, duration, error, }: Pick<TableEvent, "command" | "data" | "localParams"> & {
|
|
56
69
|
duration: number;
|
|
57
70
|
error?: any;
|
|
@@ -72,14 +85,14 @@ export declare class ViewHandler {
|
|
|
72
85
|
filter: AnyObject;
|
|
73
86
|
} | undefined, _param3?: undefined, tableRules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => Promise<import("prostgles-types").ValidatedColumnInfo[]>;
|
|
74
87
|
getValidatedRules: (tableRules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => import("../DboBuilderTypes").ValidatedTableRules;
|
|
75
|
-
find: (filter?: Filter | undefined, selectParams?: SelectParams | undefined,
|
|
76
|
-
findOne(filter?: Filter, selectParams?: SelectParams,
|
|
88
|
+
find: (filter?: Filter | undefined, selectParams?: SelectParams | undefined, param3?: Param3 | undefined, tableRules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => Promise<any[]>;
|
|
89
|
+
findOne(filter?: Filter, selectParams?: SelectParams, param3?: Param3, table_rules?: ParsedTableRule, localParams?: LocalParams): Promise<any>;
|
|
77
90
|
subscribe(filter: Filter, params: SubscribeParams, onData: OnData): Promise<SubscriptionHandler>;
|
|
78
91
|
subscribe(filter: Filter, params: SubscribeParams, onData?: OnData, table_rules?: ParsedTableRule, localParams?: LocalParams): Promise<SubscriptionChannels>;
|
|
79
92
|
subscribeOne(filter: Filter, params: SubscribeParams, onData: (item: AnyObject | undefined, error?: unknown) => any): Promise<SubscriptionHandler>;
|
|
80
93
|
subscribeOne(filter: Filter, params: SubscribeParams, onData: undefined, table_rules: ParsedTableRule, localParams: LocalParams): Promise<SubscriptionChannels>;
|
|
81
|
-
count: (_filter?: Filter | undefined, selectParams?: SelectParams | undefined,
|
|
82
|
-
size: (_filter?: Filter | undefined, selectParams?: SelectParams | undefined,
|
|
94
|
+
count: (_filter?: Filter | undefined, selectParams?: SelectParams | undefined, param3?: Param3 | undefined, table_rules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => Promise<number>;
|
|
95
|
+
size: (_filter?: Filter | undefined, selectParams?: SelectParams | undefined, param3?: Param3 | undefined, table_rules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => Promise<string>;
|
|
83
96
|
getAllowedSelectFields(selectParams: FieldFilter | undefined, allowed_cols: FieldFilter, allow_empty?: boolean): string[];
|
|
84
97
|
/**
|
|
85
98
|
* Parses group or simple filter
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,SAAS,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const size_1 = require("./size");
|
|
|
14
14
|
const subscribe_1 = require("./subscribe");
|
|
15
15
|
const validateViewRules_1 = require("./validateViewRules");
|
|
16
16
|
const utils_1 = require("../../utils/utils");
|
|
17
|
+
const getDbHandlerWithAbort_1 = require("./getDbHandlerWithAbort");
|
|
17
18
|
class ViewHandler {
|
|
18
19
|
db;
|
|
19
20
|
name;
|
|
@@ -63,6 +64,19 @@ class ViewHandler {
|
|
|
63
64
|
getTransaction = (localParams) => {
|
|
64
65
|
return localParams?.tx || this.tx;
|
|
65
66
|
};
|
|
67
|
+
abortRemoteQuery = (abortSignalId, localParams) => {
|
|
68
|
+
const sid = this.dboBuilder.prostgles.authHandler.getSIDNoError(localParams.clientReq);
|
|
69
|
+
if (!sid) {
|
|
70
|
+
throw new Error("Cannot get SID from client request. Ensure that the client is authenticated before using abortable queries.");
|
|
71
|
+
}
|
|
72
|
+
const abortableQuery = this.activeQueries.get(abortSignalId);
|
|
73
|
+
if (!abortableQuery || abortableQuery.sid !== sid) {
|
|
74
|
+
throw new Error(`No active query found with abortSignalId ${abortSignalId}. Ensure that the query was initiated with the correct abortSignalId.`);
|
|
75
|
+
}
|
|
76
|
+
abortableQuery.abort();
|
|
77
|
+
};
|
|
78
|
+
activeQueries = new Map();
|
|
79
|
+
getDbHandlerWithAbort = getDbHandlerWithAbort_1.getDbHandlerWithAbort.bind(this);
|
|
66
80
|
_log = ({ command, data, localParams, duration, error, }) => {
|
|
67
81
|
if (localParams?.noLog) {
|
|
68
82
|
if (localParams.clientReq) {
|
|
@@ -108,14 +122,14 @@ class ViewHandler {
|
|
|
108
122
|
getColumns = getColumns_1.getColumns.bind(this);
|
|
109
123
|
getValidatedRules = getValidatedTableRules_1.getValidatedTableRules.bind(this);
|
|
110
124
|
find = find_1.find.bind(this);
|
|
111
|
-
async findOne(filter, selectParams,
|
|
125
|
+
async findOne(filter, selectParams, param3, table_rules, localParams) {
|
|
112
126
|
try {
|
|
113
127
|
const { limit, ...params } = selectParams ?? {};
|
|
114
128
|
if (limit) {
|
|
115
129
|
throw "limit not allowed in findOne()";
|
|
116
130
|
}
|
|
117
131
|
const start = Date.now();
|
|
118
|
-
const result = await this.find(filter, { ...params, limit: 1, returnType: "row" },
|
|
132
|
+
const result = await this.find(filter, { ...params, limit: 1, returnType: "row" }, param3, table_rules, localParams);
|
|
119
133
|
await this._log({
|
|
120
134
|
command: "find",
|
|
121
135
|
localParams,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":";;;AAUA,qDAAqE;AAOrE,8CAAoE;AAEpE,iFAA8E;AAC9E,8CAA2C;AAC3C,mCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,6 @@ import type { SelectParams } from "prostgles-types";
|
|
|
2
2
|
import type { ParsedTableRule } from "../../PublishParser/publishTypesAndUtils";
|
|
3
3
|
import type { Filter, LocalParams } from "../DboBuilder";
|
|
4
4
|
import type { ViewHandler } from "./ViewHandler";
|
|
5
|
-
|
|
5
|
+
import type { Param3 } from "./find";
|
|
6
|
+
export declare function count(this: ViewHandler, _filter?: Filter, selectParams?: SelectParams, param3?: Param3, table_rules?: ParsedTableRule, localParams?: LocalParams): Promise<number>;
|
|
6
7
|
//# sourceMappingURL=count.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAMzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAMzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,wBAAsB,KAAK,CACzB,IAAI,EAAE,WAAW,EACjB,OAAO,CAAC,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,YAAY,EAC3B,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,eAAe,EAC7B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC,CAmEjB"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.count = count;
|
|
4
4
|
const dboBuilderUtils_1 = require("../dboBuilderUtils");
|
|
5
5
|
const getReturnTypeQuery_1 = require("./getReturnTypeQuery");
|
|
6
|
-
async function count(_filter, selectParams,
|
|
6
|
+
async function count(_filter, selectParams, param3, table_rules, localParams) {
|
|
7
7
|
const filter = _filter || {};
|
|
8
8
|
const { limit: _limit, ...selectParamsWithoutLimit } = selectParams ?? {};
|
|
9
9
|
const start = Date.now();
|
|
@@ -32,7 +32,10 @@ async function count(_filter, selectParams, _param3_unused, table_rules, localPa
|
|
|
32
32
|
if (queryToReturn) {
|
|
33
33
|
return queryToReturn;
|
|
34
34
|
}
|
|
35
|
-
const handler = this.
|
|
35
|
+
const handler = this.getDbHandlerWithAbort(localParams, {
|
|
36
|
+
abortSignal: selectParams?.abortSignal,
|
|
37
|
+
abortSignalId: param3?.abortSignalId,
|
|
38
|
+
});
|
|
36
39
|
return handler.one(queryWithRLS).then(({ count }) => +count);
|
|
37
40
|
});
|
|
38
41
|
await this._log({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":";;AAYA,sBA0EC;AAnFD,wDAI4B;AAE5B,6DAA0D;AAGnD,KAAK,UAAU,KAAK,CAEzB,OAAgB,EAChB,YAA2B,EAC3B,MAAe,EACf,WAA6B,EAC7B,WAAyB;IAEzB,MAAM,MAAM,GAAG,OAAO,IAAI,EAAE,CAAC;IAC7B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,EAAE,GAAG,YAAY,IAAI,EAAE,CAAC;IAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAC5B,MAAM,EACN,EAAE,MAAM,EAAE,wBAAwB,CAAC,MAAM,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAC3D,SAAS,EACT,WAAW,EACX,WAAW,CACZ,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACxB,MAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,wBAAwB,EAAE,SAAS,EAAE,WAAW,EAAE;gBAC3F,GAAG,WAAW;gBACd,WAAW,EAAE,OAAO;gBACpB,WAAW,EAAE,IAAI;aAClB,CAAC,CAAsB,CAAC;YAEzB,MAAM,mBAAmB,GAAG;;;UAGxB,SAAS;;OAEZ,CAAC;YACF,MAAM,YAAY,GAAG,IAAA,6BAAW,EAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;YAEnE,MAAM,aAAa,GAAG,MAAM,IAAA,uCAAkB,EAAC;gBAC7C,OAAO,EAAE,IAAI;gBACb,WAAW;gBACX,eAAe,EAAE,mBAAmB;gBACpC,YAAY;gBACZ,UAAU,EAAE,YAAY,EAAE,UAAU;gBACpC,QAAQ,EAAE,SAAS;aACpB,CAAC,CAAC;YACH,IAAI,aAAa,EAAE,CAAC;gBAClB,OAAO,aAA0B,CAAC;YACpC,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE;gBACtD,WAAW,EAAE,YAAY,EAAE,WAAW;gBACtC,aAAa,EAAE,MAAM,EAAE,aAAa;aACrC,CAAC,CAAC;YACH,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,OAAO;YAChB,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;SAC7B,CAAC,CAAC;QACH,OAAO,MAAgB,CAAC;IAC1B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,OAAO;YAChB,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;YAC5B,KAAK,EAAE,IAAA,kCAAgB,EAAC,CAAC,CAAC;SAC3B,CAAC,CAAC;QACH,MAAM,IAAA,qDAAmC,EAAC,CAAC,EAAE;YAC3C,IAAI,EAAE,aAAa;YACnB,WAAW;YACX,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS;SACrC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -2,5 +2,8 @@ import type { SelectParams } from "prostgles-types";
|
|
|
2
2
|
import type { ParsedTableRule } from "../../PublishParser/PublishParser";
|
|
3
3
|
import type { Filter, LocalParams } from "../DboBuilder";
|
|
4
4
|
import type { ViewHandler } from "./ViewHandler";
|
|
5
|
-
export
|
|
5
|
+
export type Param3 = {
|
|
6
|
+
abortSignalId?: string;
|
|
7
|
+
};
|
|
8
|
+
export declare const find: (this: ViewHandler, filter?: Filter, selectParams?: SelectParams, param3?: Param3, tableRules?: ParsedTableRule, localParams?: LocalParams) => Promise<any[]>;
|
|
6
9
|
//# sourceMappingURL=find.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAUzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,eAAO,MAAM,IAAI,GACf,MAAM,WAAW,EACjB,
|
|
1
|
+
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAUzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,MAAM,MAAM,GAAG;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,IAAI,GACf,MAAM,WAAW,EACjB,SAAQ,MAAW,EACnB,eAAe,YAAY,EAC3B,SAAS,MAAM,EACf,aAAa,eAAe,EAC5B,cAAc,WAAW,KACxB,OAAO,CAAC,GAAG,EAAE,CA0Jf,CAAC"}
|
|
@@ -6,11 +6,11 @@ const DboBuilder_1 = require("../DboBuilder");
|
|
|
6
6
|
const getNewQuery_1 = require("../QueryBuilder/getNewQuery");
|
|
7
7
|
const getSelectQuery_1 = require("../QueryBuilder/getSelectQuery");
|
|
8
8
|
const getReturnTypeQuery_1 = require("./getReturnTypeQuery");
|
|
9
|
-
const find = async function (filter, selectParams,
|
|
9
|
+
const find = async function (filter = {}, selectParams, param3, tableRules, localParams) {
|
|
10
10
|
const start = Date.now();
|
|
11
|
-
const
|
|
11
|
+
const { limit, returnType, abortSignal } = selectParams ?? {};
|
|
12
|
+
const command = limit === 1 && returnType === "row" ? "findOne" : "find";
|
|
12
13
|
try {
|
|
13
|
-
filter = filter || {};
|
|
14
14
|
const allowedReturnTypes = Object.keys({
|
|
15
15
|
row: 1,
|
|
16
16
|
statement: 1,
|
|
@@ -35,6 +35,7 @@ const find = async function (filter, selectParams, _, tableRules, localParams) {
|
|
|
35
35
|
returnType: 1,
|
|
36
36
|
groupBy: 1,
|
|
37
37
|
having: 1,
|
|
38
|
+
abortSignal: 1,
|
|
38
39
|
});
|
|
39
40
|
const invalidParams = Object.keys(selectParams).filter((k) => !validParamNames.includes(k));
|
|
40
41
|
if (invalidParams.length)
|
|
@@ -65,7 +66,7 @@ const find = async function (filter, selectParams, _, tableRules, localParams) {
|
|
|
65
66
|
const selectParamsLimitCheck = localParams?.bypassLimit && !Number.isFinite(_selectParams.limit) ?
|
|
66
67
|
{ ..._selectParams, limit: null }
|
|
67
68
|
: { limit: 1000, ..._selectParams };
|
|
68
|
-
const newQuery = await (0, getNewQuery_1.getNewQuery)(this, filter, selectParamsLimitCheck,
|
|
69
|
+
const newQuery = await (0, getNewQuery_1.getNewQuery)(this, filter, selectParamsLimitCheck, undefined, tableRules, localParams);
|
|
69
70
|
const queryWithoutRLS = (0, getSelectQuery_1.getSelectQuery)(this, newQuery, undefined, !!selectParamsLimitCheck.groupBy);
|
|
70
71
|
const queryWithRLS = (0, DboBuilder_1.withUserRLS)(localParams, queryWithoutRLS);
|
|
71
72
|
const queryToReturn = await (0, getReturnTypeQuery_1.getReturnTypeQuery)({
|
|
@@ -81,7 +82,10 @@ const find = async function (filter, selectParams, _, tableRules, localParams) {
|
|
|
81
82
|
}
|
|
82
83
|
const query = queryWithRLS;
|
|
83
84
|
const isOneOrNone = returnType === "row" || returnType === "value";
|
|
84
|
-
const dbHandler = this.
|
|
85
|
+
const dbHandler = this.getDbHandlerWithAbort(localParams, {
|
|
86
|
+
abortSignal,
|
|
87
|
+
abortSignalId: param3?.abortSignalId,
|
|
88
|
+
});
|
|
85
89
|
const queryPromise = isOneOrNone ?
|
|
86
90
|
dbHandler.oneOrNone(query).then((data) => (data ? [data] : []))
|
|
87
91
|
: dbHandler.any(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":";;;AACA,qDAA2C;AAG3C,8CAKuB;AACvB,6DAA0D;AAC1D,mEAAgE;AAChE,6DAA0D;
|
|
1
|
+
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { DB } from "../../initProstgles";
|
|
2
|
+
import { type LocalParams } from "../DboBuilder";
|
|
3
|
+
import type { ViewHandler } from "./ViewHandler";
|
|
4
|
+
import type * as pgPromise from "pg-promise";
|
|
5
|
+
export declare function getDbHandlerWithAbort(this: ViewHandler, localParams: LocalParams | undefined, params: {
|
|
6
|
+
abortSignal: AbortSignal | undefined;
|
|
7
|
+
abortSignalId: string | undefined;
|
|
8
|
+
}): Pick<DB | pgPromise.ITask<{}>, "any" | "one" | "many" | "manyOrNone" | "none" | "oneOrNone">;
|
|
9
|
+
//# sourceMappingURL=getDbHandlerWithAbort.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getDbHandlerWithAbort.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getDbHandlerWithAbort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,KAAK,SAAS,MAAM,YAAY,CAAC;AAE7C,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,MAAM,EAAE;IAAE,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAClF,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,YAAY,GAAG,MAAM,GAAG,WAAW,CAAC,CAwF9F"}
|