@alwaysai/device-agent 0.0.12 → 0.0.14

package/lib/subcommands/device/device.js

@@ -2,70 +2,81 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInfoCliLeaf = exports.initCliLeaf = void 0;
 const alwayscli_1 = require("@alwaysai/alwayscli");
-const user_1 = require("alwaysai/lib/components/user");
-const project_1 = require("alwaysai/lib/core/project");
+const app_1 = require("alwaysai/lib/core/app");
 const uuid_1 = require("uuid");
 const infrastructure_1 = require("alwaysai/lib/infrastructure");
+const fs_1 = require("fs");
 const http_client_1 = require("../../util/http-client");
 const directories_1 = require("../../util/directories");
 const constants_1 = require("alwaysai/lib/constants");
 const util_1 = require("alwaysai/lib/util");
 const device_control_1 = require("../../device-control/device-control");
-const certificates_and_tokens_1 = require("../../infrastructure/certificates-and-tokens");
+const tokens_and_device_cfg_1 = require("../../infrastructure/tokens-and-device-cfg");
 const logger_1 = require("../../util/logger");
+const device_1 = require("alwaysai/lib/core/device");
+const require_logged_in_and_paid_plan_1 = require("../../util/require-logged-in-and-paid-plan");
 exports.initCliLeaf = (0, alwayscli_1.CliLeaf)({
-    name: "init",
-    description: "Initialize device",
+    name: 'init',
+    description: 'Initialize device',
     namedInputs: {
         name: (0, alwayscli_1.CliStringInput)({
-            description: "Device name",
-            required: true,
+            description: 'Device name',
+            required: false
         }),
         description: (0, alwayscli_1.CliStringInput)({
-            description: "Device description",
-            required: false,
-        }),
+            description: 'Device description',
+            required: false
+        })
     },
     async action(_, opts) {
-        const { name, description } = opts;
-        logger_1.logger.info("Initializing device");
-        await (0, user_1.checkUserIsLoggedInComponent)({ yes: true });
-        if (!(await (0, project_1.checkPaidPlan)())) {
-            throw new Error(`This action only supported for Enterprise alwaysAI accounts!`);
+        let { name } = opts;
+        name = name || (0, uuid_1.v4)();
+        if ((0, device_1.DeviceConfigFile)().exists() || (0, fs_1.existsSync)((0, directories_1.getPrivateKeyFilePath)())) {
+            throw new Error("Device has been previously provisioned. Run 'aai-agent device clean' to re-provision");
         }
+        logger_1.logger.info(`Initializing device ${name}`);
+        await (0, require_logged_in_and_paid_plan_1.requireLoggedInAndPaidPlan)();
         const { username } = await (0, infrastructure_1.CliAuthenticationClient)().getInfo();
-        const spawner = (0, util_1.JsSpawner)();
-        const hardwareId = await (0, certificates_and_tokens_1.getTargetHardwareUuid)(spawner);
+        const hardwareId = await (0, app_1.getTargetHardwareUuid)((0, util_1.JsSpawner)());
         const device = {
-            deviceMode: "production",
+            deviceMode: 'production',
             hardwareId,
             txId: (0, uuid_1.v4)(),
             userName: username,
-            friendlyName: name,
+            friendlyName: name
         };
-        const response = await (0, http_client_1.microServiceHttpClient)("fleet-provision", "addDevice", "POST", JSON.stringify(device));
-        const ROOT_CERT_AWS = await (0, http_client_1.httpClient)("https://www.amazontrust.com/repository/AmazonRootCA1.pem", "GET");
-        await (0, certificates_and_tokens_1.writeCertificateAndToken)({ deviceUuid: response.deviceUuid });
-        await (0, util_1.JsSpawner)().mkdirp(directories_1.BOOTSTRAP_CERTIFICATES_DIR_PATH);
-        (0, util_1.JsSpawner)({ path: constants_1.LOCAL_CERT_AND_KEY_DIR }).writeFile(directories_1.AWS_ROOT_CERTIFICATE_FILE_NAME, ROOT_CERT_AWS);
-        const certSpawner = (0, util_1.JsSpawner)({ path: directories_1.BOOTSTRAP_CERTIFICATES_DIR_PATH });
+        // FIXME: Use JSON schema to validate input
+        const response = await (0, http_client_1.microServiceHttpClient)('fleet-provision', 'addDevice', 'POST', JSON.stringify(device));
+        logger_1.logger.debug(`addDevice Response: ${JSON.stringify(response, null, 2)}`);
+        if (!('claimCertificate' in response)) {
+            throw new Error("Device cannot be provisioned. Run 'aai-agent device clean' and retry.");
+        }
+        const ROOT_CERT_AWS = await (0, http_client_1.httpClient)('https://www.amazontrust.com/repository/AmazonRootCA1.pem', 'GET', {});
+        await (0, tokens_and_device_cfg_1.writeTokenAndDeviceCfg)({
+            deviceUuid: response.deviceUuid
+        });
+        await (0, util_1.JsSpawner)().mkdirp((0, directories_1.BOOTSTRAP_CERTIFICATES_DIR_PATH)());
+        await (0, util_1.JsSpawner)({ path: constants_1.LOCAL_CERT_AND_KEY_DIR }).writeFile(directories_1.AWS_ROOT_CERTIFICATE_FILE_NAME, ROOT_CERT_AWS);
+        const certSpawner = (0, util_1.JsSpawner)({
+            path: (0, directories_1.BOOTSTRAP_CERTIFICATES_DIR_PATH)()
+        });
         for (const key in response.claimCertificate) {
             await certSpawner.writeFile(key, response.claimCertificate[key]);
         }
-        logger_1.logger.info(`Initialized device as ${response.deviceUuid}`);
-    },
+        logger_1.logger.info(`Initialized device ${name}: UUID=${response.deviceUuid}`);
+    }
 });
 exports.getInfoCliLeaf = (0, alwayscli_1.CliLeaf)({
-    name: "get-info",
-    description: "Get device info",
+    name: 'get-info',
+    description: 'Get device info',
     namedInputs: {},
     async action(_, opts) {
         const deviceInfo = [
-            ["CPU Utilization", `${String(await (0, device_control_1.getCpuUtil)())} %`],
-            ["Disk Utilization", `${String(await (0, device_control_1.getDiskUtil)())} %`],
-            ["Memory Utilization", `${String(await (0, device_control_1.getMemUtil)())} %`],
+            ['CPU Utilization', `${String(await (0, device_control_1.getCpuUtil)())} %`],
+            ['Disk Utilization', `${String(await (0, device_control_1.getDiskUtil)())} %`],
+            ['Memory Utilization', `${String(await (0, device_control_1.getMemUtil)())} %`]
         ];
         console.table(deviceInfo);
-    },
+    }
 });
 //# sourceMappingURL=device.js.map

package/lib/subcommands/device/device.js.map

@@ -1 +1 @@
-{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../src/subcommands/device/device.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../src/subcommands/device/device.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,+CAA8D;AAC9D,+BAAoC;AACpC,gEAAsE;AACtE,2BAAgC;AAChC,wDAA4E;AAC5E,wDAIgC;AAEhC,sDAAgE;AAChE,4CAA8C;AAC9C,wEAI6C;AAC7C,sFAAoF;AACpF,8CAA2C;AAC3C,qDAA4D;AAC5D,gGAAwF;AAE3E,QAAA,WAAW,GAAG,IAAA,mBAAO,EAAC;IACjC,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,mBAAmB;IAChC,WAAW,EAAE;QACX,IAAI,EAAE,IAAA,0BAAc,EAAC;YACnB,WAAW,EAAE,aAAa;YAC1B,QAAQ,EAAE,KAAK;SAChB,CAAC;QACF,WAAW,EAAE,IAAA,0BAAc,EAAC;YAC1B,WAAW,EAAE,oBAAoB;YACjC,QAAQ,EAAE,KAAK;SAChB,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACpB,IAAI,GAAG,IAAI,IAAI,IAAA,SAAM,GAAE,CAAC;QAExB,IAAI,IAAA,yBAAgB,GAAE,CAAC,MAAM,EAAE,IAAI,IAAA,eAAU,EAAC,IAAA,mCAAqB,GAAE,CAAC,EAAE;YACtE,MAAM,IAAI,KAAK,CACb,sFAAsF,CACvF,CAAC;SACH;QACD,eAAM,CAAC,IAAI,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC;QAC3C,MAAM,IAAA,4DAA0B,GAAE,CAAC;QACnC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,wCAAuB,GAAE,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,UAAU,GAAG,MAAM,IAAA,2BAAqB,EAAC,IAAA,gBAAS,GAAE,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG;YACb,UAAU,EAAE,YAAY;YACxB,UAAU;YACV,IAAI,EAAE,IAAA,SAAM,GAAE;YACd,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,IAAI;SACnB,CAAC;QAEF,2CAA2C;QAC3C,MAAM,QAAQ,GACZ,MAAM,IAAA,oCAAsB,EAC1B,iBAAiB,EACjB,WAAW,EACX,MAAM,EACN,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACvB,CAAC;QACJ,eAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAEzE,IAAI,CAAC,CAAC,kBAAkB,IAAI,QAAQ,CAAC,EAAE;YACrC,MAAM,IAAI,KAAK,CACb,uEAAuE,CACxE,CAAC;SACH;QACD,MAAM,aAAa,GAAG,MAAM,IAAA,wBAAU,EACpC,0DAA0D,EAC1D,KAAK,EACL,EAAE,CACH,CAAC;QAEF,MAAM,IAAA,8CAAsB,EAAC;YAC3B,UAAU,EAAE,QAAQ,CAAC,UAAU;SAChC,CAAC,CAAC;QAEH,MAAM,IAAA,gBAAS,GAAE,CAAC,MAAM,CAAC,IAAA,6CAA+B,GAAE,CAAC,CAAC;QAE5D,MAAM,IAAA,gBAAS,EAAC,EAAE,IAAI,EAAE,kCAAsB,EAAE,CAAC,CAAC,SAAS,CACzD,4CAA8B,EAC9B,aAAa,CACd,CAAC;QACF,MAAM,WAAW,GAAG,IAAA,gBAAS,EAAC;YAC5B,IAAI,EAAE,IAAA,6CAA+B,GAAE;SACxC,CAAC,CAAC;QACH,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,gBAAgB,EAAE;YAC3C,MAAM,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;SAClE;QAED,eAAM,CAAC,IAAI,CAAC,sBAAsB,IAAI,UAAU,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;IACzE,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,cAAc,GAAG,IAAA,mBAAO,EAAC;IACpC,IAAI,EAAE,UAAU;IAChB,WAAW,EAAE,iBAAiB;IAC9B,WAAW,EAAE,EAAE;IACf,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,UAAU,GAAG;YACjB,CAAC,iBAAiB,EAAE,GAAG,MAAM,CAAC,MAAM,IAAA,2BAAU,GAAE,CAAC,IAAI,CAAC;YACtD,CAAC,kBAAkB,EAAE,GAAG,MAAM,CAAC,MAAM,IAAA,4BAAW,GAAE,CAAC,IAAI,CAAC;YACxD,CAAC,oBAAoB,EAAE,GAAG,MAAM,CAAC,MAAM,IAAA,2BAAU,GAAE,CAAC,IAAI,CAAC;SAC1D,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;CACF,CAAC,CAAC"}

package/lib/subcommands/device/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/subcommands/device/index.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe,mDAI1B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/subcommands/device/index.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,mDAI1B,CAAC"}

package/lib/subcommands/device/index.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deviceCliBranch = void 0;
 const alwayscli_1 = require("@alwaysai/alwayscli");
 const device_1 = require("./device");
+const clean_1 = require("./clean");
 exports.deviceCliBranch = (0, alwayscli_1.CliBranch)({
     name: 'device',
     description: 'Manage current device',
-    subcommands: [device_1.initCliLeaf, device_1.getInfoCliLeaf],
+    subcommands: [device_1.initCliLeaf, device_1.getInfoCliLeaf, clean_1.cleanCliLeaf]
 });
 //# sourceMappingURL=index.js.map

package/lib/subcommands/device/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/subcommands/device/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,qCAAuD;AAE1C,QAAA,eAAe,GAAG,IAAA,qBAAS,EAAC;IACvC,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,CAAC,oBAAW,EAAE,uBAAc,CAAC;CAC3C,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/subcommands/device/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,qCAAuD;AACvD,mCAAuC;AAE1B,QAAA,eAAe,GAAG,IAAA,qBAAS,EAAC;IACvC,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,CAAC,oBAAW,EAAE,uBAAc,EAAE,oBAAY,CAAC;CACzD,CAAC,CAAC"}

package/lib/subcommands/get-model-package.js

@@ -12,17 +12,17 @@ exports.getModelPackageCliLeaf = (0, alwayscli_1.CliLeaf)({
     positionalInput: (0, alwayscli_1.CliStringInput)({
         description: 'For example, "alwaysai/mobilenet_ssd"',
         required: true,
-        placeholder: '<id>',
+        placeholder: '<id>'
     }),
     namedInputs: {
         version: (0, alwayscli_1.CliNumberInput)({
             description: 'The version number of the model',
-            required: false,
+            required: false
         }),
         path: (0, alwayscli_1.CliStringInput)({
             description: 'The output path to write model package to',
-            required: false,
-        }),
+            required: false
+        })
     },
     async action(id, opts) {
         const path = opts.path || process.cwd();
@@ -30,6 +30,6 @@ exports.getModelPackageCliLeaf = (0, alwayscli_1.CliLeaf)({
         const version = opts.version || (await (0, infrastructure_1.CliRpcClient)().getModelVersion({ id })).version;
         await (0, app_1.appInstallModel)(spawner, id, version);
         logger_1.logger.info(`Completed downloading ${id} to ${path}`);
-    },
+    }
 });
 //# sourceMappingURL=get-model-package.js.map

package/lib/subcommands/index.d.ts

@@ -1,7 +1,6 @@
 export declare const subcommands: (import("@alwaysai/alwayscli/lib/types").CliBranch | import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, {
     email: import("@alwaysai/alwayscli").CliInput<string, true>;
     password: import("@alwaysai/alwayscli").CliInput<string, true>;
-    device: import("@alwaysai/alwayscli").CliInput<string | undefined, false>;
 }, import("@alwaysai/alwayscli").CliInput<undefined, false>> | import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<string, true>, {
     version: import("@alwaysai/alwayscli").CliInput<number | undefined, boolean>;
     path: import("@alwaysai/alwayscli").CliInput<string | undefined, false>;

package/lib/subcommands/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/subcommands/index.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,WAAW;;;;;;;+DAKvB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/subcommands/index.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,WAAW;;;;;;+DAKvB,CAAC"}

package/lib/subcommands/index.js

@@ -9,6 +9,6 @@ exports.subcommands = [
     login_1.loginCliLeaf,
     app_1.appCliBranch,
     device_1.deviceCliBranch,
-    get_model_package_1.getModelPackageCliLeaf,
+    get_model_package_1.getModelPackageCliLeaf
 ];
 //# sourceMappingURL=index.js.map

package/lib/subcommands/login.d.ts

@@ -1,6 +1,5 @@
 export declare const loginCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, {
     email: import("@alwaysai/alwayscli").CliInput<string, true>;
     password: import("@alwaysai/alwayscli").CliInput<string, true>;
-    device: import("@alwaysai/alwayscli").CliInput<string | undefined, false>;
 }, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
 //# sourceMappingURL=login.d.ts.map

package/lib/subcommands/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/subcommands/login.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY;;;;4DA4BvB,CAAC"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/subcommands/login.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;4DAqBvB,CAAC"}

package/lib/subcommands/login.js

@@ -3,33 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loginCliLeaf = void 0;
 const alwayscli_1 = require("@alwaysai/alwayscli");
 const user_1 = require("alwaysai/lib/components/user");
-const certificates_and_tokens_1 = require("../infrastructure/certificates-and-tokens");
 exports.loginCliLeaf = (0, alwayscli_1.CliLeaf)({
     name: 'login',
     description: 'Login to alwaysAI (this is meant for scripted environments)',
     namedInputs: {
         email: (0, alwayscli_1.CliStringInput)({
             description: 'alwaysAI email',
-            required: true,
+            required: true
         }),
         password: (0, alwayscli_1.CliStringInput)({
             description: 'Account password',
-            required: true,
-        }),
-        device: (0, alwayscli_1.CliStringInput)({
-            description: 'The device UUID',
-            required: false,
-        }),
+            required: true
+        })
     },
     async action(_, opts) {
-        const { email, password, device } = opts;
+        const { email, password } = opts;
         await (0, user_1.alwaysaiUserLoginYesComponent)({
             alwaysaiUserEmail: email,
-            alwaysaiUserPassword: password,
+            alwaysaiUserPassword: password
         });
-        if (device) {
-            await (0, certificates_and_tokens_1.writeCertificateAndToken)({ deviceUuid: device });
-        }
-    },
+    }
 });
 //# sourceMappingURL=login.js.map

package/lib/subcommands/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/subcommands/login.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,uDAA6E;AAC7E,uFAAqF;AAExE,QAAA,YAAY,GAAG,IAAA,mBAAO,EAAC;IAClC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,6DAA6D;IAC1E,WAAW,EAAE;QACX,KAAK,EAAE,IAAA,0BAAc,EAAC;YACpB,WAAW,EAAE,gBAAgB;YAC7B,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,QAAQ,EAAE,IAAA,0BAAc,EAAC;YACvB,WAAW,EAAE,kBAAkB;YAC/B,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,MAAM,EAAE,IAAA,0BAAc,EAAC;YACrB,WAAW,EAAE,iBAAiB;YAC9B,QAAQ,EAAE,KAAK;SAChB,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAEzC,MAAM,IAAA,oCAA6B,EAAC;YAClC,iBAAiB,EAAE,KAAK;YACxB,oBAAoB,EAAE,QAAQ;SAC/B,CAAC,CAAC;QACH,IAAI,MAAM,EAAE;YACV,MAAM,IAAA,kDAAwB,EAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;SACxD;IACH,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/subcommands/login.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,uDAA6E;AAEhE,QAAA,YAAY,GAAG,IAAA,mBAAO,EAAC;IAClC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,6DAA6D;IAC1E,WAAW,EAAE;QACX,KAAK,EAAE,IAAA,0BAAc,EAAC;YACpB,WAAW,EAAE,gBAAgB;YAC7B,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,QAAQ,EAAE,IAAA,0BAAc,EAAC;YACvB,WAAW,EAAE,kBAAkB;YAC/B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAEjC,MAAM,IAAA,oCAA6B,EAAC;YAClC,iBAAiB,EAAE,KAAK;YACxB,oBAAoB,EAAE,QAAQ;SAC/B,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC"}

package/lib/util/clean-certs.d.ts

@@ -0,0 +1,2 @@
+export declare const rmBootstrapCertsAndClose: () => Promise<never>;
+//# sourceMappingURL=clean-certs.d.ts.map

package/lib/util/clean-certs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clean-certs.d.ts","sourceRoot":"","sources":["../../src/util/clean-certs.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,wBAAwB,sBAMpC,CAAC"}

package/lib/util/clean-certs.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rmBootstrapCertsAndClose = void 0;
+const util_1 = require("alwaysai/lib/util");
+const logger_1 = require("../util/logger");
+const constants_1 = require("alwaysai/lib/constants");
+const directories_1 = require("../util/directories");
+const rmBootstrapCertsAndClose = async () => {
+    const spawner = (0, util_1.JsSpawner)();
+    await spawner.rimraf((0, directories_1.BOOTSTRAP_CERTIFICATES_DIR_PATH)());
+    await spawner.rimraf(constants_1.LOCAL_CERT_AND_KEY_DIR);
+    logger_1.logger.error('Could not provision device. Try again.');
+    process.exit(1);
+};
+exports.rmBootstrapCertsAndClose = rmBootstrapCertsAndClose;
+//# sourceMappingURL=clean-certs.js.map

package/lib/util/clean-certs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clean-certs.js","sourceRoot":"","sources":["../../src/util/clean-certs.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAC9C,2CAAwC;AACxC,sDAAgE;AAChE,qDAAsE;AAE/D,MAAM,wBAAwB,GAAG,KAAK,IAAI,EAAE;IACjD,MAAM,OAAO,GAAG,IAAA,gBAAS,GAAE,CAAC;IAC5B,MAAM,OAAO,CAAC,MAAM,CAAC,IAAA,6CAA+B,GAAE,CAAC,CAAC;IACxD,MAAM,OAAO,CAAC,MAAM,CAAC,kCAAsB,CAAC,CAAC;IAC7C,eAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;IACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;AANW,QAAA,wBAAwB,4BAMnC"}

package/lib/util/directories.d.ts

@@ -1,20 +1,21 @@
-export declare const BOOTSTRAP_DIR_NAME = "bootstrap-certificates";
-export declare const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = "aai-claim-private-key_qa.pem.key";
-export declare const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = "aai-claim-cert_qa.pem.crt";
-export declare const BOOTSTRAP_CLAIM_ID_FILE_NAME = "aai-claim-cert-id_qa.txt";
+export declare const APP_ROOT: string;
+export declare const CREDENTIALS_FILE_PATH: string;
 export declare const AWS_ROOT_CERTIFICATE_FILE_NAME = "AmazonRootCA1.pem";
+export declare const AWS_ROOT_CERTIFICATE_FILE_PATH: string;
+export declare const shortenSystemId: () => "qa" | "dev" | "prod" | undefined;
+export declare const BOOTSTRAP_DIR_NAME = "bootstrap-certificates";
+export declare const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME: () => string;
+export declare const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME: () => string;
+export declare const BOOTSTRAP_CLAIM_ID_FILE_NAME: () => string;
 export declare const CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = "certificate-ownership-token.txt";
-export declare const DEVICE_PRIVATE_KEY_FILE_NAME = "aai-claim-private-key_qa.pem.key";
-export declare const DEVICE_CERTIFICATE_FILE_NAME = "aai-claim-cert_qa.pem.crt";
-export declare const DEVICE_CLAIM_ID_FILE_NAME = "aai-claim-cert-id_qa.txt";
+export declare const DEVICE_PRIVATE_KEY_FILE_NAME: () => string;
+export declare const DEVICE_CERTIFICATE_FILE_NAME: () => string;
+export declare const DEVICE_CLAIM_ID_FILE_NAME: () => string;
 export declare function getPrivateKeyFilePath(): string;
 export declare function getCertificateFilePath(): string;
-export declare function getRootCertificateFilePath(): string;
-export declare function getCredentialsFilePath(): string;
-export declare const BOOTSTRAP_CERTIFICATES_DIR_PATH: string;
-export declare const DEVICE_CLAIM_ID_FILE_PATH: string;
-export declare const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH: string;
-export declare const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH: string;
-export declare const BOOTSTRAP_CLAIM_ID_FILE_PATH: string;
-export declare const AWS_ROOT_CERTIFICATE_FILE_PATH: string;
+export declare const BOOTSTRAP_CERTIFICATES_DIR_PATH: () => string;
+export declare const DEVICE_CLAIM_ID_FILE_PATH: () => string;
+export declare const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH: () => string;
+export declare const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH: () => string;
+export declare const BOOTSTRAP_CLAIM_ID_FILE_PATH: () => string;
 //# sourceMappingURL=directories.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"directories.d.ts","sourceRoot":"","sources":["../../src/util/directories.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,kBAAkB,2BAA2B,CAAC;AAC3D,eAAO,MAAM,sCAAsC,qCACf,CAAC;AACrC,eAAO,MAAM,sCAAsC,8BACtB,CAAC;AAC9B,eAAO,MAAM,4BAA4B,6BAA6B,CAAC;AACvE,eAAO,MAAM,8BAA8B,sBAAsB,CAAC;AAClE,eAAO,MAAM,qCAAqC,oCACf,CAAC;AAEpC,eAAO,MAAM,4BAA4B,qCAAqC,CAAC;AAC/E,eAAO,MAAM,4BAA4B,8BAA8B,CAAC;AACxE,eAAO,MAAM,yBAAyB,6BAA6B,CAAC;AAEpE,wBAAgB,qBAAqB,WAEpC;AAED,wBAAgB,sBAAsB,WAErC;AAED,wBAAgB,0BAA0B,WAEzC;AAED,wBAAgB,sBAAsB,WAErC;AAED,eAAO,MAAM,+BAA+B,QAG3C,CAAC;AACF,eAAO,MAAM,yBAAyB,QAGrC,CAAC;AAEF,eAAO,MAAM,sCAAsC,QAIlD,CAAC;AAEF,eAAO,MAAM,sCAAsC,QAIlD,CAAC;AAEF,eAAO,MAAM,4BAA4B,QAIxC,CAAC;AAEF,eAAO,MAAM,8BAA8B,QAG1C,CAAC"}
+{"version":3,"file":"directories.d.ts","sourceRoot":"","sources":["../../src/util/directories.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,QAAQ,QAAqC,CAAC;AAE3D,eAAO,MAAM,qBAAqB,QAGjC,CAAC;AAEF,eAAO,MAAM,8BAA8B,sBAAsB,CAAC;AAClE,eAAO,MAAM,8BAA8B,QAG1C,CAAC;AAEF,eAAO,MAAM,eAAe,yCAU3B,CAAC;AAEF,eAAO,MAAM,kBAAkB,2BAA2B,CAAC;AAC3D,eAAO,MAAM,sCAAsC,cACG,CAAC;AACvD,eAAO,MAAM,sCAAsC,cACJ,CAAC;AAChD,eAAO,MAAM,4BAA4B,cACK,CAAC;AAC/C,eAAO,MAAM,qCAAqC,oCACf,CAAC;AACpC,eAAO,MAAM,4BAA4B,cACa,CAAC;AACvD,eAAO,MAAM,4BAA4B,cACM,CAAC;AAChD,eAAO,MAAM,yBAAyB,cACQ,CAAC;AAE/C,wBAAgB,qBAAqB,WAEpC;AAED,wBAAgB,sBAAsB,WAErC;AAED,eAAO,MAAM,+BAA+B,cACM,CAAC;AACnD,eAAO,MAAM,yBAAyB,cACgB,CAAC;AAEvD,eAAO,MAAM,sCAAsC,cAKhD,CAAC;AAEJ,eAAO,MAAM,sCAAsC,cAKhD,CAAC;AAEJ,eAAO,MAAM,4BAA4B,cAKtC,CAAC"}

package/lib/util/directories.js

@@ -1,37 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AWS_ROOT_CERTIFICATE_FILE_PATH = exports.BOOTSTRAP_CLAIM_ID_FILE_PATH = exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = exports.DEVICE_CLAIM_ID_FILE_PATH = exports.BOOTSTRAP_CERTIFICATES_DIR_PATH = exports.getCredentialsFilePath = exports.getRootCertificateFilePath = exports.getCertificateFilePath = exports.getPrivateKeyFilePath = exports.DEVICE_CLAIM_ID_FILE_NAME = exports.DEVICE_CERTIFICATE_FILE_NAME = exports.DEVICE_PRIVATE_KEY_FILE_NAME = exports.CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = exports.AWS_ROOT_CERTIFICATE_FILE_NAME = exports.BOOTSTRAP_CLAIM_ID_FILE_NAME = exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = exports.BOOTSTRAP_DIR_NAME = void 0;
+exports.BOOTSTRAP_CLAIM_ID_FILE_PATH = exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = exports.DEVICE_CLAIM_ID_FILE_PATH = exports.BOOTSTRAP_CERTIFICATES_DIR_PATH = exports.getCertificateFilePath = exports.getPrivateKeyFilePath = exports.DEVICE_CLAIM_ID_FILE_NAME = exports.DEVICE_CERTIFICATE_FILE_NAME = exports.DEVICE_PRIVATE_KEY_FILE_NAME = exports.CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = exports.BOOTSTRAP_CLAIM_ID_FILE_NAME = exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = exports.BOOTSTRAP_DEVICE_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.APP_ROOT = void 0;
 const constants_1 = require("alwaysai/lib/constants");
 const path_1 = require("path");
-exports.BOOTSTRAP_DIR_NAME = "bootstrap-certificates";
-exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = "aai-claim-private-key_qa.pem.key";
-exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = "aai-claim-cert_qa.pem.crt";
-exports.BOOTSTRAP_CLAIM_ID_FILE_NAME = "aai-claim-cert-id_qa.txt";
-exports.AWS_ROOT_CERTIFICATE_FILE_NAME = "AmazonRootCA1.pem";
-exports.CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = "certificate-ownership-token.txt";
-exports.DEVICE_PRIVATE_KEY_FILE_NAME = "aai-claim-private-key_qa.pem.key";
-exports.DEVICE_CERTIFICATE_FILE_NAME = "aai-claim-cert_qa.pem.crt";
-exports.DEVICE_CLAIM_ID_FILE_NAME = "aai-claim-cert-id_qa.txt";
+const system_id_1 = require("../infrastructure/system-id");
+const path = require("path");
+exports.APP_ROOT = path.join(constants_1.AAI_DIR, 'applications');
+exports.CREDENTIALS_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_AAI_CFG_DIR, constants_1.DEVICE_TOKEN_FILE_NAME);
+exports.AWS_ROOT_CERTIFICATE_FILE_NAME = 'AmazonRootCA1.pem';
+exports.AWS_ROOT_CERTIFICATE_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.AWS_ROOT_CERTIFICATE_FILE_NAME);
+const shortenSystemId = () => {
+    const id = (0, system_id_1.getSystemId)();
+    switch (id) {
+        case 'development':
+            return 'dev';
+        case 'qa':
+            return 'qa';
+        case 'production':
+            return 'prod';
+    }
+};
+exports.shortenSystemId = shortenSystemId;
+exports.BOOTSTRAP_DIR_NAME = 'bootstrap-certificates';
+const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = () => `aai-claim-private-key_${(0, exports.shortenSystemId)()}.pem.key`;
+exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME = BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME;
+const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = () => `aai-claim-cert_${(0, exports.shortenSystemId)()}.pem.crt`;
+exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME = BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME;
+const BOOTSTRAP_CLAIM_ID_FILE_NAME = () => `aai-claim-cert-id_${(0, exports.shortenSystemId)()}.txt`;
+exports.BOOTSTRAP_CLAIM_ID_FILE_NAME = BOOTSTRAP_CLAIM_ID_FILE_NAME;
+exports.CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME = 'certificate-ownership-token.txt';
+const DEVICE_PRIVATE_KEY_FILE_NAME = () => `aai-claim-private-key_${(0, exports.shortenSystemId)()}.pem.key`;
+exports.DEVICE_PRIVATE_KEY_FILE_NAME = DEVICE_PRIVATE_KEY_FILE_NAME;
+const DEVICE_CERTIFICATE_FILE_NAME = () => `aai-claim-cert_${(0, exports.shortenSystemId)()}.pem.crt`;
+exports.DEVICE_CERTIFICATE_FILE_NAME = DEVICE_CERTIFICATE_FILE_NAME;
+const DEVICE_CLAIM_ID_FILE_NAME = () => `aai-claim-cert-id_${(0, exports.shortenSystemId)()}.txt`;
+exports.DEVICE_CLAIM_ID_FILE_NAME = DEVICE_CLAIM_ID_FILE_NAME;
 function getPrivateKeyFilePath() {
-    return (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.DEVICE_PRIVATE_KEY_FILE_NAME);
+    return (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, (0, exports.DEVICE_PRIVATE_KEY_FILE_NAME)());
 }
 exports.getPrivateKeyFilePath = getPrivateKeyFilePath;
 function getCertificateFilePath() {
-    return (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.DEVICE_CERTIFICATE_FILE_NAME);
+    return (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, (0, exports.DEVICE_CERTIFICATE_FILE_NAME)());
 }
 exports.getCertificateFilePath = getCertificateFilePath;
-function getRootCertificateFilePath() {
-    return (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.AWS_ROOT_CERTIFICATE_FILE_NAME);
-}
-exports.getRootCertificateFilePath = getRootCertificateFilePath;
-function getCredentialsFilePath() {
-    return (0, path_1.join)(constants_1.LOCAL_AAI_CFG_DIR, constants_1.DEVICE_TOKEN_FILE_NAME);
-}
-exports.getCredentialsFilePath = getCredentialsFilePath;
-exports.BOOTSTRAP_CERTIFICATES_DIR_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME);
-exports.DEVICE_CLAIM_ID_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, constants_1.DEVICE_TOKEN_FILE_NAME);
-exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME);
-exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME);
-exports.BOOTSTRAP_CLAIM_ID_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, exports.BOOTSTRAP_CLAIM_ID_FILE_NAME);
-exports.AWS_ROOT_CERTIFICATE_FILE_PATH = (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.AWS_ROOT_CERTIFICATE_FILE_NAME);
+const BOOTSTRAP_CERTIFICATES_DIR_PATH = () => (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME);
+exports.BOOTSTRAP_CERTIFICATES_DIR_PATH = BOOTSTRAP_CERTIFICATES_DIR_PATH;
+const DEVICE_CLAIM_ID_FILE_PATH = () => (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, constants_1.DEVICE_TOKEN_FILE_NAME);
+exports.DEVICE_CLAIM_ID_FILE_PATH = DEVICE_CLAIM_ID_FILE_PATH;
+const BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = () => (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, (0, exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_NAME)());
+exports.BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH = BOOTSTRAP_DEVICE_PRIVATE_KEY_FILE_PATH;
+const BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = () => (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, (0, exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_NAME)());
+exports.BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH = BOOTSTRAP_DEVICE_CERTIFICATE_FILE_PATH;
+const BOOTSTRAP_CLAIM_ID_FILE_PATH = () => (0, path_1.join)(constants_1.LOCAL_CERT_AND_KEY_DIR, exports.BOOTSTRAP_DIR_NAME, (0, exports.BOOTSTRAP_CLAIM_ID_FILE_NAME)());
+exports.BOOTSTRAP_CLAIM_ID_FILE_PATH = BOOTSTRAP_CLAIM_ID_FILE_PATH;
 //# sourceMappingURL=directories.js.map

package/lib/util/directories.js.map

@@ -1 +1 @@
-{"version":3,"file":"directories.js","sourceRoot":"","sources":["../../src/util/directories.ts"],"names":[],"mappings":";;;AAAA,sDAIgC;AAChC,+BAA4B;AAEf,QAAA,kBAAkB,GAAG,wBAAwB,CAAC;AAC9C,QAAA,sCAAsC,GACjD,kCAAkC,CAAC;AACxB,QAAA,sCAAsC,GACjD,2BAA2B,CAAC;AACjB,QAAA,4BAA4B,GAAG,0BAA0B,CAAC;AAC1D,QAAA,8BAA8B,GAAG,mBAAmB,CAAC;AACrD,QAAA,qCAAqC,GAChD,iCAAiC,CAAC;AAEvB,QAAA,4BAA4B,GAAG,kCAAkC,CAAC;AAClE,QAAA,4BAA4B,GAAG,2BAA2B,CAAC;AAC3D,QAAA,yBAAyB,GAAG,0BAA0B,CAAC;AAEpE,SAAgB,qBAAqB;IACnC,OAAO,IAAA,WAAI,EAAC,kCAAsB,EAAE,oCAA4B,CAAC,CAAC;AACpE,CAAC;AAFD,sDAEC;AAED,SAAgB,sBAAsB;IACpC,OAAO,IAAA,WAAI,EAAC,kCAAsB,EAAE,oCAA4B,CAAC,CAAC;AACpE,CAAC;AAFD,wDAEC;AAED,SAAgB,0BAA0B;IACxC,OAAO,IAAA,WAAI,EAAC,kCAAsB,EAAE,sCAA8B,CAAC,CAAC;AACtE,CAAC;AAFD,gEAEC;AAED,SAAgB,sBAAsB;IACpC,OAAO,IAAA,WAAI,EAAC,6BAAiB,EAAE,kCAAsB,CAAC,CAAC;AACzD,CAAC;AAFD,wDAEC;AAEY,QAAA,+BAA+B,GAAG,IAAA,WAAI,EACjD,kCAAsB,EACtB,0BAAkB,CACnB,CAAC;AACW,QAAA,yBAAyB,GAAG,IAAA,WAAI,EAC3C,kCAAsB,EACtB,kCAAsB,CACvB,CAAC;AAEW,QAAA,sCAAsC,GAAG,IAAA,WAAI,EACxD,kCAAsB,EACtB,0BAAkB,EAClB,8CAAsC,CACvC,CAAC;AAEW,QAAA,sCAAsC,GAAG,IAAA,WAAI,EACxD,kCAAsB,EACtB,0BAAkB,EAClB,8CAAsC,CACvC,CAAC;AAEW,QAAA,4BAA4B,GAAG,IAAA,WAAI,EAC9C,kCAAsB,EACtB,0BAAkB,EAClB,oCAA4B,CAC7B,CAAC;AAEW,QAAA,8BAA8B,GAAG,IAAA,WAAI,EAChD,kCAAsB,EACtB,sCAA8B,CAC/B,CAAC"}
+{"version":3,"file":"directories.js","sourceRoot":"","sources":["../../src/util/directories.ts"],"names":[],"mappings":"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"}

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

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

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

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

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchWithTimeout = void 0;
+const node_fetch_1 = require("node-fetch");
+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 response;
+}
+exports.fetchWithTimeout = fetchWithTimeout;
+//# sourceMappingURL=fetch-with-timeout.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-with-timeout.js","sourceRoot":"","sources":["../../src/util/fetch-with-timeout.ts"],"names":[],"mappings":";;;AAAA,2CAAmC;AAE5B,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,QAAQ,CAAC;AAClB,CAAC;AAfD,4CAeC"}

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

@@ -1,2 +1,2 @@
-export declare function getDeviceId(): string;
+export declare function getDeviceUuid(): string;
 //# sourceMappingURL=get-device-id.d.ts.map

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":"AAKA,wBAAgB,WAAW,WAgB1B"}
+{"version":3,"file":"get-device-id.d.ts","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,WAiB5B"}

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

@@ -1,24 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDeviceId = void 0;
-const directories_1 = require("../util/directories");
-const alwayscli_1 = require("@alwaysai/alwayscli");
-const config_nodejs_1 = require("@alwaysai/config-nodejs");
-const t = require("io-ts");
-function getDeviceId() {
-    const path = (0, directories_1.getCredentialsFilePath)();
-    const codec = t.type({
-        deviceId: t.union([t.string, t.undefined]),
-    });
-    const credentialsJsonFile = (0, config_nodejs_1.ConfigFile)({
-        path,
-        codec,
-    });
-    const config = credentialsJsonFile.readIfExists();
-    if (!config || !config.deviceId) {
-        throw new alwayscli_1.CliTerseError('Invalid device credentials! Please ensure you are using the device agent on a valid device.');
+exports.getDeviceUuid = void 0;
+const device_1 = require("alwaysai/lib/core/device");
+function getDeviceUuid() {
+    const deviceCfgFile = (0, device_1.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;
 }
-exports.getDeviceId = getDeviceId;
+exports.getDeviceUuid = getDeviceUuid;
 //# sourceMappingURL=get-device-id.js.map

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,qDAA6D;AAC7D,mDAAoD;AACpD,2DAAqD;AACrD,2BAA2B;AAE3B,SAAgB,WAAW;IACzB,MAAM,IAAI,GAAG,IAAA,oCAAsB,GAAE,CAAC;IACtC,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC;QACnB,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;KAC3C,CAAC,CAAC;IACH,MAAM,mBAAmB,GAAG,IAAA,0BAAU,EAAC;QACrC,IAAI;QACJ,KAAK;KACN,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,mBAAmB,CAAC,YAAY,EAAE,CAAC;IAClD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QAC/B,MAAM,IAAI,yBAAa,CACrB,6FAA6F,CAC9F,CAAC;KACH;IACD,OAAO,MAAM,CAAC,QAAQ,CAAC;AACzB,CAAC;AAhBD,kCAgBC"}
+{"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,GAAG,EAAE;QACZ,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"}

package/lib/util/http-client.d.ts

@@ -1,3 +1,3 @@
-export declare function httpClient(url: string, method: string, data?: string, headers?: object): Promise<any>;
+export declare function httpClient(url: string, method: string, headers: any, data?: string): Promise<any>;
 export declare function microServiceHttpClient(service: string, path: string, method: string, data?: string): Promise<any>;
 //# sourceMappingURL=http-client.d.ts.map

package/lib/util/http-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":"AAIA,wBAAsB,UAAU,CAC9B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,gBAcjB;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,gBAMd"}
+{"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":"AAKA,wBAAsB,UAAU,CAC9B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,GAAG,EACZ,IAAI,CAAC,EAAE,MAAM,gBAkBd;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,gBAMd"}

package/lib/util/http-client.js

@@ -4,27 +4,29 @@ 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");
-async function httpClient(url, method, data, headers) {
-    const options = Object.assign({ method }, (data ? { body: data } : {}));
+const logger_1 = require("../util/logger");
+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 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_1.logger.error(`HTTP Client error for ${url}: ${e}`);
+    }
 }
 exports.httpClient = httpClient;
 async function microServiceHttpClient(service, path, method, data) {
     const endpoint = (0, endpoints_1.serviceEndpointBuilder)(service, path);
     const { getIdAuthorizationHeader } = (0, infrastructure_1.CliAuthenticationClient)();
     const authorizationHeader = await getIdAuthorizationHeader();
-    return await httpClient(endpoint, method, data);
+    return await httpClient(endpoint, method, authorizationHeader, data);
 }
 exports.microServiceHttpClient = microServiceHttpClient;
 //# sourceMappingURL=http-client.js.map