Marketplace Improvements: Allow filtering by plugin type, and also display plugin type in the search results, and on landing pages.

- Also, make the retries more aggressive for raw.githubusercontent.com (it randomly fails)

Author: jhuckaby

htdocs/js/pages/admin/Marketplace.class.js

@@ -74,8 +74,13 @@ Page.Marketplace = class Marketplace extends Page.PageUtils {
 								var def = config.ui.data_types[type];
 								if (def) return { id: type, title: toTitleCase(type), icon: def.icon };
 								else return type;
-							} ) ),
-							value: args.type || '',
+							} ) ).concat( [
+								{ id: 'p_action', title: 'Action Plugins', icon: 'gesture-tap', group: "Plugin Types" },
+								{ id: 'p_event', title: 'Event Plugins', icon: 'calendar-clock' },
+								{ id: 'p_monitor', title: 'Monitor Plugins', icon: 'console' },
+								{ id: 'p_scheduler', title: 'Trigger Plugins', icon: 'rocket-launch-outline' }
+							] ),
+							value: args.plugin_type ? `p_${args.plugin_type}` : (args.type || ''),
 							'data-shrinkwrap': 1
 						})
 					});
@@ -214,7 +219,14 @@ Page.Marketplace = class Marketplace extends Page.PageUtils {
 		if (lic) args.license = lic;
 
 		var type = this.div.find('#fe_s_type').val();
-		if (type) args.type = type;
+		if (type) {
+			if (type.match(/^p_(\w+)$/)) {
+				var plugin_type = RegExp.$1;
+				args.type = 'plugin';
+				args.plugin_type = plugin_type;
+			}
+			else args.type = type;
+		}
 
 		var sort = this.div.find('#fe_s_sort').val();
 		if (sort != 'title_asc') args.sort = sort;
@@ -321,7 +333,7 @@ Page.Marketplace = class Marketplace extends Page.PageUtils {
 				combo,
 				self.getNiceProductAuthor( product.author ),
 				self.getNiceProductLicense( product.license ),
-				self.getNiceProductType( product.type ),
+				self.getNiceProductType( product ),
 				self.getNiceProductDate( product.created ),
 				self.getNiceProductVersion( product.versions[0] )
 			];
@@ -335,10 +347,12 @@ Page.Marketplace = class Marketplace extends Page.PageUtils {
 		this.cleanupBoxButtonFloater();
 	}
 
-	getNiceProductType(type) {
+	getNiceProductType(product) {
 		// { id: type, title: toTitleCase(type), icon: def.icon };
-		var def = config.ui.data_types[type];
-		if (def) return `<i class="mdi mdi-${def.icon}">&nbsp;</i>` + toTitleCase(type);
+		if (product.plugin_type) return this.getNicePluginType(product.plugin_type);
+		
+		var def = config.ui.data_types[product.type];
+		if (def) return `<i class="mdi mdi-${def.icon}">&nbsp;</i>` + toTitleCase(product.type);
 		else return type;
 	}
 
@@ -438,7 +452,7 @@ Page.Marketplace = class Marketplace extends Page.PageUtils {
 					// type
 					html += '<div>';
 						html += '<div class="info_label">Type</div>';
-						html += '<div class="info_value">' + this.getNiceProductType(product.type) + '</div>';
+						html += '<div class="info_value">' + this.getNiceProductType(product) + '</div>';
 					html += '</div>';
 
 					// status (installed / not)

lib/api/search.js

@@ -441,7 +441,7 @@ class Search {
 							filename: 'README.md'
 						} );
 
-						self.request.get( url, { retries: 5, retryDelay: 100 }, function(err, resp, data, perf) {
+						self.request.get( url, { retries: 8, retryDelay: 50 }, function(err, resp, data, perf) {
 							if (err) return self.doError( 'marketplace', "Failed to fetch README: " + err, callback );
 
 							// try to fix image src urls if relative
@@ -465,7 +465,7 @@ class Search {
 							filename: 'xyops.json'
 						} );
 
-						self.request.json( url, false, { retries: 5, retryDelay: 100 }, function(err, resp, data, perf) {
+						self.request.json( url, false, { retries: 8, retryDelay: 50 }, function(err, resp, data, perf) {
 							if (err) return self.doError( 'marketplace', "Failed to fetch data: " + err, callback );
 							callback({ code: 0, item, version: ver, data: data });
 						});
@@ -479,7 +479,7 @@ class Search {
 							filename: 'logo.png'
 						} );
 
-						self.request.get( url, { retries: 5, retryDelay: 100 }, function(err, resp, data, perf) {
+						self.request.get( url, { retries: 8, retryDelay: 50 }, function(err, resp, data, perf) {
 							if (err) return self.doError( 'marketplace', "Failed to fetch README: " + err, callback );
 							callback( "200 OK", { 'Content-Type': 'image/png' }, data );
 						});
@@ -489,16 +489,18 @@ class Search {
 				} // id
 				else if (params.fields) {
 					// return all unique field values (tags, licenses, etc.)
-					var fields = { types: {}, requires: {}, tags: {}, licenses: {} };
+					var fields = { types: {}, plugin_types: {}, requires: {}, tags: {}, licenses: {} };
 
 					metadata.rows.forEach( function(row) {
 						if (row.type) fields.types[ row.type ] = 1;
+						if (row.plugin_type) fields.plugin_types[ row.plugin_type ] = 1;
 						if (row.license) fields.licenses[ row.license ] = 1;
 						(row.requires || []).forEach( function(req) { fields.requires[req] = 1; } );
 						(row.tags || []).forEach( function(tag) { fields.tags[tag] = 1; } );
 					} );
 
 					fields.types = Tools.hashKeysToArray(fields.types).sort();
+					fields.plugin_types = Tools.hashKeysToArray(fields.plugin_types).sort();
 					fields.requires = Tools.hashKeysToArray(fields.requires).sort();
 					fields.tags = Tools.hashKeysToArray(fields.tags).sort();
 					fields.licenses = Tools.hashKeysToArray(fields.licenses).sort();
@@ -516,6 +518,7 @@ class Search {
 						if (!text.includes(params.query.toLowerCase())) return false;
 					}
 					if (params.type && (row.type != params.type)) return false;
+					if (params.plugin_type && (row.plugin_type != params.plugin_type)) return false;
 					if (params.license && (row.license.toLowerCase() != params.license.toLowerCase())) return false;
 					if (params.tags && !includesAllCI(row.tags, params.tags)) return false;
 					if (params.requires && !includesAllCI(row.requires, params.requires)) return false;
@@ -537,7 +540,7 @@ class Search {
 				if (err || (stats.mtimeMs / 1000 < Tools.timeNow() - marketplace.ttl)) {
 					// fetch from origin
 					self.logDebug(5, "Fetching marketplace metadata from origin: " + marketplace.metadata_url);
-					self.request.json( marketplace.metadata_url, false, { retries: 5, retryDelay: 100 }, function(err, resp, metadata, perf) {
+					self.request.json( marketplace.metadata_url, false, { retries: 8, retryDelay: 50 }, function(err, resp, metadata, perf) {
 						if (err) return self.doError('marketplace', "Failed to fetch marketplace metadata: " + marketplace.metadata_url + ": " + err, callback);
 
 						Tools.writeFileAtomic( cache_file, JSON.stringify(metadata), function(err) {