@alwaysai/device-agent 1.3.1 → 1.5.0

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

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runChannel = exports.PassthroughHandler = void 0;
-// eslint-disable-next-line
-const amqp = require('amqplib');
+exports.PassthroughHandler = void 0;
+const amqp = require("amqplib");
 const constants_1 = require("../local-connection/constants");
 const rabbitmq_connection_1 = require("../local-connection/rabbitmq-connection");
 const logger_1 = require("../util/logger");
@@ -12,18 +11,78 @@ const ackQueue = [];
 const MAX_LOCAL_CONNECTION_ATTEMPTS = 10;
 class PassthroughHandler {
     constructor(publisher) {
+        this.runChannel = async () => {
+            logger_1.logger.debug('Beginning to consume packets');
+            await this.channel.consume(this.packetQueue, (msg) => {
+                // NOTE: this needs to be an arrow function and then the whole contents of processPublish are below
+                if ((msg === null || msg === void 0 ? void 0 : msg.content) !== undefined) {
+                    const packet = JSON.parse(msg.content.toString());
+                    messageQueue.push({ packet, msg });
+                    while (messageQueue.length > 0) {
+                        const entry = messageQueue.shift();
+                        const { packet, msg } = entry;
+                        try {
+                            const parsedPacket = JSON.parse(packet);
+                            if (parsedPacket === null || parsedPacket === void 0 ? void 0 : parsedPacket['action']) {
+                                switch (parsedPacket['action']) {
+                                    case 'analytics':
+                                        ackQueue.push(msg);
+                                        // FIXME: put real topic here
+                                        this.publisher.publishToCloudWithAck(packet, (errOrResp) => {
+                                            while (ackQueue.length > 0) {
+                                                const msg = ackQueue.shift();
+                                                if (errOrResp === true) {
+                                                    this.channel.ack(msg); // acknowledge, allow queue to discard
+                                                }
+                                                else if (errOrResp === false) {
+                                                    this.channel.reject(msg, true); // reject and requeue
+                                                }
+                                            }
+                                        });
+                                        break;
+                                    case 'heartbeat':
+                                        this.channel.ack(msg);
+                                        logger_1.logger.silly(`Heartbeat package received & acknowledged: ${packet}`);
+                                        break;
+                                    default:
+                                        this.channel.ack(msg);
+                                        logger_1.logger.debug(`Unknown 'action' package received & acknowledged: ${packet}`);
+                                        break;
+                                }
+                            }
+                            else {
+                                this.channel.ack(msg);
+                                logger_1.logger.debug(`Received & acknowledged a RabbitMQ Package of unknown structure: ${parsedPacket}`);
+                            }
+                        }
+                        catch (e) {
+                            logger_1.logger.error(`There was a problem parsing RabbitMQ packet ${e}`);
+                            this.channel.ack(msg);
+                            logger_1.logger.debug(`Problematic packet was acknowledged`);
+                        }
+                    }
+                }
+            }, {
+                noAck: false // When true, RabbitMQ deletes message as soon as it is consumed
+            });
+        };
         this.publisher = publisher;
     }
-    async setup() {
-        await (0, rabbitmq_connection_1.setupRabbitMQContainer)();
+    async establishLocalConnection() {
         let connectAttempts = 0;
         let connected = false;
-        logger_1.logger.debug(`Setting up alwaysAI Local Connection on host: ${constants_1.LOCAL_CONNECTION_HOST} and channel key: ${constants_1.LOCAL_CONNECTION_ROUTING_KEY}`);
+        logger_1.logger.debug(`Establishing local connection...`);
         while (connectAttempts <= MAX_LOCAL_CONNECTION_ATTEMPTS &&
             this.connection === undefined) {
             try {
                 this.connection = await amqp.connect(`amqp://${constants_1.LOCAL_CONNECTION_HOST}:${constants_1.LOCAL_CONNECTION_PORT}`);
                 this.channel = await this.connection.createChannel();
+                this.connection.on('error', async () => {
+                    logger_1.logger.error(`Local connection failed. Attempting to reconnect...`);
+                    await (0, rabbitmq_connection_1.stopRabbitMQContainer)();
+                    this.connection = undefined;
+                    await this.setup();
+                });
                 connected = true;
             }
             catch (e) {
@@ -34,74 +93,29 @@ class PassthroughHandler {
             }
         }
         if (connected === true) {
-            this.channel.prefetch(1); // This ensures we only get one packet at a time! This appears to have prevented throttling
+            await this.channel.prefetch(1); // This ensures we only get one packet at a time! This appears to have prevented throttling
             this.packetQueue = `${constants_1.LOCAL_CONNECTION_ROUTING_KEY}`;
             await this.channel.assertQueue(this.packetQueue, {
                 durable: true
             });
+            logger_1.logger.info(`Local connection established.`);
         }
         else {
             throw new Error('Unable to establish connection to alwaysAI Local Connection, please try restarting Device Agent.');
         }
     }
-}
-exports.PassthroughHandler = PassthroughHandler;
-function processPublish(passthroughHandler) {
-    while (messageQueue.length > 0) {
-        const entry = messageQueue.shift();
-        const { packet, msg } = entry;
+    async setup() {
+        logger_1.logger.debug(`Setting up alwaysAI Local Connection on host: ${constants_1.LOCAL_CONNECTION_HOST} and channel key: ${constants_1.LOCAL_CONNECTION_ROUTING_KEY}`);
+        await (0, rabbitmq_connection_1.setupRabbitMQContainer)();
         try {
-            const parsedPacket = JSON.parse(packet);
-            if (parsedPacket && parsedPacket['action']) {
-                switch (parsedPacket['action']) {
-                    case 'analytics':
-                        ackQueue.push(msg);
-                        // FIXME: put real topic here
-                        passthroughHandler.publisher.publishToCloudWithAck(packet, (errOrResp) => {
-                            while (ackQueue.length > 0) {
-                                const msg = ackQueue.shift();
-                                if (errOrResp === true) {
-                                    passthroughHandler.channel.ack(msg); // acknowledge, allow queue to discard
-                                }
-                                else if (errOrResp === false) {
-                                    passthroughHandler.channel.reject(msg, true); // reject and requeue
-                                }
-                            }
-                        });
-                        break;
-                    case 'heartbeat':
-                        passthroughHandler.channel.ack(msg);
-                        logger_1.logger.debug(`Heartbeat package received & acknowledged: ${packet}`);
-                        break;
-                    default:
-                        passthroughHandler.channel.ack(msg);
-                        logger_1.logger.debug(`Unknown 'action' package received & acknowledged: ${packet}`);
-                        break;
-                }
-            }
-            else {
-                passthroughHandler.channel.ack(msg);
-                logger_1.logger.debug(`Received & acknowledged a RabbitMQ Package of unknown structure: ${parsedPacket}`);
-            }
+            await this.establishLocalConnection();
+            await this.runChannel();
         }
-        catch (e) {
-            logger_1.logger.error(`There was a problem parsing RabbitMQ packet ${e}`);
-            passthroughHandler.channel.ack(msg);
-            logger_1.logger.debug(`Problematic packet was acknowledged`);
+        catch (error) {
+            logger_1.logger.error(`There was a problem maintaining RabbitMQ connection: ${error}`);
+            throw new Error(`There was a problem maintaining RabbitMQ connection: ${error}`);
         }
     }
 }
-async function runChannel(passthroughHandler) {
-    logger_1.logger.debug('Beginning to consume packets');
-    passthroughHandler.channel.consume(passthroughHandler.packetQueue, function (msg) {
-        if (msg.content !== undefined) {
-            const packet = JSON.parse(msg.content.toString());
-            messageQueue.push({ packet, msg });
-            processPublish(passthroughHandler);
-        }
-    }, {
-        noAck: false // When true, RabbitMQ deletes message as soon as it is consumed
-    });
-}
-exports.runChannel = runChannel;
+exports.PassthroughHandler = PassthroughHandler;
 //# sourceMappingURL=passthrough-handler.js.map

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

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

package/lib/cloud-connection/shadow-handler.d.ts

@@ -2,21 +2,7 @@ import { AppConfig } from '@alwaysai/app-configuration-schemas';
 import { EnvVars } from '../application-control';
 import { Publisher } from './publisher';
 import { AppConfigModels } from './shadow';
-export interface ShadowTopics {
-    projects: {
-        get: string;
-        getAccepted: string;
-        getRejected: string;
-        update: string;
-        updateDelta: string;
-        updateAccepted: string;
-        updateRejected: string;
-        delete: string;
-    };
-    systemInfo: {
-        update: string;
-    };
-}
+import { SecureTunnelShadowDescriptionReported } from '@alwaysai/device-agent-schemas';
 export declare type AppConfigUpdate = {
     newAppCfg: AppConfig;
     updatedModels?: AppConfigModels;
@@ -33,18 +19,27 @@ export declare type ShadowUpdate = {
 export declare class ShadowHandler {
     private clientId;
     private publisher;
-    readonly shadowPrefix: string;
-    readonly shadowTopics: ShadowTopics;
+    projectShadowTopics: string[];
+    readonly shadowTopics: {
+        [key: string]: any;
+    };
     constructor(clientId: string, publisher: Publisher);
-    private handleNamedShadowUpdate;
-    handleShadowTopic({ topic, payload, clientToken }: {
+    private generateAppConfigUpdate;
+    private processProjectShadowUpdates;
+    private processProjectShadowUpdate;
+    handleProjectShadow({ topic, payload, clientToken }: {
         topic: string;
         payload: any;
         clientToken: string;
     }): Promise<ShadowUpdate[]>;
     updateSystemInfoShadow(): Promise<void>;
     updateProjectShadow(projectId: string): Promise<void>;
-    getShadowUpdates(): void;
-    clearAppConfig(projectId: string): void;
+    updateProjectEnvVars({ projectId, envVars }: {
+        projectId: string;
+        envVars: EnvVars;
+    }): Promise<void>;
+    updateSecureTunnelShadow(secureTunnelShadowUpdate: SecureTunnelShadowDescriptionReported): Promise<void>;
+    getProjectShadowUpdates(): void;
+    clearProjectShadow(projectId: string): void;
 }
 //# sourceMappingURL=shadow-handler.d.ts.map

package/lib/cloud-connection/shadow-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shadow-handler.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/shadow-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAEV,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,OAAO,EAA8B,MAAM,wBAAwB,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAuB,MAAM,UAAU,CAAC;AAIhE,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE;QACR,GAAG,EAAE,MAAM,CAAC;QACZ,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,cAAc,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,MAAM,CAAC;QACvB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,UAAU,EAAE;QACV,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,oBAAY,eAAe,GAAG;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,eAAe,CAAC;CACjC,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,SAAS,CAAY;IAC7B,SAAgB,YAAY,EAAE,MAAM,CAAC;IACrC,SAAgB,YAAY,EAAE,YAAY,CAAC;gBAE/B,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS;YAqBpC,uBAAuB;IAsExB,iBAAiB,CAAC,EAC7B,KAAK,EACL,OAAO,EACP,WAAW,EACZ,EAAE;QACD,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,GAAG,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAqCd,sBAAsB;IAYtB,mBAAmB,CAAC,SAAS,EAAE,MAAM;IAmB3C,gBAAgB;IAQhB,cAAc,CAAC,SAAS,EAAE,MAAM;CAiBxC"}
+{"version":3,"file":"shadow-handler.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/shadow-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAEV,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,OAAO,EAIR,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAuB,MAAM,UAAU,CAAC;AAChE,OAAO,EAWL,qCAAqC,EACtC,MAAM,gCAAgC,CAAC;AAExC,oBAAY,eAAe,GAAG;IAC5B,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,eAAe,CAAC;CACjC,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,SAAS,CAAY;IACtB,mBAAmB,EAAE,MAAM,EAAE,CAAM;IAC1C,SAAgB,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;gBACzC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS;YAoDpC,uBAAuB;YA8CvB,2BAA2B;YAkC3B,0BAA0B;IAiD3B,mBAAmB,CAAC,EAC/B,KAAK,EACL,OAAO,EACP,WAAW,EACZ,EAAE;QACD,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,GAAG,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAqEd,sBAAsB;IAUtB,mBAAmB,CAAC,SAAS,EAAE,MAAM;IAqBrC,oBAAoB,CAAC,EAChC,SAAS,EACT,OAAO,EACR,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,OAAO,CAAC;KAClB;IAkBY,wBAAwB,CACnC,wBAAwB,EAAE,qCAAqC;IAa1D,uBAAuB;IAOvB,kBAAkB,CAAC,SAAS,EAAE,MAAM;CAY5C"}

package/lib/cloud-connection/shadow-handler.js

@@ -3,157 +3,211 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShadowHandler = void 0;
 const app_configuration_schemas_1 = require("@alwaysai/app-configuration-schemas");
 const application_control_1 = require("../application-control");
+const device_control_1 = require("../device-control/device-control");
 const logger_1 = require("../util/logger");
 const shadow_1 = require("./shadow");
-const device_control_1 = require("../device-control/device-control");
 const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
 class ShadowHandler {
     constructor(clientId, publisher) {
+        this.projectShadowTopics = [];
         this.clientId = clientId;
         this.publisher = publisher;
-        this.shadowPrefix = `$aws/things/${this.clientId}/shadow/name/`;
         this.shadowTopics = {
-            projects: {
-                get: `${this.shadowPrefix}projects/get`,
-                getAccepted: `${this.shadowPrefix}projects/get/accepted`,
-                getRejected: `${this.shadowPrefix}projects/get/rejected`,
-                update: `${this.shadowPrefix}projects/update`,
-                updateDelta: `${this.shadowPrefix}projects/update/delta`,
-                updateAccepted: `${this.shadowPrefix}projects/update/accepted`,
-                updateRejected: `${this.shadowPrefix}projects/update/rejected`,
-                delete: `${this.shadowPrefix}projects/delete`
+            project: {
+                get: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'projects', 'get'),
+                getAccepted: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'projects', 'get/accepted'),
+                getRejected: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'projects', 'get/rejected'),
+                update: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'projects', 'update'),
+                updateDelta: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'projects', 'update/delta'),
+                updateAccepted: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'projects', 'update/accepted'),
+                updateRejected: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'projects', 'update/rejected')
             },
             systemInfo: {
-                update: `${this.shadowPrefix}system-info/update`
+                update: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'system-info', 'update')
+            },
+            secureTunnel: {
+                get: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'secure-tunnel', 'get'),
+                getAccepted: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'secure-tunnel', 'get/accepted'),
+                getRejected: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'secure-tunnel', 'get/rejected'),
+                update: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'secure-tunnel', 'update'),
+                updateDelta: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'secure-tunnel', 'update/delta'),
+                updateAccepted: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'secure-tunnel', 'update/accepted'),
+                updateRejected: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'secure-tunnel', 'update/rejected'),
+                delete: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'secure-tunnel', 'delete'),
+                deleteAccepted: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'secure-tunnel', 'delete/accepted'),
+                deleteRejected: (0, device_agent_schemas_1.getShadowTopic)(clientId, 'secure-tunnel', 'delete/rejected')
             }
         };
+        this.projectShadowTopics.push(this.shadowTopics.project.getAccepted);
+        this.projectShadowTopics.push(this.shadowTopics.project.getRejected);
+        this.projectShadowTopics.push(this.shadowTopics.project.updateDelta);
+        this.projectShadowTopics.push(this.shadowTopics.project.updateAccepted);
+        this.projectShadowTopics.push(this.shadowTopics.project.updateRejected);
     }
-    async handleNamedShadowUpdate({ delta }) {
-        const updates = [];
-        const deltaKeys = Object.keys(delta);
-        for (const projectId of deltaKeys) {
-            const projectShadow = delta[projectId];
-            // For incoming shadow updates, there will be no TxID, so it needs to be generated here.
-            const txId = (0, device_agent_schemas_1.generateTxId)();
-            const shadowUpdate = { projectId, txId };
-            if (projectShadow.appConfig) {
-                let newAppCfg;
-                try {
-                    newAppCfg = JSON.parse(projectShadow.appConfig);
-                }
-                catch (error) {
-                    logger_1.logger.error(`Could not parse the appConfig for transaction ${txId}!\n${error}`);
-                    continue;
-                }
-                if (!(0, app_configuration_schemas_1.validateAppConfig)(newAppCfg)) {
-                    // FIXME: Raise an exception to be handled at higher layer
-                    logger_1.logger.error(`Received invalid app config for ${projectId}!\n${JSON.stringify(app_configuration_schemas_1.validateAppConfig.errors, null, 2)}`);
+    async generateAppConfigUpdate({ appConfig, txId, projectId }) {
+        let newAppCfg;
+        // Handle errors and validation
+        try {
+            newAppCfg = JSON.parse(appConfig);
+        }
+        catch (error) {
+            logger_1.logger.error(`Could not parse the appConfig for transaction ${txId}!\n${error}`);
+            return null;
+        }
+        if (!(0, app_configuration_schemas_1.validateAppConfig)(newAppCfg)) {
+            // FIXME: Raise an exception to be handled at higher layer
+            logger_1.logger.error(`Received invalid app config for ${projectId}!\n${JSON.stringify(app_configuration_schemas_1.validateAppConfig.errors, null, 2)}`);
+            return null;
+        }
+        // If all ok, return the AppConfigUpdate
+        logger_1.logger.info(`Found a delta for app config shadow. Updating ${projectId}`);
+        const { updatedModels } = await (0, shadow_1.getAppCfgModelsDiff)({
+            newAppCfg,
+            projectId
+        });
+        const appCfgUpdate = { newAppCfg };
+        if (updatedModels && Object.keys(updatedModels).length) {
+            appCfgUpdate.updatedModels = updatedModels;
+        }
+        return appCfgUpdate;
+    }
+    async processProjectShadowUpdates({ delta }) {
+        const shadowUpdatesPromises = [];
+        for (const [projectId, projectDelta] of Object.entries(delta)) {
+            if (projectDelta) {
+                const valid = (0, device_agent_schemas_1.validateProjectShadowUpdate)(projectDelta);
+                if (!valid) {
+                    logger_1.logger.error(`Error validating shadow update: ${JSON.stringify({ projectDelta, errors: device_agent_schemas_1.validateProjectShadowUpdate.errors }, null, 2)}`);
                     continue;
                 }
-                const { updatedModels } = await (0, shadow_1.getAppCfgModelsDiff)({
-                    newAppCfg,
-                    projectId
-                });
-                if (updatedModels && Object.keys(updatedModels).length) {
-                    shadowUpdate.appCfgUpdate = { newAppCfg, updatedModels };
-                }
-                else {
-                    shadowUpdate.appCfgUpdate = { newAppCfg };
-                }
-            }
-            else {
-                logger_1.logger.info(`Ignoring app config shadow update for ${projectId} due to no delta`);
+                shadowUpdatesPromises.push(this.processProjectShadowUpdate({
+                    projectId,
+                    projectDelta
+                }));
             }
-            if (projectShadow.envVars) {
-                const envVars = projectShadow.envVars;
-                shadowUpdate.envVarUpdate = { envVars };
-            }
-            else {
-                logger_1.logger.info(`Ignoring app environment variable shadow update for ${projectId} due to no delta`);
-            }
-            if (shadowUpdate.appCfgUpdate || shadowUpdate.envVarUpdate) {
-                updates.push(shadowUpdate);
+        }
+        return (await Promise.all(shadowUpdatesPromises)).filter((promise) => promise !== null);
+    }
+    async processProjectShadowUpdate({ projectId, projectDelta }) {
+        const txId = (0, device_agent_schemas_1.generateTxId)();
+        const shadowUpdate = { projectId, txId };
+        // Handle appConfig Updates
+        if (!projectDelta.appConfig) {
+            logger_1.logger.info(`Ignoring app config shadow update for ${projectId} due to no delta`);
+        }
+        else {
+            logger_1.logger.info(`Found a delta for app config shadow. Updating ${projectId}`);
+            const appConfig = projectDelta.appConfig;
+            const appCfgUpdate = await this.generateAppConfigUpdate({
+                appConfig,
+                txId,
+                projectId
+            });
+            if (appCfgUpdate) {
+                shadowUpdate.appCfgUpdate = appCfgUpdate;
             }
         }
-        return updates;
+        // Handle envVars Updates
+        if (!projectDelta.envVars) {
+            logger_1.logger.info(`Ignoring app environment variable shadow update for ${projectId} due to no delta`);
+        }
+        else {
+            logger_1.logger.info(`Found a delta for app environment variable shadow. Updating ${projectId}`);
+            const envVars = projectDelta.envVars;
+            shadowUpdate.envVarUpdate = { envVars };
+        }
+        return shadowUpdate.appCfgUpdate || shadowUpdate.envVarUpdate
+            ? shadowUpdate
+            : null;
     }
     // Public interface
-    async handleShadowTopic({ topic, payload, clientToken }) {
+    async handleProjectShadow({ topic, payload, clientToken }) {
         // TODO: make use a function like the other topic getters
-        const shadowName = topic.split('/')[5];
+        if (!this.projectShadowTopics.includes(topic)) {
+            throw Error(`Topic ${topic} is not in the ${this.projectShadowTopics}`);
+        }
         switch (topic) {
-            case this.shadowTopics.projects.updateAccepted:
+            case this.shadowTopics.project.updateAccepted: {
                 if (clientToken === this.clientId) {
-                    logger_1.logger.debug(`Ignoring delta caused by Device Agent: ${JSON.stringify({ topic, payload }, null, 2)}`);
+                    logger_1.logger.debug(`Ignoring message as it was caused by Device Agent itself: ${JSON.stringify({ topic, payload }, null, 2)}`);
                     break;
                 }
-                return await this.handleNamedShadowUpdate({ delta: payload.desired });
-            case this.shadowTopics.projects.getAccepted:
-                if (payload['delta']) {
-                    return await this.handleNamedShadowUpdate({
-                        delta: payload['delta']
+                const desired = (0, device_agent_schemas_1.getDesiredFromMessage)(payload);
+                if (!desired) {
+                    logger_1.logger.debug(`No desired state found in message: ${JSON.stringify(payload)}`);
+                }
+                else {
+                    return await this.processProjectShadowUpdates({ delta: desired });
+                }
+                break;
+            }
+            case this.shadowTopics.project.getAccepted: {
+                if (clientToken !== this.clientId) {
+                    logger_1.logger.debug(`Ignoring message as it was caused by Device Agent itself: ${JSON.stringify({ topic, payload }, null, 2)}`);
+                    break;
+                }
+                if (payload.state.delta) {
+                    return await this.processProjectShadowUpdates({
+                        delta: payload.state.delta
                     });
                 }
                 else {
-                    logger_1.logger.info(`No delta updates in named shadow '${shadowName}'`);
+                    logger_1.logger.info(`No delta in projects.getAccepted in named shadow '${topic.split('/')[5]}'`);
                 }
                 break;
+            }
+            case this.shadowTopics.project.getRejected:
+            case this.shadowTopics.project.updateDelta:
+            case this.shadowTopics.project.updateRejected: {
+                // Not handling these for now
+                break;
+            }
             default:
-                logger_1.logger.info(`Ignoring shadow message: ${JSON.stringify({ topic, payload }, null, 2)}`);
+                logger_1.logger.info(`Did not match a correct topic. Ignoring shadow message: ${JSON.stringify({ topic, payload }, null, 2)}`);
         }
         return [];
     }
     async updateSystemInfoShadow() {
         const systemInfo = await (0, device_control_1.getSystemInformation)();
-        const packet = {
-            state: {
-                reported: systemInfo
-            },
-            clientToken: this.clientId
-        };
-        const topic = this.shadowTopics.systemInfo.update;
-        this.publisher.publish(topic, JSON.stringify(packet));
+        this.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(this.clientId, 'system-info', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateSystemInfoShadowMessage)(this.clientId, systemInfo)));
     }
     async updateProjectShadow(projectId) {
         const appCfg = await (0, application_control_1.readAppCfgFile)({ projectId });
         const envVars = await (0, application_control_1.getAllEnvs)({ projectId });
-        const packet = {
-            state: {
-                reported: {
-                    [projectId]: {
-                        appConfig: JSON.stringify(appCfg),
-                        envVars
-                    }
-                }
-            },
-            clientToken: this.clientId
-        };
-        const topic = this.shadowTopics.projects.update;
-        this.publisher.publish(topic, JSON.stringify(packet));
-    }
-    getShadowUpdates() {
-        const topic = this.shadowTopics.projects.get;
-        const packet = {
-            clientToken: this.clientId
+        const toReport = {
+            [projectId]: {
+                appConfig: JSON.stringify(appCfg),
+                envVars
+            }
         };
-        this.publisher.publish(topic, JSON.stringify(packet));
+        this.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(this.clientId, 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateProjectShadowMessage)({
+            clientId: this.clientId,
+            reported: toReport
+        })));
     }
-    clearAppConfig(projectId) {
-        const topic = this.shadowTopics.projects.update;
-        // TODO: We should actually send only desired and handle the delta
-        // to update reported
-        const packet = {
-            state: {
-                desired: {
-                    [projectId]: null
-                },
-                reported: {
-                    [projectId]: null
+    async updateProjectEnvVars({ projectId, envVars }) {
+        await (0, application_control_1.setEnv)({ projectId, envVars });
+        this.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(this.clientId, 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateProjectShadowMessage)({
+            clientId: this.clientId,
+            reported: {
+                [projectId]: {
+                    envVars
                 }
-            },
-            clientToken: this.clientId
-        };
-        this.publisher.publish(topic, JSON.stringify(packet));
+            }
+        })));
+    }
+    async updateSecureTunnelShadow(secureTunnelShadowUpdate) {
+        this.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(this.clientId, 'secure-tunnel', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateSecureTunnelShadowMessage)(secureTunnelShadowUpdate, this.clientId)));
+    }
+    getProjectShadowUpdates() {
+        this.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(this.clientId, 'projects', 'get'), JSON.stringify((0, device_agent_schemas_1.buildBaseShadowMessage)(this.clientId)));
+    }
+    clearProjectShadow(projectId) {
+        this.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(this.clientId, 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateProjectShadowMessage)({
+            clientId: this.clientId,
+            reported: { [projectId]: null },
+            desired: { [projectId]: null }
+        })));
     }
 }
 exports.ShadowHandler = ShadowHandler;