Short urls #89

Merged
bones7242 merged 6 commits from short-urls into master 2017-07-18 04:18:47 +02:00
6 changed files with 136 additions and 60 deletions
Showing only changes of commit 8d4ae9ce3c - Show all commits

View file

@ -7,7 +7,7 @@
},
"Database": {
"MySqlConnectionUri": "none",
"DownloadDirectory": "/home/lbry/Downloads/"
"DownloadDirectory": "C:\\Users\\Bones\\Downloads\\lbry\\"
},
"Logging": {
"LogLevel": "silly"

View file

@ -3,9 +3,10 @@ const db = require('../models');
const logger = require('winston');
const getAllFreePublicClaims = require('../helpers/functions/getAllFreePublicClaims.js');
const isFreePublicClaim = require('../helpers/functions/isFreePublicClaim.js');
const { validateClaimId } = require('../helpers/libraries/serveHelpers.js');
function updateFileIfNeeded (uri, claimName, claimId, localOutpoint, localHeight) {
logger.debug(`A mysql record was found for ${claimName}:${claimId}. Initiating resolve to check outpoint.`);
logger.debug(`Initiating resolve to check outpoint for ${claimName}:${claimId}.`);
// 1. resolve claim
lbryApi
.resolveUri(uri)
@ -34,7 +35,7 @@ function updateFileIfNeeded (uri, claimName, claimId, localOutpoint, localHeight
}
})
.catch(error => {
logger.error(`error resolving "${uri}" >> `, error);
logger.error(error);
});
}
@ -110,6 +111,41 @@ function getClaimAndHandleResponse (uri, address, height, resolve, reject) {
});
}
function getClaimAndReturnResponse (uri, address, height) {
const deferred = new Promise((resolve, reject) => {
lbryApi
.getClaim(uri)
.then(({ name, claim_id, outpoint, file_name, download_path, mime_type, metadata }) => {
// create entry in the db
logger.silly(`creating new File record`);
db.File
.create({
name,
claimId : claim_id,
address, // note: passed as an arguent, not from this 'get' call
outpoint,
height, // note: passed as an arguent, not from this 'get' call
fileName: file_name,
filePath: download_path,
fileType: mime_type,
nsfw : metadata.stream.metadata.nsfw,
})
.then(result => {
logger.debug('successfully created File record');
resolve(result); // note: result.dataValues ?
})
.catch(error => {
logger.error('sequelize create error', error);
reject(error);
});
})
.catch(error => {
reject(error);
});
});
return deferred;
}
module.exports = {
getClaimByName (claimName) {
const deferred = new Promise((resolve, reject) => {
@ -155,20 +191,23 @@ module.exports = {
},
getClaimByClaimId (name, claimId) {
const deferred = new Promise((resolve, reject) => {
const uri = `${name}#${claimId}`;
// 1. check locally for the claim
db.File
.findOne({ where: { name, claimId } })
.then(claim => {
// 2. if a match is found locally, serve it
if (claim) {
// serve the file
resolve(claim.dataValues);
// trigger an update if needed
updateFileIfNeeded(uri, name, claimId, claim.dataValues.outpoint, claim.dataValues.outpoint);
// 2. otherwise use daemon to retrieve it
} else {
// 3. resolve the Uri
let uri;
validateClaimId(name, claimId) // 1. validate the claim id & retrieve the full claim id if needed
.then(validClaimId => { // 2. check locally for the claim
logger.debug('valid claim id:', validClaimId);
uri = `${name}#${validClaimId}`;
return db.File.findOne({ where: { name, claimId: validClaimId } });
})
.then(({ dataValues }) => {
if (dataValues) { // 3. if a match is found locally, serve that claim
logger.debug('Result found in File table:', dataValues);
// return the data for the file to be served
resolve(dataValues); // break out of the chain???
// update the file, as needed
updateFileIfNeeded(uri, name, claimId, dataValues.outpoint, dataValues.outpoint);
// 3. if a match was not found use the daemon to retrieve the claim & return the db data once it is created
} else { // 4. resolve the Uri
logger.debug('No result found in File table,');
lbryApi
.resolveUri(uri)
.then(result => {
@ -176,14 +215,13 @@ module.exports = {
if (!result.claim) {
logger.debug('resolve did not return a claim');
resolve(null);
return;
}
// 4. check to see if the claim is free & public
// check to see if the claim is free & public
if (isFreePublicClaim(result.claim)) {
// 5. get claim and serve
getClaimAndHandleResponse(uri, result.claim.address, result.claim.height, resolve, reject);
// get claim and serve
resolve(getClaimAndReturnResponse(uri, result.claim.address, result.claim.height));
} else {
reject(null);
resolve(null);
}
})
.catch(error => {

View file

@ -36,7 +36,7 @@ module.exports = {
});
})
.catch(error => {
logger.error('sequelize error', error);
logger.error('Sequelize error', error);
});
},
sendGoogleAnalytics (action, headers, ip, originalUrl) {

View file

@ -55,7 +55,6 @@ module.exports = (claimName) => {
resolve(orderedPublicClaims);
})
.catch(error => {
logger.error('error received from lbryApi.getClaimsList', error);
reject(error);
});
});

View file

@ -0,0 +1,68 @@
const logger = require('winston');
const db = require('../../models');
module.exports = {
serveFile ({ fileName, fileType, filePath }, res) {
logger.info(`serving file ${fileName}`);
// set default options
let options = {
headers: {
'X-Content-Type-Options': 'nosniff',
'Content-Type' : fileType,
},
};
// adjust default options as needed
switch (fileType) {
case 'image/jpeg':
break;
case 'image/gif':
break;
case 'image/png':
break;
case 'video/mp4':
break;
default:
logger.warn('sending file with unknown type as .jpeg');
options['headers']['Content-Type'] = 'image/jpeg';
break;
}
// send the file
res.status(200).sendFile(filePath, options);
},
validateClaimId (name, claimId) {
const deferred = new Promise((resolve, reject) => {
logger.debug('claim id length:', claimId.length);
// make sure the claim id is 40 characters
if (claimId.length === 40) {
logger.debug('Claim Id length is valid.');
resolve(claimId);
// if the claim id is shorter than 40, check the db for the full claim id
} else if (claimId.length === 1) {
logger.debug(`Finding claim id for "${name}" "${claimId}"`);
db.File
.findOne({
where: {
name,
claimId: { $like: `${claimId}%` },
},
})
.then(file => {
// if no results were found, throw an error
if (!file) {
reject(new Error('That is not a valid short URL.'));
}
// if a result was found, resolve with the full claim id
logger.debug('Full claim id:', file.dataValues.claimId);
resolve(file.dataValues.claimId);
})
.catch(error => {
reject(error);
});
} else {
logger.error('The Claim Id was neither 40 nor 1 character in length');
reject(new Error('That Claim Id is not valid.'));
}
});
return deferred;
},
};

View file

@ -2,47 +2,17 @@ const logger = require('winston');
const { getClaimByClaimId, getClaimByName } = require('../controllers/serveController.js');
const { postToStats, sendGoogleAnalytics } = require('../controllers/statsController.js');
const errorHandlers = require('../helpers/libraries/errorHandlers.js');
function serveFile ({ fileName, fileType, filePath }, res) {
logger.info(`serving file ${fileName}`);
// set default options
let options = {
headers: {
'X-Content-Type-Options': 'nosniff',
'Content-Type' : fileType,
},
};
// adjust default options as needed
switch (fileType) {
case 'image/jpeg':
break;
case 'image/gif':
break;
case 'image/png':
break;
case 'video/mp4':
break;
default:
logger.warn('sending file with unknown type as .jpeg');
options['headers']['Content-Type'] = 'image/jpeg';
break;
}
// send file
res.status(200).sendFile(filePath, options);
}
function sendAnalyticsAndLog (headers, ip, originalUrl) {
// google analytics
sendGoogleAnalytics('serve', headers, ip, originalUrl);
}
const { serveFile } = require('../helpers/libraries/serveHelpers.js');
module.exports = (app) => {
// route to serve a specific asset
app.get('/:name/:claim_id', ({ headers, ip, originalUrl, params }, res) => {
sendAnalyticsAndLog(headers, ip, originalUrl);
// google analytics
sendGoogleAnalytics('serve', headers, ip, originalUrl);
// begin image-serve processes
getClaimByClaimId(params.name, params.claim_id)
.then(fileInfo => {
logger.debug('file info:', fileInfo);
// check to make sure a file was found
if (!fileInfo) {
res.status(307).render('noClaims');
@ -67,9 +37,10 @@ module.exports = (app) => {
errorHandlers.handleRequestError('serve', originalUrl, ip, error, res);
});
});
// route to serve the winning claim
// route to serve the winning asset at a claim
app.get('/:name', ({ headers, ip, originalUrl, params }, res) => {
sendAnalyticsAndLog(headers, ip, originalUrl);
// google analytics
sendGoogleAnalytics('serve', headers, ip, originalUrl);
// begin image-serve processes
getClaimByName(params.name)
.then(fileInfo => {