@alwaysai/device-agent 0.2.0 → 1.0.0

package/lib/cloud-connection/live-updates-handler.js

@@ -7,6 +7,7 @@ const logger_1 = require("../util/logger");
 const sleep_1 = require("../util/sleep");
 const messages_1 = require("./messages");
 const environment_1 = require("../environment");
+const message_builder_1 = require("./message-builder");
 const LIVE_UPDATES_TIMEOUT = environment_1.ALWAYSAI_LIVE_UPDATES_TIMEOUT_MS
     ? parseInt(environment_1.ALWAYSAI_LIVE_UPDATES_TIMEOUT_MS)
     : 60000;
@@ -14,22 +15,23 @@ class LiveUpdatesHandler {
     /*=================================================================
                               Public interface
     =================================================================*/
-    constructor(publisher) {
+    constructor(publisher, clientId) {
         this.liveUpdatesAlive = {
-            [device_agent_schemas_1.keyMirrors.agentMessageType.device_stats]: false,
-            [device_agent_schemas_1.keyMirrors.agentMessageType.app_state]: false,
-            [device_agent_schemas_1.keyMirrors.agentMessageType.app_logs]: false,
-            [device_agent_schemas_1.keyMirrors.agentMessageType.app_install_status]: false
+            [device_agent_schemas_1.keyMirrors.toClientMessageType.device_stats]: false,
+            [device_agent_schemas_1.keyMirrors.toClientMessageType.app_state]: false,
+            [device_agent_schemas_1.keyMirrors.toClientMessageType.app_logs]: false,
+            [device_agent_schemas_1.keyMirrors.toClientMessageType.status_response]: false
         };
         this.liveUpdatesSleepIntervals = {
-            [device_agent_schemas_1.keyMirrors.agentMessageType.device_stats]: 5000,
-            [device_agent_schemas_1.keyMirrors.agentMessageType.app_state]: 5000,
-            [device_agent_schemas_1.keyMirrors.agentMessageType.app_logs]: 5000,
-            [device_agent_schemas_1.keyMirrors.agentMessageType.app_install_status]: 5000
+            [device_agent_schemas_1.keyMirrors.toClientMessageType.device_stats]: 5000,
+            [device_agent_schemas_1.keyMirrors.toClientMessageType.app_state]: 5000,
+            [device_agent_schemas_1.keyMirrors.toClientMessageType.app_logs]: 5000,
+            [device_agent_schemas_1.keyMirrors.toClientMessageType.status_response]: 5000
         };
         this.appLogStreams = new Set();
-        this.appInstallStatuses = new Set();
+        this.transactionStatuses = new Set();
         this.publisher = publisher;
+        this.clientId = clientId;
         logger_1.logger.debug(`Toggle live updates timeout set to ${LIVE_UPDATES_TIMEOUT} ms`);
     }
     async startAppLogStream(projectId) {
@@ -39,7 +41,7 @@ class LiveUpdatesHandler {
             projectId,
             args: ['--tail', '100', '--no-log-prefix']
         });
-        readable.on('data', (chunk) => {
+        readable.on('data', async (chunk) => {
             if (!this.appLogStreams.has(projectId)) {
                 // why doesn't typescript know about this function?
                 // @ts-ignore
@@ -48,13 +50,11 @@ class LiveUpdatesHandler {
                 return;
             }
             const logStr = chunk.toString();
-            const message = {
-                messageType: device_agent_schemas_1.keyMirrors.agentMessageType.app_logs,
-                appLogs: {
-                    projectId,
-                    logChunk: logStr
-                }
+            const payload = {
+                projectId,
+                logChunk: logStr
             };
+            const message = await (0, message_builder_1.buildAppLogsMessage)(payload, this.clientId);
             this.publisher.publishToClient(message);
         });
         readable.on('error', (error) => {
@@ -64,16 +64,16 @@ class LiveUpdatesHandler {
             logger_1.logger.info(`App logs finished piping for project ${projectId}`);
         });
     }
-    continuePublishing(flag, projectId) {
+    continuePublishing(flag, txId) {
         switch (flag) {
-            case device_agent_schemas_1.keyMirrors.agentMessageType.device_stats:
-            case device_agent_schemas_1.keyMirrors.agentMessageType.app_state:
+            case device_agent_schemas_1.keyMirrors.toClientMessageType.device_stats:
+            case device_agent_schemas_1.keyMirrors.toClientMessageType.app_state:
                 return this.liveUpdatesAlive[flag];
-            case device_agent_schemas_1.keyMirrors.agentMessageType.app_install_status: {
-                if (!projectId) {
-                    throw new Error(`Project ID not provided to continuePublishing!`);
+            case device_agent_schemas_1.keyMirrors.toClientMessageType.status_response: {
+                if (!txId) {
+                    throw new Error(`Transaction ID not provided to continuePublishing!`);
                 }
-                return this.appInstallStatuses.has(projectId);
+                return this.transactionStatuses.has(txId);
             }
             default:
                 logger_1.logger.error(`Unrecognized publishable flag ${flag}`);
@@ -93,7 +93,7 @@ class LiveUpdatesHandler {
             this.liveUpdatesAlive.device_stats = toggles.deviceStats;
         }
         if (toggles.appState !== undefined) {
-            this.liveUpdatesAlive.app_state = toggles.appState;
+            this.liveUpdatesAlive.app_logs = toggles.appState;
         }
     }
     restartLiveUpdatesTimeout() {
@@ -106,16 +106,19 @@ class LiveUpdatesHandler {
             this.appLogStreams.clear();
         }, LIVE_UPDATES_TIMEOUT);
     }
-    async startPublishingLiveUpdates(messageType, getMessageData, args, projectId) {
+    async startPublishingLiveUpdates(messageType, payloadBuilderFunction, messageBuilderFunction, args, txId) {
         logger_1.logger.info(`Turned on live updates for ${messageType}`);
         // eslint-disable-next-line no-constant-condition
         while (true) {
             try {
-                const message = await getMessageData(...args);
-                if (!this.continuePublishing(messageType, projectId)) {
+                if (!this.continuePublishing(messageType, txId)) {
                     logger_1.logger.info(`Turned off live updates for ${messageType}`);
                     break;
                 }
+                const payload = await payloadBuilderFunction(...args);
+                logger_1.logger.debug(`payload returned from builder: ${JSON.stringify(payload)}`);
+                const message = await messageBuilderFunction(payload, txId);
+                logger_1.logger.debug(`message returned from builder: ${JSON.stringify(message)}`);
                 this.publisher.publishToClient(message);
             }
             catch (e) {
@@ -133,23 +136,23 @@ class LiveUpdatesHandler {
     getAppLogsLiveUpdates() {
         return this.liveUpdatesAlive.app_logs;
     }
-    async enableAppInstallStatus(props) {
-        const { projectId, appReleaseHash } = props;
-        this.liveUpdatesAlive.app_install_status = true;
-        if (!this.appInstallStatuses.has(projectId)) {
-            this.appInstallStatuses.add(projectId);
+    async enableTransactionStatus(props) {
+        const { txId } = props;
+        this.liveUpdatesAlive.status_response = true;
+        if (!this.transactionStatuses.has(txId)) {
+            this.transactionStatuses.add(txId);
             // Don't wait for this call to finish since it loops until disabled
-            void this.startPublishingLiveUpdates(device_agent_schemas_1.keyMirrors.agentMessageType.app_install_status, messages_1.getAppInstallStatusMessage, [device_agent_schemas_1.keyMirrors.appInstallStatus.in_progress, '', appReleaseHash], projectId);
+            void this.startPublishingLiveUpdates(device_agent_schemas_1.keyMirrors.toClientMessageType.status_response, messages_1.getStatusResponsePayload, message_builder_1.buildStatusResponseMessage, [device_agent_schemas_1.keyMirrors.statusResponse.in_progress, ''], txId);
         }
     }
-    async disableAppInstallStatus(props) {
-        const { projectId } = props;
-        this.appInstallStatuses.delete(projectId);
-        if (this.appInstallStatuses.size === 0) {
-            this.liveUpdatesAlive.app_install_status = false;
+    async disableTransactionStatus(props) {
+        const { txId } = props;
+        this.transactionStatuses.delete(txId);
+        if (this.transactionStatuses.size === 0) {
+            this.liveUpdatesAlive.status_response = false;
         }
     }
-    async handleToggles(toggles) {
+    async handleToggles(toggles, txId) {
         const { deviceStats, appState, appLogs } = toggles;
         this.restartLiveUpdatesTimeout();
         const currentDeviceStats = this.getDeviceStatsLiveUpdates();
@@ -157,7 +160,7 @@ class LiveUpdatesHandler {
             this.liveUpdatesAlive.device_stats = deviceStats;
             if (deviceStats && currentDeviceStats !== true) {
                 // Don't wait for this call to finish since it loops until disabled
-                void this.startPublishingLiveUpdates(device_agent_schemas_1.keyMirrors.agentMessageType.device_stats, messages_1.getDeviceStatsMessage, []);
+                void this.startPublishingLiveUpdates(device_agent_schemas_1.keyMirrors.toClientMessageType.device_stats, messages_1.getDeviceStatsPayload, message_builder_1.buildDeviceStatsMessage, [], txId);
             }
         }
         const currentAppState = this.getAppStateLiveUpdates();
@@ -165,7 +168,7 @@ class LiveUpdatesHandler {
             this.liveUpdatesAlive.app_state = appState;
             if (appState && currentAppState !== true) {
                 // Don't wait for this call to finish since it loops until disabled
-                void this.startPublishingLiveUpdates(device_agent_schemas_1.keyMirrors.agentMessageType.app_state, messages_1.getAppStateMessage, []);
+                void this.startPublishingLiveUpdates(device_agent_schemas_1.keyMirrors.toClientMessageType.app_state, messages_1.getAppStatePayload, message_builder_1.buildAppStateMessage, [], txId);
             }
         }
         const currentAppLogs = this.getAppLogsLiveUpdates();

package/lib/cloud-connection/live-updates-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"live-updates-handler.js","sourceRoot":"","sources":["../../src/cloud-connection/live-updates-handler.ts"],"names":[],"mappings":";;;AAAA,yEAKwC;AACxC,gEAAoD;AACpD,2CAAwC;AACxC,yCAAkC;AAElC,yCAIoB;AAEpB,gDAAkE;AAElE,MAAM,oBAAoB,GAAG,8CAAgC;IAC3D,CAAC,CAAC,QAAQ,CAAC,8CAAgC,CAAC;IAC5C,CAAC,CAAC,KAAK,CAAC;AAEV,MAAa,kBAAkB;IAkI7B;;uEAEmE;IAEnE,YAAY,SAAoB;QAlIxB,qBAAgB,GAAG;YACzB,CAAC,iCAAU,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,KAAK;YACjD,CAAC,iCAAU,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,KAAK;YAC9C,CAAC,iCAAU,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,KAAK;YAC7C,CAAC,iCAAU,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,EAAE,KAAK;SACxD,CAAC;QACM,8BAAyB,GAAG;YAClC,CAAC,iCAAU,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,IAAI;YAChD,CAAC,iCAAU,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,IAAI;YAC7C,CAAC,iCAAU,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,IAAI;YAC5C,CAAC,iCAAU,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,EAAE,IAAI;SACvD,CAAC;QACM,kBAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,uBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;QAsH7C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,eAAM,CAAC,KAAK,CACV,sCAAsC,oBAAoB,KAAK,CAChE,CAAC;IACJ,CAAC;IAxHO,KAAK,CAAC,iBAAiB,CAAC,SAAiB;QAC/C,eAAM,CAAC,IAAI,CAAC,2BAA2B,SAAS,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAU,EAAC;YAChC,SAAS;YACT,IAAI,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,iBAAiB,CAAC;SAC3C,CAAC,CAAC;QACH,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACpC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;gBACtC,mDAAmD;gBACnD,aAAa;gBACb,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACnB,eAAM,CAAC,IAAI,CAAC,yCAAyC,SAAS,EAAE,CAAC,CAAC;gBAClE,OAAO;aACR;YACD,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,OAAO,GAAmB;gBAC9B,WAAW,EAAE,iCAAU,CAAC,gBAAgB,CAAC,QAAQ;gBACjD,OAAO,EAAE;oBACP,SAAS;oBACT,QAAQ,EAAE,MAAM;iBACjB;aACF,CAAC;YACF,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC7B,eAAM,CAAC,KAAK,CACV,yCAAyC,SAAS,KAAK,KAAK,EAAE,CAC/D,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;YAC3B,eAAM,CAAC,IAAI,CAAC,wCAAwC,SAAS,EAAE,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,kBAAkB,CACxB,IAA2B,EAC3B,SAAkB;QAElB,QAAQ,IAAI,EAAE;YACZ,KAAK,iCAAU,CAAC,gBAAgB,CAAC,YAAY,CAAC;YAC9C,KAAK,iCAAU,CAAC,gBAAgB,CAAC,SAAS;gBACxC,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACrC,KAAK,iCAAU,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;gBACnD,IAAI,CAAC,SAAS,EAAE;oBACd,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;iBACnE;gBACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;aAC/C;YACD;gBACE,eAAM,CAAC,KAAK,CAAC,iCAAiC,IAAI,EAAE,CAAC,CAAC;gBACtD,OAAO,KAAK,CAAC;SAChB;IACH,CAAC;IAEO,sBAAsB,CAAC,IAA2B;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,MAAM,EAAE;YACV,OAAO,MAAM,CAAC;SACf;QACD,eAAM,CAAC,KAAK,CAAC,kCAAkC,IAAI,EAAE,CAAC,CAAC;QACvD,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;IAEO,cAAc,CAAC,OAA2B;QAChD,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE;YACrC,IAAI,CAAC,gBAAgB,CAAC,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;SAC1D;QACD,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE;YAClC,IAAI,CAAC,gBAAgB,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;SACpD;IACH,CAAC;IAEO,yBAAyB;QAC/B,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACtC,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxC,IAAI,CAAC,cAAc,CAAC;gBAClB,WAAW,EAAE,KAAK;gBAClB,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAC7B,CAAC,EAAE,oBAAoB,CAAC,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,0BAA0B,CACtC,WAAkC,EAClC,cAAkE,EAClE,IAAO,EACP,SAAkB;QAElB,eAAM,CAAC,IAAI,CAAC,8BAA8B,WAAW,EAAE,CAAC,CAAC;QACzD,iDAAiD;QACjD,OAAO,IAAI,EAAE;YACX,IAAI;gBACF,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC;gBAC9C,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE;oBACpD,eAAM,CAAC,IAAI,CAAC,+BAA+B,WAAW,EAAE,CAAC,CAAC;oBAC1D,MAAM;iBACP;gBACD,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;aACzC;YAAC,OAAO,CAAC,EAAE;gBACV,eAAM,CAAC,KAAK,CACV,qCAAqC,WAAW,KAAK,CAAC,CAAC,OAAO,EAAE,CACjE,CAAC;aACH;YACD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC,CAAC;SACvD;IACH,CAAC;IAaM,yBAAyB;QAC9B,OAAO,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC;IAC5C,CAAC;IAEM,sBAAsB;QAC3B,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;IACzC,CAAC;IAEM,qBAAqB;QAC1B,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;IACxC,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,KAGnC;QACC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;QAC5C,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAChD,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAC3C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACvC,mEAAmE;YACnE,KAAK,IAAI,CAAC,0BAA0B,CAClC,iCAAU,CAAC,gBAAgB,CAAC,kBAAkB,EAC9C,qCAA0B,EAC1B,CAAC,iCAAU,CAAC,gBAAgB,CAAC,WAAW,EAAE,EAAE,EAAE,cAAc,CAAC,EAC7D,SAAS,CACV,CAAC;SACH;IACH,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAAC,KAA4B;QAC/D,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAC5B,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAE1C,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,KAAK,CAAC,EAAE;YACtC,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,GAAG,KAAK,CAAC;SAClD;IACH,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAA2B;QACpD,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QACnD,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAEjC,MAAM,kBAAkB,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC5D,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,IAAI,CAAC,gBAAgB,CAAC,YAAY,GAAG,WAAW,CAAC;YACjD,IAAI,WAAW,IAAI,kBAAkB,KAAK,IAAI,EAAE;gBAC9C,mEAAmE;gBACnE,KAAK,IAAI,CAAC,0BAA0B,CAClC,iCAAU,CAAC,gBAAgB,CAAC,YAAY,EACxC,gCAAqB,EACrB,EAAE,CACH,CAAC;aACH;SACF;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACtD,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,IAAI,CAAC,gBAAgB,CAAC,SAAS,GAAG,QAAQ,CAAC;YAC3C,IAAI,QAAQ,IAAI,eAAe,KAAK,IAAI,EAAE;gBACxC,mEAAmE;gBACnE,KAAK,IAAI,CAAC,0BAA0B,CAClC,iCAAU,CAAC,gBAAgB,CAAC,SAAS,EACrC,6BAAkB,EAClB,EAAE,CACH,CAAC;aACH;SACF;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACpD,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,IAAI,OAAO,CAAC,MAAM,IAAI,cAAc,KAAK,IAAI,EAAE;gBAC7C,mEAAmE;gBACnE,KAAK,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aAChD;iBAAM;gBACL,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aAC9C;SACF;IACH,CAAC;CACF;AA5ND,gDA4NC"}
+{"version":3,"file":"live-updates-handler.js","sourceRoot":"","sources":["../../src/cloud-connection/live-updates-handler.ts"],"names":[],"mappings":"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"}

package/lib/cloud-connection/live-updates-handler.test.js

@@ -12,6 +12,7 @@ const testFalseToggles = {
 };
 const mockClient = jest.fn();
 const clientId = 'test-client';
+const emptyTxId = '';
 jest.spyOn(global, 'setTimeout');
 // NOTE: this was the way I found to mock private class functions
 const mockStartPublishingLiveUpdates = jest.spyOn(live_updates_handler_1.LiveUpdatesHandler.prototype, 'startPublishingLiveUpdates');
@@ -21,24 +22,24 @@ describe('Test Live Updates Handler', () => {
     let publisher;
     beforeEach(() => {
         publisher = new publisher_1.Publisher(mockClient, clientId);
-        liveUpdatesHandler = new live_updates_handler_1.LiveUpdatesHandler(publisher);
+        liveUpdatesHandler = new live_updates_handler_1.LiveUpdatesHandler(publisher, clientId);
         jest.clearAllMocks();
     });
     test('ignore subsequent enables', async () => {
-        void liveUpdatesHandler.handleToggles(testTrueToggles);
+        void liveUpdatesHandler.handleToggles(testTrueToggles, emptyTxId);
         // called twice, once for device stats, once for app state
         expect(mockStartPublishingLiveUpdates).toBeCalledTimes(2);
         // restartLiveUpdatesTimeout is always called once when handleToggles is called
         expect(jest.mocked(setTimeout)).toBeCalledTimes(1);
         // Second call -> should not call startPublishingLiveUpdates should not be called
         jest.clearAllMocks();
-        void liveUpdatesHandler.handleToggles(testTrueToggles);
+        void liveUpdatesHandler.handleToggles(testTrueToggles, emptyTxId);
         expect(mockStartPublishingLiveUpdates).toBeCalledTimes(0);
         expect(jest.mocked(setTimeout)).toHaveBeenCalledTimes(1);
     });
     test('test disable live updates', async () => {
         // Test calling handleToggles one time, enabling it
-        void liveUpdatesHandler.handleToggles(testTrueToggles);
+        void liveUpdatesHandler.handleToggles(testTrueToggles, emptyTxId);
         expect(mockStartPublishingLiveUpdates).toBeCalledTimes(2);
         expect(jest.mocked(setTimeout)).toHaveBeenCalledTimes(1);
         expect(liveUpdatesHandler.getDeviceStatsLiveUpdates()).toBe(true);
@@ -46,7 +47,7 @@ describe('Test Live Updates Handler', () => {
         expect(liveUpdatesHandler.getAppLogsLiveUpdates()).toBe(false);
         // Check to see that attributes are properly set to false when disabled
         jest.clearAllMocks();
-        void liveUpdatesHandler.handleToggles(testFalseToggles);
+        void liveUpdatesHandler.handleToggles(testFalseToggles, emptyTxId);
         expect(mockStartPublishingLiveUpdates).toBeCalledTimes(0);
         expect(jest.mocked(setTimeout)).toHaveBeenCalledTimes(1);
         expect(liveUpdatesHandler.getDeviceStatsLiveUpdates()).toBe(false);

package/lib/cloud-connection/live-updates-handler.test.js.map

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

package/lib/cloud-connection/message-builder.d.ts

@@ -0,0 +1,7 @@
+import { AppLogsMessage, AppLogsPayload, AppStateMessage, AppStatePayload, DeviceStatsMessage, DeviceStatsPayload, SignedUrlsRequestMessage, SignedUrlsRequestPayload, StatusResponseMessage, StatusResponsePayload } from '@alwaysai/device-agent-schemas';
+export declare function buildAppLogsMessage(payload: AppLogsPayload, txId?: string): Promise<AppLogsMessage>;
+export declare function buildAppStateMessage(payload: AppStatePayload, txId?: string): Promise<AppStateMessage>;
+export declare function buildSignedUrlsRequestMessage(payload: SignedUrlsRequestPayload, txId?: string): Promise<SignedUrlsRequestMessage>;
+export declare function buildStatusResponseMessage(payload: StatusResponsePayload, txId?: string): Promise<StatusResponseMessage>;
+export declare function buildDeviceStatsMessage(payload: DeviceStatsPayload, txId?: string): Promise<DeviceStatsMessage>;
+//# sourceMappingURL=message-builder.d.ts.map

package/lib/cloud-connection/message-builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-builder.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/message-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,cAAc,EACd,eAAe,EAEf,eAAe,EAEf,kBAAkB,EAElB,kBAAkB,EAClB,wBAAwB,EAExB,wBAAwB,EACxB,qBAAqB,EAErB,qBAAqB,EAKtB,MAAM,gCAAgC,CAAC;AAiBxC,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,cAAc,EACvB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,CAAC,CAUzB;AAGD,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,eAAe,EACxB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,CAAC,CAU1B;AAGD,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,wBAAwB,EACjC,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,wBAAwB,CAAC,CAUnC;AAGD,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,qBAAqB,EAC9B,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,qBAAqB,CAAC,CAWhC;AAGD,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,kBAAkB,EAC3B,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,kBAAkB,CAAC,CAU7B"}

package/lib/cloud-connection/message-builder.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildDeviceStatsMessage = exports.buildStatusResponseMessage = exports.buildSignedUrlsRequestMessage = exports.buildAppStateMessage = exports.buildAppLogsMessage = void 0;
+const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
+const get_device_id_1 = require("../util/get-device-id");
+function buildBaseClientMessage(txId) {
+    const clientId = (0, get_device_id_1.getDeviceUuid)();
+    const baseClientMessage = {
+        timestamp: new Date().toUTCString(),
+        deviceId: clientId,
+        topic: (0, device_agent_schemas_1.getToClientTopic)(clientId),
+        txId: txId || (0, device_agent_schemas_1.generateTxId)()
+    };
+    return baseClientMessage;
+}
+// Public Message Builders
+// app logs
+async function buildAppLogsMessage(payload, txId) {
+    const baseMessage = buildBaseClientMessage(txId);
+    const messageType = device_agent_schemas_1.keyMirrors.toClientMessageType.app_logs;
+    const message = Object.assign(Object.assign({}, baseMessage), { messageType,
+        payload });
+    return message;
+}
+exports.buildAppLogsMessage = buildAppLogsMessage;
+// app state
+async function buildAppStateMessage(payload, txId) {
+    const baseMessage = buildBaseClientMessage(txId);
+    const messageType = device_agent_schemas_1.keyMirrors.toClientMessageType.app_state;
+    const message = Object.assign(Object.assign({}, baseMessage), { messageType,
+        payload });
+    return message;
+}
+exports.buildAppStateMessage = buildAppStateMessage;
+// signed URLs
+async function buildSignedUrlsRequestMessage(payload, txId) {
+    const baseMessage = buildBaseClientMessage(txId);
+    const messageType = device_agent_schemas_1.keyMirrors.toCloudMessageType.signed_urls_request;
+    const message = Object.assign(Object.assign({}, baseMessage), { messageType,
+        payload });
+    return message;
+}
+exports.buildSignedUrlsRequestMessage = buildSignedUrlsRequestMessage;
+// status response
+async function buildStatusResponseMessage(payload, txId) {
+    const baseMessage = buildBaseClientMessage(txId);
+    const messageType = device_agent_schemas_1.keyMirrors.toClientMessageType.status_response;
+    const message = Object.assign(Object.assign({}, baseMessage), { messageType,
+        payload });
+    const valid = (0, device_agent_schemas_1.validateToDeviceAgentMessage)(message);
+    return message;
+}
+exports.buildStatusResponseMessage = buildStatusResponseMessage;
+// device stats
+async function buildDeviceStatsMessage(payload, txId) {
+    const messageType = device_agent_schemas_1.keyMirrors.toClientMessageType.device_stats;
+    const baseMessage = buildBaseClientMessage(txId);
+    const message = Object.assign(Object.assign({}, baseMessage), { messageType,
+        payload });
+    return message;
+}
+exports.buildDeviceStatsMessage = buildDeviceStatsMessage;
+//# sourceMappingURL=message-builder.js.map

package/lib/cloud-connection/message-builder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-builder.js","sourceRoot":"","sources":["../../src/cloud-connection/message-builder.ts"],"names":[],"mappings":";;;AAAA,yEAqBwC;AACxC,yDAAsD;AAEtD,SAAS,sBAAsB,CAAC,IAAa;IAC3C,MAAM,QAAQ,GAAG,IAAA,6BAAa,GAAE,CAAC;IACjC,MAAM,iBAAiB,GAAG;QACxB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,IAAA,uCAAgB,EAAC,QAAQ,CAAC;QACjC,IAAI,EAAE,IAAI,IAAI,IAAA,mCAAY,GAAE;KAC7B,CAAC;IACF,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,0BAA0B;AAE1B,WAAW;AACJ,KAAK,UAAU,mBAAmB,CACvC,OAAuB,EACvB,IAAa;IAEb,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,WAAW,GACf,iCAAU,CAAC,mBAAmB,CAAC,QAAQ,CAAC;IAC1C,MAAM,OAAO,mCACR,WAAW,KACd,WAAW;QACX,OAAO,GACR,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AAbD,kDAaC;AAED,YAAY;AACL,KAAK,UAAU,oBAAoB,CACxC,OAAwB,EACxB,IAAa;IAEb,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,WAAW,GACf,iCAAU,CAAC,mBAAmB,CAAC,SAAS,CAAC;IAC3C,MAAM,OAAO,mCACR,WAAW,KACd,WAAW;QACX,OAAO,GACR,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AAbD,oDAaC;AAED,cAAc;AACP,KAAK,UAAU,6BAA6B,CACjD,OAAiC,EACjC,IAAa;IAEb,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,WAAW,GACf,iCAAU,CAAC,kBAAkB,CAAC,mBAAmB,CAAC;IACpD,MAAM,OAAO,mCACR,WAAW,KACd,WAAW;QACX,OAAO,GACR,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AAbD,sEAaC;AAED,kBAAkB;AACX,KAAK,UAAU,0BAA0B,CAC9C,OAA8B,EAC9B,IAAa;IAEb,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,WAAW,GACf,iCAAU,CAAC,mBAAmB,CAAC,eAAe,CAAC;IACjD,MAAM,OAAO,mCACR,WAAW,KACd,WAAW;QACX,OAAO,GACR,CAAC;IACF,MAAM,KAAK,GAAG,IAAA,mDAA4B,EAAC,OAAO,CAAC,CAAC;IACpD,OAAO,OAAO,CAAC;AACjB,CAAC;AAdD,gEAcC;AAED,eAAe;AACR,KAAK,UAAU,uBAAuB,CAC3C,OAA2B,EAC3B,IAAa;IAEb,MAAM,WAAW,GACf,iCAAU,CAAC,mBAAmB,CAAC,YAAY,CAAC;IAC9C,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,OAAO,mCACR,WAAW,KACd,WAAW;QACX,OAAO,GACR,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AAbD,0DAaC"}

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

@@ -1,16 +1,6 @@
-import { AppInstallStatusMessage, AppStatePacket } from '@alwaysai/device-agent-schemas';
-import { AppInstallStatusValue } from '@alwaysai/device-agent-schemas/lib/constants';
-export declare function getAppStateMessage(): Promise<{
-    messageType: "app_state";
-    appState: AppStatePacket[];
-}>;
-export declare function getAppInstallStatusMessage(status: AppInstallStatusValue, message: string, appReleaseHash: string): Promise<AppInstallStatusMessage>;
-export declare function getDeviceStatsMessage(): Promise<{
-    messageType: "device_stats";
-    deviceStats: {
-        cpuUsage: number;
-        diskUtil: number;
-        usedMemoryPercentage: number;
-    };
-}>;
+import { AppStatePayload, DeviceStatsPayload, StatusResponsePayload } from '@alwaysai/device-agent-schemas';
+import { StatusResponseValue } from '@alwaysai/device-agent-schemas/lib/constants';
+export declare function getAppStatePayload(): Promise<AppStatePayload>;
+export declare function getStatusResponsePayload(status: StatusResponseValue, message: string): Promise<StatusResponsePayload>;
+export declare function getDeviceStatsPayload(): Promise<DeviceStatsPayload>;
 //# sourceMappingURL=messages.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,cAAc,EAEf,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AASrF,wBAAsB,kBAAkB;;;GAavC;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,qBAAqB,EAC7B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,uBAAuB,CAAC,CAUlC;AAED,wBAAsB,qBAAqB;;;;;;;GAc1C"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AASnF,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAYnE;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,qBAAqB,CAAC,CAMhC;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAWzE"}

package/lib/cloud-connection/messages.js

@@ -1,50 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDeviceStatsMessage = exports.getAppInstallStatusMessage = exports.getAppStateMessage = void 0;
-const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
+exports.getDeviceStatsPayload = exports.getStatusResponsePayload = exports.getAppStatePayload = void 0;
 const application_control_1 = require("../application-control");
 const device_control_1 = require("../device-control/device-control");
 const agent_config_1 = require("../infrastructure/agent-config");
-async function getAppStateMessage() {
-    const appStateMessage = [];
+async function getAppStatePayload() {
+    const appState = [];
     const apps = await (0, agent_config_1.AgentConfigFile)().getApps();
     for (const app of apps) {
         const projectId = app.projectId;
-        const status = await (0, application_control_1.getAppStatus)({ projectId });
-        appStateMessage.push(status);
+        const status = await (0, application_control_1.getAppState)({ projectId });
+        appState.push(status);
     }
-    const appStatePackage = {
-        messageType: device_agent_schemas_1.keyMirrors.agentMessageType.app_state,
-        appState: appStateMessage
+    const appStatePayload = {
+        appState: appState
     };
-    return appStatePackage;
+    return appStatePayload;
 }
-exports.getAppStateMessage = getAppStateMessage;
-async function getAppInstallStatusMessage(status, message, appReleaseHash) {
-    const appInstallStatusMessage = {
-        messageType: device_agent_schemas_1.keyMirrors.agentMessageType.app_install_status,
-        appInstallStatus: {
-            status,
-            message,
-            appReleaseHash
-        }
+exports.getAppStatePayload = getAppStatePayload;
+async function getStatusResponsePayload(status, message) {
+    const statusResponsePayload = {
+        status,
+        message
     };
-    return appInstallStatusMessage;
+    return statusResponsePayload;
 }
-exports.getAppInstallStatusMessage = getAppInstallStatusMessage;
-async function getDeviceStatsMessage() {
+exports.getStatusResponsePayload = getStatusResponsePayload;
+async function getDeviceStatsPayload() {
     const cpuUsage = await (0, device_control_1.getCpuUtil)();
     const diskUtil = await (0, device_control_1.getDiskUtil)();
     const memUtil = await (0, device_control_1.getMemUtil)();
-    const deviceStatsMessage = {
-        messageType: device_agent_schemas_1.keyMirrors.agentMessageType.device_stats,
-        deviceStats: {
-            cpuUsage,
-            diskUtil,
-            usedMemoryPercentage: memUtil
-        }
+    const deviceStatsPayload = {
+        cpuUsage,
+        diskUtil,
+        usedMemoryPercentage: memUtil
     };
-    return deviceStatsMessage;
+    return deviceStatsPayload;
 }
-exports.getDeviceStatsMessage = getDeviceStatsMessage;
+exports.getDeviceStatsPayload = getDeviceStatsPayload;
 //# sourceMappingURL=messages.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/cloud-connection/messages.ts"],"names":[],"mappings":";;;AAAA,yEAIwC;AAExC,gEAAsD;AACtD,qEAI0C;AAC1C,iEAAiE;AAE1D,KAAK,UAAU,kBAAkB;IACtC,MAAM,eAAe,GAAqB,EAAE,CAAC;IAC7C,MAAM,IAAI,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC,OAAO,EAAE,CAAC;IAC/C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,IAAA,kCAAY,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACjD,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAC9B;IACD,MAAM,eAAe,GAAG;QACtB,WAAW,EAAE,iCAAU,CAAC,gBAAgB,CAAC,SAAS;QAClD,QAAQ,EAAE,eAAe;KAC1B,CAAC;IACF,OAAO,eAAe,CAAC;AACzB,CAAC;AAbD,gDAaC;AAEM,KAAK,UAAU,0BAA0B,CAC9C,MAA6B,EAC7B,OAAe,EACf,cAAsB;IAEtB,MAAM,uBAAuB,GAA4B;QACvD,WAAW,EAAE,iCAAU,CAAC,gBAAgB,CAAC,kBAAkB;QAC3D,gBAAgB,EAAE;YAChB,MAAM;YACN,OAAO;YACP,cAAc;SACf;KACF,CAAC;IACF,OAAO,uBAAuB,CAAC;AACjC,CAAC;AAdD,gEAcC;AAEM,KAAK,UAAU,qBAAqB;IACzC,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAU,GAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,MAAM,IAAA,4BAAW,GAAE,CAAC;IACrC,MAAM,OAAO,GAAG,MAAM,IAAA,2BAAU,GAAE,CAAC;IAEnC,MAAM,kBAAkB,GAAG;QACzB,WAAW,EAAE,iCAAU,CAAC,gBAAgB,CAAC,YAAY;QACrD,WAAW,EAAE;YACX,QAAQ;YACR,QAAQ;YACR,oBAAoB,EAAE,OAAO;SAC9B;KACF,CAAC;IACF,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAdD,sDAcC"}
+{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/cloud-connection/messages.ts"],"names":[],"mappings":";;;AAOA,gEAAqD;AACrD,qEAI0C;AAC1C,iEAAiE;AAE1D,KAAK,UAAU,kBAAkB;IACtC,MAAM,QAAQ,GAAe,EAAE,CAAC;IAChC,MAAM,IAAI,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC,OAAO,EAAE,CAAC;IAC/C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAW,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAChD,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACvB;IACD,MAAM,eAAe,GAAG;QACtB,QAAQ,EAAE,QAAQ;KACnB,CAAC;IACF,OAAO,eAAe,CAAC;AACzB,CAAC;AAZD,gDAYC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,MAA2B,EAC3B,OAAe;IAEf,MAAM,qBAAqB,GAA0B;QACnD,MAAM;QACN,OAAO;KACR,CAAC;IACF,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AATD,4DASC;AAEM,KAAK,UAAU,qBAAqB;IACzC,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAU,GAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,MAAM,IAAA,4BAAW,GAAE,CAAC;IACrC,MAAM,OAAO,GAAG,MAAM,IAAA,2BAAU,GAAE,CAAC;IAEnC,MAAM,kBAAkB,GAAuB;QAC7C,QAAQ;QACR,QAAQ;QACR,oBAAoB,EAAE,OAAO;KAC9B,CAAC;IACF,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAXD,sDAWC"}

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

@@ -1,15 +1,14 @@
-import { DeviceAgentMessagePayload } from '@alwaysai/device-agent-schemas';
+import { ToClientMessage, ToCloudMessage } from '@alwaysai/device-agent-schemas';
 export declare class Publisher {
     private client;
     private clientId;
     private readonly toClientTopic;
     private readonly toCloudTopic;
     constructor(client: any, clientId: string);
-    private buildMessagePacket;
     publish(topic: string, payload: string): void;
     publishToCloudWithAck(payload: string, ackNackCallback: CallableFunction): void;
-    publishDeviceAgentPayload(topic: string, payload: DeviceAgentMessagePayload): void;
-    publishToClient(payload: DeviceAgentMessagePayload): void;
-    publishToCloud(payload: DeviceAgentMessagePayload): void;
+    publishDeviceAgentMessage(topic: string, message: ToClientMessage | ToCloudMessage): void;
+    publishToClient(message: ToClientMessage): void;
+    publishToCloud(message: ToCloudMessage): void;
 }
 //# sourceMappingURL=publisher.d.ts.map

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":"AAAA,OAAO,EAEL,yBAAyB,EAG1B,MAAM,gCAAgC,CAAC;AAGxC,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAOzC,OAAO,CAAC,kBAAkB;IAanB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAWtC,qBAAqB,CAC1B,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,gBAAgB;IAkB5B,yBAAyB,CAC9B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,yBAAyB;IAU7B,eAAe,CAAC,OAAO,EAAE,yBAAyB;IAIlD,cAAc,CAAC,OAAO,EAAE,yBAAyB;CAGzD"}
+{"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;AAExC,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAOlC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAWtC,qBAAqB,CAC1B,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,gBAAgB;IAkB5B,yBAAyB,CAC9B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,GAAG,cAAc;IASpC,eAAe,CAAC,OAAO,EAAE,eAAe;IAIxC,cAAc,CAAC,OAAO,EAAE,cAAc;CAI9C"}

package/lib/cloud-connection/publisher.js

@@ -1,23 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Publisher = void 0;
-const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
 const logger_1 = require("../util/logger");
+const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
 class Publisher {
     constructor(client, clientId) {
         this.client = client;
         this.clientId = clientId;
-        this.toClientTopic = (0, device_agent_schemas_1.getClientTopic)(this.clientId);
-        this.toCloudTopic = (0, device_agent_schemas_1.getCloudTopic)(this.clientId);
-    }
-    buildMessagePacket(topic, payload) {
-        const packet = {
-            timestamp: new Date().toUTCString(),
-            deviceId: this.clientId,
-            topic,
-            payload
-        };
-        return packet;
+        this.toClientTopic = (0, device_agent_schemas_1.getToClientTopic)(this.clientId);
+        this.toCloudTopic = (0, device_agent_schemas_1.getToCloudTopic)(this.clientId);
     }
     publish(topic, payload) {
         // TODO: topic validation
@@ -40,17 +31,17 @@ class Publisher {
             }
         });
     }
-    publishDeviceAgentPayload(topic, payload) {
-        const packet = this.buildMessagePacket(topic, payload);
-        const packetStr = JSON.stringify(packet);
-        logger_1.logger.debug(`Publishing message:\n${JSON.stringify({ topic, packet }, null, 2)}`);
-        this.publish(topic, packetStr);
+    publishDeviceAgentMessage(topic, message) {
+        const messageStr = JSON.stringify(message);
+        logger_1.logger.debug(`Publishing message:\n${JSON.stringify({ topic, message }, null, 2)}`);
+        this.publish(topic, messageStr);
     }
-    publishToClient(payload) {
-        this.publishDeviceAgentPayload(this.toClientTopic, payload);
+    publishToClient(message) {
+        this.publishDeviceAgentMessage(this.toClientTopic, message);
     }
-    publishToCloud(payload) {
-        this.publishDeviceAgentPayload(this.toCloudTopic, payload);
+    publishToCloud(message) {
+        // Can edit topic field in message here if we want
+        this.publishDeviceAgentMessage(this.toCloudTopic, message);
     }
 }
 exports.Publisher = Publisher;

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

@@ -1 +1 @@
-{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../src/cloud-connection/publisher.ts"],"names":[],"mappings":";;;AAAA,yEAKwC;AACxC,2CAAwC;AAExC,MAAa,SAAS;IAMpB,YAAY,MAAW,EAAE,QAAgB;QACvC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAA,qCAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,IAAA,oCAAa,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;IAEO,kBAAkB,CACxB,KAAa,EACb,OAAkC;QAElC,MAAM,MAAM,GAAG;YACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK;YACL,OAAO;SACR,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,OAAO,CAAC,KAAa,EAAE,OAAe;QAC3C,yBAAyB;QACzB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE;YAC/C,IAAI,GAAG,EAAE;gBACP,eAAM,CAAC,KAAK,CACV,sCAAsC,KAAK,cAAc,OAAO,YAAY,GAAG,EAAE,CAClF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,qBAAqB,CAC1B,OAAe,EACf,eAAiC;QAEjC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAQ,EAAE,IAAS,EAAE,EAAE;YACtE,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;IACL,CAAC;IAEM,yBAAyB,CAC9B,KAAa,EACb,OAAkC;QAElC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACzC,eAAM,CAAC,KAAK,CACV,wBAAwB,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACrE,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACjC,CAAC;IAEM,eAAe,CAAC,OAAkC;QACvD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAEM,cAAc,CAAC,OAAkC;QACtD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;CACF;AA5ED,8BA4EC"}
+{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../src/cloud-connection/publisher.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,yEAKwC;AAExC,MAAa,SAAS;IAMpB,YAAY,MAAW,EAAE,QAAgB;QACvC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,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,CAAC,KAAa,EAAE,OAAe;QAC3C,yBAAyB;QACzB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE;YAC/C,IAAI,GAAG,EAAE;gBACP,eAAM,CAAC,KAAK,CACV,sCAAsC,KAAK,cAAc,OAAO,YAAY,GAAG,EAAE,CAClF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,qBAAqB,CAC1B,OAAe,EACf,eAAiC;QAEjC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAQ,EAAE,IAAS,EAAE,EAAE;YACtE,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;IACL,CAAC;IAEM,yBAAyB,CAC9B,KAAa,EACb,OAAyC;QAEzC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3C,eAAM,CAAC,KAAK,CACV,wBAAwB,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACtE,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAClC,CAAC;IAEM,eAAe,CAAC,OAAwB;QAC7C,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAEM,cAAc,CAAC,OAAuB;QAC3C,kDAAkD;QAClD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;CACF;AA/DD,8BA+DC"}

package/lib/cloud-connection/transaction-queue.d.ts

@@ -0,0 +1,12 @@
+export declare class TransactionQueue {
+    private transactionList;
+    private txIdToProjectIdMap;
+    constructor();
+    addTxIdToQueue(txId: string, projectId: string): void;
+    getCurrentTxId(): string;
+    checkTxnInQueue(txId: string): boolean;
+    getProjectIdForTxnId(txId: string): string;
+    completeTxn(txId: string): void;
+    completeCurrentTxn(): void;
+}
+//# sourceMappingURL=transaction-queue.d.ts.map

package/lib/cloud-connection/transaction-queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transaction-queue.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/transaction-queue.ts"],"names":[],"mappings":"AAAA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,eAAe,CAAW;IAClC,OAAO,CAAC,kBAAkB,CAAkC;;IAOrD,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAS9C,cAAc;IAId,eAAe,CAAC,IAAI,EAAE,MAAM;IAI5B,oBAAoB,CAAC,IAAI,EAAE,MAAM;IAIjC,WAAW,CAAC,IAAI,EAAE,MAAM;IAKxB,kBAAkB;CAI1B"}

package/lib/cloud-connection/transaction-queue.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionQueue = void 0;
+class TransactionQueue {
+    constructor() {
+        this.txIdToProjectIdMap = {};
+        this.transactionList = [];
+        this.txIdToProjectIdMap = {};
+    }
+    addTxIdToQueue(txId, projectId) {
+        if (!this.checkTxnInQueue(txId)) {
+            this.transactionList.push(txId);
+            this.txIdToProjectIdMap[txId] = projectId;
+        }
+        else {
+            throw new Error(`txId ${txId} is already added to the queue!`);
+        }
+    }
+    getCurrentTxId() {
+        return this.transactionList[0];
+    }
+    checkTxnInQueue(txId) {
+        return this.transactionList.includes(txId);
+    }
+    getProjectIdForTxnId(txId) {
+        return this.txIdToProjectIdMap[txId];
+    }
+    completeTxn(txId) {
+        delete this.txIdToProjectIdMap[txId];
+        this.transactionList.splice(this.transactionList.indexOf(txId), 1);
+    }
+    completeCurrentTxn() {
+        delete this.txIdToProjectIdMap[this.transactionList[0]];
+        this.transactionList.shift();
+    }
+}
+exports.TransactionQueue = TransactionQueue;
+//# sourceMappingURL=transaction-queue.js.map