@alwaysai/device-agent 0.0.4 → 0.0.5

package/lib/application-control/status.js

@@ -2,19 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.restartApp = exports.stopApp = exports.startApp = exports.getAppLogs = exports.getAppStatus = exports.listAppLatestRelease = exports.listAppReleases = void 0;
 const docker_compose_1 = require("docker-compose");
-const alwaysai_1 = require("alwaysai");
+const infrastructure_1 = require("alwaysai/lib/infrastructure");
+const util_1 = require("alwaysai/lib/util");
 const docker_cmd_1 = require("../docker/docker-cmd");
-const js_spawner_1 = require("../util/spawner/js-spawner");
 const utils_1 = require("./utils");
+const agent_config_1 = require("../infrastructure/agent-config");
 async function listAppReleases(props) {
     const { projectId } = props;
-    const releaseHistory = await (0, alwaysai_1.fetchAppReleaseHistory)(projectId);
+    const releaseHistory = await (0, infrastructure_1.fetchAppReleaseHistory)(projectId);
     return releaseHistory;
 }
 exports.listAppReleases = listAppReleases;
 async function listAppLatestRelease(props) {
     const { projectId } = props;
-    const releaseHistory = await (0, alwaysai_1.fetchAppReleaseHistory)(projectId);
+    const releaseHistory = await (0, infrastructure_1.fetchAppReleaseHistory)(projectId);
     if (releaseHistory.length >= 1) {
         return releaseHistory[0]['releaseHash'];
     }
@@ -23,16 +24,23 @@ async function listAppLatestRelease(props) {
 exports.listAppLatestRelease = listAppLatestRelease;
 async function getAppStatus(props) {
     const { projectId } = props;
-    const appDir = (0, utils_1.getAppDir)(projectId);
-    if (!(await (0, utils_1.isAppInstalled)({ appDir }))) {
+    if (!(await (0, agent_config_1.AgentConfigFile)().isAppPresent({ projectId }))) {
         throw new Error('Application is not installed');
     }
+    const appDetails = {
+        projectId,
+        version: await (0, agent_config_1.AgentConfigFile)().getAppVersion({ projectId }),
+    };
+    if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
+        // App is being installed or updated
+        return { appDetails, services: [] };
+    }
+    const appDir = (0, utils_1.getAppDir)(projectId);
     // Check if app is running
     const output = await docker_compose_1.default.ps({ cwd: appDir });
     if (output.exitCode !== 0) {
         throw new Error(`Failed to get application status! stdout=${output.out} stderr=${output.err}`);
     }
-    const appDetails = { projectId, version: await (0, utils_1.getAppVersion)({ appDir }) };
     const services = [];
     if (output.data.services.length === 0) {
         // If the app has never been started (or has an empty docker-compose.yaml)
@@ -69,10 +77,8 @@ async function getAppStatus(props) {
 exports.getAppStatus = getAppStatus;
 async function getAppLogs(props) {
     const { projectId, services } = props;
+    await (0, utils_1.requireAppInstalled)({ projectId });
     const appDir = (0, utils_1.getAppDir)(projectId);
-    if (!(await (0, utils_1.isAppInstalled)({ appDir }))) {
-        throw new Error('Application is not installed');
-    }
     const serviceList = services
         ? services
         : await (async function () {
@@ -84,7 +90,7 @@ async function getAppLogs(props) {
             return services;
         })();
     // Use direct command with spawner in order to get a readable stream
-    return await (0, js_spawner_1.JsSpawner)().runStreaming({
+    return await (0, util_1.JsSpawner)().runStreaming({
         exe: 'docker-compose',
         args: ['logs', '-f', ...serviceList],
         cwd: appDir,
@@ -93,11 +99,8 @@ async function getAppLogs(props) {
 exports.getAppLogs = getAppLogs;
 async function startApp(props) {
     const { projectId, dockerLoginToken } = props;
+    await (0, utils_1.requireAppInstalled)({ projectId });
     const appDir = (0, utils_1.getAppDir)(projectId);
-    // Check if app is installed
-    if (!(await (0, utils_1.isAppInstalled)({ appDir }))) {
-        throw new Error('Application is not installed');
-    }
     if (dockerLoginToken !== undefined) {
         const result = await (0, docker_cmd_1.runDockerLogin)({ token: dockerLoginToken });
         console.log(result);
@@ -114,12 +117,8 @@ async function startApp(props) {
 exports.startApp = startApp;
 async function stopApp(props) {
     const { projectId } = props;
+    await (0, utils_1.requireAppInstalled)({ projectId });
     const appDir = (0, utils_1.getAppDir)(projectId);
-    // Check if app is installed
-    if (!(await (0, utils_1.isAppInstalled)({ appDir }))) {
-        console.log('Application is not installed');
-        return;
-    }
     // TODO: Check if app is running
     // Stop app
     const output = await docker_compose_1.default.down({ cwd: appDir });

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

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

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

@@ -1,16 +1,3 @@
-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;

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

@@ -1 +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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/application-control/types.ts"],"names":[],"mappings":"AAAA,oBAAY,YAAY,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC"}

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

@@ -1,15 +1,8 @@
 export declare const APP_ROOT: string;
 export declare function getAppDir(projectId: string): string;
-export declare function isAppInstalled(props: {
-    appDir: string;
-}): Promise<boolean>;
-export declare function setAppVersion(props: {
-    appDir: string;
-    version: string;
+export declare function requireAppInstalled(props: {
+    projectId: string;
 }): Promise<void>;
-export declare function getAppVersion(props: {
-    appDir: string;
-}): Promise<any>;
 export declare function buildApp(props: {
     appDir: string;
 }): Promise<void>;

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,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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/application-control/utils.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,QAAQ,QAAqC,CAAC;AAG3D,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAsB,mBAAmB,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBASrE;AAED,wBAAsB,QAAQ,CAAC,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,iBAsBvD"}

package/lib/application-control/utils.js

@@ -1,43 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildApp = exports.getAppVersion = exports.setAppVersion = exports.isAppInstalled = exports.getAppDir = exports.APP_ROOT = void 0;
+exports.buildApp = exports.requireAppInstalled = exports.getAppDir = exports.APP_ROOT = void 0;
 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 alwaysai_1 = require("alwaysai");
+const constants_1 = require("alwaysai/lib/constants");
 const run_cli_cmd_1 = require("../util/run-cli-cmd");
-exports.APP_ROOT = path.join(alwaysai_1.AAI_DIR, 'applications');
-const RELEASE_FILENAME = 'alwaysai.release.json';
+const agent_config_1 = require("../infrastructure/agent-config");
+exports.APP_ROOT = path.join(constants_1.AAI_DIR, 'applications');
 const DOCKER_COMPOSE_FILENAME = 'docker-compose.yaml';
 function getAppDir(projectId) {
     return path.join(exports.APP_ROOT, projectId);
 }
 exports.getAppDir = getAppDir;
-async function isAppInstalled(props) {
-    const { appDir } = props;
-    // TODO: Could do more sophisticated check
-    if (fs.existsSync(appDir)) {
-        return true;
+async function requireAppInstalled(props) {
+    const { projectId } = props;
+    // Ensure an app that is being installed or updated is not modified
+    if (!(await (0, agent_config_1.AgentConfigFile)().isAppPresent({ projectId }))) {
+        throw new Error('Application is not installed');
+    }
+    if (!(await (0, agent_config_1.AgentConfigFile)().isAppReady({ projectId }))) {
+        throw new Error('Application is not done installing or updating');
     }
-    return false;
-}
-exports.isAppInstalled = isAppInstalled;
-async function setAppVersion(props) {
-    const { appDir, version } = props;
-    // TODO: Switch to node-config
-    const versionPath = path.join(appDir, RELEASE_FILENAME);
-    const versionData = { version };
-    await (0, js_spawner_1.JsSpawner)().writeFile(versionPath, JSON.stringify(versionData, null, 2));
-}
-exports.setAppVersion = setAppVersion;
-async function getAppVersion(props) {
-    const { appDir } = props;
-    const versionPath = path.join(appDir, RELEASE_FILENAME);
-    const releaseData = JSON.parse(await (0, js_spawner_1.JsSpawner)().readFile(versionPath));
-    return releaseData.version;
 }
-exports.getAppVersion = getAppVersion;
+exports.requireAppInstalled = requireAppInstalled;
 async function buildApp(props) {
     const { appDir } = props;
     await (0, run_cli_cmd_1.runCliCmd)({
@@ -53,7 +39,6 @@ async function buildApp(props) {
         });
     }
     const buildOut = await docker_compose_1.default.buildAll({ cwd: appDir });
-    console.log(buildOut);
     if (buildOut.exitCode !== 0) {
         throw new Error(`Failed to build application! stdout=${buildOut.out} stderr=${buildOut.err}`);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/application-control/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/application-control/utils.ts"],"names":[],"mappings":";;;AAAA,mDAAqC;AACrC,6BAA6B;AAC7B,yBAAyB;AACzB,sDAAiD;AAEjD,qDAAgD;AAChD,iEAAiE;AAEpD,QAAA,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAO,EAAE,cAAc,CAAC,CAAC;AAC3D,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,mBAAmB,CAAC,KAA4B;IACpE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,mEAAmE;IACnE,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAe,GAAE,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;QAC1D,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IACD,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAe,GAAE,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE;QACxD,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;AACH,CAAC;AATD,kDASC;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,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;AAtBD,4BAsBC"}

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

@@ -1,10 +1,23 @@
+import { InstallationStatus } from '@alwaysai/device-agent-schemas';
 export declare class DeviceAgentCloudConnection {
-    device: any;
     private clientId;
     private host;
-    private publishInterval;
+    private publishable;
+    private readonly publishInterval;
+    private readonly installationStatusInterval;
+    private installationStatus;
+    private publishableTimeout;
+    device: any;
+    agentTopicPrefix: string;
+    cloudTopicPrefix: string;
     constructor();
+    setInstallationStatus(installationStatus: InstallationStatus): void;
+    getInstallationStatus(): InstallationStatus;
+    getPublishable(): boolean;
+    setPublishable(enabled: boolean): void;
+    restartPublishableTimeout(): void;
     getPublishInterval(): number;
+    getInstallationStatusInterval(): 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":"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"}
+{"version":3,"file":"device-agent-cloud-connection.d.ts","sourceRoot":"","sources":["../../src/cloud-connection/device-agent-cloud-connection.ts"],"names":[],"mappings":"AAgBA,OAAO,EASL,kBAAkB,EAEnB,MAAM,gCAAgC,CAAC;AAIxC,qBAAa,0BAA0B;IACrC,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,IAAI,CAA2B;IACvC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAQ;IACxC,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAQ;IACnD,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,kBAAkB,CAAgC;IAEnD,MAAM,MAAiB;IACvB,gBAAgB,SAAsD;IACtE,gBAAgB,SAAsD;;IAetE,qBAAqB,CAAC,kBAAkB,EAAE,kBAAkB;IAI5D,qBAAqB,IAAI,kBAAkB;IAI3C,cAAc,IAAI,OAAO;IAIzB,cAAc,CAAC,OAAO,EAAE,OAAO;IAI/B,yBAAyB;IAOzB,kBAAkB;IAIlB,6BAA6B;IAI7B,WAAW,IAAI,MAAM;IAIrB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAGrD;AAED,wBAAgB,4BAA4B,SA8N3C"}

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

@@ -1,19 +1,32 @@
 "use strict";
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runDeviceAgentCloudInterface = exports.DeviceAgentCloudConnection = void 0;
 const awsIot = require('aws-iot-device-sdk');
-const urls_1 = require("../util/urls");
+const urls_1 = require("../infrastructure/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 device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
 const get_device_id_1 = require("../util/get-device-id");
+const agent_config_1 = require("../infrastructure/agent-config");
 class DeviceAgentCloudConnection {
     constructor() {
-        this.device = awsIot.device;
         this.clientId = (0, get_device_id_1.getDeviceId)();
         this.host = (0, urls_1.getIoTCoreEndpointUrl)();
+        this.publishable = false;
         this.publishInterval = 1000;
+        this.installationStatusInterval = 3000;
+        this.device = awsIot.device;
+        this.agentTopicPrefix = `destination/agent/device/${this.clientId}/topic/`;
+        this.cloudTopicPrefix = `destination/cloud/device/${this.clientId}/topic/`;
         this.device = awsIot.device({
             keyPath: (0, directories_1.getPrivateKeyFilePath)(),
             certPath: (0, directories_1.getCertificateFilePath)(),
@@ -21,29 +34,96 @@ class DeviceAgentCloudConnection {
             clientId: this.clientId,
             host: this.host,
         });
-        // TODO: subscribe to topics here
-        this.device.subscribe('command');
-        this.publishInterval = this.publishInterval;
+        this.device.subscribe(`${this.agentTopicPrefix}command`);
+        this.device.subscribe(`${this.agentTopicPrefix}response`);
+    }
+    setInstallationStatus(installationStatus) {
+        this.installationStatus = installationStatus;
+    }
+    getInstallationStatus() {
+        return this.installationStatus;
+    }
+    getPublishable() {
+        return this.publishable;
+    }
+    setPublishable(enabled) {
+        this.publishable = enabled;
+    }
+    restartPublishableTimeout() {
+        clearTimeout(this.publishableTimeout);
+        this.publishableTimeout = setTimeout(() => {
+            this.setPublishable(false);
+        }, 600000); // 10 min
     }
     getPublishInterval() {
         return this.publishInterval;
     }
+    getInstallationStatusInterval() {
+        return this.installationStatusInterval;
+    }
     getClientId() {
         return this.clientId;
     }
     publishMessage(topic, message) {
-        console.log('publishing message ', message);
         this.device.publish(topic, message);
     }
 }
 exports.DeviceAgentCloudConnection = DeviceAgentCloudConnection;
 function runDeviceAgentCloudInterface() {
     const deviceAgent = new DeviceAgentCloudConnection();
+    async function buildMessagePacket(topic, payload) {
+        const packet = {
+            timestamp: new Date().toUTCString(),
+            deviceId: deviceAgent.getClientId(),
+            topic,
+            payload,
+        };
+        return packet;
+    }
+    async function getAppLogsMessage() {
+        var e_1, _a;
+        const appLogsList = [];
+        const apps = await (0, agent_config_1.AgentConfigFile)().getReadyApps();
+        for (const app of apps) {
+            const projectId = app.projectId;
+            const readable = await (0, status_1.getAppLogs)({ projectId });
+            const logs = [];
+            readable.setEncoding('utf8');
+            try {
+                for (var readable_1 = (e_1 = void 0, __asyncValues(readable)), readable_1_1; readable_1_1 = await readable_1.next(), !readable_1_1.done;) {
+                    const chunk = readable_1_1.value;
+                    logs.push(chunk);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (readable_1_1 && !readable_1_1.done && (_a = readable_1.return)) await _a.call(readable_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            const appLogs = {
+                projectId,
+                logs,
+            };
+            appLogsList.push(appLogs);
+        }
+        const applicationStatePackage = {
+            applicationLogs: appLogsList,
+        };
+        return applicationStatePackage;
+    }
+    const publishAppLogs = setInterval(async function () {
+        const appLogsMessage = await getAppLogsMessage();
+        const topic = `device/${deviceAgent.getClientId()}/topic/application-management`;
+        const appLogsPacket = await buildMessagePacket(topic, appLogsMessage);
+        deviceAgent.publishMessage(topic, JSON.stringify({ appLogsPacket }));
+    }, deviceAgent.getPublishInterval());
     async function getAppStateMessage() {
         const appStateMessage = [];
-        const installedApps = await (0, install_1.getInstalledApps)();
-        for (const app of installedApps) {
-            const projectId = app['projectId'];
+        const apps = await (0, agent_config_1.AgentConfigFile)().getApps();
+        for (const app of apps) {
+            const projectId = app.projectId;
             const status = await (0, status_1.getAppStatus)({ projectId });
             appStateMessage.push(status);
         }
@@ -53,15 +133,12 @@ function runDeviceAgentCloudInterface() {
         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 }));
+        if (deviceAgent.getPublishable()) {
+            const topic = `${deviceAgent.cloudTopicPrefix}application-management`;
+            const appStateMessage = await getAppStateMessage();
+            const appStatePacket = await buildMessagePacket(topic, appStateMessage);
+            deviceAgent.publishMessage(topic, JSON.stringify({ appStatePacket }));
+        }
     }, deviceAgent.getPublishInterval());
     async function getDeviceStatsMessage() {
         const cpuUsage = await (0, device_control_1.getCpuUtil)();
@@ -71,22 +148,113 @@ function runDeviceAgentCloudInterface() {
             deviceStats: {
                 cpuUsage,
                 diskUtil,
-                freeMemoryPercentage: memUtil,
+                usedMemoryPercentage: memUtil,
             },
         };
         return deviceStatsMessage;
     }
     const publishDeviceStats = setInterval(async function () {
-        const topic = `device/${deviceAgent.getClientId()}/topic/device-management`;
-        const deviceStatsMessage = await getDeviceStatsMessage();
-        const deviceStatsPackage = {
+        if (deviceAgent.getPublishable()) {
+            const topic = `${deviceAgent.cloudTopicPrefix}device-management`;
+            const deviceStatsMessage = await getDeviceStatsMessage();
+            const deviceStatsPacket = await buildMessagePacket(topic, deviceStatsMessage);
+            deviceAgent.publishMessage(topic, JSON.stringify({ deviceStatsPacket }));
+        }
+    }, deviceAgent.getPublishInterval());
+    const publishDeviceRequest = async ({ projectId }) => {
+        const topic = `${deviceAgent.cloudTopicPrefix}request`;
+        const deviceRequestPackage = {
             timestamp: new Date().toUTCString(),
             deviceId: deviceAgent.getClientId(),
+            projectId,
+            releaseHash: '',
             topic,
-            payload: deviceStatsMessage,
         };
-        deviceAgent.publishMessage(topic, JSON.stringify({ deviceStatsPackage }));
-    }, deviceAgent.getPublishInterval());
+        deviceAgent.publishMessage(topic, JSON.stringify({ device_request: deviceRequestPackage }));
+    };
+    const publishInstallationStatus = async (interval) => {
+        const topic = `${deviceAgent.cloudTopicPrefix}installation-status`;
+        const installationStatus = deviceAgent.getInstallationStatus();
+        const installationStatusPacket = await buildMessagePacket(topic, {
+            installationStatus,
+        });
+        deviceAgent.device.publish(topic, JSON.stringify({ installationStatusPacket }));
+        if (installationStatus.status !== device_agent_schemas_1.InstallationStatusEnum.IN_PROGRESS) {
+            clearInterval(interval);
+        }
+    };
+    const handleMessageTopic = async ({ topic, payload }) => {
+        const action = payload['action'];
+        const actionPayload = payload[action];
+        const type = topic.split('/').slice(-1)[0];
+        if (!type) {
+            return false;
+        }
+        switch (action) {
+            /**
+             * Install app package based on the given project ID
+             */
+            case 'install':
+                /**
+                  {
+                    "action": "install",
+                    "install": {
+                      "releaseHash": "7fb2a812f9e7aa193208dac353521965da50d755085162066c125592f1ed760b",
+                      "projectId": "786e4686-a681-4cff-9e17-1e7d385c0fdb"
+                    }
+                  }
+                 */
+                if (type === 'response') {
+                    deviceAgent.setInstallationStatus({
+                        status: device_agent_schemas_1.InstallationStatusEnum.IN_PROGRESS,
+                    });
+                    const installationStatusPing = setInterval(() => publishInstallationStatus(installationStatusPing), deviceAgent.getInstallationStatusInterval());
+                    // Install the app with the given url
+                    await (async () => {
+                        try {
+                            await (0, install_1.installApp)(actionPayload);
+                            deviceAgent.setInstallationStatus({
+                                status: device_agent_schemas_1.InstallationStatusEnum.SUCCESS,
+                            });
+                        }
+                        catch (e) {
+                            const reason = e.message;
+                            deviceAgent.setInstallationStatus({
+                                status: device_agent_schemas_1.InstallationStatusEnum.FAILURE,
+                                reason,
+                            });
+                        }
+                    })();
+                    break;
+                }
+                publishDeviceRequest(actionPayload);
+                break;
+            case 'start':
+                (0, status_1.startApp)({ projectId: actionPayload.projectId });
+                break;
+            case 'stop':
+                (0, status_1.stopApp)({ projectId: actionPayload.projectId });
+                break;
+            case 'restart':
+                (0, status_1.restartApp)({ projectId: actionPayload.projectId });
+                break;
+            /**
+             * Allow/disallow publishing on this device. By default, (publishable = false)
+             */
+            case 'publishable':
+                /**
+                  {
+                    "action": "publishable",
+                    "publishable": true | false
+                  }
+                 */
+                deviceAgent.setPublishable(actionPayload);
+                deviceAgent.restartPublishableTimeout();
+                break;
+            default:
+                break;
+        }
+    };
     deviceAgent.device.on('connect', function () {
         deviceAgent.publishMessage('connection', deviceAgent.getClientId());
         console.log('Device Agent has connected to the cloud');
@@ -95,8 +263,13 @@ function runDeviceAgentCloudInterface() {
         console.log('Device Agent has been disconnected from the cloud');
     });
     deviceAgent.device.on('message', function (topic, payload) {
-        // TODO: parse/determine action based on topic/payload here
-        console.log('message', topic, payload.toString());
+        // ToDo: insert valdiation here for incoming messages.  Maybe we will use a JSON schema for the message structure.
+        try {
+            handleMessageTopic({ topic, payload: JSON.parse(payload) });
+        }
+        catch (error) {
+            console.error(error);
+        }
     });
 }
 exports.runDeviceAgentCloudInterface = runDeviceAgentCloudInterface;

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

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

package/lib/docker/docker-cmd.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runDockerLogin = void 0;
-const js_spawner_1 = require("../util/spawner/js-spawner");
+const util_1 = require("alwaysai/lib/util");
 async function runDockerLogin(props) {
     const { token } = props;
-    const spawner = (0, js_spawner_1.JsSpawner)();
+    const spawner = (0, util_1.JsSpawner)();
     const server = '994534263224.dkr.ecr.us-west-2.amazonaws.com';
     const output = await spawner.run({
         exe: 'docker',

package/lib/docker/docker-cmd.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker-cmd.js","sourceRoot":"","sources":["../../src/docker/docker-cmd.ts"],"names":[],"mappings":";;;AAAA,2DAAuD;AAEhD,KAAK,UAAU,cAAc,CAAC,KAAwB;IAC3D,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IACxB,MAAM,OAAO,GAAG,IAAA,sBAAS,GAAE,CAAC;IAC5B,MAAM,MAAM,GAAG,8CAA8C,CAAC;IAC9D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC/B,GAAG,EAAE,QAAQ;QACb,IAAI,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC;KAClE,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AATD,wCASC"}
+{"version":3,"file":"docker-cmd.js","sourceRoot":"","sources":["../../src/docker/docker-cmd.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAEvC,KAAK,UAAU,cAAc,CAAC,KAAwB;IAC3D,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IACxB,MAAM,OAAO,GAAG,IAAA,gBAAS,GAAE,CAAC;IAC5B,MAAM,MAAM,GAAG,8CAA8C,CAAC;IAC9D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC/B,GAAG,EAAE,QAAQ;QACb,IAAI,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC;KAClE,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AATD,wCASC"}