@alwaysai/device-agent 0.0.14 → 0.0.16

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

@@ -143,22 +143,26 @@ export class ShadowHandler {
       },
       clientToken: this.clientId
     };
-    this.publisher.publish(
-      this.shadowTopics.projects.update,
-      JSON.stringify(packet)
+    const topic = this.shadowTopics.projects.update;
+    logger.debug(
+      `Publishing message:\n${JSON.stringify({ topic, packet }, null, 2)}`
     );
+    this.publisher.publish(topic, JSON.stringify(packet));
   }
 
   public getShadowUpdates() {
-    this.publisher.publish(
-      this.shadowTopics.projects.get,
-      JSON.stringify({
-        clientToken: this.clientId
-      })
+    const topic = this.shadowTopics.projects.get;
+    const packet = {
+      clientToken: this.clientId
+    };
+    logger.debug(
+      `Publishing message:\n${JSON.stringify({ topic, packet }, null, 2)}`
     );
+    this.publisher.publish(topic, JSON.stringify(packet));
   }
 
   public deleteProjectShadow(projectId: string) {
+    const topic = this.shadowTopics.projects.update;
     const packet = {
       state: {
         reported: {
@@ -167,9 +171,9 @@ export class ShadowHandler {
       },
       clientToken: this.clientId
     };
-    this.publisher.publish(
-      this.shadowTopics.projects.update,
-      JSON.stringify(packet)
+    logger.debug(
+      `Publishing message:\n${JSON.stringify({ topic, packet }, null, 2)}`
     );
+    this.publisher.publish(topic, JSON.stringify(packet));
   }
 }

package/src/environment.ts

@@ -8,7 +8,7 @@ export const ALWAYSAI_SHOW_HIDDEN = parseBoolean(
 );
 export const ALWAYSAI_DEVICE_AGENT_MODE =
   process.env.ALWAYSAI_DEVICE_AGENT_MODE;
-export const ALWAYSAI_LOG_LEVEL = process.env.AAI_LOG_LEVEL;
+export const ALWAYSAI_LOG_LEVEL = process.env.ALWAYSAI_LOG_LEVEL;
 export const ALWAYSAI_LOG_TO_CONSOLE = process.env.ALWAYSAI_LOG_TO_CONSOLE;
 export const ALWAYSAI_ANALYTICS_PASSTHROUGH = parseBoolean(
   process.env.ALWAYSAI_ANALYTICS_PASSTHROUGH

package/src/index.ts

@@ -12,15 +12,18 @@ import { AgentConfigFile } from './infrastructure/agent-config';
 import { ALWAYSAI_DEVICE_AGENT_MODE } from './environment';
 import { logger } from './util/logger';
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { version } = require('../package.json');
+
 if (module === require.main) {
-  logger.info('Starting alwaysAI Device Agent');
+  logger.info(`Starting alwaysAI Device Agent v${version}`);
   if (!AgentConfigFile().exists()) {
     AgentConfigFile().initialize();
   }
 
   if (ALWAYSAI_DEVICE_AGENT_MODE === 'cloud') {
-    runDeviceAgentCloudInterface();
+    void runDeviceAgentCloudInterface();
   } else {
-    runCliAndExit(root, {});
+    void runCliAndExit(root, {});
   }
 }

package/src/subcommands/app/app.ts

@@ -18,13 +18,12 @@ import {
   setEnv,
   startApp,
   stopApp,
-  uninstallApp,
   updateModels
 } from '../../application-control';
 import { DeviceAgentCloudConnection } from '../../cloud-connection/device-agent-cloud-connection';
 import { AgentConfigFile } from '../../infrastructure/agent-config';
 import { logger } from '../../util/logger';
-import { timer } from '../../util/timer';
+import sleep from '../../util/sleep';
 
 export const listAppsCliLeaf = CliLeaf({
   name: 'list',
@@ -96,9 +95,9 @@ export const installAppCliLeaf = CliLeaf({
         }
       }
     };
-    await deviceAgent.handleClientMessage({ topic, message });
-    while (deviceAgent.getCmdStatus(project) === 'in_progress') {
-      await timer(1000);
+    await deviceAgent.handleMessage(topic, message);
+    while (deviceAgent.isCmdInProgress(project)) {
+      await sleep(1000);
     }
     deviceAgent.stop();
   }
@@ -198,7 +197,25 @@ export const uninstallAppCliLeaf = CliLeaf({
   },
   async action(_, opts) {
     const { project } = opts;
-    await uninstallApp({ projectId: project });
+    const deviceAgent = new DeviceAgentCloudConnection();
+    await deviceAgent.setupHandlers();
+    const topic = deviceAgent.getToDeviceTopic();
+    const message: ClientMessage = {
+      timestamp: '',
+      topic,
+      payload: {
+        messageType: keyMirrors.clientMessageType.app_version_control,
+        appVersionControl: {
+          baseCommand: keyMirrors.appVersionControl.uninstall,
+          projectId: project
+        }
+      }
+    };
+    await deviceAgent.handleMessage(topic, message);
+    while (deviceAgent.isCmdInProgress(project)) {
+      await sleep(1000);
+    }
+    deviceAgent.stop();
   }
 });
 
@@ -273,8 +290,8 @@ export const addModelCliLeaf = CliLeaf({
     };
 
     await deviceAgent.handleMessage(topic, message);
-    while (deviceAgent.getCmdStatus(project) === 'in_progress') {
-      await timer(1000);
+    while (deviceAgent.isCmdInProgress(project)) {
+      await sleep(1000);
     }
     deviceAgent.stop();
   }
@@ -333,7 +350,7 @@ export const updateModelsCliLeaf = CliLeaf({
   }
 });
 
-export const getAllEnvsCLiLeaf = CliLeaf({
+export const getAllEnvsCliLeaf = CliLeaf({
   name: 'get-all-envs',
   description: 'Get environment variables for an application',
   namedInputs: {
@@ -348,7 +365,7 @@ export const getAllEnvsCLiLeaf = CliLeaf({
   }
 });
 
-export const setEnvCLiLeaf = CliLeaf({
+export const setEnvCliLeaf = CliLeaf({
   name: 'set-env',
   description: 'Set environment variables for a service',
   positionalInput: CliStringArrayInput({

package/src/subcommands/app/index.ts

@@ -16,8 +16,8 @@ import {
   restartAppCliLeaf,
   replaceModelsCliLeaf,
   showAppModelsCliLeaf,
-  getAllEnvsCLiLeaf,
-  setEnvCLiLeaf
+  getAllEnvsCliLeaf,
+  setEnvCliLeaf
 } from './app';
 
 export const appCliBranch = CliBranch({
@@ -40,7 +40,7 @@ export const appCliBranch = CliBranch({
     removeModelCliLeaf,
     replaceModelsCliLeaf,
     updateModelsCliLeaf,
-    getAllEnvsCLiLeaf,
-    setEnvCLiLeaf
+    getAllEnvsCliLeaf,
+    setEnvCliLeaf
   ]
 });

package/src/subcommands/device/device.ts

@@ -7,7 +7,7 @@ import { httpClient, microServiceHttpClient } from '../../util/http-client';
 import {
   AWS_ROOT_CERTIFICATE_FILE_NAME,
   BOOTSTRAP_CERTIFICATES_DIR_PATH,
-  getPrivateKeyFilePath
+  DEVICE_PRIVATE_KEY_FILE_PATH
 } from '../../util/directories';
 
 import { LOCAL_CERT_AND_KEY_DIR } from 'alwaysai/lib/constants';
@@ -39,7 +39,10 @@ export const initCliLeaf = CliLeaf({
     let { name } = opts;
     name = name || uuidv4();
 
-    if (DeviceConfigFile().exists() || existsSync(getPrivateKeyFilePath())) {
+    if (
+      DeviceConfigFile().exists() ||
+      existsSync(DEVICE_PRIVATE_KEY_FILE_PATH)
+    ) {
       throw new Error(
         "Device has been previously provisioned. Run 'aai-agent device clean' to re-provision"
       );

package/src/util/directories.ts

@@ -33,52 +33,54 @@ export const shortenSystemId = () => {
   }
 };
 
+/*===================================================================
+                    Bootstrap Certificates
+===================================================================*/
+
 export const BOOTSTRAP_DIR_NAME = 'bootstrap-certificates';
-export const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = () =>
+export const BOOTSTRAP_PRIVATE_KEY_FILE_NAME = () =>
   `aai-claim-private-key_${shortenSystemId()}.pem.key`;
-export const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = () =>
+export const BOOTSTRAP_CERTIFICATE_FILE_NAME = () =>
   `aai-claim-cert_${shortenSystemId()}.pem.crt`;
-export const BOOTSTRAP_CLAIM_ID_FILE_NAME = () =>
+export const BOOTSTRAP_ID_FILE_NAME = () =>
   `aai-claim-cert-id_${shortenSystemId()}.txt`;
 export const CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME =
   'certificate-ownership-token.txt';
-export const DEVICE_PRIVATE_KEY_FILE_NAME = () =>
-  `aai-claim-private-key_${shortenSystemId()}.pem.key`;
-export const DEVICE_CERTIFICATE_FILE_NAME = () =>
-  `aai-claim-cert_${shortenSystemId()}.pem.crt`;
-export const DEVICE_CLAIM_ID_FILE_NAME = () =>
-  `aai-claim-cert-id_${shortenSystemId()}.txt`;
-
-export function getPrivateKeyFilePath() {
-  return join(LOCAL_CERT_AND_KEY_DIR, DEVICE_PRIVATE_KEY_FILE_NAME());
-}
-
-export function getCertificateFilePath() {
-  return join(LOCAL_CERT_AND_KEY_DIR, DEVICE_CERTIFICATE_FILE_NAME());
-}
 
 export const BOOTSTRAP_CERTIFICATES_DIR_PATH = () =>
   join(LOCAL_CERT_AND_KEY_DIR, BOOTSTRAP_DIR_NAME);
-export const DEVICE_CLAIM_ID_FILE_PATH = () =>
-  join(LOCAL_CERT_AND_KEY_DIR, DEVICE_TOKEN_FILE_NAME);
 
-export const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = () =>
+export const BOOTSTRAP_PRIVATE_KEY_FILE_PATH = () =>
   join(
     LOCAL_CERT_AND_KEY_DIR,
     BOOTSTRAP_DIR_NAME,
-    BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME()
+    BOOTSTRAP_PRIVATE_KEY_FILE_NAME()
   );
 
-export const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = () =>
+export const BOOTSTRAP_CERTIFICATE_FILE_PATH = () =>
   join(
     LOCAL_CERT_AND_KEY_DIR,
     BOOTSTRAP_DIR_NAME,
-    BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME()
+    BOOTSTRAP_CERTIFICATE_FILE_NAME()
   );
 
-export const BOOTSTRAP_CLAIM_ID_FILE_PATH = () =>
-  join(
-    LOCAL_CERT_AND_KEY_DIR,
-    BOOTSTRAP_DIR_NAME,
-    BOOTSTRAP_CLAIM_ID_FILE_NAME()
-  );
+export const BOOTSTRAP_ID_FILE_PATH = () =>
+  join(LOCAL_CERT_AND_KEY_DIR, BOOTSTRAP_DIR_NAME, BOOTSTRAP_ID_FILE_NAME());
+
+/*===================================================================
+                      Device Certificates
+===================================================================*/
+
+export const DEVICE_PRIVATE_KEY_FILE_NAME = 'aai-device-private-key.pem.key';
+export const DEVICE_CERTIFICATE_FILE_NAME = 'aai-device-cert.pem.crt';
+export const DEVICE_ID_FILE_NAME = 'aai-device-cert-id.txt';
+
+export const DEVICE_PRIVATE_KEY_FILE_PATH = join(
+  LOCAL_CERT_AND_KEY_DIR,
+  DEVICE_PRIVATE_KEY_FILE_NAME
+);
+
+export const DEVICE_CERTIFICATE_FILE_PATH = join(
+  LOCAL_CERT_AND_KEY_DIR,
+  DEVICE_CERTIFICATE_FILE_NAME
+);

package/src/util/logger.ts

@@ -26,3 +26,5 @@ export const logger = winston.createLogger({
   ),
   transports
 });
+
+logger.info(`Initialized logger with log level: ${LOG_LEVEL}`);

package/lib/cloud-connection/app-install-status.d.ts

@@ -1,16 +0,0 @@
-import { AppInstallStatusPacket } from '@alwaysai/device-agent-schemas';
-export declare class AppInstallStatus {
-    private appReleaseHash;
-    private status;
-    private message?;
-    constructor(appReleaseHash: any, status: any, message?: any);
-    getAppReleaseHash(): string;
-    update(status: any, message?: any): void;
-    getStatusPacket(): AppInstallStatusPacket;
-}
-export declare class AppInstallStatusManager {
-    private appList;
-    update(appReleaseHash: any, status: any, message?: any): void;
-    getStatusPacket(appReleaseHash: any): AppInstallStatusPacket;
-}
-//# sourceMappingURL=app-install-status.d.ts.map

package/lib/cloud-connection/app-install-status.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"app-install-status.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/app-install-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAGxE,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,OAAO,CAAC,CAAS;gBAEb,cAAc,KAAA,EAAE,MAAM,KAAA,EAAE,OAAO,CAAC,KAAA;IAMrC,iBAAiB;IAIjB,MAAM,CAAC,MAAM,KAAA,EAAE,OAAO,CAAC,KAAA;IAKvB,eAAe,IAAI,sBAAsB;CAOjD;AAED,qBAAa,uBAAuB;IAClC,OAAO,CAAC,OAAO,CAA0B;IAElC,MAAM,CAAC,cAAc,KAAA,EAAE,MAAM,KAAA,EAAE,OAAO,CAAC,KAAA;IAkBvC,eAAe,CAAC,cAAc,KAAA;CAQtC"}

package/lib/cloud-connection/app-install-status.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppInstallStatusManager = exports.AppInstallStatus = void 0;
-class AppInstallStatus {
-    constructor(appReleaseHash, status, message) {
-        this.appReleaseHash = appReleaseHash;
-        this.status = status;
-        this.message = message;
-    }
-    getAppReleaseHash() {
-        return this.appReleaseHash;
-    }
-    update(status, message) {
-        this.status = status;
-        this.message = message;
-    }
-    getStatusPacket() {
-        return {
-            status: this.status,
-            message: this.message,
-            appReleaseHash: this.appReleaseHash
-        };
-    }
-}
-exports.AppInstallStatus = AppInstallStatus;
-class AppInstallStatusManager {
-    constructor() {
-        this.appList = [];
-    }
-    update(appReleaseHash, status, message) {
-        // Update status if existing
-        // TODO: Reimplement this as a map
-        for (const app of this.appList) {
-            if (app.getAppReleaseHash() === appReleaseHash) {
-                app.update(status, message);
-                return;
-            }
-        }
-        // App was not found, so add to list
-        const appInstallStatus = new AppInstallStatus(appReleaseHash, status, message);
-        this.appList.push(appInstallStatus);
-    }
-    getStatusPacket(appReleaseHash) {
-        for (const app of this.appList) {
-            if (app.getAppReleaseHash() === appReleaseHash) {
-                return app.getStatusPacket();
-            }
-        }
-        throw new Error(`No status for ${appReleaseHash}`);
-    }
-}
-exports.AppInstallStatusManager = AppInstallStatusManager;
-//# sourceMappingURL=app-install-status.js.map

package/lib/cloud-connection/app-install-status.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"app-install-status.js","sourceRoot":"","sources":["../../src/cloud-connection/app-install-status.ts"],"names":[],"mappings":";;;AAGA,MAAa,gBAAgB;IAK3B,YAAY,cAAc,EAAE,MAAM,EAAE,OAAQ;QAC1C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,iBAAiB;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAEM,MAAM,CAAC,MAAM,EAAE,OAAQ;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,eAAe;QACpB,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAC;IACJ,CAAC;CACF;AA3BD,4CA2BC;AAED,MAAa,uBAAuB;IAApC;QACU,YAAO,GAAuB,EAAE,CAAC;IA4B3C,CAAC;IA1BQ,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,OAAQ;QAC5C,4BAA4B;QAC5B,kCAAkC;QAClC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE;YAC9B,IAAI,GAAG,CAAC,iBAAiB,EAAE,KAAK,cAAc,EAAE;gBAC9C,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC5B,OAAO;aACR;SACF;QACD,oCAAoC;QACpC,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAC3C,cAAc,EACd,MAAM,EACN,OAAO,CACR,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACtC,CAAC;IAEM,eAAe,CAAC,cAAc;QACnC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE;YAC9B,IAAI,GAAG,CAAC,iBAAiB,EAAE,KAAK,cAAc,EAAE;gBAC9C,OAAO,GAAG,CAAC,eAAe,EAAE,CAAC;aAC9B;SACF;QACD,MAAM,IAAI,KAAK,CAAC,iBAAiB,cAAc,EAAE,CAAC,CAAC;IACrD,CAAC;CACF;AA7BD,0DA6BC"}

package/lib/util/timer.d.ts

@@ -1,2 +0,0 @@
-export declare const timer: (ms: number) => Promise<unknown>;
-//# sourceMappingURL=timer.d.ts.map

package/lib/util/timer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../src/util/timer.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,OAAQ,MAAM,qBAA8C,CAAC"}

package/lib/util/timer.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.timer = void 0;
-const timer = (ms) => new Promise((res) => setTimeout(res, ms));
-exports.timer = timer;
-//# sourceMappingURL=timer.js.map

package/lib/util/timer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"timer.js","sourceRoot":"","sources":["../../src/util/timer.ts"],"names":[],"mappings":";;;AAAO,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;AAAlE,QAAA,KAAK,SAA6D"}

package/src/cloud-connection/app-install-status.ts

@@ -1,62 +0,0 @@
-import { AppInstallStatusPacket } from '@alwaysai/device-agent-schemas';
-import { AppInstallStatusValue } from '@alwaysai/device-agent-schemas/lib/constants';
-
-export class AppInstallStatus {
-  private appReleaseHash: string;
-  private status: AppInstallStatusValue;
-  private message?: string;
-
-  constructor(appReleaseHash, status, message?) {
-    this.appReleaseHash = appReleaseHash;
-    this.status = status;
-    this.message = message;
-  }
-
-  public getAppReleaseHash() {
-    return this.appReleaseHash;
-  }
-
-  public update(status, message?) {
-    this.status = status;
-    this.message = message;
-  }
-
-  public getStatusPacket(): AppInstallStatusPacket {
-    return {
-      status: this.status,
-      message: this.message,
-      appReleaseHash: this.appReleaseHash
-    };
-  }
-}
-
-export class AppInstallStatusManager {
-  private appList: AppInstallStatus[] = [];
-
-  public update(appReleaseHash, status, message?) {
-    // Update status if existing
-    // TODO: Reimplement this as a map
-    for (const app of this.appList) {
-      if (app.getAppReleaseHash() === appReleaseHash) {
-        app.update(status, message);
-        return;
-      }
-    }
-    // App was not found, so add to list
-    const appInstallStatus = new AppInstallStatus(
-      appReleaseHash,
-      status,
-      message
-    );
-    this.appList.push(appInstallStatus);
-  }
-
-  public getStatusPacket(appReleaseHash) {
-    for (const app of this.appList) {
-      if (app.getAppReleaseHash() === appReleaseHash) {
-        return app.getStatusPacket();
-      }
-    }
-    throw new Error(`No status for ${appReleaseHash}`);
-  }
-}

package/src/util/timer.ts

@@ -1 +0,0 @@
-export const timer = (ms: number) => new Promise((res) => setTimeout(res, ms));