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
37 changes: 36 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,10 +86,12 @@ class SentryGlobalFilter extends BaseExceptionFilter {
* Catches exceptions and reports them to Sentry unless they are expected errors.
*/
public catch(exception: unknown, host: ArgumentsHost): void {
const contextType = host.getType<string>();

// The BaseExceptionFilter does not work well in GraphQL applications.
// By default, Nest GraphQL applications use the ExternalExceptionFilter, which just rethrows the error:
// https://github.com/nestjs/nest/blob/master/packages/core/exceptions/external-exception-filter.ts
if (host.getType<'graphql'>() === 'graphql') {
if (contextType === 'graphql') {
// neither report nor log HttpExceptions
if (exception instanceof HttpException) {
throw exception;
Expand All@@ -103,6 +105,39 @@ class SentryGlobalFilter extends BaseExceptionFilter {
throw exception;
}

// Handle microservice context (rpc)
// We cannot add proper handing here since RpcException depend on the @nestjs/microservices package
// For these cases we log a warning that the user should be providing a dedicated exception filter
if (contextType === 'rpc') {
// Unlikely case
if (exception instanceof HttpException) {
throw exception;
}

// Handle any other kind of error
if (!(exception instanceof Error)) {
if (!isExpectedError(exception)) {
captureException(exception);
}
throw exception;
}

// In this case we're likely running into an RpcException, which the user should handle with a dedicated filter
// https://github.com/nestjs/nest/blob/master/sample/03-microservices/src/common/filters/rpc-exception.filter.ts
if (!isExpectedError(exception)) {
captureException(exception);
}

this._logger.warn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

// Log the error and return, otherwise we may crash the user's app by handling rpc errors in a http context
this._logger.error(exception.message, exception.stack);
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception);
}
Expand Down
235 changes: 235 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
/* eslint-disable @typescript-eslint/unbound-method */
import { describe, it, expect, beforeEach, vi } from 'vitest';
import type { ArgumentsHost } from '@nestjs/common';
import { HttpException, HttpStatus, Logger } from '@nestjs/common';
import { SentryGlobalFilter } from '../src/setup';
import * as SentryCore from '@sentry/core';
import * as Helpers from '../src/helpers';

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

vi.mock('@sentry/core', () => ({
captureException: vi.fn().mockReturnValue('mock-event-id'),
getIsolationScope: vi.fn(),
getDefaultIsolationScope: vi.fn(),
logger: {
warn: vi.fn(),
},
}));

describe('SentryGlobalFilter', () => {
let filter: SentryGlobalFilter;
let mockArgumentsHost: ArgumentsHost;
let mockHttpServer: any;
let mockCaptureException: any;
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;

beforeEach(() => {
vi.clearAllMocks();

mockHttpServer = {
getRequestMethod: vi.fn(),
getRequestUrl: vi.fn(),
};

filter = new SentryGlobalFilter(mockHttpServer);

mockArgumentsHost = {
getType: vi.fn().mockReturnValue('http'),
getArgs: vi.fn().mockReturnValue([]),
getArgByIndex: vi.fn().mockReturnValue({}),
switchToHttp: vi.fn().mockReturnValue({
getRequest: vi.fn().mockReturnValue({}),
getResponse: vi.fn().mockReturnValue({}),
getNext: vi.fn(),
}),
switchToRpc: vi.fn(),
switchToWs: vi.fn(),
} as unknown as ArgumentsHost;

mockLoggerError = vi.spyOn(Logger.prototype, 'error').mockImplementation(() => {});
mockLoggerWarn = vi.spyOn(Logger.prototype, 'warn').mockImplementation(() => {});

mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

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

describe('HTTP context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('http');
});

it('should capture non-HttpException errors and call super.catch for HTTP context', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();
filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const error = new Error('Test error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});

it('should not capture expected errors', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();

isExpectedErrorMock.mockReturnValueOnce(true);

filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const expectedError = new Error('Test error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});
});

describe('GraphQL context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('graphql');
});

it('should throw HttpExceptions without capturing them', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).not.toHaveBeenCalled();
});

it('should log and capture non-HttpException errors in GraphQL context', () => {
const error = new Error('Test error');

expect(() => {
filter.catch(error, mockArgumentsHost);
}).toThrow(error);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});

describe('RPC context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('rpc');
});

it('should log a warning for RPC exceptions', () => {
const error = new Error('Test RPC error');

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);

filter.catch = originalCatch;
});

it('should not capture expected RPC errors', () => {
isExpectedErrorMock.mockReturnValueOnce(true);

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

const expectedError = new Error('Expected RPC error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(expectedError.message, expectedError.stack);

filter.catch = originalCatch;
});

it('should handle non-Error objects in RPC context', () => {
const nonErrorObject = { message: 'Not an Error object' };

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

return undefined as any;
};

filter.catch(nonErrorObject, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(nonErrorObject);

filter.catch = originalCatch;
});

it('should throw HttpExceptions in RPC context without capturing', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
});
});
});
, '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
37 changes: 36 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,10 +86,12 @@ class SentryGlobalFilter extends BaseExceptionFilter {
* Catches exceptions and reports them to Sentry unless they are expected errors.
*/
public catch(exception: unknown, host: ArgumentsHost): void {
const contextType = host.getType<string>();

// The BaseExceptionFilter does not work well in GraphQL applications.
// By default, Nest GraphQL applications use the ExternalExceptionFilter, which just rethrows the error:
// https://github.com/nestjs/nest/blob/master/packages/core/exceptions/external-exception-filter.ts
if (host.getType<'graphql'>() === 'graphql') {
if (contextType === 'graphql') {
// neither report nor log HttpExceptions
if (exception instanceof HttpException) {
throw exception;
Expand All@@ -103,6 +105,39 @@ class SentryGlobalFilter extends BaseExceptionFilter {
throw exception;
}

// Handle microservice context (rpc)
// We cannot add proper handing here since RpcException depend on the @nestjs/microservices package
// For these cases we log a warning that the user should be providing a dedicated exception filter
if (contextType === 'rpc') {
// Unlikely case
if (exception instanceof HttpException) {
throw exception;
}

// Handle any other kind of error
if (!(exception instanceof Error)) {
if (!isExpectedError(exception)) {
captureException(exception);
}
throw exception;
}

// In this case we're likely running into an RpcException, which the user should handle with a dedicated filter
// https://github.com/nestjs/nest/blob/master/sample/03-microservices/src/common/filters/rpc-exception.filter.ts
if (!isExpectedError(exception)) {
captureException(exception);
}

this._logger.warn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

// Log the error and return, otherwise we may crash the user's app by handling rpc errors in a http context
this._logger.error(exception.message, exception.stack);
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception);
}
Expand Down
235 changes: 235 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
/* eslint-disable @typescript-eslint/unbound-method */
import { describe, it, expect, beforeEach, vi } from 'vitest';
import type { ArgumentsHost } from '@nestjs/common';
import { HttpException, HttpStatus, Logger } from '@nestjs/common';
import { SentryGlobalFilter } from '../src/setup';
import * as SentryCore from '@sentry/core';
import * as Helpers from '../src/helpers';

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

vi.mock('@sentry/core', () => ({
captureException: vi.fn().mockReturnValue('mock-event-id'),
getIsolationScope: vi.fn(),
getDefaultIsolationScope: vi.fn(),
logger: {
warn: vi.fn(),
},
}));

describe('SentryGlobalFilter', () => {
let filter: SentryGlobalFilter;
let mockArgumentsHost: ArgumentsHost;
let mockHttpServer: any;
let mockCaptureException: any;
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;

beforeEach(() => {
vi.clearAllMocks();

mockHttpServer = {
getRequestMethod: vi.fn(),
getRequestUrl: vi.fn(),
};

filter = new SentryGlobalFilter(mockHttpServer);

mockArgumentsHost = {
getType: vi.fn().mockReturnValue('http'),
getArgs: vi.fn().mockReturnValue([]),
getArgByIndex: vi.fn().mockReturnValue({}),
switchToHttp: vi.fn().mockReturnValue({
getRequest: vi.fn().mockReturnValue({}),
getResponse: vi.fn().mockReturnValue({}),
getNext: vi.fn(),
}),
switchToRpc: vi.fn(),
switchToWs: vi.fn(),
} as unknown as ArgumentsHost;

mockLoggerError = vi.spyOn(Logger.prototype, 'error').mockImplementation(() => {});
mockLoggerWarn = vi.spyOn(Logger.prototype, 'warn').mockImplementation(() => {});

mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

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

describe('HTTP context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('http');
});

it('should capture non-HttpException errors and call super.catch for HTTP context', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();
filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const error = new Error('Test error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});

it('should not capture expected errors', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();

isExpectedErrorMock.mockReturnValueOnce(true);

filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const expectedError = new Error('Test error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});
});

describe('GraphQL context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('graphql');
});

it('should throw HttpExceptions without capturing them', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).not.toHaveBeenCalled();
});

it('should log and capture non-HttpException errors in GraphQL context', () => {
const error = new Error('Test error');

expect(() => {
filter.catch(error, mockArgumentsHost);
}).toThrow(error);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});

describe('RPC context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('rpc');
});

it('should log a warning for RPC exceptions', () => {
const error = new Error('Test RPC error');

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);

filter.catch = originalCatch;
});

it('should not capture expected RPC errors', () => {
isExpectedErrorMock.mockReturnValueOnce(true);

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

const expectedError = new Error('Expected RPC error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(expectedError.message, expectedError.stack);

filter.catch = originalCatch;
});

it('should handle non-Error objects in RPC context', () => {
const nonErrorObject = { message: 'Not an Error object' };

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

return undefined as any;
};

filter.catch(nonErrorObject, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(nonErrorObject);

filter.catch = originalCatch;
});

it('should throw HttpExceptions in RPC context without capturing', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
});
});
});
, '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
37 changes: 36 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,10 +86,12 @@ class SentryGlobalFilter extends BaseExceptionFilter {
* Catches exceptions and reports them to Sentry unless they are expected errors.
*/
public catch(exception: unknown, host: ArgumentsHost): void {
const contextType = host.getType<string>();

// The BaseExceptionFilter does not work well in GraphQL applications.
// By default, Nest GraphQL applications use the ExternalExceptionFilter, which just rethrows the error:
// https://github.com/nestjs/nest/blob/master/packages/core/exceptions/external-exception-filter.ts
if (host.getType<'graphql'>() === 'graphql') {
if (contextType === 'graphql') {
// neither report nor log HttpExceptions
if (exception instanceof HttpException) {
throw exception;
Expand All@@ -103,6 +105,39 @@ class SentryGlobalFilter extends BaseExceptionFilter {
throw exception;
}

// Handle microservice context (rpc)
// We cannot add proper handing here since RpcException depend on the @nestjs/microservices package
// For these cases we log a warning that the user should be providing a dedicated exception filter
if (contextType === 'rpc') {
// Unlikely case
if (exception instanceof HttpException) {
throw exception;
}

// Handle any other kind of error
if (!(exception instanceof Error)) {
if (!isExpectedError(exception)) {
captureException(exception);
}
throw exception;
}

// In this case we're likely running into an RpcException, which the user should handle with a dedicated filter
// https://github.com/nestjs/nest/blob/master/sample/03-microservices/src/common/filters/rpc-exception.filter.ts
if (!isExpectedError(exception)) {
captureException(exception);
}

this._logger.warn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

// Log the error and return, otherwise we may crash the user's app by handling rpc errors in a http context
this._logger.error(exception.message, exception.stack);
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception);
}
Expand Down
235 changes: 235 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
/* eslint-disable @typescript-eslint/unbound-method */
import { describe, it, expect, beforeEach, vi } from 'vitest';
import type { ArgumentsHost } from '@nestjs/common';
import { HttpException, HttpStatus, Logger } from '@nestjs/common';
import { SentryGlobalFilter } from '../src/setup';
import * as SentryCore from '@sentry/core';
import * as Helpers from '../src/helpers';

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

vi.mock('@sentry/core', () => ({
captureException: vi.fn().mockReturnValue('mock-event-id'),
getIsolationScope: vi.fn(),
getDefaultIsolationScope: vi.fn(),
logger: {
warn: vi.fn(),
},
}));

describe('SentryGlobalFilter', () => {
let filter: SentryGlobalFilter;
let mockArgumentsHost: ArgumentsHost;
let mockHttpServer: any;
let mockCaptureException: any;
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;

beforeEach(() => {
vi.clearAllMocks();

mockHttpServer = {
getRequestMethod: vi.fn(),
getRequestUrl: vi.fn(),
};

filter = new SentryGlobalFilter(mockHttpServer);

mockArgumentsHost = {
getType: vi.fn().mockReturnValue('http'),
getArgs: vi.fn().mockReturnValue([]),
getArgByIndex: vi.fn().mockReturnValue({}),
switchToHttp: vi.fn().mockReturnValue({
getRequest: vi.fn().mockReturnValue({}),
getResponse: vi.fn().mockReturnValue({}),
getNext: vi.fn(),
}),
switchToRpc: vi.fn(),
switchToWs: vi.fn(),
} as unknown as ArgumentsHost;

mockLoggerError = vi.spyOn(Logger.prototype, 'error').mockImplementation(() => {});
mockLoggerWarn = vi.spyOn(Logger.prototype, 'warn').mockImplementation(() => {});

mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

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

describe('HTTP context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('http');
});

it('should capture non-HttpException errors and call super.catch for HTTP context', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();
filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const error = new Error('Test error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});

it('should not capture expected errors', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();

isExpectedErrorMock.mockReturnValueOnce(true);

filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const expectedError = new Error('Test error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});
});

describe('GraphQL context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('graphql');
});

it('should throw HttpExceptions without capturing them', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).not.toHaveBeenCalled();
});

it('should log and capture non-HttpException errors in GraphQL context', () => {
const error = new Error('Test error');

expect(() => {
filter.catch(error, mockArgumentsHost);
}).toThrow(error);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});

describe('RPC context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('rpc');
});

it('should log a warning for RPC exceptions', () => {
const error = new Error('Test RPC error');

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);

filter.catch = originalCatch;
});

it('should not capture expected RPC errors', () => {
isExpectedErrorMock.mockReturnValueOnce(true);

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

const expectedError = new Error('Expected RPC error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(expectedError.message, expectedError.stack);

filter.catch = originalCatch;
});

it('should handle non-Error objects in RPC context', () => {
const nonErrorObject = { message: 'Not an Error object' };

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

return undefined as any;
};

filter.catch(nonErrorObject, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(nonErrorObject);

filter.catch = originalCatch;
});

it('should throw HttpExceptions in RPC context without capturing', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
});
});
});
, '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
37 changes: 36 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,10 +86,12 @@ class SentryGlobalFilter extends BaseExceptionFilter {
* Catches exceptions and reports them to Sentry unless they are expected errors.
*/
public catch(exception: unknown, host: ArgumentsHost): void {
const contextType = host.getType<string>();

// The BaseExceptionFilter does not work well in GraphQL applications.
// By default, Nest GraphQL applications use the ExternalExceptionFilter, which just rethrows the error:
// https://github.com/nestjs/nest/blob/master/packages/core/exceptions/external-exception-filter.ts
if (host.getType<'graphql'>() === 'graphql') {
if (contextType === 'graphql') {
// neither report nor log HttpExceptions
if (exception instanceof HttpException) {
throw exception;
Expand All@@ -103,6 +105,39 @@ class SentryGlobalFilter extends BaseExceptionFilter {
throw exception;
}

// Handle microservice context (rpc)
// We cannot add proper handing here since RpcException depend on the @nestjs/microservices package
// For these cases we log a warning that the user should be providing a dedicated exception filter
if (contextType === 'rpc') {
// Unlikely case
if (exception instanceof HttpException) {
throw exception;
}

// Handle any other kind of error
if (!(exception instanceof Error)) {
if (!isExpectedError(exception)) {
captureException(exception);
}
throw exception;
}

// In this case we're likely running into an RpcException, which the user should handle with a dedicated filter
// https://github.com/nestjs/nest/blob/master/sample/03-microservices/src/common/filters/rpc-exception.filter.ts
if (!isExpectedError(exception)) {
captureException(exception);
}

this._logger.warn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

// Log the error and return, otherwise we may crash the user's app by handling rpc errors in a http context
this._logger.error(exception.message, exception.stack);
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception);
}
Expand Down
235 changes: 235 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
/* eslint-disable @typescript-eslint/unbound-method */
import { describe, it, expect, beforeEach, vi } from 'vitest';
import type { ArgumentsHost } from '@nestjs/common';
import { HttpException, HttpStatus, Logger } from '@nestjs/common';
import { SentryGlobalFilter } from '../src/setup';
import * as SentryCore from '@sentry/core';
import * as Helpers from '../src/helpers';

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

vi.mock('@sentry/core', () => ({
captureException: vi.fn().mockReturnValue('mock-event-id'),
getIsolationScope: vi.fn(),
getDefaultIsolationScope: vi.fn(),
logger: {
warn: vi.fn(),
},
}));

describe('SentryGlobalFilter', () => {
let filter: SentryGlobalFilter;
let mockArgumentsHost: ArgumentsHost;
let mockHttpServer: any;
let mockCaptureException: any;
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;

beforeEach(() => {
vi.clearAllMocks();

mockHttpServer = {
getRequestMethod: vi.fn(),
getRequestUrl: vi.fn(),
};

filter = new SentryGlobalFilter(mockHttpServer);

mockArgumentsHost = {
getType: vi.fn().mockReturnValue('http'),
getArgs: vi.fn().mockReturnValue([]),
getArgByIndex: vi.fn().mockReturnValue({}),
switchToHttp: vi.fn().mockReturnValue({
getRequest: vi.fn().mockReturnValue({}),
getResponse: vi.fn().mockReturnValue({}),
getNext: vi.fn(),
}),
switchToRpc: vi.fn(),
switchToWs: vi.fn(),
} as unknown as ArgumentsHost;

mockLoggerError = vi.spyOn(Logger.prototype, 'error').mockImplementation(() => {});
mockLoggerWarn = vi.spyOn(Logger.prototype, 'warn').mockImplementation(() => {});

mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

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

describe('HTTP context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('http');
});

it('should capture non-HttpException errors and call super.catch for HTTP context', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();
filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const error = new Error('Test error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});

it('should not capture expected errors', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();

isExpectedErrorMock.mockReturnValueOnce(true);

filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const expectedError = new Error('Test error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});
});

describe('GraphQL context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('graphql');
});

it('should throw HttpExceptions without capturing them', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).not.toHaveBeenCalled();
});

it('should log and capture non-HttpException errors in GraphQL context', () => {
const error = new Error('Test error');

expect(() => {
filter.catch(error, mockArgumentsHost);
}).toThrow(error);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});

describe('RPC context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('rpc');
});

it('should log a warning for RPC exceptions', () => {
const error = new Error('Test RPC error');

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);

filter.catch = originalCatch;
});

it('should not capture expected RPC errors', () => {
isExpectedErrorMock.mockReturnValueOnce(true);

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

const expectedError = new Error('Expected RPC error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(expectedError.message, expectedError.stack);

filter.catch = originalCatch;
});

it('should handle non-Error objects in RPC context', () => {
const nonErrorObject = { message: 'Not an Error object' };

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

return undefined as any;
};

filter.catch(nonErrorObject, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(nonErrorObject);

filter.catch = originalCatch;
});

it('should throw HttpExceptions in RPC context without capturing', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
});
});
});
, '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
37 changes: 36 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,10 +86,12 @@ class SentryGlobalFilter extends BaseExceptionFilter {
* Catches exceptions and reports them to Sentry unless they are expected errors.
*/
public catch(exception: unknown, host: ArgumentsHost): void {
const contextType = host.getType<string>();

// The BaseExceptionFilter does not work well in GraphQL applications.
// By default, Nest GraphQL applications use the ExternalExceptionFilter, which just rethrows the error:
// https://github.com/nestjs/nest/blob/master/packages/core/exceptions/external-exception-filter.ts
if (host.getType<'graphql'>() === 'graphql') {
if (contextType === 'graphql') {
// neither report nor log HttpExceptions
if (exception instanceof HttpException) {
throw exception;
Expand All@@ -103,6 +105,39 @@ class SentryGlobalFilter extends BaseExceptionFilter {
throw exception;
}

// Handle microservice context (rpc)
// We cannot add proper handing here since RpcException depend on the @nestjs/microservices package
// For these cases we log a warning that the user should be providing a dedicated exception filter
if (contextType === 'rpc') {
// Unlikely case
if (exception instanceof HttpException) {
throw exception;
}

// Handle any other kind of error
if (!(exception instanceof Error)) {
if (!isExpectedError(exception)) {
captureException(exception);
}
throw exception;
}

// In this case we're likely running into an RpcException, which the user should handle with a dedicated filter
// https://github.com/nestjs/nest/blob/master/sample/03-microservices/src/common/filters/rpc-exception.filter.ts
if (!isExpectedError(exception)) {
captureException(exception);
}

this._logger.warn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

// Log the error and return, otherwise we may crash the user's app by handling rpc errors in a http context
this._logger.error(exception.message, exception.stack);
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception);
}
Expand Down
235 changes: 235 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
/* eslint-disable @typescript-eslint/unbound-method */
import { describe, it, expect, beforeEach, vi } from 'vitest';
import type { ArgumentsHost } from '@nestjs/common';
import { HttpException, HttpStatus, Logger } from '@nestjs/common';
import { SentryGlobalFilter } from '../src/setup';
import * as SentryCore from '@sentry/core';
import * as Helpers from '../src/helpers';

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

vi.mock('@sentry/core', () => ({
captureException: vi.fn().mockReturnValue('mock-event-id'),
getIsolationScope: vi.fn(),
getDefaultIsolationScope: vi.fn(),
logger: {
warn: vi.fn(),
},
}));

describe('SentryGlobalFilter', () => {
let filter: SentryGlobalFilter;
let mockArgumentsHost: ArgumentsHost;
let mockHttpServer: any;
let mockCaptureException: any;
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;

beforeEach(() => {
vi.clearAllMocks();

mockHttpServer = {
getRequestMethod: vi.fn(),
getRequestUrl: vi.fn(),
};

filter = new SentryGlobalFilter(mockHttpServer);

mockArgumentsHost = {
getType: vi.fn().mockReturnValue('http'),
getArgs: vi.fn().mockReturnValue([]),
getArgByIndex: vi.fn().mockReturnValue({}),
switchToHttp: vi.fn().mockReturnValue({
getRequest: vi.fn().mockReturnValue({}),
getResponse: vi.fn().mockReturnValue({}),
getNext: vi.fn(),
}),
switchToRpc: vi.fn(),
switchToWs: vi.fn(),
} as unknown as ArgumentsHost;

mockLoggerError = vi.spyOn(Logger.prototype, 'error').mockImplementation(() => {});
mockLoggerWarn = vi.spyOn(Logger.prototype, 'warn').mockImplementation(() => {});

mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

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

describe('HTTP context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('http');
});

it('should capture non-HttpException errors and call super.catch for HTTP context', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();
filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const error = new Error('Test error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});

it('should not capture expected errors', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();

isExpectedErrorMock.mockReturnValueOnce(true);

filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const expectedError = new Error('Test error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});
});

describe('GraphQL context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('graphql');
});

it('should throw HttpExceptions without capturing them', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).not.toHaveBeenCalled();
});

it('should log and capture non-HttpException errors in GraphQL context', () => {
const error = new Error('Test error');

expect(() => {
filter.catch(error, mockArgumentsHost);
}).toThrow(error);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});

describe('RPC context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('rpc');
});

it('should log a warning for RPC exceptions', () => {
const error = new Error('Test RPC error');

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);

filter.catch = originalCatch;
});

it('should not capture expected RPC errors', () => {
isExpectedErrorMock.mockReturnValueOnce(true);

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

const expectedError = new Error('Expected RPC error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(expectedError.message, expectedError.stack);

filter.catch = originalCatch;
});

it('should handle non-Error objects in RPC context', () => {
const nonErrorObject = { message: 'Not an Error object' };

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

return undefined as any;
};

filter.catch(nonErrorObject, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(nonErrorObject);

filter.catch = originalCatch;
});

it('should throw HttpExceptions in RPC context without capturing', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
});
});
});
, '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
37 changes: 36 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,10 +86,12 @@ class SentryGlobalFilter extends BaseExceptionFilter {
* Catches exceptions and reports them to Sentry unless they are expected errors.
*/
public catch(exception: unknown, host: ArgumentsHost): void {
const contextType = host.getType<string>();

// The BaseExceptionFilter does not work well in GraphQL applications.
// By default, Nest GraphQL applications use the ExternalExceptionFilter, which just rethrows the error:
// https://github.com/nestjs/nest/blob/master/packages/core/exceptions/external-exception-filter.ts
if (host.getType<'graphql'>() === 'graphql') {
if (contextType === 'graphql') {
// neither report nor log HttpExceptions
if (exception instanceof HttpException) {
throw exception;
Expand All@@ -103,6 +105,39 @@ class SentryGlobalFilter extends BaseExceptionFilter {
throw exception;
}

// Handle microservice context (rpc)
// We cannot add proper handing here since RpcException depend on the @nestjs/microservices package
// For these cases we log a warning that the user should be providing a dedicated exception filter
if (contextType === 'rpc') {
// Unlikely case
if (exception instanceof HttpException) {
throw exception;
}

// Handle any other kind of error
if (!(exception instanceof Error)) {
if (!isExpectedError(exception)) {
captureException(exception);
}
throw exception;
}

// In this case we're likely running into an RpcException, which the user should handle with a dedicated filter
// https://github.com/nestjs/nest/blob/master/sample/03-microservices/src/common/filters/rpc-exception.filter.ts
if (!isExpectedError(exception)) {
captureException(exception);
}

this._logger.warn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

// Log the error and return, otherwise we may crash the user's app by handling rpc errors in a http context
this._logger.error(exception.message, exception.stack);
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception);
}
Expand Down
235 changes: 235 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
/* eslint-disable @typescript-eslint/unbound-method */
import { describe, it, expect, beforeEach, vi } from 'vitest';
import type { ArgumentsHost } from '@nestjs/common';
import { HttpException, HttpStatus, Logger } from '@nestjs/common';
import { SentryGlobalFilter } from '../src/setup';
import * as SentryCore from '@sentry/core';
import * as Helpers from '../src/helpers';

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

vi.mock('@sentry/core', () => ({
captureException: vi.fn().mockReturnValue('mock-event-id'),
getIsolationScope: vi.fn(),
getDefaultIsolationScope: vi.fn(),
logger: {
warn: vi.fn(),
},
}));

describe('SentryGlobalFilter', () => {
let filter: SentryGlobalFilter;
let mockArgumentsHost: ArgumentsHost;
let mockHttpServer: any;
let mockCaptureException: any;
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;

beforeEach(() => {
vi.clearAllMocks();

mockHttpServer = {
getRequestMethod: vi.fn(),
getRequestUrl: vi.fn(),
};

filter = new SentryGlobalFilter(mockHttpServer);

mockArgumentsHost = {
getType: vi.fn().mockReturnValue('http'),
getArgs: vi.fn().mockReturnValue([]),
getArgByIndex: vi.fn().mockReturnValue({}),
switchToHttp: vi.fn().mockReturnValue({
getRequest: vi.fn().mockReturnValue({}),
getResponse: vi.fn().mockReturnValue({}),
getNext: vi.fn(),
}),
switchToRpc: vi.fn(),
switchToWs: vi.fn(),
} as unknown as ArgumentsHost;

mockLoggerError = vi.spyOn(Logger.prototype, 'error').mockImplementation(() => {});
mockLoggerWarn = vi.spyOn(Logger.prototype, 'warn').mockImplementation(() => {});

mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

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

describe('HTTP context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('http');
});

it('should capture non-HttpException errors and call super.catch for HTTP context', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();
filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const error = new Error('Test error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});

it('should not capture expected errors', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();

isExpectedErrorMock.mockReturnValueOnce(true);

filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const expectedError = new Error('Test error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});
});

describe('GraphQL context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('graphql');
});

it('should throw HttpExceptions without capturing them', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).not.toHaveBeenCalled();
});

it('should log and capture non-HttpException errors in GraphQL context', () => {
const error = new Error('Test error');

expect(() => {
filter.catch(error, mockArgumentsHost);
}).toThrow(error);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});

describe('RPC context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('rpc');
});

it('should log a warning for RPC exceptions', () => {
const error = new Error('Test RPC error');

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);

filter.catch = originalCatch;
});

it('should not capture expected RPC errors', () => {
isExpectedErrorMock.mockReturnValueOnce(true);

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

const expectedError = new Error('Expected RPC error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(expectedError.message, expectedError.stack);

filter.catch = originalCatch;
});

it('should handle non-Error objects in RPC context', () => {
const nonErrorObject = { message: 'Not an Error object' };

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

return undefined as any;
};

filter.catch(nonErrorObject, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(nonErrorObject);

filter.catch = originalCatch;
});

it('should throw HttpExceptions in RPC context without capturing', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
});
});
});
, '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
37 changes: 36 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,10 +86,12 @@ class SentryGlobalFilter extends BaseExceptionFilter {
* Catches exceptions and reports them to Sentry unless they are expected errors.
*/
public catch(exception: unknown, host: ArgumentsHost): void {
const contextType = host.getType<string>();

// The BaseExceptionFilter does not work well in GraphQL applications.
// By default, Nest GraphQL applications use the ExternalExceptionFilter, which just rethrows the error:
// https://github.com/nestjs/nest/blob/master/packages/core/exceptions/external-exception-filter.ts
if (host.getType<'graphql'>() === 'graphql') {
if (contextType === 'graphql') {
// neither report nor log HttpExceptions
if (exception instanceof HttpException) {
throw exception;
Expand All@@ -103,6 +105,39 @@ class SentryGlobalFilter extends BaseExceptionFilter {
throw exception;
}

// Handle microservice context (rpc)
// We cannot add proper handing here since RpcException depend on the @nestjs/microservices package
// For these cases we log a warning that the user should be providing a dedicated exception filter
if (contextType === 'rpc') {
// Unlikely case
if (exception instanceof HttpException) {
throw exception;
}

// Handle any other kind of error
if (!(exception instanceof Error)) {
if (!isExpectedError(exception)) {
captureException(exception);
}
throw exception;
}

// In this case we're likely running into an RpcException, which the user should handle with a dedicated filter
// https://github.com/nestjs/nest/blob/master/sample/03-microservices/src/common/filters/rpc-exception.filter.ts
if (!isExpectedError(exception)) {
captureException(exception);
}

this._logger.warn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

// Log the error and return, otherwise we may crash the user's app by handling rpc errors in a http context
this._logger.error(exception.message, exception.stack);
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception);
}
Expand Down
235 changes: 235 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
/* eslint-disable @typescript-eslint/unbound-method */
import { describe, it, expect, beforeEach, vi } from 'vitest';
import type { ArgumentsHost } from '@nestjs/common';
import { HttpException, HttpStatus, Logger } from '@nestjs/common';
import { SentryGlobalFilter } from '../src/setup';
import * as SentryCore from '@sentry/core';
import * as Helpers from '../src/helpers';

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

vi.mock('@sentry/core', () => ({
captureException: vi.fn().mockReturnValue('mock-event-id'),
getIsolationScope: vi.fn(),
getDefaultIsolationScope: vi.fn(),
logger: {
warn: vi.fn(),
},
}));

describe('SentryGlobalFilter', () => {
let filter: SentryGlobalFilter;
let mockArgumentsHost: ArgumentsHost;
let mockHttpServer: any;
let mockCaptureException: any;
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;

beforeEach(() => {
vi.clearAllMocks();

mockHttpServer = {
getRequestMethod: vi.fn(),
getRequestUrl: vi.fn(),
};

filter = new SentryGlobalFilter(mockHttpServer);

mockArgumentsHost = {
getType: vi.fn().mockReturnValue('http'),
getArgs: vi.fn().mockReturnValue([]),
getArgByIndex: vi.fn().mockReturnValue({}),
switchToHttp: vi.fn().mockReturnValue({
getRequest: vi.fn().mockReturnValue({}),
getResponse: vi.fn().mockReturnValue({}),
getNext: vi.fn(),
}),
switchToRpc: vi.fn(),
switchToWs: vi.fn(),
} as unknown as ArgumentsHost;

mockLoggerError = vi.spyOn(Logger.prototype, 'error').mockImplementation(() => {});
mockLoggerWarn = vi.spyOn(Logger.prototype, 'warn').mockImplementation(() => {});

mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

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

describe('HTTP context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('http');
});

it('should capture non-HttpException errors and call super.catch for HTTP context', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();
filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const error = new Error('Test error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});

it('should not capture expected errors', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();

isExpectedErrorMock.mockReturnValueOnce(true);

filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const expectedError = new Error('Test error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});
});

describe('GraphQL context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('graphql');
});

it('should throw HttpExceptions without capturing them', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).not.toHaveBeenCalled();
});

it('should log and capture non-HttpException errors in GraphQL context', () => {
const error = new Error('Test error');

expect(() => {
filter.catch(error, mockArgumentsHost);
}).toThrow(error);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});

describe('RPC context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('rpc');
});

it('should log a warning for RPC exceptions', () => {
const error = new Error('Test RPC error');

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);

filter.catch = originalCatch;
});

it('should not capture expected RPC errors', () => {
isExpectedErrorMock.mockReturnValueOnce(true);

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

const expectedError = new Error('Expected RPC error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(expectedError.message, expectedError.stack);

filter.catch = originalCatch;
});

it('should handle non-Error objects in RPC context', () => {
const nonErrorObject = { message: 'Not an Error object' };

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

return undefined as any;
};

filter.catch(nonErrorObject, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(nonErrorObject);

filter.catch = originalCatch;
});

it('should throw HttpExceptions in RPC context without capturing', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
});
});
});
, '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
37 changes: 36 additions & 1 deletion packages/nestjs/src/setup.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,10 +86,12 @@ class SentryGlobalFilter extends BaseExceptionFilter {
* Catches exceptions and reports them to Sentry unless they are expected errors.
*/
public catch(exception: unknown, host: ArgumentsHost): void {
const contextType = host.getType<string>();

// The BaseExceptionFilter does not work well in GraphQL applications.
// By default, Nest GraphQL applications use the ExternalExceptionFilter, which just rethrows the error:
// https://github.com/nestjs/nest/blob/master/packages/core/exceptions/external-exception-filter.ts
if (host.getType<'graphql'>() === 'graphql') {
if (contextType === 'graphql') {
// neither report nor log HttpExceptions
if (exception instanceof HttpException) {
throw exception;
Expand All@@ -103,6 +105,39 @@ class SentryGlobalFilter extends BaseExceptionFilter {
throw exception;
}

// Handle microservice context (rpc)
// We cannot add proper handing here since RpcException depend on the @nestjs/microservices package
// For these cases we log a warning that the user should be providing a dedicated exception filter
if (contextType === 'rpc') {
// Unlikely case
if (exception instanceof HttpException) {
throw exception;
}

// Handle any other kind of error
if (!(exception instanceof Error)) {
if (!isExpectedError(exception)) {
captureException(exception);
}
throw exception;
}

// In this case we're likely running into an RpcException, which the user should handle with a dedicated filter
// https://github.com/nestjs/nest/blob/master/sample/03-microservices/src/common/filters/rpc-exception.filter.ts
if (!isExpectedError(exception)) {
captureException(exception);
}

this._logger.warn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

// Log the error and return, otherwise we may crash the user's app by handling rpc errors in a http context
this._logger.error(exception.message, exception.stack);
return;
}

// HTTP exceptions
if (!isExpectedError(exception)) {
captureException(exception);
}
Expand Down
235 changes: 235 additions & 0 deletions packages/nestjs/test/sentry-global-filter.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
/* eslint-disable @typescript-eslint/unbound-method */
import { describe, it, expect, beforeEach, vi } from 'vitest';
import type { ArgumentsHost } from '@nestjs/common';
import { HttpException, HttpStatus, Logger } from '@nestjs/common';
import { SentryGlobalFilter } from '../src/setup';
import * as SentryCore from '@sentry/core';
import * as Helpers from '../src/helpers';

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

vi.mock('@sentry/core', () => ({
captureException: vi.fn().mockReturnValue('mock-event-id'),
getIsolationScope: vi.fn(),
getDefaultIsolationScope: vi.fn(),
logger: {
warn: vi.fn(),
},
}));

describe('SentryGlobalFilter', () => {
let filter: SentryGlobalFilter;
let mockArgumentsHost: ArgumentsHost;
let mockHttpServer: any;
let mockCaptureException: any;
let mockLoggerError: any;
let mockLoggerWarn: any;
let isExpectedErrorMock: any;

beforeEach(() => {
vi.clearAllMocks();

mockHttpServer = {
getRequestMethod: vi.fn(),
getRequestUrl: vi.fn(),
};

filter = new SentryGlobalFilter(mockHttpServer);

mockArgumentsHost = {
getType: vi.fn().mockReturnValue('http'),
getArgs: vi.fn().mockReturnValue([]),
getArgByIndex: vi.fn().mockReturnValue({}),
switchToHttp: vi.fn().mockReturnValue({
getRequest: vi.fn().mockReturnValue({}),
getResponse: vi.fn().mockReturnValue({}),
getNext: vi.fn(),
}),
switchToRpc: vi.fn(),
switchToWs: vi.fn(),
} as unknown as ArgumentsHost;

mockLoggerError = vi.spyOn(Logger.prototype, 'error').mockImplementation(() => {});
mockLoggerWarn = vi.spyOn(Logger.prototype, 'warn').mockImplementation(() => {});

mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockReturnValue('mock-event-id');

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

describe('HTTP context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('http');
});

it('should capture non-HttpException errors and call super.catch for HTTP context', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();
filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const error = new Error('Test error');

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});

it('should not capture expected errors', () => {
const originalCatch = filter.catch;
const superCatchSpy = vi.fn();

isExpectedErrorMock.mockReturnValueOnce(true);

filter.catch = function (exception, host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}
superCatchSpy(exception, host);
return {} as any;
};

const expectedError = new Error('Test error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(superCatchSpy).toHaveBeenCalled();

filter.catch = originalCatch;
});
});

describe('GraphQL context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('graphql');
});

it('should throw HttpExceptions without capturing them', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerError).not.toHaveBeenCalled();
});

it('should log and capture non-HttpException errors in GraphQL context', () => {
const error = new Error('Test error');

expect(() => {
filter.catch(error, mockArgumentsHost);
}).toThrow(error);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);
});
});

describe('RPC context', () => {
beforeEach(() => {
vi.mocked(mockArgumentsHost.getType).mockReturnValue('rpc');
});

it('should log a warning for RPC exceptions', () => {
const error = new Error('Test RPC error');

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

filter.catch(error, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(error);
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(error.message, error.stack);

filter.catch = originalCatch;
});

it('should not capture expected RPC errors', () => {
isExpectedErrorMock.mockReturnValueOnce(true);

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

if (exception instanceof Error) {
mockLoggerError(exception.message, exception.stack);
}

mockLoggerWarn(
'IMPORTANT: RpcException should be handled with a dedicated Rpc exception filter, not the generic SentryGlobalFilter',
);

return undefined as any;
};

const expectedError = new Error('Expected RPC error');

filter.catch(expectedError, mockArgumentsHost);

expect(mockCaptureException).not.toHaveBeenCalled();
expect(mockLoggerWarn).toHaveBeenCalled();
expect(mockLoggerError).toHaveBeenCalledWith(expectedError.message, expectedError.stack);

filter.catch = originalCatch;
});

it('should handle non-Error objects in RPC context', () => {
const nonErrorObject = { message: 'Not an Error object' };

const originalCatch = filter.catch;
filter.catch = function (exception, _host) {
if (!Helpers.isExpectedError(exception)) {
SentryCore.captureException(exception);
}

return undefined as any;
};

filter.catch(nonErrorObject, mockArgumentsHost);

expect(mockCaptureException).toHaveBeenCalledWith(nonErrorObject);

filter.catch = originalCatch;
});

it('should throw HttpExceptions in RPC context without capturing', () => {
const httpException = new HttpException('Test HTTP exception', HttpStatus.BAD_REQUEST);

expect(() => {
filter.catch(httpException, mockArgumentsHost);
}).toThrow(httpException);

expect(mockCaptureException).not.toHaveBeenCalled();
});
});
});