@alwaysai/device-agent 0.0.7 → 0.0.9

package/src/infrastructure/agent-config.test.ts

@@ -95,7 +95,9 @@ describe('Test Agent Config', () => {
       const version = 'im-a-version';
 
       await configFile.setAppInstalling({ projectId, version });
+      expect(await configFile.getAppVersion({ projectId })).toEqual(version);
       await configFile.setAppInstalled({ projectId, version });
+      expect(await configFile.getAppVersion({ projectId })).toEqual(version);
       await configFile.setAppUninstalled({ projectId });
       const apps = await configFile.getApps();
       expect(apps).toEqual([]);
@@ -110,9 +112,13 @@ describe('Test Agent Config', () => {
     test('Set and get backup', async () => {
       const projectId = 'add-me';
       const version = 'im-a-version';
+      const version2 = 'newer-version';
 
+      // first installation, we use the version
       await configFile.setAppInstalling({ projectId, version });
+      expect(await configFile.getAppVersion({ projectId })).toEqual(version);
       await configFile.setAppInstalled({ projectId, version });
+      expect(await configFile.getAppVersion({ projectId })).toEqual(version);
       const backup1 = await configFile.getAppBackup({ projectId });
       expect(backup1).toBeNull();
       await configFile.setAppBackup({ projectId });
@@ -138,6 +144,56 @@ describe('Test Agent Config', () => {
       });
       const backup2 = await configFile.getAppBackup({ projectId });
       expect(backup2).toEqual({ version });
+
+      await configFile.setAppInstalling({ projectId, version: version2 });
+      expect(await configFile.getAppVersion({ projectId })).toEqual(version);
+      await configFile.setAppInstalled({ projectId, version: version2 });
+      expect(await configFile.getAppVersion({ projectId })).toEqual(version2);
+      const backup3 = await configFile.getAppBackup({ projectId });
+      expect(backup3).toEqual({ version });
+    });
+
+    test('Test app rollback', async () => {
+      const projectId = 'add-me';
+      const version1 = 'original-version';
+      const version2 = 'newer-version';
+      await configFile.setAppInstalling({ projectId, version: version1 });
+      await configFile.setAppInstalled({ projectId, version: version1 });
+      expect(await configFile.getAppVersion({ projectId })).toEqual(version1);
+      expect(await configFile.getAppBackup({ projectId })).toBeNull();
+
+      // next installation - verify app is present and ready
+      expect(await configFile.isAppPresent({ projectId })).toBe(true);
+      expect(await configFile.isAppReady({ projectId })).toBe(true);
+
+      // test to see if app has backup
+      await configFile.setAppBackup({ projectId });
+      const expectedBackupVersion = (await configFile.getAppBackup({ projectId }))
+        ?.version;
+      expect(expectedBackupVersion).toEqual(version1);
+      expect(await configFile.getAppVersion({ projectId })).toEqual(version1);
+
+      // simulate second version install
+      await configFile.setAppInstalling({ projectId, version: version2 });
+      const newExpectedBackupVersion = (await configFile.getAppBackup({ projectId }))
+        ?.version;
+      expect(newExpectedBackupVersion).toEqual(version1);
+      await configFile.setAppInstalled({ projectId, version: version2 });
+      expect(await configFile.getAppVersion({ projectId })).toEqual(version2);
+
+      // simulate the rollback step: set the version that we will roll back to
+      await configFile.setAppInstalling({ projectId, version: version1 });
+
+      // test state during rollback
+      expect(await configFile.isAppReady({ projectId })).toEqual(false);
+      expect(await configFile.getAppVersion({ projectId })).toEqual(version2);
+
+      // test final state of rolled-back app
+      await configFile.setAppInstalled({ projectId, version: version1 });
+      const finalBackupVersion = (await configFile.getAppBackup({ projectId }))?.version;
+      expect(finalBackupVersion).toEqual(version1);
+      expect(await configFile.isAppReady({ projectId })).toEqual(true);
+      expect(await configFile.getAppVersion({ projectId })).toEqual(version1);
     });
   });
 });

package/src/infrastructure/agent-config.ts

@@ -2,7 +2,6 @@ import { ConfigFileSchema } from '@alwaysai/config-nodejs';
 import { JSONSchemaType } from 'ajv';
 import { homedir } from 'os';
 import { join } from 'path';
-import { ALWAYSAI_DEVICE_AGENT_MODE } from '../environment';
 
 export interface AppBackupConfig {
   version: string;
@@ -134,17 +133,16 @@ export function AgentConfigFile(dir = ALWAYSAI_CONFIG_DIR) {
 
   async function setAppInstalling(props: { projectId: string; version: string }) {
     const { projectId, version } = props;
+
     const app = await getApp({ projectId });
     if (app) {
       await removeApp({ projectId });
       const config = configFile.read();
-      config.applications.push({
-        projectId,
-        version,
-        ready: false,
-      });
+      // NOTE: do not update the version for an existing app until it is installed
+      config.applications.push({ ...app, ...{ ready: false } });
       configFile.write(config);
     } else {
+      // NOTE: for a brand-new app, we need to specify the version
       const config = configFile.read();
       config.applications.push({
         projectId,
@@ -161,21 +159,14 @@ export function AgentConfigFile(dir = ALWAYSAI_CONFIG_DIR) {
     if (app) {
       await removeApp({ projectId });
       const config = configFile.read();
-      app.version = version;
-      config.applications.push({
-        projectId,
-        version,
-        ready: true,
-      });
+      config.applications.push({ ...app, ...{ version, ready: true } });
       configFile.write(config);
     } else {
-      const config = configFile.read();
-      config.applications.push({
-        projectId,
-        version,
-        ready: true,
-      });
-      configFile.write(config);
+      // NOTE: we should never be setting an app as installed
+      // if it doesn't exist (setAppInstalling was never called)
+      throw new Error(
+        `App ${projectId} was not previously configured and could not be set to installed!`,
+      );
     }
   }
 

package/src/subcommands/app/app.ts

@@ -91,7 +91,7 @@ export const installAppCliLeaf = CliLeaf({
     if (releaseHash === undefined) {
       throw new CliTerseError('This application has not been published yet');
     }
-    await installApp({ projectId: project, releaseHash });
+    await installApp({ projectId: project, appReleaseHash: releaseHash });
   },
 });
 

package/src/subcommands/login.ts

@@ -1,6 +1,6 @@
-import { CliLeaf, CliStringInput, CliUsageError } from '@alwaysai/alwayscli';
+import { CliLeaf, CliStringInput } from '@alwaysai/alwayscli';
+import { alwaysaiUserLoginYesComponent } from 'alwaysai/lib/components/user';
 import { writeCertificateAndToken } from '../infrastructure/certificates-and-tokens';
-import { runCliCmd } from '../util/run-cli-cmd';
 
 export const loginCliLeaf = CliLeaf({
   name: 'login',
@@ -21,8 +21,10 @@ export const loginCliLeaf = CliLeaf({
   },
   async action(_, opts) {
     const { email, password, device } = opts;
-    await runCliCmd({
-      cmd: ['user', 'login', '--yes', '--email', email, '--password', password],
+
+    await alwaysaiUserLoginYesComponent({
+      alwaysaiUserEmail: email,
+      alwaysaiUserPassword: password,
     });
     if (device) {
       await writeCertificateAndToken({ deviceUuid: device });

package/src/util/copy-dir.ts

@@ -6,5 +6,7 @@ export async function copyDir(props: { srcPath: string; destPath: string }) {
   const allFileNames = await src.readdir();
   const dest = JsSpawner({ path: destPath });
   await dest.mkdirp();
-  await dest.untar(await src.tar(...allFileNames));
+  if (allFileNames.length) {
+    await dest.untar(await src.tar(...allFileNames));
+  }
 }

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

@@ -0,0 +1,15 @@
+export async function runInDir<T extends any[], R extends any>(
+  func: (...args: T) => R,
+  args: T,
+  dir: string,
+) {
+  const origCwd = process.cwd();
+  let out: R;
+  try {
+    process.chdir(dir);
+    out = await func(...args);
+  } finally {
+    process.chdir(origCwd);
+  }
+  return out;
+}

package/src/util/sleep.ts

@@ -0,0 +1,5 @@
+export default function sleep(ms: number) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}

package/lib/util/run-cli-cmd.d.ts

@@ -1,5 +0,0 @@
-export declare function runCliCmd(props: {
-    cmd: string[];
-    cwd?: string;
-}): Promise<void>;
-//# sourceMappingURL=run-cli-cmd.d.ts.map

package/lib/util/run-cli-cmd.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"run-cli-cmd.d.ts","sourceRoot":"","sources":["../../src/util/run-cli-cmd.ts"],"names":[],"mappings":"AAEA,wBAAsB,SAAS,CAAC,KAAK,EAAE;IAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAerF"}

package/lib/util/run-cli-cmd.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCliCmd = void 0;
-const alwaysai = require("alwaysai");
-async function runCliCmd(props) {
-    const { cmd, cwd } = props;
-    const origCwd = process.cwd();
-    try {
-        if (cwd) {
-            process.chdir(cwd);
-        }
-        await alwaysai.aai(...cmd);
-    }
-    catch (err) {
-        throw err;
-    }
-    finally {
-        if (cwd) {
-            process.chdir(origCwd);
-        }
-    }
-}
-exports.runCliCmd = runCliCmd;
-//# sourceMappingURL=run-cli-cmd.js.map

package/lib/util/run-cli-cmd.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"run-cli-cmd.js","sourceRoot":"","sources":["../../src/util/run-cli-cmd.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AAE9B,KAAK,UAAU,SAAS,CAAC,KAAsC;IACpE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC9B,IAAI;QACF,IAAI,GAAG,EAAE;YACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpB;QACD,MAAM,QAAQ,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;KAC5B;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,GAAG,CAAC;KACX;YAAS;QACR,IAAI,GAAG,EAAE;YACP,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SACxB;KACF;AACH,CAAC;AAfD,8BAeC"}

package/src/util/run-cli-cmd.ts

@@ -1,18 +0,0 @@
-import * as alwaysai from 'alwaysai';
-
-export async function runCliCmd(props: { cmd: string[]; cwd?: string }): Promise<void> {
-  const { cmd, cwd } = props;
-  const origCwd = process.cwd();
-  try {
-    if (cwd) {
-      process.chdir(cwd);
-    }
-    await alwaysai.aai(...cmd);
-  } catch (err) {
-    throw err;
-  } finally {
-    if (cwd) {
-      process.chdir(origCwd);
-    }
-  }
-}