@verdant-web/server 4.0.3 → 4.0.4
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/esm/connections/ClientConnection.d.ts +7 -2
- package/dist/esm/connections/ClientConnection.js +15 -8
- package/dist/esm/connections/ClientConnection.js.map +1 -1
- package/dist/esm/connections/Presence.d.ts +1 -1
- package/dist/esm/connections/Presence.js +2 -2
- package/dist/esm/connections/Presence.js.map +1 -1
- package/dist/esm/libraries/singleNode.js +1 -0
- package/dist/esm/libraries/singleNode.js.map +1 -1
- package/package.json +2 -2
- package/src/connections/ClientConnection.ts +27 -10
- package/src/connections/Presence.ts +2 -2
- package/src/libraries/singleNode.ts +1 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ServerMessage } from '@verdant-web/common';
|
|
2
2
|
import { IncomingMessage, ServerResponse } from 'http';
|
|
3
3
|
import { WebSocket as WSWebSocket } from 'ws';
|
|
4
|
+
import { Logger } from '../logger.js';
|
|
4
5
|
import { UserProfileLoader } from '../Profiles.js';
|
|
5
6
|
import { TokenInfo } from '../TokenVerifier.js';
|
|
6
7
|
import { MessageSender } from './MessageSender.js';
|
|
@@ -8,10 +9,14 @@ import { Presence } from './Presence.js';
|
|
|
8
9
|
export declare class ClientConnectionManager implements MessageSender {
|
|
9
10
|
private readonly connections;
|
|
10
11
|
readonly presence: Presence;
|
|
11
|
-
|
|
12
|
+
private readonly log?;
|
|
13
|
+
constructor({ profiles, log, }: {
|
|
12
14
|
profiles: UserProfileLoader<any>;
|
|
15
|
+
log?: Logger;
|
|
13
16
|
});
|
|
14
|
-
addSocket: (key: string, socket: WebSocket | WSWebSocket, info: TokenInfo
|
|
17
|
+
addSocket: (key: string, socket: WebSocket | WSWebSocket, info: TokenInfo, options?: {
|
|
18
|
+
disableAutoRemoveOnClose?: boolean;
|
|
19
|
+
}) => void;
|
|
15
20
|
addRequest: (key: string, request: IncomingMessage, response: ServerResponse, info: TokenInfo) => () => void;
|
|
16
21
|
addFetch: (key: string, req: Request, info: TokenInfo) => (() => Response);
|
|
17
22
|
remove: (key: string) => void;
|
|
@@ -97,19 +97,25 @@ class WebSocketClientConnection extends ClientConnection {
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
export class ClientConnectionManager {
|
|
100
|
-
constructor({ profiles }) {
|
|
100
|
+
constructor({ profiles, log, }) {
|
|
101
101
|
this.connections = new Map();
|
|
102
|
-
this.addSocket = (key, socket, info) => {
|
|
102
|
+
this.addSocket = (key, socket, info, options) => {
|
|
103
103
|
const connection = new WebSocketClientConnection(key, socket, info);
|
|
104
104
|
this.connections.set(key, connection);
|
|
105
105
|
const unsubscribes = [];
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
106
|
+
if (!(options === null || options === void 0 ? void 0 : options.disableAutoRemoveOnClose)) {
|
|
107
|
+
unsubscribes.push(subscribeToSocketEvent(socket, 'close', () => {
|
|
108
|
+
var _a;
|
|
109
|
+
(_a = this.log) === null || _a === void 0 ? void 0 : _a.call(this, 'info', `Socket closed: ${key}`);
|
|
110
|
+
this.connections.delete(key);
|
|
111
|
+
this.presence.removeConnection(key);
|
|
112
|
+
unsubscribes.forEach((u) => u());
|
|
113
|
+
}));
|
|
114
|
+
}
|
|
111
115
|
unsubscribes.push(subscribeToSocketEvent(socket, 'messsage', () => {
|
|
112
|
-
|
|
116
|
+
// sockets get a long keepalive for message activity
|
|
117
|
+
// since they have a reliable close event
|
|
118
|
+
this.presence.keepAlive(key, 10 * 60 * 1000);
|
|
113
119
|
}));
|
|
114
120
|
};
|
|
115
121
|
this.addRequest = (key, request, response, info) => {
|
|
@@ -162,6 +168,7 @@ export class ClientConnectionManager {
|
|
|
162
168
|
this.connections.clear();
|
|
163
169
|
};
|
|
164
170
|
this.presence = new Presence(profiles);
|
|
171
|
+
this.log = log;
|
|
165
172
|
}
|
|
166
173
|
}
|
|
167
174
|
//# sourceMappingURL=ClientConnection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientConnection.js","sourceRoot":"","sources":["../../../src/connections/ClientConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"ClientConnection.js","sourceRoot":"","sources":["../../../src/connections/ClientConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export declare class Presence extends EventSubscriber<PresenceEvents> {
|
|
|
15
15
|
private keepalives;
|
|
16
16
|
constructor(profiles: UserProfiles<any>);
|
|
17
17
|
set: (connectionKey: string, userId: string, userInfo: UserInfoUpdate) => Promise<UserInfo<any, any>>;
|
|
18
|
-
keepAlive: (connectionKey: string) => void;
|
|
18
|
+
keepAlive: (connectionKey: string, duration?: number) => void;
|
|
19
19
|
get: (userId: string) => UserInfo<any, any>;
|
|
20
20
|
removeConnection: (connectionKey: string) => void;
|
|
21
21
|
all: () => Record<string, UserInfo<any, any>>;
|
|
@@ -25,7 +25,7 @@ export class Presence extends EventSubscriber {
|
|
|
25
25
|
this.keepAlive(connectionKey);
|
|
26
26
|
return this.presences[userId];
|
|
27
27
|
};
|
|
28
|
-
this.keepAlive = (connectionKey) => {
|
|
28
|
+
this.keepAlive = (connectionKey, duration = 60 * 1000) => {
|
|
29
29
|
const existing = this.keepalives.get(connectionKey);
|
|
30
30
|
if (existing) {
|
|
31
31
|
clearTimeout(existing);
|
|
@@ -33,7 +33,7 @@ export class Presence extends EventSubscriber {
|
|
|
33
33
|
this.keepalives.set(connectionKey, setTimeout(() => {
|
|
34
34
|
this.removeConnection(connectionKey);
|
|
35
35
|
this.keepalives.delete(connectionKey);
|
|
36
|
-
},
|
|
36
|
+
}, duration));
|
|
37
37
|
};
|
|
38
38
|
this.get = (userId) => {
|
|
39
39
|
return this.presences[userId];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Presence.js","sourceRoot":"","sources":["../../../src/connections/Presence.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,eAAe,EACf,uBAAuB,GAGvB,MAAM,qBAAqB,CAAC;AAO7B;;;GAGG;AACH,MAAM,OAAO,QAAS,SAAQ,eAA+B;IAM5D,YAAqB,QAA2B;QAC/C,KAAK,EAAE,CAAC;QADY,aAAQ,GAAR,QAAQ,CAAmB;QALxC,cAAS,GAAuC,EAAE,CAAC;QACnD,qBAAgB,GAA2B,EAAE,CAAC;QAC9C,qBAAgB,GAAgC,EAAE,CAAC;QACnD,eAAU,GAAG,IAAI,GAAG,EAA0B,CAAC;QAMvD,QAAG,GAAG,KAAK,EACV,aAAqB,EACrB,MAAc,EACd,QAAwB,EACvB,EAAE;YACH,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,mCAClB,QAAQ,KACX,OAAO,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EACxC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,uBAAuB,GACtD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;YAC9C,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;gBAC5B,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;YACpD,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAEjD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;YAE9B,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAE,CAAC;QAChC,CAAC,CAAC;QAEF,cAAS,GAAG,CAAC,aAAqB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"Presence.js","sourceRoot":"","sources":["../../../src/connections/Presence.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,7 @@ export class SingleNodeLibraryManager {
|
|
|
25
25
|
this.constructMicroserver = async (libraryId) => {
|
|
26
26
|
const clientConnections = new ClientConnectionManager({
|
|
27
27
|
profiles: this.ctx.profiles,
|
|
28
|
+
log: this.ctx.log,
|
|
28
29
|
});
|
|
29
30
|
const storage = await this.ctx.storage(libraryId);
|
|
30
31
|
const library = new Library({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleNode.js","sourceRoot":"","sources":["../../../src/libraries/singleNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,SAAS,EACT,eAAe,EACf,YAAY,GACZ,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAa,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAGN,0BAA0B,GAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAgB1C,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAEtB,MAAM,OAAO,wBAAwB;IAMpC,YAAoB,GAAgC;QAAhC,QAAG,GAAH,GAAG,CAA6B;QALpC,WAAM,GAAG,IAAI,eAAe,EAAiB,CAAC;QACtD,wBAAmB,GAC1B,IAAI,GAAG,EAAE,CAAC;QAeX,QAAG,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;YACjC,IAAI,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACjE,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACzB,kBAAkB,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;gBAC1D,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;YAC7D,CAAC;YACD,OAAO,kBAAkB,CAAC;QAC3B,CAAC,CAAC;QAEF,UAAK,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;YACnC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACtC,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;YACpB,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC5C,CAAC,CAAC;QAEM,yBAAoB,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;YAC1D,MAAM,iBAAiB,GAAG,IAAI,uBAAuB,CAAC;gBACrD,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"singleNode.js","sourceRoot":"","sources":["../../../src/libraries/singleNode.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@verdant-web/server",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.4",
|
|
4
4
|
"access": "public",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"@types/ws": "^8.5.3",
|
|
58
58
|
"cross-env": "7.0.3",
|
|
59
59
|
"typescript": "5.9.3",
|
|
60
|
-
"vitest": "
|
|
60
|
+
"vitest": "^4.0.8"
|
|
61
61
|
},
|
|
62
62
|
"scripts": {
|
|
63
63
|
"build": "tsc",
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { authz, ServerMessage } from '@verdant-web/common';
|
|
2
2
|
import { IncomingMessage, ServerResponse } from 'http';
|
|
3
3
|
import { WebSocket as WSWebSocket } from 'ws';
|
|
4
|
+
import { Logger } from '../logger.js';
|
|
4
5
|
import { UserProfileLoader } from '../Profiles.js';
|
|
5
6
|
import { TokenInfo } from '../TokenVerifier.js';
|
|
6
7
|
import { MessageSender } from './MessageSender.js';
|
|
@@ -150,31 +151,47 @@ class WebSocketClientConnection extends ClientConnection {
|
|
|
150
151
|
export class ClientConnectionManager implements MessageSender {
|
|
151
152
|
private readonly connections: Map<string, ClientConnection> = new Map();
|
|
152
153
|
readonly presence: Presence;
|
|
153
|
-
|
|
154
|
-
|
|
154
|
+
private readonly log?: Logger;
|
|
155
|
+
|
|
156
|
+
constructor({
|
|
157
|
+
profiles,
|
|
158
|
+
log,
|
|
159
|
+
}: {
|
|
160
|
+
profiles: UserProfileLoader<any>;
|
|
161
|
+
log?: Logger;
|
|
162
|
+
}) {
|
|
155
163
|
this.presence = new Presence(profiles);
|
|
164
|
+
this.log = log;
|
|
156
165
|
}
|
|
157
166
|
|
|
158
167
|
addSocket = (
|
|
159
168
|
key: string,
|
|
160
169
|
socket: WebSocket | WSWebSocket,
|
|
161
170
|
info: TokenInfo,
|
|
171
|
+
options?: {
|
|
172
|
+
disableAutoRemoveOnClose?: boolean;
|
|
173
|
+
},
|
|
162
174
|
) => {
|
|
163
175
|
const connection = new WebSocketClientConnection(key, socket, info);
|
|
164
176
|
|
|
165
177
|
this.connections.set(key, connection);
|
|
166
178
|
|
|
167
179
|
const unsubscribes: (() => void)[] = [];
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
180
|
+
if (!options?.disableAutoRemoveOnClose) {
|
|
181
|
+
unsubscribes.push(
|
|
182
|
+
subscribeToSocketEvent(socket, 'close', () => {
|
|
183
|
+
this.log?.('info', `Socket closed: ${key}`);
|
|
184
|
+
this.connections.delete(key);
|
|
185
|
+
this.presence.removeConnection(key);
|
|
186
|
+
unsubscribes.forEach((u) => u());
|
|
187
|
+
}),
|
|
188
|
+
);
|
|
189
|
+
}
|
|
175
190
|
unsubscribes.push(
|
|
176
191
|
subscribeToSocketEvent(socket, 'messsage', () => {
|
|
177
|
-
|
|
192
|
+
// sockets get a long keepalive for message activity
|
|
193
|
+
// since they have a reliable close event
|
|
194
|
+
this.presence.keepAlive(key, 10 * 60 * 1000);
|
|
178
195
|
}),
|
|
179
196
|
);
|
|
180
197
|
};
|
|
@@ -48,7 +48,7 @@ export class Presence extends EventSubscriber<PresenceEvents> {
|
|
|
48
48
|
return this.presences[userId]!;
|
|
49
49
|
};
|
|
50
50
|
|
|
51
|
-
keepAlive = (connectionKey: string) => {
|
|
51
|
+
keepAlive = (connectionKey: string, duration = 60 * 1000) => {
|
|
52
52
|
const existing = this.keepalives.get(connectionKey);
|
|
53
53
|
if (existing) {
|
|
54
54
|
clearTimeout(existing);
|
|
@@ -59,7 +59,7 @@ export class Presence extends EventSubscriber<PresenceEvents> {
|
|
|
59
59
|
setTimeout(() => {
|
|
60
60
|
this.removeConnection(connectionKey);
|
|
61
61
|
this.keepalives.delete(connectionKey);
|
|
62
|
-
},
|
|
62
|
+
}, duration),
|
|
63
63
|
);
|
|
64
64
|
};
|
|
65
65
|
|
|
@@ -68,6 +68,7 @@ export class SingleNodeLibraryManager {
|
|
|
68
68
|
private constructMicroserver = async (libraryId: string) => {
|
|
69
69
|
const clientConnections = new ClientConnectionManager({
|
|
70
70
|
profiles: this.ctx.profiles,
|
|
71
|
+
log: this.ctx.log,
|
|
71
72
|
});
|
|
72
73
|
const storage = await this.ctx.storage(libraryId);
|
|
73
74
|
const library = new Library({
|