Skip to content

Commit 5eecbb5

Browse files
authored
fix(websockets): filter for text and binary frames (#522)
1 parent 1b58892 commit 5eecbb5

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

playwright/src/main/java/com/microsoft/playwright/impl/WebSocketImpl.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,22 @@ public String text() {
178178
void handleEvent(String event, JsonObject parameters) {
179179
switch (event) {
180180
case "frameSent": {
181+
int opCode = parameters.get("opcode").getAsInt();
182+
if (opCode != 1 && opCode != 2) {
183+
break;
184+
}
181185
WebSocketFrameImpl WebSocketFrame = new WebSocketFrameImpl(
182-
parameters.get("data").getAsString(), parameters.get("opcode").getAsInt() == 2);
186+
parameters.get("data").getAsString(), opCode == 2);
183187
listeners.notify(EventType.FRAMESENT, WebSocketFrame);
184188
break;
185189
}
186190
case "frameReceived": {
191+
int opCode = parameters.get("opcode").getAsInt();
192+
if (opCode != 1 && opCode != 2) {
193+
break;
194+
}
187195
WebSocketFrameImpl WebSocketFrame = new WebSocketFrameImpl(
188-
parameters.get("data").getAsString(), parameters.get("opcode").getAsInt() == 2);
196+
parameters.get("data").getAsString(), opCode == 2);
189197
listeners.notify(EventType.FRAMERECEIVED, WebSocketFrame);
190198
break;
191199
}

playwright/src/test/java/com/microsoft/playwright/TestWebSocket.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ void shouldEmitFrameEvents() {
102102
" ws.addEventListener('message', () => { ws.close(); });\n" +
103103
" }", webSocketServer.getPort());
104104
waitForCondition(socketClosed);
105-
if (isWebKit()) {
106-
// TODO: there is intermittent <received<A+g=> message in WebKit.
107-
log.remove("received<A+g=>");
108-
}
109105
assertEquals("open", log.get(0), "Events: " + log);
110106
assertEquals("close", log.get(3), "Events: " + log);
111107
log.sort(String::compareTo);

0 commit comments

Comments
 (0)