twilio 4.0.2 → 4.1.1

package/index.d.ts

@@ -0,0 +1,2 @@
+import lib from "./lib";
+export = lib;

package/index.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault =
+  (this && this.__importDefault) ||
+  function (mod) {
+    return mod && mod.__esModule ? mod : { default: mod };
+  };
+Object.defineProperty(exports, "__esModule", { value: true });
+const lib_1 = __importDefault(require("./lib"));
+module.exports = lib_1.default;

package/lib/base/BaseTwilio.d.ts

@@ -1,81 +1,84 @@
 /// <reference types="node" />
 import RequestClient from "./RequestClient";
 import { HttpMethod } from "../interfaces";
-export interface ClientOpts {
-    httpClient?: RequestClient;
-    accountSid?: string;
-    env?: NodeJS.ProcessEnv;
-    edge?: string;
-    region?: string;
-    lazyLoading?: boolean;
-    logLevel?: string;
-    userAgentExtensions?: string[];
-    autoRetry?: boolean;
-    maxRetries?: number;
-}
-export interface RequestOpts {
-    method?: HttpMethod;
-    uri?: string;
-    username?: string;
-    password?: string;
-    headers?: Headers;
-    params?: object;
-    data?: object;
-    timeout?: number;
-    allowRedirects?: boolean;
-    logLevel?: string;
-}
-/**
- * Parent class for Twilio Client that implements request & validation logic
- */
-export declare class BaseTwilio {
-    username: string;
-    password: string;
-    accountSid: string;
-    opts?: ClientOpts;
-    env?: NodeJS.ProcessEnv;
-    edge?: string;
-    region?: string;
-    logLevel?: string;
-    autoRetry: boolean;
-    maxRetries?: number;
-    userAgentExtensions?: string[];
-    _httpClient?: RequestClient;
-    /**
-     * Create a BaseTwilio instance
-     *
-     * @param username -
-     *          The username used for authentication. This is normally account sid, but if using key/secret auth will be
-     *          the api key sid.
-     * @param password -
-     *          The password used for authentication. This is normally auth token, but if using key/secret auth will be
-     *          the secret.
-     * @param opts - The options argument
-     *
-     * @returns A new instance of BaseTwilio
-     */
-    constructor(username?: string, password?: string, opts?: ClientOpts);
-    get httpClient(): RequestClient;
-    /**
-     * Makes a request to the Twilio API using the configured http client.
-     * Authentication information is automatically added if none is provided.
-     *
-     * @param opts - The options argument
-     */
-    request(opts: RequestOpts): Promise<any>;
-    /**
-     * Adds a region and/or edge to a given hostname
-     *
-     * @param hostname - A URI hostname (e.g. api.twilio.com)
-     * @param targetEdge - The targeted edge location (e.g. sydney)
-     * @param targetRegion - The targeted region location (e.g. au1)
-     */
-    getHostname(hostname: string, targetEdge: string | undefined, targetRegion: string | undefined): string;
+declare namespace Twilio {
+    interface ClientOpts {
+        httpClient?: RequestClient;
+        accountSid?: string;
+        env?: NodeJS.ProcessEnv;
+        edge?: string;
+        region?: string;
+        lazyLoading?: boolean;
+        logLevel?: string;
+        userAgentExtensions?: string[];
+        autoRetry?: boolean;
+        maxRetries?: number;
+    }
+    interface RequestOpts {
+        method?: HttpMethod;
+        uri?: string;
+        username?: string;
+        password?: string;
+        headers?: Headers;
+        params?: object;
+        data?: object;
+        timeout?: number;
+        allowRedirects?: boolean;
+        logLevel?: string;
+    }
     /**
-     * Validates that a request to the new SSL certificate is successful.
-     *
-     * @throws RestException if the request fails
-     *
+     * Parent class for Twilio Client that implements request & validation logic
      */
-    validateSslCert(): Promise<any>;
+    class Client {
+        username: string;
+        password: string;
+        accountSid: string;
+        opts?: ClientOpts;
+        env?: NodeJS.ProcessEnv;
+        edge?: string;
+        region?: string;
+        logLevel?: string;
+        autoRetry: boolean;
+        maxRetries?: number;
+        userAgentExtensions?: string[];
+        _httpClient?: RequestClient;
+        /**
+         * Create a BaseTwilio instance
+         *
+         * @param username -
+         *          The username used for authentication. This is normally account sid, but if using key/secret auth will be
+         *          the api key sid.
+         * @param password -
+         *          The password used for authentication. This is normally auth token, but if using key/secret auth will be
+         *          the secret.
+         * @param opts - The options argument
+         *
+         * @returns A new instance of BaseTwilio
+         */
+        constructor(username?: string, password?: string, opts?: ClientOpts);
+        get httpClient(): RequestClient;
+        /**
+         * Makes a request to the Twilio API using the configured http client.
+         * Authentication information is automatically added if none is provided.
+         *
+         * @param opts - The options argument
+         */
+        request(opts: RequestOpts): Promise<any>;
+        /**
+         * Adds a region and/or edge to a given hostname
+         *
+         * @param hostname - A URI hostname (e.g. api.twilio.com)
+         * @param targetEdge - The targeted edge location (e.g. sydney)
+         * @param targetRegion - The targeted region location (e.g. au1)
+         */
+        getHostname(hostname: string, targetEdge: string | undefined, targetRegion: string | undefined): string;
+        /**
+         * Validates that a request to the new SSL certificate is successful.
+         *
+         * @throws RestException if the request fails
+         *
+         */
+        validateSslCert(): Promise<any>;
+    }
 }
+export = Twilio;

package/lib/base/BaseTwilio.js

@@ -2,171 +2,173 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseTwilio = void 0;
 const RequestClient_1 = __importDefault(require("./RequestClient")); /* jshint ignore:line */
 const os = require("os"); /* jshint ignore:line */
 const url = require("url"); /* jshint ignore:line */
 const moduleInfo = require("../../package.json"); /* jshint ignore:line */
 const util = require("util"); /* jshint ignore:line */
 const RestException = require("../base/RestException"); /* jshint ignore:line */
-/* jshint ignore:start */
-/**
- * Parent class for Twilio Client that implements request & validation logic
- */
-/* jshint ignore:end */
-class BaseTwilio {
+var Twilio;
+(function (Twilio) {
     /* jshint ignore:start */
     /**
-     * Create a BaseTwilio instance
-     *
-     * @param username -
-     *          The username used for authentication. This is normally account sid, but if using key/secret auth will be
-     *          the api key sid.
-     * @param password -
-     *          The password used for authentication. This is normally auth token, but if using key/secret auth will be
-     *          the secret.
-     * @param opts - The options argument
-     *
-     * @returns A new instance of BaseTwilio
+     * Parent class for Twilio Client that implements request & validation logic
      */
     /* jshint ignore:end */
-    constructor(username, password, opts) {
-        this.opts = opts || {};
-        this.env = this.opts.env || process.env;
-        this.username =
-            username ||
-                this.env.TWILIO_ACCOUNT_SID ||
-                (() => {
-                    throw new Error("username is required");
-                })();
-        this.password =
-            password ||
-                this.env.TWILIO_AUTH_TOKEN ||
-                (() => {
-                    throw new Error("password is required");
-                })();
-        this.accountSid = this.opts.accountSid || this.username;
-        this.edge = this.opts.edge || this.env.TWILIO_EDGE;
-        this.region = this.opts.region || this.env.TWILIO_REGION;
-        this.logLevel = this.opts.logLevel || this.env.TWILIO_LOG_LEVEL;
-        this.autoRetry = this.opts.autoRetry || false;
-        this.maxRetries = this.opts.maxRetries;
-        this.userAgentExtensions = this.opts.userAgentExtensions || [];
-        this._httpClient = this.opts.httpClient;
-        if (this.opts.lazyLoading === false) {
-            this._httpClient = this.httpClient;
+    class Client {
+        /* jshint ignore:start */
+        /**
+         * Create a BaseTwilio instance
+         *
+         * @param username -
+         *          The username used for authentication. This is normally account sid, but if using key/secret auth will be
+         *          the api key sid.
+         * @param password -
+         *          The password used for authentication. This is normally auth token, but if using key/secret auth will be
+         *          the secret.
+         * @param opts - The options argument
+         *
+         * @returns A new instance of BaseTwilio
+         */
+        /* jshint ignore:end */
+        constructor(username, password, opts) {
+            this.opts = opts || {};
+            this.env = this.opts.env || process.env;
+            this.username =
+                username ||
+                    this.env.TWILIO_ACCOUNT_SID ||
+                    (() => {
+                        throw new Error("username is required");
+                    })();
+            this.password =
+                password ||
+                    this.env.TWILIO_AUTH_TOKEN ||
+                    (() => {
+                        throw new Error("password is required");
+                    })();
+            this.accountSid = this.opts.accountSid || this.username;
+            this.edge = this.opts.edge || this.env.TWILIO_EDGE;
+            this.region = this.opts.region || this.env.TWILIO_REGION;
+            this.logLevel = this.opts.logLevel || this.env.TWILIO_LOG_LEVEL;
+            this.autoRetry = this.opts.autoRetry || false;
+            this.maxRetries = this.opts.maxRetries;
+            this.userAgentExtensions = this.opts.userAgentExtensions || [];
+            this._httpClient = this.opts.httpClient;
+            if (this.opts.lazyLoading === false) {
+                this._httpClient = this.httpClient;
+            }
+            if (!this.accountSid.startsWith("AC")) {
+                const apiKeyMsg = this.accountSid.startsWith("SK")
+                    ? ". The given SID indicates an API Key which requires the accountSid to be passed as an additional option"
+                    : "";
+                throw new Error("accountSid must start with AC" + apiKeyMsg);
+            }
         }
-        if (!this.accountSid.startsWith("AC")) {
-            const apiKeyMsg = this.accountSid.startsWith("SK")
-                ? ". The given SID indicates an API Key which requires the accountSid to be passed as an additional option"
-                : "";
-            throw new Error("accountSid must start with AC" + apiKeyMsg);
+        get httpClient() {
+            if (!this._httpClient) {
+                this._httpClient = new RequestClient_1.default({
+                    autoRetry: this.autoRetry,
+                    maxRetries: this.maxRetries,
+                });
+            }
+            return this._httpClient;
         }
-    }
-    get httpClient() {
-        if (!this._httpClient) {
-            this._httpClient = new RequestClient_1.default({
-                autoRetry: this.autoRetry,
-                maxRetries: this.maxRetries,
+        /* jshint ignore:start */
+        /**
+         * Makes a request to the Twilio API using the configured http client.
+         * Authentication information is automatically added if none is provided.
+         *
+         * @param opts - The options argument
+         */
+        /* jshint ignore:end */
+        request(opts) {
+            opts = opts || {};
+            if (!opts.method) {
+                throw new Error("method is required");
+            }
+            if (!opts.uri) {
+                throw new Error("uri is required");
+            }
+            const username = opts.username || this.username;
+            const password = opts.password || this.password;
+            const headers = opts.headers || {};
+            const pkgVersion = moduleInfo.version;
+            const osName = os.platform();
+            const osArch = os.arch();
+            const nodeVersion = process.version;
+            headers["User-Agent"] = util.format("twilio-node/%s (%s %s) node/%s", pkgVersion, osName, osArch, nodeVersion);
+            this.userAgentExtensions?.forEach((extension) => {
+                headers["User-Agent"] += ` ${extension}`;
+            });
+            headers["Accept-Charset"] = "utf-8";
+            if (opts.method === "post" && !headers["Content-Type"]) {
+                headers["Content-Type"] = "application/x-www-form-urlencoded";
+            }
+            if (!headers["Accept"]) {
+                headers["Accept"] = "application/json";
+            }
+            var uri = new url.URL(opts.uri);
+            uri.hostname = this.getHostname(uri.hostname, this.edge, this.region);
+            return this.httpClient?.request({
+                method: opts.method,
+                uri: uri.href,
+                username: username,
+                password: password,
+                headers: headers,
+                params: opts.params,
+                data: opts.data,
+                timeout: opts.timeout,
+                allowRedirects: opts.allowRedirects,
+                logLevel: opts.logLevel,
             });
         }
-        return this._httpClient;
-    }
-    /* jshint ignore:start */
-    /**
-     * Makes a request to the Twilio API using the configured http client.
-     * Authentication information is automatically added if none is provided.
-     *
-     * @param opts - The options argument
-     */
-    /* jshint ignore:end */
-    request(opts) {
-        opts = opts || {};
-        if (!opts.method) {
-            throw new Error("method is required");
-        }
-        if (!opts.uri) {
-            throw new Error("uri is required");
-        }
-        const username = opts.username || this.username;
-        const password = opts.password || this.password;
-        const headers = opts.headers || {};
-        const pkgVersion = moduleInfo.version;
-        const osName = os.platform();
-        const osArch = os.arch();
-        const nodeVersion = process.version;
-        headers["User-Agent"] = util.format("twilio-node/%s (%s %s) node/%s", pkgVersion, osName, osArch, nodeVersion);
-        this.userAgentExtensions?.forEach((extension) => {
-            headers["User-Agent"] += ` ${extension}`;
-        });
-        headers["Accept-Charset"] = "utf-8";
-        if (opts.method === "post" && !headers["Content-Type"]) {
-            headers["Content-Type"] = "application/x-www-form-urlencoded";
-        }
-        if (!headers["Accept"]) {
-            headers["Accept"] = "application/json";
-        }
-        var uri = new url.URL(opts.uri);
-        uri.hostname = this.getHostname(uri.hostname, this.edge, this.region);
-        return this.httpClient?.request({
-            method: opts.method,
-            uri: uri.href,
-            username: username,
-            password: password,
-            headers: headers,
-            params: opts.params,
-            data: opts.data,
-            timeout: opts.timeout,
-            allowRedirects: opts.allowRedirects,
-            logLevel: opts.logLevel,
-        });
-    }
-    /* jshint ignore:start */
-    /**
-     * Adds a region and/or edge to a given hostname
-     *
-     * @param hostname - A URI hostname (e.g. api.twilio.com)
-     * @param targetEdge - The targeted edge location (e.g. sydney)
-     * @param targetRegion - The targeted region location (e.g. au1)
-     */
-    /* jshint ignore:end */
-    getHostname(hostname, targetEdge, targetRegion) {
-        const defaultRegion = "us1";
-        const domain = hostname.split(".").slice(-2).join(".");
-        const prefix = hostname.split("." + domain)[0];
-        let [product, edge, region] = prefix.split(".");
-        if (edge && !region) {
-            region = edge;
-            edge = undefined;
+        /* jshint ignore:start */
+        /**
+         * Adds a region and/or edge to a given hostname
+         *
+         * @param hostname - A URI hostname (e.g. api.twilio.com)
+         * @param targetEdge - The targeted edge location (e.g. sydney)
+         * @param targetRegion - The targeted region location (e.g. au1)
+         */
+        /* jshint ignore:end */
+        getHostname(hostname, targetEdge, targetRegion) {
+            const defaultRegion = "us1";
+            const domain = hostname.split(".").slice(-2).join(".");
+            const prefix = hostname.split("." + domain)[0];
+            let [product, edge, region] = prefix.split(".");
+            if (edge && !region) {
+                region = edge;
+                edge = undefined;
+            }
+            region = targetRegion || region || (targetEdge && defaultRegion);
+            if (!region) {
+                return hostname;
+            }
+            edge = targetEdge || edge;
+            return [product, edge, region, domain].filter((part) => part).join(".");
         }
-        region = targetRegion || region || (targetEdge && defaultRegion);
-        if (!region) {
-            return hostname;
+        /* jshint ignore:start */
+        /**
+         * Validates that a request to the new SSL certificate is successful.
+         *
+         * @throws RestException if the request fails
+         *
+         */
+        /* jshint ignore:end */
+        validateSslCert() {
+            return this.httpClient
+                ?.request({
+                method: "get",
+                uri: "https://api.twilio.com:8443/2010-04-01/.json",
+            })
+                .then((response) => {
+                if (response["statusCode"] < 200 || response["statusCode"] >= 300) {
+                    throw new RestException(response);
+                }
+                return response;
+            });
         }
-        edge = targetEdge || edge;
-        return [product, edge, region, domain].filter((part) => part).join(".");
-    }
-    /* jshint ignore:start */
-    /**
-     * Validates that a request to the new SSL certificate is successful.
-     *
-     * @throws RestException if the request fails
-     *
-     */
-    /* jshint ignore:end */
-    validateSslCert() {
-        return this.httpClient
-            ?.request({
-            method: "get",
-            uri: "https://api.twilio.com:8443/2010-04-01/.json",
-        })
-            .then((response) => {
-            if (response["statusCode"] < 200 || response["statusCode"] >= 300) {
-                throw new RestException(response);
-            }
-            return response;
-        });
     }
-}
-exports.BaseTwilio = BaseTwilio;
+    Twilio.Client = Client;
+})(Twilio || (Twilio = {}));
+module.exports = Twilio;

package/lib/base/Domain.d.ts

@@ -1,4 +1,4 @@
-import { BaseTwilio, RequestOpts } from "./BaseTwilio";
+import { Client as BaseTwilio, RequestOpts } from "./BaseTwilio";
 /**
  * Base domain object
  */

package/lib/base/RequestClient.d.ts

@@ -2,104 +2,8 @@
 import { HttpMethod } from "../interfaces";
 import { AxiosInstance } from "axios";
 import Response from "../http/response";
-import Request from "../http/request";
-import { Headers } from "../http/request";
-export interface RequestOptions<TData = any, TParams = object> {
-    /**
-     * The HTTP method
-     */
-    method: HttpMethod;
-    /**
-     * The request URI
-     */
-    uri: string;
-    /**
-     * The username used for auth
-     */
-    username?: string;
-    /**
-     * The password used for auth
-     */
-    password?: string;
-    /**
-     * The request headers
-     */
-    headers?: Headers;
-    /**
-     * The object of params added as query string to the request
-     */
-    params?: TParams;
-    /**
-     * The form data that should be submitted
-     */
-    data?: TData;
-    /**
-     * The request timeout in milliseconds
-     */
-    timeout?: number;
-    /**
-     * Should the client follow redirects
-     */
-    allowRedirects?: boolean;
-    /**
-     * Set to true to use the forever-agent
-     */
-    forever?: boolean;
-    /**
-     * Set to 'debug' to enable debug logging
-     */
-    logLevel?: string;
-}
-export interface RequestClientOptions {
-    /**
-     * A timeout in milliseconds. This will be used as the HTTPS agent's socket
-     * timeout, AND as the default request timeout.
-     */
-    timeout?: number;
-    /**
-     * https.Agent keepAlive option
-     */
-    keepAlive?: boolean;
-    /**
-     * https.Agent keepAliveMSecs option
-     */
-    keepAliveMsecs?: number;
-    /**
-     * https.Agent maxSockets option
-     */
-    maxSockets?: number;
-    /**
-     * https.Agent maxTotalSockets option
-     */
-    maxTotalSockets?: number;
-    /**
-     * https.Agent maxFreeSockets option
-     */
-    maxFreeSockets?: number;
-    /**
-     * https.Agent scheduling option
-     */
-    scheduling?: "fifo" | "lifo" | undefined;
-    /**
-     * The private CA certificate bundle (if private SSL certificate)
-     */
-    ca?: string | Buffer;
-    /**
-     * Enable auto-retry with exponential backoff when receiving 429 Errors from
-     * the API. Disabled by default.
-     */
-    autoRetry?: boolean;
-    /**
-     * Maximum retry delay in milliseconds for 429 Error response retries.
-     * Defaults to 3000.
-     */
-    maxRetryDelay?: number;
-    /**
-     * Maximum number of request retries for 429 Error responses. Defaults to 3.
-     */
-    maxRetries?: number;
-}
-export default class RequestClient {
+import Request, { Headers } from "../http/request";
+declare class RequestClient {
     defaultTimeout: number;
     axios: AxiosInstance;
     lastResponse?: Response<any>;
@@ -121,7 +25,7 @@ export default class RequestClient {
      * @param opts.maxRetryDelay - Max retry delay in milliseconds for 429 Too Many Request response retries. Defaults to 3000.
      * @param opts.maxRetries - Max number of request retries for 429 Too Many Request responses. Defaults to 3.
      */
-    constructor(opts?: RequestClientOptions);
+    constructor(opts?: RequestClient.RequestClientOptions);
     /**
      * Make http request
      * @param opts - The options argument
@@ -137,7 +41,105 @@ export default class RequestClient {
      * @param opts.forever - Set to true to use the forever-agent
      * @param opts.logLevel - Show debug logs
      */
-    request<TData>(opts: RequestOptions<TData>): Promise<Response<TData>>;
+    request<TData>(opts: RequestClient.RequestOptions<TData>): Promise<Response<TData>>;
     filterLoggingHeaders(headers: Headers): string[];
     private logRequest;
 }
+declare namespace RequestClient {
+    interface RequestOptions<TData = any, TParams = object> {
+        /**
+         * The HTTP method
+         */
+        method: HttpMethod;
+        /**
+         * The request URI
+         */
+        uri: string;
+        /**
+         * The username used for auth
+         */
+        username?: string;
+        /**
+         * The password used for auth
+         */
+        password?: string;
+        /**
+         * The request headers
+         */
+        headers?: Headers;
+        /**
+         * The object of params added as query string to the request
+         */
+        params?: TParams;
+        /**
+         * The form data that should be submitted
+         */
+        data?: TData;
+        /**
+         * The request timeout in milliseconds
+         */
+        timeout?: number;
+        /**
+         * Should the client follow redirects
+         */
+        allowRedirects?: boolean;
+        /**
+         * Set to true to use the forever-agent
+         */
+        forever?: boolean;
+        /**
+         * Set to 'debug' to enable debug logging
+         */
+        logLevel?: string;
+    }
+    interface RequestClientOptions {
+        /**
+         * A timeout in milliseconds. This will be used as the HTTPS agent's socket
+         * timeout, AND as the default request timeout.
+         */
+        timeout?: number;
+        /**
+         * https.Agent keepAlive option
+         */
+        keepAlive?: boolean;
+        /**
+         * https.Agent keepAliveMSecs option
+         */
+        keepAliveMsecs?: number;
+        /**
+         * https.Agent maxSockets option
+         */
+        maxSockets?: number;
+        /**
+         * https.Agent maxTotalSockets option
+         */
+        maxTotalSockets?: number;
+        /**
+         * https.Agent maxFreeSockets option
+         */
+        maxFreeSockets?: number;
+        /**
+         * https.Agent scheduling option
+         */
+        scheduling?: "fifo" | "lifo" | undefined;
+        /**
+         * The private CA certificate bundle (if private SSL certificate)
+         */
+        ca?: string | Buffer;
+        /**
+         * Enable auto-retry with exponential backoff when receiving 429 Errors from
+         * the API. Disabled by default.
+         */
+        autoRetry?: boolean;
+        /**
+         * Maximum retry delay in milliseconds for 429 Error response retries.
+         * Defaults to 3000.
+         */
+        maxRetryDelay?: number;
+        /**
+         * Maximum number of request retries for 429 Error responses. Defaults to 3.
+         */
+        maxRetries?: number;
+    }
+}
+export = RequestClient;

package/lib/base/RequestClient.js

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const fs = __importStar(require("fs"));
 const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
@@ -38,7 +37,7 @@ const DEFAULT_TIMEOUT = 30000;
 const DEFAULT_INITIAL_RETRY_INTERVAL_MILLIS = 100;
 const DEFAULT_MAX_RETRY_DELAY = 3000;
 const DEFAULT_MAX_RETRIES = 3;
-function getExpontentialBackoffResponseHandler(axios, opts) {
+function getExponentialBackoffResponseHandler(axios, opts) {
     const maxIntervalMillis = opts.maxIntervalMillis;
     const maxRetries = opts.maxRetries;
     return function (res) {
@@ -110,7 +109,7 @@ class RequestClient {
         this.axios.defaults.headers.post["Content-Type"] = DEFAULT_CONTENT_TYPE;
         this.axios.defaults.httpsAgent = agent;
         if (opts.autoRetry) {
-            this.axios.interceptors.response.use(getExpontentialBackoffResponseHandler(this.axios, {
+            this.axios.interceptors.response.use(getExponentialBackoffResponseHandler(this.axios, {
                 maxIntervalMillis: this.maxRetryDelay,
                 maxRetries: this.maxRetries,
             }));
@@ -220,4 +219,4 @@ class RequestClient {
         console.log("-- END Twilio API Request --");
     }
 }
-exports.default = RequestClient;
+module.exports = RequestClient;

package/lib/rest/Twilio.d.ts

@@ -1,4 +1,4 @@
-import { BaseTwilio, ClientOpts } from "../base/BaseTwilio";
+import { Client, ClientOpts, RequestOpts } from "../base/BaseTwilio";
 import Accounts from "./Accounts";
 import Api from "./Api";
 import Autopilot from "./Autopilot";
@@ -61,7 +61,7 @@ import { ValidationRequestListInstance } from "./api/v2010/account/validationReq
 /**
  * Twilio Client to interact with the Rest API
  */
-declare class Twilio extends BaseTwilio {
+declare class Twilio extends Client {
     /** (Twilio.Accounts) - accounts domain */
     _accounts?: Accounts;
     /** (Twilio.Api) - api domain */
@@ -263,4 +263,10 @@ declare class Twilio extends BaseTwilio {
     /** Getter for (Twilio.Api.V2010.AccountContext.ValidationRequestListInstance) validationRequests resource */
     get validationRequests(): ValidationRequestListInstance;
 }
+declare namespace Twilio {
+    interface RequestClientOptions extends ClientOpts {
+    }
+    interface RequestOptions extends RequestOpts {
+    }
+}
 export = Twilio;

package/lib/rest/Twilio.js

@@ -15,7 +15,7 @@ const BaseTwilio_1 = require("../base/BaseTwilio");
  * Twilio Client to interact with the Rest API
  */
 /* jshint ignore:end */
-class Twilio extends BaseTwilio_1.BaseTwilio {
+class Twilio extends BaseTwilio_1.Client {
     /* jshint ignore:start */
     /**
      * Creates a new instance of Twilio Client

package/lib/twiml/FaxResponse.d.ts

@@ -63,4 +63,4 @@ declare namespace FaxResponse {
     }
     export {};
 }
-export default FaxResponse;
+export = FaxResponse;

package/lib/twiml/FaxResponse.js

@@ -8,7 +8,6 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
 const TwiML_1 = __importDefault(require("./TwiML"));
 class FaxResponse extends TwiML_1.default {
     /**
@@ -64,4 +63,4 @@ class FaxResponse extends TwiML_1.default {
     }
     FaxResponse.Receive = Receive;
 })(FaxResponse || (FaxResponse = {}));
-exports.default = FaxResponse;
+module.exports = FaxResponse;

package/lib/twiml/MessagingResponse.d.ts

@@ -114,4 +114,4 @@ declare namespace MessagingResponse {
         constructor(redirect: XMLElement);
     }
 }
-export default MessagingResponse;
+export = MessagingResponse;

package/lib/twiml/MessagingResponse.js

@@ -8,7 +8,6 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
 const TwiML_1 = __importDefault(require("./TwiML"));
 class MessagingResponse extends TwiML_1.default {
     /**
@@ -117,4 +116,4 @@ class MessagingResponse extends TwiML_1.default {
     }
     MessagingResponse.Redirect = Redirect;
 })(MessagingResponse || (MessagingResponse = {}));
-exports.default = MessagingResponse;
+module.exports = MessagingResponse;

package/lib/twiml/VoiceResponse.d.ts

@@ -2445,4 +2445,4 @@ declare namespace VoiceResponse {
     }
     export {};
 }
-export default VoiceResponse;
+export = VoiceResponse;

package/lib/twiml/VoiceResponse.js

@@ -8,7 +8,6 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
 const TwiML_1 = __importDefault(require("./TwiML"));
 class VoiceResponse extends TwiML_1.default {
     /**
@@ -1431,4 +1430,4 @@ class VoiceResponse extends TwiML_1.default {
     }
     VoiceResponse.VirtualAgent = VirtualAgent;
 })(VoiceResponse || (VoiceResponse = {}));
-exports.default = VoiceResponse;
+module.exports = VoiceResponse;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "twilio",
   "description": "A Twilio helper library",
-  "version": "4.0.2",
+  "version": "4.1.1",
   "author": "API Team <api@twilio.com>",
   "contributors": [
     {
@@ -69,7 +69,9 @@
     "typedoc": "typedoc --entryPointStrategy expand src --out docs --logLevel Error"
   },
   "files": [
-    "lib"
+    "lib",
+    "index.js",
+    "index.d.ts"
   ],
   "main": "./lib",
   "types": "./index.d.ts",