prostgles-server 4.2.643 → 4.2.645
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/debug/fixes-review-build.log +4 -0
- package/debug/fixes-review-client-schema.backup +745 -0
- package/debug/fixes-review-generated-schema.backup +489 -0
- package/debug/fixes-review-probes-build.log +0 -0
- package/debug/fixes-review-probes.patch +43 -0
- package/debug/fixes-review-restore-build.log +0 -0
- package/debug/fixes-review-tests-build.log +0 -0
- package/debug/fixes-review-typecheck.log +8 -0
- package/debug/review-current-fixes-build.log +4 -0
- package/debug/review-current-fixes-client.backup +745 -0
- package/debug/review-current-fixes-probes-build.log +0 -0
- package/debug/review-current-fixes-probes.patch +55 -0
- package/debug/review-current-fixes-restore-build.log +0 -0
- package/debug/review-current-fixes-rls.backup +478 -0
- package/debug/review-current-fixes-schema.backup +489 -0
- package/debug/review-current-fixes-test-build.log +0 -0
- package/debug/review-current-fixes-typecheck.log +8 -0
- package/debug/review-user-identity-build.log +4 -0
- package/debug/review-user-identity-probes-build.log +0 -0
- package/debug/review-user-identity-probes.log +558 -0
- package/debug/review-user-identity-probes.patch +45 -0
- package/debug/review-user-identity-restore-build.log +0 -0
- package/debug/review-user-identity-rls.backup +463 -0
- package/debug/review-user-identity-schema.backup +720 -0
- package/debug/review-user-identity-server.log +3248 -0
- package/debug/review-user-identity-test-build.log +0 -0
- package/debug/review-user-identity-typecheck.log +8 -0
- package/debug/server-user-lint.log +4 -0
- package/debug/server-user-test-server.log +538 -0
- package/debug/server-user-typecheck.log +8 -0
- package/debug/user-identity-direct-call-build.log +0 -0
- package/debug/user-identity-direct-call-schema.backup +489 -0
- package/debug/user-identity-regressions-build.log +4 -0
- package/debug/user-identity-regressions-generated-schema.backup +489 -0
- package/debug/user-identity-regressions-test-build.log +0 -0
- package/dist/Auth/AuthHandler.js +1 -1
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +8 -6
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/AuthTypes.js.map +1 -1
- package/dist/Auth/utils/getClientRequestIPsInfo.d.ts +2 -1
- package/dist/Auth/utils/getClientRequestIPsInfo.d.ts.map +1 -1
- package/dist/Auth/utils/getClientRequestIPsInfo.js +8 -1
- package/dist/Auth/utils/getClientRequestIPsInfo.js.map +1 -1
- package/dist/Auth/utils/getSessionUser.d.ts +4 -3
- package/dist/Auth/utils/getSessionUser.d.ts.map +1 -1
- package/dist/Auth/utils/getSessionUser.js +4 -2
- package/dist/Auth/utils/getSessionUser.js.map +1 -1
- package/dist/Auth/utils/getSessionUser.spec.js +2 -4
- package/dist/Auth/utils/getSessionUser.spec.js.map +1 -1
- package/dist/Auth/utils/handleGetUser.d.ts.map +1 -1
- package/dist/Auth/utils/handleGetUser.js +16 -0
- package/dist/Auth/utils/handleGetUser.js.map +1 -1
- package/dist/Auth/utils/serverSideRequest.d.ts +17 -0
- package/dist/Auth/utils/serverSideRequest.d.ts.map +1 -0
- package/dist/Auth/utils/serverSideRequest.js +20 -0
- package/dist/Auth/utils/serverSideRequest.js.map +1 -0
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +0 -4
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js +5 -8
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.js +2 -1
- package/dist/DboBuilder/ViewHandler/count.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.js +2 -1
- package/dist/DboBuilder/ViewHandler/find.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.d.ts +9 -2
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.js +57 -23
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/size.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/size.js +2 -1
- package/dist/DboBuilder/ViewHandler/size.js.map +1 -1
- package/dist/StorageClient/getLocalStorageClient.d.ts +9 -2
- package/dist/StorageClient/getLocalStorageClient.d.ts.map +1 -1
- package/dist/StorageClient/getLocalStorageClient.js.map +1 -1
- package/dist/initProstgles.d.ts +12 -2
- package/dist/initProstgles.d.ts.map +1 -1
- package/dist/initProstgles.js +10 -1
- package/dist/initProstgles.js.map +1 -1
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js +4 -3
- package/dist/runClientRequest.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +1 -1
- package/lib/Auth/AuthTypes.ts +9 -6
- package/lib/Auth/utils/getClientRequestIPsInfo.ts +11 -2
- package/lib/Auth/utils/getSessionUser.spec.ts +4 -6
- package/lib/Auth/utils/getSessionUser.ts +8 -5
- package/lib/Auth/utils/handleGetUser.ts +13 -0
- package/lib/Auth/utils/serverSideRequest.ts +27 -0
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +11 -11
- package/lib/DboBuilder/ViewHandler/count.ts +2 -1
- package/lib/DboBuilder/ViewHandler/find.ts +2 -1
- package/lib/DboBuilder/ViewHandler/getDbHandlerWithAbort.ts +72 -29
- package/lib/DboBuilder/ViewHandler/size.ts +2 -1
- package/lib/StorageClient/getLocalStorageClient.ts +2 -2
- package/lib/initProstgles.ts +31 -5
- package/lib/runClientRequest.ts +8 -5
- package/package.json +1 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { type UserLike } from "prostgles-types";
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
import { type FieldFilter, type UserLike } from "prostgles-types";
|
|
2
|
+
export declare const getSessionUser: <U extends UserLike = UserLike>(clientInfo: {
|
|
3
|
+
user?: U;
|
|
4
|
+
} | undefined, sessionFieldsFilter: undefined | FieldFilter<U>) => UserLike | undefined;
|
|
4
5
|
//# sourceMappingURL=getSessionUser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSessionUser.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/getSessionUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"getSessionUser.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/getSessionUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAGrF,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC1D,YAAY;IAAE,IAAI,CAAC,EAAE,CAAC,CAAA;CAAE,GAAG,SAAS,EACpC,qBAAqB,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,KAC9C,QAAQ,GAAG,SAeb,CAAC"}
|
|
@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getSessionUser = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const parseFieldFilter_1 = require("../../DboBuilder/ViewHandler/parseFieldFilter");
|
|
6
|
-
const getSessionUser = (clientInfo) => {
|
|
6
|
+
const getSessionUser = (clientInfo, sessionFieldsFilter) => {
|
|
7
7
|
const user = clientInfo?.user;
|
|
8
8
|
if (!user)
|
|
9
9
|
return;
|
|
10
|
-
const sessionFields = (0, parseFieldFilter_1.parseFieldFilter)(
|
|
10
|
+
const sessionFields = (0, parseFieldFilter_1.parseFieldFilter)(
|
|
11
|
+
//@ts-expect-error
|
|
12
|
+
sessionFieldsFilter ?? [], false, (0, prostgles_types_1.getKeys)(user));
|
|
11
13
|
return {
|
|
12
14
|
...(0, prostgles_types_1.pickKeys)(user, sessionFields),
|
|
13
15
|
...(0, prostgles_types_1.pickKeys)(user, ["id", "type"]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSessionUser.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getSessionUser.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getSessionUser.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getSessionUser.ts"],"names":[],"mappings":";;;AAAA,qDAAqF;AACrF,oFAAiF;AAE1E,MAAM,cAAc,GAAG,CAC5B,UAAoC,EACpC,mBAA+C,EACzB,EAAE;IACxB,MAAM,IAAI,GAAG,UAAU,EAAE,IAAI,CAAC;IAC9B,IAAI,CAAC,IAAI;QAAE,OAAO;IAElB,MAAM,aAAa,GAAG,IAAA,mCAAgB;IACpC,kBAAkB;IAClB,mBAAmB,IAAI,EAAE,EACzB,KAAK,EACL,IAAA,yBAAO,EAAC,IAAI,CAAC,CACF,CAAC;IAEd,OAAO;QACL,GAAG,IAAA,0BAAQ,EAAC,IAAI,EAAE,aAAa,CAAC;QAChC,GAAG,IAAA,0BAAQ,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KACtB,CAAC;AAChB,CAAC,CAAC;AAlBW,QAAA,cAAc,kBAkBzB"}
|
|
@@ -17,9 +17,8 @@ void (0, node_test_1.describe)("getSessionUser", async () => {
|
|
|
17
17
|
secret: "hidden",
|
|
18
18
|
},
|
|
19
19
|
clientUser: { id: "user-1", type: "admin" },
|
|
20
|
-
sessionFields: ["tenant_id"],
|
|
21
20
|
};
|
|
22
|
-
node_assert_1.default.deepEqual((0, getSessionUser_1.getSessionUser)(clientInfo), {
|
|
21
|
+
node_assert_1.default.deepEqual((0, getSessionUser_1.getSessionUser)(clientInfo, ["tenant_id"]), {
|
|
23
22
|
tenant_id: 42,
|
|
24
23
|
id: "user-1",
|
|
25
24
|
type: "admin",
|
|
@@ -30,9 +29,8 @@ void (0, node_test_1.describe)("getSessionUser", async () => {
|
|
|
30
29
|
sid: "sid",
|
|
31
30
|
user: { id: "user-1", type: "admin", tenant_id: 42, secret: "hidden" },
|
|
32
31
|
clientUser: { id: "user-1", type: "admin" },
|
|
33
|
-
sessionFields: { secret: false },
|
|
34
32
|
};
|
|
35
|
-
node_assert_1.default.deepEqual((0, getSessionUser_1.getSessionUser)(clientInfo), {
|
|
33
|
+
node_assert_1.default.deepEqual((0, getSessionUser_1.getSessionUser)(clientInfo, { secret: false }), {
|
|
36
34
|
id: "user-1",
|
|
37
35
|
type: "admin",
|
|
38
36
|
tenant_id: 42,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSessionUser.spec.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getSessionUser.spec.ts"],"names":[],"mappings":";;;;;AAAA,8DAAiC;AACjC,yCAA2C;AAE3C,qDAAkD;AAElD,KAAK,IAAA,oBAAQ,EAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;IACzC,MAAM,IAAA,gBAAI,EAAC,wEAAwE,EAAE,GAAG,EAAE;QACxF,MAAM,UAAU,GAAG;YACjB,GAAG,EAAE,KAAK;YACV,IAAI,EAAE;gBACJ,EAAE,EAAE,QAAQ;gBACZ,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,EAAE;gBACb,MAAM,EAAE,QAAQ;aACjB;YACD,UAAU,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE;
|
|
1
|
+
{"version":3,"file":"getSessionUser.spec.js","sourceRoot":"","sources":["../../../lib/Auth/utils/getSessionUser.spec.ts"],"names":[],"mappings":";;;;;AAAA,8DAAiC;AACjC,yCAA2C;AAE3C,qDAAkD;AAElD,KAAK,IAAA,oBAAQ,EAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;IACzC,MAAM,IAAA,gBAAI,EAAC,wEAAwE,EAAE,GAAG,EAAE;QACxF,MAAM,UAAU,GAAG;YACjB,GAAG,EAAE,KAAK;YACV,IAAI,EAAE;gBACJ,EAAE,EAAE,QAAQ;gBACZ,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,EAAE;gBACb,MAAM,EAAE,QAAQ;aACjB;YACD,UAAU,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE;SAChB,CAAC;QAE9B,qBAAM,CAAC,SAAS,CAAC,IAAA,+BAAc,EAAC,UAAU,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE;YAC1D,SAAS,EAAE,EAAE;YACb,EAAE,EAAE,QAAQ;YACZ,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,IAAA,gBAAI,EAAC,kCAAkC,EAAE,GAAG,EAAE;QAClD,MAAM,UAAU,GAAG;YACjB,GAAG,EAAE,KAAK;YACV,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;YACtE,UAAU,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE;SAChB,CAAC;QAE9B,qBAAM,CAAC,SAAS,CAAC,IAAA,+BAAc,EAAC,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE;YAC9D,EAAE,EAAE,QAAQ;YACZ,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGetUser.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAA2B,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"handleGetUser.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAA2B,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAK5F,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,GAAG,sBAAsB,CAAC;AAE7E;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,CAiG9B;AAED,eAAO,MAAM,WAAW,GACtB,aAAa,iBAAiB,KAC7B,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC,WAEjE,CAAC"}
|
|
@@ -5,6 +5,7 @@ exports.handleGetUserThrottled = handleGetUserThrottled;
|
|
|
5
5
|
const prostgles_types_1 = require("prostgles-types");
|
|
6
6
|
const AuthHandler_1 = require("../AuthHandler");
|
|
7
7
|
const throttledReject_1 = require("./throttledReject");
|
|
8
|
+
const serverSideRequest_1 = require("./serverSideRequest");
|
|
8
9
|
/**
|
|
9
10
|
* For a given request return the user data if available using the auth handler's getUser method.
|
|
10
11
|
* Use cache data if configured in Auth
|
|
@@ -12,6 +13,21 @@ const throttledReject_1 = require("./throttledReject");
|
|
|
12
13
|
*/
|
|
13
14
|
async function handleGetUserThrottled(clientReq) {
|
|
14
15
|
const config = this.config;
|
|
16
|
+
if (!clientReq.httpReq && !clientReq.socket) {
|
|
17
|
+
const userId = (0, serverSideRequest_1.getServerSideUserId)(this.prostgles, clientReq);
|
|
18
|
+
if (!userId)
|
|
19
|
+
throw new Error("Invalid server-side user request");
|
|
20
|
+
if (!config?.findUser)
|
|
21
|
+
throw new Error("auth.findUser is required for userId requests");
|
|
22
|
+
const user = await config.findUser({ id: userId }, this.dbHandles.dbo);
|
|
23
|
+
if (!user || user.id !== userId)
|
|
24
|
+
throw new Error("User not found for userId request");
|
|
25
|
+
return {
|
|
26
|
+
sid: undefined,
|
|
27
|
+
user,
|
|
28
|
+
clientUser: { id: user.id, type: user.type },
|
|
29
|
+
};
|
|
30
|
+
}
|
|
15
31
|
if (!config) {
|
|
16
32
|
return {
|
|
17
33
|
sid: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGetUser.js","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"handleGetUser.js","sourceRoot":"","sources":["../../../lib/Auth/utils/handleGetUser.ts"],"names":[],"mappings":";;;AAeA,wDAoGC;AAlHD,qDAA2C;AAC3C,gDAA2E;AAG3E,uDAAsD;AACtD,2DAA0D;AAI1D;;;;GAIG;AACI,KAAK,UAAU,sBAAsB,CAE1C,SAA4B;IAE5B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAA,uCAAmB,EAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,EAAE,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACxF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACvE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,KAAK,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACtF,OAAO;YACL,GAAG,EAAE,SAAS;YACd,IAAI;YACJ,UAAU,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;SACf,CAAC;IAClC,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,GAAG,EAAE,SAAS;SACf,CAAC;IACJ,CAAC;IACD,MAAM,oBAAoB,GAAG,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC;IAE7D,sCAAsC;IACtC,MAAM,WAAW,GACf,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CACjC,CAAC,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAC/E,CAAC;IACJ,IAAI,SAAS,CAAC,MAAM,IAAI,WAAW,EAAE,CAAC;QACpC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC1E,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL,GAAG,QAAQ;gBACX,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC;QACJ,CAAC;;YACC,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC;IACN,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE;QAChD,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QACnC,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,OAAO,CAC1C,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAC/B,GAAG,EACH,EAAE,EACF,IAAA,qCAAuB,EAAC,SAAS,CAAC,EAClC,SAAS,CACV,CAAC;QACF,IAAI,IAAA,mBAAW,EAAC,eAAe,CAAC,EAAE,CAAC;YACjC,OAAO;gBACL,KAAK,EACH,IAAA,0BAAQ,EAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE;gBACzF,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;aACT,CAAC;QAChC,CAAC;QACD,MAAM,UAAU,GAAG,eAAe,CAAC;QAEnC,IAAI,UAAU,IAAI,MAAM,IAAI,UAAU,EAAE,CAAC;YACvC,IAAI,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBACpD,MAAM,2DAA2D,CAAC;YACpE,CAAC;YACD,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;YACnC,IAAI,CAAC,2BAA2B,CAAC,UAAU,CAAC,OAAO,EAAE;gBACnD,GAAG,EAAE,OAAO;gBACZ,GAAG,EAAE,GAA2B;aACjC,CAAC,CAAC;YACH,OAAO,sBAA+B,CAAC;QACzC,CAAC;QAED,8BAA8B;QAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,oBAAoB,IAAI,GAAG,EAAE,CAAC;YAChC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;YACnC,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YACzD,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,UAAU,EAAE,IAAI,EAAE,CAAC;gBACnD,MAAM,WAAW,GAAG;oBAClB,QAAQ,EAAE,UAAU;oBACpB,OAAO;iBACR,CAAC;gBACF,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;oBACrB,SAAS,CAAC,MAAM,CAAC,WAAW,KAAK,IAAI,GAAG,EAAE,CAAC;oBAC3C,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;gBACtE,CAAC;qBAAM,CAAC;oBACN,SAAS,CAAC,OAAO,CAAC,WAAW,KAAK,IAAI,GAAG,EAAE,CAAC;oBAC5C,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;gBACvE,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,UAAU,EAAE,IAAI,IAAI,GAAG,EAAE,CAAC;YAC5B,OAAO,EAAE,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAC7F,CAAC,EAAE,GAAG,CAAC,CAAC;IACR,OAAO,MAAM,CAAC;AAChB,CAAC;AAEM,MAAM,WAAW,GAAG,CACzB,WAA8B,EAC8C,EAAE;IAC9E,OAAO,OAAO,CAAC,OAAO,WAAW,KAAK,QAAQ,IAAI,CAAC,WAAW,IAAI,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC;AAC/F,CAAC,CAAC;AAJW,QAAA,WAAW,eAItB"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { AuthClientRequest } from "../AuthTypes";
|
|
2
|
+
import type { Prostgles } from "../../Prostgles";
|
|
3
|
+
/** This capability cannot be supplied through JSON, HTTP or socket payloads. */
|
|
4
|
+
declare const serverSideUser: unique symbol;
|
|
5
|
+
export type ServerSideRequest = {
|
|
6
|
+
readonly [serverSideUser]: {
|
|
7
|
+
readonly prostgles: Prostgles;
|
|
8
|
+
readonly userId: string;
|
|
9
|
+
};
|
|
10
|
+
socket?: undefined;
|
|
11
|
+
httpReq?: undefined;
|
|
12
|
+
res?: undefined;
|
|
13
|
+
};
|
|
14
|
+
export declare const createServerSideRequest: (prostgles: Prostgles, userId: string) => ServerSideRequest;
|
|
15
|
+
export declare const getServerSideUserId: (prostgles: Prostgles, request: AuthClientRequest) => string | undefined;
|
|
16
|
+
export {};
|
|
17
|
+
//# sourceMappingURL=serverSideRequest.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serverSideRequest.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/serverSideRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,gFAAgF;AAChF,QAAA,MAAM,cAAc,eAA2B,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,CAAC,cAAc,CAAC,EAAE;QAAE,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACtF,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,GAAG,CAAC,EAAE,SAAS,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,WAAW,SAAS,EAAE,QAAQ,MAAM,KAAG,iBAO9E,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,WAAW,SAAS,EAAE,SAAS,iBAAiB,uBAIvE,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getServerSideUserId = exports.createServerSideRequest = void 0;
|
|
4
|
+
/** This capability cannot be supplied through JSON, HTTP or socket payloads. */
|
|
5
|
+
const serverSideUser = Symbol("serverSideUser");
|
|
6
|
+
const createServerSideRequest = (prostgles, userId) => {
|
|
7
|
+
if (typeof userId !== "string" || !userId.length) {
|
|
8
|
+
throw new Error("userId must be a non-empty string");
|
|
9
|
+
}
|
|
10
|
+
return Object.freeze({
|
|
11
|
+
[serverSideUser]: Object.freeze({ prostgles, userId }),
|
|
12
|
+
});
|
|
13
|
+
};
|
|
14
|
+
exports.createServerSideRequest = createServerSideRequest;
|
|
15
|
+
const getServerSideUserId = (prostgles, request) => !request.socket && !request.httpReq &&
|
|
16
|
+
serverSideUser in request && request[serverSideUser].prostgles === prostgles ?
|
|
17
|
+
request[serverSideUser].userId
|
|
18
|
+
: undefined;
|
|
19
|
+
exports.getServerSideUserId = getServerSideUserId;
|
|
20
|
+
//# sourceMappingURL=serverSideRequest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serverSideRequest.js","sourceRoot":"","sources":["../../../lib/Auth/utils/serverSideRequest.ts"],"names":[],"mappings":";;;AAGA,gFAAgF;AAChF,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AASzC,MAAM,uBAAuB,GAAG,CAAC,SAAoB,EAAE,MAAc,EAAqB,EAAE;IACjG,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;KACvD,CAAC,CAAC;AACL,CAAC,CAAC;AAPW,QAAA,uBAAuB,2BAOlC;AAEK,MAAM,mBAAmB,GAAG,CAAC,SAAoB,EAAE,OAA0B,EAAE,EAAE,CACtF,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO;IACnC,cAAc,IAAI,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;IAC5E,OAAO,CAAC,cAAc,CAAC,CAAC,MAAM;IAChC,CAAC,CAAC,SAAS,CAAC;AAJD,QAAA,mBAAmB,uBAIlB"}
|
|
@@ -67,10 +67,6 @@ export declare class ViewHandler {
|
|
|
67
67
|
socketId: string | undefined;
|
|
68
68
|
}>;
|
|
69
69
|
abortRequests: Set<string>;
|
|
70
|
-
getDbHandlerWithAbort: (localParams: LocalParams | undefined, params: {
|
|
71
|
-
abortSignal: AbortSignal | undefined;
|
|
72
|
-
abortSignalId: string | undefined;
|
|
73
|
-
}) => Pick<import("../..").DB | pgPromise.ITask<{}>, "any" | "none" | "one" | "oneOrNone" | "many" | "manyOrNone">;
|
|
74
70
|
_log: ({ command, data, localParams, duration, error, }: Pick<TableEvent, "command" | "data" | "localParams"> & {
|
|
75
71
|
duration: number;
|
|
76
72
|
error?: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,20 +68,17 @@ class ViewHandler {
|
|
|
68
68
|
return localParams?.tx || this.tx;
|
|
69
69
|
};
|
|
70
70
|
abortRemoteQuery = (abortSignalId, localParams) => {
|
|
71
|
-
const
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
}
|
|
75
|
-
const abortableQuery = this.activeQueries.get(abortSignalId);
|
|
76
|
-
if (!abortableQuery || abortableQuery.sid !== sid) {
|
|
71
|
+
const abortSignalKeys = (0, getDbHandlerWithAbort_1.getAbortSignalKeys)(this.dboBuilder.prostgles, { abortSignalId }, localParams);
|
|
72
|
+
const abortableQuery = this.activeQueries.get(abortSignalKeys.abortSignalKey);
|
|
73
|
+
if (!abortableQuery) {
|
|
77
74
|
throw new Error(`No active query found with abortSignalId ${abortSignalId}. Ensure that the query was initiated with the correct abortSignalId.`);
|
|
78
75
|
}
|
|
76
|
+
this.abortRequests.add(abortSignalKeys.abortSignalKey);
|
|
79
77
|
abortableQuery.abort();
|
|
80
|
-
this.abortRequests.delete(
|
|
78
|
+
this.abortRequests.delete(abortSignalKeys.abortSignalKey);
|
|
81
79
|
};
|
|
82
80
|
activeQueries = new Map();
|
|
83
81
|
abortRequests = new Set();
|
|
84
|
-
getDbHandlerWithAbort = getDbHandlerWithAbort_1.getDbHandlerWithAbort.bind(this);
|
|
85
82
|
_log = ({ command, data, localParams, duration, error, }) => {
|
|
86
83
|
if (localParams?.noLog) {
|
|
87
84
|
if (localParams.clientReq) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":";;;AAUA,qDAAqE;AAQrE,6CAAkD;AAElD,8CAAoE;AAEpE,iFAA8E;AAC9E,8CAA2C;AAE3C,mCAAgC;AAChC,iCAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAEjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,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;AAGrC,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,CAuEjB"}
|
|
@@ -3,6 +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
|
+
const getDbHandlerWithAbort_1 = require("./getDbHandlerWithAbort");
|
|
6
7
|
async function count(_filter, selectParams, param3, table_rules, localParams) {
|
|
7
8
|
const filter = _filter || {};
|
|
8
9
|
const { limit: _limit, ...selectParamsWithoutLimit } = selectParams ?? {};
|
|
@@ -32,7 +33,7 @@ async function count(_filter, selectParams, param3, table_rules, localParams) {
|
|
|
32
33
|
if (queryToReturn) {
|
|
33
34
|
return queryToReturn;
|
|
34
35
|
}
|
|
35
|
-
const handler =
|
|
36
|
+
const handler = (0, getDbHandlerWithAbort_1.getDbHandlerWithAbort)(this, localParams, {
|
|
36
37
|
abortSignal: selectParams?.abortSignal,
|
|
37
38
|
abortSignalId: param3?.abortSignalId,
|
|
38
39
|
});
|
|
@@ -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":";;AAaA,sBA8EC;AAxFD,wDAI4B;AAE5B,6DAA0D;AAE1D,mEAAgE;AAEzD,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,EAC9B,WAAW,EACX,mBAAmB,EACnB,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CACnC,CAAC;YAEF,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,IAAA,6CAAqB,EAAC,IAAI,EAAE,WAAW,EAAE;gBACvD,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"}
|
|
@@ -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;AAWzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
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;AAWzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,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,CA8Hf,CAAC"}
|
|
@@ -7,6 +7,7 @@ const getNewQuery_1 = require("../QueryBuilder/getNewQuery");
|
|
|
7
7
|
const getSelectQuery_1 = require("../QueryBuilder/getSelectQuery");
|
|
8
8
|
const getReturnTypeQuery_1 = require("./getReturnTypeQuery");
|
|
9
9
|
const validateSelectParams_1 = require("./validateSelectParams");
|
|
10
|
+
const getDbHandlerWithAbort_1 = require("./getDbHandlerWithAbort");
|
|
10
11
|
const find = async function (filter = {}, selectParams, param3, tableRules, localParams) {
|
|
11
12
|
const start = Date.now();
|
|
12
13
|
const { limit, returnType, abortSignal } = selectParams ?? {};
|
|
@@ -55,7 +56,7 @@ const find = async function (filter = {}, selectParams, param3, tableRules, loca
|
|
|
55
56
|
}
|
|
56
57
|
const query = queryWithRLS;
|
|
57
58
|
const isOneOrNone = returnType === "row" || returnType === "value";
|
|
58
|
-
const dbHandler =
|
|
59
|
+
const dbHandler = (0, getDbHandlerWithAbort_1.getDbHandlerWithAbort)(this, localParams, {
|
|
59
60
|
abortSignal,
|
|
60
61
|
abortSignalId: param3?.abortSignalId,
|
|
61
62
|
});
|
|
@@ -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;AAC1D,iEAA8D;
|
|
1
|
+
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,15 @@ import type { DB } from "../../initProstgles";
|
|
|
2
2
|
import { type LocalParams } from "../DboBuilder";
|
|
3
3
|
import type { ViewHandler } from "./ViewHandler";
|
|
4
4
|
import type pgPromise from "pg-promise";
|
|
5
|
-
|
|
5
|
+
import type { Prostgles } from "../../Prostgles";
|
|
6
|
+
type Params = {
|
|
6
7
|
abortSignal: AbortSignal | undefined;
|
|
7
8
|
abortSignalId: string | undefined;
|
|
8
|
-
}
|
|
9
|
+
};
|
|
10
|
+
export declare const getDbHandlerWithAbort: (viewHandler: ViewHandler, localParams: LocalParams | undefined, params: Params) => Pick<DB | pgPromise.ITask<{}>, "any" | "one" | "many" | "manyOrNone" | "none" | "oneOrNone">;
|
|
11
|
+
export declare const getAbortSignalKeys: (prostgles: Prostgles, params: Pick<Params, "abortSignalId">, localParams: LocalParams | undefined) => {
|
|
12
|
+
abortSignalId: string;
|
|
13
|
+
abortSignalKey: string;
|
|
14
|
+
};
|
|
15
|
+
export {};
|
|
9
16
|
//# sourceMappingURL=getDbHandlerWithAbort.d.ts.map
|
|
@@ -1 +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,SAAS,MAAM,YAAY,CAAC;AAExC,
|
|
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,SAAS,MAAM,YAAY,CAAC;AAExC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,KAAK,MAAM,GAAG;IAAE,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAE1F,eAAO,MAAM,qBAAqB,GAChC,aAAa,WAAW,EACxB,aAAa,WAAW,GAAG,SAAS,EACpC,QAAQ,MAAM,KACb,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,YAAY,GAAG,MAAM,GAAG,WAAW,CAqG7F,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,WAAW,SAAS,EACpB,QAAQ,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,EACrC,aAAa,WAAW,GAAG,SAAS;;;CA+BrC,CAAC"}
|
|
@@ -1,27 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getDbHandlerWithAbort =
|
|
3
|
+
exports.getAbortSignalKeys = exports.getDbHandlerWithAbort = void 0;
|
|
4
4
|
const DboBuilder_1 = require("../DboBuilder");
|
|
5
|
-
|
|
5
|
+
const serverSideRequest_1 = require("../../Auth/utils/serverSideRequest");
|
|
6
|
+
const getDbHandlerWithAbort = (viewHandler, localParams, params) => {
|
|
6
7
|
if (params.abortSignal && params.abortSignalId) {
|
|
7
8
|
throw new Error("Cannot provide both abortSignal and abortSignalId");
|
|
8
9
|
}
|
|
9
10
|
if (params.abortSignal?.aborted) {
|
|
10
11
|
throw new Error("Query aborted before execution");
|
|
11
12
|
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
if (this.activeQueries.has(abortSignalId)) {
|
|
15
|
-
throw new Error(`A query with abortSignalId ${params.abortSignalId} is already active. Ensure that each query has a unique abortSignalId.`);
|
|
13
|
+
if (params.abortSignal !== undefined && !(params.abortSignal instanceof AbortSignal)) {
|
|
14
|
+
throw new Error("abortSignal must be an instance of AbortSignal");
|
|
16
15
|
}
|
|
17
|
-
const
|
|
18
|
-
const
|
|
16
|
+
const { clientReq } = localParams ?? {};
|
|
17
|
+
const abortSignal = params.abortSignal ?? AbortSignal.timeout(clientReq ? 7_000 : 120_000);
|
|
18
|
+
const { prostgles } = viewHandler.dboBuilder;
|
|
19
|
+
const handler = viewHandler.getTransaction(localParams)?.t ?? viewHandler.db;
|
|
20
|
+
const { adminClient } = prostgles;
|
|
19
21
|
if (!adminClient) {
|
|
20
22
|
throw new Error("adminClient not available. Ensure prostgles.adminClient is initialized before using abortable queries.");
|
|
21
23
|
}
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
24
|
+
const signalKeys = (0, exports.getAbortSignalKeys)(prostgles, params, localParams);
|
|
25
|
+
const { abortSignalKey } = signalKeys;
|
|
26
|
+
if (viewHandler.activeQueries.has(abortSignalKey)) {
|
|
27
|
+
throw new Error(`A query with abortSignalId ${params.abortSignalId} is already active. Ensure that each query has a unique abortSignalId.`);
|
|
25
28
|
}
|
|
26
29
|
const withAbortQuery = (func) => {
|
|
27
30
|
return (query, ...args) => {
|
|
@@ -31,30 +34,31 @@ function getDbHandlerWithAbort(localParams, params) {
|
|
|
31
34
|
throw new Error("Query does not have a prostgles query id prefix. Ensure that the query is generated using prostgles methods that include the query id.");
|
|
32
35
|
}
|
|
33
36
|
const abort = () => {
|
|
34
|
-
void
|
|
35
|
-
data: { query, abortSignalId },
|
|
37
|
+
void viewHandler._log({
|
|
38
|
+
data: { query, abortSignalId: signalKeys.abortSignalId },
|
|
36
39
|
command: "abort",
|
|
37
40
|
localParams,
|
|
38
|
-
duration: Date.now() - (
|
|
41
|
+
duration: Date.now() - (viewHandler.activeQueries.get(abortSignalKey)?.start ?? Date.now()),
|
|
39
42
|
error: new Error("Query aborted"),
|
|
40
43
|
});
|
|
41
44
|
/** Only terminate if there is exactly one matching query with a query id prefix */
|
|
42
|
-
|
|
45
|
+
viewHandler.abortRequests.delete(abortSignalKey);
|
|
43
46
|
void adminClient
|
|
44
47
|
.query(`
|
|
45
48
|
SELECT pg_cancel_backend(pid), *
|
|
46
49
|
FROM pg_stat_activity
|
|
47
50
|
WHERE query LIKE $1 AND pid <> pg_backend_pid()
|
|
48
51
|
`, [`${queryIdPrefix}%`])
|
|
49
|
-
.catch((
|
|
52
|
+
.catch((_err) => {
|
|
50
53
|
// ignore error
|
|
51
54
|
});
|
|
52
55
|
};
|
|
53
|
-
if (
|
|
54
|
-
|
|
55
|
-
throw new Error(
|
|
56
|
+
if (viewHandler.abortRequests.has(abortSignalKey)) {
|
|
57
|
+
viewHandler.abortRequests.delete(abortSignalKey);
|
|
58
|
+
throw new Error("Abort already requested");
|
|
56
59
|
}
|
|
57
|
-
|
|
60
|
+
const sid = prostgles.authHandler.getSIDNoError(clientReq);
|
|
61
|
+
viewHandler.activeQueries.set(abortSignalKey, {
|
|
58
62
|
query,
|
|
59
63
|
start: Date.now(),
|
|
60
64
|
sid,
|
|
@@ -64,8 +68,8 @@ function getDbHandlerWithAbort(localParams, params) {
|
|
|
64
68
|
abortSignal.addEventListener("abort", abort);
|
|
65
69
|
return func(query, ...args).finally(() => {
|
|
66
70
|
abortSignal.removeEventListener("abort", abort);
|
|
67
|
-
|
|
68
|
-
|
|
71
|
+
viewHandler.activeQueries.delete(abortSignalKey);
|
|
72
|
+
viewHandler.abortRequests.delete(abortSignalKey);
|
|
69
73
|
});
|
|
70
74
|
};
|
|
71
75
|
};
|
|
@@ -77,5 +81,35 @@ function getDbHandlerWithAbort(localParams, params) {
|
|
|
77
81
|
none: withAbortQuery(handler.none.bind(handler)),
|
|
78
82
|
many: withAbortQuery(handler.many.bind(handler)),
|
|
79
83
|
};
|
|
80
|
-
}
|
|
84
|
+
};
|
|
85
|
+
exports.getDbHandlerWithAbort = getDbHandlerWithAbort;
|
|
86
|
+
const getAbortSignalKeys = (prostgles, params, localParams) => {
|
|
87
|
+
const clientIdentifier = (() => {
|
|
88
|
+
const { clientReq } = localParams ?? {};
|
|
89
|
+
if (!clientReq) {
|
|
90
|
+
if (params.abortSignalId !== undefined) {
|
|
91
|
+
throw new Error("abortSignalId must not be provided for local requests. Use abortSignal instead.");
|
|
92
|
+
}
|
|
93
|
+
return ["<local-request>", "local"];
|
|
94
|
+
}
|
|
95
|
+
const sid = prostgles.authHandler.getSIDNoError(clientReq);
|
|
96
|
+
if (sid)
|
|
97
|
+
return [sid, "sid"];
|
|
98
|
+
const userId = (0, serverSideRequest_1.getServerSideUserId)(prostgles, clientReq);
|
|
99
|
+
if (userId)
|
|
100
|
+
return [userId, "userId"];
|
|
101
|
+
throw new Error("Cannot get SID or userId from client request. Ensure that the client is authenticated before using abortable queries.");
|
|
102
|
+
})();
|
|
103
|
+
const abortSignalId = params.abortSignalId ?? crypto.randomUUID();
|
|
104
|
+
const MAX_LENGTH = 36;
|
|
105
|
+
if (abortSignalId.length > MAX_LENGTH) {
|
|
106
|
+
throw new Error(`abortSignalId length must not exceed ${MAX_LENGTH} characters`);
|
|
107
|
+
}
|
|
108
|
+
const abortSignalKey = JSON.stringify([...clientIdentifier, abortSignalId]);
|
|
109
|
+
return {
|
|
110
|
+
abortSignalId,
|
|
111
|
+
abortSignalKey,
|
|
112
|
+
};
|
|
113
|
+
};
|
|
114
|
+
exports.getAbortSignalKeys = getAbortSignalKeys;
|
|
81
115
|
//# sourceMappingURL=getDbHandlerWithAbort.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDbHandlerWithAbort.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getDbHandlerWithAbort.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getDbHandlerWithAbort.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getDbHandlerWithAbort.ts"],"names":[],"mappings":";;;AACA,8CAAkE;AAGlE,0EAAyE;AAKlE,MAAM,qBAAqB,GAAG,CACnC,WAAwB,EACxB,WAAoC,EACpC,MAAc,EACgF,EAAE;IAChG,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,MAAM,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,WAAW,YAAY,WAAW,CAAC,EAAE,CAAC;QACrF,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,WAAW,IAAI,EAAE,CAAC;IACxC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC3F,MAAM,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC,UAAU,CAAC;IAC7C,MAAM,OAAO,GAAG,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,CAAC;IAC7E,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IAClC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CACb,wGAAwG,CACzG,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,0BAAkB,EAAC,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACtE,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC;IACtC,IAAI,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CACb,8BAA8B,MAAM,CAAC,aAAa,wEAAwE,CAC3H,CAAC;IACJ,CAAC;IAED,MAAM,cAAc,GAAG,CACrB,IAAyC,EACzC,EAAE;QACF,OAAO,CAAC,KAAa,EAAE,GAAG,IAAU,EAAE,EAAE;YACtC,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9C,MAAM,gBAAgB,GAAG,aAAa,EAAE,UAAU,CAAC,4BAAe,CAAC,CAAC;YACpE,IAAI,CAAC,aAAa,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CACb,wIAAwI,CACzI,CAAC;YACJ,CAAC;YAED,MAAM,KAAK,GAAG,GAAG,EAAE;gBACjB,KAAK,WAAW,CAAC,IAAI,CAAC;oBACpB,IAAI,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,UAAU,CAAC,aAAa,EAAE;oBACxD,OAAO,EAAE,OAAO;oBAChB,WAAW;oBACX,QAAQ,EACN,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,KAAK,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;oBACnF,KAAK,EAAE,IAAI,KAAK,CAAC,eAAe,CAAC;iBAClC,CAAC,CAAC;gBACH,mFAAmF;gBAEnF,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;gBACjD,KAAK,WAAW;qBACb,KAAK,CACJ;;;;aAIC,EACD,CAAC,GAAG,aAAa,GAAG,CAAC,CACtB;qBACA,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;oBACd,eAAe;gBACjB,CAAC,CAAC,CAAC;YACP,CAAC,CAAC;YAEF,IAAI,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;gBAClD,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;gBACjD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAC7C,CAAC;YAED,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAC3D,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE;gBAC5C,KAAK;gBACL,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;gBACjB,GAAG;gBACH,KAAK;gBACL,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;aAC7C,CAAC,CAAC;YACH,WAAW,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;gBACvC,WAAW,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAChD,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;gBACjD,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO;QACL,UAAU,EAAE,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5D,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,SAAS,EAAE,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1D,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACjD,CAAC;AACJ,CAAC,CAAC;AAzGW,QAAA,qBAAqB,yBAyGhC;AAEK,MAAM,kBAAkB,GAAG,CAChC,SAAoB,EACpB,MAAqC,EACrC,WAAoC,EACpC,EAAE;IACF,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE;QAC7B,MAAM,EAAE,SAAS,EAAE,GAAG,WAAW,IAAI,EAAE,CAAC;QACxC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;gBACvC,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,GAAG;YAAE,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAA,uCAAmB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACzD,IAAI,MAAM;YAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACtC,MAAM,IAAI,KAAK,CACb,uHAAuH,CACxH,CAAC;IACJ,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;IAElE,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,IAAI,aAAa,CAAC,MAAM,GAAG,UAAU,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,wCAAwC,UAAU,aAAa,CAAC,CAAC;IACnF,CAAC;IACD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,gBAAgB,EAAE,aAAa,CAAC,CAAC,CAAC;IAC5E,OAAO;QACL,aAAa;QACb,cAAc;KACf,CAAC;AACJ,CAAC,CAAC;AAlCW,QAAA,kBAAkB,sBAkC7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"size.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/size.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,oBAAoB,CAAC;AAM9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"size.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/size.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,oBAAoB,CAAC;AAM9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,wBAAsB,IAAI,CACxB,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,CA0EjB"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.size = size;
|
|
4
4
|
const dboBuilderUtils_1 = require("../dboBuilderUtils");
|
|
5
5
|
const getReturnTypeQuery_1 = require("./getReturnTypeQuery");
|
|
6
|
+
const getDbHandlerWithAbort_1 = require("./getDbHandlerWithAbort");
|
|
6
7
|
async function size(_filter, selectParams, param3, table_rules, localParams) {
|
|
7
8
|
const filter = _filter || {};
|
|
8
9
|
const start = Date.now();
|
|
@@ -30,7 +31,7 @@ async function size(_filter, selectParams, param3, table_rules, localParams) {
|
|
|
30
31
|
if (queryToReturn) {
|
|
31
32
|
return queryToReturn;
|
|
32
33
|
}
|
|
33
|
-
const handler =
|
|
34
|
+
const handler = (0, getDbHandlerWithAbort_1.getDbHandlerWithAbort)(this, localParams, {
|
|
34
35
|
abortSignal: selectParams?.abortSignal,
|
|
35
36
|
abortSignalId: param3?.abortSignalId,
|
|
36
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"size.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/size.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"size.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/size.ts"],"names":[],"mappings":";;AAYA,oBAiFC;AA1FD,wDAI4B;AAE5B,6DAA0D;AAE1D,mEAAgE;AACzD,KAAK,UAAU,IAAI,CAExB,OAAgB,EAChB,YAA2B,EAC3B,MAAe,EACf,WAA6B,EAC7B,WAAyB;IAEzB,MAAM,MAAM,GAAG,OAAO,IAAI,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAC5B,MAAM,EACN,EAAE,GAAG,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,EAC7B,MAAM,EACN,WAAW,EACX,WAAW,CACZ,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACxB,MAAM,qBAAqB,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAC5C,MAAM,EACN;gBACE,GAAG,YAAY;gBACf,KAAK,EAAE,YAAY,EAAE,KAAK,IAAI,MAAM,CAAC,gBAAgB;aACtD,EACD,SAAS,EACT,WAAW,EACX,EAAE,GAAG,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAC5D,CAAsB,CAAC;YAExB,MAAM,mBAAmB,GAAG;;;YAGtB,qBAAqB;;OAE1B,CAAC;YACF,MAAM,YAAY,GAAG,IAAA,6BAAW,EAC9B,WAAW,EACX,mBAAmB,EACnB,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CACnC,CAAC;YAEF,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,IAAA,6CAAqB,EAAC,IAAI,EAAE,WAAW,EAAE;gBACvD,WAAW,EAAE,YAAY,EAAE,WAAW;gBACtC,aAAa,EAAE,MAAM,EAAE,aAAa;aACrC,CAAC,CAAC;YACH,OAAO,OAAO,CAAC,GAAG,CAA0B,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;QAC5F,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,MAAM;YACf,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;YAC9B,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,MAAM;YACf,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;YAC9B,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"}
|