@alwaysai/device-agent 2.0.2-0 → 2.0.3

package/lib/infrastructure/config-check-utility.js

@@ -8,7 +8,7 @@ const path_1 = require("path");
 const logger_1 = require("../util/logger");
 exports.validConfigMessage = 'Device config is present and valid.';
 async function checkDeviceConfigPresent(baseDir) {
-    logger_1.logger.debug('Checking for required device configuraton file.');
+    logger_1.logger.debug('Checking for required device configuration file.');
     const deviceConfig = (0, device_1.DeviceConfigFile)(baseDir
         ? (0, path_1.join)(baseDir, (0, infrastructure_1.getDeviceConfigPath)(), infrastructure_1.DEVICE_CONFIG_FILE_NAME)
         : undefined);
@@ -38,7 +38,7 @@ async function checkCertificatesPresent(baseDir) {
 }
 exports.checkCertificatesPresent = checkCertificatesPresent;
 async function checkAaiConfigPresent(baseDir) {
-    logger_1.logger.debug('Checking for required alwaysai configuraton file.');
+    logger_1.logger.debug('Checking for required alwaysAI configuration file.');
     const localAaiCfg = new infrastructure_1.LocalAaiCfg(baseDir);
     try {
         await localAaiCfg.readAaiCfgFile();

package/lib/infrastructure/config-check-utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-check-utility.js","sourceRoot":"","sources":["../../src/infrastructure/config-check-utility.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAC5D,gEAKqC;AACrC,4CAA2D;AAC3D,+BAA4B;AAC5B,2CAAwC;AAE3B,QAAA,kBAAkB,GAAG,qCAAqC,CAAC;AAEjE,KAAK,UAAU,wBAAwB,CAC5C,OAAgB;IAEhB,eAAM,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,IAAA,yBAAgB,EACnC,OAAO;QACL,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,EAAE,IAAA,oCAAmB,GAAE,EAAE,wCAAuB,CAAC;QAC/D,CAAC,CAAC,SAAS,CACd,CAAC;IACF,IAAI,YAAY,CAAC,MAAM,EAAE,EAAE;QACzB,IAAI;YACF,YAAY,CAAC,IAAI,EAAE,CAAC;YACpB,eAAM,CAAC,KAAK,CAAC,0BAAkB,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,CAAC,EAAE;YACV,eAAM,CAAC,KAAK,CAAC,IAAA,qBAAc,EAAC,CAAC,CAAC,CAAC,CAAC;YAChC,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;SACtE;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AApBD,4DAoBC;AAEM,KAAK,UAAU,wBAAwB,CAAC,OAAgB;IAC7D,eAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACpD,MAAM,kBAAkB,GAAG,IAAI,wCAAuB,CAAC,OAAO,CAAC,CAAC;IAEhE,MAAM,uBAAuB,GAAG,MAAM,uBAAuB,CAAC;QAC5D,kBAAkB,CAAC,sBAAsB,EAAE;QAC3C,kBAAkB,CAAC,qBAAqB,EAAE;QAC1C,kBAAkB,CAAC,0BAA0B,EAAE;KAChD,CAAC,CAAC;IACH,OAAO,uBAAuB,CAAC;AACjC,CAAC;AAVD,4DAUC;AAEM,KAAK,UAAU,qBAAqB,CACzC,OAAgB;IAEhB,eAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,IAAI,4BAAW,CAAC,OAAO,CAAC,CAAC;IAE7C,IAAI;QACF,MAAM,WAAW,CAAC,cAAc,EAAE,CAAC;QACnC,eAAM,CAAC,KAAK,CAAC,0BAAkB,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,IAAA,qBAAc,EAAC,CAAC,CAAC,CAAC,CAAC;QAChC,eAAM,CAAC,KAAK,CACV,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAChE,CAAC;KACH;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAjBD,sDAiBC;AAEM,KAAK,UAAU,uBAAuB,CAAC,aAAuB;IACnE,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;QAChC,eAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,aAAa,CAAC,CAAC;QACpD,IAAI,CAAC,CAAC,MAAM,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,EAAE;YACzB,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,eAAe,CAAC,CAAC;YACrC,OAAO,KAAK,CAAC;SACd;KACF;IACD,eAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACtC,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,0DAUC"}
+{"version":3,"file":"config-check-utility.js","sourceRoot":"","sources":["../../src/infrastructure/config-check-utility.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAC5D,gEAKqC;AACrC,4CAA2D;AAC3D,+BAA4B;AAC5B,2CAAwC;AAE3B,QAAA,kBAAkB,GAAG,qCAAqC,CAAC;AAEjE,KAAK,UAAU,wBAAwB,CAC5C,OAAgB;IAEhB,eAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACjE,MAAM,YAAY,GAAG,IAAA,yBAAgB,EACnC,OAAO;QACL,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,EAAE,IAAA,oCAAmB,GAAE,EAAE,wCAAuB,CAAC;QAC/D,CAAC,CAAC,SAAS,CACd,CAAC;IACF,IAAI,YAAY,CAAC,MAAM,EAAE,EAAE;QACzB,IAAI;YACF,YAAY,CAAC,IAAI,EAAE,CAAC;YACpB,eAAM,CAAC,KAAK,CAAC,0BAAkB,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,CAAC,EAAE;YACV,eAAM,CAAC,KAAK,CAAC,IAAA,qBAAc,EAAC,CAAC,CAAC,CAAC,CAAC;YAChC,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;SACtE;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AApBD,4DAoBC;AAEM,KAAK,UAAU,wBAAwB,CAAC,OAAgB;IAC7D,eAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACpD,MAAM,kBAAkB,GAAG,IAAI,wCAAuB,CAAC,OAAO,CAAC,CAAC;IAEhE,MAAM,uBAAuB,GAAG,MAAM,uBAAuB,CAAC;QAC5D,kBAAkB,CAAC,sBAAsB,EAAE;QAC3C,kBAAkB,CAAC,qBAAqB,EAAE;QAC1C,kBAAkB,CAAC,0BAA0B,EAAE;KAChD,CAAC,CAAC;IACH,OAAO,uBAAuB,CAAC;AACjC,CAAC;AAVD,4DAUC;AAEM,KAAK,UAAU,qBAAqB,CACzC,OAAgB;IAEhB,eAAM,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,IAAI,4BAAW,CAAC,OAAO,CAAC,CAAC;IAE7C,IAAI;QACF,MAAM,WAAW,CAAC,cAAc,EAAE,CAAC;QACnC,eAAM,CAAC,KAAK,CAAC,0BAAkB,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,IAAA,qBAAc,EAAC,CAAC,CAAC,CAAC,CAAC;QAChC,eAAM,CAAC,KAAK,CACV,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAChE,CAAC;KACH;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAjBD,sDAiBC;AAEM,KAAK,UAAU,uBAAuB,CAAC,aAAuB;IACnE,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;QAChC,eAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,aAAa,CAAC,CAAC;QACpD,IAAI,CAAC,CAAC,MAAM,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,EAAE;YACzB,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,eAAe,CAAC,CAAC;YACrC,OAAO,KAAK,CAAC;SACd;KACF;IACD,eAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACtC,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,0DAUC"}

package/lib/infrastructure/legacy-migration/legacy-migration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"legacy-migration.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/legacy-migration/legacy-migration.ts"],"names":[],"mappings":"AA8BA,OAAO,EAEL,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAMxB,wBAAsB,sBAAsB,CAAC,OAAO,CAAC,EAAE,MAAM,iBA8C5D;AAED,wBAAsB,mBAAmB,CAAC,OAAO,CAAC,EAAE,MAAM,iBAiBzD;AAED,wBAAsB,mBAAmB,CACvC,YAAY,EAAE,eAAe,EAC7B,OAAO,CAAC,EAAE,MAAM,iBAyCjB;AAED,wBAAsB,+BAA+B,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CAyElB"}
+{"version":3,"file":"legacy-migration.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/legacy-migration/legacy-migration.ts"],"names":[],"mappings":"AA8BA,OAAO,EAEL,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAMxB,wBAAsB,sBAAsB,CAAC,OAAO,CAAC,EAAE,MAAM,iBA8C5D;AAED,wBAAsB,mBAAmB,CAAC,OAAO,CAAC,EAAE,MAAM,iBAiBzD;AAED,wBAAsB,mBAAmB,CACvC,YAAY,EAAE,eAAe,EAC7B,OAAO,CAAC,EAAE,MAAM,iBAyCjB;AAED,wBAAsB,+BAA+B,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CAoElB"}

package/lib/infrastructure/legacy-migration/legacy-migration.js

@@ -7,7 +7,7 @@ const paths_1 = require("alwaysai/lib/paths");
 const util_1 = require("alwaysai/lib/util");
 const path_1 = require("path");
 const rimraf_1 = require("rimraf");
-const rabbitmq_connection_1 = require("../../local-connection/rabbitmq-connection");
+const rabbitmq_container_1 = require("../../local-connection/rabbitmq-container");
 const copy_dir_1 = require("../../util/copy-dir");
 const directories_1 = require("../../util/directories");
 const logger_1 = require("../../util/logger");
@@ -29,7 +29,7 @@ async function migrateAgentConfigFile(baseDir) {
         parsedAgentConfig = legacyAgentConfigFile.read();
     }
     catch (e) {
-        logger_1.logger.error(`Error reading agent config for:\n${(0, util_1.stringifyError)(e)}`);
+        logger_1.logger.error(`Error reading agent config! Error:\n${(0, util_1.stringifyError)(e)}`);
         logger_1.logger.error(`Agent Config Errors: ${JSON.stringify(legacyAgentConfigFile.getErrors(), null, 2)}`);
         throw new Error(`Could not parse ${legacyAgentConfigFile.path} while migrating your legacy device files.`);
     }
@@ -40,7 +40,7 @@ async function migrateAgentConfigFile(baseDir) {
         await (0, rimraf_1.default)(legacyAgentConfigFile.path);
     }
     catch (e) {
-        logger_1.logger.error(`Error writing agent config for:\n${(0, util_1.stringifyError)(e)}`);
+        logger_1.logger.error(`Error writing agent config! Error:\n${(0, util_1.stringifyError)(e)}`);
         logger_1.logger.error(`Agent Config Errors: ${JSON.stringify(newAgentConfig.getErrors(), null, 2)}`);
         throw new Error(`Could not parse ${newAgentConfig.path} while migrating your legacy device files.`);
     }
@@ -123,15 +123,11 @@ async function migrateFromLegacyCertsAndTokens(baseDir) {
         logger_1.logger.debug('Copying agent config file to new file path.');
         await migrateAgentConfigFile(baseDir);
         // if rabbitmq container is present, stop container and migrate files
-        try {
-            if (await (0, rabbitmq_connection_1.checkRabbitMQContainerRunning)()) {
-                await (0, rabbitmq_connection_1.stopRabbitMQContainer)();
+        if (await (0, rabbitmq_container_1.checkRabbitMQContainerRunning)()) {
+            if ((await (0, rabbitmq_container_1.stopRabbitMQContainer)()) === false) {
+                logger_1.logger.error(`You may need to manually stop the container by running docker-compose down in the following directory: ${(0, directories_1.getDeviceAgentDockerComposePath)()}`);
             }
         }
-        catch (e) {
-            logger_1.logger.error(`You may need to manually stop the container by running docker-compose down in the following directory: ${(0, directories_1.getDeviceAgentDockerComposePath)()}`);
-            logger_1.logger.debug(`Error in checking / stopping RabbitMQ container!\n${(0, util_1.stringifyError)(e)}`);
-        }
         if (await (0, util_1.exists)((0, directories_1.getDeviceAgentConfigPath)(baseDir))) {
             await (0, copy_dir_1.copyDir)({
                 srcPath: legacyFiles.getLegacyDeviceAgentConfigDirPath(),

package/lib/infrastructure/legacy-migration/legacy-migration.js.map

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

package/lib/jobs/job-handler.d.ts

@@ -6,7 +6,7 @@ export declare class JobHandler extends BaseHandler implements MessageHandler {
     private readonly state;
     private jobId;
     handle(message: any, topic: string): Promise<void>;
-    getJobTopic(): {
+    getJobTopics(): {
         NOTIFY_NEXT: string;
         START_NEXT: string;
         START_NEXT_ACCEPTED: string;

package/lib/jobs/job-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"job-handler.d.ts","sourceRoot":"","sources":["../../src/jobs/job-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EACL,WAAW,EACX,cAAc,EACf,MAAM,0CAA0C,CAAC;AAkBlD,qBAAa,UAAW,SAAQ,WAAY,YAAW,cAAc;IACnE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA4B;gBAE3C,cAAc,EAAE,cAAc;IAQ1C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA0B;IAChD,OAAO,CAAC,KAAK,CAAM;IAEN,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB/D,WAAW;;;;;;YAUG,UAAU;IAOxB,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,WAAW;IAsBnB,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAE/B;IAEF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAG7B;CACH"}
+{"version":3,"file":"job-handler.d.ts","sourceRoot":"","sources":["../../src/jobs/job-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EACL,WAAW,EACX,cAAc,EACf,MAAM,0CAA0C,CAAC;AAkBlD,qBAAa,UAAW,SAAQ,WAAY,YAAW,cAAc;IACnE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA4B;gBAE3C,cAAc,EAAE,cAAc;IAQ1C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA0B;IAChD,OAAO,CAAC,KAAK,CAAM;IAEN,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB/D,YAAY;;;;;;YAUE,UAAU;IAOxB,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,WAAW;IAsBnB,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAE/B;IAEF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAG7B;CACH"}

package/lib/jobs/job-handler.js

@@ -31,7 +31,7 @@ class JobHandler extends base_message_handler_1.BaseHandler {
         this.msgHandler = new device_agent_message_handler_1.DeviceAgentMessageHandler(handlerContext, this.handleJobError, this.handleJobSuccess);
     }
     async handle(message, topic) {
-        const TOPICS = this.getJobTopic();
+        const TOPICS = this.getJobTopics();
         try {
             switch (topic) {
                 case TOPICS.NOTIFY_NEXT:
@@ -48,7 +48,7 @@ class JobHandler extends base_message_handler_1.BaseHandler {
             logger_1.logger.error(`Error handling job for topic: ${topic}`, error);
         }
     }
-    getJobTopic() {
+    getJobTopics() {
         const TOPICS = {
             NOTIFY_NEXT: `$aws/things/${this.clientId}/jobs/notify-next`,
             START_NEXT: `$aws/things/${this.clientId}/jobs/start-next`,
@@ -60,7 +60,7 @@ class JobHandler extends base_message_handler_1.BaseHandler {
     async notifyNext(message) {
         // Triggers when a job is completed and we need to notify the next job
         logger_1.logger.info('Invoking NOTIFY_NEXT handler');
-        const TOPICS = this.getJobTopic();
+        const TOPICS = this.getJobTopics();
         this.publisher.publish(TOPICS.START_NEXT, JSON.stringify({}));
     }
     startNextAccepted(message) {
@@ -114,7 +114,7 @@ class JobHandler extends base_message_handler_1.BaseHandler {
         }
     }
     updateJobStatus(status, message) {
-        const { UPDATE } = this.getJobTopic();
+        const { UPDATE } = this.getJobTopics();
         const payload = {
             status,
             statusDetails: {

package/lib/jobs/job-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"job-handler.js","sourceRoot":"","sources":["../../src/jobs/job-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"job-handler.js","sourceRoot":"","sources":["../../src/jobs/job-handler.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AACxC,mFAGkD;AAClD,mGAA6F;AAE7F,MAAM,QAAQ;IAIZ,oBAAoB;IACpB;QAHO,kBAAa,GAAG,KAAK,CAAC;IAGL,CAAC,CAAC,sBAAsB;IAEhD,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;YACtB,QAAQ,CAAC,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;SACpC;QACD,OAAO,QAAQ,CAAC,QAAQ,CAAC;IAC3B,CAAC;CACF;AAED,MAAa,UAAW,SAAQ,kCAAW;IAGzC,YAAY,cAA8B;QACxC,KAAK,CAAC,cAAc,CAAC,CAAC;QAOP,UAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QACxC,UAAK,GAAG,EAAE,CAAC;QAsGF,qBAAgB,GAAG,CAAC,IAAY,EAAQ,EAAE;YACzD,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACpC,CAAC,CAAC;QAEe,mBAAc,GAAG,CAAC,KAAa,EAAE,GAAW,EAAQ,EAAE;YACrE,eAAM,CAAC,KAAK,CAAC,0BAA0B,GAAG,EAAE,CAAC,CAAC;YAC9C,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,qBAAqB,GAAG,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC;QApHA,IAAI,CAAC,UAAU,GAAG,IAAI,wDAAyB,CAC7C,cAAc,EACd,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,gBAAgB,CACtB,CAAC;IACJ,CAAC;IAIM,KAAK,CAAC,MAAM,CAAC,OAAY,EAAE,KAAa;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAEnC,IAAI;YACF,QAAQ,KAAK,EAAE;gBACb,KAAK,MAAM,CAAC,WAAW;oBACrB,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBAC/B,MAAM;gBACR,KAAK,MAAM,CAAC,mBAAmB;oBAC7B,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBAChC,MAAM;gBACR;oBACE,eAAM,CAAC,IAAI,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;aACjD;SACF;QAAC,OAAO,KAAK,EAAE;YACd,eAAM,CAAC,KAAK,CAAC,iCAAiC,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;SAC/D;IACH,CAAC;IAED,YAAY;QACV,MAAM,MAAM,GAAG;YACb,WAAW,EAAE,eAAe,IAAI,CAAC,QAAQ,mBAAmB;YAC5D,UAAU,EAAE,eAAe,IAAI,CAAC,QAAQ,kBAAkB;YAC1D,mBAAmB,EAAE,eAAe,IAAI,CAAC,QAAQ,2BAA2B;YAC5E,MAAM,EAAE,eAAe,IAAI,CAAC,QAAQ,SAAS,IAAI,CAAC,KAAK,SAAS;SACjE,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,OAAY;QACnC,sEAAsE;QACtE,eAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACnC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IAEO,iBAAiB,CAAC,OAAY;QACpC,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;YAC5B,eAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YACvC,OAAO;SACR;QAED,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;QAEhC,IAAI;YACF,IAAI,OAAO,CAAC,SAAS,EAAE;gBACrB,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aAC7C;iBAAM;gBACL,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;aAClC;SACF;QAAC,OAAO,KAAc,EAAE;YACvB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SACzB;QACD,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;IACnC,CAAC;IAEO,mBAAmB,CAAC,SAAc;QACxC,eAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAClC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACtC,CAAC;IAEO,WAAW,CAAC,KAAc;QAChC,IAAI,KAAK,YAAY,KAAK,EAAE;YAC1B,eAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;YAC/C,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;SACxC;aAAM;YACL,IAAI,YAAoB,CAAC;YACzB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,YAAY,GAAG,KAAK,CAAC;aACtB;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;gBACtD,IAAI;oBACF,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;iBACtC;gBAAC,OAAO,SAAS,EAAE;oBAClB,YAAY,GAAG,qCAAqC,CAAC;iBACtD;aACF;iBAAM;gBACL,YAAY,GAAG,eAAe,CAAC;aAChC;YACD,eAAM,CAAC,KAAK,CAAC,qBAAqB,YAAY,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;SACvC;IACH,CAAC;IAEO,eAAe,CAAC,MAAc,EAAE,OAAgB;QACtD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG;YACd,MAAM;YACN,aAAa,EAAE;gBACb,OAAO;aACR;SACF,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACxD,eAAM,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,KAAK,OAAO,MAAM,EAAE,CAAC,CAAC;QACrD,sBAAsB;QACtB,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;IACnC,CAAC;CAUF;AA1HD,gCA0HC"}

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

@@ -0,0 +1,6 @@
+export declare function checkRabbitMQContainerRunning(): Promise<boolean>;
+export declare function runRabbitMQContainer(opts?: {
+    max_attempts: number;
+}): Promise<boolean>;
+export declare function stopRabbitMQContainer(): Promise<boolean>;
+//# sourceMappingURL=rabbitmq-container.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"rabbitmq-container.d.ts","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-container.ts"],"names":[],"mappings":"AAqBA,wBAAsB,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC,CA4BtE;AAoCD,wBAAsB,oBAAoB,CAAC,IAAI,CAAC,EAAE;IAChD,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,OAAO,CAAC,CAsCnB;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC,CAuB9D"}

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

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stopRabbitMQContainer = exports.runRabbitMQContainer = exports.checkRabbitMQContainerRunning = void 0;
+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 logger_1 = require("../util/logger");
+const sleep_1 = require("../util/sleep");
+const constants_1 = require("./constants");
+const rabbitMQServiceName = 'alwaysAIRabbitMQ';
+const rabbitMQContainerName = 'alwaysAIRabbitMQContainer';
+/*
+Utility functions to control the Local Connection container (RabbitMQ).
+
+All exported functions handle their own errors and log their status, returning a
+boolean indicating whether the action was successful.
+*/
+async function checkRabbitMQContainerRunning() {
+    logger_1.logger.debug('Checking Local Connection Container status');
+    const spawner = (0, util_1.JsSpawner)();
+    if (!(await spawner.exists((0, directories_1.getDeviceAgentDockerComposePath)()))) {
+        logger_1.logger.warn('Local Connection configuration file is not present');
+        return false;
+    }
+    const containerData = await docker_compose_1.compose.ps({ cwd: (0, directories_1.getDeviceAgentConfigPath)() });
+    for (const service of containerData.data.services) {
+        if ((service === null || service === void 0 ? void 0 : service.name) === rabbitMQContainerName) {
+            if (service.state.includes('Up')) {
+                logger_1.logger.debug('Local Connection container is up.');
+                return true;
+            }
+            logger_1.logger.debug(`Local Connection container is not up. Status: ${service.state}`);
+            return false;
+        }
+    }
+    logger_1.logger.warn(`Local Connection container not found in container data: ${JSON.stringify(containerData, null, 2)}`);
+    return false;
+}
+exports.checkRabbitMQContainerRunning = checkRabbitMQContainerRunning;
+async function writeRabbitMQDockerComposeFile() {
+    const spawner = (0, util_1.JsSpawner)();
+    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 = {
+        services: {
+            [rabbitMQServiceName]: {
+                container_name: rabbitMQContainerName,
+                image: 'rabbitmq:3.11',
+                ports: [`${constants_1.LOCAL_CONNECTION_PORT}:${constants_1.LOCAL_CONNECTION_PORT}`],
+                hostname: 'my-rabbit',
+                restart: 'on-failure',
+                environment: [`RABBITMQ_NODE_PORT=${constants_1.LOCAL_CONNECTION_PORT}`],
+                volumes: [
+                    './rabbitmq/:/var/lib/rabbitmq/',
+                    './rabbitmq/log/:/var/log/rabbitmq/'
+                ]
+            }
+        }
+    };
+    const RabbitMQDockerComposeYaml = YAML.stringify(rabbitmqDockerComposeCmd);
+    await spawner.writeFile((0, directories_1.getDeviceAgentDockerComposePath)(), RabbitMQDockerComposeYaml);
+}
+async function runRabbitMQContainer(opts) {
+    const max_attempts = (opts === null || opts === void 0 ? void 0 : opts.max_attempts) || 10;
+    logger_1.logger.debug('Starting the Local Connection container');
+    try {
+        await writeRabbitMQDockerComposeFile();
+        const upOut = await docker_compose_1.compose.upAll({
+            cwd: (0, directories_1.getDeviceAgentConfigPath)()
+        });
+        logger_1.logger.debug(`Docker compose up for Local Connection:\n${JSON.stringify(upOut, null, 2)}`);
+        if (upOut.exitCode !== 0) {
+            throw new Error(`Failed to start Local Connection! stdout=${upOut.out} stderr=${upOut.err}`);
+        }
+        // check if the container is up
+        let attempts = 0;
+        while (!(await checkRabbitMQContainerRunning())) {
+            attempts++;
+            if (attempts >= max_attempts) {
+                throw new Error('Local Connection container failed to come up after start!');
+            }
+            await (0, sleep_1.default)(1000);
+        }
+        return true;
+    }
+    catch (e) {
+        logger_1.logger.error(`Unable to start Local Connection container!\n${(0, util_1.stringifyError)(e)}`);
+        return false;
+    }
+}
+exports.runRabbitMQContainer = runRabbitMQContainer;
+async function stopRabbitMQContainer() {
+    logger_1.logger.debug(`Stopping alwaysAI Local Connection container`);
+    try {
+        const downOut = await docker_compose_1.compose.down({ cwd: (0, directories_1.getDeviceAgentConfigPath)() });
+        logger_1.logger.debug(`Local Connection docker-compose down: ${JSON.stringify(downOut, null, 2)}`);
+        if (downOut.exitCode !== 0) {
+            throw new Error(`Failed to stop Local Connection! stdout=${downOut.out} stderr=${downOut.err}`);
+        }
+        return true;
+    }
+    catch (e) {
+        logger_1.logger.error(`Unable to stop Local Connection Container:\n${(0, util_1.stringifyError)(e)}`);
+        return false;
+    }
+}
+exports.stopRabbitMQContainer = stopRabbitMQContainer;
+//# sourceMappingURL=rabbitmq-container.js.map

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

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

package/lib/local-connection/rabbitmq-container.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=rabbitmq-container.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"rabbitmq-container.test.d.ts","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-container.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,219 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const rabbitmq_container_1 = require("./rabbitmq-container");
+const mockJsSpawner = {
+    exists: jest.fn(),
+    mkdirp: jest.fn(),
+    writeFile: jest.fn()
+};
+jest.mock('alwaysai/lib/util/spawner', () => {
+    return {
+        JsSpawner: jest.fn(() => mockJsSpawner)
+    };
+});
+jest.mock('../docker/docker-compose', () => {
+    return {
+        compose: {
+            ps: jest.fn(),
+            upAll: jest.fn(),
+            down: jest.fn()
+        }
+    };
+});
+const docker_compose_1 = require("../docker/docker-compose");
+describe('Test check RabbitMQ container running', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+    test('Compose file not found', async () => {
+        mockJsSpawner.exists.mockResolvedValue(false);
+        const running = await (0, rabbitmq_container_1.checkRabbitMQContainerRunning)();
+        expect(running).toBeFalsy();
+    });
+    test('Container not found', async () => {
+        mockJsSpawner.exists.mockResolvedValue(true);
+        jest.mocked(docker_compose_1.compose.ps).mockResolvedValue({
+            exitCode: 0,
+            out: '',
+            err: '',
+            data: {
+                services: []
+            }
+        });
+        const running = await (0, rabbitmq_container_1.checkRabbitMQContainerRunning)();
+        expect(running).toBeFalsy();
+    });
+    test('Container is not up', async () => {
+        mockJsSpawner.exists.mockResolvedValue(true);
+        jest.mocked(docker_compose_1.compose.ps).mockResolvedValue({
+            exitCode: 0,
+            out: '',
+            err: '',
+            data: {
+                services: [
+                    {
+                        name: 'alwaysAIRabbitMQContainer',
+                        command: '',
+                        state: 'Down',
+                        ports: []
+                    }
+                ]
+            }
+        });
+        const running = await (0, rabbitmq_container_1.checkRabbitMQContainerRunning)();
+        expect(running).toBeFalsy();
+    });
+    test('Container is up', async () => {
+        mockJsSpawner.exists.mockResolvedValue(true);
+        jest.mocked(docker_compose_1.compose.ps).mockResolvedValue({
+            exitCode: 0,
+            out: '',
+            err: '',
+            data: {
+                services: [
+                    {
+                        name: 'alwaysAIRabbitMQContainer',
+                        command: '',
+                        state: 'Up',
+                        ports: []
+                    }
+                ]
+            }
+        });
+        const running = await (0, rabbitmq_container_1.checkRabbitMQContainerRunning)();
+        expect(running).toBeTruthy();
+    });
+});
+describe('Test run RabbitMQ container', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+    test('Compose file write fails', async () => {
+        mockJsSpawner.exists.mockResolvedValueOnce(false);
+        mockJsSpawner.mkdirp.mockImplementation(async () => {
+            return;
+        });
+        mockJsSpawner.writeFile.mockImplementation(async () => {
+            throw new Error('Failed to write file!');
+        });
+        const running = await (0, rabbitmq_container_1.runRabbitMQContainer)();
+        expect(running).toBeFalsy();
+    });
+    test('Compose up fails', async () => {
+        mockJsSpawner.exists.mockResolvedValueOnce(true);
+        mockJsSpawner.writeFile.mockImplementation(async () => {
+            return;
+        });
+        jest.mocked(docker_compose_1.compose.upAll).mockResolvedValue({
+            exitCode: 1,
+            out: '',
+            err: ''
+        });
+        const running = await (0, rabbitmq_container_1.runRabbitMQContainer)();
+        expect(running).toBeFalsy();
+    });
+    test('Container fails to come up', async () => {
+        // exists(deviceAgentConfigPath)
+        mockJsSpawner.exists.mockResolvedValueOnce(true);
+        mockJsSpawner.writeFile.mockImplementation(async () => {
+            return;
+        });
+        jest.mocked(docker_compose_1.compose.upAll).mockResolvedValue({
+            exitCode: 0,
+            out: '',
+            err: ''
+        });
+        // exists(deviceAgentDockerComposePath)
+        mockJsSpawner.exists.mockResolvedValueOnce(true);
+        jest.mocked(docker_compose_1.compose.ps).mockResolvedValue({
+            exitCode: 0,
+            out: '',
+            err: '',
+            data: {
+                services: [
+                    {
+                        name: 'alwaysAIRabbitMQContainer',
+                        command: '',
+                        state: 'Down',
+                        ports: []
+                    }
+                ]
+            }
+        });
+        const running = await (0, rabbitmq_container_1.runRabbitMQContainer)({ max_attempts: 2 });
+        expect(jest.mocked(docker_compose_1.compose.ps)).toBeCalledTimes(2);
+        expect(running).toBeFalsy();
+    });
+    test('Container comes up successfully', async () => {
+        // exists(deviceAgentConfigPath)
+        mockJsSpawner.exists.mockResolvedValueOnce(true);
+        mockJsSpawner.writeFile.mockImplementation(async () => {
+            return;
+        });
+        jest.mocked(docker_compose_1.compose.upAll).mockResolvedValue({
+            exitCode: 0,
+            out: '',
+            err: ''
+        });
+        // exists(deviceAgentDockerComposePath)
+        mockJsSpawner.exists.mockResolvedValueOnce(true);
+        // Check status twice, one with container still down and next up
+        jest.mocked(docker_compose_1.compose.ps).mockResolvedValueOnce({
+            exitCode: 0,
+            out: '',
+            err: '',
+            data: {
+                services: [
+                    {
+                        name: 'alwaysAIRabbitMQContainer',
+                        command: '',
+                        state: 'Down',
+                        ports: []
+                    }
+                ]
+            }
+        });
+        jest.mocked(docker_compose_1.compose.ps).mockResolvedValueOnce({
+            exitCode: 0,
+            out: '',
+            err: '',
+            data: {
+                services: [
+                    {
+                        name: 'alwaysAIRabbitMQContainer',
+                        command: '',
+                        state: 'Up',
+                        ports: []
+                    }
+                ]
+            }
+        });
+        const running = await (0, rabbitmq_container_1.runRabbitMQContainer)({ max_attempts: 2 });
+        expect(jest.mocked(docker_compose_1.compose.ps)).toBeCalledTimes(2);
+        expect(running).toBeTruthy();
+    });
+});
+describe('Test stopping RabbitMQ container', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+    test('Compose down fails', async () => {
+        jest.mocked(docker_compose_1.compose.down).mockResolvedValue({
+            exitCode: 1,
+            out: '',
+            err: ''
+        });
+        const stopped = await (0, rabbitmq_container_1.stopRabbitMQContainer)();
+        expect(stopped).toBeFalsy();
+    });
+    test('Stop succeeds', async () => {
+        jest.mocked(docker_compose_1.compose.down).mockResolvedValue({
+            exitCode: 0,
+            out: '',
+            err: ''
+        });
+        const stopped = await (0, rabbitmq_container_1.stopRabbitMQContainer)();
+        expect(stopped).toBeTruthy();
+    });
+});
+//# sourceMappingURL=rabbitmq-container.test.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/analytics.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,sBAAsB;;4DAkBjC,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;4DAgEjC,CAAC"}
+{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/analytics.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,sBAAsB;;4DAkBjC,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;4DA+DjC,CAAC"}

package/lib/subcommands/app/analytics.js

@@ -63,15 +63,14 @@ exports.setAnalyticsCfgCliLeaf = (0, alwayscli_1.CliLeaf)({
                 appConfig: JSON.stringify(appCfg) // Pack app config as string as dictated by schema
             }
         };
+        await deviceAgent.waitForConnection();
         deviceAgent.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(deviceAgent.getClientId(), 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateShadowMessage)({
             clientId: 'client',
             desired: toDesire
         })));
         // Sleep for extra time to ensure time for shadow response
         await (0, sleep_1.default)(10000);
-        while (deviceAgent.isCmdInProgress(project)) {
-            await (0, sleep_1.default)(1000);
-        }
+        await deviceAgent.waitForCmd(project);
         await deviceAgent.stop();
     }
 });

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

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

package/lib/subcommands/app/env-vars.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-vars.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/env-vars.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,iBAAiB;;4DAc5B,CAAC;AAEH,eAAO,MAAM,aAAa;;;4DAsDxB,CAAC;AAEH,eAAO,MAAM,YAAY;;;4DA4DvB,CAAC"}
+{"version":3,"file":"env-vars.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/env-vars.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,iBAAiB;;4DAc5B,CAAC;AAEH,eAAO,MAAM,aAAa;;;4DAqDxB,CAAC;AAEH,eAAO,MAAM,YAAY;;;4DA2DvB,CAAC"}

package/lib/subcommands/app/env-vars.js

@@ -56,15 +56,14 @@ exports.setEnvCliLeaf = (0, alwayscli_1.CliLeaf)({
                 envVars: JSON.stringify(envVars)
             }
         };
+        await deviceAgent.waitForConnection();
         deviceAgent.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(deviceAgent.getClientId(), 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateShadowMessage)({
             clientId: 'client',
             desired: toDesire
         })));
         // Sleep for extra time to ensure time for shadow response
         await (0, sleep_1.default)(10000);
-        while (deviceAgent.isCmdInProgress(projectId)) {
-            await (0, sleep_1.default)(1000);
-        }
+        await deviceAgent.waitForCmd(projectId);
         await deviceAgent.stop();
     }
 });
@@ -102,15 +101,14 @@ exports.rmEnvCliLeaf = (0, alwayscli_1.CliLeaf)({
                 envVars: JSON.stringify(newEnvs)
             }
         };
+        await deviceAgent.waitForConnection();
         deviceAgent.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(deviceAgent.getClientId(), 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateShadowMessage)({
             clientId: 'client',
             desired: toDesire
         })));
         // Sleep for extra time to ensure time for shadow response
         await (0, sleep_1.default)(10000);
-        while (deviceAgent.isCmdInProgress(projectId)) {
-            await (0, sleep_1.default)(1000);
-        }
+        await deviceAgent.waitForCmd(projectId);
         await deviceAgent.stop();
     }
 });