@alwaysai/device-agent 1.5.0 → 2.0.1

package/lib/util/directories.js

@@ -1,16 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SECURE_TUNNEL_BIN_PATH = exports.SECURE_TUNNEL_BIN_DIR = exports.SECURE_TUNNEL_BIN_NAME = exports.DEVICE_CERTIFICATE_FILE_PATH = exports.DEVICE_PRIVATE_KEY_FILE_PATH = exports.DEVICE_ID_FILE_NAME = exports.DEVICE_CERTIFICATE_FILE_NAME = exports.DEVICE_PRIVATE_KEY_FILE_NAME = exports.BOOTSTRAP_ID_FILE_PATH = exports.BOOTSTRAP_CERTIFICATE_FILE_PATH = exports.BOOTSTRAP_PRIVATE_KEY_FILE_PATH = exports.BOOTSTRAP_CERTIFICATES_DIR_PATH = exports.CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = exports.BOOTSTRAP_ID_FILE_NAME = exports.BOOTSTRAP_CERTIFICATE_FILE_NAME = exports.BOOTSTRAP_PRIVATE_KEY_FILE_NAME = exports.BOOTSTRAP_DIR_NAME = exports.shortenSystemId = exports.AWS_ROOT_CERTIFICATE_FILE_PATH = exports.AWS_ROOT_CERTIFICATE_FILE_NAME = exports.CREDENTIALS_FILE_PATH = exports.DEVICE_AGENT_DOCKER_COMPOSE_PATH = exports.DEVICE_AGENT_CFG_PATH = exports.DEVICE_AGENT_CFG_DIR = exports.APP_ROOT = void 0;
+exports.SECURE_TUNNEL_BIN_PATH = exports.SECURE_TUNNEL_BIN_DIR = exports.SECURE_TUNNEL_BIN_NAME = exports.shortenSystemId = exports.AWS_ROOT_CERTIFICATE_FILE_NAME = exports.AWS_ROOT_CERTIFICATE_FILE_PATH = exports.CREDENTIALS_FILE_PATH = exports.getDeviceAgentDockerComposePath = exports.getDeviceAgentConfigPath = exports.DEVICE_AGENT_CFG_DIR = exports.APP_ROOT = void 0;
+const infrastructure_1 = require("alwaysai/lib/infrastructure");
 const paths_1 = require("alwaysai/lib/paths");
 const path_1 = require("path");
 const system_id_1 = require("../infrastructure/system-id");
 exports.APP_ROOT = (0, path_1.join)(paths_1.AAI_DIR, 'applications');
 exports.DEVICE_AGENT_CFG_DIR = 'device-agent';
-exports.DEVICE_AGENT_CFG_PATH = (0, path_1.join)(paths_1.LOCAL_AAI_CFG_DIR, exports.DEVICE_AGENT_CFG_DIR);
-exports.DEVICE_AGENT_DOCKER_COMPOSE_PATH = (0, path_1.join)(exports.DEVICE_AGENT_CFG_PATH, paths_1.DOCKER_COMPOSE_FILE);
+function getDeviceAgentConfigPath(baseDir) {
+    if (baseDir) {
+        return (0, path_1.join)(baseDir, (0, infrastructure_1.getDeviceConfigPath)(), exports.DEVICE_AGENT_CFG_DIR);
+    }
+    return (0, path_1.join)(paths_1.LOCAL_AAI_CFG_DIR, (0, infrastructure_1.getDeviceConfigPath)(), exports.DEVICE_AGENT_CFG_DIR);
+}
+exports.getDeviceAgentConfigPath = getDeviceAgentConfigPath;
+function getDeviceAgentDockerComposePath(baseDir) {
+    return (0, path_1.join)(getDeviceAgentConfigPath(baseDir), paths_1.DOCKER_COMPOSE_FILE);
+}
+exports.getDeviceAgentDockerComposePath = getDeviceAgentDockerComposePath;
 exports.CREDENTIALS_FILE_PATH = (0, path_1.join)(paths_1.LOCAL_AAI_CFG_DIR, paths_1.DEVICE_TOKEN_FILE_NAME);
-exports.AWS_ROOT_CERTIFICATE_FILE_NAME = 'AmazonRootCA1.pem';
-exports.AWS_ROOT_CERTIFICATE_FILE_PATH = (0, path_1.join)(paths_1.LOCAL_CERT_AND_KEY_DIR, exports.AWS_ROOT_CERTIFICATE_FILE_NAME);
+const localDeviceCertificates = new infrastructure_1.LocalDeviceCertificates();
+exports.AWS_ROOT_CERTIFICATE_FILE_PATH = localDeviceCertificates.getRootCertificateFilePath();
+exports.AWS_ROOT_CERTIFICATE_FILE_NAME = localDeviceCertificates.getRootCertificateFileName();
 const shortenSystemId = () => {
     const id = (0, system_id_1.getSystemId)();
     switch (id) {
@@ -20,36 +31,11 @@ const shortenSystemId = () => {
             return 'qa';
         case 'production':
             return 'prod';
+        default:
+            return 'prod';
     }
 };
 exports.shortenSystemId = shortenSystemId;
-/*===================================================================
-                    Bootstrap Certificates
-===================================================================*/
-exports.BOOTSTRAP_DIR_NAME = 'bootstrap-certificates';
-const BOOTSTRAP_PRIVATE_KEY_FILE_NAME = () => `aai-claim-private-key_${(0, exports.shortenSystemId)()}.pem.key`;
-exports.BOOTSTRAP_PRIVATE_KEY_FILE_NAME = BOOTSTRAP_PRIVATE_KEY_FILE_NAME;
-const BOOTSTRAP_CERTIFICATE_FILE_NAME = () => `aai-claim-cert_${(0, exports.shortenSystemId)()}.pem.crt`;
-exports.BOOTSTRAP_CERTIFICATE_FILE_NAME = BOOTSTRAP_CERTIFICATE_FILE_NAME;
-const BOOTSTRAP_ID_FILE_NAME = () => `aai-claim-cert-id_${(0, exports.shortenSystemId)()}.txt`;
-exports.BOOTSTRAP_ID_FILE_NAME = BOOTSTRAP_ID_FILE_NAME;
-exports.CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = 'certificate-ownership-token.txt';
-const BOOTSTRAP_CERTIFICATES_DIR_PATH = () => (0, path_1.join)(paths_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME);
-exports.BOOTSTRAP_CERTIFICATES_DIR_PATH = BOOTSTRAP_CERTIFICATES_DIR_PATH;
-const BOOTSTRAP_PRIVATE_KEY_FILE_PATH = () => (0, path_1.join)(paths_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, (0, exports.BOOTSTRAP_PRIVATE_KEY_FILE_NAME)());
-exports.BOOTSTRAP_PRIVATE_KEY_FILE_PATH = BOOTSTRAP_PRIVATE_KEY_FILE_PATH;
-const BOOTSTRAP_CERTIFICATE_FILE_PATH = () => (0, path_1.join)(paths_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, (0, exports.BOOTSTRAP_CERTIFICATE_FILE_NAME)());
-exports.BOOTSTRAP_CERTIFICATE_FILE_PATH = BOOTSTRAP_CERTIFICATE_FILE_PATH;
-const BOOTSTRAP_ID_FILE_PATH = () => (0, path_1.join)(paths_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, (0, exports.BOOTSTRAP_ID_FILE_NAME)());
-exports.BOOTSTRAP_ID_FILE_PATH = BOOTSTRAP_ID_FILE_PATH;
-/*===================================================================
-                      Device Certificates
-===================================================================*/
-exports.DEVICE_PRIVATE_KEY_FILE_NAME = 'aai-device-private-key.pem.key';
-exports.DEVICE_CERTIFICATE_FILE_NAME = 'aai-device-cert.pem.crt';
-exports.DEVICE_ID_FILE_NAME = 'aai-device-cert-id.txt';
-exports.DEVICE_PRIVATE_KEY_FILE_PATH = (0, path_1.join)(paths_1.LOCAL_CERT_AND_KEY_DIR, exports.DEVICE_PRIVATE_KEY_FILE_NAME);
-exports.DEVICE_CERTIFICATE_FILE_PATH = (0, path_1.join)(paths_1.LOCAL_CERT_AND_KEY_DIR, exports.DEVICE_CERTIFICATE_FILE_NAME);
 /*===================================================================
                       Secure Tunnel bin directory
 ===================================================================*/

package/lib/util/directories.js.map

@@ -1 +1 @@
-{"version":3,"file":"directories.js","sourceRoot":"","sources":["../../src/util/directories.ts"],"names":[],"mappings":";;;AAAA,8CAM4B;AAC5B,+BAA4B;AAC5B,2DAA0D;AAE7C,QAAA,QAAQ,GAAG,IAAA,WAAI,EAAC,eAAO,EAAE,cAAc,CAAC,CAAC;AAEzC,QAAA,oBAAoB,GAAG,cAAc,CAAC;AACtC,QAAA,qBAAqB,GAAG,IAAA,WAAI,EACvC,yBAAiB,EACjB,4BAAoB,CACrB,CAAC;AACW,QAAA,gCAAgC,GAAG,IAAA,WAAI,EAClD,6BAAqB,EACrB,2BAAmB,CACpB,CAAC;AAEW,QAAA,qBAAqB,GAAG,IAAA,WAAI,EACvC,yBAAiB,EACjB,8BAAsB,CACvB,CAAC;AAEW,QAAA,8BAA8B,GAAG,mBAAmB,CAAC;AACrD,QAAA,8BAA8B,GAAG,IAAA,WAAI,EAChD,8BAAsB,EACtB,sCAA8B,CAC/B,CAAC;AAEK,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,MAAM,EAAE,GAAG,IAAA,uBAAW,GAAE,CAAC;IACzB,QAAQ,EAAE,EAAE;QACV,KAAK,aAAa;YAChB,OAAO,KAAK,CAAC;QACf,KAAK,IAAI;YACP,OAAO,IAAI,CAAC;QACd,KAAK,YAAY;YACf,OAAO,MAAM,CAAC;KACjB;AACH,CAAC,CAAC;AAVW,QAAA,eAAe,mBAU1B;AAEF;;qEAEqE;AAExD,QAAA,kBAAkB,GAAG,wBAAwB,CAAC;AACpD,MAAM,+BAA+B,GAAG,GAAG,EAAE,CAClD,yBAAyB,IAAA,uBAAe,GAAE,UAAU,CAAC;AAD1C,QAAA,+BAA+B,mCACW;AAChD,MAAM,+BAA+B,GAAG,GAAG,EAAE,CAClD,kBAAkB,IAAA,uBAAe,GAAE,UAAU,CAAC;AADnC,QAAA,+BAA+B,mCACI;AACzC,MAAM,sBAAsB,GAAG,GAAG,EAAE,CACzC,qBAAqB,IAAA,uBAAe,GAAE,MAAM,CAAC;AADlC,QAAA,sBAAsB,0BACY;AAClC,QAAA,qCAAqC,GAChD,iCAAiC,CAAC;AAE7B,MAAM,+BAA+B,GAAG,GAAG,EAAE,CAClD,IAAA,WAAI,EAAC,8BAAsB,EAAE,0BAAkB,CAAC,CAAC;AADtC,QAAA,+BAA+B,mCACO;AAE5C,MAAM,+BAA+B,GAAG,GAAG,EAAE,CAClD,IAAA,WAAI,EACF,8BAAsB,EACtB,0BAAkB,EAClB,IAAA,uCAA+B,GAAE,CAClC,CAAC;AALS,QAAA,+BAA+B,mCAKxC;AAEG,MAAM,+BAA+B,GAAG,GAAG,EAAE,CAClD,IAAA,WAAI,EACF,8BAAsB,EACtB,0BAAkB,EAClB,IAAA,uCAA+B,GAAE,CAClC,CAAC;AALS,QAAA,+BAA+B,mCAKxC;AAEG,MAAM,sBAAsB,GAAG,GAAG,EAAE,CACzC,IAAA,WAAI,EAAC,8BAAsB,EAAE,0BAAkB,EAAE,IAAA,8BAAsB,GAAE,CAAC,CAAC;AADhE,QAAA,sBAAsB,0BAC0C;AAE7E;;qEAEqE;AAExD,QAAA,4BAA4B,GAAG,gCAAgC,CAAC;AAChE,QAAA,4BAA4B,GAAG,yBAAyB,CAAC;AACzD,QAAA,mBAAmB,GAAG,wBAAwB,CAAC;AAE/C,QAAA,4BAA4B,GAAG,IAAA,WAAI,EAC9C,8BAAsB,EACtB,oCAA4B,CAC7B,CAAC;AAEW,QAAA,4BAA4B,GAAG,IAAA,WAAI,EAC9C,8BAAsB,EACtB,oCAA4B,CAC7B,CAAC;AAEF;;qEAEqE;AACxD,QAAA,sBAAsB,GAAG,YAAY,CAAC;AACtC,QAAA,qBAAqB,GAAG,eAAe,CAAC;AACxC,QAAA,sBAAsB,GAAG,IAAA,WAAI,EACxC,eAAO,EACP,6BAAqB,EACrB,8BAAsB,CACvB,CAAC"}
+{"version":3,"file":"directories.js","sourceRoot":"","sources":["../../src/util/directories.ts"],"names":[],"mappings":";;;AAAA,gEAGqC;AACrC,8CAK4B;AAC5B,+BAA4B;AAC5B,2DAA0D;AAE7C,QAAA,QAAQ,GAAG,IAAA,WAAI,EAAC,eAAO,EAAE,cAAc,CAAC,CAAC;AAEzC,QAAA,oBAAoB,GAAG,cAAc,CAAC;AAEnD,SAAgB,wBAAwB,CAAC,OAAQ;IAC/C,IAAI,OAAO,EAAE;QACX,OAAO,IAAA,WAAI,EAAC,OAAO,EAAE,IAAA,oCAAmB,GAAE,EAAE,4BAAoB,CAAC,CAAC;KACnE;IACD,OAAO,IAAA,WAAI,EAAC,yBAAiB,EAAE,IAAA,oCAAmB,GAAE,EAAE,4BAAoB,CAAC,CAAC;AAC9E,CAAC;AALD,4DAKC;AAED,SAAgB,+BAA+B,CAAC,OAAQ;IACtD,OAAO,IAAA,WAAI,EAAC,wBAAwB,CAAC,OAAO,CAAC,EAAE,2BAAmB,CAAC,CAAC;AACtE,CAAC;AAFD,0EAEC;AAEY,QAAA,qBAAqB,GAAG,IAAA,WAAI,EACvC,yBAAiB,EACjB,8BAAsB,CACvB,CAAC;AAEF,MAAM,uBAAuB,GAAG,IAAI,wCAAuB,EAAE,CAAC;AACjD,QAAA,8BAA8B,GACzC,uBAAuB,CAAC,0BAA0B,EAAE,CAAC;AAC1C,QAAA,8BAA8B,GACzC,uBAAuB,CAAC,0BAA0B,EAAE,CAAC;AAEhD,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,MAAM,EAAE,GAAG,IAAA,uBAAW,GAAE,CAAC;IACzB,QAAQ,EAAE,EAAE;QACV,KAAK,aAAa;YAChB,OAAO,KAAK,CAAC;QACf,KAAK,IAAI;YACP,OAAO,IAAI,CAAC;QACd,KAAK,YAAY;YACf,OAAO,MAAM,CAAC;QAChB;YACE,OAAO,MAAM,CAAC;KACjB;AACH,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B;AAEF;;qEAEqE;AACxD,QAAA,sBAAsB,GAAG,YAAY,CAAC;AACtC,QAAA,qBAAqB,GAAG,eAAe,CAAC;AACxC,QAAA,sBAAsB,GAAG,IAAA,WAAI,EACxC,eAAO,EACP,6BAAqB,EACrB,8BAAsB,CACvB,CAAC"}

package/lib/util/file.d.ts

@@ -4,4 +4,8 @@ export declare function pruneDir({ path, exclude, recurse }: {
     exclude?: string[];
     recurse?: boolean;
 }): Promise<boolean>;
+export declare function downloadToFile({ path, url }: {
+    path: string;
+    url: string;
+}): Promise<void>;
 //# sourceMappingURL=file.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"AAKA,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,iBAU5C;AAED,wBAAsB,QAAQ,CAAC,EAC7B,IAAI,EACJ,OAAO,EACP,OAAO,EACR,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,oBAkDA"}
+{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"AAOA,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,iBAU5C;AAED,wBAAsB,QAAQ,CAAC,EAC7B,IAAI,EACJ,OAAO,EACP,OAAO,EACR,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,oBAkDA;AAED,wBAAsB,cAAc,CAAC,EACnC,IAAI,EACJ,GAAG,EACJ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,iBAsEA"}

package/lib/util/file.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pruneDir = exports.safeRimraf = void 0;
+exports.downloadToFile = exports.pruneDir = exports.safeRimraf = void 0;
 const rimraf_1 = require("rimraf");
 const logger_1 = require("../util/logger");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
+const util_1 = require("alwaysai/lib/util");
+const fs_1 = require("fs");
 async function safeRimraf(path) {
     logger_1.logger.debug(`Removing ${path}`);
     try {
@@ -12,7 +14,7 @@ async function safeRimraf(path) {
     }
     catch (e) {
         logger_1.logger.error(`Failed to remove ${path}. Please manually delete the file or directory.`);
-        logger_1.logger.debug(`Error removing ${path}: ${e}`);
+        logger_1.logger.debug(`Error removing ${path}:\n${(0, util_1.stringifyError)(e)}`);
     }
 }
 exports.safeRimraf = safeRimraf;
@@ -57,10 +59,69 @@ async function pruneDir({ path, exclude, recurse }) {
         }
         return canPruneParent;
     }
-    catch (error) {
-        logger_1.logger.error(`Error pruning directory ${path}: ${JSON.stringify(error)}`);
+    catch (e) {
+        logger_1.logger.error(`Error pruning directory ${path}!\n${(0, util_1.stringifyError)(e)}`);
         return false;
     }
 }
 exports.pruneDir = pruneDir;
+async function downloadToFile({ path, url }) {
+    var _a;
+    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 = (_a = response.body) === null || _a === void 0 ? void 0 : _a.getReader();
+    if (reader) {
+        const chunks = [];
+        const totalSize = contentLength ? parseInt(contentLength) : undefined;
+        const PROGRESS_PERC_LOG_INCREMENT = 5;
+        const BYTE_DOWNLOAD_LOG_INCREMENT = 5000000;
+        const [baseUrl, urlParams] = url.split('?');
+        const urlForLog = `${baseUrl}${(urlParams === null || urlParams === void 0 ? void 0 : 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_1.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_1.logger.debug(`Download progress: ${progress.toFixed(2)}% - ${urlForLog}`);
+                    }
+                }
+                else {
+                    if (downloadedSize >
+                        totalDownloadedBytes + BYTE_DOWNLOAD_LOG_INCREMENT) {
+                        totalDownloadedBytes += BYTE_DOWNLOAD_LOG_INCREMENT;
+                        logger_1.logger.debug(`Download progress: ${downloadedSize} total bytes - ${urlForLog}`);
+                    }
+                }
+            }
+        }
+        logger_1.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;
+        }
+        (0, fs_1.writeFileSync)(path, combinedChunks);
+    }
+    else {
+        throw new Error('Unable to access response body when downloading file.');
+    }
+}
+exports.downloadToFile = downloadToFile;
 //# sourceMappingURL=file.js.map

package/lib/util/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAChC,2CAAwC;AACxC,0CAA2D;AAC3D,+BAA4B;AAErB,KAAK,UAAU,UAAU,CAAC,IAAY;IAC3C,eAAM,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACjC,IAAI;QACF,MAAM,IAAA,eAAM,EAAC,IAAI,CAAC,CAAC;KACpB;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CACV,oBAAoB,IAAI,iDAAiD,CAC1E,CAAC;QACF,eAAM,CAAC,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC;KAC9C;AACH,CAAC;AAVD,gCAUC;AAEM,KAAK,UAAU,QAAQ,CAAC,EAC7B,IAAI,EACJ,OAAO,EACP,OAAO,EAKR;IACC;;;;;;OAMG;IACH,IAAI;QACF,MAAM,KAAK,GAAG,MAAM,IAAA,kBAAO,EAAC,IAAI,CAAC,CAAC;QAElC,IAAI,cAAc,GAAG,IAAI,CAAC;QAE1B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAElC,MAAM,UAAU,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAC/C,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAC/B,CAAC;YAEF,IAAI,UAAU,EAAE;gBACd,eAAM,CAAC,KAAK,CAAC,kBAAkB,QAAQ,kBAAkB,CAAC,CAAC;gBAC3D,cAAc,GAAG,KAAK,CAAC;gBACvB,SAAS;aACV;YAED,MAAM,SAAS,GAAG,MAAM,IAAA,eAAI,EAAC,QAAQ,CAAC,CAAC;YACvC,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE;gBAC3B,IAAI,OAAO,EAAE;oBACX,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC;wBAChC,IAAI,EAAE,QAAQ;wBACd,OAAO;wBACP,OAAO;qBACR,CAAC,CAAC;oBAEH,IAAI,UAAU,EAAE;wBACd,MAAM,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC;qBACvB;yBAAM;wBACL,cAAc,GAAG,KAAK,CAAC;qBACxB;iBACF;aACF;iBAAM;gBACL,MAAM,IAAA,iBAAM,EAAC,QAAQ,CAAC,CAAC;aACxB;SACF;QACD,OAAO,cAAc,CAAC;KACvB;IAAC,OAAO,KAAK,EAAE;QACd,eAAM,CAAC,KAAK,CAAC,2BAA2B,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1E,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AA1DD,4BA0DC"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}

package/lib/util/get-device-id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-device-id.d.ts","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,WAiB5B"}
+{"version":3,"file":"get-device-id.d.ts","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":"AAKA,wBAAgB,aAAa,WAc5B"}

package/lib/util/get-device-id.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDeviceUuid = void 0;
 const device_1 = require("alwaysai/lib/core/device");
+const logger_1 = require("./logger");
+const util_1 = require("alwaysai/lib/util");
+const aai_error_1 = require("./aai-error");
 function getDeviceUuid() {
     const deviceCfgFile = (0, device_1.DeviceConfigFile)();
     if (!deviceCfgFile.exists()) {
@@ -12,7 +15,10 @@ function getDeviceUuid() {
         return cfg.deviceUuid;
     }
     catch (e) {
-        throw new Error(`Failed to read device configuration: ${JSON.stringify(deviceCfgFile.getErrors(), null, 2)}`);
+        logger_1.logger.error(`Failed to read device configuration!\n${(0, util_1.stringifyError)(e)}`);
+        throw new aai_error_1.default('Failed to read device configuration', {
+            cause: deviceCfgFile.getErrors()
+        });
     }
 }
 exports.getDeviceUuid = getDeviceUuid;

package/lib/util/get-device-id.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-device-id.js","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAE5D,SAAgB,aAAa;IAC3B,MAAM,aAAa,GAAG,IAAA,yBAAgB,GAAE,CAAC;IACzC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IACD,IAAI;QACF,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QACjC,OAAO,GAAG,CAAC,UAAU,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,SAAS,CACpD,aAAa,CAAC,SAAS,EAAE,EACzB,IAAI,EACJ,CAAC,CACF,EAAE,CACJ,CAAC;KACH;AACH,CAAC;AAjBD,sCAiBC"}
+{"version":3,"file":"get-device-id.js","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAC5D,qCAAkC;AAClC,4CAAmD;AACnD,2CAAmC;AAEnC,SAAgB,aAAa;IAC3B,MAAM,aAAa,GAAG,IAAA,yBAAgB,GAAE,CAAC;IACzC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IACD,IAAI;QACF,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QACjC,OAAO,GAAG,CAAC,UAAU,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,yCAAyC,IAAA,qBAAc,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3E,MAAM,IAAI,mBAAQ,CAAC,qCAAqC,EAAE;YACxD,KAAK,EAAE,aAAa,CAAC,SAAS,EAAE;SACjC,CAAC,CAAC;KACJ;AACH,CAAC;AAdD,sCAcC"}

package/lib/util/http-client.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.microServiceHttpClient = exports.httpClient = void 0;
-const node_fetch_1 = require("node-fetch");
 const endpoints_1 = require("../endpoints");
 const infrastructure_1 = require("alwaysai/lib/infrastructure");
 const logger_1 = require("../util/logger");
+const util_1 = require("alwaysai/lib/util");
 async function httpClient(url, method, headers, data) {
     const options = Object.assign({ method }, (data ? { body: data, headers } : { headers }));
     try {
-        const response = await (0, node_fetch_1.default)(url, options);
+        const response = await fetch(url, options);
         const contentType = response.headers.get('content-type');
         if (contentType === 'application/json') {
             return await response.json();
@@ -18,7 +18,7 @@ async function httpClient(url, method, headers, data) {
         }
     }
     catch (e) {
-        logger_1.logger.error(`HTTP Client error for ${url}: ${e.message}`);
+        logger_1.logger.error(`HTTP Client error for ${url}:\n${(0, util_1.stringifyError)(e)}`);
     }
 }
 exports.httpClient = httpClient;

package/lib/util/http-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":";;;AAAA,2CAA+B;AAC/B,4CAAsD;AACtD,gEAAsE;AACtE,2CAAwC;AAEjC,KAAK,UAAU,UAAU,CAC9B,GAAW,EACX,MAAc,EACd,OAAY,EACZ,IAAa;IAEb,MAAM,OAAO,mBACX,MAAM,IACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAClD,CAAC;IACF,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,WAAW,KAAK,kBAAkB,EAAE;YACtC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;QACD,IAAI,WAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;KACF;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KAC5D;AACH,CAAC;AAtBD,gCAsBC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,IAAY,EACZ,MAAc,EACd,IAAa;IAEb,MAAM,QAAQ,GAAG,IAAA,kCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAA,wCAAuB,GAAE,CAAC;IAC/D,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,EAAE,CAAC;IAC7D,OAAO,MAAM,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,CAAC,CAAC;AACvE,CAAC;AAVD,wDAUC"}
+{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":";;;AAAA,4CAAsD;AACtD,gEAAsE;AACtE,2CAAwC;AACxC,4CAAmD;AAE5C,KAAK,UAAU,UAAU,CAC9B,GAAW,EACX,MAAc,EACd,OAAY,EACZ,IAAa;IAEb,MAAM,OAAO,mBACX,MAAM,IACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAClD,CAAC;IACF,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,WAAW,KAAK,kBAAkB,EAAE;YACtC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;QACD,IAAI,WAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;KACF;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,MAAM,IAAA,qBAAc,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC;KACrE;AACH,CAAC;AAtBD,gCAsBC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,IAAY,EACZ,MAAc,EACd,IAAa;IAEb,MAAM,QAAQ,GAAG,IAAA,kCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAA,wCAAuB,GAAE,CAAC;IAC/D,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,EAAE,CAAC;IAC7D,OAAO,MAAM,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,CAAC,CAAC;AACvE,CAAC;AAVD,wDAUC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alwaysai/device-agent",
   "description": "The alwaysAI Device Agent",
-  "version": "1.5.0",
+  "version": "2.0.1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "publishConfig": {
@@ -13,7 +13,7 @@
   },
   "engines": {
     "npm": ">=7.0.0",
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -34,44 +34,46 @@
     "publish-provisioning:prod": "node ./scripts/publish-provisioning-scripts.js prod"
   },
   "dependencies": {
-    "@alwaysai/alwayscli": "0.3.2",
-    "@alwaysai/app-configuration-schemas": "0.1.0",
-    "@alwaysai/config-nodejs": "0.3.0",
-    "@alwaysai/device-agent-schemas": "2.3.3",
+    "@alwaysai/alwayscli": "0.3.3",
+    "@alwaysai/app-configuration-schemas": "0.2.0",
+    "@alwaysai/config-nodejs": "0.3.3",
+    "@alwaysai/device-agent-schemas": "3.3.0",
     "@carnesen/coded-error": "0.4.0",
     "ajv": "8.11.0",
-    "alwaysai": "2.5.3",
+    "alwaysai": "2.6.1",
     "amqplib": "0.10.3",
-    "aws-iot-device-sdk": "2.2.12",
-    "docker-compose": "0.24.3",
+    "aws-iot-device-sdk": "2.2.15",
+    "docker-compose": "0.24.8",
     "lodash": "4.17.21",
-    "node-fetch": "2.6.1",
     "node-os-utils": "1.3.7",
     "rimraf": "4.4.0",
+    "serialize-error": "8.1.0",
     "systeminformation": "5.21.13",
     "uuid": "9.0.0",
     "winston": "3.13.0",
     "winston-daily-rotate-file": "5.0.0",
-    "yaml": "2.2.1"
+    "yaml": "2.5.0"
   },
   "devDependencies": {
-    "@alwaysai/eslint-config": "0.1.0",
+    "@alwaysai/eslint-config": "0.1.3",
     "@alwaysai/tsconfig": "0.0.1",
     "@types/amqplib": "0.10.5",
     "@types/destroy": "1.0.0",
-    "@types/jest": "28.1.2",
-    "@types/node": "16.11.12",
+    "@types/jest": "29.1.2",
+    "@types/node": "18.11.9",
     "@types/node-os-utils": "^1.3.4",
+    "@types/rimraf": "3.0.2",
     "@types/sinon": "10.0.6",
+    "@types/tar": "6.1.2",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
-    "aws-sdk": "^2.1046.0",
+    "aws-sdk": "^2.1663.0",
     "cp-cli": "2.0.0",
     "get-stream": "6.0.1",
-    "jest": "28.1.1",
+    "jest": "29.7.0",
     "sinon": "12.0.1",
     "tempy": "0.7.1",
-    "ts-jest": "28.0.5",
+    "ts-jest": "29.2.3",
     "ts-mock-imports": "1.3.8",
     "ts-node": "10.8.1",
     "typescript": "4.6.4"

package/readme.md

@@ -28,7 +28,6 @@ change.
   - [Control the application](#control-the-application)
   - [Manage application models](#manage-application-models)
     - [Update models to new version of the same model ID](#update-models-to-new-version-of-the-same-model-id)
-    - [Replace models for an application for new ID](#replace-models-for-an-application-for-new-id)
     - [Manually download a model package](#manually-download-a-model-package)
   - [Set and update environment variables](#set-and-update-environment-variables)
 - [Device Cleaning and Uninstalling](#device-cleaning-and-uninstalling)
@@ -86,15 +85,18 @@ Provisioning the device performs the following:
 Run the following command on the target device to provision it:
 
 ```bash
-$ curl -fsSL https://artifacts.alwaysai.co/device-agent/provision.sh | bash -s -- --email <email> --password <password> [--device-name <device_name>]
+$ curl -fsSL https://artifacts.alwaysai.co/device-agent/provision.sh | bash -s -- --email <email> --password <password> [--device-name <device_name>] [--pm2-overwrite] [--agent-tag <agent_tag>]
 ```
 
-Where:
-* `email` is the email associated with your alwaysAI account.
-* `password` is the password for your alwaysAI account.
-* `device_name` is an optional device name, which will be displayed on the
-  devices page of the alwaysAI Dashboard. If a device name is not provided, one
-  will be generated for you and logged to the console for reference.
+
+| Options         | Details                                                                                                                                                                                                                                  |
+|:----------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| --email         | [REQUIRED] The email associated with your alwaysAI account.                                                                                                                                                                              |
+| --password      | [REQUIRED] The password associated with your alwaysAI account                                                                                                                                                                            |
+| --device-name   | [OPTIONAL] A device name to be associated with this device. It will be displayed on the devices page of the alwaysAI Dashboard. If a device name is not provided, one will be generated for you and logged to the console for reference. |
+| --pm2-overwrite | [OPTIONAL] Overwrite any existing pm2 configuration with the latest provided by the script. The default   behavior is to leave existing pm2 configurations as-is.                                                                        |
+| --agent-tag     | [OPTIONAL] Select a specific release tag for the alwaysAI Device Agent. The default option is latest, which tracks the latest production release from alwaysAI.                                                                          |
+
 
 **Important note**: If your password contains one or more special characters and you receive an error message that your password does not match your username but you are sure that it is correctly entered, please try preceding every special character in your password with a backslash, and re-running the provisioning command. You can also reset your password at https://console.alwaysai.co/dashboard by logging out, navigating to the sign in page, and clicking '`Forgot Password?`'.
 
@@ -303,7 +305,6 @@ Subcommands:
    app uninstall         : Remove an alwaysAI app
    app show-models       : Show the application models
    app add-model         : Add a model to an alwaysAI app
-   app remove-model      : Remove a model from an alwaysAI app
    app get-all-envs      : Get environment variables for an application
    app set-env           : Set environment variables for a service
    app get-analytics-cfg : Get analytics configuration for an application
@@ -362,32 +363,11 @@ There are several ways to manage the models for your application.
 #### Update models to new version of the same model ID
 
 If a new version of a model is published for an existing model ID, and an
-application is already configured to be using that model ID, updating to the
+application is already configured to be using that model ID, updating the
 new model can simply be done with:
 
 ```bash
-$ aai-agent app stop --project <project_id>
-$ aai-agent app update-models --project <project_id>
-$ aai-agent app start --project <project_id>
-```
-
-#### Replace models for an application for new ID
-
-If you'd like to install an entirely new model to an application, replacing the
-model the app was originally configured with, run the following command:
-
-```bash
-$ aai-agent app stop --project <project_id>
-$ aai-agent app replace-models --project <project_id> --models <model_id_1> [<model_id_2> ...]
-$ aai-agent app start --project <project_id>
-```
-
-If you plan on using this method, you can make your application source model ID
-agnostic by providing the model ID to edgeIQ in the following way:
-
-Select the first model in the config list:
-```python
-obj_detect = edgeiq.ObjectDetection(edgeiq._globals.MODEL_ID_LIST[0])
+$ aai-agent app add-model --project <ProjectID> --model <ModelID> --version <ModelVersion>
 ```
 
 #### Manually download a model package

package/src/application-control/config.ts

@@ -6,13 +6,14 @@ import {
   requireAppInstalled,
   requireAppReady
 } from './utils';
-import { JsSpawner } from 'alwaysai/lib/util';
+import { JsSpawner, stringifyError } from 'alwaysai/lib/util';
 import { compose } from '../docker/docker-compose';
 import { assign, merge } from 'lodash';
 import { AppJsonFile } from 'alwaysai/lib/core/app';
 import { AppConfig } from '@alwaysai/app-configuration-schemas';
 import { isAppStarted, restartApp } from './status';
 import { logger } from '../util/logger';
+import AaiError from '../util/aai-error';
 
 export async function readAppCfgFile(props: {
   projectId: string;
@@ -27,11 +28,9 @@ export async function readAppCfgFile(props: {
   try {
     return appJson.read();
   } catch (e) {
-    throw new Error(
-      `Error reading app config for ${projectId}:\n${
-        e.message
-      }\n${appJson.getErrors()}`
-    );
+    throw new AaiError(`Error reading app config for ${projectId}`, {
+      cause: appJson.getErrors()
+    });
   }
 }
 
@@ -45,11 +44,9 @@ export async function writeAppCfgFile(props: {
   try {
     appJson.write(appCfg);
   } catch (e) {
-    throw new Error(
-      `Error writing app config for ${projectId}:\n${
-        e.message
-      }\n${appJson.getErrors()}`
-    );
+    throw new AaiError(`Error writing app config for ${projectId}`, {
+      cause: appJson.getErrors()
+    });
   }
 }
 
@@ -124,7 +121,7 @@ export async function writeDockerCompose(props: {
   try {
     await compose.config({ cwd: appDir, configAsString: composeOutput });
   } catch (e) {
-    logger.error(JSON.stringify(e));
+    logger.error(stringifyError(e));
   }
   await spawner.writeFile('docker-compose.yaml', composeOutput);
 }

package/src/application-control/environment-variables.test.ts

@@ -91,6 +91,24 @@ describe('Test environment variable get and set', () => {
         edgeiq: { TEST3: '5', TEST4: '6' }
       });
     });
+    test('get all envs with one service and one cleared env', async () => {
+      const compose = {
+        services: {
+          alwaysai: {
+            environment: ['TEST=', 'TEST2=2']
+          }
+        }
+      };
+      jest.mocked(readDockerCompose).mockResolvedValue(compose);
+
+      const envVars = await getAllEnvs({ projectId: projectId1 });
+      expect(jest.mocked(readDockerCompose)).toBeCalledWith({
+        projectId: projectId1
+      });
+      expect(envVars).toEqual({
+        alwaysai: { TEST: '', TEST2: '2' }
+      });
+    });
   });
   describe('Test setEnv()', () => {
     test('Set one env', async () => {
@@ -126,7 +144,7 @@ describe('Test environment variable get and set', () => {
       };
       jest.mocked(readDockerCompose).mockResolvedValue(compose);
 
-      const envVars = { alwaysai: { TEST1: '2' } };
+      const envVars = { alwaysai: { TEST1: '2', TEST2: '2' } };
       await setEnv({ projectId: projectId1, envVars });
       expect(jest.mocked(readDockerCompose)).toBeCalledWith({
         projectId: projectId1
@@ -152,7 +170,10 @@ describe('Test environment variable get and set', () => {
       };
       jest.mocked(readDockerCompose).mockResolvedValue(compose);
 
-      const envVars = { alwaysai: { TEST1: '2' } };
+      const envVars = {
+        alwaysai: { TEST1: '2', TEST2: '4' },
+        other: { OTHER_TEST: '1' }
+      };
       await setEnv({ projectId: projectId1, envVars });
       expect(jest.mocked(readDockerCompose)).toBeCalledWith({
         projectId: projectId1
@@ -171,7 +192,7 @@ describe('Test environment variable get and set', () => {
         }
       });
     });
-    test('Remove one env', async () => {
+    test('Unset an envvar', async () => {
       const environment = ['TEST1=1', 'TEST2=2'];
       const compose = {
         services: {
@@ -180,7 +201,7 @@ describe('Test environment variable get and set', () => {
       };
       jest.mocked(readDockerCompose).mockResolvedValue(compose);
 
-      const envVars = { alwaysai: { TEST1: null } };
+      const envVars = { alwaysai: { TEST1: '', TEST2: '2' } };
       await setEnv({ projectId: projectId1, envVars });
       expect(jest.mocked(readDockerCompose)).toBeCalledWith({
         projectId: projectId1
@@ -190,7 +211,7 @@ describe('Test environment variable get and set', () => {
         dockerCompose: {
           services: {
             alwaysai: {
-              environment: ['TEST2=2']
+              environment: ['TEST1=', 'TEST2=2']
             }
           }
         }
@@ -199,12 +220,12 @@ describe('Test environment variable get and set', () => {
   });
   describe('Test helpers', () => {
     test('convertStringEnvsToKeyVal', () => {
-      const stringEnvs: string[] = ['TEST1=', 'TEST2=test2', 'TEST3=null'];
+      const stringEnvs: string[] = ['TEST1=', 'TEST2=test2', 'TEST3='];
       const envVars = convertStringEnvsToKeyVal(stringEnvs);
       expect(envVars).toEqual({
         TEST1: '',
         TEST2: 'test2',
-        TEST3: 'null'
+        TEST3: ''
       });
     });
   });