Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert WebSocket module to TurboModule

Browse Source 
Summary:
Implement the TurboModule interface in WebSocketModule.

Changelog: [Internal]

Reviewed By: mdvacca, RSNara

Differential Revision: D17587622

fbshipit-source-id: 6135ad79955c014a648cd29e21e91c71bbee5d44
This commit is contained in:
Emily Janzer
2019-10-22 19:32:31 -07:00
committed by Facebook Github Bot
parent 6ba2769f0f
commit 6b3d4e41ee
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
+3
View File
@@ -20,4 +20,7 @@ rn_android_library(
react_native_target("java/com/facebook/react/modules/core:core"),
react_native_target("java/com/facebook/react/modules/network:network"),
],
exported_deps = [
react_native_target("java/com/facebook/fbreact/specs:FBReactNativeSpec"),
],
)
ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
+24 -14
View File
@@ -9,10 +9,9 @@ package com.facebook.react.modules.websocket;
import androidx.annotation.Nullable;
import com.facebook.common.logging.FLog;
import com.facebook.fbreact.specs.NativeWebSocketModuleSpec;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.ReadableMapKeySetIterator;
@@ -38,7 +37,7 @@ import okhttp3.WebSocketListener;
import okio.ByteString;
@ReactModule(name = WebSocketModule.NAME, hasConstants = false)
public final class WebSocketModule extends ReactContextBaseJavaModule {
public final class WebSocketModule extends NativeWebSocketModuleSpec {
public static final String TAG = WebSocketModule.class.getSimpleName();
public static final String NAME = "WebSocketModule";
@@ -84,12 +83,13 @@ public final class WebSocketModule extends ReactContextBaseJavaModule {
}
}
@ReactMethod
@Override
public void connect(
final String url,
@Nullable final ReadableArray protocols,
@Nullable final ReadableMap options,
final int id) {
final double socketID) {
final int id = (int) socketID;
OkHttpClient client =
new OkHttpClient.Builder()
.connectTimeout(10, TimeUnit.SECONDS)
@@ -212,8 +212,9 @@ public final class WebSocketModule extends ReactContextBaseJavaModule {
client.dispatcher().executorService().shutdown();
}
@ReactMethod
public void close(int code, String reason, int id) {
@Override
public void close(double code, String reason, double socketID) {
int id = (int) socketID;
WebSocket client = mWebSocketConnections.get(id);
if (client == null) {
// WebSocket is already closed
@@ -221,7 +222,7 @@ public final class WebSocketModule extends ReactContextBaseJavaModule {
return;
}
try {
client.close(code, reason);
client.close((int) code, reason);
mWebSocketConnections.remove(id);
mContentHandlers.remove(id);
} catch (Exception e) {
@@ -229,8 +230,9 @@ public final class WebSocketModule extends ReactContextBaseJavaModule {
}
}
@ReactMethod
public void send(String message, int id) {
@Override
public void send(String message, double socketID) {
final int id = (int) socketID;
WebSocket client = mWebSocketConnections.get(id);
if (client == null) {
// This is a programmer error -- display development warning
@@ -254,8 +256,9 @@ public final class WebSocketModule extends ReactContextBaseJavaModule {
}
}
@ReactMethod
public void sendBinary(String base64String, int id) {
@Override
public void sendBinary(String base64String, double socketID) {
final int id = (int) socketID;
WebSocket client = mWebSocketConnections.get(id);
if (client == null) {
// This is a programmer error -- display development warning
@@ -303,8 +306,9 @@ public final class WebSocketModule extends ReactContextBaseJavaModule {
}
}
@ReactMethod
public void ping(int id) {
@Override
public void ping(double socketID) {
final int id = (int) socketID;
WebSocket client = mWebSocketConnections.get(id);
if (client == null) {
// This is a programmer error -- display development warning
@@ -396,4 +400,10 @@ public final class WebSocketModule extends ReactContextBaseJavaModule {
throw new IllegalArgumentException("Unable to get cookie from " + uri);
}
}
@Override
public void addListener(String eventName) {}
@Override
public void removeListeners(double count) {}
}