@mantiq/heartbeat 0.3.5 → 0.4.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mantiq/heartbeat",
-  "version": "0.3.5",
+  "version": "0.4.0-rc.2",
   "description": "Observability, APM & queue monitoring for MantiqJS",
   "type": "module",
   "license": "MIT",
@@ -40,14 +40,20 @@
     "LICENSE"
   ],
   "scripts": {
-    "build": "bun build ./src/index.ts --outdir ./dist --target bun",
+    "build": "bun build ./src/index.ts --outdir ./dist --target bun --packages=external",
     "test": "bun test",
     "typecheck": "tsc --noEmit",
     "clean": "rm -rf dist"
   },
   "devDependencies": {
     "bun-types": "latest",
-    "typescript": "^5.7.0"
+    "typescript": "^5.7.0",
+    "@mantiq/core": "workspace:*",
+    "@mantiq/cli": "workspace:*",
+    "@mantiq/queue": "workspace:*",
+    "@mantiq/events": "workspace:*",
+    "@mantiq/database": "workspace:*",
+    "@mantiq/logging": "workspace:*"
   },
   "peerDependencies": {
     "@mantiq/core": "^0.1.0",
@@ -56,5 +62,8 @@
     "@mantiq/events": "^0.1.0",
     "@mantiq/database": "^0.1.0",
     "@mantiq/logging": "^0.1.0"
+  },
+  "mantiq": {
+    "provider": "HeartbeatServiceProvider"
   }
 }

package/src/contracts/Entry.ts

@@ -19,7 +19,7 @@ export type EntryType =
 export interface PendingEntry {
   type: EntryType
   content: Record<string, any>
-  tags?: string[]
+  tags?: string[] | undefined
   requestId: string | null
   createdAt: number
 }

package/src/dashboard/pages/MailPage.ts

@@ -4,7 +4,7 @@ import type { HeartbeatStore } from '../../storage/HeartbeatStore.ts'
 import type { MailEntryContent } from '../../contracts/Entry.ts'
 
 export async function renderMailPage(store: HeartbeatStore, basePath: string): Promise<string> {
-  const entries = await store.getEntries('mail', 50)
+  const entries = await store.getEntries({ type: 'mail', limit: 50 })
 
   const rows = entries.map((e) => {
     let c: MailEntryContent

package/src/middleware/HeartbeatMiddleware.ts

@@ -136,29 +136,41 @@ export class HeartbeatMiddleware implements Middleware {
         }
       }
 
-      // Attach debug stats header: duration;memory;status;queries
-      if (process.env.APP_DEBUG === 'true' && response!) {
-        try {
-          const mem = (Math.abs(process.memoryUsage().rss - startMemory) / 1024 / 1024).toFixed(1)
-          const headers = new Headers(response!.headers)
-          headers.set('X-Heartbeat', `${Math.round(duration)}ms;${mem}MB;${response!.status};0q`)
-          headers.set('Access-Control-Expose-Headers', [headers.get('Access-Control-Expose-Headers'), 'X-Heartbeat'].filter(Boolean).join(', '))
-          response = new Response(response!.body, { status: response!.status, statusText: response!.statusText, headers })
-        } catch { /* ignore */ }
-      }
-
       // Flush entries (fire-and-forget)
       this.heartbeat.flush()
     }
 
-    // Inject debug widget into HTML responses when APP_DEBUG=true
+    // Debug mode: attach X-Heartbeat header + inject widget
     if (process.env.APP_DEBUG === 'true' && response!) {
-      const ct = response!.headers.get('content-type') ?? ''
-      if (ct.includes('text/html') && response!.status < 400) {
-        const duration = performance.now() - startTime
-        const memUsage = process.memoryUsage().rss - startMemory
-        response = await this.injectWidget(response!, duration, memUsage)
-      }
+      const totalDuration = performance.now() - startTime
+      const totalMemory = Math.abs(process.memoryUsage().rss - startMemory)
+      const mem = (totalMemory / 1024 / 1024).toFixed(1)
+      const statsHeader = `${Math.round(totalDuration)}ms;${mem}MB;${response!.status};0q`
+
+      try {
+        const ct = response!.headers.get('content-type') ?? ''
+        const isHtml = ct.includes('text/html') && response!.status < 400
+        const cloned = response!.clone()
+        const body = await cloned.text()
+        const headers = new Headers(response!.headers)
+
+        headers.set('X-Heartbeat', statsHeader)
+        headers.set('Access-Control-Expose-Headers', [headers.get('Access-Control-Expose-Headers'), 'X-Heartbeat'].filter(Boolean).join(', '))
+
+        let finalBody = body
+        if (isHtml && this.heartbeat.config.widget?.enabled !== false && body.includes('</body>')) {
+          const widget = renderWidget({
+            duration: totalDuration,
+            memory: totalMemory,
+            status: response!.status,
+            queries: 0,
+            dashboardPath: this.heartbeat.config.dashboard.path,
+          })
+          finalBody = body.replace('</body>', widget + '\n</body>')
+        }
+
+        response = new Response(finalBody, { status: response!.status, statusText: response!.statusText, headers })
+      } catch (e) { console.error('[Heartbeat Widget]', e) }
     }
 
     return response!
@@ -225,29 +237,4 @@ export class HeartbeatMiddleware implements Middleware {
     }
   }
 
-  private async injectWidget(response: Response, duration: number, memory: number): Promise<Response> {
-    if (this.heartbeat.config.widget?.enabled === false) return response
-
-    try {
-      const html = await response.text()
-      if (!html.includes('</body>')) return new Response(html, { status: response.status, statusText: response.statusText, headers: response.headers })
-
-      const widget = renderWidget({
-        duration,
-        memory: Math.abs(memory),
-        status: response.status,
-        queries: 0, // TODO: wire up query count from QueryWatcher
-        dashboardPath: this.heartbeat.config.dashboard.path,
-      })
-
-      const injected = html.replace('</body>', widget + '\n</body>')
-      return new Response(injected, {
-        status: response.status,
-        statusText: response.statusText,
-        headers: response.headers,
-      })
-    } catch {
-      return response
-    }
-  }
 }

package/src/models/EntryModel.ts

@@ -2,9 +2,11 @@ import { Model } from '@mantiq/database'
 
 export class EntryModel extends Model {
   static override table = 'heartbeat_entries'
+  static override incrementing = true
+  static override keyType = 'int' as const
   static override timestamps = false
   static override fillable = ['uuid', 'type', 'request_id', 'content', 'tags', 'created_at']
-  static override casts: Record<string, string> = {
+  static override casts: Record<string, 'int' | 'float' | 'boolean' | 'string' | 'json' | 'date' | 'datetime' | 'array'> = {
     id: 'int',
     created_at: 'int',
   }

package/src/models/ExceptionGroupModel.ts

@@ -3,12 +3,14 @@ import { Model } from '@mantiq/database'
 export class ExceptionGroupModel extends Model {
   static override table = 'heartbeat_exception_groups'
   static override primaryKey = 'fingerprint'
+  static override incrementing = false
+  static override keyType = 'string' as const
   static override timestamps = false
   static override fillable = [
     'fingerprint', 'class', 'message', 'count',
     'first_seen_at', 'last_seen_at', 'last_entry_uuid', 'resolved_at',
   ]
-  static override casts: Record<string, string> = {
+  static override casts: Record<string, 'int' | 'float' | 'boolean' | 'string' | 'json' | 'date' | 'datetime' | 'array'> = {
     count: 'int',
     first_seen_at: 'int',
     last_seen_at: 'int',

package/src/models/MetricModel.ts

@@ -2,9 +2,11 @@ import { Model } from '@mantiq/database'
 
 export class MetricModel extends Model {
   static override table = 'heartbeat_metrics'
+  static override incrementing = true
+  static override keyType = 'int' as const
   static override timestamps = false
   static override fillable = ['name', 'type', 'value', 'tags', 'period', 'bucket', 'created_at']
-  static override casts: Record<string, string> = {
+  static override casts: Record<string, 'int' | 'float' | 'boolean' | 'string' | 'json' | 'date' | 'datetime' | 'array'> = {
     id: 'int',
     value: 'float',
     period: 'int',

package/src/models/SpanModel.ts

@@ -2,12 +2,14 @@ import { Model } from '@mantiq/database'
 
 export class SpanModel extends Model {
   static override table = 'heartbeat_spans'
+  static override incrementing = true
+  static override keyType = 'int' as const
   static override timestamps = false
   static override fillable = [
     'trace_id', 'span_id', 'parent_span_id', 'name', 'type', 'status',
     'start_time', 'end_time', 'duration', 'attributes', 'events', 'created_at',
   ]
-  static override casts: Record<string, string> = {
+  static override casts: Record<string, 'int' | 'float' | 'boolean' | 'string' | 'json' | 'date' | 'datetime' | 'array'> = {
     id: 'int',
     start_time: 'int',
     end_time: 'int',

package/src/storage/HeartbeatStore.ts

@@ -54,10 +54,10 @@ export class HeartbeatStore {
    * Query entries with optional type filter and pagination.
    */
   async getEntries(options: {
-    type?: EntryType
-    limit?: number
-    offset?: number
-    requestId?: string
+    type?: EntryType | undefined
+    limit?: number | undefined
+    offset?: number | undefined
+    requestId?: string | undefined
   } = {}): Promise<HeartbeatEntry[]> {
     const { type, limit = 50, offset = 0, requestId } = options
 

package/src/tracing/Span.ts

@@ -14,7 +14,7 @@ export class Span {
   endTime: number | null = null
   status: SpanStatus = 'ok'
   attributes: Record<string, string | number | boolean> = {}
-  events: Array<{ name: string; timestamp: number; attributes?: Record<string, any> }> = []
+  events: Array<{ name: string; timestamp: number; attributes?: Record<string, any> | undefined }> = []
 
   constructor(
     traceId: string,

package/src/watchers/CacheWatcher.ts

@@ -26,7 +26,7 @@ export class CacheWatcher extends Watcher {
       duration: null,
     }
 
-    const tags = [operation]
+    const tags: string[] = [operation]
     if (operation === 'miss') tags.push('cache-miss')
 
     this.record('cache', content, tags)

package/src/watchers/ScheduleWatcher.ts

@@ -27,7 +27,7 @@ export class ScheduleWatcher extends Watcher {
       status: data.status,
     }
 
-    const tags = [data.status]
+    const tags: string[] = [data.status]
     if (data.status === 'error') tags.push('failed')
 
     this.record('schedule', content, tags)