-
Notifications
You must be signed in to change notification settings - Fork 42
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/wayback machine #286
base: master
Are you sure you want to change the base?
Changes from 14 commits
9d61a6f
35704a0
d10b1ea
92c7c8e
c2b2cae
9bc0f69
efc09fe
5514439
d4184a2
565491b
734ec81
4ace6fc
3cbd152
22c6015
0c7c183
bcb2da7
ced199e
d7b796c
167d287
abb91d7
fa153ac
698830e
74f93e5
a3364d7
d916d1e
f53d4f3
d76ca18
8e3ec2f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
// Third party imports | ||
const axios = require('axios'); | ||
const mustache = require('mustache'); | ||
const xml2js = require('xml2js'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. you should install
to add it to package.json |
||
|
||
// Local imports | ||
const config = require('../config'); | ||
const {debug} = require('../utils/logger')('ia:actions:wayback-machine'); | ||
const dialog = require('../dialog'); | ||
const endpointProcessor = require('../network/endpoint-processor'); | ||
const traverse = require('../utils/traverse'); | ||
const waybackStrings = require('../strings').intents.wayback; | ||
|
||
/** | ||
* Handle wayback query action | ||
* - fill slots of wayback query | ||
* - perform data requests to archive and alexa rankings | ||
* - construct response speech for action | ||
* | ||
* @param app | ||
*/ | ||
function handler (app) { | ||
// Create wayback object | ||
const waybackObject = { | ||
url: '', | ||
earliestYear: 0, | ||
latestYear: 0, | ||
totalUniqueURLs: 0, | ||
alexaWorldRank: 0, | ||
alexaUSRank: 0, | ||
speech: waybackStrings.default, | ||
}; | ||
|
||
// Check to see that both parameters have content | ||
if (!app.params.getByName('wayback') && !app.params.getByName('url')) { | ||
debug('wayback action called by mistake'); | ||
dialog.ask(app, waybackObject); | ||
} | ||
|
||
// Get url parameter and make url queries | ||
waybackObject.url = app.params.getByName('url'); | ||
const archiveQueryURL = endpointProcessor.preprocess( | ||
config.wayback.ARCHIVE, app, waybackObject | ||
); | ||
const alexaQueryURL = endpointProcessor.preprocess( | ||
config.wayback.ALEXA, app, waybackObject | ||
); | ||
|
||
return Promise.all([axios.get(archiveQueryURL), axios.get(alexaQueryURL)]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please don't use callback nesting here. One of the main feature of Promises is avoiding callback hell. It should be something like: action.then(a => {
return Promise.all(/*....*/);
})
.then(b => {
return Promise.all(/*....*/);
})
.then(c => {
}); |
||
.then(function (allData) { | ||
// All data available here in the order it was called. | ||
|
||
// Parse data from archive request | ||
let archiveJSON = allData[0].data; | ||
archiveEngine(archiveJSON, waybackObject); | ||
|
||
// Parse data from alexa request | ||
let XMLparser = new xml2js.Parser(); | ||
let convertXML = new Promise((resolve, reject) => { | ||
XMLparser.parseString(allData[1].data, function (err, result) { | ||
if (err) { | ||
let error = new Error('The XML parser didn\'t work. Error message: ' + err); | ||
reject(error); | ||
} else { | ||
resolve(result); | ||
} | ||
}); | ||
}); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think you need to store return Promise.all([archiveJSON, new Promise((resolve, reject) => {
//...
}]) and btw it would need it because part of code from Btw I'd recommend to write unit test of this pipeline, so you would see how promise will fire one after another. In additional I'd recommend to put: XMLparser.parseString(allData[1].data, function (err, result) { in separate function so it would improve readability of this pipeline. |
||
convertXML | ||
.then(function (fulfilled) { | ||
debug('XML parse successful!'); | ||
alexaEngine(JSON.parse(JSON.stringify(fulfilled)), waybackObject); | ||
}) | ||
.catch(function (error) { | ||
debug(error.message); | ||
waybackObject.speech = waybackStrings.error; | ||
dialog.ask(app, waybackObject); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. if we would like to change dialog flow here we should embed new Promise((resolve, reject) => {
XMLparser.parseString(allData[1].data, function (err, result) {
//...
}) Because right now we will reach Actually, I'd recommend to create unit tests for that part of the code - it would help a lot. All async scenarios are very tricky. |
||
}); | ||
|
||
// Construct response dialog for action | ||
if (waybackObject.alexaUSRank !== 0) { | ||
waybackObject.speech = mustache.render(waybackStrings.speech, waybackObject); | ||
waybackObject.speech += mustache.render(waybackStrings.additionalSpeech, waybackObject); | ||
} else { | ||
waybackObject.speech = mustache.render(waybackStrings.speech, waybackObject); | ||
waybackObject.speech += '.'; | ||
} | ||
|
||
dialog.close(app, waybackObject); | ||
}); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You may want gracefully cover |
||
} // End of handler | ||
|
||
function archiveEngine (archiveJSON, waybackObject) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just general comments. I'd recommend writing pure functions everywhere it possible. Motivation:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this function also should be pure-function and it doesn't need to be async |
||
// Create array of capture years and then find earliest year | ||
// and most recent year. | ||
let yearsArray = Object.keys(archiveJSON.captures); | ||
waybackObject.earliestYear = yearsArray[0]; | ||
waybackObject.latestYear = yearsArray[yearsArray.length - 1]; | ||
|
||
// Traverse URL category | ||
|
||
// Find baseline of URL count | ||
waybackObject.totalUniqueURLs += traverse(archiveJSON.urls[waybackObject.earliestYear]); | ||
// debug('Baseline url count: ' + waybackObject.totalUniqueURLs); | ||
|
||
waybackObject.totalUniqueURLs += traverse(archiveJSON.new_urls); | ||
// debug('Final url count: ' + waybackObject.totalUniqueURLs); | ||
} | ||
|
||
function alexaEngine (alexaJSON, waybackObject) { | ||
waybackObject.alexaWorldRank = alexaJSON['ALEXA']['SD'][0]['POPULARITY'][0]['$']['TEXT']; | ||
try { | ||
waybackObject.alexaUSRank = alexaJSON['ALEXA']['SD'][0]['COUNTRY'][0]['$']['RANK']; | ||
} catch (e) { | ||
debug('Country not found'); | ||
debug(e); | ||
} | ||
} | ||
|
||
module.exports = { | ||
handler, | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
const _ = require('lodash'); | ||
const {debug} = require('../utils/logger')('ia:actions:utils:traverse'); | ||
|
||
/** | ||
* Traverse a given object | ||
* | ||
* @param {Object} obj | ||
*/ | ||
module.exports = function (obj) { | ||
let results = []; | ||
function traverse (obj) { | ||
_.forOwn(obj, (val, key) => { | ||
if (_.isArray(val)) { | ||
val.forEach(el => { | ||
traverse(el); | ||
}); | ||
} else if (_.isObject(val)) { | ||
traverse(val); | ||
} else { | ||
results.push(val); | ||
} | ||
}); | ||
} | ||
traverse(obj); | ||
let count = 0; | ||
while (results.length !== 0) { | ||
count += results.pop(); | ||
} | ||
debug('final count inside traverse = ' + count); | ||
return count; | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
const {expect} = require('chai'); | ||
const rewire = require('rewire'); | ||
|
||
const action = rewire('../../src/actions/wayback-machine'); | ||
|
||
const mockApp = require('../_utils/mocking/platforms/app'); | ||
const mockDialog = require('../_utils/mocking/dialog'); | ||
|
||
describe('actions', () => { | ||
describe('wayback machine', () => { | ||
let app; | ||
let dialog; | ||
|
||
beforeEach(() => { | ||
app = mockApp(); | ||
dialog = mockDialog(); | ||
action.__set__('dialog', dialog); | ||
}); | ||
|
||
it('check to see that a promise is returned with network requests', () => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. please give some space here ;) |
||
action.handler(app); | ||
expect(Promise.resolve()).to.be.a('promise'); | ||
}); | ||
}); | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
const {expect} = require('chai'); | ||
const traverse = require('../../src/utils/traverse'); | ||
|
||
let testJSON = {'captures': { | ||
'1999': { | ||
'text/html': 18360 | ||
}, | ||
'2000': { | ||
'application/x-director': 19, | ||
'video/quicktime': 1584, | ||
'application/x-troff-man': 1, | ||
'x-world/x-vrml': 1, | ||
'audio/x-pn-realaudio': 176, | ||
'audio/mpeg': 195, | ||
'audio/x-wav': 3098, | ||
'image/png': 97, | ||
'text/html': 901401, | ||
'video/x-ms-asf': 142, | ||
'image/gif': 17388, | ||
'text/plain': 394428, | ||
'image/jpeg': 82903, | ||
'application/x-shockwave-flash': 39, | ||
'application/zip': 108, | ||
'audio/x-aiff': 2767, | ||
'text/css': 55, | ||
'application/pdf': 291 | ||
}}}; | ||
|
||
describe('utils', () => { | ||
describe('traverse', () => { | ||
it('should traverse a given object to return the sum of it\'s leaf nodes', () => { | ||
expect(traverse(testJSON)).to.be.equal(1423053); | ||
}); | ||
}); | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all new imports should be installed by:
when you would need new lib for testing you should use instead: