consolidated the resolve-and-update code
This commit is contained in:
bill bittner
parent
0af0ffb2da
commit
232591fdb3
6 changed files with 104 additions and 103 deletions
controllers
|
|
@ -4,9 +4,71 @@ const logger = require('winston');
|
|||
const getAllFreePublicClaims = require('../helpers/functions/getAllFreePublicClaims.js');
|
||||
const isFreePublicClaim = require('../helpers/functions/isFreePublicClaim.js');
|
||||
|
||||
function getClaimAndHandleResponse (claimUri, height, resolve, reject) {
|
||||
function updateFileIfNeeded (uri, claimName, claimId, localOutpoint, localHeight) {
|
||||
logger.debug(`A mysql record was found for ${claimId}`);
|
||||
logger.debug('initiating resolve on claim to check outpoint');
|
||||
// 1. resolve claim
|
||||
lbryApi
|
||||
.getClaim(claimUri)
|
||||
.resolveUri(uri)
|
||||
.then(result => {
|
||||
// logger.debug('resolved result:', result);
|
||||
const resolvedOutpoint = `${result[uri].claim.txid}:${result[uri].claim.nout}`;
|
||||
const resolvedHeight = result[uri].claim.height;
|
||||
logger.debug('database outpoint:', localOutpoint);
|
||||
logger.debug('resolved outpoint:', resolvedOutpoint);
|
||||
// 2. if the outpoint's match, no further work needed
|
||||
if (localOutpoint === resolvedOutpoint) {
|
||||
logger.debug('local outpoint matched');
|
||||
// 2. if the outpoints don't match, check the height
|
||||
} else if (localHeight > resolvedHeight) {
|
||||
logger.debug('local height was greater than resolved height');
|
||||
// 2. get the resolved claim
|
||||
} else {
|
||||
logger.debug(`local outpoint did not match for ${uri}. Initiating update.`);
|
||||
getClaimAndUpdate(uri, resolvedHeight);
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
logger.error(`error resolving "${uri}" >> `, error);
|
||||
});
|
||||
}
|
||||
|
||||
function getClaimAndUpdate (uri, height) {
|
||||
// 1. get the claim
|
||||
lbryApi
|
||||
.getClaim(uri)
|
||||
.then(({ name, claim_id, outpoint, file_name, download_path, mime_type, metadata }) => {
|
||||
logger.debug(' Get returned outpoint: ', outpoint);
|
||||
// 2. update the entry in db
|
||||
db.File
|
||||
.update({
|
||||
outpoint,
|
||||
height, // note: height is coming from 'resolve', not 'get'.
|
||||
fileName: file_name,
|
||||
filePath: download_path,
|
||||
fileType: mime_type,
|
||||
nsfw : metadata.stream.metadata.nsfw,
|
||||
}, {
|
||||
where: {
|
||||
name,
|
||||
claimId: claim_id,
|
||||
},
|
||||
})
|
||||
.then(result => {
|
||||
logger.debug('successfully updated mysql record', result);
|
||||
})
|
||||
.catch(error => {
|
||||
logger.error('sequelize error', error);
|
||||
});
|
||||
})
|
||||
.catch(error => {
|
||||
logger.error(`error while getting claim for ${uri} >> `, error);
|
||||
});
|
||||
}
|
||||
|
||||
function getClaimAndHandleResponse (uri, height, resolve, reject) {
|
||||
lbryApi
|
||||
.getClaim(uri)
|
||||
.then(({ name, claim_id, outpoint, file_name, download_path, mime_type, metadata }) => {
|
||||
// create entry in the db
|
||||
logger.debug('creating new record in db');
|
||||
|
|
@ -21,6 +83,9 @@ function getClaimAndHandleResponse (claimUri, height, resolve, reject) {
|
|||
fileType: mime_type,
|
||||
nsfw : metadata.stream.metadata.nsfw,
|
||||
})
|
||||
.then(result => {
|
||||
logger.debug('successfully created mysql record', result);
|
||||
})
|
||||
.catch(error => {
|
||||
logger.error('sequelize create error', error);
|
||||
});
|
||||
|
|
@ -36,95 +101,29 @@ function getClaimAndHandleResponse (claimUri, height, resolve, reject) {
|
|||
});
|
||||
}
|
||||
|
||||
function resolveAndUpdateIfNeeded (uri, claimName, claimId, localOutpoint, localHeight) {
|
||||
logger.debug('initiating resolve on local record to check outpoint');
|
||||
// 1. resolve claim
|
||||
lbryApi
|
||||
.resolveUri(uri)
|
||||
.then(result => {
|
||||
// logger.debug('resolved result:', result);
|
||||
const resolvedOutpoint = `${result[uri].claim.txid}:${result[uri].claim.nout}`;
|
||||
const resolvedHeight = result[uri].claim.height;
|
||||
logger.debug('database outpoint:', localOutpoint);
|
||||
logger.debug('resolved outpoint:', resolvedOutpoint);
|
||||
// 2. if the outpoint's match, no further work needed
|
||||
if (localOutpoint === resolvedOutpoint) {
|
||||
logger.debug('local outpoint matched');
|
||||
// 2. if the outpoints don't match, check the height
|
||||
} else if (localHeight > resolvedHeight) {
|
||||
logger.debug('local height was greater than resolve height');
|
||||
// 2. get the resolved claim
|
||||
} else {
|
||||
logger.debug(`local outpoint did not match for ${uri}. Initiating update.`);
|
||||
getClaimAndUpdate(uri, claimName, claimId);
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
logger.error(`error resolving "${uri}" >> `, error);
|
||||
});
|
||||
}
|
||||
|
||||
function getClaimAndUpdate (uri, claimName, claimId) {
|
||||
// 1. get the claim
|
||||
lbryApi
|
||||
.getClaim(uri)
|
||||
.then(({ outpoint, file_name, download_path, mime_type }) => {
|
||||
logger.debug('getClaim outpoint', outpoint);
|
||||
// 2. update the entry in db
|
||||
db.File
|
||||
.update({
|
||||
outpoint: outpoint,
|
||||
fileName: file_name,
|
||||
filePath: download_path,
|
||||
fileType: mime_type,
|
||||
}, {
|
||||
where: {
|
||||
name : claimName,
|
||||
claimId: claimId,
|
||||
},
|
||||
})
|
||||
.then(result => {
|
||||
logger.debug('successfully updated mysql record', result);
|
||||
})
|
||||
.catch(error => {
|
||||
logger.error('sequelize error', error);
|
||||
});
|
||||
})
|
||||
.catch(error => {
|
||||
logger.error(`error while getting claim for ${uri}`, error);
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getClaimByName (claimName) {
|
||||
const deferred = new Promise((resolve, reject) => {
|
||||
// 1. get all free public claims
|
||||
// 1. get the top free, public claims
|
||||
getAllFreePublicClaims(claimName)
|
||||
.then(freePublicClaimList => {
|
||||
const claimId = freePublicClaimList[0].claim_id;
|
||||
const name = freePublicClaimList[0].name;
|
||||
const outpoint = `${freePublicClaimList[0].txid}:${freePublicClaimList[0].nout}`;
|
||||
const claimId = freePublicClaimList[0].claim_id;
|
||||
const uri = `${name}#${claimId}`;
|
||||
const height = freePublicClaimList[0].height;
|
||||
// 2. check to see if the file is available locally
|
||||
db.File
|
||||
.findOne({ where: { name: name, claimId: claimId } }) // note: consolidate for es6?
|
||||
.findOne({ where: { name: name, claimId: claimId } }) // note: destructure for es6?
|
||||
.then(claim => {
|
||||
// 3. if a matching claim_id is found locally, serve it
|
||||
if (claim) {
|
||||
logger.debug(`A mysql record was found for ${claimId}`);
|
||||
// trigger update if needed
|
||||
if (claim.dataValues.outpoint === outpoint) {
|
||||
logger.debug(`local outpoint matched for ${claimId}`);
|
||||
} else {
|
||||
logger.debug(`local outpoint did not match for ${claimId}`);
|
||||
getClaimAndUpdate(uri, name, claimId);
|
||||
}
|
||||
// return the claim
|
||||
updateFileIfNeeded(uri, name, claimId, claim.dataValues.outpoint, claim.dataValues.height);
|
||||
// serve the file
|
||||
resolve(claim.dataValues);
|
||||
// 3. otherwise use daemon to retrieve it
|
||||
} else {
|
||||
// 4. get the claim and serve it
|
||||
// get the claim and serve it
|
||||
getClaimAndHandleResponse(uri, height, resolve, reject);
|
||||
}
|
||||
})
|
||||
|
|
@ -144,14 +143,13 @@ module.exports = {
|
|||
const uri = `${claimName}#${claimId}`;
|
||||
// 1. check locally for the claim
|
||||
db.File
|
||||
.findOne({ where: { name: claimName, claimId: claimId } }) // note: consolidate for es6?
|
||||
.findOne({ where: { name: claimName, claimId: claimId } }) // note: destructure?
|
||||
.then(claim => {
|
||||
// 2. if a match is found locally, serve it
|
||||
if (claim) {
|
||||
logger.debug(`A mysql record was found for ${claimId}`);
|
||||
// trigger an update if needed
|
||||
resolveAndUpdateIfNeeded(uri, claimName, claimId, claim.dataValues.outpoint, claim.dataValues.outpoint); // ok to just start asynch function, or need to add to a task cue?
|
||||
// resolve and send
|
||||
updateFileIfNeeded(uri, claimName, claimId, claim.dataValues.outpoint, claim.dataValues.outpoint);
|
||||
// serve the file
|
||||
resolve(claim.dataValues);
|
||||
// 2. otherwise use daemon to retrieve it
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue