Differences From Artifact [1e684aefeb]:
- File src/OFHTTPClient.m — part of check-in [b090b5ce92] at 2018-11-17 22:59:10 on branch trunk — Various minor style improvements (user: js, size: 30702) [annotate] [blame] [check-ins using]
To Artifact [376bac39d6]:
- File
src/OFHTTPClient.m
— part of check-in
[d16ad96cbd]
at
2018-12-07 01:33:47
on branch trunk
— OFStream: Use a delegate for async operations
The target / selector approach had several drawbacks:
* It was inconvenient to use, as for every read or write, a target,
selector and context would need to be specified.
* It lacked any kind of type-safety and would not even warn about using
a callback method with the wrong number of parameters.
* It encouraged using a different callback method for each read or
write call, which results in code that is hard to follow and also
slower (as it needs to recreate the async operation with a new
callback every time). (user: js, size: 29459) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
47 48 49 50 51 52 53 | #import "OFTruncatedDataException.h" #import "OFUnsupportedProtocolException.h" #import "OFUnsupportedVersionException.h" #import "OFWriteFailedException.h" #define REDIRECTS_DEFAULT 10 | | > | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | #import "OFTruncatedDataException.h" #import "OFUnsupportedProtocolException.h" #import "OFUnsupportedVersionException.h" #import "OFWriteFailedException.h" #define REDIRECTS_DEFAULT 10 @interface OFHTTPClientRequestHandler: OFObject <OFStreamDelegate> { @public OFHTTPClient *_client; OFHTTPRequest *_request; OFString *_requestString; unsigned int _redirects; id _context; bool _firstLine; OFString *_version; int _status; OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_serverHeaders; } |
︙ | ︙ | |||
274 275 276 277 278 279 280 281 282 283 284 285 286 287 | return self; } - (void)dealloc { [_client release]; [_request release]; [_context release]; [_version release]; [_serverHeaders release]; [super dealloc]; } | > | 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 | return self; } - (void)dealloc { [_client release]; [_request release]; [_requestString release]; [_context release]; [_version release]; [_serverHeaders release]; [super dealloc]; } |
︙ | ︙ | |||
474 475 476 477 478 479 480 481 482 483 484 485 486 487 | if ([_client->_delegate respondsToSelector: @selector(client: didReceiveHeaders:statusCode:request:context:)]) [_client->_delegate client: _client didReceiveHeaders: _serverHeaders statusCode: _status request: _request context: _context]; [self performSelector: @selector(createResponseWithSocket:) withObject: sock afterDelay: 0]; return false; } | > > | 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 | if ([_client->_delegate respondsToSelector: @selector(client: didReceiveHeaders:statusCode:request:context:)]) [_client->_delegate client: _client didReceiveHeaders: _serverHeaders statusCode: _status request: _request context: _context]; [sock setDelegate: nil]; [self performSelector: @selector(createResponseWithSocket:) withObject: sock afterDelay: 0]; return false; } |
︙ | ︙ | |||
519 520 521 522 523 524 525 | [_serverHeaders setObject: value forKey: key]; return true; } | | < < < < < < < < < < < | < < < | < | | < | | | | > > > | < | > > > > > > > > > | < < < > | < < < < | | < < < < > > < < < < < < < < < < < < < < < < < < < < < < < < < < | > > < < < < < < < < < < < < < < | | | | | < | 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 | [_serverHeaders setObject: value forKey: key]; return true; } - (bool)stream: (OF_KINDOF(OFStream *))sock didReadLine: (OFString *)line { bool ret; @try { if (_firstLine) { _firstLine = false; ret = [self handleFirstLine: line]; } else ret = [self handleServerHeader: line socket: sock]; } @catch (id e) { [self raiseException: e]; ret = false; } return ret; } - (void)stream: (OF_KINDOF(OFStream *))sock didFailWithException: (id)exception { if ([exception isKindOfClass: [OFWriteFailedException class]] && ([exception errNo] == ECONNRESET || [exception errNo] == EPIPE)) { /* In case a keep-alive connection timed out */ [self closeAndReconnect]; return; } if ([exception isKindOfClass: [OFInvalidEncodingException class]]) exception = [OFInvalidServerReplyException exception]; [self raiseException: exception]; } - (size_t)stream: (OF_KINDOF(OFStream *))sock didWriteBuffer: (const void **)request length: (size_t)length { _firstLine = true; [_requestString release]; _requestString = nil; if ([[_request headers] objectForKey: @"Content-Length"] != nil) { [sock setDelegate: nil]; OFStream *requestBody = [[[OFHTTPClientRequestBodyStream alloc] initWithHandler: self socket: sock] autorelease]; if ([_client->_delegate respondsToSelector: @selector(client:wantsRequestBody:request:context:)]) [_client->_delegate client: _client wantsRequestBody: requestBody request: _request context: _context]; } else [sock asyncReadLine]; return 0; } - (void)handleSocket: (OFTCPSocket *)sock { /* * As a work around for a bug with split packets in lighttpd when using * HTTPS, we construct the complete request in a buffer string and then * send it all at once. * * We do not use the socket's write buffer in case we need to resend * the entire request (e.g. in case a keep-alive connection timed out). */ @try { [_requestString release]; _requestString = [constructRequestString(_request) retain]; [sock asyncWriteBuffer: [_requestString UTF8String] length: [_requestString UTF8StringLength]]; } @catch (id e) { [self raiseException: e]; return; } } - (void)socketDidConnect: (OFTCPSocket *)sock context: (id)context exception: (id)exception { if (exception != nil) { [self raiseException: exception]; return; } [sock setDelegate: self]; if ([_client->_delegate respondsToSelector: @selector(client:didCreateSocket:request:context:)]) [_client->_delegate client: _client didCreateSocket: sock request: _request context: _context]; [self performSelector: @selector(handleSocket:) withObject: sock afterDelay: 0]; } - (void)start { OFURL *URL = [_request URL]; OFTCPSocket *sock; /* Can we reuse the last socket? */ if (_client->_socket != nil && ![_client->_socket isAtEndOfStream] && [[_client->_lastURL scheme] isEqual: [URL scheme]] && [[_client->_lastURL host] isEqual: [URL host]] && [_client->_lastURL port] == [URL port] && (_client->_lastWasHEAD || [_client->_lastResponse isAtEndOfStream])) { /* * Set _socket to nil, so that in case of an error it won't be * reused. If everything is successful, we set _socket again * at the end. */ sock = [_client->_socket autorelease]; _client->_socket = nil; [_client->_lastURL release]; _client->_lastURL = nil; [_client->_lastResponse release]; _client->_lastResponse = nil; [self performSelector: @selector(handleSocket:) withObject: sock afterDelay: 0]; } else [self closeAndReconnect]; } - (void)closeAndReconnect { @try { |
︙ | ︙ | |||
852 853 854 855 856 857 858 | { if (_socket == nil) return; if (_toWrite > 0) @throw [OFTruncatedDataException exception]; | > | < < < | 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 | { if (_socket == nil) return; if (_toWrite > 0) @throw [OFTruncatedDataException exception]; [_socket setDelegate: _handler]; [_socket asyncReadLine]; [_socket release]; _socket = nil; } - (int)fileDescriptorForWriting { |
︙ | ︙ |