leaf-connect 1.0.3 → 1.1.1

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "leaf-connect",
-  "version": "1.0.3",
+  "version": "1.1.1",
   "description": "Node.js client library for the Nissan Leaf API",
   "main": "src/index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "lint": "standard src/**/*.js",
+    "lint-fix": "standard --fix src/**/*.js"
   },
   "files": [
     "src/*"
@@ -22,6 +23,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "axios": "0.21.4"
+    "axios": "1.4.0"
+  },
+  "devDependencies": {
+    "standard": "17.1.0"
   }
 }

package/src/index.js

@@ -101,7 +101,7 @@ module.exports = async ({
 
   return {
 
-    sessionInfo: () => JSON.stringify(sessionState.info, null, 2),
+    sessionInfo: () => sessionState.info,
 
     status: async () => {
       const {data} = await apiInstance({url: 'BatteryStatusCheckRequest.php', data: sessionState.requestOptions})
@@ -125,13 +125,13 @@ module.exports = async ({
     cachedStatus: async () => {
       const {data} = await apiInstance({url: 'BatteryStatusRecordsRequest.php', data: sessionState.requestOptions})
 
-      return JSON.stringify(data, null, 2)
+      return data
     },
 
     climateControlStatus: async () => {
       const {data} = await apiInstance({url: 'RemoteACRecordsRequest.php', data: sessionState.requestOptions})
 
-      return JSON.stringify(data, null, 2)
+      return data
     },
 
     climateControlTurnOn: async () => {
@@ -174,7 +174,7 @@ module.exports = async ({
     chargingStart: async () => {
       const {data} = await apiInstance({url: 'BatteryRemoteChargingRequest.php', data: sessionState.requestOptions})
 
-      return JSON.stringify(data, null, 2)
+      return data
     },
 
     history: async date => {
@@ -186,7 +186,7 @@ module.exports = async ({
         }
       })
 
-      return JSON.stringify(data, null, 2)
+      return data
     },
 
     location: async () => {
@@ -211,7 +211,7 @@ module.exports = async ({
     lastLocation: async () => {
       const {data} = await apiInstance({url: 'MyCarFinderLatLng.php', data: sessionState.requestOptions})
 
-      return JSON.stringify(data, null, 2)
+      return data
     }
 
   }

package/src/lib/retry-until-success.js

@@ -3,10 +3,11 @@ const maxWaitTime = 30000
 module.exports = async (interval, fn) => {
   const startTime = Date.now()
 
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     const retry = async fn => {
       if (startTime > startTime + maxWaitTime) {
-        throw Error('Timout threshold exceeded.')
+        reject(Error('Timout threshold exceeded.'))
+        return
       }
 
       let data = {}
@@ -16,16 +17,14 @@ module.exports = async (interval, fn) => {
 
         if (!data.responseFlag) {
           console.log(data)
-          throw Error('Response did not include response flag')
-        }
-
-        if (data.responseFlag === '0') {
+          reject(Error('Response did not include response flag'))
+        } else if (data.responseFlag === '0') {
           setTimeout(() => retry(fn), interval)
         } else {
           resolve(JSON.stringify(data, null, 2))
         }
       } catch (error) {
-        throw Error(`Failed to get status ${error.message}`)
+        reject(Error(`Failed to get status ${error.message}`))
       }
     }