Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions packages/browser/test/tracekit/chromium.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -643,4 +643,97 @@ describe('Tracekit - Chrome Tests', () => {
},
});
});

it('should correctly parse a wasm stack trace', () => {
const WASM_ERROR = {
message: 'memory access out of bounds',
name: 'RuntimeError',
stack: `RuntimeError: memory access out of bounds
at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)
at MyClass::foo(int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637)
at MyClass::getAt(int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b)
at emscripten::internal::MethodInvoker<int (MyClass::*)(int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df)
at ClassHandle.MyClass$getAt [as getAt] (eval at newFunc (http://localhost:8001/main.js:2201:27), <anonymous>:9:10)
at myFunctionVectorOutOfBounds (http://localhost:8001/main.html:18:22)
at captureError (http://localhost:8001/main.html:27:11)
at Object.onRuntimeInitialized (http://localhost:8001/main.html:39:9)
at doRun (http://localhost:8001/main.js:7084:71)
at run (http://localhost:8001/main.js:7101:5)`,
};

const ex = exceptionFromError(parser, WASM_ERROR);

// This is really ugly but the wasm integration should clean up these stack frames
expect(ex).toStrictEqual({
stacktrace: {
frames: [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
],
},
type: 'RuntimeError',
value: 'memory access out of bounds',
});
});
});
2 changes: 2 additions & 0 deletions packages/wasm/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "npm pack",
"test": "vitest run",
"test:watch": "vitest --watch",
"circularDepCheck": "madge --circular src/index.ts",
"clean": "rimraf build coverage sentry-wasm-*.tgz",
"fix": "eslint . --format stylish --fix",
Expand Down
25 changes: 21 additions & 4 deletions packages/wasm/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,20 +36,36 @@ const _wasmIntegration = (() => {

export const wasmIntegration = defineIntegration(_wasmIntegration);

const PARSER_REGEX = /^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/;

/**
* Patches a list of stackframes with wasm data needed for server-side symbolication
* if applicable. Returns true if the provided list of stack frames had at least one
* matching registered image.
*/
function patchFrames(frames: Array<StackFrame>): boolean {
// Only exported for tests
export function patchFrames(frames: Array<StackFrame>): boolean {
let hasAtLeastOneWasmFrameWithImage = false;
frames.forEach(frame => {
if (!frame.filename) {
return;
}
const match = frame.filename.match(/^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/) as
| null
| [string, string, string];

const split = frame.filename.split('(');
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const lastSplit = split[split.length - 1]!;

// Let's call this first match a "messy match".
// The browser stacktrace parser spits out frames that have a filename like this: "int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb"
// It contains some leftover mess because wasm stack frames are more complicated than our parser can handle: "at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)"
// This first match simply tries to mitigate the mess up until the first opening parens.
// The match afterwards is a sensible fallback
let match = lastSplit.match(PARSER_REGEX) as null | [string, string, string];

if (!match) {
match = frame.filename.match(PARSER_REGEX) as null | [string, string, string];
}

if (match) {
const index = getImage(match[1]);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could check the length of the match array before here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is a match it is 100% guaranteed to have 3 entries so I don't think it would matter and it saves bundle size.

frame.instruction_addr = match[2];
Expand All@@ -62,5 +78,6 @@ function patchFrames(frames: Array<StackFrame>): boolean {
}
}
});

return hasAtLeastOneWasmFrameWithImage;
}
159 changes: 159 additions & 0 deletions packages/wasm/test/stacktrace-parsing.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
import { describe, it, expect } from 'vitest';
import { patchFrames } from '../src/index';

describe('patchFrames()', () => {
it('should correctly extract instruction addresses', () => {
const frames = [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
{
filename: 'http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
];

patchFrames(frames);

expect(frames).toStrictEqual([
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
instruction_addr: '0x47df',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::getAt',
in_app: true,
instruction_addr: '0x540b',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::foo',
in_app: true,
instruction_addr: '0x5637',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
]);
});
});
3 changes: 3 additions & 0 deletions packages/wasm/test/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"extends": "../tsconfig.test.json"
}
8 changes: 8 additions & 0 deletions packages/wasm/tsconfig.test.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
{
"extends": "./tsconfig.json",
"include": ["test/**/*", "vite.config.ts"],
"compilerOptions": {
"types": ["node"],
"lib": ["DOM", "ESNext"]
}
}
8 changes: 8 additions & 0 deletions packages/wasm/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
...baseConfig.test,
},
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions packages/browser/test/tracekit/chromium.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -643,4 +643,97 @@ describe('Tracekit - Chrome Tests', () => {
},
});
});

it('should correctly parse a wasm stack trace', () => {
const WASM_ERROR = {
message: 'memory access out of bounds',
name: 'RuntimeError',
stack: `RuntimeError: memory access out of bounds
at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)
at MyClass::foo(int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637)
at MyClass::getAt(int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b)
at emscripten::internal::MethodInvoker<int (MyClass::*)(int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df)
at ClassHandle.MyClass$getAt [as getAt] (eval at newFunc (http://localhost:8001/main.js:2201:27), <anonymous>:9:10)
at myFunctionVectorOutOfBounds (http://localhost:8001/main.html:18:22)
at captureError (http://localhost:8001/main.html:27:11)
at Object.onRuntimeInitialized (http://localhost:8001/main.html:39:9)
at doRun (http://localhost:8001/main.js:7084:71)
at run (http://localhost:8001/main.js:7101:5)`,
};

const ex = exceptionFromError(parser, WASM_ERROR);

// This is really ugly but the wasm integration should clean up these stack frames
expect(ex).toStrictEqual({
stacktrace: {
frames: [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
],
},
type: 'RuntimeError',
value: 'memory access out of bounds',
});
});
});
2 changes: 2 additions & 0 deletions packages/wasm/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "npm pack",
"test": "vitest run",
"test:watch": "vitest --watch",
"circularDepCheck": "madge --circular src/index.ts",
"clean": "rimraf build coverage sentry-wasm-*.tgz",
"fix": "eslint . --format stylish --fix",
Expand Down
25 changes: 21 additions & 4 deletions packages/wasm/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,20 +36,36 @@ const _wasmIntegration = (() => {

export const wasmIntegration = defineIntegration(_wasmIntegration);

const PARSER_REGEX = /^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/;

/**
* Patches a list of stackframes with wasm data needed for server-side symbolication
* if applicable. Returns true if the provided list of stack frames had at least one
* matching registered image.
*/
function patchFrames(frames: Array<StackFrame>): boolean {
// Only exported for tests
export function patchFrames(frames: Array<StackFrame>): boolean {
let hasAtLeastOneWasmFrameWithImage = false;
frames.forEach(frame => {
if (!frame.filename) {
return;
}
const match = frame.filename.match(/^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/) as
| null
| [string, string, string];

const split = frame.filename.split('(');
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const lastSplit = split[split.length - 1]!;

// Let's call this first match a "messy match".
// The browser stacktrace parser spits out frames that have a filename like this: "int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb"
// It contains some leftover mess because wasm stack frames are more complicated than our parser can handle: "at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)"
// This first match simply tries to mitigate the mess up until the first opening parens.
// The match afterwards is a sensible fallback
let match = lastSplit.match(PARSER_REGEX) as null | [string, string, string];

if (!match) {
match = frame.filename.match(PARSER_REGEX) as null | [string, string, string];
}

if (match) {
const index = getImage(match[1]);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could check the length of the match array before here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is a match it is 100% guaranteed to have 3 entries so I don't think it would matter and it saves bundle size.

frame.instruction_addr = match[2];
Expand All@@ -62,5 +78,6 @@ function patchFrames(frames: Array<StackFrame>): boolean {
}
}
});

return hasAtLeastOneWasmFrameWithImage;
}
159 changes: 159 additions & 0 deletions packages/wasm/test/stacktrace-parsing.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
import { describe, it, expect } from 'vitest';
import { patchFrames } from '../src/index';

describe('patchFrames()', () => {
it('should correctly extract instruction addresses', () => {
const frames = [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
{
filename: 'http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
];

patchFrames(frames);

expect(frames).toStrictEqual([
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
instruction_addr: '0x47df',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::getAt',
in_app: true,
instruction_addr: '0x540b',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::foo',
in_app: true,
instruction_addr: '0x5637',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
]);
});
});
3 changes: 3 additions & 0 deletions packages/wasm/test/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"extends": "../tsconfig.test.json"
}
8 changes: 8 additions & 0 deletions packages/wasm/tsconfig.test.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
{
"extends": "./tsconfig.json",
"include": ["test/**/*", "vite.config.ts"],
"compilerOptions": {
"types": ["node"],
"lib": ["DOM", "ESNext"]
}
}
8 changes: 8 additions & 0 deletions packages/wasm/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
...baseConfig.test,
},
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions packages/browser/test/tracekit/chromium.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -643,4 +643,97 @@ describe('Tracekit - Chrome Tests', () => {
},
});
});

it('should correctly parse a wasm stack trace', () => {
const WASM_ERROR = {
message: 'memory access out of bounds',
name: 'RuntimeError',
stack: `RuntimeError: memory access out of bounds
at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)
at MyClass::foo(int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637)
at MyClass::getAt(int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b)
at emscripten::internal::MethodInvoker<int (MyClass::*)(int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df)
at ClassHandle.MyClass$getAt [as getAt] (eval at newFunc (http://localhost:8001/main.js:2201:27), <anonymous>:9:10)
at myFunctionVectorOutOfBounds (http://localhost:8001/main.html:18:22)
at captureError (http://localhost:8001/main.html:27:11)
at Object.onRuntimeInitialized (http://localhost:8001/main.html:39:9)
at doRun (http://localhost:8001/main.js:7084:71)
at run (http://localhost:8001/main.js:7101:5)`,
};

const ex = exceptionFromError(parser, WASM_ERROR);

// This is really ugly but the wasm integration should clean up these stack frames
expect(ex).toStrictEqual({
stacktrace: {
frames: [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
],
},
type: 'RuntimeError',
value: 'memory access out of bounds',
});
});
});
2 changes: 2 additions & 0 deletions packages/wasm/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "npm pack",
"test": "vitest run",
"test:watch": "vitest --watch",
"circularDepCheck": "madge --circular src/index.ts",
"clean": "rimraf build coverage sentry-wasm-*.tgz",
"fix": "eslint . --format stylish --fix",
Expand Down
25 changes: 21 additions & 4 deletions packages/wasm/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,20 +36,36 @@ const _wasmIntegration = (() => {

export const wasmIntegration = defineIntegration(_wasmIntegration);

const PARSER_REGEX = /^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/;

/**
* Patches a list of stackframes with wasm data needed for server-side symbolication
* if applicable. Returns true if the provided list of stack frames had at least one
* matching registered image.
*/
function patchFrames(frames: Array<StackFrame>): boolean {
// Only exported for tests
export function patchFrames(frames: Array<StackFrame>): boolean {
let hasAtLeastOneWasmFrameWithImage = false;
frames.forEach(frame => {
if (!frame.filename) {
return;
}
const match = frame.filename.match(/^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/) as
| null
| [string, string, string];

const split = frame.filename.split('(');
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const lastSplit = split[split.length - 1]!;

// Let's call this first match a "messy match".
// The browser stacktrace parser spits out frames that have a filename like this: "int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb"
// It contains some leftover mess because wasm stack frames are more complicated than our parser can handle: "at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)"
// This first match simply tries to mitigate the mess up until the first opening parens.
// The match afterwards is a sensible fallback
let match = lastSplit.match(PARSER_REGEX) as null | [string, string, string];

if (!match) {
match = frame.filename.match(PARSER_REGEX) as null | [string, string, string];
}

if (match) {
const index = getImage(match[1]);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could check the length of the match array before here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is a match it is 100% guaranteed to have 3 entries so I don't think it would matter and it saves bundle size.

frame.instruction_addr = match[2];
Expand All@@ -62,5 +78,6 @@ function patchFrames(frames: Array<StackFrame>): boolean {
}
}
});

return hasAtLeastOneWasmFrameWithImage;
}
159 changes: 159 additions & 0 deletions packages/wasm/test/stacktrace-parsing.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
import { describe, it, expect } from 'vitest';
import { patchFrames } from '../src/index';

describe('patchFrames()', () => {
it('should correctly extract instruction addresses', () => {
const frames = [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
{
filename: 'http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
];

patchFrames(frames);

expect(frames).toStrictEqual([
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
instruction_addr: '0x47df',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::getAt',
in_app: true,
instruction_addr: '0x540b',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::foo',
in_app: true,
instruction_addr: '0x5637',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
]);
});
});
3 changes: 3 additions & 0 deletions packages/wasm/test/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"extends": "../tsconfig.test.json"
}
8 changes: 8 additions & 0 deletions packages/wasm/tsconfig.test.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
{
"extends": "./tsconfig.json",
"include": ["test/**/*", "vite.config.ts"],
"compilerOptions": {
"types": ["node"],
"lib": ["DOM", "ESNext"]
}
}
8 changes: 8 additions & 0 deletions packages/wasm/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
...baseConfig.test,
},
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions packages/browser/test/tracekit/chromium.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -643,4 +643,97 @@ describe('Tracekit - Chrome Tests', () => {
},
});
});

it('should correctly parse a wasm stack trace', () => {
const WASM_ERROR = {
message: 'memory access out of bounds',
name: 'RuntimeError',
stack: `RuntimeError: memory access out of bounds
at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)
at MyClass::foo(int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637)
at MyClass::getAt(int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b)
at emscripten::internal::MethodInvoker<int (MyClass::*)(int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df)
at ClassHandle.MyClass$getAt [as getAt] (eval at newFunc (http://localhost:8001/main.js:2201:27), <anonymous>:9:10)
at myFunctionVectorOutOfBounds (http://localhost:8001/main.html:18:22)
at captureError (http://localhost:8001/main.html:27:11)
at Object.onRuntimeInitialized (http://localhost:8001/main.html:39:9)
at doRun (http://localhost:8001/main.js:7084:71)
at run (http://localhost:8001/main.js:7101:5)`,
};

const ex = exceptionFromError(parser, WASM_ERROR);

// This is really ugly but the wasm integration should clean up these stack frames
expect(ex).toStrictEqual({
stacktrace: {
frames: [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
],
},
type: 'RuntimeError',
value: 'memory access out of bounds',
});
});
});
2 changes: 2 additions & 0 deletions packages/wasm/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "npm pack",
"test": "vitest run",
"test:watch": "vitest --watch",
"circularDepCheck": "madge --circular src/index.ts",
"clean": "rimraf build coverage sentry-wasm-*.tgz",
"fix": "eslint . --format stylish --fix",
Expand Down
25 changes: 21 additions & 4 deletions packages/wasm/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,20 +36,36 @@ const _wasmIntegration = (() => {

export const wasmIntegration = defineIntegration(_wasmIntegration);

const PARSER_REGEX = /^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/;

/**
* Patches a list of stackframes with wasm data needed for server-side symbolication
* if applicable. Returns true if the provided list of stack frames had at least one
* matching registered image.
*/
function patchFrames(frames: Array<StackFrame>): boolean {
// Only exported for tests
export function patchFrames(frames: Array<StackFrame>): boolean {
let hasAtLeastOneWasmFrameWithImage = false;
frames.forEach(frame => {
if (!frame.filename) {
return;
}
const match = frame.filename.match(/^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/) as
| null
| [string, string, string];

const split = frame.filename.split('(');
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const lastSplit = split[split.length - 1]!;

// Let's call this first match a "messy match".
// The browser stacktrace parser spits out frames that have a filename like this: "int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb"
// It contains some leftover mess because wasm stack frames are more complicated than our parser can handle: "at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)"
// This first match simply tries to mitigate the mess up until the first opening parens.
// The match afterwards is a sensible fallback
let match = lastSplit.match(PARSER_REGEX) as null | [string, string, string];

if (!match) {
match = frame.filename.match(PARSER_REGEX) as null | [string, string, string];
}

if (match) {
const index = getImage(match[1]);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could check the length of the match array before here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is a match it is 100% guaranteed to have 3 entries so I don't think it would matter and it saves bundle size.

frame.instruction_addr = match[2];
Expand All@@ -62,5 +78,6 @@ function patchFrames(frames: Array<StackFrame>): boolean {
}
}
});

return hasAtLeastOneWasmFrameWithImage;
}
159 changes: 159 additions & 0 deletions packages/wasm/test/stacktrace-parsing.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
import { describe, it, expect } from 'vitest';
import { patchFrames } from '../src/index';

describe('patchFrames()', () => {
it('should correctly extract instruction addresses', () => {
const frames = [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
{
filename: 'http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
];

patchFrames(frames);

expect(frames).toStrictEqual([
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
instruction_addr: '0x47df',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::getAt',
in_app: true,
instruction_addr: '0x540b',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::foo',
in_app: true,
instruction_addr: '0x5637',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
]);
});
});
3 changes: 3 additions & 0 deletions packages/wasm/test/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"extends": "../tsconfig.test.json"
}
8 changes: 8 additions & 0 deletions packages/wasm/tsconfig.test.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
{
"extends": "./tsconfig.json",
"include": ["test/**/*", "vite.config.ts"],
"compilerOptions": {
"types": ["node"],
"lib": ["DOM", "ESNext"]
}
}
8 changes: 8 additions & 0 deletions packages/wasm/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
...baseConfig.test,
},
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions packages/browser/test/tracekit/chromium.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -643,4 +643,97 @@ describe('Tracekit - Chrome Tests', () => {
},
});
});

it('should correctly parse a wasm stack trace', () => {
const WASM_ERROR = {
message: 'memory access out of bounds',
name: 'RuntimeError',
stack: `RuntimeError: memory access out of bounds
at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)
at MyClass::foo(int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637)
at MyClass::getAt(int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b)
at emscripten::internal::MethodInvoker<int (MyClass::*)(int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df)
at ClassHandle.MyClass$getAt [as getAt] (eval at newFunc (http://localhost:8001/main.js:2201:27), <anonymous>:9:10)
at myFunctionVectorOutOfBounds (http://localhost:8001/main.html:18:22)
at captureError (http://localhost:8001/main.html:27:11)
at Object.onRuntimeInitialized (http://localhost:8001/main.html:39:9)
at doRun (http://localhost:8001/main.js:7084:71)
at run (http://localhost:8001/main.js:7101:5)`,
};

const ex = exceptionFromError(parser, WASM_ERROR);

// This is really ugly but the wasm integration should clean up these stack frames
expect(ex).toStrictEqual({
stacktrace: {
frames: [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
],
},
type: 'RuntimeError',
value: 'memory access out of bounds',
});
});
});
2 changes: 2 additions & 0 deletions packages/wasm/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "npm pack",
"test": "vitest run",
"test:watch": "vitest --watch",
"circularDepCheck": "madge --circular src/index.ts",
"clean": "rimraf build coverage sentry-wasm-*.tgz",
"fix": "eslint . --format stylish --fix",
Expand Down
25 changes: 21 additions & 4 deletions packages/wasm/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,20 +36,36 @@ const _wasmIntegration = (() => {

export const wasmIntegration = defineIntegration(_wasmIntegration);

const PARSER_REGEX = /^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/;

/**
* Patches a list of stackframes with wasm data needed for server-side symbolication
* if applicable. Returns true if the provided list of stack frames had at least one
* matching registered image.
*/
function patchFrames(frames: Array<StackFrame>): boolean {
// Only exported for tests
export function patchFrames(frames: Array<StackFrame>): boolean {
let hasAtLeastOneWasmFrameWithImage = false;
frames.forEach(frame => {
if (!frame.filename) {
return;
}
const match = frame.filename.match(/^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/) as
| null
| [string, string, string];

const split = frame.filename.split('(');
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const lastSplit = split[split.length - 1]!;

// Let's call this first match a "messy match".
// The browser stacktrace parser spits out frames that have a filename like this: "int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb"
// It contains some leftover mess because wasm stack frames are more complicated than our parser can handle: "at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)"
// This first match simply tries to mitigate the mess up until the first opening parens.
// The match afterwards is a sensible fallback
let match = lastSplit.match(PARSER_REGEX) as null | [string, string, string];

if (!match) {
match = frame.filename.match(PARSER_REGEX) as null | [string, string, string];
}

if (match) {
const index = getImage(match[1]);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could check the length of the match array before here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is a match it is 100% guaranteed to have 3 entries so I don't think it would matter and it saves bundle size.

frame.instruction_addr = match[2];
Expand All@@ -62,5 +78,6 @@ function patchFrames(frames: Array<StackFrame>): boolean {
}
}
});

return hasAtLeastOneWasmFrameWithImage;
}
159 changes: 159 additions & 0 deletions packages/wasm/test/stacktrace-parsing.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
import { describe, it, expect } from 'vitest';
import { patchFrames } from '../src/index';

describe('patchFrames()', () => {
it('should correctly extract instruction addresses', () => {
const frames = [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
{
filename: 'http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
];

patchFrames(frames);

expect(frames).toStrictEqual([
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
instruction_addr: '0x47df',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::getAt',
in_app: true,
instruction_addr: '0x540b',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::foo',
in_app: true,
instruction_addr: '0x5637',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
]);
});
});
3 changes: 3 additions & 0 deletions packages/wasm/test/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"extends": "../tsconfig.test.json"
}
8 changes: 8 additions & 0 deletions packages/wasm/tsconfig.test.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
{
"extends": "./tsconfig.json",
"include": ["test/**/*", "vite.config.ts"],
"compilerOptions": {
"types": ["node"],
"lib": ["DOM", "ESNext"]
}
}
8 changes: 8 additions & 0 deletions packages/wasm/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
...baseConfig.test,
},
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions packages/browser/test/tracekit/chromium.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -643,4 +643,97 @@ describe('Tracekit - Chrome Tests', () => {
},
});
});

it('should correctly parse a wasm stack trace', () => {
const WASM_ERROR = {
message: 'memory access out of bounds',
name: 'RuntimeError',
stack: `RuntimeError: memory access out of bounds
at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)
at MyClass::foo(int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637)
at MyClass::getAt(int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b)
at emscripten::internal::MethodInvoker<int (MyClass::*)(int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df)
at ClassHandle.MyClass$getAt [as getAt] (eval at newFunc (http://localhost:8001/main.js:2201:27), <anonymous>:9:10)
at myFunctionVectorOutOfBounds (http://localhost:8001/main.html:18:22)
at captureError (http://localhost:8001/main.html:27:11)
at Object.onRuntimeInitialized (http://localhost:8001/main.html:39:9)
at doRun (http://localhost:8001/main.js:7084:71)
at run (http://localhost:8001/main.js:7101:5)`,
};

const ex = exceptionFromError(parser, WASM_ERROR);

// This is really ugly but the wasm integration should clean up these stack frames
expect(ex).toStrictEqual({
stacktrace: {
frames: [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
],
},
type: 'RuntimeError',
value: 'memory access out of bounds',
});
});
});
2 changes: 2 additions & 0 deletions packages/wasm/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "npm pack",
"test": "vitest run",
"test:watch": "vitest --watch",
"circularDepCheck": "madge --circular src/index.ts",
"clean": "rimraf build coverage sentry-wasm-*.tgz",
"fix": "eslint . --format stylish --fix",
Expand Down
25 changes: 21 additions & 4 deletions packages/wasm/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,20 +36,36 @@ const _wasmIntegration = (() => {

export const wasmIntegration = defineIntegration(_wasmIntegration);

const PARSER_REGEX = /^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/;

/**
* Patches a list of stackframes with wasm data needed for server-side symbolication
* if applicable. Returns true if the provided list of stack frames had at least one
* matching registered image.
*/
function patchFrames(frames: Array<StackFrame>): boolean {
// Only exported for tests
export function patchFrames(frames: Array<StackFrame>): boolean {
let hasAtLeastOneWasmFrameWithImage = false;
frames.forEach(frame => {
if (!frame.filename) {
return;
}
const match = frame.filename.match(/^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/) as
| null
| [string, string, string];

const split = frame.filename.split('(');
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const lastSplit = split[split.length - 1]!;

// Let's call this first match a "messy match".
// The browser stacktrace parser spits out frames that have a filename like this: "int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb"
// It contains some leftover mess because wasm stack frames are more complicated than our parser can handle: "at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)"
// This first match simply tries to mitigate the mess up until the first opening parens.
// The match afterwards is a sensible fallback
let match = lastSplit.match(PARSER_REGEX) as null | [string, string, string];

if (!match) {
match = frame.filename.match(PARSER_REGEX) as null | [string, string, string];
}

if (match) {
const index = getImage(match[1]);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could check the length of the match array before here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is a match it is 100% guaranteed to have 3 entries so I don't think it would matter and it saves bundle size.

frame.instruction_addr = match[2];
Expand All@@ -62,5 +78,6 @@ function patchFrames(frames: Array<StackFrame>): boolean {
}
}
});

return hasAtLeastOneWasmFrameWithImage;
}
159 changes: 159 additions & 0 deletions packages/wasm/test/stacktrace-parsing.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
import { describe, it, expect } from 'vitest';
import { patchFrames } from '../src/index';

describe('patchFrames()', () => {
it('should correctly extract instruction addresses', () => {
const frames = [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
{
filename: 'http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
];

patchFrames(frames);

expect(frames).toStrictEqual([
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
instruction_addr: '0x47df',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::getAt',
in_app: true,
instruction_addr: '0x540b',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::foo',
in_app: true,
instruction_addr: '0x5637',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
]);
});
});
3 changes: 3 additions & 0 deletions packages/wasm/test/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"extends": "../tsconfig.test.json"
}
8 changes: 8 additions & 0 deletions packages/wasm/tsconfig.test.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
{
"extends": "./tsconfig.json",
"include": ["test/**/*", "vite.config.ts"],
"compilerOptions": {
"types": ["node"],
"lib": ["DOM", "ESNext"]
}
}
8 changes: 8 additions & 0 deletions packages/wasm/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
...baseConfig.test,
},
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions packages/browser/test/tracekit/chromium.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -643,4 +643,97 @@ describe('Tracekit - Chrome Tests', () => {
},
});
});

it('should correctly parse a wasm stack trace', () => {
const WASM_ERROR = {
message: 'memory access out of bounds',
name: 'RuntimeError',
stack: `RuntimeError: memory access out of bounds
at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)
at MyClass::foo(int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637)
at MyClass::getAt(int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b)
at emscripten::internal::MethodInvoker<int (MyClass::*)(int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df)
at ClassHandle.MyClass$getAt [as getAt] (eval at newFunc (http://localhost:8001/main.js:2201:27), <anonymous>:9:10)
at myFunctionVectorOutOfBounds (http://localhost:8001/main.html:18:22)
at captureError (http://localhost:8001/main.html:27:11)
at Object.onRuntimeInitialized (http://localhost:8001/main.html:39:9)
at doRun (http://localhost:8001/main.js:7084:71)
at run (http://localhost:8001/main.js:7101:5)`,
};

const ex = exceptionFromError(parser, WASM_ERROR);

// This is really ugly but the wasm integration should clean up these stack frames
expect(ex).toStrictEqual({
stacktrace: {
frames: [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
],
},
type: 'RuntimeError',
value: 'memory access out of bounds',
});
});
});
2 changes: 2 additions & 0 deletions packages/wasm/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "npm pack",
"test": "vitest run",
"test:watch": "vitest --watch",
"circularDepCheck": "madge --circular src/index.ts",
"clean": "rimraf build coverage sentry-wasm-*.tgz",
"fix": "eslint . --format stylish --fix",
Expand Down
25 changes: 21 additions & 4 deletions packages/wasm/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,20 +36,36 @@ const _wasmIntegration = (() => {

export const wasmIntegration = defineIntegration(_wasmIntegration);

const PARSER_REGEX = /^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/;

/**
* Patches a list of stackframes with wasm data needed for server-side symbolication
* if applicable. Returns true if the provided list of stack frames had at least one
* matching registered image.
*/
function patchFrames(frames: Array<StackFrame>): boolean {
// Only exported for tests
export function patchFrames(frames: Array<StackFrame>): boolean {
let hasAtLeastOneWasmFrameWithImage = false;
frames.forEach(frame => {
if (!frame.filename) {
return;
}
const match = frame.filename.match(/^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/) as
| null
| [string, string, string];

const split = frame.filename.split('(');
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const lastSplit = split[split.length - 1]!;

// Let's call this first match a "messy match".
// The browser stacktrace parser spits out frames that have a filename like this: "int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb"
// It contains some leftover mess because wasm stack frames are more complicated than our parser can handle: "at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)"
// This first match simply tries to mitigate the mess up until the first opening parens.
// The match afterwards is a sensible fallback
let match = lastSplit.match(PARSER_REGEX) as null | [string, string, string];

if (!match) {
match = frame.filename.match(PARSER_REGEX) as null | [string, string, string];
}

if (match) {
const index = getImage(match[1]);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could check the length of the match array before here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is a match it is 100% guaranteed to have 3 entries so I don't think it would matter and it saves bundle size.

frame.instruction_addr = match[2];
Expand All@@ -62,5 +78,6 @@ function patchFrames(frames: Array<StackFrame>): boolean {
}
}
});

return hasAtLeastOneWasmFrameWithImage;
}
159 changes: 159 additions & 0 deletions packages/wasm/test/stacktrace-parsing.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
import { describe, it, expect } from 'vitest';
import { patchFrames } from '../src/index';

describe('patchFrames()', () => {
it('should correctly extract instruction addresses', () => {
const frames = [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
{
filename: 'http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
];

patchFrames(frames);

expect(frames).toStrictEqual([
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
instruction_addr: '0x47df',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::getAt',
in_app: true,
instruction_addr: '0x540b',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::foo',
in_app: true,
instruction_addr: '0x5637',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
]);
});
});
3 changes: 3 additions & 0 deletions packages/wasm/test/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"extends": "../tsconfig.test.json"
}
8 changes: 8 additions & 0 deletions packages/wasm/tsconfig.test.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
{
"extends": "./tsconfig.json",
"include": ["test/**/*", "vite.config.ts"],
"compilerOptions": {
"types": ["node"],
"lib": ["DOM", "ESNext"]
}
}
8 changes: 8 additions & 0 deletions packages/wasm/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
...baseConfig.test,
},
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions packages/browser/test/tracekit/chromium.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -643,4 +643,97 @@ describe('Tracekit - Chrome Tests', () => {
},
});
});

it('should correctly parse a wasm stack trace', () => {
const WASM_ERROR = {
message: 'memory access out of bounds',
name: 'RuntimeError',
stack: `RuntimeError: memory access out of bounds
at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)
at MyClass::foo(int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637)
at MyClass::getAt(int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b)
at emscripten::internal::MethodInvoker<int (MyClass::*)(int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df)
at ClassHandle.MyClass$getAt [as getAt] (eval at newFunc (http://localhost:8001/main.js:2201:27), <anonymous>:9:10)
at myFunctionVectorOutOfBounds (http://localhost:8001/main.html:18:22)
at captureError (http://localhost:8001/main.html:27:11)
at Object.onRuntimeInitialized (http://localhost:8001/main.html:39:9)
at doRun (http://localhost:8001/main.js:7084:71)
at run (http://localhost:8001/main.js:7101:5)`,
};

const ex = exceptionFromError(parser, WASM_ERROR);

// This is really ugly but the wasm integration should clean up these stack frames
expect(ex).toStrictEqual({
stacktrace: {
frames: [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
],
},
type: 'RuntimeError',
value: 'memory access out of bounds',
});
});
});
2 changes: 2 additions & 0 deletions packages/wasm/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "npm pack",
"test": "vitest run",
"test:watch": "vitest --watch",
"circularDepCheck": "madge --circular src/index.ts",
"clean": "rimraf build coverage sentry-wasm-*.tgz",
"fix": "eslint . --format stylish --fix",
Expand Down
25 changes: 21 additions & 4 deletions packages/wasm/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,20 +36,36 @@ const _wasmIntegration = (() => {

export const wasmIntegration = defineIntegration(_wasmIntegration);

const PARSER_REGEX = /^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/;

/**
* Patches a list of stackframes with wasm data needed for server-side symbolication
* if applicable. Returns true if the provided list of stack frames had at least one
* matching registered image.
*/
function patchFrames(frames: Array<StackFrame>): boolean {
// Only exported for tests
export function patchFrames(frames: Array<StackFrame>): boolean {
let hasAtLeastOneWasmFrameWithImage = false;
frames.forEach(frame => {
if (!frame.filename) {
return;
}
const match = frame.filename.match(/^(.*?):wasm-function\[\d+\]:(0x[a-fA-F0-9]+)$/) as
| null
| [string, string, string];

const split = frame.filename.split('(');
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const lastSplit = split[split.length - 1]!;

// Let's call this first match a "messy match".
// The browser stacktrace parser spits out frames that have a filename like this: "int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb"
// It contains some leftover mess because wasm stack frames are more complicated than our parser can handle: "at MyClass::bar(int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb)"
// This first match simply tries to mitigate the mess up until the first opening parens.
// The match afterwards is a sensible fallback
let match = lastSplit.match(PARSER_REGEX) as null | [string, string, string];

if (!match) {
match = frame.filename.match(PARSER_REGEX) as null | [string, string, string];
}

if (match) {
const index = getImage(match[1]);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could check the length of the match array before here

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is a match it is 100% guaranteed to have 3 entries so I don't think it would matter and it saves bundle size.

frame.instruction_addr = match[2];
Expand All@@ -62,5 +78,6 @@ function patchFrames(frames: Array<StackFrame>): boolean {
}
}
});

return hasAtLeastOneWasmFrameWithImage;
}
159 changes: 159 additions & 0 deletions packages/wasm/test/stacktrace-parsing.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
import { describe, it, expect } from 'vitest';
import { patchFrames } from '../src/index';

describe('patchFrames()', () => {
it('should correctly extract instruction addresses', () => {
const frames = [
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename:
'int) const, int, MyClass const*, int>::invoke(int (MyClass::* const&)(int) const, MyClass const*, int) (http://localhost:8001/main.wasm:wasm-function[152]:0x47df',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[182]:0x540b',
function: 'MyClass::getAt',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[186]:0x5637',
function: 'MyClass::foo',
in_app: true,
},
{
filename: 'int) const (http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
{
filename: 'http://localhost:8001/main.wasm:wasm-function[190]:0x5aeb',
function: 'MyClass::bar',
in_app: true,
},
];

patchFrames(frames);

expect(frames).toStrictEqual([
{
colno: 5,
filename: 'http://localhost:8001/main.js',
function: 'run',
in_app: true,
lineno: 7101,
},
{
colno: 71,
filename: 'http://localhost:8001/main.js',
function: 'doRun',
in_app: true,
lineno: 7084,
},
{
colno: 9,
filename: 'http://localhost:8001/main.html',
function: 'Object.onRuntimeInitialized',
in_app: true,
lineno: 39,
},
{
colno: 11,
filename: 'http://localhost:8001/main.html',
function: 'captureError',
in_app: true,
lineno: 27,
},
{
colno: 22,
filename: 'http://localhost:8001/main.html',
function: 'myFunctionVectorOutOfBounds',
in_app: true,
lineno: 18,
},
{
colno: 27,
filename: 'http://localhost:8001/main.js',
function: 'ClassHandle.MyClass$getAt [as getAt]',
in_app: true,
lineno: 2201,
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'emscripten::internal::MethodInvoker<int (MyClass::*)',
in_app: true,
instruction_addr: '0x47df',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::getAt',
in_app: true,
instruction_addr: '0x540b',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::foo',
in_app: true,
instruction_addr: '0x5637',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
{
filename: 'http://localhost:8001/main.wasm',
function: 'MyClass::bar',
in_app: true,
instruction_addr: '0x5aeb',
platform: 'native',
},
]);
});
});
3 changes: 3 additions & 0 deletions packages/wasm/test/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"extends": "../tsconfig.test.json"
}
8 changes: 8 additions & 0 deletions packages/wasm/tsconfig.test.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
{
"extends": "./tsconfig.json",
"include": ["test/**/*", "vite.config.ts"],
"compilerOptions": {
"types": ["node"],
"lib": ["DOM", "ESNext"]
}
}
8 changes: 8 additions & 0 deletions packages/wasm/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
...baseConfig.test,
},
};