@relkit/runtime-hono 0.3.0 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/control-plane.d.ts +2 -0
- package/dist/control-plane.d.ts.map +1 -0
- package/dist/control-plane.js +4 -0
- package/dist/control-plane.js.map +1 -0
- package/dist/http-response.d.ts +5 -0
- package/dist/http-response.d.ts.map +1 -0
- package/dist/http-response.js +124 -0
- package/dist/http-response.js.map +1 -0
- package/dist/http-span-record.d.ts +4 -0
- package/dist/http-span-record.d.ts.map +1 -0
- package/dist/http-span-record.js +9 -0
- package/dist/http-span-record.js.map +1 -0
- package/dist/http-span.d.ts +8 -0
- package/dist/http-span.d.ts.map +1 -0
- package/dist/http-span.js +122 -0
- package/dist/http-span.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/materialize-routes-utils.d.ts.map +1 -1
- package/dist/materialize-routes-utils.js +16 -2
- package/dist/materialize-routes-utils.js.map +1 -1
- package/dist/mcp.js +0 -1
- package/dist/mcp.js.map +1 -1
- package/dist/middleware-limits.d.ts.map +1 -1
- package/dist/middleware-limits.js +9 -4
- package/dist/middleware-limits.js.map +1 -1
- package/dist/middleware-utils.d.ts +11 -1
- package/dist/middleware-utils.d.ts.map +1 -1
- package/dist/middleware-utils.js +19 -5
- package/dist/middleware-utils.js.map +1 -1
- package/dist/middleware.d.ts.map +1 -1
- package/dist/middleware.js +41 -45
- package/dist/middleware.js.map +1 -1
- package/dist/rate-limit-telemetry.d.ts +0 -4
- package/dist/rate-limit-telemetry.d.ts.map +1 -1
- package/dist/rate-limit-telemetry.js +0 -39
- package/dist/rate-limit-telemetry.js.map +1 -1
- package/dist/rate-limit.d.ts.map +1 -1
- package/dist/rate-limit.js +17 -12
- package/dist/rate-limit.js.map +1 -1
- package/dist/request-inference.d.ts +2 -0
- package/dist/request-inference.d.ts.map +1 -0
- package/dist/request-inference.js +80 -0
- package/dist/request-inference.js.map +1 -0
- package/dist/request-record-middleware.d.ts +1 -1
- package/dist/request-record-middleware.d.ts.map +1 -1
- package/dist/request-record-middleware.js +7 -6
- package/dist/request-record-middleware.js.map +1 -1
- package/dist/request-record-utils.d.ts.map +1 -1
- package/dist/request-record-utils.js +4 -0
- package/dist/request-record-utils.js.map +1 -1
- package/dist/route-middleware.d.ts.map +1 -1
- package/dist/route-middleware.js +3 -1
- package/dist/route-middleware.js.map +1 -1
- package/dist/rpc-middleware-trace.d.ts +6 -0
- package/dist/rpc-middleware-trace.d.ts.map +1 -0
- package/dist/rpc-middleware-trace.js +31 -0
- package/dist/rpc-middleware-trace.js.map +1 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +3 -26
- package/dist/rpc.js.map +1 -1
- package/package.json +10 -9
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"control-plane.d.ts","sourceRoot":"","sources":["../src/control-plane.ts"],"names":[],"mappings":"AAAA,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE9D"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"control-plane.js","sourceRoot":"","sources":["../src/control-plane.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,wBAAwB,CAAC,IAAY;IACnD,OAAO,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AAC7D,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { type HttpMiddlewareOptions, type HttpRequestState, type RequestLifecycleEvent, type RequestLifecycleType } from "./middleware-utils.js";
|
|
2
|
+
export declare function observeHttpResponse(request: Request, response: Response, state: HttpRequestState, options: HttpMiddlewareOptions, handlerError?: unknown): Response;
|
|
3
|
+
export declare function observeEarlyHttpAbort(request: Request, state: HttpRequestState, options: HttpMiddlewareOptions): () => void;
|
|
4
|
+
export declare function boundaryEvent(request: Request, state: HttpRequestState, type: RequestLifecycleType, status?: number, error?: unknown): RequestLifecycleEvent;
|
|
5
|
+
//# sourceMappingURL=http-response.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-response.d.ts","sourceRoot":"","sources":["../src/http-response.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAC1B,MAAM,uBAAuB,CAAC;AAI/B,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,qBAAqB,EAC9B,YAAY,CAAC,EAAE,OAAO,GACrB,QAAQ,CAuFV;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,qBAAqB,GAC7B,MAAM,IAAI,CASZ;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAE,oBAAoB,EAC1B,MAAM,CAAC,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,OAAO,GACd,qBAAqB,CAkBvB"}
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
import { completeSpan } from "@relkit/invocation";
|
|
2
|
+
import { emitTerminalLifecycle, } from "./middleware-utils.js";
|
|
3
|
+
const completedStates = new WeakSet();
|
|
4
|
+
export function observeHttpResponse(request, response, state, options, handlerError) {
|
|
5
|
+
if (completedStates.has(state))
|
|
6
|
+
return response;
|
|
7
|
+
const span = state.serverSpan;
|
|
8
|
+
span.event("http.response.headers", BigInt(Date.now()) * 1000000n, {
|
|
9
|
+
"http.response.status_code": response.status,
|
|
10
|
+
});
|
|
11
|
+
let done = false;
|
|
12
|
+
let bytes = 0;
|
|
13
|
+
const finish = (outcome, error) => {
|
|
14
|
+
if (done || completedStates.has(state))
|
|
15
|
+
return;
|
|
16
|
+
done = true;
|
|
17
|
+
completedStates.add(state);
|
|
18
|
+
if ((state.runtimeSignal?.current ?? state.signal).aborted)
|
|
19
|
+
outcome = "cancelled";
|
|
20
|
+
(state.runtimeSignal?.current ?? request.signal).removeEventListener("abort", abort);
|
|
21
|
+
span.attribute("http.response.status_code", response.status);
|
|
22
|
+
span.attribute("http.response.body.size", bytes);
|
|
23
|
+
span.event(`http.${outcome}`, BigInt(Date.now()) * 1000000n);
|
|
24
|
+
const effective = state.requestRecord?.setOutcome(outcome === "success" && response.status >= 500 ? "defect" : outcome);
|
|
25
|
+
const status = response.status >= 400
|
|
26
|
+
? response.status
|
|
27
|
+
: fallbackStatus(effective ?? outcome, response.status);
|
|
28
|
+
const record = state.requestRecord?.finish({ status, responseBytes: bytes });
|
|
29
|
+
if (record)
|
|
30
|
+
options.observability?.collect(record);
|
|
31
|
+
const finalOutcome = record?.outcome ?? outcome;
|
|
32
|
+
span.attribute("relkit.outcome", finalOutcome);
|
|
33
|
+
if (error instanceof Error) {
|
|
34
|
+
span.attribute("error.type", error.name);
|
|
35
|
+
span.attribute("error.message", error.message);
|
|
36
|
+
}
|
|
37
|
+
completeSpan(span, error ?? (finalOutcome === "success" ? undefined : finalOutcome));
|
|
38
|
+
const type = finalOutcome === "cancelled"
|
|
39
|
+
? "request.cancelled"
|
|
40
|
+
: error === undefined
|
|
41
|
+
? "request.completed"
|
|
42
|
+
: "request.failed";
|
|
43
|
+
void emitTerminalLifecycle(options, state, boundaryEvent(request, state, type, response.status, error), finalOutcome === "cancelled" ? "onCancel" : error === undefined ? "onComplete" : "onError");
|
|
44
|
+
};
|
|
45
|
+
const observedSignal = state.runtimeSignal?.current ?? request.signal;
|
|
46
|
+
const abort = () => finish("cancelled", observedSignal.reason);
|
|
47
|
+
observedSignal.addEventListener("abort", abort, { once: true });
|
|
48
|
+
if (handlerError !== undefined) {
|
|
49
|
+
finish("defect", handlerError);
|
|
50
|
+
return response;
|
|
51
|
+
}
|
|
52
|
+
if (request.method === "HEAD" ||
|
|
53
|
+
response.body === null ||
|
|
54
|
+
response.status === 204 ||
|
|
55
|
+
response.status === 304) {
|
|
56
|
+
finish(response.status >= 500 ? "defect" : "success");
|
|
57
|
+
return response;
|
|
58
|
+
}
|
|
59
|
+
const reader = response.body.getReader();
|
|
60
|
+
return new Response(new ReadableStream({
|
|
61
|
+
async pull(controller) {
|
|
62
|
+
try {
|
|
63
|
+
const result = await reader.read();
|
|
64
|
+
if (result.done) {
|
|
65
|
+
finish(response.status >= 500 ? "defect" : "success");
|
|
66
|
+
controller.close();
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
bytes += result.value.byteLength;
|
|
70
|
+
controller.enqueue(result.value);
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
finish("defect", error);
|
|
74
|
+
controller.error(error);
|
|
75
|
+
}
|
|
76
|
+
},
|
|
77
|
+
cancel(reason) {
|
|
78
|
+
finish("cancelled", reason);
|
|
79
|
+
return reader.cancel(reason);
|
|
80
|
+
},
|
|
81
|
+
}), { status: response.status, statusText: response.statusText, headers: response.headers });
|
|
82
|
+
}
|
|
83
|
+
export function observeEarlyHttpAbort(request, state, options) {
|
|
84
|
+
const signal = state.signal;
|
|
85
|
+
const abort = () => {
|
|
86
|
+
const error = signal.reason ?? new DOMException("Request cancelled", "AbortError");
|
|
87
|
+
observeHttpResponse(request, new Response(null, { status: 499 }), state, options, error);
|
|
88
|
+
};
|
|
89
|
+
signal.addEventListener("abort", abort, { once: true });
|
|
90
|
+
if (signal.aborted)
|
|
91
|
+
abort();
|
|
92
|
+
return () => signal.removeEventListener("abort", abort);
|
|
93
|
+
}
|
|
94
|
+
export function boundaryEvent(request, state, type, status, error) {
|
|
95
|
+
const now = Date.now();
|
|
96
|
+
return Object.freeze({
|
|
97
|
+
type,
|
|
98
|
+
requestId: state.requestId,
|
|
99
|
+
traceId: state.traceId,
|
|
100
|
+
method: request.method,
|
|
101
|
+
path: new URL(request.url).pathname,
|
|
102
|
+
startedAt: new Date(state.startedAt).toISOString(),
|
|
103
|
+
...(type === "request.started"
|
|
104
|
+
? {}
|
|
105
|
+
: {
|
|
106
|
+
completedAt: new Date(now).toISOString(),
|
|
107
|
+
durationMs: Math.max(0, now - state.startedAt),
|
|
108
|
+
status: status ?? 500,
|
|
109
|
+
}),
|
|
110
|
+
...(error instanceof Error ? { errorName: error.name || "Error" } : {}),
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
function fallbackStatus(outcome, status) {
|
|
114
|
+
return outcome === "success"
|
|
115
|
+
? status || 200
|
|
116
|
+
: outcome === "validation-error"
|
|
117
|
+
? 422
|
|
118
|
+
: outcome === "timeout"
|
|
119
|
+
? 504
|
|
120
|
+
: outcome === "cancelled"
|
|
121
|
+
? 499
|
|
122
|
+
: 500;
|
|
123
|
+
}
|
|
124
|
+
//# sourceMappingURL=http-response.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-response.js","sourceRoot":"","sources":["../src/http-response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EACL,qBAAqB,GAKtB,MAAM,uBAAuB,CAAC;AAE/B,MAAM,eAAe,GAAG,IAAI,OAAO,EAAoB,CAAC;AAExD,MAAM,UAAU,mBAAmB,CACjC,OAAgB,EAChB,QAAkB,EAClB,KAAuB,EACvB,OAA8B,EAC9B,YAAsB;IAEtB,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,UAAW,CAAC;IAC/B,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,QAAU,EAAE;QACnE,2BAA2B,EAAE,QAAQ,CAAC,MAAM;KAC7C,CAAC,CAAC;IACH,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,MAAM,GAAG,CAAC,OAAuB,EAAE,KAAe,EAAQ,EAAE;QAChE,IAAI,IAAI,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO;QAC/C,IAAI,GAAG,IAAI,CAAC;QACZ,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO;YAAE,OAAO,GAAG,WAAW,CAAC;QAClF,CAAC,KAAK,CAAC,aAAa,EAAE,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACrF,IAAI,CAAC,SAAS,CAAC,2BAA2B,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7D,IAAI,CAAC,SAAS,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,CAAC,QAAQ,OAAO,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,QAAU,CAAC,CAAC;QAC/D,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,EAAE,UAAU,CAC/C,OAAO,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CACrE,CAAC;QACF,MAAM,MAAM,GACV,QAAQ,CAAC,MAAM,IAAI,GAAG;YACpB,CAAC,CAAC,QAAQ,CAAC,MAAM;YACjB,CAAC,CAAC,cAAc,CAAC,SAAS,IAAI,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7E,IAAI,MAAM;YAAE,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,MAAM,EAAE,OAAO,IAAI,OAAO,CAAC;QAChD,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;QAC/C,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC;QACD,YAAY,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;QACrF,MAAM,IAAI,GACR,YAAY,KAAK,WAAW;YAC1B,CAAC,CAAC,mBAAmB;YACrB,CAAC,CAAC,KAAK,KAAK,SAAS;gBACnB,CAAC,CAAC,mBAAmB;gBACrB,CAAC,CAAC,gBAAgB,CAAC;QACzB,KAAK,qBAAqB,CACxB,OAAO,EACP,KAAK,EACL,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,EAC3D,YAAY,KAAK,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAC3F,CAAC;IACJ,CAAC,CAAC;IACF,MAAM,cAAc,GAAG,KAAK,CAAC,aAAa,EAAE,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IACtE,MAAM,KAAK,GAAG,GAAS,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IACrE,cAAc,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC/B,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IACE,OAAO,CAAC,MAAM,KAAK,MAAM;QACzB,QAAQ,CAAC,IAAI,KAAK,IAAI;QACtB,QAAQ,CAAC,MAAM,KAAK,GAAG;QACvB,QAAQ,CAAC,MAAM,KAAK,GAAG,EACvB,CAAC;QACD,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACtD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;IACzC,OAAO,IAAI,QAAQ,CACjB,IAAI,cAAc,CAAa;QAC7B,KAAK,CAAC,IAAI,CAAC,UAAU;YACnB,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBACnC,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;oBAChB,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBACtD,UAAU,CAAC,KAAK,EAAE,CAAC;oBACnB,OAAO;gBACT,CAAC;gBACD,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;gBACjC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;gBACxB,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QACD,MAAM,CAAC,MAAM;YACX,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC5B,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC,EACF,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CACxF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAAgB,EAChB,KAAuB,EACvB,OAA8B;IAE9B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,KAAK,GAAG,GAAS,EAAE;QACvB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,IAAI,IAAI,YAAY,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC;QACnF,mBAAmB,CAAC,OAAO,EAAE,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3F,CAAC,CAAC;IACF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,IAAI,MAAM,CAAC,OAAO;QAAE,KAAK,EAAE,CAAC;IAC5B,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,OAAgB,EAChB,KAAuB,EACvB,IAA0B,EAC1B,MAAe,EACf,KAAe;IAEf,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,IAAI;QACJ,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,IAAI,EAAE,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ;QACnC,SAAS,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE;QAClD,GAAG,CAAC,IAAI,KAAK,iBAAiB;YAC5B,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE,WAAW,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;gBACxC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC;gBAC9C,MAAM,EAAE,MAAM,IAAI,GAAG;aACtB,CAAC;QACN,GAAG,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxE,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,OAAuB,EAAE,MAAc;IAC7D,OAAO,OAAO,KAAK,SAAS;QAC1B,CAAC,CAAC,MAAM,IAAI,GAAG;QACf,CAAC,CAAC,OAAO,KAAK,kBAAkB;YAC9B,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,OAAO,KAAK,SAAS;gBACrB,CAAC,CAAC,GAAG;gBACL,CAAC,CAAC,OAAO,KAAK,WAAW;oBACvB,CAAC,CAAC,GAAG;oBACL,CAAC,CAAC,GAAG,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { type SpanLifecycle } from "@relkit/invocation";
|
|
2
|
+
import type { HttpMiddlewareOptions } from "./middleware-utils.js";
|
|
3
|
+
export declare function collectHttpSpan(event: SpanLifecycle, options: HttpMiddlewareOptions): void;
|
|
4
|
+
//# sourceMappingURL=http-span-record.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-span-record.d.ts","sourceRoot":"","sources":["../src/http-span-record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEnE,wBAAgB,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAK1F"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-span-record.js","sourceRoot":"","sources":["../src/http-span-record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsB,MAAM,oBAAoB,CAAC;AAItE,MAAM,UAAU,eAAe,CAAC,KAAoB,EAAE,OAA8B;IAClF,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAe,CAAC;IACjD,IAAI,CAAC;QACH,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;AACZ,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { SpanRuntime } from "@relkit/invocation";
|
|
2
|
+
import type { MiddlewareHandler } from "hono";
|
|
3
|
+
import { type HttpMiddlewareOptions, type HttpRequestState } from "./middleware-utils.js";
|
|
4
|
+
export declare function createHttpSpanRuntime(options: HttpMiddlewareOptions): SpanRuntime;
|
|
5
|
+
export declare function outerHttpState(request: Request): HttpRequestState | undefined;
|
|
6
|
+
export declare function httpSpanMiddleware(options: HttpMiddlewareOptions): MiddlewareHandler;
|
|
7
|
+
export declare function instrumentHttpRequest(request: Request, options: HttpMiddlewareOptions, handler: (request: Request) => Response | Promise<Response>): Promise<Response>;
|
|
8
|
+
//# sourceMappingURL=http-span.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-span.d.ts","sourceRoot":"","sources":["../src/http-span.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,WAAW,EAAiB,MAAM,oBAAoB,CAAC;AAEvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAKL,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;AAO/B,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,GAAG,WAAW,CAYjF;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAE7E;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,qBAAqB,GAAG,iBAAiB,CA6BpF;AAED,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAC1D,OAAO,CAAC,QAAQ,CAAC,CA0DnB"}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
import { createSpanId, createTraceId, parseTraceParent, toRequestId } from "@relkit/contracts";
|
|
2
|
+
import { runInExecutionContext, SpanRuntime, startRootSpan } from "@relkit/invocation";
|
|
3
|
+
import { createRequestRecordBuilder } from "@relkit/observability";
|
|
4
|
+
import { emitLifecycle, getRequestState, readId, setRequestState, } from "./middleware-utils.js";
|
|
5
|
+
import { collectHttpSpan } from "./http-span-record.js";
|
|
6
|
+
import { boundaryEvent, observeEarlyHttpAbort, observeHttpResponse } from "./http-response.js";
|
|
7
|
+
import { isRelkitControlPlanePath } from "./control-plane.js";
|
|
8
|
+
const outerStates = new WeakMap();
|
|
9
|
+
export function createHttpSpanRuntime(options) {
|
|
10
|
+
return (options.spanRuntime ??
|
|
11
|
+
new SpanRuntime({
|
|
12
|
+
ids: { next: (kind) => (kind === "trace" ? createTraceId() : createSpanId()) },
|
|
13
|
+
observer: (event) => collectHttpSpan(event, options),
|
|
14
|
+
...(options.observability?.capture === undefined
|
|
15
|
+
? {}
|
|
16
|
+
: { capture: options.observability.capture }),
|
|
17
|
+
recording: options.observability !== undefined,
|
|
18
|
+
}));
|
|
19
|
+
}
|
|
20
|
+
export function outerHttpState(request) {
|
|
21
|
+
return outerStates.get(request);
|
|
22
|
+
}
|
|
23
|
+
export function httpSpanMiddleware(options) {
|
|
24
|
+
return async (context, next) => {
|
|
25
|
+
const state = getRequestState(context);
|
|
26
|
+
if (!state || isRelkitControlPlanePath(context.req.path))
|
|
27
|
+
return next();
|
|
28
|
+
if (state.serverSpan !== undefined)
|
|
29
|
+
return next();
|
|
30
|
+
const runtime = options.spanRuntime ?? createHttpSpanRuntime(options);
|
|
31
|
+
const span = startRootSpan(runtime, `HTTP ${context.req.method}`, "server", state.remoteParent, state.remoteParent === undefined ? state.traceId : undefined);
|
|
32
|
+
prepareSpan(span, state.requestId, context.req.method);
|
|
33
|
+
const active = Object.freeze({ ...state, traceId: span.traceId, serverSpan: span });
|
|
34
|
+
active.requestRecord?.setTraceId(span.traceId);
|
|
35
|
+
setRequestState(context, active);
|
|
36
|
+
let failure;
|
|
37
|
+
try {
|
|
38
|
+
await runInExecutionContext({ span, runtime, requestId: state.requestId, originRequestId: state.requestId }, next);
|
|
39
|
+
}
|
|
40
|
+
catch (error) {
|
|
41
|
+
failure = error;
|
|
42
|
+
}
|
|
43
|
+
context.res = observeHttpResponse(context.req.raw, context.res, active, options, failure);
|
|
44
|
+
if (failure !== undefined)
|
|
45
|
+
throw failure;
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
export async function instrumentHttpRequest(request, options, handler) {
|
|
49
|
+
if (isRelkitControlPlanePath(new URL(request.url).pathname))
|
|
50
|
+
return handler(request);
|
|
51
|
+
const requestId = readId(undefined, options.requestId, "request", toRequestId);
|
|
52
|
+
const remoteParent = parseTraceParent(request.headers.get("traceparent"), request.headers.get("tracestate"));
|
|
53
|
+
const runtime = options.spanRuntime ?? createHttpSpanRuntime(options);
|
|
54
|
+
const span = startRootSpan(runtime, `HTTP ${request.method}`, "server", remoteParent);
|
|
55
|
+
const startedAt = options.now?.() ?? Date.now();
|
|
56
|
+
const requestBytes = contentLength(request);
|
|
57
|
+
const requestRecord = options.observability === undefined
|
|
58
|
+
? undefined
|
|
59
|
+
: createRequestRecordBuilder({
|
|
60
|
+
requestId,
|
|
61
|
+
traceId: span.traceId,
|
|
62
|
+
generationId: options.generationId ?? "generation.unknown",
|
|
63
|
+
graphHash: options.graphHash ?? "sha256:unknown",
|
|
64
|
+
method: request.method,
|
|
65
|
+
rawPath: new URL(request.url).pathname,
|
|
66
|
+
startedAt,
|
|
67
|
+
...(requestBytes === undefined ? {} : { requestBytes }),
|
|
68
|
+
...(options.now === undefined ? {} : { now: options.now }),
|
|
69
|
+
});
|
|
70
|
+
if (requestRecord)
|
|
71
|
+
options.observability.collect(requestRecord.started);
|
|
72
|
+
const state = Object.freeze({
|
|
73
|
+
requestId,
|
|
74
|
+
traceId: span.traceId,
|
|
75
|
+
signal: request.signal,
|
|
76
|
+
startedAt,
|
|
77
|
+
...(remoteParent === undefined ? {} : { remoteParent }),
|
|
78
|
+
runtimeSignal: { current: request.signal },
|
|
79
|
+
serverSpan: span,
|
|
80
|
+
...(requestRecord === undefined ? {} : { requestRecord }),
|
|
81
|
+
lifecycleStarted: true,
|
|
82
|
+
});
|
|
83
|
+
prepareSpan(span, requestId, request.method);
|
|
84
|
+
outerStates.set(request, state);
|
|
85
|
+
const removeEarlyAbort = observeEarlyHttpAbort(request, state, options);
|
|
86
|
+
await emitLifecycle(options, boundaryEvent(request, state, "request.started"), "onStart");
|
|
87
|
+
try {
|
|
88
|
+
const response = await runInExecutionContext({ span, runtime, requestId, originRequestId: requestId }, () => handler(request));
|
|
89
|
+
return withRequestId(observeHttpResponse(request, response, state, options), options, requestId);
|
|
90
|
+
}
|
|
91
|
+
catch (error) {
|
|
92
|
+
observeHttpResponse(request, new Response(null, { status: 500 }), state, options, error);
|
|
93
|
+
throw error;
|
|
94
|
+
}
|
|
95
|
+
finally {
|
|
96
|
+
removeEarlyAbort();
|
|
97
|
+
outerStates.delete(request);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
function prepareSpan(span, requestId, method) {
|
|
101
|
+
span.attribute("relkit.request.id", requestId);
|
|
102
|
+
span.attribute("relkit.origin_request.id", requestId);
|
|
103
|
+
span.attribute("http.request.method", method);
|
|
104
|
+
span.event("http.received", span.startTime);
|
|
105
|
+
}
|
|
106
|
+
function contentLength(request) {
|
|
107
|
+
const header = request.headers.get("content-length");
|
|
108
|
+
if (header === null || !/^\d+$/.test(header))
|
|
109
|
+
return undefined;
|
|
110
|
+
const value = Number(header);
|
|
111
|
+
return Number.isSafeInteger(value) && value >= 0 ? value : undefined;
|
|
112
|
+
}
|
|
113
|
+
function withRequestId(response, options, requestId) {
|
|
114
|
+
const headers = new Headers(response.headers);
|
|
115
|
+
headers.set(options.requestIdHeader ?? "x-request-id", requestId);
|
|
116
|
+
return new Response(response.body, {
|
|
117
|
+
status: response.status,
|
|
118
|
+
statusText: response.statusText,
|
|
119
|
+
headers,
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=http-span.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-span.js","sourceRoot":"","sources":["../src/http-span.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC"}
|
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"materialize-routes-utils.d.ts","sourceRoot":"","sources":["../src/materialize-routes-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"materialize-routes-utils.d.ts","sourceRoot":"","sources":["../src/materialize-routes-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAI7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAY7F,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,2BAA2B,GACnC,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAEzC;AAkFD,wBAAsB,UAAU,CAC9B,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,uBAAuB,EAChC,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,OAAO,CAAC,CAiBlB;AAED,wBAAgB,QAAQ,CAAC,CAAC,EACxB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,EAC7D,EAAE,EAAE,MAAM,GACT,CAAC,GAAG,SAAS,CAIf;AACD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzE"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { mapRequest } from "./request-mapping.js";
|
|
2
2
|
import { isRequestMappingFailure } from "./request-mapping.js";
|
|
3
|
+
import { decodeInferredInput } from "./request-inference.js";
|
|
3
4
|
import { mapFailureResponse, mapInputValidationResponse, mapSuccessResponse, } from "./response-mapping.js";
|
|
4
5
|
import { getRequestState } from "./middleware.js";
|
|
5
6
|
import { invokeWithRecord, mapInputWithRecord, recordDetail } from "./request-record-utils.js";
|
|
6
7
|
import { requestFromContext } from "./request-context.js";
|
|
8
|
+
import { frameworkTrace } from "@relkit/invocation";
|
|
7
9
|
export function createRouteHandler(trigger, options) {
|
|
8
10
|
return async (context) => stripHead(trigger, await handleRoute(context, trigger, options));
|
|
9
11
|
}
|
|
@@ -13,13 +15,24 @@ async function handleRoute(context, trigger, options) {
|
|
|
13
15
|
const builder = state?.requestRecord;
|
|
14
16
|
builder?.setRoute(trigger.id, trigger.targetFunctionId);
|
|
15
17
|
builder?.setServiceId(trigger.serviceId);
|
|
18
|
+
frameworkTrace.rename(`${context.req.method} ${trigger.config.path}`);
|
|
19
|
+
frameworkTrace.setAttributes({
|
|
20
|
+
"http.route": trigger.config.path,
|
|
21
|
+
"relkit.route.id": trigger.id,
|
|
22
|
+
"relkit.function.id": trigger.targetFunctionId,
|
|
23
|
+
"code.function.name": trigger.targetFunctionId,
|
|
24
|
+
...(trigger.serviceId === undefined ? {} : { "relkit.service.id": trigger.serviceId }),
|
|
25
|
+
});
|
|
26
|
+
frameworkTrace.event("http.route.matched", { "http.route": trigger.config.path });
|
|
16
27
|
recordDetail(builder, { kind: "match", targetId: trigger.id, outcome: "success" });
|
|
17
28
|
const responseOptions = responseOptionsFor(options, state?.signal);
|
|
18
29
|
const input = await mapInputWithRecord(() => routeInput(request, trigger, trigger.targetFunctionId, options), builder, trigger.targetFunctionId);
|
|
19
30
|
if (isRequestMappingFailure(input)) {
|
|
31
|
+
frameworkTrace.event("http.validation.failed");
|
|
20
32
|
builder?.setOutcome("validation-error");
|
|
21
33
|
return mapInputValidationResponse(trigger, input.issues, responseOptions);
|
|
22
34
|
}
|
|
35
|
+
frameworkTrace.event("http.validation.completed");
|
|
23
36
|
try {
|
|
24
37
|
const value = await invokeWithRecord(options.engine, {
|
|
25
38
|
functionId: trigger.targetFunctionId,
|
|
@@ -27,7 +40,6 @@ async function handleRoute(context, trigger, options) {
|
|
|
27
40
|
source: "http",
|
|
28
41
|
...(state?.signal === undefined ? {} : { signal: state.signal }),
|
|
29
42
|
...(state?.requestId === undefined ? {} : { requestId: state.requestId }),
|
|
30
|
-
...(state?.requestId === undefined ? {} : { correlationId: state.requestId }),
|
|
31
43
|
...(state?.traceId === undefined ? {} : { traceId: state.traceId }),
|
|
32
44
|
...(typeof trigger.config.timeoutMs !== "number"
|
|
33
45
|
? {}
|
|
@@ -68,7 +80,9 @@ export async function routeInput(request, trigger, targetFunctionId, options) {
|
|
|
68
80
|
: { maxBodyBytes: trigger.config.maxBodyBytes }),
|
|
69
81
|
transforms: options.manifest.requestTransforms,
|
|
70
82
|
});
|
|
71
|
-
return isRequestMappingFailure(result)
|
|
83
|
+
return isRequestMappingFailure(result)
|
|
84
|
+
? result
|
|
85
|
+
: decodeInferredInput(result.value, getEntry(options.manifest.routes ?? {}, trigger.id), getEntry(options.manifest.targets ?? {}, trigger.targetFunctionId));
|
|
72
86
|
}
|
|
73
87
|
export function getEntry(entries, id) {
|
|
74
88
|
if (entries instanceof Map)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"materialize-routes-utils.js","sourceRoot":"","sources":["../src/materialize-routes-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"materialize-routes-utils.js","sourceRoot":"","sources":["../src/materialize-routes-utils.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp.js
CHANGED
|
@@ -44,7 +44,6 @@ async function invoke(tool, runtime, input, context, options) {
|
|
|
44
44
|
source: "tool",
|
|
45
45
|
...(state?.signal === undefined ? {} : { signal: state.signal }),
|
|
46
46
|
...(state?.requestId === undefined ? {} : { requestId: state.requestId }),
|
|
47
|
-
...(state?.requestId === undefined ? {} : { correlationId: state.requestId }),
|
|
48
47
|
...(state?.traceId === undefined ? {} : { traceId: state.traceId }),
|
|
49
48
|
...(tool.timeoutMs === undefined ? {} : { timeoutMs: tool.timeoutMs }),
|
|
50
49
|
...(options.auth === undefined ? {} : { auth: options.auth.contextFor(context.req.raw) }),
|
package/dist/mcp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,gBAAgB,GAEjB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAenE,MAAM,UAAU,UAAU,CAAC,GAAS,EAAE,OAAoC;IACxE,IAAI,OAAO,CAAC,GAAG,EAAE,OAAO,KAAK,KAAK;QAAE,OAAO;IAC3C,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AAC1F,CAAC;AAED,SAAS,UAAU,CAAC,OAAgB,EAAE,OAAoC;IACxE,OAAO,gBAAgB,CAAC,GAAG,EAAE;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK;aAC7B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;aAC5B,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,QAAQ,CACf,MAAiB,EACjB,IAAsB,EACtB,OAAgB,EAChB,OAAoC;IAEpC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,EAAE,IAAI,CAAC,EAAE,CAA4B,CAAC;IAC3F,MAAM,KAAK,GAAG,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC;IACrC,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC;IACvC,MAAM,CAAC,YAAY,CACjB,IAAI,CAAC,EAAE,EACP;QACE,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QACtD,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;QACzD,WAAW,EAAE;YACX,YAAY,EAAE,IAAI,CAAC,UAAU,KAAK,MAAM,IAAI,IAAI,CAAC,UAAU,KAAK,MAAM;YACtE,eAAe,EAAE,IAAI,CAAC,UAAU,KAAK,OAAO;SAC7C;KACF,EACD,KAAK,EAAE,UAAmB,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CACnF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,MAAM,CACnB,IAAsB,EACtB,OAAgC,EAChC,KAAc,EACd,OAAgB,EAChB,OAAoC;IAEpC,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC,+BAA+B,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;YACxC,UAAU,EAAE,IAAI,CAAC,gBAAgB;YACjC,KAAK;YACL,MAAM,EAAE,MAAM;YACd,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;YAChE,GAAG,CAAC,KAAK,EAAE,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;YACzE,GAAG,CAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-limits.d.ts","sourceRoot":"","sources":["../src/middleware-limits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAOL,KAAK,qBAAqB,EAC3B,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware-limits.d.ts","sourceRoot":"","sources":["../src/middleware-limits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAOL,KAAK,qBAAqB,EAC3B,MAAM,uBAAuB,CAAC;AAI/B,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CAqEvF"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import { createFallbackState, emitLifecycle, getRequestState, lifecycleEvent, setRequestState, validateLimit, } from "./middleware-utils.js";
|
|
2
2
|
import { ensureRequestRecord, finishRequestRecord } from "./request-record-middleware.js";
|
|
3
|
+
import { isRelkitControlPlanePath } from "./control-plane.js";
|
|
3
4
|
export function limitsMiddleware(options = {}) {
|
|
4
5
|
validateLimit(options.maxBodyBytes, "maxBodyBytes");
|
|
5
6
|
validateLimit(options.timeoutMs, "timeoutMs");
|
|
6
7
|
return async (context, next) => {
|
|
7
|
-
const
|
|
8
|
+
const controlPlane = isRelkitControlPlanePath(context.req.path);
|
|
9
|
+
const state = getRequestState(context) ?? createFallbackState(context, options);
|
|
10
|
+
const current = controlPlane ? state : ensureRequestRecord(context, state, options);
|
|
8
11
|
const length = Number(context.req.header("content-length"));
|
|
9
12
|
if (options.maxBodyBytes !== undefined &&
|
|
10
13
|
Number.isSafeInteger(length) &&
|
|
@@ -21,9 +24,11 @@ export function limitsMiddleware(options = {}) {
|
|
|
21
24
|
current.requestRecord?.setOutcome("validation-error");
|
|
22
25
|
setRequestState(context, Object.freeze({ ...current, signal: context.req.raw.signal }));
|
|
23
26
|
context.res = response;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
+
if (!controlPlane) {
|
|
28
|
+
finishRequestRecord(context, current, options, "validation-error");
|
|
29
|
+
await emitLifecycle(options, lifecycleEvent(context, current, "request.started"), "onStart");
|
|
30
|
+
await emitLifecycle(options, lifecycleEvent(context, current, "request.completed", undefined, response.status), "onComplete");
|
|
31
|
+
}
|
|
27
32
|
return response;
|
|
28
33
|
}
|
|
29
34
|
const controller = new AbortController();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-limits.js","sourceRoot":"","sources":["../src/middleware-limits.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,cAAc,EACd,eAAe,EACf,aAAa,GAEd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware-limits.js","sourceRoot":"","sources":["../src/middleware-limits.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,24 @@
|
|
|
1
|
-
import type { MaybePromise, RequestId, TraceId } from "@relkit/contracts";
|
|
1
|
+
import type { MaybePromise, RequestId, SpanContext, TraceId } from "@relkit/contracts";
|
|
2
2
|
import type { RequestRecordBuilder, RequestRecordSink } from "@relkit/observability";
|
|
3
3
|
import type { Context } from "hono";
|
|
4
|
+
import type { RelkitSpan, SpanRuntime } from "@relkit/invocation";
|
|
4
5
|
export declare const REQUEST_ID_HEADER: "x-request-id";
|
|
5
6
|
export declare const TRACE_ID_HEADER: "x-trace-id";
|
|
6
7
|
export declare const REQUEST_CONTEXT_KEY: "relkit.request";
|
|
7
8
|
export interface HttpRequestState {
|
|
8
9
|
readonly requestId: RequestId;
|
|
9
10
|
readonly traceId: TraceId;
|
|
11
|
+
readonly remoteParent?: SpanContext;
|
|
12
|
+
readonly serverSpan?: RelkitSpan;
|
|
10
13
|
readonly signal: AbortSignal;
|
|
11
14
|
readonly startedAt: number;
|
|
12
15
|
readonly deadlineMs?: number;
|
|
13
16
|
readonly requestRecord?: RequestRecordBuilder;
|
|
17
|
+
readonly lifecycleStarted?: true;
|
|
18
|
+
readonly runtimeSignal?: {
|
|
19
|
+
current: AbortSignal;
|
|
20
|
+
terminalLifecycle?: boolean;
|
|
21
|
+
};
|
|
14
22
|
}
|
|
15
23
|
export type RequestLifecycleType = "request.started" | "request.completed" | "request.failed" | "request.cancelled";
|
|
16
24
|
export interface RequestLifecycleEvent {
|
|
@@ -45,6 +53,7 @@ export interface HttpMiddlewareOptions {
|
|
|
45
53
|
readonly observability?: RequestRecordSink;
|
|
46
54
|
readonly lifecycle?: RequestLifecycleHooks;
|
|
47
55
|
readonly onLifecycleEvent?: (event: RequestLifecycleEvent) => MaybePromise<void>;
|
|
56
|
+
readonly spanRuntime?: SpanRuntime;
|
|
48
57
|
}
|
|
49
58
|
export declare function getRequestState(context: Context): HttpRequestState | undefined;
|
|
50
59
|
export declare function setRequestState(context: Context, state: HttpRequestState): void;
|
|
@@ -53,5 +62,6 @@ export declare function createFallbackState(context: Context, options: HttpMiddl
|
|
|
53
62
|
export declare function readId<T extends RequestId | TraceId>(incoming: string | undefined, generate: (() => string) | undefined, prefix: string, normalize: (value: unknown) => T): T;
|
|
54
63
|
export declare function lifecycleEvent(context: Context, state: HttpRequestState, type: RequestLifecycleType, error?: unknown, status?: number): RequestLifecycleEvent;
|
|
55
64
|
export declare function emitLifecycle(options: HttpMiddlewareOptions, event: RequestLifecycleEvent, hook: keyof RequestLifecycleHooks): Promise<void>;
|
|
65
|
+
export declare function emitTerminalLifecycle(options: HttpMiddlewareOptions, state: HttpRequestState, event: RequestLifecycleEvent, hook: keyof RequestLifecycleHooks): Promise<void>;
|
|
56
66
|
export declare function validateLimit(value: number | undefined, name: string): void;
|
|
57
67
|
//# sourceMappingURL=middleware-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-utils.d.ts","sourceRoot":"","sources":["../src/middleware-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware-utils.d.ts","sourceRoot":"","sources":["../src/middleware-utils.ts"],"names":[],"mappings":"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"}
|