refactor(cu): reconsolidate ao http side effect routes and middleware

servers/cu/src/effects/ao-http/index.js

@@ -5,7 +5,7 @@ import FastifyMiddie from '@fastify/middie'
 import cors from 'cors'
 import helmet from 'helmet'
 
-import { withMetricRoutes } from '../routes/metrics.js'
+import { withMetricRoutes } from './routes/metrics.js'
 import { withStateRoutes } from './routes/state.js'
 import { withResultRoutes } from './routes/result.js'
 import { withDryRunRoutes } from './routes/dryRun.js'

servers/cu/src/effects/ao-http/routes/cron.js

@@ -1,10 +1,10 @@
 import { always, compose, identity } from 'ramda'
 import { z } from 'zod'
 
-import { withErrorHandler } from '../../middleware/withErrorHandler.js'
+import { withErrorHandler } from './middleware/withErrorHandler.js'
 import { withCuMode } from './middleware/withCuMode.js'
-import { withMetrics } from '../../middleware/withMetrics.js'
-import { withProcessRestrictionFromPath } from '../../middleware/withProcessRestriction.js'
+import { withMetrics } from './middleware/withMetrics.js'
+import { withProcessRestrictionFromPath } from './middleware/withProcessRestriction.js'
 
 /**
  * TODO: could be moved into a route utils or middleware

servers/cu/src/effects/ao-http/routes/dryRun.js

@@ -3,9 +3,9 @@ import { z } from 'zod'
 
 import { busyIn } from '../../../domain/utils.js'
 
-import { withErrorHandler } from '../../middleware/withErrorHandler.js'
-import { withMetrics } from '../../middleware/withMetrics.js'
-import { withProcessRestrictionFromQuery } from '../../middleware/withProcessRestriction.js'
+import { withErrorHandler } from './middleware/withErrorHandler.js'
+import { withMetrics } from './middleware/withMetrics.js'
+import { withProcessRestrictionFromQuery } from './middleware/withProcessRestriction.js'
 
 const inputSchema = z.object({
   processId: z.string().min(1, 'a process-id query parameter is required'),

servers/cu/src/effects/ao-http/routes/healthcheck.js

@@ -1,6 +1,6 @@
 import { always, compose } from 'ramda'
 
-import { withErrorHandler } from '../../middleware/withErrorHandler.js'
+import { withErrorHandler } from './middleware/withErrorHandler.js'
 
 export const withHealthcheckRoutes = (app) => {
   // healthcheck

servers/cu/src/effects/routes/metrics.js → servers/cu/src/effects/ao-http/routes/metrics.js

@@ -1,6 +1,6 @@
 import { always, compose } from 'ramda'
 
-import { withErrorHandler } from '../middleware/withErrorHandler.js'
+import { withErrorHandler } from './middleware/withErrorHandler.js'
 
 export const withMetricRoutes = (app) => {
   app.get(
@@ -13,7 +13,7 @@ export const withMetricRoutes = (app) => {
           domain: { apis: { metrics } }
         } = req
 
-        if (!config.ENABLE_METRICS_ENDPOINT) return res.status(404)
+        if (!config.ENABLE_METRICS_ENDPOINT) return res.status(404).send('Not Found')
 
         await metrics.compute()
           .toPromise()

servers/cu/src/effects/middleware/withErrorHandler.js → servers/cu/src/effects/ao-http/routes/middleware/withErrorHandler.js

@@ -1,4 +1,4 @@
-import { errFrom } from '../../domain/utils.js'
+import { errFrom } from '../../../../domain/utils.js'
 
 /**
  * A middleware that simply calls the next handler in the chain.

servers/cu/src/effects/middleware/withMetrics.js → servers/cu/src/effects/ao-http/routes/middleware/withMetrics.js

@@ -1,6 +1,6 @@
 import { always } from 'ramda'
 
-import { histogramWith, summaryWith } from '../metrics.js'
+import { histogramWith, summaryWith } from '../../../metrics.js'
 
 const histogram = histogramWith()({
   name: 'http_request_duration_seconds',

servers/cu/src/effects/ao-http/routes/result.js

@@ -4,10 +4,10 @@ import { z } from 'zod'
 import { busyIn } from '../../../domain/utils.js'
 
 import { withInMemoryCache } from './middleware/withInMemoryCache.js'
-import { withErrorHandler } from '../../middleware/withErrorHandler.js'
+import { withErrorHandler } from './middleware/withErrorHandler.js'
 import { withCuMode } from './middleware/withCuMode.js'
-import { withMetrics } from '../../middleware/withMetrics.js'
-import { withProcessRestrictionFromQuery } from '../../middleware/withProcessRestriction.js'
+import { withMetrics } from './middleware/withMetrics.js'
+import { withProcessRestrictionFromQuery } from './middleware/withProcessRestriction.js'
 
 const inputSchema = z.object({
   messageUid: z.string().min(1, 'a message unique identifier is required'),

servers/cu/src/effects/ao-http/routes/results.js

@@ -1,10 +1,10 @@
 import { always, compose, identity } from 'ramda'
 import { z } from 'zod'
 
-import { withErrorHandler } from '../../middleware/withErrorHandler.js'
+import { withErrorHandler } from './middleware/withErrorHandler.js'
 import { withCuMode } from './middleware/withCuMode.js'
-import { withProcessRestrictionFromPath } from '../../middleware/withProcessRestriction.js'
-import { withMetrics } from '../../middleware/withMetrics.js'
+import { withProcessRestrictionFromPath } from './middleware/withProcessRestriction.js'
+import { withMetrics } from './middleware/withMetrics.js'
 
 /**
  * TODO: could be moved into a route utils or middleware

servers/cu/src/effects/ao-http/routes/state.js

@@ -3,10 +3,10 @@ import { z } from 'zod'
 
 import { arrayBufferFromMaybeView, busyIn } from '../../../domain/utils.js'
 
-import { withErrorHandler } from '../../middleware/withErrorHandler.js'
+import { withErrorHandler } from './middleware/withErrorHandler.js'
 import { withCuMode } from './middleware/withCuMode.js'
-import { withProcessRestrictionFromPath } from '../../middleware/withProcessRestriction.js'
-import { withMetrics } from '../../middleware/withMetrics.js'
+import { withProcessRestrictionFromPath } from './middleware/withProcessRestriction.js'
+import { withMetrics } from './middleware/withMetrics.js'
 
 const inputSchema = z.object({
   processId: z.string().min(1, 'an ao process id is required'),