split lbryApi from lbryHelpers

helpers/lbryApi.js

@@ -1,4 +1,3 @@
-var path = require('path');
 var axios = require('axios');
 
 module.exports = {

helpers/lbryHelpers.js

@@ -66,25 +66,6 @@ function findAllClaims(name, resolve, reject){
 }
 
 module.exports = {
-
-	publishClaim: function(publishParams){
-		console.log("publish params:>", publishParams);
-		var deferred = new Promise(function(resolve, reject){
-			axios.post('http://localhost:5279/lbryapi', {
-				"method": "publish", 
-				"params": publishParams
-			})
-			.then(function (response) {
-				console.log(">> 'publish' success");
-				resolve(response.data);
-			}).catch(function(error){
-				console.log(">> 'publish' error");
-				reject(error);
-			})
-		})
-		return deferred;
-	},
-
 	getClaimBasedOnNameOnly: function(claimName){
 		var deferred = new Promise(function (resolve, reject){
 			// make a call to the daemon to get the claims list 
@@ -126,7 +107,6 @@ module.exports = {
 		});
 		return deferred;
 	},
-
 	getClaimBasedOnUri: function(uri){  
 		/* 
 			to do: need to pass the URI through a test (use 'resolve') to see if it is free and public. Right now it is jumping straight to 'get'ing and serving the asset.
@@ -139,7 +119,6 @@ module.exports = {
 		return deferred;
 
 	},
-
 	getAllFreePublicClaims: function(claimName, res){  // note: work in progress
 		var deferred = new Promise(function(resolve, reject){
 			console.log(">> get all claims data for", claimName)
@@ -176,38 +155,4 @@ module.exports = {
 		});
 		return deferred;
 	},
-
-	getClaimsList: function(claimName){
-		var deferred = new Promise(function(resolve, reject){
-			console.log(">> claims_list for", claimName)
-			axios.post('http://localhost:5279/lbryapi', {
-				method: "claim_list",
-				params: { name: claimName }
-			}).then(function (response) {
-				console.log(">> claim_list success");
-				resolve(response.data); 
-			}).catch(function(error){
-				console.log(">> claim_list error");
-				reject(error);
-			});
-		});
-		return deferred;
-	},
-
-	resolveUri: function(uri){
-		var deferred = new Promise(function(resolve, reject){
-			console.log(">> resolve uri for", uri)
-			axios.post('http://localhost:5279/lbryapi', {
-				"method": "resolve",
-				"params": { "uri": uri}
-			}).then(function(response){
-				console.log(response.data);
-				resolve(response.data);
-			}).catch(function(error){
-				console.log(">> 'resolve' error");
-				reject(error);
-			});
-		});
-		return deferred;
-	}
 }

routes/serve-routes.js

@@ -1,11 +1,11 @@
-module.exports = function(app, routeHelpers, lbryApi, ua, googleAnalyticsId){
+module.exports = function(app, routeHelpers, lbryHelpers, ua, googleAnalyticsId){
 	// route to fetch one free public claim 
 	app.get("/:name/:claim_id", function(req, res){
 		ua(googleAnalyticsId, {https: true}).event("Serve Route", "/name/claimId", req.params.name + "/" + req.params.claim_id).send();
 		var uri = req.params.name + "#" + req.params.claim_id;
 		console.log(">> GET request on /" + uri);
 		// create promise
-		lbryApi.getClaimBasedOnUri(uri)
+		lbryHelpers.getClaimBasedOnUri(uri)
 		.then(function(filePath){
 			console.log("/:name/:claim_id success.");
 			res.status(200).sendFile(filePath);
@@ -20,7 +20,7 @@ module.exports = function(app, routeHelpers, lbryApi, ua, googleAnalyticsId){
 		ua(googleAnalyticsId, {https: true}).event("Serve Route", "/name", req.params.name).send();
 		console.log(">> GET request on /" + req.params.name);
 		// create promise
-		lbryApi.getClaimBasedOnNameOnly(req.params.name)
+		lbryHelpers.getClaimBasedOnNameOnly(req.params.name)
 		.then(function(filePath){
 			console.log("/:name success.")
 			res.status(200).sendFile(filePath);

routes/show-routes.js

@@ -1,11 +1,11 @@
 
-module.exports = function(app, routeHelpers, lbryApi, ua, googleAnalyticsId){
+module.exports = function(app, routeHelpers, lbryHelpers, ua, googleAnalyticsId){
 	// route to fetch all free public claims 
 	app.get("/:name/all", function(req, res){
 		console.log(">> GET request on /" + req.params.name + " (all)");
 		ua(googleAnalyticsId, {https: true}).event("Show Routes", "/name/all", req.params.name + "/all").send();
 		// create promise
-		lbryApi.getAllFreePublicClaims(req.params.name)
+		lbryHelpers.getAllFreePublicClaims(req.params.name)
 		.then(function(orderedFreePublicClaims){
 			console.log("/:name/all success.");
 			res.status(200).render('allClaims', { claims: orderedFreePublicClaims });

server.js

@@ -12,6 +12,7 @@ var ua = require('universal-analytics');
 var socketHelpers = require('./helpers/socketHelpers.js');
 var routeHelpers = require('./helpers/routeHelpers.js');
 var lbryApi = require('./helpers/lbryApi.js');
+var lbryHelpers = require('./helpers/lbryHelpers.js');
 
 var googleAnalyticsId = config.get('AnalyticsConfig.googleId');
 
@@ -52,8 +53,8 @@ app.set('view engine', 'handlebars');
 
 // require express routes
 require("./routes/api-routes.js")(app, routeHelpers, lbryApi);
-require("./routes/show-routes.js")(app, routeHelpers, lbryApi, ua, googleAnalyticsId);
+require("./routes/show-routes.js")(app, routeHelpers, lbryHelpers, ua, googleAnalyticsId);
-require("./routes/serve-routes.js")(app, routeHelpers, lbryApi, ua, googleAnalyticsId);
+require("./routes/serve-routes.js")(app, routeHelpers, lbryHelpers, ua, googleAnalyticsId);
 require("./routes/home-routes.js")(app);
 
 // wrap the server in socket.io to intercept incoming sockets requests