Merge c3263bb into d582385

.changeset/omega-carrots-sort.md

@@ -0,0 +1,6 @@
+---
+"@tbdex/http-server": minor
+---
+
+* Restructure error messages as ErrorDetail type
+* Handle http-server callback errors and pass offering to RFQ handler

packages/http-server/src/request-handlers/callback-error.ts

@@ -0,0 +1,20 @@
+import type { ErrorDetail } from '@tbdex/http-client'
+
+export class CallbackError extends Error {
+  public readonly statusCode: number
+  public readonly details: ErrorDetail[]
+
+  constructor(statusCode: number, details: ErrorDetail[] = []) {
+    super()
+
+    this.name = this.constructor.name
+    this.statusCode = statusCode
+    this.details = details
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, this.constructor)
+    }
+
+    Object.setPrototypeOf(this, CallbackError.prototype)
+  }
+}

packages/http-server/src/request-handlers/index.ts

@@ -1,3 +1,4 @@
+export * from './callback-error.js'
 export * from './get-exchanges.js'
 export * from './get-offerings.js'
 export * from './submit-close.js'

packages/http-server/src/request-handlers/submit-close.ts

@@ -3,6 +3,7 @@ import type { ErrorDetail } from '@tbdex/http-client'
 import type { MessageKind } from '@tbdex/protocol'
 
 import { Message } from '@tbdex/protocol'
+import { CallbackError } from './index.js'
 
 type SubmitCloseOpts = {
   callback: SubmitCallback<'close'>
@@ -37,11 +38,15 @@ export function submitClose(opts: SubmitCloseOpts): RequestHandler {
     }
 
     try {
-      // TODO: figure out what to do with callback result, if anything. (issue #12)
-      const _result = await callback({ request: req, response: res }, message)
+      await callback({ request: req, response: res }, message, undefined)
       return res.sendStatus(202)
     } catch(e) {
-      // TODO: handle error lewl (issue #3)
+      if (e instanceof CallbackError) {
+        return res.status(e.statusCode).json({ errors: e.details })
+      } else {
+        const errorDetail: ErrorDetail = { detail: 'umm idk' }
+        return res.status(500).json({ errors: [errorDetail] })
+      }
     }
   }
 }

packages/http-server/src/request-handlers/submit-order.ts

@@ -3,6 +3,7 @@ import type { ErrorDetail } from '@tbdex/http-client'
 import type { MessageKind } from '@tbdex/protocol'
 
 import { Message } from '@tbdex/protocol'
+import { CallbackError } from './index.js'
 
 type SubmitOrderOpts = {
   callback: SubmitCallback<'order'>
@@ -40,11 +41,15 @@ export function submitOrder(opts: SubmitOrderOpts): RequestHandler {
     }
 
     try {
-      // TODO: figure out what to do with callback result, if anything. (#issue 5)
-      const _result = await callback({ request: req, response: res }, message)
+      await callback({ request: req, response: res }, message, undefined)
       return res.sendStatus(202)
     } catch(e) {
-      // TODO: handle error lewl
+      if (e instanceof CallbackError) {
+        return res.status(e.statusCode).json({ errors: e.details })
+      } else {
+        const errorDetail: ErrorDetail = { detail: 'umm idk' }
+        return res.status(500).json({ errors: [errorDetail] })
+      }
     }
   }
 }

packages/http-server/src/request-handlers/submit-rfq.ts

@@ -3,6 +3,7 @@ import type { MessageKind } from '@tbdex/protocol'
 import type { ErrorDetail } from '@tbdex/http-client'
 
 import { Message } from '@tbdex/protocol'
+import { CallbackError } from './index.js'
 
 type SubmitRfqOpts = {
   callback: SubmitCallback<'rfq'>
@@ -53,10 +54,14 @@ export function submitRfq(options: SubmitRfqOpts): RequestHandler {
     }
 
     try {
-      // TODO: figure out what to do with callback result, if anything. (issue #7)
-      const _result = await callback({ request: req, response: res }, message)
+      await callback({ request: req, response: res }, message, { offering })
     } catch(e) {
-      // TODO: handle error lewl (#issue 8)
+      if (e instanceof CallbackError) {
+        return res.status(e.statusCode).json({ errors: e.details })
+      } else {
+        const errorDetail: ErrorDetail = { detail: 'umm idk' }
+        return res.status(500).json({ errors: [errorDetail] })
+      }
     }
 
     return res.sendStatus(202)

packages/http-server/src/types.ts

@@ -28,11 +28,21 @@ export type GetCallbacks = {
  */
 export type SubmitKind = 'rfq' | 'order' | 'close'
 
+/**
+ * Types for options provided to {@link SubmitCallback}
+ * @beta
+ */
+export type SubmitCallbackOpts = {
+  'rfq': { offering: Offering }
+  'order': undefined
+  'close': undefined
+}
+
 /**
  * Callback handler for the submit requests
  * @beta
  */
-export type SubmitCallback<T extends SubmitKind> = (ctx: RequestContext, message: MessageKindClasses[T]) => any
+export type SubmitCallback<T extends SubmitKind> = (ctx: RequestContext, message: MessageKindClasses[T], opts: SubmitCallbackOpts[T]) => Promise<void>
 
 /**
  * Map of callbacks handlers for the submit requests

packages/protocol/build/compile-validators.js

@@ -17,7 +17,7 @@ import standaloneCode from 'ajv/dist/standalone/index.js'
 
 import { mkdirp } from 'mkdirp'
 
-const schemaHostUrl = 'https://tbdex.dev'
+const schemaHostUrl = 'https://tbdex.dev/json-schemas'
 const schemaUrls = {
   definitions : `${schemaHostUrl}/definitions.json`,
   resource    : `${schemaHostUrl}/resource.schema.json`,