@alwaysai/device-agent 2.0.2-0 → 2.0.2

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

@@ -1 +1 @@
-{"version":3,"file":"env-vars.js","sourceRoot":"","sources":["../../../src/subcommands/app/env-vars.ts"],"names":[],"mappings":";;;AAAA,mDAK6B;AAC7B,mEAAuD;AACvD,wGAAkG;AAClG,4CAAqC;AACrC,yEAIwC;AAE3B,QAAA,iBAAiB,GAAG,IAAA,mBAAO,EAAC;IACvC,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,8CAA8C;IAC3D,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAU,EAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QACzD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,aAAa,GAAG,IAAA,mBAAO,EAAC;IACnC,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,yCAAyC;IACtD,eAAe,EAAE,IAAA,+BAAmB,EAAC;QACnC,WAAW,EAAE,iCAAiC;QAC9C,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,yDAAyD;YACtE,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI;QACrB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC7C,MAAM,WAAW,GAAG,MAAM,IAAA,gCAAU,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACpD,MAAM,OAAO,GAAY,EAAE,CAAC,OAAO,CAAC,oBAAO,WAAW,CAAC,OAAO,CAAC,CAAE,EAAE,CAAC;QAEpE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;YAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACxB,MAAM,IAAI,yBAAa,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;aACrD;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACzB,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QACvC,CAAC,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QAErD,MAAM,QAAQ,GAAG;YACf,CAAC,SAAS,CAAC,EAAE;gBACX,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;aACjC;SACF,CAAC;QACF,WAAW,CAAC,SAAS,CAAC,OAAO,CAC3B,IAAA,qCAAc,EAAC,WAAW,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAC/D,IAAI,CAAC,SAAS,CACZ,IAAA,+CAAwB,EAAC;YACvB,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,QAAQ;SAClB,CAAC,CACH,CACF,CAAC;QACF,0DAA0D;QAC1D,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,CAAC;QAEnB,OAAO,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;YAC7C,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;SACnB;QACD,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,YAAY,GAAG,IAAA,mBAAO,EAAC;IAClC,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,oDAAoD;IACjE,eAAe,EAAE,IAAA,0BAAc,EAAC;QAC9B,WAAW,EAAE,mDAAmD;QAChE,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EACT,+DAA+D;YACjE,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI;QACpB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC7C,MAAM,MAAM,GAAG,GAAG,CAAC;QACnB,MAAM,WAAW,GAAG,MAAM,IAAA,gCAAU,EAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;QAE/D,MAAM,OAAO,qBAAQ,WAAW,CAAE,CAAC;QACnC,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAClD,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;SACjC;aAAM;YACL,MAAM,IAAI,yBAAa,CACrB,uBAAuB,MAAM,gBAAgB,OAAO,yBAAyB,IAAI,CAAC,SAAS,CACzF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EACjC,IAAI,EACJ,CAAC,CACF,wCAAwC,CAC1C,CAAC;SACH;QAED,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QAErD,MAAM,QAAQ,GAAG;YACf,CAAC,SAAS,CAAC,EAAE;gBACX,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;aACjC;SACF,CAAC;QACF,WAAW,CAAC,SAAS,CAAC,OAAO,CAC3B,IAAA,qCAAc,EAAC,WAAW,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAC/D,IAAI,CAAC,SAAS,CACZ,IAAA,+CAAwB,EAAC;YACvB,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,QAAQ;SAClB,CAAC,CACH,CACF,CAAC;QACF,0DAA0D;QAC1D,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,CAAC;QAEnB,OAAO,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;YAC7C,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;SACnB;QACD,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"env-vars.js","sourceRoot":"","sources":["../../../src/subcommands/app/env-vars.ts"],"names":[],"mappings":";;;AAAA,mDAK6B;AAC7B,mEAAuD;AACvD,wGAAkG;AAClG,4CAAqC;AACrC,yEAIwC;AAE3B,QAAA,iBAAiB,GAAG,IAAA,mBAAO,EAAC;IACvC,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,8CAA8C;IAC3D,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAU,EAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QACzD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,aAAa,GAAG,IAAA,mBAAO,EAAC;IACnC,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,yCAAyC;IACtD,eAAe,EAAE,IAAA,+BAAmB,EAAC;QACnC,WAAW,EAAE,iCAAiC;QAC9C,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,yDAAyD;YACtE,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI;QACrB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC7C,MAAM,WAAW,GAAG,MAAM,IAAA,gCAAU,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACpD,MAAM,OAAO,GAAY,EAAE,CAAC,OAAO,CAAC,oBAAO,WAAW,CAAC,OAAO,CAAC,CAAE,EAAE,CAAC;QAEpE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;YAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACxB,MAAM,IAAI,yBAAa,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;aACrD;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACzB,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QACvC,CAAC,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QAErD,MAAM,QAAQ,GAAG;YACf,CAAC,SAAS,CAAC,EAAE;gBACX,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;aACjC;SACF,CAAC;QACF,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;QACtC,WAAW,CAAC,SAAS,CAAC,OAAO,CAC3B,IAAA,qCAAc,EAAC,WAAW,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAC/D,IAAI,CAAC,SAAS,CACZ,IAAA,+CAAwB,EAAC;YACvB,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,QAAQ;SAClB,CAAC,CACH,CACF,CAAC;QACF,0DAA0D;QAC1D,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,CAAC;QAEnB,MAAM,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,YAAY,GAAG,IAAA,mBAAO,EAAC;IAClC,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,oDAAoD;IACjE,eAAe,EAAE,IAAA,0BAAc,EAAC;QAC9B,WAAW,EAAE,mDAAmD;QAChE,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EACT,+DAA+D;YACjE,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI;QACpB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC7C,MAAM,MAAM,GAAG,GAAG,CAAC;QACnB,MAAM,WAAW,GAAG,MAAM,IAAA,gCAAU,EAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;QAE/D,MAAM,OAAO,qBAAQ,WAAW,CAAE,CAAC;QACnC,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAClD,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;SACjC;aAAM;YACL,MAAM,IAAI,yBAAa,CACrB,uBAAuB,MAAM,gBAAgB,OAAO,yBAAyB,IAAI,CAAC,SAAS,CACzF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EACjC,IAAI,EACJ,CAAC,CACF,wCAAwC,CAC1C,CAAC;SACH;QAED,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QAErD,MAAM,QAAQ,GAAG;YACf,CAAC,SAAS,CAAC,EAAE;gBACX,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;aACjC;SACF,CAAC;QACF,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;QACtC,WAAW,CAAC,SAAS,CAAC,OAAO,CAC3B,IAAA,qCAAc,EAAC,WAAW,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAC/D,IAAI,CAAC,SAAS,CACZ,IAAA,+CAAwB,EAAC;YACvB,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,QAAQ;SAClB,CAAC,CACH,CACF,CAAC;QACF,0DAA0D;QAC1D,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,CAAC;QAEnB,MAAM,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/models.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,oBAAoB;;4DAc/B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;4DAgD1B,CAAC"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/models.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,oBAAoB;;4DAc/B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;4DA+C1B,CAAC"}

package/lib/subcommands/app/models.js

@@ -49,15 +49,14 @@ exports.addModelCliLeaf = (0, alwayscli_1.CliLeaf)({
                 appConfig: JSON.stringify(newAppCfg)
             }
         };
+        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();
     }
 });

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

@@ -1 +1 @@
-{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/subcommands/app/models.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,mEAAyE;AACzE,wGAAkG;AAClG,4CAAqC;AACrC,yEAGwC;AAE3B,QAAA,oBAAoB,GAAG,IAAA,mBAAO,EAAC;IAC1C,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,6BAA6B;IAC1C,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAY,EAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7D,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,eAAe,GAAG,IAAA,mBAAO,EAAC;IACrC,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,gCAAgC;IAC7C,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,KAAK,EAAE,IAAA,0BAAc,EAAC;YACpB,WAAW,EAAE,UAAU;YACvB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,eAAe;YAC5B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACpD,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QAErD,gCAAgC;QAEhC,MAAM,SAAS,GAAG,MAAM,IAAA,oCAAc,EAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;QACjE,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAE1C,MAAM,QAAQ,GAAG;YACf,CAAC,SAAS,CAAC,EAAE;gBACX,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;aACrC;SACF,CAAC;QACF,WAAW,CAAC,SAAS,CAAC,OAAO,CAC3B,IAAA,qCAAc,EAAC,WAAW,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAC/D,IAAI,CAAC,SAAS,CACZ,IAAA,+CAAwB,EAAC;YACvB,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,QAAQ;SAClB,CAAC,CACH,CACF,CAAC;QACF,0DAA0D;QAC1D,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,CAAC;QAEnB,OAAO,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;YAC7C,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;SACnB;QACD,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/subcommands/app/models.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,mEAAyE;AACzE,wGAAkG;AAClG,4CAAqC;AACrC,yEAGwC;AAE3B,QAAA,oBAAoB,GAAG,IAAA,mBAAO,EAAC;IAC1C,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,6BAA6B;IAC1C,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAY,EAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7D,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,eAAe,GAAG,IAAA,mBAAO,EAAC;IACrC,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,gCAAgC;IAC7C,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,KAAK,EAAE,IAAA,0BAAc,EAAC;YACpB,WAAW,EAAE,UAAU;YACvB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,eAAe;YAC5B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACpD,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QAErD,gCAAgC;QAEhC,MAAM,SAAS,GAAG,MAAM,IAAA,oCAAc,EAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;QACjE,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAE1C,MAAM,QAAQ,GAAG;YACf,CAAC,SAAS,CAAC,EAAE;gBACX,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;aACrC;SACF,CAAC;QACF,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;QACtC,WAAW,CAAC,SAAS,CAAC,OAAO,CAC3B,IAAA,qCAAc,EAAC,WAAW,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAC/D,IAAI,CAAC,SAAS,CACZ,IAAA,+CAAwB,EAAC;YACvB,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,QAAQ;SAClB,CAAC,CACH,CACF,CAAC;QACF,0DAA0D;QAC1D,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,CAAC;QAEnB,MAAM,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"shadow.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/shadow.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,gBAAgB;;4DAqB3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DAqB9B,CAAC"}
+{"version":3,"file":"shadow.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/shadow.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,gBAAgB;;4DAoB3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DAoB9B,CAAC"}

package/lib/subcommands/app/shadow.js

@@ -16,12 +16,11 @@ exports.getShadowCliLeaf = (0, alwayscli_1.CliLeaf)({
     async action(_, opts) {
         const { project } = opts;
         const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
+        await deviceAgent.waitForConnection();
         deviceAgent.shadowHandler.getProjectShadowUpdates();
         // 5 seconds should cover the response wait time
         await (0, sleep_1.default)(5000);
-        while (deviceAgent.isCmdInProgress(project)) {
-            await (0, sleep_1.default)(1000);
-        }
+        await deviceAgent.waitForCmd(project);
         await deviceAgent.stop();
     }
 });
@@ -37,12 +36,11 @@ exports.updateShadowCliLeaf = (0, alwayscli_1.CliLeaf)({
     async action(_, opts) {
         const { project } = opts;
         const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
+        await deviceAgent.waitForConnection();
         await deviceAgent.shadowHandler.updateProjectShadow(project);
         // 5 seconds should cover the response wait time
         await (0, sleep_1.default)(5000);
-        while (deviceAgent.isCmdInProgress(project)) {
-            await (0, sleep_1.default)(1000);
-        }
+        await deviceAgent.waitForCmd(project);
         await deviceAgent.stop();
     }
 });

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

@@ -1 +1 @@
-{"version":3,"file":"shadow.js","sourceRoot":"","sources":["../../../src/subcommands/app/shadow.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,wGAAkG;AAClG,4CAAqC;AAExB,QAAA,gBAAgB,GAAG,IAAA,mBAAO,EAAC;IACtC,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,wBAAwB;IACrC,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QACrD,WAAW,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAC;QAEpD,gDAAgD;QAChD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;QAClB,OAAO,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YAC3C,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;SACnB;QACD,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,IAAA,mBAAO,EAAC;IACzC,IAAI,EAAE,eAAe;IACrB,WAAW,EAAE,8DAA8D;IAC3E,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QACrD,MAAM,WAAW,CAAC,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAE7D,gDAAgD;QAChD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;QAClB,OAAO,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YAC3C,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;SACnB;QACD,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"shadow.js","sourceRoot":"","sources":["../../../src/subcommands/app/shadow.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,wGAAkG;AAClG,4CAAqC;AAExB,QAAA,gBAAgB,GAAG,IAAA,mBAAO,EAAC;IACtC,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,wBAAwB;IACrC,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QACrD,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;QACtC,WAAW,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAC;QAEpD,gDAAgD;QAChD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;QAClB,MAAM,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,IAAA,mBAAO,EAAC;IACzC,IAAI,EAAE,eAAe;IACrB,WAAW,EAAE,8DAA8D;IAC3E,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QACrD,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;QACtC,MAAM,WAAW,CAAC,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAE7D,gDAAgD;QAChD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;QAClB,MAAM,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC"}

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;;;;;;4DAkE5B,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":"AAcA,eAAO,MAAM,eAAe,yKAQ1B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;4DAiE5B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DA4B9B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;4DAc7B,CAAC"}

package/lib/subcommands/app/version.js

@@ -6,7 +6,6 @@ const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
 const application_control_1 = require("../../application-control");
 const device_agent_cloud_connection_1 = require("../../cloud-connection/device-agent-cloud-connection");
 const agent_config_1 = require("../../infrastructure/agent-config");
-const sleep_1 = require("../../util/sleep");
 const logger_1 = require("../../util/logger");
 exports.listAppsCliLeaf = (0, alwayscli_1.CliLeaf)({
     name: 'list',
@@ -69,10 +68,9 @@ exports.installAppCliLeaf = (0, alwayscli_1.CliLeaf)({
                 envVars
             }
         };
-        await deviceAgent.handleMessage(topic, message);
-        while (deviceAgent.isCmdInProgress(project)) {
-            await (0, sleep_1.default)(1000);
-        }
+        await deviceAgent.waitForConnection();
+        await deviceAgent.sendCliCmd(topic, message);
+        await deviceAgent.waitForCmd(project);
         await deviceAgent.stop();
     }
 });
@@ -99,10 +97,9 @@ exports.uninstallAppCliLeaf = (0, alwayscli_1.CliLeaf)({
                 projectId: project
             }
         };
-        await deviceAgent.handleMessage(topic, message);
-        while (deviceAgent.isCmdInProgress(project)) {
-            await (0, sleep_1.default)(1000);
-        }
+        await deviceAgent.waitForConnection();
+        await deviceAgent.sendCliCmd(topic, message);
+        await deviceAgent.waitForCmd(project);
         await deviceAgent.stop();
     }
 });

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.2-0",
+  "version": "2.0.2",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "publishConfig": {

package/readme.md

@@ -53,14 +53,23 @@ change.
 * Passwordless `sudo` for `/sbin/shutdown` for device restart functionality
 
 To enable passwordless `sudo` for `npm` and `sbin/shutdown` for the current
-user, run `sudo visudo` and add the following lines to the end of the file:
+user, run `sudo visudo` and add the following lines, where `<username>` is replaced with your username on the device:
+
+> **Note**: It is critical that these lines be added to the **end of the file**.
 
 ```bash
-<username> <hostname> = (root) NOPASSWD: /usr/bin/npm
-<username> <hostname> = (root) NOPASSWD: /sbin/shutdown
+<username> ALL = NOPASSWD: /usr/bin/pm2
+<username> ALL = NOPASSWD: /usr/lib/node_modules/pm2/bin/pm2
+<username> ALL = NOPASSWD: /usr/bin/npm
+<username> ALL = NOPASSWD: /sbin/shutdown
 ```
 
-On a linux system `username` can be obtained by typing `whoami` into the terminal. Similarly, if you don't know your `hostname` you can simply type `hostname`.
+On a linux system, the username can be obtained by typing `whoami` into the terminal. For example:
+
+```bash
+$ whoami
+alwaysAI
+```
 
 ## Provision Device
 
@@ -429,6 +438,7 @@ $ pm2 delete 0
 $ pm2 flush
 $ pm2 unstartup
 ```
+
 ### Remove the device configuration
 
 Open a new terminal and run `aai-agent device clean`.
@@ -443,3 +453,5 @@ running `aai-agent`. You should see a response similar to
 
 Go to the [Devices](https://console.alwaysai.co/dashboard/devices) tab, find the
 device in question, and remove the device using the trashcan icon.
+
+

package/src/application-control/install.ts

@@ -16,7 +16,8 @@ import {
   appCleanDocker,
   getPythonVenvPaths,
   createPythonVenv,
-  installPythonReqs
+  installPythonReqs,
+  TargetHardware
 } from 'alwaysai/lib/core/app';
 import { DOCKER_IMAGE_ID_INITIAL_VALUE } from 'alwaysai/lib/constants';
 import { runInDir } from '../util/run-in-dir';
@@ -30,6 +31,7 @@ import {
 } from '../local-connection/constants';
 import { DOCKERFILE, PYTHON_REQUIREMENTS_FILE_NAME } from 'alwaysai/lib/paths';
 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';
 
@@ -234,15 +236,18 @@ async function checkValidProjectFiles({ appDir }) {
   if (!AppJsonFile(appDir).readIfExists()) {
     throw new Error('App JSON file does not exist!');
   }
-
   // write target json
   if (!fs.existsSync(path.join(appDir, DOCKERFILE))) {
     throw new Error('No Dockerfile found for application!');
   }
+  const targetHw: TargetHardware =
+    parseTargetHW(ALWAYSAI_TARGET_HW_OVERRIDE) ??
+    (await getTargetHardwareType({}));
+  logger.debug(`Target Hardware selected to: ${targetHw}`);
   TargetJsonFile(appDir).write({
     targetProtocol: 'docker:',
     dockerImageId: DOCKER_IMAGE_ID_INITIAL_VALUE,
-    targetHardware: await getTargetHardwareType({})
+    targetHardware: targetHw
   });
 }
 

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

@@ -16,40 +16,32 @@ export class ConnectionManager extends MessageDispatcher<any> {
   private clientId: string;
   private host: string;
   private port: number;
-  private device: awsIot.device | null = null;
+  private device: awsIot.device;
   private subscribedTopics: Set<string> = new Set();
+  private connected = false;
 
   constructor(clientId: string, host: string, port: number) {
     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,
+      clientId: this.clientId,
+      host: this.host,
+      port: this.port,
+      keepalive: 10 // time before re-connect attempt on dropped connection, default is 400 seconds
+    });
   }
 
   public getIoTDevice() {
     return this.device;
   }
 
-  public connect(cb): 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(cb);
-    } catch (error) {
-      logger.error(`Error connecting to cloud!\n${stringifyError(error)}`);
-      this.handleReconnection();
-    }
-  }
-
   public isConnected(): boolean {
-    return this.device ? this.device.connected : false;
+    return this.connected;
   }
 
   public registerHandler(topic: string, handler: MessageHandler) {
@@ -58,16 +50,11 @@ export class ConnectionManager extends MessageDispatcher<any> {
   }
 
   public disconnect(): void {
-    if (this.device) {
-      this.device.end();
-      logger.debug(`Device Agent has been disconnected from the AWS IoT Core.`);
-    }
+    this.device.end();
+    logger.debug(`Device Agent has been disconnected from the AWS IoT Core.`);
   }
 
   public subscribe(topic: string): void {
-    if (!this.device) {
-      throw new Error('Must call connect() before subscribe()!');
-    }
     if (!this.subscribedTopics.has(topic)) {
       this.device.subscribe(topic);
       this.subscribedTopics.add(topic);
@@ -76,9 +63,6 @@ export class ConnectionManager extends MessageDispatcher<any> {
   }
 
   public unsubscribe(topic: string): void {
-    if (!this.device) {
-      throw new Error('Must call connect() before unsubscribe()!');
-    }
     if (this.subscribedTopics.has(topic)) {
       this.device.unsubscribe(topic);
       this.subscribedTopics.delete(topic);
@@ -86,25 +70,16 @@ export class ConnectionManager extends MessageDispatcher<any> {
     }
   }
 
-  private handleReconnection() {
-    logger.debug(`Attempting to reconnect to AWS IoT Core...`);
-    setTimeout(
-      () =>
-        this.connect(() => {
-          // Do nothing
-        }),
-      5000
-    ); // try in 5 seconds.
-  }
-
-  private setupHandlers(cb): void {
+  public initConnectionHandlers(connectCallback: () => void): void {
     this.device.on('connect', (connack: any) => {
       logger.info('Device Agent has connected to the cloud.');
-      cb();
+      this.connected = true;
+      connectCallback();
     });
 
     this.device.on('disconnect', () => {
       logger.warn('Device Agent has been disconnected from the cloud');
+      this.connected = false;
     });
 
     this.device.on('reconnect', () => {
@@ -117,15 +92,18 @@ export class ConnectionManager extends MessageDispatcher<any> {
       logger.error(
         `Error connecting to the AWS IoT Core!\n${stringifyError(e)}`
       );
+      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()}`);
       void this.logConnectionInfo();
+      this.connected = false;
     });
 
     this.device.on('message', async (topic: string, payload: string) => {

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

@@ -41,8 +41,6 @@ export class DeviceAgentCloudConnection {
     SecureTunnelHandlerSingleton.getInstance();
 
   constructor() {
-    this.liveUpdatesHandler = new LiveUpdatesHandler();
-
     // Initialize & setup the connection
     this.connectionManager = new ConnectionManager(
       this.clientId,
@@ -52,92 +50,91 @@ export class DeviceAgentCloudConnection {
 
     this.publisher = new Publisher(this.connectionManager, this.clientId);
     this.shadowHandler = new ShadowHandler(this.clientId, this.publisher);
-
-    this.connectionManager.connect(() => {
-      void this.shadowHandler.initShadows();
-      this.publisher.publish(JOB_HANDLER_TOPICS.START_NEXT, JSON.stringify({}));
-    });
-
+    this.liveUpdatesHandler = new LiveUpdatesHandler();
     this.transactionManager = new TransactionManager(this.liveUpdatesHandler);
 
-    // Construct a HandlerContext used by all the message handlers
-    const handlerContext: HandlerContext = {
-      clientId: this.clientId,
-      txnMgr: this.transactionManager,
-      publisher: this.publisher,
-      shadowHandler: this.shadowHandler,
-      liveUpdatesHandler: this.liveUpdatesHandler,
-      secureTunnelHandler: this.secureTunnelHandler
-    };
-
-    // Instantiate & register message handlers for Project Shadow topics
-    const projectShadowMessageHandler = new ProjectShadowMessageHandler(
-      handlerContext
-    );
-    this.shadowHandler.projectShadowTopics.forEach((topic) => {
+    this.connectionManager.initConnectionHandlers(() => {
+      // Construct a HandlerContext used by all the message handlers
+      const handlerContext: HandlerContext = {
+        clientId: this.clientId,
+        txnMgr: this.transactionManager,
+        publisher: this.publisher,
+        shadowHandler: this.shadowHandler,
+        liveUpdatesHandler: this.liveUpdatesHandler,
+        secureTunnelHandler: this.secureTunnelHandler
+      };
+
+      // Instantiate & register message handlers for Project Shadow topics
+      const projectShadowMessageHandler = new ProjectShadowMessageHandler(
+        handlerContext
+      );
+      this.shadowHandler.projectShadowTopics.forEach((topic) => {
+        this.connectionManager.registerHandler(
+          topic,
+          projectShadowMessageHandler
+        );
+      });
+
+      // Instantiate & register message handlers for to-device and secureTunnel topics
       this.connectionManager.registerHandler(
-        topic,
-        projectShadowMessageHandler
+        this.toDeviceTopic,
+        new DeviceAgentMessageHandler(
+          handlerContext,
+          (txId: string, errorMsg: string) => {
+            const msg = buildToClientStatusResponseMessage(
+              this.publisher.getClientId(),
+              {
+                status: keyMirrors.statusResponse.failure,
+                message: errorMsg
+              },
+              txId
+            );
+            this.publisher.publishToClient(msg);
+          },
+          (txId: string) => {
+            const msg = buildToClientStatusResponseMessage(
+              this.publisher.getClientId(),
+              { status: keyMirrors.statusResponse.success },
+              txId
+            );
+            this.publisher.publishToClient(msg);
+          }
+        )
       );
-    });
 
-    // Instantiate & register message handlers for to-device and secureTunnel topics
-    this.connectionManager.registerHandler(
-      this.toDeviceTopic,
-      new DeviceAgentMessageHandler(
-        handlerContext,
-        (txId: string, errorMsg: string) => {
-          const msg = buildToClientStatusResponseMessage(
-            this.publisher.getClientId(),
-            {
-              status: keyMirrors.statusResponse.failure,
-              message: errorMsg
-            },
-            txId
-          );
-          this.publisher.publishToClient(msg);
-        },
-        (txId: string) => {
-          const msg = buildToClientStatusResponseMessage(
-            this.publisher.getClientId(),
-            { status: keyMirrors.statusResponse.success },
-            txId
-          );
-          this.publisher.publishToClient(msg);
-        }
-      )
-    );
-
-    const secureTunnelMessageHandler = new SecureTunnelMessageHandler(
-      handlerContext
-    );
-    this.connectionManager.registerHandler(
-      secureTunnelMessageHandler.getNotifyTopic(),
-      secureTunnelMessageHandler
-    );
+      const secureTunnelMessageHandler = new SecureTunnelMessageHandler(
+        handlerContext
+      );
+      this.connectionManager.registerHandler(
+        secureTunnelMessageHandler.getNotifyTopic(),
+        secureTunnelMessageHandler
+      );
 
-    this.connectionManager.registerHandler(
-      this.shadowHandler.shadowTopics.secureTunnel.updateDelta,
-      secureTunnelMessageHandler
-    );
-    this.connectionManager.registerHandler(
-      this.shadowHandler.shadowTopics.secureTunnel.deleteAccepted,
-      secureTunnelMessageHandler
-    );
+      this.connectionManager.registerHandler(
+        this.shadowHandler.shadowTopics.secureTunnel.updateDelta,
+        secureTunnelMessageHandler
+      );
+      this.connectionManager.registerHandler(
+        this.shadowHandler.shadowTopics.secureTunnel.deleteAccepted,
+        secureTunnelMessageHandler
+      );
 
-    const jobHandler = new JobHandler(handlerContext);
+      const jobHandler = new JobHandler(handlerContext);
+      const JOB_HANDLER_TOPICS = jobHandler.getJobTopics();
 
-    const JOB_HANDLER_TOPICS = jobHandler.getJobTopic();
+      this.connectionManager.registerHandler(
+        JOB_HANDLER_TOPICS.NOTIFY_NEXT,
+        jobHandler
+      );
 
-    this.connectionManager.registerHandler(
-      JOB_HANDLER_TOPICS.NOTIFY_NEXT,
-      jobHandler
-    );
+      this.connectionManager.registerHandler(
+        JOB_HANDLER_TOPICS.START_NEXT_ACCEPTED,
+        jobHandler
+      );
+      this.publisher.publish(JOB_HANDLER_TOPICS.START_NEXT, JSON.stringify({}));
 
-    this.connectionManager.registerHandler(
-      JOB_HANDLER_TOPICS.START_NEXT_ACCEPTED,
-      jobHandler
-    );
+      void this.shadowHandler.initShadows();
+    });
   }
 
   /*=================================================================
@@ -158,7 +155,22 @@ export class DeviceAgentCloudConnection {
     await sleep(1000);
     this.connectionManager.disconnect();
   }
-  public async handleMessage(topic: string, message: any) {
+
+  // CLI methods
+
+  public async waitForConnection() {
+    while (!this.connectionManager.isConnected()) {
+      await sleep(1000);
+    }
+  }
+
+  public async waitForCmd(projectId: string) {
+    while (this.isCmdInProgress(projectId)) {
+      await sleep(1000);
+    }
+  }
+
+  public async sendCliCmd(topic: string, message: any) {
     this.connectionManager.dispatch(topic, message);
   }
 }

package/src/environment.ts

@@ -1,4 +1,6 @@
+import { TargetHardware } from 'alwaysai/lib/core/app';
 import { platform } from 'os';
+import { logger } from './util/logger';
 
 export const ALWAYSAI_OS_PLATFORM = parseOsPlatform(
   process.env.ALWAYSAI_OS_PLATFORM
@@ -22,6 +24,22 @@ export const ALWAYSAI_LOCAL_CONNECTION_PORT =
   process.env.ALWAYSAI_LOCAL_CONNECTION_PORT;
 export const ALWAYSAI_LOCAL_CONNECTION_ANALYTICS_ROUTING_KEY =
   process.env.ALWAYSAI_LOCAL_CONNECTION_ANALYTICS_ROUTING_KEY;
+export const ALWAYSAI_TARGET_HW_OVERRIDE =
+  process.env.ALWAYSAI_TARGET_HW_OVERRIDE;
+
+export function parseTargetHW(
+  hardwareType?: string
+): TargetHardware | undefined {
+  const target = hardwareType ? TargetHardware[hardwareType] : undefined;
+  if (!target && hardwareType) {
+    logger.error(
+      `Incorrect TargetHardware: ${hardwareType}. Ignoring the environment variable. Allowed TargetHardware types: ${Object.keys(
+        TargetHardware
+      )}`
+    );
+  }
+  return target;
+}
 
 function parseOsPlatform(str: string | undefined): NodeJS.Platform {
   switch (str) {

package/src/jobs/job-handler.ts

@@ -36,7 +36,7 @@ export class JobHandler extends BaseHandler implements MessageHandler {
   private jobId = '';
 
   public async handle(message: any, topic: string): Promise<void> {
-    const TOPICS = this.getJobTopic();
+    const TOPICS = this.getJobTopics();
 
     try {
       switch (topic) {
@@ -54,7 +54,7 @@ export class JobHandler extends BaseHandler implements MessageHandler {
     }
   }
 
-  getJobTopic() {
+  getJobTopics() {
     const TOPICS = {
       NOTIFY_NEXT: `$aws/things/${this.clientId}/jobs/notify-next`,
       START_NEXT: `$aws/things/${this.clientId}/jobs/start-next`,
@@ -67,7 +67,7 @@ export class JobHandler extends BaseHandler implements MessageHandler {
   private async notifyNext(message: any): Promise<void> {
     // Triggers when a job is completed and we need to notify the next job
     logger.info('Invoking NOTIFY_NEXT handler');
-    const TOPICS = this.getJobTopic();
+    const TOPICS = this.getJobTopics();
     this.publisher.publish(TOPICS.START_NEXT, JSON.stringify({}));
   }
 
@@ -121,7 +121,7 @@ export class JobHandler extends BaseHandler implements MessageHandler {
   }
 
   private updateJobStatus(status: string, message?: string): void {
-    const { UPDATE } = this.getJobTopic();
+    const { UPDATE } = this.getJobTopics();
     const payload = {
       status,
       statusDetails: {