From 2ca6138852cd32de6b737023802a5e568b71b04d Mon Sep 17 00:00:00 2001
From: Adam Ernst <adamjernst@fb.com>
Date: Thu, 8 Dec 2016 07:28:12 -0800
Subject: [PATCH] Start exposing RCTWebSocketObserver using a protocol

Reviewed By: javache

Differential Revision: D4296387

fbshipit-source-id: 33f92c36168dcb18356d0ccdaf902a84634d94b7
---
 Libraries/WebSocket/RCTWebSocketManager.h |  3 +++
 Libraries/WebSocket/RCTWebSocketManager.m | 13 +++++--------
 React/Base/RCTWebSocketProxy.h            |  7 +++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Libraries/WebSocket/RCTWebSocketManager.h b/Libraries/WebSocket/RCTWebSocketManager.h
index 68a97ab49..9b0764695 100644
--- a/Libraries/WebSocket/RCTWebSocketManager.h
+++ b/Libraries/WebSocket/RCTWebSocketManager.h
@@ -12,6 +12,9 @@
 
 #if RCT_DEV // Only supported in dev mode
 
+@interface RCTWebSocketObserver : NSObject <RCTWebSocketObserver>
+@end
+
 @interface RCTWebSocketManager : NSObject <RCTWebSocketProxy>
 @end
 
diff --git a/Libraries/WebSocket/RCTWebSocketManager.m b/Libraries/WebSocket/RCTWebSocketManager.m
index f577ae2e0..a9330899c 100644
--- a/Libraries/WebSocket/RCTWebSocketManager.m
+++ b/Libraries/WebSocket/RCTWebSocketManager.m
@@ -20,18 +20,15 @@
 
 #pragma mark - RCTWebSocketObserver
 
-@interface RCTWebSocketObserver : NSObject <RCTSRWebSocketDelegate> {
+@interface RCTWebSocketObserver () <RCTSRWebSocketDelegate>
+@end
+
+@implementation RCTWebSocketObserver {
   NSURL *_url;
   RCTSRWebSocket *_socket;
 }
 
-- (instancetype)initWithURL:(NSURL *)url;
-
-@property (nonatomic, weak) id<RCTWebSocketProxyDelegate> delegate;
-
-@end
-
-@implementation RCTWebSocketObserver
+@synthesize delegate = _delegate;
 
 - (instancetype)initWithURL:(NSURL *)url
 {
diff --git a/React/Base/RCTWebSocketProxy.h b/React/Base/RCTWebSocketProxy.h
index 3701d605d..692e687fd 100644
--- a/React/Base/RCTWebSocketProxy.h
+++ b/React/Base/RCTWebSocketProxy.h
@@ -12,6 +12,13 @@
 
 #if RCT_DEV // Only supported in dev mode
 
+@protocol RCTWebSocketProxyDelegate;
+
+@protocol RCTWebSocketObserver
+- (instancetype)initWithURL:(NSURL *)url;
+@property (nonatomic, weak) id<RCTWebSocketProxyDelegate> delegate;
+@end
+
 @protocol RCTWebSocketProxy
 
 + (instancetype)sharedInstance;