@alwaysai/device-agent 1.4.0 → 2.0.0

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

@@ -1,73 +1,95 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const live_updates_handler_1 = require("./live-updates-handler");
-const publisher_1 = require("./publisher");
-global.setTimeout = jest.fn();
+const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
+const crypto_1 = require("crypto");
+const stream_1 = require("stream");
+jest.mock('../util/sleep');
+jest.mock('./messages');
+jest.useFakeTimers();
 // https://github.com/facebook/react-native/issues/35701
 Object.defineProperty(global, 'performance', {
     writable: true
 });
-const testTrueToggles = {
-    deviceStats: true,
-    appState: true
-};
-const testFalseToggles = {
-    deviceStats: false,
-    appState: false
-};
-const mockClient = jest.fn();
-const clientId = 'test-client';
-const emptyTxId = '';
-// NOTE: this was the way I found to mock private class functions
-const mockStartPublishingLiveUpdates = jest.spyOn(live_updates_handler_1.LiveUpdatesHandler.prototype, 'startPublishingLiveUpdates');
-mockStartPublishingLiveUpdates.mockResolvedValue(null);
+const mockTransactionId = '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d';
+const mockProjectId = '12345678-abcd-abcd-abcd-0123456789ab';
 describe('Test Live Updates Handler', () => {
     let liveUpdatesHandler;
-    let publisher;
     beforeEach(() => {
-        publisher = new publisher_1.Publisher(mockClient, clientId);
-        liveUpdatesHandler = new live_updates_handler_1.LiveUpdatesHandler(publisher, clientId);
+        liveUpdatesHandler = new live_updates_handler_1.LiveUpdatesHandler();
         jest.clearAllMocks();
     });
-    test('ignore subsequent enables', async () => {
-        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, emptyTxId);
-        expect(mockStartPublishingLiveUpdates).toBeCalledTimes(0);
-        expect(jest.mocked(setTimeout)).toHaveBeenCalledTimes(1);
+    test('enable interval', async () => {
+        const mockPublishingFn = jest.fn();
+        const mockClearInterval = jest.spyOn(global, 'clearInterval');
+        const mockSetInterval = jest.spyOn(global, 'setInterval');
+        await liveUpdatesHandler.enable(device_agent_schemas_1.keyMirrors.toClientMessageType.device_stats, mockPublishingFn);
+        jest.advanceTimersByTime(live_updates_handler_1.DEFAULT_INTERVALS_MS);
+        expect(mockPublishingFn).toBeCalledTimes(2);
+        expect(mockClearInterval).toBeCalledWith(undefined);
+        expect(mockSetInterval).toBeCalledTimes(1);
+    });
+    test('subsequent enable resets interval with no duplicates', async () => {
+        const mockPublishingFn = jest.fn();
+        const mockSetInterval = jest.spyOn(global, 'setInterval');
+        const mockClearInterval = jest.spyOn(global, 'clearInterval');
+        await liveUpdatesHandler.enable(device_agent_schemas_1.keyMirrors.toClientMessageType.device_stats, mockPublishingFn, mockTransactionId);
+        await liveUpdatesHandler.enable(device_agent_schemas_1.keyMirrors.toClientMessageType.device_stats, mockPublishingFn, mockTransactionId);
+        jest.advanceTimersByTime(live_updates_handler_1.DEFAULT_INTERVALS_MS);
+        expect(mockClearInterval.mock.calls[0][0]).toEqual(undefined);
+        expect(mockClearInterval.mock.calls[1][0]).toEqual(mockSetInterval.mock.results[0].value);
+        expect(mockSetInterval).toBeCalledTimes(2);
+        expect(mockPublishingFn).toBeCalledTimes(3);
     });
     test('test disable live updates', async () => {
-        // Test calling handleToggles one time, enabling it
-        void liveUpdatesHandler.handleToggles(testTrueToggles, emptyTxId);
-        expect(mockStartPublishingLiveUpdates).toBeCalledTimes(2);
-        expect(jest.mocked(setTimeout)).toHaveBeenCalledTimes(1);
-        expect(liveUpdatesHandler.getDeviceStatsLiveUpdates()).toBe(true);
-        expect(liveUpdatesHandler.getAppStateLiveUpdates()).toBe(true);
-        expect(liveUpdatesHandler.getAppLogsLiveUpdates()).toBe(false);
-        // Check to see that attributes are properly set to false when disabled
-        jest.clearAllMocks();
-        void liveUpdatesHandler.handleToggles(testFalseToggles, emptyTxId);
-        expect(mockStartPublishingLiveUpdates).toBeCalledTimes(0);
-        expect(jest.mocked(setTimeout)).toHaveBeenCalledTimes(1);
-        expect(liveUpdatesHandler.getDeviceStatsLiveUpdates()).toBe(false);
-        expect(liveUpdatesHandler.getAppStateLiveUpdates()).toBe(false);
-        expect(liveUpdatesHandler.getAppLogsLiveUpdates()).toBe(false);
+        const mockSetInterval = jest.spyOn(global, 'setInterval');
+        const mockClearInterval = jest.spyOn(global, 'clearInterval');
+        await liveUpdatesHandler.enable(device_agent_schemas_1.keyMirrors.toClientMessageType.device_stats, async () => undefined, mockTransactionId);
+        liveUpdatesHandler.disable(device_agent_schemas_1.keyMirrors.toClientMessageType.device_stats, mockTransactionId);
+        expect(mockClearInterval).toHaveBeenLastCalledWith(mockSetInterval.mock.results[0].value);
     });
-    test('timeout turns off live updates', async () => {
-        jest.useFakeTimers({ legacyFakeTimers: true });
-        void liveUpdatesHandler.handleToggles(testTrueToggles, emptyTxId);
-        expect(liveUpdatesHandler.getDeviceStatsLiveUpdates()).toBe(true);
-        expect(liveUpdatesHandler.getAppStateLiveUpdates()).toBe(true);
-        expect(liveUpdatesHandler.getAppLogsLiveUpdates()).toBe(false);
+    test('kill all timeout turns off all live updates', async () => {
+        const mockPublishingFn = jest.fn();
+        const mockSetInterval = jest.spyOn(global, 'setInterval');
+        const mockClearInterval = jest.spyOn(global, 'clearInterval');
+        jest.spyOn(global, 'setTimeout');
+        const numLivingIntervals = 5;
+        for (let i = 0; i < numLivingIntervals; i++) {
+            await liveUpdatesHandler.enable(device_agent_schemas_1.keyMirrors.toClientMessageType.status_response, mockPublishingFn, (0, crypto_1.randomUUID)());
+        }
+        mockSetInterval.mock.results.forEach((result) => clearInterval(result.value));
         jest.runAllTimers();
-        expect(liveUpdatesHandler.getDeviceStatsLiveUpdates()).toBe(false);
-        expect(liveUpdatesHandler.getAppStateLiveUpdates()).toBe(false);
-        expect(liveUpdatesHandler.getAppLogsLiveUpdates()).toBe(false);
+        expect(mockPublishingFn).toBeCalledTimes(numLivingIntervals);
+        expect(mockSetInterval).toBeCalledTimes(numLivingIntervals);
+        for (let i = 0; i < numLivingIntervals; i++) {
+            expect(mockClearInterval).toHaveBeenCalledWith(mockSetInterval.mock.results[i].value);
+        }
+    });
+    test('startStream streams data to publish', async () => {
+        const mockStream = new stream_1.PassThrough();
+        const mockPublishingFn = jest
+            .fn()
+            .mockImplementation((logChunk) => undefined);
+        await liveUpdatesHandler.startStream(mockProjectId, async () => mockStream, mockPublishingFn);
+        const data = 'Data for stream';
+        mockStream.emit('data', data);
+        expect(mockPublishingFn).toBeCalledWith(data);
+        mockStream.end();
+        mockStream.destroy();
+    });
+    test('failure does not disable interval', async () => {
+        const mockPublishingFn = jest
+            .fn()
+            .mockImplementationOnce(() => undefined)
+            .mockImplementation(() => {
+            throw new Error('Manual throw for unit test');
+        });
+        jest.spyOn(global, 'setInterval');
+        const mockClearInterval = jest.spyOn(global, 'clearInterval');
+        await liveUpdatesHandler.enable(device_agent_schemas_1.keyMirrors.toClientMessageType.device_stats, mockPublishingFn, mockTransactionId);
+        jest.advanceTimersByTime(live_updates_handler_1.DEFAULT_INTERVALS_MS);
+        expect(mockClearInterval).toBeCalledTimes(1);
+        expect(mockPublishingFn).toBeCalledTimes(2);
     });
 });
 //# sourceMappingURL=live-updates-handler.test.js.map

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":";;AAAA,iEAGgC;AAChC,yEAA4D;AAC5D,mCAAoC;AACpC,mCAAqC;AAErC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AAC3B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACxB,IAAI,CAAC,aAAa,EAAE,CAAC;AAErB,wDAAwD;AACxD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE;IAC3C,QAAQ,EAAE,IAAI;CACf,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,sCAAsC,CAAC;AACjE,MAAM,aAAa,GAAG,sCAAsC,CAAC;AAE7D,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,IAAI,kBAAsC,CAAC;IAE3C,UAAU,CAAC,GAAG,EAAE;QACd,kBAAkB,GAAG,IAAI,yCAAkB,EAAE,CAAC;QAC9C,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,iBAAiB,EAAE,KAAK,IAAI,EAAE;QACjC,MAAM,gBAAgB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QACnC,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAC9D,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAE1D,MAAM,kBAAkB,CAAC,MAAM,CAC7B,iCAAU,CAAC,mBAAmB,CAAC,YAAY,EAC3C,gBAAgB,CACjB,CAAC;QAEF,IAAI,CAAC,mBAAmB,CAAC,2CAAoB,CAAC,CAAC;QAE/C,MAAM,CAAC,gBAAgB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,gBAAgB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QACnC,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC1D,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAE9D,MAAM,kBAAkB,CAAC,MAAM,CAC7B,iCAAU,CAAC,mBAAmB,CAAC,YAAY,EAC3C,gBAAgB,EAChB,iBAAiB,CAClB,CAAC;QACF,MAAM,kBAAkB,CAAC,MAAM,CAC7B,iCAAU,CAAC,mBAAmB,CAAC,YAAY,EAC3C,gBAAgB,EAChB,iBAAiB,CAClB,CAAC;QAEF,IAAI,CAAC,mBAAmB,CAAC,2CAAoB,CAAC,CAAC;QAE/C,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9D,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAChD,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CACtC,CAAC;QACF,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,gBAAgB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC1D,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAE9D,MAAM,kBAAkB,CAAC,MAAM,CAC7B,iCAAU,CAAC,mBAAmB,CAAC,YAAY,EAC3C,KAAK,IAAI,EAAE,CAAC,SAAS,EACrB,iBAAiB,CAClB,CAAC;QACF,kBAAkB,CAAC,OAAO,CACxB,iCAAU,CAAC,mBAAmB,CAAC,YAAY,EAC3C,iBAAiB,CAClB,CAAC;QAEF,MAAM,CAAC,iBAAiB,CAAC,CAAC,wBAAwB,CAChD,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CACtC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,gBAAgB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QACnC,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC1D,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAEjC,MAAM,kBAAkB,GAAG,CAAC,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,kBAAkB,CAAC,MAAM,CAC7B,iCAAU,CAAC,mBAAmB,CAAC,eAAe,EAC9C,gBAAgB,EAChB,IAAA,mBAAU,GAAE,CACb,CAAC;SACH;QAED,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9C,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAC5B,CAAC;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,MAAM,CAAC,gBAAgB,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;QAC7D,MAAM,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;QAC5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,CAAC,iBAAiB,CAAC,CAAC,oBAAoB,CAC5C,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CACtC,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,UAAU,GAAG,IAAI,oBAAW,EAAE,CAAC;QACrC,MAAM,gBAAgB,GAAG,IAAI;aAC1B,EAAE,EAAE;aACJ,kBAAkB,CAAC,CAAC,QAAgB,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;QAEvD,MAAM,kBAAkB,CAAC,WAAW,CAClC,aAAa,EACb,KAAK,IAAI,EAAE,CAAC,UAAU,EACtB,gBAAgB,CACjB,CAAC;QAEF,MAAM,IAAI,GAAG,iBAAiB,CAAC;QAC/B,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAE9B,MAAM,CAAC,gBAAgB,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAE9C,UAAU,CAAC,GAAG,EAAE,CAAC;QACjB,UAAU,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,gBAAgB,GAAG,IAAI;aAC1B,EAAE,EAAE;aACJ,sBAAsB,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;aACvC,kBAAkB,CAAC,GAAG,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QACL,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAClC,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAE9D,MAAM,kBAAkB,CAAC,MAAM,CAC7B,iCAAU,CAAC,mBAAmB,CAAC,YAAY,EAC3C,gBAAgB,EAChB,iBAAiB,CAClB,CAAC;QAEF,IAAI,CAAC,mBAAmB,CAAC,2CAAoB,CAAC,CAAC;QAE/C,MAAM,CAAC,iBAAiB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,CAAC,gBAAgB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -1,11 +1,16 @@
+import * as amqp from 'amqplib';
 import { Publisher } from './publisher';
+import { ShadowHandler } from './shadow-handler';
 export declare class PassthroughHandler {
     publisher: Publisher;
-    connection: any;
-    channel: any;
+    shadowHandler: ShadowHandler;
+    connection: amqp.Connection | undefined;
+    channel: amqp.Channel;
     packetQueue: any;
-    constructor(publisher: Publisher);
+    constructor(publisher: Publisher, shadowHandler: ShadowHandler);
+    runChannel: () => Promise<void>;
+    establishLocalConnection(): Promise<void>;
+    private publishPassthroughStatusUpdate;
     setup(): Promise<void>;
 }
-export declare function runChannel(passthroughHandler: PassthroughHandler): Promise<void>;
 //# sourceMappingURL=passthrough-handler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"passthrough-handler.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/passthrough-handler.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,qBAAa,kBAAkB;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,MAAC;IACX,OAAO,MAAC;IACR,WAAW,MAAC;gBAEP,SAAS,EAAE,SAAS;IAInB,KAAK;CAwCnB;AAsDD,wBAAsB,UAAU,CAAC,kBAAkB,EAAE,kBAAkB,iBAetE"}
+{"version":3,"file":"passthrough-handler.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/passthrough-handler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAahC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAMjD,qBAAa,kBAAkB;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IACxC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;IACtB,WAAW,MAAC;gBAEP,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa;IAK9D,UAAU,sBAoER;IAEI,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;YA8CjC,8BAA8B;IAetC,KAAK;CA0BZ"}

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

@@ -1,8 +1,9 @@
 "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 util_1 = require("alwaysai/lib/util");
+const amqp = require("amqplib");
+const environment_1 = require("../environment");
 const constants_1 = require("../local-connection/constants");
 const rabbitmq_connection_1 = require("../local-connection/rabbitmq-connection");
 const logger_1 = require("../util/logger");
@@ -11,19 +12,80 @@ const messageQueue = [];
 const ackQueue = [];
 const MAX_LOCAL_CONNECTION_ATTEMPTS = 10;
 class PassthroughHandler {
-    constructor(publisher) {
+    constructor(publisher, shadowHandler) {
+        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!\n${(0, util_1.stringifyError)(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;
+        this.shadowHandler = shadowHandler;
     }
-    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 +96,45 @@ 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;
-        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;
-                }
+    async publishPassthroughStatusUpdate(status, message) {
+        const deviceAgentPassthroughStatus = {
+            passthrough: {
+                status: status,
+                message: message !== null && message !== void 0 ? message : ''
+            }
+        };
+        await this.shadowHandler.updateDeviceAgentStatusShadow(deviceAgentPassthroughStatus);
+    }
+    async setup() {
+        if (environment_1.ALWAYSAI_ANALYTICS_PASSTHROUGH === true) {
+            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 this.publishPassthroughStatusUpdate('starting');
+            await (0, rabbitmq_connection_1.setupRabbitMQContainer)();
+            try {
+                await this.establishLocalConnection();
+                await this.runChannel();
+                await this.publishPassthroughStatusUpdate('running', `Passthrough running on host: ${constants_1.LOCAL_CONNECTION_HOST} and channel key: ${constants_1.LOCAL_CONNECTION_ROUTING_KEY}`);
             }
-            else {
-                passthroughHandler.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 maintaining RabbitMQ connection!\n${(0, util_1.stringifyError)(e)}`);
+                await this.publishPassthroughStatusUpdate('error', (0, util_1.stringifyError)(e));
             }
         }
-        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`);
+        else {
+            await this.publishPassthroughStatusUpdate('disabled');
         }
     }
 }
-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

@@ -1,5 +1,6 @@
 import { AppConfig } from '@alwaysai/app-configuration-schemas';
-import { EnvVars } from '../application-control';
+import { EnvVars, SecureTunnelShadowUpdate } from '@alwaysai/device-agent-schemas';
+import { DeviceAgentStatusShadowUpdate } from '@alwaysai/device-agent-schemas/lib/shadow-schema';
 import { Publisher } from './publisher';
 import { AppConfigModels } from './shadow';
 export declare type AppConfigUpdate = {
@@ -24,6 +25,7 @@ export declare class ShadowHandler {
     };
     constructor(clientId: string, publisher: Publisher);
     private generateAppConfigUpdate;
+    private generateEnvVarsUpdate;
     private processProjectShadowUpdates;
     private processProjectShadowUpdate;
     handleProjectShadow({ topic, payload, clientToken }: {
@@ -37,6 +39,8 @@ export declare class ShadowHandler {
         projectId: string;
         envVars: EnvVars;
     }): Promise<void>;
+    updateSecureTunnelShadow(secureTunnelShadowUpdate: SecureTunnelShadowUpdate): Promise<void>;
+    updateDeviceAgentStatusShadow(deviceAgentStatusShadowUpdate: DeviceAgentStatusShadowUpdate): Promise<void>;
     getProjectShadowUpdates(): void;
     clearProjectShadow(projectId: string): void;
 }

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,EACL,OAAO,EAIR,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAuB,MAAM,UAAU,CAAC;AAchE,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;YAiDvB,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;IAkBM,uBAAuB;IAOvB,kBAAkB,CAAC,SAAS,EAAE,MAAM;CAY5C"}
+{"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,EAEL,OAAO,EAKP,wBAAwB,EAGzB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAEL,6BAA6B,EAE9B,MAAM,kDAAkD,CAAC;AAK1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAuB,MAAM,UAAU,CAAC;AAEhE,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;YAgDvB,qBAAqB;YAkCrB,2BAA2B;YAkC3B,0BAA0B;IAwD3B,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;IAwDd,sBAAsB;IAatB,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,wBAAwB;IAavC,6BAA6B,CACxC,6BAA6B,EAAE,6BAA6B;IAavD,uBAAuB;IAOvB,kBAAkB,CAAC,SAAS,EAAE,MAAM;CAY5C"}