@alwaysai/device-agent 0.1.0 → 0.1.2

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

@@ -30,7 +30,7 @@ describe('Test Shadow Handler', () => {
     }).toThrow(Error);
   });
 
-  test('ignore message from self', async () => {
+  test('ignore update delta message from self', async () => {
     const ogAppCfg1: AppConfig = {
       scripts: {
         start: 'python app.py'
@@ -55,263 +55,372 @@ describe('Test Shadow Handler', () => {
       }
     };
 
-    const appCfgUpdates = await shadowHandler.handleShadowTopic({
+    const updates = await shadowHandler.handleShadowTopic({
       topic: shadowHandler.shadowTopics.projects.updateDelta,
       payload,
       clientToken: clientId
     });
-    expect(appCfgUpdates.length).toBe(0);
+    expect(updates.length).toBe(0);
   });
 
-  test('handle shadow get response with updated models', async () => {
-    const ogAppCfg1: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {
-        'alwaysai/mobilenet_ssd': 3
-      }
-    };
-
-    jest.mocked(readAppCfgFile).mockResolvedValue(ogAppCfg1);
-    const appCfg1: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {
-        'alwaysai/yolo_v3': 4
-      }
-    };
-
+  test('handle project shadow empty delta', async () => {
     const payload = {
-      delta: {
-        [projectId1]: {
-          appConfig: JSON.stringify(appCfg1)
-        }
-      }
+      [projectId1]: {}
     };
 
-    const appCfgUpdates = await shadowHandler.handleShadowTopic({
-      topic: shadowHandler.shadowTopics.projects.getAccepted,
+    const updates = await shadowHandler.handleShadowTopic({
+      topic: shadowHandler.shadowTopics.projects.updateDelta,
       payload,
       clientToken: ''
     });
-    expect(appCfgUpdates.length).toBe(1);
-    expect(appCfgUpdates[0]).toEqual({
-      projectId: projectId1,
-      newAppCfg: appCfg1,
-      updatedModels: {
-        'alwaysai/yolo_v3': 4
-      }
-    });
+    expect(updates.length).toBe(0);
   });
 
-  test('handle shadow delta without app config', async () => {
-    const ogAppCfg1: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {
-        'alwaysai/mobilenet_ssd': 2
-      }
-    };
-    jest.mocked(readAppCfgFile).mockResolvedValue(ogAppCfg1);
+  describe('handle project shadow app cfg', () => {
+    test('handle project shadow app cfg get response with updated models', async () => {
+      const ogAppCfg1: AppConfig = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {
+          'alwaysai/mobilenet_ssd': 3
+        }
+      };
 
-    const payload = {
-      [projectId1]: {}
-    };
+      jest.mocked(readAppCfgFile).mockResolvedValue(ogAppCfg1);
+      const appCfg1: AppConfig = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {
+          'alwaysai/yolo_v3': 4
+        }
+      };
 
-    const appCfgUpdates = await shadowHandler.handleShadowTopic({
-      topic: shadowHandler.shadowTopics.projects.updateDelta,
-      payload,
-      clientToken: ''
+      const payload = {
+        delta: {
+          [projectId1]: {
+            appConfig: JSON.stringify(appCfg1)
+          }
+        }
+      };
+
+      const updates = await shadowHandler.handleShadowTopic({
+        topic: shadowHandler.shadowTopics.projects.getAccepted,
+        payload,
+        clientToken: ''
+      });
+      expect(updates.length).toBe(1);
+      expect(updates[0]).toEqual({
+        projectId: projectId1,
+        appCfgUpdate: {
+          newAppCfg: appCfg1,
+          updatedModels: {
+            'alwaysai/yolo_v3': 4
+          }
+        }
+      });
     });
-    expect(appCfgUpdates.length).toBe(0);
-  });
 
-  test('handle shadow delta with updated models', async () => {
-    const ogAppCfg1: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {
-        'alwaysai/mobilenet_ssd': 2
-      }
-    };
+    test('handle project shadow app cfg delta with updated models', async () => {
+      const ogAppCfg1: AppConfig = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {
+          'alwaysai/mobilenet_ssd': 2
+        }
+      };
 
-    jest.mocked(readAppCfgFile).mockResolvedValue(ogAppCfg1);
-    const appCfg1: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {
-        'alwaysai/mobilenet_ssd': 3,
-        'alwaysai/yolo_v4': 5
-      }
-    };
+      jest.mocked(readAppCfgFile).mockResolvedValue(ogAppCfg1);
+      const appCfg1: AppConfig = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {
+          'alwaysai/mobilenet_ssd': 3,
+          'alwaysai/yolo_v4': 5
+        }
+      };
 
-    const payload = {
-      [projectId1]: {
-        appConfig: JSON.stringify(appCfg1)
-      }
-    };
+      const payload = {
+        [projectId1]: {
+          appConfig: JSON.stringify(appCfg1)
+        }
+      };
 
-    const appCfgUpdates = await shadowHandler.handleShadowTopic({
-      topic: shadowHandler.shadowTopics.projects.updateDelta,
-      payload,
-      clientToken: ''
-    });
-    expect(appCfgUpdates.length).toBe(1);
-    expect(appCfgUpdates[0]).toEqual({
-      projectId: projectId1,
-      newAppCfg: appCfg1,
-      updatedModels: {
-        'alwaysai/mobilenet_ssd': 3,
-        'alwaysai/yolo_v4': 5
-      }
+      const updates = await shadowHandler.handleShadowTopic({
+        topic: shadowHandler.shadowTopics.projects.updateDelta,
+        payload,
+        clientToken: ''
+      });
+      expect(updates.length).toBe(1);
+      expect(updates[0]).toEqual({
+        projectId: projectId1,
+        appCfgUpdate: {
+          newAppCfg: appCfg1,
+          updatedModels: {
+            'alwaysai/mobilenet_ssd': 3,
+            'alwaysai/yolo_v4': 5
+          }
+        }
+      });
     });
-  });
 
-  test('handle shadow delta with updated models for two apps', async () => {
-    const ogAppCfg1: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {
-        'alwaysai/mobilenet_ssd': 2
-      }
-    };
-    jest.mocked(readAppCfgFile).mockResolvedValueOnce(ogAppCfg1);
-    const ogAppCfg2: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {
-        'alwaysai/yolo_v4': 5
-      }
-    };
-    jest.mocked(readAppCfgFile).mockResolvedValueOnce(ogAppCfg2);
+    test('handle project shadow app cfg delta with updated models for two apps', async () => {
+      const ogAppCfg1: AppConfig = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {
+          'alwaysai/mobilenet_ssd': 2
+        }
+      };
+      jest.mocked(readAppCfgFile).mockResolvedValueOnce(ogAppCfg1);
+      const ogAppCfg2: AppConfig = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {
+          'alwaysai/yolo_v4': 5
+        }
+      };
+      jest.mocked(readAppCfgFile).mockResolvedValueOnce(ogAppCfg2);
 
-    const appCfg1: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {
-        'alwaysai/mobilenet_ssd': 3,
-        'alwaysai/yolo_v4': 5
-      }
-    };
-    const appCfg2: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {
-        'alwaysai/yolo_v4': 5,
-        'alwaysai/human_pose': 7
-      }
-    };
-    const payload = {
-      [projectId1]: {
-        appConfig: JSON.stringify(appCfg1)
-      },
-      [projectId2]: {
-        appConfig: JSON.stringify(appCfg2)
-      }
-    };
+      const appCfg1: AppConfig = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {
+          'alwaysai/mobilenet_ssd': 3,
+          'alwaysai/yolo_v4': 5
+        }
+      };
+      const appCfg2: AppConfig = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {
+          'alwaysai/yolo_v4': 5,
+          'alwaysai/human_pose': 7
+        }
+      };
+      const payload = {
+        [projectId1]: {
+          appConfig: JSON.stringify(appCfg1)
+        },
+        [projectId2]: {
+          appConfig: JSON.stringify(appCfg2)
+        }
+      };
 
-    const appCfgUpdates = await shadowHandler.handleShadowTopic({
-      topic: shadowHandler.shadowTopics.projects.updateDelta,
-      payload,
-      clientToken: ''
+      const updates = await shadowHandler.handleShadowTopic({
+        topic: shadowHandler.shadowTopics.projects.updateDelta,
+        payload,
+        clientToken: ''
+      });
+      expect(updates.length).toBe(2);
+      expect(updates[0]).toEqual({
+        projectId: projectId1,
+        appCfgUpdate: {
+          newAppCfg: appCfg1,
+          updatedModels: {
+            'alwaysai/mobilenet_ssd': 3,
+            'alwaysai/yolo_v4': 5
+          }
+        }
+      });
+      expect(updates[1]).toEqual({
+        projectId: projectId2,
+        appCfgUpdate: {
+          newAppCfg: appCfg2,
+          updatedModels: {
+            'alwaysai/human_pose': 7
+          }
+        }
+      });
     });
-    expect(appCfgUpdates.length).toBe(2);
-    expect(appCfgUpdates[0]).toEqual({
-      projectId: projectId1,
-      newAppCfg: appCfg1,
-      updatedModels: {
-        'alwaysai/mobilenet_ssd': 3,
-        'alwaysai/yolo_v4': 5
-      }
+
+    test('handle project shadow app cfg delta with updated analytics', async () => {
+      const ogAppCfg1: AppConfig = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {}
+      };
+      jest.mocked(readAppCfgFile).mockResolvedValue(ogAppCfg1);
+
+      const appCfg1: AppConfig = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {},
+        analytics: {
+          enable_cloud_publish: true
+        }
+      };
+
+      const payload = {
+        [projectId1]: {
+          appConfig: JSON.stringify(appCfg1)
+        }
+      };
+
+      const updates = await shadowHandler.handleShadowTopic({
+        topic: shadowHandler.shadowTopics.projects.updateDelta,
+        payload,
+        clientToken: ''
+      });
+      expect(updates.length).toBe(1);
+      expect(updates[0]).toEqual({
+        projectId: projectId1,
+        appCfgUpdate: {
+          newAppCfg: appCfg1
+        }
+      });
     });
-    expect(appCfgUpdates[1]).toEqual({
-      projectId: projectId2,
-      newAppCfg: appCfg2,
-      updatedModels: {
-        'alwaysai/human_pose': 7
-      }
+
+    test('handle project shadow app cfg delta with invalid app config', async () => {
+      const ogAppCfg1: AppConfig = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {
+          'alwaysai/mobilenet_ssd': 2
+        }
+      };
+
+      jest.mocked(readAppCfgFile).mockResolvedValue(ogAppCfg1);
+      const appCfg1 = {
+        scripts: {
+          start: 'python app.py'
+        },
+        models: {
+          'alwaysai/mobilenet_ssd': '3', // string instead of int
+          'alwaysai/yolo_v4': '5' // string instead of int
+        }
+      };
+
+      const payload = {
+        [projectId1]: {
+          appConfig: JSON.stringify(appCfg1)
+        }
+      };
+
+      const updates = await shadowHandler.handleShadowTopic({
+        topic: shadowHandler.shadowTopics.projects.updateDelta,
+        payload,
+        clientToken: ''
+      });
+      expect(updates.length).toBe(0);
     });
   });
 
-  test('handle shadow delta with updated analytics', async () => {
-    const ogAppCfg1: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {}
-    };
-    jest.mocked(readAppCfgFile).mockResolvedValue(ogAppCfg1);
+  describe('handle project shadow env vars', () => {
+    test('handle project shadow env vars get response with delta', async () => {
+      const envVars1 = {
+        VAR0: 'value0'
+      };
+      const payload = {
+        delta: {
+          [projectId1]: {
+            envVars: envVars1
+          }
+        }
+      };
 
-    const appCfg1: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {},
-      analytics: {
-        enable_cloud_publish: true
-      }
-    };
+      const updates = await shadowHandler.handleShadowTopic({
+        topic: shadowHandler.shadowTopics.projects.getAccepted,
+        payload,
+        clientToken: ''
+      });
+      expect(updates.length).toBe(1);
+      expect(updates[0]).toEqual({
+        projectId: projectId1,
+        envVarUpdate: {
+          envVars: envVars1
+        }
+      });
+    });
 
-    const payload = {
-      [projectId1]: {
-        appConfig: JSON.stringify(appCfg1)
-      }
-    };
+    test('handle project shadow env vars update delta', async () => {
+      const envVars1 = {
+        VAR1: 'value1'
+      };
+      const payload = {
+        [projectId1]: {
+          envVars: envVars1
+        }
+      };
 
-    const appCfgUpdates = await shadowHandler.handleShadowTopic({
-      topic: shadowHandler.shadowTopics.projects.updateDelta,
-      payload,
-      clientToken: ''
+      const updates = await shadowHandler.handleShadowTopic({
+        topic: shadowHandler.shadowTopics.projects.updateDelta,
+        payload,
+        clientToken: ''
+      });
+      expect(updates.length).toBe(1);
+      expect(updates[0]).toEqual({
+        projectId: projectId1,
+        envVarUpdate: {
+          envVars: envVars1
+        }
+      });
     });
-    expect(appCfgUpdates.length).toBe(1);
-    expect(appCfgUpdates[0]).toEqual({
-      projectId: projectId1,
-      newAppCfg: appCfg1
+
+    test('handle project shadow env vars update delta for two projects', async () => {
+      const envVars1 = {
+        VAR1: 'value1'
+      };
+      const envVars2 = {
+        VAR2: null
+      };
+      const payload = {
+        [projectId1]: {
+          envVars: envVars1
+        },
+        [projectId2]: {
+          envVars: envVars2
+        }
+      };
+
+      const updates = await shadowHandler.handleShadowTopic({
+        topic: shadowHandler.shadowTopics.projects.updateDelta,
+        payload,
+        clientToken: ''
+      });
+      expect(updates.length).toBe(2);
+      expect(updates[0]).toEqual({
+        projectId: projectId1,
+        envVarUpdate: {
+          envVars: envVars1
+        }
+      });
+      expect(updates[1]).toEqual({
+        projectId: projectId2,
+        envVarUpdate: {
+          envVars: envVars2
+        }
+      });
     });
   });
 
-  test('handle shadow delta with invalid app config', async () => {
-    const ogAppCfg1: AppConfig = {
-      scripts: {
-        start: 'python app.py'
-      },
-      models: {
-        'alwaysai/mobilenet_ssd': 2
-      }
-    };
-
-    jest.mocked(readAppCfgFile).mockResolvedValue(ogAppCfg1);
-    const appCfg1 = {
-      scripts: {
-        start: 'python app.py'
+  test('clear project shadow', async () => {
+    shadowHandler.clearAppConfig(projectId1);
+    const packet = {
+      state: {
+        desired: {
+          [projectId1]: null
+        },
+        reported: {
+          [projectId1]: null
+        }
       },
-      models: {
-        'alwaysai/mobilenet_ssd': '3',
-        'alwaysai/yolo_v4': '5'
-      }
-    };
-
-    const payload = {
-      [projectId1]: {
-        appConfig: JSON.stringify(appCfg1)
-      }
+      clientToken: clientId
     };
-
-    const appCfgUpdates = await shadowHandler.handleShadowTopic({
-      topic: shadowHandler.shadowTopics.projects.updateDelta,
-      payload,
-      clientToken: ''
-    });
-    expect(appCfgUpdates.length).toBe(0);
+    expect(jest.mocked(publisher.publish)).toBeCalledWith(
+      shadowHandler.shadowTopics.projects.update,
+      JSON.stringify(packet)
+    );
   });
 
   test.skip('publish app config', async () => {
@@ -324,7 +433,7 @@ describe('Test Shadow Handler', () => {
     };
     jest.mocked(readAppCfgFile).mockResolvedValue(testAppCfg);
 
-    await shadowHandler.publishAppConfig(projectId1);
+    await shadowHandler.updateProjectShadow(projectId1);
     expect(jest.mocked(readAppCfgFile)).toBeCalledWith({ projectId1 });
     const packet = {
       state: {
@@ -349,23 +458,4 @@ describe('Test Shadow Handler', () => {
       })
     );
   });
-
-  test('clear project shadow', async () => {
-    shadowHandler.clearAppConfig(projectId1);
-    const packet = {
-      state: {
-        desired: {
-          [projectId1]: null
-        },
-        reported: {
-          [projectId1]: null
-        }
-      },
-      clientToken: clientId
-    };
-    expect(jest.mocked(publisher.publish)).toBeCalledWith(
-      shadowHandler.shadowTopics.projects.update,
-      JSON.stringify(packet)
-    );
-  });
 });