node-red-node-openweathermap - npm Package Compare versions

Comparing version 0.1.18 to 0.1.19

package.json

 {
     "name"          : "node-red-node-openweathermap",
-    "version"       : "0.1.18",
+    "version"       : "0.1.19",
     "description"   : "A Node-RED node that gets the weather report from openweathermap",
@@ -5,0 +5,0 @@ "dependencies"  : {

README.md

@@ -43,2 +43,3 @@ node-red-node-openweathermap
   - **weather** - a very short description of the current weather.
+  - **icon** - the weather icon code for the current conditions.
   - **tempc** - the current ground temperature at that location in Celsius.
@@ -45,0 +46,0 @@ - **tempk** - the current ground temperature at that location in Kelvin.

weather.js

@@ -19,3 +19,3 @@ /**
     "use strict";
-    var http = require("http");
+    var request = require("request");
 
@@ -71,75 +71,71 @@ function assignmentFunction(node, msg, lat, lon, city, country, language, callback) {
                 node.status({fill:"blue",shape:"dot",text:"weather.status.requesting"});
-                http.get(url, function(res) {
-                    var weather = "";
-                    res.on('data', function(d) {
-                        weather += d;
-                    });
-
-                    res.on('end', function() {
-                        var jsun;
-                        if (weather.indexOf("Invalid API key") > -1) {
-                            callback(RED._("weather.error.invalid-key"));
-                            return;
-                        }
-                        try {
-                            jsun = JSON.parse(weather);
-                        } catch (e) {
-                            callback(RED._("weather.error.invalid-json"));
-                            return;
-                        }
-                        if (jsun) {
-                            msg.data = jsun;
-                            if (jsun.hasOwnProperty("weather") && jsun.hasOwnProperty("main")) {
-                                msg.payload.weather = jsun.weather[0].main;
-                                msg.payload.detail = jsun.weather[0].description;
-                                msg.payload.tempk = jsun.main.temp;
-                                if (jsun.main.hasOwnProperty("temp")) { msg.payload.tempc = parseInt(10 * (Number(jsun.main.temp) - 273.15))/10; }
-                                if (jsun.main.hasOwnProperty("temp_max")) { msg.payload.temp_maxc = parseInt(10 * (Number(jsun.main.temp_max) - 273.15))/10; }
-                                if (jsun.main.hasOwnProperty("temp_min")) { msg.payload.temp_minc = parseInt(10 * (Number(jsun.main.temp_min) - 273.15))/10; }
-                                msg.payload.humidity = jsun.main.humidity;
-                                msg.payload.maxtemp = jsun.main.temp_max;
-                                msg.payload.mintemp = jsun.main.temp_min;
-                                msg.payload.windspeed = jsun.wind.speed;
-                                msg.payload.winddirection = jsun.wind.deg;
-                                msg.payload.location = jsun.name;
-                                msg.payload.sunrise = jsun.sys.sunrise;
-                                msg.payload.sunset = jsun.sys.sunset;
-                                msg.payload.clouds = jsun.clouds.all;
-                                if (jsun.hasOwnProperty("coord")) {
-                                    msg.location.lon = jsun.coord.lon;
-                                    msg.location.lat = jsun.coord.lat;
+                request.get(url, function(error, result, data) {
+                    if (error) {
+                        callback(error);
+                        return;
+                    }
+                    var weather = data;
+                    var jsun;
+                    if (weather.indexOf("Invalid API key") > -1) {
+                        callback(RED._("weather.error.invalid-key"));
+                        return;
+                    }
+                    try {
+                        jsun = JSON.parse(weather);
+                    } catch (e) {
+                        callback(RED._("weather.error.invalid-json"));
+                        return;
+                    }
+                    if (jsun) {
+                        msg.data = jsun;
+                        if (jsun.hasOwnProperty("weather") && jsun.hasOwnProperty("main")) {
+                            msg.payload.weather = jsun.weather[0].main;
+                            msg.payload.detail = jsun.weather[0].description;
+                            msg.payload.icon = jsun.weather[0].icon;
+                            msg.payload.tempk = jsun.main.temp;
+                            if (jsun.main.hasOwnProperty("temp")) { msg.payload.tempc = parseInt(10 * (Number(jsun.main.temp) - 273.15))/10; }
+                            if (jsun.main.hasOwnProperty("temp_max")) { msg.payload.temp_maxc = parseInt(10 * (Number(jsun.main.temp_max) - 273.15))/10; }
+                            if (jsun.main.hasOwnProperty("temp_min")) { msg.payload.temp_minc = parseInt(10 * (Number(jsun.main.temp_min) - 273.15))/10; }
+                            msg.payload.humidity = jsun.main.humidity;
+                            msg.payload.maxtemp = jsun.main.temp_max;
+                            msg.payload.mintemp = jsun.main.temp_min;
+                            msg.payload.windspeed = jsun.wind.speed;
+                            msg.payload.winddirection = jsun.wind.deg;
+                            msg.payload.location = jsun.name;
+                            msg.payload.sunrise = jsun.sys.sunrise;
+                            msg.payload.sunset = jsun.sys.sunset;
+                            msg.payload.clouds = jsun.clouds.all;
+                            if (jsun.hasOwnProperty("coord")) {
+                                msg.location.lon = jsun.coord.lon;
+                                msg.location.lat = jsun.coord.lat;
+                            }
+                            msg.location.city = jsun.name;
+                            msg.location.country = jsun.sys.country;
+                            if (jsun.hasOwnProperty("dt")) { msg.time = new Date(jsun.dt*1000); }
+                            msg.title = RED._("weather.message.title");
+                            msg.description = RED._("weather.message.description", {lat: msg.location.lat, lon: msg.location.lon});
+                            msg.payload.description = (RED._("weather.message.payload", {name: jsun.name, lat: jsun.coord.lat, lon: jsun.coord.lon, main: jsun.weather[0].main, description: jsun.weather[0].description}));
+                            callback();
+                        } else if (jsun.hasOwnProperty("list")) {
+                            msg.payload = jsun.list;
+                            if (jsun.hasOwnProperty("city")) {
+                                msg.location.city = jsun.city.name;
+                                msg.location.country = jsun.city.country;
+                                if (jsun.city.hasOwnProperty("coord")) {
+                                    msg.location.lat = jsun.city.coord.lat;
+                                    msg.location.lon = jsun.city.coord.lon;
                                 }
-                                msg.location.city = jsun.name;
-                                msg.location.country = jsun.sys.country;
-                                if (jsun.hasOwnProperty("dt")) { msg.time = new Date(jsun.dt*1000); }
-                                msg.title = RED._("weather.message.title");
-                                msg.description = RED._("weather.message.description", {lat: msg.location.lat, lon: msg.location.lon});
-                                msg.payload.description = (RED._("weather.message.payload", {name: jsun.name, lat: jsun.coord.lat, lon: jsun.coord.lon, main: jsun.weather[0].main, description: jsun.weather[0].description}));
-                                callback();
-                            } else if (jsun.hasOwnProperty("list")) {
-                                msg.payload = jsun.list;
-                                if (jsun.hasOwnProperty("city")) {
-                                    msg.location.city = jsun.city.name;
-                                    msg.location.country = jsun.city.country;
-                                    if (jsun.city.hasOwnProperty("coord")) {
-                                        msg.location.lat = jsun.city.coord.lat;
-                                        msg.location.lon = jsun.city.coord.lon;
-                                    }
-                                }
-                                msg.title = RED._("weather.message.forecast");
-                                callback();
+                            }
+                            msg.title = RED._("weather.message.forecast");
+                            callback();
+                        } else {
+                            if (jsun.message === "Error: Not found city") {
+                                callback(RED._("weather.error.invalid-city_country"));
+                                return;
                             } else {
-                                if (jsun.message === "Error: Not found city") {
-                                    callback(RED._("weather.error.invalid-city_country"));
-                                    return;
-                                } else {
-                                    callback(jsun.cod + " " + jsun.message);
-                                    return;
-                                }
+                                callback(jsun.cod + " " + jsun.message);
+                                return;
                             }
                         }
-                    });
-                }).on('error', function(e) {
-                    callback(e);
-                    return;
+                    }
                 });
@@ -146,0 +142,0 @@ node.status({});

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Improved metrics

Number of lines in readme file

79

increased by1.28%

Number of medium supply chain risk alerts

0

decreased by-100%

Worsened metrics

Total package byte prevSize

49475

decreased by-0.32%

Lines of code

301

decreased by-0.99%

No dependency changes