Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdfe3122

Browse files
fix: prevent crash when using custom headers
It seems that the Deno.upgradeWebSocket() method does not allow toprovide additional headers during the WebSocket handshake.Exception:> TypeError: Headers are immutable.> at Headers.set (deno:ext/fetch/20_headers.js:384:15)> at /packages/engine.io/lib/transports/websocket.ts:60:24> at Headers.forEach (deno:ext/webidl/00_webidl.js:1001:13)> at WS.onRequest (/packages/engine.io/lib/transports/websocket.ts:59:21)> at Server.handshake (/packages/engine.io/lib/server.ts:344:31)
1 parent193a9b5 commitdfe3122

File tree

3 files changed

+28
-6
lines changed

3 files changed

+28
-6
lines changed

‎packages/engine.io/lib/server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ export class Server extends EventEmitter<never, never, ServerReservedEvents> {
214214
if(req.headers.has("upgrade")){
215215
consttransport=newWS(this.opts);
216216

217-
constpromise=transport.onRequest(req,responseHeaders);
217+
constpromise=transport.onRequest(req);
218218

219219
socket._maybeUpgrade(transport);
220220

‎packages/engine.io/lib/transports/websocket.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class WS extends Transport {
2323
}
2424
}
2525

26-
publiconRequest(req:Request,responseHeaders:Headers):Promise<Response>{
26+
publiconRequest(req:Request):Promise<Response>{
2727
const{ socket, response}=Deno.upgradeWebSocket(req);
2828

2929
this.socket=socket;
@@ -56,9 +56,7 @@ export class WS extends Transport {
5656
this.onClose();
5757
};
5858

59-
responseHeaders.forEach((value,key)=>{
60-
response.headers.set(key,value);
61-
});
59+
// note: response.headers is immutable, so it seems we can't add headers here
6260

6361
returnPromise.resolve(response);
6462
}

‎packages/engine.io/test/response_headers.test.ts‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import{assertEquals,describe,it}from"../../../test_deps.ts";
22
import{Server}from"../lib/server.ts";
3-
import{enableLogs,parseSessionID,testServe}from"./util.ts";
3+
import{
4+
enableLogs,
5+
parseSessionID,
6+
testServe,
7+
testServeWithAsyncResults,
8+
}from"./util.ts";
49

510
awaitenableLogs();
611

@@ -43,4 +48,23 @@ describe("response headers", () => {
4348
awaitdataResponse.body?.cancel();
4449
});
4550
});
51+
52+
it("should not crash when using WebSocket (noop)",()=>{
53+
constengine=newServer({
54+
editHandshakeHeaders:(responseHeaders)=>{
55+
responseHeaders.set("abc","123");
56+
},
57+
editResponseHeaders:(responseHeaders)=>{
58+
responseHeaders.set("def","456");
59+
},
60+
});
61+
62+
returntestServeWithAsyncResults(engine,1,(port,done)=>{
63+
constsocket=newWebSocket(
64+
`ws://localhost:${port}/engine.io/?EIO=4&transport=websocket`,
65+
);
66+
67+
socket.onopen=done;
68+
});
69+
});
4670
});

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp