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
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
import { SubscribeMessage, WebSocketGateway, MessageBody } from '@nestjs/websockets';
import { UseFilters } from '@nestjs/common';
import { MessageBody, SubscribeMessage, WebSocketGateway, WsException } from '@nestjs/websockets';
import * as Sentry from '@sentry/nestjs';
import { SentryGlobalFilter } from '@sentry/nestjs/setup';

@UseFilters(new SentryGlobalFilter())
@WebSocketGateway()
export class AppGateway {
@SubscribeMessage('test-exception')
handleTestException() {
throw new Error('This is an exception in a WebSocket handler');
}

@SubscribeMessage('test-ws-exception')
handleWsException() {
throw new WsException('Expected WebSocket exception');
}

@SubscribeMessage('test-manual-capture')
handleManualCapture() {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,39 @@ test('Captures manually reported error in WebSocket gateway handler', async ({ b
socket.disconnect();
});

test('Automatically captures unexpected errors in WebSocket gateway handlers', async ({ baseURL }) => {
const errorPromise = waitForError('nestjs-websockets', event => {
return event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler';
});

const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});

const error = await errorPromise;

expect(error.exception?.values).toHaveLength(1);
expect(error.exception?.values?.[0]?.type).toBe('Error');
expect(error.exception?.values?.[0]?.value).toBe('This is an exception in a WebSocket handler');
expect(error.exception?.values?.[0]?.mechanism).toEqual({
handled: false,
type: 'auto.ws.nestjs.global_filter',
});

socket.disconnect();
});

// There is no good mechanism to verify that an event was NOT sent to Sentry.
// The idea here is that we first send a message that triggers an exception which won't be auto-captured,
// The idea here is that we first send a message that triggers an expected exception which won't be auto-captured,
// and then send a message that triggers a manually captured error which will be sent to Sentry.
// If the manually captured error arrives, we can deduce that the first exception was not sent,
// because Socket.IO guarantees message ordering: https://socket.io/docs/v4/delivery-guarantees
test('Does not automatically capture exceptions in WebSocket gateway handler', async ({ baseURL }) => {
test('Does not automatically capture expected WebSocket exceptions', async ({ baseURL }) => {
let errorEventOccurred = false;

waitForError('nestjs-websockets', event => {
if (!event.type && event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler') {
if (!event.type && event.exception?.values?.[0]?.value === 'Expected WebSocket exception') {
errorEventOccurred = true;
}

Expand All@@ -45,7 +68,7 @@ test('Does not automatically capture exceptions in WebSocket gateway handler', a
const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});
socket.emit('test-ws-exception', {});
socket.emit('test-manual-capture', {});
await manualCapturePromise;

Expand Down
18 changes: 16 additions & 2 deletions packages/nestjs/src/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,24 @@ export function isExpectedError(exception: unknown): boolean {
return true;
}

// RpcException
if (typeof ex.getError === 'function' && typeof ex.initMessage === 'function') {
if (isWsOrRpcException(exception)) {
return true;
}

return false;
}

/**
* Determines if the exception is a WsException or RpcException, which have the same shape.
* Both have `getError()` and `initMessage()` methods.
*
* We use duck-typing to avoid importing from `@nestjs/websockets` or `@nestjs/microservices`.
*/
export function isWsOrRpcException(exception: unknown): boolean {
if (typeof exception !== 'object' || exception === null) {
return false;
}

const ex = exception as Record<string, unknown>;
return typeof ex.getError === 'function' && typeof ex.initMessage === 'function';
}
29 changes: 28 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import { Catch, Global, HttpException, Injectable, Logger, Module } from '@nestj
import { APP_INTERCEPTOR, BaseExceptionFilter } from '@nestjs/core';
import { captureException, debug, getDefaultIsolationScope, getIsolationScope } from '@sentry/core';
import type { Observable } from 'rxjs';
import { isExpectedError } from './helpers';
import { isExpectedError, isWsOrRpcException } from './helpers';

// Partial extract of FastifyRequest interface
// https://github.com/fastify/fastify/blob/87f9f20687c938828f1138f91682d568d2a31e53/types/request.d.ts#L41
Expand DownExpand Up@@ -152,6 +152,33 @@ class SentryGlobalFilter extends BaseExceptionFilter {
return;
}

if (contextType === 'ws') {
if (!isExpectedError(exception)) {
captureException(exception, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
}

const client = host.switchToWs().getClient<{ emit?: (event: string, data: unknown) => void }>();

if (isWsOrRpcException(exception)) {
const result = (exception as { getError: () => unknown }).getError();
const response = typeof result === 'object' && result !== null ? result : { status: 'error', message: result };
client.emit?.('exception', response);
return;
}

if (exception instanceof Error) {
this._logger.error(exception.message, exception.stack);
}

client.emit?.('exception', { status: 'error', message: 'Internal server error' });
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception, {
Expand Down
85 changes: 85 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { SentryGlobalFilter } from '../src/setup';

vi.mock('../src/helpers', () => ({
isExpectedError: vi.fn(),
isWsOrRpcException: vi.fn(),
}));

vi.mock('@sentry/core', () => ({
Expand All@@ -27,6 +28,7 @@ describe('SentryGlobalFilter', () => {
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;
let isWsOrRpcExceptionMock: any;

beforeEach(() => {
vi.clearAllMocks();
Expand DownExpand Up@@ -57,6 +59,7 @@ describe('SentryGlobalFilter', () => {
mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

isExpectedErrorMock = vi.mocked(Helpers.isExpectedError).mockImplementation(() => false);
isWsOrRpcExceptionMock = vi.mocked(Helpers.isWsOrRpcException).mockImplementation(() => false);
});

describe('HTTP context', () => {
Expand DownExpand Up@@ -237,4 +240,86 @@ describe('SentryGlobalFilter', () => {
expect(mockCaptureException).not.toHaveBeenCalled();
});
});

describe('WebSocket context', () => {
let mockEmit: ReturnType<typeof vi.fn>;

beforeEach(() => {
mockEmit = vi.fn();
vi.mocked(mockArgumentsHost.getType).mockReturnValue('ws');
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({ emit: mockEmit }),
getData: vi.fn(),
getPattern: vi.fn(),
});
});

it('captures unexpected errors and emits a generic error response', () => {
const error = new Error('Test WebSocket error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('does not capture expected WebSocket exceptions and emits their response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
isWsOrRpcExceptionMock.mockReturnValueOnce(true);
const exception = {
getError: () => 'Expected WebSocket exception',
initMessage: vi.fn(),
};

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Expected WebSocket exception',
});
});

it('does not capture HTTP exceptions and emits a generic error response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
const exception = new HttpException('Bad request', HttpStatus.BAD_REQUEST);

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(exception.message, exception.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('captures unexpected errors when the WebSocket client cannot emit', () => {
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({}),
getData: vi.fn(),
getPattern: vi.fn(),
});
const error = new Error('WebSocket adapter without emit');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});
});
Loading
, '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
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
import { SubscribeMessage, WebSocketGateway, MessageBody } from '@nestjs/websockets';
import { UseFilters } from '@nestjs/common';
import { MessageBody, SubscribeMessage, WebSocketGateway, WsException } from '@nestjs/websockets';
import * as Sentry from '@sentry/nestjs';
import { SentryGlobalFilter } from '@sentry/nestjs/setup';

@UseFilters(new SentryGlobalFilter())
@WebSocketGateway()
export class AppGateway {
@SubscribeMessage('test-exception')
handleTestException() {
throw new Error('This is an exception in a WebSocket handler');
}

@SubscribeMessage('test-ws-exception')
handleWsException() {
throw new WsException('Expected WebSocket exception');
}

@SubscribeMessage('test-manual-capture')
handleManualCapture() {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,39 @@ test('Captures manually reported error in WebSocket gateway handler', async ({ b
socket.disconnect();
});

test('Automatically captures unexpected errors in WebSocket gateway handlers', async ({ baseURL }) => {
const errorPromise = waitForError('nestjs-websockets', event => {
return event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler';
});

const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});

const error = await errorPromise;

expect(error.exception?.values).toHaveLength(1);
expect(error.exception?.values?.[0]?.type).toBe('Error');
expect(error.exception?.values?.[0]?.value).toBe('This is an exception in a WebSocket handler');
expect(error.exception?.values?.[0]?.mechanism).toEqual({
handled: false,
type: 'auto.ws.nestjs.global_filter',
});

socket.disconnect();
});

// There is no good mechanism to verify that an event was NOT sent to Sentry.
// The idea here is that we first send a message that triggers an exception which won't be auto-captured,
// The idea here is that we first send a message that triggers an expected exception which won't be auto-captured,
// and then send a message that triggers a manually captured error which will be sent to Sentry.
// If the manually captured error arrives, we can deduce that the first exception was not sent,
// because Socket.IO guarantees message ordering: https://socket.io/docs/v4/delivery-guarantees
test('Does not automatically capture exceptions in WebSocket gateway handler', async ({ baseURL }) => {
test('Does not automatically capture expected WebSocket exceptions', async ({ baseURL }) => {
let errorEventOccurred = false;

waitForError('nestjs-websockets', event => {
if (!event.type && event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler') {
if (!event.type && event.exception?.values?.[0]?.value === 'Expected WebSocket exception') {
errorEventOccurred = true;
}

Expand All@@ -45,7 +68,7 @@ test('Does not automatically capture exceptions in WebSocket gateway handler', a
const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});
socket.emit('test-ws-exception', {});
socket.emit('test-manual-capture', {});
await manualCapturePromise;

Expand Down
18 changes: 16 additions & 2 deletions packages/nestjs/src/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,24 @@ export function isExpectedError(exception: unknown): boolean {
return true;
}

// RpcException
if (typeof ex.getError === 'function' && typeof ex.initMessage === 'function') {
if (isWsOrRpcException(exception)) {
return true;
}

return false;
}

/**
* Determines if the exception is a WsException or RpcException, which have the same shape.
* Both have `getError()` and `initMessage()` methods.
*
* We use duck-typing to avoid importing from `@nestjs/websockets` or `@nestjs/microservices`.
*/
export function isWsOrRpcException(exception: unknown): boolean {
if (typeof exception !== 'object' || exception === null) {
return false;
}

const ex = exception as Record<string, unknown>;
return typeof ex.getError === 'function' && typeof ex.initMessage === 'function';
}
29 changes: 28 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import { Catch, Global, HttpException, Injectable, Logger, Module } from '@nestj
import { APP_INTERCEPTOR, BaseExceptionFilter } from '@nestjs/core';
import { captureException, debug, getDefaultIsolationScope, getIsolationScope } from '@sentry/core';
import type { Observable } from 'rxjs';
import { isExpectedError } from './helpers';
import { isExpectedError, isWsOrRpcException } from './helpers';

// Partial extract of FastifyRequest interface
// https://github.com/fastify/fastify/blob/87f9f20687c938828f1138f91682d568d2a31e53/types/request.d.ts#L41
Expand DownExpand Up@@ -152,6 +152,33 @@ class SentryGlobalFilter extends BaseExceptionFilter {
return;
}

if (contextType === 'ws') {
if (!isExpectedError(exception)) {
captureException(exception, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
}

const client = host.switchToWs().getClient<{ emit?: (event: string, data: unknown) => void }>();

if (isWsOrRpcException(exception)) {
const result = (exception as { getError: () => unknown }).getError();
const response = typeof result === 'object' && result !== null ? result : { status: 'error', message: result };
client.emit?.('exception', response);
return;
}

if (exception instanceof Error) {
this._logger.error(exception.message, exception.stack);
}

client.emit?.('exception', { status: 'error', message: 'Internal server error' });
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception, {
Expand Down
85 changes: 85 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { SentryGlobalFilter } from '../src/setup';

vi.mock('../src/helpers', () => ({
isExpectedError: vi.fn(),
isWsOrRpcException: vi.fn(),
}));

vi.mock('@sentry/core', () => ({
Expand All@@ -27,6 +28,7 @@ describe('SentryGlobalFilter', () => {
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;
let isWsOrRpcExceptionMock: any;

beforeEach(() => {
vi.clearAllMocks();
Expand DownExpand Up@@ -57,6 +59,7 @@ describe('SentryGlobalFilter', () => {
mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

isExpectedErrorMock = vi.mocked(Helpers.isExpectedError).mockImplementation(() => false);
isWsOrRpcExceptionMock = vi.mocked(Helpers.isWsOrRpcException).mockImplementation(() => false);
});

describe('HTTP context', () => {
Expand DownExpand Up@@ -237,4 +240,86 @@ describe('SentryGlobalFilter', () => {
expect(mockCaptureException).not.toHaveBeenCalled();
});
});

describe('WebSocket context', () => {
let mockEmit: ReturnType<typeof vi.fn>;

beforeEach(() => {
mockEmit = vi.fn();
vi.mocked(mockArgumentsHost.getType).mockReturnValue('ws');
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({ emit: mockEmit }),
getData: vi.fn(),
getPattern: vi.fn(),
});
});

it('captures unexpected errors and emits a generic error response', () => {
const error = new Error('Test WebSocket error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('does not capture expected WebSocket exceptions and emits their response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
isWsOrRpcExceptionMock.mockReturnValueOnce(true);
const exception = {
getError: () => 'Expected WebSocket exception',
initMessage: vi.fn(),
};

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Expected WebSocket exception',
});
});

it('does not capture HTTP exceptions and emits a generic error response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
const exception = new HttpException('Bad request', HttpStatus.BAD_REQUEST);

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(exception.message, exception.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('captures unexpected errors when the WebSocket client cannot emit', () => {
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({}),
getData: vi.fn(),
getPattern: vi.fn(),
});
const error = new Error('WebSocket adapter without emit');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});
});
Loading
, '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
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
import { SubscribeMessage, WebSocketGateway, MessageBody } from '@nestjs/websockets';
import { UseFilters } from '@nestjs/common';
import { MessageBody, SubscribeMessage, WebSocketGateway, WsException } from '@nestjs/websockets';
import * as Sentry from '@sentry/nestjs';
import { SentryGlobalFilter } from '@sentry/nestjs/setup';

@UseFilters(new SentryGlobalFilter())
@WebSocketGateway()
export class AppGateway {
@SubscribeMessage('test-exception')
handleTestException() {
throw new Error('This is an exception in a WebSocket handler');
}

@SubscribeMessage('test-ws-exception')
handleWsException() {
throw new WsException('Expected WebSocket exception');
}

@SubscribeMessage('test-manual-capture')
handleManualCapture() {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,39 @@ test('Captures manually reported error in WebSocket gateway handler', async ({ b
socket.disconnect();
});

test('Automatically captures unexpected errors in WebSocket gateway handlers', async ({ baseURL }) => {
const errorPromise = waitForError('nestjs-websockets', event => {
return event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler';
});

const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});

const error = await errorPromise;

expect(error.exception?.values).toHaveLength(1);
expect(error.exception?.values?.[0]?.type).toBe('Error');
expect(error.exception?.values?.[0]?.value).toBe('This is an exception in a WebSocket handler');
expect(error.exception?.values?.[0]?.mechanism).toEqual({
handled: false,
type: 'auto.ws.nestjs.global_filter',
});

socket.disconnect();
});

// There is no good mechanism to verify that an event was NOT sent to Sentry.
// The idea here is that we first send a message that triggers an exception which won't be auto-captured,
// The idea here is that we first send a message that triggers an expected exception which won't be auto-captured,
// and then send a message that triggers a manually captured error which will be sent to Sentry.
// If the manually captured error arrives, we can deduce that the first exception was not sent,
// because Socket.IO guarantees message ordering: https://socket.io/docs/v4/delivery-guarantees
test('Does not automatically capture exceptions in WebSocket gateway handler', async ({ baseURL }) => {
test('Does not automatically capture expected WebSocket exceptions', async ({ baseURL }) => {
let errorEventOccurred = false;

waitForError('nestjs-websockets', event => {
if (!event.type && event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler') {
if (!event.type && event.exception?.values?.[0]?.value === 'Expected WebSocket exception') {
errorEventOccurred = true;
}

Expand All@@ -45,7 +68,7 @@ test('Does not automatically capture exceptions in WebSocket gateway handler', a
const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});
socket.emit('test-ws-exception', {});
socket.emit('test-manual-capture', {});
await manualCapturePromise;

Expand Down
18 changes: 16 additions & 2 deletions packages/nestjs/src/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,24 @@ export function isExpectedError(exception: unknown): boolean {
return true;
}

// RpcException
if (typeof ex.getError === 'function' && typeof ex.initMessage === 'function') {
if (isWsOrRpcException(exception)) {
return true;
}

return false;
}

/**
* Determines if the exception is a WsException or RpcException, which have the same shape.
* Both have `getError()` and `initMessage()` methods.
*
* We use duck-typing to avoid importing from `@nestjs/websockets` or `@nestjs/microservices`.
*/
export function isWsOrRpcException(exception: unknown): boolean {
if (typeof exception !== 'object' || exception === null) {
return false;
}

const ex = exception as Record<string, unknown>;
return typeof ex.getError === 'function' && typeof ex.initMessage === 'function';
}
29 changes: 28 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import { Catch, Global, HttpException, Injectable, Logger, Module } from '@nestj
import { APP_INTERCEPTOR, BaseExceptionFilter } from '@nestjs/core';
import { captureException, debug, getDefaultIsolationScope, getIsolationScope } from '@sentry/core';
import type { Observable } from 'rxjs';
import { isExpectedError } from './helpers';
import { isExpectedError, isWsOrRpcException } from './helpers';

// Partial extract of FastifyRequest interface
// https://github.com/fastify/fastify/blob/87f9f20687c938828f1138f91682d568d2a31e53/types/request.d.ts#L41
Expand DownExpand Up@@ -152,6 +152,33 @@ class SentryGlobalFilter extends BaseExceptionFilter {
return;
}

if (contextType === 'ws') {
if (!isExpectedError(exception)) {
captureException(exception, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
}

const client = host.switchToWs().getClient<{ emit?: (event: string, data: unknown) => void }>();

if (isWsOrRpcException(exception)) {
const result = (exception as { getError: () => unknown }).getError();
const response = typeof result === 'object' && result !== null ? result : { status: 'error', message: result };
client.emit?.('exception', response);
return;
}

if (exception instanceof Error) {
this._logger.error(exception.message, exception.stack);
}

client.emit?.('exception', { status: 'error', message: 'Internal server error' });
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception, {
Expand Down
85 changes: 85 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { SentryGlobalFilter } from '../src/setup';

vi.mock('../src/helpers', () => ({
isExpectedError: vi.fn(),
isWsOrRpcException: vi.fn(),
}));

vi.mock('@sentry/core', () => ({
Expand All@@ -27,6 +28,7 @@ describe('SentryGlobalFilter', () => {
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;
let isWsOrRpcExceptionMock: any;

beforeEach(() => {
vi.clearAllMocks();
Expand DownExpand Up@@ -57,6 +59,7 @@ describe('SentryGlobalFilter', () => {
mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

isExpectedErrorMock = vi.mocked(Helpers.isExpectedError).mockImplementation(() => false);
isWsOrRpcExceptionMock = vi.mocked(Helpers.isWsOrRpcException).mockImplementation(() => false);
});

describe('HTTP context', () => {
Expand DownExpand Up@@ -237,4 +240,86 @@ describe('SentryGlobalFilter', () => {
expect(mockCaptureException).not.toHaveBeenCalled();
});
});

describe('WebSocket context', () => {
let mockEmit: ReturnType<typeof vi.fn>;

beforeEach(() => {
mockEmit = vi.fn();
vi.mocked(mockArgumentsHost.getType).mockReturnValue('ws');
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({ emit: mockEmit }),
getData: vi.fn(),
getPattern: vi.fn(),
});
});

it('captures unexpected errors and emits a generic error response', () => {
const error = new Error('Test WebSocket error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('does not capture expected WebSocket exceptions and emits their response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
isWsOrRpcExceptionMock.mockReturnValueOnce(true);
const exception = {
getError: () => 'Expected WebSocket exception',
initMessage: vi.fn(),
};

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Expected WebSocket exception',
});
});

it('does not capture HTTP exceptions and emits a generic error response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
const exception = new HttpException('Bad request', HttpStatus.BAD_REQUEST);

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(exception.message, exception.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('captures unexpected errors when the WebSocket client cannot emit', () => {
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({}),
getData: vi.fn(),
getPattern: vi.fn(),
});
const error = new Error('WebSocket adapter without emit');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});
});
Loading
, '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
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
import { SubscribeMessage, WebSocketGateway, MessageBody } from '@nestjs/websockets';
import { UseFilters } from '@nestjs/common';
import { MessageBody, SubscribeMessage, WebSocketGateway, WsException } from '@nestjs/websockets';
import * as Sentry from '@sentry/nestjs';
import { SentryGlobalFilter } from '@sentry/nestjs/setup';

@UseFilters(new SentryGlobalFilter())
@WebSocketGateway()
export class AppGateway {
@SubscribeMessage('test-exception')
handleTestException() {
throw new Error('This is an exception in a WebSocket handler');
}

@SubscribeMessage('test-ws-exception')
handleWsException() {
throw new WsException('Expected WebSocket exception');
}

@SubscribeMessage('test-manual-capture')
handleManualCapture() {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,39 @@ test('Captures manually reported error in WebSocket gateway handler', async ({ b
socket.disconnect();
});

test('Automatically captures unexpected errors in WebSocket gateway handlers', async ({ baseURL }) => {
const errorPromise = waitForError('nestjs-websockets', event => {
return event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler';
});

const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});

const error = await errorPromise;

expect(error.exception?.values).toHaveLength(1);
expect(error.exception?.values?.[0]?.type).toBe('Error');
expect(error.exception?.values?.[0]?.value).toBe('This is an exception in a WebSocket handler');
expect(error.exception?.values?.[0]?.mechanism).toEqual({
handled: false,
type: 'auto.ws.nestjs.global_filter',
});

socket.disconnect();
});

// There is no good mechanism to verify that an event was NOT sent to Sentry.
// The idea here is that we first send a message that triggers an exception which won't be auto-captured,
// The idea here is that we first send a message that triggers an expected exception which won't be auto-captured,
// and then send a message that triggers a manually captured error which will be sent to Sentry.
// If the manually captured error arrives, we can deduce that the first exception was not sent,
// because Socket.IO guarantees message ordering: https://socket.io/docs/v4/delivery-guarantees
test('Does not automatically capture exceptions in WebSocket gateway handler', async ({ baseURL }) => {
test('Does not automatically capture expected WebSocket exceptions', async ({ baseURL }) => {
let errorEventOccurred = false;

waitForError('nestjs-websockets', event => {
if (!event.type && event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler') {
if (!event.type && event.exception?.values?.[0]?.value === 'Expected WebSocket exception') {
errorEventOccurred = true;
}

Expand All@@ -45,7 +68,7 @@ test('Does not automatically capture exceptions in WebSocket gateway handler', a
const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});
socket.emit('test-ws-exception', {});
socket.emit('test-manual-capture', {});
await manualCapturePromise;

Expand Down
18 changes: 16 additions & 2 deletions packages/nestjs/src/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,24 @@ export function isExpectedError(exception: unknown): boolean {
return true;
}

// RpcException
if (typeof ex.getError === 'function' && typeof ex.initMessage === 'function') {
if (isWsOrRpcException(exception)) {
return true;
}

return false;
}

/**
* Determines if the exception is a WsException or RpcException, which have the same shape.
* Both have `getError()` and `initMessage()` methods.
*
* We use duck-typing to avoid importing from `@nestjs/websockets` or `@nestjs/microservices`.
*/
export function isWsOrRpcException(exception: unknown): boolean {
if (typeof exception !== 'object' || exception === null) {
return false;
}

const ex = exception as Record<string, unknown>;
return typeof ex.getError === 'function' && typeof ex.initMessage === 'function';
}
29 changes: 28 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import { Catch, Global, HttpException, Injectable, Logger, Module } from '@nestj
import { APP_INTERCEPTOR, BaseExceptionFilter } from '@nestjs/core';
import { captureException, debug, getDefaultIsolationScope, getIsolationScope } from '@sentry/core';
import type { Observable } from 'rxjs';
import { isExpectedError } from './helpers';
import { isExpectedError, isWsOrRpcException } from './helpers';

// Partial extract of FastifyRequest interface
// https://github.com/fastify/fastify/blob/87f9f20687c938828f1138f91682d568d2a31e53/types/request.d.ts#L41
Expand DownExpand Up@@ -152,6 +152,33 @@ class SentryGlobalFilter extends BaseExceptionFilter {
return;
}

if (contextType === 'ws') {
if (!isExpectedError(exception)) {
captureException(exception, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
}

const client = host.switchToWs().getClient<{ emit?: (event: string, data: unknown) => void }>();

if (isWsOrRpcException(exception)) {
const result = (exception as { getError: () => unknown }).getError();
const response = typeof result === 'object' && result !== null ? result : { status: 'error', message: result };
client.emit?.('exception', response);
return;
}

if (exception instanceof Error) {
this._logger.error(exception.message, exception.stack);
}

client.emit?.('exception', { status: 'error', message: 'Internal server error' });
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception, {
Expand Down
85 changes: 85 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { SentryGlobalFilter } from '../src/setup';

vi.mock('../src/helpers', () => ({
isExpectedError: vi.fn(),
isWsOrRpcException: vi.fn(),
}));

vi.mock('@sentry/core', () => ({
Expand All@@ -27,6 +28,7 @@ describe('SentryGlobalFilter', () => {
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;
let isWsOrRpcExceptionMock: any;

beforeEach(() => {
vi.clearAllMocks();
Expand DownExpand Up@@ -57,6 +59,7 @@ describe('SentryGlobalFilter', () => {
mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

isExpectedErrorMock = vi.mocked(Helpers.isExpectedError).mockImplementation(() => false);
isWsOrRpcExceptionMock = vi.mocked(Helpers.isWsOrRpcException).mockImplementation(() => false);
});

describe('HTTP context', () => {
Expand DownExpand Up@@ -237,4 +240,86 @@ describe('SentryGlobalFilter', () => {
expect(mockCaptureException).not.toHaveBeenCalled();
});
});

describe('WebSocket context', () => {
let mockEmit: ReturnType<typeof vi.fn>;

beforeEach(() => {
mockEmit = vi.fn();
vi.mocked(mockArgumentsHost.getType).mockReturnValue('ws');
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({ emit: mockEmit }),
getData: vi.fn(),
getPattern: vi.fn(),
});
});

it('captures unexpected errors and emits a generic error response', () => {
const error = new Error('Test WebSocket error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('does not capture expected WebSocket exceptions and emits their response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
isWsOrRpcExceptionMock.mockReturnValueOnce(true);
const exception = {
getError: () => 'Expected WebSocket exception',
initMessage: vi.fn(),
};

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Expected WebSocket exception',
});
});

it('does not capture HTTP exceptions and emits a generic error response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
const exception = new HttpException('Bad request', HttpStatus.BAD_REQUEST);

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(exception.message, exception.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('captures unexpected errors when the WebSocket client cannot emit', () => {
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({}),
getData: vi.fn(),
getPattern: vi.fn(),
});
const error = new Error('WebSocket adapter without emit');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});
});
Loading
, '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
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
import { SubscribeMessage, WebSocketGateway, MessageBody } from '@nestjs/websockets';
import { UseFilters } from '@nestjs/common';
import { MessageBody, SubscribeMessage, WebSocketGateway, WsException } from '@nestjs/websockets';
import * as Sentry from '@sentry/nestjs';
import { SentryGlobalFilter } from '@sentry/nestjs/setup';

@UseFilters(new SentryGlobalFilter())
@WebSocketGateway()
export class AppGateway {
@SubscribeMessage('test-exception')
handleTestException() {
throw new Error('This is an exception in a WebSocket handler');
}

@SubscribeMessage('test-ws-exception')
handleWsException() {
throw new WsException('Expected WebSocket exception');
}

@SubscribeMessage('test-manual-capture')
handleManualCapture() {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,39 @@ test('Captures manually reported error in WebSocket gateway handler', async ({ b
socket.disconnect();
});

test('Automatically captures unexpected errors in WebSocket gateway handlers', async ({ baseURL }) => {
const errorPromise = waitForError('nestjs-websockets', event => {
return event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler';
});

const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});

const error = await errorPromise;

expect(error.exception?.values).toHaveLength(1);
expect(error.exception?.values?.[0]?.type).toBe('Error');
expect(error.exception?.values?.[0]?.value).toBe('This is an exception in a WebSocket handler');
expect(error.exception?.values?.[0]?.mechanism).toEqual({
handled: false,
type: 'auto.ws.nestjs.global_filter',
});

socket.disconnect();
});

// There is no good mechanism to verify that an event was NOT sent to Sentry.
// The idea here is that we first send a message that triggers an exception which won't be auto-captured,
// The idea here is that we first send a message that triggers an expected exception which won't be auto-captured,
// and then send a message that triggers a manually captured error which will be sent to Sentry.
// If the manually captured error arrives, we can deduce that the first exception was not sent,
// because Socket.IO guarantees message ordering: https://socket.io/docs/v4/delivery-guarantees
test('Does not automatically capture exceptions in WebSocket gateway handler', async ({ baseURL }) => {
test('Does not automatically capture expected WebSocket exceptions', async ({ baseURL }) => {
let errorEventOccurred = false;

waitForError('nestjs-websockets', event => {
if (!event.type && event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler') {
if (!event.type && event.exception?.values?.[0]?.value === 'Expected WebSocket exception') {
errorEventOccurred = true;
}

Expand All@@ -45,7 +68,7 @@ test('Does not automatically capture exceptions in WebSocket gateway handler', a
const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});
socket.emit('test-ws-exception', {});
socket.emit('test-manual-capture', {});
await manualCapturePromise;

Expand Down
18 changes: 16 additions & 2 deletions packages/nestjs/src/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,24 @@ export function isExpectedError(exception: unknown): boolean {
return true;
}

// RpcException
if (typeof ex.getError === 'function' && typeof ex.initMessage === 'function') {
if (isWsOrRpcException(exception)) {
return true;
}

return false;
}

/**
* Determines if the exception is a WsException or RpcException, which have the same shape.
* Both have `getError()` and `initMessage()` methods.
*
* We use duck-typing to avoid importing from `@nestjs/websockets` or `@nestjs/microservices`.
*/
export function isWsOrRpcException(exception: unknown): boolean {
if (typeof exception !== 'object' || exception === null) {
return false;
}

const ex = exception as Record<string, unknown>;
return typeof ex.getError === 'function' && typeof ex.initMessage === 'function';
}
29 changes: 28 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import { Catch, Global, HttpException, Injectable, Logger, Module } from '@nestj
import { APP_INTERCEPTOR, BaseExceptionFilter } from '@nestjs/core';
import { captureException, debug, getDefaultIsolationScope, getIsolationScope } from '@sentry/core';
import type { Observable } from 'rxjs';
import { isExpectedError } from './helpers';
import { isExpectedError, isWsOrRpcException } from './helpers';

// Partial extract of FastifyRequest interface
// https://github.com/fastify/fastify/blob/87f9f20687c938828f1138f91682d568d2a31e53/types/request.d.ts#L41
Expand DownExpand Up@@ -152,6 +152,33 @@ class SentryGlobalFilter extends BaseExceptionFilter {
return;
}

if (contextType === 'ws') {
if (!isExpectedError(exception)) {
captureException(exception, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
}

const client = host.switchToWs().getClient<{ emit?: (event: string, data: unknown) => void }>();

if (isWsOrRpcException(exception)) {
const result = (exception as { getError: () => unknown }).getError();
const response = typeof result === 'object' && result !== null ? result : { status: 'error', message: result };
client.emit?.('exception', response);
return;
}

if (exception instanceof Error) {
this._logger.error(exception.message, exception.stack);
}

client.emit?.('exception', { status: 'error', message: 'Internal server error' });
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception, {
Expand Down
85 changes: 85 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { SentryGlobalFilter } from '../src/setup';

vi.mock('../src/helpers', () => ({
isExpectedError: vi.fn(),
isWsOrRpcException: vi.fn(),
}));

vi.mock('@sentry/core', () => ({
Expand All@@ -27,6 +28,7 @@ describe('SentryGlobalFilter', () => {
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;
let isWsOrRpcExceptionMock: any;

beforeEach(() => {
vi.clearAllMocks();
Expand DownExpand Up@@ -57,6 +59,7 @@ describe('SentryGlobalFilter', () => {
mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

isExpectedErrorMock = vi.mocked(Helpers.isExpectedError).mockImplementation(() => false);
isWsOrRpcExceptionMock = vi.mocked(Helpers.isWsOrRpcException).mockImplementation(() => false);
});

describe('HTTP context', () => {
Expand DownExpand Up@@ -237,4 +240,86 @@ describe('SentryGlobalFilter', () => {
expect(mockCaptureException).not.toHaveBeenCalled();
});
});

describe('WebSocket context', () => {
let mockEmit: ReturnType<typeof vi.fn>;

beforeEach(() => {
mockEmit = vi.fn();
vi.mocked(mockArgumentsHost.getType).mockReturnValue('ws');
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({ emit: mockEmit }),
getData: vi.fn(),
getPattern: vi.fn(),
});
});

it('captures unexpected errors and emits a generic error response', () => {
const error = new Error('Test WebSocket error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('does not capture expected WebSocket exceptions and emits their response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
isWsOrRpcExceptionMock.mockReturnValueOnce(true);
const exception = {
getError: () => 'Expected WebSocket exception',
initMessage: vi.fn(),
};

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Expected WebSocket exception',
});
});

it('does not capture HTTP exceptions and emits a generic error response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
const exception = new HttpException('Bad request', HttpStatus.BAD_REQUEST);

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(exception.message, exception.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('captures unexpected errors when the WebSocket client cannot emit', () => {
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({}),
getData: vi.fn(),
getPattern: vi.fn(),
});
const error = new Error('WebSocket adapter without emit');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});
});
Loading
, '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
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
import { SubscribeMessage, WebSocketGateway, MessageBody } from '@nestjs/websockets';
import { UseFilters } from '@nestjs/common';
import { MessageBody, SubscribeMessage, WebSocketGateway, WsException } from '@nestjs/websockets';
import * as Sentry from '@sentry/nestjs';
import { SentryGlobalFilter } from '@sentry/nestjs/setup';

@UseFilters(new SentryGlobalFilter())
@WebSocketGateway()
export class AppGateway {
@SubscribeMessage('test-exception')
handleTestException() {
throw new Error('This is an exception in a WebSocket handler');
}

@SubscribeMessage('test-ws-exception')
handleWsException() {
throw new WsException('Expected WebSocket exception');
}

@SubscribeMessage('test-manual-capture')
handleManualCapture() {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,39 @@ test('Captures manually reported error in WebSocket gateway handler', async ({ b
socket.disconnect();
});

test('Automatically captures unexpected errors in WebSocket gateway handlers', async ({ baseURL }) => {
const errorPromise = waitForError('nestjs-websockets', event => {
return event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler';
});

const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});

const error = await errorPromise;

expect(error.exception?.values).toHaveLength(1);
expect(error.exception?.values?.[0]?.type).toBe('Error');
expect(error.exception?.values?.[0]?.value).toBe('This is an exception in a WebSocket handler');
expect(error.exception?.values?.[0]?.mechanism).toEqual({
handled: false,
type: 'auto.ws.nestjs.global_filter',
});

socket.disconnect();
});

// There is no good mechanism to verify that an event was NOT sent to Sentry.
// The idea here is that we first send a message that triggers an exception which won't be auto-captured,
// The idea here is that we first send a message that triggers an expected exception which won't be auto-captured,
// and then send a message that triggers a manually captured error which will be sent to Sentry.
// If the manually captured error arrives, we can deduce that the first exception was not sent,
// because Socket.IO guarantees message ordering: https://socket.io/docs/v4/delivery-guarantees
test('Does not automatically capture exceptions in WebSocket gateway handler', async ({ baseURL }) => {
test('Does not automatically capture expected WebSocket exceptions', async ({ baseURL }) => {
let errorEventOccurred = false;

waitForError('nestjs-websockets', event => {
if (!event.type && event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler') {
if (!event.type && event.exception?.values?.[0]?.value === 'Expected WebSocket exception') {
errorEventOccurred = true;
}

Expand All@@ -45,7 +68,7 @@ test('Does not automatically capture exceptions in WebSocket gateway handler', a
const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});
socket.emit('test-ws-exception', {});
socket.emit('test-manual-capture', {});
await manualCapturePromise;

Expand Down
18 changes: 16 additions & 2 deletions packages/nestjs/src/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,24 @@ export function isExpectedError(exception: unknown): boolean {
return true;
}

// RpcException
if (typeof ex.getError === 'function' && typeof ex.initMessage === 'function') {
if (isWsOrRpcException(exception)) {
return true;
}

return false;
}

/**
* Determines if the exception is a WsException or RpcException, which have the same shape.
* Both have `getError()` and `initMessage()` methods.
*
* We use duck-typing to avoid importing from `@nestjs/websockets` or `@nestjs/microservices`.
*/
export function isWsOrRpcException(exception: unknown): boolean {
if (typeof exception !== 'object' || exception === null) {
return false;
}

const ex = exception as Record<string, unknown>;
return typeof ex.getError === 'function' && typeof ex.initMessage === 'function';
}
29 changes: 28 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import { Catch, Global, HttpException, Injectable, Logger, Module } from '@nestj
import { APP_INTERCEPTOR, BaseExceptionFilter } from '@nestjs/core';
import { captureException, debug, getDefaultIsolationScope, getIsolationScope } from '@sentry/core';
import type { Observable } from 'rxjs';
import { isExpectedError } from './helpers';
import { isExpectedError, isWsOrRpcException } from './helpers';

// Partial extract of FastifyRequest interface
// https://github.com/fastify/fastify/blob/87f9f20687c938828f1138f91682d568d2a31e53/types/request.d.ts#L41
Expand DownExpand Up@@ -152,6 +152,33 @@ class SentryGlobalFilter extends BaseExceptionFilter {
return;
}

if (contextType === 'ws') {
if (!isExpectedError(exception)) {
captureException(exception, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
}

const client = host.switchToWs().getClient<{ emit?: (event: string, data: unknown) => void }>();

if (isWsOrRpcException(exception)) {
const result = (exception as { getError: () => unknown }).getError();
const response = typeof result === 'object' && result !== null ? result : { status: 'error', message: result };
client.emit?.('exception', response);
return;
}

if (exception instanceof Error) {
this._logger.error(exception.message, exception.stack);
}

client.emit?.('exception', { status: 'error', message: 'Internal server error' });
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception, {
Expand Down
85 changes: 85 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { SentryGlobalFilter } from '../src/setup';

vi.mock('../src/helpers', () => ({
isExpectedError: vi.fn(),
isWsOrRpcException: vi.fn(),
}));

vi.mock('@sentry/core', () => ({
Expand All@@ -27,6 +28,7 @@ describe('SentryGlobalFilter', () => {
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;
let isWsOrRpcExceptionMock: any;

beforeEach(() => {
vi.clearAllMocks();
Expand DownExpand Up@@ -57,6 +59,7 @@ describe('SentryGlobalFilter', () => {
mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

isExpectedErrorMock = vi.mocked(Helpers.isExpectedError).mockImplementation(() => false);
isWsOrRpcExceptionMock = vi.mocked(Helpers.isWsOrRpcException).mockImplementation(() => false);
});

describe('HTTP context', () => {
Expand DownExpand Up@@ -237,4 +240,86 @@ describe('SentryGlobalFilter', () => {
expect(mockCaptureException).not.toHaveBeenCalled();
});
});

describe('WebSocket context', () => {
let mockEmit: ReturnType<typeof vi.fn>;

beforeEach(() => {
mockEmit = vi.fn();
vi.mocked(mockArgumentsHost.getType).mockReturnValue('ws');
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({ emit: mockEmit }),
getData: vi.fn(),
getPattern: vi.fn(),
});
});

it('captures unexpected errors and emits a generic error response', () => {
const error = new Error('Test WebSocket error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('does not capture expected WebSocket exceptions and emits their response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
isWsOrRpcExceptionMock.mockReturnValueOnce(true);
const exception = {
getError: () => 'Expected WebSocket exception',
initMessage: vi.fn(),
};

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Expected WebSocket exception',
});
});

it('does not capture HTTP exceptions and emits a generic error response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
const exception = new HttpException('Bad request', HttpStatus.BAD_REQUEST);

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(exception.message, exception.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('captures unexpected errors when the WebSocket client cannot emit', () => {
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({}),
getData: vi.fn(),
getPattern: vi.fn(),
});
const error = new Error('WebSocket adapter without emit');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});
});
Loading
, '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
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
import { SubscribeMessage, WebSocketGateway, MessageBody } from '@nestjs/websockets';
import { UseFilters } from '@nestjs/common';
import { MessageBody, SubscribeMessage, WebSocketGateway, WsException } from '@nestjs/websockets';
import * as Sentry from '@sentry/nestjs';
import { SentryGlobalFilter } from '@sentry/nestjs/setup';

@UseFilters(new SentryGlobalFilter())
@WebSocketGateway()
export class AppGateway {
@SubscribeMessage('test-exception')
handleTestException() {
throw new Error('This is an exception in a WebSocket handler');
}

@SubscribeMessage('test-ws-exception')
handleWsException() {
throw new WsException('Expected WebSocket exception');
}

@SubscribeMessage('test-manual-capture')
handleManualCapture() {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,39 @@ test('Captures manually reported error in WebSocket gateway handler', async ({ b
socket.disconnect();
});

test('Automatically captures unexpected errors in WebSocket gateway handlers', async ({ baseURL }) => {
const errorPromise = waitForError('nestjs-websockets', event => {
return event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler';
});

const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});

const error = await errorPromise;

expect(error.exception?.values).toHaveLength(1);
expect(error.exception?.values?.[0]?.type).toBe('Error');
expect(error.exception?.values?.[0]?.value).toBe('This is an exception in a WebSocket handler');
expect(error.exception?.values?.[0]?.mechanism).toEqual({
handled: false,
type: 'auto.ws.nestjs.global_filter',
});

socket.disconnect();
});

// There is no good mechanism to verify that an event was NOT sent to Sentry.
// The idea here is that we first send a message that triggers an exception which won't be auto-captured,
// The idea here is that we first send a message that triggers an expected exception which won't be auto-captured,
// and then send a message that triggers a manually captured error which will be sent to Sentry.
// If the manually captured error arrives, we can deduce that the first exception was not sent,
// because Socket.IO guarantees message ordering: https://socket.io/docs/v4/delivery-guarantees
test('Does not automatically capture exceptions in WebSocket gateway handler', async ({ baseURL }) => {
test('Does not automatically capture expected WebSocket exceptions', async ({ baseURL }) => {
let errorEventOccurred = false;

waitForError('nestjs-websockets', event => {
if (!event.type && event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler') {
if (!event.type && event.exception?.values?.[0]?.value === 'Expected WebSocket exception') {
errorEventOccurred = true;
}

Expand All@@ -45,7 +68,7 @@ test('Does not automatically capture exceptions in WebSocket gateway handler', a
const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});
socket.emit('test-ws-exception', {});
socket.emit('test-manual-capture', {});
await manualCapturePromise;

Expand Down
18 changes: 16 additions & 2 deletions packages/nestjs/src/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,24 @@ export function isExpectedError(exception: unknown): boolean {
return true;
}

// RpcException
if (typeof ex.getError === 'function' && typeof ex.initMessage === 'function') {
if (isWsOrRpcException(exception)) {
return true;
}

return false;
}

/**
* Determines if the exception is a WsException or RpcException, which have the same shape.
* Both have `getError()` and `initMessage()` methods.
*
* We use duck-typing to avoid importing from `@nestjs/websockets` or `@nestjs/microservices`.
*/
export function isWsOrRpcException(exception: unknown): boolean {
if (typeof exception !== 'object' || exception === null) {
return false;
}

const ex = exception as Record<string, unknown>;
return typeof ex.getError === 'function' && typeof ex.initMessage === 'function';
}
29 changes: 28 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import { Catch, Global, HttpException, Injectable, Logger, Module } from '@nestj
import { APP_INTERCEPTOR, BaseExceptionFilter } from '@nestjs/core';
import { captureException, debug, getDefaultIsolationScope, getIsolationScope } from '@sentry/core';
import type { Observable } from 'rxjs';
import { isExpectedError } from './helpers';
import { isExpectedError, isWsOrRpcException } from './helpers';

// Partial extract of FastifyRequest interface
// https://github.com/fastify/fastify/blob/87f9f20687c938828f1138f91682d568d2a31e53/types/request.d.ts#L41
Expand DownExpand Up@@ -152,6 +152,33 @@ class SentryGlobalFilter extends BaseExceptionFilter {
return;
}

if (contextType === 'ws') {
if (!isExpectedError(exception)) {
captureException(exception, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
}

const client = host.switchToWs().getClient<{ emit?: (event: string, data: unknown) => void }>();

if (isWsOrRpcException(exception)) {
const result = (exception as { getError: () => unknown }).getError();
const response = typeof result === 'object' && result !== null ? result : { status: 'error', message: result };
client.emit?.('exception', response);
return;
}

if (exception instanceof Error) {
this._logger.error(exception.message, exception.stack);
}

client.emit?.('exception', { status: 'error', message: 'Internal server error' });
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception, {
Expand Down
85 changes: 85 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { SentryGlobalFilter } from '../src/setup';

vi.mock('../src/helpers', () => ({
isExpectedError: vi.fn(),
isWsOrRpcException: vi.fn(),
}));

vi.mock('@sentry/core', () => ({
Expand All@@ -27,6 +28,7 @@ describe('SentryGlobalFilter', () => {
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;
let isWsOrRpcExceptionMock: any;

beforeEach(() => {
vi.clearAllMocks();
Expand DownExpand Up@@ -57,6 +59,7 @@ describe('SentryGlobalFilter', () => {
mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

isExpectedErrorMock = vi.mocked(Helpers.isExpectedError).mockImplementation(() => false);
isWsOrRpcExceptionMock = vi.mocked(Helpers.isWsOrRpcException).mockImplementation(() => false);
});

describe('HTTP context', () => {
Expand DownExpand Up@@ -237,4 +240,86 @@ describe('SentryGlobalFilter', () => {
expect(mockCaptureException).not.toHaveBeenCalled();
});
});

describe('WebSocket context', () => {
let mockEmit: ReturnType<typeof vi.fn>;

beforeEach(() => {
mockEmit = vi.fn();
vi.mocked(mockArgumentsHost.getType).mockReturnValue('ws');
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({ emit: mockEmit }),
getData: vi.fn(),
getPattern: vi.fn(),
});
});

it('captures unexpected errors and emits a generic error response', () => {
const error = new Error('Test WebSocket error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('does not capture expected WebSocket exceptions and emits their response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
isWsOrRpcExceptionMock.mockReturnValueOnce(true);
const exception = {
getError: () => 'Expected WebSocket exception',
initMessage: vi.fn(),
};

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Expected WebSocket exception',
});
});

it('does not capture HTTP exceptions and emits a generic error response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
const exception = new HttpException('Bad request', HttpStatus.BAD_REQUEST);

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(exception.message, exception.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('captures unexpected errors when the WebSocket client cannot emit', () => {
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({}),
getData: vi.fn(),
getPattern: vi.fn(),
});
const error = new Error('WebSocket adapter without emit');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});
});
Loading
, '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
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
import { SubscribeMessage, WebSocketGateway, MessageBody } from '@nestjs/websockets';
import { UseFilters } from '@nestjs/common';
import { MessageBody, SubscribeMessage, WebSocketGateway, WsException } from '@nestjs/websockets';
import * as Sentry from '@sentry/nestjs';
import { SentryGlobalFilter } from '@sentry/nestjs/setup';

@UseFilters(new SentryGlobalFilter())
@WebSocketGateway()
export class AppGateway {
@SubscribeMessage('test-exception')
handleTestException() {
throw new Error('This is an exception in a WebSocket handler');
}

@SubscribeMessage('test-ws-exception')
handleWsException() {
throw new WsException('Expected WebSocket exception');
}

@SubscribeMessage('test-manual-capture')
handleManualCapture() {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,39 @@ test('Captures manually reported error in WebSocket gateway handler', async ({ b
socket.disconnect();
});

test('Automatically captures unexpected errors in WebSocket gateway handlers', async ({ baseURL }) => {
const errorPromise = waitForError('nestjs-websockets', event => {
return event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler';
});

const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});

const error = await errorPromise;

expect(error.exception?.values).toHaveLength(1);
expect(error.exception?.values?.[0]?.type).toBe('Error');
expect(error.exception?.values?.[0]?.value).toBe('This is an exception in a WebSocket handler');
expect(error.exception?.values?.[0]?.mechanism).toEqual({
handled: false,
type: 'auto.ws.nestjs.global_filter',
});

socket.disconnect();
});

// There is no good mechanism to verify that an event was NOT sent to Sentry.
// The idea here is that we first send a message that triggers an exception which won't be auto-captured,
// The idea here is that we first send a message that triggers an expected exception which won't be auto-captured,
// and then send a message that triggers a manually captured error which will be sent to Sentry.
// If the manually captured error arrives, we can deduce that the first exception was not sent,
// because Socket.IO guarantees message ordering: https://socket.io/docs/v4/delivery-guarantees
test('Does not automatically capture exceptions in WebSocket gateway handler', async ({ baseURL }) => {
test('Does not automatically capture expected WebSocket exceptions', async ({ baseURL }) => {
let errorEventOccurred = false;

waitForError('nestjs-websockets', event => {
if (!event.type && event.exception?.values?.[0]?.value === 'This is an exception in a WebSocket handler') {
if (!event.type && event.exception?.values?.[0]?.value === 'Expected WebSocket exception') {
errorEventOccurred = true;
}

Expand All@@ -45,7 +68,7 @@ test('Does not automatically capture exceptions in WebSocket gateway handler', a
const socket = io(baseURL!);
await new Promise<void>(resolve => socket.on('connect', resolve));

socket.emit('test-exception', {});
socket.emit('test-ws-exception', {});
socket.emit('test-manual-capture', {});
await manualCapturePromise;

Expand Down
18 changes: 16 additions & 2 deletions packages/nestjs/src/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,24 @@ export function isExpectedError(exception: unknown): boolean {
return true;
}

// RpcException
if (typeof ex.getError === 'function' && typeof ex.initMessage === 'function') {
if (isWsOrRpcException(exception)) {
return true;
}

return false;
}

/**
* Determines if the exception is a WsException or RpcException, which have the same shape.
* Both have `getError()` and `initMessage()` methods.
*
* We use duck-typing to avoid importing from `@nestjs/websockets` or `@nestjs/microservices`.
*/
export function isWsOrRpcException(exception: unknown): boolean {
if (typeof exception !== 'object' || exception === null) {
return false;
}

const ex = exception as Record<string, unknown>;
return typeof ex.getError === 'function' && typeof ex.initMessage === 'function';
}
29 changes: 28 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import { Catch, Global, HttpException, Injectable, Logger, Module } from '@nestj
import { APP_INTERCEPTOR, BaseExceptionFilter } from '@nestjs/core';
import { captureException, debug, getDefaultIsolationScope, getIsolationScope } from '@sentry/core';
import type { Observable } from 'rxjs';
import { isExpectedError } from './helpers';
import { isExpectedError, isWsOrRpcException } from './helpers';

// Partial extract of FastifyRequest interface
// https://github.com/fastify/fastify/blob/87f9f20687c938828f1138f91682d568d2a31e53/types/request.d.ts#L41
Expand DownExpand Up@@ -152,6 +152,33 @@ class SentryGlobalFilter extends BaseExceptionFilter {
return;
}

if (contextType === 'ws') {
if (!isExpectedError(exception)) {
captureException(exception, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
}

const client = host.switchToWs().getClient<{ emit?: (event: string, data: unknown) => void }>();

if (isWsOrRpcException(exception)) {
const result = (exception as { getError: () => unknown }).getError();
const response = typeof result === 'object' && result !== null ? result : { status: 'error', message: result };
client.emit?.('exception', response);
return;
}

if (exception instanceof Error) {
this._logger.error(exception.message, exception.stack);
}

client.emit?.('exception', { status: 'error', message: 'Internal server error' });
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception, {
Expand Down
85 changes: 85 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { SentryGlobalFilter } from '../src/setup';

vi.mock('../src/helpers', () => ({
isExpectedError: vi.fn(),
isWsOrRpcException: vi.fn(),
}));

vi.mock('@sentry/core', () => ({
Expand All@@ -27,6 +28,7 @@ describe('SentryGlobalFilter', () => {
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;
let isWsOrRpcExceptionMock: any;

beforeEach(() => {
vi.clearAllMocks();
Expand DownExpand Up@@ -57,6 +59,7 @@ describe('SentryGlobalFilter', () => {
mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

isExpectedErrorMock = vi.mocked(Helpers.isExpectedError).mockImplementation(() => false);
isWsOrRpcExceptionMock = vi.mocked(Helpers.isWsOrRpcException).mockImplementation(() => false);
});

describe('HTTP context', () => {
Expand DownExpand Up@@ -237,4 +240,86 @@ describe('SentryGlobalFilter', () => {
expect(mockCaptureException).not.toHaveBeenCalled();
});
});

describe('WebSocket context', () => {
let mockEmit: ReturnType<typeof vi.fn>;

beforeEach(() => {
mockEmit = vi.fn();
vi.mocked(mockArgumentsHost.getType).mockReturnValue('ws');
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({ emit: mockEmit }),
getData: vi.fn(),
getPattern: vi.fn(),
});
});

it('captures unexpected errors and emits a generic error response', () => {
const error = new Error('Test WebSocket error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('does not capture expected WebSocket exceptions and emits their response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
isWsOrRpcExceptionMock.mockReturnValueOnce(true);
const exception = {
getError: () => 'Expected WebSocket exception',
initMessage: vi.fn(),
};

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Expected WebSocket exception',
});
});

it('does not capture HTTP exceptions and emits a generic error response', () => {
isExpectedErrorMock.mockReturnValueOnce(true);
const exception = new HttpException('Bad request', HttpStatus.BAD_REQUEST);

filter.catch(exception, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(exception.message, exception.stack);
expect(mockEmit).toHaveBeenCalledWith('exception', {
status: 'error',
message: 'Internal server error',
});
});

it('captures unexpected errors when the WebSocket client cannot emit', () => {
vi.mocked(mockArgumentsHost.switchToWs).mockReturnValue({
getClient: () => ({}),
getData: vi.fn(),
getPattern: vi.fn(),
});
const error = new Error('WebSocket adapter without emit');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error, {
mechanism: {
handled: false,
type: 'auto.ws.nestjs.global_filter',
},
});
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});
});
Loading