prostgles-server 4.2.560 → 4.2.566
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/endpoints/setOAuthRequestHandlers.d.ts.map +1 -1
- package/dist/Auth/endpoints/setOAuthRequestHandlers.js +9 -6
- package/dist/Auth/endpoints/setOAuthRequestHandlers.js.map +1 -1
- package/dist/Auth/sendEmail.js +34 -1
- package/dist/Auth/sendEmail.js.map +1 -1
- package/dist/DBSchemaBuilder/DBSchemaBuilder.spec.js +4 -1
- package/dist/DBSchemaBuilder/DBSchemaBuilder.spec.js.map +1 -1
- package/dist/DBSchemaBuilder/getGlobalBuiltinTypes.js +34 -1
- package/dist/DBSchemaBuilder/getGlobalBuiltinTypes.js.map +1 -1
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.js +34 -1
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.js.map +1 -1
- package/dist/DBSchemaBuilder/resolveTypeToStructure.js +34 -1
- package/dist/DBSchemaBuilder/resolveTypeToStructure.js.map +1 -1
- package/dist/DboBuilder/DboBuilderTypes.d.ts +1 -1
- package/dist/DboBuilder/DboBuilderTypes.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilderTypes.js +5 -2
- package/dist/DboBuilder/DboBuilderTypes.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/Functions.js +5 -2
- package/dist/DboBuilder/QueryBuilder/Functions/Functions.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/HASHING_FUNCTIONS.js +5 -2
- package/dist/DboBuilder/QueryBuilder/Functions/HASHING_FUNCTIONS.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/TEXT_FUNCTIONS.js +5 -2
- package/dist/DboBuilder/QueryBuilder/Functions/TEXT_FUNCTIONS.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +3 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js +2 -0
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.d.ts +1 -1
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.js +15 -7
- package/dist/DboBuilder/ViewHandler/getDbHandlerWithAbort.js.map +1 -1
- package/dist/DboBuilder/runSql/QueryStreamer.js +34 -1
- package/dist/DboBuilder/runSql/QueryStreamer.js.map +1 -1
- package/dist/DboBuilder/runSql/getAdminClient.js +34 -1
- package/dist/DboBuilder/runSql/getAdminClient.js.map +1 -1
- package/dist/FileManager/FileManager.js +39 -3
- package/dist/FileManager/FileManager.js.map +1 -1
- package/dist/FileManager/initFileManager.js +34 -1
- package/dist/FileManager/initFileManager.js.map +1 -1
- package/dist/FileManager/upload.js +35 -2
- package/dist/FileManager/upload.js.map +1 -1
- package/dist/FileManager/uploadStream.js +36 -3
- package/dist/FileManager/uploadStream.js.map +1 -1
- package/dist/Logging.d.ts +9 -2
- package/dist/Logging.d.ts.map +1 -1
- package/dist/Prostgles.d.ts +1 -1
- package/dist/Prostgles.d.ts.map +1 -1
- package/dist/Prostgles.js +38 -2
- package/dist/Prostgles.js.map +1 -1
- package/dist/PubSubManager/PubSubManagerUtils.d.ts +1 -1
- package/dist/PubSubManager/PubSubManagerUtils.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManagerUtils.js +5 -2
- package/dist/PubSubManager/PubSubManagerUtils.js.map +1 -1
- package/dist/PubSubManager/addTrigger.js +34 -1
- package/dist/PubSubManager/addTrigger.js.map +1 -1
- package/dist/PubSubManager/initialiseEventTriggers.js +34 -1
- package/dist/PubSubManager/initialiseEventTriggers.js.map +1 -1
- package/dist/WebsocketAPI/onSocketConnected.d.ts.map +1 -1
- package/dist/WebsocketAPI/onSocketConnected.js +6 -9
- package/dist/WebsocketAPI/onSocketConnected.js.map +1 -1
- package/dist/getDbConnection.d.ts.map +1 -1
- package/dist/getDbConnection.js +6 -3
- package/dist/getDbConnection.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.map +1 -1
- package/dist/runClientRequest.js +1 -0
- package/dist/runClientRequest.js.map +1 -1
- package/lib/Auth/endpoints/setOAuthRequestHandlers.ts +7 -8
- package/lib/DboBuilder/DboBuilderTypes.ts +1 -1
- package/lib/DboBuilder/QueryBuilder/Functions/Functions.ts +1 -1
- package/lib/DboBuilder/QueryBuilder/Functions/HASHING_FUNCTIONS.ts +1 -1
- package/lib/DboBuilder/QueryBuilder/Functions/TEXT_FUNCTIONS.ts +1 -1
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +10 -2
- package/lib/DboBuilder/ViewHandler/getDbHandlerWithAbort.ts +18 -8
- package/lib/FileManager/FileManager.ts +1 -1
- package/lib/Logging.ts +20 -10
- package/lib/Prostgles.ts +1 -1
- package/lib/PubSubManager/PubSubManagerUtils.ts +1 -1
- package/lib/WebsocketAPI/onSocketConnected.ts +6 -9
- package/lib/getDbConnection.ts +3 -4
- package/lib/initProstgles.ts +2 -0
- package/lib/runClientRequest.ts +1 -0
- package/package.json +1 -1
- package/tsconfig.json +4 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,22 @@
|
|
|
1
1
|
import type e from "express";
|
|
2
|
-
import
|
|
2
|
+
import passport from "passport";
|
|
3
3
|
import { Strategy as FacebookStrategy } from "passport-facebook";
|
|
4
4
|
import { Strategy as GitHubStrategy } from "passport-github2";
|
|
5
5
|
import { Strategy as GoogleStrategy } from "passport-google-oauth20";
|
|
6
6
|
import { Strategy as MicrosoftStrategy } from "passport-microsoft";
|
|
7
|
+
import OAuth2Strategy from "passport-oauth2";
|
|
7
8
|
import { getObjectEntries, isEmpty } from "prostgles-types";
|
|
8
9
|
import { getErrorAsObject } from "../../DboBuilder/dboBuilderUtils";
|
|
9
|
-
import type { DBOFullyTyped } from "../../DBSchemaBuilder/DBSchemaBuilder";
|
|
10
10
|
import type { AuthHandler } from "../AuthHandler";
|
|
11
11
|
import { HTTP_FAIL_CODES } from "../AuthHandler";
|
|
12
12
|
import type { AuthProviderUserData, LoginWithOAuthConfig } from "../AuthTypes";
|
|
13
13
|
import { getClientRequestIPsInfo } from "../utils/getClientRequestIPsInfo";
|
|
14
14
|
import { upsertNamedExpressMiddleware } from "../utils/upsertNamedExpressMiddleware";
|
|
15
15
|
import type { LoginResponseHandler } from "./setLoginRequestHandler";
|
|
16
|
-
import OAuth2Strategy from "passport-oauth2";
|
|
17
16
|
export function setOAuthRequestHandlers(
|
|
18
17
|
this: AuthHandler,
|
|
19
18
|
app: e.Express,
|
|
20
|
-
loginWithOAuthConfig: LoginWithOAuthConfig<void
|
|
19
|
+
loginWithOAuthConfig: LoginWithOAuthConfig<void>,
|
|
21
20
|
) {
|
|
22
21
|
const { onProviderLoginFail, onProviderLoginStart, websiteUrl, OAuthProviders } =
|
|
23
22
|
loginWithOAuthConfig;
|
|
@@ -50,8 +49,8 @@ export function setOAuthRequestHandlers(
|
|
|
50
49
|
(accessToken, refreshToken, profile, done) => {
|
|
51
50
|
// This callback is where you would normally store or retrieve user info from the database
|
|
52
51
|
return done(null, profile, { accessToken, refreshToken, profile });
|
|
53
|
-
}
|
|
54
|
-
)
|
|
52
|
+
},
|
|
53
|
+
),
|
|
55
54
|
);
|
|
56
55
|
|
|
57
56
|
const authPath = `${this.authRoutes.loginWithProvider}/${providerName}`;
|
|
@@ -91,11 +90,11 @@ export function setOAuthRequestHandlers(
|
|
|
91
90
|
}).catch((e: any) => {
|
|
92
91
|
res.status(HTTP_FAIL_CODES.INTERNAL_SERVER_ERROR).json(
|
|
93
92
|
//@ts-ignore
|
|
94
|
-
getErrorAsObject(e)
|
|
93
|
+
getErrorAsObject(e),
|
|
95
94
|
);
|
|
96
95
|
});
|
|
97
96
|
}
|
|
98
|
-
}
|
|
97
|
+
},
|
|
99
98
|
)(req, res);
|
|
100
99
|
} catch (_e) {
|
|
101
100
|
res
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import pgPromise from "pg-promise";
|
|
2
2
|
import type { ColumnInfo, PG_COLUMN_UDT_DATA_TYPE } from "prostgles-types";
|
|
3
3
|
import { asName, includes, isObject, TextFilter_FullTextSearchFilterKeys } from "prostgles-types";
|
|
4
4
|
import { asNameAlias } from "../../../utils/asNameAlias";
|
|
@@ -3,7 +3,7 @@ import { asValue } from "../../../PubSubManager/PubSubManagerUtils";
|
|
|
3
3
|
import { parseFieldFilter } from "../../ViewHandler/parseFieldFilter";
|
|
4
4
|
import { asFunction } from "./utils";
|
|
5
5
|
import type { FunctionSpec } from "./Functions";
|
|
6
|
-
import
|
|
6
|
+
import pgPromise from "pg-promise";
|
|
7
7
|
import { asNameAlias } from "../../../utils/asNameAlias";
|
|
8
8
|
const pgp = pgPromise();
|
|
9
9
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import type pgPromise from "pg-promise";
|
|
2
2
|
import type {
|
|
3
3
|
AnyObject,
|
|
4
4
|
ColumnInfo,
|
|
@@ -128,12 +128,20 @@ export class ViewHandler {
|
|
|
128
128
|
);
|
|
129
129
|
}
|
|
130
130
|
abortableQuery.abort();
|
|
131
|
+
this.abortRequests.delete(abortSignalId);
|
|
131
132
|
};
|
|
132
133
|
|
|
133
134
|
activeQueries = new Map<
|
|
134
135
|
string,
|
|
135
|
-
{
|
|
136
|
+
{
|
|
137
|
+
abort: VoidFunction;
|
|
138
|
+
query: string;
|
|
139
|
+
start: number;
|
|
140
|
+
sid: string | undefined;
|
|
141
|
+
socketId: string | undefined;
|
|
142
|
+
}
|
|
136
143
|
>();
|
|
144
|
+
abortRequests = new Set<string>();
|
|
137
145
|
getDbHandlerWithAbort = getDbHandlerWithAbort.bind(this);
|
|
138
146
|
|
|
139
147
|
_log = ({
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { DB } from "../../initProstgles";
|
|
2
2
|
import { QUERY_ID_PREFIX, type LocalParams } from "../DboBuilder";
|
|
3
3
|
import type { ViewHandler } from "./ViewHandler";
|
|
4
|
-
import type
|
|
4
|
+
import type pgPromise from "pg-promise";
|
|
5
5
|
|
|
6
6
|
export function getDbHandlerWithAbort(
|
|
7
7
|
this: ViewHandler,
|
|
@@ -52,37 +52,47 @@ export function getDbHandlerWithAbort(
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
const abort = () => {
|
|
55
|
+
void this._log({
|
|
56
|
+
data: { query, abortSignalId },
|
|
57
|
+
command: "abort",
|
|
58
|
+
localParams,
|
|
59
|
+
duration: Date.now() - (this.activeQueries.get(abortSignalId)?.start ?? Date.now()),
|
|
60
|
+
error: new Error("Query aborted"),
|
|
61
|
+
});
|
|
55
62
|
/** Only terminate if there is exactly one matching query with a query id prefix */
|
|
56
63
|
|
|
64
|
+
this.abortRequests.delete(abortSignalId);
|
|
57
65
|
void adminClient
|
|
58
66
|
.query(
|
|
59
67
|
`
|
|
60
|
-
SELECT
|
|
68
|
+
SELECT pg_cancel_backend(pid), *
|
|
61
69
|
FROM pg_stat_activity
|
|
62
70
|
WHERE query LIKE $1 AND pid <> pg_backend_pid()
|
|
63
71
|
`,
|
|
64
72
|
[`${queryIdPrefix}%`],
|
|
65
73
|
)
|
|
66
|
-
.then((res) => {
|
|
67
|
-
// if (params.abortSignalId) {
|
|
68
|
-
// console.log(JSON.stringify(res.rows));
|
|
69
|
-
// process.exit(1);
|
|
70
|
-
// }
|
|
71
|
-
})
|
|
72
74
|
.catch((err) => {
|
|
73
75
|
// ignore error
|
|
74
76
|
});
|
|
75
77
|
};
|
|
78
|
+
|
|
79
|
+
if (this.abortRequests.has(abortSignalId)) {
|
|
80
|
+
this.abortRequests.delete(abortSignalId);
|
|
81
|
+
throw new Error(`Abort requested`);
|
|
82
|
+
}
|
|
83
|
+
|
|
76
84
|
this.activeQueries.set(abortSignalId, {
|
|
77
85
|
query,
|
|
78
86
|
start: Date.now(),
|
|
79
87
|
sid,
|
|
80
88
|
abort,
|
|
89
|
+
socketId: localParams?.clientReq?.socket?.id,
|
|
81
90
|
});
|
|
82
91
|
abortSignal.addEventListener("abort", abort);
|
|
83
92
|
return func(query, ...args).finally(() => {
|
|
84
93
|
abortSignal.removeEventListener("abort", abort);
|
|
85
94
|
this.activeQueries.delete(abortSignalId);
|
|
95
|
+
this.abortRequests.delete(abortSignalId);
|
|
86
96
|
});
|
|
87
97
|
};
|
|
88
98
|
};
|
|
@@ -329,7 +329,7 @@ export const getFileType = async (
|
|
|
329
329
|
): Promise<{ mime: ALLOWED_CONTENT_TYPE; ext: ALLOWED_EXTENSION }> => {
|
|
330
330
|
const { fileTypeFromBuffer } = await (eval('import("file-type")') as Promise<
|
|
331
331
|
// eslint-disable-next-line @typescript-eslint/consistent-type-imports
|
|
332
|
-
typeof import("file-type")
|
|
332
|
+
typeof import("file-type", { with: { "resolution-mode": "import" } })
|
|
333
333
|
>);
|
|
334
334
|
|
|
335
335
|
const fileNameMime = getFileTypeFromFilename(fileName);
|
package/lib/Logging.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AnyObject, ClientSchema, TableHandler } from "prostgles-types";
|
|
1
|
+
import type { ABORTABLE_METHODS, AnyObject, ClientSchema, TableHandler } from "prostgles-types";
|
|
2
2
|
import type { LocalParams } from "./DboBuilder/DboBuilder";
|
|
3
3
|
import type { PubSubManagerTriggers, SyncParams } from "./PubSubManager/PubSubManager";
|
|
4
4
|
import type { NotifTypeName } from "./PubSubManager/PubSubManagerUtils";
|
|
@@ -14,15 +14,25 @@ export namespace EventTypes {
|
|
|
14
14
|
error?: any;
|
|
15
15
|
};
|
|
16
16
|
|
|
17
|
-
export type Table =
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
17
|
+
export type Table =
|
|
18
|
+
| (ClientInfo &
|
|
19
|
+
DebugInfo & {
|
|
20
|
+
type: "table";
|
|
21
|
+
tableName: string;
|
|
22
|
+
command: keyof TableHandler | "sync";
|
|
23
|
+
txInfo: AnyObject | undefined;
|
|
24
|
+
data: AnyObject;
|
|
25
|
+
localParams: LocalParams | undefined;
|
|
26
|
+
})
|
|
27
|
+
| (ClientInfo &
|
|
28
|
+
DebugInfo & {
|
|
29
|
+
type: "table";
|
|
30
|
+
tableName: string;
|
|
31
|
+
command: "abort";
|
|
32
|
+
txInfo: AnyObject | undefined;
|
|
33
|
+
data: AnyObject;
|
|
34
|
+
localParams: LocalParams | undefined;
|
|
35
|
+
});
|
|
26
36
|
|
|
27
37
|
export type Sync = ClientInfo &
|
|
28
38
|
DebugInfo & {
|
package/lib/Prostgles.ts
CHANGED
|
@@ -42,16 +42,13 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
|
42
42
|
this.dbEventsManager?.removeNotify(undefined, socket);
|
|
43
43
|
this.connectedSockets = this.connectedSockets.filter((s) => s.id !== socket.id);
|
|
44
44
|
this.dboBuilder.queryStreamer.onDisconnect(socket.id);
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
activeQuery.abort();
|
|
51
|
-
}
|
|
52
|
-
});
|
|
45
|
+
this.dboBuilder.dboMap.forEach((tableHandler) => {
|
|
46
|
+
tableHandler.activeQueries.forEach((activeQuery) => {
|
|
47
|
+
if (activeQuery.socketId === socket.id) {
|
|
48
|
+
activeQuery.abort();
|
|
49
|
+
}
|
|
53
50
|
});
|
|
54
|
-
}
|
|
51
|
+
});
|
|
55
52
|
|
|
56
53
|
void this.opts.onSocketDisconnect?.({ socket, dbo: dbo as DBOFullyTyped, db, getUser });
|
|
57
54
|
});
|
package/lib/getDbConnection.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import pgPromise from "pg-promise";
|
|
2
2
|
import type { ProstglesInitOptions } from "./ProstglesTypes";
|
|
3
3
|
import type { DB, PGP } from "./initProstgles";
|
|
4
4
|
import type pg from "pg-promise/typescript/pg-subset";
|
|
@@ -15,8 +15,7 @@ export const getDbConnection = function ({
|
|
|
15
15
|
onNotice,
|
|
16
16
|
}: GetDbConnectionArgs): { db: DB; pgp: PGP } {
|
|
17
17
|
const onQueryOrError:
|
|
18
|
-
|
|
|
19
|
-
| ((error: any, ctx: pgPromise.IEventContext<pg.IClient>) => void) =
|
|
18
|
+
undefined | ((error: any, ctx: pgPromise.IEventContext<pg.IClient>) => void) =
|
|
20
19
|
!onQuery && !DEBUG_MODE ?
|
|
21
20
|
undefined
|
|
22
21
|
: (error, ctx) => {
|
|
@@ -48,7 +47,7 @@ export const getDbConnection = function ({
|
|
|
48
47
|
client.on("notice", function (msg) {
|
|
49
48
|
if (onNotice) {
|
|
50
49
|
onNotice(msg, msg?.message);
|
|
51
|
-
} else {
|
|
50
|
+
} else if (DEBUG_MODE) {
|
|
52
51
|
console.log("notice: %j", msg?.message);
|
|
53
52
|
}
|
|
54
53
|
});
|
package/lib/initProstgles.ts
CHANGED
|
@@ -281,6 +281,8 @@ export const initProstgles = async function (
|
|
|
281
281
|
this.dbo = undefined;
|
|
282
282
|
this.db = undefined;
|
|
283
283
|
await db.$pool.end();
|
|
284
|
+
await this.adminClient?.end().catch(() => {});
|
|
285
|
+
this.adminClient = undefined;
|
|
284
286
|
await sleep(1000);
|
|
285
287
|
return true;
|
|
286
288
|
},
|
package/lib/runClientRequest.ts
CHANGED
|
@@ -160,6 +160,7 @@ export const runClientRequest = async function (
|
|
|
160
160
|
scope,
|
|
161
161
|
);
|
|
162
162
|
|
|
163
|
+
tableHandler.abortRequests.add(validation.data.param1.abortSignalId);
|
|
163
164
|
return tableHandler.abortRemoteQuery(validation.data.param1.abortSignalId, localParams);
|
|
164
165
|
} else {
|
|
165
166
|
this.publishParser.validateRequestRule(
|
package/package.json
CHANGED
package/tsconfig.json
CHANGED
|
@@ -6,11 +6,11 @@
|
|
|
6
6
|
"es2022"
|
|
7
7
|
],
|
|
8
8
|
"strict": true,
|
|
9
|
-
"module": "
|
|
9
|
+
"module": "node16",
|
|
10
10
|
"sourceMap": true,
|
|
11
11
|
"rootDir": "./lib",
|
|
12
12
|
"outDir": "dist",
|
|
13
|
-
"moduleResolution": "
|
|
13
|
+
"moduleResolution": "node16",
|
|
14
14
|
"allowSyntheticDefaultImports": true,
|
|
15
15
|
"resolveJsonModule": true,
|
|
16
16
|
"noUncheckedIndexedAccess": true,
|
|
@@ -18,7 +18,8 @@
|
|
|
18
18
|
"declaration": true,
|
|
19
19
|
"skipLibCheck": true,
|
|
20
20
|
"declarationMap": true,
|
|
21
|
-
"noImplicitAny": true
|
|
21
|
+
"noImplicitAny": true,
|
|
22
|
+
"esModuleInterop": true
|
|
22
23
|
},
|
|
23
24
|
"include": [
|
|
24
25
|
"lib/**/*.spec.ts"
|