@hubspot/local-dev-lib 4.0.1 → 4.0.2-beta.0

package/api/developerTestAccounts.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDeveloperTestAccountPersonalAccessKey = exports.fetchDeveloperTestAccountGateSyncStatus = exports.fetchDeveloperTestAccountOauthAppInstallStatus = exports.installOauthAppIntoDeveloperTestAccount = exports.fetchDeveloperTestAccountData = exports.deleteDeveloperTestAccount = exports.createDeveloperTestAccount = exports.fetchDeveloperTestAccounts = void 0;
-const axios_1 = __importDefault(require("axios"));
+const client_1 = require("../http/client");
 const http_1 = require("../http");
 const getAxiosConfig_1 = require("../http/getAxiosConfig");
 const environments_1 = require("../constants/environments");
@@ -56,7 +53,7 @@ function fetchDeveloperTestAccountData(accessToken, accountId, env = environment
             Authorization: `Bearer ${accessToken}`,
         },
     };
-    return (0, axios_1.default)(reqWithToken);
+    return (0, client_1.httpClient)(reqWithToken);
 }
 exports.fetchDeveloperTestAccountData = fetchDeveloperTestAccountData;
 function installOauthAppIntoDeveloperTestAccount(accountId, testAccountId, projectName, appUId) {

package/api/localDevAuth.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchEnabledFeatures = exports.fetchAppInstallationData = exports.fetchScopeAuthorizationData = exports.fetchScopeData = exports.fetchAccessToken = exports.LOCALDEVAUTH_ACCESS_TOKEN_PATH = void 0;
 const getAxiosConfig_1 = require("../http/getAxiosConfig");
 const http_1 = require("../http");
 const environments_1 = require("../constants/environments");
-const axios_1 = __importDefault(require("axios"));
+const client_1 = require("../http/client");
 const LOCALDEVAUTH_API_AUTH_PATH = 'localdevauth/v1/auth';
 exports.LOCALDEVAUTH_ACCESS_TOKEN_PATH = `${LOCALDEVAUTH_API_AUTH_PATH}/refresh`;
 function fetchAccessToken(personalAccessKey, env = environments_1.ENVIRONMENTS.PROD, portalId) {
@@ -20,7 +17,7 @@ function fetchAccessToken(personalAccessKey, env = environments_1.ENVIRONMENTS.P
         },
         params: portalId ? { portalId } : {},
     });
-    return (0, axios_1.default)({
+    return (0, client_1.httpClient)({
         ...axiosConfig,
         method: 'post',
     });

package/api/sandboxHubs.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSandboxPersonalAccessKey = exports.createV2Sandbox = exports.fetchSandboxHubData = exports.getSandboxUsageLimits = exports.deleteSandbox = exports.createSandbox = void 0;
-const axios_1 = __importDefault(require("axios"));
+const client_1 = require("../http/client");
 const http_1 = require("../http");
 const getAxiosConfig_1 = require("../http/getAxiosConfig");
 const environments_1 = require("../constants/environments");
@@ -44,7 +41,7 @@ function fetchSandboxHubData(accessToken, accountId, env = environments_1.ENVIRO
             Authorization: `Bearer ${accessToken}`,
         },
     };
-    return (0, axios_1.default)(reqWithToken);
+    return (0, client_1.httpClient)(reqWithToken);
 }
 exports.fetchSandboxHubData = fetchSandboxHubData;
 function createV2Sandbox(accountId, name, type, syncObjectRecords) {

package/http/client.d.ts

@@ -0,0 +1 @@
+export declare const httpClient: import("axios").AxiosInstance;

package/http/client.js

@@ -0,0 +1,82 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpClient = void 0;
+const axios_1 = __importStar(require("axios"));
+const HubSpotHttpError_1 = require("../models/HubSpotHttpError");
+const logger_1 = require("../lib/logger");
+const localDevAuth_1 = require("../api/localDevAuth");
+const fireAlarm_1 = require("../api/fireAlarm");
+const util = __importStar(require("util"));
+const trackUsage_1 = require("../lib/trackUsage");
+// Create an isolated axios instance for this copy of local-dev-lib.
+// This prevents issues when multiple copies are loaded and share the global
+// axios, where each copy would register interceptors on the shared instance
+// causing errors to be wrapped multiple times.
+exports.httpClient = axios_1.default.create();
+const IGNORE_URLS_NETWORK_DEBUG = [
+    localDevAuth_1.LOCALDEVAUTH_ACCESS_TOKEN_PATH,
+    trackUsage_1.CMS_CLI_USAGE_PATH,
+    trackUsage_1.VSCODE_USAGE_PATH,
+    fireAlarm_1.FIREALARM_API_AUTH_PATH,
+];
+function logRequest(response) {
+    try {
+        if (!process.env.HUBSPOT_NETWORK_LOGGING) {
+            return;
+        }
+        if (!process.env.HUBSPOT_DEBUG_LOGGING_VERBOSE &&
+            IGNORE_URLS_NETWORK_DEBUG.some(url => response?.config?.url && response.config.url.includes(url))) {
+            return;
+        }
+        logger_1.logger.debug(util.inspect({
+            method: response.config.method,
+            baseURL: response.config.baseURL,
+            url: response.config.url,
+            data: response.data,
+            status: response.status,
+        }, false, null, true));
+    }
+    catch (error) {
+        // Ignore any errors that occur while logging the response
+    }
+}
+// Register interceptor on our isolated instance
+exports.httpClient.interceptors.response.use((response) => {
+    logRequest(response);
+    return response;
+}, error => {
+    try {
+        if ((0, axios_1.isAxiosError)(error) && error.response) {
+            logRequest(error.response);
+        }
+    }
+    catch (e) {
+        // Ignore any errors that occur while logging the response
+    }
+    // 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 }));
+});

package/http/index.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,7 +7,6 @@ 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 = __importStar(require("axios"));
 const config_1 = require("../config");
 const getAxiosConfig_1 = require("./getAxiosConfig");
 const addQueryParams_1 = require("./addQueryParams");
@@ -38,56 +14,9 @@ const personalAccessKey_1 = require("../lib/personalAccessKey");
 const oauth_1 = require("../lib/oauth");
 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 localDevAuth_1 = require("../api/localDevAuth");
-const fireAlarm_1 = require("../api/fireAlarm");
-const util = __importStar(require("util"));
-const trackUsage_1 = require("../lib/trackUsage");
+const client_1 = require("./client");
 const i18nKey = 'http.index';
-const IGNORE_URLS_NETWORK_DEBUG = [
-    localDevAuth_1.LOCALDEVAUTH_ACCESS_TOKEN_PATH,
-    trackUsage_1.CMS_CLI_USAGE_PATH,
-    trackUsage_1.VSCODE_USAGE_PATH,
-    fireAlarm_1.FIREALARM_API_AUTH_PATH,
-];
-function logRequest(response) {
-    try {
-        if (!process.env.HUBSPOT_NETWORK_LOGGING) {
-            return;
-        }
-        if (!process.env.HUBSPOT_DEBUG_LOGGING_VERBOSE &&
-            IGNORE_URLS_NETWORK_DEBUG.some(url => response?.config?.url && response.config.url.includes(url))) {
-            return;
-        }
-        logger_1.logger.debug(util.inspect({
-            method: response.config.method,
-            baseURL: response.config.baseURL,
-            url: response.config.url,
-            data: response.data,
-            status: response.status,
-        }, false, null, true));
-    }
-    catch (error) {
-        // Ignore any errors that occur while logging the response
-    }
-}
-axios_1.default.interceptors.response.use((response) => {
-    logRequest(response);
-    return response;
-}, error => {
-    try {
-        if ((0, axios_1.isAxiosError)(error) && error.response) {
-            logRequest(error.response);
-        }
-    }
-    catch (e) {
-        // Ignore any errors that occur while logging the response
-    }
-    // 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;
 }
@@ -157,23 +86,23 @@ async function getRequest(accountId, options) {
     const { params, ...rest } = options;
     const optionsWithParams = (0, addQueryParams_1.addQueryParams)(rest, params);
     const requestConfig = await withAuth(accountId, optionsWithParams);
-    return (0, axios_1.default)(requestConfig);
+    return (0, client_1.httpClient)(requestConfig);
 }
 async function postRequest(accountId, options) {
     const requestConfig = await withAuth(accountId, options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'post' });
+    return (0, client_1.httpClient)({ ...requestConfig, method: 'post' });
 }
 async function putRequest(accountId, options) {
     const requestConfig = await withAuth(accountId, options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'put' });
+    return (0, client_1.httpClient)({ ...requestConfig, method: 'put' });
 }
 async function patchRequest(accountId, options) {
     const requestConfig = await withAuth(accountId, options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'patch' });
+    return (0, client_1.httpClient)({ ...requestConfig, method: 'patch' });
 }
 async function deleteRequest(accountId, options) {
     const requestConfig = await withAuth(accountId, options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'delete' });
+    return (0, client_1.httpClient)({ ...requestConfig, method: 'delete' });
 }
 function createGetRequestStream(contentType) {
     return async (accountId, options, destPath) => {
@@ -183,7 +112,7 @@ function createGetRequestStream(contentType) {
         return new Promise(async (resolve, reject) => {
             try {
                 const { headers, ...opts } = await withAuth(accountId, axiosConfig);
-                const res = await (0, axios_1.default)({
+                const res = await (0, client_1.httpClient)({
                     method: 'get',
                     ...opts,
                     headers: {

package/http/unauthed.js

@@ -1,33 +1,30 @@
 "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 client_1 = require("./client");
 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);
+    return (0, client_1.httpClient)(requestConfig);
 }
 async function postRequest(options) {
     const requestConfig = await (0, getAxiosConfig_1.getAxiosConfig)(options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'post' });
+    return (0, client_1.httpClient)({ ...requestConfig, method: 'post' });
 }
 async function putRequest(options) {
     const requestConfig = await (0, getAxiosConfig_1.getAxiosConfig)(options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'put' });
+    return (0, client_1.httpClient)({ ...requestConfig, method: 'put' });
 }
 async function patchRequest(options) {
     const requestConfig = await (0, getAxiosConfig_1.getAxiosConfig)(options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'patch' });
+    return (0, client_1.httpClient)({ ...requestConfig, method: 'patch' });
 }
 async function deleteRequest(options) {
     const requestConfig = await (0, getAxiosConfig_1.getAxiosConfig)(options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'delete' });
+    return (0, client_1.httpClient)({ ...requestConfig, method: 'delete' });
 }
 exports.http = {
     get: getRequest,

package/lib/trackUsage.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackUsage = exports.VSCODE_USAGE_PATH = exports.CMS_CLI_USAGE_PATH = void 0;
-const axios_1 = __importDefault(require("axios"));
+const client_1 = require("../http/client");
 const getAxiosConfig_1 = require("../http/getAxiosConfig");
 const logger_1 = require("./logger");
 const http_1 = require("../http");
@@ -62,6 +59,6 @@ async function trackUsage(eventName, eventClass, meta = {}, accountId) {
         resolveWithFullResponse: true,
     });
     logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.sendingEventUnauthenticated`));
-    return (0, axios_1.default)({ ...axiosConfig, method: 'post' });
+    return (0, client_1.httpClient)({ ...axiosConfig, method: 'post' });
 }
 exports.trackUsage = trackUsage;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "4.0.1",
+    "version": "4.0.2-beta.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",
@@ -20,7 +20,7 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@hubspot/npm-scripts": "0.0.4",
+        "@hubspot/npm-scripts": "0.0.6",
         "@types/content-disposition": "^0.5.5",
         "@types/cors": "^2.8.15",
         "@types/debounce": "^1.2.1",

package/utils/git.js

@@ -12,7 +12,7 @@ const GITIGNORE_FILE = '.gitignore';
 function makeComparisonDir(filepath) {
     if (typeof filepath !== 'string')
         return null;
-    let dir = path_1.default.dirname(path_1.default.resolve(filepath)).toLowerCase();
+    const dir = path_1.default.dirname(path_1.default.resolve(filepath)).toLowerCase();
     // Append sep to make comparisons easier e.g. 'foos'.startsWith('foo')
     return dir + (!dir.endsWith(path_1.default.sep) ? path_1.default.sep : '');
 }