@alwaysai/device-agent 2.0.2 → 2.1.0-0

package/lib/util/file.test.js.map

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

package/lib/util/get-device-id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-device-id.d.ts","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":"AAKA,wBAAgB,aAAa,WAc5B"}
+{"version":3,"file":"get-device-id.d.ts","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":"AAKA,wBAAgB,aAAa,WAgB5B"}

package/lib/util/get-device-id.js

@@ -15,7 +15,7 @@ function getDeviceUuid() {
         return cfg.deviceUuid;
     }
     catch (e) {
-        logger_1.logger.error(`Failed to read device configuration!\n${(0, util_1.stringifyError)(e)}`);
+        logger_1.logger.error(`Failed to read device configuration! Error:\n${(0, util_1.stringifyError)(e)}`);
         throw new aai_error_1.default('Failed to read device configuration', {
             cause: deviceCfgFile.getErrors()
         });

package/lib/util/get-device-id.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-device-id.js","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAC5D,qCAAkC;AAClC,4CAAmD;AACnD,2CAAmC;AAEnC,SAAgB,aAAa;IAC3B,MAAM,aAAa,GAAG,IAAA,yBAAgB,GAAE,CAAC;IACzC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IACD,IAAI;QACF,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QACjC,OAAO,GAAG,CAAC,UAAU,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,yCAAyC,IAAA,qBAAc,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3E,MAAM,IAAI,mBAAQ,CAAC,qCAAqC,EAAE;YACxD,KAAK,EAAE,aAAa,CAAC,SAAS,EAAE;SACjC,CAAC,CAAC;KACJ;AACH,CAAC;AAdD,sCAcC"}
+{"version":3,"file":"get-device-id.js","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAC5D,qCAAkC;AAClC,4CAAmD;AACnD,2CAAmC;AAEnC,SAAgB,aAAa;IAC3B,MAAM,aAAa,GAAG,IAAA,yBAAgB,GAAE,CAAC;IACzC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IACD,IAAI;QACF,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QACjC,OAAO,GAAG,CAAC,UAAU,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CACV,gDAAgD,IAAA,qBAAc,EAAC,CAAC,CAAC,EAAE,CACpE,CAAC;QACF,MAAM,IAAI,mBAAQ,CAAC,qCAAqC,EAAE;YACxD,KAAK,EAAE,aAAa,CAAC,SAAS,EAAE;SACjC,CAAC,CAAC;KACJ;AACH,CAAC;AAhBD,sCAgBC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alwaysai/device-agent",
   "description": "The alwaysAI Device Agent",
-  "version": "2.0.2",
+  "version": "2.1.0-0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "publishConfig": {
@@ -40,9 +40,9 @@
     "@alwaysai/device-agent-schemas": "3.3.0",
     "@carnesen/coded-error": "0.4.0",
     "ajv": "8.11.0",
-    "alwaysai": "2.6.1",
+    "alwaysai": "2.8.0",
     "amqplib": "0.10.3",
-    "aws-iot-device-sdk": "2.2.15",
+    "aws-iot-device-sdk-v2": "1.21.4",
     "docker-compose": "0.24.8",
     "lodash": "4.17.21",
     "node-os-utils": "1.3.7",

package/src/application-control/config.ts

@@ -121,7 +121,7 @@ export async function writeDockerCompose(props: {
   try {
     await compose.config({ cwd: appDir, configAsString: composeOutput });
   } catch (e) {
-    logger.error(stringifyError(e));
+    logger.error(`Error:\n${stringifyError(e)}`);
   }
   await spawner.writeFile('docker-compose.yaml', composeOutput);
 }

package/src/application-control/install.ts

@@ -34,6 +34,7 @@ import { downloadToFile } from '../util/file';
 import { ALWAYSAI_TARGET_HW_OVERRIDE, parseTargetHW } from '../environment';
 import { setEnvInternal } from './environment-variables';
 import { AppConfig } from '@alwaysai/app-configuration-schemas';
+import { CliTerseError } from '@alwaysai/alwayscli';
 
 type SignedUrlPayloadType = {
   appInstallPayload: {
@@ -82,7 +83,7 @@ export async function installApp(props: {
         await stopApp({ projectId });
       } catch (e) {
         logger.error(
-          `Could not stop the application. Old container might still be present after installation.\n${stringifyError(
+          `Could not stop the application. Old container might still be present after installation. Error:\n${stringifyError(
             e
           )}`
         );
@@ -265,7 +266,7 @@ export async function uninstallApp(props: {
     await stopApp({ projectId });
   } catch (e) {
     logger.warn(
-      `Failed to stop ${projectId}, may be left running...\n${stringifyError(
+      `Failed to stop ${projectId}, may be left running... Error:\n${stringifyError(
         e
       )}`
     );

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

@@ -1,4 +1,4 @@
-import { logger, stringifyError } from 'alwaysai/lib/util';
+import { stringifyError } from 'alwaysai/lib/util';
 import { uninstallApp, rollbackApp } from '../application-control';
 import { createAppBackup } from '../application-control/backup';
 import { AgentConfigFile } from '../infrastructure/agent-config';
@@ -12,6 +12,7 @@ import {
   ErrorFunction,
   SuccessFunction
 } from './transaction-manager';
+import { logger } from '../util/logger';
 
 export interface HandlerContext {
   clientId: string;
@@ -52,7 +53,9 @@ export abstract class BaseHandler {
       await uninstallApp({ projectId });
       this.shadowHandler.clearProjectShadow(projectId);
     } catch (e) {
-      logger.error(`Failed to uninstall ${projectId}!\n${stringifyError(e)}`);
+      logger.error(
+        `Failed to uninstall ${projectId}! Error:\n${stringifyError(e)}`
+      );
       throw e;
     }
   }
@@ -73,7 +76,7 @@ export abstract class BaseHandler {
         await createAppBackup({ projectId });
       } catch (e) {
         logger.error(
-          `Could not create a backup for the project: ${projectId}!\n${stringifyError(
+          `Could not create a backup for the project: ${projectId}! Error:\n${stringifyError(
             e
           )}`
         );
@@ -87,14 +90,16 @@ export abstract class BaseHandler {
       return out;
     } catch (errorAppUpdate) {
       logger.error(
-        `Failed to update ${projectId}!\n${stringifyError(errorAppUpdate)}`
+        `Failed to update ${projectId}! Error:\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(
+          `Application rollback failed for ${projectId}! Error:\n${stringifyError(
             errorRollbackApp
           )}`
         );

package/src/cloud-connection/{device-agent.ts → bootstrap-agent.ts}

@@ -1,11 +1,10 @@
-// eslint-disable-next-line
-const awsIot = require('aws-iot-device-sdk');
 import { getTargetHardwareUuid } from 'alwaysai/lib/core/app';
 import {
   DEVICE_CERTIFICATE_FILE_NAME,
   DEVICE_CERTIFICATE_ID_FILE_NAME,
   DEVICE_PRIVATE_KEY_FILE_NAME,
-  LOCAL_CERT_AND_KEY_DIR
+  LOCAL_CERT_AND_KEY_DIR,
+  LocalDeviceCertificates
 } from 'alwaysai/lib/infrastructure';
 import { JsSpawner } from 'alwaysai/lib/util';
 import {
@@ -14,18 +13,20 @@ import {
 } from '../infrastructure/device-certificate';
 import { getDeviceUuid } from '../util/get-device-id';
 import { logger } from '../util/logger';
+import { ConnectionManager, DeviceAgentConfigType } from './connection-manager';
+import { Publisher } from './publisher';
+import { MessageHandler } from './message-dispatcher';
+import {
+  getBootstrapCertificateFilePath,
+  getBootstrapPrivateKeyFilePath
+} from '../infrastructure/device-certificate';
+import { getIoTCoreEndpointUrl } from '../infrastructure/urls';
+``;
+import { AWS_ROOT_CERTIFICATE_FILE_PATH } from '../util/directories';
 
 // eslint-disable-next-line
 const process = require('process');
 
-interface DeviceAgentConfigType {
-  keyPath: string;
-  certPath: string;
-  caPath: string;
-  clientId: string;
-  host: string;
-}
-
 interface FleetProvisionTemplateMessageType {
   certificateOwnershipToken: string;
   parameters: {
@@ -36,38 +37,40 @@ interface FleetProvisionTemplateMessageType {
   };
 }
 
-export class DeviceAgent {
-  constructor(config: DeviceAgentConfigType) {
-    this.device = awsIot.device(config);
+export class BootstrapAgent implements MessageHandler {
+  private connectionManager: ConnectionManager;
+  private publisher: Publisher;
+  private readonly clientId = getDeviceUuid();
+  private readonly host = getIoTCoreEndpointUrl();
+  private readonly port = 8883;
+
+  constructor() {
+    // Initialize & setup the connection
+    const bootstrapAgentConfig = {
+      clientId: this.clientId,
+      host: this.host,
+      port: this.port,
+      keyPath: getBootstrapPrivateKeyFilePath(),
+      certPath: getBootstrapCertificateFilePath(),
+      caPath: AWS_ROOT_CERTIFICATE_FILE_PATH
+    };
+    this.connectionManager = new ConnectionManager(bootstrapAgentConfig);
+
+    this.publisher = new Publisher(
+      this.connectionManager,
+      bootstrapAgentConfig.clientId
+    );
   }
 
-  public deviceType = 'aai-device';
-  public device = awsIot.device;
   public hardwareId = async () => await getTargetHardwareUuid(JsSpawner());
   public deviceId = getDeviceUuid();
+  public deviceType = 'aai-device';
 
   public publishMessage(topic: string, message: string) {
-    this.device.publish(topic, message);
-  }
-}
-
-export class BootstrapAgent extends DeviceAgent {
-  public async subscribeToAllTopics() {
-    const AWS_CERTIFICATE_ACCEPT_TOPIC =
-      '$aws/certificates/create/json/accepted';
-    const PROVISIONING_ACCEPTED_TOPIC =
-      '$aws/provisioning-templates/FleetProvisionTemplate/provision/json/accepted';
-
-    const topics = [AWS_CERTIFICATE_ACCEPT_TOPIC, PROVISIONING_ACCEPTED_TOPIC];
-    const resp = this.device.subscribe(
-      topics,
-      function (err: any, granted: { topic: string; qos: number }[]) {
-        logger.debug(`Bootstrap Agent: ${JSON.stringify(granted, null, 2)}`);
-      }
-    );
+    this.publisher.publish(topic, message);
   }
 
-  public async handleAwsCertificateTopics(topic: string, payload: any) {
+  public async handle(payload: any, topic: string) {
     switch (topic) {
       case '$aws/certificates/create/json/accepted': {
         logger.debug(
@@ -124,4 +127,34 @@ export class BootstrapAgent extends DeviceAgent {
       }
     }
   }
+
+  public async bootstrapProvision() {
+    const rmBootstrapCertsAndClose = async () => {
+      const deviceCertificates = new LocalDeviceCertificates();
+      const spawner = JsSpawner();
+      await spawner.rimraf(getBootstrapCertificateDirectoryPath());
+      await spawner.rimraf(deviceCertificates.getCertificateDirectoryPath());
+      logger.error('Could not provision device. Try again.');
+      process.exit(1);
+    };
+
+    setTimeout(rmBootstrapCertsAndClose, 60000);
+
+    this.connectionManager.initConnectionHandlers(() => {
+      logger.info('Your device is being provisioned');
+    });
+
+    await this.connectionManager.waitForConnection();
+
+    this.connectionManager.registerHandler(
+      '$aws/certificates/create/json/accepted',
+      this
+    );
+    this.connectionManager.registerHandler(
+      '$aws/provisioning-templates/FleetProvisionTemplate/provision/json/accepted',
+      this
+    );
+
+    this.publishMessage('$aws/certificates/create/json', '{}');
+  }
 }

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

@@ -1,4 +1,4 @@
-import * as awsIot from 'aws-iot-device-sdk';
+import { mqtt5, iot } from 'aws-iot-device-sdk-v2';
 import {
   DEVICE_CERTIFICATE_FILE_PATH,
   DEVICE_PRIVATE_KEY_FILE_PATH
@@ -9,35 +9,64 @@ import { logger } from '../util/logger';
 import { promisify } from 'util';
 import { exec } from 'child_process';
 import { MessageDispatcher, MessageHandler } from './message-dispatcher';
+import { once } from 'events';
 
 const exec_promise = promisify(exec);
 
+// replace with direct params: instead of interface
+export interface DeviceAgentConfigType {
+  clientId: string;
+  host: string;
+  port: number;
+  keyPath?: string;
+  certPath?: string;
+  caPath?: string;
+}
+
 export class ConnectionManager extends MessageDispatcher<any> {
   private clientId: string;
   private host: string;
   private port: number;
-  private device: awsIot.device;
+  private config: mqtt5.Mqtt5ClientConfig;
+  private client: mqtt5.Mqtt5Client;
   private subscribedTopics: Set<string> = new Set();
   private connected = false;
+  readonly qos: mqtt5.QoS;
 
-  constructor(clientId: string, host: string, port: number) {
+  constructor(deviceAgentConfig: DeviceAgentConfigType) {
     super();
-    this.clientId = clientId;
-    this.host = host;
-    this.port = port;
-    this.device = awsIot.device({
-      keyPath: DEVICE_PRIVATE_KEY_FILE_PATH,
-      certPath: DEVICE_CERTIFICATE_FILE_PATH,
-      caPath: AWS_ROOT_CERTIFICATE_FILE_PATH,
+
+    // Use config values if provided, otherwise use defaults
+    this.clientId = deviceAgentConfig.clientId;
+    this.host = deviceAgentConfig.host;
+    this.port = deviceAgentConfig.port;
+    this.qos = mqtt5.QoS.AtLeastOnce;
+
+    const certPath = deviceAgentConfig.certPath || DEVICE_CERTIFICATE_FILE_PATH;
+    const keyPath = deviceAgentConfig.keyPath || DEVICE_PRIVATE_KEY_FILE_PATH;
+    const caPath = deviceAgentConfig.caPath || AWS_ROOT_CERTIFICATE_FILE_PATH;
+
+    const builder =
+      iot.AwsIotMqtt5ClientConfigBuilder.newDirectMqttBuilderWithMtlsFromPath(
+        this.host,
+        certPath,
+        keyPath
+      );
+
+    builder.withConnectProperties({
       clientId: this.clientId,
-      host: this.host,
-      port: this.port,
-      keepalive: 10 // time before re-connect attempt on dropped connection, default is 400 seconds
+      keepAliveIntervalSeconds: 10
     });
+
+    builder.withCertificateAuthorityFromPath(undefined, caPath);
+
+    this.config = builder.build();
+    this.client = new mqtt5.Mqtt5Client(this.config);
+    this.client.start();
   }
 
   public getIoTDevice() {
-    return this.device;
+    return this.client;
   }
 
   public isConnected(): boolean {
@@ -46,76 +75,147 @@ export class ConnectionManager extends MessageDispatcher<any> {
 
   public registerHandler(topic: string, handler: MessageHandler) {
     super.registerHandler(topic, handler);
-    this.subscribe(topic);
+    void this.subscribe(topic);
   }
 
-  public disconnect(): void {
-    this.device.end();
+  public async disconnect(): Promise<void> {
+    const stopped = once(this.client, mqtt5.Mqtt5Client.STOPPED);
+    this.client.stop();
+    await stopped;
     logger.debug(`Device Agent has been disconnected from the AWS IoT Core.`);
   }
 
-  public subscribe(topic: string): void {
+  public async subscribe(topic: string): Promise<void> {
     if (!this.subscribedTopics.has(topic)) {
-      this.device.subscribe(topic);
+      const suback = await this.client.subscribe({
+        subscriptions: [{ qos: mqtt5.QoS.AtLeastOnce, topicFilter: topic }]
+      });
       this.subscribedTopics.add(topic);
-      logger.debug(`Subscribed to topic: ${topic}`);
+      logger.debug(
+        `Subscribed to topic: ${topic}, result: ${JSON.stringify(suback)}`
+      );
     }
   }
 
-  public unsubscribe(topic: string): void {
+  public async unsubscribe(topic: string): Promise<void> {
     if (this.subscribedTopics.has(topic)) {
-      this.device.unsubscribe(topic);
+      const unsuback = await this.client.unsubscribe({
+        topicFilters: [topic]
+      });
+      logger.debug(
+        `Unsubscribed from topic: ${topic}, result: ${JSON.stringify(unsuback)}`
+      );
       this.subscribedTopics.delete(topic);
-      logger.debug(`Unsubscribed from topic: ${topic}`);
     }
   }
 
   public initConnectionHandlers(connectCallback: () => void): void {
-    this.device.on('connect', (connack: any) => {
-      logger.info('Device Agent has connected to the cloud.');
-      this.connected = true;
-      connectCallback();
+    this.client.on('attemptingConnect', () => {
+      logger.debug(`Device Agent is attempting connection`);
     });
 
-    this.device.on('disconnect', () => {
+    this.client.on(
+      'connectionSuccess',
+      (eventData: mqtt5.ConnectionSuccessEvent) => {
+        logger.info('Device Agent has connected to the cloud.');
+        logger.debug(`Connack: ${JSON.stringify(eventData.connack)}`);
+        logger.debug(`Settings: ${JSON.stringify(eventData.settings)}`);
+        this.connected = true;
+        connectCallback();
+      }
+    );
+
+    this.client.on('disconnection', (eventData: mqtt5.DisconnectionEvent) => {
       logger.warn('Device Agent has been disconnected from the cloud');
+      logger.warn(`Disconnection event: ${eventData.error.toString()}`);
+      if (eventData.disconnect !== undefined) {
+        logger.debug(
+          'Disconnect packet: ' + JSON.stringify(eventData.disconnect)
+        );
+      }
       this.connected = false;
     });
 
-    this.device.on('reconnect', () => {
-      logger.info(
-        `Device Agent attempting to re-connect ${new Date().toLocaleString()}`
-      );
-    });
+    this.client.on(
+      'connectionFailure',
+      (eventData: mqtt5.ConnectionFailureEvent) => {
+        logger.error(
+          `Error connecting to the AWS IoT Core! Disconnection event: ${eventData.error.toString()}`
+        );
+        if (eventData.connack) {
+          logger.debug(
+            'Disconnect packet: ' + JSON.stringify(eventData.connack)
+          );
+        }
 
-    this.device.on('error', function (e) {
+        this.connected = false;
+      }
+    );
+
+    this.client.on('error', (error) => {
       logger.error(
-        `Error connecting to the AWS IoT Core!\n${stringifyError(e)}`
+        `Error connecting to the AWS IoT Core! Error:\n${stringifyError(
+          error as Error
+        )}`
       );
       this.connected = false;
     });
 
-    this.device.on('close', () => {
-      logger.warn('Device Agent AWS IoT Core connection closed.');
-      this.connected = false;
-    });
-
-    this.device.on('offline', () => {
-      logger.warn(`Device Agent is offline ${new Date().toLocaleString()}`);
+    this.client.on('stopped', () => {
+      logger.warn(`Device Agent has stopped ${new Date().toLocaleString()}`);
       void this.logConnectionInfo();
       this.connected = false;
     });
 
-    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)}`);
+    this.client.on(
+      'messageReceived',
+      (eventData: mqtt5.MessageReceivedEvent) => {
+        const topic = eventData.message.topicName;
+        const payloadBuffer = eventData.message.payload as ArrayBuffer;
+        try {
+          const payloadString = payloadBuffer
+            ? Buffer.from(new Uint8Array(payloadBuffer)).toString('utf-8')
+            : null;
+          logger.debug(
+            `Message received on topic: ${topic}:\n${payloadString}`
+          );
+          this.dispatch(eventData.message.topicName, payloadString);
+        } catch (e) {
+          logger.error(
+            `Error parsing message on topic ${
+              eventData.message.topicName
+            }!:\n${stringifyError(e)}`
+          );
+        }
       }
+    );
+  }
+
+  public waitForConnection(timeoutMs = 10000): Promise<void> {
+    return new Promise((resolve, reject) => {
+      if (this.connected) {
+        return resolve(); // already connected
+      }
+
+      const timeout = setTimeout(() => {
+        reject(new Error('Timed out waiting for MQTT connection'));
+      }, timeoutMs);
+
+      this.client.on('connectionSuccess', () => {
+        clearTimeout(timeout);
+        this.connected = true;
+        resolve();
+      });
+
+      this.client.on('disconnection', (event) => {
+        const errorString = event.error
+          ? event.error.toString()
+          : 'Unknown reason';
+        logger.warn(
+          `Disconnected while waiting for connection: ${errorString}`
+        );
+        reject(new Error(`Disconnected: ${errorString}`));
+      });
     });
   }
 

package/src/cloud-connection/device-agent-cloud-connection.ts

@@ -15,16 +15,16 @@ import { getDeviceAgentVersion } from '../util/check-for-updates';
 import { getDeviceUuid } from '../util/get-device-id';
 import { logger } from '../util/logger';
 import sleep from '../util/sleep';
-import { bootstrapProvision } from './bootstrap-provision';
 import { LiveUpdatesHandler } from './live-updates-handler';
 import { PassthroughHandler } from './passthrough-handler';
 import { Publisher } from './publisher';
 import { ShadowHandler, ProjectShadowMessageHandler } from './shadow-handler';
 import { JobHandler } from '../jobs/job-handler';
 import { TransactionManager } from './transaction-manager';
-import { ConnectionManager } from './connection-manager';
+import { ConnectionManager, DeviceAgentConfigType } from './connection-manager';
 import { DeviceAgentMessageHandler } from './device-agent-message-handler';
 import { HandlerContext } from './base-message-handler';
+import { BootstrapAgent } from './bootstrap-agent';
 
 export class DeviceAgentCloudConnection {
   private connectionManager: ConnectionManager;
@@ -42,11 +42,12 @@ export class DeviceAgentCloudConnection {
 
   constructor() {
     // Initialize & setup the connection
-    this.connectionManager = new ConnectionManager(
-      this.clientId,
-      this.host,
-      this.port
-    );
+    const deviceAgentConfig: DeviceAgentConfigType = {
+      clientId: this.clientId,
+      host: this.host,
+      port: this.port
+    };
+    this.connectionManager = new ConnectionManager(deviceAgentConfig);
 
     this.publisher = new Publisher(this.connectionManager, this.clientId);
     this.shadowHandler = new ShadowHandler(this.clientId, this.publisher);
@@ -153,7 +154,7 @@ export class DeviceAgentCloudConnection {
     // lost since we aren't waiting for responses so sleep for a short time to
     // receive them
     await sleep(1000);
-    this.connectionManager.disconnect();
+    await this.connectionManager.disconnect();
   }
 
   // CLI methods
@@ -180,7 +181,8 @@ export async function runDeviceAgentCloudInterface() {
     `Starting alwaysAI Device Agent v${await getDeviceAgentVersion()}`
   );
   if (existsSync(getBootstrapPrivateKeyFilePath())) {
-    await bootstrapProvision();
+    const bootstrapAgent = new BootstrapAgent();
+    await bootstrapAgent.bootstrapProvision();
     return;
   }
 
@@ -191,16 +193,12 @@ export async function runDeviceAgentCloudInterface() {
   }
 
   if (await requiredConfigFilesPresentAndValid()) {
-    const deviceAgent = new DeviceAgentCloudConnection();
-    if (ALWAYSAI_ANALYTICS_PASSTHROUGH === true) {
-      const shadowHandler = deviceAgent.shadowHandler;
-      const publisher = deviceAgent.publisher;
-      const passthroughHandler = new PassthroughHandler(
-        publisher,
-        shadowHandler
-      );
-      await passthroughHandler.setup();
-    }
+    const cloudConnection = new DeviceAgentCloudConnection();
+    const passthroughHandler = new PassthroughHandler(
+      cloudConnection.publisher,
+      cloudConnection.shadowHandler
+    );
+    await passthroughHandler.run();
   } else {
     throw new Error(
       "Set device agent to local mode and retry the 'aai-agent device init' command"