@alwaysai/device-agent 2.0.0 → 2.0.1

package/lib/secure-tunneling/secure-tunnel-message-handler.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SecureTunnelMessageHandler = void 0;
+const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
+const logger_1 = require("../util/logger");
+const base_message_handler_1 = require("../cloud-connection/base-message-handler");
+class SecureTunnelMessageHandler extends base_message_handler_1.BaseHandler {
+    getNotifyTopic() {
+        return `$aws/things/${this.clientId}/tunnels/notify`;
+    }
+    async handle(message, topic) {
+        const secureTunnelNotifyTopic = this.getNotifyTopic();
+        if (topic === secureTunnelNotifyTopic) {
+            await this.secureTunnelHandler.secureTunnelNotifyHandler(message);
+        }
+        else if (topic === this.shadowHandler.shadowTopics.secureTunnel.updateDelta) {
+            logger_1.logger.info(`Received secure tunnel update: ${JSON.stringify(message)}`);
+            await this.handleSecureTunnelMessage(message);
+        }
+        else if (topic === this.shadowHandler.shadowTopics.secureTunnel.deleteAccepted) {
+            logger_1.logger.info(`Received secure tunnel deleteAccepted: ${message}`);
+            await this.secureTunnelHandler.destroy();
+        }
+    }
+    async handleSecureTunnelMessage(payload) {
+        logger_1.logger.info(`Received secure tunnel update: ${JSON.stringify(payload)}`);
+        const state = (0, device_agent_schemas_1.getUpdateDeltaStateFromMessage)(payload);
+        if (!state) {
+            logger_1.logger.debug(`No state found in message: ${JSON.stringify(payload)}`);
+            return;
+        }
+        const valid = (0, device_agent_schemas_1.validateSecureTunnelShadowUpdate)(state);
+        if (!valid) {
+            logger_1.logger.error(`Error validating message: ${JSON.stringify({ payload, errors: device_agent_schemas_1.validateSecureTunnelShadowUpdate.errors }, null, 2)}`);
+            return;
+        }
+        const secureTunnelUpdate = await this.secureTunnelHandler.syncShadowToDeviceState(payload);
+        await this.shadowHandler.updateSecureTunnelShadow(secureTunnelUpdate);
+    }
+}
+exports.SecureTunnelMessageHandler = SecureTunnelMessageHandler;
+//# sourceMappingURL=secure-tunnel-message-handler.js.map

package/lib/secure-tunneling/secure-tunnel-message-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"secure-tunnel-message-handler.js","sourceRoot":"","sources":["../../src/secure-tunneling/secure-tunnel-message-handler.ts"],"names":[],"mappings":";;;AAAA,yEAGwC;AAExC,2CAAwC;AACxC,mFAAuE;AAEvE,MAAa,0BACX,SAAQ,kCAAW;IAGZ,cAAc;QACnB,OAAO,eAAe,IAAI,CAAC,QAAQ,iBAAiB,CAAC;IACvD,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAY,EAAE,KAAa;QAC7C,MAAM,uBAAuB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACtD,IAAI,KAAK,KAAK,uBAAuB,EAAE;YACrC,MAAM,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;SACnE;aAAM,IACL,KAAK,KAAK,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,YAAY,CAAC,WAAW,EAClE;YACA,eAAM,CAAC,IAAI,CAAC,kCAAkC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACzE,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;SAC/C;aAAM,IACL,KAAK,KAAK,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,YAAY,CAAC,cAAc,EACrE;YACA,eAAM,CAAC,IAAI,CAAC,0CAA0C,OAAO,EAAE,CAAC,CAAC;YACjE,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;SAC1C;IACH,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,OAAY;QACjD,eAAM,CAAC,IAAI,CAAC,kCAAkC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzE,MAAM,KAAK,GAAG,IAAA,qDAA8B,EAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,EAAE;YACV,eAAM,CAAC,KAAK,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACtE,OAAO;SACR;QACD,MAAM,KAAK,GAAG,IAAA,uDAAgC,EAAC,KAAK,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,EAAE;YACV,eAAM,CAAC,KAAK,CACV,6BAA6B,IAAI,CAAC,SAAS,CACzC,EAAE,OAAO,EAAE,MAAM,EAAE,uDAAgC,CAAC,MAAM,EAAE,EAC5D,IAAI,EACJ,CAAC,CACF,EAAE,CACJ,CAAC;YACF,OAAO;SACR;QACD,MAAM,kBAAkB,GACtB,MAAM,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,CAAC;IACxE,CAAC;CACF;AA/CD,gEA+CC"}

package/lib/subcommands/app/version.d.ts

@@ -3,6 +3,8 @@ export declare const installAppCliLeaf: import("@alwaysai/alwayscli/lib/types").
     project: import("@alwaysai/alwayscli").CliInput<string, true>;
     'release-hash': import("@alwaysai/alwayscli").CliInput<string | undefined, false>;
     releaseHash: import("@alwaysai/alwayscli").CliInput<string | undefined, false>;
+    appCfg: import("@alwaysai/alwayscli").CliInput<string | undefined, false>;
+    envVars: import("@alwaysai/alwayscli").CliInput<string | undefined, false>;
 }, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
 export declare const uninstallAppCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, {
     project: import("@alwaysai/alwayscli").CliInput<string, true>;

package/lib/subcommands/app/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/version.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,eAAe,yKAQ1B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;4DAgD5B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DA6B9B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;4DAc7B,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/version.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,eAAe,yKAQ1B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;4DAkE5B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DA6B9B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;4DAc7B,CAAC"}

package/lib/subcommands/app/version.js

@@ -33,10 +33,20 @@ exports.installAppCliLeaf = (0, alwayscli_1.CliLeaf)({
             description: 'Release Hash',
             required: false,
             hidden: true
+        }),
+        appCfg: (0, alwayscli_1.CliStringInput)({
+            description: 'Application Configuration',
+            required: false,
+            hidden: true
+        }),
+        envVars: (0, alwayscli_1.CliStringInput)({
+            description: 'Environment Variables configuration',
+            hidden: true,
+            required: false
         })
     },
     async action(_, opts) {
-        const { project, releaseHash, 'release-hash': releaseHashNew } = opts;
+        const { project, releaseHash, 'release-hash': releaseHashNew, appCfg, envVars } = opts;
         if (releaseHash) {
             logger_1.logger.warn(`--releaseHash is deprecated and will be removed in a future release. Please switch to --release-hash`);
         }
@@ -54,7 +64,9 @@ exports.installAppCliLeaf = (0, alwayscli_1.CliLeaf)({
             payload: {
                 baseCommand: device_agent_schemas_1.keyMirrors.appVersionControl.install,
                 projectId: project,
-                appReleaseHash: releaseHashResolved
+                appReleaseHash: releaseHashResolved,
+                appCfg,
+                envVars
             }
         };
         await deviceAgent.handleMessage(topic, message);

package/lib/subcommands/app/version.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alwaysai/device-agent",
   "description": "The alwaysAI Device Agent",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "publishConfig": {
@@ -37,7 +37,7 @@
     "@alwaysai/alwayscli": "0.3.3",
     "@alwaysai/app-configuration-schemas": "0.2.0",
     "@alwaysai/config-nodejs": "0.3.3",
-    "@alwaysai/device-agent-schemas": "3.1.0",
+    "@alwaysai/device-agent-schemas": "3.3.0",
     "@carnesen/coded-error": "0.4.0",
     "ajv": "8.11.0",
     "alwaysai": "2.6.1",

package/src/application-control/environment-variables.ts

@@ -6,9 +6,11 @@ import { AgentConfigFile } from '../infrastructure/agent-config';
 import { isAppStarted, restartApp } from './status';
 import { EnvVars } from '@alwaysai/device-agent-schemas';
 
-export async function setEnv(props: { projectId: string; envVars: EnvVars }) {
+export async function setEnv(props: {
+  projectId: string;
+  envVars: EnvVars;
+}): Promise<void> {
   const { projectId, envVars } = props;
-  await requireAppReady({ projectId });
   const appReleaseHash = await AgentConfigFile().getAppVersion({
     projectId
   });
@@ -16,6 +18,33 @@ export async function setEnv(props: { projectId: string; envVars: EnvVars }) {
     projectId,
     version: appReleaseHash
   });
+  await setEnvInternal({ projectId, envVars });
+
+  const appDir = getAppDir(projectId);
+  await buildApp({ appDir });
+
+  await AgentConfigFile().setAppInstalled({
+    projectId,
+    version: appReleaseHash
+  });
+
+  if (await isAppStarted({ projectId })) {
+    await restartApp({ projectId });
+  }
+  logger.info(
+    `Updated environment variables for ${projectId}: ${JSON.stringify(
+      envVars,
+      null,
+      2
+    )}`
+  );
+}
+
+export async function setEnvInternal(props: {
+  projectId: string;
+  envVars: EnvVars;
+}): Promise<void> {
+  const { projectId, envVars } = props;
 
   const composeParsed = await readDockerCompose({ projectId });
   if (!('services' in composeParsed)) {
@@ -45,25 +74,6 @@ export async function setEnv(props: { projectId: string; envVars: EnvVars }) {
   });
 
   await writeDockerCompose({ projectId, dockerCompose: composeParsed });
-
-  const appDir = getAppDir(projectId);
-  await buildApp({ appDir });
-
-  await AgentConfigFile().setAppInstalled({
-    projectId,
-    version: appReleaseHash
-  });
-
-  if (await isAppStarted({ projectId })) {
-    await restartApp({ projectId });
-  }
-  logger.info(
-    `Updated environment variables for ${projectId}: ${JSON.stringify(
-      envVars,
-      null,
-      2
-    )}`
-  );
 }
 
 export function convertStringEnvsToKeyVal(stringEnvs: string[]) {

package/src/application-control/install.ts

@@ -4,7 +4,7 @@ import * as path from 'path';
 import { buildDockerImage } from 'alwaysai/lib/util/docker';
 import { JsSpawner, Spawner, stringifyError } from 'alwaysai/lib/util';
 import { getAppDir, buildApp } from './utils';
-import { AppDetails } from '@alwaysai/device-agent-schemas';
+import { AppDetails, EnvVars } from '@alwaysai/device-agent-schemas';
 import { BACKUP_EXT } from './backup';
 import { startApp, stopApp, isAppStarted } from './status';
 import { AgentConfigFile } from '../infrastructure/agent-config';
@@ -22,7 +22,7 @@ import { DOCKER_IMAGE_ID_INITIAL_VALUE } from 'alwaysai/lib/constants';
 import { runInDir } from '../util/run-in-dir';
 import { installModelsWithPresignedURLs } from './models';
 import { logger } from '../util/logger';
-import { updateAppCfgFile } from './config';
+import { updateAppCfgFile, writeAppCfgFile } from './config';
 import {
   LOCAL_CONNECTION_HOST,
   LOCAL_CONNECTION_PORT,
@@ -30,6 +30,8 @@ import {
 } from '../local-connection/constants';
 import { DOCKERFILE, PYTHON_REQUIREMENTS_FILE_NAME } from 'alwaysai/lib/paths';
 import { downloadToFile } from '../util/file';
+import { setEnvInternal } from './environment-variables';
+import { AppConfig } from '@alwaysai/app-configuration-schemas';
 
 type SignedUrlPayloadType = {
   appInstallPayload: {
@@ -56,8 +58,11 @@ export async function installApp(props: {
   projectId: string;
   appReleaseHash: string;
   signedUrlsPayload: SignedUrlPayloadType;
+  appCfg?: AppConfig;
+  envVars?: EnvVars;
 }): Promise<void> {
-  const { projectId, appReleaseHash, signedUrlsPayload } = props;
+  const { projectId, appReleaseHash, signedUrlsPayload, appCfg, envVars } =
+    props;
   logger.info(`Installing ${projectId}:${appReleaseHash}`);
 
   const appDir = getAppDir(projectId);
@@ -127,6 +132,22 @@ export async function installApp(props: {
     path.join(appDir, 'models')
   );
 
+  // See if there's appCfg or envVars in the transaction, and if so, apply it
+
+  if (appCfg) {
+    logger.debug(`applying appCfg: ${JSON.stringify(appCfg)}`);
+    await writeAppCfgFile({ projectId, appCfg });
+  }
+
+  if (envVars) {
+    logger.debug(`applying envVarUpdate: ${JSON.stringify(envVars)}`);
+    try {
+      await setEnvInternal({ projectId, envVars });
+    } catch (error) {
+      logger.error(`error is : ${error}`);
+    }
+  }
+
   await installAppBuildReqs({ appDir });
   await buildApp({ appDir });
 

package/src/application-control/utils.ts

@@ -74,4 +74,17 @@ export async function buildApp(props: { appDir: string }) {
       `Failed to build application! stdout=${buildOut.out} stderr=${buildOut.err}`
     );
   }
+
+  // Prune unused Docker resources after a successful build
+  logger.debug('Pruning docker system');
+  try {
+    const spawner = JsSpawner();
+    const pruneOut = await spawner.run({
+      exe: 'docker',
+      args: ['system', 'prune', '-f']
+    });
+    logger.debug(pruneOut);
+  } catch (error) {
+    logger.error(`Stderr occurred when pruning docker system: ${error}`);
+  }
 }

package/src/cloud-connection/base-message-handler.ts

@@ -0,0 +1,118 @@
+import { logger, stringifyError } from 'alwaysai/lib/util';
+import { uninstallApp, rollbackApp } from '../application-control';
+import { createAppBackup } from '../application-control/backup';
+import { AgentConfigFile } from '../infrastructure/agent-config';
+import { SecureTunnelHandlerSingleton } from '../secure-tunneling/secure-tunneling';
+import AaiError from '../util/aai-error';
+import { LiveUpdatesHandler } from './live-updates-handler';
+import { Publisher } from './publisher';
+import { ShadowHandler } from './shadow-handler';
+import {
+  TransactionManager,
+  ErrorFunction,
+  SuccessFunction
+} from './transaction-manager';
+
+export interface HandlerContext {
+  clientId: string;
+  txnMgr: TransactionManager;
+  publisher: Publisher;
+  shadowHandler: ShadowHandler;
+  liveUpdatesHandler: LiveUpdatesHandler;
+  secureTunnelHandler: SecureTunnelHandlerSingleton;
+}
+
+export abstract class BaseHandler {
+  protected clientId: string;
+  protected txnMgr: TransactionManager;
+  protected publisher: Publisher;
+  protected shadowHandler: ShadowHandler;
+  protected liveUpdatesHandler: LiveUpdatesHandler;
+  protected secureTunnelHandler: SecureTunnelHandlerSingleton;
+  protected readonly errorFn?: ErrorFunction;
+  protected readonly successFn?: SuccessFunction;
+
+  constructor(
+    context: HandlerContext,
+    errorFn?: ErrorFunction,
+    successFn?: SuccessFunction
+  ) {
+    this.clientId = context.clientId;
+    this.txnMgr = context.txnMgr;
+    this.publisher = context.publisher;
+    this.shadowHandler = context.shadowHandler;
+    this.liveUpdatesHandler = context.liveUpdatesHandler;
+    this.secureTunnelHandler = context.secureTunnelHandler;
+    this.errorFn = errorFn;
+    this.successFn = successFn;
+  }
+
+  protected async atomicApplicationUninstall(projectId: string) {
+    try {
+      await uninstallApp({ projectId });
+      this.shadowHandler.clearProjectShadow(projectId);
+    } catch (e) {
+      logger.error(`Failed to uninstall ${projectId}!\n${stringifyError(e)}`);
+      throw e;
+    }
+  }
+
+  protected async atomicApplicationUpdate<F extends () => any>(
+    func: F,
+    projectId: string,
+    skipUpdateShadow?: boolean
+  ): Promise<ReturnType<F>> {
+    if (await AgentConfigFile().isAppPresent({ projectId })) {
+      // Reject the application update if app is present but not ready
+      if (!(await AgentConfigFile().isAppReady({ projectId }))) {
+        throw new Error('Application already has installation in progress!');
+      }
+
+      // Try to create a backup, so that there is one available if something goes wrong in the next try:catch.
+      try {
+        await createAppBackup({ projectId });
+      } catch (e) {
+        logger.error(
+          `Could not create a backup for the project: ${projectId}!\n${stringifyError(
+            e
+          )}`
+        );
+      }
+    }
+
+    try {
+      const out: ReturnType<F> = await func();
+      if (!skipUpdateShadow)
+        await this.shadowHandler.updateProjectShadow(projectId);
+      return out;
+    } catch (errorAppUpdate) {
+      logger.error(
+        `Failed to update ${projectId}!\n${stringifyError(errorAppUpdate)}`
+      );
+      // If something goes wrong, first try to rollback
+      try {
+        await rollbackApp({ projectId });
+      } catch (errorRollbackApp) {
+        logger.error(
+          `Application rollback failed for ${projectId}!\n${stringifyError(
+            errorRollbackApp
+          )}`
+        );
+        // and if that fails, uninstall the app as a last resort.
+        try {
+          await this.atomicApplicationUninstall(projectId);
+        } catch {
+          // atomicApplicationUninstall logs failure, so there's nothing to do here.
+        }
+        throw new AaiError(
+          'Application update and rollback failed, uninstalled the application!',
+          { cause: errorAppUpdate }
+        );
+      }
+      throw new AaiError(
+        'Application update failed, rolled the application back!',
+        { cause: errorAppUpdate }
+      );
+    }
+  }
+}

package/src/cloud-connection/connection-manager.ts

@@ -0,0 +1,187 @@
+import * as awsIot from 'aws-iot-device-sdk';
+import {
+  DEVICE_CERTIFICATE_FILE_PATH,
+  DEVICE_PRIVATE_KEY_FILE_PATH
+} from 'alwaysai/lib/infrastructure';
+import { AWS_ROOT_CERTIFICATE_FILE_PATH } from '../util/directories';
+import { stringifyError } from 'alwaysai/lib/util';
+import { logger } from '../util/logger';
+import { promisify } from 'util';
+import { exec } from 'child_process';
+import { MessageDispatcher, MessageHandler } from './message-dispatcher';
+
+const exec_promise = promisify(exec);
+
+export class ConnectionManager extends MessageDispatcher<any> {
+  private clientId: string;
+  private host: string;
+  private port: number;
+  private device = awsIot.device;
+  private subscribedTopics: Set<string> = new Set();
+
+  constructor(clientId: string, host: string, port: number) {
+    super();
+    this.clientId = clientId;
+    this.host = host;
+    this.port = port;
+  }
+
+  public getIoTDevice() {
+    return this.device;
+  }
+
+  public setupConnection(): void {
+    this.connect();
+  }
+
+  public connect(): void {
+    try {
+      this.device = awsIot.device({
+        keyPath: DEVICE_PRIVATE_KEY_FILE_PATH,
+        certPath: DEVICE_CERTIFICATE_FILE_PATH,
+        caPath: AWS_ROOT_CERTIFICATE_FILE_PATH,
+        clientId: this.clientId,
+        host: this.host,
+        port: this.port,
+        keepalive: 10 // time before re-connect attempt on dropped connection, default is 400 seconds
+      });
+      this.setupHandlers();
+    } catch (error) {
+      logger.error(`Error connecting to cloud!\n${stringifyError(error)}`);
+      this.handleReconnection();
+    }
+  }
+
+  public registerHandler(topic: string, handler: MessageHandler) {
+    super.registerHandler(topic, handler);
+    this.subscribe(topic);
+  }
+
+  public disconnect(): void {
+    if (this.device) {
+      this.device.end();
+      logger.debug(`Device Agent has been disconnected from the AWS IoT Core.`);
+    }
+  }
+
+  public subscribe(topic: string): void {
+    if (this.device && !this.subscribedTopics.has(topic)) {
+      this.device.subscribe(topic);
+      this.subscribedTopics.add(topic);
+      logger.debug(`Subscribed to topic: ${topic}`);
+    }
+  }
+
+  public unsubscribe(topic: string): void {
+    if (this.device && this.subscribedTopics.has(topic)) {
+      this.device.unsubscribe(topic);
+      this.subscribedTopics.delete(topic);
+      logger.debug(`Unsubscribed from topic: ${topic}`);
+    }
+  }
+
+  public isConnected(): boolean {
+    return this.device ? this.device.connected : false;
+  }
+
+  private handleReconnection() {
+    logger.debug(`Attempting to reconnect to AWS IoT Core...`);
+    setTimeout(() => this.connect(), 5000); // try in 5 seconds.
+  }
+
+  private setupHandlers(): void {
+    this.device.on('connect', (connack: any) => {
+      logger.info('Device Agent has connected to the cloud.');
+    });
+
+    this.device.on('disconnect', () => {
+      logger.warn('Device Agent has been disconnected from the cloud');
+    });
+
+    this.device.on('reconnect', () => {
+      logger.info(
+        `Device Agent attempting to re-connect ${new Date().toLocaleString()}`
+      );
+    });
+
+    this.device.on('error', function (e) {
+      logger.error(
+        `Error connecting to the AWS IoT Core!\n${stringifyError(e)}`
+      );
+    });
+
+    this.device.on('close', () => {
+      logger.warn('Device Agent AWS IoT Core connection closed.');
+    });
+
+    this.device.on('offline', () => {
+      logger.warn(`Device Agent is offline ${new Date().toLocaleString()}`);
+      void this.logConnectionInfo();
+    });
+
+    this.device.on('message', async (topic: string, payload: string) => {
+      logger.debug(
+        `Message received on topic: ${topic}:\n${payload.toString()}`
+      );
+      try {
+        const jsonPacket = JSON.parse(payload);
+        this.dispatch(topic, jsonPacket);
+      } catch (e) {
+        logger.error(`Error parsing message!\n${stringifyError(e)}`);
+      }
+    });
+  }
+
+  private async logConnectionInfo() {
+    try {
+      /**
+       * We're using the 'netcat' or 'nc' command to test the connection to the IoT Core endpoint.
+       * This command doesn't always exit (see below), so
+       * we use timeout to break out of the prompt
+       * and catch the resulting error/parse the resulting stderr
+       *
+       * Sample command for current host and port:
+       * nc -zv -w 1 a3tzi5g7sq5zsj-ats.iot.us-west-2.amazonaws.com 8883
+       *
+       * Sample output when port is not blocked and host is reachable:
+       * $ nc  -zv -w 1 a3tzi5g7sq5zsj-ats.iot.us-west-2.amazonaws.com 443
+       * Connection to a3tzi5g7sq5zsj-ats.iot.us-west-2.amazonaws.com 443 port [tcp/https] succeeded!
+       *
+       *
+       * Sample output when port is blocked (will repeatedly try until ctrl-C out):
+       * $ nc -zv -w 1 a3tzi5g7sq5zsj-ats.iot.us-west-2.amazonaws.com 8883
+       * nc: connect to a3tzi5g7sq5zsj-ats.iot.us-west-2.amazonaws.com port 8883 (tcp) timed out: Operation now in progress
+       * nc: connect to a3tzi5g7sq5zsj-ats.iot.us-west-2.amazonaws.com port 8883 (tcp) timed out: Operation now in progress
+       * nc: connect to a3tzi5g7sq5zsj-ats.iot.us-west-2.amazonaws.com port 8883 (tcp) timed out: Operation now in progress
+       * ^C
+       *
+       *
+       * Sample command/output when the port isn't enable on that host:
+       * $ nc -zv -w 1 localhost 8883
+       * nc: connect to localhost port 8883 (tcp) failed: Connection refused
+       */
+      await exec_promise(`nc -zv -w 1 ${this.host} ${this.port}`, {
+        timeout: 2000
+      });
+    } catch (err) {
+      const output = JSON.stringify(err['stderr']);
+      if (output.indexOf('not known') !== -1) {
+        logger.warn(
+          'Iot Core endpoint appears to be unreachable, internet connection may be unstable or the host may be down.'
+        );
+      } else if (output.indexOf('timed out') !== -1) {
+        logger.warn(
+          `Internet connection appears fine, however the endpoint was not reachable on the current connection port: ${this.port}\nPlease check if a firewall is in place.`
+        );
+      } else if (output.indexOf('refused') !== -1) {
+        logger.warn(
+          `The connection was refused, likely ${this.host} is not running a service on ${this.port}.`
+        );
+      } else {
+        logger.warn(
+          `Output from checking connection to ${this.host} on ${this.port}: ${output}`
+        );
+      }
+    }
+  }
+}