@alwaysai/device-agent 0.1.0 → 0.1.2

package/lib/application-control/config.d.ts

@@ -12,7 +12,6 @@ export declare function updateAppCfgFile(props: {
 }): Promise<void>;
 export declare function updateAppCfg(props: {
     projectId: string;
-    appReleaseHash: string;
     newAppCfg: AppConfig;
 }): Promise<void>;
 export declare function readDockerCompose(props: {

package/lib/application-control/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/application-control/config.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAIhE,wBAAsB,cAAc,CAAC,KAAK,EAAE;IAC1C,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,SAAS,CAAC,CAmBrB;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,CAAC;CACnB,iBAgBA;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,GAAG,CAAC;CAChB,iBAKA;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;CACtB,iBA6BA;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,gBAUnE;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,GAAG,CAAC;CACpB,iBAWA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/application-control/config.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAIhE,wBAAsB,cAAc,CAAC,KAAK,EAAE;IAC1C,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,SAAS,CAAC,CAiBrB;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,CAAC;CACnB,iBAaA;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,GAAG,CAAC;CAChB,iBAKA;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;CACtB,iBAmCA;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,gBAOnE;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,GAAG,CAAC;CACpB,iBAQA"}

package/lib/application-control/config.js

@@ -12,9 +12,7 @@ const status_1 = require("./status");
 const logger_1 = require("../util/logger");
 async function readAppCfgFile(props) {
     const { projectId } = props;
-    if (!(await (0, agent_config_1.AgentConfigFile)().isAppPresent({ projectId }))) {
-        throw new Error(`App ${projectId} is not present!`);
-    }
+    await (0, utils_1.requireAppInstalled)({ projectId });
     const appDir = (0, utils_1.getAppDir)(projectId);
     const appJson = (0, app_1.AppJsonFile)(appDir);
     if (!appJson.exists()) {
@@ -30,9 +28,6 @@ async function readAppCfgFile(props) {
 exports.readAppCfgFile = readAppCfgFile;
 async function writeAppCfgFile(props) {
     const { projectId, appCfg } = props;
-    if (!(await (0, agent_config_1.AgentConfigFile)().isAppPresent({ projectId }))) {
-        throw new Error(`App ${projectId} is not present!`);
-    }
     const appDir = (0, utils_1.getAppDir)(projectId);
     const appJson = (0, app_1.AppJsonFile)(appDir);
     try {
@@ -51,37 +46,31 @@ async function updateAppCfgFile(props) {
 }
 exports.updateAppCfgFile = updateAppCfgFile;
 async function updateAppCfg(props) {
-    const { projectId, appReleaseHash, newAppCfg } = props;
-    logger_1.logger.info(`Updating app config for ${projectId}:${appReleaseHash}.`);
+    const { projectId, newAppCfg } = props;
+    logger_1.logger.info(`Updating app config for ${projectId}`);
     const appDir = (0, utils_1.getAppDir)(projectId);
-    if (await (0, agent_config_1.AgentConfigFile)().isAppPresent({ projectId })) {
-        if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
-            throw new Error('Application already has installation in progress!');
-        }
-        logger_1.logger.info('Application is already installed, updating');
-        await (0, agent_config_1.AgentConfigFile)().setAppInstalling({
-            projectId,
-            version: appReleaseHash
-        });
-    }
-    else {
-        throw new Error('Application is not installed!');
-    }
+    await (0, utils_1.requireAppReady)({ projectId });
+    const appReleaseHash = await (0, agent_config_1.AgentConfigFile)().getAppVersion({
+        projectId
+    });
+    await (0, agent_config_1.AgentConfigFile)().setAppInstalling({
+        projectId,
+        version: appReleaseHash
+    });
     await writeAppCfgFile({ projectId, appCfg: newAppCfg });
     await (0, utils_1.buildApp)({ appDir });
     await (0, agent_config_1.AgentConfigFile)().setAppInstalled({
         projectId,
         version: appReleaseHash
     });
-    await (0, status_1.restartApp)({ projectId });
-    logger_1.logger.info(`Updated app config and rebuilt ${projectId}:${appReleaseHash}.`);
+    if (await (0, status_1.isAppStarted)({ projectId })) {
+        await (0, status_1.restartApp)({ projectId });
+    }
+    logger_1.logger.info(`Updated app config and rebuilt ${projectId}: ${JSON.stringify(newAppCfg, null, 2)}`);
 }
 exports.updateAppCfg = updateAppCfg;
 async function readDockerCompose(props) {
     const { projectId } = props;
-    if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
-        throw new Error(`App ${projectId} is not ready!`);
-    }
     const appDir = (0, utils_1.getAppDir)(projectId);
     const spawner = (0, util_1.JsSpawner)({ path: appDir });
     const composeContents = await spawner.readFile('docker-compose.yaml');
@@ -91,9 +80,6 @@ async function readDockerCompose(props) {
 exports.readDockerCompose = readDockerCompose;
 async function writeDockerCompose(props) {
     const { projectId, dockerCompose } = props;
-    if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
-        throw new Error(`App ${projectId} is not ready!`);
-    }
     const appDir = (0, utils_1.getAppDir)(projectId);
     const spawner = (0, util_1.JsSpawner)({ path: appDir });
     const composeOutput = (0, yaml_1.stringify)(dockerCompose);

package/lib/application-control/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/application-control/config.ts"],"names":[],"mappings":";;;AAAA,iEAAiE;AACjE,+BAAwC;AACxC,mCAA8C;AAC9C,4CAA8C;AAC9C,mDAAqC;AACrC,mCAAuC;AACvC,+CAAoD;AAEpD,qCAAsC;AACtC,2CAAwC;AAEjC,KAAK,UAAU,cAAc,CAAC,KAEpC;IACC,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAe,GAAE,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;QAC1D,MAAM,IAAI,KAAK,CAAC,OAAO,SAAS,kBAAkB,CAAC,CAAC;KACrD;IACD,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,IAAA,iBAAW,EAAC,MAAM,CAAC,CAAC;IACpC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,kBAAkB,SAAS,iBAAiB,CAAC,CAAC;KAC/D;IACD,IAAI;QACF,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,gCAAgC,SAAS,MACvC,CAAC,CAAC,OACJ,KAAK,OAAO,CAAC,SAAS,EAAE,EAAE,CAC3B,CAAC;KACH;AACH,CAAC;AArBD,wCAqBC;AAEM,KAAK,UAAU,eAAe,CAAC,KAGrC;IACC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACpC,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAe,GAAE,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;QAC1D,MAAM,IAAI,KAAK,CAAC,OAAO,SAAS,kBAAkB,CAAC,CAAC;KACrD;IACD,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,IAAA,iBAAW,EAAC,MAAM,CAAC,CAAC;IACpC,IAAI;QACF,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,gCAAgC,SAAS,MACvC,CAAC,CAAC,OACJ,KAAK,OAAO,CAAC,SAAS,EAAE,EAAE,CAC3B,CAAC;KACH;AACH,CAAC;AAnBD,0CAmBC;AAEM,KAAK,UAAU,gBAAgB,CAAC,KAGtC;IACC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACvC,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,IAAA,eAAM,EAAC,cAAc,EAAE,IAAA,cAAK,EAAC,cAAc,EAAE,SAAS,CAAC,CAAC,CAAC;IACxE,MAAM,eAAe,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;AAC/C,CAAC;AARD,4CAQC;AAEM,KAAK,UAAU,YAAY,CAAC,KAIlC;IACC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACvD,eAAM,CAAC,IAAI,CAAC,2BAA2B,SAAS,IAAI,cAAc,GAAG,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IAEpC,IAAI,MAAM,IAAA,8BAAe,GAAE,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;QACvD,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAe,GAAE,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;YACxD,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;SACtE;QACD,eAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QAC1D,MAAM,IAAA,8BAAe,GAAE,CAAC,gBAAgB,CAAC;YACvC,SAAS;YACT,OAAO,EAAE,cAAc;SACxB,CAAC,CAAC;KACJ;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IAED,MAAM,eAAe,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACxD,MAAM,IAAA,gBAAQ,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3B,MAAM,IAAA,8BAAe,GAAE,CAAC,eAAe,CAAC;QACtC,SAAS;QACT,OAAO,EAAE,cAAc;KACxB,CAAC,CAAC;IAEH,MAAM,IAAA,mBAAU,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAEhC,eAAM,CAAC,IAAI,CAAC,kCAAkC,SAAS,IAAI,cAAc,GAAG,CAAC,CAAC;AAChF,CAAC;AAjCD,oCAiCC;AAEM,KAAK,UAAU,iBAAiB,CAAC,KAA4B;IAClE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAe,GAAE,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;QACxD,MAAM,IAAI,KAAK,CAAC,OAAO,SAAS,gBAAgB,CAAC,CAAC;KACnD;IACD,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,IAAA,gBAAS,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5C,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IACtE,MAAM,aAAa,GAAG,IAAA,YAAK,EAAC,eAAe,CAAC,CAAC;IAC7C,OAAO,aAAa,CAAC;AACvB,CAAC;AAVD,8CAUC;AAEM,KAAK,UAAU,kBAAkB,CAAC,KAGxC;IACC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAC3C,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAe,GAAE,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;QACxD,MAAM,IAAI,KAAK,CAAC,OAAO,SAAS,gBAAgB,CAAC,CAAC;KACnD;IACD,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,IAAA,gBAAS,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5C,MAAM,aAAa,GAAG,IAAA,gBAAS,EAAC,aAAa,CAAC,CAAC;IAC/C,wBAAwB;IACxB,MAAM,wBAAO,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,CAAC;IACrE,MAAM,OAAO,CAAC,SAAS,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;AAChE,CAAC;AAdD,gDAcC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/application-control/config.ts"],"names":[],"mappings":"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"}

package/lib/application-control/environment-variables.d.ts

@@ -1,9 +1,13 @@
+export interface EnvVars {
+    [service: string]: {
+        [name: string]: string;
+    };
+}
 export declare function setEnv(props: {
     projectId: string;
-    vars: string[];
-    service?: string;
+    envVars: EnvVars;
 }): Promise<void>;
 export declare function getAllEnvs(props: {
     projectId: string;
-}): Promise<{}>;
+}): Promise<EnvVars>;
 //# sourceMappingURL=environment-variables.d.ts.map

package/lib/application-control/environment-variables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"environment-variables.d.ts","sourceRoot":"","sources":["../../src/application-control/environment-variables.ts"],"names":[],"mappings":"AAKA,wBAAsB,MAAM,CAAC,KAAK,EAAE;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,iBA4BA;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,eAkC5D"}
+{"version":3,"file":"environment-variables.d.ts","sourceRoot":"","sources":["../../src/application-control/environment-variables.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,OAAO;IACtB,CAAC,OAAO,EAAE,MAAM,GAAG;QACjB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;KACxB,CAAC;CACH;AAED,wBAAsB,MAAM,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,iBAkE1E;AAWD,wBAAsB,UAAU,CAAC,KAAK,EAAE;IACtC,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,OAAO,CAAC,CAwCnB"}

package/lib/application-control/environment-variables.js

@@ -2,46 +2,74 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllEnvs = exports.setEnv = void 0;
 const util_1 = require("alwaysai/lib/util");
-const agent_config_1 = require("../infrastructure/agent-config");
 const config_1 = require("./config");
 const utils_1 = require("./utils");
+const logger_1 = require("../util/logger");
+const agent_config_1 = require("../infrastructure/agent-config");
+const status_1 = require("./status");
 async function setEnv(props) {
-    const { projectId, vars } = props;
-    if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
-        throw new Error(`App ${projectId} is not ready!`);
-    }
+    const { projectId, envVars } = props;
+    await (0, utils_1.requireAppReady)({ projectId });
+    const appReleaseHash = await (0, agent_config_1.AgentConfigFile)().getAppVersion({
+        projectId
+    });
+    await (0, agent_config_1.AgentConfigFile)().setAppInstalling({
+        projectId,
+        version: appReleaseHash
+    });
     const composeParsed = await (0, config_1.readDockerCompose)({ projectId });
-    if ('services' in composeParsed) {
-        let services = Object.keys(composeParsed['services']);
-        if (props.service) {
-            if (services.includes(props.service)) {
-                services = [props.service];
-            }
-            else {
-                throw new Error(`Service ${props.service} not found in ${services}`);
-            }
+    if (!('services' in composeParsed)) {
+        throw new Error(`Docker compose file for ${projectId} has no services!`);
+    }
+    const services = Object.keys(envVars);
+    for (const s of services) {
+        if (!Object.keys(composeParsed['services']).includes(s)) {
+            throw new Error(`Service ${s} not found in ${JSON.stringify(composeParsed['services'], null, 2)}`);
         }
-        for (const s of services) {
-            const service = composeParsed['services'][s];
-            // The environment field overrides the env files, so by appending to
-            // the environment list we can assure the value will be used
-            if ('environment' in service) {
-                const environment = service['environment'];
-                composeParsed['services'][s]['environment'] = environment.concat(vars);
-            }
-            else {
-                composeParsed['services'][s]['environment'] = vars;
-            }
+        const envVarList = [];
+        for (const envVar of Object.keys(envVars[s])) {
+            envVarList.push(`${envVar}=${envVars[s][envVar]}`);
+        }
+        const service = composeParsed['services'][s];
+        // The environment field overrides the env files, so by appending to
+        // the environment list we can assure the value will be used over
+        // the env_file.
+        // NOTE: We are only appending the new values to the end of the
+        // environment variable list, which will override but not replace
+        // previous instances of the same environment variable.
+        if ('environment' in service) {
+            const environment = service['environment'];
+            composeParsed['services'][s]['environment'] =
+                environment.concat(envVarList);
+        }
+        else {
+            composeParsed['services'][s]['environment'] = envVarList;
         }
     }
     await (0, config_1.writeDockerCompose)({ projectId, dockerCompose: composeParsed });
+    const appDir = (0, utils_1.getAppDir)(projectId);
+    await (0, utils_1.buildApp)({ appDir });
+    await (0, agent_config_1.AgentConfigFile)().setAppInstalled({
+        projectId,
+        version: appReleaseHash
+    });
+    if (await (0, status_1.isAppStarted)({ projectId })) {
+        await (0, status_1.restartApp)({ projectId });
+    }
+    logger_1.logger.info(`Updated environment variables for ${projectId}: ${JSON.stringify(envVars, null, 2)}`);
 }
 exports.setEnv = setEnv;
+async function convertStringEnvsToKeyVal(stringEnvs) {
+    const envVars = {};
+    stringEnvs.forEach((env) => {
+        const keyVal = env.split('=');
+        envVars[keyVal[0]] = keyVal[1];
+    });
+    return envVars;
+}
 async function getAllEnvs(props) {
     const { projectId } = props;
-    if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
-        throw new Error(`App ${projectId} is not ready!`);
-    }
+    await (0, utils_1.requireAppReady)({ projectId });
     const appDir = (0, utils_1.getAppDir)(projectId);
     const spawner = (0, util_1.JsSpawner)({ path: appDir });
     const envVars = {};
@@ -49,22 +77,30 @@ async function getAllEnvs(props) {
     if ('services' in composeParsed) {
         const services = Object.keys(composeParsed['services']);
         for (const s of services) {
-            envVars[s] = [];
+            envVars[s] = {};
             const service = composeParsed['services'][s];
+            // Read env_file first, since it is lowest on the hierarchy
             if ('env_file' in service) {
                 const envFiles = service['env_file'];
                 for (const ef of envFiles) {
-                    envVars[s] = envVars[s].concat((await spawner.readFile(ef)).split('\n'));
+                    if (!(await spawner.exists(ef))) {
+                        logger_1.logger.error(`Skipping env file ${ef} for service ${s}: not found!`);
+                        continue;
+                    }
+                    let envFileLines = (await spawner.readFile(ef)).split('\n');
+                    // Filter out empty lines and comment lines
+                    envFileLines = envFileLines.filter((v) => {
+                        return v !== '' && !v.includes('#');
+                    });
+                    const newEnvVars = await convertStringEnvsToKeyVal(envFileLines);
+                    envVars[s] = Object.assign(Object.assign({}, envVars[s]), newEnvVars);
                 }
             }
             if ('environment' in service) {
                 const environment = service['environment'];
-                envVars[s] = envVars[s].concat(environment);
+                const newEnvVars = await convertStringEnvsToKeyVal(environment);
+                envVars[s] = Object.assign(Object.assign({}, envVars[s]), newEnvVars);
             }
-            // Filter out empty lines and comment lines
-            envVars[s] = envVars[s].filter((v) => {
-                return v !== '' && !v.includes('#');
-            });
         }
     }
     return envVars;

package/lib/application-control/environment-variables.js.map

@@ -1 +1 @@
-{"version":3,"file":"environment-variables.js","sourceRoot":"","sources":["../../src/application-control/environment-variables.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAC9C,iEAAiE;AACjE,qCAAiE;AACjE,mCAAoC;AAE7B,KAAK,UAAU,MAAM,CAAC,KAI5B;IACC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAClC,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAe,GAAE,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;QACxD,MAAM,IAAI,KAAK,CAAC,OAAO,SAAS,gBAAgB,CAAC,CAAC;KACnD;IACD,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAiB,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAC7D,IAAI,UAAU,IAAI,aAAa,EAAE;QAC/B,IAAI,QAAQ,GAAa,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;QAChE,IAAI,KAAK,CAAC,OAAO,EAAE;YACjB,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;gBACpC,QAAQ,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aAC5B;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,WAAW,KAAK,CAAC,OAAO,iBAAiB,QAAQ,EAAE,CAAC,CAAC;aACtE;SACF;QACD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE;YACxB,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7C,oEAAoE;YACpE,4DAA4D;YAC5D,IAAI,aAAa,IAAI,OAAO,EAAE;gBAC5B,MAAM,WAAW,GAAa,OAAO,CAAC,aAAa,CAAC,CAAC;gBACrD,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACxE;iBAAM;gBACL,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;aACpD;SACF;KACF;IACD,MAAM,IAAA,2BAAkB,EAAC,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC,CAAC;AACxE,CAAC;AAhCD,wBAgCC;AAEM,KAAK,UAAU,UAAU,CAAC,KAA4B;IAC3D,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAe,GAAE,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;QACxD,MAAM,IAAI,KAAK,CAAC,OAAO,SAAS,gBAAgB,CAAC,CAAC;KACnD;IACD,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,IAAA,gBAAS,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAiB,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAC7D,IAAI,UAAU,IAAI,aAAa,EAAE;QAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;QACxD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE;YACxB,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;YAChB,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7C,IAAI,UAAU,IAAI,OAAO,EAAE;gBACzB,MAAM,QAAQ,GAAa,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC/C,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE;oBACzB,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAC5B,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CACzC,CAAC;iBACH;aACF;YACD,IAAI,aAAa,IAAI,OAAO,EAAE;gBAC5B,MAAM,WAAW,GAAa,OAAO,CAAC,aAAa,CAAC,CAAC;gBACrD,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;aAC7C;YACD,2CAA2C;YAC3C,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;gBACnC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;SACJ;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAlCD,gCAkCC"}
+{"version":3,"file":"environment-variables.js","sourceRoot":"","sources":["../../src/application-control/environment-variables.ts"],"names":[],"mappings":"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"}

package/lib/application-control/environment-variables.test.d.ts

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

package/lib/application-control/environment-variables.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"environment-variables.test.d.ts","sourceRoot":"","sources":["../../src/application-control/environment-variables.test.ts"],"names":[],"mappings":""}

package/lib/application-control/environment-variables.test.js

@@ -0,0 +1,163 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const agent_config_1 = require("../infrastructure/agent-config");
+const config_1 = require("./config");
+const environment_variables_1 = require("./environment-variables");
+const status_1 = require("./status");
+const utils_1 = require("./utils");
+jest.mock('./config');
+jest.mock('./utils');
+jest.mocked(utils_1.requireAppReady).mockResolvedValue();
+jest.mocked(utils_1.buildApp).mockResolvedValue();
+jest.mock('./status');
+jest.mocked(status_1.isAppStarted).mockResolvedValue(true);
+jest.mocked(status_1.restartApp).mockResolvedValue();
+jest.mock('../infrastructure/agent-config');
+const mockSetAppInstalling = jest.fn().mockResolvedValue({});
+const mockSetAppInstalled = jest.fn().mockResolvedValue({});
+const mockGetAppVersion = jest.fn().mockResolvedValue('test-version');
+jest.mocked(agent_config_1.AgentConfigFile).mockReturnValue({
+    setAppInstalling: mockSetAppInstalling,
+    setAppInstalled: mockSetAppInstalled,
+    getAppVersion: mockGetAppVersion
+});
+const projectId1 = 'test-project';
+describe('Test environment variable get and set', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+    describe('Test getAllEnvs()', () => {
+        test('get all envs with one service and no envs', async () => {
+            const compose = {
+                services: {
+                    alwaysai: {}
+                }
+            };
+            jest.mocked(config_1.readDockerCompose).mockResolvedValue(compose);
+            const envVars = await (0, environment_variables_1.getAllEnvs)({ projectId: projectId1 });
+            expect(jest.mocked(config_1.readDockerCompose)).toBeCalledWith({
+                projectId: projectId1
+            });
+            expect(envVars).toEqual({
+                alwaysai: {}
+            });
+        });
+        // TODO: Add test with env file
+        test('get all envs with one service and two envs', async () => {
+            const compose = {
+                services: {
+                    alwaysai: {
+                        environment: ['TEST=1', 'TEST2=2']
+                    }
+                }
+            };
+            jest.mocked(config_1.readDockerCompose).mockResolvedValue(compose);
+            const envVars = await (0, environment_variables_1.getAllEnvs)({ projectId: projectId1 });
+            expect(jest.mocked(config_1.readDockerCompose)).toBeCalledWith({
+                projectId: projectId1
+            });
+            expect(envVars).toEqual({
+                alwaysai: { TEST: '1', TEST2: '2' }
+            });
+        });
+        test('get all envs with two services and envs', async () => {
+            const compose = {
+                services: {
+                    alwaysai: {
+                        environment: ['TEST=3', 'TEST2=4']
+                    },
+                    edgeiq: {
+                        environment: ['TEST3=5', 'TEST4=6']
+                    }
+                }
+            };
+            jest.mocked(config_1.readDockerCompose).mockResolvedValue(compose);
+            const envVars = await (0, environment_variables_1.getAllEnvs)({ projectId: projectId1 });
+            expect(jest.mocked(config_1.readDockerCompose)).toBeCalledWith({
+                projectId: projectId1
+            });
+            expect(envVars).toEqual({
+                alwaysai: { TEST: '3', TEST2: '4' },
+                edgeiq: { TEST3: '5', TEST4: '6' }
+            });
+        });
+    });
+    describe('Test setEnv()', () => {
+        test('Set one env', async () => {
+            const compose = {
+                services: {
+                    alwaysai: {}
+                }
+            };
+            jest.mocked(config_1.readDockerCompose).mockResolvedValue(compose);
+            const envVars = { alwaysai: { TEST: '1' } };
+            await (0, environment_variables_1.setEnv)({ projectId: projectId1, envVars });
+            expect(jest.mocked(config_1.readDockerCompose)).toBeCalledWith({
+                projectId: projectId1
+            });
+            expect(jest.mocked(config_1.writeDockerCompose)).toBeCalledWith({
+                projectId: projectId1,
+                dockerCompose: {
+                    services: {
+                        alwaysai: {
+                            environment: ['TEST=1']
+                        }
+                    }
+                }
+            });
+        });
+        test('Update one env', async () => {
+            const environment = ['TEST1=1', 'TEST2=2'];
+            const compose = {
+                services: {
+                    alwaysai: { environment }
+                }
+            };
+            jest.mocked(config_1.readDockerCompose).mockResolvedValue(compose);
+            const envVars = { alwaysai: { TEST1: '2' } };
+            await (0, environment_variables_1.setEnv)({ projectId: projectId1, envVars });
+            expect(jest.mocked(config_1.readDockerCompose)).toBeCalledWith({
+                projectId: projectId1
+            });
+            expect(jest.mocked(config_1.writeDockerCompose)).toBeCalledWith({
+                projectId: projectId1,
+                dockerCompose: {
+                    services: {
+                        alwaysai: {
+                            environment: ['TEST1=1', 'TEST2=2', 'TEST1=2']
+                        }
+                    }
+                }
+            });
+        });
+        test('Update one env with two services', async () => {
+            const environment = ['TEST1=3', 'TEST2=4'];
+            const compose = {
+                services: {
+                    alwaysai: { environment },
+                    other: { environment: ['OTHER_TEST=1'] }
+                }
+            };
+            jest.mocked(config_1.readDockerCompose).mockResolvedValue(compose);
+            const envVars = { alwaysai: { TEST1: '2' } };
+            await (0, environment_variables_1.setEnv)({ projectId: projectId1, envVars });
+            expect(jest.mocked(config_1.readDockerCompose)).toBeCalledWith({
+                projectId: projectId1
+            });
+            expect(jest.mocked(config_1.writeDockerCompose)).toBeCalledWith({
+                projectId: projectId1,
+                dockerCompose: {
+                    services: {
+                        alwaysai: {
+                            environment: ['TEST1=3', 'TEST2=4', 'TEST1=2']
+                        },
+                        other: {
+                            environment: ['OTHER_TEST=1']
+                        }
+                    }
+                }
+            });
+        });
+    });
+});
+//# sourceMappingURL=environment-variables.test.js.map

package/lib/application-control/environment-variables.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"environment-variables.test.js","sourceRoot":"","sources":["../../src/application-control/environment-variables.test.ts"],"names":[],"mappings":"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"}

package/lib/application-control/index.d.ts

@@ -1,10 +1,10 @@
-import { readAppCfgFile, updateAppCfg, readDockerCompose, writeDockerCompose } from './config';
+import { readAppCfgFile, updateAppCfg } from './config';
 import { installApp, uninstallApp } from './install';
 import { rollbackApp } from './backup';
 import { getAppStatus, startApp, getAppLogs, stopApp, restartApp } from './status';
 import { ModelDetails } from './types';
-import { getAllEnvs, setEnv } from './environment-variables';
-export { readAppCfgFile, updateAppCfg, readDockerCompose, writeDockerCompose, installApp, uninstallApp, rollbackApp, getAppStatus, startApp, getAppLogs, stopApp, restartApp, ModelDetails, getAllEnvs, setEnv };
+import { EnvVars, getAllEnvs, setEnv } from './environment-variables';
+export { readAppCfgFile, updateAppCfg, installApp, uninstallApp, rollbackApp, getAppStatus, startApp, getAppLogs, stopApp, restartApp, ModelDetails, EnvVars, getAllEnvs, setEnv };
 import { getAppModels, removeModel, replaceModels, updateModels, updateModelsWithPresignedUrls } from './models';
 export { getAppModels, removeModel, replaceModels, updateModels, updateModelsWithPresignedUrls };
 //# sourceMappingURL=index.d.ts.map

package/lib/application-control/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application-control/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,OAAO,EACP,UAAU,EACX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EACL,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,OAAO,EACP,UAAU,EACV,YAAY,EACZ,UAAU,EACV,MAAM,EACP,CAAC;AAGF,OAAO,EACL,YAAY,EACZ,WAAW,EACX,aAAa,EACb,YAAY,EACZ,6BAA6B,EAC9B,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,YAAY,EACZ,WAAW,EACX,aAAa,EACb,YAAY,EACZ,6BAA6B,EAC9B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application-control/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,OAAO,EACP,UAAU,EACX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EACL,cAAc,EACd,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,OAAO,EACP,UAAU,EACV,YAAY,EACZ,OAAO,EACP,UAAU,EACV,MAAM,EACP,CAAC;AAGF,OAAO,EACL,YAAY,EACZ,WAAW,EACX,aAAa,EACb,YAAY,EACZ,6BAA6B,EAC9B,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,YAAY,EACZ,WAAW,EACX,aAAa,EACb,YAAY,EACZ,6BAA6B,EAC9B,CAAC"}

package/lib/application-control/index.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateModelsWithPresignedUrls = exports.updateModels = exports.replaceModels = exports.removeModel = exports.getAppModels = exports.setEnv = exports.getAllEnvs = exports.restartApp = exports.stopApp = exports.getAppLogs = exports.startApp = exports.getAppStatus = exports.rollbackApp = exports.uninstallApp = exports.installApp = exports.writeDockerCompose = exports.readDockerCompose = exports.updateAppCfg = exports.readAppCfgFile = void 0;
+exports.updateModelsWithPresignedUrls = exports.updateModels = exports.replaceModels = exports.removeModel = exports.getAppModels = exports.setEnv = exports.getAllEnvs = exports.restartApp = exports.stopApp = exports.getAppLogs = exports.startApp = exports.getAppStatus = exports.rollbackApp = exports.uninstallApp = exports.installApp = exports.updateAppCfg = exports.readAppCfgFile = void 0;
 const config_1 = require("./config");
 Object.defineProperty(exports, "readAppCfgFile", { enumerable: true, get: function () { return config_1.readAppCfgFile; } });
 Object.defineProperty(exports, "updateAppCfg", { enumerable: true, get: function () { return config_1.updateAppCfg; } });
-Object.defineProperty(exports, "readDockerCompose", { enumerable: true, get: function () { return config_1.readDockerCompose; } });
-Object.defineProperty(exports, "writeDockerCompose", { enumerable: true, get: function () { return config_1.writeDockerCompose; } });
 const install_1 = require("./install");
 Object.defineProperty(exports, "installApp", { enumerable: true, get: function () { return install_1.installApp; } });
 Object.defineProperty(exports, "uninstallApp", { enumerable: true, get: function () { return install_1.uninstallApp; } });

package/lib/application-control/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/application-control/index.ts"],"names":[],"mappings":";;;AAAA,qCAKkB;AAchB,+FAlBA,uBAAc,OAkBA;AACd,6FAlBA,qBAAY,OAkBA;AACZ,kGAlBA,0BAAiB,OAkBA;AACjB,mGAlBA,2BAAkB,OAkBA;AAhBpB,uCAAqD;AAiBnD,2FAjBO,oBAAU,OAiBP;AACV,6FAlBmB,sBAAY,OAkBnB;AAjBd,qCAAuC;AAkBrC,4FAlBO,oBAAW,OAkBP;AAjBb,qCAMkB;AAYhB,6FAjBA,qBAAY,OAiBA;AACZ,yFAjBA,iBAAQ,OAiBA;AACR,2FAjBA,mBAAU,OAiBA;AACV,wFAjBA,gBAAO,OAiBA;AACP,2FAjBA,mBAAU,OAiBA;AAdZ,mEAA6D;AAgB3D,2FAhBO,kCAAU,OAgBP;AACV,uFAjBmB,8BAAM,OAiBnB;AAGR,gBAAgB;AAChB,qCAMkB;AAGhB,6FARA,qBAAY,OAQA;AACZ,4FARA,oBAAW,OAQA;AACX,8FARA,sBAAa,OAQA;AACb,6FARA,qBAAY,OAQA;AACZ,8GARA,sCAA6B,OAQA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/application-control/index.ts"],"names":[],"mappings":";;;AAAA,qCAAwD;AActD,+FAdO,uBAAc,OAcP;AACd,6FAfuB,qBAAY,OAevB;AAdd,uCAAqD;AAenD,2FAfO,oBAAU,OAeP;AACV,6FAhBmB,sBAAY,OAgBnB;AAfd,qCAAuC;AAgBrC,4FAhBO,oBAAW,OAgBP;AAfb,qCAMkB;AAUhB,6FAfA,qBAAY,OAeA;AACZ,yFAfA,iBAAQ,OAeA;AACR,2FAfA,mBAAU,OAeA;AACV,wFAfA,gBAAO,OAeA;AACP,2FAfA,mBAAU,OAeA;AAZZ,mEAAsE;AAepE,2FAfgB,kCAAU,OAehB;AACV,uFAhB4B,8BAAM,OAgB5B;AAGR,gBAAgB;AAChB,qCAMkB;AAGhB,6FARA,qBAAY,OAQA;AACZ,4FARA,oBAAW,OAQA;AACX,8FARA,sBAAa,OAQA;AACb,6FARA,qBAAY,OAQA;AACZ,8GARA,sCAA6B,OAQA"}

package/lib/application-control/models.d.ts

@@ -19,7 +19,6 @@ export declare function installModelsWithPresignedURLs(modelPayloads: ModelInsta
 export declare function updateModelsWithPresignedUrls(props: {
     projectId: string;
     modelInstallPayloads: ModelInstallPayload[];
-    appReleaseHash: string;
     newAppCfg: AppConfig;
 }): Promise<void>;
 //# sourceMappingURL=models.d.ts.map

package/lib/application-control/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/application-control/models.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAgBrE,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAUvC,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAEhE,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,2BAoB9D;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,iBAiBA;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,iBAyBA;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAU9D;AAED,wBAAsB,8BAA8B,CAClD,aAAa,EAAE,mBAAmB,EAAE,EACpC,SAAS,EAAE,MAAM,iBAsClB;AAED,wBAAsB,6BAA6B,CAAC,KAAK,EAAE;IACzD,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;CACtB,iBA+DA"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/application-control/models.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAerE,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAUvC,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAEhE,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,2BAoB9D;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,iBAiBA;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,iBAyBA;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAU9D;AAED,wBAAsB,8BAA8B,CAClD,aAAa,EAAE,mBAAmB,EAAE,EACpC,SAAS,EAAE,MAAM,iBAsClB;AAED,wBAAsB,6BAA6B,CAAC,KAAK,EAAE;IACzD,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,SAAS,EAAE,SAAS,CAAC;CACtB,iBAkDA"}

package/lib/application-control/models.js

@@ -114,24 +114,18 @@ async function installModelsWithPresignedURLs(modelPayloads, targetDir) {
 }
 exports.installModelsWithPresignedURLs = installModelsWithPresignedURLs;
 async function updateModelsWithPresignedUrls(props) {
-    const { projectId, modelInstallPayloads, appReleaseHash, newAppCfg } = props;
+    const { projectId, modelInstallPayloads, newAppCfg } = props;
     logger_1.logger.info(`Installing models for ${projectId}`);
     const spawner = (0, util_1.JsSpawner)();
     const appDir = (0, utils_1.getAppDir)(projectId);
-    if (await (0, agent_config_1.AgentConfigFile)().isAppPresent({ projectId })) {
-        if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
-            throw new Error('Application already has installation in progress!');
-        }
-        logger_1.logger.info('Updating installed application');
-        await (0, agent_config_1.AgentConfigFile)().setAppInstalling({
-            projectId,
-            version: appReleaseHash
-        });
-    }
-    else {
-        throw new Error('Application is not installed!');
-    }
-    const ogAppCfg = await (0, config_1.readAppCfgFile)({ projectId });
+    await (0, utils_1.requireAppReady)({ projectId });
+    const appReleaseHash = await (0, agent_config_1.AgentConfigFile)().getAppVersion({
+        projectId
+    });
+    await (0, agent_config_1.AgentConfigFile)().setAppInstalling({
+        projectId,
+        version: appReleaseHash
+    });
     const ogDir = path.join(appDir, constants_1.APP_MODELS_DIRECTORY_NAME);
     // Copy all current models to restore dir in case of failure
     const restoreDir = `${ogDir}.restore`;
@@ -153,18 +147,10 @@ async function updateModelsWithPresignedUrls(props) {
             projectId,
             version: appReleaseHash
         });
-        await (0, status_1.restartApp)({ projectId });
+        if (await (0, status_1.isAppStarted)({ projectId })) {
+            await (0, status_1.restartApp)({ projectId });
+        }
         logger_1.logger.info(`Models installed for project ${projectId}`);
-        /* Leave error handling to higher level so errors are sent to cloud
-      } catch (e) {
-        logger.error(
-          'Error updating app models from presigned URL, restoring models.',
-          e.message
-        );
-        await spawner.rimraf(ogDir);
-        await copyDir({ srcPath: restoreDir, destPath: ogDir });
-        await writeAppCfgFile({ projectId, appCfg: ogAppCfg });
-        */
     }
     finally {
         await spawner.rimraf(tmpDir);