Skip to content

Commit db90342

Browse files
committed
fixup! fixup! ✨(y-provider) add endpoint returning document connection state
1 parent 7c6ff41 commit db90342

File tree

2 files changed

+26
-15
lines changed

2 files changed

+26
-15
lines changed

src/frontend/servers/y-provider/__tests__/getDocumentConnectionInfoHandler.test.ts

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import request from 'supertest';
22
import { v4 as uuid } from 'uuid';
33

4-
const port = 5556;
4+
const port = 5566;
55
const origin = 'http://localhost:3000';
66

77
jest.mock('../src/env', () => {
@@ -79,39 +79,43 @@ describe('Server Tests', () => {
7979

8080
document.addConnection({
8181
webSocket: 1,
82-
context: { sessionKey: 'test-session-key', readOnly: false },
82+
context: { sessionKey: 'test-session-key' },
8383
document: document,
8484
pongReceived: false,
85+
readOnly: false,
8586
request: null,
8687
timeout: 0,
8788
socketId: uuid(),
8889
lock: null,
8990
} as any);
9091
document.addConnection({
9192
webSocket: 2,
92-
context: { sessionKey: 'other-session-key', readOnly: false },
93+
context: { sessionKey: 'other-session-key' },
9394
document: document,
9495
pongReceived: false,
96+
readOnly: false,
9597
request: null,
9698
timeout: 0,
9799
socketId: uuid(),
98100
lock: null,
99101
} as any);
100102
document.addConnection({
101103
webSocket: 3,
102-
context: { sessionKey: 'last-session-key', readOnly: false },
104+
context: { sessionKey: 'last-session-key' },
103105
document: document,
104106
pongReceived: false,
107+
readOnly: false,
105108
request: null,
106109
timeout: 0,
107110
socketId: uuid(),
108111
lock: null,
109112
} as any);
110113
document.addConnection({
111114
webSocket: 4,
112-
context: { sessionKey: 'session-read-only', readOnly: true },
115+
context: { sessionKey: 'session-read-only' },
113116
document: document,
114117
pongReceived: false,
118+
readOnly: true,
115119
request: null,
116120
timeout: 0,
117121
socketId: uuid(),
@@ -141,39 +145,43 @@ describe('Server Tests', () => {
141145

142146
document.addConnection({
143147
webSocket: 1,
144-
context: { sessionKey: 'test-session-key', readOnly: false },
148+
context: { sessionKey: 'test-session-key' },
145149
document: document,
146150
pongReceived: false,
151+
readOnly: false,
147152
request: null,
148153
timeout: 0,
149154
socketId: uuid(),
150155
lock: null,
151156
} as any);
152157
document.addConnection({
153158
webSocket: 2,
154-
context: { sessionKey: 'other-session-key', readOnly: false },
159+
context: { sessionKey: 'other-session-key' },
155160
document: document,
156161
pongReceived: false,
162+
readOnly: false,
157163
request: null,
158164
timeout: 0,
159165
socketId: uuid(),
160166
lock: null,
161167
} as any);
162168
document.addConnection({
163169
webSocket: 3,
164-
context: { sessionKey: 'last-session-key', readOnly: false },
170+
context: { sessionKey: 'last-session-key' },
165171
document: document,
166172
pongReceived: false,
173+
readOnly: false,
167174
request: null,
168175
timeout: 0,
169176
socketId: uuid(),
170177
lock: null,
171178
} as any);
172179
document.addConnection({
173180
webSocket: 4,
174-
context: { sessionKey: 'session-read-only', readOnly: true },
181+
context: { sessionKey: 'session-read-only' },
175182
document: document,
176183
pongReceived: false,
184+
readOnly: true,
177185
request: null,
178186
timeout: 0,
179187
socketId: uuid(),
@@ -202,39 +210,43 @@ describe('Server Tests', () => {
202210

203211
document.addConnection({
204212
webSocket: 1,
205-
context: { sessionKey: 'test-session-key', readOnly: false },
213+
context: { sessionKey: 'test-session-key' },
206214
document: document,
207215
pongReceived: false,
216+
readOnly: false,
208217
request: null,
209218
timeout: 0,
210219
socketId: uuid(),
211220
lock: null,
212221
} as any);
213222
document.addConnection({
214223
webSocket: 2,
215-
context: { sessionKey: 'other-session-key', readOnly: false },
224+
context: { sessionKey: 'other-session-key' },
216225
document: document,
217226
pongReceived: false,
227+
readOnly: false,
218228
request: null,
219229
timeout: 0,
220230
socketId: uuid(),
221231
lock: null,
222232
} as any);
223233
document.addConnection({
224234
webSocket: 3,
225-
context: { sessionKey: 'last-session-key', readOnly: false },
235+
context: { sessionKey: 'last-session-key' },
226236
document: document,
227237
pongReceived: false,
238+
readOnly: false,
228239
request: null,
229240
timeout: 0,
230241
socketId: uuid(),
231242
lock: null,
232243
} as any);
233244
document.addConnection({
234245
webSocket: 4,
235-
context: { sessionKey: 'session-read-only', readOnly: true },
246+
context: { sessionKey: 'session-read-only' },
236247
document: document,
237248
pongReceived: false,
249+
readOnly: true,
238250
request: null,
239251
timeout: 0,
240252
socketId: uuid(),

src/frontend/servers/y-provider/src/handlers/getDocumentConnectionInfoHandler.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ export const getDocumentConnectionInfoHandler = (
3636
}
3737
const connections = roomInfo
3838
.getConnections()
39-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
40-
.filter((connection) => connection.context.readOnly === false);
39+
.filter((connection) => connection.readOnly === false);
4140

4241
res.status(200).json({
4342
count: connections.length,

0 commit comments

Comments
 (0)