Proxy for Plugins fix (#7655)

Author: stephannn

pluginHandler.js

@@ -252,9 +252,8 @@ module.exports.pluginHandler = function (parent) {
             var http = (configUrl.indexOf('https://') >= 0) ? require('https') : require('http');
             if (configUrl.indexOf('://') === -1) reject("Unable to fetch the config: Bad URL (" + configUrl + ")");
             var options = require('url').parse(configUrl);
-            if (typeof parent.config.settings.plugins.proxy == 'string') { // Proxy support
-                const HttpsProxyAgent = require('https-proxy-agent');
-                options.agent = new HttpsProxyAgent(require('url').parse(parent.config.settings.plugins.proxy));
+            if (typeof parent.config.settings.plugins.proxy == 'string' || process.env['HTTP_PROXY'] || process.env['HTTPS_PROXY'] || process.env['http_proxy'] || process.env['https_proxy']) { // Proxy support
+                options.agent = new (require('https-proxy-agent').HttpsProxyAgent)(require('url').parse(parent.config.settings.plugins.proxy) || process.env['HTTP_PROXY'] || process.env['HTTPS_PROXY'] || process.env['http_proxy'] || process.env['https_proxy']);
             }
             http.get(options, function (res) {
                 var configStr = '';
@@ -276,7 +275,6 @@ module.exports.pluginHandler = function (parent) {
                         reject("Error getting plugin config. Check that you have valid JSON.");
                     }
                 });
-
             }).on('error', function (e) {
                 reject("Error getting plugin config: " + e.message);
             });
@@ -437,16 +435,17 @@ module.exports.pluginHandler = function (parent) {
                     followRedirects: true,
                     method: 'GET'
                 };
-                if (typeof parent.config.settings.plugins.proxy == 'string') {  // Proxy support
-                    const HttpsProxyAgent = require('https-proxy-agent');
-                    opts.agent = new HttpsProxyAgent(require('url').parse(parent.config.settings.plugins.proxy));
+                if (typeof parent.config.settings.plugins.proxy == 'string' || process.env['HTTP_PROXY'] || process.env['HTTPS_PROXY'] || process.env['http_proxy'] || process.env['https_proxy']) { // Proxy support
+                    opts.agent = new (require('https-proxy-agent').HttpsProxyAgent)(require('url').parse(parent.config.settings.plugins.proxy) || process.env['HTTP_PROXY'] || process.env['HTTPS_PROXY'] || process.env['http_proxy'] || process.env['https_proxy']);
                 }
+                var done = false;
                 var request = http.get(opts, function (response) {
                     // handle redirections with grace
                     if (response.headers.location) {
                         file.close(() => obj.fs.unlink(fileName, () => {}));
                         return obj.installPlugin(id, version_only, response.headers.location, func);
                     }
+                    if ((response.statusCode != null) && (response.statusCode >= 400)) { return console.log('Error downloading plugin: HTTP ' + response.statusCode); }
                     response.pipe(file);
                     file.on('finish', function () {
                         file.close(function () {
@@ -486,11 +485,11 @@ module.exports.pluginHandler = function (parent) {
                                 });
                                 zipfile.on('end', function () {
                                     setTimeout(function () {
-                                        obj.fs.unlinkSync(fileName);
+                                        try { obj.fs.unlinkSync(fileName); } catch (ex) { }
                                         if (version_only == null || version_only === false) {
-                                            parent.db.setPluginStatus(id, 1, func);
+                                            parent.db.setPluginStatus(id, 1, function () { if (done) return; done = true; if (typeof func == 'function') { func(null); } });
                                         } else {
-                                            parent.db.updatePlugin(id, { status: 1, version: version_only.name }, func);
+                                            parent.db.updatePlugin(id, { status: 1, version: version_only.name }, function () { if (done) return; done = true; if (typeof func == 'function') { func(null); } });
                                         }
                                         try {
                                             obj.plugins[plugin.shortName] = require(obj.pluginPath + '/' + plugin.shortName + '/' + plugin.shortName + '.js')[plugin.shortName](obj);
@@ -505,10 +504,13 @@ module.exports.pluginHandler = function (parent) {
                                         parent.updateMeshCore();
                                     });
                                 });
+                                zipfile.on('error', function (e) { console.log('Error extracting plugin ZIP: ' + e.message); });
                             });
                         });
                     });
                 });
+                request.on('error', function (e) { console.log('Error downloading plugin: ' + e.message); });
+                request.setTimeout(30000, function () { request.destroy(new Error('Timed out while downloading plugin')); });
             } else if (plugin.repository.type == 'npm') {
                 // @TODO npm support? (need a test plugin)
             }
@@ -532,9 +534,8 @@ module.exports.pluginHandler = function (parent) {
                         'Accept': 'application/vnd.github.v3+json'
                     }
                 };
-                if (typeof parent.config.settings.plugins.proxy == 'string') { // Proxy support
-                    const HttpsProxyAgent = require('https-proxy-agent');
-                    options.agent = new HttpsProxyAgent(require('url').parse(parent.config.settings.plugins.proxy));
+                if (typeof parent.config.settings.plugins.proxy == 'string' || process.env['HTTP_PROXY'] || process.env['HTTPS_PROXY'] || process.env['http_proxy'] || process.env['https_proxy']) { // Proxy support
+                    options.agent = new (require('https-proxy-agent').HttpsProxyAgent)(require('url').parse(parent.config.settings.plugins.proxy) || process.env['HTTP_PROXY'] || process.env['HTTPS_PROXY'] || process.env['http_proxy'] || process.env['https_proxy']);
                 }
                 http.get(opts, function (res) {
                     var versStr = '';