node-red-contrib-gps - npm Package Compare versions

Comparing version 1.0.4 to 1.0.5

lib/GpsApi.js

@@ -1,103 +0,126 @@
-const axios = require('axios')
-const CryptoJS = require('crypto-js')
-const GpsApiCode = require('./GpsApiCode')
+const axios = require("axios");
+const CryptoJS = require("crypto-js");
+const GpsApiCode = require("./GpsApiCode");
 
 // 提前一分钟更新
-const EXPIRE_TIME = (60 * 1000)
+const EXPIRE_TIME = 60 * 1000;
 
-const baseUrl = { 'gpsoo': 'http://api.gpsoo.net/1',
-  'gmiot': 'http://litapi.gmiot.net/1' }
+const baseUrl = {
+  gpsoo: "http://api.gpsoo.net/1",
+  gmiot: "https://litin.gmiot.net/1",
+};
 
 class GpsApi {
-  constructor (node, config) {
-    this.node = node
-    this.config = config
+  constructor(node, config) {
+    this.node = node;
+    this.config = config;
   }
-  getToken () {
-    const { set: setCache, get: getCache } = this.node.context().global
-    const { phone, password, platform } = this.config
-    const cache_key = `gps-${phone}-${platform}`
+  getToken() {
+    const { set: setCache, get: getCache } = this.node.context().global;
+    const { phone, password, platform } = this.config;
+    const cache_key = `gps-${phone}-${platform}`;
     return new Promise(async (resolve, reject) => {
       try {
-        const cache = getCache(cache_key)
-        if (cache && cache.time && ((cache.time - new Date().valueOf()) > EXPIRE_TIME)) {
-          resolve(cache.token)
-          return
+        const cache = getCache(cache_key);
+        if (
+          cache &&
+          cache.time &&
+          cache.time - new Date().valueOf() > EXPIRE_TIME
+        ) {
+          resolve(cache.token);
+          return;
         }
-        const time = parseInt(new Date().getTime() / 1000, 10)
-        const md5Pass = CryptoJS.MD5(password).toString()
-        const signature = CryptoJS.MD5(md5Pass + time).toString()
-        const { data } = await axios.get(`${baseUrl[platform]}/auth/access_token?account=${phone}&time=${time}&signature=${signature}`, {
-          headers: {
-            'Content-type': 'Content-type: text/html; charset=utf-8'
-          }
-        }).catch(err => {
-          throw new Error(`[GPS api Token]${err}`)
-        })
+        const time = parseInt(new Date().getTime() / 1000, 10);
+        const md5Pass = CryptoJS.MD5(password).toString();
+        const signature = CryptoJS.MD5(md5Pass + time).toString();
+        const { data } = await axios
+          .get(
+            `${baseUrl[platform]}/auth/access_token?account=${phone}&time=${time}&signature=${signature}`,
+            {
+              headers: {
+                "Content-type": "Content-type: text/html; charset=utf-8",
+              },
+            }
+          )
+          .catch((err) => {
+            throw new Error(`[GPS api Token]${err}`);
+          });
         if (data.ret != 0) {
-          const msg = GpsApiCode[data.ret] || data.msg
-          throw new Error(`[GPS api Token]${msg}`)
+          const msg = GpsApiCode[data.ret] || data.msg;
+          throw new Error(`[GPS api Token]${msg}`);
         }
         if (!data.access_token) {
-          reject(new Error('[GPS api Token]token获取失败'))
+          reject(new Error("[GPS api Token]token获取失败"));
         }
         setCache(cache_key, {
           token: data.access_token,
-          time: data.expires_in * 1000 + new Date().getTime()
-        })
-        resolve(data.access_token)
-      } catch (err) { reject(err) }
-    })
+          time: data.expires_in * 1000 + new Date().getTime(),
+        });
+        resolve(data.access_token);
+      } catch (err) {
+        reject(err);
+      }
+    });
   }
 
-  monitor () {
+  monitor() {
     return new Promise(async (resolve, reject) => {
       try {
-        const { phone, platform } = this.config
-        const access_token = await this.getToken()
+        const { phone, platform } = this.config;
+        const access_token = await this.getToken();
 
-        const { data } = await axios.get(`${baseUrl[platform]}/account/monitor?target=${phone}&access_token=${access_token}`, {
-          headers: {
-            'Content-type': 'Content-type: text/html; charset=utf-8'
-          }
-        }).catch(err => {
-          throw new Error(`【监控】monitor ${err}`)
-        })
+        const { data } = await axios
+          .get(
+            `${baseUrl[platform]}/account/monitor?target=${phone}&access_token=${access_token}`,
+            {
+              headers: {
+                "Content-type": "Content-type: text/html; charset=utf-8",
+              },
+            }
+          )
+          .catch((err) => {
+            throw new Error(`【监控】monitor ${err}`);
+          });
 
         if (data.ret != 0) {
-          const msg = GpsApiCode[data.ret] || data.msg
-          throw new Error(`【监控】monitor${msg}`)
+          const msg = GpsApiCode[data.ret] || data.msg;
+          throw new Error(`【监控】monitor${msg}`);
         }
-        resolve(data.data)
+        resolve(data.data);
       } catch (error) {
-        reject(error)
+        reject(error);
       }
-    })
+    });
   }
 
-  address (longitude, latitude) {
+  address(longitude, latitude) {
     return new Promise(async (resolve, reject) => {
       try {
-        const { platform } = this.config
-        const access_token = await this.getToken()
+        const { platform } = this.config;
+        const access_token = await this.getToken();
 
-        const { data } = await axios.get(`${baseUrl[platform]}/tool/address?lng=${longitude}&lat=${latitude}&access_token=${access_token}`, {
-          headers: {
-            'Content-type': 'Content-type: text/html; charset=utf-8'
-          }
-        }).catch(err => {
-          throw new Error(`[【逆地理位置解析】]${err}`)
-        })
+        const { data } = await axios
+          .get(
+            `${baseUrl[platform]}/tool/address?lng=${longitude}&lat=${latitude}&access_token=${access_token}`,
+            {
+              headers: {
+                "Content-type": "Content-type: text/html; charset=utf-8",
+              },
+            }
+          )
+          .catch((err) => {
+            throw new Error(`[【逆地理位置解析】]${err}`);
+          });
 
         if (data.ret != 0) {
-          const msg = GpsApiCode[data.ret] || data.msg
-          throw new Error(`[【逆地理位置解析】]${msg}`)
+          const msg = GpsApiCode[data.ret] || data.msg;
+          throw new Error(`[【逆地理位置解析】]${msg}`);
         }
-        resolve(data)
+        resolve(data);
       } catch (error) {
-        reject(error)
+        reject(error);
       }
-    })
+    });
   }
 }
-module.exports = GpsApi
+module.exports = GpsApi;

package.json

 {
   "name": "node-red-contrib-gps",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "汽车在线和万物在线 ，可以获取设备的gps位置和逆地理位置解析",
@@ -28,3 +28,3 @@ "main": "index.js",
   "dependencies": {
-    "axios": "^0.18.0",
+    "axios": ">=0.21.2",
     "crypto-js": "^3.1.9-1"
@@ -31,0 +31,0 @@ },

No alert changes

Improved metrics

Total package byte prevSize

23730

increased by1.43%

Lines of code

241

increased by10.55%

Dependency changes

• + Addedasynckit@0.4.0(transitive)

• + Addedaxios@1.7.9(transitive)

• + Addedcall-bind-apply-helpers@1.0.2(transitive)

• + Addedcombined-stream@1.0.8(transitive)

• + Addeddelayed-stream@1.0.0(transitive)

• + Addeddunder-proto@1.0.1(transitive)

• + Addedes-define-property@1.0.1(transitive)

• + Addedes-errors@1.3.0(transitive)

• + Addedes-object-atoms@1.1.1(transitive)

• + Addedes-set-tostringtag@2.1.0(transitive)

• + Addedfollow-redirects@1.15.9(transitive)

• + Addedform-data@4.0.2(transitive)

• + Addedfunction-bind@1.1.2(transitive)

• + Addedget-intrinsic@1.2.7(transitive)

• + Addedget-proto@1.0.1(transitive)

• + Addedgopd@1.2.0(transitive)

• + Addedhas-symbols@1.1.0(transitive)

• + Addedhas-tostringtag@1.0.2(transitive)

• + Addedhasown@2.0.2(transitive)

• + Addedmath-intrinsics@1.1.0(transitive)

• + Addedmime-db@1.52.0(transitive)

• + Addedmime-types@2.1.35(transitive)

• + Addedproxy-from-env@1.1.0(transitive)

• - Removedaxios@0.18.1(transitive)

• - Removedfollow-redirects@1.5.10(transitive)

• - Removedis-buffer@2.0.5(transitive)

• Updatedaxios@>=0.21.2