@alwaysai/device-agent 0.0.15 → 0.0.17

package/lib/subcommands/app/version.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rollbackAppCliLeaf = exports.uninstallAppCliLeaf = exports.installAppCliLeaf = exports.listAppsCliLeaf = void 0;
+const alwayscli_1 = require("@alwaysai/alwayscli");
+const device_agent_schemas_1 = require("@alwaysai/device-agent-schemas");
+const application_control_1 = require("../../application-control");
+const device_agent_cloud_connection_1 = require("../../cloud-connection/device-agent-cloud-connection");
+const agent_config_1 = require("../../infrastructure/agent-config");
+const sleep_1 = require("../../util/sleep");
+exports.listAppsCliLeaf = (0, alwayscli_1.CliLeaf)({
+    name: 'list',
+    description: 'List all installed apps',
+    namedInputs: {},
+    async action(_, opts) {
+        const apps = await (0, agent_config_1.AgentConfigFile)().getApps();
+        console.table(apps);
+    }
+});
+exports.installAppCliLeaf = (0, alwayscli_1.CliLeaf)({
+    name: 'install',
+    description: 'Install an alwaysAI app from a project',
+    namedInputs: {
+        project: (0, alwayscli_1.CliStringInput)({
+            description: 'Project ID',
+            required: true
+        }),
+        releaseHash: (0, alwayscli_1.CliStringInput)({
+            description: 'Release Hash',
+            required: true
+        })
+    },
+    async action(_, opts) {
+        const { project, releaseHash } = opts;
+        const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
+        await deviceAgent.setupHandlers();
+        const topic = deviceAgent.getToDeviceTopic();
+        const message = {
+            timestamp: '',
+            topic,
+            payload: {
+                messageType: device_agent_schemas_1.keyMirrors.clientMessageType.app_version_control,
+                appVersionControl: {
+                    baseCommand: device_agent_schemas_1.keyMirrors.appVersionControl.install,
+                    projectId: project,
+                    appReleaseHash: releaseHash
+                }
+            }
+        };
+        await deviceAgent.handleMessage(topic, message);
+        while (deviceAgent.isCmdInProgress(project)) {
+            await (0, sleep_1.default)(1000);
+        }
+        deviceAgent.stop();
+    }
+});
+exports.uninstallAppCliLeaf = (0, alwayscli_1.CliLeaf)({
+    name: 'uninstall',
+    description: 'Remove an alwaysAI app',
+    namedInputs: {
+        project: (0, alwayscli_1.CliStringInput)({
+            description: 'Project ID',
+            required: true
+        })
+    },
+    async action(_, opts) {
+        const { project } = opts;
+        const deviceAgent = new device_agent_cloud_connection_1.DeviceAgentCloudConnection();
+        await deviceAgent.setupHandlers();
+        const topic = deviceAgent.getToDeviceTopic();
+        const message = {
+            timestamp: '',
+            topic,
+            payload: {
+                messageType: device_agent_schemas_1.keyMirrors.clientMessageType.app_version_control,
+                appVersionControl: {
+                    baseCommand: device_agent_schemas_1.keyMirrors.appVersionControl.uninstall,
+                    projectId: project
+                }
+            }
+        };
+        await deviceAgent.handleMessage(topic, message);
+        while (deviceAgent.isCmdInProgress(project)) {
+            await (0, sleep_1.default)(1000);
+        }
+        deviceAgent.stop();
+    }
+});
+exports.rollbackAppCliLeaf = (0, alwayscli_1.CliLeaf)({
+    name: 'rollback',
+    description: 'Rollback an alwaysAI app to the previous version',
+    namedInputs: {
+        project: (0, alwayscli_1.CliStringInput)({
+            description: 'Project ID',
+            required: true
+        })
+    },
+    hidden: true,
+    async action(_, opts) {
+        const { project } = opts;
+        await (0, application_control_1.rollbackApp)({ projectId: project });
+    }
+});
+//# sourceMappingURL=version.js.map

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

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

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

@@ -11,7 +11,7 @@ function getDeviceUuid() {
         const cfg = deviceCfgFile.read();
         return cfg.deviceUuid;
     }
-    catch (err) {
+    catch (e) {
         throw new Error(`Failed to read device configuration: ${JSON.stringify(deviceCfgFile.getErrors(), null, 2)}`);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"get-device-id.js","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAE5D,SAAgB,aAAa;IAC3B,MAAM,aAAa,GAAG,IAAA,yBAAgB,GAAE,CAAC;IACzC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IACD,IAAI;QACF,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QACjC,OAAO,GAAG,CAAC,UAAU,CAAC;KACvB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,SAAS,CACpD,aAAa,CAAC,SAAS,EAAE,EACzB,IAAI,EACJ,CAAC,CACF,EAAE,CACJ,CAAC;KACH;AACH,CAAC;AAjBD,sCAiBC"}
+{"version":3,"file":"get-device-id.js","sourceRoot":"","sources":["../../src/util/get-device-id.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAE5D,SAAgB,aAAa;IAC3B,MAAM,aAAa,GAAG,IAAA,yBAAgB,GAAE,CAAC;IACzC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IACD,IAAI;QACF,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QACjC,OAAO,GAAG,CAAC,UAAU,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,SAAS,CACpD,aAAa,CAAC,SAAS,EAAE,EACzB,IAAI,EACJ,CAAC,CACF,EAAE,CACJ,CAAC;KACH;AACH,CAAC;AAjBD,sCAiBC"}

package/lib/util/http-client.js

@@ -18,7 +18,7 @@ async function httpClient(url, method, headers, data) {
         }
     }
     catch (e) {
-        logger_1.logger.error(`HTTP Client error for ${url}: ${e}`);
+        logger_1.logger.error(`HTTP Client error for ${url}: ${e.message}`);
     }
 }
 exports.httpClient = httpClient;

package/lib/util/http-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":";;;AAAA,2CAA+B;AAC/B,4CAAsD;AACtD,gEAAsE;AACtE,2CAAwC;AAEjC,KAAK,UAAU,UAAU,CAC9B,GAAW,EACX,MAAc,EACd,OAAY,EACZ,IAAa;IAEb,MAAM,OAAO,mBACX,MAAM,IACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAClD,CAAC;IACF,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,WAAW,KAAK,kBAAkB,EAAE;YACtC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;QACD,IAAI,WAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;KACF;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;KACpD;AACH,CAAC;AAtBD,gCAsBC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,IAAY,EACZ,MAAc,EACd,IAAa;IAEb,MAAM,QAAQ,GAAG,IAAA,kCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAA,wCAAuB,GAAE,CAAC;IAC/D,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,EAAE,CAAC;IAC7D,OAAO,MAAM,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,CAAC,CAAC;AACvE,CAAC;AAVD,wDAUC"}
+{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/util/http-client.ts"],"names":[],"mappings":";;;AAAA,2CAA+B;AAC/B,4CAAsD;AACtD,gEAAsE;AACtE,2CAAwC;AAEjC,KAAK,UAAU,UAAU,CAC9B,GAAW,EACX,MAAc,EACd,OAAY,EACZ,IAAa;IAEb,MAAM,OAAO,mBACX,MAAM,IACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAClD,CAAC;IACF,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,WAAW,KAAK,kBAAkB,EAAE;YACtC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;QACD,IAAI,WAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;KACF;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KAC5D;AACH,CAAC;AAtBD,gCAsBC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,IAAY,EACZ,MAAc,EACd,IAAa;IAEb,MAAM,QAAQ,GAAG,IAAA,kCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAA,wCAAuB,GAAE,CAAC;IAC/D,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,EAAE,CAAC;IAC7D,OAAO,MAAM,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,CAAC,CAAC;AACvE,CAAC;AAVD,wDAUC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alwaysai/device-agent",
   "description": "The alwaysAI Device Agent",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "publishConfig": {

package/src/application-control/config.ts

@@ -23,9 +23,11 @@ export async function readAppCfgFile(props: {
   }
   try {
     return appJson.read();
-  } catch (err) {
+  } catch (e) {
     throw new Error(
-      `Error reading app config for ${projectId}:\n${err}\n${appJson.getErrors()}`
+      `Error reading app config for ${projectId}:\n${
+        e.message
+      }\n${appJson.getErrors()}`
     );
   }
 }
@@ -42,9 +44,11 @@ export async function writeAppCfgFile(props: {
   const appJson = AppJsonFile(appDir);
   try {
     appJson.write(appCfg);
-  } catch (err) {
+  } catch (e) {
     throw new Error(
-      `Error writing app config for ${projectId}:\n${err}\n${appJson.getErrors()}`
+      `Error writing app config for ${projectId}:\n${
+        e.message
+      }\n${appJson.getErrors()}`
     );
   }
 }

package/src/application-control/install.ts

@@ -6,7 +6,7 @@ import { JsSpawner, Spawner } from 'alwaysai/lib/util';
 import { getAppDir, downloadPackageUsingPresignedUrl, buildApp } from './utils';
 import { AppDetailsPacket } from '@alwaysai/device-agent-schemas';
 import { BACKUP_EXT } from './backup';
-import { stopApp } from './status';
+import { startApp, stopApp } from './status';
 import { AgentConfigFile } from '../infrastructure/agent-config';
 import { ProjectJsonFile } from 'alwaysai/lib/core/project';
 import {
@@ -107,6 +107,8 @@ export async function installApp(props: {
     version: appReleaseHash
   });
 
+  await startApp({ projectId });
+
   logger.info(`Completed installing ${projectId}:${appReleaseHash}`);
 }
 
@@ -199,7 +201,9 @@ export async function uninstallApp(props: {
   try {
     await stopApp({ projectId });
   } catch (e) {
-    logger.warn(`Failed to stop ${projectId}, may be left running...\n${e}`);
+    logger.warn(
+      `Failed to stop ${projectId}, may be left running...\n${e.message}`
+    );
   }
   await AgentConfigFile().setAppUninstalled({ projectId });
   // Delete application directory and backup

package/src/application-control/models.ts

@@ -213,7 +213,7 @@ export async function updateModelsWithPresignedUrls(props: {
   } catch (e) {
     logger.error(
       'Error updating app models from presigned URL, restoring models.',
-      e
+      e.message
     );
     await spawner.rimraf(ogDir);
     await copyDir({ srcPath: restoreDir, destPath: ogDir });

package/src/application-control/status.ts

@@ -135,8 +135,7 @@ export async function startApp(props: {
     logger.debug(`docker login: ${result}`);
   }
 
-  // TODO: Check if app is running
-  // Start app
+  // Always call `docker-compose up` regardless of application state
   const upOut = await compose.upAll({ cwd: appDir });
   logger.debug(`docker-compose up: ${JSON.stringify(upOut, null, 2)}`);
   if (upOut.exitCode !== 0) {
@@ -152,21 +151,16 @@ export async function stopApp(props: { projectId: string }): Promise<void> {
   await requireAppInstalled({ projectId });
 
   const appDir = getAppDir(projectId);
-  const appStatus = await getAppStatus({ projectId });
-  const appIsRunning =
-    appStatus.services.length &&
-    appStatus.services[0].state !== keyMirrors.appState.stopped;
-  if (appIsRunning) {
-    // Stop app
-    const output = await compose.down({ cwd: appDir });
-    logger.debug(`docker-compose down: ${JSON.stringify(output, null, 2)}`);
-    if (output.exitCode !== 0) {
-      throw new Error(
-        `Failed to stop application! stdout=${output.out} stderr=${output.err}`
-      );
-    }
-    logger.info(`Stopped ${projectId}`);
+  // Always call `docker-compose down` regardless of application state to ensure
+  // containers are cleaned up
+  const output = await compose.down({ cwd: appDir });
+  logger.debug(`docker-compose down: ${JSON.stringify(output, null, 2)}`);
+  if (output.exitCode !== 0) {
+    throw new Error(
+      `Failed to stop application! stdout=${output.out} stderr=${output.err}`
+    );
   }
+  logger.info(`Stopped ${projectId}`);
 }
 
 export async function restartApp(props: { projectId: string }): Promise<void> {

package/src/application-control/utils.ts

@@ -104,11 +104,10 @@ export async function downloadPackageUsingPresignedUrl(props: {
   let response: any;
   try {
     response = await fetchWithTimeout(presignedUrl);
-  } catch (error) {
-    const errorBody =
-      error.type === 'aborted' ? error : await error.response.text();
+  } catch (e) {
+    const errorBody = e.type === 'aborted' ? e : await e.response.text();
     throw new Error(
-      `downloadPackageUsingPresignedUrl: Error=${error}\n${errorBody}`
+      `downloadPackageUsingPresignedUrl: Error=${e}\n${errorBody}`
     );
   }
 

package/src/cloud-connection/device-agent-cloud-connection.ts

@@ -138,7 +138,7 @@ export class DeviceAgentCloudConnection {
     });
     try {
       await uninstallApp({ projectId });
-      this.shadowHandler.deleteProjectShadow(projectId);
+      this.shadowHandler.clearAppConfig(projectId);
 
       await this.cmdStatusMgr.stop(projectId);
       await this.liveUpdatesHandler.disableAppInstallStatus({
@@ -153,7 +153,7 @@ export class DeviceAgentCloudConnection {
         )
       );
     } catch (e) {
-      logger.error(`Failed to uninstall ${projectId}: ${e}`);
+      logger.error(`Failed to uninstall ${projectId}: ${e.message}`);
       const message: string = e.message;
       await this.cmdStatusMgr.stop(projectId);
       await this.liveUpdatesHandler.disableAppInstallStatus({
@@ -200,29 +200,32 @@ export class DeviceAgentCloudConnection {
       );
 
       // update app config shadow for project
-      await this.shadowHandler.publishAppState(projectId);
+      await this.shadowHandler.publishAppConfig(projectId);
       return out;
     } catch (e) {
-      logger.error(`Failed to install ${projectId}: ${e}`);
+      logger.error(`Failed to install ${projectId}: ${e.message}`);
       const message: string = e.message;
 
       // uninstall the failed app to put system back in good state
       // TODO: Replace this with rollback
-      await uninstallApp({ projectId });
-      this.shadowHandler.deleteProjectShadow(projectId);
+      try {
+        await uninstallApp({ projectId });
+      } finally {
+        this.shadowHandler.clearAppConfig(projectId);
 
-      await this.cmdStatusMgr.stop(projectId);
-      await this.liveUpdatesHandler.disableAppInstallStatus({
-        projectId
-      });
-      // Send final status message
-      this.publisher.publishToClient(
-        await getAppInstallStatusMessage(
-          keyMirrors.appInstallStatus.failure,
-          message,
-          appReleaseHash
-        )
-      );
+        await this.cmdStatusMgr.stop(projectId);
+        await this.liveUpdatesHandler.disableAppInstallStatus({
+          projectId
+        });
+        // Send final status message
+        this.publisher.publishToClient(
+          await getAppInstallStatusMessage(
+            keyMirrors.appInstallStatus.failure,
+            message,
+            appReleaseHash
+          )
+        );
+      }
     }
   }
 
@@ -298,7 +301,10 @@ export class DeviceAgentCloudConnection {
 
     this.subscribe(this.toDeviceTopic);
     this.subscribe(this.shadowHandler.shadowTopics.projects.getAccepted);
+    this.subscribe(this.shadowHandler.shadowTopics.projects.getRejected);
     this.subscribe(this.shadowHandler.shadowTopics.projects.updateDelta);
+    this.subscribe(this.shadowHandler.shadowTopics.projects.updateAccepted);
+    this.subscribe(this.shadowHandler.shadowTopics.projects.updateRejected);
   }
 
   public getClientId(): string {
@@ -419,11 +425,17 @@ export class DeviceAgentCloudConnection {
       case this.shadowHandler.shadowTopics.projects.updateDelta: {
         const appConfigUpdates = await this.shadowHandler.handleShadowTopic({
           topic,
-          payload: message.state
+          payload: message.state,
+          clientToken: message.clientToken
         });
         await this.handleAppConfigUpdates(appConfigUpdates);
         break;
       }
+      case this.shadowHandler.shadowTopics.projects.getRejected:
+      case this.shadowHandler.shadowTopics.projects.updateAccepted:
+      case this.shadowHandler.shadowTopics.projects.updateRejected:
+        // Not handling these for now
+        break;
       case this.toDeviceTopic:
         await this.handleClientMessage({
           topic,
@@ -461,8 +473,8 @@ export class DeviceAgentCloudConnection {
       try {
         const jsonPacket = JSON.parse(payload);
         await this.handleMessage(topic, jsonPacket);
-      } catch (error) {
-        logger.error(`Error parsing message: ${error}`);
+      } catch (e) {
+        logger.error(`Error parsing message: ${e.message}`);
       }
     });
 

package/src/cloud-connection/live-updates-handler.ts

@@ -132,16 +132,15 @@ export class LiveUpdatesHandler {
     while (true) {
       try {
         const message = await getMessageData(...args);
+        if (!this.continuePublishing(messageType, projectId)) {
+          logger.info(`Turned off live updates for ${messageType}`);
+          break;
+        }
         this.publisher.publishToClient(message);
       } catch (e) {
         logger.error(
           `Error publishing live updates for ${messageType}: ${e.message}`
         );
-        break;
-      }
-      if (!this.continuePublishing(messageType, projectId)) {
-        logger.info(`Turned off live updates for ${messageType}`);
-        break;
       }
       await sleep(this.getLiveUpdatesInterval(messageType));
     }
@@ -161,14 +160,16 @@ export class LiveUpdatesHandler {
   }) {
     const { projectId, appReleaseHash } = props;
     this.liveUpdatesAlive.app_install_status = true;
-    this.appInstallStatuses.add(projectId);
-    // Don't wait for this call to finish since it loops until disabled
-    void this.startPublishingLiveUpdates(
-      keyMirrors.agentMessageType.app_install_status,
-      getAppInstallStatusMessage,
-      [keyMirrors.appInstallStatus.in_progress, '', appReleaseHash],
-      projectId
-    );
+    if (!this.appInstallStatuses.has(projectId)) {
+      this.appInstallStatuses.add(projectId);
+      // Don't wait for this call to finish since it loops until disabled
+      void this.startPublishingLiveUpdates(
+        keyMirrors.agentMessageType.app_install_status,
+        getAppInstallStatusMessage,
+        [keyMirrors.appInstallStatus.in_progress, '', appReleaseHash],
+        projectId
+      );
+    }
   }
 
   public async disableAppInstallStatus(props: { projectId: string }) {

package/src/cloud-connection/shadow-handler.test.ts

@@ -24,7 +24,8 @@ describe('Test Shadow Handler', () => {
     expect(async () => {
       await shadowHandler.handleShadowTopic({
         topic: shadowHandler.shadowTopics.projects.updateDelta,
-        payload: Buffer.from('test-payload')
+        payload: Buffer.from('test-payload'),
+        clientToken: ''
       });
     }).toThrow(Error);
   });
@@ -51,13 +52,13 @@ describe('Test Shadow Handler', () => {
     const payload = {
       [projectId1]: {
         appConfig: JSON.stringify(appCfg1)
-      },
-      clientToken: clientId
+      }
     };
 
     const appCfgUpdates = await shadowHandler.handleShadowTopic({
       topic: shadowHandler.shadowTopics.projects.updateDelta,
-      payload
+      payload,
+      clientToken: clientId
     });
     expect(appCfgUpdates.length).toBe(0);
   });
@@ -92,7 +93,8 @@ describe('Test Shadow Handler', () => {
 
     const appCfgUpdates = await shadowHandler.handleShadowTopic({
       topic: shadowHandler.shadowTopics.projects.getAccepted,
-      payload
+      payload,
+      clientToken: ''
     });
     expect(appCfgUpdates.length).toBe(1);
     expect(appCfgUpdates[0]).toEqual({
@@ -121,7 +123,8 @@ describe('Test Shadow Handler', () => {
 
     const appCfgUpdates = await shadowHandler.handleShadowTopic({
       topic: shadowHandler.shadowTopics.projects.updateDelta,
-      payload
+      payload,
+      clientToken: ''
     });
     expect(appCfgUpdates.length).toBe(0);
   });
@@ -155,7 +158,8 @@ describe('Test Shadow Handler', () => {
 
     const appCfgUpdates = await shadowHandler.handleShadowTopic({
       topic: shadowHandler.shadowTopics.projects.updateDelta,
-      payload
+      payload,
+      clientToken: ''
     });
     expect(appCfgUpdates.length).toBe(1);
     expect(appCfgUpdates[0]).toEqual({
@@ -217,7 +221,8 @@ describe('Test Shadow Handler', () => {
 
     const appCfgUpdates = await shadowHandler.handleShadowTopic({
       topic: shadowHandler.shadowTopics.projects.updateDelta,
-      payload
+      payload,
+      clientToken: ''
     });
     expect(appCfgUpdates.length).toBe(2);
     expect(appCfgUpdates[0]).toEqual({
@@ -264,7 +269,8 @@ describe('Test Shadow Handler', () => {
 
     const appCfgUpdates = await shadowHandler.handleShadowTopic({
       topic: shadowHandler.shadowTopics.projects.updateDelta,
-      payload
+      payload,
+      clientToken: ''
     });
     expect(appCfgUpdates.length).toBe(1);
     expect(appCfgUpdates[0]).toEqual({
@@ -302,12 +308,13 @@ describe('Test Shadow Handler', () => {
 
     const appCfgUpdates = await shadowHandler.handleShadowTopic({
       topic: shadowHandler.shadowTopics.projects.updateDelta,
-      payload
+      payload,
+      clientToken: ''
     });
     expect(appCfgUpdates.length).toBe(0);
   });
 
-  test.skip('publish app state', async () => {
+  test.skip('publish app config', async () => {
     // FIXME: For some reason publisher is not being called...
     const testAppCfg: AppConfig = {
       scripts: {
@@ -317,7 +324,7 @@ describe('Test Shadow Handler', () => {
     };
     jest.mocked(readAppCfgFile).mockResolvedValue(testAppCfg);
 
-    await shadowHandler.publishAppState(projectId1);
+    await shadowHandler.publishAppConfig(projectId1);
     expect(jest.mocked(readAppCfgFile)).toBeCalledWith({ projectId1 });
     const packet = {
       state: {
@@ -343,10 +350,13 @@ describe('Test Shadow Handler', () => {
     );
   });
 
-  test('delete project shadow', async () => {
-    shadowHandler.deleteProjectShadow(projectId1);
+  test('clear project shadow', async () => {
+    shadowHandler.clearAppConfig(projectId1);
     const packet = {
       state: {
+        desired: {
+          [projectId1]: null
+        },
         reported: {
           [projectId1]: null
         }

package/src/cloud-connection/shadow-handler.ts

@@ -9,10 +9,13 @@ import { AppConfigModels, getAppCfgModelsDiff } from './shadow';
 
 export interface ShadowTopics {
   projects: {
-    update: string;
     get: string;
-    updateDelta: string;
     getAccepted: string;
+    getRejected: string;
+    update: string;
+    updateDelta: string;
+    updateAccepted: string;
+    updateRejected: string;
     delete: string;
   };
 }
@@ -35,10 +38,13 @@ export class ShadowHandler {
     this.shadowPrefix = `$aws/things/${this.clientId}/shadow/name/`;
     this.shadowTopics = {
       projects: {
-        update: `${this.shadowPrefix}projects/update`,
         get: `${this.shadowPrefix}projects/get`,
-        updateDelta: `${this.shadowPrefix}projects/update/delta`,
         getAccepted: `${this.shadowPrefix}projects/get/accepted`,
+        getRejected: `${this.shadowPrefix}projects/get/rejected`,
+        update: `${this.shadowPrefix}projects/update`,
+        updateDelta: `${this.shadowPrefix}projects/update/delta`,
+        updateAccepted: `${this.shadowPrefix}projects/update/accepted`,
+        updateRejected: `${this.shadowPrefix}projects/update/rejected`,
         delete: `${this.shadowPrefix}projects/delete`
       }
     };
@@ -92,16 +98,18 @@ export class ShadowHandler {
 
   public async handleShadowTopic({
     topic,
-    payload
+    payload,
+    clientToken
   }: {
     topic: string;
     payload: any;
+    clientToken: string;
   }): Promise<AppConfigUpdate[]> {
     // TODO: make use a function like the other topic getters
     const shadowName = topic.split('/')[5];
     switch (topic) {
       case this.shadowTopics.projects.updateDelta:
-        if (payload.clientToken === this.clientId) {
+        if (clientToken === this.clientId) {
           logger.debug(
             `Ignoring message sent from self: ${JSON.stringify(
               { topic, payload },
@@ -133,7 +141,7 @@ export class ShadowHandler {
     return [];
   }
 
-  public async publishAppState(projectId: string) {
+  public async publishAppConfig(projectId: string) {
     const appCfg = await readAppCfgFile({ projectId });
     const packet = {
       state: {
@@ -143,33 +151,42 @@ export class ShadowHandler {
       },
       clientToken: this.clientId
     };
-    this.publisher.publish(
-      this.shadowTopics.projects.update,
-      JSON.stringify(packet)
+    const topic = this.shadowTopics.projects.update;
+    logger.debug(
+      `Publishing message:\n${JSON.stringify({ topic, packet }, null, 2)}`
     );
+    this.publisher.publish(topic, JSON.stringify(packet));
   }
 
   public getShadowUpdates() {
-    this.publisher.publish(
-      this.shadowTopics.projects.get,
-      JSON.stringify({
-        clientToken: this.clientId
-      })
+    const topic = this.shadowTopics.projects.get;
+    const packet = {
+      clientToken: this.clientId
+    };
+    logger.debug(
+      `Publishing message:\n${JSON.stringify({ topic, packet }, null, 2)}`
     );
+    this.publisher.publish(topic, JSON.stringify(packet));
   }
 
-  public deleteProjectShadow(projectId: string) {
+  public clearAppConfig(projectId: string) {
+    const topic = this.shadowTopics.projects.update;
+    // TODO: We should actually send only desired and handle the delta
+    // to update reported
     const packet = {
       state: {
+        desired: {
+          [projectId]: null
+        },
         reported: {
           [projectId]: null
         }
       },
       clientToken: this.clientId
     };
-    this.publisher.publish(
-      this.shadowTopics.projects.update,
-      JSON.stringify(packet)
+    logger.debug(
+      `Publishing message:\n${JSON.stringify({ topic, packet }, null, 2)}`
     );
+    this.publisher.publish(topic, JSON.stringify(packet));
   }
 }