@alwaysai/device-agent 2.0.1 → 2.0.2

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

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/version.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,eAAe,yKAQ1B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;4DAkE5B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DA6B9B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;4DAc7B,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/version.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,eAAe,yKAQ1B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;4DAiE5B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DA4B9B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;4DAc7B,CAAC"}

package/lib/subcommands/app/version.js

@@ -6,7 +6,6 @@ const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
 const application_control_1 = require("../../application-control");
 const device_agent_cloud_connection_1 = require("../../cloud-connection/device-agent-cloud-connection");
 const agent_config_1 = require("../../infrastructure/agent-config");
-const sleep_1 = require("../../util/sleep");
 const logger_1 = require("../../util/logger");
 exports.listAppsCliLeaf = (0, alwayscli_1.CliLeaf)({
     name: 'list',
@@ -69,10 +68,9 @@ exports.installAppCliLeaf = (0, alwayscli_1.CliLeaf)({
                 envVars
             }
         };
-        await deviceAgent.handleMessage(topic, message);
-        while (deviceAgent.isCmdInProgress(project)) {
-            await (0, sleep_1.default)(1000);
-        }
+        await deviceAgent.waitForConnection();
+        await deviceAgent.sendCliCmd(topic, message);
+        await deviceAgent.waitForCmd(project);
         await deviceAgent.stop();
     }
 });
@@ -99,10 +97,9 @@ exports.uninstallAppCliLeaf = (0, alwayscli_1.CliLeaf)({
                 projectId: project
             }
         };
-        await deviceAgent.handleMessage(topic, message);
-        while (deviceAgent.isCmdInProgress(project)) {
-            await (0, sleep_1.default)(1000);
-        }
+        await deviceAgent.waitForConnection();
+        await deviceAgent.sendCliCmd(topic, message);
+        await deviceAgent.waitForCmd(project);
         await deviceAgent.stop();
     }
 });

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alwaysai/device-agent",
   "description": "The alwaysAI Device Agent",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "publishConfig": {

package/readme.md

@@ -53,14 +53,23 @@ change.
 * Passwordless `sudo` for `/sbin/shutdown` for device restart functionality
 
 To enable passwordless `sudo` for `npm` and `sbin/shutdown` for the current
-user, run `sudo visudo` and add the following lines to the end of the file:
+user, run `sudo visudo` and add the following lines, where `<username>` is replaced with your username on the device:
+
+> **Note**: It is critical that these lines be added to the **end of the file**.
 
 ```bash
-<username> <hostname> = (root) NOPASSWD: /usr/bin/npm
-<username> <hostname> = (root) NOPASSWD: /sbin/shutdown
+<username> ALL = NOPASSWD: /usr/bin/pm2
+<username> ALL = NOPASSWD: /usr/lib/node_modules/pm2/bin/pm2
+<username> ALL = NOPASSWD: /usr/bin/npm
+<username> ALL = NOPASSWD: /sbin/shutdown
 ```
 
-On a linux system `username` can be obtained by typing `whoami` into the terminal. Similarly, if you don't know your `hostname` you can simply type `hostname`.
+On a linux system, the username can be obtained by typing `whoami` into the terminal. For example:
+
+```bash
+$ whoami
+alwaysAI
+```
 
 ## Provision Device
 
@@ -429,6 +438,7 @@ $ pm2 delete 0
 $ pm2 flush
 $ pm2 unstartup
 ```
+
 ### Remove the device configuration
 
 Open a new terminal and run `aai-agent device clean`.
@@ -443,3 +453,5 @@ running `aai-agent`. You should see a response similar to
 
 Go to the [Devices](https://console.alwaysai.co/dashboard/devices) tab, find the
 device in question, and remove the device using the trashcan icon.
+
+

package/src/application-control/install.ts

@@ -16,7 +16,8 @@ import {
   appCleanDocker,
   getPythonVenvPaths,
   createPythonVenv,
-  installPythonReqs
+  installPythonReqs,
+  TargetHardware
 } from 'alwaysai/lib/core/app';
 import { DOCKER_IMAGE_ID_INITIAL_VALUE } from 'alwaysai/lib/constants';
 import { runInDir } from '../util/run-in-dir';
@@ -30,6 +31,7 @@ import {
 } from '../local-connection/constants';
 import { DOCKERFILE, PYTHON_REQUIREMENTS_FILE_NAME } from 'alwaysai/lib/paths';
 import { downloadToFile } from '../util/file';
+import { ALWAYSAI_TARGET_HW_OVERRIDE, parseTargetHW } from '../environment';
 import { setEnvInternal } from './environment-variables';
 import { AppConfig } from '@alwaysai/app-configuration-schemas';
 
@@ -234,15 +236,18 @@ async function checkValidProjectFiles({ appDir }) {
   if (!AppJsonFile(appDir).readIfExists()) {
     throw new Error('App JSON file does not exist!');
   }
-
   // write target json
   if (!fs.existsSync(path.join(appDir, DOCKERFILE))) {
     throw new Error('No Dockerfile found for application!');
   }
+  const targetHw: TargetHardware =
+    parseTargetHW(ALWAYSAI_TARGET_HW_OVERRIDE) ??
+    (await getTargetHardwareType({}));
+  logger.debug(`Target Hardware selected to: ${targetHw}`);
   TargetJsonFile(appDir).write({
     targetProtocol: 'docker:',
     dockerImageId: DOCKER_IMAGE_ID_INITIAL_VALUE,
-    targetHardware: await getTargetHardwareType({})
+    targetHardware: targetHw
   });
 }
 

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

@@ -16,40 +16,32 @@ export class ConnectionManager extends MessageDispatcher<any> {
   private clientId: string;
   private host: string;
   private port: number;
-  private device = awsIot.device;
+  private device: awsIot.device;
   private subscribedTopics: Set<string> = new Set();
+  private connected = false;
 
   constructor(clientId: string, host: string, port: number) {
     super();
     this.clientId = clientId;
     this.host = host;
     this.port = port;
+    this.device = awsIot.device({
+      keyPath: DEVICE_PRIVATE_KEY_FILE_PATH,
+      certPath: DEVICE_CERTIFICATE_FILE_PATH,
+      caPath: AWS_ROOT_CERTIFICATE_FILE_PATH,
+      clientId: this.clientId,
+      host: this.host,
+      port: this.port,
+      keepalive: 10 // time before re-connect attempt on dropped connection, default is 400 seconds
+    });
   }
 
   public getIoTDevice() {
     return this.device;
   }
 
-  public setupConnection(): void {
-    this.connect();
-  }
-
-  public connect(): void {
-    try {
-      this.device = awsIot.device({
-        keyPath: DEVICE_PRIVATE_KEY_FILE_PATH,
-        certPath: DEVICE_CERTIFICATE_FILE_PATH,
-        caPath: AWS_ROOT_CERTIFICATE_FILE_PATH,
-        clientId: this.clientId,
-        host: this.host,
-        port: this.port,
-        keepalive: 10 // time before re-connect attempt on dropped connection, default is 400 seconds
-      });
-      this.setupHandlers();
-    } catch (error) {
-      logger.error(`Error connecting to cloud!\n${stringifyError(error)}`);
-      this.handleReconnection();
-    }
+  public isConnected(): boolean {
+    return this.connected;
   }
 
   public registerHandler(topic: string, handler: MessageHandler) {
@@ -58,14 +50,12 @@ export class ConnectionManager extends MessageDispatcher<any> {
   }
 
   public disconnect(): void {
-    if (this.device) {
-      this.device.end();
-      logger.debug(`Device Agent has been disconnected from the AWS IoT Core.`);
-    }
+    this.device.end();
+    logger.debug(`Device Agent has been disconnected from the AWS IoT Core.`);
   }
 
   public subscribe(topic: string): void {
-    if (this.device && !this.subscribedTopics.has(topic)) {
+    if (!this.subscribedTopics.has(topic)) {
       this.device.subscribe(topic);
       this.subscribedTopics.add(topic);
       logger.debug(`Subscribed to topic: ${topic}`);
@@ -73,29 +63,23 @@ export class ConnectionManager extends MessageDispatcher<any> {
   }
 
   public unsubscribe(topic: string): void {
-    if (this.device && this.subscribedTopics.has(topic)) {
+    if (this.subscribedTopics.has(topic)) {
       this.device.unsubscribe(topic);
       this.subscribedTopics.delete(topic);
       logger.debug(`Unsubscribed from topic: ${topic}`);
     }
   }
 
-  public isConnected(): boolean {
-    return this.device ? this.device.connected : false;
-  }
-
-  private handleReconnection() {
-    logger.debug(`Attempting to reconnect to AWS IoT Core...`);
-    setTimeout(() => this.connect(), 5000); // try in 5 seconds.
-  }
-
-  private setupHandlers(): void {
+  public initConnectionHandlers(connectCallback: () => void): void {
     this.device.on('connect', (connack: any) => {
       logger.info('Device Agent has connected to the cloud.');
+      this.connected = true;
+      connectCallback();
     });
 
     this.device.on('disconnect', () => {
       logger.warn('Device Agent has been disconnected from the cloud');
+      this.connected = false;
     });
 
     this.device.on('reconnect', () => {
@@ -108,15 +92,18 @@ export class ConnectionManager extends MessageDispatcher<any> {
       logger.error(
         `Error connecting to the AWS IoT Core!\n${stringifyError(e)}`
       );
+      this.connected = false;
     });
 
     this.device.on('close', () => {
       logger.warn('Device Agent AWS IoT Core connection closed.');
+      this.connected = false;
     });
 
     this.device.on('offline', () => {
       logger.warn(`Device Agent is offline ${new Date().toLocaleString()}`);
       void this.logConnectionInfo();
+      this.connected = false;
     });
 
     this.device.on('message', async (topic: string, payload: string) => {

package/src/cloud-connection/device-agent-cloud-connection.ts

@@ -41,109 +41,100 @@ export class DeviceAgentCloudConnection {
     SecureTunnelHandlerSingleton.getInstance();
 
   constructor() {
-    this.liveUpdatesHandler = new LiveUpdatesHandler();
-
     // Initialize & setup the connection
     this.connectionManager = new ConnectionManager(
       this.clientId,
       this.host,
       this.port
     );
-    this.connectionManager.setupConnection();
 
-    // Initialize the Publisher, ShadowHandler & Transaction Manager
-    this.publisher = new Publisher(
-      this.connectionManager.getIoTDevice(),
-      this.clientId
-    );
+    this.publisher = new Publisher(this.connectionManager, this.clientId);
     this.shadowHandler = new ShadowHandler(this.clientId, this.publisher);
-
-    this.transactionManager = new TransactionManager(
-      this.publisher,
-      this.liveUpdatesHandler
-    );
-
-    // Construct a HandlerContext used by all the message handlers
-    const handlerContext: HandlerContext = {
-      clientId: this.clientId,
-      txnMgr: this.transactionManager,
-      publisher: this.publisher,
-      shadowHandler: this.shadowHandler,
-      liveUpdatesHandler: this.liveUpdatesHandler,
-      secureTunnelHandler: this.secureTunnelHandler
-    };
-
-    // Instantiate & register message handlers for Project Shadow topics
-    const projectShadowMessageHandler = new ProjectShadowMessageHandler(
-      handlerContext
-    );
-    this.shadowHandler.projectShadowTopics.forEach((topic) => {
+    this.liveUpdatesHandler = new LiveUpdatesHandler();
+    this.transactionManager = new TransactionManager(this.liveUpdatesHandler);
+
+    this.connectionManager.initConnectionHandlers(() => {
+      // Construct a HandlerContext used by all the message handlers
+      const handlerContext: HandlerContext = {
+        clientId: this.clientId,
+        txnMgr: this.transactionManager,
+        publisher: this.publisher,
+        shadowHandler: this.shadowHandler,
+        liveUpdatesHandler: this.liveUpdatesHandler,
+        secureTunnelHandler: this.secureTunnelHandler
+      };
+
+      // Instantiate & register message handlers for Project Shadow topics
+      const projectShadowMessageHandler = new ProjectShadowMessageHandler(
+        handlerContext
+      );
+      this.shadowHandler.projectShadowTopics.forEach((topic) => {
+        this.connectionManager.registerHandler(
+          topic,
+          projectShadowMessageHandler
+        );
+      });
+
+      // Instantiate & register message handlers for to-device and secureTunnel topics
       this.connectionManager.registerHandler(
-        topic,
-        projectShadowMessageHandler
+        this.toDeviceTopic,
+        new DeviceAgentMessageHandler(
+          handlerContext,
+          (txId: string, errorMsg: string) => {
+            const msg = buildToClientStatusResponseMessage(
+              this.publisher.getClientId(),
+              {
+                status: keyMirrors.statusResponse.failure,
+                message: errorMsg
+              },
+              txId
+            );
+            this.publisher.publishToClient(msg);
+          },
+          (txId: string) => {
+            const msg = buildToClientStatusResponseMessage(
+              this.publisher.getClientId(),
+              { status: keyMirrors.statusResponse.success },
+              txId
+            );
+            this.publisher.publishToClient(msg);
+          }
+        )
       );
-    });
 
-    // Instantiate & register message handlers for to-device and secureTunnel topics
-    this.connectionManager.registerHandler(
-      this.toDeviceTopic,
-      new DeviceAgentMessageHandler(
-        handlerContext,
-        (txId: string, errorMsg: string) => {
-          const msg = buildToClientStatusResponseMessage(
-            this.publisher.getClientId(),
-            {
-              status: keyMirrors.statusResponse.failure,
-              message: errorMsg
-            },
-            txId
-          );
-          this.publisher.publishToClient(msg);
-        },
-        (txId: string) => {
-          const msg = buildToClientStatusResponseMessage(
-            this.publisher.getClientId(),
-            { status: keyMirrors.statusResponse.success },
-            txId
-          );
-          this.publisher.publishToClient(msg);
-        }
-      )
-    );
-
-    const secureTunnelMessageHandler = new SecureTunnelMessageHandler(
-      handlerContext
-    );
-    this.connectionManager.registerHandler(
-      secureTunnelMessageHandler.getNotifyTopic(),
-      secureTunnelMessageHandler
-    );
-
-    this.connectionManager.registerHandler(
-      this.shadowHandler.shadowTopics.secureTunnel.updateDelta,
-      secureTunnelMessageHandler
-    );
-    this.connectionManager.registerHandler(
-      this.shadowHandler.shadowTopics.secureTunnel.deleteAccepted,
-      secureTunnelMessageHandler
-    );
+      const secureTunnelMessageHandler = new SecureTunnelMessageHandler(
+        handlerContext
+      );
+      this.connectionManager.registerHandler(
+        secureTunnelMessageHandler.getNotifyTopic(),
+        secureTunnelMessageHandler
+      );
 
-    const jobHandler = new JobHandler(handlerContext);
+      this.connectionManager.registerHandler(
+        this.shadowHandler.shadowTopics.secureTunnel.updateDelta,
+        secureTunnelMessageHandler
+      );
+      this.connectionManager.registerHandler(
+        this.shadowHandler.shadowTopics.secureTunnel.deleteAccepted,
+        secureTunnelMessageHandler
+      );
 
-    const JOB_HANDLER_TOPICS = jobHandler.getJobTopic();
+      const jobHandler = new JobHandler(handlerContext);
+      const JOB_HANDLER_TOPICS = jobHandler.getJobTopics();
 
-    this.connectionManager.registerHandler(
-      JOB_HANDLER_TOPICS.NOTIFY_NEXT,
-      jobHandler
-    );
+      this.connectionManager.registerHandler(
+        JOB_HANDLER_TOPICS.NOTIFY_NEXT,
+        jobHandler
+      );
 
-    this.connectionManager.registerHandler(
-      JOB_HANDLER_TOPICS.START_NEXT_ACCEPTED,
-      jobHandler
-    );
+      this.connectionManager.registerHandler(
+        JOB_HANDLER_TOPICS.START_NEXT_ACCEPTED,
+        jobHandler
+      );
+      this.publisher.publish(JOB_HANDLER_TOPICS.START_NEXT, JSON.stringify({}));
 
-    // Initialize job
-    this.publisher.publish(JOB_HANDLER_TOPICS.START_NEXT, JSON.stringify({}));
+      void this.shadowHandler.initShadows();
+    });
   }
 
   /*=================================================================
@@ -164,7 +155,22 @@ export class DeviceAgentCloudConnection {
     await sleep(1000);
     this.connectionManager.disconnect();
   }
-  public async handleMessage(topic: string, message: any) {
+
+  // CLI methods
+
+  public async waitForConnection() {
+    while (!this.connectionManager.isConnected()) {
+      await sleep(1000);
+    }
+  }
+
+  public async waitForCmd(projectId: string) {
+    while (this.isCmdInProgress(projectId)) {
+      await sleep(1000);
+    }
+  }
+
+  public async sendCliCmd(topic: string, message: any) {
     this.connectionManager.dispatch(topic, message);
   }
 }

package/src/cloud-connection/publisher.ts

@@ -6,15 +6,16 @@ import {
   getToCloudTopic
 } from '@alwaysai/device-agent-schemas';
 import * as winston from 'winston';
+import { ConnectionManager } from './connection-manager';
 
 export class Publisher {
-  private client: any;
+  private connectionManager: ConnectionManager;
   private clientId: string;
   private readonly toClientTopic: string;
   private readonly toCloudTopic: string;
 
-  constructor(client: any, clientId: string) {
-    this.client = client;
+  constructor(connectionManager: ConnectionManager, clientId: string) {
+    this.connectionManager = connectionManager;
     this.clientId = clientId;
     this.toClientTopic = getToClientTopic(this.clientId);
     this.toCloudTopic = getToCloudTopic(this.clientId);
@@ -34,13 +35,15 @@ export class Publisher {
         2
       )}`
     );
-    this.client.publish(topic, payload, (err: any) => {
-      if (err) {
-        logger.error(
-          `Error publishing message: \nTopic: ${topic}\nMessage: ${payload}\nError: ${err}`
-        );
-      }
-    });
+    this.connectionManager
+      .getIoTDevice()
+      .publish(topic, payload, (err: any) => {
+        if (err) {
+          logger.error(
+            `Error publishing message: \nTopic: ${topic}\nMessage: ${payload}\nError: ${err}`
+          );
+        }
+      });
   }
 
   public publishToCloudWithAck(
@@ -48,19 +51,21 @@ export class Publisher {
     ackNackCallback: CallableFunction
   ) {
     const topic = this.toCloudTopic;
-    this.client.publish(topic, payload, { qos: 1 }, (err: any, resp: any) => {
-      if (err) {
-        logger.error(
-          `Error publishing message: \nTopic: ${topic}\nMessage: ${payload}\nError: ${err}`
-        );
-        ackNackCallback(false);
-      } else if (resp) {
-        logger.debug(
-          `Successfully published message: \nTopic: ${topic}\nMessage: ${payload}`
-        );
-        ackNackCallback(true);
-      }
-    });
+    this.connectionManager
+      .getIoTDevice()
+      .publish(topic, payload, { qos: 1 }, (err: any, resp: any) => {
+        if (err) {
+          logger.error(
+            `Error publishing message: \nTopic: ${topic}\nMessage: ${payload}\nError: ${err}`
+          );
+          ackNackCallback(false);
+        } else if (resp) {
+          logger.debug(
+            `Successfully published message: \nTopic: ${topic}\nMessage: ${payload}`
+          );
+          ackNackCallback(true);
+        }
+      });
   }
 
   public publishDeviceAgentMessage(

package/src/cloud-connection/shadow-handler.test.ts

@@ -5,10 +5,14 @@ import { ShadowHandler } from './shadow-handler';
 import { Logger } from 'winston';
 import { logger } from '../util/logger';
 import { getShadowTopic } from '@alwaysai/device-agent-schemas';
+import { ConnectionManager } from './connection-manager';
 
 jest.mock('../application-control');
 jest.mock('./publisher');
-const mockClient = jest.fn();
+jest.mock('./connection-manager');
+const mockConnectionManager = {
+  getIotDevice: jest.fn()
+} as any as ConnectionManager;
 const clientId = 'test-client';
 const projectId1 = 'test-project';
 const projectId2 = 'test-project-2';
@@ -18,7 +22,7 @@ describe('Test Shadow Handler', () => {
   let shadowHandler: ShadowHandler;
 
   beforeEach(() => {
-    publisher = new Publisher(mockClient, clientId);
+    publisher = new Publisher(mockConnectionManager, clientId);
     shadowHandler = new ShadowHandler(clientId, publisher);
   });
 

package/src/cloud-connection/shadow-handler.ts

@@ -346,6 +346,10 @@ export class ShadowHandler {
     return [];
   }
 
+  public async initShadows() {
+    await this.updateSystemInfoShadow();
+  }
+
   public async updateSystemInfoShadow() {
     const systemInfo = await getSystemInformation();
     this.publisher.publish(