Solved lots of bugs

resourcepool · Mar 16, 2019 · c578ef1 · c578ef1
1 parent 875f4cd
commit c578ef1
Show file tree

Hide file tree

Showing 20 changed files with 1,034 additions and 1,557 deletions.
diff --git a/bin/savelora.py b/bin/savelora.py
@@ -21,12 +21,14 @@ def setup(groupvars):
     savelorapublicjwt = jwt.encode({
           "sub": "001",
           "name": "Public Idiot",
-          "iat": 1546297200
+          "iat": 1546297200,
+          "exp": 2147483647
         }, constant.SAVE_LORA_API_PUBLIC_SECRET, algorithm='HS256').decode('utf-8')
     saveloraproxyjwt = jwt.encode({
           "sub": "007",
           "name": "Trinity",
-          "iat": 1546297200
+          "iat": 1546297200,
+          "exp": 2147483647
         }, constant.SAVE_LORA_API_PROXY_SECRET, algorithm='HS256').decode('utf-8')
     saveloraadminsecret = ''.join(random.SystemRandom().choice(string.ascii_lowercase + string.ascii_uppercase + string.digits) for _ in range(64))
     print("Save LoRa Public Server JWT is " + savelorapublicjwt)

diff --git a/boilerplate/chapter1/README.md b/boilerplate/chapter1/README.md
diff --git a/boilerplate/chapter1/src/api/api.js b/boilerplate/chapter1/src/api/api.js
@@ -7,6 +7,7 @@
  */
 const Logger = require('../log/logger');
 const conf = require('../conf');
+const utils = require("../utils");
 const axios = require('axios');
 
 const authHeader = "Authorization";
@@ -20,14 +21,14 @@ const client = axios.create({
 
 const deviceExists = async (devEUI) => {
   try {
-    const response = await client.get(`/devices/${devEUI}`);
+    const response = await client.get(`/devices/${utils.normalizeHexString(devEUI)}`);
     logger.debug("Response received", response.data);
     return response;
   } catch (e) {
     if (e.response.status === 404) {
       return false;
     }
-    logger.error("Error occured during call to http api", e);
+    logger.error("Error occured during call to http api", e.message);
     throw e;
   }
 };
@@ -49,70 +50,77 @@ const createDevice = async (device) => {
     logger.debug("Response received", response.data);
     return response;
   } catch (e) {
-    logger.error("Error occured during call to http api", e);
+    logger.error("Error occured during call to http api", e.message);
     throw e;
   }
 };
 
-
+/**
+ * @param devEUI string
+ * @returns {Promise<boolean>}
+ */
 const deviceNwkKeyExists = async (devEUI) => {
   try {
-    const response = await client.get(`/devices/${devEUI}/keys`);
+    const response = await client.get(`/devices/${utils.normalizeHexString(devEUI)}/keys`);
     logger.debug("Response received", response.data);
     return !!response;
   } catch (e) {
     if (e.response.status === 404) {
       return false;
     }
-    logger.error("Error occured during call to http api", e);
+    logger.error("Error occured during call to http api", e.message);
     throw e;
   }
 };
 
 
 /**
  *
- * @param devEUI {string} hex string
- * @param nwkKey {string} hex string
+ * @param devEUI string
+ * (hex string)
+ * @param nwkKey string
+ * (hex string)
  * @returns {Promise<*>}
  */
 const updateDeviceNwkKey = async (devEUI, nwkKey) => {
   try {
-    const response = await client.put(`/devices/${devEUI}/keys`, {
+    const response = await client.put(`/devices/${utils.normalizeHexString(devEUI)}/keys`, {
       deviceKeys: {
-        devEUI: devEUI,
-        nwkKey: nwkKey
+        devEUI: utils.normalizeHexString(devEUI),
+        nwkKey: utils.normalizeHexString(nwkKey)
       }
     });
     logger.debug("Response received", response.data);
     return response;
   } catch (e) {
-    logger.error("Error occured during call to http api", e);
+    logger.error("Error occured during call to http api", e.message);
     throw e;
   }
 };
 
 /**
  *
- * @param devEUI {string} hex string
- * @param nwkKey {string} hex string
+ * @param devEUI string
+ * (hex string)
+ * @param nwkKey string
+ * (hex string)
  * @returns {Promise<*>}
  */
 const setDeviceNwkKey = async (devEUI, nwkKey) => {
   try {
-    const response = await client.post(`/devices/${devEUI}/keys`, {
+    const response = await client.post(`/devices/${utils.normalizeHexString(devEUI)}/keys`, {
       deviceKeys: {
-        devEUI: devEUI,
-        nwkKey: nwkKey
+        devEUI: utils.normalizeHexString(devEUI),
+        nwkKey: utils.normalizeHexString(nwkKey)
       }
     });
     logger.debug("Response received", response.data);
     return response;
   } catch (e) {
     if (e.response.status === 409) {
-      return await updateDeviceNwkKey(devEUI, nwkKey);
+      return await updateDeviceNwkKey(utils.normalizeHexString(devEUI), utils.normalizeHexString(nwkKey));
     }
-    logger.error("Error occured during call to http api", e);
+    logger.error("Error occured during call to http api", e.message);
     throw e;
   }
 };

diff --git a/boilerplate/chapter1/src/progress/review-service.js b/boilerplate/chapter1/src/progress/review-service.js
@@ -59,7 +59,7 @@ const solveJoinRequestSupportedChallenge = async () => {
   try {
     challenge.content.messages.forEach(message => {
       let packetDecoder = new JoinRequestPacketDecoder(message.topic, message.message);
-      result.content.messages.push({supported: packetDecoder.isSupported()});
+      result.content.messages.push({supported: !!packetDecoder.isSupported()});
     });
   } catch (e) {
     if (!result.errors) {

diff --git a/boilerplate/chapter2/README.md b/boilerplate/chapter2/README.md
diff --git a/server/Dockerfile b/server/Dockerfile
@@ -1,5 +1,4 @@
 FROM node:slim
-
 WORKDIR /server
 
 COPY ./package.json /server/
@@ -10,5 +9,7 @@ COPY ./src /server/src
 
 RUN npm install
 
+ENV NODE_ENV=production
+
 EXPOSE 3333
-CMD [ "npm", "start" ]
+CMD [ "npm", "start"]
diff --git a/server/src/appserver/appserver-service.ts b/server/src/appserver/appserver-service.ts
@@ -31,6 +31,9 @@ export const init = () => {
 const checkDevices = async () => {
     logger.debug("Checking devices");
     let devices = await appServerClient.getRegisteredDevices();
+    if (!devices) {
+        return;
+    }
     if (parseInt(devices.totalCount!) > 0) {
         for (let d of devices.result!) {
             let team = await teamDao.findByDevEUI(normalizeHexString(d.devEUI!));
@@ -54,7 +57,7 @@ const updateDeviceProgress = async (team: Team, d: DeviceDescriptor): Promise<bo
         }
     }
     let deviceKeys = await appServerClient.getKeys(d.devEUI!);
-    if (!deviceKeys.nwkKey || normalizeHexString(deviceKeys.nwkKey!) !== normalizeHexString(config.loRaServer.targetNwkKey)) {
+    if (!deviceKeys || !deviceKeys.nwkKey || normalizeHexString(deviceKeys.nwkKey!) !== normalizeHexString(config.loRaServer.targetNwkKey)) {
         return true;
     }
     // Device keys match the target. We can validate this step