leaf-connect 1.0.2 → 1.1.1

package/README.md

@@ -1,6 +1,6 @@
 # leaf-connect
 
-[WIP] Node.js client library for the Nissan Leaf API
+Node.js client library for the Nissan Leaf API
 
 ## Requirements
 

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "leaf-connect",
-  "version": "1.0.2",
+  "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.19.2"
+    "axios": "1.4.0"
+  },
+  "devDependencies": {
+    "standard": "17.1.0"
   }
 }

package/src/index.js

@@ -1,11 +1,11 @@
 const axios = require('axios')
-const { stringify } = require('querystring')
+const {stringify} = require('querystring')
 const encryptPassword = require('./lib/encrypt-password')
 const extractData = require('./lib/extract-data')
 const retryUntilSuccess = require('./lib/retry-until-success')
 const logger = require('./lib/logger')
 
-const API_ENDPOINT = 'https://gdcportalgw.its-mo.com/api_v190426_NE/gdc/'
+const API_ENDPOINT = 'https://gdcportalgw.its-mo.com/api_v210707_NE/gdc/'
 const INITIAL_APP_STR = '9s5rfKVuMrT03RtzajWNcA'
 const RESULT_POLLING_INTERVAL = 20000
 const REGION_CODES = ['NE', 'NCI', 'NNA', 'NMA', 'NML']
@@ -56,7 +56,7 @@ module.exports = async ({
   }
 
   try {
-    const { data } = await apiInstance(
+    const {data} = await apiInstance(
       {
         url: 'InitialApp_v2.php',
         data: {
@@ -72,7 +72,7 @@ module.exports = async ({
     throw Error(`Cloud not connect to ${API_ENDPOINT}:\n ${error.message}`)
   }
 
-  const { data } = await apiInstance({
+  const {data} = await apiInstance({
     url: 'UserLoginRequest.php',
     data: {
       initial_app_str: INITIAL_APP_STR,
@@ -101,14 +101,14 @@ 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 })
-      const { resultKey } = data
+      const {data} = await apiInstance({url: 'BatteryStatusCheckRequest.php', data: sessionState.requestOptions})
+      const {resultKey} = data
 
       const runStatusResult = async () => {
-        const { data } = await apiInstance({
+        const {data} = await apiInstance({
           url: 'BatteryStatusCheckResultRequest.php',
           data: {
             ...sessionState.requestOptions,
@@ -123,23 +123,23 @@ module.exports = async ({
     },
 
     cachedStatus: async () => {
-      const { data } = await apiInstance({ url: 'BatteryStatusRecordsRequest.php', data: sessionState.requestOptions })
+      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 })
+      const {data} = await apiInstance({url: 'RemoteACRecordsRequest.php', data: sessionState.requestOptions})
 
-      return JSON.stringify(data, null, 2)
+      return data
     },
 
     climateControlTurnOn: async () => {
-      const { data } = await apiInstance({ url: 'ACRemoteRequest.php', data: sessionState.requestOptions })
-      const { resultKey } = data
+      const {data} = await apiInstance({url: 'ACRemoteRequest.php', data: sessionState.requestOptions})
+      const {resultKey} = data
 
       const runClimateControlTurnOnResult = async () => {
-        const { data } = await apiInstance({
+        const {data} = await apiInstance({
           url: 'ACRemoteResult.php',
           data: {
             ...sessionState.requestOptions,
@@ -153,11 +153,11 @@ module.exports = async ({
     },
 
     climateControlTurnOff: async () => {
-      const { data } = await apiInstance({ url: 'ACRemoteOffRequest.php', data: sessionState.requestOptions })
-      const { resultKey } = data
+      const {data} = await apiInstance({url: 'ACRemoteOffRequest.php', data: sessionState.requestOptions})
+      const {resultKey} = data
 
       const runClimateControlTurnOffResult = async () => {
-        const { data } = await apiInstance({
+        const {data} = await apiInstance({
           url: 'ACRemoteOffResult.php',
           data: {
             ...sessionState.requestOptions,
@@ -172,13 +172,13 @@ module.exports = async ({
     },
 
     chargingStart: async () => {
-      const { data } = await apiInstance({ url: 'BatteryRemoteChargingRequest.php', data: sessionState.requestOptions })
+      const {data} = await apiInstance({url: 'BatteryRemoteChargingRequest.php', data: sessionState.requestOptions})
 
-      return JSON.stringify(data, null, 2)
+      return data
     },
 
     history: async date => {
-      const { data } = await apiInstance({
+      const {data} = await apiInstance({
         url: 'CarKarteDetailInfoRequest.php',
         data: {
           ...sessionState.requestOptions,
@@ -186,15 +186,15 @@ module.exports = async ({
         }
       })
 
-      return JSON.stringify(data, null, 2)
+      return data
     },
 
     location: async () => {
-      const { data } = await apiInstance({ url: 'MyCarFinderRequest.php', data: sessionState.requestOptions })
-      const { resultKey } = data
+      const {data} = await apiInstance({url: 'MyCarFinderRequest.php', data: sessionState.requestOptions})
+      const {resultKey} = data
 
       const runLocationResult = async () => {
-        const { data } = await apiInstance({
+        const {data} = await apiInstance({
           url: 'MyCarFinderResultRequest.php',
           data: {
             ...sessionState.requestOptions,
@@ -209,9 +209,9 @@ module.exports = async ({
     },
 
     lastLocation: async () => {
-      const { data } = await apiInstance({ url: 'MyCarFinderLatLng.php', data: sessionState.requestOptions })
+      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}`))
       }
     }