@tastytrade/api 3.1.0 → 5.0.0

package/dist/utils/json-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-util.d.ts","sourceRoot":"","sources":["../../lib/utils/json-util.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAA;AAEtB,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;AACzE,MAAM,MAAM,SAAS,GAAG,cAAc,GAAG,SAAS,GAAG,OAAO,CAAA;AAC5D,MAAM,WAAW,OAAO;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAA;CACrC;AACD,MAAM,MAAM,SAAS,GAAG,SAAS,EAAE,CAAA;AAEnC,qBAAa,WAAW;aACa,IAAI,EAAE,OAAO;gBAAb,IAAI,GAAE,OAAY;IAE9C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,UAAQ,GAAG,IAAI;CAQxE;AAGD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,qBAa/C;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKhD"}

package/dist/utils/json-util.js

@@ -1,43 +1,32 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dasherize = exports.recursiveDasherizeKeys = exports.JsonBuilder = void 0;
-var lodash_1 = __importDefault(require("lodash"));
-var JsonBuilder = /** @class */ (function () {
-    function JsonBuilder(json) {
-        if (json === void 0) { json = {}; }
+import _ from 'lodash';
+export class JsonBuilder {
+    constructor(json = {}) {
         this.json = json;
     }
-    JsonBuilder.prototype.add = function (key, value, serializeEmpty) {
-        if (serializeEmpty === void 0) { serializeEmpty = false; }
-        if ((lodash_1.default.isNil(value) || value === '') && !serializeEmpty) {
+    add(key, value, serializeEmpty = false) {
+        if ((_.isNil(value) || value === '') && !serializeEmpty) {
             return this;
         }
         this.json[key] = value;
         return this;
-    };
-    return JsonBuilder;
-}());
-exports.JsonBuilder = JsonBuilder;
+    }
+}
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function recursiveDasherizeKeys(body) {
-    var dasherized = lodash_1.default.mapKeys(body, function (_value, key) { return dasherize(key); });
+export function recursiveDasherizeKeys(body) {
+    let dasherized = _.mapKeys(body, (_value, key) => dasherize(key));
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    dasherized = lodash_1.default.mapValues(dasherized, function (value) {
-        if (lodash_1.default.isPlainObject(value)) {
+    dasherized = _.mapValues(dasherized, (value) => {
+        if (_.isPlainObject(value)) {
             return recursiveDasherizeKeys(value);
         }
         return value;
     });
     return dasherized;
 }
-exports.recursiveDasherizeKeys = recursiveDasherizeKeys;
-function dasherize(target) {
+export function dasherize(target) {
     // prettier-ignore
     return target
-        .replace(/([A-Z])/g, function (_match, p1, _offset, _whole) { return "-".concat(p1.toLowerCase()); })
+        .replace(/([A-Z])/g, (_match, p1, _offset, _whole) => `-${p1.toLowerCase()}`)
         .replace(/\s/g, '-');
 }
-exports.dasherize = dasherize;
+//# sourceMappingURL=json-util.js.map

package/dist/utils/json-util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-util.js","sourceRoot":"","sources":["../../lib/utils/json-util.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAA;AAStB,MAAM,OAAO,WAAW;IACtB,YAAmC,OAAgB,EAAE;QAAlB,SAAI,GAAJ,IAAI,CAAc;IAAG,CAAC;IAElD,GAAG,CAAC,GAAW,EAAE,KAAgB,EAAE,cAAc,GAAG,KAAK;QAC9D,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACxD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QACtB,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAED,8DAA8D;AAC9D,MAAM,UAAU,sBAAsB,CAAC,IAAS;IAC9C,IAAI,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAEjE,8DAA8D;IAC9D,UAAU,GAAG,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,KAAU,EAAE,EAAE;QAClD,IAAI,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,sBAAsB,CAAC,KAAK,CAAC,CAAA;QACtC,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC,CAAC,CAAA;IAEF,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,MAAc;IACtC,kBAAkB;IAClB,OAAO,MAAM;SACV,OAAO,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAU,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;SACpF,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACxB,CAAC"}

package/dist/utils/response-util.d.ts

@@ -1 +1,2 @@
 export default function extractResponseData(httpResponse: any): any;
+//# sourceMappingURL=response-util.d.ts.map

package/dist/utils/response-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"response-util.d.ts","sourceRoot":"","sources":["../../lib/utils/response-util.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,YAAY,EAAE,GAAG,OAQ5D"}

package/dist/utils/response-util.js

@@ -1,21 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var lodash_1 = __importDefault(require("lodash"));
+import _ from 'lodash';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function extractResponseData(httpResponse) {
-    if (lodash_1.default.has(httpResponse, 'data.data.items')) {
-        return lodash_1.default.get(httpResponse, 'data.data.items');
+export default function extractResponseData(httpResponse) {
+    if (_.has(httpResponse, 'data.data.items')) {
+        return _.get(httpResponse, 'data.data.items');
     }
-    else if (lodash_1.default.has(httpResponse, 'data.data')) {
-        return lodash_1.default.get(httpResponse, 'data.data');
+    else if (_.has(httpResponse, 'data.data')) {
+        return _.get(httpResponse, 'data.data');
     }
     else {
         return httpResponse;
     }
 }
-exports.default = extractResponseData;
 // add login parser here
 // create unit tests for login parser, extractreponsedata
+//# sourceMappingURL=response-util.js.map

package/dist/utils/response-util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"response-util.js","sourceRoot":"","sources":["../../lib/utils/response-util.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAA;AAEtB,8DAA8D;AAC9D,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,YAAiB;IAC3D,IAAI,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QAC3C,OAAO,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;IAC/C,CAAC;SAAM,IAAI,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,EAAC,CAAC;QAC3C,OAAO,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;IACzC,CAAC;SAAI,CAAC;QACJ,OAAO,YAAY,CAAA;IACrB,CAAC;AACH,CAAC;AAED,wBAAwB;AACxB,yDAAyD"}

package/lib/account-streamer.ts

@@ -1,9 +1,10 @@
 import WebSocket from 'isomorphic-ws'
 import _ from 'lodash'
-import type { JsonMap, JsonValue } from './utils/json-util'
-import { JsonBuilder } from './utils/json-util'
-import TastytradeSession from './models/tastytrade-session'
-import { MinTlsVersion } from './utils/constants'
+import type { JsonMap, JsonValue } from './utils/json-util.js'
+import { JsonBuilder } from './utils/json-util.js'
+import TastytradeSession from './models/tastytrade-session.js'
+import { MinTlsVersion } from './utils/constants.js'
+import type Logger from './logger.js'
 
 export enum STREAMER_STATE {
   Open = 0,
@@ -42,6 +43,7 @@ function removeElement<T>(array: T[], element: T): void {
 }
 
 export class AccountStreamer {
+  private readonly logger: Logger
   private websocket: WebSocket | null = null
   private startResolve: ((result: boolean) => void) | null = null
   private startReject: ((reason?: any) => void) | null = null
@@ -65,13 +67,17 @@ export class AccountStreamer {
     [(status: string) => void, (error: string) => void]
   > = new Map()
 
-  private readonly logger = console
-
   /**
    * 
    * @param url Url of the account streamer service
    */
-  constructor(private readonly url: string, private readonly session: TastytradeSession) {}
+  constructor(
+    private readonly url: string,
+    private readonly session: TastytradeSession,
+    logger: Logger
+  ) {
+    this.logger = logger
+    }
 
   get streamerState(): STREAMER_STATE {
     return this._streamerState
@@ -237,6 +243,7 @@ export class AccountStreamer {
       // Queue up and send on open
       this.queued.push(message)
     } else {
+      this.logger.info('Sending message: ', message)
       websocket.send(message)
     }
 
@@ -304,12 +311,12 @@ export class AccountStreamer {
     this.queued = []
   }
 
-  private readonly handleOpen = (event: WebSocket.Event) => {
+  private readonly handleOpen = (_event: WebSocket.Event) => {
     if (this.startResolve === null) {
       return
     }
 
-    this.logger.info('AccountStreamer opened', event)
+    this.logger.info('AccountStreamer opened')
 
     this.startResolve(true)
     this.startResolve = this.startReject = null
@@ -320,7 +327,7 @@ export class AccountStreamer {
   }
 
   private readonly handleClose = (event: WebSocket.CloseEvent) => {
-    this.logger.info('AccountStreamer closed', event)
+    this.logger.info('AccountStreamer closed')
     if (this.websocket === null) {
       return
     }
@@ -335,7 +342,7 @@ export class AccountStreamer {
       return
     }
 
-    this.logger.warn('AccountStreamer error', event)
+    this.logger.error('AccountStreamer error', event)
 
     this.lastErrorEvent = event
     this.streamerState = STREAMER_STATE.Error
@@ -370,7 +377,7 @@ export class AccountStreamer {
   }
 
   private readonly handleOneMessage = (json: JsonMap) => {
-    this.logger.info(json)
+    this.logger.info('Message received: ', json)
 
     const action = json.action as string
     this.streamerMessageObservers.forEach(observer => observer(json))

package/lib/logger.ts

@@ -0,0 +1,48 @@
+import _ from 'lodash'
+
+export default interface Logger {
+  error(...data: any[]): void;
+  info(...data: any[]): void;
+  warn(...data: any[]): void;
+}
+
+export enum LogLevel {
+  INFO = 1,
+  WARN = 2,
+  ERROR = 3
+}
+
+export class TastytradeLogger implements Logger {
+  public logLevel: LogLevel
+  private logger: Logger | null = null
+
+  constructor(logger?: Logger, logLevel?: LogLevel) {
+    this.logger = logger ?? null
+    this.logLevel = logLevel ?? LogLevel.ERROR
+  }
+
+  error(...data: any[]): void {
+    if (this.shouldLog(LogLevel.ERROR)) {
+      this.logger!.error(...data)
+    }
+  }
+
+  info(...data: any[]): void {
+    if (this.shouldLog(LogLevel.INFO)) {
+      this.logger!.info(...data)
+    }
+  }
+
+  warn(...data: any[]): void {
+    if (this.shouldLog(LogLevel.WARN)) {
+      this.logger!.warn(...data)
+    }
+  }
+
+  private shouldLog(level: LogLevel) {
+    if (_.isNil(this.logger)) {
+      return false
+    }
+    return LogLevel[level] >= LogLevel[this.logLevel]
+  }
+}

package/lib/market-data-streamer.ts

@@ -1,7 +1,7 @@
 import WebSocket from 'isomorphic-ws'
 import _ from 'lodash'
 import { v4 as uuidv4 } from 'uuid'
-import { MinTlsVersion } from './utils/constants'
+import { MinTlsVersion } from './utils/constants.js'
 
 export enum MarketDataSubscriptionType {
   Candle = 'Candle',
@@ -54,6 +54,10 @@ export default class MarketDataStreamer {
   private errorListeners = new Map()
   private authStateListeners = new Map()
 
+  constructor() {
+    console.warn('MarketDataStreamer is deprecated and will be removed in a future release of @tastytrade/api. Use @dxfeed/dxlink-api instead.')
+  }
+
   addDataListener(dataListener: MarketDataListener, channelId: number | null = null): Remover {
     if (_.isNil(dataListener)) {
       return _.noop

package/lib/services/account-status-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 // create the central class that aggregates all services
 export default class AccountStatusService {

package/lib/services/accounts-and-customers-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class AccountsAndCustomersService {
     constructor(private httpClient: TastytradeHttpClient) {

package/lib/services/balances-and-positions-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class BalancesAndPositionsService {
     constructor(private httpClient: TastytradeHttpClient) {

package/lib/services/instruments-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 import _ from 'lodash'
 
 export default class InstrumentsService {

package/lib/services/margin-requirements-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class MarginRequirementsService {
     constructor(private httpClient: TastytradeHttpClient) {

package/lib/services/market-metrics-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class MarketMetricsService {
     constructor(private httpClient: TastytradeHttpClient) {

package/lib/services/net-liquidating-value-history-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class NetLiquidatingValueHistoryService {
     constructor(private httpClient: TastytradeHttpClient) {

package/lib/services/orders-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class OrderService {
     constructor(private httpClient: TastytradeHttpClient) {

package/lib/services/risk-parameters-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class RiskParametersService {
     constructor(private httpClient: TastytradeHttpClient) {

package/lib/services/session-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class SessionService {
     constructor(public httpClient: TastytradeHttpClient) {

package/lib/services/symbol-search-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class SymbolSearchService {
     constructor(private httpClient: TastytradeHttpClient) {

package/lib/services/tastytrade-http-client.ts

@@ -1,10 +1,9 @@
-import TastytradeSession from "../models/tastytrade-session"
+import TastytradeSession from "../models/tastytrade-session.js"
 import axios from "axios"
 import qs from 'qs'
-import { recursiveDasherizeKeys } from "../utils/json-util"
+import { recursiveDasherizeKeys } from "../utils/json-util.js"
 import _ from 'lodash'
-import https from 'https'
-import { MinTlsVersion } from "../utils/constants"
+import type Logger from "../logger.js"
 
 const ParamsSerializer = {
   serialize: function (queryParams: object) {
@@ -12,22 +11,28 @@ const ParamsSerializer = {
   }
 }
 
-export default class TastytradeHttpClient{
+export default class TastytradeHttpClient {
+    private readonly logger?: Logger
     public readonly session: TastytradeSession
-    private readonly httpsAgent: https.Agent
 
-    constructor(private readonly baseUrl: string) {
+    constructor(private readonly baseUrl: string, logger?: Logger) {
+      this.logger = logger
       this.session = new TastytradeSession()
-      this.httpsAgent = new https.Agent({ minVersion: MinTlsVersion })
     }
 
     private getDefaultHeaders(): any {
-        return {
-          "Content-Type": "application/json",
-          "Accept": "application/json",
-          "Authorization": this.session.authToken,
-          "User-Agent": 'tastytrade-sdk-js'
-        };
+      const headers: { [key: string]: any } = {
+        "Content-Type": "application/json",
+        "Accept": "application/json",
+        "Authorization": this.session.authToken
+      };
+
+      // Only set user agent if running in node
+      if (typeof window === 'undefined') {
+        headers["User-Agent"] = 'tastytrade-sdk-js'
+      }
+
+      return headers
     }
 
     private async executeRequest(method: string, url: string, data: object = {}, headers: object = {}, params: object = {}) {
@@ -42,10 +47,10 @@ export default class TastytradeHttpClient{
         data: dasherizedData,
         headers: mergedHeaders, 
         params: dasherizedParams,
-        paramsSerializer: ParamsSerializer,
-        httpsAgent: this.httpsAgent
+        paramsSerializer: ParamsSerializer
        }, _.isEmpty)
 
+      this.logger?.info('Making request', config)
       return axios.request(config)
     }
 

package/lib/services/transactions-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class TransactionsService {
     constructor(private httpClient: TastytradeHttpClient) {

package/lib/services/watchlists-service.ts

@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class WatchlistsService {
     constructor(private httpClient: TastytradeHttpClient) {

package/lib/tastytrade-api.ts

@@ -1,24 +1,34 @@
-import TastytradeHttpClient from "./services/tastytrade-http-client"
-import { AccountStreamer, STREAMER_STATE, Disposer, StreamerStateObserver } from './account-streamer'
-import MarketDataStreamer, { CandleSubscriptionOptions, CandleType, MarketDataSubscriptionType, MarketDataListener } from "./market-data-streamer"
+import TastytradeHttpClient from "./services/tastytrade-http-client.js"
+import { AccountStreamer, STREAMER_STATE, type Disposer, type StreamerStateObserver } from './account-streamer.js'
+import MarketDataStreamer, { type CandleSubscriptionOptions, CandleType, MarketDataSubscriptionType, type MarketDataListener } from "./market-data-streamer.js"
 
 //Services:
-import SessionService from "./services/session-service"
-import AccountStatusService from "./services/account-status-service"
-import AccountsAndCustomersService from "./services/accounts-and-customers-service"
-import BalancesAndPositionsService from "./services/balances-and-positions-service"
-import InstrumentsService from "./services/instruments-service"
-import MarginRequirementsService from "./services/margin-requirements-service"
-import MarketMetricsService from "./services/market-metrics-service"
-import NetLiquidatingValueHistoryService from "./services/net-liquidating-value-history-service"
-import OrderService from "./services/orders-service"
-import RiskParametersService from "./services/risk-parameters-service"
-import SymbolSearchService from "./services/symbol-search-service"
-import TransactionsService from "./services/transactions-service"
-import WatchlistsService from "./services/watchlists-service"
-import TastytradeSession from "./models/tastytrade-session"
+import SessionService from "./services/session-service.js"
+import AccountStatusService from "./services/account-status-service.js"
+import AccountsAndCustomersService from "./services/accounts-and-customers-service.js"
+import BalancesAndPositionsService from "./services/balances-and-positions-service.js"
+import InstrumentsService from "./services/instruments-service.js"
+import MarginRequirementsService from "./services/margin-requirements-service.js"
+import MarketMetricsService from "./services/market-metrics-service.js"
+import NetLiquidatingValueHistoryService from "./services/net-liquidating-value-history-service.js"
+import OrderService from "./services/orders-service.js"
+import RiskParametersService from "./services/risk-parameters-service.js"
+import SymbolSearchService from "./services/symbol-search-service.js"
+import TransactionsService from "./services/transactions-service.js"
+import WatchlistsService from "./services/watchlists-service.js"
+import TastytradeSession from "./models/tastytrade-session.js"
+import type Logger from "./logger.js"
+import { TastytradeLogger, LogLevel } from "./logger.js"
+
+export type ClientConfig = {
+  baseUrl: string,
+  accountStreamerUrl: string,
+  logger?: Logger,
+  logLevel?: LogLevel
+}
 
 export default class TastytradeClient {
+  public readonly logger: TastytradeLogger
   public readonly httpClient: TastytradeHttpClient
 
   public readonly accountStreamer: AccountStreamer
@@ -37,9 +47,10 @@ export default class TastytradeClient {
   public readonly transactionsService: TransactionsService
   public readonly watchlistsService: WatchlistsService
 
-  constructor(readonly baseUrl: string, readonly accountStreamerUrl: string) {
-    this.httpClient = new TastytradeHttpClient(baseUrl)
-    this.accountStreamer = new AccountStreamer(accountStreamerUrl, this.session)
+  constructor(config: ClientConfig) {
+    this.logger = new TastytradeLogger(config.logger, config.logLevel)
+    this.httpClient = new TastytradeHttpClient(config.baseUrl, this.logger)
+    this.accountStreamer = new AccountStreamer(config.accountStreamerUrl, this.session, this.logger)
 
     this.sessionService = new SessionService(this.httpClient)
     this.accountStatusService = new AccountStatusService(this.httpClient)
@@ -61,5 +72,7 @@ export default class TastytradeClient {
   }
 }
 
-export { MarketDataStreamer, MarketDataSubscriptionType, MarketDataListener, CandleSubscriptionOptions, CandleType }
-export { AccountStreamer, STREAMER_STATE, Disposer, StreamerStateObserver }
+export { MarketDataStreamer, MarketDataSubscriptionType, type MarketDataListener, type CandleSubscriptionOptions, CandleType }
+export { AccountStreamer, STREAMER_STATE, type Disposer, type StreamerStateObserver }
+export { TastytradeLogger, LogLevel }
+export type { Logger }

package/package.json

@@ -1,8 +1,13 @@
 {
   "name": "@tastytrade/api",
-  "version": "3.1.0",
-  "main": "dist/tastytrade-api.js",
-  "typings": "dist/tastytrade-api.d.ts",
+  "version": "5.0.0",
+  "type": "module",
+  "module": "dist/tastytrade-api.js",
+  "types": "dist/tastytrade-api.d.ts",
+  "exports": {
+    "types": "./dist/tastytrade-api.d.ts",
+    "default": "./dist/tastytrade-api.js"
+  },
   "repository": "https://github.com/tastytrade/tastytrade-api-js",
   "license": "MIT",
   "description": "Typescript impelementation of tastytrade api",
@@ -13,8 +18,8 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "test": "jest -i --restoreMocks",
-    "unit-test": "jest --testPathPattern=tests/unit",
-    "integration-test": "jest --testPathPattern=tests/integration",
+    "unit-test": "node --experimental-vm-modules ./node_modules/.bin/jest tests/unit",
+    "integration-test": "node --experimental-vm-modules ./node_modules/.bin/jest tests/integration",
     "lint": "eslint lib/** tests/**",
     "prepublishOnly": "npm run unit-test && npm run build",
     "postpack": "git tag -a $npm_package_version -m $npm_package_version && git push origin $npm_package_version"
@@ -30,7 +35,6 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@types/axios": "^0.14.0",
     "@types/jest": "^29.5.0",
     "@types/node": "20.9.0",
     "@types/uuid": "^9.0.2",
@@ -39,8 +43,9 @@
     "@typescript-eslint/parser": "^5.57.1",
     "dotenv": "^16.0.3",
     "eslint": "^8.14.0",
-    "jest": "^29.5.0",
-    "ts-jest": "^29.0.5",
-    "typescript": "4.6.3"
+    "jest": "^29.7.0",
+    "nock": "^13.5.4",
+    "ts-jest": "^29.1.2",
+    "typescript": "^5.4.2"
   }
 }