@alwaysai/device-agent 2.0.1 → 2.0.2

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

@@ -1,23 +1,11 @@
-import {
-  EnvVars,
-  ToClientStatusResponseMessage,
-  generateTxId,
-  keyMirrors,
-  buildToClientStatusResponseMessage
-} from '@alwaysai/device-agent-schemas';
+import { EnvVars, generateTxId } from '@alwaysai/device-agent-schemas';
 import { TransactionManager } from './transaction-manager';
 import { v4 as uuidv4 } from 'uuid';
-import { Publisher } from './publisher';
 import { LiveUpdatesHandler } from './live-updates-handler';
 import { AppConfigUpdate, ShadowUpdate } from './shadow-handler';
 import { AppContent } from './device-agent-message-handler';
 import { AppConfig } from '@alwaysai/app-configuration-schemas';
 
-const mockClient = {
-  publish: jest.fn()
-};
-const clientId = 'test-client';
-
 const mockLiveUpdatesHandler = {
   enable: jest.fn(),
   disable: jest.fn()
@@ -25,7 +13,6 @@ const mockLiveUpdatesHandler = {
 
 describe('Test Transaction Manager', () => {
   let txnMgr: TransactionManager;
-  let publisher: Publisher;
   const func_complete: () => Promise<boolean> = jest
     .fn()
     .mockResolvedValue(true);
@@ -34,8 +21,7 @@ describe('Test Transaction Manager', () => {
     .mockResolvedValue(false);
 
   beforeEach(() => {
-    publisher = new Publisher(mockClient, clientId);
-    txnMgr = new TransactionManager(publisher, mockLiveUpdatesHandler);
+    txnMgr = new TransactionManager(mockLiveUpdatesHandler);
     jest.clearAllMocks();
   });
 
@@ -63,29 +49,22 @@ describe('Test Transaction Manager', () => {
     const txId = generateTxId();
     const projectId = generateRandomProjectId();
 
-    const successFn = (txId: string) => {
-      const msg = buildToClientStatusResponseMessage(
-        clientId,
-        { status: keyMirrors.statusResponse.success },
-        txId
-      );
-      publisher.publishToClient(msg);
-    };
+    const successFn = jest.fn();
+    const errorFn = jest.fn();
 
     await txnMgr.runTransactionStep({
       func: func_complete,
       projectId,
       txId,
       start: true,
-      successFn
+      successFn,
+      errorFn
     });
     expect(txnMgr.isOngoingTransaction(txId)).toBe(false);
     expect(txnMgr.isOngoingTransactionForProjectID(projectId)).toBe(false);
     expect(txnMgr.isAnyOngoingTransaction()).toBe(false);
-    const msg: ToClientStatusResponseMessage = JSON.parse(
-      mockClient.publish.mock.calls[0][1]
-    );
-    expect(msg.payload.status).toBe(keyMirrors.statusResponse.success);
+    expect(successFn).toBeCalledTimes(1);
+    expect(errorFn).toBeCalledTimes(0);
   });
 
   test('Start a new transaction and complete in second step', async () => {
@@ -214,17 +193,8 @@ describe('Test Transaction Manager', () => {
     const txId = generateTxId();
     const projectId = generateRandomProjectId();
 
-    const errorFn = (txId: string, errorMsg: string) => {
-      const msg = buildToClientStatusResponseMessage(
-        clientId,
-        {
-          status: keyMirrors.statusResponse.failure,
-          message: errorMsg
-        },
-        txId
-      );
-      publisher.publishToClient(msg);
-    };
+    const successFn = jest.fn();
+    const errorFn = jest.fn();
 
     await txnMgr.runTransactionStep({
       func: jest.fn().mockImplementation(() => {
@@ -234,15 +204,14 @@ describe('Test Transaction Manager', () => {
       txId,
       start: true,
       stepName: 'step1',
+      successFn,
       errorFn
     });
     expect(txnMgr.isOngoingTransaction(txId)).toBe(false);
     expect(txnMgr.isOngoingTransactionForProjectID(projectId)).toBe(false);
     expect(txnMgr.isAnyOngoingTransaction()).toBe(false);
-    const msg: ToClientStatusResponseMessage = JSON.parse(
-      mockClient.publish.mock.calls[0][1]
-    );
-    expect(msg.payload.status).toBe(keyMirrors.statusResponse.failure);
+    expect(successFn).toBeCalledTimes(0);
+    expect(errorFn).toBeCalledTimes(1);
   });
 
   test('Complete ongoing transaction', async () => {

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

@@ -4,7 +4,6 @@ import {
   keyMirrors
 } from '@alwaysai/device-agent-schemas';
 import { LiveUpdatesHandler } from './live-updates-handler';
-import { Publisher } from './publisher';
 import { logger } from '../util/logger';
 import { keyMirror, stringifyError } from 'alwaysai/lib/util';
 import { CodedError } from '@carnesen/coded-error';
@@ -30,7 +29,6 @@ export class TransactionManager {
   private detailsByTx: Record<string, TransactionDetails> = {};
   private detailsByProject: Record<string, TransactionDetails> = {};
   private readonly liveUpdatesHandler: LiveUpdatesHandler;
-  private publisher: Publisher;
   private async startTransaction(
     txId: string,
     projectId: string,
@@ -96,10 +94,9 @@ export class TransactionManager {
     logger.info(`Updated transaction:\n${JSON.stringify(txDetails, null, 2)}`);
   }
 
-  constructor(publisher: Publisher, liveUpdatesHandler: LiveUpdatesHandler) {
+  constructor(liveUpdatesHandler: LiveUpdatesHandler) {
     this.detailsByTx = {};
     this.detailsByProject = {};
-    this.publisher = publisher;
     this.liveUpdatesHandler = liveUpdatesHandler;
   }
 

package/src/environment.ts

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

package/src/jobs/job-handler.ts

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

package/src/subcommands/app/analytics.ts

@@ -80,6 +80,7 @@ export const setAnalyticsCfgCliLeaf = CliLeaf({
         appConfig: JSON.stringify(appCfg) // Pack app config as string as dictated by schema
       }
     };
+    await deviceAgent.waitForConnection();
     deviceAgent.publisher.publish(
       getShadowTopic(deviceAgent.getClientId(), 'projects', 'update'),
       JSON.stringify(
@@ -92,9 +93,7 @@ export const setAnalyticsCfgCliLeaf = CliLeaf({
     // Sleep for extra time to ensure time for shadow response
     await sleep(10000);
 
-    while (deviceAgent.isCmdInProgress(project)) {
-      await sleep(1000);
-    }
+    await deviceAgent.waitForCmd(project);
     await deviceAgent.stop();
   }
 });

package/src/subcommands/app/env-vars.ts

@@ -66,6 +66,7 @@ export const setEnvCliLeaf = CliLeaf({
         envVars: JSON.stringify(envVars)
       }
     };
+    await deviceAgent.waitForConnection();
     deviceAgent.publisher.publish(
       getShadowTopic(deviceAgent.getClientId(), 'projects', 'update'),
       JSON.stringify(
@@ -78,9 +79,7 @@ export const setEnvCliLeaf = CliLeaf({
     // Sleep for extra time to ensure time for shadow response
     await sleep(10000);
 
-    while (deviceAgent.isCmdInProgress(projectId)) {
-      await sleep(1000);
-    }
+    await deviceAgent.waitForCmd(projectId);
     await deviceAgent.stop();
   }
 });
@@ -128,6 +127,7 @@ export const rmEnvCliLeaf = CliLeaf({
         envVars: JSON.stringify(newEnvs)
       }
     };
+    await deviceAgent.waitForConnection();
     deviceAgent.publisher.publish(
       getShadowTopic(deviceAgent.getClientId(), 'projects', 'update'),
       JSON.stringify(
@@ -140,9 +140,7 @@ export const rmEnvCliLeaf = CliLeaf({
     // Sleep for extra time to ensure time for shadow response
     await sleep(10000);
 
-    while (deviceAgent.isCmdInProgress(projectId)) {
-      await sleep(1000);
-    }
+    await deviceAgent.waitForCmd(projectId);
     await deviceAgent.stop();
   }
 });

package/src/subcommands/app/models.ts

@@ -54,6 +54,7 @@ export const addModelCliLeaf = CliLeaf({
         appConfig: JSON.stringify(newAppCfg)
       }
     };
+    await deviceAgent.waitForConnection();
     deviceAgent.publisher.publish(
       getShadowTopic(deviceAgent.getClientId(), 'projects', 'update'),
       JSON.stringify(
@@ -66,9 +67,7 @@ export const addModelCliLeaf = CliLeaf({
     // Sleep for extra time to ensure time for shadow response
     await sleep(10000);
 
-    while (deviceAgent.isCmdInProgress(projectId)) {
-      await sleep(1000);
-    }
+    await deviceAgent.waitForCmd(projectId);
     await deviceAgent.stop();
   }
 });

package/src/subcommands/app/shadow.ts

@@ -14,13 +14,12 @@ export const getShadowCliLeaf = CliLeaf({
   async action(_, opts) {
     const { project } = opts;
     const deviceAgent = new DeviceAgentCloudConnection();
+    await deviceAgent.waitForConnection();
     deviceAgent.shadowHandler.getProjectShadowUpdates();
 
     // 5 seconds should cover the response wait time
     await sleep(5000);
-    while (deviceAgent.isCmdInProgress(project)) {
-      await sleep(1000);
-    }
+    await deviceAgent.waitForCmd(project);
     await deviceAgent.stop();
   }
 });
@@ -37,13 +36,12 @@ export const updateShadowCliLeaf = CliLeaf({
   async action(_, opts) {
     const { project } = opts;
     const deviceAgent = new DeviceAgentCloudConnection();
+    await deviceAgent.waitForConnection();
     await deviceAgent.shadowHandler.updateProjectShadow(project);
 
     // 5 seconds should cover the response wait time
     await sleep(5000);
-    while (deviceAgent.isCmdInProgress(project)) {
-      await sleep(1000);
-    }
+    await deviceAgent.waitForCmd(project);
     await deviceAgent.stop();
   }
 });

package/src/subcommands/app/version.ts

@@ -10,6 +10,7 @@ import { DeviceAgentCloudConnection } from '../../cloud-connection/device-agent-
 import { AgentConfigFile } from '../../infrastructure/agent-config';
 import sleep from '../../util/sleep';
 import { logger } from '../../util/logger';
+import { device } from 'alwaysai/lib/components';
 
 export const listAppsCliLeaf = CliLeaf({
   name: 'list',
@@ -81,10 +82,9 @@ export const installAppCliLeaf = CliLeaf({
         envVars
       }
     };
-    await deviceAgent.handleMessage(topic, message);
-    while (deviceAgent.isCmdInProgress(project)) {
-      await sleep(1000);
-    }
+    await deviceAgent.waitForConnection();
+    await deviceAgent.sendCliCmd(topic, message);
+    await deviceAgent.waitForCmd(project);
     await deviceAgent.stop();
   }
 });
@@ -112,10 +112,9 @@ export const uninstallAppCliLeaf = CliLeaf({
         projectId: project
       }
     };
-    await deviceAgent.handleMessage(topic, message);
-    while (deviceAgent.isCmdInProgress(project)) {
-      await sleep(1000);
-    }
+    await deviceAgent.waitForConnection();
+    await deviceAgent.sendCliCmd(topic, message);
+    await deviceAgent.waitForCmd(project);
     await deviceAgent.stop();
   }
 });