Skip to content

Commit 914f33c

Browse files
zxcpoiuFacebook Github Bot 6
authored and
Facebook Github Bot 6
committed
make protocols argument work fixes #5810 fix #6137
Summary:Hey there and thanks for submitting a pull request! Please have a look at the following checklist so that others have enough information to review your pull request: **motivation** WebSocket spec supports [Sec-WebSocket-Protocol](https://tools.ietf.org/html/rfc6455#section-11.3.4) as a standard way for negotiate a sub protocol between client and server. * ios WebSocket implementation supports it. * android WebSocket implementation ignores this header, leave a comment syas: "OkHttp will overrides it", so it did not implement. * after some test, OkHttp doesn't override the header we add. **Test plan (required)** 1. run and react-native app on android 2. at the main page, invoke: `var ws = new WebSocket('ws://example.ws-service.fakedomain.com', 'my-sub-protocol');` 3. see the header if it send the correct header, ex, use ngrep: `sudo ngrep -t -Wbyline -deth0 host example.ws-service.fakedomain.com and port 80` you should see the WebSocket initial GET handshake includes header: `Sec-WebSocke Closes #6223 Differential Revision: D3162822 fb-gh-sync-id: a00f1c0f3e1c24ad6aa234329cbb2abad7664264 fbshipit-source-id: a00f1c0f3e1c24ad6aa234329cbb2abad7664264
1 parent a35ef6c commit 914f33c

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public String getName() {
6666

6767
@ReactMethod
6868
public void connect(final String url, @Nullable final ReadableArray protocols, @Nullable final ReadableMap headers, final int id) {
69-
// ignoring protocols, since OKHttp overrides them.
7069
OkHttpClient client = new OkHttpClient();
7170

7271
client.setConnectTimeout(10, TimeUnit.SECONDS);
@@ -99,6 +98,21 @@ public void connect(final String url, @Nullable final ReadableArray protocols, @
9998
builder.addHeader("origin", setDefaultOrigin(url));
10099
}
101100

101+
if (protocols != null && protocols.size() > 0) {
102+
StringBuilder protocolsValue = new StringBuilder("");
103+
for (int i = 0; i < protocols.size(); i++) {
104+
String v = protocols.getString(i).trim();
105+
if (!v.isEmpty() && !v.contains(",")) {
106+
protocolsValue.append(v);
107+
protocolsValue.append(",");
108+
}
109+
}
110+
if (protocolsValue.length() > 0) {
111+
protocolsValue.replace(protocolsValue.length() - 1, protocolsValue.length(), "");
112+
builder.addHeader("Sec-WebSocket-Protocol", protocolsValue.toString());
113+
}
114+
}
115+
102116
WebSocketCall.create(client, builder.build()).enqueue(new WebSocketListener() {
103117

104118
@Override

0 commit comments

Comments
 (0)