@alwaysai/device-agent 1.4.0 → 2.0.0

package/lib/infrastructure/require-files-present-ready.test.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const config_check_utility_1 = require("./config-check-utility");
+const required_config_checks_1 = require("./required-config-checks");
+const mockedDeviceCfgCheckFunction = jest.fn();
+const mockedCertCheckFunction = jest.fn();
+const mockedAaiCfgCheckFunction = jest.fn();
+jest.mock('./config-check-utility');
+jest
+    .mocked(config_check_utility_1.checkAaiConfigPresent)
+    .mockImplementation(mockedAaiCfgCheckFunction);
+jest
+    .mocked(config_check_utility_1.checkDeviceConfigPresent)
+    .mockImplementation(mockedDeviceCfgCheckFunction);
+jest
+    .mocked(config_check_utility_1.checkCertificatesPresent)
+    .mockImplementation(mockedCertCheckFunction);
+describe('test requiredConfigFilesPresentAndValid', () => {
+    function setupMocks(mockDeviceCfgCheck, mockCertCheck, mockAaiCfgCheck) {
+        mockedDeviceCfgCheckFunction.mockResolvedValue(mockDeviceCfgCheck);
+        mockedCertCheckFunction.mockResolvedValue(mockCertCheck);
+        mockedAaiCfgCheckFunction.mockResolvedValue(mockAaiCfgCheck);
+    }
+    it('test return value when checkDeviceConfigPresent is false', async () => {
+        setupMocks(false, true, true);
+        const newConfigsPresent = await (0, required_config_checks_1.requiredConfigFilesPresentAndValid)();
+        expect(newConfigsPresent).toBe(false);
+    });
+    it('test return value when checkCertificatesPresent is false', async () => {
+        setupMocks(true, false, false);
+        const newConfigsPresent = await (0, required_config_checks_1.requiredConfigFilesPresentAndValid)();
+        expect(newConfigsPresent).toBe(false);
+    });
+    it('test return value when checkAaiConfigPresent is false', async () => {
+        setupMocks(true, true, false);
+        const newConfigsPresent = await (0, required_config_checks_1.requiredConfigFilesPresentAndValid)();
+        expect(newConfigsPresent).toBe(false);
+    });
+    it('test return value when all included functions return true', async () => {
+        setupMocks(true, true, true);
+        expect(await (0, required_config_checks_1.requiredConfigFilesPresentAndValid)()).toBe(true);
+    });
+});
+//# sourceMappingURL=require-files-present-ready.test.js.map

package/lib/infrastructure/require-files-present-ready.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"require-files-present-ready.test.js","sourceRoot":"","sources":["../../src/infrastructure/require-files-present-ready.test.ts"],"names":[],"mappings":";;AAAA,iEAIgC;AAChC,qEAA8E;AAE9E,MAAM,4BAA4B,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;AAC/C,MAAM,uBAAuB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;AAC1C,MAAM,yBAAyB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;AAE5C,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AAEpC,IAAI;KACD,MAAM,CAAC,4CAAqB,CAAC;KAC7B,kBAAkB,CAAC,yBAAyB,CAAC,CAAC;AACjD,IAAI;KACD,MAAM,CAAC,+CAAwB,CAAC;KAChC,kBAAkB,CAAC,4BAA4B,CAAC,CAAC;AACpD,IAAI;KACD,MAAM,CAAC,+CAAwB,CAAC;KAChC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;AAE/C,QAAQ,CAAC,yCAAyC,EAAE,GAAG,EAAE;IACvD,SAAS,UAAU,CAAC,kBAAkB,EAAE,aAAa,EAAE,eAAe;QACpE,4BAA4B,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QACnE,uBAAuB,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QACzD,yBAAyB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;IAC/D,CAAC;IAED,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACxE,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC9B,MAAM,iBAAiB,GAAG,MAAM,IAAA,2DAAkC,GAAE,CAAC;QACrE,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACxE,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC/B,MAAM,iBAAiB,GAAG,MAAM,IAAA,2DAAkC,GAAE,CAAC;QACrE,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,iBAAiB,GAAG,MAAM,IAAA,2DAAkC,GAAE,CAAC;QACrE,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC7B,MAAM,CAAC,MAAM,IAAA,2DAAkC,GAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/infrastructure/required-config-checks.d.ts

@@ -0,0 +1,2 @@
+export declare function requiredConfigFilesPresentAndValid(baseDir?: any): Promise<boolean>;
+//# sourceMappingURL=required-config-checks.d.ts.map

package/lib/infrastructure/required-config-checks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"required-config-checks.d.ts","sourceRoot":"","sources":["../../src/infrastructure/required-config-checks.ts"],"names":[],"mappings":"AAOA,wBAAsB,kCAAkC,CAAC,OAAO,CAAC,KAAA,oBAyBhE"}

package/lib/infrastructure/required-config-checks.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requiredConfigFilesPresentAndValid = void 0;
+const logger_1 = require("../util/logger");
+const config_check_utility_1 = require("./config-check-utility");
+async function requiredConfigFilesPresentAndValid(baseDir) {
+    // we need device/certificates, alwaysai.config.json, and device/alwaysai.device.json
+    logger_1.logger.debug('Checking for required configuration files.');
+    const newDeviceConfigPresent = await (0, config_check_utility_1.checkDeviceConfigPresent)(baseDir);
+    if (!newDeviceConfigPresent) {
+        logger_1.logger.debug('Required device configuration is not present and valid.');
+        return false;
+    }
+    // check new certificates are present
+    const certificatesPresent = await (0, config_check_utility_1.checkCertificatesPresent)(baseDir);
+    if (!certificatesPresent) {
+        logger_1.logger.debug('Required certificates paths not found.');
+        return false;
+    }
+    // TODO: add alwaysai.config.json check here
+    const aaiConfigPresent = await (0, config_check_utility_1.checkAaiConfigPresent)(baseDir);
+    if (!aaiConfigPresent) {
+        logger_1.logger.debug('Required aai configuration file is not present and valid.');
+        return false;
+    }
+    logger_1.logger.debug('All configuration files appear to be present.');
+    return true;
+}
+exports.requiredConfigFilesPresentAndValid = requiredConfigFilesPresentAndValid;
+//# sourceMappingURL=required-config-checks.js.map

package/lib/infrastructure/required-config-checks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"required-config-checks.js","sourceRoot":"","sources":["../../src/infrastructure/required-config-checks.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,iEAIgC;AAEzB,KAAK,UAAU,kCAAkC,CAAC,OAAQ;IAC/D,qFAAqF;IACrF,eAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAC3D,MAAM,sBAAsB,GAAG,MAAM,IAAA,+CAAwB,EAAC,OAAO,CAAC,CAAC;IACvE,IAAI,CAAC,sBAAsB,EAAE;QAC3B,eAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;QACxE,OAAO,KAAK,CAAC;KACd;IAED,qCAAqC;IACrC,MAAM,mBAAmB,GAAG,MAAM,IAAA,+CAAwB,EAAC,OAAO,CAAC,CAAC;IACpE,IAAI,CAAC,mBAAmB,EAAE;QACxB,eAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACvD,OAAO,KAAK,CAAC;KACd;IAED,4CAA4C;IAC5C,MAAM,gBAAgB,GAAG,MAAM,IAAA,4CAAqB,EAAC,OAAO,CAAC,CAAC;IAC9D,IAAI,CAAC,gBAAgB,EAAE;QACrB,eAAM,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAC1E,OAAO,KAAK,CAAC;KACd;IAED,eAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;IAC9D,OAAO,IAAI,CAAC;AACd,CAAC;AAzBD,gFAyBC"}

package/lib/infrastructure/tokens-and-device-cfg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokens-and-device-cfg.d.ts","sourceRoot":"","sources":["../../src/infrastructure/tokens-and-device-cfg.ts"],"names":[],"mappings":"AAYA,wBAAsB,sBAAsB,CAAC,KAAK,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,iBAqBzE"}
+{"version":3,"file":"tokens-and-device-cfg.d.ts","sourceRoot":"","sources":["../../src/infrastructure/tokens-and-device-cfg.ts"],"names":[],"mappings":"AAaA,wBAAsB,sBAAsB,CAAC,KAAK,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,iBAsBzE"}

package/lib/infrastructure/tokens-and-device-cfg.js

@@ -1,26 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeTokenAndDeviceCfg = void 0;
-const logger_1 = require("../util/logger");
-const http_client_1 = require("../util/http-client");
-const require_logged_in_and_paid_plan_1 = require("../util/require-logged-in-and-paid-plan");
 const device_1 = require("alwaysai/lib/core/device");
-const util_1 = require("alwaysai/lib/util");
+const infrastructure_1 = require("alwaysai/lib/infrastructure");
 const paths_1 = require("alwaysai/lib/paths");
+const util_1 = require("alwaysai/lib/util");
+const path_1 = require("path");
+const http_client_1 = require("../util/http-client");
+const logger_1 = require("../util/logger");
+const require_logged_in_and_paid_plan_1 = require("../util/require-logged-in-and-paid-plan");
 // NOTE: This closely follows the flow of deviceCheckAndUpdateComponent in the CLI
 async function writeTokenAndDeviceCfg(props) {
     const { deviceUuid } = props;
     await (0, require_logged_in_and_paid_plan_1.requireLoggedInAndPaidPlan)();
     const { accessToken, refreshToken, idToken } = await (0, http_client_1.microServiceHttpClient)('token-service', 'create-device-tokens', 'POST', JSON.stringify({}));
     const tokens = {
-        deviceId: deviceUuid,
+        deviceUuid,
         accessToken,
         refreshToken,
         idToken
     };
-    const tokenSpawner = (0, util_1.JsSpawner)({ path: paths_1.LOCAL_AAI_CFG_DIR });
-    await (0, device_1.writeTokens)({ spawner: tokenSpawner, tokens });
-    await (0, device_1.writeOrValidateDeviceCfgFile)({ spawner: tokenSpawner, deviceUuid });
+    const tokenSpawner = (0, util_1.JsSpawner)({
+        path: (0, path_1.join)(paths_1.LOCAL_AAI_CFG_DIR, (0, infrastructure_1.getDeviceConfigPath)())
+    });
+    await (0, device_1.writeOrValidateDeviceCfgFile)(Object.assign({ spawner: tokenSpawner }, tokens));
     logger_1.logger.info('Updated tokens and certificate');
 }
 exports.writeTokenAndDeviceCfg = writeTokenAndDeviceCfg;

package/lib/infrastructure/tokens-and-device-cfg.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokens-and-device-cfg.js","sourceRoot":"","sources":["../../src/infrastructure/tokens-and-device-cfg.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,qDAA6D;AAC7D,6FAAqF;AACrF,qDAIkC;AAClC,4CAA8C;AAC9C,8CAAuD;AAEvD,kFAAkF;AAC3E,KAAK,UAAU,sBAAsB,CAAC,KAA6B;IACxE,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC7B,MAAM,IAAA,4DAA0B,GAAE,CAAC;IACnC,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,oCAAsB,EACzE,eAAe,EACf,sBAAsB,EACtB,MAAM,EACN,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CACnB,CAAC;IAEF,MAAM,MAAM,GAAiB;QAC3B,QAAQ,EAAE,UAAU;QACpB,WAAW;QACX,YAAY;QACZ,OAAO;KACR,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,gBAAS,EAAC,EAAE,IAAI,EAAE,yBAAiB,EAAE,CAAC,CAAC;IAC5D,MAAM,IAAA,oBAAW,EAAC,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;IACrD,MAAM,IAAA,qCAA4B,EAAC,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC;IAE1E,eAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;AAChD,CAAC;AArBD,wDAqBC"}
+{"version":3,"file":"tokens-and-device-cfg.js","sourceRoot":"","sources":["../../src/infrastructure/tokens-and-device-cfg.ts"],"names":[],"mappings":";;;AAAA,qDAGkC;AAClC,gEAAkE;AAClE,8CAAuD;AACvD,4CAA8C;AAC9C,+BAA4B;AAC5B,qDAA6D;AAC7D,2CAAwC;AACxC,6FAAqF;AAErF,kFAAkF;AAC3E,KAAK,UAAU,sBAAsB,CAAC,KAA6B;IACxE,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC7B,MAAM,IAAA,4DAA0B,GAAE,CAAC;IACnC,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,oCAAsB,EACzE,eAAe,EACf,sBAAsB,EACtB,MAAM,EACN,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CACnB,CAAC;IAEF,MAAM,MAAM,GAAiB;QAC3B,UAAU;QACV,WAAW;QACX,YAAY;QACZ,OAAO;KACR,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,gBAAS,EAAC;QAC7B,IAAI,EAAE,IAAA,WAAI,EAAC,yBAAiB,EAAE,IAAA,oCAAmB,GAAE,CAAC;KACrD,CAAC,CAAC;IACH,MAAM,IAAA,qCAA4B,kBAAG,OAAO,EAAE,YAAY,IAAK,MAAM,EAAG,CAAC;IAEzE,eAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;AAChD,CAAC;AAtBD,wDAsBC"}

package/lib/local-connection/rabbitmq-connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq-connection.d.ts","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-connection.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,mBAAmB,qBAAqB,CAAC;AACtD,eAAO,MAAM,qBAAqB,8BAA8B,CAAC;AAEjE,wBAAsB,6BAA6B,qBAwBlD;AAED,wBAAsB,8BAA8B,kBAgCnD;AAED,wBAAsB,sBAAsB,kBA2B3C;AAED,wBAAsB,qBAAqB,kBAc1C"}
+{"version":3,"file":"rabbitmq-connection.d.ts","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-connection.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,mBAAmB,qBAAqB,CAAC;AACtD,eAAO,MAAM,qBAAqB,8BAA8B,CAAC;AAEjE,wBAAsB,6BAA6B,qBAwBlD;AAED,wBAAsB,8BAA8B,kBAgCnD;AAED,wBAAsB,sBAAsB,kBA+B3C;AAED,wBAAsB,qBAAqB,kBAgB1C"}

package/lib/local-connection/rabbitmq-connection.js

@@ -1,41 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stopRabbitMQContainer = exports.setupRabbitMQContainer = exports.writeRabbitMQDockerComposeFile = exports.checkRabbitMQContainerRunning = exports.rabbitMQContainerName = exports.rabbitMQServiceName = void 0;
-const logger_1 = require("../util/logger");
-const sleep_1 = require("../util/sleep");
-const docker_compose_1 = require("docker-compose");
+const util_1 = require("alwaysai/lib/util");
 const YAML = require("yaml");
+const docker_compose_1 = require("../docker/docker-compose");
 const directories_1 = require("../util/directories");
-const util_1 = require("alwaysai/lib/util");
+const logger_1 = require("../util/logger");
+const sleep_1 = require("../util/sleep");
 const constants_1 = require("./constants");
 exports.rabbitMQServiceName = 'alwaysAIRabbitMQ';
 exports.rabbitMQContainerName = 'alwaysAIRabbitMQContainer';
 async function checkRabbitMQContainerRunning() {
     logger_1.logger.debug('Checking alwaysAI Local Connection Container status');
     const spawner = (0, util_1.JsSpawner)();
-    if (!(await spawner.exists(directories_1.DEVICE_AGENT_DOCKER_COMPOSE_PATH))) {
+    if (!(await spawner.exists((0, directories_1.getDeviceAgentDockerComposePath)()))) {
         logger_1.logger.warn('alwaysAI Location Connection configuration file is not present');
         return false;
     }
-    const containerData = await docker_compose_1.default.ps({ cwd: directories_1.DEVICE_AGENT_CFG_PATH });
-    if (!(containerData === undefined)) {
+    const containerData = await docker_compose_1.compose.ps({ cwd: (0, directories_1.getDeviceAgentConfigPath)() });
+    if (containerData !== undefined) {
         const rabbitmqService = containerData.data.services[0];
-        if (rabbitmqService.name === exports.rabbitMQContainerName &&
-            rabbitmqService.state === 'Up') {
-            logger_1.logger.debug('alwaysAI Local Connection is running');
+        if ((rabbitmqService === null || rabbitmqService === void 0 ? void 0 : rabbitmqService.name) === exports.rabbitMQContainerName &&
+            rabbitmqService.state.includes('Up')) {
+            logger_1.logger.debug('alwaysAI Local Connection Container is up');
             return true;
         }
-        logger_1.logger.debug('alwaysAI Local Connection is not running');
+        logger_1.logger.debug('alwaysAI Local Connection Container is not up');
         return false;
     }
-    logger_1.logger.warn('alwaysAI Local Connection container was undefined');
+    logger_1.logger.warn('alwaysAI Local Connection Container is undefined');
     return false;
 }
 exports.checkRabbitMQContainerRunning = checkRabbitMQContainerRunning;
 async function writeRabbitMQDockerComposeFile() {
     const spawner = (0, util_1.JsSpawner)();
-    if (!(await spawner.exists(directories_1.DEVICE_AGENT_CFG_PATH))) {
-        await (0, util_1.JsSpawner)().mkdirp(directories_1.DEVICE_AGENT_CFG_PATH);
+    if (!(await spawner.exists((0, directories_1.getDeviceAgentConfigPath)()))) {
+        await (0, util_1.JsSpawner)().mkdirp((0, directories_1.getDeviceAgentConfigPath)());
     }
     logger_1.logger.debug(`Writing Local Connection Docker compose files with Local Connection port: ${constants_1.LOCAL_CONNECTION_PORT}`);
     const rabbitmqDockerComposeCmd = {
@@ -55,7 +55,7 @@ async function writeRabbitMQDockerComposeFile() {
         }
     };
     const RabbitMQDockerComposeYaml = YAML.stringify(rabbitmqDockerComposeCmd);
-    await spawner.writeFile(directories_1.DEVICE_AGENT_DOCKER_COMPOSE_PATH, RabbitMQDockerComposeYaml);
+    await spawner.writeFile((0, directories_1.getDeviceAgentDockerComposePath)(), RabbitMQDockerComposeYaml);
 }
 exports.writeRabbitMQDockerComposeFile = writeRabbitMQDockerComposeFile;
 async function setupRabbitMQContainer() {
@@ -64,11 +64,11 @@ async function setupRabbitMQContainer() {
         await writeRabbitMQDockerComposeFile();
     }
     catch (e) {
-        logger_1.logger.error(`An error occurred setting up docker-compose.yaml for Device Agent pass through:\n{e.message}`);
+        logger_1.logger.error(`An error occurred setting up docker-compose.yaml for Device Agent pass through!\n${(0, util_1.stringifyError)(e)}`);
     }
     try {
-        const upOut = await docker_compose_1.default.upAll({
-            cwd: directories_1.DEVICE_AGENT_CFG_PATH
+        const upOut = await docker_compose_1.compose.upAll({
+            cwd: (0, directories_1.getDeviceAgentConfigPath)()
         });
         logger_1.logger.debug(`Docker compose up for alwaysAI Local Connection:\n${JSON.stringify(upOut)}`);
         // check if the container is up
@@ -77,18 +77,18 @@ async function setupRabbitMQContainer() {
         }
     }
     catch (e) {
-        logger_1.logger.error(`Unable to start alwaysAI Device Agent Local Connection Container:\n${e.messaage}`);
+        logger_1.logger.error(`Unable to start alwaysAI Device Agent Local Connection Container!\n${(0, util_1.stringifyError)(e)}`);
     }
 }
 exports.setupRabbitMQContainer = setupRabbitMQContainer;
 async function stopRabbitMQContainer() {
     try {
-        const downOut = await docker_compose_1.default.down({ cwd: directories_1.DEVICE_AGENT_CFG_PATH });
+        const downOut = await docker_compose_1.compose.down({ cwd: (0, directories_1.getDeviceAgentConfigPath)() });
         logger_1.logger.debug(`Stopping alwaysAI Local Connection container`);
         logger_1.logger.debug(`Docker compose down for alwaysAI Local Connection:\n${JSON.stringify(downOut)}`);
     }
     catch (e) {
-        logger_1.logger.error(`Unable to stop alwaysAI Device Agent Local Connection Container:\n${e.message}`);
+        logger_1.logger.error(`Unable to stop alwaysAI Device Agent Local Connection Container!\n${(0, util_1.stringifyError)(e)}`);
     }
 }
 exports.stopRabbitMQContainer = stopRabbitMQContainer;

package/lib/local-connection/rabbitmq-connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq-connection.js","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-connection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rabbitmq-connection.js","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-connection.ts"],"names":[],"mappings":"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"}

package/lib/secure-tunneling/secure-tunneling.d.ts

@@ -1,23 +1,15 @@
-export declare type SecureTunnelPortInfo = {
-    enabled: boolean;
-    type: string;
-    ip: string;
-    port: number;
-};
-export declare type SecureTunnelShadowDesRep = {
-    st_ports: SecureTunnelPortInfo[];
-};
+import { SecureTunnelShadowUpdate } from '@alwaysai/device-agent-schemas';
 export declare type SecureTunnelShadowState = {
-    reported?: SecureTunnelShadowDesRep;
-    desired?: SecureTunnelShadowDesRep;
+    reported?: SecureTunnelShadowUpdate;
+    desired?: SecureTunnelShadowUpdate;
 };
 export declare type SecureTunnelShadowUpdateDelta = {
     version: number;
     timestamp: number;
-    state: SecureTunnelShadowDesRep;
+    state: SecureTunnelShadowUpdate;
     metadata?: any;
 };
-export declare type SecureTunnelShadowUpdate = {
+export declare type SecureTunnelShadow = {
     version: number;
     state: SecureTunnelShadowState;
 };
@@ -33,7 +25,7 @@ export declare class SecureTunnelHandlerSingleton {
     private static instance;
     private reported;
     private httpProxyMap;
-    private localproxyInfo;
+    private localProxyInfo;
     /**
      * Initializes private variables of SecureTunnel handler.
      * private constructor to prevent instantiation from outside
@@ -49,15 +41,15 @@ export declare class SecureTunnelHandlerSingleton {
     destroy(): Promise<void>;
     /**
      * Returns current state of SecureTunnel shadow
-     * @returns {SecureTunnelShadowDesRep} - reported state of the SecureTunnel shadow
+     * @returns {SecureTunnelShadowUpdate} - reported state of the SecureTunnel shadow
      */
-    getSecureTunnelShadow(): SecureTunnelShadowDesRep;
+    getSecureTunnelShadow(): SecureTunnelShadowUpdate;
     /**
      * Updates current state of SecureTunnel shadow
      * @param {SecureTunnelShadowUpdateDelta} deltaMsg - delta message, which includes desired state of the SecureTunnel shadow
-     * @return {SecureTunnelShadowDesRep} update reported message to send back to AWS IoT device shadow
+     * @return {SecureTunnelShadowUpdate} update reported message to send back to AWS IoT device shadow
      */
-    syncShadowToDeviceState(deltaMsg: SecureTunnelShadowUpdateDelta): Promise<SecureTunnelShadowDesRep>;
+    syncShadowToDeviceState(deltaMsg: SecureTunnelShadowUpdateDelta): Promise<SecureTunnelShadowUpdate>;
     /**
      * Starts SecureTunnel
      * @param {SecureTunnelNotificationType} message - AWS notification received
@@ -79,20 +71,20 @@ export declare class SecureTunnelHandlerSingleton {
      */
     private stopProxyMapping;
     /**
-     * Starts SecureTunnel localproxy process
+     * Starts SecureTunnel localProxy process
      */
-    private startLocalproxy;
+    private startLocalProxy;
     /**
-     * Stops SecureTunnel localproxy process
+     * Stops SecureTunnel local proxy process
      */
-    private stopLocalproxy;
+    private stopLocalProxy;
     /**
      * processes and validate notify message
      * @param {string[]} message - message, which contains: clientAccessToken, region, services
      */
     private processNotifyMessage;
     /**
-     * Downloads SecureTunnel localproxy, if it was not downloaded before
+     * Downloads SecureTunnel local proxy, if it was not downloaded before
      */
     private downloadSecureTunnel;
     /**

package/lib/secure-tunneling/secure-tunneling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secure-tunneling.d.ts","sourceRoot":"","sources":["../../src/secure-tunneling/secure-tunneling.ts"],"names":[],"mappings":"AAsBA,oBAAY,oBAAoB,GAAG;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,oBAAY,wBAAwB,GAAG;IACrC,QAAQ,EAAE,oBAAoB,EAAE,CAAC;CAClC,CAAC;AAEF,oBAAY,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,wBAAwB,CAAC;IACpC,OAAO,CAAC,EAAE,wBAAwB,CAAC;CACpC,CAAC;AAEF,oBAAY,6BAA6B,GAAG;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,wBAAwB,CAAC;IAChC,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,CAAC;AAEF,oBAAY,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,uBAAuB,CAAC;CAChC,CAAC;AAsBF,aAAK,4BAA4B,GAAG;IAClC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAMF;;GAEG;AACH,qBAAa,4BAA4B;IACvC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA+B;IACtD,OAAO,CAAC,QAAQ,CAA2B;IAC3C,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,CAAC,cAAc,CAA6B;IAEnD;;;OAGG;IACH,OAAO;IAqBP;;OAEG;WACW,WAAW,IAAI,4BAA4B;IAUzD;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBrC;;;OAGG;IACI,qBAAqB,IAAI,wBAAwB;IAOxD;;;;OAIG;IACU,uBAAuB,CAClC,QAAQ,EAAE,6BAA6B,GACtC,OAAO,CAAC,wBAAwB,CAAC;IA0DpC;;;OAGG;IACU,yBAAyB,CACpC,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,IAAI,CAAC;IAmBhB;;;OAGG;YACW,oBAAoB;IAkClC;;;OAGG;YACW,iBAAiB;IA+C/B;;;OAGG;YACW,gBAAgB;IA2C9B;;OAEG;YACW,eAAe;IAuB7B;;OAEG;YACW,cAAc;IA4B5B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAmF5B;;OAEG;YACW,oBAAoB;IA8BlC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,SAAS;CAmBlB"}
+{"version":3,"file":"secure-tunneling.d.ts","sourceRoot":"","sources":["../../src/secure-tunneling/secure-tunneling.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,wBAAwB,EACzB,MAAM,gCAAgC,CAAC;AAuBxC,oBAAY,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,wBAAwB,CAAC;IACpC,OAAO,CAAC,EAAE,wBAAwB,CAAC;CACpC,CAAC;AAEF,oBAAY,6BAA6B,GAAG;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,wBAAwB,CAAC;IAChC,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,CAAC;AAEF,oBAAY,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,uBAAuB,CAAC;CAChC,CAAC;AAsBF,aAAK,4BAA4B,GAAG;IAClC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAMF;;GAEG;AACH,qBAAa,4BAA4B;IACvC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA+B;IACtD,OAAO,CAAC,QAAQ,CAA2B;IAC3C,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,CAAC,cAAc,CAA6B;IAEnD;;;OAGG;IACH,OAAO;IAqBP;;OAEG;WACW,WAAW,IAAI,4BAA4B;IAUzD;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBrC;;;OAGG;IACI,qBAAqB,IAAI,wBAAwB;IAOxD;;;;OAIG;IACU,uBAAuB,CAClC,QAAQ,EAAE,6BAA6B,GACtC,OAAO,CAAC,wBAAwB,CAAC;IA0DpC;;;OAGG;IACU,yBAAyB,CACpC,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,IAAI,CAAC;IAmBhB;;;OAGG;YACW,oBAAoB;IAkClC;;;OAGG;YACW,iBAAiB;IAiD/B;;;OAGG;YACW,gBAAgB;IA2C9B;;OAEG;YACW,eAAe;IAuB7B;;OAEG;YACW,cAAc;IA4B5B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAmF5B;;OAEG;YACW,oBAAoB;IAwClC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,SAAS;CAmBlB"}

package/lib/secure-tunneling/secure-tunneling.js

@@ -5,12 +5,12 @@ const paths_1 = require("alwaysai/lib/paths");
 const util_1 = require("alwaysai/lib/util");
 const path_1 = require("path");
 const urls_1 = require("../urls");
-const cloud_mode_ready_1 = require("../util/cloud-mode-ready");
+const aws_regions_1 = require("../util/aws-regions");
 const directories_1 = require("../util/directories");
-const download_file_1 = require("../util/download-file");
 const logger_1 = require("../util/logger");
 const system_info_1 = require("../util/system-info");
 const spawner_detached_1 = require("./spawner-detached");
+const file_1 = require("../util/file");
 var SecureTunnelServiceType;
 (function (SecureTunnelServiceType) {
     SecureTunnelServiceType["SSH"] = "SSH";
@@ -39,7 +39,7 @@ class SecureTunnelHandlerSingleton {
             st_ports: [JSON.parse(JSON.stringify(defaultSecureTunnelPortInfo))]
         };
         this.httpProxyMap = [];
-        this.localproxyInfo = {
+        this.localProxyInfo = {
             lpDstAccessKey: '',
             lpRegion: '',
             lpServices: '',
@@ -83,12 +83,12 @@ class SecureTunnelHandlerSingleton {
         };
         logger_1.logger.debug(`httpProxyMap after : ${JSON.stringify(this.httpProxyMap)}`);
         logger_1.logger.debug(`reported after     : ${JSON.stringify(this.reported)}`);
-        await this.stopLocalproxy();
+        await this.stopLocalProxy();
         logger_1.logger.debug('<- SecureTunnelHandlerSingleton.destroy');
     }
     /**
      * Returns current state of SecureTunnel shadow
-     * @returns {SecureTunnelShadowDesRep} - reported state of the SecureTunnel shadow
+     * @returns {SecureTunnelShadowUpdate} - reported state of the SecureTunnel shadow
      */
     getSecureTunnelShadow() {
         logger_1.logger.debug('-> SecureTunnelHandlerSingleton.getSecureTunnelShadow');
@@ -99,7 +99,7 @@ class SecureTunnelHandlerSingleton {
     /**
      * Updates current state of SecureTunnel shadow
      * @param {SecureTunnelShadowUpdateDelta} deltaMsg - delta message, which includes desired state of the SecureTunnel shadow
-     * @return {SecureTunnelShadowDesRep} update reported message to send back to AWS IoT device shadow
+     * @return {SecureTunnelShadowUpdate} update reported message to send back to AWS IoT device shadow
      */
     async syncShadowToDeviceState(deltaMsg) {
         logger_1.logger.debug('-> SecureTunnelHandlerSingleton.syncShadowToDeviceState');
@@ -140,7 +140,7 @@ class SecureTunnelHandlerSingleton {
         }
         // if all entries are disabled, we need also to kill local proxy
         if (this.reported.st_ports.every((portInfo) => !portInfo.enabled)) {
-            await this.stopLocalproxy();
+            await this.stopLocalProxy();
         }
         // need to order list in the same order as desired before sending back
         const sortedPorts = this.sortPorts(state);
@@ -155,15 +155,15 @@ class SecureTunnelHandlerSingleton {
     async secureTunnelNotifyHandler(message) {
         logger_1.logger.debug('-> SecureTunnelHandlerSingleton.secureTunnelNotifyHandler');
         try {
-            await this.stopLocalproxy();
+            await this.stopLocalProxy();
             this.processNotifyMessage(message);
             await this.downloadSecureTunnel();
-            await this.startLocalproxy();
+            await this.startLocalProxy();
         }
-        catch (error) {
-            logger_1.logger.error(error);
+        catch (e) {
+            logger_1.logger.error((0, util_1.stringifyError)(e));
         }
-        logger_1.logger.info(`Local Proxy Started: ${JSON.stringify(this.localproxyInfo)}`);
+        logger_1.logger.info(`Local Proxy Started: ${JSON.stringify(this.localProxyInfo)}`);
         logger_1.logger.debug('<- SecureTunnelHandlerSingleton.secureTunnelNotifyHandler');
     }
     //---------------------------------------------------------------------------
@@ -229,8 +229,8 @@ class SecureTunnelHandlerSingleton {
             });
             logger_1.logger.info(`Started Port Proxy Mapping for: ${JSON.stringify(this.httpProxyMap[this.httpProxyMap.length - 1])}`);
         }
-        catch (error) {
-            logger_1.logger.error(`ERROR: starting socat for: ${portInfo.ip}:${portInfo.port} on localhost port: ${localPort}, error: ${error}`);
+        catch (e) {
+            logger_1.logger.error(`ERROR: starting socat for: ${portInfo.ip}:${portInfo.port} on localhost port: ${localPort}\nerror:\n${(0, util_1.stringifyError)(e)}`);
             const lastHttpProxyMap = this.httpProxyMap.pop();
             logger_1.logger.info(`removed last proxyMap: ${JSON.stringify(lastHttpProxyMap)}`);
         }
@@ -259,7 +259,7 @@ class SecureTunnelHandlerSingleton {
                 logger_1.logger.debug(`Remaining map: ${JSON.stringify(this.httpProxyMap)}`);
             }
             catch (e) {
-                logger_1.logger.error('ERROR: killing socat process:', e);
+                logger_1.logger.error(`ERROR: killing socat process:\n${(0, util_1.stringifyError)(e)}`);
             }
             logger_1.logger.debug(`Removing map: ${JSON.stringify(this.httpProxyMap[itemIndex])}`);
             this.httpProxyMap.splice(itemIndex, 1);
@@ -267,52 +267,52 @@ class SecureTunnelHandlerSingleton {
         logger_1.logger.debug('<- SecureTunnelHandlerSingleton.stopProxyMapping');
     }
     /**
-     * Starts SecureTunnel localproxy process
+     * Starts SecureTunnel localProxy process
      */
-    async startLocalproxy() {
-        logger_1.logger.debug('-> SecureTunnelHandlerSingleton.startLocalproxy');
+    async startLocalProxy() {
+        logger_1.logger.debug('-> SecureTunnelHandlerSingleton.startLocalProxy');
         const args = [
             '--destination-app',
-            this.localproxyInfo.lpServices,
+            this.localProxyInfo.lpServices,
             '--region',
-            this.localproxyInfo.lpRegion,
+            this.localProxyInfo.lpRegion,
             '--capath',
             directories_1.AWS_ROOT_CERTIFICATE_FILE_PATH,
             '--local-bind-address',
             '0.0.0.0',
             '-t',
-            this.localproxyInfo.lpDstAccessKey
+            this.localProxyInfo.lpDstAccessKey
         ];
-        this.localproxyInfo.lpProcess = await (0, spawner_detached_1.runDetachedProcess)(directories_1.SECURE_TUNNEL_BIN_PATH, args);
-        logger_1.logger.debug('<- SecureTunnelHandlerSingleton.startLocalproxy');
+        this.localProxyInfo.lpProcess = await (0, spawner_detached_1.runDetachedProcess)(directories_1.SECURE_TUNNEL_BIN_PATH, args);
+        logger_1.logger.debug('<- SecureTunnelHandlerSingleton.startLocalProxy');
     }
     /**
-     * Stops SecureTunnel localproxy process
+     * Stops SecureTunnel local proxy process
      */
-    async stopLocalproxy() {
-        logger_1.logger.debug('-> SecureTunnelHandlerSingleton.stopLocalproxy');
-        if (!this.localproxyInfo.lpProcess) {
-            logger_1.logger.debug('No localproxy process running');
-            logger_1.logger.debug('<- SecureTunnelHandlerSingleton.stopLocalproxy');
+    async stopLocalProxy() {
+        logger_1.logger.debug('-> SecureTunnelHandlerSingleton.stopLocalProxy');
+        if (!this.localProxyInfo.lpProcess) {
+            logger_1.logger.debug('No local proxy process running');
+            logger_1.logger.debug('<- SecureTunnelHandlerSingleton.stopLocalProxy');
             return;
         }
         try {
-            logger_1.logger.debug(`About to kill localproxy: ${this.localproxyInfo.lpDstAccessKey}`);
-            await (0, spawner_detached_1.killDetachedProcess)(this.localproxyInfo.lpProcess, [
+            logger_1.logger.debug(`About to kill local proxy: ${this.localProxyInfo.lpDstAccessKey}`);
+            await (0, spawner_detached_1.killDetachedProcess)(this.localProxyInfo.lpProcess, [
                 directories_1.SECURE_TUNNEL_BIN_PATH
             ]);
-            logger_1.logger.debug('SUCCESS: killing localproxy process');
+            logger_1.logger.debug('SUCCESS: killing local proxy process');
         }
         catch (e) {
-            logger_1.logger.error('ERROR: killing localproxy process:', e);
+            logger_1.logger.error(`ERROR: killing local proxy process:\n${(0, util_1.stringifyError)(e)}`);
         }
-        this.localproxyInfo = {
+        this.localProxyInfo = {
             lpDstAccessKey: '',
             lpRegion: '',
             lpServices: '',
             lpProcess: null
         };
-        logger_1.logger.debug('<- SecureTunnelHandlerSingleton.stopLocalproxy');
+        logger_1.logger.debug('<- SecureTunnelHandlerSingleton.stopLocalProxy');
     }
     /**
      * processes and validate notify message
@@ -325,7 +325,7 @@ class SecureTunnelHandlerSingleton {
         if (clientAccessToken === '') {
             throw new Error('ERROR: invalid destination access token');
         }
-        if (!(0, cloud_mode_ready_1.isValidAwsRegion)(region)) {
+        if (!(0, aws_regions_1.isValidAwsRegion)(region)) {
             throw new Error(`ERROR: invalid/unsupported region: ${region}`);
         }
         if (services.length === 0) {
@@ -366,15 +366,15 @@ class SecureTunnelHandlerSingleton {
                 portMappingList.push(`${port}=${this.httpProxyMap[index].localhostPort}`);
             });
         }
-        this.localproxyInfo.lpDstAccessKey = clientAccessToken;
-        this.localproxyInfo.lpRegion = region;
-        this.localproxyInfo.lpServices = portMappingList.join(',');
+        this.localProxyInfo.lpDstAccessKey = clientAccessToken;
+        this.localProxyInfo.lpRegion = region;
+        this.localProxyInfo.lpServices = portMappingList.join(',');
         logger_1.logger.debug(`reported =  ${JSON.stringify(this.reported.st_ports)}`);
-        logger_1.logger.debug(`localproxyInfo =  ${JSON.stringify(this.localproxyInfo)}`);
+        logger_1.logger.debug(`localProxyInfo =  ${JSON.stringify(this.localProxyInfo)}`);
         logger_1.logger.debug('<- SecureTunnelHandlerSingleton.processNotifyMessage');
     }
     /**
-     * Downloads SecureTunnel localproxy, if it was not downloaded before
+     * Downloads SecureTunnel local proxy, if it was not downloaded before
      */
     async downloadSecureTunnel() {
         logger_1.logger.debug('-> SecureTunnelHandlerSingleton.downloadSecureTunnel');
@@ -387,14 +387,19 @@ class SecureTunnelHandlerSingleton {
             (0, system_info_1.getDistribution)(),
             (0, system_info_1.getOsVersion)()
         ]);
-        logger_1.logger.info('Downloading SecureTunnel localproxy ...');
+        logger_1.logger.info('Downloading SecureTunnel local proxy ...');
         const url = `${urls_1.aaiArtifactsBucketUrl}/securetunnel/${linuxDistro}/${osVersion}/${arch}/${directories_1.SECURE_TUNNEL_BIN_NAME}`;
         await (0, util_1.JsSpawner)().mkdirp((0, path_1.join)(paths_1.AAI_DIR, directories_1.SECURE_TUNNEL_BIN_DIR));
-        await (0, download_file_1.downloadFile)({
-            url,
-            path: directories_1.SECURE_TUNNEL_BIN_PATH,
-            errorMessage: `Secure Tunnel bin for ${linuxDistro} ${osVersion} ${arch} not found}`
-        });
+        try {
+            await (0, file_1.downloadToFile)({
+                url,
+                path: directories_1.SECURE_TUNNEL_BIN_PATH
+            });
+        }
+        catch (error) {
+            logger_1.logger.error(`Secure Tunnel bin for ${linuxDistro} ${osVersion} ${arch} not found}: ${(0, util_1.stringifyError)(error)}`);
+            throw new Error(`Secure Tunnel bin for ${linuxDistro} ${osVersion} ${arch} not found}`);
+        }
         await (0, util_1.JsSpawner)().run({
             exe: 'chmod',
             args: ['+x', directories_1.SECURE_TUNNEL_BIN_PATH]