Fix caching of npm search results and only make one registry request on /admin/plugins

fixes #1488

2 files changed, 8 insertions, 4 deletions

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index a973875c..d7f94d2c 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -163,8 +163,10 @@ $(document).ready(function () {
     }
     updateHandlers();
 
-    socket.emit('checkUpdates');
-    tasks++;
+    setTimeout(function() {
+      socket.emit('checkUpdates');
+      tasks++;
+    }, 5000)
   });
   
   socket.on('updatable', function(data) {
diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index 15d87940..14a3b7be 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -71,12 +71,13 @@ exports.install = function(plugin_name, cb) {
 };
 
 exports.searchCache = null;
+var cacheTimestamp = 0;
 
-exports.search = function(query, cache, cb) {
+exports.search = function(query, maxCacheAge, cb) {
   withNpm(
     function (cb) {
       var getData = function (cb) {
-        if (cache && exports.searchCache) {
+        if (maxCacheAge && exports.searchCache && Math.round(+new Date/1000)-cacheTimestamp < maxCacheAge) {
           cb(null, exports.searchCache);
         } else {
           registry.get(
@@ -84,6 +85,7 @@ exports.search = function(query, cache, cb) {
             function (er, data) {
               if (er) return cb(er);
               exports.searchCache = data;
+              cacheTimestamp = Math.round(+new Date/1000)
               cb(er, data);
             }
           );