monastery 3.0.4 → 3.0.5

package/changelog.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.0.5](https://github.com/boycce/monastery/compare/3.0.4...3.0.5) (2024-04-29)
+
 ### [3.0.4](https://github.com/boycce/monastery/compare/3.0.3...3.0.4) (2024-04-29)
 
 ### [3.0.3](https://github.com/boycce/monastery/compare/3.0.2...3.0.3) (2024-04-28)

package/lib/index.js

@@ -215,7 +215,7 @@ Manager.prototype.onError = function(fn) {
       resolve(err)
     })
   }).then((err) => {
-    fn(err)
+    return fn(err)
   })
 }
 
@@ -226,6 +226,9 @@ Manager.prototype.onOpen = function(fn) {
    * @return {Promise(manager)}
    */
   return new Promise((resolve, reject) => {
+    if (this._state == 'open') {
+      resolve(this)
+    }
     this.on('open', () => {
       resolve(this)
     })
@@ -233,7 +236,7 @@ Manager.prototype.onOpen = function(fn) {
       reject(err)
     })
   }).then((err) => { // If `then` is not chained, the error will be thrown, detached!
-    fn(err)
+    return fn(err)
   })
 }
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A simple, straightforward MongoDB ODM",
   "author": "Ricky Boyce",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",

package/test/manager.js

@@ -18,18 +18,34 @@ test('manager > uri error', async () => {
 
 test('manager > onError', async () => {
   // Bad port (thrown by MongoDB)
-  let error
   const db = monastery('localhost:1234/monastery', { serverSelectionTimeoutMS: 500 })
-  await db.onError((res) => { error = res.message })
+  let error, isAPromise
+  await db.onError((res) => { error = res.message }).then(() => { isAPromise = true })
   expect(error).toEqual('connect ECONNREFUSED 127.0.0.1:1234')
+  expect(isAPromise).toEqual(true)
   db.close()
 })
 
 test('manager > onOpen', async () => {
-  let manager
   const db = monastery('localhost/monastery', { serverSelectionTimeoutMS: 500 })
-  await db.onOpen((res) => { manager = res })
-  expect(manager.open).toEqual(expect.any(Function))
+
+  let manager1
+  await db.onOpen((res) => { manager1 = res })
+  expect(manager1.open).toEqual(expect.any(Function))
+
+  // Wait until after the client has been connected
+  await new Promise((resolve, reject) => {
+    setTimeout(() => {
+      resolve()
+    }, 1000)
+  })
+
+  // This should still run after the client has been connected
+  let manager2
+  let isAPromise
+  await db.onOpen((res) => { manager2 = res }).then(() => { isAPromise = true })
+  expect(manager2.open).toEqual(expect.any(Function))
+  expect(isAPromise).toEqual(true)
   db.close()
 })