@hubspot/local-dev-lib 0.6.1-experimental.0 → 0.6.2-experimental.0

package/http/index.js

@@ -51,6 +51,10 @@ const IGNORE_URLS_NETWORK_DEBUG = [
     trackUsage_1.VSCODE_USAGE_PATH,
     fireAlarm_1.FIREALARM_API_AUTH_PATH,
 ];
+// Create an isolated axios instance for this copy of local-dev-lib.
+// This prevents issues when multiple copies are loaded and share the global
+// register interceptors on the shared instance causing errors to be wrapped multiple times.
+const httpClient = axios_1.default.create();
 function logRequest(response) {
     try {
         if (!process.env.HUBSPOT_NETWORK_LOGGING) {
@@ -72,7 +76,8 @@ function logRequest(response) {
         // Ignore any errors that occur while logging the response
     }
 }
-axios_1.default.interceptors.response.use((response) => {
+// Register interceptor on our isolated instance
+httpClient.interceptors.response.use((response) => {
     logRequest(response);
     return response;
 }, error => {
@@ -84,14 +89,7 @@ axios_1.default.interceptors.response.use((response) => {
     catch (e) {
         // Ignore any errors that occur while logging the response
     }
-    // Don't re-wrap if already a HubSpotHttpError. This can happen when
-    // multiple copies of local-dev-lib are loaded and share the same axios
-    // instance, causing multiple interceptors to be registered.
-    if (error instanceof HubSpotHttpError_1.HubSpotHttpError ||
-        error?.name === HubSpotHttpError_1.HubSpotHttpErrorName) {
-        return Promise.reject(error);
-    }
-    // Wrap all axios errors in our own Error class.  Attach the 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 }));
 });
@@ -164,23 +162,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 httpClient(requestConfig);
 }
 async function postRequest(accountId, options) {
     const requestConfig = await withAuth(accountId, options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'post' });
+    return httpClient({ ...requestConfig, method: 'post' });
 }
 async function putRequest(accountId, options) {
     const requestConfig = await withAuth(accountId, options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'put' });
+    return httpClient({ ...requestConfig, method: 'put' });
 }
 async function patchRequest(accountId, options) {
     const requestConfig = await withAuth(accountId, options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'patch' });
+    return httpClient({ ...requestConfig, method: 'patch' });
 }
 async function deleteRequest(accountId, options) {
     const requestConfig = await withAuth(accountId, options);
-    return (0, axios_1.default)({ ...requestConfig, method: 'delete' });
+    return httpClient({ ...requestConfig, method: 'delete' });
 }
 function createGetRequestStream(contentType) {
     return async (accountId, options, destPath) => {
@@ -190,7 +188,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 httpClient({
                     method: 'get',
                     ...opts,
                     headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.6.1-experimental.0",
+    "version": "0.6.2-experimental.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",