@alwaysai/device-agent 0.1.6 → 1.0.0-pre-release

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

@@ -0,0 +1,40 @@
+export class TransactionQueue {
+  private transactionList: string[];
+  private txIdToProjectIdMap: { [txId: string]: string } = {};
+
+  constructor() {
+    this.transactionList = [];
+    this.txIdToProjectIdMap = {};
+  }
+
+  public addTxIdToQueue(txId: string, projectId: string) {
+    if (!this.checkTxnInQueue(txId)) {
+      this.transactionList.push(txId);
+      this.txIdToProjectIdMap[txId] = projectId;
+    } else {
+      throw new Error(`txId ${txId} is already added to the queue!`);
+    }
+  }
+
+  public getCurrentTxId() {
+    return this.transactionList[0];
+  }
+
+  public checkTxnInQueue(txId: string) {
+    return this.transactionList.includes(txId);
+  }
+
+  public getProjectIdForTxnId(txId: string) {
+    return this.txIdToProjectIdMap[txId];
+  }
+
+  public completeTxn(txId: string) {
+    delete this.txIdToProjectIdMap[txId];
+    this.transactionList.splice(this.transactionList.indexOf(txId), 1);
+  }
+
+  public completeCurrentTxn() {
+    delete this.txIdToProjectIdMap[this.transactionList[0]];
+    this.transactionList.shift();
+  }
+}

package/src/environment.ts

@@ -16,6 +16,13 @@ export const ALWAYSAI_ANALYTICS_PASSTHROUGH = parseBoolean(
 export const ALWAYSAI_LIVE_UPDATES_TIMEOUT_MS =
   process.env.ALWAYSAI_LIVE_UPDATES_TIMEOUT_MS;
 
+export const ALWAYSAI_LOCAL_CONNECTION_HOST =
+  process.env.ALWAYSAI_LOCAL_CONNECTION_HOST;
+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;
+
 function parseOsPlatform(str: string | undefined): NodeJS.Platform {
   switch (str) {
     case 'win32':

package/src/local-connection/constants.ts

@@ -0,0 +1,16 @@
+import {
+  ALWAYSAI_LOCAL_CONNECTION_HOST,
+  ALWAYSAI_LOCAL_CONNECTION_PORT,
+  ALWAYSAI_LOCAL_CONNECTION_ANALYTICS_ROUTING_KEY
+} from '../environment';
+
+export const LOCAL_CONNECTION_HOST = ALWAYSAI_LOCAL_CONNECTION_HOST
+  ? ALWAYSAI_LOCAL_CONNECTION_HOST
+  : 'localhost';
+export const LOCAL_CONNECTION_PORT = ALWAYSAI_LOCAL_CONNECTION_PORT
+  ? parseInt(ALWAYSAI_LOCAL_CONNECTION_PORT)
+  : 5672;
+export const LOCAL_CONNECTION_ROUTING_KEY =
+  ALWAYSAI_LOCAL_CONNECTION_ANALYTICS_ROUTING_KEY
+    ? ALWAYSAI_LOCAL_CONNECTION_ANALYTICS_ROUTING_KEY
+    : 'edgeiq-analytics-publish';

package/src/local-connection/rabbitmq-connection.ts

@@ -8,12 +8,20 @@ import {
   DEVICE_AGENT_DOCKER_COMPOSE_PATH
 } from '../util/directories';
 import { JsSpawner } from 'alwaysai/lib/util';
+import { LOCAL_CONNECTION_PORT } from './constants';
 
 export const rabbitMQServiceName = 'alwaysAIRabbitMQ';
 export const rabbitMQContainerName = 'alwaysAIRabbitMQContainer';
 
 export async function checkRabbitMQContainerRunning() {
   logger.debug('Checking alwaysAI Local Connection Container status');
+  const spawner = JsSpawner();
+  if (!(await spawner.exists(DEVICE_AGENT_DOCKER_COMPOSE_PATH))) {
+    logger.warn(
+      'alwaysAI Location Connection configuration file is not present'
+    );
+    return false;
+  }
   const containerData = await compose.ps({ cwd: DEVICE_AGENT_CFG_PATH });
   if (!(containerData === undefined)) {
     const rabbitmqService = containerData.data.services[0];
@@ -27,6 +35,8 @@ export async function checkRabbitMQContainerRunning() {
     logger.debug('alwaysAI Local Connection is not running');
     return false;
   }
+  logger.warn('alwaysAI Local Connection container was undefined');
+  return false;
 }
 
 export async function writeRabbitMQDockerComposeFile() {
@@ -35,14 +45,23 @@ export async function writeRabbitMQDockerComposeFile() {
     await JsSpawner().mkdirp(DEVICE_AGENT_CFG_PATH);
   }
 
+  logger.debug(
+    `Writing Local Connection Docker compose files with Local Connection port: ${LOCAL_CONNECTION_PORT}`
+  );
+
   const rabbitmqDockerComposeCmd = {
     services: {
       [rabbitMQServiceName]: {
         container_name: rabbitMQContainerName,
         image: 'rabbitmq:3.11',
-        ports: ['5672:5672'],
+        ports: [`${LOCAL_CONNECTION_PORT}:${LOCAL_CONNECTION_PORT}`],
         hostname: 'my-rabbit',
-        restart: 'on-failure'
+        restart: 'on-failure',
+        environment: [`RABBITMQ_NODE_PORT=${LOCAL_CONNECTION_PORT}`],
+        volumes: [
+          './rabbitmq/:/var/lib/rabbitmq/',
+          './rabbitmq/log/:/var/log/rabbitmq/'
+        ]
       }
     }
   };
@@ -86,6 +105,7 @@ export async function setupRabbitMQContainer() {
 export async function stopRabbitMQContainer() {
   try {
     const downOut = await compose.down({ cwd: DEVICE_AGENT_CFG_PATH });
+    logger.debug(`Stopping alwaysAI Local Connection container`);
     logger.debug(
       `Docker compose down for alwaysAI Local Connection:\n${JSON.stringify(
         downOut

package/src/secure-tunneling/index.ts

@@ -48,7 +48,6 @@ async function downloadSecureTunnel() {
   const url = `${aaiArtifactsBucketUrl}/securetunnel/${linuxDistro}/${osVersion}/${arch}/${SECURE_TUNNEL_BIN_NAME}`;
 
   await JsSpawner().mkdirp(join(AAI_DIR, SECURE_TUNNEL_BIN_DIR));
-  //fix this error message
   await downloadFile({
     url,
     path: SECURE_TUNNEL_BIN_PATH,
@@ -70,8 +69,6 @@ async function terminateSecureTunnelProcess() {
       args: [SECURE_TUNNEL_BIN_NAME]
     });
   } catch (e) {
-    console.log(e);
-    //check exit codes
-    console.log('No secure tunnel process to kill');
+    logger.debug('Proccess terminated if status code is 1');
   }
 }

package/src/subcommands/app/index.ts

@@ -5,7 +5,8 @@ import {
   addModelCliLeaf,
   removeModelCliLeaf,
   replaceModelsCliLeaf,
-  updateModelsCliLeaf
+  updateModelsCliLeaf,
+  installModelCliLeaf
 } from './models';
 import {
   getAppStatusCliLeaf,
@@ -39,6 +40,7 @@ export const appCliBranch = CliBranch({
     addModelCliLeaf,
     removeModelCliLeaf,
     replaceModelsCliLeaf,
+    installModelCliLeaf,
     updateModelsCliLeaf,
     getAllEnvsCliLeaf,
     setEnvCliLeaf,

package/src/subcommands/app/models.ts

@@ -1,5 +1,6 @@
 import {
   CliLeaf,
+  CliNumberInput,
   CliStringArrayInput,
   CliStringInput
 } from '@alwaysai/alwayscli';
@@ -75,6 +76,49 @@ export const addModelCliLeaf = CliLeaf({
   }
 });
 
+export const installModelCliLeaf = CliLeaf({
+  name: 'install-model',
+  description: 'Install an alwaysAI model to a project',
+  namedInputs: {
+    project: CliStringInput({
+      description: 'Project ID',
+      required: true
+    }),
+    modelName: CliStringInput({
+      description: 'Model Name',
+      required: true
+    }),
+    modelVersion: CliNumberInput({
+      description: 'Model Version',
+      required: true
+    })
+  },
+  async action(_, opts) {
+    const { project, modelName, modelVersion } = opts;
+    const deviceAgent = new DeviceAgentCloudConnection();
+    await deviceAgent.setupHandlers();
+    const topic = deviceAgent.getShadowTopics().projects.getAccepted;
+    const newAppCfg = await readAppCfgFile({ projectId: project });
+    newAppCfg['models'][modelName] = modelVersion;
+
+    const message = {
+      state: {
+        delta: {
+          [project]: {
+            appConfig: JSON.stringify(newAppCfg)
+          }
+        }
+      },
+      clientToken: deviceAgent.getClientId()
+    };
+    await deviceAgent.handleMessage(topic, message);
+    while (deviceAgent.isCmdInProgress(project)) {
+      await sleep(1000);
+    }
+    await deviceAgent.stop();
+  }
+});
+
 export const removeModelCliLeaf = CliLeaf({
   name: 'remove-model',
   description: 'Remove a model from an alwaysAI app',

package/src/subcommands/app/status.ts

@@ -1,7 +1,7 @@
 import { CliLeaf, CliStringInput } from '@alwaysai/alwayscli';
 import {
   getAppLogs,
-  getAppStatus,
+  getAppState,
   restartApp,
   startApp,
   stopApp
@@ -19,7 +19,7 @@ export const getAppStatusCliLeaf = CliLeaf({
   },
   async action(_, opts) {
     const { project } = opts;
-    const appStatus = await getAppStatus({ projectId: project });
+    const appStatus = await getAppState({ projectId: project });
     logger.info(JSON.stringify(appStatus, null, 2));
   }
 });

package/src/subcommands/app/version.ts

@@ -1,5 +1,9 @@
 import { CliLeaf, CliStringInput } from '@alwaysai/alwayscli';
-import { ClientMessage, keyMirrors } from '@alwaysai/device-agent-schemas';
+import {
+  AppVersionControlMessage,
+  generateTxId,
+  keyMirrors
+} from '@alwaysai/device-agent-schemas';
 import { rollbackApp } from '../../application-control';
 import { DeviceAgentCloudConnection } from '../../cloud-connection/device-agent-cloud-connection';
 import { AgentConfigFile } from '../../infrastructure/agent-config';
@@ -33,16 +37,15 @@ export const installAppCliLeaf = CliLeaf({
     const deviceAgent = new DeviceAgentCloudConnection();
     await deviceAgent.setupHandlers();
     const topic = deviceAgent.getToDeviceTopic();
-    const message: ClientMessage = {
+    const message: AppVersionControlMessage = {
       timestamp: '',
       topic,
+      messageType: keyMirrors.toDeviceAgentMessageType.app_version_control,
+      txId: generateTxId(),
       payload: {
-        messageType: keyMirrors.clientMessageType.app_version_control,
-        appVersionControl: {
-          baseCommand: keyMirrors.appVersionControl.install,
-          projectId: project,
-          appReleaseHash: releaseHash
-        }
+        baseCommand: keyMirrors.appVersionControl.install,
+        projectId: project,
+        appReleaseHash: releaseHash
       }
     };
     await deviceAgent.handleMessage(topic, message);
@@ -67,15 +70,14 @@ export const uninstallAppCliLeaf = CliLeaf({
     const deviceAgent = new DeviceAgentCloudConnection();
     await deviceAgent.setupHandlers();
     const topic = deviceAgent.getToDeviceTopic();
-    const message: ClientMessage = {
+    const message: AppVersionControlMessage = {
       timestamp: '',
       topic,
+      messageType: keyMirrors.toDeviceAgentMessageType.app_version_control,
+      txId: generateTxId(),
       payload: {
-        messageType: keyMirrors.clientMessageType.app_version_control,
-        appVersionControl: {
-          baseCommand: keyMirrors.appVersionControl.uninstall,
-          projectId: project
-        }
+        baseCommand: keyMirrors.appVersionControl.uninstall,
+        projectId: project
       }
     };
     await deviceAgent.handleMessage(topic, message);

package/src/subcommands/device/clean.ts

@@ -3,13 +3,33 @@ import { rimraf } from 'rimraf';
 import { logger } from '../../util/logger';
 import { AgentConfigFile } from '../../infrastructure/agent-config';
 import { DeviceConfigFile } from 'alwaysai/lib/core/device';
-import { APP_ROOT, CREDENTIALS_FILE_PATH } from '../../util/directories';
+import {
+  APP_ROOT,
+  CREDENTIALS_FILE_PATH,
+  DEVICE_AGENT_CFG_PATH
+} from '../../util/directories';
+import {
+  checkRabbitMQContainerRunning,
+  stopRabbitMQContainer
+} from '../../local-connection/rabbitmq-connection';
+import { stopApp } from '../../application-control';
 import { LOCAL_CERT_AND_KEY_DIR } from 'alwaysai/lib/paths';
 
 export const cleanCliLeaf = CliLeaf({
   name: 'clean',
   description: 'Remove all provisioning files',
   async action(_, opts) {
+    if (await checkRabbitMQContainerRunning()) {
+      await stopRabbitMQContainer();
+    }
+    logger.debug(`Removing ${DEVICE_AGENT_CFG_PATH}`);
+    await rimraf(DEVICE_AGENT_CFG_PATH);
+    logger.debug('Checking for alwaysAI applications still running');
+    const apps = await AgentConfigFile().getApps();
+    for (const app of apps) {
+      const { projectId } = app;
+      await stopApp({ projectId });
+    }
     logger.info('Cleaning device configuration');
     logger.debug(`Removing ${LOCAL_CERT_AND_KEY_DIR}`);
     await rimraf(LOCAL_CERT_AND_KEY_DIR);

package/src/urls.ts

@@ -1 +1,3 @@
-export const aaiArtifactsBucketUrl = `https://alwaysai-artifacts-prod.s3.us-west-1.amazonaws.com`;
+import { shortenSystemId } from './util/directories';
+
+export const aaiArtifactsBucketUrl = `https://alwaysai-artifacts-${shortenSystemId()}.s3.us-west-1.amazonaws.com`;

package/lib/docker/secure-tunnel-docker.d.ts

@@ -1,2 +0,0 @@
-export declare const handleSecureTunnelTopic: (clientAccessToken: string) => Promise<void>;
-//# sourceMappingURL=secure-tunnel-docker.d.ts.map

package/lib/docker/secure-tunnel-docker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"secure-tunnel-docker.d.ts","sourceRoot":"","sources":["../../src/docker/secure-tunnel-docker.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,uBAAuB,sBAA6B,MAAM,kBA+BtE,CAAC"}

package/lib/docker/secure-tunnel-docker.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleSecureTunnelTopic = void 0;
-const util_1 = require("alwaysai/lib/util");
-const handleSecureTunnelTopic = async (clientAccessToken) => {
-    await dockerPull();
-    const dockerImage = `alwaysai/securetunneling-localproxy:latest`;
-    const cmd = [
-        'run',
-        '--rm',
-        '--detach',
-        '--name',
-        'secure-tunnel',
-        '--expose',
-        '5555',
-        '-p',
-        '5555:5555',
-        dockerImage,
-        '-r',
-        'us-west-2',
-        '-d',
-        '5555',
-        '-b',
-        '0.0.0.0',
-        '-t',
-        clientAccessToken
-    ];
-    const spawner = (0, util_1.JsSpawner)();
-    const output = await spawner.run({
-        exe: 'docker',
-        args: cmd
-    });
-    console.log(output);
-    console.log(cmd);
-};
-exports.handleSecureTunnelTopic = handleSecureTunnelTopic;
-async function dockerPull() {
-    //ASK ALEX TO RENAME TO PROD
-    const dockerImage = `alwaysai/securetunneling-localproxy:latest`;
-    const cmd = ['pull', dockerImage];
-    const spawner = (0, util_1.JsSpawner)();
-    const output = await spawner.run({
-        exe: 'docker',
-        args: cmd
-    });
-    console.log(output);
-    console.log(cmd);
-}
-//# sourceMappingURL=secure-tunnel-docker.js.map

package/lib/docker/secure-tunnel-docker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"secure-tunnel-docker.js","sourceRoot":"","sources":["../../src/docker/secure-tunnel-docker.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAEvC,MAAM,uBAAuB,GAAG,KAAK,EAAE,iBAAyB,EAAE,EAAE;IACzE,MAAM,UAAU,EAAE,CAAC;IACnB,MAAM,WAAW,GAAG,4CAA4C,CAAC;IACjE,MAAM,GAAG,GAAG;QACV,KAAK;QACL,MAAM;QACN,UAAU;QACV,QAAQ;QACR,eAAe;QACf,UAAU;QACV,MAAM;QACN,IAAI;QACJ,WAAW;QACX,WAAW;QACX,IAAI;QACJ,WAAW;QACX,IAAI;QACJ,MAAM;QACN,IAAI;QACJ,SAAS;QACT,IAAI;QACJ,iBAAiB;KAClB,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,gBAAS,GAAE,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC/B,GAAG,EAAE,QAAQ;QACb,IAAI,EAAE,GAAG;KACV,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACnB,CAAC,CAAC;AA/BW,QAAA,uBAAuB,2BA+BlC;AAEF,KAAK,UAAU,UAAU;IACvB,4BAA4B;IAC5B,MAAM,WAAW,GAAG,4CAA4C,CAAC;IACjE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAElC,MAAM,OAAO,GAAG,IAAA,gBAAS,GAAE,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC/B,GAAG,EAAE,QAAQ;QACb,IAAI,EAAE,GAAG;KACV,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACnB,CAAC"}