@hubspot/local-dev-lib 3.21.1-beta.2 → 3.21.2-beta.0

package/http/index.js

@@ -41,22 +41,29 @@ const lang_1 = require("../utils/lang");
 const HubSpotHttpError_1 = require("../models/HubSpotHttpError");
 const localDevAuth_1 = require("../api/localDevAuth");
 const util = __importStar(require("util"));
+const trackUsage_1 = require("../lib/trackUsage");
 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,
+];
 function logRequest(response) {
     try {
-        if (process.env.HUBSPOT_NETWORK_LOGGING) {
-            if (response.config.url === localDevAuth_1.LOCALDEVAUTH_ACCESS_TOKEN_PATH) {
-                // Don't log access tokens
-                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));
+        if (!process.env.HUBSPOT_NETWORK_LOGGING) {
+            return;
+        }
+        if (response?.config?.url &&
+            IGNORE_URLS_NETWORK_DEBUG.includes(response.config.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

package/lib/portManager.js

@@ -7,11 +7,10 @@ exports.portManagerHasActiveServers = exports.deleteServerInstance = exports.get
 const axios_1 = __importDefault(require("axios"));
 const PortManagerServer_1 = require("../utils/PortManagerServer");
 const ports_1 = require("../constants/ports");
-const detectPort_1 = require("../utils/detectPort");
 const logger_1 = require("./logger");
 exports.BASE_URL = `http://localhost:${ports_1.PORT_MANAGER_SERVER_PORT}`;
 async function isPortManagerPortAvailable() {
-    return ((await (0, detectPort_1.detectPort)(ports_1.PORT_MANAGER_SERVER_PORT)) === ports_1.PORT_MANAGER_SERVER_PORT);
+    return PortManagerServer_1.PortManagerServer.portAvailable();
 }
 exports.isPortManagerPortAvailable = isPortManagerPortAvailable;
 async function isPortManagerServerRunning() {

package/lib/trackUsage.d.ts

@@ -1 +1,3 @@
+export declare const CMS_CLI_USAGE_PATH: string;
+export declare const VSCODE_USAGE_PATH: string;
 export declare function trackUsage(eventName: string, eventClass: string, meta?: {}, accountId?: number): Promise<void>;

package/lib/trackUsage.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trackUsage = void 0;
+exports.trackUsage = exports.VSCODE_USAGE_PATH = exports.CMS_CLI_USAGE_PATH = void 0;
 const axios_1 = __importDefault(require("axios"));
 const getAxiosConfig_1 = require("../http/getAxiosConfig");
 const logger_1 = require("./logger");
@@ -12,6 +12,8 @@ const config_1 = require("../config");
 const fileMapper_1 = require("../api/fileMapper");
 const lang_1 = require("../utils/lang");
 const i18nKey = 'lib.trackUsage';
+exports.CMS_CLI_USAGE_PATH = `${fileMapper_1.FILE_MAPPER_API_PATH}/cms-cli-usage`;
+exports.VSCODE_USAGE_PATH = `${fileMapper_1.FILE_MAPPER_API_PATH}/vscode-extension-usage`;
 async function trackUsage(eventName, eventClass, meta = {}, accountId) {
     const usageEvent = {
         accountId,
@@ -23,18 +25,17 @@ async function trackUsage(eventName, eventClass, meta = {}, accountId) {
         VSCODE_EXTENSION_INTERACTION: 'vscode-extension-interaction',
         CLI_INTERACTION: 'cli-interaction',
     };
-    let analyticsEndpoint;
+    let path = fileMapper_1.FILE_MAPPER_API_PATH;
     switch (eventName) {
         case EVENT_TYPES.CLI_INTERACTION:
-            analyticsEndpoint = 'cms-cli-usage';
+            path = exports.CMS_CLI_USAGE_PATH;
             break;
         case EVENT_TYPES.VSCODE_EXTENSION_INTERACTION:
-            analyticsEndpoint = 'vscode-extension-usage';
+            path = exports.VSCODE_USAGE_PATH;
             break;
         default:
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.invalidEvent`, { eventName }));
     }
-    const path = `${fileMapper_1.FILE_MAPPER_API_PATH}/${analyticsEndpoint}`;
     const accountConfig = accountId && (0, config_1.getAccountConfig)(accountId);
     if (accountConfig && accountConfig.authType === 'personalaccesskey') {
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.sendingEventAuthenticated`));

package/package.json

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

package/utils/PortManagerServer.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { Express, Request, Response } from 'express';
+import { Express } from 'express';
 import { Server } from 'http';
-import { RequestPortsData, ServerPortMap } from '../types/PortManager';
+import { ServerPortMap } from '../types/PortManager';
 export declare const HEALTH_CHECK_PATH = "/port-manager-health-check";
 export declare const SERVICE_HEALTHY = "OK";
 declare class _PortManagerServer {
@@ -10,19 +10,18 @@ declare class _PortManagerServer {
     serverPortMap: ServerPortMap;
     constructor();
     init(): Promise<void>;
-    reset(): void;
-    listen(): Promise<Server>;
-    setupRoutes(): void;
-    setPort(instanceId: string, port: number): void;
-    deletePort(instanceId: string): void;
-    send404(res: Response, instanceId: string): void;
-    getServers: (req: Request, res: Response) => Promise<void>;
-    getServerPortByInstanceId: (req: Request, res: Response) => void;
-    assignPortsToServers: (req: Request<never, never, {
-        portData: Array<RequestPortsData>;
-    }>, res: Response) => Promise<void>;
-    deleteServerInstance: (req: Request, res: Response) => void;
-    closeServer: (req: Request, res: Response) => void;
+    private reset;
+    portAvailable(): Promise<boolean>;
+    private listen;
+    private setupRoutes;
+    private setPort;
+    private deletePort;
+    private send404;
+    private getServers;
+    private getServerPortByInstanceId;
+    private assignPortsToServers;
+    private deleteServerInstance;
+    private closeServer;
 }
 export declare const PortManagerServer: _PortManagerServer;
 export {};

package/utils/PortManagerServer.js

@@ -8,7 +8,6 @@ const express_1 = __importDefault(require("express"));
 const cors_1 = __importDefault(require("cors"));
 const detectPort_1 = require("./detectPort");
 const ports_1 = require("../constants/ports");
-const errors_1 = require("../errors");
 const logger_1 = require("../lib/logger");
 const lang_1 = require("./lang");
 const i18nKey = 'utils.PortManagerServer';
@@ -22,6 +21,11 @@ class _PortManagerServer {
         this.serverPortMap = {};
     }
     async init() {
+        if (!(await this.portAvailable())) {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.portInUse`, {
+                port: ports_1.PORT_MANAGER_SERVER_PORT,
+            }));
+        }
         if (this.app) {
             throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.duplicateInstance`));
         }
@@ -29,24 +33,17 @@ class _PortManagerServer {
         this.app.use(express_1.default.json());
         this.app.use((0, cors_1.default)());
         this.setupRoutes();
-        try {
-            this.server = await this.listen();
-            logger_1.logger.debug(this.server);
-        }
-        catch (e) {
-            if ((0, errors_1.isSystemError)(e) && e.code === 'EADDRINUSE') {
-                throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.portInUse`, {
-                    port: ports_1.PORT_MANAGER_SERVER_PORT,
-                }), { cause: e });
-            }
-            throw e;
-        }
+        this.server = await this.listen();
+        logger_1.logger.debug(this.server);
     }
     reset() {
         this.app = undefined;
         this.server = undefined;
         this.serverPortMap = {};
     }
+    async portAvailable() {
+        return ((await (0, detectPort_1.detectPort)(ports_1.PORT_MANAGER_SERVER_PORT)) === ports_1.PORT_MANAGER_SERVER_PORT);
+    }
     listen() {
         return new Promise((resolve, reject) => {
             const server = this.app.listen(ports_1.PORT_MANAGER_SERVER_PORT, () => {