@gobing-ai/ts-infra 0.3.9 → 0.3.11

package/README.md

@@ -4,15 +4,15 @@ Infrastructure backbone — typed event bus, queue/scheduler contracts, adapter
 
 ## Overview
 
-`ts-infra` provides six subsystems that form the application backbone:
+`ts-infra` provides the subsystems that form the application backbone:
 
 | Subsystem | Module | Purpose |
 |-----------|--------|---------|
-| **Event Bus** | `event-bus/` | Typed pub/sub with sync + async dispatch, lifecycle self-observability |
-| **Job Queue** | core + `/job-queue-db` | Queue interfaces in core; DB-backed enqueue/consume flow (`DBJobQueue`, `DBQueueConsumer`) via opt-in subpath |
+| **Event Bus** | `event-bus/` | Typed pub/sub with sync + async dispatch, named async handlers, queue consumer bridge, lifecycle self-observability |
+| **Job Queue** | core + `/job-queue-db` | Queue interfaces in core; DB-backed enqueue/consume flow (`DBJobQueue`, `DBQueueConsumer`) via opt-in subpath; optional typed event emission |
 | **Scheduler** | core + scheduler subpaths | Scheduler contracts, registry, built-in actions, noop adapter in core; Node and Cloudflare adapters via opt-in subpaths |
-| **Telemetry** | `telemetry/` | OTel instrumentation — tracing (`traceAsync`), metrics (12 instruments), SQL sanitizer; opt-in OTLP export via the `/otel-node` subpath |
-| **API Client** | `api-client.ts` | Typed HTTP client with OTel tracing, timeout, and error handling |
+| **Telemetry** | `telemetry/` | OTel instrumentation — tracing (`traceAsync`) with master switch, metrics (12 instruments), SQL sanitizer; opt-in OTLP export via the `/otel-node` subpath |
+| **API Client** | `api-client.ts` | Typed HTTP client with OTel tracing, timeout, per-request abort, optional event emission |
 | **Logger** | `logger.ts` | LogTape-backed structured logger with levels, child loggers, injectable sinks, and mute toggle |
 | **Application Bootstrap** | `application/` | Plugin-driven lifecycle: deterministic startup → shutdown, DI orchestration, services as plugins |
 | **Plugin Host** | `application/plugins/` | Insertion-ordered plugin registry, fail-fast/fail-soft lifecycle fan-out, reason-carrying teardown |
@@ -30,6 +30,7 @@ classDiagram
             +removeAllListeners(event?) void
             +listenerCount(event) number
             +eventNames() string[]
+            +createJobHandler() JobHandler<AsyncEventJobPayload>
         }
     }
 
@@ -120,12 +121,20 @@ classDiagram
             +get~T~(path, opts?) Promise~T~
             +post~T~(path, body?, opts?) Promise~T~
             +put~T~(path, body?, opts?) Promise~T~
+            +patch~T~(path, body?, opts?) Promise~T~
             +delete~T~(path, opts?) Promise~T~
+            +rawRequest(method, path, body?, opts?) Promise~RawHttpResponse~
         }
         class APIError {
             +number status
             +string body
         }
+        class RawHttpResponse {
+            +number status
+            +Record&lt;string,string&gt; headers
+            +string body
+            +boolean truncated?
+        }
     }
 
     namespace logger {
@@ -151,11 +160,15 @@ classDiagram
     SchedulerFactory --> SchedulerAdapter : "uses injected adapter"
     SchedulerFactory --> NoopSchedulerAdapter : "default when none injected"
     EventBus --> JobQueue : "async dispatch"
+    EventBus --> QueueConsumer : "createJobHandler bridge"
     DBJobQueue --> JobQueue : "implements"
     DBQueueConsumer --> QueueConsumer : "implements"
+    DBJobQueue --> EventBus : "optional QueueEvents"
+    DBQueueConsumer --> EventBus : "optional QueueEvents"
     EventBus --> Logger : "self-observability"
     APIClient --> Tracing : "traceAsync"
     APIClient --> Metrics : "counters + histograms"
+    APIClient --> EventBus : "optional ApiClientEvents"
 ```
 
 ## How It Works
@@ -191,6 +204,21 @@ await bus.emit('user.signed_up', 'alice@test.com', 'pro');
 bus.once('user.signed_up', () => console.log('one-time'));
 ```
 
+**Named async handlers** enable queue-backed dispatch. Use `name` to assign a stable id for jobs consumed across process restarts, and `createJobHandler()` to register the bridge on a queue consumer:
+
+```ts
+// Producer side: register async handlers with stable names
+bus.on('order.placed', (orderId) => {
+    console.log(`Order: ${orderId}`);
+}, { async: true, name: 'order-handler' });
+
+// Consumer side: register createJobHandler on your DBQueueConsumer
+const jobHandler = bus.createJobHandler();
+queueConsumer.register('order.placed', jobHandler);
+queueConsumer.register('order.updated', jobHandler);
+// → enqueued { event, args, handlerId } jobs dispatch to the matching named handler
+```
+
 **Lifecycle events** — inject a second `EventBus` to observe bus internals:
 
 ```ts
@@ -241,32 +269,47 @@ For scheduled drains and tests, call `processOnce()` instead of starting the pol
 const processed = await consumer.processOnce();
 ```
 
-The consumer claims ready jobs, resets stuck processing jobs after the visibility timeout, retries failed jobs with exponential backoff, and marks expired jobs failed through `QueueJobDao`.
+The consumer claims ready jobs, resets stuck processing jobs after the visibility timeout, retries failed jobs with exponential backoff, and marks expired jobs failed through `QueueJobDao`. Corrupt payloads are failed individually without rejecting the batch. Poll-cycle errors are logged and retried on the next cycle — a single DAO hiccup will not crash the process.
+
+**Queue lifecycle events** are opt-in through the injected `EventBus`:
+
+```ts
+import { EventBus } from '@gobing-ai/ts-infra';
+import type { QueueEvents } from '@gobing-ai/ts-infra';
+import { DBJobQueue, DBQueueConsumer } from '@gobing-ai/ts-infra/job-queue-db';
+
+const events = new EventBus<QueueEvents>();
+events.on('queue.job.enqueued', ({ jobId, type }) => { /* ... */ });
+events.on('queue.job.completed', ({ jobId, type }) => { /* ... */ });
+events.on('queue.job.failed', ({ jobId, type, error, attempt }) => { /* ... */ });
+events.on('queue.job.retrying', ({ jobId, type, attempt, nextRetryAt }) => { /* ... */ });
+events.on('queue.consumer.started', () => { /* ... */ });
+events.on('queue.consumer.stopped', () => { /* ... */ });
+
+const queue = new DBJobQueue<Payload>(dao, events);                // emits enqueued
+const consumer = new DBQueueConsumer<Payload>(dao, { events });    // emits the rest
+```
 
 ### Scheduler — cron-like actions
 
 ```ts
-import { initScheduler, setSchedulerAdapter } from '@gobing-ai/ts-infra';
+import { initScheduler } from '@gobing-ai/ts-infra';
 import { NodeSchedulerAdapter } from '@gobing-ai/ts-infra/scheduler-node';
 
-// Node.js (interval-based)
-const scheduler = new NodeSchedulerAdapter();
-scheduler.register('60000', async () => {
-    console.log('Runs every 60 seconds');
-});
-scheduler.register('*/5 * * * *', async () => {
-    console.log('Runs every 5 minutes');
-});
-await scheduler.start();
-
-// Or use the core factory after injecting the runtime adapter
-setSchedulerAdapter(new NodeSchedulerAdapter());
-const sched = initScheduler([
+// Core factory — pass the adapter and entries in one call
+const sched = initScheduler(new NodeSchedulerAdapter(), [
     ['300000', async () => cleanupExpiredSessions()],
     ['3600000', async () => generateReports()],
 ]);
 await sched.start();
 
+// Or register directly on the adapter
+const sched2 = new NodeSchedulerAdapter();
+sched2.register('*/5 * * * *', async () => {
+    console.log('Runs every 5 minutes');
+});
+await sched2.start();
+
 // Cloudflare Workers
 import { CloudflareSchedulerAdapter } from '@gobing-ai/ts-infra/scheduler-cloudflare';
 const cfScheduler = new CloudflareSchedulerAdapter();
@@ -301,11 +344,39 @@ try {
     }
 }
 
+// PATCH method
+await api.patch('/users/1', { name: 'updated' });
+
+// Raw request — returns status/headers/body for ALL status codes (no throw on 4xx/5xx)
+const { status, headers, body, truncated } = await api.rawRequest('GET', '/debug', undefined, {
+    redirect: 'follow',
+    maxResponseBytes: 10_000,  // cap response body; truncated === true when exceeded
+});
+
+// Per-request abort signal (not confused with timeouts)
+const controller = new AbortController();
+setTimeout(() => controller.abort(), 2_000);
+await api.get('/slow', { signal: controller.signal }); // throws DOMException AbortError
+
 // Custom operation name for tracing
 const items = await api.get<Item[]>('/items', { operationName: 'inventory.list' });
 ```
 
-The client auto-instruments every request: creates a `CLIENT` span, records method/URL/status attributes, emits request count + duration metrics, and records errors.
+The client auto-instruments every request: creates a `CLIENT` span, records method/URL/status attributes, emits request count + duration metrics, and records errors. Timeouts throw `APIError(0, "Request timed out after …ms")` — never a raw `DOMException`. Caller-initiated aborts rethrow the original `AbortError`.
+
+**API client events** are opt-in through the constructor:
+
+```ts
+import { EventBus } from '@gobing-ai/ts-infra';
+import type { ApiClientEvents } from '@gobing-ai/ts-infra';
+
+const events = new EventBus<ApiClientEvents>();
+events.on('api.request.error', ({ url, method, status, error }) => {
+    console.error(`HTTP error — ${method} ${url}: ${error}`);
+});
+
+const api = new APIClient({ baseUrl: '...', events });
+```
 
 ### Logger — structured JSON
 
@@ -347,7 +418,8 @@ import {
     sanitizeSql,
 } from '@gobing-ai/ts-infra';
 
-// Initialize at startup
+// Initialize at startup — the master switch is real:
+// enabled: false short-circuits ALL infra tracing + metrics to shared noop instruments
 initTelemetry({
     enabled: true,
     serviceName: 'my-api',
@@ -517,6 +589,8 @@ bootstrap:
     enabled: true
     serviceName: billing-api
     endpoint: http://otel-collector:4318
+    headers:
+      authorization: Bearer ${OTEL_TOKEN}
   database:
     enabled: true
     driver: bun-sqlite

package/dist/api-client.d.ts

@@ -1,9 +1,17 @@
+import type { EventBus } from './event-bus/event-bus';
+import type { ApiClientEvents } from './events';
 /** Configuration for {@link APIClient}: base URL, default headers, timeout, and optional custom fetch. */
 export interface APIClientConfig {
     baseUrl: string;
     defaultHeaders?: Record<string, string>;
     timeout?: number;
     fetch?: typeof globalThis.fetch;
+    /**
+     * Optional bus for `api.request.error` events. Emitted on network errors,
+     * timeouts, and (for the JSON methods) non-2xx responses. `rawRequest`
+     * returns non-2xx statuses normally, so it emits only on network/timeout.
+     */
+    events?: EventBus<ApiClientEvents>;
 }
 /** Per-request overrides: headers, timeout, operation name, and abort signal. */
 export interface RequestOptions {
@@ -12,7 +20,24 @@ export interface RequestOptions {
     operationName?: string;
     signal?: AbortSignal;
 }
-/** HTTP error with status code and response body text. */
+/** Options for {@link APIClient.rawRequest}: extends RequestOptions with redirect policy and response-size cap. */
+export interface RawRequestOptions extends RequestOptions {
+    /** Redirect policy (default `'manual'`). */
+    redirect?: 'follow' | 'error' | 'manual';
+    maxResponseBytes?: number;
+}
+/** Raw HTTP response returned by {@link APIClient.rawRequest} for all status codes. */
+export interface RawHttpResponse {
+    status: number;
+    headers: Record<string, string>;
+    body: string;
+    /** True when `maxResponseBytes` capped the body. Omitted when no cap was applied. */
+    truncated?: boolean;
+}
+/**
+ * HTTP error with status code and response body text.
+ * Timeouts are reported with `status === 0` (no response was received).
+ */
 export declare class APIError extends Error {
     readonly status: number;
     readonly body: string;
@@ -33,12 +58,30 @@ export declare class APIClient {
     private readonly defaultHeaders;
     private readonly timeout;
     private readonly fetchFn;
+    private readonly events;
     constructor(config: APIClientConfig);
     private buildUrl;
+    private emitRequestError;
+    /**
+     * Shared request lifecycle: span + attributes, timeout/abort wiring,
+     * total/duration/error metrics, the fetch call, and timeout-vs-abort error
+     * mapping. `consume` owns response handling (parse/throw policy).
+     */
+    private runRequest;
     private request;
+    /**
+     * Make a raw HTTP request returning status, headers, and body for ALL status codes.
+     * Never throws on HTTP status codes (2xx, 4xx, 5xx all return a {@link RawHttpResponse}).
+     * Throws only on network/timeout errors.
+     *
+     * Deliberately does NOT force Content-Type: application/json — callers pass raw
+     * string bodies and set their own content-type header.
+     */
+    rawRequest(method: string, path: string, body?: string, opts?: RawRequestOptions): Promise<RawHttpResponse>;
     get<T>(path: string, opts?: RequestOptions): Promise<T>;
     post<T>(path: string, body?: unknown, opts?: RequestOptions): Promise<T>;
     put<T>(path: string, body?: unknown, opts?: RequestOptions): Promise<T>;
+    patch<T>(path: string, body?: unknown, opts?: RequestOptions): Promise<T>;
     delete<T>(path: string, opts?: RequestOptions): Promise<T>;
 }
 //# sourceMappingURL=api-client.d.ts.map

package/dist/api-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"AAkBA,0GAA0G;AAC1G,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACnC;AAED,iFAAiF;AACjF,MAAM,WAAW,cAAc;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC;CACxB;AAED,0DAA0D;AAC1D,qBAAa,QAAS,SAAQ,KAAK;aAEX,MAAM,EAAE,MAAM;aACd,IAAI,EAAE,MAAM;gBADZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM;CAKnC;AAID;;;;;;;;;GASG;AACH,qBAAa,SAAS;IAClB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;gBAEtC,MAAM,EAAE,eAAe;IAOnC,OAAO,CAAC,QAAQ;YAIF,OAAO;IAmFf,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAIvD,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAIxE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAIvE,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;CAGnE"}
+{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAUhD,0GAA0G;AAC1G,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAChC;;;;OAIG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;CACtC;AACD,iFAAiF;AACjF,MAAM,WAAW,cAAc;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC;CACxB;AAED,mHAAmH;AACnH,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACrD,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IACzC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,uFAAuF;AACvF,MAAM,WAAW,eAAe;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,qFAAqF;IACrF,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB;AACD;;;GAGG;AACH,qBAAa,QAAS,SAAQ,KAAK;aAEX,MAAM,EAAE,MAAM;aACd,IAAI,EAAE,MAAM;gBADZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM;CAKnC;AAkDD;;;;;;;;;GASG;AACH,qBAAa,SAAS;IAClB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAEnD,MAAM,EAAE,eAAe;IAQnC,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,gBAAgB;IASxB;;;;OAIG;YACW,UAAU;YA0FV,OAAO;IAmCrB;;;;;;;OAOG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IA+C3G,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAIvD,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAIxE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAIvE,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAIzE,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;CAGnE"}

package/dist/api-client.js

@@ -5,7 +5,10 @@ import { SpanKind } from '@opentelemetry/api';
 import { ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_URL_FULL, } from '@opentelemetry/semantic-conventions';
 import { getHttpClientRequestDuration, getHttpClientRequestErrors, getHttpClientRequestTotal, } from './telemetry/metrics.js';
 import { traceAsync } from './telemetry/tracing.js';
-/** HTTP error with status code and response body text. */
+/**
+ * HTTP error with status code and response body text.
+ * Timeouts are reported with `status === 0` (no response was received).
+ */
 export class APIError extends Error {
     status;
     body;
@@ -16,6 +19,47 @@ export class APIError extends Error {
         this.name = 'APIError';
     }
 }
+// ── Body reading ────────────────────────────────────────────────────
+/**
+ * Read a response body capped at `maxResponseBytes` (UTF-8 bytes). Returns the
+ * decoded text and whether the body was truncated. Falls back to `text()` with
+ * a character cap when the response exposes no readable stream.
+ */
+async function readBodyCapped(response, maxResponseBytes) {
+    const reader = response.body?.getReader();
+    if (!reader) {
+        const full = await response.text();
+        if (full.length > maxResponseBytes) {
+            return { text: full.slice(0, maxResponseBytes), truncated: true };
+        }
+        return { text: full };
+    }
+    const chunks = [];
+    const decoder = new TextDecoder();
+    let total = 0;
+    let truncated = false;
+    while (true) {
+        const { done, value } = await reader.read();
+        if (done)
+            break;
+        const remaining = maxResponseBytes - total;
+        if (value.length > remaining) {
+            // The streaming decoder holds back a trailing partial multibyte
+            // sequence, which is then dropped — the cap is a byte budget.
+            chunks.push(decoder.decode(value.slice(0, remaining), { stream: true }));
+            truncated = true;
+            break;
+        }
+        chunks.push(decoder.decode(value, { stream: true }));
+        total += value.length;
+    }
+    if (truncated) {
+        // Stop the underlying stream instead of letting it keep downloading.
+        await reader.cancel().catch(() => { });
+    }
+    reader.releaseLock();
+    return { text: chunks.join(''), ...(truncated ? { truncated } : {}) };
+}
 // ── Client ──────────────────────────────────────────────────────────
 /**
  * Typed HTTP client builder wrapping fetch with automatic JSON serialization,
@@ -32,22 +76,31 @@ export class APIClient {
     defaultHeaders;
     timeout;
     fetchFn;
+    events;
     constructor(config) {
         this.baseUrl = config.baseUrl.replace(/\/+$/, '');
         this.defaultHeaders = config.defaultHeaders ?? {};
         this.timeout = config.timeout ?? 30_000;
         this.fetchFn = config.fetch ?? globalThis.fetch;
+        this.events = config.events;
     }
     buildUrl(path) {
         return `${this.baseUrl}${path.startsWith('/') ? path : `/${path}`}`;
     }
-    async request(method, path, body, opts) {
-        const url = this.buildUrl(path);
-        const headers = {
-            'Content-Type': 'application/json',
-            ...this.defaultHeaders,
-            ...opts?.headers,
-        };
+    emitRequestError(method, url, error, status) {
+        void this.events?.emit('api.request.error', {
+            url,
+            method,
+            ...(status !== undefined ? { status } : {}),
+            error,
+        });
+    }
+    /**
+     * Shared request lifecycle: span + attributes, timeout/abort wiring,
+     * total/duration/error metrics, the fetch call, and timeout-vs-abort error
+     * mapping. `consume` owns response handling (parse/throw policy).
+     */
+    async runRequest(method, url, headers, body, opts, redirect, consume) {
         const operationName = opts?.operationName ?? `HTTP ${method} ${url}`;
         return traceAsync(operationName, async (span) => {
             span.setAttribute(ATTR_HTTP_REQUEST_METHOD, method);
@@ -66,40 +119,40 @@ export class APIClient {
                 const response = await this.fetchFn(url, {
                     method,
                     headers,
-                    body: body !== undefined ? JSON.stringify(body) : undefined,
+                    body,
                     signal: combinedSignal,
+                    ...(redirect ? { redirect } : {}),
                 });
                 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
                 getHttpClientRequestTotal().add(1, {
                     'http.request.method': method,
                     'http.response.status_code': response.status,
                 });
-                const duration = performance.now() - start;
-                getHttpClientRequestDuration().record(duration, {
+                getHttpClientRequestDuration().record(performance.now() - start, {
                     'http.request.method': method,
                     'http.response.status_code': response.status,
                 });
-                if (!response.ok) {
-                    const text = await response.text();
+                return await consume(response, span);
+            }
+            catch (error) {
+                // Timeout (our own AbortController fired) — but never relabel a
+                // caller-initiated abort via opts.signal as a timeout.
+                if (error instanceof DOMException && error.name === 'AbortError' && !opts?.signal?.aborted) {
                     getHttpClientRequestErrors().add(1, {
                         'http.request.method': method,
-                        'error.type': `HTTP_${response.status}`,
+                        'error.type': 'Timeout',
                     });
-                    throw new APIError(response.status, text);
+                    const timeoutError = new APIError(0, `Request timed out after ${timeoutMs}ms: ${method} ${url}`);
+                    this.emitRequestError(method, url, timeoutError.message);
+                    throw timeoutError;
                 }
-                const contentType = response.headers.get('content-type') ?? '';
-                if (contentType.includes('application/json')) {
-                    return (await response.json());
-                }
-                return (await response.text());
-            }
-            catch (error) {
                 if (!(error instanceof APIError)) {
                     getHttpClientRequestErrors().add(1, {
                         'http.request.method': method,
                         'error.type': error instanceof Error ? error.name : 'Unknown',
                     });
                 }
+                this.emitRequestError(method, url, error instanceof Error ? error.message : String(error), error instanceof APIError && error.status > 0 ? error.status : undefined);
                 throw error;
             }
             finally {
@@ -108,6 +161,72 @@ export class APIClient {
             }
         }, { kind: SpanKind.CLIENT });
     }
+    async request(method, path, body, opts) {
+        const url = this.buildUrl(path);
+        const headers = {
+            'Content-Type': 'application/json',
+            ...this.defaultHeaders,
+            ...opts?.headers,
+        };
+        return this.runRequest(method, url, headers, body !== undefined ? JSON.stringify(body) : undefined, opts, undefined, async (response) => {
+            if (!response.ok) {
+                const text = await response.text();
+                getHttpClientRequestErrors().add(1, {
+                    'http.request.method': method,
+                    'error.type': `HTTP_${response.status}`,
+                });
+                throw new APIError(response.status, text);
+            }
+            const contentType = response.headers.get('content-type') ?? '';
+            if (contentType.includes('application/json')) {
+                return (await response.json());
+            }
+            return (await response.text());
+        });
+    }
+    /**
+     * Make a raw HTTP request returning status, headers, and body for ALL status codes.
+     * Never throws on HTTP status codes (2xx, 4xx, 5xx all return a {@link RawHttpResponse}).
+     * Throws only on network/timeout errors.
+     *
+     * Deliberately does NOT force Content-Type: application/json — callers pass raw
+     * string bodies and set their own content-type header.
+     */
+    async rawRequest(method, path, body, opts) {
+        const url = this.buildUrl(path);
+        const headers = {
+            ...this.defaultHeaders,
+            ...opts?.headers,
+        };
+        const redirect = opts?.redirect ?? 'manual';
+        const maxResponseBytes = opts?.maxResponseBytes;
+        return this.runRequest(method, url, headers, body ?? undefined, opts, redirect, async (response) => {
+            if (!response.ok) {
+                getHttpClientRequestErrors().add(1, {
+                    'http.request.method': method,
+                    'error.type': `HTTP_${response.status}`,
+                });
+            }
+            let text;
+            let truncated;
+            if (maxResponseBytes !== undefined) {
+                ({ text, truncated } = await readBodyCapped(response, maxResponseBytes));
+            }
+            else {
+                text = await response.text();
+            }
+            const responseHeaders = {};
+            response.headers.forEach((value, key) => {
+                responseHeaders[key] = value;
+            });
+            return {
+                status: response.status,
+                headers: responseHeaders,
+                body: text,
+                ...(truncated !== undefined ? { truncated } : {}),
+            };
+        });
+    }
     async get(path, opts) {
         return this.request('GET', path, undefined, opts);
     }
@@ -117,6 +236,9 @@ export class APIClient {
     async put(path, body, opts) {
         return this.request('PUT', path, body, opts);
     }
+    async patch(path, body, opts) {
+        return this.request('PATCH', path, body, opts);
+    }
     async delete(path, opts) {
         return this.request('DELETE', path, undefined, opts);
     }

package/dist/application/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAsB,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAM7C,OAAO,KAAK,EAER,2BAA2B,EAC3B,kBAAkB,EAGrB,MAAM,SAAS,CAAC;AAiCjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAsB,cAAc,CAAC,UAAU,GAAG,OAAO,EAAE,OAAO,SAAS,QAAQ,GAAG,WAAW,EAC7F,OAAO,EAAE,2BAA2B,CAAC,UAAU,EAAE,OAAO,CAAC,GAC1D,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAkIlD;AAED,YAAY,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACvE,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE7D,YAAY,EACR,0BAA0B,EAC1B,2BAA2B,EAC3B,uBAAuB,EACvB,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EACtB,aAAa,EACb,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,gBAAgB,GACnB,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAsB,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAM7C,OAAO,KAAK,EAER,2BAA2B,EAC3B,kBAAkB,EAGrB,MAAM,SAAS,CAAC;AAiCjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAsB,cAAc,CAAC,UAAU,GAAG,OAAO,EAAE,OAAO,SAAS,QAAQ,GAAG,WAAW,EAC7F,OAAO,EAAE,2BAA2B,CAAC,UAAU,EAAE,OAAO,CAAC,GAC1D,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAmIlD;AAED,YAAY,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACvE,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE7D,YAAY,EACR,0BAA0B,EAC1B,2BAA2B,EAC3B,uBAAuB,EACvB,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EACtB,aAAa,EACb,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,gBAAgB,GACnB,MAAM,SAAS,CAAC"}

package/dist/application/index.js

@@ -105,9 +105,9 @@ export async function runApplication(options) {
         if (lifecycleBus && eventsDefaultObservers) {
             attachDefaultObservers(lifecycleBus);
         }
-        const events = options.services?.events
-            ? options.services.events
-            : new EventBus({ lifecycleBus: lifecycleBus });
+        const events = options.services?.events ??
+            options.config?.events?.bus ??
+            new EventBus({ lifecycleBus: lifecycleBus });
         // ── 4. Database (injected only) ────────────────────────────────
         const db = options.services?.db;
         // ── 5. Scheduler ───────────────────────────────────────────────

package/dist/application/plugins/builtins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builtins.d.ts","sourceRoot":"","sources":["../../../src/application/plugins/builtins.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAI7C,OAAO,KAAK,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAItC;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,0BAA0B,CAAC,WAAW,CAAC,GAAG,MAAM,CAwBvF;AAID;;;;;;GAMG;AACH,wBAAgB,YAAY,CACxB,MAAM,EAAE;IACJ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CACnD,EACD,QAAQ,CAAC,EAAE,OAAO,GACnB,MAAM,CAiBR;AAID,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,OAAO,SAAS,QAAQ,EACnE,KAAK,EAAE,CAAC,GAAG,EAAE,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,EAC7E,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,SAAS,EAC1G,GAAG,CAAC,EAAE,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,GAC9C,MAAM,CAgBR;AAGD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM,CAgBrF;AAID;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,aAAa,GAAG,MAAM,CAelD"}
+{"version":3,"file":"builtins.d.ts","sourceRoot":"","sources":["../../../src/application/plugins/builtins.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAI7C,OAAO,KAAK,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAItC;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,0BAA0B,CAAC,WAAW,CAAC,GAAG,MAAM,CA0BvF;AAID;;;;;;GAMG;AACH,wBAAgB,YAAY,CACxB,MAAM,EAAE;IACJ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CACnD,EACD,QAAQ,CAAC,EAAE,OAAO,GACnB,MAAM,CAiBR;AAID,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,OAAO,SAAS,QAAQ,EACnE,KAAK,EAAE,CAAC,GAAG,EAAE,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,EAC7E,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,SAAS,EAC1G,GAAG,CAAC,EAAE,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,GAC9C,MAAM,CAgBR;AAGD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM,CAgBrF;AAID;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,aAAa,GAAG,MAAM,CAelD"}

package/dist/application/plugins/builtins.js

@@ -25,21 +25,23 @@ export function telemetryPlugin(config) {
         failFast: true,
         onLoad: async () => { },
         onStart: async () => {
+            // Always record the resolved config — `enabled: false` must reach the
+            // master switch so infra spans/instruments actually go quiet.
+            initTelemetry({
+                enabled: config.enabled,
+                serviceName: config.serviceName,
+                environment: config.environment,
+                dbStatementDebug: config.dbStatementDebug,
+            });
             if (config.enabled) {
-                initTelemetry({
-                    enabled: config.enabled,
-                    serviceName: config.serviceName,
-                    environment: config.environment,
-                    dbStatementDebug: config.dbStatementDebug,
-                });
                 initMetrics();
             }
         },
         onStop: async () => {
             if (config.enabled) {
                 shutdownMetrics();
-                await shutdownTelemetry();
             }
+            await shutdownTelemetry();
         },
     };
 }

package/dist/application/types.d.ts

@@ -65,7 +65,7 @@ export interface SchedulerOptions {
 }
 /**
  * Fully-resolved bootstrap config (all optionals filled with defaults).
- * Constructed internally by `resolveBootstrapConfig`.
+ * Constructed internally by `runApplication`.
  */
 export interface ApplicationBootstrapConfig {
     readonly logging: Readonly<Required<Pick<LoggingOptions, 'enabled' | 'level' | 'console' | 'json'>> & {

package/dist/application-node.d.ts

@@ -14,17 +14,33 @@
  *
  * @module application-node
  */
-import type { ApplicationBootstrapOptions, ApplicationConfigLoader, ApplicationRuntime, ApplicationStopReason, EventMap, InfraEvents } from './application/types';
+import type { ApplicationBootstrapOptions, ApplicationConfigLoader, ApplicationRuntime, ApplicationStopReason, EventMap, EventsOptions, InfraEvents, LoggingOptions, SchedulerOptions, TelemetryOptions } from './application/types';
 /** Error thrown when application config validation fails. Includes file path and section name. */
 export declare class ConfigValidationError extends Error {
     constructor(message: string);
 }
+/**
+ * Telemetry options for the Node subpath: the portable flags plus OTLP export
+ * wiring. Presence of `endpoint` (with `enabled` not false) turns on Node OTel
+ * export via `@gobing-ai/ts-infra/otel-node`.
+ */
+export interface NodeTelemetryBootstrapOptions extends TelemetryOptions {
+    /** OTLP/HTTP collector endpoint base, e.g. `http://localhost:4318`. */
+    endpoint?: string;
+    /** Extra headers sent on every OTLP request (e.g. an auth token). */
+    headers?: Record<string, string>;
+}
 /** Options for the Node/Bun convenience {@link runNodeApplication}. */
 export interface NodeApplicationOptions<TAppConfig = unknown, TEvents extends EventMap = InfraEvents> {
     /** YAML config loading options. When omitted, uses defaults. */
     readonly configLoader?: ApplicationConfigLoader<TAppConfig>;
     /** Inline bootstrap config (overrides YAML-loaded config). */
-    readonly config?: ApplicationBootstrapOptions<TAppConfig, TEvents>['config'];
+    readonly config?: {
+        logging?: LoggingOptions;
+        events?: EventsOptions<TEvents>;
+        telemetry?: NodeTelemetryBootstrapOptions;
+        scheduler?: SchedulerOptions;
+    };
     /** Pre-built services to inject. */
     readonly services?: ApplicationBootstrapOptions<TAppConfig, TEvents>['services'];
     /** User callback: application logic. */

package/dist/application-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application-node.d.ts","sourceRoot":"","sources":["../src/application-node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAWH,OAAO,KAAK,EACR,2BAA2B,EAC3B,uBAAuB,EAEvB,kBAAkB,EAClB,qBAAqB,EAGrB,QAAQ,EACR,WAAW,EAId,MAAM,qBAAqB,CAAC;AAM7B,kGAAkG;AAClG,qBAAa,qBAAsB,SAAQ,KAAK;gBAChC,OAAO,EAAE,MAAM;CAI9B;AAgHD,uEAAuE;AACvE,MAAM,WAAW,sBAAsB,CAAC,UAAU,GAAG,OAAO,EAAE,OAAO,SAAS,QAAQ,GAAG,WAAW;IAChG,gEAAgE;IAChE,QAAQ,CAAC,YAAY,CAAC,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAC5D,8DAA8D;IAC9D,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC7E,oCAAoC;IACpC,QAAQ,CAAC,QAAQ,CAAC,EAAE,2BAA2B,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC;IACjF,wCAAwC;IACxC,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACvF,wDAAwD;IACxD,QAAQ,CAAC,IAAI,CAAC,EAAE,CACZ,GAAG,EAAE,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,EAC5C,MAAM,EAAE,qBAAqB,KAC5B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC7B;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,GAAG,OAAO,EAAE,OAAO,SAAS,QAAQ,GAAG,WAAW,EACjG,OAAO,EAAE,sBAAsB,CAAC,UAAU,EAAE,OAAO,CAAC,GACrD,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CA8FlD"}
+{"version":3,"file":"application-node.d.ts","sourceRoot":"","sources":["../src/application-node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAWH,OAAO,KAAK,EACR,2BAA2B,EAC3B,uBAAuB,EAEvB,kBAAkB,EAClB,qBAAqB,EAGrB,QAAQ,EACR,aAAa,EACb,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EACnB,MAAM,qBAAqB,CAAC;AAM7B,kGAAkG;AAClG,qBAAa,qBAAsB,SAAQ,KAAK;gBAChC,OAAO,EAAE,MAAM;CAI9B;AAgHD;;;;GAIG;AACH,MAAM,WAAW,6BAA8B,SAAQ,gBAAgB;IACnE,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED,uEAAuE;AACvE,MAAM,WAAW,sBAAsB,CAAC,UAAU,GAAG,OAAO,EAAE,OAAO,SAAS,QAAQ,GAAG,WAAW;IAChG,gEAAgE;IAChE,QAAQ,CAAC,YAAY,CAAC,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAC5D,8DAA8D;IAC9D,QAAQ,CAAC,MAAM,CAAC,EAAE;QACd,OAAO,CAAC,EAAE,cAAc,CAAC;QACzB,MAAM,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;QAChC,SAAS,CAAC,EAAE,6BAA6B,CAAC;QAC1C,SAAS,CAAC,EAAE,gBAAgB,CAAC;KAChC,CAAC;IACF,oCAAoC;IACpC,QAAQ,CAAC,QAAQ,CAAC,EAAE,2BAA2B,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC;IACjF,wCAAwC;IACxC,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACvF,wDAAwD;IACxD,QAAQ,CAAC,IAAI,CAAC,EAAE,CACZ,GAAG,EAAE,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,EAC5C,MAAM,EAAE,qBAAqB,KAC5B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC7B;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,GAAG,OAAO,EAAE,OAAO,SAAS,QAAQ,GAAG,WAAW,EACjG,OAAO,EAAE,sBAAsB,CAAC,UAAU,EAAE,OAAO,CAAC,GACrD,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAmGlD"}