From 600128bda0390f2051ad20ee42930f036c79323c Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Tue, 5 Sep 2017 20:28:32 +0200 Subject: Clear cache automaticly --- lib/getMeetingpointData.js | 91 ++++++++++++++++++++++++++++++++++++++++++++++ lib/getUserIndex.js | 72 ------------------------------------ routes/index.js | 23 +++++++----- 3 files changed, 105 insertions(+), 81 deletions(-) create mode 100644 lib/getMeetingpointData.js delete mode 100644 lib/getUserIndex.js diff --git a/lib/getMeetingpointData.js b/lib/getMeetingpointData.js new file mode 100644 index 0000000..fb4c6e4 --- /dev/null +++ b/lib/getMeetingpointData.js @@ -0,0 +1,91 @@ +'use strict' + +const Promise = require('bluebird') +const cheerio = require('cheerio') +const _ = require('lodash') +const request = Promise.promisify(require('request')) + +let meetingpointData +let lastUpdate + +function getUsers (page) { + const script = page('script').eq(1).text() + + const regexs = [/var classes = \[(.+)\];/, /var teachers = \[(.+)\];/, /var rooms = \[(.+)\];/, /var students = \[(.+)\];/] + const items = regexs.map(function (regex) { + return script.match(regex)[1].split(',').map(function (item) { + return item.replace(/"/g, '') + }) + }) + + return [] + .concat(items[0].map(function (item, index) { + return { + type: 'c', + value: item, + index: index + } + })) + .concat(items[1].map(function (item, index) { + return { + type: 't', + value: item, + index: index + } + })) + .concat(items[2].map(function (item, index) { + return { + type: 'r', + value: item, + index: index + } + })) + .concat(items[3].map(function (item, index) { + return { + type: 's', + value: item, + index: index + } + })) +} + +function getValidWeekNumbers(page) { + const weekSelector = page('select[name="week"]'); + const weekNumbers = _.map(weekSelector.children(), option => parseInt(option.attribs.value)) + + return weekNumbers; +} + +function requestData() { + lastUpdate = new Date() + + return request(`http://www.meetingpointmco.nl/Roosters-AL/doc/dagroosters/frames/navbar.htm`).then((response) => { + const page = cheerio.load(response.body) + const users = getUsers(page) + const validWeekNumbers = getValidWeekNumbers(page) + + meetingpointData = { users, validWeekNumbers } + + return meetingpointData + }) +} + +function getMeetingpointData () { + if (lastUpdate == null) { + return requestData() + } else if (!meetingpointData) { + // The first request hasn't resolved yet, throw an error. + return Promise.reject() + } else if (new Date() - lastUpdate > 10 * 60 * 1000) { // 10 minutes + return requestData().catch(function () { + console.warn('Unable to update userIndex, using cached.') + + return meetingpointData + }) + } + else { + return Promise.resolve(meetingpointData) + } +} + +module.exports = getMeetingpointData diff --git a/lib/getUserIndex.js b/lib/getUserIndex.js deleted file mode 100644 index 393eab0..0000000 --- a/lib/getUserIndex.js +++ /dev/null @@ -1,72 +0,0 @@ -'use strict' - -const Promise = require('bluebird') -const cheerio = require('cheerio') -const _ = require('lodash') -const request = Promise.promisify(require('request')) - -exports = {} -module.exports = exports - -function getUsers (page) { - const script = page('script').eq(1).text() - - const regexs = [/var classes = \[(.+)\];/, /var teachers = \[(.+)\];/, /var rooms = \[(.+)\];/, /var students = \[(.+)\];/] - const items = regexs.map(function (regex) { - return script.match(regex)[1].split(',').map(function (item) { - return item.replace(/"/g, '') - }) - }) - - return [] - .concat(items[0].map(function (item, index) { - return { - type: 'c', - value: item, - index: index - } - })) - .concat(items[1].map(function (item, index) { - return { - type: 't', - value: item, - index: index - } - })) - .concat(items[2].map(function (item, index) { - return { - type: 'r', - value: item, - index: index - } - })) - .concat(items[3].map(function (item, index) { - return { - type: 's', - value: item, - index: index - } - })) -} - -function getValidWeekNumbers(page) { - const weekSelector = page('select[name="week"]'); - const weekNumbers = _.map(weekSelector.children(), option => parseInt(option.attribs.value)) - - return weekNumbers; -} - -function requestData() { - return request(`http://www.meetingpointmco.nl/Roosters-AL/doc/dagroosters/frames/navbar.htm`).then((response) => { - const page = cheerio.load(response.body) - const users = getUsers(page) - const validWeekNumbers = getValidWeekNumbers(page) - - return { users, validWeekNumbers } - }) -} - -requestData().then(({ users, validWeekNumbers }) => { - exports.users = users - exports.validWeekNumbers = validWeekNumbers -}) diff --git a/routes/index.js b/routes/index.js index 570fe5f..68f29b7 100644 --- a/routes/index.js +++ b/routes/index.js @@ -2,19 +2,24 @@ const express = require('express') const router = express.Router() -const data = require('../lib/getUserIndex') +const getMeetingpointData = require('../lib/getMeetingpointData') /* GET home page. */ router.get('/', function (req, res, next) { - let flags = [] - if (req.query.nfd != null) { - flags.push('NO_FEATURE_DETECT') - } + getMeetingpointData().then(data => { + let flags = [] + if (req.query.nfd != null) { + flags.push('NO_FEATURE_DETECT') + } - const flagsStr = `var FLAGS = ${JSON.stringify(flags)};` - const usersStr = `var USERS = ${JSON.stringify(data.users)};` - const validWeekNumbersStr = `var VALID_WEEK_NUMBERS = ${JSON.stringify(data.validWeekNumbers)}` - res.render('index', { flagsStr, usersStr, validWeekNumbersStr }) + const flagsStr = `var FLAGS = ${JSON.stringify(flags)};` + const usersStr = `var USERS = ${JSON.stringify(data.users)};` + const validWeekNumbersStr = `var VALID_WEEK_NUMBERS = ${JSON.stringify(data.validWeekNumbers)}` + res.render('index', { flagsStr, usersStr, validWeekNumbersStr }) + }).catch(function () { + console.error('Unable to get user info, emergency redirect!') + res.redirect('http://www.meetingpointmco.nl/Roosters-AL/doc/') + }) }) module.exports = router -- cgit v1.1