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

updated publish controller

Browse source
This commit is contained in:
bill bittner 2017-08-16 11:00:17 -07:00
parent cddd7ac3b2
commit dd762ec10b
5 changed files with 117 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
controllers/publishController.js
View file

@ -3,96 +3,51 @@ const db = require('../models');
const lbryApi = require('../helpers/lbryApi.js');
const publishHelpers = require('../helpers/publishHelpers.js');
function checkNameAvailability (name) {
return new Promise((resolve, reject) => {
// find any records where the name is used
db.File
.findAll({ where: { name } })
.then(result => {
if (result.length >= 1) {
// filter out any results that were not published from a spee.ch wallet address
lbryApi
.getWalletList()
.then((walletList) => {
const filteredResult = result.filter((claim) => {
return walletList.includes(claim.address);
});
if (filteredResult.length >= 1) {
resolve(false);
} else {
resolve(true);
}
})
.catch((error) => {
reject(error);
});
} else {
resolve(true);
}
})
.catch(error => {
reject(error);
});
});
};
module.exports = {
publish (publishParams, fileName, fileType) {
return new Promise((resolve, reject) => {
let publishResults = {};
// 1. make sure the name is available
checkNameAvailability(publishParams.name)
publishHelpers.checkNameAvailability(publishParams.name)
// 2. publish the file
.then(result => {
if (result === true) {
// 2. publish the file
lbryApi
.publishClaim(publishParams)
return lbryApi.publishClaim(publishParams);
} else {
return new Error('That name has already been claimed by spee.ch. Please choose a new claim name.');
}
})
// 3. upsert File record (update is in case the claim has been published before by this daemon)
.then(result => {
logger.info(`Successfully published ${fileName}`, result);
// 3. update old record or create new one (update is in case the claim has been published before by this daemon)
db.upsert(
db.File,
{
let fileRecord;
let upsertCriteria;
publishResults = result;
logger.info(`Successfully published ${fileName}`, publishResults);
fileRecord = {
name : publishParams.name,
claimId : result.claim_id,
claimId : publishResults.claim_id,
address : publishParams.claim_address,
outpoint: `${result.txid}:${result.nout}`,
outpoint: `${publishResults.txid}:${publishResults.nout}`,
height : 0,
fileName,
filePath: publishParams.file_path,
fileType,
nsfw : publishParams.metadata.nsfw,
},
{
};
upsertCriteria = {
name : publishParams.name,
claimId: result.claim_id,
}
).then(() => {
// resolve the promise with the result from lbryApi.publishClaim;
resolve(result);
})
.catch(error => {
logger.error('Sequelize findOne error', error);
// reject the promise
reject(error);
});
})
.catch(error => {
// delete the local file
publishHelpers.deleteTemporaryFile(publishParams.file_path);
// reject the promise
reject(error);
});
} else {
const err = new Error('That name has already been claimed by spee.ch. Please choose a new claim name.');
reject(err);
}
claimId: publishResults.claim_id,
};
return Promise.all([db.upsert(db.File, fileRecord, upsertCriteria, 'File'), db.upsert(db.Claim, fileRecord, upsertCriteria, 'Claim')]);
})
.then((fileRecordResults, claimRecordResults) => {
logger.debug('File and Claim records successfully created');
resolve(publishResults); // resolve the promise with the result from lbryApi.publishClaim;
})
.catch(error => {
publishHelpers.deleteTemporaryFile(publishParams.file_path); // delete the local file
reject(error);
});
});
},
checkNameAvailability (name) {
return checkNameAvailability(name);
},
};

32
helpers/publishHelpers.js
View file

@ -1,6 +1,8 @@
const logger = require('winston');
const config = require('config');
const fs = require('fs');
const db = require('../models');
const { getWalletList } = require('./lbryApi.js');
module.exports = {
validateFile (file, name, license, nsfw) {
@ -90,4 +92,34 @@ module.exports = {
logger.debug(`successfully deleted ${filePath}`);
});
},
checkNameAvailability (name) {
return new Promise((resolve, reject) => {
// find any records where the name is used
db.File.findAll({ where: { name } })
.then(result => {
if (result.length >= 1) {
// filter out any results that were not published from a spee.ch wallet address
getWalletList()
.then((walletList) => {
const filteredResult = result.filter((claim) => {
return walletList.includes(claim.address);
});
if (filteredResult.length >= 1) {
resolve(false);
} else {
resolve(true);
}
})
.catch((error) => {
reject(error);
});
} else {
resolve(true);
}
})
.catch(error => {
reject(error);
});
});
},
};

6
models/index.js
View file

@ -37,15 +37,15 @@ Object.keys(db).forEach(modelName => {
}
});
db['upsert'] = (Model, values, condition) => {
db['upsert'] = (Model, values, condition, tableName) => {
return Model
.findOne({ where: condition })
.then(function (obj) {
if (obj) { // update
logger.silly(`updating ${values.name}:${values.claimId} in File db`);
logger.debug(`updating "${values.name}" "${values.claimId}" in db.${tableName}`);
return obj.update(values);
} else { // insert
logger.silly(`creating ${values.name}:${values.claimId} in File db`);
logger.debug(`creating "${values.name}" "${values.claimId}" in db.${tableName}`);
return Model.create(values);
}
}).catch(function (error) {

18
routes/api-routes.js
View file

@ -1,9 +1,9 @@
const logger = require('winston');
const multipart = require('connect-multiparty');
const multipartMiddleware = multipart();
const publishController = require('../controllers/publishController.js');
const lbryApi = require('../helpers/lbryApi.js');
const { createPublishParams, validateFile } = require('../helpers/publishHelpers.js');
const { publish } = require('../controllers/publishController.js');
const { getClaimList, resolveUri } = require('../helpers/lbryApi.js');
const { createPublishParams, validateFile, checkNameAvailability } = require('../helpers/publishHelpers.js');
const errorHandlers = require('../helpers/errorHandlers.js');
const { postToStats, sendGoogleAnalytics } = require('../controllers/statsController.js');
@ -13,8 +13,7 @@ module.exports = (app, hostedContentPath) => {
// google analytics
sendGoogleAnalytics('SERVE', headers, ip, originalUrl);
// serve the content
lbryApi
.getClaimList(params.name)
getClaimList(params.name)
.then(claimsList => {
postToStats('serve', originalUrl, ip, null, null, 'success');
res.status(200).json(claimsList);
@ -26,8 +25,7 @@ module.exports = (app, hostedContentPath) => {
// route to check whether spee.ch has published to a claim
app.get('/api/isClaimAvailable/:name', ({ ip, originalUrl, params }, res) => {
// send response
publishController
.checkNameAvailability(params.name)
checkNameAvailability(params.name)
.then(result => {
if (result === true) {
res.status(200).json(true);
@ -45,8 +43,7 @@ module.exports = (app, hostedContentPath) => {
// google analytics
sendGoogleAnalytics('SERVE', headers, ip, originalUrl);
// serve content
lbryApi
.resolveUri(params.uri)
resolveUri(params.uri)
.then(resolvedUri => {
postToStats('serve', originalUrl, ip, null, null, 'success');
res.status(200).json(resolvedUri);
@ -79,8 +76,7 @@ module.exports = (app, hostedContentPath) => {
const fileType = file.type;
const publishParams = createPublishParams(name, filePath, license, nsfw);
// publish the file
publishController
.publish(publishParams, fileName, fileType)
publish(publishParams, fileName, fileType)
.then(result => {
postToStats('publish', originalUrl, ip, null, null, 'success');
res.status(200).json(result);

3
routes/sockets-routes.js
View file

@ -38,8 +38,7 @@ module.exports = (app, siofu, hostedContentPath) => {
// prepare the publish parameters
const publishParams = publishHelpers.createPublishParams(file.meta.name, file.pathName, file.meta.license, file.meta.nsfw);
// publish the file
publishController
.publish(publishParams, file.name, file.meta.type)
publishController.publish(publishParams, file.name, file.meta.type)
.then(result => {
postToStats('publish', '/', null, null, null, 'success');
socket.emit('publish-complete', { name: publishParams.name, result });