@alwaysai/device-agent 1.5.0 → 2.0.0

package/lib/subcommands/app/analytics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/analytics.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,sBAAsB;;4DAkBjC,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;4DAiEjC,CAAC"}
+{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/analytics.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,sBAAsB;;4DAkBjC,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;4DAgEjC,CAAC"}

package/lib/subcommands/app/analytics.js

@@ -48,7 +48,6 @@ exports.setAnalyticsCfgCliLeaf = (0, alwayscli_1.CliLeaf)({
     },
     async action(_, { project, 'enable-cloud-publish': enableCLoudPublish, 'enable-file-publish': enableFilePublish, 'file-size-bytes': fileSizeBytes }) {
         const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
-        await deviceAgent.setupHandlers();
         const newAppCfg = {
             analytics: {
                 enable_cloud_publish: enableCLoudPublish,
@@ -64,7 +63,7 @@ exports.setAnalyticsCfgCliLeaf = (0, alwayscli_1.CliLeaf)({
                 appConfig: JSON.stringify(appCfg) // Pack app config as string as dictated by schema
             }
         };
-        deviceAgent.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(deviceAgent.getClientId(), 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateProjectShadowMessage)({
+        deviceAgent.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(deviceAgent.getClientId(), 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateShadowMessage)({
             clientId: 'client',
             desired: toDesire
         })));

package/lib/subcommands/app/analytics.js.map

@@ -1 +1 @@
-{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../../src/subcommands/app/analytics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../../src/subcommands/app/analytics.ts"],"names":[],"mappings":"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"}

package/lib/subcommands/app/env-vars.d.ts

@@ -5,4 +5,8 @@ export declare const setEnvCliLeaf: import("@alwaysai/alwayscli/lib/types").CliL
     project: import("@alwaysai/alwayscli").CliInput<string, true>;
     service: import("@alwaysai/alwayscli").CliInput<string, true>;
 }, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
+export declare const rmEnvCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<string, true>, {
+    project: import("@alwaysai/alwayscli").CliInput<string, true>;
+    service: import("@alwaysai/alwayscli").CliInput<string, true>;
+}, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
 //# sourceMappingURL=env-vars.d.ts.map

package/lib/subcommands/app/env-vars.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-vars.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/env-vars.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,iBAAiB;;4DAc5B,CAAC;AAEH,eAAO,MAAM,aAAa;;;4DAqDxB,CAAC"}
+{"version":3,"file":"env-vars.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/env-vars.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,iBAAiB;;4DAc5B,CAAC;AAEH,eAAO,MAAM,aAAa;;;4DAsDxB,CAAC;AAEH,eAAO,MAAM,YAAY;;;4DA4DvB,CAAC"}

package/lib/subcommands/app/env-vars.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setEnvCliLeaf = exports.getAllEnvsCliLeaf = void 0;
+exports.rmEnvCliLeaf = exports.setEnvCliLeaf = exports.getAllEnvsCliLeaf = void 0;
 const alwayscli_1 = require("@alwaysai/alwayscli");
 const application_control_1 = require("../../application-control");
 const device_agent_cloud_connection_1 = require("../../cloud-connection/device-agent-cloud-connection");
@@ -40,23 +40,69 @@ exports.setEnvCliLeaf = (0, alwayscli_1.CliLeaf)({
     },
     async action(args, opts) {
         const { project: projectId, service } = opts;
-        const envVars = { [service]: {} };
+        const currentEnvs = await (0, application_control_1.getAllEnvs)({ projectId });
+        const envVars = { [service]: Object.assign({}, currentEnvs[service]) };
         args.forEach((arg) => {
             const nameVal = arg.split('=');
             if (nameVal.length !== 2) {
                 throw new alwayscli_1.CliTerseError(`Invalid argument: ${arg}`);
             }
-            const value = nameVal[1] === '' ? null : nameVal[1];
+            const value = nameVal[1];
             envVars[service][nameVal[0]] = value;
         });
         const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
-        await deviceAgent.setupHandlers();
         const toDesire = {
             [projectId]: {
-                envVars
+                envVars: JSON.stringify(envVars)
             }
         };
-        deviceAgent.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(deviceAgent.getClientId(), 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateProjectShadowMessage)({
+        deviceAgent.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(deviceAgent.getClientId(), 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateShadowMessage)({
+            clientId: 'client',
+            desired: toDesire
+        })));
+        // Sleep for extra time to ensure time for shadow response
+        await (0, sleep_1.default)(10000);
+        while (deviceAgent.isCmdInProgress(projectId)) {
+            await (0, sleep_1.default)(1000);
+        }
+        await deviceAgent.stop();
+    }
+});
+exports.rmEnvCliLeaf = (0, alwayscli_1.CliLeaf)({
+    name: 'rm-env',
+    description: 'Remove an environment variable from an application',
+    positionalInput: (0, alwayscli_1.CliStringInput)({
+        description: 'The key of the environment variable to be removed',
+        required: true
+    }),
+    namedInputs: {
+        project: (0, alwayscli_1.CliStringInput)({
+            description: 'Project Id',
+            required: true
+        }),
+        service: (0, alwayscli_1.CliStringInput)({
+            description: 'Docker compose service to remove an environment variable from',
+            required: true
+        })
+    },
+    async action(arg, opts) {
+        const { project: projectId, service } = opts;
+        const envVar = arg;
+        const currentEnvs = await (0, application_control_1.getAllEnvs)({ projectId: projectId });
+        const newEnvs = Object.assign({}, currentEnvs);
+        if (Object.keys(newEnvs[service]).includes(envVar)) {
+            delete newEnvs[service][envVar];
+        }
+        else {
+            throw new alwayscli_1.CliTerseError(`Could not find key "${envVar}" in service ${service}. Current keys are:\n ${JSON.stringify(Object.keys(currentEnvs[service]), null, 2)}.\nPlease check the key and try again.`);
+        }
+        const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
+        const toDesire = {
+            [projectId]: {
+                envVars: JSON.stringify(newEnvs)
+            }
+        };
+        deviceAgent.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(deviceAgent.getClientId(), 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateShadowMessage)({
             clientId: 'client',
             desired: toDesire
         })));

package/lib/subcommands/app/env-vars.js.map

@@ -1 +1 @@
-{"version":3,"file":"env-vars.js","sourceRoot":"","sources":["../../../src/subcommands/app/env-vars.ts"],"names":[],"mappings":";;;AAAA,mDAK6B;AAC7B,mEAAgE;AAChE,wGAAkG;AAClG,4CAAqC;AAErC,yEAGwC;AAE3B,QAAA,iBAAiB,GAAG,IAAA,mBAAO,EAAC;IACvC,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,8CAA8C;IAC3D,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAU,EAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QACzD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,aAAa,GAAG,IAAA,mBAAO,EAAC;IACnC,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,yCAAyC;IACtD,eAAe,EAAE,IAAA,+BAAmB,EAAC;QACnC,WAAW,EAAE,iCAAiC;QAC9C,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,yDAAyD;YACtE,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI;QACrB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC7C,MAAM,OAAO,GAAY,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;YAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACxB,MAAM,IAAI,yBAAa,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;aACrD;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACpD,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QACvC,CAAC,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QACrD,MAAM,WAAW,CAAC,aAAa,EAAE,CAAC;QAElC,MAAM,QAAQ,GAAG;YACf,CAAC,SAAS,CAAC,EAAE;gBACX,OAAO;aACR;SACF,CAAC;QACF,WAAW,CAAC,SAAS,CAAC,OAAO,CAC3B,IAAA,qCAAc,EAAC,WAAW,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAC/D,IAAI,CAAC,SAAS,CACZ,IAAA,sDAA+B,EAAC;YAC9B,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,QAAQ;SAClB,CAAC,CACH,CACF,CAAC;QACF,0DAA0D;QAC1D,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,CAAC;QAEnB,OAAO,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;YAC7C,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;SACnB;QACD,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"env-vars.js","sourceRoot":"","sources":["../../../src/subcommands/app/env-vars.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/index.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,YAAY,mDAyBvB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/index.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,YAAY,mDAuBvB,CAAC"}

package/lib/subcommands/app/index.js

@@ -23,11 +23,9 @@ exports.appCliBranch = (0, alwayscli_1.CliBranch)({
         version_1.rollbackAppCliLeaf,
         models_1.showAppModelsCliLeaf,
         models_1.addModelCliLeaf,
-        models_1.removeModelCliLeaf,
-        models_1.replaceModelsCliLeaf,
-        models_1.updateModelsCliLeaf,
         env_vars_1.getAllEnvsCliLeaf,
         env_vars_1.setEnvCliLeaf,
+        env_vars_1.rmEnvCliLeaf,
         analytics_1.getAnalyticsCfgCliLeaf,
         analytics_1.setAnalyticsCfgCliLeaf,
         shadow_1.getShadowCliLeaf,

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/subcommands/app/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,yCAA8D;AAC9D,qCAMkB;AAClB,qCAMkB;AAClB,uCAKmB;AACnB,qCAAiE;AACjE,2CAA6E;AAEhE,QAAA,YAAY,GAAG,IAAA,qBAAS,EAAC;IACpC,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,8BAA8B;IAC3C,WAAW,EAAE;QACX,yBAAe;QACf,2BAAiB;QACjB,4BAAmB;QACnB,wBAAe;QACf,uBAAc;QACd,0BAAiB;QACjB,0BAAiB;QACjB,6BAAmB;QACnB,4BAAkB;QAClB,6BAAoB;QACpB,wBAAe;QACf,2BAAkB;QAClB,6BAAoB;QACpB,4BAAmB;QACnB,4BAAiB;QACjB,wBAAa;QACb,kCAAsB;QACtB,kCAAsB;QACtB,yBAAgB;QAChB,4BAAmB;KACpB;CACF,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/subcommands/app/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,yCAA4E;AAC5E,qCAAiE;AACjE,qCAMkB;AAClB,uCAKmB;AACnB,qCAAiE;AACjE,2CAA6E;AAEhE,QAAA,YAAY,GAAG,IAAA,qBAAS,EAAC;IACpC,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,8BAA8B;IAC3C,WAAW,EAAE;QACX,yBAAe;QACf,2BAAiB;QACjB,4BAAmB;QACnB,wBAAe;QACf,uBAAc;QACd,0BAAiB;QACjB,0BAAiB;QACjB,6BAAmB;QACnB,4BAAkB;QAClB,6BAAoB;QACpB,wBAAe;QACf,4BAAiB;QACjB,wBAAa;QACb,uBAAY;QACZ,kCAAsB;QACtB,kCAAsB;QACtB,yBAAgB;QAChB,4BAAmB;KACpB;CACF,CAAC,CAAC"}

package/lib/subcommands/app/models.d.ts

@@ -6,15 +6,4 @@ export declare const addModelCliLeaf: import("@alwaysai/alwayscli/lib/types").Cl
     model: import("@alwaysai/alwayscli").CliInput<string, true>;
     version: import("@alwaysai/alwayscli").CliInput<string, true>;
 }, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
-export declare const removeModelCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, {
-    project: import("@alwaysai/alwayscli").CliInput<string, true>;
-    model: import("@alwaysai/alwayscli").CliInput<string, true>;
-}, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
-export declare const replaceModelsCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, {
-    project: import("@alwaysai/alwayscli").CliInput<string, true>;
-    models: import("@alwaysai/alwayscli").CliInput<string[], true>;
-}, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
-export declare const updateModelsCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, {
-    project: import("@alwaysai/alwayscli").CliInput<string, true>;
-}, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
 //# sourceMappingURL=models.d.ts.map

package/lib/subcommands/app/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/models.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,oBAAoB;;4DAc/B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;4DAiD1B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;4DAkB7B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;4DAqB/B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DAiB9B,CAAC"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/models.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,oBAAoB;;4DAc/B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;4DAgD1B,CAAC"}

package/lib/subcommands/app/models.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateModelsCliLeaf = exports.replaceModelsCliLeaf = exports.removeModelCliLeaf = exports.addModelCliLeaf = exports.showAppModelsCliLeaf = void 0;
+exports.addModelCliLeaf = exports.showAppModelsCliLeaf = void 0;
 const alwayscli_1 = require("@alwaysai/alwayscli");
 const application_control_1 = require("../../application-control");
 const device_agent_cloud_connection_1 = require("../../cloud-connection/device-agent-cloud-connection");
@@ -41,7 +41,6 @@ exports.addModelCliLeaf = (0, alwayscli_1.CliLeaf)({
     async action(_, opts) {
         const { project: projectId, model, version } = opts;
         const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
-        await deviceAgent.setupHandlers();
         // Update the shadow as a client
         const newAppCfg = await (0, application_control_1.readAppCfgFile)({ projectId: projectId });
         newAppCfg.models[model] = Number(version);
@@ -50,7 +49,7 @@ exports.addModelCliLeaf = (0, alwayscli_1.CliLeaf)({
                 appConfig: JSON.stringify(newAppCfg)
             }
         };
-        deviceAgent.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(deviceAgent.getClientId(), 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateProjectShadowMessage)({
+        deviceAgent.publisher.publish((0, device_agent_schemas_1.getShadowTopic)(deviceAgent.getClientId(), 'projects', 'update'), JSON.stringify((0, device_agent_schemas_1.buildUpdateShadowMessage)({
             clientId: 'client',
             desired: toDesire
         })));
@@ -62,59 +61,4 @@ exports.addModelCliLeaf = (0, alwayscli_1.CliLeaf)({
         await deviceAgent.stop();
     }
 });
-exports.removeModelCliLeaf = (0, alwayscli_1.CliLeaf)({
-    name: 'remove-model',
-    description: 'Remove a model from an alwaysAI app',
-    namedInputs: {
-        project: (0, alwayscli_1.CliStringInput)({
-            description: 'Project ID',
-            required: true
-        }),
-        model: (0, alwayscli_1.CliStringInput)({
-            description: 'Model ID',
-            required: true
-        })
-    },
-    async action(_, opts) {
-        const { project, model } = opts;
-        // TODO: Replace with handleMessage()
-        await (0, application_control_1.removeModel)({ projectId: project, modelId: model });
-    }
-});
-exports.replaceModelsCliLeaf = (0, alwayscli_1.CliLeaf)({
-    name: 'replace-models',
-    description: 'Replace all models of an alwaysAI app with new models',
-    namedInputs: {
-        project: (0, alwayscli_1.CliStringInput)({
-            description: 'Project Id',
-            required: true
-        }),
-        models: (0, alwayscli_1.CliStringArrayInput)({
-            description: 'One or more model IDs',
-            required: true
-        })
-    },
-    hidden: true,
-    async action(_, opts) {
-        const { project, models } = opts;
-        console.log('This command is deprecated and will be removed in a future release');
-        await (0, application_control_1.replaceModels)({ projectId: project, modelIds: models });
-    }
-});
-exports.updateModelsCliLeaf = (0, alwayscli_1.CliLeaf)({
-    name: 'update-models',
-    description: 'Update all models for an alwaysAI app',
-    namedInputs: {
-        project: (0, alwayscli_1.CliStringInput)({
-            description: 'Project Id',
-            required: true
-        })
-    },
-    hidden: true,
-    async action(_, opts) {
-        const { project } = opts;
-        console.log('This command is deprecated and will be removed in a future release');
-        await (0, application_control_1.updateModels)({ projectId: project });
-    }
-});
 //# sourceMappingURL=models.js.map

package/lib/subcommands/app/models.js.map

@@ -1 +1 @@
-{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/subcommands/app/models.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/subcommands/app/models.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,mEAAyE;AACzE,wGAAkG;AAClG,4CAAqC;AACrC,yEAGwC;AAE3B,QAAA,oBAAoB,GAAG,IAAA,mBAAO,EAAC;IAC1C,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,6BAA6B;IAC1C,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAY,EAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7D,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,eAAe,GAAG,IAAA,mBAAO,EAAC;IACrC,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,gCAAgC;IAC7C,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,KAAK,EAAE,IAAA,0BAAc,EAAC;YACpB,WAAW,EAAE,UAAU;YACvB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,eAAe;YAC5B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACpD,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QAErD,gCAAgC;QAEhC,MAAM,SAAS,GAAG,MAAM,IAAA,oCAAc,EAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;QACjE,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAE1C,MAAM,QAAQ,GAAG;YACf,CAAC,SAAS,CAAC,EAAE;gBACX,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;aACrC;SACF,CAAC;QACF,WAAW,CAAC,SAAS,CAAC,OAAO,CAC3B,IAAA,qCAAc,EAAC,WAAW,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAC/D,IAAI,CAAC,SAAS,CACZ,IAAA,+CAAwB,EAAC;YACvB,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,QAAQ;SAClB,CAAC,CACH,CACF,CAAC;QACF,0DAA0D;QAC1D,MAAM,IAAA,eAAK,EAAC,KAAK,CAAC,CAAC;QAEnB,OAAO,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;YAC7C,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;SACnB;QACD,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC"}

package/lib/subcommands/app/shadow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shadow.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/shadow.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,gBAAgB;;4DAsB3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DAmB9B,CAAC"}
+{"version":3,"file":"shadow.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/shadow.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,gBAAgB;;4DAqB3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DAqB9B,CAAC"}

package/lib/subcommands/app/shadow.js

@@ -16,9 +16,8 @@ exports.getShadowCliLeaf = (0, alwayscli_1.CliLeaf)({
     async action(_, opts) {
         const { project } = opts;
         const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
-        await deviceAgent.setupHandlers();
-        // The Device Agent always gets the latest shadow and updates
-        // itself. 5 seconds should cover the initial response wait time
+        deviceAgent.shadowHandler.getProjectShadowUpdates();
+        // 5 seconds should cover the response wait time
         await (0, sleep_1.default)(5000);
         while (deviceAgent.isCmdInProgress(project)) {
             await (0, sleep_1.default)(1000);
@@ -38,10 +37,12 @@ exports.updateShadowCliLeaf = (0, alwayscli_1.CliLeaf)({
     async action(_, opts) {
         const { project } = opts;
         const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
-        await deviceAgent.setupHandlers();
-        await deviceAgent.updateProjectShadow(project);
+        await deviceAgent.shadowHandler.updateProjectShadow(project);
         // 5 seconds should cover the response wait time
         await (0, sleep_1.default)(5000);
+        while (deviceAgent.isCmdInProgress(project)) {
+            await (0, sleep_1.default)(1000);
+        }
         await deviceAgent.stop();
     }
 });

package/lib/subcommands/app/shadow.js.map

@@ -1 +1 @@
-{"version":3,"file":"shadow.js","sourceRoot":"","sources":["../../../src/subcommands/app/shadow.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,wGAAkG;AAClG,4CAAqC;AAExB,QAAA,gBAAgB,GAAG,IAAA,mBAAO,EAAC;IACtC,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,wBAAwB;IACrC,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QACrD,MAAM,WAAW,CAAC,aAAa,EAAE,CAAC;QAElC,6DAA6D;QAC7D,gEAAgE;QAChE,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;QAClB,OAAO,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YAC3C,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;SACnB;QACD,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,IAAA,mBAAO,EAAC;IACzC,IAAI,EAAE,eAAe;IACrB,WAAW,EAAE,8DAA8D;IAC3E,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QACrD,MAAM,WAAW,CAAC,aAAa,EAAE,CAAC;QAClC,MAAM,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAE/C,gDAAgD;QAChD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;QAClB,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"shadow.js","sourceRoot":"","sources":["../../../src/subcommands/app/shadow.ts"],"names":[],"mappings":";;;AAAA,mDAA8D;AAC9D,wGAAkG;AAClG,4CAAqC;AAExB,QAAA,gBAAgB,GAAG,IAAA,mBAAO,EAAC;IACtC,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,wBAAwB;IACrC,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QACrD,WAAW,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAC;QAEpD,gDAAgD;QAChD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;QAClB,OAAO,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YAC3C,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;SACnB;QACD,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,IAAA,mBAAO,EAAC;IACzC,IAAI,EAAE,eAAe;IACrB,WAAW,EAAE,8DAA8D;IAC3E,WAAW,EAAE;QACX,OAAO,EAAE,IAAA,0BAAc,EAAC;YACtB,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,0DAA0B,EAAE,CAAC;QACrD,MAAM,WAAW,CAAC,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAE7D,gDAAgD;QAChD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;QAClB,OAAO,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YAC3C,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;SACnB;QACD,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC"}

package/lib/subcommands/app/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/version.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,eAAe,yKAQ1B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;4DAiD5B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DA8B9B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;4DAc7B,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/subcommands/app/version.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,eAAe,yKAQ1B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;4DAgD5B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;4DA6B9B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;4DAc7B,CAAC"}

package/lib/subcommands/app/version.js

@@ -45,8 +45,7 @@ exports.installAppCliLeaf = (0, alwayscli_1.CliLeaf)({
             throw new alwayscli_1.CliTerseError('--release-hash flag is required!');
         }
         const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
-        await deviceAgent.setupHandlers();
-        const topic = deviceAgent.getToDeviceTopic();
+        const topic = (0, device_agent_schemas_1.getToDeviceTopic)(deviceAgent.getClientId());
         const message = {
             timestamp: '',
             topic,
@@ -77,8 +76,7 @@ exports.uninstallAppCliLeaf = (0, alwayscli_1.CliLeaf)({
     async action(_, opts) {
         const { project } = opts;
         const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
-        await deviceAgent.setupHandlers();
-        const topic = deviceAgent.getToDeviceTopic();
+        const topic = (0, device_agent_schemas_1.getToDeviceTopic)(deviceAgent.getClientId());
         const message = {
             timestamp: '',
             topic,

package/lib/subcommands/app/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/subcommands/app/version.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/subcommands/app/version.ts"],"names":[],"mappings":"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"}

package/lib/subcommands/config.d.ts

@@ -0,0 +1,2 @@
+export declare const configBranch: import("@alwaysai/alwayscli/lib/types").CliBranch;
+//# sourceMappingURL=config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/subcommands/config.ts"],"names":[],"mappings":"AAoCA,eAAO,MAAM,YAAY,mDAKvB,CAAC"}

package/lib/subcommands/config.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.configBranch = void 0;
+const alwayscli_1 = require("@alwaysai/alwayscli");
+const constants_1 = require("alwaysai/lib/constants");
+const environment_1 = require("alwaysai/lib/environment");
+const infrastructure_1 = require("alwaysai/lib/infrastructure");
+const util_1 = require("alwaysai/lib/util");
+const environment_2 = require("../environment");
+const show = (0, alwayscli_1.CliLeaf)({
+    name: 'show',
+    description: `Show your current configuration`,
+    action() {
+        if (environment_1.ALWAYSAI_SYSTEM_ID) {
+            (0, util_1.echo)('[WARNING] System ID is overridden by environment variable "ALWAYSAI_SYSTEM_ID"');
+        }
+        return { systemId: (0, infrastructure_1.getSystemId)() };
+    }
+});
+const set = (0, alwayscli_1.CliLeaf)({
+    name: 'set',
+    description: 'Set an configuration value',
+    namedInputs: {
+        systemId: (0, alwayscli_1.CliOneOfInput)({ values: constants_1.SYSTEM_IDS, required: true })
+    },
+    action(_, { systemId }) {
+        if (environment_1.ALWAYSAI_SYSTEM_ID) {
+            (0, util_1.echo)('WARNING] System ID is overridden by environment variable "ALWAYSAI_SYSTEM_ID"');
+        }
+        return (0, infrastructure_1.setSystemId)(systemId);
+    }
+});
+exports.configBranch = (0, alwayscli_1.CliBranch)({
+    name: 'config',
+    hidden: !environment_2.ALWAYSAI_SHOW_HIDDEN,
+    description: `Show or set  configuration values`,
+    subcommands: [show, set]
+});
+//# sourceMappingURL=config.js.map

package/lib/subcommands/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/subcommands/config.ts"],"names":[],"mappings":";;;AAAA,mDAAwE;AACxE,sDAAoD;AACpD,0DAA8D;AAC9D,gEAAuE;AACvE,4CAAyC;AACzC,gDAAsD;AAEtD,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC;IACnB,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,iCAAiC;IAC9C,MAAM;QACJ,IAAI,gCAAkB,EAAE;YACtB,IAAA,WAAI,EACF,gFAAgF,CACjF,CAAC;SACH;QACD,OAAO,EAAE,QAAQ,EAAE,IAAA,4BAAW,GAAE,EAAE,CAAC;IACrC,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,GAAG,GAAG,IAAA,mBAAO,EAAC;IAClB,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,4BAA4B;IACzC,WAAW,EAAE;QACX,QAAQ,EAAE,IAAA,yBAAa,EAAC,EAAE,MAAM,EAAE,sBAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;KAChE;IACD,MAAM,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE;QACpB,IAAI,gCAAkB,EAAE;YACtB,IAAA,WAAI,EACF,+EAA+E,CAChF,CAAC;SACH;QACD,OAAO,IAAA,4BAAW,EAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,YAAY,GAAG,IAAA,qBAAS,EAAC;IACpC,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,CAAC,kCAAoB;IAC7B,WAAW,EAAE,mCAAmC;IAChD,WAAW,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC;CACzB,CAAC,CAAC"}

package/lib/subcommands/device/clean.d.ts

@@ -1,2 +1,2 @@
-export declare const cleanCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, {}, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
+export declare const cleanCliLeaf: import("@alwaysai/alwayscli/lib/types").CliLeaf<import("@alwaysai/alwayscli").CliInput<undefined, false>, import("@alwaysai/alwayscli/lib/types").AnyNamedInputs, import("@alwaysai/alwayscli").CliInput<undefined, false>>;
 //# sourceMappingURL=clean.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"clean.d.ts","sourceRoot":"","sources":["../../../src/subcommands/device/clean.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,YAAY,yKAuCvB,CAAC"}
+{"version":3,"file":"clean.d.ts","sourceRoot":"","sources":["../../../src/subcommands/device/clean.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,YAAY,6NAgDvB,CAAC"}

package/lib/subcommands/device/clean.js

@@ -2,14 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanCliLeaf = void 0;
 const alwayscli_1 = require("@alwaysai/alwayscli");
-const logger_1 = require("../../util/logger");
-const agent_config_1 = require("../../infrastructure/agent-config");
 const device_1 = require("alwaysai/lib/core/device");
-const directories_1 = require("../../util/directories");
-const rabbitmq_connection_1 = require("../../local-connection/rabbitmq-connection");
+const infrastructure_1 = require("alwaysai/lib/infrastructure");
+const util_1 = require("alwaysai/lib/util");
+const promises_1 = require("fs/promises");
 const application_control_1 = require("../../application-control");
-const paths_1 = require("alwaysai/lib/paths");
+const agent_config_1 = require("../../infrastructure/agent-config");
+const rabbitmq_connection_1 = require("../../local-connection/rabbitmq-connection");
+const directories_1 = require("../../util/directories");
 const file_1 = require("../../util/file");
+const logger_1 = require("../../util/logger");
 exports.cleanCliLeaf = (0, alwayscli_1.CliLeaf)({
     name: 'clean',
     description: 'Remove all provisioning files',
@@ -21,25 +23,33 @@ exports.cleanCliLeaf = (0, alwayscli_1.CliLeaf)({
             }
         }
         catch (e) {
-            logger_1.logger.error(`You may need to manually stop the container by running docker-compose down in the following directory: ${directories_1.DEVICE_AGENT_DOCKER_COMPOSE_PATH}`);
-            logger_1.logger.debug(`Error in checking / stopping RabbitMQ container: ${e}`);
+            logger_1.logger.error(`You may need to manually stop the container by running docker-compose down in the following directory: ${(0, directories_1.getDeviceAgentDockerComposePath)()}`);
+            logger_1.logger.debug(`Error in checking / stopping RabbitMQ container!\n${(0, util_1.stringifyError)(e)}`);
         }
-        await (0, file_1.safeRimraf)(directories_1.DEVICE_AGENT_CFG_PATH);
+        await (0, file_1.safeRimraf)((0, directories_1.getDeviceAgentConfigPath)());
         logger_1.logger.debug('Checking for alwaysAI applications still running');
         const apps = await (0, agent_config_1.AgentConfigFile)().getApps();
-        const stopAppPromises = [];
+        const uninstallAppPromises = [];
         for (const app of apps) {
             const { projectId } = app;
-            stopAppPromises.push((0, application_control_1.stopApp)({ projectId }));
+            uninstallAppPromises.push((0, application_control_1.uninstallApp)({ projectId }));
         }
-        await Promise.all(stopAppPromises);
-        await (0, file_1.safeRimraf)(paths_1.LOCAL_CERT_AND_KEY_DIR);
+        await Promise.all(uninstallAppPromises);
+        await (0, file_1.safeRimraf)(infrastructure_1.LOCAL_CERT_AND_KEY_DIR);
+        const legacyCertificates = new infrastructure_1.LocalLegacyDeviceCertificates();
+        await (0, file_1.safeRimraf)(legacyCertificates.getCertificateDirectoryPath());
         logger_1.logger.debug(`Removing ${(0, agent_config_1.AgentConfigFile)().path}`);
         (0, agent_config_1.AgentConfigFile)().remove();
         logger_1.logger.debug(`Removing ${(0, device_1.DeviceConfigFile)().path}`);
         (0, device_1.DeviceConfigFile)().remove();
         await (0, file_1.safeRimraf)(directories_1.CREDENTIALS_FILE_PATH);
-        await (0, file_1.safeRimraf)(directories_1.APP_ROOT);
+        const files = await (0, promises_1.readdir)(directories_1.APP_ROOT);
+        logger_1.logger.debug(`${directories_1.APP_ROOT} folder contents ${JSON.stringify(files.length)}`);
+        // This won't handle hidden files, but will remove if truly empty, which is safer
+        if (files.length === 0) {
+            logger_1.logger.debug('Applications directory is empty, removing.');
+            await (0, file_1.safeRimraf)(directories_1.APP_ROOT);
+        }
         logger_1.logger.info('Device configuration cleaned');
     }
 });

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

@@ -1 +1 @@
-{"version":3,"file":"clean.js","sourceRoot":"","sources":["../../../src/subcommands/device/clean.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,8CAA2C;AAC3C,oEAAoE;AACpE,qDAA4D;AAC5D,wDAKgC;AAChC,oFAGoD;AACpD,mEAAoD;AACpD,8CAA4D;AAC5D,0CAA6C;AAEhC,QAAA,YAAY,GAAG,IAAA,mBAAO,EAAC;IAClC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,+BAA+B;IAC5C,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,eAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAC5C,IAAI;YACF,IAAI,MAAM,IAAA,mDAA6B,GAAE,EAAE;gBACzC,MAAM,IAAA,2CAAqB,GAAE,CAAC;aAC/B;SACF;QAAC,OAAO,CAAC,EAAE;YACV,eAAM,CAAC,KAAK,CACV,0GAA0G,8CAAgC,EAAE,CAC7I,CAAC;YACF,eAAM,CAAC,KAAK,CAAC,oDAAoD,CAAC,EAAE,CAAC,CAAC;SACvE;QAED,MAAM,IAAA,iBAAU,EAAC,mCAAqB,CAAC,CAAC;QAExC,eAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACjE,MAAM,IAAI,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC,OAAO,EAAE,CAAC;QAC/C,MAAM,eAAe,GAAoB,EAAE,CAAC;QAC5C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC;YAC1B,eAAe,CAAC,IAAI,CAAC,IAAA,6BAAO,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;SAC9C;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAEnC,MAAM,IAAA,iBAAU,EAAC,8BAAsB,CAAC,CAAC;QAEzC,eAAM,CAAC,KAAK,CAAC,YAAY,IAAA,8BAAe,GAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QACnD,IAAA,8BAAe,GAAE,CAAC,MAAM,EAAE,CAAC;QAC3B,eAAM,CAAC,KAAK,CAAC,YAAY,IAAA,yBAAgB,GAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QACpD,IAAA,yBAAgB,GAAE,CAAC,MAAM,EAAE,CAAC;QAE5B,MAAM,IAAA,iBAAU,EAAC,mCAAqB,CAAC,CAAC;QACxC,MAAM,IAAA,iBAAU,EAAC,sBAAQ,CAAC,CAAC;QAE3B,eAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAC9C,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"clean.js","sourceRoot":"","sources":["../../../src/subcommands/device/clean.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,qDAA4D;AAC5D,gEAGqC;AACrC,4CAAmD;AACnD,0CAAsC;AACtC,mEAAyD;AACzD,oEAAoE;AACpE,oFAGoD;AACpD,wDAKgC;AAChC,0CAA6C;AAC7C,8CAA2C;AAE9B,QAAA,YAAY,GAAG,IAAA,mBAAO,EAAC;IAClC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,+BAA+B;IAC5C,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI;QAClB,eAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAC5C,IAAI;YACF,IAAI,MAAM,IAAA,mDAA6B,GAAE,EAAE;gBACzC,MAAM,IAAA,2CAAqB,GAAE,CAAC;aAC/B;SACF;QAAC,OAAO,CAAC,EAAE;YACV,eAAM,CAAC,KAAK,CACV,0GAA0G,IAAA,6CAA+B,GAAE,EAAE,CAC9I,CAAC;YACF,eAAM,CAAC,KAAK,CACV,qDAAqD,IAAA,qBAAc,EAAC,CAAC,CAAC,EAAE,CACzE,CAAC;SACH;QAED,MAAM,IAAA,iBAAU,EAAC,IAAA,sCAAwB,GAAE,CAAC,CAAC;QAE7C,eAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACjE,MAAM,IAAI,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC,OAAO,EAAE,CAAC;QAC/C,MAAM,oBAAoB,GAAoB,EAAE,CAAC;QACjD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC;YAC1B,oBAAoB,CAAC,IAAI,CAAC,IAAA,kCAAY,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;SACxD;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAExC,MAAM,IAAA,iBAAU,EAAC,uCAAsB,CAAC,CAAC;QACzC,MAAM,kBAAkB,GAAG,IAAI,8CAA6B,EAAE,CAAC;QAC/D,MAAM,IAAA,iBAAU,EAAC,kBAAkB,CAAC,2BAA2B,EAAE,CAAC,CAAC;QAEnE,eAAM,CAAC,KAAK,CAAC,YAAY,IAAA,8BAAe,GAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QACnD,IAAA,8BAAe,GAAE,CAAC,MAAM,EAAE,CAAC;QAC3B,eAAM,CAAC,KAAK,CAAC,YAAY,IAAA,yBAAgB,GAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QACpD,IAAA,yBAAgB,GAAE,CAAC,MAAM,EAAE,CAAC;QAE5B,MAAM,IAAA,iBAAU,EAAC,mCAAqB,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,IAAA,kBAAO,EAAC,sBAAQ,CAAC,CAAC;QACtC,eAAM,CAAC,KAAK,CAAC,GAAG,sBAAQ,oBAAoB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5E,iFAAiF;QACjF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,eAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC3D,MAAM,IAAA,iBAAU,EAAC,sBAAQ,CAAC,CAAC;SAC5B;QACD,eAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAC9C,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":"AAOA,eAAO,MAAM,eAAe,mDAU1B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/subcommands/device/index.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,eAAe,mDAW1B,CAAC"}

package/lib/subcommands/device/index.js

@@ -7,6 +7,7 @@ const clean_1 = require("./clean");
 const init_1 = require("./init");
 const restart_1 = require("./restart");
 const refresh_1 = require("./refresh");
+const migrate_1 = require("./migrate");
 exports.deviceCliBranch = (0, alwayscli_1.CliBranch)({
     name: 'device',
     description: 'Manage current device',
@@ -15,7 +16,8 @@ exports.deviceCliBranch = (0, alwayscli_1.CliBranch)({
         get_info_1.getInfoCliLeaf,
         refresh_1.refreshCliLeaf,
         clean_1.cleanCliLeaf,
-        restart_1.restartCliLeaf
+        restart_1.restartCliLeaf,
+        migrate_1.migrateCliLeaf
     ]
 });
 //# 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,yCAA4C;AAC5C,mCAAuC;AACvC,iCAAqC;AACrC,uCAA2C;AAC3C,uCAA2C;AAE9B,QAAA,eAAe,GAAG,IAAA,qBAAS,EAAC;IACvC,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE;QACX,kBAAW;QACX,yBAAc;QACd,wBAAc;QACd,oBAAY;QACZ,wBAAc;KACf;CACF,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/subcommands/device/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,yCAA4C;AAC5C,mCAAuC;AACvC,iCAAqC;AACrC,uCAA2C;AAC3C,uCAA2C;AAC3C,uCAA2C;AAE9B,QAAA,eAAe,GAAG,IAAA,qBAAS,EAAC;IACvC,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE;QACX,kBAAW;QACX,yBAAc;QACd,wBAAc;QACd,oBAAY;QACZ,wBAAc;QACd,wBAAc;KACf;CACF,CAAC,CAAC"}

package/lib/subcommands/device/init.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initCliLeaf = void 0;
 const alwayscli_1 = require("@alwaysai/alwayscli");
 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 uuid_1 = require("uuid");
 const directories_1 = require("../../util/directories");
+const http_client_1 = require("../../util/http-client");
+const device_1 = require("alwaysai/lib/core/device");
 const util_1 = require("alwaysai/lib/util");
+const device_certificate_1 = require("../../infrastructure/device-certificate");
 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");
-const paths_1 = require("alwaysai/lib/paths");
 exports.initCliLeaf = (0, alwayscli_1.CliLeaf)({
     name: 'init',
     description: 'Initialize device',
@@ -31,7 +31,7 @@ exports.initCliLeaf = (0, alwayscli_1.CliLeaf)({
         let { name } = opts;
         name = name || (0, uuid_1.v4)();
         if ((0, device_1.DeviceConfigFile)().exists() ||
-            (0, fs_1.existsSync)(directories_1.DEVICE_PRIVATE_KEY_FILE_PATH)) {
+            (0, fs_1.existsSync)(infrastructure_1.DEVICE_PRIVATE_KEY_FILE_PATH)) {
             throw new Error("Device has been previously provisioned. Run 'aai-agent device clean' to re-provision");
         }
         logger_1.logger.info(`Initializing device ${name}`);
@@ -55,10 +55,10 @@ exports.initCliLeaf = (0, alwayscli_1.CliLeaf)({
         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: paths_1.LOCAL_CERT_AND_KEY_DIR }).writeFile(directories_1.AWS_ROOT_CERTIFICATE_FILE_NAME, ROOT_CERT_AWS);
+        await (0, util_1.JsSpawner)().mkdirp((0, device_certificate_1.getBootstrapCertificateDirectoryPath)());
+        await (0, util_1.JsSpawner)({ path: infrastructure_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)()
+            path: (0, device_certificate_1.getBootstrapCertificateDirectoryPath)()
         });
         const writeCertFilePromises = [];
         for (const key in response.claimCertificate) {