@hubspot/local-dev-lib 2.2.0 → 2.3.0-beta.0

package/lib/portManager.d.ts

@@ -1,5 +1,6 @@
 import { RequestPortsData } from '../types/PortManager';
 export declare const BASE_URL: string;
+export declare function isPortManagerPortAvailable(): Promise<boolean>;
 export declare function isPortManagerServerRunning(): Promise<boolean>;
 export declare function startPortManagerServer(): Promise<void>;
 export declare function stopPortManagerServer(): Promise<void>;

package/lib/portManager.js

@@ -3,15 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.portManagerHasActiveServers = exports.deleteServerInstance = exports.requestPorts = exports.stopPortManagerServer = exports.startPortManagerServer = exports.isPortManagerServerRunning = exports.BASE_URL = void 0;
+exports.portManagerHasActiveServers = exports.deleteServerInstance = exports.requestPorts = exports.stopPortManagerServer = exports.startPortManagerServer = exports.isPortManagerServerRunning = exports.isPortManagerPortAvailable = exports.BASE_URL = void 0;
 const axios_1 = __importDefault(require("axios"));
 const PortManagerServer_1 = require("../utils/PortManagerServer");
-const detectPort_1 = require("../utils/detectPort");
 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);
+}
+exports.isPortManagerPortAvailable = isPortManagerPortAvailable;
 async function isPortManagerServerRunning() {
-    const port = await (0, detectPort_1.detectPort)(ports_1.PORT_MANAGER_SERVER_PORT);
-    return port !== ports_1.PORT_MANAGER_SERVER_PORT;
+    try {
+        const { data } = await axios_1.default.get(`${exports.BASE_URL}${PortManagerServer_1.HEALTH_CHECK_PATH}`);
+        return data.status === PortManagerServer_1.SERVICE_HEALTHY;
+    }
+    catch (e) {
+        logger_1.logger.debug(e);
+        return false;
+    }
 }
 exports.isPortManagerServerRunning = isPortManagerServerRunning;
 async function startPortManagerServer() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "2.2.0",
+    "version": "2.3.0-beta.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "main": "lib/index.js",
     "repository": {

package/utils/PortManagerServer.d.ts

@@ -2,6 +2,8 @@
 import { Express, Request, Response } from 'express';
 import { Server } from 'http';
 import { RequestPortsData, ServerPortMap } from '../types/PortManager';
+export declare const HEALTH_CHECK_PATH = "/port-manager-health-check";
+export declare const SERVICE_HEALTHY = "OK";
 declare class _PortManagerServer {
     app?: Express;
     server?: Server;

package/utils/PortManagerServer.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.PortManagerServer = void 0;
+exports.PortManagerServer = exports.SERVICE_HEALTHY = exports.HEALTH_CHECK_PATH = void 0;
 const express_1 = __importDefault(require("express"));
 const cors_1 = __importDefault(require("cors"));
 const detectPort_1 = require("./detectPort");
@@ -12,6 +12,8 @@ const errors_1 = require("../errors");
 const logger_1 = require("../lib/logger");
 const lang_1 = require("./lang");
 const i18nKey = 'utils.PortManagerServer';
+exports.HEALTH_CHECK_PATH = '/port-manager-health-check';
+exports.SERVICE_HEALTHY = 'OK';
 class _PortManagerServer {
     app;
     server;
@@ -29,6 +31,7 @@ class _PortManagerServer {
         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') {
@@ -65,6 +68,9 @@ class _PortManagerServer {
         this.app.post('/servers', this.assignPortsToServers);
         this.app.delete('/servers/:instanceId', this.deleteServerInstance);
         this.app.post('/close', this.closeServer);
+        this.app.use(exports.HEALTH_CHECK_PATH, (req, res) => {
+            res.status(200).send({ status: exports.SERVICE_HEALTHY });
+        });
     }
     setPort(instanceId, port) {
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.setPort`, { instanceId, port }));