Merge pull request particle-iot#60 from AntonPuko/deviceClean

Device clean

Author: jlkalberer

src/controllers/DevicesController.js

@@ -82,7 +82,7 @@ class DevicesController extends Controller {
       return this.ok({ result: varValue });
     } catch (error) {
       const errorMessage = error.message;
-      if (errorMessage.indexOf('Variable not found') >= 0) {
+      if (errorMessage.match('Variable not found')) {
         throw new HttpError('Variable not found', 404);
       }
       throw error;
@@ -108,19 +108,21 @@ class DevicesController extends Controller {
     }
     // 2 flash device with known app
     if (postBody.app_id) {
-      await this._deviceRepository.flashKnownApp(
+      const flashStatus = await this._deviceRepository.flashKnownApp(
         deviceID,
         this.user.id,
         postBody.app_id,
       );
 
-      return this.ok({ id: deviceID, status: 'Update started' });
+      return this.ok({ id: deviceID, status: flashStatus });
     }
 
     const file = this.request.files.file[0];
     if (file && file.originalname.endsWith('.bin')) {
-      await this._deviceRepository.flashBinary(deviceID, file);
-      return this.ok({ id: deviceID, status: 'Update started' });
+      const flashStatus = await this._deviceRepository
+        .flashBinary(deviceID, file);
+
+      return this.ok({ id: deviceID, status: flashStatus });
     }
 
     throw new HttpError('Did not update device');

src/repository/DeviceRepository.js

@@ -84,28 +84,25 @@ class DeviceRepository {
       deviceID,
       userID,
     );
+
     if (!attributes) {
       throw new HttpError('No device found', 404);
     }
 
     const device = this._deviceServer.getDevice(attributes.deviceID);
-    // TODO: Not sure if this should actually be the core ID that gets sent
-    // but that's what the old source code does :/
-    const response = device
-      ? await device.onApiMessage(
-        attributes.deviceID,
-        { cmd: 'Ping' },
-      )
+
+    const pingResponse = device
+      ? device.ping()
       : {
         connected: false,
         lastPing: null,
       };
 
     return {
       ...attributes,
-      connected: response.connected,
+      connected: pingResponse.connected,
       lastFlashedAppName: null,
-      lastHeard: response.lastPing,
+      lastHeard: pingResponse.lastPing,
     };
   };
 
@@ -117,10 +114,7 @@ class DeviceRepository {
 
     const [attributes, description] = await Promise.all([
       this._deviceAttributeRepository.getById(deviceID, userID),
-      device.onApiMessage(
-        deviceID,
-        { cmd: 'Describe' },
-      ),
+      device.getDescription(),
     ]);
 
     if (!attributes) {
@@ -130,10 +124,10 @@ class DeviceRepository {
     return ({
       ...attributes,
       connected: true,
-      functions: description.f,
+      functions: description.state.f,
       lastFlashedAppName: null,
       lastHeard: new Date(),
-      variables: description.v,
+      variables: description.state.v,
     });
   };
 
@@ -142,23 +136,19 @@ class DeviceRepository {
       await this._deviceAttributeRepository.getAll(userID);
     const devicePromises = devicesAttributes.map(async attributes => {
       const device = this._deviceServer.getDevice(attributes.deviceID);
-      // TODO: Not sure if this should actually be the core ID that gets sent
-      // but that's what the old source code does :/
-      const response = device
-        ? await device.onApiMessage(
-          attributes.deviceID,
-          { cmd: 'Ping' },
-        )
+
+      const pingResponse = device
+        ? device.ping()
         : {
           connected: false,
           lastPing: null,
         };
 
       return {
         ...attributes,
-        connected: response.connected,
+        connected: pingResponse.connected,
         lastFlashedAppName: null,
-        lastHeard: response.lastPing,
+        lastHeard: pingResponse.lastPing,
       };
     });
 
@@ -179,16 +169,11 @@ class DeviceRepository {
     if (!device) {
       throw new HttpError('Could not get device for ID', 404);
     }
-    const result = await device.onApiMessage(
-      deviceID,
-      { cmd: 'CallFn', name: functionName, args: functionArguments },
-    );
 
-    if (result.error) {
-      throw result.error;
-    }
-
-    return result.result;
+    return await device.callFunction(
+      functionName,
+      functionArguments,
+    );
   };
 
   getVariableValue = async (
@@ -204,16 +189,8 @@ class DeviceRepository {
     if (!device) {
       throw new HttpError('Could not get device for ID', 404);
     }
-    const result = await device.onApiMessage(
-      deviceID,
-      { cmd: 'GetVar', name: varName },
-    );
-
-    if (result.error) {
-      throw result.error;
-    }
 
-    return result;
+    return await device.getVariableValue(varName);
   };
 
   flashBinary = async (
@@ -225,16 +202,7 @@ class DeviceRepository {
       throw new HttpError('Could not get device for ID', 404);
     }
 
-    const result = await device.onApiMessage(
-      deviceID,
-      { cmd: 'UFlash', args: { data: file.buffer } },
-    );
-
-    if (result.error) {
-      throw result.error;
-    }
-
-    return result.result;
+    return await device.flash(file.buffer);
   };
 
   flashKnownApp = async (
@@ -257,16 +225,7 @@ class DeviceRepository {
       throw new HttpError('Could not get device for ID', 404);
     }
 
-    const result = await device.onApiMessage(
-      deviceID,
-      { cmd: 'UFlash', args: { data: knownFirmware } },
-    );
-
-    if (result.error) {
-      throw result.error;
-    }
-
-    return result.result;
+    return await device.flash(knownFirmware);
   };
 
   provision = async (

test/setup/SparkCoreMock.js

@@ -4,6 +4,22 @@ class SparkCoreMock {
   onApiMessage() {
     return true;
   }
+
+  getVariableValue = (): Object => 0;
+
+  getDescription = (): Object => ({
+    firmware_version: '0.6.0',
+    product_id: '6',
+    state: {
+      f: null,
+      v: null,
+    },
+  });
+
+  ping = (): Object => ({
+    connected: false,
+    lastPing: new Date(),
+  });
 }
 
 export default SparkCoreMock;