Upgrade async package to 3.2.2 (#8447)

* Revert "Revert "Bump async to 3.2.2 (#7618)""

This reverts commit 75153a555211d654744c2e61e27fe21085826c22.

* [web] fix usage of async.queue.drain in script

* [clsi] fix usage of async.queue.drain

* [spelling] fix usage of async.queue.drain

* [redis-wrapper] fix usage of async.queue.drain

* [web] Test that LockManager queue is cleared

This protects against a regression found when upgrading the
async package. Here we test that the `queue.drain` callback
is really getting called, and the lock is being removed from
the LOCK_QUEUES map.

* [redis-wrapper] Upgrade async to 3.2.2

GitOrigin-RevId: df921e6d7f1d505bd467f22e58600ba1aff48869

services/web/app/src/Features/Exports/ExportsHandler.js

@@ -72,7 +72,7 @@ module.exports = ExportsHandler = {
       // TODO: when we update async, signature will change from (cb, results) to (results, cb)
       rootDoc: [
         'project',
-        (cb, results) =>
+        (results, cb) =>
           ProjectRootDocManager.ensureRootDocumentIsValid(
             project_id,
             function (error) {

services/web/app/src/Features/Project/ProjectController.js

@@ -785,7 +785,7 @@ const ProjectController = {
         },
         brandVariation: [
           'project',
-          (cb, results) => {
+          (results, cb) => {
             if (
               (results.project != null
                 ? results.project.brandVariationId

services/web/app/src/Features/Project/ProjectRootDocManager.js

@@ -95,7 +95,7 @@ module.exports = ProjectRootDocManager = {
             let doc = null
 
             return async.until(
-              () => doc != null || files.length === 0,
+              cb => cb(null, doc != null || files.length === 0),
               function (cb) {
                 const file = files.shift()
                 return fs.readFile(

services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js

@@ -64,7 +64,7 @@ function buildUsersSubscriptionViewModel(user, callback) {
       },
       recurlySubscription: [
         'personalSubscription',
-        (cb, { personalSubscription }) => {
+        ({ personalSubscription }, cb) => {
           if (
             personalSubscription == null ||
             personalSubscription.recurlySubscription_id == null ||
@@ -81,7 +81,7 @@ function buildUsersSubscriptionViewModel(user, callback) {
       ],
       recurlyCoupons: [
         'recurlySubscription',
-        (cb, { recurlySubscription }) => {
+        ({ recurlySubscription }, cb) => {
           if (!recurlySubscription) {
             return cb(null, null)
           }
@@ -91,7 +91,7 @@ function buildUsersSubscriptionViewModel(user, callback) {
       ],
       plan: [
         'personalSubscription',
-        (cb, { personalSubscription }) => {
+        ({ personalSubscription }, cb) => {
           if (personalSubscription == null) {
             return cb()
           }

services/web/package.json

@@ -82,7 +82,7 @@
     "angular": "~1.8.0",
     "angular-sanitize": "~1.8.0",
     "archiver": "^5.3.0",
-    "async": "0.6.2",
+    "async": "3.2.2",
     "backbone": "^1.3.3",
     "basic-auth": "^2.0.1",
     "bcrypt": "^5.0.0",

services/web/scripts/purge_non_logged_in_sessions.js

@@ -43,12 +43,12 @@ function scanAndPurge(cb) {
   })
 
   stream.on('end', () => {
-    queue.drain = () => {
+    queue.drain(() => {
       console.log(
         `All sessions have been checked, ${totalDeletedSessions} deleted`
       )
       cb()
-    }
+    })
   })
 
   stream.on('error', err => {

services/web/test/unit/src/User/UserSessionsManagerTests.js

@@ -89,7 +89,7 @@ describe('UserSessionsManager', function () {
 
     it('should not produce an error', function (done) {
       return this.call(err => {
-        expect(err).to.not.be.instanceof(Error)
+        expect(err).to.not.exist
         return done()
       })
     })
@@ -144,8 +144,7 @@ describe('UserSessionsManager', function () {
 
       it('should not produce an error', function (done) {
         return this.call(err => {
-          expect(err).to.not.be.instanceof(Error)
-          expect(err).to.equal(null)
+          expect(err).to.not.exist
           return done()
         })
       })
@@ -181,8 +180,7 @@ describe('UserSessionsManager', function () {
 
       it('should not produce an error', function (done) {
         return this.call(err => {
-          expect(err).to.not.be.instanceof(Error)
-          expect(err).to.equal(null)
+          expect(err).to.not.exist
           return done()
         })
       })
@@ -227,8 +225,7 @@ describe('UserSessionsManager', function () {
 
     it('should not produce an error', function (done) {
       return this.call(err => {
-        expect(err).to.not.be.instanceof(Error)
-        expect(err).to.equal(undefined)
+        expect(err).to.not.exist
         return done()
       })
     })
@@ -283,8 +280,7 @@ describe('UserSessionsManager', function () {
 
       it('should not produce an error', function (done) {
         return this.call(err => {
-          expect(err).to.not.be.instanceof(Error)
-          expect(err).to.equal(null)
+          expect(err).to.not.exist
           return done()
         })
       })
@@ -320,8 +316,7 @@ describe('UserSessionsManager', function () {
 
       it('should not produce an error', function (done) {
         return this.call(err => {
-          expect(err).to.not.be.instanceof(Error)
-          expect(err).to.equal(null)
+          expect(err).to.not.exist
           return done()
         })
       })
@@ -363,8 +358,7 @@ describe('UserSessionsManager', function () {
 
     it('should not produce an error', function (done) {
       return this.call(err => {
-        expect(err).to.not.be.instanceof(Error)
-        expect(err).to.equal(null)
+        expect(err).to.not.exist
         return done()
       })
     })
@@ -407,8 +401,7 @@ describe('UserSessionsManager', function () {
 
       it('should not produce an error', function (done) {
         return this.call(err => {
-          expect(err).to.not.be.instanceof(Error)
-          expect(err).to.equal(null)
+          expect(err).to.not.exist
           return done()
         })
       })
@@ -474,8 +467,7 @@ describe('UserSessionsManager', function () {
 
       it('should not produce an error', function (done) {
         return this.call(err => {
-          expect(err).to.not.be.instanceof(Error)
-          expect(err).to.equal(null)
+          expect(err).to.not.exist
           return done()
         })
       })
@@ -497,8 +489,7 @@ describe('UserSessionsManager', function () {
 
       it('should not produce an error', function (done) {
         return this.call(err => {
-          expect(err).to.not.be.instanceof(Error)
-          expect(err).to.equal(null)
+          expect(err).to.not.exist
           return done()
         })
       })
@@ -524,8 +515,7 @@ describe('UserSessionsManager', function () {
 
     it('should not produce an error', function (done) {
       return this.call(err => {
-        expect(err).to.not.be.instanceof(Error)
-        expect(err).to.equal(null)
+        expect(err).to.not.exist
         return done()
       })
     })
@@ -559,8 +549,7 @@ describe('UserSessionsManager', function () {
 
       it('should not produce an error', function (done) {
         return this.call(err => {
-          expect(err).to.not.be.instanceof(Error)
-          expect(err).to.equal(null)
+          expect(err).to.not.exist
           return done()
         })
       })
@@ -598,7 +587,7 @@ describe('UserSessionsManager', function () {
 
     it('should not produce an error', function (done) {
       return this.call((err, sessions) => {
-        expect(err).to.equal(null)
+        expect(err).to.not.exist
         return done()
       })
     })
@@ -635,7 +624,7 @@ describe('UserSessionsManager', function () {
 
       it('should not produce an error', function (done) {
         return this.call((err, sessions) => {
-          expect(err).to.equal(null)
+          expect(err).to.not.exist
           return done()
         })
       })
@@ -713,8 +702,7 @@ describe('UserSessionsManager', function () {
 
     it('should not produce an error', function (done) {
       return this.call(err => {
-        expect(err).to.not.be.instanceof(Error)
-        expect(err).to.equal(undefined)
+        expect(err).to.not.exist
         return done()
       })
     })
@@ -736,8 +724,7 @@ describe('UserSessionsManager', function () {
 
       it('should not produce an error', function (done) {
         return this.call(err => {
-          expect(err).to.not.be.instanceof(Error)
-          expect(err).to.equal(undefined)
+          expect(err).to.not.exist
           return done()
         })
       })
@@ -762,8 +749,7 @@ describe('UserSessionsManager', function () {
 
       it('should not produce an error', function (done) {
         return this.call(err => {
-          expect(err).to.not.be.instanceof(Error)
-          expect(err).to.equal(null)
+          expect(err).to.not.exist
           return done()
         })
       })

services/web/test/unit/src/infrastructure/LockManager/getLockTests.js

@@ -74,6 +74,10 @@ describe('LockManager - getting the lock', function () {
     it('should return the callback', function () {
       return this.callback.calledWith(null).should.equal(true)
     })
+
+    it('should clear the lock queue', function () {
+      this.LockManager._lockQueuesSize().should.equal(0)
+    })
   })
 
   describe('when the lock is initially set', function () {
@@ -107,6 +111,10 @@ describe('LockManager - getting the lock', function () {
     it('should return the callback', function () {
       return this.callback.calledWith(null).should.equal(true)
     })
+
+    it('should clear the lock queue', function () {
+      this.LockManager._lockQueuesSize().should.equal(0)
+    })
   })
 
   describe('when the lock times out', function () {
@@ -178,5 +186,9 @@ describe('LockManager - getting the lock', function () {
     it('should process the requests in order', function () {
       return this.results.should.deep.equal([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
     })
+
+    it('should clear the lock queue', function () {
+      this.LockManager._lockQueuesSize().should.equal(0)
+    })
   })
 })