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

Edited code to be ES6, added eslint and some basic linting configuration

Browse source 
Edited code to be ES6, added eslint and some basic linting configuration,(also includes husky for auto eslint before push)
This commit is contained in:
Fillerino 2017-06-17 22:51:30 +02:00
parent c89061c83f
commit 085d099040
19 changed files with 4038 additions and 606 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.eslintignore Normal file
View file

@ -0,0 +1,2 @@
node_modules/
public/

35
.eslintrc Normal file
View file

@ -0,0 +1,35 @@
{
"extends": "standard",
"env": {
"es6": true,
"jest": true,
"node": true
},
"globals": {
"GENTLY": true
},
"rules": {
"no-multi-spaces": 0,
"new-cap": 0,
"prefer-promise-reject-errors":0,
"comma-dangle": [
"error",
"always-multiline"
],
"key-spacing": [
"error",
{
"multiLine": {
"beforeColon": false,
"afterColon": true
},
"align": {
"beforeColon": false,
"afterColon": true,
"on": "colon",
"mode": "strict"
}
}
]
}
}

83
controllers/publishController.js
View file

@ -1,57 +1,58 @@
var fs = require('fs'); const fs = require('fs')
var lbryApi = require('../helpers/libraries/lbryApi.js'); const lbryApi = require('../helpers/libraries/lbryApi.js')
var config = require('config'); const config = require('config')
var errorHandlers = require("../helpers/libraries/errorHandlers.js"); const errorHandlers = require('../helpers/libraries/errorHandlers.js')
var walledAddress = config.get('WalletConfig.lbryAddress'); const walledAddress = config.get('WalletConfig.lbryAddress')
function createPublishParams (claim, filePath, license, nsfw) { function createPublishParams (claim, filePath, license, nsfw) {
console.log("nsfw:", nsfw, typeof nsfw); console.log('nsfw:', nsfw, typeof nsfw)
var publishParams = { const publishParams = {
"name": claim, name : claim,
"file_path": filePath, file_path: filePath,
"bid": 0.01, bid : 0.01,
"metadata": { metadata : {
"description": claim + " published via spee.ch", description: `${claim} published via spee.ch`,
"title": claim, title : claim,
"author": "spee.ch", author : 'spee.ch',
"language": "en", language : 'en',
"license": license, license,
"nsfw": (nsfw.toLowerCase() === "on") nsfw : nsfw.toLowerCase() === 'on',
}, },
"claim_address": walledAddress, claim_address : walledAddress,
"change_address": walledAddress change_address: walledAddress,
}; }
return publishParams; return publishParams
} }
function deleteTemporaryFile (filePath) { function deleteTemporaryFile (filePath) {
fs.unlink(filePath, function(err) { fs.unlink(filePath, err => {
if (err) throw err; if (err) throw err
console.log('successfully deleted ' + filePath); console.log(`successfully deleted ${filePath}`)
}); })
} }
module.exports = { module.exports = {
publish: function(claim, fileName, filePath, fileType, license, nsfw, socket, visitor) { publish (claim, fileName, filePath, fileType, 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)...')
// send to analytics // send to analytics
visitor.event("Publish Route", "Publish Request", filePath).send(); visitor.event('Publish Route', 'Publish Request', filePath).send()
// create the publish object // create the publish object
var publishParams = createPublishParams(claim, filePath, license, nsfw); const publishParams = createPublishParams(claim, filePath, license, nsfw)
// get a promise to publish // get a promise to publish
lbryApi.publishClaim(publishParams, fileName, fileType) lbryApi
.then(function(result){ .publishClaim(publishParams, fileName, fileType)
visitor.event("Publish Route", "Publish Success", filePath).send(); .then(result => {
console.log("publish promise success. Tx info:", result) visitor.event('Publish Route', 'Publish Success', filePath).send()
socket.emit("publish-complete", {name: claim, result: result}); console.log('publish promise success. Tx info:', result)
socket.emit('publish-complete', { name: claim, result })
}) })
.catch(function(error){ .catch(error => {
visitor.event("Publish Route", "Publish Failure", filePath).send(); visitor.event('Publish Route', 'Publish Failure', filePath).send()
console.log("error:", error); console.log('error:', error)
socket.emit("publish-failure", errorHandlers.handlePublishError(error)); socket.emit('publish-failure', errorHandlers.handlePublishError(error))
deleteTemporaryFile(filePath); deleteTemporaryFile(filePath)
}); })
} },
} }

126
controllers/serveController.js
View file

@ -1,102 +1,112 @@
var lbryApi = require('../helpers/libraries/lbryApi.js'); const lbryApi = require('../helpers/libraries/lbryApi.js')
var db = require("../models"); const db = require('../models')
var getAllFreePublicClaims = require("../helpers/functions/getAllFreePublicClaims.js"); const getAllFreePublicClaims = require('../helpers/functions/getAllFreePublicClaims.js')
var isFreePublicClaim = require("../helpers/functions/isFreePublicClaim.js"); const isFreePublicClaim = require('../helpers/functions/isFreePublicClaim.js')
function getClaimAndHandleResponse (claimUri, resolve, reject) { function getClaimAndHandleResponse (claimUri, resolve, reject) {
lbryApi.getClaim(claimUri) lbryApi
.then(function(result){ .getClaim(claimUri)
.then(({ file_name, download_path, mime_type }) => {
resolve({ resolve({
file_name: result.file_name, file_name,
file_path: result.download_path, file_path: download_path,
file_type: result.mime_type file_type: mime_type,
}); })
}).catch(function(error){ })
.catch(error => {
reject(error) reject(error)
}); })
} }
module.exports = { module.exports = {
getClaimByName: function(claimName){ getClaimByName (claimName) {
var deferred = new Promise(function (resolve, reject){ const deferred = new Promise((resolve, reject) => {
console.log(">> lbryHelpers >> getClaim BasedOnNameOnly:", claimName); console.log('>> lbryHelpers >> getClaim BasedOnNameOnly:', claimName)
// get all free public claims // get all free public claims
getAllFreePublicClaims(claimName) getAllFreePublicClaims(claimName)
.then(function(freePublicClaimList){ .then(freePublicClaimList => {
console.log(">> Decided on public claim id:", freePublicClaimList[0].claim_id); console.log('>> Decided on public claim id:', freePublicClaimList[0].claim_id)
var freePublicClaimOutpoint = freePublicClaimList[0].txid + ":" + freePublicClaimList[0].nout; const freePublicClaimOutpoint = `${freePublicClaimList[0].txid}:${freePublicClaimList[0].nout}`
var freePublicClaimUri = freePublicClaimList[0].name + "#" + freePublicClaimList[0].claim_id; const freePublicClaimUri = `${freePublicClaimList[0].name}#${freePublicClaimList[0].claim_id}`
// check to see if the file is available locally // check to see if the file is available locally
db.File.findOne({where: { claim_id: freePublicClaimList[0].claim_id }}) db.File
.then(function(claim){ .findOne({ where: { claim_id: freePublicClaimList[0].claim_id } })
.then(claim => {
// if a found locally... // if a found locally...
if (claim) { if (claim) {
console.log(">> A matching claim_id was found locally"); console.log('>> A matching claim_id was found locally')
// if the outpoint's match return it // if the outpoint's match return it
if (claim.dataValues.outpoint === freePublicClaimOutpoint) { if (claim.dataValues.outpoint === freePublicClaimOutpoint) {
console.log(">> Local outpoint matched"); console.log('>> Local outpoint matched')
resolve(claim.dataValues); resolve(claim.dataValues)
// if the outpoint's don't match, fetch updated claim // if the outpoint's don't match, fetch updated claim
} else { } else {
console.log(">> local outpoint did not match"); console.log('>> local outpoint did not match')
getClaimAndHandleResponse(freePublicClaimUri, resolve, reject); getClaimAndHandleResponse(freePublicClaimUri, resolve, reject)
} }
// ... otherwise use daemon to retrieve it // ... otherwise use daemon to retrieve it
} else { } else {
// 'get' the claim // 'get' the claim
getClaimAndHandleResponse(freePublicClaimUri, resolve, reject) getClaimAndHandleResponse(freePublicClaimUri, resolve, reject)
} }
}).catch(function(error){ })
reject(error); .catch(error => {
}); reject(error)
}).catch(function(error){ })
reject(error); })
}); .catch(error => {
}); reject(error)
return deferred; })
})
return deferred
}, },
getClaimByClaimId: function(claimName, claimId){ getClaimByClaimId (claimName, claimId) {
var deferred = new Promise(function (resolve, reject){ const deferred = new Promise((resolve, reject) => {
var uri = claimName + "#" + claimId; const uri = `${claimName}#${claimId}`
console.log(">> lbryHelpers >> getClaimBasedOnUri:", uri); console.log('>> lbryHelpers >> getClaimBasedOnUri:', uri)
// resolve the Uri // resolve the Uri
lbryApi.resolveUri(uri) // note: use 'spread' and make parallel with db.File.findOne() lbryApi
.then(function(result){ // note should just be 'result' returned. .resolveUri(uri) // note: use 'spread' and make parallel with db.File.findOne()
.then(result => {
// note should just be 'result' returned.
// get the outpoint // get the outpoint
var resolvedOutpoint = result[uri].claim.txid + ":" + result[uri].claim.nout; const resolvedOutpoint = `${result[uri].claim.txid}:${result[uri].claim.nout}`
// check locally for the claim // check locally for the claim
db.File.findOne({where: { claim_id: claimId }}) db.File
.then(function(claim){ .findOne({ where: { claim_id: claimId } })
.then(claim => {
// if a found locally... // if a found locally...
if (claim) { if (claim) {
console.log(">> A matching claim_id was found locally"); console.log('>> A matching claim_id was found locally')
// if the outpoint's match return it // if the outpoint's match return it
if (claim.dataValues.outpoint === resolvedOutpoint) { if (claim.dataValues.outpoint === resolvedOutpoint) {
console.log(">> Local outpoint matched"); console.log('>> Local outpoint matched')
resolve(claim.dataValues); resolve(claim.dataValues)
// if the outpoint's don't match, fetch updated claim // if the outpoint's don't match, fetch updated claim
} else { } else {
console.log(">> Local outpoint did not match"); console.log('>> Local outpoint did not match')
getClaimAndHandleResponse(uri, resolve, reject); getClaimAndHandleResponse(uri, resolve, reject)
} }
// ... otherwise use daemon to retrieve it // ... otherwise use daemon to retrieve it
} else { } else {
// check to make sure it is free and public (note: no need for another resolve?) // check to make sure it is free and public (note: no need for another resolve?)
if (isFreePublicClaim(result[uri].claim)) { if (isFreePublicClaim(result[uri].claim)) {
// 'get' the claim // 'get' the claim
getClaimAndHandleResponse(uri, resolve, reject); getClaimAndHandleResponse(uri, resolve, reject)
} else { } else {
reject("NO_FREE_PUBLIC_CLAIMS"); reject('NO_FREE_PUBLIC_CLAIMS')
} }
} }
}).catch(function(error){ })
.catch(error => {
reject(error) reject(error)
}); })
}).catch(function(error){ })
reject(error); .catch(error => {
}); reject(error)
}); })
return deferred; })
} return deferred
},
} }

8
controllers/showController.js
View file

@ -1,7 +1,7 @@
var getAllFreePublicClaims = require("../helpers/functions/getAllFreePublicClaims.js"); const getAllFreePublicClaims = require('../helpers/functions/getAllFreePublicClaims.js')
module.exports = { module.exports = {
getAllClaims: function(claimName){ getAllClaims (claimName) {
return getAllFreePublicClaims(claimName); return getAllFreePublicClaims(claimName)
} },
} }

78
helpers/functions/getAllFreePublicClaims.js
View file

@ -1,61 +1,63 @@
var isFreePublicClaim = require("./isFreePublicClaim.js"); const isFreePublicClaim = require('./isFreePublicClaim.js')
var lbryApi = require('../libraries/lbryApi.js'); const lbryApi = require('../libraries/lbryApi.js')
function filterForFreePublicClaims (claimsListArray) { function filterForFreePublicClaims (claimsListArray) {
// console.log("claims list:", claimsListArray) // console.log("claims list:", claimsListArray)
if (!claimsListArray) { if (!claimsListArray) {
return null; return null
};
var freePublicClaims = claimsListArray.filter(function(claim){
if (!claim.value){
return false;
} }
return (isFreePublicClaim(claim)); const freePublicClaims = claimsListArray.filter(claim => {
}); if (!claim.value) {
return freePublicClaims; return false
}
return isFreePublicClaim(claim)
})
return freePublicClaims
} }
function orderTopClaims (claimsListArray) { function orderTopClaims (claimsListArray) {
console.log(">> orderTopClaims"); console.log('>> orderTopClaims')
claimsListArray.sort(function(claimA, claimB){ claimsListArray.sort(({ amountA, heightA }, { amountB, heightB }) => {
if (claimA.amount === claimB.amount){ if (amountA === amountB) {
return (claimA.height > claimB.height); return heightA > heightB
} else { } else {
return (claimA.amount < claimB.amount); return amountA < amountB
} }
}) })
return claimsListArray; return claimsListArray
} }
module.exports = function(claimName){ module.exports = claimName => {
var deferred = new Promise(function(resolve, reject){ const deferred = new Promise((resolve, reject) => {
// make a call to the daemon to get the claims list // make a call to the daemon to get the claims list
lbryApi.getClaimsList(claimName) lbryApi
.then(function(result){ .getClaimsList(claimName)
var claimsList = result.claims; .then(({ claims }) => {
console.log(">> Number of claims:", claimsList.length) const claimsList = claims
console.log('>> Number of claims:', claimsList.length)
// return early if no claims were found // return early if no claims were found
if (claimsList.length === 0) { if (claimsList.length === 0) {
reject("NO_CLAIMS"); reject('NO_CLAIMS')
console.log("exiting due to lack of claims"); console.log('exiting due to lack of claims')
return; return
} }
// filter the claims to return only free, public claims // filter the claims to return only free, public claims
var freePublicClaims = filterForFreePublicClaims(claimsList); const freePublicClaims = filterForFreePublicClaims(claimsList)
// return early if no free, public claims were found // return early if no free, public claims were found
if (!freePublicClaims || (freePublicClaims.length === 0)){ if (!freePublicClaims || freePublicClaims.length === 0) {
reject("NO_FREE_PUBLIC_CLAIMS"); reject('NO_FREE_PUBLIC_CLAIMS')
console.log("exiting due to lack of free or public claims"); console.log('exiting due to lack of free or public claims')
return; return
} }
// order the claims // order the claims
var orderedPublicClaims = orderTopClaims(freePublicClaims); const orderedPublicClaims = orderTopClaims(freePublicClaims)
// resolve the promise // resolve the promise
resolve(orderedPublicClaims); resolve(orderedPublicClaims)
}).catch(function(error){ })
console.log(">> 'claim_list' error"); .catch(error => {
reject(error); console.log(">> 'claim_list' error")
}); reject(error)
}); })
return deferred; })
return deferred
} }

18
helpers/functions/isFreePublicClaim.js
View file

@ -1,11 +1,11 @@
module.exports = ({ value }) => {
module.exports = function(claim){ console.log('>> check: isFreePublicClaim?')
console.log(">> check: isFreePublicClaim?"); if (
if (((claim.value.stream.metadata.license.indexOf("Public Domain") != -1 ) || (claim.value.stream.metadata.license.indexOf("Creative Commons") != -1 )) (value.stream.metadata.license.indexOf('Public Domain') !== -1 || value.stream.metadata.license.indexOf('Creative Commons') !== -1) &&
&& (!value.stream.metadata.fee || value.stream.metadata.fee.amount === 0)
(!claim.value.stream.metadata.fee || claim.value.stream.metadata.fee.amount === 0)) { ) {
return true; return true
} else { } else {
return false; return false
}
} }
};

28
helpers/libraries/errorHandlers.js
View file

@ -1,22 +1,22 @@
module.exports = { module.exports = {
handleRequestError: function(error, res) { handleRequestError (error, res) {
if ((error === "NO_CLAIMS") || (error === "NO_FREE_PUBLIC_CLAIMS")){ if (error === 'NO_CLAIMS' || error === 'NO_FREE_PUBLIC_CLAIMS') {
res.status(307).render('noClaims'); res.status(307).render('noClaims')
} else if (error.response) { } else if (error.response) {
res.status(error.response.status).send(error.response.data.error.message); res.status(error.response.status).send(error.response.data.error.message)
} else if (error.code === "ECONNREFUSED") { } else if (error.code === 'ECONNREFUSED') {
res.status(400).send("Connection refused. The daemon may not be running."); res.status(400).send('Connection refused. The daemon may not be running.')
} else { } else {
res.status(400).send(error.toString()); res.status(400).send(error.toString())
}; }
}, },
handlePublishError: function(error) { handlePublishError (error) {
if (error.code === "ECONNREFUSED"){ if (error.code === 'ECONNREFUSED') {
return "Connection refused. The daemon may not be running."; return 'Connection refused. The daemon may not be running.'
} else if (error.response.data.error) { } else if (error.response.data.error) {
return error.response.data.error; return error.response.data.error
} else { } else {
return error; return error
};
} }
},
} }

168
helpers/libraries/lbryApi.js
View file

@ -1,53 +1,61 @@
var axios = require('axios'); const axios = require('axios')
var db = require("../../models"); const db = require('../../models')
module.exports = { module.exports = {
publishClaim: function(publishParams, fileName, fileType){ publishClaim (publishParams, fileName, fileType) {
var deferred = new Promise(function(resolve, reject){ const deferred = new Promise((resolve, reject) => {
console.log(">> lbryApi >> publishClaim:", publishParams); console.log('>> lbryApi >> publishClaim:', publishParams)
axios.post('http://localhost:5279/lbryapi', { axios
"method": "publish", .post('http://localhost:5279/lbryapi', {
"params": publishParams method: 'publish',
}).then(function (response) { params: publishParams,
console.log(">> 'publish' success", response); })
var result = response.data.result; .then(response => {
db.File.create({ console.log(">> 'publish' success", response)
const result = response.data.result
db.File
.create({
name : publishParams.name, name : publishParams.name,
claim_id : result.claim_id, claim_id : result.claim_id,
outpoint: result.txid + ":" + result.nout, outpoint : `${result.txid}:${result.nout}`,
file_name: fileName, file_name: fileName,
file_path: publishParams.file_path, file_path: publishParams.file_path,
file_type: fileType, file_type: fileType,
nsfw : publishParams.metadata.nsfw, nsfw : publishParams.metadata.nsfw,
}).catch(function(error){ })
console.log('An error occurred when writing to the MySQL database:', error); .catch(error => {
}); console.log('An error occurred when writing to the MySQL database:', error)
resolve(result); })
}).catch(function(error){ resolve(result)
console.log(">> 'publish' error"); })
reject(error); .catch(error => {
}); console.log(">> 'publish' error")
}); reject(error)
return deferred; })
})
return deferred
}, },
getClaim: function(uri){ getClaim (uri) {
var deferred = new Promise(function(resolve, reject){ const deferred = new Promise((resolve, reject) => {
console.log(">> lbryApi >> getClaim:", uri); console.log('>> lbryApi >> getClaim:', uri)
axios.post('http://localhost:5279/lbryapi', { axios
"method": "get", .post('http://localhost:5279/lbryapi', {
"params": { "uri": uri, "timeout": 20} method: 'get',
}).then(function (response) { params: { uri, timeout: 20 },
console.log(">> 'get' success"); })
.then(({ data }) => {
console.log(">> 'get' success")
// check to make sure the daemon didn't just time out // check to make sure the daemon didn't just time out
if (response.data.result.error){ if (data.result.error) {
reject(response.data.result.error); reject(data.result.error)
} }
/* /*
note: put in a check to make sure we do not resolve until the download is actually complete (response.data.completed === true) note: put in a check to make sure we do not resolve until the download is actually complete (response.data.completed === true)
*/ */
// save a record of the file to the Files table // save a record of the file to the Files table
var result = response.data.result const result = data.result
db.File.create({ db.File
.create({
name : result.name, name : result.name,
claim_id : result.claim_id, claim_id : result.claim_id,
outpoint : result.outpoint, outpoint : result.outpoint,
@ -55,47 +63,55 @@ module.exports = {
file_path: result.download_path, file_path: result.download_path,
file_type: result.mime_type, file_type: result.mime_type,
nsfw : result.metadata.stream.metadata.nsfw, nsfw : result.metadata.stream.metadata.nsfw,
}).catch(function(error){ })
console.log('An error occurred when writing to the MySQL database:', error); .catch(error => {
}); console.log('An error occurred when writing to the MySQL database:', error)
resolve(result); })
}).catch(function(error){ resolve(result)
console.log(">> 'get' error"); })
reject(error); .catch(error => {
}); console.log(">> 'get' error")
}); reject(error)
return deferred; })
})
return deferred
}, },
getClaimsList: function(claimName){ getClaimsList (claimName) {
var deferred = new Promise(function(resolve, reject){ const deferred = new Promise((resolve, reject) => {
console.log(">> lbryApi >> getClaimList:", claimName); console.log('>> lbryApi >> getClaimList:', claimName)
axios.post('http://localhost:5279/lbryapi', { axios
method: "claim_list", .post('http://localhost:5279/lbryapi', {
params: { name: claimName } method: 'claim_list',
}).then(function (response) { params: { name: claimName },
console.log(">> 'claim_list' success"); })
resolve(response.data.result); .then(({ data }) => {
}).catch(function(error){ console.log(">> 'claim_list' success")
console.log(">> 'claim_list' error"); resolve(data.result)
reject(error); })
}); .catch(error => {
}); console.log(">> 'claim_list' error")
return deferred; reject(error)
})
})
return deferred
},
resolveUri (uri) {
const deferred = new Promise((resolve, reject) => {
console.log('>> lbryApi >> resolveUri:', uri)
axios
.post('http://localhost:5279/lbryapi', {
method: 'resolve',
params: { uri },
})
.then(({ data }) => {
console.log(">> 'resolve' success")
resolve(data.result)
})
.catch(error => {
console.log(">> 'resolve' error")
reject(error)
})
})
return deferred
}, },
resolveUri: function(uri){
var deferred = new Promise(function(resolve, reject){
console.log(">> lbryApi >> resolveUri:", uri);
axios.post('http://localhost:5279/lbryapi', {
"method": "resolve",
"params": { "uri": uri}
}).then(function(response){
console.log(">> 'resolve' success");
resolve(response.data.result);
}).catch(function(error){
console.log(">> 'resolve' error");
reject(error);
});
});
return deferred;
}
} }

42
models/file.js
View file

@ -1,35 +1,39 @@
module.exports = function(sequelize, DataTypes){ module.exports = (sequelize, { STRING, BOOLEAN }) => {
var File = sequelize.define("File", { const File = sequelize.define(
'File',
{
name: { name: {
type: DataTypes.STRING, type : STRING,
allowNull: false allowNull: false,
}, },
claim_id: { claim_id: {
type: DataTypes.STRING, type : STRING,
allowNull: false allowNull: false,
}, },
outpoint: { outpoint: {
type: DataTypes.STRING, type : STRING,
allowNull: false allowNull: false,
}, },
file_name: { file_name: {
type: DataTypes.STRING, type : STRING,
allowNull: false allowNull: false,
}, },
file_path: { file_path: {
type: DataTypes.STRING, type : STRING,
allowNull: false allowNull: false,
}, },
file_type: { file_type: {
type: DataTypes.STRING, type: STRING,
}, },
nsfw: { nsfw: {
type: DataTypes.BOOLEAN, type : BOOLEAN,
allowNull : false, allowNull : false,
defaultValue: false defaultValue: false,
},
},
{
freezeTableName: true,
} }
}, { )
freezeTableName: true return File
});
return File;
} }

49
models/index.js
View file

@ -1,41 +1,34 @@
'use strict'; const fs = require('fs')
const path = require('path')
const Sequelize = require('sequelize')
const basename = path.basename(module.filename)
const config = require('config')
const db = {}
var fs = require('fs'); const connectionUri = config.get('Database.MySqlConnectionUri')
var path = require('path'); const sequelize = new Sequelize(connectionUri)
var Sequelize = require('sequelize');
var basename = path.basename(module.filename);
var config = require('config');
var db = {};
var connectionUri = config.get('Database.MySqlConnectionUri');
var sequelize = new Sequelize(connectionUri);
sequelize sequelize
.authenticate() .authenticate()
.then(() => { .then(() => {
console.log('Connection has been established successfully.'); console.log('Connection has been established successfully.')
}) })
.catch(err => { .catch(err => {
console.error('Unable to connect to the database:', err); console.error('Unable to connect to the database:', err)
});
fs
.readdirSync(__dirname)
.filter(function(file) {
return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
}) })
.forEach(function(file) {
var model = sequelize['import'](path.join(__dirname, file));
db[model.name] = model;
});
Object.keys(db).forEach(function(modelName) { fs.readdirSync(__dirname).filter(file => file.indexOf('.') !== 0 && file !== basename && file.slice(-3) === '.js').forEach(file => {
const model = sequelize['import'](path.join(__dirname, file))
db[model.name] = model
})
Object.keys(db).forEach(modelName => {
if (db[modelName].associate) { if (db[modelName].associate) {
db[modelName].associate(db); db[modelName].associate(db)
} }
}); })
db.sequelize = sequelize; db.sequelize = sequelize
db.Sequelize = Sequelize; db.Sequelize = Sequelize
module.exports = db; module.exports = db

3351
package-lock.json generated Normal file
View file

File diff suppressed because it is too large Load diff

15
package.json
View file

@ -5,7 +5,10 @@
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
"start": "node server.js" "start": "node server.js",
"lint": "eslint .",
"fix": "eslint . --fix",
"precommit": "eslint ."
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -34,5 +37,15 @@
"socket.io": "^2.0.1", "socket.io": "^2.0.1",
"socketio-file-upload": "^0.6.0", "socketio-file-upload": "^0.6.0",
"universal-analytics": "^0.4.13" "universal-analytics": "^0.4.13"
},
"devDependencies": {
"eslint": "3.19.0",
"eslint-config-standard": "10.2.1",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-node": "^4.2.2",
"eslint-plugin-promise": "3.5.0",
"eslint-plugin-react": "6.10.3",
"eslint-plugin-standard": "3.0.1",
"husky": "^0.13.4"
} }
} }

48
routes/api-routes.js
View file

@ -1,28 +1,30 @@
var errorHandlers = require("../helpers/libraries/errorHandlers.js"); const errorHandlers = require('../helpers/libraries/errorHandlers.js')
var lbryApi = require("../helpers/libraries/lbryApi.js"); const lbryApi = require('../helpers/libraries/lbryApi.js')
module.exports = function(app){ module.exports = app => {
// route to run a claim_list request on the daemon // route to run a claim_list request on the daemon
app.get("/api/claim_list/:claim", function(req, res){ app.get('/api/claim_list/:claim', ({ params }, res) => {
lbryApi.getClaimsList(req.params.claim) lbryApi
.then(function(claimsList){ .getClaimsList(params.claim)
console.log("/api/claim_list/:claim success."); .then(claimsList => {
res.status(200).json(claimsList); console.log('/api/claim_list/:claim success.')
res.status(200).json(claimsList)
})
.catch(error => {
console.log('/api/claim_list/:name error:', error)
errorHandlers.handleRequestError(error, res)
})
}) })
.catch(function(error){
console.log("/api/claim_list/:name error:", error);
errorHandlers.handleRequestError(error, res);
});
});
// route to run a resolve request on the daemon // route to run a resolve request on the daemon
app.get("/api/resolve/:uri", function(req, res){ app.get('/api/resolve/:uri', ({ params }, res) => {
lbryApi.resolveUri(req.params.uri) lbryApi
.then(function(resolvedUri){ .resolveUri(params.uri)
console.log("/api/resolve/:claim success."); .then(resolvedUri => {
res.status(200).json(resolvedUri); console.log('/api/resolve/:claim success.')
}).catch(function(error){ res.status(200).json(resolvedUri)
errorHandlers.handleRequestError(error, res); })
}); .catch(error => {
}); errorHandlers.handleRequestError(error, res)
})
})
} }

14
routes/home-routes.js
View file

@ -1,10 +1,10 @@
module.exports = function(app){ module.exports = app => {
// route for the home page // route for the home page
app.get("/", function(req, res){ app.get('/', (req, res) => {
res.status(200).render('index'); res.status(200).render('index')
}); })
// a catch-all route if someone visits a page that does not exist // a catch-all route if someone visits a page that does not exist
app.use("*", function(req, res){ app.use('*', (req, res) => {
res.status(404).render('fourOhFour'); res.status(404).render('fourOhFour')
}); })
} }

96
routes/serve-routes.js
View file

@ -1,63 +1,67 @@
var errorHandlers = require("../helpers/libraries/errorHandlers.js"); const errorHandlers = require('../helpers/libraries/errorHandlers.js')
var serveController = require("../controllers/serveController.js"); const serveController = require('../controllers/serveController.js')
function serveFile(fileInfo, res){ function serveFile ({ fileType, filePath }, res) {
// set default options // set default options
var options = { const options = {
headers: { headers: {
"X-Content-Type-Options": "nosniff", 'X-Content-Type-Options': 'nosniff',
"Content-Type": fileInfo.file_type 'Content-Type' : fileType,
},
} }
};
// adjust default options as needed // adjust default options as needed
switch (fileInfo.file_type){ switch (fileType) {
case "image/jpeg": case 'image/jpeg':
break; break
case "image/gif": case 'image/gif':
break; break
case "image/png": case 'image/png':
break; break
case "video/mp4": case 'video/mp4':
break; break
default: default:
console.log("sending unknown file type as .jpeg"); console.log('sending unknown file type as .jpeg')
options["headers"]["Content-Type"] = "image/jpeg"; options['headers']['Content-Type'] = 'image/jpeg'
break; break
} }
// send file // send file
res.status(200).sendFile(fileInfo.file_path, options); res.status(200).sendFile(filePath, options)
} }
module.exports = function(app, ua, googleAnalyticsId){ module.exports = (app, ua, googleAnalyticsId) => {
// route to fetch one free public claim // route to fetch one free public claim
app.get("/:name/:claim_id", function(req, res){ app.get('/:name/:claim_id', ({ params }, res) => {
var routeString = req.params.name + "/" + req.params.claim_id; const routeString = `${params.name}/${params.claim_id}`
// google analytics // google analytics
ua(googleAnalyticsId, {https: true}).event("Serve Route", "/name/claimId", routeString).send(); ua(googleAnalyticsId, { https: true }).event('Serve Route', '/name/claimId', routeString).send()
// begin image-serve processes // begin image-serve processes
console.log(">> GET request on /" + routeString); console.log(`>> GET request on /${routeString}`)
serveController.getClaimByClaimId(req.params.name, req.params.claim_id) serveController
.then(function(fileInfo){ .getClaimByClaimId(params.name, params.claim_id)
console.log("/:name/:claim_id success.", fileInfo.file_name); .then(fileInfo => {
serveFile(fileInfo, res); console.log('/:name/:claim_id success.', fileInfo.file_name)
}).catch(function(error){ serveFile(fileInfo, res)
console.log("/:name/:claim_id error:", error) })
errorHandlers.handleRequestError(error, res); .catch(error => {
}); console.log('/:name/:claim_id error:', error)
}); errorHandlers.handleRequestError(error, res)
})
})
// route to fetch one free public claim // route to fetch one free public claim
app.get("/:name", function(req, res){ app.get('/:name', ({ params }, res) => {
// google analytics // google analytics
ua(googleAnalyticsId, {https: true}).event("Serve Route", "/name", req.params.name).send(); ua(googleAnalyticsId, { https: true }).event('Serve Route', '/name', params.name).send()
// begin image-serve processes // begin image-serve processes
console.log(">> GET request on /" + req.params.name); console.log(`>> GET request on /${params.name}`)
serveController.getClaimByName(req.params.name) serveController
.then(function(fileInfo){ .getClaimByName(params.name)
console.log("/:name success.", fileInfo.file_name); .then(fileInfo => {
serveFile(fileInfo, res); console.log('/:name success.', fileInfo.file_name)
}).catch(function(error){ serveFile(fileInfo, res)
console.log("/:name error:", error); })
errorHandlers.handleRequestError(error, res); .catch(error => {
}); console.log('/:name error:', error)
}); errorHandlers.handleRequestError(error, res)
})
})
} }

30
routes/show-routes.js
View file

@ -1,22 +1,22 @@
var errorHandlers = require("../helpers/libraries/errorHandlers.js"); const errorHandlers = require('../helpers/libraries/errorHandlers.js')
var showController = require("../controllers/showController.js"); const showController = require('../controllers/showController.js')
module.exports = function(app, ua, googleAnalyticsId){ module.exports = (app, ua, googleAnalyticsId) => {
// route to fetch all free public claims // route to fetch all free public claims
app.get("/:name/all", function(req, res){ app.get('/:name/all', ({ params }, res) => {
console.log(">> GET request on /" + req.params.name + "/all"); console.log(`>> GET request on /${params.name}/all`)
// google analytics // google analytics
ua(googleAnalyticsId, {https: true}).event("Show Routes", "/name/all", req.params.name + "/all").send(); ua(googleAnalyticsId, { https: true }).event('Show Routes', '/name/all', `${params.name}/all`).send()
// fetch all free public claims // fetch all free public claims
showController.getAllClaims(req.params.name) showController
.then(function(orderedFreePublicClaims){ .getAllClaims(params.name)
console.log("/:name/all success."); .then(orderedFreePublicClaims => {
res.status(200).render('allClaims', { claims: orderedFreePublicClaims }); console.log('/:name/all success.')
return; res.status(200).render('allClaims', { claims: orderedFreePublicClaims })
})
.catch(error => {
console.log('/:name/all error:', error)
errorHandlers.handleRequestError(error, res)
}) })
.catch(function(error){
console.log("/:name/all error:", error);
errorHandlers.handleRequestError(error, res);
}) })
});
} }

66
routes/sockets-routes.js
View file

@ -1,42 +1,42 @@
var publishController = require('../controllers/publishController.js'); const publishController = require('../controllers/publishController.js')
module.exports = function(app, siofu, hostedContentPath, ua, googleAnalyticsId) { module.exports = (app, siofu, hostedContentPath, ua, googleAnalyticsId) => {
var http = require('http').Server(app); const http = require('http').Server(app)
var io = require('socket.io')(http); const io = require('socket.io')(http)
io.on('connection', function(socket){ io.on('connection', socket => {
console.log('a user connected via sockets'); console.log('a user connected via sockets')
// create visitor record // create visitor record
var visitor = ua(googleAnalyticsId, {https: true}); const visitor = ua(googleAnalyticsId, { https: true })
// attach upload listeners // attach upload listeners
var uploader = new siofu(); const uploader = new siofu()
uploader.dir = hostedContentPath; uploader.dir = hostedContentPath
uploader.listen(socket); uploader.listen(socket)
uploader.on("start", function(event){ uploader.on('start', ({ file }) => {
// server side test to make sure file is not a bad file type // server side test to make sure file is not a bad file type
if (/\.exe$/.test(event.file.name)) { if (/\.exe$/.test(file.name)) {
uploader.abort(event.file.id, socket); uploader.abort(file.id, socket)
} }
}); })
uploader.on("error", function(event){ uploader.on('error', ({ error }) => {
console.log("an error occured while uploading", event.error); console.log('an error occured while uploading', error)
socket.emit("publish-status", event.error) socket.emit('publish-status', error)
}); })
uploader.on("saved", function(event){ uploader.on('saved', ({ file }) => {
console.log("uploaded ", event.file.name); console.log('uploaded ', file.name)
if (event.file.success){ if (file.success) {
socket.emit("publish-status", "file upload successfully completed"); socket.emit('publish-status', 'file upload successfully completed')
publishController.publish(event.file.meta.name, event.file.name, event.file.pathName, event.file.meta.type, event.file.meta.license, event.file.meta.nsfw, socket, visitor) publishController.publish(file.meta.name, file.name, file.pathName, file.meta.type, file.meta.license, 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')
// to-do: remove the file // to-do: remove the file
}; }
}); })
// handle disconnect // handle disconnect
socket.on('disconnect', function(){ socket.on('disconnect', () => {
console.log('user disconnected'); console.log('user disconnected')
}); })
}); })
return http; return http
} }

81
server.js
View file

@ -1,69 +1,68 @@
// load dependencies // load dependencies
var express = require('express'); const express = require('express')
var bodyParser = require('body-parser'); const bodyParser = require('body-parser')
var path = require('path'); const siofu = require('socketio-file-upload')
var siofu = require("socketio-file-upload"); const expressHandlebars = require('express-handlebars')
var expressHandlebars = require("express-handlebars"); const Handlebars = require('handlebars')
var Handlebars = require('handlebars'); const config = require('config')
var axios = require('axios'); const ua = require('universal-analytics')
var config = require('config');
var ua = require('universal-analytics');
var googleAnalyticsId = config.get('AnalyticsConfig.googleId'); const googleAnalyticsId = config.get('AnalyticsConfig.googleId')
var hostedContentPath = config.get('Database.PublishUploadPath'); const hostedContentPath = config.get('Database.PublishUploadPath')
// set port // set port
var PORT = 3000; const PORT = 3000
// initialize express app // initialize express app
var app = express(); const app = express()
// require our models for syncing // require our models for syncing
var db = require("./models"); const db = require('./models')
// make express look in the public directory for assets (css/js/img) // make express look in the public directory for assets (css/js/img)
app.use(express.static(__dirname + '/public')); app.use(express.static(`${__dirname}/public`))
// configure express app // configure express app
app.use(bodyParser.json()); // for parsing application/json app.use(bodyParser.json()) // for parsing application/json
app.use(bodyParser.urlencoded({ extended: true })); // for parsing application/x-www-form-urlencoded app.use(bodyParser.urlencoded({ extended: true })) // for parsing application/x-www-form-urlencoded
app.use(siofu.router); app.use(siofu.router)
// configure handlebars & register it with Express app // configure handlebars & register it with Express app
var hbs = expressHandlebars.create({ const hbs = expressHandlebars.create({
defaultLayout: 'main', // sets the default layout defaultLayout: 'main', // sets the default layout
handlebars : Handlebars, // includes basic handlebars for access to that library handlebars : Handlebars, // includes basic handlebars for access to that library
helpers: { // define any extra helpers you may need helpers : {
googleAnalytics: function(){ // define any extra helpers you may need
var googleApiKey = config.get('AnalyticsConfig.googleId') googleAnalytics () {
return new Handlebars.SafeString(`<script> const googleApiKey = config.get('AnalyticsConfig.googleId')
return new Handlebars.SafeString(
`<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '${googleApiKey}', 'auto'); ga('create', '${googleApiKey}', 'auto');
ga('send', 'pageview'); ga('send', 'pageview');
</script>`); </script>`
} )
} },
}); },
app.engine('handlebars', hbs.engine); })
app.set('view engine', 'handlebars'); app.engine('handlebars', hbs.engine)
app.set('view engine', 'handlebars')
// require express routes // require express routes
require("./routes/api-routes.js")(app); require('./routes/api-routes.js')(app)
require("./routes/show-routes.js")(app, ua, googleAnalyticsId); require('./routes/show-routes.js')(app, ua, googleAnalyticsId)
require("./routes/serve-routes.js")(app, ua, googleAnalyticsId); require('./routes/serve-routes.js')(app, ua, googleAnalyticsId)
require("./routes/home-routes.js")(app); require('./routes/home-routes.js')(app)
// require socket.io routes // require socket.io routes
var http = require("./routes/sockets-routes.js")(app, siofu, hostedContentPath, ua, googleAnalyticsId); const http = require('./routes/sockets-routes.js')(app, siofu, hostedContentPath, ua, googleAnalyticsId)
// sync sequelize // sync sequelize
// wrap the server in socket.io to intercept incoming sockets requests // wrap the server in socket.io to intercept incoming sockets requests
// start server // start server
db.sequelize.sync({}) db.sequelize.sync({}).then(() => {
.then(function(){ http.listen(PORT, () => {
http.listen(PORT, function() { console.log(`Listening on PORT ${PORT}`)
console.log("Listening on PORT " + PORT); })
}); })
});