@alwaysai/device-agent 2.0.2 → 2.0.3

package/src/subcommands/device/local-connection.ts

@@ -0,0 +1,16 @@
+import { CliLeaf } from '@alwaysai/alwayscli';
+import { stopRabbitMQContainer } from '../../local-connection/rabbitmq-container';
+import { logger } from '../../util/logger';
+import { getDeviceAgentDockerComposePath } from '../../util/directories';
+
+export const stopLocalConnectionCliLeaf = CliLeaf({
+  name: 'stop-local-connection',
+  description: 'Stop the Device Agent local connection container',
+  async action(_, opts) {
+    if ((await stopRabbitMQContainer()) === false) {
+      logger.error(
+        `You may need to manually stop the container by running docker-compose down in the following directory: ${getDeviceAgentDockerComposePath()}`
+      );
+    }
+  }
+});

package/src/subcommands/index.ts

@@ -3,13 +3,11 @@ import { configBranch } from './config';
 import { deviceCliBranch } from './device';
 import { getModelPackageCliLeaf } from './get-model-package';
 import { loginCliLeaf } from './login';
-import { stopRabbitMQContainerCliLeaf } from './rabbitmq-connection';
 
 export const subcommands = [
   loginCliLeaf,
   configBranch,
   appCliBranch,
   deviceCliBranch,
-  getModelPackageCliLeaf,
-  stopRabbitMQContainerCliLeaf
+  getModelPackageCliLeaf
 ];

package/src/util/check-for-updates.ts

@@ -20,7 +20,9 @@ export async function getDeviceAgentVersion(): Promise<string> {
     daVersion = parsed.version;
   } catch (e) {
     logger.error(
-      `Could not retrieve the Device Agent version!\n${stringifyError(e)}`
+      `Could not retrieve the Device Agent version! Error:\n${stringifyError(
+        e
+      )}`
     );
   }
   return daVersion;
@@ -48,6 +50,6 @@ export async function checkForUpdatesAndPrompt() {
       );
     }
   } catch (e) {
-    logger.error(`Could not check for updates!\n${stringifyError(e)}`);
+    logger.error(`Could not check for updates! Error:\n${stringifyError(e)}`);
   }
 }

package/src/util/file.test.ts

@@ -80,7 +80,7 @@ describe('pruneDir function', () => {
 
     const result = await pruneDir({ path: rootPath, recurse: false });
 
-    expect(result).toBe(true);
+    expect(result).toBe(false);
     expect(readdir).toHaveBeenCalledWith(rootPath);
     expect(stat).toHaveBeenCalledTimes(2); // Called for file1.txt and subdir
     expect(unlink).toHaveBeenCalledWith(`${rootPath}/file1.txt`);

package/src/util/file.ts

@@ -65,6 +65,10 @@ export async function pruneDir({
           } else {
             canPruneParent = false;
           }
+        } else {
+          // Directory encountered but recursion is not allowed, parent cannot be pruned
+          logger.debug(`Skipping directory ${filePath} as recurse is false.`);
+          canPruneParent = false;
         }
       } else {
         await unlink(filePath);
@@ -72,7 +76,9 @@ export async function pruneDir({
     }
     return canPruneParent;
   } catch (e) {
-    logger.error(`Error pruning directory ${path}!\n${stringifyError(e)}`);
+    logger.error(
+      `Error pruning directory ${path}! Error:\n${stringifyError(e)}`
+    );
     return false;
   }
 }

package/src/util/get-device-id.ts

@@ -12,7 +12,9 @@ export function getDeviceUuid() {
     const cfg = deviceCfgFile.read();
     return cfg.deviceUuid;
   } catch (e) {
-    logger.error(`Failed to read device configuration!\n${stringifyError(e)}`);
+    logger.error(
+      `Failed to read device configuration! Error:\n${stringifyError(e)}`
+    );
     throw new AaiError('Failed to read device configuration', {
       cause: deviceCfgFile.getErrors()
     });

package/lib/local-connection/rabbitmq-connection.d.ts

@@ -1,7 +0,0 @@
-export declare const rabbitMQServiceName = "alwaysAIRabbitMQ";
-export declare const rabbitMQContainerName = "alwaysAIRabbitMQContainer";
-export declare function checkRabbitMQContainerRunning(): Promise<boolean>;
-export declare function writeRabbitMQDockerComposeFile(): Promise<void>;
-export declare function setupRabbitMQContainer(): Promise<void>;
-export declare function stopRabbitMQContainer(): Promise<void>;
-//# sourceMappingURL=rabbitmq-connection.d.ts.map

package/lib/local-connection/rabbitmq-connection.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rabbitmq-connection.d.ts","sourceRoot":"","sources":["../../src/local-connection/rabbitmq-connection.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,mBAAmB,qBAAqB,CAAC;AACtD,eAAO,MAAM,qBAAqB,8BAA8B,CAAC;AAEjE,wBAAsB,6BAA6B,qBAwBlD;AAED,wBAAsB,8BAA8B,kBAgCnD;AAED,wBAAsB,sBAAsB,kBA+B3C;AAED,wBAAsB,qBAAqB,kBAgB1C"}

package/lib/local-connection/rabbitmq-connection.js

@@ -1,95 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.stopRabbitMQContainer = exports.setupRabbitMQContainer = exports.writeRabbitMQDockerComposeFile = exports.checkRabbitMQContainerRunning = exports.rabbitMQContainerName = exports.rabbitMQServiceName = void 0;
-const util_1 = require("alwaysai/lib/util");
-const YAML = require("yaml");
-const docker_compose_1 = require("../docker/docker-compose");
-const directories_1 = require("../util/directories");
-const logger_1 = require("../util/logger");
-const sleep_1 = require("../util/sleep");
-const constants_1 = require("./constants");
-exports.rabbitMQServiceName = 'alwaysAIRabbitMQ';
-exports.rabbitMQContainerName = 'alwaysAIRabbitMQContainer';
-async function checkRabbitMQContainerRunning() {
-    logger_1.logger.debug('Checking alwaysAI Local Connection Container status');
-    const spawner = (0, util_1.JsSpawner)();
-    if (!(await spawner.exists((0, directories_1.getDeviceAgentDockerComposePath)()))) {
-        logger_1.logger.warn('alwaysAI Location Connection configuration file is not present');
-        return false;
-    }
-    const containerData = await docker_compose_1.compose.ps({ cwd: (0, directories_1.getDeviceAgentConfigPath)() });
-    if (containerData !== undefined) {
-        const rabbitmqService = containerData.data.services[0];
-        if ((rabbitmqService === null || rabbitmqService === void 0 ? void 0 : rabbitmqService.name) === exports.rabbitMQContainerName &&
-            rabbitmqService.state.includes('Up')) {
-            logger_1.logger.debug('alwaysAI Local Connection Container is up');
-            return true;
-        }
-        logger_1.logger.debug('alwaysAI Local Connection Container is not up');
-        return false;
-    }
-    logger_1.logger.warn('alwaysAI Local Connection Container is undefined');
-    return false;
-}
-exports.checkRabbitMQContainerRunning = checkRabbitMQContainerRunning;
-async function writeRabbitMQDockerComposeFile() {
-    const spawner = (0, util_1.JsSpawner)();
-    if (!(await spawner.exists((0, directories_1.getDeviceAgentConfigPath)()))) {
-        await (0, util_1.JsSpawner)().mkdirp((0, directories_1.getDeviceAgentConfigPath)());
-    }
-    logger_1.logger.debug(`Writing Local Connection Docker compose files with Local Connection port: ${constants_1.LOCAL_CONNECTION_PORT}`);
-    const rabbitmqDockerComposeCmd = {
-        services: {
-            [exports.rabbitMQServiceName]: {
-                container_name: exports.rabbitMQContainerName,
-                image: 'rabbitmq:3.11',
-                ports: [`${constants_1.LOCAL_CONNECTION_PORT}:${constants_1.LOCAL_CONNECTION_PORT}`],
-                hostname: 'my-rabbit',
-                restart: 'on-failure',
-                environment: [`RABBITMQ_NODE_PORT=${constants_1.LOCAL_CONNECTION_PORT}`],
-                volumes: [
-                    './rabbitmq/:/var/lib/rabbitmq/',
-                    './rabbitmq/log/:/var/log/rabbitmq/'
-                ]
-            }
-        }
-    };
-    const RabbitMQDockerComposeYaml = YAML.stringify(rabbitmqDockerComposeCmd);
-    await spawner.writeFile((0, directories_1.getDeviceAgentDockerComposePath)(), RabbitMQDockerComposeYaml);
-}
-exports.writeRabbitMQDockerComposeFile = writeRabbitMQDockerComposeFile;
-async function setupRabbitMQContainer() {
-    logger_1.logger.debug('Attempting to start the alwaysAI Local Connection Container');
-    try {
-        await writeRabbitMQDockerComposeFile();
-    }
-    catch (e) {
-        logger_1.logger.error(`An error occurred setting up docker-compose.yaml for Device Agent pass through!\n${(0, util_1.stringifyError)(e)}`);
-    }
-    try {
-        const upOut = await docker_compose_1.compose.upAll({
-            cwd: (0, directories_1.getDeviceAgentConfigPath)()
-        });
-        logger_1.logger.debug(`Docker compose up for alwaysAI Local Connection:\n${JSON.stringify(upOut)}`);
-        // check if the container is up
-        while (!(await checkRabbitMQContainerRunning())) {
-            await (0, sleep_1.default)(10);
-        }
-    }
-    catch (e) {
-        logger_1.logger.error(`Unable to start alwaysAI Device Agent Local Connection Container!\n${(0, util_1.stringifyError)(e)}`);
-    }
-}
-exports.setupRabbitMQContainer = setupRabbitMQContainer;
-async function stopRabbitMQContainer() {
-    try {
-        const downOut = await docker_compose_1.compose.down({ cwd: (0, directories_1.getDeviceAgentConfigPath)() });
-        logger_1.logger.debug(`Stopping alwaysAI Local Connection container`);
-        logger_1.logger.debug(`Docker compose down for alwaysAI Local Connection:\n${JSON.stringify(downOut)}`);
-    }
-    catch (e) {
-        logger_1.logger.error(`Unable to stop alwaysAI Device Agent Local Connection Container!\n${(0, util_1.stringifyError)(e)}`);
-    }
-}
-exports.stopRabbitMQContainer = stopRabbitMQContainer;
-//# sourceMappingURL=rabbitmq-connection.js.map

package/lib/local-connection/rabbitmq-connection.js.map

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

package/lib/subcommands/rabbitmq-connection.d.ts

@@ -1,2 +0,0 @@
-export declare const stopRabbitMQContainerCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, import("@alwaysai/alwayscli/lib/types").AnyNamedInputs, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
-//# sourceMappingURL=rabbitmq-connection.d.ts.map

package/lib/subcommands/rabbitmq-connection.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rabbitmq-connection.d.ts","sourceRoot":"","sources":["../../src/subcommands/rabbitmq-connection.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,4BAA4B,6NAOvC,CAAC"}

package/lib/subcommands/rabbitmq-connection.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.stopRabbitMQContainerCliLeaf = void 0;
-const alwayscli_1 = require("@alwaysai/alwayscli");
-const rabbitmq_connection_1 = require("../local-connection/rabbitmq-connection");
-exports.stopRabbitMQContainerCliLeaf = (0, alwayscli_1.CliLeaf)({
-    name: 'stop-analytics-pass-through',
-    description: 'Stop the Device Agent connection to edgeIQ',
-    hidden: true,
-    async action(_, opts) {
-        await (0, rabbitmq_connection_1.stopRabbitMQContainer)();
-    }
-});
-//# sourceMappingURL=rabbitmq-connection.js.map

package/lib/subcommands/rabbitmq-connection.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rabbitmq-connection.js","sourceRoot":"","sources":["../../src/subcommands/rabbitmq-connection.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,iFAAgF;AAEnE,QAAA,4BAA4B,GAAG,IAAA,mBAAO,EAAC;IAClD,IAAI,EAAE,6BAA6B;IACnC,WAAW,EAAE,4CAA4C;IACzD,MAAM,EAAE,IAAI;IACZ,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,IAAA,2CAAqB,GAAE,CAAC;IAChC,CAAC;CACF,CAAC,CAAC"}

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

@@ -1,124 +0,0 @@
-import { JsSpawner, stringifyError } from 'alwaysai/lib/util';
-import * as YAML from 'yaml';
-import { compose } from '../docker/docker-compose';
-import {
-  getDeviceAgentConfigPath,
-  getDeviceAgentDockerComposePath
-} from '../util/directories';
-import { logger } from '../util/logger';
-import sleep from '../util/sleep';
-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(getDeviceAgentDockerComposePath()))) {
-    logger.warn(
-      'alwaysAI Location Connection configuration file is not present'
-    );
-    return false;
-  }
-  const containerData = await compose.ps({ cwd: getDeviceAgentConfigPath() });
-  if (containerData !== undefined) {
-    const rabbitmqService = containerData.data.services[0];
-    if (
-      rabbitmqService?.name === rabbitMQContainerName &&
-      rabbitmqService.state.includes('Up')
-    ) {
-      logger.debug('alwaysAI Local Connection Container is up');
-      return true;
-    }
-    logger.debug('alwaysAI Local Connection Container is not up');
-    return false;
-  }
-  logger.warn('alwaysAI Local Connection Container is undefined');
-  return false;
-}
-
-export async function writeRabbitMQDockerComposeFile() {
-  const spawner = JsSpawner();
-  if (!(await spawner.exists(getDeviceAgentConfigPath()))) {
-    await JsSpawner().mkdirp(getDeviceAgentConfigPath());
-  }
-
-  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: [`${LOCAL_CONNECTION_PORT}:${LOCAL_CONNECTION_PORT}`],
-        hostname: 'my-rabbit',
-        restart: 'on-failure',
-        environment: [`RABBITMQ_NODE_PORT=${LOCAL_CONNECTION_PORT}`],
-        volumes: [
-          './rabbitmq/:/var/lib/rabbitmq/',
-          './rabbitmq/log/:/var/log/rabbitmq/'
-        ]
-      }
-    }
-  };
-
-  const RabbitMQDockerComposeYaml = YAML.stringify(rabbitmqDockerComposeCmd);
-  await spawner.writeFile(
-    getDeviceAgentDockerComposePath(),
-    RabbitMQDockerComposeYaml
-  );
-}
-
-export async function setupRabbitMQContainer() {
-  logger.debug('Attempting to start the alwaysAI Local Connection Container');
-  try {
-    await writeRabbitMQDockerComposeFile();
-  } catch (e) {
-    logger.error(
-      `An error occurred setting up docker-compose.yaml for Device Agent pass through!\n${stringifyError(
-        e
-      )}`
-    );
-  }
-  try {
-    const upOut = await compose.upAll({
-      cwd: getDeviceAgentConfigPath()
-    });
-    logger.debug(
-      `Docker compose up for alwaysAI Local Connection:\n${JSON.stringify(
-        upOut
-      )}`
-    );
-    // check if the container is up
-    while (!(await checkRabbitMQContainerRunning())) {
-      await sleep(10);
-    }
-  } catch (e) {
-    logger.error(
-      `Unable to start alwaysAI Device Agent Local Connection Container!\n${stringifyError(
-        e
-      )}`
-    );
-  }
-}
-
-export async function stopRabbitMQContainer() {
-  try {
-    const downOut = await compose.down({ cwd: getDeviceAgentConfigPath() });
-    logger.debug(`Stopping alwaysAI Local Connection container`);
-    logger.debug(
-      `Docker compose down for alwaysAI Local Connection:\n${JSON.stringify(
-        downOut
-      )}`
-    );
-  } catch (e) {
-    logger.error(
-      `Unable to stop alwaysAI Device Agent Local Connection Container!\n${stringifyError(
-        e
-      )}`
-    );
-  }
-}

package/src/subcommands/rabbitmq-connection.ts

@@ -1,11 +0,0 @@
-import { CliLeaf } from '@alwaysai/alwayscli';
-import { stopRabbitMQContainer } from '../local-connection/rabbitmq-connection';
-
-export const stopRabbitMQContainerCliLeaf = CliLeaf({
-  name: 'stop-analytics-pass-through',
-  description: 'Stop the Device Agent connection to edgeIQ',
-  hidden: true,
-  async action(_, opts) {
-    await stopRabbitMQContainer();
-  }
-});