kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-05-06 17:52:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update JSStackTrace to support segment ids

Browse Source 
Reviewed By: jeanlauliac

Differential Revision: D13504222

fbshipit-source-id: ffda11697838ea03d15a28704d401e1051058b49
This commit is contained in:
Alex Dvornikov
2018-12-18 15:56:39 -08:00
committed by Facebook Github Bot
parent 0407d8c8fd
commit ae121690eb
3 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java
View File

@@ -15,7 +15,7 @@ import com.facebook.react.bridge.ReadableType;
public class JSStackTrace {
final private static Pattern mJsModuleIdPattern = Pattern.compile("(?:^|[/\\\\])(\\d+\\.js)$");
private static final Pattern FILE_ID_PATTERN = Pattern.compile("\\b((?:seg-\\d+(?:_\\d+)?|\\d+)\\.js)");
public static String format(String message, ReadableArray stack) {
StringBuilder stringBuilder = new StringBuilder(message).append(", stack:\n");
@@ -24,7 +24,7 @@ public class JSStackTrace {
stringBuilder
.append(frame.getString("methodName"))
.append("@")
.append(stackFrameToModuleId(frame))
.append(parseFileId(frame))
.append(frame.getInt("lineNumber"));
if (frame.hasKey("column") &&
!frame.isNull("column") &&
@@ -38,16 +38,18 @@ public class JSStackTrace {
return stringBuilder.toString();
}
// If the file name of a stack frame is numeric (+ ".js"), we assume it's a lazily injected module
// coming from a "random access bundle". We are using special source maps for these bundles, so
// that we can symbolicate stack traces for multiple injected files with a single source map.
// We have to include the module id in the stack for that, though. The ".js" suffix is kept to
// avoid ambiguities between "module-id:line" and "line:column".
private static String stackFrameToModuleId(ReadableMap frame) {
// Besides a regular bundle (e.g. "bundle.js"), a stack frame can be produced by:
// 1) "random access bundle (RAM)", e.g. "1.js", where "1" is a module name
// 2) "segment file", e.g. "seg-1.js", where "1" is a segment name
// 3) "RAM segment file", e.g. "seg-1_2.js", where "1" is a segment name and "2" is a module name
// We are using a special source map format for such cases, so that we could symbolicate
// stack traces with a single source map file.
// NOTE: The ".js" suffix is kept to avoid ambiguities between "module-id:line" and "line:column".
private static String parseFileId(ReadableMap frame) {
if (frame.hasKey("file") &&
!frame.isNull("file") &&
frame.getType("file") == ReadableType.String) {
final Matcher matcher = mJsModuleIdPattern.matcher(frame.getString("file"));
final Matcher matcher = FILE_ID_PATTERN.matcher(frame.getString("file"));
if (matcher.find()) {
return matcher.group(1) + ":";
}