Node.js 12 support:

- Update `gc-stats` to version 1.4.0 - Replace `zipfile` -> `adm-zip` - Update `libxmljs` to version 0.19.7 - Update `sqlite` to version 4.2.0 - Adapted pool acquires to the new version of `cartodb-redis` - Adapted test to use `adm-zip`
2020-05-18 11:32:41 +02:00 · 2020-05-18 11:32:41 +02:00 · 0c92fcaf96
commit 0c92fcaf96
parent 7f1de39797
10 changed files with 299 additions and 469 deletions
--- a/lib/batch/leader/provider/redis-distlock.js
+++ b/lib/batch/leader/provider/redis-distlock.js
@ -58,16 +58,16 @@ RedisDistlockLocker.prototype.unlock = function (resource, callback) {
    var self = this;
    var lock = this._getLock(resourceId(resource));
    if (lock) {
-        this.pool.acquire(REDIS_DISTLOCK.DB, function (err, client) {
-            if (err) {
-                return callback(err);
-            }
-            self.redlock.servers = [client];
-            return self.redlock.unlock(lock, function (err) {
-                self.pool.release(REDIS_DISTLOCK.DB, client);
-                return callback(err);
-            });
-        });
+        this.pool.acquire(REDIS_DISTLOCK.DB)
+            .then(client => {
+                self.redlock.servers = [client];
+                self.redlock.unlock(lock, function (err) {
+                    self.pool.release(REDIS_DISTLOCK.DB, client)
+                        .catch(err => debug(err))
+                        .finally(() => err ? callback(err) : callback());
+                });
+            })
+            .catch(err => callback(err));
    }
 };

@ -84,28 +84,28 @@ RedisDistlockLocker.prototype._setLock = function (resource, lock) {

 RedisDistlockLocker.prototype._tryExtend = function (lock, ttl, callback) {
    var self = this;
-    this.pool.acquire(REDIS_DISTLOCK.DB, function (err, client) {
-        if (err) {
-            return callback(err);
-        }
-        self.redlock.servers = [client];
-        return lock.extend(ttl, function (err, _lock) {
-            self.pool.release(REDIS_DISTLOCK.DB, client);
-            return callback(err, _lock);
-        });
-    });
+    this.pool.acquire(REDIS_DISTLOCK.DB)
+        .then(client => {
+            self.redlock.servers = [client];
+            lock.extend(ttl, function (err, _lock) {
+                self.pool.release(REDIS_DISTLOCK.DB, client)
+                    .catch(err => debug(err))
+                    .finally(() => err ? callback(err) : callback(null, _lock));
+            });
+        })
+        .catch(err => callback(err));
 };

 RedisDistlockLocker.prototype._tryAcquire = function (resource, ttl, callback) {
    var self = this;
-    this.pool.acquire(REDIS_DISTLOCK.DB, function (err, client) {
-        if (err) {
-            return callback(err);
-        }
-        self.redlock.servers = [client];
-        return self.redlock.lock(resource, ttl, function (err, _lock) {
-            self.pool.release(REDIS_DISTLOCK.DB, client);
-            return callback(err, _lock);
-        });
-    });
+    this.pool.acquire(REDIS_DISTLOCK.DB)
+        .then(client => {
+            self.redlock.servers = [client];
+            self.redlock.lock(resource, ttl, function (err, _lock) {
+                self.pool.release(REDIS_DISTLOCK.DB, client)
+                    .catch(err => debug(err))
+                    .finally(() => err ? callback(err) : callback(null, _lock));
+            });
+        })
+        .catch(err => callback(err));
 };
--- a/lib/batch/maintenance/host-user-queue-mover.js
+++ b/lib/batch/maintenance/host-user-queue-mover.js
@ -75,36 +75,38 @@ HostUserQueueMover.prototype.moveOldQueueJobs = function (host, callback) {

 HostUserQueueMover.prototype.processNextJob = function (host, callback) {
    var self = this;
-    this.pool.acquire(QUEUE.OLD.DB, function (err, client) {
-        if (err) {
-            return callback(err);
-        }
+    this.pool.acquire(QUEUE.OLD.DB)
+        .then(client => {
+            client.lpop(QUEUE.OLD.PREFIX + host, function (err, jobId) {
+                self.pool.release(QUEUE.OLD.DB, client)
+                    .then(() => {
+                        if (err) {
+                            return callback(err);
+                        }

-        client.lpop(QUEUE.OLD.PREFIX + host, function (err, jobId) {
-            if (err) {
-                return callback(err);
-            }
-            self.pool.release(QUEUE.OLD.DB, client);
-            debug('Found jobId=%s at queue=%s', jobId, host);
-            if (!jobId) {
-                var emptyQueueError = new Error('Empty queue');
-                emptyQueueError.name = 'EmptyQueue';
-                return callback(emptyQueueError);
-            }
-            self.jobService.get(jobId, function (err, job) {
-                if (err) {
-                    debug(err);
-                    return callback();
-                }
-                if (job) {
-                    return self.jobQueue.enqueueFirst(job.data.user, jobId, function () {
-                        return callback();
-                    });
-                }
-                return callback();
+                        debug('Found jobId=%s at queue=%s', jobId, host);
+                        if (!jobId) {
+                            var emptyQueueError = new Error('Empty queue');
+                            emptyQueueError.name = 'EmptyQueue';
+                            return callback(emptyQueueError);
+                        }
+                        self.jobService.get(jobId, function (err, job) {
+                            if (err) {
+                                debug(err);
+                                return callback();
+                            }
+                            if (job) {
+                                return self.jobQueue.enqueueFirst(job.data.user, jobId, function () {
+                                    return callback();
+                                });
+                            }
+                            return callback();
+                        });
+                    })
+                    .catch(err => callback(err));
            });
-        });
-    });
+        })
+        .catch(err => callback(err));
 };

 HostUserQueueMover.prototype.getOldQueues = function (callback) {
@ -112,15 +114,15 @@ HostUserQueueMover.prototype.getOldQueues = function (callback) {
    var hosts = {};
    var self = this;

-    this.pool.acquire(QUEUE.OLD.DB, function (err, client) {
-        if (err) {
-            return callback(err);
-        }
-        self._getOldQueues(client, initialCursor, hosts, function (err, hosts) {
-            self.pool.release(QUEUE.DB, client);
-            return callback(err, Object.keys(hosts));
-        });
-    });
+    this.pool.acquire(QUEUE.OLD.DB)
+        .then(client => {
+            self._getOldQueues(client, initialCursor, hosts, function (err, hosts) {
+                self.pool.release(QUEUE.DB, client)
+                    .then(() => err ? callback(err) : callback(null, Object.keys(hosts)))
+                    .catch(err => callback(err));
+            });
+        })
+        .catch(err => callback(err));
 };

 HostUserQueueMover.prototype._getOldQueues = function (client, cursor, hosts, callback) {
--- a/lib/batch/pubsub/job-publisher.js
+++ b/lib/batch/pubsub/job-publisher.js
@ -11,21 +11,21 @@ function JobPublisher (pool) {
 JobPublisher.prototype.publish = function (user) {
    var self = this;

-    this.pool.acquire(Channel.DB, function (err, client) {
-        if (err) {
-            return error('Error adquiring redis client: ' + err.message);
-        }
+    this.pool.acquire(Channel.DB)
+        .then(client => {
+            client.publish(Channel.NAME, user, function (err) {
+                self.pool.release(Channel.DB, client)
+                    .then(() => {
+                        if (err) {
+                            return error('Error publishing to ' + Channel.NAME + ':' + user + ', ' + err.message);
+                        }

-        client.publish(Channel.NAME, user, function (err) {
-            self.pool.release(Channel.DB, client);
-
-            if (err) {
-                return error('Error publishing to ' + Channel.NAME + ':' + user + ', ' + err.message);
-            }
-
-            debug('publish to ' + Channel.NAME + ':' + user);
-        });
-    });
+                        debug('publish to ' + Channel.NAME + ':' + user);
+                    })
+                    .catch(err => error('Error releasing redis client: ' + err.message));
+            });
+        })
+        .catch(err => error('Error adquiring redis client: ' + err.message));
 };

 module.exports = JobPublisher;
--- a/lib/batch/pubsub/job-subscriber.js
+++ b/lib/batch/pubsub/job-subscriber.js
@ -13,34 +13,34 @@ module.exports = JobSubscriber;
 JobSubscriber.prototype.subscribe = function (onJobHandler, callback) {
    var self = this;

-    self.pool.acquire(Channel.DB, function (err, client) {
-        if (err) {
+    self.pool.acquire(Channel.DB)
+        .then(client => {
+            self.client = client;
+            client.removeAllListeners('message');
+            client.unsubscribe(Channel.NAME);
+            client.subscribe(Channel.NAME);
+            client.on('message', function (channel, user) {
+                debug('message received in channel=%s from user=%s', channel, user);
+                onJobHandler(user);
+            });
+
+            client.on('error', function () {
+                self.unsubscribe();
+                self.pool.release(Channel.DB, client)
+                    .catch(err => error('Error releasing redis client: ' + err.message));
+                self.subscribe(onJobHandler);
+            });
+
            if (callback) {
-                callback(err);
+                callback();
+            }
+        })
+        .catch(err => {
+            error('Error adquiring redis client: ' + err.message);
+            if (callback) {
+                return callback(err);
            }
-            return error('Error adquiring redis client: ' + err.message);
-        }
-
-        self.client = client;
-        client.removeAllListeners('message');
-        client.unsubscribe(Channel.NAME);
-        client.subscribe(Channel.NAME);
-
-        client.on('message', function (channel, user) {
-            debug('message received in channel=%s from user=%s', channel, user);
-            onJobHandler(user);
        });
-
-        client.on('error', function () {
-            self.unsubscribe();
-            self.pool.release(Channel.DB, client);
-            self.subscribe(onJobHandler);
-        });
-
-        if (callback) {
-            callback();
-        }
-    });
 };

 JobSubscriber.prototype.unsubscribe = function (callback) {
--- a/package-lock.json
+++ b/package-lock.json
@ -494,6 +494,12 @@
      "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
      "dev": true
    },
+    "adm-zip": {
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz",
+      "integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g==",
+      "dev": true
+    },
    "agent-base": {
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
@ -727,9 +733,9 @@
      "integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ=="
    },
    "bindings": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
-      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.1.tgz",
+      "integrity": "sha512-i47mqjF9UbjxJhxGf+pZ6kSxrnI3wBLlnGI2ArWJ4r0VrvDS7ZYXkprq/pLaBWYq4GM0r4zdHY+NNRqEMU7uew==",
      "dev": true
    },
    "bintrees": {
@ -2277,33 +2283,29 @@
      }
    },
    "gc-stats": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/gc-stats/-/gc-stats-1.2.1.tgz",
-      "integrity": "sha512-CPQfMBQPGkqG4upxCn4zHxYZo20woPClSeqnC/WK8pFqlfAtz6zpxbOfnmxOIDYiC26H/pYlWQfdoPVGoqxFUA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/gc-stats/-/gc-stats-1.4.0.tgz",
+      "integrity": "sha512-4FcCj9e8j8rCjvLkqRpGZBLgTC/xr9XEf5By3x77cDucWWB3pJK6FEwXZCTCbb4z8xdaOoi4owBNrvn3ciDdxA==",
      "requires": {
-        "nan": "^2.10.0",
-        "node-pre-gyp": "^0.11.0"
+        "nan": "^2.13.2",
+        "node-pre-gyp": "^0.13.0"
      },
      "dependencies": {
        "abbrev": {
          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-          "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+          "bundled": true
        },
        "ansi-regex": {
          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+          "bundled": true
        },
        "aproba": {
          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-          "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+          "bundled": true
        },
        "are-we-there-yet": {
          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-          "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+          "bundled": true,
          "requires": {
            "delegates": "^1.0.0",
            "readable-stream": "^2.0.6"
@ -2311,13 +2313,11 @@
        },
        "balanced-match": {
          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+          "bundled": true
        },
        "brace-expansion": {
          "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "bundled": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@ -2325,69 +2325,57 @@
        },
        "chownr": {
          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
-          "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
+          "bundled": true
        },
        "code-point-at": {
          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+          "bundled": true
        },
        "concat-map": {
          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+          "bundled": true
        },
        "console-control-strings": {
          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+          "bundled": true
        },
        "core-util-is": {
          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+          "bundled": true
        },
        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "4.1.1",
+          "bundled": true,
          "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
          }
        },
        "deep-extend": {
          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-          "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+          "bundled": true
        },
        "delegates": {
          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+          "bundled": true
        },
        "detect-libc": {
          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-          "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
+          "bundled": true
        },
        "fs-minipass": {
          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
-          "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+          "bundled": true,
          "requires": {
            "minipass": "^2.2.1"
          }
        },
        "fs.realpath": {
          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+          "bundled": true
        },
        "gauge": {
          "version": "2.7.4",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+          "bundled": true,
          "requires": {
            "aproba": "^1.0.3",
            "console-control-strings": "^1.0.0",
@ -2400,9 +2388,8 @@
          }
        },
        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "version": "7.1.3",
+          "bundled": true,
          "requires": {
            "fs.realpath": "^1.0.0",
            "inflight": "^1.0.4",
@ -2414,29 +2401,25 @@
        },
        "has-unicode": {
          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+          "bundled": true
        },
        "iconv-lite": {
          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "bundled": true,
          "requires": {
            "safer-buffer": ">= 2.1.2 < 3"
          }
        },
        "ignore-walk": {
          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
-          "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
+          "bundled": true,
          "requires": {
            "minimatch": "^3.0.4"
          }
        },
        "inflight": {
          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+          "bundled": true,
          "requires": {
            "once": "^1.3.0",
            "wrappy": "1"
@ -2444,91 +2427,77 @@
        },
        "inherits": {
          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+          "bundled": true
        },
        "ini": {
          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+          "bundled": true
        },
        "is-fullwidth-code-point": {
          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "bundled": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
        },
        "isarray": {
          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+          "bundled": true
        },
        "minimatch": {
          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "bundled": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
        },
        "minimist": {
          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+          "bundled": true
        },
        "minipass": {
          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-          "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+          "bundled": true,
          "requires": {
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.0"
          }
        },
        "minizlib": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz",
-          "integrity": "sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==",
+          "version": "1.2.1",
+          "bundled": true,
          "requires": {
            "minipass": "^2.2.1"
          }
        },
        "mkdirp": {
          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "bundled": true,
          "requires": {
            "minimist": "0.0.8"
          }
        },
        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "nan": {
+          "version": "2.14.1",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+          "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="
        },
        "needle": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
-          "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
+          "version": "2.3.1",
+          "bundled": true,
          "requires": {
-            "debug": "^2.1.2",
+            "debug": "^4.1.0",
            "iconv-lite": "^0.4.4",
            "sax": "^1.2.4"
-          },
-          "dependencies": {
-            "sax": {
-              "version": "1.2.4",
-              "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-              "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-            }
          }
        },
        "node-pre-gyp": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz",
-          "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==",
+          "version": "0.13.0",
+          "bundled": true,
          "requires": {
            "detect-libc": "^1.0.2",
            "mkdirp": "^0.5.1",
@ -2544,22 +2513,19 @@
        },
        "nopt": {
          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+          "bundled": true,
          "requires": {
            "abbrev": "1",
            "osenv": "^0.1.4"
          }
        },
        "npm-bundled": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-          "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g=="
+          "version": "1.0.6",
+          "bundled": true
        },
        "npm-packlist": {
-          "version": "1.1.12",
-          "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz",
-          "integrity": "sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==",
+          "version": "1.4.1",
+          "bundled": true,
          "requires": {
            "ignore-walk": "^3.0.1",
            "npm-bundled": "^1.0.1"
@ -2567,8 +2533,7 @@
        },
        "npmlog": {
          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-          "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+          "bundled": true,
          "requires": {
            "are-we-there-yet": "~1.1.2",
            "console-control-strings": "~1.1.0",
@ -2578,36 +2543,30 @@
        },
        "number-is-nan": {
          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+          "bundled": true
        },
        "object-assign": {
          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+          "bundled": true
        },
        "once": {
          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+          "bundled": true,
          "requires": {
            "wrappy": "1"
          }
        },
        "os-homedir": {
          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+          "bundled": true
        },
        "os-tmpdir": {
          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-          "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+          "bundled": true
        },
        "osenv": {
          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-          "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+          "bundled": true,
          "requires": {
            "os-homedir": "^1.0.0",
            "os-tmpdir": "^1.0.0"
@ -2615,18 +2574,15 @@
        },
        "path-is-absolute": {
          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+          "bundled": true
        },
        "process-nextick-args": {
          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+          "bundled": true
        },
        "rc": {
          "version": "1.2.8",
-          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-          "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+          "bundled": true,
          "requires": {
            "deep-extend": "^0.6.0",
            "ini": "~1.3.0",
@ -2636,15 +2592,13 @@
          "dependencies": {
            "minimist": {
              "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+              "bundled": true
            }
          }
        },
        "readable-stream": {
          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "bundled": true,
          "requires": {
            "core-util-is": "~1.0.0",
            "inherits": "~2.0.3",
@ -2656,42 +2610,39 @@
          }
        },
        "rimraf": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+          "version": "2.6.3",
+          "bundled": true,
          "requires": {
-            "glob": "^7.0.5"
+            "glob": "^7.1.3"
          }
        },
        "safe-buffer": {
          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+          "bundled": true
        },
        "safer-buffer": {
          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-          "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+          "bundled": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true
        },
        "semver": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
+          "version": "5.7.0",
+          "bundled": true
        },
        "set-blocking": {
          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+          "bundled": true
        },
        "signal-exit": {
          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+          "bundled": true
        },
        "string-width": {
          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "bundled": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@ -2700,34 +2651,30 @@
        },
        "string_decoder": {
          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "bundled": true,
          "requires": {
            "safe-buffer": "~5.1.0"
          }
        },
        "strip-ansi": {
          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "bundled": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
        },
        "strip-json-comments": {
          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+          "bundled": true
        },
        "tar": {
-          "version": "4.4.6",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz",
-          "integrity": "sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==",
+          "version": "4.4.8",
+          "bundled": true,
          "requires": {
-            "chownr": "^1.0.1",
+            "chownr": "^1.1.1",
            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.3",
-            "minizlib": "^1.1.0",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
            "mkdirp": "^0.5.0",
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.2"
@ -2735,26 +2682,22 @@
        },
        "util-deprecate": {
          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+          "bundled": true
        },
        "wide-align": {
          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-          "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+          "bundled": true,
          "requires": {
            "string-width": "^1.0.2 || 2"
          }
        },
        "wrappy": {
          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+          "bundled": true
        },
        "yallist": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
-          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k="
+          "version": "3.0.3",
+          "bundled": true
        }
      }
    },
@ -3589,20 +3532,20 @@
      }
    },
    "libxmljs": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/libxmljs/-/libxmljs-0.19.5.tgz",
-      "integrity": "sha512-mKlafbSIsgZCXcha6loyMN/Q1kcbNJ5N3VC/rS0vrJXdI99TzEI2i2rPp10HN/B70vSPh6bq6nHhoCT19eGtTw==",
+      "version": "0.19.7",
+      "resolved": "https://registry.npmjs.org/libxmljs/-/libxmljs-0.19.7.tgz",
+      "integrity": "sha512-lFJyG9T1mVwTzNTw6ZkvIt0O+NsIR+FTE+RcC2QDFGU8YMnQrnyEOGrj6HWSe1AdwQK7s37BOp4NL+pcAqfK2g==",
      "dev": true,
      "requires": {
        "bindings": "~1.3.0",
-        "nan": "~2.10.0",
+        "nan": "~2.14.0",
        "node-pre-gyp": "~0.11.0"
      },
      "dependencies": {
        "nan": {
-          "version": "2.10.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-          "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+          "version": "2.14.1",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+          "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
          "dev": true
        }
      }
@ -3917,7 +3860,8 @@
    "nan": {
      "version": "2.11.1",
      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
-      "integrity": "sha1-kOIrzLjKV+pM03zIPTgZtS7qZ2Y="
+      "integrity": "sha1-kOIrzLjKV+pM03zIPTgZtS7qZ2Y=",
+      "optional": true
    },
    "natural-compare": {
      "version": "1.4.0",
@ -5402,20 +5346,19 @@
      "dev": true
    },
    "sqlite3": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.6.tgz",
-      "integrity": "sha512-EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz",
+      "integrity": "sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==",
      "dev": true,
      "requires": {
-        "nan": "~2.10.0",
-        "node-pre-gyp": "^0.11.0",
-        "request": "^2.87.0"
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.11.0"
      },
      "dependencies": {
        "nan": {
-          "version": "2.10.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-          "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+          "version": "2.14.1",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+          "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
          "dev": true
        }
      }
@ -5986,81 +5929,6 @@
        "camelcase": "^3.0.0",
        "lodash.assign": "^4.1.0"
      }
-    },
-    "zipfile": {
-      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.12.tgz",
-      "integrity": "sha512-zA60gW+XgQBu/Q4qV3BCXNIDRald6Xi5UOPj3jWGlnkjmBHaKDwIz7kyXWV3kq7VEsQN/2t/IWjdXdKeVNm6Eg==",
-      "dev": true,
-      "requires": {
-        "nan": "~2.10.0",
-        "node-pre-gyp": "~0.10.2"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "nan": {
-          "version": "2.10.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-          "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
-          "dev": true
-        },
-        "node-pre-gyp": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
-          "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
-          "dev": true,
-          "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-          "dev": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-          "dev": true
-        }
-      }
    }
  }
 }
--- a/package.json
+++ b/package.json
@ -36,7 +36,7 @@
    "cartodb-redis": "^3.0.0",
    "debug": "^4.1.1",
    "express": "^4.16.4",
-    "gc-stats": "1.2.1",
+    "gc-stats": "^1.4.0",
    "log4js": "cartodb/log4js-node#cdb",
    "lru-cache": "~2.5.0",
    "mkdirp": "0.5.1",
@ -57,20 +57,20 @@
    "yargs": "~5.0.0"
  },
  "devDependencies": {
+    "adm-zip": "^0.4.14",
    "eslint": "^6.8.0",
    "eslint-config-standard": "^14.1.0",
    "eslint-plugin-import": "^2.19.1",
    "eslint-plugin-node": "^10.0.0",
    "eslint-plugin-promise": "^4.2.1",
    "eslint-plugin-standard": "^4.0.1",
-    "libxmljs": "0.19.5",
+    "libxmljs": "^0.19.7",
    "mocha": "^5.2.0",
    "mockdate": "^2.0.2",
    "nyc": "^15.0.0",
    "shapefile": "0.3.0",
-    "sqlite3": "^4.0.6",
-    "zipfile": "0.5.12",
-    "sinon": "^9.0.0"
+    "sinon": "^9.0.0",
+    "sqlite3": "^4.2.0"
  },
  "scripts": {
    "lint:fix": "eslint --fix app.js \"lib/**/*.js\" \"test/**/*.js\"",
--- a/test/acceptance/export/shapefile-test.js
+++ b/test/acceptance/export/shapefile-test.js
@ -6,13 +6,25 @@ var server = require('../../../lib/server')();
 var assert = require('../../support/assert');
 var querystring = require('querystring');
 var shapefile = require('shapefile');
-var _ = require('underscore');
-var zipfile = require('zipfile');
+const AdmZip = require('adm-zip');
 var fs = require('fs');

-describe('export.shapefile', function () {
-// SHP tests
+function assertZipfileContent (content, filename = 'cartodb-query') {
+    const tmpfile = '/tmp/myshape.zip';
+    const err = fs.writeFileSync(tmpfile, content, 'binary');

+    assert.ifError(err);
+
+    const names = new AdmZip(tmpfile).getEntries().map(entry => entry.name);
+    assert.ok(names.includes(`${filename}.shp`), `SHP zipfile does not contain .shp: ${names}`);
+    assert.ok(names.includes(`${filename}.shx`), `SHP zipfile does not contain .shx: ${names}`);
+    assert.ok(names.includes(`${filename}.dbf`), `SHP zipfile does not contain .dbf: ${names}`);
+    assert.ok(names.includes(`${filename}.prj`), `SHP zipfile does not contain .prj: ${names}`);
+
+    fs.unlinkSync(tmpfile);
+}
+
+describe('export.shapefile', function () {
    it('SHP format, unauthenticated', function (done) {
        assert.response(server, {
            url: '/api/v1/sql?q=SELECT%20*%20FROM%20untitle_table_4%20LIMIT%201&format=shp',
@ -25,18 +37,7 @@ describe('export.shapefile', function () {
            var cd = res.headers['content-disposition'];
            assert.strictEqual(true, /^attachment/.test(cd), 'SHP is not disposed as attachment: ' + cd);
            assert.strictEqual(true, /filename=cartodb-query.zip/gi.test(cd));
-            var tmpfile = '/tmp/myshape.zip';
-            var writeErr = fs.writeFileSync(tmpfile, res.body, 'binary');
-            if (writeErr) {
-                return done(writeErr);
-            }
-            var zf = new zipfile.ZipFile(tmpfile);
-            assert.ok(_.contains(zf.names, 'cartodb-query.shp'), 'SHP zipfile does not contain .shp: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.shx'), 'SHP zipfile does not contain .shx: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.dbf'), 'SHP zipfile does not contain .dbf: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.prj'), 'SHP zipfile does not contain .prj: ' + zf.names);
-            // TODO: check DBF contents
-            fs.unlinkSync(tmpfile);
+            assertZipfileContent(res.body);
            done();
        });
    });
@ -89,17 +90,7 @@ describe('export.shapefile', function () {
            var cd = res.headers['content-disposition'];
            assert.strictEqual(true, /^attachment/.test(cd), 'SHP is not disposed as attachment: ' + cd);
            assert.strictEqual(true, /filename=myshape.zip/gi.test(cd));
-            var tmpfile = '/tmp/myshape.zip';
-            var writeErr = fs.writeFileSync(tmpfile, res.body, 'binary');
-            if (writeErr) {
-                return done(writeErr);
-            }
-            var zf = new zipfile.ZipFile(tmpfile);
-            assert.ok(_.contains(zf.names, 'myshape.shp'), 'SHP zipfile does not contain .shp: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'myshape.shx'), 'SHP zipfile does not contain .shx: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'myshape.dbf'), 'SHP zipfile does not contain .dbf: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'myshape.prj'), 'SHP zipfile does not contain .prj: ' + zf.names);
-            fs.unlinkSync(tmpfile);
+            assertZipfileContent(res.body, 'myshape');
            done();
        });
    });
@ -122,11 +113,11 @@ describe('export.shapefile', function () {
            if (writeErr) {
                return done(writeErr);
            }
-            var zf = new zipfile.ZipFile(tmpfile);
-            assert.ok(_.contains(zf.names, fname + '.shp'), 'SHP zipfile does not contain .shp: ' + zf.names);
-            assert.ok(_.contains(zf.names, fname + '.shx'), 'SHP zipfile does not contain .shx: ' + zf.names);
-            assert.ok(_.contains(zf.names, fname + '.dbf'), 'SHP zipfile does not contain .dbf: ' + zf.names);
-            assert.ok(_.contains(zf.names, fname + '.prj'), 'SHP zipfile does not contain .prj: ' + zf.names);
+            const names = new AdmZip(tmpfile).getEntries().map(entry => entry.name);
+            assert.ok(names.includes(`${fname}.shp`), `SHP zipfile does not contain .shp: ${names}`);
+            assert.ok(names.includes(`${fname}.shx`), `SHP zipfile does not contain .shx: ${names}`);
+            assert.ok(names.includes(`${fname}.dbf`), `SHP zipfile does not contain .dbf: ${names}`);
+            assert.ok(names.includes(`${fname}.prj`), `SHP zipfile does not contain .prj: ${names}`);
            fs.unlinkSync(tmpfile);
            done();
        });
@ -143,18 +134,7 @@ describe('export.shapefile', function () {
            assert.strictEqual(res.statusCode, 200, res.body);
            var cd = res.headers['content-disposition'];
            assert.strictEqual(true, /filename=cartodb-query.zip/gi.test(cd));
-            var tmpfile = '/tmp/myshape.zip';
-            var writeErr = fs.writeFileSync(tmpfile, res.body, 'binary');
-            if (writeErr) {
-                return done(writeErr);
-            }
-            var zf = new zipfile.ZipFile(tmpfile);
-            assert.ok(_.contains(zf.names, 'cartodb-query.shp'), 'SHP zipfile does not contain .shp: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.shx'), 'SHP zipfile does not contain .shx: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.dbf'), 'SHP zipfile does not contain .dbf: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.prj'), 'SHP zipfile does not contain .prj: ' + zf.names);
-            // TODO: check contents of the DBF
-            fs.unlinkSync(tmpfile);
+            assertZipfileContent(res.body);
            done();
        });
    });
@ -179,8 +159,7 @@ describe('export.shapefile', function () {
            if (writeErr) {
                return done(writeErr);
            }
-            var zf = new zipfile.ZipFile(tmpfile);
-            var buffer = zf.readFileSync('myshape.dbf');
+            const buffer = new AdmZip(tmpfile).getEntry('myshape.dbf').getData();
            fs.unlinkSync(tmpfile);
            var strings = buffer.toString();
            assert.ok(/♥♦♣♠/.exec(strings), "Cannot find '♥♦♣♠' in here:\n" + strings);
@ -259,8 +238,7 @@ describe('export.shapefile', function () {
            if (writeErr) {
                return done(writeErr);
            }
-            var zf = new zipfile.ZipFile(tmpfile);
-            var buffer = zf.readFileSync('myshape.dbf');
+            const buffer = new AdmZip(tmpfile).getEntry('myshape.dbf').getData();
            fs.unlinkSync(tmpfile);
            var strings = buffer.toString();
            assert.ok(!/skipme/.exec(strings), "Could not skip 'skipme' field:\n" + strings);
@ -276,18 +254,7 @@ describe('export.shapefile', function () {
            var cd = res.headers['content-disposition'];
            assert.strictEqual(true, /^attachment/.test(cd), 'SHP is not disposed as attachment: ' + cd);
            assert.strictEqual(true, /filename=cartodb-query.zip/gi.test(cd));
-            var tmpfile = '/tmp/myshape.zip';
-            var writeErr = fs.writeFileSync(tmpfile, res.body, 'binary');
-            if (writeErr) {
-                return done(writeErr);
-            }
-            var zf = new zipfile.ZipFile(tmpfile);
-            assert.ok(_.contains(zf.names, 'cartodb-query.shp'), 'SHP zipfile does not contain .shp: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.shx'), 'SHP zipfile does not contain .shx: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.dbf'), 'SHP zipfile does not contain .dbf: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.prj'), 'SHP zipfile does not contain .prj: ' + zf.names);
-            // TODO: check DBF contents
-            fs.unlinkSync(tmpfile);
+            assertZipfileContent(res.body);
            if (!--waiting) {
                done();
            }
@ -325,18 +292,7 @@ describe('export.shapefile', function () {
            assert.strictEqual(res.statusCode, 200, res.body);
            var cd = res.headers['content-disposition'];
            assert.strictEqual(true, /filename=cartodb-query.zip/gi.test(cd));
-            var tmpfile = '/tmp/myshape.zip';
-            var writeErr = fs.writeFileSync(tmpfile, res.body, 'binary');
-            if (writeErr) {
-                return done(writeErr);
-            }
-            var zf = new zipfile.ZipFile(tmpfile);
-            assert.ok(_.contains(zf.names, 'cartodb-query.shp'), 'SHP zipfile does not contain .shp: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.shx'), 'SHP zipfile does not contain .shx: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.dbf'), 'SHP zipfile does not contain .dbf: ' + zf.names);
-            assert.ok(_.contains(zf.names, 'cartodb-query.prj'), 'SHP zipfile does not contain .prj: ' + zf.names);
-            // TODO: check contents of the DBF
-            fs.unlinkSync(tmpfile);
+            assertZipfileContent(res.body);
            done();
        });
    });
@ -370,14 +326,12 @@ describe('export.shapefile', function () {
                return done(err);
            }

-            var zf = new zipfile.ZipFile(tmpShpPath);
-            zf.names.forEach(function (name) {
-                var buffer = zf.readFileSync(name);
-                var tmpDbfPath = '/tmp/' + name;
-                err = fs.writeFileSync(tmpDbfPath, buffer);
-                if (err) {
-                    return done(err);
-                }
+            const zf = new AdmZip(tmpShpPath);
+            zf.getEntries().forEach(entry => {
+                const buffer = entry.getData();
+                const tmpDbfPath = `/tmp/${entry.name}`;
+                const err = fs.writeFileSync(tmpDbfPath, buffer);
+                assert.ifError(err);
            });
            shapefile.read('/tmp/' + filename, function (err, collection) {
                if (err) {
--- a/test/integration/batch/job-publisher-test.js
+++ b/test/integration/batch/job-publisher-test.js
@ -17,21 +17,21 @@ describe('job publisher', function () {
    var jobPublisher = new JobPublisher(redisUtils.getPool());

    it('.publish() should publish in job channel', function (done) {
-        redisUtils.getPool().acquire(Channel.DB, function (err, client) {
-            if (err) {
-                return done(err);
-            }
+        redisUtils.getPool().acquire(Channel.DB)
+            .then(client => {
+                client.subscribe(Channel.NAME);

-            client.subscribe(Channel.NAME);
+                client.on('message', function (channel, host) {
+                    assert.strictEqual(host, HOST);
+                    assert.strictEqual(channel, Channel.NAME);
+                    client.unsubscribe(Channel.NAME);
+                    redisUtils.getPool().release(Channel.DB, client)
+                        .then(() => done())
+                        .catch((err) => done(err));
+                });

-            client.on('message', function (channel, host) {
-                assert.strictEqual(host, HOST);
-                assert.strictEqual(channel, Channel.NAME);
-                client.unsubscribe(Channel.NAME);
-                done();
-            });
-
-            jobPublisher.publish(HOST);
-        });
+                jobPublisher.publish(HOST);
+            })
+            .catch((err) => done(err));
    });
 });
--- a/test/unit/batch/job-publisher-test.js
+++ b/test/unit/batch/job-publisher-test.js
@ -23,8 +23,8 @@ describe('batch API job publisher', function () {
            }
        };
        this.pool = {
-            acquire: function (db, cb) {
-                cb(null, self.redis);
+            acquire: function (db) {
+                return Promise.resolve(self.redis);
            }
        };

@ -33,6 +33,8 @@ describe('batch API job publisher', function () {

    it('.publish() should publish new messages', function () {
        this.jobPublisher.publish(this.host);
-        assert.ok(this.redis.publishIsCalledWithValidArgs);
+        setImmediate(() => {
+            assert.ok(this.redis.publishIsCalledWithValidArgs);
+        });
    });
 });
--- a/test/unit/batch/job-subscriber-test.js
+++ b/test/unit/batch/job-subscriber-test.js
@ -38,11 +38,11 @@ describe('batch API job subscriber', function () {
            connected: true
        };
        this.pool = {
-            acquire: function (db, cb) {
-                cb(null, self.redis);
+            acquire: function () {
+                return Promise.resolve(self.redis);
            },
            release: function (/* db, client */) {
-
+                return Promise.resolve();
            }
        };
        this.queueSeeker = {
@ -58,13 +58,17 @@ describe('batch API job subscriber', function () {

    it('.subscribe() should listen for incoming messages', function () {
        this.jobSubscriber.subscribe(this.onMessageListener);
-        assert.ok(this.redis.onIsCalledWithValidArgs);
-        assert.ok(this.redis.subscribeIsCalledWithValidArgs);
+        setImmediate(() => {
+            assert.ok(this.redis.onIsCalledWithValidArgs);
+            assert.ok(this.redis.subscribeIsCalledWithValidArgs);
+        });
    });

    it('.unsubscribe() should stop listening for incoming messages', function () {
        this.jobSubscriber.subscribe(this.onMessageListener);
        this.jobSubscriber.unsubscribe();
-        assert.ok(this.redis.unsubscribeIsCalledWithValidArgs);
+        setImmediate(() => {
+            assert.ok(this.redis.unsubscribeIsCalledWithValidArgs);
+        });
    });
 });