Update first batch of npm dependencies (#7169)

* Update dependencies in cucumber-js test framework

* Clear package-lock.json

* Fix tape test

* Replace rimraf with node-interal fs.rm

* Update Babel

* Update xmlbuilder

* Delete files in a sync way

Author: DennisOSRM

features/lib/osrm_loader.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const util = require('util');
-const Timeout = require('node-timeout');
+const { Timeout } = require('./utils');
 const tryConnect = require('../lib/try_connect');
 const errorReason = require('./utils').errorReason;
 

features/lib/try_connect.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const net = require('net');
-const Timeout = require('node-timeout');
 
 module.exports = function tryConnect(host, port, callback) {
   net.connect({ port: port, host: host })

features/lib/utils.js

@@ -1,9 +1,37 @@
 'use strict';
 
 const util = require('util');
+const { mkdir } = require('fs/promises');
+
+function Timeout(ms, options) {
+    return function (cb) {
+        let called = false;
+        const timer = setTimeout(() => {
+            if (!called) {
+                called = true;
+                cb(options.err || new Error(`Operation timed out after ${ms}ms`));
+            }
+        }, ms);
+
+        return function (...args) {
+            if (!called) {
+                called = true;
+                clearTimeout(timer);
+                cb(...args);
+            }
+        };
+    };
+}
+
+function createDir(dir, callback) {
+    mkdir(dir, { recursive: true })
+        .then(() => callback(null))
+        .catch(err => callback(err));
+}
 
 module.exports = {
 
+    createDir,
     ensureDecimal: (i) => {
         if (parseInt(i) === i) return i.toFixed(1);
         else return i;
@@ -13,5 +41,6 @@ module.exports = {
         return err.signal ?
             'killed by signal ' + err.signal :
             'exited with code ' + err.code;
-    }
+    },
+    Timeout
 };

features/step_definitions/distance_matrix.js

@@ -40,7 +40,7 @@ function tableCodeOnlyParse(table, annotation, format, callback) {
     this.reprocessAndLoadData((e) => {
         if (e) return callback(e);
         var testRow = (row, ri, cb) => {
-            var afterRequest = (err, res) => {
+            var afterRequest = (err, res, body) => {
                 if (err) return cb(err);
 
                 for (var k in row) {
@@ -57,8 +57,8 @@ function tableCodeOnlyParse(table, annotation, format, callback) {
 
                 var json;
                 got.code = 'unknown';
-                if (res.body.length) {
-                    json = JSON.parse(res.body);
+                if (body.length) {
+                    json = JSON.parse(body);
                     got.code = json.code;
                 }
 
@@ -126,13 +126,13 @@ function tableParse(table, noRoute, annotation, format, callback) {
         if (e) return callback(e);
         // compute matrix
 
-        this.requestTable(waypoints, params, (err, response) => {
+        this.requestTable(waypoints, params, (err, response, body) => {
             if (err) return callback(err);
-            if (!response.body.length) return callback(new Error('Invalid response body'));
+            if (!body.length) return callback(new Error('Invalid response body'));
 
             var result = [];
             if (format === 'json') {
-                var json = JSON.parse(response.body);
+                var json = JSON.parse(body);
 
                 if (annotation === 'fallback_speed_cells') {
                     result = table.raw().map(row => row.map(() => ''));
@@ -154,7 +154,6 @@ function tableParse(table, noRoute, annotation, format, callback) {
                     });
                 }
             } else { //flatbuffers
-                var body = response.body;
                 var bytes = new Uint8Array(body.length);
                 for (var indx = 0; indx < body.length; ++indx) {
                     bytes[indx] = body.charCodeAt(indx);

features/step_definitions/matching.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var util = require('util');
-var polyline = require('polyline');
+var polyline = require('@mapbox/polyline');
 
 module.exports = function () {
     this.When(/^I match I should get$/, (table, callback) => {
@@ -10,15 +10,15 @@ module.exports = function () {
         this.reprocessAndLoadData((e) => {
             if (e) return callback(e);
             var testRow = (row, ri, cb) => {
-                var afterRequest = (err, res) => {
+                var afterRequest = (err, res, body) => {
                     if (err) return cb(err);
                     var json;
 
                     var headers = new Set(table.raw()[0]);
 
                     got.code = 'unknown';
-                    if (res.body.length) {
-                        json = JSON.parse(res.body);
+                    if (body.length) {
+                        json = JSON.parse(body);
                         got.code = json.code;
                     }
 

features/step_definitions/nearest.js

@@ -12,15 +12,15 @@ module.exports = function () {
                 var inNode = this.findNodeByName(row.in);
                 if (!inNode) throw new Error(util.format('*** unknown in-node "%s"', row.in));
 
-                this.requestNearest(inNode, this.queryParams, (err, response) => {
+                this.requestNearest(inNode, this.queryParams, (err, response, body) => {
                     if (err) return cb(err);
                     var coord;
                     var headers = new Set(table.raw()[0]);
 
-                    var got = { in: row.in};
+                    var got = { in: row.in };
 
-                    if (response.body.length) {
-                        var json = JSON.parse(response.body);
+                    if (body.length) {
+                        var json = JSON.parse(body);
                         got.code = json.code;
 
                         if (response.statusCode === 200) {
@@ -72,12 +72,11 @@ module.exports = function () {
                 if (!outNode) throw new Error(util.format('*** unknown out-node "%s"', row.out));
 
                 this.queryParams.output = 'flatbuffers';
-                this.requestNearest(inNode, this.queryParams, (err, response) => {
+                this.requestNearest(inNode, this.queryParams, (err, response, body) => {
                     if (err) return cb(err);
                     var coord;
 
-                    if (response.statusCode === 200 && response.body.length) {
-                        var body = response.body;
+                    if (response.statusCode === 200 && body.length) {
                         var bytes = new Uint8Array(body.length);
                         for (var indx = 0; indx < body.length; ++indx) {
                             bytes[indx] = body.charCodeAt(indx);

features/step_definitions/requests.js

@@ -6,6 +6,7 @@ module.exports = function () {
             if (e) return callback(e);
             this.requestUrl(path, (err, res, body) => {
                 this.response = res;
+                this.body = body;
                 callback(err, res, body);
             });
         });
@@ -25,7 +26,7 @@ module.exports = function () {
 
     this.Then(/^status code should be (.+)$/, (code, callback) => {
         try {
-            this.json = JSON.parse(this.response.body);
+            this.json = JSON.parse(this.body);
         } catch(e) {
             return callback(e);
         }
@@ -35,7 +36,7 @@ module.exports = function () {
 
     this.Then(/^status message should be "(.*?)"$/, (message, callback) => {
         try {
-            this.json = JSON.parse(this.response.body);
+            this.json = JSON.parse(this.body);
         } catch(e) {
             return callback(e);
         }

features/step_definitions/trip.js

@@ -1,5 +1,5 @@
 var util = require('util');
-var polyline = require('polyline');
+var polyline = require('@mapbox/polyline');
 
 module.exports = function () {
     function add(a, b) {
@@ -12,7 +12,7 @@ module.exports = function () {
         this.reprocessAndLoadData((e) => {
             if (e) return callback(e);
             var testRow = (row, ri, cb) => {
-                var afterRequest = (err, res) => {
+                var afterRequest = (err, res, body) => {
                     if (err) return cb(err);
                     var headers = new Set(table.raw()[0]);
 
@@ -30,8 +30,8 @@ module.exports = function () {
 
                     var json;
                     got.code = 'unknown';
-                    if (res.body.length) {
-                        json = JSON.parse(res.body);
+                    if (body.length) {
+                        json = JSON.parse(body);
                         got.code = json.code;
                     }
 

features/support/cache.js

@@ -4,11 +4,11 @@ const d3 = require('d3-queue');
 const fs = require('fs');
 const util = require('util');
 const path = require('path');
-const mkdirp = require('mkdirp');
 const hash = require('../lib/hash');
-const rimraf = require('rimraf');
+const { rm } = require('fs/promises');
+const { createDir } = require('../lib/utils');
 
-module.exports = function() {
+module.exports = function () {
     this.initializeCache = (callback) => {
         this.getOSRMHash((err, osrmHash) => {
             if (err) return callback(err);
@@ -45,7 +45,7 @@ module.exports = function() {
                 this.featureProcessedCacheDirectories[uri] = featureProcessedCacheDirectory;
 
                 d3.queue(1)
-                    .defer(mkdirp, featureProcessedCacheDirectory)
+                    .defer(createDir, featureProcessedCacheDirectory)
                     .defer(this.cleanupFeatureCache.bind(this), featureCacheDirectory, hash)
                     .defer(this.cleanupProcessedFeatureCache.bind(this), featureProcessedCacheDirectory, this.osrmHash)
                     .awaitAll(callback);
@@ -61,33 +61,29 @@ module.exports = function() {
     this.cleanupProcessedFeatureCache = (directory, osrmHash, callback) => {
         let parentPath = path.resolve(path.join(directory, '..'));
         fs.readdir(parentPath, (err, files) => {
+            if (err) return callback(err);
             let q = d3.queue();
-            function runStats(path, callback) {
-                fs.stat(path, (err, stat) => {
+            files.forEach((f) => {
+                let filePath = path.join(parentPath, f);
+                fs.stat(filePath, (err, stat) => {
                     if (err) return callback(err);
-                    callback(null, {file: path, stat: stat});
-                });
-            }
-            files.map(f => { q.defer(runStats, path.join(parentPath, f)); });
-            q.awaitAll((err, results) => {
-                if (err) return callback(err);
-                let q = d3.queue();
-                results.forEach(r => {
-                    if (r.stat.isDirectory() && r.file.search(osrmHash) < 0) {
-                        q.defer(rimraf, r.file);
+                    if (stat.isDirectory() && filePath.search(osrmHash) < 0) {
+                        rm(filePath, { recursive: true, force: true });
                     }
                 });
-                q.awaitAll(callback);
             });
+            q.awaitAll(callback);
         });
     };
 
     this.cleanupFeatureCache = (directory, featureHash, callback) => {
         let parentPath = path.resolve(path.join(directory, '..'));
         fs.readdir(parentPath, (err, files) => {
+            if (err) return callback(err);
             let q = d3.queue();
-            files.filter(name => { return name !== featureHash;})
-                .map((f) => { q.defer(rimraf, path.join(parentPath, f)); });
+            files.filter((name) => name !== featureHash).forEach((f) => {
+                rm(path.join(parentPath, f), { recursive: true, force: true });
+            });
             q.awaitAll(callback);
         });
     };

features/support/hooks.js

@@ -2,13 +2,13 @@
 
 var d3 = require('d3-queue');
 var path = require('path');
-var mkdirp = require('mkdirp');
-var rimraf = require('rimraf');
+var fs = require('fs');
 var OSM = require('../lib/osm');
 var OSRMLoader = require('../lib/osrm_loader');
+const { createDir } = require('../lib/utils');
 
 module.exports = function () {
-    this.registerHandler('BeforeFeatures', {timeout: 30000},  (features, callback) => {
+    this.registerHandler('BeforeFeatures', { timeout: 30000 }, (features, callback) => {
         this.osrmLoader = new OSRMLoader(this);
         this.OSMDB = new OSM.DB();
 
@@ -48,8 +48,8 @@ module.exports = function () {
         let logDir = path.join(this.LOGS_PATH, this.featureID);
         this.scenarioLogFile = path.join(logDir, this.scenarioID) + '.log';
         d3.queue(1)
-            .defer(mkdirp, logDir)
-            .defer(rimraf, this.scenarioLogFile)
+            .defer(createDir, logDir)
+            .defer((callback) => fs.rm(this.scenarioLogFile, { force: true }, callback))
             .awaitAll(callback);
         // uncomment to get path to logfile
         // console.log('  Writing logging output to ' + this.scenarioLogFile);