@alwaysai/device-agent 1.2.0 → 1.3.0

package/src/subcommands/device/device.ts

@@ -14,7 +14,9 @@ import { JsSpawner } from 'alwaysai/lib/util';
 import {
   getCpuDetails,
   getDiskDetails,
-  getMemDetails
+  getMemDetails,
+  getSystemInformation,
+  reboot
 } from '../../device-control/device-control';
 import { writeTokenAndDeviceCfg } from '../../infrastructure/tokens-and-device-cfg';
 import { logger } from '../../util/logger';
@@ -109,24 +111,33 @@ export const getInfoCliLeaf = CliLeaf({
     const cpuDetails = await getCpuDetails();
     const diskDetails = await getDiskDetails();
     const memDetails = await getMemDetails();
-    const deviceInfo = [
-      [
-        'CPU Utilization',
-        `Used ${cpuDetails.usedPerc.toFixed(2)}%, Temperature: ${
-          cpuDetails.temperature
-        } °C`
-      ],
-      [
-        'Disk Utilization',
-        `${diskDetails.usedGb} GB / ${
-          diskDetails.usedGb + diskDetails.freeGb
-        } GB`
-      ],
-      [
-        'Memory Utilization',
-        `${memDetails.usedMb} MB / ${memDetails.usedMb + memDetails.freeMb} MB`
-      ]
-    ];
-    console.table(deviceInfo);
+    const out = {
+      'CPU Utilization': `Used ${cpuDetails.usedPerc.toFixed(
+        2
+      )}%, Temperature ${cpuDetails.temperature} °C`,
+      'Disk Utilization': `${diskDetails.usedGb} GB / ${
+        diskDetails.usedGb + diskDetails.freeGb
+      } GB`,
+      'Memory Utilization': `${memDetails.usedMb} MB / ${
+        memDetails.usedMb + memDetails.freeMb
+      } MB`
+    };
+    console.table(out);
+    const systemInfo = await getSystemInformation();
+    console.table(systemInfo.os);
+    console.table(systemInfo.cpu);
+    console.table(systemInfo.disk?.drives);
+    console.table(systemInfo.device);
+    console.table(systemInfo.network);
+    console.table(systemInfo.versions);
+  }
+});
+
+export const restartCliLeaf = CliLeaf({
+  name: 'restart',
+  description: 'Restart the device',
+  namedInputs: {},
+  async action(_, opts) {
+    await reboot();
   }
 });

package/src/subcommands/device/index.ts

@@ -1,9 +1,9 @@
 import { CliBranch } from '@alwaysai/alwayscli';
-import { getInfoCliLeaf, initCliLeaf } from './device';
+import { getInfoCliLeaf, initCliLeaf, restartCliLeaf } from './device';
 import { cleanCliLeaf } from './clean';
 
 export const deviceCliBranch = CliBranch({
   name: 'device',
   description: 'Manage current device',
-  subcommands: [initCliLeaf, getInfoCliLeaf, cleanCliLeaf]
+  subcommands: [initCliLeaf, getInfoCliLeaf, cleanCliLeaf, restartCliLeaf]
 });

package/src/util/logger.ts

@@ -2,19 +2,24 @@ import * as winston from 'winston';
 import 'winston-daily-rotate-file';
 import * as path from 'path';
 import { AAI_DIR } from 'alwaysai/lib/paths';
-import { ALWAYSAI_LOG_LEVEL, ALWAYSAI_LOG_TO_CONSOLE } from '../environment';
+import {
+  ALWAYSAI_DEVICE_AGENT_MODE,
+  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'
-      })
-    ];
+const transports =
+  ALWAYSAI_LOG_TO_CONSOLE || ALWAYSAI_DEVICE_AGENT_MODE !== 'cloud'
+    ? [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'
+        })
+      ];
 
 export const logger = winston.createLogger({
   level: LOG_LEVEL,

package/src/util/safe-rimraf.ts

@@ -0,0 +1,14 @@
+import { rimraf } from 'rimraf';
+import { logger } from '../util/logger';
+
+export default async function safeRimraf(path: string) {
+  logger.debug(`Removing ${path}`);
+  try {
+    await rimraf(path);
+  } catch (e) {
+    logger.error(
+      `Failed to remove ${path}. Please manually delete the file or directory.`
+    );
+    logger.debug(`Error removing ${path}: ${e}`);
+  }
+}

package/lib/cloud-connection/transaction-queue.d.ts

@@ -1,12 +0,0 @@
-export declare class TransactionQueue {
-    private transactionList;
-    private txIdToProjectIdMap;
-    constructor();
-    addTxIdToQueue(txId: string, projectId: string): void;
-    getCurrentTxId(): string;
-    checkTxnInQueue(txId: string): boolean;
-    getProjectIdForTxnId(txId: string): string;
-    completeTxn(txId: string): void;
-    completeCurrentTxn(): void;
-}
-//# sourceMappingURL=transaction-queue.d.ts.map

package/lib/cloud-connection/transaction-queue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"transaction-queue.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/transaction-queue.ts"],"names":[],"mappings":"AAAA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,eAAe,CAAW;IAClC,OAAO,CAAC,kBAAkB,CAAkC;;IAOrD,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAS9C,cAAc;IAId,eAAe,CAAC,IAAI,EAAE,MAAM;IAI5B,oBAAoB,CAAC,IAAI,EAAE,MAAM;IAIjC,WAAW,CAAC,IAAI,EAAE,MAAM;IAKxB,kBAAkB;CAI1B"}

package/lib/cloud-connection/transaction-queue.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransactionQueue = void 0;
-class TransactionQueue {
-    constructor() {
-        this.txIdToProjectIdMap = {};
-        this.transactionList = [];
-        this.txIdToProjectIdMap = {};
-    }
-    addTxIdToQueue(txId, projectId) {
-        if (!this.checkTxnInQueue(txId)) {
-            this.transactionList.push(txId);
-            this.txIdToProjectIdMap[txId] = projectId;
-        }
-        else {
-            throw new Error(`txId ${txId} is already added to the queue!`);
-        }
-    }
-    getCurrentTxId() {
-        return this.transactionList[0];
-    }
-    checkTxnInQueue(txId) {
-        return this.transactionList.includes(txId);
-    }
-    getProjectIdForTxnId(txId) {
-        return this.txIdToProjectIdMap[txId];
-    }
-    completeTxn(txId) {
-        delete this.txIdToProjectIdMap[txId];
-        this.transactionList.splice(this.transactionList.indexOf(txId), 1);
-    }
-    completeCurrentTxn() {
-        delete this.txIdToProjectIdMap[this.transactionList[0]];
-        this.transactionList.shift();
-    }
-}
-exports.TransactionQueue = TransactionQueue;
-//# sourceMappingURL=transaction-queue.js.map

package/lib/cloud-connection/transaction-queue.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"transaction-queue.js","sourceRoot":"","sources":["../../src/cloud-connection/transaction-queue.ts"],"names":[],"mappings":";;;AAAA,MAAa,gBAAgB;IAI3B;QAFQ,uBAAkB,GAA+B,EAAE,CAAC;QAG1D,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;IAEM,cAAc,CAAC,IAAY,EAAE,SAAiB;QACnD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;YAC/B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;SAC3C;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,iCAAiC,CAAC,CAAC;SAChE;IACH,CAAC;IAEM,cAAc;QACnB,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IAEM,eAAe,CAAC,IAAY;QACjC,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAEM,oBAAoB,CAAC,IAAY;QACtC,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAEM,WAAW,CAAC,IAAY;QAC7B,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;CACF;AAvCD,4CAuCC"}

package/lib/cloud-connection/transaction-queue.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=transaction-queue.test.d.ts.map

package/lib/cloud-connection/transaction-queue.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"transaction-queue.test.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/transaction-queue.test.ts"],"names":[],"mappings":""}

package/lib/cloud-connection/transaction-queue.test.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
-const transaction_queue_1 = require("./transaction-queue");
-describe('Test Transaction Queue', () => {
-    let txnQueue;
-    beforeEach(() => {
-        txnQueue = new transaction_queue_1.TransactionQueue();
-        jest.clearAllMocks();
-    });
-    test('Add new to transaction queue', async () => {
-        const txId = (0, device_agent_schemas_1.generateTxId)();
-        const projectId = '1241fad-agah-gfadg-2352dgzg';
-        txnQueue.addTxIdToQueue(txId, projectId);
-        expect(txnQueue.checkTxnInQueue(txId)).toBeTruthy();
-    });
-    test('Attempt to add existing to transaction queue, results in failure', async () => {
-        const txId = (0, device_agent_schemas_1.generateTxId)();
-        const projectId = '1241fad-agah-gfadg-2352dgzg';
-        txnQueue.addTxIdToQueue(txId, projectId);
-        expect(() => txnQueue.addTxIdToQueue(txId, projectId)).toThrow(`txId ${txId} is already added to the queue!`);
-    });
-    test('Check current transaction', async () => {
-        const txId = (0, device_agent_schemas_1.generateTxId)();
-        const projectId = '1241fad-agah-gfadg-2352dgzg';
-        txnQueue.addTxIdToQueue(txId, projectId);
-        const txId2 = (0, device_agent_schemas_1.generateTxId)();
-        const projectId2 = '1241faegta-agah-gagadg-2352dgzg';
-        txnQueue.addTxIdToQueue(txId2, projectId2);
-        expect(txnQueue.getCurrentTxId()).toEqual(txId);
-    });
-    test('Test remove transaction from queue', async () => {
-        const txId = (0, device_agent_schemas_1.generateTxId)();
-        const projectId = '1241fad-agah-gfadg-2352dgzg';
-        txnQueue.addTxIdToQueue(txId, projectId);
-        txnQueue.completeCurrentTxn();
-        expect(txnQueue.getCurrentTxId()).toBeUndefined();
-    });
-    test('Test get project ID for a given txId', async () => {
-        const txId = (0, device_agent_schemas_1.generateTxId)();
-        const projectId = '1241fad-agah-gfadg-2352dgzg';
-        txnQueue.addTxIdToQueue(txId, projectId);
-        expect(txnQueue.getProjectIdForTxnId(txId)).toEqual(projectId);
-    });
-});
-//# sourceMappingURL=transaction-queue.test.js.map

package/lib/cloud-connection/transaction-queue.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"transaction-queue.test.js","sourceRoot":"","sources":["../../src/cloud-connection/transaction-queue.test.ts"],"names":[],"mappings":";;AAAA,yEAA8D;AAC9D,2DAAuD;AAEvD,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,IAAI,QAA0B,CAAC;IAE/B,UAAU,CAAC,GAAG,EAAE;QACd,QAAQ,GAAG,IAAI,oCAAgB,EAAE,CAAC;QAClC,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,IAAI,GAAG,IAAA,mCAAY,GAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,6BAA6B,CAAC;QAChD,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACzC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAClF,MAAM,IAAI,GAAG,IAAA,mCAAY,GAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,6BAA6B,CAAC;QAChD,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAC5D,QAAQ,IAAI,iCAAiC,CAC9C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,IAAI,GAAG,IAAA,mCAAY,GAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,6BAA6B,CAAC;QAChD,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAEzC,MAAM,KAAK,GAAG,IAAA,mCAAY,GAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,iCAAiC,CAAC;QACrD,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC3C,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QACpD,MAAM,IAAI,GAAG,IAAA,mCAAY,GAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,6BAA6B,CAAC;QAChD,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACzC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QAE9B,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACtD,MAAM,IAAI,GAAG,IAAA,mCAAY,GAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,6BAA6B,CAAC;QAChD,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAEzC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -1,55 +0,0 @@
-import { generateTxId } from '@alwaysai/device-agent-schemas';
-import { TransactionQueue } from './transaction-queue';
-
-describe('Test Transaction Queue', () => {
-  let txnQueue: TransactionQueue;
-
-  beforeEach(() => {
-    txnQueue = new TransactionQueue();
-    jest.clearAllMocks();
-  });
-
-  test('Add new to transaction queue', async () => {
-    const txId = generateTxId();
-    const projectId = '1241fad-agah-gfadg-2352dgzg';
-    txnQueue.addTxIdToQueue(txId, projectId);
-    expect(txnQueue.checkTxnInQueue(txId)).toBeTruthy();
-  });
-
-  test('Attempt to add existing to transaction queue, results in failure', async () => {
-    const txId = generateTxId();
-    const projectId = '1241fad-agah-gfadg-2352dgzg';
-    txnQueue.addTxIdToQueue(txId, projectId);
-    expect(() => txnQueue.addTxIdToQueue(txId, projectId)).toThrow(
-      `txId ${txId} is already added to the queue!`
-    );
-  });
-
-  test('Check current transaction', async () => {
-    const txId = generateTxId();
-    const projectId = '1241fad-agah-gfadg-2352dgzg';
-    txnQueue.addTxIdToQueue(txId, projectId);
-
-    const txId2 = generateTxId();
-    const projectId2 = '1241faegta-agah-gagadg-2352dgzg';
-    txnQueue.addTxIdToQueue(txId2, projectId2);
-    expect(txnQueue.getCurrentTxId()).toEqual(txId);
-  });
-
-  test('Test remove transaction from queue', async () => {
-    const txId = generateTxId();
-    const projectId = '1241fad-agah-gfadg-2352dgzg';
-    txnQueue.addTxIdToQueue(txId, projectId);
-    txnQueue.completeCurrentTxn();
-
-    expect(txnQueue.getCurrentTxId()).toBeUndefined();
-  });
-
-  test('Test get project ID for a given txId', async () => {
-    const txId = generateTxId();
-    const projectId = '1241fad-agah-gfadg-2352dgzg';
-    txnQueue.addTxIdToQueue(txId, projectId);
-
-    expect(txnQueue.getProjectIdForTxnId(txId)).toEqual(projectId);
-  });
-});

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

@@ -1,40 +0,0 @@
-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();
-  }
-}