@alwaysai/device-agent 1.3.0 → 1.3.1

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

@@ -1,40 +1,121 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionManager = void 0;
+const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
+const logger_1 = require("../util/logger");
+const util_1 = require("alwaysai/lib/util");
+const coded_error_1 = require("@carnesen/coded-error");
 class TransactionManager {
-    constructor() {
-        this.txToProject = {};
-        this.projectToTx = {};
-        this.txToProject = {};
-        this.projectToTx = {};
+    constructor(publisher, liveUpdatesHandler) {
+        this.detailsByTx = {};
+        this.detailsByProject = {};
+        this.Errors = (0, util_1.keyMirror)({
+            TRANSACTION_ONGOING: null,
+            PROJECT_ONGOING: null,
+            TRANSACTION_NOT_ONGOING: null
+        });
+        this.detailsByTx = {};
+        this.detailsByProject = {};
+        this.publisher = publisher;
+        this.liveUpdatesHandler = liveUpdatesHandler;
     }
-    addTransaction(txId, projectId) {
-        // Check if the Transaction already exists
-        if (this.txToProject[txId]) {
-            throw new Error(`Transaction ID ${txId} already exists for this projectId ${projectId}!`);
+    startTransaction(txId, projectId, stepName) {
+        // Check if the transaction already exists
+        if (this.detailsByTx[txId]) {
+            const txnDetails = this.detailsByTx[txId];
+            throw new coded_error_1.CodedError(`Transaction ${txId} already ongoing!\n${JSON.stringify(txnDetails, null, 2)}`, this.Errors.TRANSACTION_ONGOING);
+        }
+        // Check if there is any ongoing transactions for project
+        if (this.detailsByProject[projectId]) {
+            const txnDetails = this.detailsByProject[projectId];
+            throw new coded_error_1.CodedError(`Project ${projectId} already has an ongoing transaction!\n${JSON.stringify(txnDetails, null, 2)}`, this.Errors.PROJECT_ONGOING);
+        }
+        // Map the Transaction ID with Project ID
+        const txDetails = {
+            txId,
+            projectId,
+            stepName,
+            start: new Date().toLocaleString()
+        };
+        this.detailsByTx[txId] = txDetails;
+        this.detailsByProject[projectId] = txDetails;
+        logger_1.logger.info(`Started transaction:\n${JSON.stringify(txDetails, null, 2)}`);
+        // send live updates
+        void this.liveUpdatesHandler.enableTransactionStatus({
+            txId
+        });
+    }
+    updateTransaction(txId, stepName) {
+        const txDetails = this.detailsByTx[txId];
+        if (!txDetails) {
+            throw new coded_error_1.CodedError(`Cannot update transaction ${txId} since it doesn't exist!`, this.Errors.TRANSACTION_NOT_ONGOING);
+        }
+        txDetails.stepName = stepName;
+        txDetails.update = new Date().toLocaleString();
+        logger_1.logger.info(`Updated transaction:\n${JSON.stringify(txDetails, null, 2)}`);
+    }
+    async runTransactionStep(props) {
+        const { func, projectId, txId, start, stepName } = props;
+        if (start) {
+            this.startTransaction(txId, projectId, stepName);
         }
         else {
-            // Check if there is any ongoing Transactions for Project ID
-            if (this.projectToTx[projectId]) {
-                throw new Error(`This Project ID ${projectId} already has an ongoing transaction!`);
-            }
-            else {
-                // Map the Transaction ID with Project ID
-                this.txToProject[txId] = projectId;
-                this.projectToTx[projectId] = txId;
+            this.updateTransaction(txId, stepName);
+        }
+        try {
+            const completed = await func();
+            if (completed) {
+                this.completeTransaction(txId);
+                const successStatusResponsePayload = {
+                    status: device_agent_schemas_1.keyMirrors.statusResponse.success
+                };
+                // Send final status message
+                const message = (0, device_agent_schemas_1.buildToClientStatusResponseMessage)(this.publisher.getClientId(), successStatusResponsePayload, txId);
+                this.publisher.publishToClient(message);
             }
         }
+        catch (e) {
+            const message = e.message;
+            logger_1.logger.error(`Failed to execute cmd for ${projectId}:\n${message}\n${e.stack}`);
+            this.completeTransaction(txId);
+            const failureStatusResponsePayload = {
+                status: device_agent_schemas_1.keyMirrors.statusResponse.failure,
+                message
+            };
+            // Send final status message
+            const failureStatusResponseMessage = (0, device_agent_schemas_1.buildToClientStatusResponseMessage)(this.publisher.getClientId(), failureStatusResponsePayload, txId);
+            this.publisher.publishToClient(failureStatusResponseMessage);
+        }
     }
     getTransactionFromProject(projectId) {
-        return this.projectToTx[projectId];
+        const txnDetails = this.detailsByProject[projectId];
+        return txnDetails === null || txnDetails === void 0 ? void 0 : txnDetails.txId;
+    }
+    isOngoingTransactionForProjectID(projectId) {
+        return projectId in this.detailsByProject;
+    }
+    isOngoingTransaction(txId) {
+        return txId in this.detailsByTx;
+    }
+    isAnyOngoingTransaction() {
+        return Object.keys(this.detailsByTx).length > 0;
     }
     getProjectFromTransaction(txId) {
-        return this.txToProject[txId];
+        const txnDetails = this.detailsByTx[txId];
+        return txnDetails === null || txnDetails === void 0 ? void 0 : txnDetails.projectId;
     }
     completeTransaction(txId) {
-        const projectId = this.txToProject[txId];
-        delete this.txToProject[txId];
-        delete this.projectToTx[projectId];
+        const txDetails = this.detailsByTx[txId];
+        if (txDetails === undefined) {
+            throw new coded_error_1.CodedError(`Cannot complete transaction ${txId} since it doesn't exist!`, this.Errors.TRANSACTION_NOT_ONGOING);
+        }
+        txDetails.stop = new Date().toLocaleString();
+        logger_1.logger.info(`Completed transaction:\n${JSON.stringify(txDetails, null, 2)}`);
+        delete this.detailsByTx[txId];
+        delete this.detailsByProject[txDetails.projectId];
+        void this.liveUpdatesHandler.disableTransactionStatus({
+            txId
+        });
     }
 }
 exports.TransactionManager = TransactionManager;

package/lib/cloud-connection/transaction-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-manager.js","sourceRoot":"","sources":["../../src/cloud-connection/transaction-manager.ts"],"names":[],"mappings":";;;AAAA,MAAa,kBAAkB;IAI7B;QAHQ,gBAAW,GAA2B,EAAE,CAAC;QACzC,gBAAW,GAA2B,EAAE,CAAC;QAG/C,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAEM,cAAc,CAAC,IAAY,EAAE,SAAiB;QACnD,0CAA0C;QAC1C,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC1B,MAAM,IAAI,KAAK,CACb,kBAAkB,IAAI,sCAAsC,SAAS,GAAG,CACzE,CAAC;SACH;aAAM;YACL,4DAA4D;YAC5D,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;gBAC/B,MAAM,IAAI,KAAK,CACb,mBAAmB,SAAS,sCAAsC,CACnE,CAAC;aACH;iBAAM;gBACL,yCAAyC;gBACzC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;gBACnC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;aACpC;SACF;IACH,CAAC;IAEM,yBAAyB,CAAC,SAAiB;QAChD,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAEM,yBAAyB,CAAC,IAAY;QAC3C,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAEM,mBAAmB,CAAC,IAAY;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;CACF;AA1CD,gDA0CC"}
+{"version":3,"file":"transaction-manager.js","sourceRoot":"","sources":["../../src/cloud-connection/transaction-manager.ts"],"names":[],"mappings":"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"}

package/lib/cloud-connection/transaction-manager.test.js

@@ -3,61 +3,227 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
 const transaction_manager_1 = require("./transaction-manager");
 const uuid_1 = require("uuid");
+const publisher_1 = require("./publisher");
+const mockClient = {
+    publish: jest.fn()
+};
+const clientId = 'test-client';
+const mockLiveUpdatesHandler = {
+    enableTransactionStatus: jest.fn(),
+    disableTransactionStatus: jest.fn()
+};
 describe('Test Transaction Manager', () => {
     let txnMgr;
+    let publisher;
+    const func_complete = jest
+        .fn()
+        .mockResolvedValue(true);
+    const func_incomplete = jest
+        .fn()
+        .mockResolvedValue(false);
     beforeEach(() => {
-        txnMgr = new transaction_manager_1.TransactionManager();
+        publisher = new publisher_1.Publisher(mockClient, clientId);
+        txnMgr = new transaction_manager_1.TransactionManager(publisher, mockLiveUpdatesHandler);
         jest.clearAllMocks();
     });
     function generateRandomProjectId() {
         return (0, uuid_1.v4)();
     }
-    test('Add a new transaction', async () => {
+    test('Start a new transaction', async () => {
         const txId = (0, device_agent_schemas_1.generateTxId)();
         const projectId = generateRandomProjectId();
-        txnMgr.addTransaction(txId, projectId);
+        await txnMgr.runTransactionStep({
+            func: func_incomplete,
+            projectId,
+            txId,
+            start: true
+        });
         expect(txnMgr.getProjectFromTransaction(txId)).toEqual(projectId);
         expect(txnMgr.getTransactionFromProject(projectId)).toEqual(txId);
+        expect(txnMgr.isOngoingTransaction(txId)).toBe(true);
+        expect(txnMgr.isOngoingTransactionForProjectID(projectId)).toBe(true);
+        expect(txnMgr.isAnyOngoingTransaction()).toBe(true);
+    });
+    test('Start a new transaction which completes in one step', async () => {
+        const txId = (0, device_agent_schemas_1.generateTxId)();
+        const projectId = generateRandomProjectId();
+        await txnMgr.runTransactionStep({
+            func: func_complete,
+            projectId,
+            txId,
+            start: true
+        });
+        expect(txnMgr.isOngoingTransaction(txId)).toBe(false);
+        expect(txnMgr.isOngoingTransactionForProjectID(projectId)).toBe(false);
+        expect(txnMgr.isAnyOngoingTransaction()).toBe(false);
+        const msg = JSON.parse(mockClient.publish.mock.calls[0][1]);
+        expect(msg.payload.status).toBe(device_agent_schemas_1.keyMirrors.statusResponse.success);
+    });
+    test('Start a new transaction and complete in second step', async () => {
+        const txId = (0, device_agent_schemas_1.generateTxId)();
+        const projectId = generateRandomProjectId();
+        await txnMgr.runTransactionStep({
+            func: func_incomplete,
+            projectId,
+            txId,
+            start: true,
+            stepName: 'step1'
+        });
+        await txnMgr.runTransactionStep({
+            func: func_complete,
+            projectId,
+            txId,
+            start: false,
+            stepName: 'step2'
+        });
+        expect(txnMgr.isOngoingTransaction(txId)).toBe(false);
+        expect(txnMgr.isOngoingTransactionForProjectID(projectId)).toBe(false);
+        expect(txnMgr.isAnyOngoingTransaction()).toBe(false);
     });
-    test('Add multiple transactions to different projects', async () => {
+    test('Start multiple transactions for different projects', async () => {
         const numTransactions = 3;
         const projectTxIdList = [];
         for (let i = 0; i < numTransactions; i++) {
             const txId = (0, device_agent_schemas_1.generateTxId)();
             const projectId = generateRandomProjectId();
-            txnMgr.addTransaction(txId, projectId);
+            await txnMgr.runTransactionStep({
+                func: func_incomplete,
+                projectId,
+                txId,
+                start: true
+            });
             projectTxIdList.push({ projectId, txId });
         }
         projectTxIdList.forEach(({ txId, projectId }) => {
             expect(txnMgr.getProjectFromTransaction(txId)).toEqual(projectId);
             expect(txnMgr.getTransactionFromProject(projectId)).toEqual(txId);
+            expect(txnMgr.isOngoingTransaction(txId)).toBe(true);
+            expect(txnMgr.isOngoingTransactionForProjectID(projectId)).toBe(true);
+            expect(txnMgr.isAnyOngoingTransaction()).toBe(true);
         });
     });
-    test('Attempt to add existing transaction to a project, results in failure', async () => {
+    test('Attempt to start an ongoing transaction, results in failure', async () => {
         const txId = (0, device_agent_schemas_1.generateTxId)();
         const projectId = generateRandomProjectId();
-        txnMgr.addTransaction(txId, projectId);
-        expect(() => txnMgr.addTransaction(txId, projectId)).toThrow(`Transaction ID ${txId} already exists for this projectId ${projectId}!`);
+        await txnMgr.runTransactionStep({
+            func: func_incomplete,
+            projectId,
+            txId,
+            start: true,
+            stepName: 'step1'
+        });
+        try {
+            await txnMgr.runTransactionStep({
+                func: func_incomplete,
+                projectId,
+                txId,
+                start: true,
+                stepName: 'step2'
+            });
+            throw new Error('Expected starting transaction to fail!');
+        }
+        catch (e) {
+            console.log(e);
+            expect(e.code).toBe(txnMgr.Errors.TRANSACTION_ONGOING);
+        }
         expect(txnMgr.getTransactionFromProject(projectId)).toEqual(txId);
         expect(txnMgr.getProjectFromTransaction(txId)).toEqual(projectId);
     });
-    test('Attempt to add a transaction to a project with an ongoing transaction, results in failure', async () => {
+    test('Attempt to continue a transaction that is not ongoing', async () => {
+        const txId = (0, device_agent_schemas_1.generateTxId)();
+        const projectId = generateRandomProjectId();
+        try {
+            await txnMgr.runTransactionStep({
+                func: func_incomplete,
+                projectId,
+                txId,
+                start: false,
+                stepName: 'step1'
+            });
+            throw new Error('Expected continue transaction to fail!');
+        }
+        catch (e) {
+            console.log(e);
+            expect(e.code).toBe(txnMgr.Errors.TRANSACTION_NOT_ONGOING);
+        }
+        expect(txnMgr.isOngoingTransaction(txId)).toBe(false);
+        expect(txnMgr.isOngoingTransactionForProjectID(projectId)).toBe(false);
+        expect(txnMgr.isAnyOngoingTransaction()).toBe(false);
+    });
+    test('Attempt to start a transaction for a project with an ongoing transaction, results in failure', async () => {
         const txId = (0, device_agent_schemas_1.generateTxId)();
         const txId2 = (0, device_agent_schemas_1.generateTxId)();
         const projectId = generateRandomProjectId();
-        txnMgr.addTransaction(txId, projectId);
-        expect(() => txnMgr.addTransaction(txId2, projectId)).toThrow(`This Project ID ${projectId} already has an ongoing transaction!`);
+        await txnMgr.runTransactionStep({
+            func: func_incomplete,
+            projectId,
+            txId,
+            start: true,
+            stepName: 'step1'
+        });
+        try {
+            await txnMgr.runTransactionStep({
+                func: func_incomplete,
+                projectId,
+                txId: txId2,
+                start: true,
+                stepName: 'step2'
+            });
+            throw new Error('Expected start transaction to fail!');
+        }
+        catch (e) {
+            console.log(e);
+            expect(e.code).toBe(txnMgr.Errors.PROJECT_ONGOING);
+        }
         expect(txnMgr.getTransactionFromProject(projectId)).toEqual(txId);
         expect(txnMgr.getProjectFromTransaction(txId)).toEqual(projectId);
         expect(txnMgr.getProjectFromTransaction(txId2)).toBeUndefined();
     });
-    test('Test remove transaction from queue', async () => {
+    test('Handle error in step function', async () => {
         const txId = (0, device_agent_schemas_1.generateTxId)();
         const projectId = generateRandomProjectId();
-        txnMgr.addTransaction(txId, projectId);
+        await txnMgr.runTransactionStep({
+            func: jest.fn().mockImplementation(() => {
+                throw new Error('Test error!');
+            }),
+            projectId,
+            txId,
+            start: true,
+            stepName: 'step1'
+        });
+        expect(txnMgr.isOngoingTransaction(txId)).toBe(false);
+        expect(txnMgr.isOngoingTransactionForProjectID(projectId)).toBe(false);
+        expect(txnMgr.isAnyOngoingTransaction()).toBe(false);
+        const msg = JSON.parse(mockClient.publish.mock.calls[0][1]);
+        expect(msg.payload.status).toBe(device_agent_schemas_1.keyMirrors.statusResponse.failure);
+    });
+    test('Complete ongoing transaction', async () => {
+        const txId = (0, device_agent_schemas_1.generateTxId)();
+        const projectId = generateRandomProjectId();
+        await txnMgr.runTransactionStep({
+            func: func_incomplete,
+            projectId,
+            txId,
+            start: true,
+            stepName: 'step1'
+        });
         txnMgr.completeTransaction(txId);
         expect(txnMgr.getTransactionFromProject(projectId)).toBeUndefined();
         expect(txnMgr.getProjectFromTransaction(txId)).toBeUndefined();
+        expect(txnMgr.isOngoingTransactionForProjectID(projectId)).toBe(false);
+        expect(txnMgr.isAnyOngoingTransaction()).toBe(false);
+    });
+    test('Test remove non-existing transaction from queue', async () => {
+        const txId = (0, device_agent_schemas_1.generateTxId)();
+        try {
+            txnMgr.completeTransaction(txId);
+            throw new Error('Expected completTransaction to fail!');
+        }
+        catch (e) {
+            console.log(e);
+            expect(e.code).toBe(txnMgr.Errors.TRANSACTION_NOT_ONGOING);
+        }
+        expect(txnMgr.getProjectFromTransaction(txId)).toBeUndefined();
     });
 });
 //# sourceMappingURL=transaction-manager.test.js.map

package/lib/cloud-connection/transaction-manager.test.js.map

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

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

@@ -0,0 +1,10 @@
+export declare const getAnalyticsCfgCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, {
+    project: import("@alwaysai/alwayscli").CliInput<string, true>;
+}, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
+export declare const setAnalyticsCfgCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, {
+    project: import("@alwaysai/alwayscli").CliInput<string, true>;
+    'enable-cloud-publish': import("@alwaysai/alwayscli").CliInput<boolean, false>;
+    'enable-file-publish': import("@alwaysai/alwayscli").CliInput<boolean, false>;
+    'file-size-bytes': import("@alwaysai/alwayscli").CliInput<number | undefined, boolean>;
+}, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
+//# sourceMappingURL=analytics.d.ts.map

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

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

package/lib/subcommands/app/analytics.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setAnalyticsCfgCliLeaf = exports.getAnalyticsCfgCliLeaf = void 0;
+const alwayscli_1 = require("@alwaysai/alwayscli");
+const application_control_1 = require("../../application-control");
+const device_agent_cloud_connection_1 = require("../../cloud-connection/device-agent-cloud-connection");
+const sleep_1 = require("../../util/sleep");
+const logger_1 = require("../../util/logger");
+const lodash_1 = require("lodash");
+exports.getAnalyticsCfgCliLeaf = (0, alwayscli_1.CliLeaf)({
+    name: 'get-analytics-cfg',
+    description: 'Get analytics configuration for an application',
+    namedInputs: {
+        project: (0, alwayscli_1.CliStringInput)({
+            description: 'Project Id',
+            required: true
+        })
+    },
+    async action(_, opts) {
+        const { project } = opts;
+        const appCfg = await (0, application_control_1.readAppCfgFile)({ projectId: project });
+        if (appCfg.analytics !== undefined) {
+            console.log(JSON.stringify(appCfg.analytics, null, 2));
+        }
+        else {
+            console.log('No analytics configuration for app!');
+        }
+    }
+});
+exports.setAnalyticsCfgCliLeaf = (0, alwayscli_1.CliLeaf)({
+    name: 'set-analytics-cfg',
+    description: 'Set analytics configuration for an application. Note that this resets the config so all desired options must be set',
+    namedInputs: {
+        project: (0, alwayscli_1.CliStringInput)({
+            description: 'Project Id',
+            required: true
+        }),
+        'enable-cloud-publish': (0, alwayscli_1.CliFlagInput)({
+            description: 'Enable publishing analytics to cloud'
+        }),
+        'enable-file-publish': (0, alwayscli_1.CliFlagInput)({
+            description: 'Enable publishing analytics to file'
+        }),
+        'file-size-bytes': (0, alwayscli_1.CliNumberInput)({
+            description: 'Set the max file size in bytes for analytics file writing',
+            required: false
+        })
+    },
+    async action(_, { project, 'enable-cloud-publish': enableCLoudPublish, 'enable-file-publish': enableFilePublish, 'file-size-bytes': fileSizeBytes }) {
+        const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
+        await deviceAgent.setupHandlers();
+        const newAppCfg = {
+            analytics: {
+                enable_cloud_publish: enableCLoudPublish,
+                enable_file_publish: enableFilePublish,
+                file_size_bytes: fileSizeBytes
+            }
+        };
+        const existingAppCfg = await (0, application_control_1.readAppCfgFile)({ projectId: project });
+        const appCfg = (0, lodash_1.assign)(existingAppCfg, (0, lodash_1.merge)(existingAppCfg, newAppCfg));
+        // Update the shadow as a client
+        const topic = deviceAgent.getShadowTopics().projects.update;
+        const packet = {
+            state: {
+                desired: {
+                    [project]: {
+                        appConfig: JSON.stringify(appCfg) // Pack app config as string as dictated by schema
+                    }
+                }
+            },
+            clientToken: 'client'
+        };
+        logger_1.logger.debug(`Publishing message:\n${JSON.stringify({ topic, packet }, null, 2)}`);
+        deviceAgent.publisher.publish(topic, JSON.stringify(packet));
+        // Sleep for extra time to ensure time for shadow response
+        await (0, sleep_1.default)(10000);
+        while (deviceAgent.isCmdInProgress(project)) {
+            await (0, sleep_1.default)(1000);
+        }
+        await deviceAgent.stop();
+    }
+});
+//# sourceMappingURL=analytics.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/index.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,YAAY,mDAwBvB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/index.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,YAAY,mDAyBvB,CAAC"}

package/lib/subcommands/app/index.js

@@ -7,6 +7,7 @@ const models_1 = require("./models");
 const status_1 = require("./status");
 const version_1 = require("./version");
 const shadow_1 = require("./shadow");
+const analytics_1 = require("./analytics");
 exports.appCliBranch = (0, alwayscli_1.CliBranch)({
     name: 'app',
     description: 'Manage alwaysAI applications',
@@ -24,10 +25,11 @@ exports.appCliBranch = (0, alwayscli_1.CliBranch)({
         models_1.addModelCliLeaf,
         models_1.removeModelCliLeaf,
         models_1.replaceModelsCliLeaf,
-        models_1.installModelCliLeaf,
         models_1.updateModelsCliLeaf,
         env_vars_1.getAllEnvsCliLeaf,
         env_vars_1.setEnvCliLeaf,
+        analytics_1.getAnalyticsCfgCliLeaf,
+        analytics_1.setAnalyticsCfgCliLeaf,
         shadow_1.getShadowCliLeaf,
         shadow_1.updateShadowCliLeaf
     ]

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/subcommands/app/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,yCAA8D;AAC9D,qCAOkB;AAClB,qCAMkB;AAClB,uCAKmB;AACnB,qCAAiE;AAEpD,QAAA,YAAY,GAAG,IAAA,qBAAS,EAAC;IACpC,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,8BAA8B;IAC3C,WAAW,EAAE;QACX,yBAAe;QACf,2BAAiB;QACjB,4BAAmB;QACnB,wBAAe;QACf,uBAAc;QACd,0BAAiB;QACjB,0BAAiB;QACjB,6BAAmB;QACnB,4BAAkB;QAClB,6BAAoB;QACpB,wBAAe;QACf,2BAAkB;QAClB,6BAAoB;QACpB,4BAAmB;QACnB,4BAAmB;QACnB,4BAAiB;QACjB,wBAAa;QACb,yBAAgB;QAChB,4BAAmB;KACpB;CACF,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/subcommands/app/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,yCAA8D;AAC9D,qCAMkB;AAClB,qCAMkB;AAClB,uCAKmB;AACnB,qCAAiE;AACjE,2CAA6E;AAEhE,QAAA,YAAY,GAAG,IAAA,qBAAS,EAAC;IACpC,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,8BAA8B;IAC3C,WAAW,EAAE;QACX,yBAAe;QACf,2BAAiB;QACjB,4BAAmB;QACnB,wBAAe;QACf,uBAAc;QACd,0BAAiB;QACjB,0BAAiB;QACjB,6BAAmB;QACnB,4BAAkB;QAClB,6BAAoB;QACpB,wBAAe;QACf,2BAAkB;QAClB,6BAAoB;QACpB,4BAAmB;QACnB,4BAAiB;QACjB,wBAAa;QACb,kCAAsB;QACtB,kCAAsB;QACtB,yBAAgB;QAChB,4BAAmB;KACpB;CACF,CAAC,CAAC"}

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

@@ -6,11 +6,6 @@ export declare const addModelCliLeaf: import("@alwaysai/alwayscli/lib/types").Cl
     model: import("@alwaysai/alwayscli").CliInput<string, true>;
     version: import("@alwaysai/alwayscli").CliInput<string, true>;
 }, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
-export declare const installModelCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, {
-    project: import("@alwaysai/alwayscli").CliInput<string, true>;
-    modelName: import("@alwaysai/alwayscli").CliInput<string, true>;
-    modelVersion: import("@alwaysai/alwayscli").CliInput<number, true>;
-}, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
 export declare const removeModelCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, {
     project: import("@alwaysai/alwayscli").CliInput<string, true>;
     model: import("@alwaysai/alwayscli").CliInput<string, true>;

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

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/models.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,oBAAoB;;4DAc/B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;4DA4C1B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;4DAyC9B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;4DAkB7B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;4DAqB/B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DAiB9B,CAAC"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/models.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,oBAAoB;;4DAc/B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;4DAkD1B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;4DAkB7B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;4DAqB/B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DAiB9B,CAAC"}