@alwaysai/device-agent 0.0.12 → 0.0.14

package/src/subcommands/index.ts

@@ -7,5 +7,5 @@ export const subcommands = [
   loginCliLeaf,
   appCliBranch,
   deviceCliBranch,
-  getModelPackageCliLeaf,
+  getModelPackageCliLeaf
 ];

package/src/subcommands/login.ts

@@ -1,6 +1,5 @@
 import { CliLeaf, CliStringInput } from '@alwaysai/alwayscli';
 import { alwaysaiUserLoginYesComponent } from 'alwaysai/lib/components/user';
-import { writeCertificateAndToken } from '../infrastructure/certificates-and-tokens';
 
 export const loginCliLeaf = CliLeaf({
   name: 'login',
@@ -8,26 +7,19 @@ export const loginCliLeaf = CliLeaf({
   namedInputs: {
     email: CliStringInput({
       description: 'alwaysAI email',
-      required: true,
+      required: true
     }),
     password: CliStringInput({
       description: 'Account password',
-      required: true,
-    }),
-    device: CliStringInput({
-      description: 'The device UUID',
-      required: false,
-    }),
+      required: true
+    })
   },
   async action(_, opts) {
-    const { email, password, device } = opts;
+    const { email, password } = opts;
 
     await alwaysaiUserLoginYesComponent({
       alwaysaiUserEmail: email,
-      alwaysaiUserPassword: password,
+      alwaysaiUserPassword: password
     });
-    if (device) {
-      await writeCertificateAndToken({ deviceUuid: device });
-    }
-  },
+  }
 });

package/src/util/clean-certs.ts

@@ -0,0 +1,12 @@
+import { JsSpawner } from 'alwaysai/lib/util';
+import { logger } from '../util/logger';
+import { LOCAL_CERT_AND_KEY_DIR } from 'alwaysai/lib/constants';
+import { BOOTSTRAP_CERTIFICATES_DIR_PATH } from '../util/directories';
+
+export const rmBootstrapCertsAndClose = async () => {
+  const spawner = JsSpawner();
+  await spawner.rimraf(BOOTSTRAP_CERTIFICATES_DIR_PATH());
+  await spawner.rimraf(LOCAL_CERT_AND_KEY_DIR);
+  logger.error('Could not provision device. Try again.');
+  process.exit(1);
+};

package/src/util/directories.ts

@@ -1,68 +1,84 @@
 import {
+  AAI_DIR,
   DEVICE_TOKEN_FILE_NAME,
   LOCAL_AAI_CFG_DIR,
+  LOCAL_CERT_AND_KEY_DIR
+} from 'alwaysai/lib/constants';
+import { join } from 'path';
+import { getSystemId } from '../infrastructure/system-id';
+import * as path from 'path';
+
+export const APP_ROOT = path.join(AAI_DIR, 'applications');
+
+export const CREDENTIALS_FILE_PATH = join(
+  LOCAL_AAI_CFG_DIR,
+  DEVICE_TOKEN_FILE_NAME
+);
+
+export const AWS_ROOT_CERTIFICATE_FILE_NAME = 'AmazonRootCA1.pem';
+export const AWS_ROOT_CERTIFICATE_FILE_PATH = join(
   LOCAL_CERT_AND_KEY_DIR,
-} from "alwaysai/lib/constants";
-import { join } from "path";
+  AWS_ROOT_CERTIFICATE_FILE_NAME
+);
 
-export const BOOTSTRAP_DIR_NAME = "bootstrap-certificates";
-export const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME =
-  "aai-claim-private-key_qa.pem.key";
-export const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME =
-  "aai-claim-cert_qa.pem.crt";
-export const BOOTSTRAP_CLAIM_ID_FILE_NAME = "aai-claim-cert-id_qa.txt";
-export const AWS_ROOT_CERTIFICATE_FILE_NAME = "AmazonRootCA1.pem";
-export const CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME =
-  "certificate-ownership-token.txt";
+export const shortenSystemId = () => {
+  const id = getSystemId();
+  switch (id) {
+    case 'development':
+      return 'dev';
+    case 'qa':
+      return 'qa';
+    case 'production':
+      return 'prod';
+  }
+};
 
-export const DEVICE_PRIVATE_KEY_FILE_NAME = "aai-claim-private-key_qa.pem.key";
-export const DEVICE_CERTIFICATE_FILE_NAME = "aai-claim-cert_qa.pem.crt";
-export const DEVICE_CLAIM_ID_FILE_NAME = "aai-claim-cert-id_qa.txt";
+export const BOOTSTRAP_DIR_NAME = 'bootstrap-certificates';
+export const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = () =>
+  `aai-claim-private-key_${shortenSystemId()}.pem.key`;
+export const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = () =>
+  `aai-claim-cert_${shortenSystemId()}.pem.crt`;
+export const BOOTSTRAP_CLAIM_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);
+  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);
+  return join(LOCAL_CERT_AND_KEY_DIR, DEVICE_CERTIFICATE_FILE_NAME());
 }
 
-export function getRootCertificateFilePath() {
-  return join(LOCAL_CERT_AND_KEY_DIR, AWS_ROOT_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 function getCredentialsFilePath() {
-  return join(LOCAL_AAI_CFG_DIR, DEVICE_TOKEN_FILE_NAME);
-}
+export const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = () =>
+  join(
+    LOCAL_CERT_AND_KEY_DIR,
+    BOOTSTRAP_DIR_NAME,
+    BOOTSTRAP_DEVICE_PRIVATE_KEY_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 = join(
-  LOCAL_CERT_AND_KEY_DIR,
-  BOOTSTRAP_DIR_NAME,
-  BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME
-);
-
-export const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = join(
-  LOCAL_CERT_AND_KEY_DIR,
-  BOOTSTRAP_DIR_NAME,
-  BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME
-);
+export const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = () =>
+  join(
+    LOCAL_CERT_AND_KEY_DIR,
+    BOOTSTRAP_DIR_NAME,
+    BOOTSTRAP_DEVICE_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 AWS_ROOT_CERTIFICATE_FILE_PATH = join(
-  LOCAL_CERT_AND_KEY_DIR,
-  AWS_ROOT_CERTIFICATE_FILE_NAME
-);
+export const BOOTSTRAP_CLAIM_ID_FILE_PATH = () =>
+  join(
+    LOCAL_CERT_AND_KEY_DIR,
+    BOOTSTRAP_DIR_NAME,
+    BOOTSTRAP_CLAIM_ID_FILE_NAME()
+  );

package/src/util/fetch-with-timeout.ts

@@ -0,0 +1,18 @@
+import nodeFetch from 'node-fetch';
+
+export async function fetchWithTimeout(
+  url: string,
+  options: { timeout?: number } = {}
+) {
+  //time (ms)
+  const { timeout = 60000 } = options;
+
+  const controller = new AbortController();
+  const id = setTimeout(() => controller.abort(), timeout);
+  const response = await nodeFetch(url, {
+    ...options,
+    signal: controller.signal
+  });
+  clearTimeout(id);
+  return response;
+}

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

@@ -1,22 +1,20 @@
-import { getCredentialsFilePath } from '../util/directories';
-import { CliTerseError } from '@alwaysai/alwayscli';
-import { ConfigFile } from '@alwaysai/config-nodejs';
-import * as t from 'io-ts';
+import { DeviceConfigFile } from 'alwaysai/lib/core/device';
 
-export function getDeviceId() {
-  const path = getCredentialsFilePath();
-  const codec = t.type({
-    deviceId: t.union([t.string, t.undefined]),
-  });
-  const credentialsJsonFile = ConfigFile({
-    path,
-    codec,
-  });
-  const config = credentialsJsonFile.readIfExists();
-  if (!config || !config.deviceId) {
-    throw new CliTerseError(
-      'Invalid device credentials! Please ensure you are using the device agent on a valid device.',
+export function getDeviceUuid() {
+  const deviceCfgFile = DeviceConfigFile();
+  if (!deviceCfgFile.exists()) {
+    throw new Error('Device configuration not found!');
+  }
+  try {
+    const cfg = deviceCfgFile.read();
+    return cfg.deviceUuid;
+  } catch (err) {
+    throw new Error(
+      `Failed to read device configuration: ${JSON.stringify(
+        deviceCfgFile.getErrors(),
+        null,
+        2
+      )}`
     );
   }
-  return config.deviceId;
 }

package/src/util/http-client.ts

@@ -1,25 +1,30 @@
-import fetch from "node-fetch";
-import { serviceEndpointBuilder } from "../endpoints";
-import { CliAuthenticationClient } from "alwaysai/lib/infrastructure";
+import fetch from 'node-fetch';
+import { serviceEndpointBuilder } from '../endpoints';
+import { CliAuthenticationClient } from 'alwaysai/lib/infrastructure';
+import { logger } from '../util/logger';
 
 export async function httpClient(
   url: string,
   method: string,
-  data?: string,
-  headers?: object
+  headers: any,
+  data?: string
 ) {
-  const options = { method, ...(data ? { body: data } : {}) };
+  const options = {
+    method,
+    ...(data ? { body: data, headers } : { headers })
+  };
   try {
     const response = await fetch(url, options);
-    const code = response.status;
-
-    const contentType = response.headers.get("content-type");
-    if (contentType === "application/json") {
+    const contentType = response.headers.get('content-type');
+    if (contentType === 'application/json') {
       return await response.json();
-    } else if (contentType!.includes("text/plain")) {
+    }
+    if (contentType!.includes('text/plain')) {
       return await response.text();
     }
-  } catch (e) {}
+  } catch (e) {
+    logger.error(`HTTP Client error for ${url}: ${e}`);
+  }
 }
 
 export async function microServiceHttpClient(
@@ -31,5 +36,5 @@ export async function microServiceHttpClient(
   const endpoint = serviceEndpointBuilder(service, path);
   const { getIdAuthorizationHeader } = CliAuthenticationClient();
   const authorizationHeader = await getIdAuthorizationHeader();
-  return await httpClient(endpoint, method, data);
+  return await httpClient(endpoint, method, authorizationHeader, data);
 }

package/src/util/logger.ts

@@ -5,24 +5,24 @@ import { AAI_DIR } from 'alwaysai/lib/constants';
 import { ALWAYSAI_LOG_LEVEL, ALWAYSAI_LOG_TO_CONSOLE } from '../environment';
 
 const LOG_LEVEL = ALWAYSAI_LOG_LEVEL || 'info';
+
 const transports = ALWAYSAI_LOG_TO_CONSOLE
   ? [new winston.transports.Console({ level: LOG_LEVEL })]
   : [
       new winston.transports.DailyRotateFile({
         filename: path.join(AAI_DIR, 'agent-logs', 'agent-logs.txt'),
         maxSize: '5m',
-        maxFiles: '2d',
-      }),
+        maxFiles: '2d'
+      })
     ];
 
 export const logger = winston.createLogger({
   level: LOG_LEVEL,
   format: winston.format.combine(
+    winston.format.colorize(),
     winston.format.errors({ stack: true }),
     winston.format.splat(),
-    winston.format.simple(),
+    winston.format.simple()
   ),
-  transports,
+  transports
 });
-
-logger.info(`Initialized logger with log level: ${LOG_LEVEL}`);

package/src/util/require-logged-in-and-paid-plan.ts

@@ -0,0 +1,16 @@
+import { checkPaidPlan } from 'alwaysai/lib/core/project';
+import { CliAuthenticationClient } from 'alwaysai/lib/infrastructure';
+
+export async function requireLoggedInAndPaidPlan() {
+  // FIXME: Remove this requirement
+  if (!CliAuthenticationClient().isSignedIn()) {
+    throw new Error('You must be logged in to run this command!');
+  }
+  // FIXME: This also requires Cognito and should be replaced by a check in
+  // microServiceHttpClient()
+  if (!(await checkPaidPlan())) {
+    throw new Error(
+      `This action only supported for Enterprise alwaysAI accounts!`
+    );
+  }
+}

package/src/util/run-in-dir.ts

@@ -1,7 +1,8 @@
+// eslint-disable-next-line
 export async function runInDir<T extends any[], R extends any>(
   func: (...args: T) => R,
   args: T,
-  dir: string,
+  dir: string
 ) {
   const origCwd = process.cwd();
   let out: R;

package/src/util/timer.ts

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

package/lib/infrastructure/certificates-and-tokens.d.ts

@@ -1,6 +0,0 @@
-import { Spawner } from "alwaysai/lib/util";
-export declare function getTargetHardwareUuid(spawner: Spawner): Promise<string>;
-export declare function writeCertificateAndToken(props: {
-    deviceUuid: string;
-}): Promise<void>;
-//# sourceMappingURL=certificates-and-tokens.d.ts.map

package/lib/infrastructure/certificates-and-tokens.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"certificates-and-tokens.d.ts","sourceRoot":"","sources":["../../src/infrastructure/certificates-and-tokens.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,OAAO,EAGR,MAAM,mBAAmB,CAAC;AAI3B,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,OAAO,mBAW3D;AAGD,wBAAsB,wBAAwB,CAAC,KAAK,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,iBAmB3E"}

package/lib/infrastructure/certificates-and-tokens.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeCertificateAndToken = exports.getTargetHardwareUuid = void 0;
-const device_1 = require("alwaysai/lib/components/device");
-const user_1 = require("alwaysai/lib/components/user");
-const constants_1 = require("alwaysai/lib/constants");
-const project_1 = require("alwaysai/lib/core/project");
-const util_1 = require("alwaysai/lib/util");
-const logger_1 = require("../util/logger");
-// NOTE: This is reimplemented from the CLI to work for local checks
-async function getTargetHardwareUuid(spawner) {
-    if (await spawner.exists("/var/lib/dbus/machine-id")) {
-        return await spawner.run({
-            exe: "cat",
-            args: ["/var/lib/dbus/machine-id"],
-        });
-    }
-    if (await spawner.exists("/etc/machine-id")) {
-        return await spawner.run({ exe: "cat", args: ["/etc/machine-id"] });
-    }
-    return await spawner.run({ exe: "hostname" });
-}
-exports.getTargetHardwareUuid = getTargetHardwareUuid;
-// NOTE: This closely follows the flow of deviceCheckAndUpdateComponent in the CLI
-async function writeCertificateAndToken(props) {
-    const { deviceUuid } = props;
-    await (0, user_1.checkUserIsLoggedInComponent)({ yes: true });
-    if (!(await (0, project_1.checkPaidPlan)())) {
-        throw new Error(`This action only supported for Enterprise alwaysAI accounts!`);
-    }
-    const tokens = {
-        deviceId: deviceUuid,
-        accessToken: "",
-        refreshToken: "",
-        idToken: "",
-    };
-    const tokenSpawner = (0, util_1.JsSpawner)({ path: constants_1.LOCAL_AAI_CFG_DIR });
-    await (0, util_1.writeTokens)({ spawner: tokenSpawner, tokens });
-    await (0, device_1.writeOrUpdateDeviceCfgFile)({ spawner: tokenSpawner });
-    logger_1.logger.info("Updated tokens and certificate");
-}
-exports.writeCertificateAndToken = writeCertificateAndToken;
-//# sourceMappingURL=certificates-and-tokens.js.map

package/lib/infrastructure/certificates-and-tokens.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"certificates-and-tokens.js","sourceRoot":"","sources":["../../src/infrastructure/certificates-and-tokens.ts"],"names":[],"mappings":";;;AAAA,2DAGwC;AACxC,uDAA4E;AAC5E,sDAGgC;AAChC,uDAA0D;AAC1D,4CAK2B;AAC3B,2CAAwC;AAExC,oEAAoE;AAC7D,KAAK,UAAU,qBAAqB,CAAC,OAAgB;IAC1D,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAC,EAAE;QACpD,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC;YACvB,GAAG,EAAE,KAAK;YACV,IAAI,EAAE,CAAC,0BAA0B,CAAC;SACnC,CAAC,CAAC;KACJ;IACD,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QAC3C,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;KACrE;IACD,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;AAChD,CAAC;AAXD,sDAWC;AAED,kFAAkF;AAC3E,KAAK,UAAU,wBAAwB,CAAC,KAA6B;IAC1E,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC7B,MAAM,IAAA,mCAA4B,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,IAAI,CAAC,CAAC,MAAM,IAAA,uBAAa,GAAE,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;KACH;IACD,MAAM,MAAM,GAAiB;QAC3B,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;QAChB,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,gBAAS,EAAC,EAAE,IAAI,EAAE,6BAAiB,EAAE,CAAC,CAAC;IAC5D,MAAM,IAAA,kBAAW,EAAC,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;IACrD,MAAM,IAAA,mCAA0B,EAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;IAE5D,eAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;AAChD,CAAC;AAnBD,4DAmBC"}

package/src/infrastructure/certificates-and-tokens.ts

@@ -1,53 +0,0 @@
-import {
-  DeviceTokens,
-  writeOrUpdateDeviceCfgFile,
-} from "alwaysai/lib/components/device";
-import { checkUserIsLoggedInComponent } from "alwaysai/lib/components/user";
-import {
-  LOCAL_AAI_CFG_DIR,
-  LOCAL_CERT_AND_KEY_DIR,
-} from "alwaysai/lib/constants";
-import { checkPaidPlan } from "alwaysai/lib/core/project";
-import {
-  JsSpawner,
-  Spawner,
-  writeCertificate,
-  writeTokens,
-} from "alwaysai/lib/util";
-import { logger } from "../util/logger";
-
-// NOTE: This is reimplemented from the CLI to work for local checks
-export async function getTargetHardwareUuid(spawner: Spawner) {
-  if (await spawner.exists("/var/lib/dbus/machine-id")) {
-    return await spawner.run({
-      exe: "cat",
-      args: ["/var/lib/dbus/machine-id"],
-    });
-  }
-  if (await spawner.exists("/etc/machine-id")) {
-    return await spawner.run({ exe: "cat", args: ["/etc/machine-id"] });
-  }
-  return await spawner.run({ exe: "hostname" });
-}
-
-// NOTE: This closely follows the flow of deviceCheckAndUpdateComponent in the CLI
-export async function writeCertificateAndToken(props: { deviceUuid: string }) {
-  const { deviceUuid } = props;
-  await checkUserIsLoggedInComponent({ yes: true });
-  if (!(await checkPaidPlan())) {
-    throw new Error(
-      `This action only supported for Enterprise alwaysAI accounts!`
-    );
-  }
-  const tokens: DeviceTokens = {
-    deviceId: deviceUuid,
-    accessToken: "",
-    refreshToken: "",
-    idToken: "",
-  };
-  const tokenSpawner = JsSpawner({ path: LOCAL_AAI_CFG_DIR });
-  await writeTokens({ spawner: tokenSpawner, tokens });
-  await writeOrUpdateDeviceCfgFile({ spawner: tokenSpawner });
-
-  logger.info("Updated tokens and certificate");
-}