Skip to content

Commit

Permalink
Move from xo to esling/prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
borisschapira committed Jun 4, 2020
1 parent b3a59dd commit 23fa8aa
Show file tree
Hide file tree
Showing 19 changed files with 382 additions and 4,824 deletions.
12 changes: 12 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"extends": ["prettier"],

"env": {
"node": true,
"es6": true
},

"parserOptions": {
"ecmaVersion": 8
}
}
12 changes: 12 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = {
singleQuote: true,
overrides: [
{
files: ['*.md'],
options: {
tabWidth: 4,
proseWrap: 'always'
}
}
]
};
20 changes: 10 additions & 10 deletions lib/api-client/config.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
const host = "www.dareboost.com";
const apiVersion = "0.6";
const host = 'www.dareboost.com';
const apiVersion = '0.6';
const token = process.env.DB_API_TOKEN;

// Delay between two API calls on iterative calls
const delay = 500;

exports.config = {
apiUrl: "https://" + host + "/api/" + apiVersion,
apiUrl: 'https://' + host + '/api/' + apiVersion,
endpoints: {
monitoring: {
list: "/monitoring/list",
lastReport: "/monitoring/last-report",
reports: "/monitoring/reports"
list: '/monitoring/list',
lastReport: '/monitoring/last-report',
reports: '/monitoring/reports',
},
scenario: {
list: "/scenario/list",
reports: "/scenario/reports"
}
list: '/scenario/list',
reports: '/scenario/reports',
},
},
delay,
token
token,
};
16 changes: 8 additions & 8 deletions lib/api-client/requester.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
const rp = require("request-promise");
const _ = require("underscore");
const { config } = require("./config");
const rp = require('request-promise');
const _ = require('underscore');
const { config } = require('./config');

function requestApi(endpoint, body) {
return rp({
method: "POST",
method: 'POST',
uri: config.apiUrl + endpoint,
body: _.extend(
{
token: config.token
token: config.token,
},
body
),
json: true
}).catch(error => {
console.log("Error:", err);
json: true,
}).catch((error) => {
console.log('Error:', err);
});
}

Expand Down
4 changes: 2 additions & 2 deletions lib/api-client/scenario/list.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { config } = require("../config");
const requestApi = require("../requester");
const { config } = require('../config');
const requestApi = require('../requester');

function getScenarioList() {
return requestApi(config.endpoints.scenario.list);
Expand Down
6 changes: 3 additions & 3 deletions lib/api-client/scenario/reports.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const { config } = require("../config");
const requestApi = require("../requester");
const { config } = require('../config');
const requestApi = require('../requester');

function getScenarioReports(scenarioId, limit, lastDays, error) {
return requestApi(config.endpoints.scenario.reports, {
scenarioId,
limit,
lastDays,
error
error,
});
}

Expand Down
20 changes: 10 additions & 10 deletions lib/api-client/trackings/last-executions.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
const _ = require("underscore");
const forEachTimeout = require("foreach-timeout");
const { config } = require("../config");
const requestApi = require("../requester");
const getMonitoringList = require("./list");
const _ = require('underscore');
const forEachTimeout = require('foreach-timeout');
const { config } = require('../config');
const requestApi = require('../requester');
const getMonitoringList = require('./list');

function getMonitoringLastExecution(monitoringId) {
return requestApi(config.endpoints.monitoring.lastReport, {
monitoringId,
getUniqueIDsForTips: true
getUniqueIDsForTips: true,
});
}

Expand All @@ -19,11 +19,11 @@ async function getMonitoringLastExecutions(monitoringList, predicateTips) {

const activeMonitoringsData = activeMonitorings.monitorings;

const activeMonitoringIds = _.pluck(activeMonitoringsData, "id");
const activeMonitoringIds = _.pluck(activeMonitoringsData, 'id');

const monitoringLastExecutions = await forEachTimeout(
_.map(activeMonitoringIds, id => getMonitoringLastExecution(id)),
e => Promise.resolve(e),
_.map(activeMonitoringIds, (id) => getMonitoringLastExecution(id)),
(e) => Promise.resolve(e),
config.delay
);

Expand All @@ -43,7 +43,7 @@ async function getMonitoringLastExecutions(monitoringList, predicateTips) {
monitoringLastExecution.report.publicReportUrl,
score: monitoringLastExecution.report.summary
? monitoringLastExecution.report.summary.score
: -1
: -1,
},
monitoringLastExecution.report.config
);
Expand Down
4 changes: 2 additions & 2 deletions lib/api-client/trackings/list.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { config } = require("../config");
const requestApi = require("../requester");
const { config } = require('../config');
const requestApi = require('../requester');

function getMonitoringList() {
return requestApi(config.endpoints.monitoring.list);
Expand Down
6 changes: 3 additions & 3 deletions lib/api-client/trackings/reports.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const { config } = require("../config");
const requestApi = require("../requester");
const { config } = require('../config');
const requestApi = require('../requester');

function getMonitoringReports(monitoringId, limit, lastDays, error) {
return requestApi(config.endpoints.monitoring.reports, {
monitoringId,
limit,
lastDays,
error
error,
});
}

Expand Down
14 changes: 7 additions & 7 deletions lib/helpers/page/average-values.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const _ = require("underscore");
const transformations = require("../../transformations");
const io = require("../../io");
const getMonitoringList = require("../../api-client/trackings/list");
const getMonitoringReports = require("../../api-client/trackings/reports");
const _ = require('underscore');
const transformations = require('../../transformations');
const io = require('../../io');
const getMonitoringList = require('../../api-client/trackings/list');
const getMonitoringReports = require('../../api-client/trackings/reports');

(async () => {
const avgValuesData = [];
Expand Down Expand Up @@ -30,9 +30,9 @@ const getMonitoringReports = require("../../api-client/trackings/reports");
monitoringReports.statistics.averageTimings.domInteractive,
startRender: monitoringReports.statistics.averageTimings.startRender,
loadEvent: monitoringReports.statistics.averageTimings.loadEvent,
speedIndex: monitoringReports.statistics.averageTimings.speedIndex
speedIndex: monitoringReports.statistics.averageTimings.speedIndex,
});
}

io.doExport(avgValuesData, "avgMonitoringValues");
io.doExport(avgValuesData, 'avgMonitoringValues');
})();
12 changes: 6 additions & 6 deletions lib/helpers/page/common-tips.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const transformations = require("../../transformations");
const io = require("../../io");
const getMonitoringList = require("../../api-client/trackings/list");
const getMonitoringLastExecutions = require("../../api-client/trackings/last-executions");
const transformations = require('../../transformations');
const io = require('../../io');
const getMonitoringList = require('../../api-client/trackings/list');
const getMonitoringLastExecutions = require('../../api-client/trackings/last-executions');

// Predicate used to filter tips in tracking data
function predicateTip(tip) {
Expand All @@ -18,10 +18,10 @@ function predicateTip(tip) {

io.doExport(
transformations.flattenEachTrackingData(monitoringLastExecutions),
"trackingConf"
'trackingConf'
);
io.doExport(
transformations.groupTipsFromTrackingData(monitoringLastExecutions),
"commonTips"
'commonTips'
);
})();
20 changes: 10 additions & 10 deletions lib/helpers/page/monitors.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
const _ = require("underscore");
const { flattenObjects } = require("../../transformations");
const io = require("../../io");
const getMonitoringList = require("../../api-client/trackings/list");
const getMonitoringLastExecutions = require("../../api-client/trackings/last-executions");
const _ = require('underscore');
const { flattenObjects } = require('../../transformations');
const io = require('../../io');
const getMonitoringList = require('../../api-client/trackings/list');
const getMonitoringLastExecutions = require('../../api-client/trackings/last-executions');

(async () => {
const monitoringList = await getMonitoringList();

// Add a direct link to edition
_.map(
monitoringList.monitorings,
item =>
(item) =>
(item.editUrl =
"https://www.dareboost.com/" +
(item.lang ? item.lang : "en") +
"/tracking/edit/" +
'https://www.dareboost.com/' +
(item.lang ? item.lang : 'en') +
'/tracking/edit/' +
item.id)
);

io.doExport(flattenObjects(monitoringList.monitorings), "trackingConf");
io.doExport(flattenObjects(monitoringList.monitorings), 'trackingConf');
})();
20 changes: 10 additions & 10 deletions lib/helpers/page/statistics.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
const _ = require("underscore");
const transformations = require("../../transformations");
const io = require("../../io");
var Stats = require("fast-stats").Stats;
const getMonitoringList = require("../../api-client/trackings/list");
const getMonitoringReports = require("../../api-client/trackings/reports");
const _ = require('underscore');
const transformations = require('../../transformations');
const io = require('../../io');
var Stats = require('fast-stats').Stats;
const getMonitoringList = require('../../api-client/trackings/list');
const getMonitoringReports = require('../../api-client/trackings/reports');

(async () => {
const monitoringList = await getMonitoringList();
const allData = [];
const results = [];

const observedInfos = ["score", "weight"];
const observedTimings = ["firstByte", "startRender", "speedIndex"];
const observedInfos = ['score', 'weight'];
const observedTimings = ['firstByte', 'startRender', 'speedIndex'];

for (const i in monitoringList.monitorings) {
const monitor = monitoringList.monitorings[i];
Expand Down Expand Up @@ -72,11 +72,11 @@ const getMonitoringReports = require("../../api-client/trackings/reports");
p99: studiedStats.percentile(99).toFixed(0),
max: studiedStats.range()[1],
};
results.push(_.extend({ url: "", id: "", name: "All" }, result));
results.push(_.extend({ url: '', id: '', name: 'All' }, result));
});

io.doExport(
transformations.flattenObjects(results),
"page_monitor_statistics"
'page_monitor_statistics'
);
})();
18 changes: 9 additions & 9 deletions lib/helpers/scenario/status.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const util = require("util");
const _ = require("underscore");
const transformations = require("../../transformations");
const io = require("../../io");
const getScenarioList = require("../../api-client/scenario/list");
const getScenarioReports = require("../../api-client/scenario/reports");
const util = require('util');
const _ = require('underscore');
const transformations = require('../../transformations');
const io = require('../../io');
const getScenarioList = require('../../api-client/scenario/list');
const getScenarioReports = require('../../api-client/scenario/reports');

(async () => {
const allScenarioReports = [];
Expand All @@ -15,21 +15,21 @@ const getScenarioReports = require("../../api-client/scenario/reports");
if (scenarioReports.scenario) {
allScenarioReports.push({
error: false,
data: scenarioReports.scenario
data: scenarioReports.scenario,
});
}

scenarioReports = await getScenarioReports(scenario.id, 30240, 90, true);
if (scenarioReports.scenario) {
allScenarioReports.push({
error: true,
data: scenarioReports.scenario
data: scenarioReports.scenario,
});
}
}

io.doExport(
transformations.flattenScenariosReportSummariesData(allScenarioReports),
"scenarioStatuses"
'scenarioStatuses'
);
})();
Loading

0 comments on commit 23fa8aa

Please sign in to comment.