node client options

Author: AbhiPrasad

packages/core/src/index.ts

@@ -37,6 +37,7 @@ export { initAndBind } from './sdk';
 export { NoopTransport } from './transports/noop';
 export { createTransport } from './transports/base';
 export { SDK_VERSION } from './version';
+export { defaultCoreOptions, optionsToClientOptions } from './options';
 
 import * as Integrations from './integrations';
 

packages/core/src/sdk.ts

@@ -1,12 +1,12 @@
 import { getCurrentHub } from '@sentry/hub';
-import { Client, Options, Transport } from '@sentry/types';
+import { Client, ClientOptions, Transport } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
 import { IS_DEBUG_BUILD } from './flags';
 import { NewTransport } from './transports/base';
 
 /** A class object that can instantiate Client objects. */
-export type ClientClass<F extends Client, O extends Options> = new (
+export type ClientClass<F extends Client, O extends ClientOptions> = new (
   options: O,
   transport: Transport,
   newTransport?: NewTransport,
@@ -19,7 +19,7 @@ export type ClientClass<F extends Client, O extends Options> = new (
  * @param clientClass The client class to instantiate.
  * @param options Options to pass to the client.
  */
-export function initAndBind<F extends Client, O extends Options>(
+export function initAndBind<F extends Client, O extends ClientOptions>(
   clientClass: ClientClass<F, O>,
   options: O,
   transport: Transport,

packages/node/src/sdk.ts

@@ -1,15 +1,16 @@
-import { getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
+import { defaultCoreOptions, getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
+import { getIntegrationsToSetup } from '@sentry/core/build/types/integration';
 import { getMainCarrier, setHubOnCarrier } from '@sentry/hub';
 import { SessionStatus } from '@sentry/types';
-import { getGlobalObject, logger } from '@sentry/utils';
+import { getGlobalObject, logger, makeDsn, stackParserFromOptions } from '@sentry/utils';
 import * as domain from 'domain';
 
 import { NodeClient } from './client';
 import { IS_DEBUG_BUILD } from './flags';
 import { Console, ContextLines, Http, LinkedErrors, OnUncaughtException, OnUnhandledRejection } from './integrations';
 import { nodeStackParser } from './stack-parser';
 import { setupNodeTransport } from './transports';
-import { NodeOptions } from './types';
+import { NodeClientOptions, NodeOptions } from './types';
 
 export const defaultIntegrations = [
   // Common
@@ -132,7 +133,18 @@ export function init(options: NodeOptions = {}): void {
   }
 
   const { transport, newTransport } = setupNodeTransport(options);
-  initAndBind(NodeClient, options, transport, newTransport);
+
+  // TODO(v7): Refactor this to reduce the logic above
+  const clientOptions: NodeClientOptions = {
+    ...options,
+    ...defaultCoreOptions,
+    dsn: options.dsn === undefined ? undefined : makeDsn(process.env.SENTRY_DSN ? process.env.SENTRY_DSN : options.dsn),
+    stackParser: stackParserFromOptions(options),
+    integrations: getIntegrationsToSetup(options),
+    transport,
+  };
+
+  initAndBind(NodeClient, clientOptions, transport, newTransport);
 
   if (options.autoSessionTracking) {
     startSessionTracking();

packages/node/src/transports/setup.ts

@@ -2,7 +2,7 @@ import { getEnvelopeEndpointWithUrlEncodedAuth, initAPIDetails, NewTransport, No
 import { Transport, TransportOptions } from '@sentry/types';
 import { makeDsn } from '@sentry/utils';
 
-import { NodeClientOptions } from '../types';
+import { NodeOptions } from '../types';
 import { HTTPSTransport, HTTPTransport, makeNodeTransport } from '.';
 
 /**
@@ -13,7 +13,7 @@ import { HTTPSTransport, HTTPTransport, makeNodeTransport } from '.';
  * this function will return a ready to use `NewTransport`.
  */
 // TODO(v7): Adjust return value when NewTransport is the default
-export function setupNodeTransport(options: NodeClientOptions): { transport: Transport; newTransport?: NewTransport } {
+export function setupNodeTransport(options: NodeOptions): { transport: Transport; newTransport?: NewTransport } {
   if (!options.dsn) {
     // We return the noop transport here in case there is no Dsn.
     return { transport: new NoopTransport() };

packages/types/src/options.ts

@@ -227,7 +227,7 @@ export interface Options extends Omit<Partial<ClientOptions>, 'dsn' | 'integrati
   /**
    * Transport object that should be used to send events to Sentry
    */
-  transport?: TransportClass<Transport>;
+  transport?: Transport;
 
   /**
    * A stack parser implementation or an array of stack line parsers