fix: Minor issues (#1420)

* fix: Get global object fixed in hub

Fixes #1419

* fix: TransportOptions differences between node/browser

* fix: Event interface extra:any

* fix: Global naming conflict

Author: HazAT

packages/hub/package.json

@@ -15,7 +15,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/types": "4.0.0-beta.0"
+    "@sentry/types": "4.0.0-beta.0",
+    "@sentry/utils": "4.0.0-beta.0"
   },
   "devDependencies": {
     "jest": "^22.4.3",

packages/hub/src/global.ts

@@ -1,20 +1,14 @@
+import { getGlobalObject } from '@sentry/utils/misc';
 import { API_VERSION, Hub } from './hub';
 import { Carrier } from './interfaces';
 
-/** Global interface helper for type safety. */
-interface Global {
-  __SENTRY__: Carrier;
-}
-
-declare var global: Global;
-
-global.__SENTRY__ = global.__SENTRY__ || {
-  hub: undefined,
-};
-
 /** Returns the global shim registry. */
 export function getMainCarrier(): Carrier {
-  return global.__SENTRY__;
+  const carrier: any = getGlobalObject();
+  carrier.__SENTRY__ = carrier.__SENTRY__ || {
+    hub: undefined,
+  };
+  return carrier.__SENTRY__;
 }
 
 /**

packages/node/src/backend.ts

@@ -2,7 +2,7 @@ import { Backend, DSN, Options, SentryError } from '@sentry/core';
 import { addBreadcrumb, captureEvent } from '@sentry/minimal';
 import { SentryEvent, SentryResponse } from '@sentry/types';
 import { Raven } from './raven';
-import { HTTPSTransport, HTTPTransport, TransportOptions } from './transports';
+import { HTTPSTransport, HTTPTransport } from './transports';
 
 /** Extension to the Function type. */
 interface FunctionExt extends Function {
@@ -34,11 +34,6 @@ export interface NodeOptions extends Options {
 
   /** Callback that is executed when a fatal global error occurs. */
   onFatalError?(error: Error): void;
-
-  /**
-   * @inheritDoc
-   */
-  transportOptions?: TransportOptions;
 }
 
 /** The Sentry Node SDK Backend. */

packages/node/src/transports/base.ts

@@ -4,9 +4,9 @@ import {
   SentryResponse,
   Status,
   Transport,
-  TransportOptions as BaseOptions,
+  TransportOptions,
 } from '@sentry/types';
-import { serialize } from '@sentry/utils/src/object';
+import { serialize } from '@sentry/utils/object';
 import * as http from 'http';
 import * as https from 'https';
 import { getDefaultHub, NodeClient } from '../index';
@@ -19,14 +19,6 @@ export interface HTTPRequest {
   ): http.ClientRequest;
 }
 
-/** Transport options */
-export interface TransportOptions extends BaseOptions {
-  /** Options for http.agent default: { keepAlive: true, maxSockets: 100 } */
-  agentOptions?: http.AgentOptions;
-  /** Define custom headers */
-  headers?: http.IncomingHttpHeaders;
-}
-
 /** Base Transport class implementation */
 export abstract class BaseTransport implements Transport {
   /** DSN object */

packages/node/src/transports/http.ts

@@ -1,17 +1,13 @@
-import { SentryEvent, SentryResponse } from '@sentry/types';
+import { SentryEvent, SentryResponse, TransportOptions } from '@sentry/types';
 import * as http from 'http';
-import { BaseTransport, TransportOptions } from './base';
+import { BaseTransport } from './base';
 
 /** /** Node http module transport */
 export class HTTPTransport extends BaseTransport {
   /** Create a new instance and set this.agent */
   public constructor(public options: TransportOptions) {
     super(options);
-    this.client = new http.Agent(
-      this.options.agentOptions
-        ? this.options.agentOptions
-        : { keepAlive: true, maxSockets: 100 },
-    );
+    this.client = new http.Agent({ keepAlive: true, maxSockets: 100 });
   }
 
   /**

packages/node/src/transports/https.ts

@@ -1,17 +1,13 @@
-import { SentryEvent, SentryResponse } from '@sentry/types';
+import { SentryEvent, SentryResponse, TransportOptions } from '@sentry/types';
 import * as https from 'https';
-import { BaseTransport, TransportOptions } from './base';
+import { BaseTransport } from './base';
 
 /** Node https module transport */
 export class HTTPSTransport extends BaseTransport {
   /** Create a new instance and set this.agent */
   public constructor(public options: TransportOptions) {
     super(options);
-    this.client = new https.Agent(
-      this.options.agentOptions
-        ? this.options.agentOptions
-        : { keepAlive: true, maxSockets: 100 },
-    );
+    this.client = new https.Agent({ keepAlive: true, maxSockets: 100 });
   }
 
   /**

packages/node/src/transports/index.ts

@@ -1,3 +1,3 @@
-export { BaseTransport, TransportOptions } from './base';
+export { BaseTransport } from './base';
 export { HTTPTransport } from './http';
 export { HTTPSTransport } from './https';

packages/types/src/index.ts

@@ -141,7 +141,7 @@ export interface SentryEvent {
   breadcrumbs?: Breadcrumb[];
   contexts?: { [key: string]: object };
   tags?: { [key: string]: string };
-  extra?: { [key: string]: object };
+  extra?: { [key: string]: any };
   user?: User;
 }
 
@@ -162,6 +162,8 @@ export interface SentryResponse {
 /** TODO */
 export interface TransportOptions {
   dsn: DSNLike;
+  /** Define custom headers */
+  headers?: object;
 }
 
 /** TODO */