@alwaysai/device-agent 0.0.3 → 0.0.4

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

@@ -0,0 +1,8 @@
+export declare const BACKUP_EXT = ".bak";
+export declare function createAppBackup(props: {
+    projectId: string;
+}): Promise<void>;
+export declare function rollbackApp(props: {
+    projectId: string;
+}): Promise<void>;
+//# sourceMappingURL=backup.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"backup.d.ts","sourceRoot":"","sources":["../../src/application-control/backup.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,UAAU,SAAS,CAAC;AAEjC,wBAAsB,eAAe,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAMjE;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAW7D"}

package/lib/application-control/backup.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rollbackApp = exports.createAppBackup = exports.BACKUP_EXT = void 0;
+const rimraf = require("rimraf");
+const fs = require("fs");
+const copy_dir_1 = require("../util/copy-dir");
+const utils_1 = require("./utils");
+exports.BACKUP_EXT = '.bak';
+async function createAppBackup(props) {
+    const { projectId } = props;
+    const appDir = (0, utils_1.getAppDir)(projectId);
+    const backupAppDir = `${appDir}${exports.BACKUP_EXT}`;
+    await (0, copy_dir_1.copyDir)({ srcPath: appDir, destPath: backupAppDir });
+    console.log(`Backed up app ${projectId} to ${backupAppDir}`);
+}
+exports.createAppBackup = createAppBackup;
+async function rollbackApp(props) {
+    const { projectId } = props;
+    const appDir = (0, utils_1.getAppDir)(projectId);
+    const backupAppDir = `${appDir}${exports.BACKUP_EXT}`;
+    if (!fs.existsSync(backupAppDir)) {
+        throw new Error(`Backup doesn't exist for ${projectId}`);
+    }
+    rimraf.sync(appDir);
+    await (0, copy_dir_1.copyDir)({ srcPath: `${appDir}${exports.BACKUP_EXT}`, destPath: appDir });
+    await (0, utils_1.buildApp)({ appDir });
+    console.log(`Rolled back app ${projectId} to previous version`);
+}
+exports.rollbackApp = rollbackApp;
+//# sourceMappingURL=backup.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../src/application-control/backup.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,yBAAyB;AAEzB,+CAA2C;AAC3C,mCAA8C;AAEjC,QAAA,UAAU,GAAG,MAAM,CAAC;AAE1B,KAAK,UAAU,eAAe,CAAC,KAA4B;IAChE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,GAAG,MAAM,GAAG,kBAAU,EAAE,CAAC;IAC9C,MAAM,IAAA,kBAAO,EAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;IAC3D,OAAO,CAAC,GAAG,CAAC,iBAAiB,SAAS,OAAO,YAAY,EAAE,CAAC,CAAC;AAC/D,CAAC;AAND,0CAMC;AAEM,KAAK,UAAU,WAAW,CAAC,KAA4B;IAC5D,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,GAAG,MAAM,GAAG,kBAAU,EAAE,CAAC;IAC9C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,4BAA4B,SAAS,EAAE,CAAC,CAAC;KAC1D;IACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,MAAM,IAAA,kBAAO,EAAC,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,kBAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACvE,MAAM,IAAA,gBAAQ,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3B,OAAO,CAAC,GAAG,CAAC,mBAAmB,SAAS,sBAAsB,CAAC,CAAC;AAClE,CAAC;AAXD,kCAWC"}

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

@@ -0,0 +1,10 @@
+import { AppDetails } from './types';
+export declare function getInstalledApps(): Promise<AppDetails[]>;
+export declare function installApp(props: {
+    projectId: string;
+    releaseHash: string;
+}): Promise<void>;
+export declare function uninstallApp(props: {
+    projectId: string;
+}): Promise<void>;
+//# sourceMappingURL=install.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/application-control/install.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAIrC,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAkB9D;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0ChB;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB9E"}

package/lib/application-control/install.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uninstallApp = exports.installApp = exports.getInstalledApps = void 0;
+const rimraf = require("rimraf");
+const fs = require("fs");
+const path_1 = require("path");
+const run_cli_cmd_1 = require("../util/run-cli-cmd");
+const js_spawner_1 = require("../util/spawner/js-spawner");
+const utils_1 = require("./utils");
+const backup_1 = require("./backup");
+const status_1 = require("./status");
+async function getInstalledApps() {
+    if (!fs.existsSync(utils_1.APP_ROOT)) {
+        return [];
+    }
+    const projectIds = fs.readdirSync(utils_1.APP_ROOT).filter(file => {
+        const isDir = fs.statSync(`${utils_1.APP_ROOT}/${file}`).isDirectory();
+        const isBak = `${utils_1.APP_ROOT}/${file}`.includes(backup_1.BACKUP_EXT);
+        return isDir && !isBak;
+    });
+    const appDetails = [];
+    for (const projectId of projectIds) {
+        const appDir = (0, utils_1.getAppDir)(projectId);
+        const version = await (0, utils_1.getAppVersion)({ appDir });
+        appDetails.push({ projectId, version });
+    }
+    return appDetails;
+}
+exports.getInstalledApps = getInstalledApps;
+async function installApp(props) {
+    const { projectId, releaseHash } = props;
+    console.log(`Installing ${projectId}`);
+    const appDir = (0, utils_1.getAppDir)(projectId);
+    const TEMP_DIR = (0, path_1.join)(utils_1.APP_ROOT, 'temp');
+    const spawner = (0, js_spawner_1.JsSpawner)();
+    await spawner.mkdirp(TEMP_DIR);
+    // TODO Check valid projectId
+    // Check if app is installed
+    if (await (0, utils_1.isAppInstalled)({ appDir })) {
+        console.log('Application is already installed, updating');
+        await (0, backup_1.createAppBackup)({ projectId });
+        await spawner.rimraf(appDir);
+    }
+    // Create app directory
+    await spawner.mkdirp(appDir);
+    // download the application
+    await (0, run_cli_cmd_1.runCliCmd)({
+        cmd: [
+            'release',
+            'pull',
+            '--yes',
+            '--project',
+            projectId,
+            '--releaseHash',
+            releaseHash,
+        ],
+        cwd: TEMP_DIR,
+    });
+    // Unpack app package and move to install dir
+    await spawner.untar(fs.createReadStream((0, path_1.join)(TEMP_DIR, `${releaseHash}.tgz`)), appDir);
+    console.log(`Unpacked application to ${appDir}`);
+    await (0, utils_1.setAppVersion)({ appDir, version: releaseHash });
+    await (0, utils_1.buildApp)({ appDir });
+    await spawner.rimraf(TEMP_DIR);
+    console.log(`Installed ${projectId} to ${appDir}`);
+}
+exports.installApp = installApp;
+async function uninstallApp(props) {
+    const { projectId } = props;
+    const appDir = (0, utils_1.getAppDir)(projectId);
+    if (!(await (0, utils_1.isAppInstalled)({ appDir }))) {
+        console.log(`Application ${projectId} not installed`);
+        return;
+    }
+    try {
+        await (0, status_1.stopApp)({ projectId });
+    }
+    catch (_a) {
+        console.log('Failed to stop app, may be left running...');
+    }
+    // Delete application directory and backup
+    rimraf.sync(appDir);
+    rimraf.sync(`${appDir}${backup_1.BACKUP_EXT}`);
+    console.log('Uninstalled', projectId);
+}
+exports.uninstallApp = uninstallApp;
+//# sourceMappingURL=install.js.map

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

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

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

@@ -1,3 +1,7 @@
+import { ModelDetails } from './types';
+export declare function getAppModels(props: {
+    projectId: string;
+}): Promise<ModelDetails[]>;
 export declare function addModel(props: {
     projectId: string;
     modelId: string;
@@ -6,6 +10,10 @@ export declare function removeModel(props: {
     projectId: string;
     modelId: string;
 }): Promise<void>;
+export declare function replaceModels(props: {
+    projectId: string;
+    modelIds: string[];
+}): Promise<void>;
 export declare function updateModels(props: {
     projectId: string;
 }): Promise<void>;

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":"AAGA,wBAAsB,QAAQ,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBAW3E;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBAU9E;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAW9D"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/application-control/models.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAGvC,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,2BAmB9D;AAED,wBAAsB,QAAQ,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBAW3E;AAED,wBAAsB,WAAW,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBAU9E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,iBAiBnF;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAW9D"}

package/lib/application-control/models.js

@@ -1,8 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateModels = exports.removeModel = exports.addModel = void 0;
+exports.updateModels = exports.replaceModels = exports.removeModel = exports.addModel = exports.getAppModels = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
 const run_cli_cmd_1 = require("../util/run-cli-cmd");
+const js_spawner_1 = require("../util/spawner/js-spawner");
 const utils_1 = require("./utils");
+async function getAppModels(props) {
+    const { projectId } = props;
+    const appDir = (0, utils_1.getAppDir)(projectId);
+    if (!(await (0, utils_1.isAppInstalled)({ appDir }))) {
+        throw new Error('Application is not installed');
+    }
+    const appCfgPath = (0, path_1.join)(appDir, 'alwaysai.app.json');
+    if (!(0, fs_1.existsSync)(appCfgPath)) {
+        throw new Error('Application config not found!');
+    }
+    const appCfg = JSON.parse(await (0, js_spawner_1.JsSpawner)().readFile(appCfgPath));
+    const modelDetails = [];
+    if (!('models' in appCfg)) {
+        return modelDetails;
+    }
+    for (const model in appCfg['models']) {
+        modelDetails.push({ modelId: model, version: appCfg['models'][model] });
+    }
+    return modelDetails;
+}
+exports.getAppModels = getAppModels;
 async function addModel(props) {
     const { projectId, modelId } = props;
     const appDir = (0, utils_1.getAppDir)(projectId);
@@ -23,11 +47,30 @@ async function removeModel(props) {
         throw new Error('Application is not installed');
     }
     await (0, run_cli_cmd_1.runCliCmd)({
-        cmd: ['app', 'models', 'remove', modelId],
+        cmd: ['app', 'models', 'remove', modelId, '--purge'],
         cwd: appDir,
     });
 }
 exports.removeModel = removeModel;
+async function replaceModels(props) {
+    const { projectId, modelIds } = props;
+    const appDir = (0, utils_1.getAppDir)(projectId);
+    if (!(await (0, utils_1.isAppInstalled)({ appDir }))) {
+        throw new Error('Application is not installed');
+    }
+    await (0, run_cli_cmd_1.runCliCmd)({
+        cmd: ['app', 'models', 'remove-all', '--purge'],
+        cwd: appDir,
+    });
+    for (const modelId of modelIds) {
+        await (0, run_cli_cmd_1.runCliCmd)({
+            cmd: ['app', 'models', 'add', modelId],
+            cwd: appDir,
+        });
+    }
+    await (0, utils_1.buildApp)({ appDir });
+}
+exports.replaceModels = replaceModels;
 async function updateModels(props) {
     const { projectId } = props;
     const appDir = (0, utils_1.getAppDir)(projectId);

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

@@ -1 +1 @@
-{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/application-control/models.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAChD,mCAA8D;AAEvD,KAAK,UAAU,QAAQ,CAAC,KAA6C;IAC1E,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACrC,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,IAAI,CAAC,CAAC,MAAM,IAAA,sBAAc,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IACD,MAAM,IAAA,uBAAS,EAAC;QACd,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC;QACtC,GAAG,EAAE,MAAM;KACZ,CAAC,CAAC;IACH,MAAM,IAAA,gBAAQ,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AAC7B,CAAC;AAXD,4BAWC;AAEM,KAAK,UAAU,WAAW,CAAC,KAA6C;IAC7E,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACrC,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,IAAI,CAAC,CAAC,MAAM,IAAA,sBAAc,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IACD,MAAM,IAAA,uBAAS,EAAC;QACd,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC;QACzC,GAAG,EAAE,MAAM;KACZ,CAAC,CAAC;AACL,CAAC;AAVD,kCAUC;AAEM,KAAK,UAAU,YAAY,CAAC,KAA4B;IAC7D,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,IAAI,CAAC,CAAC,MAAM,IAAA,sBAAc,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IACD,MAAM,IAAA,uBAAS,EAAC;QACd,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC;QAChC,GAAG,EAAE,MAAM;KACZ,CAAC,CAAC;IACH,MAAM,IAAA,gBAAQ,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AAC7B,CAAC;AAXD,oCAWC"}
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/application-control/models.ts"],"names":[],"mappings":"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"}

package/lib/application-control/{application-control.d.ts → status.d.ts}

@@ -1,31 +1,11 @@
 /// <reference types="node" />
-export declare type AppDetails = {
-    projectId: string;
-    version: string;
-};
-export declare function getInstalledApps(): Promise<AppDetails[]>;
-export declare function rollbackApp(props: {
-    projectId: string;
-}): Promise<void>;
+import { AppStatus } from './types';
 export declare function listAppReleases(props: {
     projectId: string;
 }): Promise<import("alwaysai/lib/util/rest-client").ReleaseHistoryArray>;
 export declare function listAppLatestRelease(props: {
     projectId: string;
 }): Promise<string | undefined>;
-export declare function installApp(props: {
-    projectId: string;
-    releaseHash: string;
-}): Promise<void>;
-export declare type ServiceState = 'Stopped' | 'Up' | 'Restarting';
-export declare type ServiceStatus = {
-    name: string;
-    state: ServiceState;
-};
-export declare type AppStatus = {
-    appDetails: AppDetails;
-    services: ServiceStatus[];
-};
 export declare function getAppStatus(props: {
     projectId: string;
 }): Promise<AppStatus>;
@@ -40,7 +20,7 @@ export declare function startApp(props: {
 export declare function stopApp(props: {
     projectId: string;
 }): Promise<void>;
-export declare function uninstallApp(props: {
+export declare function restartApp(props: {
     projectId: string;
 }): Promise<void>;
-//# sourceMappingURL=application-control.d.ts.map
+//# sourceMappingURL=status.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/application-control/status.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,SAAS,EAA+B,MAAM,SAAS,CAAC;AAEjE,wBAAsB,eAAe,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,wEAIjE;AAED,wBAAsB,oBAAoB,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,+BAOtE;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CA+CnF;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAyBjC;AAED,wBAAsB,QAAQ,CAAC,KAAK,EAAE;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBhB;AAED,wBAAsB,OAAO,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBzE;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAI5E"}

package/lib/application-control/{application-control.js → status.js}

@@ -1,55 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uninstallApp = exports.stopApp = exports.startApp = exports.getAppLogs = exports.getAppStatus = exports.installApp = exports.listAppLatestRelease = exports.listAppReleases = exports.rollbackApp = exports.getInstalledApps = void 0;
+exports.restartApp = exports.stopApp = exports.startApp = exports.getAppLogs = exports.getAppStatus = exports.listAppLatestRelease = exports.listAppReleases = void 0;
 const docker_compose_1 = require("docker-compose");
-const rimraf = require("rimraf");
-const fs = require("fs");
 const alwaysai_1 = require("alwaysai");
-const path_1 = require("path");
-const run_cli_cmd_1 = require("../util/run-cli-cmd");
 const docker_cmd_1 = require("../docker/docker-cmd");
 const js_spawner_1 = require("../util/spawner/js-spawner");
-const copy_dir_1 = require("../util/copy-dir");
 const utils_1 = require("./utils");
-const BACKUP_EXT = '.bak';
-async function getInstalledApps() {
-    if (!fs.existsSync(utils_1.APP_ROOT)) {
-        return [];
-    }
-    const projectIds = fs.readdirSync(utils_1.APP_ROOT).filter(file => {
-        const isDir = fs.statSync(`${utils_1.APP_ROOT}/${file}`).isDirectory();
-        const isBak = `${utils_1.APP_ROOT}/${file}`.includes(BACKUP_EXT);
-        return isDir && !isBak;
-    });
-    const appDetails = [];
-    for (const projectId of projectIds) {
-        const appDir = (0, utils_1.getAppDir)(projectId);
-        const version = await (0, utils_1.getAppVersion)({ appDir });
-        appDetails.push({ projectId, version });
-    }
-    return appDetails;
-}
-exports.getInstalledApps = getInstalledApps;
-async function createAppBackup(props) {
-    const { projectId } = props;
-    const appDir = (0, utils_1.getAppDir)(projectId);
-    const backupAppDir = `${appDir}${BACKUP_EXT}`;
-    await (0, copy_dir_1.copyDir)({ srcPath: appDir, destPath: backupAppDir });
-    console.log(`Backed up app ${projectId} to ${backupAppDir}`);
-}
-async function rollbackApp(props) {
-    const { projectId } = props;
-    const appDir = (0, utils_1.getAppDir)(projectId);
-    const backupAppDir = `${appDir}${BACKUP_EXT}`;
-    if (!fs.existsSync(backupAppDir)) {
-        throw new Error(`Backup doesn't exist for ${projectId}`);
-    }
-    rimraf.sync(appDir);
-    await (0, copy_dir_1.copyDir)({ srcPath: `${appDir}${BACKUP_EXT}`, destPath: appDir });
-    await (0, utils_1.buildApp)({ appDir });
-    console.log(`Rolled back app ${projectId} to previous version`);
-}
-exports.rollbackApp = rollbackApp;
 async function listAppReleases(props) {
     const { projectId } = props;
     const releaseHistory = await (0, alwaysai_1.fetchAppReleaseHistory)(projectId);
@@ -65,44 +21,6 @@ async function listAppLatestRelease(props) {
     return undefined;
 }
 exports.listAppLatestRelease = listAppLatestRelease;
-async function installApp(props) {
-    const { projectId, releaseHash } = props;
-    console.log(`Installing ${projectId}`);
-    const appDir = (0, utils_1.getAppDir)(projectId);
-    const TEMP_DIR = (0, path_1.join)(utils_1.APP_ROOT, 'temp');
-    const spawner = (0, js_spawner_1.JsSpawner)();
-    await spawner.mkdirp(TEMP_DIR);
-    // TODO Check valid projectId
-    // Check if app is installed
-    if (await (0, utils_1.isAppInstalled)({ appDir })) {
-        console.log('Application is already installed, updating');
-        await createAppBackup({ projectId });
-        await spawner.rimraf(appDir);
-    }
-    // Create app directory
-    await spawner.mkdirp(appDir);
-    // download the application
-    await (0, run_cli_cmd_1.runCliCmd)({
-        cmd: [
-            'release',
-            'pull',
-            '--yes',
-            '--project',
-            projectId,
-            '--releaseHash',
-            releaseHash,
-        ],
-        cwd: TEMP_DIR,
-    });
-    // Unpack app package and move to install dir
-    await spawner.untar(fs.createReadStream((0, path_1.join)(TEMP_DIR, `${releaseHash}.tgz`)), appDir);
-    console.log(`Unpacked application to ${appDir}`);
-    await (0, utils_1.setAppVersion)({ appDir, version: releaseHash });
-    await (0, utils_1.buildApp)({ appDir });
-    await spawner.rimraf(TEMP_DIR);
-    console.log(`Installed ${projectId} to ${appDir}`);
-}
-exports.installApp = installApp;
 async function getAppStatus(props) {
     const { projectId } = props;
     const appDir = (0, utils_1.getAppDir)(projectId);
@@ -212,23 +130,10 @@ async function stopApp(props) {
     console.log('Stopped', projectId);
 }
 exports.stopApp = stopApp;
-async function uninstallApp(props) {
+async function restartApp(props) {
     const { projectId } = props;
-    const appDir = (0, utils_1.getAppDir)(projectId);
-    if (!(await (0, utils_1.isAppInstalled)({ appDir }))) {
-        console.log(`Application ${projectId} not installed`);
-        return;
-    }
-    try {
-        await stopApp({ projectId });
-    }
-    catch (_a) {
-        console.log('Failed to stop app, may be left running...');
-    }
-    // Delete application directory and backup
-    rimraf.sync(appDir);
-    rimraf.sync(`${appDir}${BACKUP_EXT}`);
-    console.log('Uninstalled', projectId);
+    await stopApp({ projectId });
+    await startApp({ projectId });
 }
-exports.uninstallApp = uninstallApp;
-//# sourceMappingURL=application-control.js.map
+exports.restartApp = restartApp;
+//# sourceMappingURL=status.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/application-control/status.ts"],"names":[],"mappings":";;;AAAA,mDAAqC;AACrC,uCAAkD;AAElD,qDAAsD;AACtD,2DAAuD;AACvD,mCAAmE;AAG5D,KAAK,UAAU,eAAe,CAAC,KAA4B;IAChE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,cAAc,GAAG,MAAM,IAAA,iCAAsB,EAAC,SAAS,CAAC,CAAC;IAC/D,OAAO,cAAc,CAAC;AACxB,CAAC;AAJD,0CAIC;AAEM,KAAK,UAAU,oBAAoB,CAAC,KAA4B;IACrE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,cAAc,GAAG,MAAM,IAAA,iCAAsB,EAAC,SAAS,CAAC,CAAC;IAC/D,IAAI,cAAc,CAAC,MAAM,IAAI,CAAC,EAAE;QAC9B,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;KACzC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAPD,oDAOC;AAEM,KAAK,UAAU,YAAY,CAAC,KAA4B;IAC7D,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IAEpC,IAAI,CAAC,CAAC,MAAM,IAAA,sBAAc,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IAED,0BAA0B;IAC1B,MAAM,MAAM,GAAG,MAAM,wBAAO,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IAEjD,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE;QACzB,MAAM,IAAI,KAAK,CACb,4CAA4C,MAAM,CAAC,GAAG,WAAW,MAAM,CAAC,GAAG,EAAE,CAC9E,CAAC;KACH;IAED,MAAM,UAAU,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,IAAA,qBAAa,EAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC3E,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACrC,0EAA0E;QAC1E,0BAA0B;QAC1B,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;KAC/C;SAAM;QACL,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC1C,iCAAiC;YACjC,4BAA4B;YAC5B,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC;YACnD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI;iBACtB,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;iBAC3B,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;iBACnB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAErB,IAAI,KAAmB,CAAC;YACxB,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAChC,KAAK,GAAG,IAAI,CAAC;aACd;iBAAM,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBAC9E,KAAK,GAAG,SAAS,CAAC;aACnB;iBAAM,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;gBAC/C,KAAK,GAAG,YAAY,CAAC;aACtB;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;aAClE;YACD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;SAChC;KACF;IACD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;AAClC,CAAC;AA/CD,oCA+CC;AAEM,KAAK,UAAU,UAAU,CAAC,KAGhC;IACC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACtC,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IAEpC,IAAI,CAAC,CAAC,MAAM,IAAA,sBAAc,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IAED,MAAM,WAAW,GAAG,QAAQ;QAC1B,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,MAAM,CAAC,KAAK;YACV,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YACpD,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE;gBACxC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC7B;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC,EAAE,CAAC;IAET,oEAAoE;IACpE,OAAO,MAAM,IAAA,sBAAS,GAAE,CAAC,YAAY,CAAC;QACpC,GAAG,EAAE,gBAAgB;QACrB,IAAI,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;QACpC,GAAG,EAAE,MAAM;KACZ,CAAC,CAAC;AACL,CAAC;AA5BD,gCA4BC;AAEM,KAAK,UAAU,QAAQ,CAAC,KAG9B;IACC,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,KAAK,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,4BAA4B;IAC5B,IAAI,CAAC,CAAC,MAAM,IAAA,sBAAc,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IACD,IAAI,gBAAgB,KAAK,SAAS,EAAE;QAClC,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAc,EAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACjE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;KACrB;IAED,gCAAgC;IAChC,YAAY;IACZ,MAAM,KAAK,GAAG,MAAM,wBAAO,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnB,IAAI,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,uCAAuC,KAAK,CAAC,GAAG,WAAW,KAAK,CAAC,GAAG,EAAE,CACvE,CAAC;KACH;IACD,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AACpC,CAAC;AAzBD,4BAyBC;AAEM,KAAK,UAAU,OAAO,CAAC,KAA4B;IACxD,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;IACpC,4BAA4B;IAC5B,IAAI,CAAC,CAAC,MAAM,IAAA,sBAAc,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE;QACvC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QAC5C,OAAO;KACR;IACD,gCAAgC;IAChC,WAAW;IACX,MAAM,MAAM,GAAG,MAAM,wBAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACpB,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE;QACzB,MAAM,IAAI,KAAK,CACb,sCAAsC,MAAM,CAAC,GAAG,WAAW,MAAM,CAAC,GAAG,EAAE,CACxE,CAAC;KACH;IACD,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AACpC,CAAC;AAlBD,0BAkBC;AAEM,KAAK,UAAU,UAAU,CAAC,KAA4B;IAC3D,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAC7B,MAAM,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;AAChC,CAAC;AAJD,gCAIC"}

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

@@ -0,0 +1,18 @@
+export declare type AppDetails = {
+    projectId: string;
+    version: string;
+};
+export declare type ServiceState = 'Stopped' | 'Up' | 'Restarting';
+export declare type ServiceStatus = {
+    name: string;
+    state: ServiceState;
+};
+export declare type AppStatus = {
+    appDetails: AppDetails;
+    services: ServiceStatus[];
+};
+export declare type ModelDetails = {
+    modelId: string;
+    version: number;
+};
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/application-control/types.ts"],"names":[],"mappings":"AAAA,oBAAY,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAChE,oBAAY,YAAY,GAAG,SAAS,GAAG,IAAI,GAAG,YAAY,CAAC;AAC3D,oBAAY,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAE,CAAC;AAClE,oBAAY,SAAS,GAAG;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,aAAa,EAAE,CAAA;CAAE,CAAC;AAC9E,oBAAY,YAAY,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/lib/application-control/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/application-control/utils.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,QAAQ,QAA8C,CAAC;AAIpE,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAOhF;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBAM7E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,gBAK5D;AAED,wBAAsB,QAAQ,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,iBAuBvD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/application-control/utils.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,QAAQ,QAAqC,CAAC;AAI3D,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAOhF;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBAM7E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,gBAK5D;AAED,wBAAsB,QAAQ,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,iBAuBvD"}

package/lib/application-control/utils.js

@@ -5,9 +5,9 @@ const docker_compose_1 = require("docker-compose");
 const path = require("path");
 const fs = require("fs");
 const js_spawner_1 = require("../util/spawner/js-spawner");
-const constants_1 = require("../constants");
+const alwaysai_1 = require("alwaysai");
 const run_cli_cmd_1 = require("../util/run-cli-cmd");
-exports.APP_ROOT = path.join(constants_1.DOT_ALWAYSAI_DIR, 'applications');
+exports.APP_ROOT = path.join(alwaysai_1.AAI_DIR, 'applications');
 const RELEASE_FILENAME = 'alwaysai.release.json';
 const DOCKER_COMPOSE_FILENAME = 'docker-compose.yaml';
 function getAppDir(projectId) {
@@ -41,7 +41,7 @@ exports.getAppVersion = getAppVersion;
 async function buildApp(props) {
     const { appDir } = props;
     await (0, run_cli_cmd_1.runCliCmd)({
-        cmd: ['app', 'configure', '--yes', '--protocol', 'docker:'],
+        cmd: ['app', 'configure', '--yes', '--protocol', 'docker:', '--skip-model-sync'],
         cwd: appDir,
     });
     await (0, run_cli_cmd_1.runCliCmd)({ cmd: ['app', 'install', '--yes', '--clean', '--pull'], cwd: appDir });

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/application-control/utils.ts"],"names":[],"mappings":";;;AAAA,mDAAqC;AACrC,6BAA6B;AAC7B,yBAAyB;AAEzB,2DAAuD;AACvD,4CAAgD;AAChD,qDAAgD;AAEnC,QAAA,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,4BAAgB,EAAE,cAAc,CAAC,CAAC;AACpE,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;AACjD,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AAEtD,SAAgB,SAAS,CAAC,SAAiB;IACzC,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAQ,EAAE,SAAS,CAAC,CAAC;AACxC,CAAC;AAFD,8BAEC;AAEM,KAAK,UAAU,cAAc,CAAC,KAAyB;IAC5D,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,0CAA0C;IAC1C,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,wCAOC;AAEM,KAAK,UAAU,aAAa,CAAC,KAA0C;IAC5E,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAClC,8BAA8B;IAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,EAAE,OAAO,EAAE,CAAC;IAChC,MAAM,IAAA,sBAAS,GAAE,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACjF,CAAC;AAND,sCAMC;AAEM,KAAK,UAAU,aAAa,CAAC,KAAyB;IAC3D,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,sBAAS,GAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IACxE,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC;AALD,sCAKC;AAEM,KAAK,UAAU,QAAQ,CAAC,KAAyB;IACtD,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,MAAM,IAAA,uBAAS,EAAC;QACd,GAAG,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC;QAC3D,GAAG,EAAE,MAAM;KACZ,CAAC,CAAC;IACH,MAAM,IAAA,uBAAS,EAAC,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IAExF,4CAA4C;IAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC,EAAE;QAC9D,MAAM,IAAA,uBAAS,EAAC;YACd,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,yBAAyB,CAAC;YAC1D,GAAG,EAAE,MAAM;SACZ,CAAC,CAAC;KACJ;IAED,MAAM,QAAQ,GAAG,MAAM,wBAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtB,IAAI,QAAQ,CAAC,QAAQ,KAAK,CAAC,EAAE;QAC3B,MAAM,IAAI,KAAK,CACb,uCAAuC,QAAQ,CAAC,GAAG,WAAW,QAAQ,CAAC,GAAG,EAAE,CAC7E,CAAC;KACH;AACH,CAAC;AAvBD,4BAuBC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/application-control/utils.ts"],"names":[],"mappings":";;;AAAA,mDAAqC;AACrC,6BAA6B;AAC7B,yBAAyB;AAEzB,2DAAuD;AACvD,uCAAmC;AACnC,qDAAgD;AAEnC,QAAA,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAO,EAAE,cAAc,CAAC,CAAC;AAC3D,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;AACjD,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AAEtD,SAAgB,SAAS,CAAC,SAAiB;IACzC,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAQ,EAAE,SAAS,CAAC,CAAC;AACxC,CAAC;AAFD,8BAEC;AAEM,KAAK,UAAU,cAAc,CAAC,KAAyB;IAC5D,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,0CAA0C;IAC1C,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,wCAOC;AAEM,KAAK,UAAU,aAAa,CAAC,KAA0C;IAC5E,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAClC,8BAA8B;IAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,EAAE,OAAO,EAAE,CAAC;IAChC,MAAM,IAAA,sBAAS,GAAE,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACjF,CAAC;AAND,sCAMC;AAEM,KAAK,UAAU,aAAa,CAAC,KAAyB;IAC3D,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,sBAAS,GAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IACxE,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC;AALD,sCAKC;AAEM,KAAK,UAAU,QAAQ,CAAC,KAAyB;IACtD,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,MAAM,IAAA,uBAAS,EAAC;QACd,GAAG,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,mBAAmB,CAAC;QAChF,GAAG,EAAE,MAAM;KACZ,CAAC,CAAC;IACH,MAAM,IAAA,uBAAS,EAAC,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IAExF,4CAA4C;IAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC,EAAE;QAC9D,MAAM,IAAA,uBAAS,EAAC;YACd,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,yBAAyB,CAAC;YAC1D,GAAG,EAAE,MAAM;SACZ,CAAC,CAAC;KACJ;IAED,MAAM,QAAQ,GAAG,MAAM,wBAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtB,IAAI,QAAQ,CAAC,QAAQ,KAAK,CAAC,EAAE;QAC3B,MAAM,IAAI,KAAK,CACb,uCAAuC,QAAQ,CAAC,GAAG,WAAW,QAAQ,CAAC,GAAG,EAAE,CAC7E,CAAC;KACH;AACH,CAAC;AAvBD,4BAuBC"}

package/lib/cloud-connection/device-agent-cloud-connection.d.ts

@@ -2,7 +2,9 @@ export declare class DeviceAgentCloudConnection {
     device: any;
     private clientId;
     private host;
+    private publishInterval;
     constructor();
+    getPublishInterval(): number;
     getClientId(): string;
     publishMessage(topic: string, message: string): void;
 }

package/lib/cloud-connection/device-agent-cloud-connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"device-agent-cloud-connection.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/device-agent-cloud-connection.ts"],"names":[],"mappings":"AAQA,qBAAa,0BAA0B;IAC9B,MAAM,MAAiB;IAC9B,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,IAAI,CAA2B;;IAehC,WAAW;IAIX,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAIrD;AAED,wBAAgB,4BAA4B,SAgB3C"}
+{"version":3,"file":"device-agent-cloud-connection.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/device-agent-cloud-connection.ts"],"names":[],"mappings":"AAaA,qBAAa,0BAA0B;IAC9B,MAAM,MAAiB;IAC9B,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,IAAI,CAA2B;IACvC,OAAO,CAAC,eAAe,CAAQ;;IAgBxB,kBAAkB;IAIlB,WAAW;IAIX,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAIrD;AAED,wBAAgB,4BAA4B,SAqE3C"}

package/lib/cloud-connection/device-agent-cloud-connection.js

@@ -4,11 +4,16 @@ exports.runDeviceAgentCloudInterface = exports.DeviceAgentCloudConnection = void
 const awsIot = require('aws-iot-device-sdk');
 const urls_1 = require("../util/urls");
 const directories_1 = require("../util/directories");
+const status_1 = require("../application-control/status");
+const install_1 = require("../application-control/install");
+const device_control_1 = require("../device-control/device-control");
+const get_device_id_1 = require("../util/get-device-id");
 class DeviceAgentCloudConnection {
     constructor() {
         this.device = awsIot.device;
-        this.clientId = 'DEVICE_AGENT'; // TODO: use CLI to get either the username or the device ID? how do we determine the device ID in this case?
+        this.clientId = (0, get_device_id_1.getDeviceId)();
         this.host = (0, urls_1.getIoTCoreEndpointUrl)();
+        this.publishInterval = 1000;
         this.device = awsIot.device({
             keyPath: (0, directories_1.getPrivateKeyFilePath)(),
             certPath: (0, directories_1.getCertificateFilePath)(),
@@ -18,18 +23,70 @@ class DeviceAgentCloudConnection {
         });
         // TODO: subscribe to topics here
         this.device.subscribe('command');
+        this.publishInterval = this.publishInterval;
+    }
+    getPublishInterval() {
+        return this.publishInterval;
     }
     getClientId() {
         return this.clientId;
     }
     publishMessage(topic, message) {
         console.log('publishing message ', message);
-        this.device.publish(topic, JSON.stringify({ message }));
+        this.device.publish(topic, message);
     }
 }
 exports.DeviceAgentCloudConnection = DeviceAgentCloudConnection;
 function runDeviceAgentCloudInterface() {
     const deviceAgent = new DeviceAgentCloudConnection();
+    async function getAppStateMessage() {
+        const appStateMessage = [];
+        const installedApps = await (0, install_1.getInstalledApps)();
+        for (const app of installedApps) {
+            const projectId = app['projectId'];
+            const status = await (0, status_1.getAppStatus)({ projectId });
+            appStateMessage.push(status);
+        }
+        const applicationStatePackage = {
+            applicationState: appStateMessage,
+        };
+        return applicationStatePackage;
+    }
+    const publishAppState = setInterval(async function () {
+        const topic = `device/${deviceAgent.getClientId()}/topic/application-management`;
+        const appStateMessage = await getAppStateMessage();
+        const appStatePackage = {
+            timestamp: new Date().toUTCString(),
+            deviceId: deviceAgent.getClientId(),
+            topic,
+            payload: appStateMessage,
+        };
+        deviceAgent.publishMessage(topic, JSON.stringify({ appStatePackage }));
+    }, deviceAgent.getPublishInterval());
+    async function getDeviceStatsMessage() {
+        const cpuUsage = await (0, device_control_1.getCpuUtil)();
+        const diskUtil = await (0, device_control_1.getDiskUtil)();
+        const memUtil = await (0, device_control_1.getMemUtil)();
+        const deviceStatsMessage = {
+            deviceStats: {
+                cpuUsage,
+                diskUtil,
+                freeMemoryPercentage: memUtil,
+            },
+        };
+        return deviceStatsMessage;
+    }
+    const publishDeviceStats = setInterval(async function () {
+        const topic = `device/${deviceAgent.getClientId()}/topic/device-management`;
+        const deviceStatsMessage = await getDeviceStatsMessage();
+        const deviceStatsPackage = {
+            timestamp: new Date().toUTCString(),
+            deviceId: deviceAgent.getClientId(),
+            topic,
+            payload: deviceStatsMessage,
+        };
+        deviceAgent.publishMessage(topic, JSON.stringify({ deviceStatsPackage }));
+    }, deviceAgent.getPublishInterval());
     deviceAgent.device.on('connect', function () {
         deviceAgent.publishMessage('connection', deviceAgent.getClientId());
         console.log('Device Agent has connected to the cloud');