Skip to content

Commit

Permalink
Fix regression with JavaScriptCore errors
Browse files Browse the repository at this point in the history 
Somehow in the big overhaul one regex got changed a bit to much,
breaking some stack traces people used.
  • Loading branch information
@Calamari
Calamari committed Apr 29, 2019
1 parent 8955ee8 commit 2e53d01
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 24 deletions.
19 changes: 19 additions & 0 deletions src/stack-trace-parser.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export function parse(stackString) {
parseChrome(line) ||
parseWinjs(line) ||
parseGecko(line) ||
parseJSC(line) ||
parseNode(line);

if (parseResult) {
Expand Down Expand Up @@ -99,6 +100,24 @@ function parseGecko(line) {
};
}

const javaScriptCoreRe = /^(?:\s*([^@]*)(?:\((.*?)\))?@)?(\S.*?):(\d+)(?::(\d+))?\s*$/i

function parseJSC(line) {
const parts = javaScriptCoreRe.exec(line);

if (!parts) {
return null;
}

return {
file: parts[3],
methodName: parts[1] || UNKNOWN_FUNCTION,
arguments: [],
lineNumber: +parts[4],
column: parts[5] ? +parts[5] : null,
};
}

const nodeRe = /^\s*at (?:((?:\[object object\])?\S+(?: \[as \S+\])?) )?\(?(.*?):(\d+)(?::(\d+))?\)?\s*$/i;

function parseNode(line) {
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/captured-errors.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,4 +314,14 @@ export default {
'value@index.android.bundle:29:927\n' +
'[native code]',
},

IOS_REACT_NATIVE_1: {
message: 'Error: from issue #11',
stack: `
_exampleFunction@/home/test/project/App.js:125:13
_depRunCallbacks@/home/test/project/node_modules/dep/index.js:77:45
tryCallTwo@/home/test/project/node_modules/react-native/node_modules/promise/lib/core.js:45:5
doResolve@/home/test/project/node_modules/react-native/node_modules/promise/lib/core.js:200:13
`
}
};
103 changes: 79 additions & 24 deletions test/stack-trace-parser.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,62 @@ import * as stackTraceParser from '../src';
import CapturedExceptions from './fixtures/captured-errors';

describe('stackTraceParser', () => {
it('should parse Safari 6 error', () => {
it('parses JavaScriptCore errors', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.IOS_REACT_NATIVE_1.stack
);
expect(stackFrames.length).to.be(4);
expect(stackFrames).to.eql([
{
file: '/home/test/project/App.js',
methodName: '_exampleFunction',
arguments: [],
lineNumber: 125,
column: 13,
},
{
file: '/home/test/project/node_modules/dep/index.js',
methodName: '_depRunCallbacks',
arguments: [],
lineNumber: 77,
column: 45,
},
{
file:
'/home/test/project/node_modules/react-native/node_modules/promise/lib/core.js',
methodName: 'tryCallTwo',
arguments: [],
lineNumber: 45,
column: 5,
},
{
file:
'/home/test/project/node_modules/react-native/node_modules/promise/lib/core.js',
methodName: 'doResolve',
arguments: [],
lineNumber: 200,
column: 13,
},
]);
});

it('parses very simple JavaScriptCore errors', () => {
const stackFrames = stackTraceParser.parse(
'global code@stack_traces/test:83:55'
);
expect(stackFrames.length).to.be(1);
expect(stackFrames).to.eql([
{
file: 'stack_traces/test',
methodName: 'global code',
arguments: [],
lineNumber: 83,
column: 55,
},
]);
});

it('parses Safari 6 error', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.SAFARI_6.stack
);
Expand Down Expand Up @@ -38,7 +93,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Safari 7 error', () => {
it('parses Safari 7 error', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.SAFARI_7.stack
);
Expand Down Expand Up @@ -66,7 +121,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Safari 8 error', () => {
it('parses Safari 8 error', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.SAFARI_8.stack
);
Expand Down Expand Up @@ -94,7 +149,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Safari 8 eval error', () => {
it('parses Safari 8 eval error', () => {
// TODO: Take into account the line and column properties on the error object and use them for the first stack trace.
const stackFrames = stackTraceParser.parse(
CapturedExceptions.SAFARI_8_EVAL.stack
Expand Down Expand Up @@ -123,7 +178,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Firefox 3 error', () => {
it('parses Firefox 3 error', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.FIREFOX_3.stack
);
Expand Down Expand Up @@ -179,7 +234,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Firefox 7 error', () => {
it('parses Firefox 7 error', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.FIREFOX_7.stack
);
Expand Down Expand Up @@ -235,7 +290,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Firefox 14 error', () => {
it('parses Firefox 14 error', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.FIREFOX_14.stack
);
Expand Down Expand Up @@ -263,7 +318,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Firefox 31 error', () => {
it('parses Firefox 31 error', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.FIREFOX_31.stack
);
Expand Down Expand Up @@ -291,7 +346,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Firefox 44 ns exceptions', () => {
it('parses Firefox 44 ns exceptions', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.FIREFOX_44_NS_EXCEPTION.stack
);
Expand Down Expand Up @@ -326,7 +381,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Chrome error with no location', () => {
it('parses Chrome error with no location', () => {
const stackFrames = stackTraceParser.parse(
'error\n at Array.forEach (native)'
);
Expand All @@ -340,7 +395,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Chrome 15 error', () => {
it('parses Chrome 15 error', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.CHROME_15.stack
);
Expand Down Expand Up @@ -375,7 +430,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Chrome 36 error with port numbers', () => {
it('parses Chrome 36 error with port numbers', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.CHROME_36.stack
);
Expand Down Expand Up @@ -403,7 +458,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Chrome error with webpack URLs', () => {
it('parses Chrome error with webpack URLs', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.CHROME_XX_WEBPACK.stack
);
Expand Down Expand Up @@ -438,7 +493,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse nested eval() from Chrome', () => {
it('parses nested eval() from Chrome', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.CHROME_48_EVAL.stack
);
Expand Down Expand Up @@ -480,7 +535,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Chrome error with blob URLs', () => {
it('parses Chrome error with blob URLs', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.CHROME_48_BLOB.stack
);
Expand Down Expand Up @@ -535,7 +590,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse IE 10 error', () => {
it('parses IE 10 error', () => {
const stackFrames = stackTraceParser.parse(CapturedExceptions.IE_10.stack);
expect(stackFrames.length).to.be(3);
// TODO: func should be normalized
Expand All @@ -562,7 +617,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse IE 11 error', () => {
it('parses IE 11 error', () => {
const stackFrames = stackTraceParser.parse(CapturedExceptions.IE_11.stack);
expect(stackFrames.length).to.be(3);
// TODO: func should be normalized
Expand All @@ -589,7 +644,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse IE 11 eval error', () => {
it('parses IE 11 eval error', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.IE_11_EVAL.stack
);
Expand Down Expand Up @@ -617,7 +672,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Opera 25 error', () => {
it('parses Opera 25 error', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.OPERA_25.stack
);
Expand Down Expand Up @@ -645,7 +700,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse PhantomJS 1.19 error', () => {
it('parses PhantomJS 1.19 error', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.PHANTOMJS_1_19.stack
);
Expand Down Expand Up @@ -673,7 +728,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Firefox errors with resource: URLs', () => {
it('parses Firefox errors with resource: URLs', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.FIREFOX_50_RESOURCE_URL.stack
);
Expand All @@ -687,7 +742,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse Firefox errors with eval URLs', () => {
it('parses Firefox errors with eval URLs', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.FIREFOX_43_EVAL.stack
);
Expand Down Expand Up @@ -729,7 +784,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse React Native errors on Android', () => {
it('parses React Native errors on Android', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.ANDROID_REACT_NATIVE.stack
);
Expand All @@ -752,7 +807,7 @@ describe('stackTraceParser', () => {
});
});

it('should parse React Native errors on Android Production', () => {
it('parses React Native errors on Android Production', () => {
const stackFrames = stackTraceParser.parse(
CapturedExceptions.ANDROID_REACT_NATIVE_PROD.stack
);
Expand Down

0 comments on commit 2e53d01

Please sign in to comment.