Skip to content

Commit d065818

Browse files
authored
fix: replace waitForEvent() by once() (#102)
* fix: replace waitForEvent() by once() * move strict up
1 parent 226e27d commit d065818

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

abstract.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
'use strict'
2+
13
const Packet = require('aedes-packet')
2-
const { PromisifiedPersistence, waitForEvent, getArrayFromStream } = require('./promisified.js')
4+
const { once } = require('node:events')
5+
const { PromisifiedPersistence, getArrayFromStream } = require('./promisified.js')
36

47
// helper functions
58

@@ -73,7 +76,7 @@ function abstractPersistence (opts) {
7376
// destroyed while it's still being set up.
7477
// https://github.com/mcollina/aedes-persistence-redis/issues/41
7578
if (waitForReady && !instance.ready) {
76-
await waitForEvent(instance, 'ready')
79+
await once(instance, 'ready')
7780
}
7881
t.diagnostic('instance created')
7982
const prInstance = new PromisifiedPersistence(instance)

promisified.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict'
2+
13
// promisified versions of the persistence interface
24
// to avoid deep callbacks while testing
35

@@ -272,14 +274,6 @@ class PromisifiedPersistence {
272274
// end of promisified versions ofthis.instance methods
273275

274276
// helper functions
275-
function waitForEvent (obj, resolveEvt) {
276-
return new Promise((resolve, reject) => {
277-
obj.once(resolveEvt, () => {
278-
resolve()
279-
})
280-
obj.once('error', reject)
281-
})
282-
}
283277

284278
// stream.toArray() sometimes returns undefined or [undefined] instead of []
285279
async function getArrayFromStream (stream) {
@@ -294,6 +288,5 @@ async function getArrayFromStream (stream) {
294288

295289
module.exports = {
296290
PromisifiedPersistence,
297-
waitForEvent,
298291
getArrayFromStream
299292
}

0 commit comments

Comments
 (0)