@alwaysai/device-agent 1.5.0 → 2.0.0

package/src/util/file.ts

@@ -2,6 +2,8 @@ import { rimraf } from 'rimraf';
 import { logger } from '../util/logger';
 import { readdir, stat, unlink, rmdir } from 'fs/promises';
 import { join } from 'path';
+import { stringifyError } from 'alwaysai/lib/util';
+import { writeFileSync } from 'fs';
 
 export async function safeRimraf(path: string) {
   logger.debug(`Removing ${path}`);
@@ -11,7 +13,7 @@ export async function safeRimraf(path: string) {
     logger.error(
       `Failed to remove ${path}. Please manually delete the file or directory.`
     );
-    logger.debug(`Error removing ${path}: ${e}`);
+    logger.debug(`Error removing ${path}:\n${stringifyError(e)}`);
   }
 }
 
@@ -69,8 +71,86 @@ export async function pruneDir({
       }
     }
     return canPruneParent;
-  } catch (error) {
-    logger.error(`Error pruning directory ${path}: ${JSON.stringify(error)}`);
+  } catch (e) {
+    logger.error(`Error pruning directory ${path}!\n${stringifyError(e)}`);
     return false;
   }
 }
+
+export async function downloadToFile({
+  path,
+  url
+}: {
+  path: string;
+  url: string;
+}) {
+  const response = await fetch(url);
+
+  if (!response.ok) {
+    throw new Error(`Failed to fetch ${url}: ${response.statusText}`);
+  }
+
+  const contentLength = response.headers.get('content-length');
+  const reader = response.body?.getReader();
+
+  if (reader) {
+    const chunks: Uint8Array[] = [];
+    const totalSize = contentLength ? parseInt(contentLength) : undefined;
+
+    const PROGRESS_PERC_LOG_INCREMENT = 5;
+    const BYTE_DOWNLOAD_LOG_INCREMENT = 5_000_000;
+    const [baseUrl, urlParams] = url.split('?');
+    const urlForLog = `${baseUrl}${
+      urlParams?.length ? `...(${urlParams.length} more characters)` : ''
+    }`;
+    let totalDownloadedBytes = 0;
+    let downloadedSize = 0;
+    let totalProgressPerc = 0;
+
+    // eslint-disable-next-line
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) {
+        logger.info(`Download complete - ${urlForLog}`);
+        break;
+      }
+      if (value) {
+        chunks.push(value);
+        downloadedSize += value.length;
+        if (totalSize) {
+          const progress = (downloadedSize / totalSize) * 100;
+          if (progress > totalProgressPerc + PROGRESS_PERC_LOG_INCREMENT) {
+            totalProgressPerc += PROGRESS_PERC_LOG_INCREMENT;
+            logger.debug(
+              `Download progress: ${progress.toFixed(2)}% - ${urlForLog}`
+            );
+          }
+        } else {
+          if (
+            downloadedSize >
+            totalDownloadedBytes + BYTE_DOWNLOAD_LOG_INCREMENT
+          ) {
+            totalDownloadedBytes += BYTE_DOWNLOAD_LOG_INCREMENT;
+            logger.debug(
+              `Download progress: ${downloadedSize} total bytes - ${urlForLog}`
+            );
+          }
+        }
+      }
+    }
+
+    logger.debug(`Writing downloaded chunks to file ${path}`);
+    const combinedSize = chunks.reduce((acc, chunk) => acc + chunk.length, 0);
+    const combinedChunks = new Uint8Array(combinedSize);
+
+    let offset = 0;
+    for (const chunk of chunks) {
+      combinedChunks.set(chunk, offset);
+      offset += chunk.length;
+    }
+
+    writeFileSync(path, combinedChunks);
+  } else {
+    throw new Error('Unable to access response body when downloading file.');
+  }
+}

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

@@ -1,4 +1,7 @@
 import { DeviceConfigFile } from 'alwaysai/lib/core/device';
+import { logger } from './logger';
+import { stringifyError } from 'alwaysai/lib/util';
+import AaiError from './aai-error';
 
 export function getDeviceUuid() {
   const deviceCfgFile = DeviceConfigFile();
@@ -9,12 +12,9 @@ export function getDeviceUuid() {
     const cfg = deviceCfgFile.read();
     return cfg.deviceUuid;
   } catch (e) {
-    throw new Error(
-      `Failed to read device configuration: ${JSON.stringify(
-        deviceCfgFile.getErrors(),
-        null,
-        2
-      )}`
-    );
+    logger.error(`Failed to read device configuration!\n${stringifyError(e)}`);
+    throw new AaiError('Failed to read device configuration', {
+      cause: deviceCfgFile.getErrors()
+    });
   }
 }

package/src/util/http-client.ts

@@ -1,7 +1,7 @@
-import fetch from 'node-fetch';
 import { serviceEndpointBuilder } from '../endpoints';
 import { CliAuthenticationClient } from 'alwaysai/lib/infrastructure';
 import { logger } from '../util/logger';
+import { stringifyError } from 'alwaysai/lib/util';
 
 export async function httpClient(
   url: string,
@@ -23,7 +23,7 @@ export async function httpClient(
       return await response.text();
     }
   } catch (e) {
-    logger.error(`HTTP Client error for ${url}: ${e.message}`);
+    logger.error(`HTTP Client error for ${url}:\n${stringifyError(e)}`);
   }
 }
 

package/lib/util/cloud-mode-ready.d.ts

@@ -1,3 +0,0 @@
-export declare function isValidAwsRegion(region: string): boolean;
-export declare function cloudModeReady(): boolean;
-//# sourceMappingURL=cloud-mode-ready.d.ts.map

package/lib/util/cloud-mode-ready.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cloud-mode-ready.d.ts","sourceRoot":"","sources":["../../src/util/cloud-mode-ready.ts"],"names":[],"mappings":"AAuCA,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,wBAAgB,cAAc,YAe7B"}

package/lib/util/cloud-mode-ready.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cloud-mode-ready.js","sourceRoot":"","sources":["../../src/util/cloud-mode-ready.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,qDAI6B;AAE7B,MAAM,iBAAiB,GAAG;IACxB,sCAAsC;IACtC,2CAA2C;IAC3C,4CAA4C;IAC5C,4CAA4C;IAC5C,4CAA4C;IAC5C,4CAA4C;IAC5C,yCAAyC;IACzC,gDAAgD;IAChD,6CAA6C;IAC7C,8CAA8C;IAC9C,gDAAgD;IAChD,sCAAsC;IACtC,wCAAwC;IACxC,kCAAkC;IAClC,iCAAiC;IACjC,wCAAwC;IACxC,qCAAqC;IACrC,sCAAsC;IACtC,kCAAkC;IAClC,kCAAkC;IAClC,mCAAmC;IACnC,uCAAuC;IACvC,yCAAyC;IACzC,uCAAuC;IACvC,2CAA2C;IAC3C,iCAAiC;IACjC,qCAAqC;IACrC,0CAA0C;IAC1C,WAAW,CAAC,mBAAmB;CAChC,CAAC;AAEF,SAAgB,gBAAgB,CAAC,MAAc;IAC7C,OAAO,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAFD,4CAEC;AAED,SAAgB,cAAc;IAC5B,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,MAAM,aAAa,GAAG;QACpB,0CAA4B;QAC5B,0CAA4B;QAC5B,4CAA8B;KAC/B,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;QAChC,IAAI,CAAC,IAAA,eAAU,EAAC,IAAI,CAAC,EAAE;YACrB,KAAK,GAAG,KAAK,CAAC;YACd,MAAM;SACP;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAfD,wCAeC"}

package/lib/util/download-file.d.ts

@@ -1,6 +0,0 @@
-export declare function downloadFile(props: {
-    url: string;
-    path: string;
-    errorMessage: string;
-}): Promise<void>;
-//# sourceMappingURL=download-file.d.ts.map

package/lib/util/download-file.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"download-file.d.ts","sourceRoot":"","sources":["../../src/util/download-file.ts"],"names":[],"mappings":"AAIA,wBAAsB,YAAY,CAAC,KAAK,EAAE;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhB"}

package/lib/util/download-file.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadFile = void 0;
-const fs = require("fs");
-const fetch_with_timeout_1 = require("./fetch-with-timeout");
-const logger_1 = require("./logger");
-async function downloadFile(props) {
-    const { url, path, errorMessage } = props;
-    logger_1.logger.debug(`Downloading package from ${url}`);
-    let response;
-    try {
-        response = await (0, fetch_with_timeout_1.fetchWithTimeout)(url);
-    }
-    catch (e) {
-        const errorBody = e.type === 'aborted' ? e : await e.response.text();
-        throw new Error(`${errorMessage}: Error=${e}\n${errorBody}`);
-    }
-    const stream = response.body.pipe(fs.createWriteStream(path));
-    await new Promise((resolve, reject) => {
-        stream.on('finish', resolve);
-        stream.on('error', reject);
-    });
-}
-exports.downloadFile = downloadFile;
-//# sourceMappingURL=download-file.js.map

package/lib/util/download-file.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"download-file.js","sourceRoot":"","sources":["../../src/util/download-file.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,6DAAwD;AACxD,qCAAkC;AAE3B,KAAK,UAAU,YAAY,CAAC,KAIlC;IACC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IAC1C,eAAM,CAAC,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC;IAChD,IAAI,QAAa,CAAC;IAClB,IAAI;QACF,QAAQ,GAAG,MAAM,IAAA,qCAAgB,EAAC,GAAG,CAAC,CAAC;KACxC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrE,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,WAAW,CAAC,KAAK,SAAS,EAAE,CAAC,CAAC;KAC9D;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9D,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC;AApBD,oCAoBC"}

package/lib/util/fetch-with-timeout.d.ts

@@ -1,4 +0,0 @@
-export declare function fetchWithTimeout(url: string, options?: {
-    timeout?: number;
-}): Promise<any>;
-//# sourceMappingURL=fetch-with-timeout.d.ts.map

package/lib/util/fetch-with-timeout.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fetch-with-timeout.d.ts","sourceRoot":"","sources":["../../src/util/fetch-with-timeout.ts"],"names":[],"mappings":"AAmBA,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,gBAanC"}

package/lib/util/fetch-with-timeout.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchWithTimeout = void 0;
-const node_fetch_1 = require("node-fetch");
-class HTTPResponseError extends Error {
-    constructor(response) {
-        super(`HTTP Error Response: ${response.status} ${response.statusText}`);
-        this.response = response;
-    }
-}
-const checkStatus = (response) => {
-    if (response.ok) {
-        // response.status >= 200 && response.status < 300
-        return response;
-    }
-    else {
-        throw new HTTPResponseError(response);
-    }
-};
-async function fetchWithTimeout(url, options = {}) {
-    //time (ms)
-    const { timeout = 60000 } = options;
-    const controller = new AbortController();
-    const id = setTimeout(() => controller.abort(), timeout);
-    const response = await (0, node_fetch_1.default)(url, Object.assign(Object.assign({}, options), { signal: controller.signal }));
-    clearTimeout(id);
-    return checkStatus(response);
-}
-exports.fetchWithTimeout = fetchWithTimeout;
-//# sourceMappingURL=fetch-with-timeout.js.map

package/lib/util/fetch-with-timeout.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fetch-with-timeout.js","sourceRoot":"","sources":["../../src/util/fetch-with-timeout.ts"],"names":[],"mappings":";;;AAAA,2CAAmC;AAEnC,MAAM,iBAAkB,SAAQ,KAAK;IAEnC,YAAY,QAAQ;QAClB,KAAK,CAAC,wBAAwB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,EAAE;IAC/B,IAAI,QAAQ,CAAC,EAAE,EAAE;QACf,kDAAkD;QAClD,OAAO,QAAQ,CAAC;KACjB;SAAM;QACL,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;KACvC;AACH,CAAC,CAAC;AAEK,KAAK,UAAU,gBAAgB,CACpC,GAAW,EACX,UAAgC,EAAE;IAElC,WAAW;IACX,MAAM,EAAE,OAAO,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;IAEpC,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAS,EAAC,GAAG,kCAC/B,OAAO,KACV,MAAM,EAAE,UAAU,CAAC,MAAM,IACzB,CAAC;IACH,YAAY,CAAC,EAAE,CAAC,CAAC;IACjB,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAfD,4CAeC"}

package/lib/util/parsing.d.ts

@@ -1,2 +0,0 @@
-export declare function replaceFalseyWithNull(object: object, recurse?: boolean): void;
-//# sourceMappingURL=parsing.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../src/util/parsing.ts"],"names":[],"mappings":"AAAA,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,QAUtE"}

package/lib/util/parsing.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceFalseyWithNull = void 0;
-function replaceFalseyWithNull(object, recurse) {
-    if (typeof object === 'string' || object instanceof String)
-        return;
-    object &&
-        Object.keys(object).forEach((key) => {
-            if (recurse) {
-                replaceFalseyWithNull(object[key], recurse);
-            }
-            if (!object[key])
-                object[key] = null;
-        });
-}
-exports.replaceFalseyWithNull = replaceFalseyWithNull;
-//# sourceMappingURL=parsing.js.map

package/lib/util/parsing.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"parsing.js","sourceRoot":"","sources":["../../src/util/parsing.ts"],"names":[],"mappings":";;;AAAA,SAAgB,qBAAqB,CAAC,MAAc,EAAE,OAAiB;IACrE,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,YAAY,MAAM;QAAE,OAAO;IAEnE,MAAM;QACJ,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;YAC1C,IAAI,OAAO,EAAE;gBACX,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;aAC7C;YACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;gBAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QACvC,CAAC,CAAC,CAAC;AACP,CAAC;AAVD,sDAUC"}

package/src/util/download-file.ts

@@ -1,25 +0,0 @@
-import * as fs from 'fs';
-import { fetchWithTimeout } from './fetch-with-timeout';
-import { logger } from './logger';
-
-export async function downloadFile(props: {
-  url: string;
-  path: string;
-  errorMessage: string;
-}): Promise<void> {
-  const { url, path, errorMessage } = props;
-  logger.debug(`Downloading package from ${url}`);
-  let response: any;
-  try {
-    response = await fetchWithTimeout(url);
-  } catch (e) {
-    const errorBody = e.type === 'aborted' ? e : await e.response.text();
-    throw new Error(`${errorMessage}: Error=${e}\n${errorBody}`);
-  }
-
-  const stream = response.body.pipe(fs.createWriteStream(path));
-  await new Promise((resolve, reject) => {
-    stream.on('finish', resolve);
-    stream.on('error', reject);
-  });
-}

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

@@ -1,35 +0,0 @@
-import nodeFetch from 'node-fetch';
-
-class HTTPResponseError extends Error {
-  public response;
-  constructor(response) {
-    super(`HTTP Error Response: ${response.status} ${response.statusText}`);
-    this.response = response;
-  }
-}
-
-const checkStatus = (response) => {
-  if (response.ok) {
-    // response.status >= 200 && response.status < 300
-    return response;
-  } else {
-    throw new HTTPResponseError(response);
-  }
-};
-
-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 checkStatus(response);
-}

package/src/util/parsing.ts

@@ -1,11 +0,0 @@
-export function replaceFalseyWithNull(object: object, recurse?: boolean) {
-  if (typeof object === 'string' || object instanceof String) return;
-
-  object &&
-    Object.keys(object).forEach((key: string) => {
-      if (recurse) {
-        replaceFalseyWithNull(object[key], recurse);
-      }
-      if (!object[key]) object[key] = null;
-    });
-}