second release

Author: Sheherezadhe

package.json

@@ -80,6 +80,7 @@
     "@types/luxon": "^2.3.1",
     "@types/react": "^17.0.38",
     "@types/react-dom": "^17.0.11",
+    "@types/react-timeago": "^4.1.3",
     "@typescript-eslint/eslint-plugin": "^5.15.0",
     "@typescript-eslint/parser": "^5.9.1",
     "@vercel/webpack-asset-relocator-loader": "^1.7.0",
@@ -104,13 +105,13 @@
     "electron-squirrel-startup": "^1.0.0",
     "express": "^4.17.3",
     "http-server": "^14.1.0",
-    "javascript-time-ago": "^2.3.13",
     "jwt-decode": "^3.1.2",
     "keycloak-js": "^17.0.0",
     "luxon": "^2.3.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-redux": "^7.2.6",
-    "react-router-dom": "^6.2.2"
+    "react-router-dom": "^6.2.2",
+    "react-timeago": "^6.2.1"
   }
 }

src/components/Status.tsx

@@ -1,12 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import Scheduler, { Statuses } from '../scheduler';
-import TimeAgo, { LocaleData } from 'javascript-time-ago';
-import en from 'javascript-time-ago/locale/en';
+import MyTimeAgo from 'react-timeago';
 import './Status.css';
 
-TimeAgo.addLocale(en as LocaleData);
-const timeAgo = new TimeAgo('en-EN');
-
 const Status = () => {
   const [data, setData] = useState<Statuses>();
 
@@ -26,7 +22,7 @@ const Status = () => {
             <div key={index}>
               {element.calledAt !== '' && element.receivedAt !== '' &&
                 <div>
-                  {element.name}: {timeAgo.format(new Date(element.calledAt))} - {timeAgo.format(new Date(element.receivedAt))}
+                  {element.name}: <MyTimeAgo date={new Date(element.calledAt)}/> - <MyTimeAgo  date={new Date(element.receivedAt)}/>
                 </div>
               }
             </div>

src/scheduler.ts

@@ -5,6 +5,7 @@ import { Sensors } from './types/planetWatch/sensors';
 import { DateTime } from 'luxon';
 import { AwairToPlanetWatchMapper } from './mappers/AwairToPlanetWatchMapper';
 import constants from './constants';
+import { authorization } from './utils/authorization';
 export interface AwairAccount {
   jwt: string;
   devices: AwairDevice[];
@@ -168,8 +169,9 @@ export class Scheduler {
   }
 
   private async fetchAndSendData(accounts: AwairAccounts) {
+    await authorization.refreshToken();
     // Grab all the data from awair and save them in a structure
-    accounts  .forEach((account) => {
+    accounts.forEach((account) => {
       const jwt = account.jwt;
 
       account.devices.forEach((device) => {
@@ -182,14 +184,24 @@ export class Scheduler {
 
         AwairController.getLatestData(jwt, deviceType, deviceId)
           .then((res) => {
-            PlanetWatchService.sendData(AwairToPlanetWatchMapper.map(device.deviceUUID, res))
-              .catch((err) => console.log(err));
             this.statuses[device.deviceUUID].receivedAt = DateTime.now().toISO();
             this.statusSubscribers.forEach((callback) => callback({ ...this.statuses }));
-            this.logs.push(DateTime.now().toFormat('[HH:mm:ss]') + ' - Retrieving data from ' + deviceId + '\n');
+            this.logs.push(DateTime.now().toFormat('[HH:mm:ss]') + ' - Retrieved data from ' + deviceId + '\n');
             this.logSubscribers.forEach((callback) => callback([...this.logs]));
+            PlanetWatchService.sendData(AwairToPlanetWatchMapper.map(device.deviceUUID, res))
+              .then(() => {
+                this.logs.push(DateTime.now().toFormat('[HH:mm:ss]') + ' - Successfully sent data to PW servers ' + deviceId + '\n');
+                this.logSubscribers.forEach((callback) => callback([...this.logs]));
+              })
+              .catch((err) => {
+                this.logs.push(DateTime.now().toFormat('[HH:mm:ss]') + ' - Error while sending data to PW servers of ' + deviceId + ' ' + err.response.data.errorMessage + '\n');
+                this.logSubscribers.forEach((callback) => callback([...this.logs]));
+                console.log(err.response.data.errorMessage);
+              });
           })
           .catch((error) => {
+            this.logs.push(DateTime.now().toFormat('[HH:mm:ss]') + ' - Error while retrieving data from ' + deviceId + ' ' + error.message + '\n');
+            this.logSubscribers.forEach((callback) => callback([...this.logs]));
             console.log(error);
           });
       });

src/services/planetWatchService.ts

@@ -7,7 +7,7 @@ const getSensors = async () => {
   const main = constants.planetWatch.sensors;
 
   const response = await axios.get<Sensors>(main);
-  
+
   return response.data;
 };
 

src/utils/authorization.tsx

@@ -47,6 +47,8 @@ class Authorization {
     this.keycloak?.logout({ redirectUri: 'http://localhost:33333/keycloak-redirect' });
   };
 
+  refreshToken = async () => this.keycloak!.updateToken(60);
+
 }
 
 export type AuthorizationProviderProps = {