prostgles-server 4.2.276 → 4.2.277
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onSocketConnected.d.ts","sourceRoot":"","sources":["../lib/onSocketConnected.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAM5D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"onSocketConnected.d.ts","sourceRoot":"","sources":["../lib/onSocketConnected.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAM5D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,iBA0I5E;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,EAAE,GAAG,EAAE,GAAG,QAErE"}
|
|
@@ -6,11 +6,14 @@ const runClientRequest_1 = require("./runClientRequest");
|
|
|
6
6
|
const dboBuilderUtils_1 = require("./DboBuilder/dboBuilderUtils");
|
|
7
7
|
const AuthHandler_1 = require("./Auth/AuthHandler");
|
|
8
8
|
async function onSocketConnected(socket) {
|
|
9
|
+
if (!this.db || !this.dbo)
|
|
10
|
+
throw new Error("db/dbo missing");
|
|
9
11
|
if (this.destroyed) {
|
|
10
12
|
console.log("Socket connected to destroyed instance");
|
|
11
13
|
socket.disconnect();
|
|
12
14
|
return;
|
|
13
15
|
}
|
|
16
|
+
const { dbo, db } = this;
|
|
14
17
|
this.connectedSockets.push(socket);
|
|
15
18
|
try {
|
|
16
19
|
const getUser = async () => {
|
|
@@ -18,19 +21,35 @@ async function onSocketConnected(socket) {
|
|
|
18
21
|
throw "authHandler missing";
|
|
19
22
|
const res = await this.authHandler.getSidAndUserFromRequest({ socket });
|
|
20
23
|
if (res === "new-session-redirect") {
|
|
24
|
+
socket.emit(prostgles_types_1.CHANNELS.AUTHGUARD, {
|
|
25
|
+
shouldReload: true,
|
|
26
|
+
error: res,
|
|
27
|
+
});
|
|
21
28
|
throw "new-session-redirect";
|
|
22
29
|
}
|
|
23
30
|
return res;
|
|
24
31
|
};
|
|
32
|
+
socket.on("disconnect", () => {
|
|
33
|
+
this.dbEventsManager?.removeNotice(socket);
|
|
34
|
+
this.dbEventsManager?.removeNotify(undefined, socket);
|
|
35
|
+
this.connectedSockets = this.connectedSockets.filter((s) => s.id !== socket.id);
|
|
36
|
+
this.dboBuilder.queryStreamer.onDisconnect(socket.id);
|
|
37
|
+
void this.opts.onLog?.({
|
|
38
|
+
type: "disconnect",
|
|
39
|
+
sid: this.authHandler?.getValidatedSid({ socket }),
|
|
40
|
+
socketId: socket.id,
|
|
41
|
+
connectedSocketIds: this.connectedSockets.map((s) => s.id),
|
|
42
|
+
});
|
|
43
|
+
if (this.opts.onSocketDisconnect) {
|
|
44
|
+
void this.opts.onSocketDisconnect({ socket, dbo: dbo, db, getUser });
|
|
45
|
+
}
|
|
46
|
+
});
|
|
25
47
|
await this.opts.onLog?.({
|
|
26
48
|
type: "connect",
|
|
27
49
|
sid: this.authHandler?.getValidatedSid({ socket }),
|
|
28
50
|
socketId: socket.id,
|
|
29
51
|
connectedSocketIds: this.connectedSockets.map((s) => s.id),
|
|
30
52
|
});
|
|
31
|
-
if (!this.db || !this.dbo)
|
|
32
|
-
throw new Error("db/dbo missing");
|
|
33
|
-
const { dbo, db } = this;
|
|
34
53
|
const { onUseOrSocketConnected } = this.opts.auth ?? {};
|
|
35
54
|
const { authHandler } = this;
|
|
36
55
|
if (onUseOrSocketConnected) {
|
|
@@ -76,21 +95,6 @@ async function onSocketConnected(socket) {
|
|
|
76
95
|
cb(err);
|
|
77
96
|
});
|
|
78
97
|
});
|
|
79
|
-
socket.on("disconnect", () => {
|
|
80
|
-
this.dbEventsManager?.removeNotice(socket);
|
|
81
|
-
this.dbEventsManager?.removeNotify(undefined, socket);
|
|
82
|
-
this.connectedSockets = this.connectedSockets.filter((s) => s.id !== socket.id);
|
|
83
|
-
this.dboBuilder.queryStreamer.onDisconnect(socket.id);
|
|
84
|
-
void this.opts.onLog?.({
|
|
85
|
-
type: "disconnect",
|
|
86
|
-
sid: this.authHandler?.getValidatedSid({ socket }),
|
|
87
|
-
socketId: socket.id,
|
|
88
|
-
connectedSocketIds: this.connectedSockets.map((s) => s.id),
|
|
89
|
-
});
|
|
90
|
-
if (this.opts.onSocketDisconnect) {
|
|
91
|
-
void this.opts.onSocketDisconnect({ socket, dbo: dbo, db, getUser });
|
|
92
|
-
}
|
|
93
|
-
});
|
|
94
98
|
socket.removeAllListeners(prostgles_types_1.CHANNELS.METHOD);
|
|
95
99
|
socket.on(prostgles_types_1.CHANNELS.METHOD, ({ method, params }, cb = (..._callback) => {
|
|
96
100
|
/* Empty */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onSocketConnected.js","sourceRoot":"","sources":["../lib/onSocketConnected.ts"],"names":[],"mappings":";;;AAAA,qDAAsD;AAGtD,yDAAuE;AACvE,kEAAgE;AAEhE,oDAA6D;AAEtD,KAAK,UAAU,iBAAiB,CAAkB,MAAoB;IAC3E,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QACtD,MAAM,CAAC,UAAU,EAAE,CAAC;QACpB,OAAO;IACT,CAAC;
|
|
1
|
+
{"version":3,"file":"onSocketConnected.js","sourceRoot":"","sources":["../lib/onSocketConnected.ts"],"names":[],"mappings":"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"}
|
package/lib/onSocketConnected.ts
CHANGED
|
@@ -7,11 +7,14 @@ import { DBOFullyTyped } from "./DBSchemaBuilder";
|
|
|
7
7
|
import { getClientRequestIPsInfo } from "./Auth/AuthHandler";
|
|
8
8
|
|
|
9
9
|
export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
10
|
+
if (!this.db || !this.dbo) throw new Error("db/dbo missing");
|
|
10
11
|
if (this.destroyed) {
|
|
11
12
|
console.log("Socket connected to destroyed instance");
|
|
12
13
|
socket.disconnect();
|
|
13
14
|
return;
|
|
14
15
|
}
|
|
16
|
+
|
|
17
|
+
const { dbo, db } = this;
|
|
15
18
|
this.connectedSockets.push(socket);
|
|
16
19
|
|
|
17
20
|
try {
|
|
@@ -19,11 +22,32 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
|
19
22
|
if (!this.authHandler) throw "authHandler missing";
|
|
20
23
|
const res = await this.authHandler.getSidAndUserFromRequest({ socket });
|
|
21
24
|
if (res === "new-session-redirect") {
|
|
25
|
+
socket.emit(CHANNELS.AUTHGUARD, {
|
|
26
|
+
shouldReload: true,
|
|
27
|
+
error: res,
|
|
28
|
+
});
|
|
22
29
|
throw "new-session-redirect";
|
|
23
30
|
}
|
|
24
31
|
return res;
|
|
25
32
|
};
|
|
26
33
|
|
|
34
|
+
socket.on("disconnect", () => {
|
|
35
|
+
this.dbEventsManager?.removeNotice(socket);
|
|
36
|
+
this.dbEventsManager?.removeNotify(undefined, socket);
|
|
37
|
+
this.connectedSockets = this.connectedSockets.filter((s) => s.id !== socket.id);
|
|
38
|
+
this.dboBuilder.queryStreamer.onDisconnect(socket.id);
|
|
39
|
+
void this.opts.onLog?.({
|
|
40
|
+
type: "disconnect",
|
|
41
|
+
sid: this.authHandler?.getValidatedSid({ socket }),
|
|
42
|
+
socketId: socket.id,
|
|
43
|
+
connectedSocketIds: this.connectedSockets.map((s) => s.id),
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
if (this.opts.onSocketDisconnect) {
|
|
47
|
+
void this.opts.onSocketDisconnect({ socket, dbo: dbo as DBOFullyTyped, db, getUser });
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
|
|
27
51
|
await this.opts.onLog?.({
|
|
28
52
|
type: "connect",
|
|
29
53
|
sid: this.authHandler?.getValidatedSid({ socket }),
|
|
@@ -31,9 +55,6 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
|
31
55
|
connectedSocketIds: this.connectedSockets.map((s) => s.id),
|
|
32
56
|
});
|
|
33
57
|
|
|
34
|
-
if (!this.db || !this.dbo) throw new Error("db/dbo missing");
|
|
35
|
-
const { dbo, db } = this;
|
|
36
|
-
|
|
37
58
|
const { onUseOrSocketConnected } = this.opts.auth ?? {};
|
|
38
59
|
const { authHandler } = this;
|
|
39
60
|
if (onUseOrSocketConnected) {
|
|
@@ -91,23 +112,6 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
|
|
|
91
112
|
}
|
|
92
113
|
);
|
|
93
114
|
|
|
94
|
-
socket.on("disconnect", () => {
|
|
95
|
-
this.dbEventsManager?.removeNotice(socket);
|
|
96
|
-
this.dbEventsManager?.removeNotify(undefined, socket);
|
|
97
|
-
this.connectedSockets = this.connectedSockets.filter((s) => s.id !== socket.id);
|
|
98
|
-
this.dboBuilder.queryStreamer.onDisconnect(socket.id);
|
|
99
|
-
void this.opts.onLog?.({
|
|
100
|
-
type: "disconnect",
|
|
101
|
-
sid: this.authHandler?.getValidatedSid({ socket }),
|
|
102
|
-
socketId: socket.id,
|
|
103
|
-
connectedSocketIds: this.connectedSockets.map((s) => s.id),
|
|
104
|
-
});
|
|
105
|
-
|
|
106
|
-
if (this.opts.onSocketDisconnect) {
|
|
107
|
-
void this.opts.onSocketDisconnect({ socket, dbo: dbo as DBOFullyTyped, db, getUser });
|
|
108
|
-
}
|
|
109
|
-
});
|
|
110
|
-
|
|
111
115
|
socket.removeAllListeners(CHANNELS.METHOD);
|
|
112
116
|
socket.on(
|
|
113
117
|
CHANNELS.METHOD,
|