|
14 | 14 | using System.Runtime.InteropServices;
|
15 | 15 | using System.Text.Json;
|
16 | 16 | using System.Globalization;
|
| 17 | +using System.Text; |
17 | 18 |
|
18 | 19 | namespace DevProxy.Plugins.Inspection;
|
19 | 20 |
|
@@ -192,6 +193,11 @@ public override async Task AfterResponseAsync(ProxyResponseArgs e, CancellationT
|
192 | 193 |
|
193 | 194 | await _webSocket.SendAsync(responseReceivedMessage, cancellationToken);
|
194 | 195 |
|
| 196 | + if (e.Session.HttpClient.Response.ContentType == "text/event-stream") |
| 197 | + { |
| 198 | + await SendBodyAsDataReceivedAsync(requestId, body.Body, cancellationToken); |
| 199 | + } |
| 200 | + |
195 | 201 | var loadingFinishedMessage = new LoadingFinishedMessage
|
196 | 202 | {
|
197 | 203 | Params = new()
|
@@ -340,35 +346,98 @@ private void SocketMessageReceived(string msg)
|
340 | 346 |
|
341 | 347 | try
|
342 | 348 | {
|
343 |
| - var message = JsonSerializer.Deserialize<GetResponseBodyMessage>(msg, ProxyUtils.JsonSerializerOptions); |
344 |
| - if (message?.Method == "Network.getResponseBody") |
| 349 | + var message = JsonSerializer.Deserialize<Message>(msg, ProxyUtils.JsonSerializerOptions); |
| 350 | + switch (message?.Method) |
345 | 351 | {
|
346 |
| - var requestId = message.Params?.RequestId; |
347 |
| - if (requestId is null || |
348 |
| - !_responseBody.TryGetValue(requestId, out var value) || |
349 |
| - // should never happen because the message is sent from devtools |
350 |
| - // and Id is required on all socket messages but theoretically |
351 |
| - // it is possible |
352 |
| - message.Id is null) |
353 |
| - { |
354 |
| - return; |
355 |
| - } |
356 |
| - |
357 |
| - var result = new GetResponseBodyResult |
358 |
| - { |
359 |
| - Id = (int)message.Id, |
360 |
| - Result = new() |
| 352 | + case "Network.getResponseBody": |
| 353 | + var getResponseBodyMessage = JsonSerializer.Deserialize<GetResponseBodyMessage>(msg, ProxyUtils.JsonSerializerOptions); |
| 354 | + if (getResponseBodyMessage is null) |
361 | 355 | {
|
362 |
| - Body = value.Body, |
363 |
| - Base64Encoded = value.Base64Encoded |
| 356 | + return; |
364 | 357 | }
|
365 |
| - }; |
366 |
| - _ = _webSocket.SendAsync(result, _cancellationToken ?? CancellationToken.None); |
| 358 | + _ = HandleNetworkGetResponseBodyAsync(getResponseBodyMessage, _cancellationToken ?? CancellationToken.None); |
| 359 | + break; |
| 360 | + case "Network.streamResourceContent": |
| 361 | + _ = HandleNetworkStreamResourceContentAsync(message, _cancellationToken ?? CancellationToken.None); |
| 362 | + break; |
| 363 | + default: |
| 364 | + break; |
367 | 365 | }
|
368 | 366 | }
|
369 | 367 | catch { }
|
370 | 368 | }
|
371 | 369 |
|
| 370 | + private async Task HandleNetworkStreamResourceContentAsync(Message message, CancellationToken cancellationToken) |
| 371 | + { |
| 372 | + if (_webSocket is null || message.Id is null) |
| 373 | + { |
| 374 | + return; |
| 375 | + } |
| 376 | + |
| 377 | + var result = new StreamResourceContentResult |
| 378 | + { |
| 379 | + Id = (int)message.Id, |
| 380 | + Result = new() |
| 381 | + { |
| 382 | + BufferedData = string.Empty |
| 383 | + } |
| 384 | + }; |
| 385 | + |
| 386 | + await _webSocket.SendAsync(result, cancellationToken); |
| 387 | + } |
| 388 | + |
| 389 | + private async Task HandleNetworkGetResponseBodyAsync(GetResponseBodyMessage message, CancellationToken cancellationToken) |
| 390 | + { |
| 391 | + if (_webSocket is null || message.Params?.RequestId is null) |
| 392 | + { |
| 393 | + return; |
| 394 | + } |
| 395 | + |
| 396 | + if (!_responseBody.TryGetValue(message.Params.RequestId, out var value) || |
| 397 | + // should never happen because the message is sent from devtools |
| 398 | + // and Id is required on all socket messages but theoretically |
| 399 | + // it is possible |
| 400 | + message.Id is null) |
| 401 | + { |
| 402 | + return; |
| 403 | + } |
| 404 | + |
| 405 | + var result = new GetResponseBodyResult |
| 406 | + { |
| 407 | + Id = (int)message.Id, |
| 408 | + Result = new() |
| 409 | + { |
| 410 | + Body = value.Body, |
| 411 | + Base64Encoded = value.Base64Encoded |
| 412 | + } |
| 413 | + }; |
| 414 | + |
| 415 | + await _webSocket.SendAsync(result, cancellationToken); |
| 416 | + } |
| 417 | + |
| 418 | + private async Task SendBodyAsDataReceivedAsync(string requestId, string? body, CancellationToken cancellationToken) |
| 419 | + { |
| 420 | + if (_webSocket is null || string.IsNullOrEmpty(body)) |
| 421 | + { |
| 422 | + return; |
| 423 | + } |
| 424 | + |
| 425 | + var base64Encoded = Convert.ToBase64String(Encoding.UTF8.GetBytes(body)); |
| 426 | + var dataReceivedMessage = new DataReceivedMessage |
| 427 | + { |
| 428 | + Params = new() |
| 429 | + { |
| 430 | + RequestId = requestId, |
| 431 | + Timestamp = (double)DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() / 1000, |
| 432 | + Data = base64Encoded, |
| 433 | + DataLength = body.Length, |
| 434 | + EncodedDataLength = base64Encoded.Length |
| 435 | + } |
| 436 | + }; |
| 437 | + |
| 438 | + await _webSocket.SendAsync(dataReceivedMessage, cancellationToken); |
| 439 | + } |
| 440 | + |
372 | 441 | private static int GetFreePort()
|
373 | 442 | {
|
374 | 443 | using var listener = new TcpListener(IPAddress.Loopback, 0);
|
|
0 commit comments