added no-value escape hatch to filterForFreePublicCLaims()

helpers/lbryHelpers.js

@@ -3,10 +3,14 @@ var axios = require('axios');
 var lbryApi = require('./lbryApi');
 
 function filterForFreePublicClaims(claimsListArray){
+	//console.log("claims list:", claimsListArray)
 	if (!claimsListArray) {
 		return null;
 	};
 	var freePublicClaims = claimsListArray.filter(function(claim){
+		if (!claim.value){
+			return false;
+		}
 		return (((claim.value.stream.metadata.license.indexOf('Public Domain') != -1) || (claim.value.stream.metadata.license.indexOf('Creative Commons') != -1)) &&
 		(!claim.value.stream.metadata.fee || claim.value.stream.metadata.fee === 0)); 
 	});
@@ -35,7 +39,7 @@ function orderTopClaims(claimsListArray){
 	return claimsListArray;
 }
 
-function getAllFreePublicClaims(claimName){  // note: work in progress
+function getAllFreePublicClaims(claimName){
 	var deferred = new Promise(function(resolve, reject){
 		console.log(">> get all claims data for", claimName)
 		// make a call to the daemon to get the claims list
@@ -97,22 +101,32 @@ module.exports = {
 		return deferred;
 	},
 	getClaimBasedOnUri: function(uri){
-		/* 
-			to do: need to pass the URI through a test to see if it is free and public. Right now it is jumping straight to 'get'ing and serving the asset.
-		*/
 		var deferred = new Promise(function (resolve, reject){
 			console.log(">> lbryHelpers >> getClaimBasedOnUri:", uri);
-			// promise to get the chosen uri
+			// resolve the claim
-			lbryApi.getClaim(uri)
+			lbryApi.resolveUri(uri)
-			.then(function(data){
+			.then(function(resolvedUri){
-				resolve({
+				console.log("result >>", resolvedUri)
-					fileName: data.result.file_name,
+				// check to make sure it is free and public
-					directory: data.result.download_directory,
+				if (isFreePublicClaim(resolvedUri.result.claim)){
-					contentType: data.result.metadata.stream.source.contentType
+					// promise to get the chosen uri
-				});
+					lbryApi.getClaim(uri)
+					.then(function(data){
+						resolve({
+							fileName: data.result.file_name,
+							directory: data.result.download_directory,
+							contentType: data.result.metadata.stream.source.contentType
+						});
+					}).catch(function(error){
+						reject(error)
+					});
+				} else {
+					reject("NO_FREE_PUBLIC_CLAIMS");
+				}
 			}).catch(function(error){
 				reject(error)
 			});
+			
 		});
 		return deferred;
 	},

routes/serve-routes.js

@@ -1,4 +1,5 @@
 function serveFile(fileInfo, res){
+	// set default options
 	var options = {
 		root: fileInfo.directory,
 		headers: { 
@@ -6,25 +7,22 @@ function serveFile(fileInfo, res){
 			"Content-Type": fileInfo.contentType
 		}
 	};
+	// adjust default options as needed
 	switch (fileInfo.contentType){
 		case "image/jpeg":
-			console.log("sending jpeg");
 			break;
 		case "image/gif":
-			console.log("sending gif");
 			break;
 		case "image/png":
-			console.log("sending png");
 			break;
 		case "video/mp4":
-			console.log("sending mp4");
 			break;
 		default:
 			console.log("sending unknown file type as .jpeg");
 			options["headers"]["Content-Type"] = "image/jpeg";
 			break;
 	}
-	console.log('options', options);
+	// send file
 	res.status(200).sendFile(fileInfo.fileName, options);
 }