fix: Use correct native node types

Author: kamilogorek

packages/node/src/handlers.ts

@@ -5,6 +5,7 @@ import { forget } from '@sentry/utils/async';
 import { serialize } from '@sentry/utils/object';
 import { parse as parseCookie } from 'cookie';
 import * as domain from 'domain';
+import * as http from 'http';
 import { hostname } from 'os';
 import { parse as parseUrl } from 'url';
 import { NodeClient } from './client';
@@ -135,8 +136,8 @@ function parseRequest(
 }
 
 /** JSDoc */
-export function requestHandler(): (req: Request, res: Response, next: () => void) => void {
-  return function sentryRequestMiddleware(req: Request, _res: Response, next: () => void): void {
+export function requestHandler(): (req: http.ClientRequest, res: http.ServerResponse, next: () => void) => void {
+  return function sentryRequestMiddleware(req: http.ClientRequest, _res: http.ServerResponse, next: () => void): void {
     const local = domain.create();
     const hub = getHubFromCarrier(req);
     hub.bindClient(getCurrentHub().getClient());
@@ -168,14 +169,14 @@ function getStatusCodeFromResponse(error: MiddlewareError): number {
 /** JSDoc */
 export function errorHandler(): (
   error: MiddlewareError,
-  req: Request,
-  res: Response,
+  req: http.ClientRequest,
+  res: http.ServerResponse,
   next: (error: MiddlewareError) => void,
 ) => void {
   return function sentryErrorMiddleware(
     error: MiddlewareError,
-    req: Request,
-    _res: Response,
+    req: http.ClientRequest,
+    _res: http.ServerResponse,
     next: (error: MiddlewareError) => void,
   ): void {
     const status = getStatusCodeFromResponse(error);

packages/node/src/integrations/http.ts

@@ -1,6 +1,6 @@
 import { Integration } from '@sentry/types';
 import { fill } from '@sentry/utils/object';
-import { ClientRequest, ClientRequestArgs, ServerResponse } from 'http';
+import { ClientRequest, ClientRequestArgs, IncomingMessage, ServerResponse } from 'http';
 import { inherits } from 'util';
 import { getCurrentHub } from '../hub';
 
@@ -10,7 +10,7 @@ let lastResponse: ServerResponse | undefined;
  * Request interface which can carry around unified url
  * independently of used framework
  */
-interface SentryRequest extends Request {
+interface SentryRequest extends IncomingMessage {
   __ravenBreadcrumbUrl?: string;
 }
 

packages/node/src/transports/base.ts

@@ -3,12 +3,13 @@ import { SentryEvent, SentryResponse, Status, Transport, TransportOptions } from
 import { serialize } from '@sentry/utils/object';
 import * as http from 'http';
 import * as https from 'https';
+import * as url from 'url';
 import { SDK_NAME, SDK_VERSION } from '../version';
 
 /** Internal used interface for typescript */
 export interface HTTPRequest {
   request(
-    options: http.RequestOptions | string | URL,
+    options: http.RequestOptions | https.RequestOptions | string | url.URL,
     callback?: (res: http.IncomingMessage) => void,
   ): http.ClientRequest;
 }
@@ -27,7 +28,7 @@ export abstract class BaseTransport implements Transport {
   }
 
   /** Returns a build request option object used by request */
-  protected getRequestOptions(): http.RequestOptions {
+  protected getRequestOptions(): http.RequestOptions | https.RequestOptions {
     const headers = {
       ...this.api.getRequestHeaders(SDK_NAME, SDK_VERSION),
       ...this.options.headers,