@getvision/server 0.4.0 → 0.4.1-ff0c7ec-develop

package/README.md

@@ -87,7 +87,7 @@ async (data, c) => {
 Zod validation for inputs and outputs:
 
 ```typescript
-.endpoint('POST', '/users', {
+app.endpoint('POST', '/users', {
   input: z.object({
     name: z.string().min(1),
     email: z.string().email()
@@ -107,11 +107,10 @@ BullMQ event bus is built-in:
 
 ```typescript
 // Subscribe to events
-.on('user/created', async (event) => {
+app.on('user/created', async (event) => {
   await sendWelcomeEmail(event.data.email)
 })
-
-// Schedule cron jobs
+ // Schedule cron jobs
 .cron('0 0 * * *', async () => {
   await cleanupInactiveUsers()
 })
@@ -205,7 +204,23 @@ const app = new Vision({
     logging: true       // Console logging
   },
   pubsub: {
-    devMode: true      // In-memory BullMQ for local dev
+    devMode: true,     // In-memory BullMQ for local dev
+    // BullMQ options
+    queue: {
+      defaultJobOptions: {
+        lockDuration: 300000, // 5 minutes
+        stalledInterval: 300000,
+        maxStalledCount: 1,
+        removeOnComplete: 1000,
+        removeOnFail: 1000,
+      }
+    },
+    worker: {
+      lockDuration: 300000,
+    },
+    queueEvents: {
+      stalledInterval: 300000,
+    }
   }
 })
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getvision/server",
-  "version": "0.4.0",
+  "version": "0.4.1-ff0c7ec-develop",
   "type": "module",
   "description": "Vision Server - Meta-framework with built-in observability, pub/sub, and type-safe APIs",
   "exports": {

package/src/event-bus.ts

@@ -1,5 +1,5 @@
 import { Queue, Worker, QueueEvents } from 'bullmq'
-import type { z, ZodError } from 'zod'
+import type { QueueEventsOptions, QueueOptions, WorkerOptions } from 'bullmq'
 import { eventRegistry } from './event-registry'
 
 /**
@@ -11,6 +11,9 @@ export interface EventBusConfig {
     port?: number
     password?: string
   }
+  queue?: Omit<QueueOptions, 'connection'>
+  worker?: Omit<WorkerOptions, 'connection'>
+  queueEvents?: Omit<QueueEventsOptions, 'connection'>
   /**
    * Default BullMQ worker concurrency (per event). Per-handler options override this.
    */
@@ -77,6 +80,9 @@ export class EventBus {
       devMode: resolvedDevMode,
       redis: mergedRedis,
       workerConcurrency: config.workerConcurrency,
+      queue: config.queue,
+      worker: config.worker,
+      queueEvents: config.queueEvents,
     }
   }
 
@@ -96,6 +102,7 @@ export class EventBus {
         port: 6379,
       }
       queue = new Queue(eventName, {
+        ...(this.config.queue || {}),
         connection,
       })
       this.queues.set(eventName, queue)
@@ -223,8 +230,13 @@ export class EventBus {
           }
         },
         {
+          ...(this.config.worker || {}),
           connection,
-          concurrency: options?.concurrency ?? this.config.workerConcurrency ?? 1,
+          concurrency:
+            options?.concurrency ??
+            this.config.workerConcurrency ??
+            this.config.worker?.concurrency ??
+            1,
         }
       )
 
@@ -237,6 +249,7 @@ export class EventBus {
           port: 6379,
         }
         const queueEvents = new QueueEvents(eventName, {
+          ...(this.config.queueEvents || {}),
           connection,
         })
 
@@ -301,7 +314,9 @@ export class EventBus {
           }
         },
         {
+          ...(this.config.worker || {}),
           connection,
+          concurrency: this.config.worker?.concurrency ?? 1,
         }
       )
 
@@ -310,6 +325,7 @@ export class EventBus {
       // Listen to cron job events
       if (!this.queueEvents.has(cronName)) {
         const queueEvents = new QueueEvents(cronName, {
+          ...(this.config.queueEvents || {}),
           connection,
         })
 

package/src/service.ts

@@ -145,20 +145,42 @@ export class ServiceBuilder<
   public getRoutesMetadata(): Array<{
     method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH'
     path: string
+    queryParams?: any
     requestBody?: any
     responseBody?: any
   }> {
     const routes: Array<{
       method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH'
       path: string
+      queryParams?: any
       requestBody?: any
       responseBody?: any
     }> = []
     this.endpoints.forEach((ep) => {
       let requestBody = undefined
-      if (ep.schema.input && ['POST', 'PUT', 'PATCH'].includes(ep.method)) {
-        requestBody = generateTemplate(ep.schema.input)
+      let queryParams = undefined
+      
+      if (ep.schema.input) {
+        if (['POST', 'PUT', 'PATCH'].includes(ep.method)) {
+          requestBody = generateTemplate(ep.schema.input)
+        } else if (ep.method === 'GET' || ep.method === 'DELETE') {
+          // Exclude path params from query params
+          const pathParamNames = (ep.path.match(/:([^/]+)/g) || []).map((p: string) => p.slice(1))
+          const fullTemplate = generateTemplate(ep.schema.input)
+          
+          if (fullTemplate && pathParamNames.length > 0) {
+            const queryFields = fullTemplate.fields.filter(
+              (f: { name: string }) => !pathParamNames.includes(f.name)
+            )
+            if (queryFields.length > 0) {
+              queryParams = { ...fullTemplate, fields: queryFields }
+            }
+          } else {
+            queryParams = fullTemplate
+          }
+        }
       }
+      
       let responseBody = undefined
       if (ep.schema.output) {
         responseBody = generateTemplate(ep.schema.output)
@@ -166,6 +188,7 @@ export class ServiceBuilder<
       routes.push({
         method: ep.method,
         path: ep.path,
+        queryParams,
         requestBody,
         responseBody,
       })
@@ -384,13 +407,34 @@ export class ServiceBuilder<
   build(app: Hono, servicesAccumulator?: Array<{ name: string; routes: any[] }>) {
     // Prepare routes with Zod schemas
     const routes = Array.from(this.endpoints.values()).map(ep => {
-      // Generate requestBody schema (input)
+      // Generate requestBody schema (input) for POST/PUT/PATCH
       let requestBody = undefined
-      if (ep.schema.input && ['POST', 'PUT', 'PATCH'].includes(ep.method)) {
-        requestBody = generateTemplate(ep.schema.input)
+      let queryParams = undefined
+      
+      if (ep.schema.input) {
+        if (['POST', 'PUT', 'PATCH'].includes(ep.method)) {
+          requestBody = generateTemplate(ep.schema.input)
+        } else if (ep.method === 'GET' || ep.method === 'DELETE') {
+          // For GET/DELETE, input schema represents query parameters
+          // BUT we need to exclude path params from query params
+          const pathParamNames = (ep.path.match(/:([^/]+)/g) || []).map((p: string) => p.slice(1))
+          const fullTemplate = generateTemplate(ep.schema.input)
+          
+          if (fullTemplate && pathParamNames.length > 0) {
+            // Filter out path params from query params
+            const queryFields = fullTemplate.fields.filter(
+              (f: { name: string }) => !pathParamNames.includes(f.name)
+            )
+            if (queryFields.length > 0) {
+              queryParams = { ...fullTemplate, fields: queryFields }
+            }
+          } else {
+            queryParams = fullTemplate
+          }
+        }
       }
       
-      // Generate responseBody schema (output) - NEW!
+      // Generate responseBody schema (output)
       let responseBody = undefined
       if (ep.schema.output) {
         responseBody = generateTemplate(ep.schema.output)
@@ -401,6 +445,7 @@ export class ServiceBuilder<
         path: ep.path,
         handler: this.name,
         middleware: [],
+        queryParams,
         requestBody,
         responseBody,
       }
@@ -525,8 +570,12 @@ export class ServiceBuilder<
           // Validate input with UniversalValidator (supports Zod, Valibot, etc.)
           const validated = UniversalValidator.parse(ep.schema.input, input)
           
+          // Merge back path params that are not in the schema
+          // This ensures path params like :id are always available to the handler
+          const finalInput = { ...params, ...(validated || {}) }
+          
           // Execute handler
-          const result = await ep.handler(validated, c as any)
+          const result = await ep.handler(finalInput, c as any)
 
           // If an output schema exists, validate and return JSON
           if (ep.schema.output) {

package/src/vision-app.ts

@@ -1,5 +1,5 @@
 import { Hono } from 'hono'
-import type { Env, Schema, Input, MiddlewareHandler } from 'hono'
+import type { Env, Schema } from 'hono'
 import { VisionCore, runInTraceContext } from '@getvision/core'
 import type { RouteMetadata } from '@getvision/core'
 import { AsyncLocalStorage } from 'async_hooks'
@@ -9,6 +9,7 @@ import { ServiceBuilder } from './service'
 import { EventBus } from './event-bus'
 import { eventRegistry } from './event-registry'
 import type { serve as honoServe } from '@hono/node-server'
+import type { QueueEventsOptions, QueueOptions, WorkerOptions } from "bullmq";
 
 export interface VisionALSContext {
   vision: VisionCore
@@ -130,6 +131,9 @@ export interface VisionConfig {
      * Default BullMQ worker concurrency for all handlers (overridable per handler)
      */
     workerConcurrency?: number
+    queue?: Omit<QueueOptions, 'connection'>
+    worker?: Omit<WorkerOptions, 'connection'>
+    queueEvents?: Omit<QueueEventsOptions, 'connection'>
   }
 }
 
@@ -161,9 +165,7 @@ export class Vision<
   private eventBus: EventBus
   private config: VisionConfig
   private serviceBuilders: ServiceBuilder<any, E>[] = []
-  private fileBasedRoutes: RouteMetadata[] = []
   private bunServer?: any
-  private _cleanupPromise?: Promise<void>
   private signalHandler?: () => Promise<void>
 
   constructor(config?: VisionConfig) {
@@ -260,6 +262,9 @@ export class Vision<
       redis: this.config.pubsub?.redis,
       devMode: this.config.pubsub?.devMode,
       workerConcurrency: this.config.pubsub?.workerConcurrency,
+      queue: this.config.pubsub?.queue,
+      worker: this.config.pubsub?.worker,
+      queueEvents: this.config.pubsub?.queueEvents,
     })
     
     // Register JSON-RPC methods for events/cron
@@ -540,6 +545,7 @@ export class Vision<
         method: r.method,
         path: r.path,
         handler: name,
+        queryParams: r.queryParams,
         requestBody: r.requestBody,
         responseBody: r.responseBody,
       }))
@@ -559,31 +565,6 @@ export class Vision<
       builder.build(this as any, allServices)
     }
     
-    // Group file-based routes by path prefix (e.g., /products, /analytics)
-    if (this.fileBasedRoutes.length > 0) {
-      const groupedRoutes = new Map<string, RouteMetadata[]>()
-      
-      for (const route of this.fileBasedRoutes) {
-        // Extract first path segment as service name
-        const segments = route.path.split('/').filter(s => s && !s.startsWith(':'))
-        const serviceName = segments[0] || 'root'
-        
-        if (!groupedRoutes.has(serviceName)) {
-          groupedRoutes.set(serviceName, [])
-        }
-        groupedRoutes.get(serviceName)!.push(route)
-      }
-      
-      // Add each group as a service
-      for (const [name, routes] of groupedRoutes.entries()) {
-        const capitalizedName = name.charAt(0).toUpperCase() + name.slice(1)
-        allServices.push({
-          name: capitalizedName,
-          routes
-        })
-      }
-    }
-    
     // Don't register to VisionCore here - let start() handle it after sub-apps are loaded
     // Just return allServices so they can be registered later
     return allServices