@hubspot/local-dev-lib 0.2.0 → 0.2.1-experimental.1

package/http/getAxiosConfig.js

@@ -1,21 +1,71 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAxiosConfig = exports.DEFAULT_USER_AGENT_HEADERS = void 0;
+exports.getAxiosConfig = exports.getDefaultUserAgentHeader = exports.USER_AGENTS = void 0;
 const package_json_1 = require("../package.json");
 const config_1 = require("../config");
 const urls_1 = require("../lib/urls");
-exports.DEFAULT_USER_AGENT_HEADERS = {
-    'User-Agent': `HubSpot Local Dev Lib/${package_json_1.version}`,
+const https_1 = __importDefault(require("https"));
+const http_1 = __importDefault(require("http"));
+// Total number of sockets across all hosts
+const MAX_TOTAL_SOCKETS = 25;
+// Total number of sockets per each host
+const MAX_SOCKETS_PER_HOST = 5;
+const httpAgent = new http_1.default.Agent({
+    keepAlive: true,
+    maxTotalSockets: MAX_TOTAL_SOCKETS,
+    maxSockets: MAX_SOCKETS_PER_HOST,
+});
+const httpsAgent = new https_1.default.Agent({
+    keepAlive: true,
+    maxTotalSockets: MAX_TOTAL_SOCKETS,
+    maxSockets: MAX_SOCKETS_PER_HOST,
+});
+exports.USER_AGENTS = {
+    'HubSpot Local Dev Lib': package_json_1.version,
+};
+function getDefaultUserAgentHeader() {
+    let userAgentString = '';
+    Object.keys(exports.USER_AGENTS).forEach((userAgentKey, i) => {
+        userAgentString += `${i > 0 ? ', ' : ''}${userAgentKey}/${exports.USER_AGENTS[userAgentKey]}`;
+    });
+    return {
+        'User-Agent': userAgentString,
+    };
+}
+exports.getDefaultUserAgentHeader = getDefaultUserAgentHeader;
+const DEFAULT_TRANSITIONAL = {
+    clarifyTimeoutError: true,
 };
 function getAxiosConfig(options) {
-    const { env, localHostOverride, ...rest } = options;
-    const { httpTimeout, httpUseLocalhost } = (0, config_1.getAndLoadConfigIfNeeded)();
+    const { env, localHostOverride, headers, ...rest } = options;
+    let config;
+    try {
+        config = (0, config_1.getConfig)();
+    }
+    catch (e) {
+        config = null;
+    }
+    let httpTimeout = 15000;
+    let httpUseLocalhost = false;
+    if (config && config.httpTimeout) {
+        httpTimeout = config.httpTimeout;
+    }
+    if (config && config.httpUseLocalhost) {
+        httpUseLocalhost = config.httpUseLocalhost;
+    }
     return {
         baseURL: (0, urls_1.getHubSpotApiOrigin)(env, localHostOverride ? false : httpUseLocalhost),
         headers: {
-            ...exports.DEFAULT_USER_AGENT_HEADERS,
+            ...getDefaultUserAgentHeader(),
+            ...(headers || {}),
         },
-        timeout: httpTimeout || 15000,
+        timeout: httpTimeout,
+        transitional: DEFAULT_TRANSITIONAL,
+        httpAgent,
+        httpsAgent,
         ...rest,
     };
 }

package/http/index.d.ts

@@ -1,18 +1,17 @@
-import { LogCallbacksArg } from '../types/LogCallbacks';
-import { HttpOptions } from '../types/Http';
-import { AxiosResponse } from 'axios';
-declare function getRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
-declare function postRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
-declare function putRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
-declare function patchRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
-declare function deleteRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
-declare const getRequestStreamCallbackKeys: readonly ["onWrite"];
-declare const http: {
+import { AxiosPromise } from 'axios';
+import { HttpOptions, HubSpotPromise } from '../types/Http';
+export declare function addUserAgentHeader(key: string, value: string): void;
+declare function getRequest<T>(accountId: number, options: HttpOptions): HubSpotPromise<T>;
+declare function postRequest<T>(accountId: number, options: HttpOptions): HubSpotPromise<T>;
+declare function putRequest<T>(accountId: number, options: HttpOptions): HubSpotPromise<T>;
+declare function patchRequest<T>(accountId: number, options: HttpOptions): HubSpotPromise<T>;
+declare function deleteRequest<T>(accountId: number, options: HttpOptions): HubSpotPromise<T>;
+export declare const http: {
     get: typeof getRequest;
     post: typeof postRequest;
     put: typeof putRequest;
     patch: typeof patchRequest;
     delete: typeof deleteRequest;
-    getOctetStream: (accountId: number, options: HttpOptions, destPath: string, logCallbacks?: LogCallbacksArg<typeof getRequestStreamCallbackKeys>) => Promise<AxiosResponse>;
+    getOctetStream: (accountId: number, options: HttpOptions, destPath: string) => AxiosPromise<any>;
 };
-export default http;
+export {};

package/http/index.js

@@ -3,22 +3,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.http = exports.addUserAgentHeader = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const content_disposition_1 = __importDefault(require("content-disposition"));
+const axios_1 = __importDefault(require("axios"));
 const config_1 = require("../config");
 const getAxiosConfig_1 = require("./getAxiosConfig");
+const addQueryParams_1 = require("./addQueryParams");
 const personalAccessKey_1 = require("../lib/personalAccessKey");
 const oauth_1 = require("../lib/oauth");
-const standardErrors_1 = require("../errors/standardErrors");
-const logger_1 = require("../utils/logger");
-const axios_1 = __importDefault(require("axios"));
+const logger_1 = require("../lib/logger");
+const lang_1 = require("../utils/lang");
+const HubSpotHttpError_1 = require("../models/HubSpotHttpError");
+const auth_1 = require("../constants/auth");
 const i18nKey = 'http.index';
-async function withOauth(accountId, accountConfig, axiosConfig) {
+axios_1.default.interceptors.response.use(undefined, error => {
+    // Wrap all axios errors in our own Error class.  Attach the error
+    // as the cause for the new error, so we maintain the stack trace
+    return Promise.reject(new HubSpotHttpError_1.HubSpotHttpError(error.message, { cause: error }));
+});
+function addUserAgentHeader(key, value) {
+    getAxiosConfig_1.USER_AGENTS[key] = value;
+}
+exports.addUserAgentHeader = addUserAgentHeader;
+async function withOauth(account, axiosConfig) {
     const { headers } = axiosConfig;
-    const oauth = (0, oauth_1.getOauthManager)(accountId, accountConfig);
+    const oauth = (0, oauth_1.getOauthManager)(account);
     if (!oauth) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.withOauth`, { accountId });
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.withOauth`, { accountId: account.accountId }));
     }
     const accessToken = await oauth.accessToken();
     return {
@@ -51,70 +64,56 @@ function withPortalId(portalId, axiosConfig) {
     };
 }
 async function withAuth(accountId, options) {
-    const accountConfig = (0, config_1.getAccountConfig)(accountId);
-    if (!accountConfig) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.withAuth`, { accountId });
-    }
-    const { env, authType, apiKey } = accountConfig;
+    const account = (0, config_1.getConfigAccountById)(accountId);
+    const { env, authType } = account;
     const axiosConfig = withPortalId(accountId, (0, getAxiosConfig_1.getAxiosConfig)({ env, ...options }));
-    if (authType === 'personalaccesskey') {
+    if (authType === auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
         return withPersonalAccessKey(accountId, axiosConfig);
     }
-    if (authType === 'oauth2') {
-        return withOauth(accountId, accountConfig, axiosConfig);
+    if (authType === auth_1.OAUTH_AUTH_METHOD.value) {
+        return withOauth(account, axiosConfig);
     }
-    const { params } = axiosConfig;
-    return {
-        ...axiosConfig,
-        params: {
-            ...params,
-            hapikey: apiKey,
-        },
-    };
-}
-function addQueryParams(configOptions, queryParams = {}) {
-    const { params } = configOptions;
-    return {
-        ...configOptions,
-        params: {
-            ...queryParams,
-            ...params,
-        },
-    };
+    if (authType === auth_1.API_KEY_AUTH_METHOD.value) {
+        const { params } = axiosConfig;
+        return {
+            ...axiosConfig,
+            params: {
+                ...params,
+                hapikey: account.apiKey,
+            },
+        };
+    }
+    throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidAuthType`, {
+        accountId,
+        authType,
+    }));
 }
 async function getRequest(accountId, options) {
-    const { query, ...rest } = options;
-    const axiosConfig = addQueryParams(rest, query);
-    const configWithAuth = await withAuth(accountId, axiosConfig);
-    const { data } = await (0, axios_1.default)(configWithAuth);
-    return data;
+    const { params, ...rest } = options;
+    const optionsWithParams = (0, addQueryParams_1.addQueryParams)(rest, params);
+    const requestConfig = await withAuth(accountId, optionsWithParams);
+    return (0, axios_1.default)(requestConfig);
 }
 async function postRequest(accountId, options) {
-    const configWithAuth = await withAuth(accountId, options);
-    const { data } = await (0, axios_1.default)({ ...configWithAuth, method: 'post' });
-    return data;
+    const requestConfig = await withAuth(accountId, options);
+    return (0, axios_1.default)({ ...requestConfig, method: 'post' });
 }
 async function putRequest(accountId, options) {
-    const configWithAuth = await withAuth(accountId, options);
-    const { data } = await (0, axios_1.default)({ ...configWithAuth, method: 'put' });
-    return data;
+    const requestConfig = await withAuth(accountId, options);
+    return (0, axios_1.default)({ ...requestConfig, method: 'put' });
 }
 async function patchRequest(accountId, options) {
-    const configWithAuth = await withAuth(accountId, options);
-    const { data } = await (0, axios_1.default)({ ...configWithAuth, method: 'put' });
-    return data;
+    const requestConfig = await withAuth(accountId, options);
+    return (0, axios_1.default)({ ...requestConfig, method: 'patch' });
 }
 async function deleteRequest(accountId, options) {
-    const configWithAuth = await withAuth(accountId, options);
-    const { data } = await (0, axios_1.default)({ ...configWithAuth, method: 'delete' });
-    return data;
+    const requestConfig = await withAuth(accountId, options);
+    return (0, axios_1.default)({ ...requestConfig, method: 'delete' });
 }
-const getRequestStreamCallbackKeys = ['onWrite'];
 function createGetRequestStream(contentType) {
-    return async (accountId, options, destPath, logCallbacks) => {
-        const { query, ...rest } = options;
-        const axiosConfig = addQueryParams(rest, query);
-        const logger = (0, logger_1.makeTypedLogger)(logCallbacks);
+    return async (accountId, options, destPath) => {
+        const { params, ...rest } = options;
+        const axiosConfig = (0, addQueryParams_1.addQueryParams)(rest, params);
         // eslint-disable-next-line no-async-promise-executor
         return new Promise(async (resolve, reject) => {
             try {
@@ -151,9 +150,9 @@ function createGetRequestStream(contentType) {
                         reject(err);
                     });
                     writeStream.on('close', async () => {
-                        logger('onWrite', `${i18nKey}.createGetRequestStream.onWrite`, {
+                        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createGetRequestStream.onWrite`, {
                             filepath,
-                        });
+                        }));
                         resolve(res);
                     });
                 }
@@ -168,7 +167,7 @@ function createGetRequestStream(contentType) {
     };
 }
 const getOctetStream = createGetRequestStream('application/octet-stream');
-const http = {
+exports.http = {
     get: getRequest,
     post: postRequest,
     put: putRequest,
@@ -176,4 +175,3 @@ const http = {
     delete: deleteRequest,
     getOctetStream,
 };
-exports.default = http;

package/http/unauthed.d.ts

@@ -0,0 +1,14 @@
+import { HttpOptions, HubSpotPromise } from '../types/Http';
+declare function getRequest<T>(options: HttpOptions): HubSpotPromise<T>;
+declare function postRequest<T>(options: HttpOptions): HubSpotPromise<T>;
+declare function putRequest<T>(options: HttpOptions): HubSpotPromise<T>;
+declare function patchRequest<T>(options: HttpOptions): HubSpotPromise<T>;
+declare function deleteRequest<T>(options: HttpOptions): HubSpotPromise<T>;
+export declare const http: {
+    get: typeof getRequest;
+    post: typeof postRequest;
+    put: typeof putRequest;
+    patch: typeof patchRequest;
+    delete: typeof deleteRequest;
+};
+export {};

package/http/unauthed.js

@@ -0,0 +1,38 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.http = void 0;
+const axios_1 = __importDefault(require("axios"));
+const getAxiosConfig_1 = require("./getAxiosConfig");
+const addQueryParams_1 = require("./addQueryParams");
+async function getRequest(options) {
+    const { params, ...rest } = options;
+    const optionsWithParams = (0, addQueryParams_1.addQueryParams)(rest, params);
+    const requestConfig = await (0, getAxiosConfig_1.getAxiosConfig)(optionsWithParams);
+    return (0, axios_1.default)(requestConfig);
+}
+async function postRequest(options) {
+    const requestConfig = await (0, getAxiosConfig_1.getAxiosConfig)(options);
+    return (0, axios_1.default)({ ...requestConfig, method: 'post' });
+}
+async function putRequest(options) {
+    const requestConfig = await (0, getAxiosConfig_1.getAxiosConfig)(options);
+    return (0, axios_1.default)({ ...requestConfig, method: 'put' });
+}
+async function patchRequest(options) {
+    const requestConfig = await (0, getAxiosConfig_1.getAxiosConfig)(options);
+    return (0, axios_1.default)({ ...requestConfig, method: 'patch' });
+}
+async function deleteRequest(options) {
+    const requestConfig = await (0, getAxiosConfig_1.getAxiosConfig)(options);
+    return (0, axios_1.default)({ ...requestConfig, method: 'delete' });
+}
+exports.http = {
+    get: getRequest,
+    post: postRequest,
+    put: putRequest,
+    patch: patchRequest,
+    delete: deleteRequest,
+};