@alwaysai/device-agent 2.1.0-1 → 2.1.0

package/lib/cloud-connection/passthrough-handler.js.map

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

package/lib/cloud-connection/publisher.d.ts

@@ -8,7 +8,7 @@ export declare class Publisher {
     private readonly toCloudTopic;
     constructor(connectionManager: ConnectionManager, clientId: string);
     publish(topic: string, payload: string, customLogger?: winston.LeveledLogMethod): void;
-    publishToCloudWithAck(payload: string, ackNackCallback: CallableFunction): void;
+    publishToCloudWithAck(payload: string): Promise<boolean>;
     publishDeviceAgentMessage(topic: string, message: ToClientMessage | ToCloudMessage, logger?: winston.LeveledLogMethod): void;
     publishToClient(message: ToClientMessage, logger?: winston.LeveledLogMethod): void;
     publishToCloud(message: ToCloudMessage, logger?: winston.LeveledLogMethod): void;

package/lib/cloud-connection/publisher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publisher.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/publisher.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,cAAc,EAGf,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,qBAAa,SAAS;IACpB,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,iBAAiB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM;IAO3D,OAAO,CACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,YAAY,GAAE,OAAO,CAAC,gBAA+B;IAsBhD,qBAAqB,CAC1B,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,gBAAgB;IAoB5B,yBAAyB,CAC9B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,GAAG,cAAc,EACzC,MAAM,CAAC,EAAE,OAAO,CAAC,gBAAgB;IAM5B,eAAe,CACpB,OAAO,EAAE,eAAe,EACxB,MAAM,CAAC,EAAE,OAAO,CAAC,gBAAgB;IAK5B,cAAc,CACnB,OAAO,EAAE,cAAc,EACvB,MAAM,CAAC,EAAE,OAAO,CAAC,gBAAgB;IAM5B,WAAW,IAAI,MAAM;CAG7B"}
+{"version":3,"file":"publisher.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/publisher.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,cAAc,EAGf,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,qBAAa,SAAS;IACpB,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,iBAAiB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM;IAO3D,OAAO,CACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,YAAY,GAAE,OAAO,CAAC,gBAA+B;IAsB1C,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAuB9D,yBAAyB,CAC9B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,GAAG,cAAc,EACzC,MAAM,CAAC,EAAE,OAAO,CAAC,gBAAgB;IAM5B,eAAe,CACpB,OAAO,EAAE,eAAe,EACxB,MAAM,CAAC,EAAE,OAAO,CAAC,gBAAgB;IAK5B,cAAc,CACnB,OAAO,EAAE,cAAc,EACvB,MAAM,CAAC,EAAE,OAAO,CAAC,gBAAgB;IAM5B,WAAW,IAAI,MAAM;CAG7B"}

package/lib/cloud-connection/publisher.js

@@ -13,29 +13,31 @@ class Publisher {
     publish(topic, payload, customLogger = logger_1.logger.debug) {
         // TODO: topic validation
         // By default, log the published message at debug level, unless otherwise specified
+        const publishPacket = {
+            topicName: topic,
+            qos: this.connectionManager.qos,
+            payload: Buffer.from(payload)
+        };
         customLogger(`Publishing message:\nTopic: ${topic}\nMessage: ${JSON.stringify(JSON.parse(payload), null, 2)}`);
-        this.connectionManager
-            .getIoTDevice()
-            .publish(topic, payload, (err) => {
-            if (err) {
-                logger_1.logger.error(`Error publishing message: \nTopic: ${topic}\nMessage: ${payload}\nError: ${err}`);
-            }
-        });
+        // TODO: Change publish() to async and resolve issues where it's used synchronously.
+        void this.connectionManager.getIoTDevice().publish(publishPacket);
     }
-    publishToCloudWithAck(payload, ackNackCallback) {
+    async publishToCloudWithAck(payload) {
         const topic = this.toCloudTopic;
-        this.connectionManager
-            .getIoTDevice()
-            .publish(topic, payload, { qos: 1 }, (err, resp) => {
-            if (err) {
-                logger_1.logger.error(`Error publishing message: \nTopic: ${topic}\nMessage: ${payload}\nError: ${err}`);
-                ackNackCallback(false);
-            }
-            else if (resp) {
-                logger_1.logger.debug(`Successfully published message: \nTopic: ${topic}\nMessage: ${payload}`);
-                ackNackCallback(true);
-            }
-        });
+        const publishPacket = {
+            topicName: topic,
+            qos: this.connectionManager.qos,
+            payload: Buffer.from(payload)
+        };
+        try {
+            await this.connectionManager.getIoTDevice().publish(publishPacket);
+            logger_1.logger.debug(`Successfully published message:\nTopic: ${topic}\nMessage: ${payload}`);
+            return true;
+        }
+        catch (err) {
+            logger_1.logger.error(`Error publishing message:\nTopic: ${topic}\nMessage: ${payload}\nError: ${err}`);
+            return false;
+        }
     }
     publishDeviceAgentMessage(topic, message, logger) {
         const messageStr = JSON.stringify(message);

package/lib/cloud-connection/publisher.js.map

@@ -1 +1 @@
-{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../src/cloud-connection/publisher.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,yEAKwC;AAIxC,MAAa,SAAS;IAMpB,YAAY,iBAAoC,EAAE,QAAgB;QAChE,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAA,uCAAgB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY,GAAG,IAAA,sCAAe,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;IAEM,OAAO,CACZ,KAAa,EACb,OAAe,EACf,eAAyC,eAAM,CAAC,KAAK;QAErD,yBAAyB;QACzB,mFAAmF;QACnF,YAAY,CACV,+BAA+B,KAAK,cAAc,IAAI,CAAC,SAAS,CAC9D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EACnB,IAAI,EACJ,CAAC,CACF,EAAE,CACJ,CAAC;QACF,IAAI,CAAC,iBAAiB;aACnB,YAAY,EAAE;aACd,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE;YACpC,IAAI,GAAG,EAAE;gBACP,eAAM,CAAC,KAAK,CACV,sCAAsC,KAAK,cAAc,OAAO,YAAY,GAAG,EAAE,CAClF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,qBAAqB,CAC1B,OAAe,EACf,eAAiC;QAEjC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,IAAI,CAAC,iBAAiB;aACnB,YAAY,EAAE;aACd,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAQ,EAAE,IAAS,EAAE,EAAE;YAC3D,IAAI,GAAG,EAAE;gBACP,eAAM,CAAC,KAAK,CACV,sCAAsC,KAAK,cAAc,OAAO,YAAY,GAAG,EAAE,CAClF,CAAC;gBACF,eAAe,CAAC,KAAK,CAAC,CAAC;aACxB;iBAAM,IAAI,IAAI,EAAE;gBACf,eAAM,CAAC,KAAK,CACV,4CAA4C,KAAK,cAAc,OAAO,EAAE,CACzE,CAAC;gBACF,eAAe,CAAC,IAAI,CAAC,CAAC;aACvB;QACH,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,yBAAyB,CAC9B,KAAa,EACb,OAAyC,EACzC,MAAiC;QAEjC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAEM,eAAe,CACpB,OAAwB,EACxB,MAAiC;QAEjC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACtE,CAAC;IAEM,cAAc,CACnB,OAAuB,EACvB,MAAiC;QAEjC,kDAAkD;QAClD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACrE,CAAC;IAEM,WAAW;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AAvFD,8BAuFC"}
+{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../src/cloud-connection/publisher.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,yEAKwC;AAKxC,MAAa,SAAS;IAMpB,YAAY,iBAAoC,EAAE,QAAgB;QAChE,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAA,uCAAgB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY,GAAG,IAAA,sCAAe,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;IAEM,OAAO,CACZ,KAAa,EACb,OAAe,EACf,eAAyC,eAAM,CAAC,KAAK;QAErD,yBAAyB;QACzB,mFAAmF;QACnF,MAAM,aAAa,GAAwB;YACzC,SAAS,EAAE,KAAK;YAChB,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,GAAG;YAC/B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SAC9B,CAAC;QAEF,YAAY,CACV,+BAA+B,KAAK,cAAc,IAAI,CAAC,SAAS,CAC9D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EACnB,IAAI,EACJ,CAAC,CACF,EAAE,CACJ,CAAC;QAEF,oFAAoF;QACpF,KAAK,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,OAAe;QAChD,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAEhC,MAAM,aAAa,GAAwB;YACzC,SAAS,EAAE,KAAK;YAChB,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,GAAG;YAC/B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SAC9B,CAAC;QAEF,IAAI;YACF,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACnE,eAAM,CAAC,KAAK,CACV,2CAA2C,KAAK,cAAc,OAAO,EAAE,CACxE,CAAC;YACF,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,GAAG,EAAE;YACZ,eAAM,CAAC,KAAK,CACV,qCAAqC,KAAK,cAAc,OAAO,YAAY,GAAG,EAAE,CACjF,CAAC;YACF,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,yBAAyB,CAC9B,KAAa,EACb,OAAyC,EACzC,MAAiC;QAEjC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAEM,eAAe,CACpB,OAAwB,EACxB,MAAiC;QAEjC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACtE,CAAC;IAEM,cAAc,CACnB,OAAuB,EACvB,MAAiC;QAEjC,kDAAkD;QAClD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACrE,CAAC;IAEM,WAAW;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AAxFD,8BAwFC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alwaysai/device-agent",
   "description": "The alwaysAI Device Agent",
-  "version": "2.1.0-1",
+  "version": "2.1.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "publishConfig": {
@@ -42,7 +42,7 @@
     "ajv": "8.11.0",
     "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/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,49 +37,49 @@ 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);
+    this.publisher.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)}`);
-      }
-    );
-  }
-
-  public async handleAwsCertificateTopics(topic: string, payload: any) {
+  public async handle(payload: any, topic: string) {
     switch (topic) {
       case '$aws/certificates/create/json/accepted': {
-        logger.debug(
-          `Received Certs: ${JSON.stringify(JSON.parse(payload), null, 2)}`
-        );
+        logger.debug(`Received Certs: ${JSON.stringify(payload, null, 2)}`);
         const {
           certificateId,
           certificatePem,
           privateKey,
           certificateOwnershipToken
-        } = JSON.parse(payload);
+        } = payload;
 
         const certSpawner = JsSpawner({ path: LOCAL_CERT_AND_KEY_DIR });
 
@@ -124,4 +125,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,173 @@ 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();
-    logger.debug(`Device Agent has been disconnected from the AWS IoT Core.`);
+  public async disconnect(): Promise<void> {
+    const stopped = once(this.client, mqtt5.Mqtt5Client.STOPPED);
+    this.client.stop();
+    await stopped;
+    logger.info(`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);
-      this.subscribedTopics.add(topic);
-      logger.debug(`Subscribed to topic: ${topic}`);
+      try {
+        const suback = await this.client.subscribe({
+          subscriptions: [{ qos: mqtt5.QoS.AtLeastOnce, topicFilter: topic }]
+        });
+        this.subscribedTopics.add(topic);
+        logger.debug(
+          `Subscribed to topic: ${topic}, result: ${JSON.stringify(suback)}`
+        );
+        // Based on documentation here: https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901178
+        suback.reasonCodes.forEach((code, index) => {
+          if ([0, 1, 2].includes(code)) {
+            logger.debug(
+              `SUBACK success for topic index ${index}: reason code ${code}`
+            );
+          } else {
+            logger.error(
+              `SUBACK error for topic index ${index}: unexpected reason code ${code}`
+            );
+          }
+        });
+      } catch (error) {
+        logger.error(
+          `Failed to subscribe to topic: ${topic}. Error: ${stringifyError(
+            error
+          )}`
+        );
+      }
     }
   }
 
-  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', () => {
-      logger.warn('Device Agent has been disconnected from the cloud');
+    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.info('Device Agent has been disconnected from the cloud');
+      logger.info(`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.connected = false;
+      }
+    );
 
-    this.device.on('error', function (e) {
+    this.client.on('error', (error) => {
       logger.error(
-        `Error connecting to the AWS IoT Core! Error:\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! Error:\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}`
+          );
+
+          if (payloadString) {
+            const parsed = JSON.parse(payloadString);
+            this.dispatch(eventData.message.topicName, parsed);
+          } else {
+            logger.warn(`Empty payload received on topic: ${topic}`);
+          }
+        } 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;
   }