LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

fixed publish analytics

Browse source
This commit is contained in:
bill bittner 2017-06-13 12:12:41 -07:00
parent 44f9df1766
commit 25500a592e
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
helpers/socketHelpers.js
View file

@ -1,11 +1,8 @@
var fs = require('fs'); var fs = require('fs');
var lbryApi = require('../helpers/lbryApi.js'); var lbryApi = require('../helpers/lbryApi.js');
var config = require('config'); var config = require('config');
var ua = require('universal-analytics');
var walledAddress = config.get('WalletConfig.lbryAddress'); var walledAddress = config.get('WalletConfig.lbryAddress');
var googleAnalyticsId = config.get('AnalyticsConfig.googleId');
var visitor = ua(googleAnalyticsId, {https: true});
function handlePublishError(error) { function handlePublishError(error) {
if (error.code === "ECONNREFUSED"){ if (error.code === "ECONNREFUSED"){
@ -44,22 +41,22 @@ function deleteTemporaryFile(filepath) {
} }
module.exports = { module.exports = {
publish: function(name, filepath, license, nsfw, socket) { publish: function(name, filepath, license, nsfw, socket, visitor) {
// update the client // update the client
socket.emit("publish-status", "Your image is being published (this might take a second)..."); socket.emit("publish-status", "Your image is being published (this might take a second)...");
visitor.event("Publish Route", "Publish Request", name, filepath).send(); visitor.event("Publish Route", "Publish Request", filepath).send();
// create the publish object // create the publish object
var publishParams = createPublishParams(name, filepath, license, nsfw); var publishParams = createPublishParams(name, filepath, license, nsfw);
// get a promise to publish // get a promise to publish
lbryApi.publishClaim(publishParams) lbryApi.publishClaim(publishParams)
.then(function(data){ .then(function(data){
visitor.event("Publish", "Publish Success", name, filepath).send(); visitor.event("Publish Route", "Publish Success", filepath).send();
console.log("publish promise success. Tx info:", data) console.log("publish promise success. Tx info:", data)
socket.emit("publish-complete", {name: name, result: data.result}); socket.emit("publish-complete", {name: name, result: data.result});
deleteTemporaryFile(filepath); deleteTemporaryFile(filepath);
}) })
.catch(function(error){ .catch(function(error){
visitor.event("Publish Route", "Publish Failure", name, filepath).send(); visitor.event("Publish Route", "Publish Failure", filepath).send();
console.log("error:", error); console.log("error:", error);
socket.emit("publish-failure", handlePublishError(error)); socket.emit("publish-failure", handlePublishError(error));
deleteTemporaryFile(filepath); deleteTemporaryFile(filepath);

6
routes/sockets-routes.js
View file

@ -1,9 +1,11 @@
module.exports = function(app, path, siofu, socketHelpers) { module.exports = function(app, path, siofu, socketHelpers, ua, googleAnalyticsId) {
var http = require('http').Server(app); var http = require('http').Server(app);
var io = require('socket.io')(http); var io = require('socket.io')(http);
io.on('connection', function(socket){ io.on('connection', function(socket){
console.log('a user connected via sockets'); console.log('a user connected via sockets');
// create visitor record
var visitor = ua(googleAnalyticsId, {https: true});
// attach upload listeners // attach upload listeners
var uploader = new siofu(); var uploader = new siofu();
uploader.dir = path.join(__dirname, '../../Uploads'); uploader.dir = path.join(__dirname, '../../Uploads');
@ -16,7 +18,7 @@ module.exports = function(app, path, siofu, socketHelpers) {
console.log("saved " + event.file.name); console.log("saved " + event.file.name);
if (event.file.success){ if (event.file.success){
socket.emit("publish-status", "file upload successfully completed"); socket.emit("publish-status", "file upload successfully completed");
socketHelpers.publish(event.file.meta.name, event.file.pathName, event.file.meta.license, event.file.meta.nsfw, socket) socketHelpers.publish(event.file.meta.name, event.file.pathName, event.file.meta.license, event.file.meta.nsfw, socket, visitor)
} else { } else {
socket.emit("publish-failure", "file uploaded, but with errors") socket.emit("publish-failure", "file uploaded, but with errors")
}; };

2
server.js
View file

@ -57,7 +57,7 @@ require("./routes/serve-routes.js")(app, routeHelpers, lbryApi, ua, googleAnalyt
require("./routes/home-routes.js")(app); require("./routes/home-routes.js")(app);
// wrap the server in socket.io to intercept incoming sockets requests // wrap the server in socket.io to intercept incoming sockets requests
var http = require("./routes/sockets-routes.js")(app, path, siofu, socketHelpers); var http = require("./routes/sockets-routes.js")(app, path, siofu, socketHelpers, ua, googleAnalyticsId);
// start server // start server
http.listen(PORT, function() { http.listen(PORT, function() {