Haraka 3.1.3 → 3.1.4

package/test/outbound/hmail.js

@@ -1,155 +1,191 @@
+'use strict'
+
+const { describe, it, before, beforeEach, afterEach } = require('node:test')
 const assert = require('node:assert')
+const { EventEmitter } = require('node:events')
 const fs = require('node:fs')
 const path = require('node:path')
 
-const Hmail = require('../../outbound/hmail')
-const outbound = require('../../outbound/index')
+// Load outbound/index FIRST to avoid the circular-dependency boot-order issue.
+const outbound = require('../../outbound')
+const Hmail = outbound.HMailItem
+const client_pool = require('../../outbound/client_pool')
+
+// ── Helpers ───────────────────────────────────────────────────────────────────
+
+const onEvent = (emitter, event) => new Promise((resolve) => emitter.once(event, resolve))
+
+// ── Tests ─────────────────────────────────────────────────────────────────────
 
 describe('outbound/hmail', () => {
-    beforeEach((done) => {
-        this.hmail = new Hmail(
+    let hmail
+
+    beforeEach(() => {
+        hmail = new Hmail(
             '1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka',
             'test/queue/1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka',
             {},
         )
-        done()
     })
 
-    it('sort_mx', (done) => {
-        const sorted = this.hmail.sort_mx([
+    describe('socket error/timeout handler robustness (#3388)', () => {
+        const mx = { using_lmtp: false, port: 25, exchange: 'mx.example.com', bind: null, bind_helo: 'test' }
+        let origRelease
+
+        function makeSocket() {
+            const s = new EventEmitter()
+            s.name = 'mock'
+            s.writable = true
+            s.write = () => {}
+            s.destroy = () => {}
+            return s
+        }
+
+        beforeEach(() => {
+            origRelease = client_pool.release_client
+            client_pool.release_client = () => {}
+            hmail.todo = { rcpt_to: [] }
+            hmail.try_deliver = () => {}
+            hmail.logerror = () => {}
+        })
+
+        afterEach(() => {
+            client_pool.release_client = origRelease
+        })
+
+        it('error then timeout does not throw ERR_UNHANDLED_ERROR', () => {
+            const socket = makeSocket()
+            hmail.try_deliver_host_on_socket(mx, '1.2.3.4', 25, socket)
+            socket.emit('error', new Error('connection refused'))
+            assert.doesNotThrow(() => socket.emit('timeout'), 'timeout after error must not crash')
+        })
+
+        it('timeout then error does not throw ERR_UNHANDLED_ERROR', () => {
+            const socket = makeSocket()
+            hmail.try_deliver_host_on_socket(mx, '1.2.3.4', 25, socket)
+            socket.emit('timeout')
+            assert.doesNotThrow(
+                () => socket.emit('error', new Error('late error')),
+                'error after timeout must not crash',
+            )
+        })
+
+        it('multiple timeouts do not throw ERR_UNHANDLED_ERROR', () => {
+            const socket = makeSocket()
+            hmail.try_deliver_host_on_socket(mx, '1.2.3.4', 25, socket)
+            socket.emit('timeout')
+            assert.doesNotThrow(() => socket.emit('timeout'), 'second timeout must not crash')
+        })
+    })
+
+    it('sort_mx orders by priority ascending', () => {
+        const sorted = hmail.sort_mx([
             { exchange: 'mx2.example.com', priority: 5 },
             { exchange: 'mx1.example.com', priority: 6 },
         ])
         assert.equal(sorted[0].exchange, 'mx2.example.com')
-        done()
     })
-    it('sort_mx, shuffled', (done) => {
-        const sorted = this.hmail.sort_mx([
+
+    it('sort_mx shuffles equal-priority entries', () => {
+        const sorted = hmail.sort_mx([
             { exchange: 'mx2.example.com', priority: 5 },
             { exchange: 'mx1.example.com', priority: 6 },
             { exchange: 'mx3.example.com', priority: 6 },
         ])
         assert.equal(sorted[0].exchange, 'mx2.example.com')
-        assert.ok(sorted[1].exchange == 'mx3.example.com' || sorted[1].exchange == 'mx1.example.com')
-        done()
+        assert.ok(['mx1.example.com', 'mx3.example.com'].includes(sorted[1].exchange))
     })
-    it('force_tls', (done) => {
-        this.hmail.todo = { domain: 'miss.example.com' }
-        this.hmail.obtls.cfg = {
-            force_tls_hosts: ['1.2.3.4', 'hit.example.com'],
-        }
-        assert.equal(this.hmail.get_force_tls({ exchange: '1.2.3.4' }), true)
-        assert.equal(this.hmail.get_force_tls({ exchange: '1.2.3.5' }), false)
-        this.hmail.todo = { domain: 'hit.example.com' }
-        assert.equal(this.hmail.get_force_tls({ exchange: '1.2.3.5' }), true)
-        done()
+
+    it('get_force_tls matches by IP and domain', () => {
+        hmail.todo = { domain: 'miss.example.com' }
+        hmail.obtls.cfg = { force_tls_hosts: ['1.2.3.4', 'hit.example.com'] }
+        assert.equal(hmail.get_force_tls({ exchange: '1.2.3.4' }), true)
+        assert.equal(hmail.get_force_tls({ exchange: '1.2.3.5' }), false)
+        hmail.todo = { domain: 'hit.example.com' }
+        assert.equal(hmail.get_force_tls({ exchange: '1.2.3.5' }), true)
     })
 })
 
-describe('outbound/hmail.HMailItem', () => {
-    it('normal queue file', (done) => {
-        this.hmail = new Hmail(
+const TOOLONG_FIXTURE = 'test/queue/1509000000000_1509000000000_0_99999_ToLong_1_haraka'
+
+const makeToolongFixture = () => {
+    const buf = Buffer.alloc(50)
+    buf.writeUInt32BE(9999, 0) // declares 9999 bytes but file has only 46 after the header
+    buf.write('{"domain":"example.com"', 4)
+    fs.writeFileSync(TOOLONG_FIXTURE, buf)
+}
+
+describe('outbound/hmail.HMailItem — queue file loading', () => {
+    before(makeToolongFixture)
+
+    it('loads a valid queue file', async () => {
+        const h = new Hmail(
             '1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka',
             'test/queue/1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka',
             {},
         )
-        this.hmail.on('ready', () => {
-            // console.log(this.hmail);
-            assert.ok(this.hmail)
-            done()
-        })
-        this.hmail.on('error', (err) => {
-            console.log(err)
-            assert.equal(err, undefined)
-            done()
-        })
+        await onEvent(h, 'ready')
+        assert.ok(h)
     })
-    it('normal TODO w/multibyte chars loads w/o error', (done) => {
-        this.hmail = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_1_qfile', 'test/fixtures/todo_qfile.txt', {})
-        this.hmail.on('ready', () => {
-            // console.log(this.hmail);
-            assert.ok(this.hmail)
-            done()
-        })
-        this.hmail.on('error', (err) => {
-            console.log(err)
-            assert.equal(err, undefined)
-            done()
-        })
+
+    it('loads a TODO with multibyte chars without error', async () => {
+        const h = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_1_qfile', 'test/fixtures/todo_qfile.txt', {})
+        await onEvent(h, 'ready')
+        assert.ok(h)
     })
-    it('too short TODO length declared', (done) => {
-        this.hmail = new Hmail(
+
+    it('emits error on too-short declared TODO length', async () => {
+        const h = new Hmail(
             '1507509981169_1507509981169_0_61403_e0Y0Ym_1_haraka',
             'test/queue/1507509981169_1507509981169_0_61403_e0Y0Ym_1_haraka',
             {},
         )
-        this.hmail.on('ready', () => {
-            // console.log(this.hmail);
-            assert.ok(this.hmail)
-            done()
-        })
-        this.hmail.on('error', (err) => {
-            console.log(err)
-            assert.ok(err)
-            done()
+        const err = await new Promise((resolve) => {
+            h.once('ready', () => resolve(null))
+            h.once('error', resolve)
         })
+        assert.ok(err, 'expected an error for truncated TODO')
     })
-    it('too long TODO length declared', (done) => {
-        this.hmail = new Hmail(
-            '1508269674999_1508269674999_0_34002_socVUF_1_haraka',
-            'test/queue/1508269674999_1508269674999_0_34002_socVUF_1_haraka',
-            {},
-        )
-        this.hmail.on('ready', () => {
-            // console.log(this.hmail);
-            assert.ok(this.hmail)
-            done()
-        })
-        this.hmail.on('error', (err) => {
-            console.log(err)
-            assert.ok(err)
-            done()
+
+    it('emits error on too-long declared TODO length', async () => {
+        // Recreate fixture in case a prior run renamed it to the error queue
+        makeToolongFixture()
+        const h = new Hmail('1509000000000_1509000000000_0_99999_ToLong_1_haraka', TOOLONG_FIXTURE, {})
+        const err = await new Promise((resolve) => {
+            h.once('ready', () => resolve(null))
+            h.once('error', resolve)
         })
+        assert.ok(err, 'expected an error for oversized TODO')
     })
-    it('zero-length file load skip w/o crash', (done) => {
-        this.hmail = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_2_zero', 'test/queue/zero-length', {})
-        this.hmail.on('ready', () => {
-            assert.ok(this.hmail)
-            done()
-        })
-        this.hmail.on('error', (err) => {
-            console.error(err)
-            assert.ok(err)
-            done()
+
+    it('skips zero-length file without crash', async () => {
+        const h = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_2_zero', 'test/queue/zero-length', {})
+        await new Promise((resolve) => {
+            h.once('ready', resolve)
+            h.once('error', resolve)
         })
+        assert.ok(h)
     })
-    it('lifecycle, reads and writes a haraka queue file', (done) => {
-        this.hmail = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_2_qfile', 'test/fixtures/todo_qfile.txt', {})
 
-        this.hmail.on('error', (err) => {
-            // console.log(err);
-            assert.equals(err, undefined)
-            done()
-        })
+    it('lifecycle: reads and writes a queue file', async () => {
+        const h = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_2_qfile', 'test/fixtures/todo_qfile.txt', {})
 
-        this.hmail.on('ready', () => {
-            const tmpfile = path.resolve('test', 'test-queue', 'delete-me')
-            const ws = new fs.createWriteStream(tmpfile)
+        await onEvent(h, 'ready')
 
-            outbound.build_todo(this.hmail.todo, ws, () => {
-                // console.log('returned from build_todo, piping')
-                // console.log(this.hmail.todo)
-                // assert.equals(this.hmail.todo.message_stream.headers.length, 22);
+        const tmpfile = path.resolve('test', 'test-queue', 'delete-me')
+        await fs.promises.mkdir(path.dirname(tmpfile), { recursive: true })
+        const ws = new fs.WriteStream(tmpfile)
 
-                const ds = this.hmail.data_stream()
+        await new Promise((resolve, reject) => {
+            outbound.build_todo(h.todo, ws, () => {
+                const ds = h.data_stream()
                 ds.pipe(ws)
-
-                ws.on('close', () => {
-                    // console.log(this.hmail.todo)
-                    assert.equal(fs.statSync(tmpfile).size, 4204)
-                    done()
-                })
+                ws.on('close', resolve)
+                ws.on('error', reject)
             })
         })
+
+        assert.equal(fs.statSync(tmpfile).size, 4204)
+        fs.unlinkSync(tmpfile)
     })
 })

package/test/outbound/index.js

@@ -1,8 +1,9 @@
 'use strict'
 
+const { describe, it, beforeEach, afterEach } = require('node:test')
 const assert = require('node:assert')
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 
 const constants = require('haraka-constants')
 const logger = require('../../logger')
@@ -22,56 +23,51 @@ describe('outbound', () => {
             let contents = lines.join(ending)
             let result = ''
 
-            // Set data_lines to lines in contents
             let match
             const re = /^([^\n]*\n?)/
             while ((match = re.exec(contents))) {
                 let line = match[1]
-                line = line.replace(/\r?\n?$/, '\r\n') // assure \r\n ending
+                line = line.replace(/\r?\n?$/, '\r\n')
                 result += line
-                contents = contents.substr(match[1].length)
-                if (contents.length === 0) {
-                    break
-                }
+                contents = contents.substring(match[1].length)
+                if (contents.length === 0) break
             }
 
             assert.deepEqual(lines.join('\r\n'), result)
         }
     })
 
-    it('log_methods added', () => {
+    it('log_methods added to HMailItem prototype', () => {
         const levels = ['DATA', 'PROTOCOL', 'DEBUG', 'INFO', 'NOTICE', 'WARN', 'ERROR', 'CRIT', 'ALERT', 'EMERG']
-
-        const HMailItem = require('../../outbound/hmail')
-
+        // Load via outbound/index to avoid circular-dep boot-order issue
+        const HMailItem = require('../../outbound').HMailItem
         for (const level of levels) {
-            assert.ok(HMailItem.prototype[`log${level.toLowerCase()}`], `Log method for level: ${level}`)
+            assert.ok(HMailItem.prototype[`log${level.toLowerCase()}`], `log method for ${level}`)
         }
     })
 
     it('set_temp_fail_intervals coverage', () => {
         const config = require('../../outbound/config')
-        // Test default configuration
         assert.deepEqual(
             config.cfg.temp_fail_intervals,
             [64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072],
         )
-        // Test a simple configuration
+
         config.cfg.temp_fail_intervals = '10s, 1m*2'
         config.set_temp_fail_intervals()
         assert.deepEqual(config.cfg.temp_fail_intervals, [10, 60, 60])
-        // Test a complex configuration
+
         config.cfg.temp_fail_intervals = '30s, 1m, 5m, 9m, 15m*3, 30m*2, 1h*3, 2h*3, 1d'
         config.set_temp_fail_intervals()
         assert.deepEqual(
             config.cfg.temp_fail_intervals,
             [30, 60, 300, 540, 900, 900, 900, 1800, 1800, 3600, 3600, 3600, 7200, 7200, 7200, 86400],
         )
-        // Test the "none" configuration
+
         config.cfg.temp_fail_intervals = 'none'
         config.set_temp_fail_intervals()
         assert.deepEqual(config.cfg.temp_fail_intervals, [])
-        // Test bad config (should revert to default)
+
         config.cfg.temp_fail_intervals = '60 min'
         config.set_temp_fail_intervals()
         assert.deepEqual(
@@ -81,29 +77,26 @@ describe('outbound', () => {
     })
 
     describe('get_tls_options', () => {
-        beforeEach((done) => {
+        let outbound, obtls
+
+        beforeEach(async () => {
             process.env.HARAKA_TEST_DIR = path.resolve('test')
-            this.outbound = require('../../outbound')
-            this.obtls = require('../../outbound/tls')
+            outbound = require('../../outbound')
+            obtls = require('../../outbound/tls')
             const tls_socket = require('../../tls_socket')
 
-            // reset config to load from tests directory
             const testDir = path.resolve('test')
-            this.outbound.config = this.outbound.config.module_config(testDir)
-            this.obtls.test_config(tls_socket.config.module_config(testDir), this.outbound.config)
-            this.obtls.init(done)
+            outbound.config = outbound.config.module_config(testDir)
+            obtls.test_config(tls_socket.config.module_config(testDir), outbound.config)
+            await new Promise((resolve) => obtls.init(resolve))
         })
 
-        afterEach((done) => {
+        afterEach(() => {
             delete process.env.HARAKA_TEST_DIR
-            done()
         })
 
         it('gets TLS properties from tls.ini.outbound', () => {
-            const tls_config = this.obtls.get_tls_options({
-                exchange: 'mail.example.com',
-            })
-
+            const tls_config = obtls.get_tls_options({ exchange: 'mail.example.com' })
             assert.deepEqual(tls_config, {
                 servername: 'mail.example.com',
                 key: fs.readFileSync(path.resolve('test', 'config', 'outbound_tls_key.pem')),
@@ -122,116 +115,83 @@ describe('outbound', () => {
     })
 
     describe('build_todo', () => {
-        beforeEach((done) => {
-            this.outbound = require('../../outbound')
+        let outbound
+
+        beforeEach(() => {
+            outbound = require('../../outbound')
             try {
                 fs.unlinkSync('test/queue/multibyte')
                 fs.unlinkSync('test/queue/plain')
             } catch (ignore) {}
-            done()
         })
 
-        it('saves a file', () => {
+        it('saves a plain queue file', () => {
             const todo = JSON.parse(
                 '{"queue_time":1507509981169,"domain":"redacteed.com","rcpt_to":[{"original":"<postmaster@redacteed.com>","original_host":"redacteed.com","host":"redacteed.com","user":"postmaster"}],"mail_from":{"original":"<matt@tnpi.net>","original_host":"tnpi.net","host":"tnpi.net","user":"matt"},"notes":{"authentication_results":["spf=pass smtp.mailfrom=tnpi.net"],"spf_mail_result":"Pass","spf_mail_record":"v=spf1 a mx include:mx.theartfarm.com ?include:forwards._spf.tnpi.net include:lists._spf.tnpi.net -all","attachment_count":0,"attachments":[{"ctype":"application/pdf","filename":"FileWithoutAccent Chars.pdf","extension":".pdf","md5":"6c1d5f5c047cff3f6320b1210970bdf6"}],"attachment_ctypes":["application/pdf","multipart/mixed","text/plain","application/pdf"],"attachment_files":["FileWithoutaccent Chars.pdf"],"attachment_archive_files":[]},"uuid":"1D5483B0-3E00-4280-A961-3AFD2017B4FC.1"}',
             )
             const fd = fs.openSync('test/queue/plain', 'w')
-            const ws = new fs.createWriteStream('test/queue/plain', {
-                fd,
-                flags: constants.WRITE_EXCL,
-            })
-            ws.on('close', () => {
-                // console.log(arguments);
-                assert.ok(1)
-            })
-            ws.on('error', (e) => {
-                console.error(e)
-            })
-            this.outbound.build_todo(todo, ws, () => {
+            const ws = new fs.createWriteStream('test/queue/plain', { fd, flags: constants.WRITE_EXCL })
+            ws.on('error', (e) => console.error(e))
+            outbound.build_todo(todo, ws, () => {
                 ws.write(Buffer.from('This is the message body'))
-                fs.fsync(fd, () => {
-                    ws.close()
-                })
+                fs.fsync(fd, () => ws.close())
             })
+            assert.ok(true)
         })
 
-        it('saves a file with multibyte chars', () => {
+        it('saves a queue file with multibyte chars', () => {
             const todo = JSON.parse(
-                '{"queue_time":1507509981169,"domain":"redacteed.com","rcpt_to":[{"original":"<postmaster@redacteed.com>","original_host":"redacteed.com","host":"redacteed.com","user":"postmaster"}],"mail_from":{"original":"<matt@tnpi.net>","original_host":"tnpi.net","host":"tnpi.net","user":"matt"},"notes":{"authentication_results":["spf=pass smtp.mailfrom=tnpi.net"],"spf_mail_result":"Pass","spf_mail_record":"v=spf1 a mx include:mx.theartfarm.com ?include:forwards._spf.tnpi.net include:lists._spf.tnpi.net -all","attachment_count":0,"attachments":[{"ctype":"application/pdf","filename":"FileWîthÁccent Chars.pdf","extension":".pdf","md5":"6c1d5f5c047cff3f6320b1210970bdf6"}],"attachment_ctypes":["application/pdf","multipart/mixed","text/plain","application/pdf"],"attachment_files":["FileWîthÁccent Chars.pdf"],"attachment_archive_files":[]},"uuid":"1D5483B0-3E00-4280-A961-3AFD2017B4FC.1"}',
+                '{"queue_time":1507509981169,"domain":"redacteed.com","rcpt_to":[{"original":"<postmaster@redacteed.com>","original_host":"redacteed.com","host":"redacteed.com","user":"postmaster"}],"mail_from":{"original":"<matt@tnpi.net>","original_host":"tnpi.net","host":"tnpi.net","user":"matt"},"notes":{"authentication_results":["spf=pass smtp.mailfrom=tnpi.net"],"spf_mail_result":"Pass","spf_mail_record":"v=spf1 a mx include:mx.theartfarm.com ?include:forwards._spf.tnpi.net include:lists._spf.tnpi.net -all","attachment_count":0,"attachments":[{"ctype":"application/pdf","filename":"FileW\\u00eeth\\u00c1ccent Chars.pdf","extension":".pdf","md5":"6c1d5f5c047cff3f6320b1210970bdf6"}],"attachment_ctypes":["application/pdf","multipart/mixed","text/plain","application/pdf"],"attachment_files":["FileW\\u00eeth\\u00c1ccent Chars.pdf"],"attachment_archive_files":[]},"uuid":"1D5483B0-3E00-4280-A961-3AFD2017B4FC.1"}',
             )
             const fd = fs.openSync('test/queue/multibyte', 'w')
-            const ws = new fs.WriteStream('test/queue/multibyte', {
-                fd,
-                flags: constants.WRITE_EXCL,
-            })
-            ws.on('close', () => {
-                assert.ok(1)
-            })
-            ws.on('error', (e) => {
-                console.error(e)
-            })
-            this.outbound.build_todo(todo, ws, () => {
+            const ws = new fs.WriteStream('test/queue/multibyte', { fd, flags: constants.WRITE_EXCL })
+            ws.on('error', (e) => console.error(e))
+            outbound.build_todo(todo, ws, () => {
                 ws.write(Buffer.from('This is the message body'))
-                fs.fsync(fd, () => {
-                    ws.close()
-                })
+                fs.fsync(fd, () => ws.close())
             })
+            assert.ok(true)
         })
     })
 
     describe('timer_queue', () => {
-        beforeEach((done) => {
+        let outbound, ob_timer_queue
+
+        beforeEach(() => {
             process.env.HARAKA_TEST_DIR = path.resolve('test')
-            this.outbound = require('../../outbound')
+            outbound = require('../../outbound')
             const TimerQueue = require('../../outbound/timer_queue')
-            this.ob_timer_queue = new TimerQueue(500)
-            done()
+            ob_timer_queue = new TimerQueue(500)
         })
 
-        afterEach((done) => {
+        afterEach(() => {
             delete process.env.HARAKA_TEST_DIR
-            this.ob_timer_queue.shutdown()
-            done()
+            ob_timer_queue.shutdown()
         })
 
         it('has initial length of 0', () => {
-            assert.equal(this.ob_timer_queue.length(), 0)
+            assert.equal(ob_timer_queue.length(), 0)
         })
 
         it('can add items', () => {
-            this.ob_timer_queue.add('1', 1000)
-            this.ob_timer_queue.add('2', 2000)
-
-            assert.equal(this.ob_timer_queue.length(), 2)
+            ob_timer_queue.add('1', 1000)
+            ob_timer_queue.add('2', 2000)
+            assert.equal(ob_timer_queue.length(), 2)
         })
 
         it('can drain items', () => {
-            this.ob_timer_queue.add('1', 1000)
-            this.ob_timer_queue.add('2', 2000)
-
-            let tq_length = this.ob_timer_queue.length()
-
-            assert.equal(tq_length, 2)
-
-            this.ob_timer_queue.drain()
-            tq_length = this.ob_timer_queue.length()
-
-            assert.equal(tq_length, 0)
+            ob_timer_queue.add('1', 1000)
+            ob_timer_queue.add('2', 2000)
+            ob_timer_queue.drain()
+            assert.equal(ob_timer_queue.length(), 0)
         })
 
         it('can discard items by id', () => {
-            this.ob_timer_queue.add('1', 1000)
-            this.ob_timer_queue.add('2', 2000)
-
-            let tq_length = this.ob_timer_queue.length()
-
-            assert.equal(tq_length, 2)
-
-            this.ob_timer_queue.discard('2')
-            tq_length = this.ob_timer_queue.length()
-
-            assert.equal(tq_length, 1)
-            assert.equal(this.ob_timer_queue.queue[0].id, '1')
+            ob_timer_queue.add('1', 1000)
+            ob_timer_queue.add('2', 2000)
+            ob_timer_queue.discard('2')
+            assert.equal(ob_timer_queue.length(), 1)
+            assert.equal(ob_timer_queue.queue[0].id, '1')
         })
     })
 })