kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-09 22:43:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

BREAKING: Change the js1 - packager - RN App protocol to version 2

Browse Source 
Reviewed By: cwdick

Differential Revision: D4551991

fbshipit-source-id: 395c38ee5c71ddc24d8743e7ec90cc89de087503
This commit is contained in:
Lukas Piatkowski
2017-02-16 04:20:32 -08:00
committed by Facebook Github Bot
parent 33817b83d6
commit a2addbd932
6 changed files with 326 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
View File

@@ -65,7 +65,7 @@ public class DevServerHelper {
private static final String ONCHANGE_ENDPOINT_URL_FORMAT =
"http://%s/onchange";
private static final String WEBSOCKET_PROXY_URL_FORMAT = "ws://%s/debugger-proxy?role=client";
private static final String PACKAGER_CONNECTION_URL_FORMAT = "ws://%s/message?role=shell";
private static final String PACKAGER_CONNECTION_URL_FORMAT = "ws://%s/message?role=android-rn-devserverhelper";
private static final String PACKAGER_STATUS_URL_FORMAT = "http://%s/status";
private static final String HEAP_CAPTURE_UPLOAD_URL_FORMAT = "http://%s/jscheapcaptureupload";
private static final String INSPECTOR_DEVICE_URL_FORMAT = "http://%s/inspector/device?name=%s";

32
ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
View File

@@ -25,7 +25,7 @@ import org.json.JSONObject;
*/
final public class JSPackagerClient implements ReconnectingWebSocket.MessageCallback {
private static final String TAG = JSPackagerClient.class.getSimpleName();
private static final int PROTOCOL_VERSION = 1;
private static final int PROTOCOL_VERSION = 2;
public class Responder {
private Object mId;
@@ -38,8 +38,8 @@ final public class JSPackagerClient implements ReconnectingWebSocket.MessageCall
try {
JSONObject message = new JSONObject();
message.put("version", PROTOCOL_VERSION);
message.put("target", "profiler");
message.put("action", result);
message.put("id", mId);
message.put("result", result);
mWebSocket.sendMessage(RequestBody.create(WebSocket.TEXT, message.toString()));
} catch (Exception e) {
FLog.e(TAG, "Responding failed", e);
@@ -109,8 +109,9 @@ final public class JSPackagerClient implements ReconnectingWebSocket.MessageCall
JSONObject message = new JSONObject(response.string());
int version = message.optInt("version");
String target = message.optString("target");
String action = message.optString("action");
String method = message.optString("method");
Object id = message.opt("id");
Object params = message.opt("params");
if (version != PROTOCOL_VERSION) {
FLog.e(
@@ -119,20 +120,21 @@ final public class JSPackagerClient implements ReconnectingWebSocket.MessageCall
return;
}
if (!"bridge".equals(target)) {
if (method == null) {
abortOnMessage(id, "No method provided");
return;
}
RequestHandler handler = mRequestHandlers.get(action);
RequestHandler handler = mRequestHandlers.get(method);
if (handler == null) {
FLog.e(TAG, "No request handler for action: " + action);
abortOnMessage(id, "No request handler for method: " + method);
return;
}
if (!"pokeSamplingProfiler".equals(action)) {
handler.onNotification(null);
if (id == null) {
handler.onNotification(params);
} else {
handler.onRequest(null, new Responder("profiler"));
handler.onRequest(params, new Responder(id));
}
} catch (Exception e) {
FLog.e(TAG, "Handling the message failed", e);
@@ -140,4 +142,12 @@ final public class JSPackagerClient implements ReconnectingWebSocket.MessageCall
response.close();
}
}
private void abortOnMessage(Object id, String reason) {
if (id != null) {
(new Responder(id)).error(reason);
}
FLog.e(TAG, "Handling the message failed with reason: " + reason);
}
}