fix: throw koa http errors from ctx.assert

__tests__/context/assert.test.js

@@ -3,6 +3,8 @@
 const { describe, it } = require('node:test')
 const context = require('../../test-helpers/context')
 const assert = require('node:assert/strict')
+const httpAssert = require('http-assert')
+const Koa = require('../..')
 
 describe('ctx.assert(value, status)', () => {
   it('should throw an error', () => {
@@ -20,4 +22,81 @@ describe('ctx.assert(value, status)', () => {
     }
     assert(assertionRan)
   })
+
+  it('should throw Koa HttpError instances', () => {
+    const ctx = context()
+
+    assert.throws(() => {
+      ctx.assert(false, 404, 'custom message')
+    }, err => {
+      assert.strictEqual(err instanceof Koa.HttpError, true)
+      assert.strictEqual(err.status, 404)
+      assert.strictEqual(err.message, 'custom message')
+      assert.strictEqual(err.expose, true)
+      return true
+    })
+  })
+
+  it('should throw Koa HttpError instances with default status', () => {
+    const ctx = context()
+
+    assert.throws(() => {
+      ctx.assert(false, 'custom message without status')
+    }, err => {
+      assert.strictEqual(err instanceof Koa.HttpError, true)
+      assert.strictEqual(err.status, 500)
+      assert.strictEqual(err.message, 'custom message without status')
+      assert.strictEqual(err.expose, false)
+      return true
+    })
+  })
+
+  it('should throw Koa HttpError instances from assertion helpers', () => {
+    const ctx = context()
+
+    assert.throws(() => {
+      ctx.assert.equal('actual', 'expected', 400, 'custom message')
+    }, err => {
+      assert.strictEqual(err instanceof Koa.HttpError, true)
+      assert.strictEqual(err.status, 400)
+      assert.strictEqual(err.message, 'custom message')
+      assert.strictEqual(err.expose, true)
+      return true
+    })
+  })
+
+  it('should throw Koa HttpError instances from assertion helpers without explicit status', () => {
+    const ctx = context()
+
+    assert.throws(() => {
+      ctx.assert.ok(false, 'custom helper message without status')
+    }, err => {
+      assert.strictEqual(err instanceof Koa.HttpError, true)
+      assert.strictEqual(err.status, 500)
+      assert.strictEqual(err.message, 'custom helper message without status')
+      assert.strictEqual(err.expose, false)
+      return true
+    })
+  })
+
+  it('should rethrow non-http assertion helper errors unchanged', () => {
+    const ctx = context()
+    const originalFail = httpAssert.fail
+    const error = new Error('custom helper failure')
+
+    httpAssert.fail = function () {
+      throw error
+    }
+
+    try {
+      assert.throws(() => {
+        ctx.assert.fail()
+      }, err => {
+        assert.strictEqual(err, error)
+        return true
+      })
+    } finally {
+      httpAssert.fail = originalFail
+    }
+  })
 })

lib/context.js

@@ -13,6 +13,27 @@ const Cookies = require('cookies')
 
 const COOKIES = Symbol('context#cookies')
 
+function rethrowKoaHttpError (fn, args) {
+  try {
+    return fn(...args)
+  } catch (err) {
+    if (err && typeof err.status === 'number') {
+      const props = Object.assign({}, err)
+      props.stack = err.stack
+      throw createError(err.status, err.message, props)
+    }
+    throw err
+  }
+}
+
+function assert (...args) {
+  return rethrowKoaHttpError(httpAssert, args)
+}
+
+for (const method of Object.keys(httpAssert)) {
+  assert[method] = (...args) => rethrowKoaHttpError(httpAssert[method], args)
+}
+
 /**
  * Context prototype.
  */
@@ -69,7 +90,7 @@ const proto = module.exports = {
    * @api public
    */
 
-  assert: httpAssert,
+  assert,
 
   /**
    * Throw an error with `status` (default 500) and