From feb4bdfd9b46e87aadfa7c0d5338cde887d1f58c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sun, 11 Dec 2016 21:50:51 +0100 Subject: First version with PostgreSQL --- server/lib/friends.js | 73 +++++++++++++++++++++++++++++++---------------- server/lib/oauth-model.js | 32 +++++++++------------ 2 files changed, 62 insertions(+), 43 deletions(-) (limited to 'server/lib') diff --git a/server/lib/friends.js b/server/lib/friends.js index eaea040ca..3ed29f651 100644 --- a/server/lib/friends.js +++ b/server/lib/friends.js @@ -4,18 +4,14 @@ const each = require('async/each') const eachLimit = require('async/eachLimit') const eachSeries = require('async/eachSeries') const fs = require('fs') -const mongoose = require('mongoose') const request = require('request') const waterfall = require('async/waterfall') const constants = require('../initializers/constants') +const db = require('../initializers/database') const logger = require('../helpers/logger') const requests = require('../helpers/requests') -const Pod = mongoose.model('Pod') -const Request = mongoose.model('Request') -const Video = mongoose.model('Video') - const friends = { addVideoToFriends, hasFriends, @@ -31,7 +27,7 @@ function addVideoToFriends (video) { } function hasFriends (callback) { - Pod.countAll(function (err, count) { + db.Pod.countAll(function (err, count) { if (err) return callback(err) const hasFriends = (count !== 0) @@ -69,13 +65,13 @@ function makeFriends (hosts, callback) { function quitFriends (callback) { // Stop pool requests - Request.deactivate() + db.Request.deactivate() // Flush pool requests - Request.flush() + db.Request.flush() waterfall([ function getPodsList (callbackAsync) { - return Pod.list(callbackAsync) + return db.Pod.list(callbackAsync) }, function announceIQuitMyFriends (pods, callbackAsync) { @@ -103,12 +99,12 @@ function quitFriends (callback) { function removePodsFromDB (pods, callbackAsync) { each(pods, function (pod, callbackEach) { - pod.remove(callbackEach) + pod.destroy().asCallback(callbackEach) }, callbackAsync) } ], function (err) { // Don't forget to re activate the scheduler, even if there was an error - Request.activate() + db.Request.activate() if (err) return callback(err) @@ -122,7 +118,7 @@ function removeVideoToFriends (videoParams) { } function sendOwnedVideosToPod (podId) { - Video.listOwned(function (err, videosList) { + db.Video.listOwnedAndPopulateAuthor(function (err, videosList) { if (err) { logger.error('Cannot get the list of videos we own.') return @@ -200,9 +196,9 @@ function getForeignPodsList (host, callback) { function makeRequestsToWinningPods (cert, podsList, callback) { // Stop pool requests - Request.deactivate() + db.Request.deactivate() // Flush pool requests - Request.forceSend() + db.Request.forceSend() eachLimit(podsList, constants.REQUESTS_IN_PARALLEL, function (pod, callbackEach) { const params = { @@ -222,8 +218,8 @@ function makeRequestsToWinningPods (cert, podsList, callback) { } if (res.statusCode === 200) { - const podObj = new Pod({ host: pod.host, publicKey: body.cert }) - podObj.save(function (err, podCreated) { + const podObj = db.Pod.build({ host: pod.host, publicKey: body.cert }) + podObj.save().asCallback(function (err, podCreated) { if (err) { logger.error('Cannot add friend %s pod.', pod.host, { error: err }) return callbackEach() @@ -242,28 +238,57 @@ function makeRequestsToWinningPods (cert, podsList, callback) { }, function endRequests () { // Final callback, we've ended all the requests // Now we made new friends, we can re activate the pool of requests - Request.activate() + db.Request.activate() logger.debug('makeRequestsToWinningPods finished.') return callback() }) } +// Wrapper that populate "to" argument with all our friends if it is not specified function createRequest (type, endpoint, data, to) { - const req = new Request({ + if (to) return _createRequest(type, endpoint, data, to) + + // If the "to" pods is not specified, we send the request to all our friends + db.Pod.listAllIds(function (err, podIds) { + if (err) { + logger.error('Cannot get pod ids', { error: err }) + return + } + + return _createRequest(type, endpoint, data, podIds) + }) +} + +function _createRequest (type, endpoint, data, to) { + const pods = [] + + // If there are no destination pods abort + if (to.length === 0) return + + to.forEach(function (toPod) { + pods.push(db.Pod.build({ id: toPod })) + }) + + const createQuery = { endpoint, request: { type: type, data: data } - }) - - if (to) { - req.to = to } - req.save(function (err) { - if (err) logger.error('Cannot save the request.', { error: err }) + // We run in transaction to keep coherency between Request and RequestToPod tables + db.sequelize.transaction(function (t) { + const dbRequestOptions = { + transaction: t + } + + return db.Request.create(createQuery, dbRequestOptions).then(function (request) { + return request.setPods(pods, dbRequestOptions) + }) + }).asCallback(function (err) { + if (err) logger.error('Error in createRequest transaction.', { error: err }) }) } diff --git a/server/lib/oauth-model.js b/server/lib/oauth-model.js index d011c4b72..1c12f1b14 100644 --- a/server/lib/oauth-model.js +++ b/server/lib/oauth-model.js @@ -1,11 +1,6 @@ -const mongoose = require('mongoose') - +const db = require('../initializers/database') const logger = require('../helpers/logger') -const OAuthClient = mongoose.model('OAuthClient') -const OAuthToken = mongoose.model('OAuthToken') -const User = mongoose.model('User') - // See https://github.com/oauthjs/node-oauth2-server/wiki/Model-specification for the model specifications const OAuthModel = { getAccessToken, @@ -21,27 +16,25 @@ const OAuthModel = { function getAccessToken (bearerToken) { logger.debug('Getting access token (bearerToken: ' + bearerToken + ').') - return OAuthToken.getByTokenAndPopulateUser(bearerToken) + return db.OAuthToken.getByTokenAndPopulateUser(bearerToken) } function getClient (clientId, clientSecret) { logger.debug('Getting Client (clientId: ' + clientId + ', clientSecret: ' + clientSecret + ').') - // TODO req validator - const mongoId = new mongoose.mongo.ObjectID(clientId) - return OAuthClient.getByIdAndSecret(mongoId, clientSecret) + return db.OAuthClient.getByIdAndSecret(clientId, clientSecret) } function getRefreshToken (refreshToken) { logger.debug('Getting RefreshToken (refreshToken: ' + refreshToken + ').') - return OAuthToken.getByRefreshTokenAndPopulateClient(refreshToken) + return db.OAuthToken.getByRefreshTokenAndPopulateClient(refreshToken) } function getUser (username, password) { logger.debug('Getting User (username: ' + username + ', password: ' + password + ').') - return User.getByUsername(username).then(function (user) { + return db.User.getByUsername(username).then(function (user) { if (!user) return null // We need to return a promise @@ -60,8 +53,8 @@ function getUser (username, password) { } function revokeToken (token) { - return OAuthToken.getByRefreshTokenAndPopulateUser(token.refreshToken).then(function (tokenDB) { - if (tokenDB) tokenDB.remove() + return db.OAuthToken.getByRefreshTokenAndPopulateUser(token.refreshToken).then(function (tokenDB) { + if (tokenDB) tokenDB.destroy() /* * Thanks to https://github.com/manjeshpv/node-oauth2-server-implementation/blob/master/components/oauth/mongo-models.js @@ -80,18 +73,19 @@ function revokeToken (token) { function saveToken (token, client, user) { logger.debug('Saving token ' + token.accessToken + ' for client ' + client.id + ' and user ' + user.id + '.') - const tokenObj = new OAuthToken({ + const tokenToCreate = { accessToken: token.accessToken, accessTokenExpiresAt: token.accessTokenExpiresAt, - client: client.id, refreshToken: token.refreshToken, refreshTokenExpiresAt: token.refreshTokenExpiresAt, - user: user.id - }) + oAuthClientId: client.id, + userId: user.id + } - return tokenObj.save().then(function (tokenCreated) { + return db.OAuthToken.create(tokenToCreate).then(function (tokenCreated) { tokenCreated.client = client tokenCreated.user = user + return tokenCreated }).catch(function (err) { throw err -- cgit v1.2.3