kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-23 03:50:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge RCTPackagerClient into RCTPackagerConnection

Browse Source 
Reviewed By: mmmulani

Differential Revision: D4988204

fbshipit-source-id: 78e0df5268bfc11e4e0edf8e60494e55022cd9f2
This commit is contained in:
Pieter De Baets
2017-05-05 08:32:15 -07:00
committed by Facebook Github Bot
parent 71e84e6ee8
commit e7680131d7
10 changed files with 152 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Libraries/WebSocket/RCTSRWebSocket.m
View File

@@ -161,33 +161,6 @@ typedef void (^data_callback)(RCTSRWebSocket *webSocket, NSData *data);
@interface RCTSRWebSocket () <NSStreamDelegate>
- (void)_writeData:(NSData *)data;
- (void)_closeWithProtocolError:(NSString *)message;
- (void)_failWithError:(NSError *)error;
- (void)_disconnect;
- (void)_readFrameNew;
- (void)_readFrameContinue;
- (void)_pumpScanner;
- (void)_pumpWriting;
- (void)_addConsumerWithScanner:(stream_scanner)consumer callback:(data_callback)callback;
- (void)_addConsumerWithDataLength:(size_t)dataLength callback:(data_callback)callback readToCurrentFrame:(BOOL)readToCurrentFrame unmaskBytes:(BOOL)unmaskBytes;
- (void)_addConsumerWithScanner:(stream_scanner)consumer callback:(data_callback)callback dataLength:(size_t)dataLength;
- (void)_readUntilBytes:(const void *)bytes length:(size_t)length callback:(data_callback)dataHandler;
- (void)_readUntilHeaderCompleteWithCallback:(data_callback)dataHandler;
- (void)_sendFrameWithOpcode:(RCTSROpCode)opcode data:(id)data;
- (BOOL)_checkHandshake:(CFHTTPMessageRef)httpMessage;
- (void)_RCTSR_commonInit;
- (void)_initializeStreams;
- (void)_connect;
@property (nonatomic, assign) RCTSRReadyState readyState;
@property (nonatomic, strong) NSOperationQueue *delegateOperationQueue;
@@ -195,7 +168,6 @@ typedef void (^data_callback)(RCTSRWebSocket *webSocket, NSData *data);
@end
@implementation RCTSRWebSocket
{
NSInteger _webSocketVersion;
@@ -255,13 +227,6 @@ typedef void (^data_callback)(RCTSRWebSocket *webSocket, NSData *data);
RCTSRIOConsumerPool *_consumerPool;
}
static __strong NSData *CRLFCRLF;
+ (void)initialize;
{
CRLFCRLF = [[NSData alloc] initWithBytes:"\r\n\r\n" length:4];
}
- (instancetype)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray<NSString *> *)protocols
{
RCTAssertParam(request);
@@ -434,7 +399,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
return;
}
if(![self _checkHandshake:_receivedHTTPHeaders]) {
if (![self _checkHandshake:_receivedHTTPHeaders]) {
[self _failWithError:[NSError errorWithDomain:RCTSRWebSocketErrorDomain code:2133 userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Invalid Sec-WebSocket-Accept response"]}]];
return;
}