@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
package/dist/middleware-utils.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { toRequestId, toTraceId } from "@relkit/contracts";
|
|
1
|
+
import { createTraceId, parseTraceParent, toRequestId, toTraceId } from "@relkit/contracts";
|
|
2
2
|
export const REQUEST_ID_HEADER = "x-request-id";
|
|
3
3
|
export const TRACE_ID_HEADER = "x-trace-id";
|
|
4
4
|
export const REQUEST_CONTEXT_KEY = "relkit.request";
|
|
5
|
+
const terminalLifecycleStates = new WeakSet();
|
|
5
6
|
export function getRequestState(context) {
|
|
6
7
|
const value = context.get(REQUEST_CONTEXT_KEY);
|
|
7
8
|
return isRequestState(value) ? value : undefined;
|
|
@@ -12,6 +13,8 @@ export function setRequestState(context, state) {
|
|
|
12
13
|
target.set("requestId", state.requestId);
|
|
13
14
|
target.set("traceId", state.traceId);
|
|
14
15
|
target.set("signal", state.signal);
|
|
16
|
+
if (state.runtimeSignal !== undefined)
|
|
17
|
+
state.runtimeSignal.current = state.signal;
|
|
15
18
|
}
|
|
16
19
|
export function setResponseHeader(context, name, value) {
|
|
17
20
|
const response = context.res;
|
|
@@ -25,18 +28,21 @@ export function setResponseHeader(context, name, value) {
|
|
|
25
28
|
}
|
|
26
29
|
export function createFallbackState(context, options) {
|
|
27
30
|
return Object.freeze({
|
|
28
|
-
requestId: readId(
|
|
29
|
-
traceId:
|
|
31
|
+
requestId: readId(undefined, options.requestId, "request", toRequestId),
|
|
32
|
+
traceId: parseTraceParent(context.req.header("traceparent"), context.req.header("tracestate"))
|
|
33
|
+
?.traceId ?? readId(undefined, options.traceId, "trace", toTraceId),
|
|
30
34
|
signal: context.req.raw.signal,
|
|
35
|
+
runtimeSignal: { current: context.req.raw.signal },
|
|
31
36
|
startedAt: Date.now(),
|
|
32
37
|
});
|
|
33
38
|
}
|
|
34
39
|
export function readId(incoming, generate, prefix, normalize) {
|
|
40
|
+
const fallback = () => prefix === "trace" ? createTraceId() : `${prefix}-${crypto.randomUUID()}`;
|
|
35
41
|
try {
|
|
36
|
-
return normalize(incoming ?? generate?.() ??
|
|
42
|
+
return normalize(incoming ?? generate?.() ?? fallback());
|
|
37
43
|
}
|
|
38
44
|
catch {
|
|
39
|
-
return normalize(
|
|
45
|
+
return normalize(fallback());
|
|
40
46
|
}
|
|
41
47
|
}
|
|
42
48
|
export function lifecycleEvent(context, state, type, error, status) {
|
|
@@ -63,6 +69,14 @@ export async function emitLifecycle(options, event, hook) {
|
|
|
63
69
|
await call(options.lifecycle?.emit, event);
|
|
64
70
|
await call(options.lifecycle?.[hook], event);
|
|
65
71
|
}
|
|
72
|
+
export async function emitTerminalLifecycle(options, state, event, hook) {
|
|
73
|
+
if (state.runtimeSignal?.terminalLifecycle === true || terminalLifecycleStates.has(state))
|
|
74
|
+
return;
|
|
75
|
+
if (state.runtimeSignal !== undefined)
|
|
76
|
+
state.runtimeSignal.terminalLifecycle = true;
|
|
77
|
+
terminalLifecycleStates.add(state);
|
|
78
|
+
await emitLifecycle(options, event, hook);
|
|
79
|
+
}
|
|
66
80
|
export function validateLimit(value, name) {
|
|
67
81
|
if (value !== undefined && (!Number.isSafeInteger(value) || value < 1))
|
|
68
82
|
throw new TypeError(`${name} must be a positive integer`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-utils.js","sourceRoot":"","sources":["../src/middleware-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware-utils.js","sourceRoot":"","sources":["../src/middleware-utils.ts"],"names":[],"mappings":"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"}
|
package/dist/middleware.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAWL,KAAK,qBAAqB,EAK3B,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,GAC1B,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,0BAA0B,8DAK5B,CAAC;AACZ,MAAM,MAAM,uBAAuB,GAAG,CAAC,OAAO,0BAA0B,CAAC,CAAC,MAAM,CAAC,CAAC;AAElF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;CACrC;AAED,4EAA4E;AAC5E,wBAAgB,yBAAyB,CACvC,OAAO,GAAE,qBAA0B,GAClC,SAAS,mBAAmB,EAAE,CAQhC;AAED,eAAO,MAAM,oBAAoB,kCAA4B,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CAkC1F;AAED,wBAAgB,eAAe,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CAEtF;AAED,wBAAgB,0BAA0B,CAAC,OAAO,GAAE,qBAA0B,GAAG,iBAAiB,CAqCjG"}
|
package/dist/middleware.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { createFallbackState, emitLifecycle, getRequestState, lifecycleEvent, readId, REQUEST_ID_HEADER, setResponseHeader, setRequestState, TRACE_ID_HEADER, } from "./middleware-utils.js";
|
|
3
|
-
import { ensureRequestRecord
|
|
1
|
+
import { parseTraceParent, toRequestId } from "@relkit/contracts";
|
|
2
|
+
import { createFallbackState, emitLifecycle, emitTerminalLifecycle, getRequestState, lifecycleEvent, readId, REQUEST_ID_HEADER, setResponseHeader, setRequestState, TRACE_ID_HEADER, } from "./middleware-utils.js";
|
|
3
|
+
import { ensureRequestRecord } from "./request-record-middleware.js";
|
|
4
4
|
import { limitsMiddleware } from "./middleware-limits.js";
|
|
5
5
|
import { failureOutcome } from "./request-record-utils.js";
|
|
6
|
+
import { createHttpSpanRuntime, httpSpanMiddleware, outerHttpState } from "./http-span.js";
|
|
7
|
+
import { isRelkitControlPlanePath } from "./control-plane.js";
|
|
6
8
|
export { REQUEST_CONTEXT_KEY, REQUEST_ID_HEADER, TRACE_ID_HEADER, getRequestState, } from "./middleware-utils.js";
|
|
7
9
|
export const FRAMEWORK_MIDDLEWARE_ORDER = Object.freeze([
|
|
8
10
|
"request-id",
|
|
@@ -12,30 +14,41 @@ export const FRAMEWORK_MIDDLEWARE_ORDER = Object.freeze([
|
|
|
12
14
|
]);
|
|
13
15
|
/** Installs the four framework-owned HTTP middleware layers in v3 order. */
|
|
14
16
|
export function createFrameworkMiddleware(options = {}) {
|
|
17
|
+
options = { ...options, spanRuntime: createHttpSpanRuntime(options) };
|
|
15
18
|
return Object.freeze([
|
|
16
|
-
{ name: "request-id", handler: requestIdMiddleware(options) },
|
|
17
|
-
{ name: "trace", handler: traceMiddleware(options) },
|
|
19
|
+
{ name: "request-id", handler: applicationOnly(requestIdMiddleware(options)) },
|
|
20
|
+
{ name: "trace", handler: applicationOnly(traceMiddleware(options)) },
|
|
18
21
|
{ name: "limits", handler: limitsMiddleware(options) },
|
|
19
|
-
{ name: "request-record", handler: requestLifecycleMiddleware(options) },
|
|
22
|
+
{ name: "request-record", handler: applicationOnly(requestLifecycleMiddleware(options)) },
|
|
20
23
|
]);
|
|
21
24
|
}
|
|
22
25
|
export const createHttpMiddleware = createFrameworkMiddleware;
|
|
23
26
|
export { limitsMiddleware } from "./middleware-limits.js";
|
|
24
27
|
export function requestIdMiddleware(options = {}) {
|
|
25
28
|
return async (context, next) => {
|
|
26
|
-
const
|
|
27
|
-
|
|
29
|
+
const outer = outerHttpState(context.req.raw);
|
|
30
|
+
if (outer !== undefined) {
|
|
31
|
+
setRequestState(context, outer);
|
|
32
|
+
context.header(options.requestIdHeader ?? REQUEST_ID_HEADER, outer.requestId);
|
|
33
|
+
await next();
|
|
34
|
+
setResponseHeader(context, options.requestIdHeader ?? REQUEST_ID_HEADER, outer.requestId);
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
const requestId = readId(undefined, options.requestId, "request", toRequestId);
|
|
38
|
+
const remoteParent = parseTraceParent(context.req.header("traceparent"), context.req.header("tracestate"));
|
|
39
|
+
const traceId = remoteParent?.traceId ?? createFallbackState(context, options).traceId;
|
|
28
40
|
const startedAt = options.now?.() ?? Date.now();
|
|
29
41
|
const state = Object.freeze({
|
|
30
42
|
requestId,
|
|
31
43
|
traceId,
|
|
32
44
|
signal: context.req.raw.signal,
|
|
45
|
+
runtimeSignal: { current: context.req.raw.signal },
|
|
33
46
|
startedAt,
|
|
47
|
+
...(remoteParent === undefined ? {} : { remoteParent }),
|
|
34
48
|
});
|
|
35
49
|
setRequestState(context, state);
|
|
36
50
|
ensureRequestRecord(context, state, options);
|
|
37
51
|
context.header(options.requestIdHeader ?? REQUEST_ID_HEADER, requestId);
|
|
38
|
-
context.header(options.traceIdHeader ?? TRACE_ID_HEADER, traceId);
|
|
39
52
|
try {
|
|
40
53
|
await next();
|
|
41
54
|
}
|
|
@@ -45,36 +58,21 @@ export function requestIdMiddleware(options = {}) {
|
|
|
45
58
|
};
|
|
46
59
|
}
|
|
47
60
|
export function traceMiddleware(options = {}) {
|
|
48
|
-
return
|
|
49
|
-
const current = ensureRequestRecord(context, getRequestState(context) ?? createFallbackState(context, options), options);
|
|
50
|
-
const traceId = readId(context.req.header(options.traceIdHeader ?? TRACE_ID_HEADER), options.traceId, "trace", toTraceId);
|
|
51
|
-
current.requestRecord?.setTraceId(traceId);
|
|
52
|
-
setRequestState(context, Object.freeze({ ...current, traceId }));
|
|
53
|
-
context.header(options.traceIdHeader ?? TRACE_ID_HEADER, traceId);
|
|
54
|
-
try {
|
|
55
|
-
await next();
|
|
56
|
-
}
|
|
57
|
-
finally {
|
|
58
|
-
setResponseHeader(context, options.traceIdHeader ?? TRACE_ID_HEADER, traceId);
|
|
59
|
-
}
|
|
60
|
-
};
|
|
61
|
+
return httpSpanMiddleware(options);
|
|
61
62
|
}
|
|
62
63
|
export function requestLifecycleMiddleware(options = {}) {
|
|
63
64
|
return async (context, next) => {
|
|
64
65
|
const state = ensureRequestRecord(context, getRequestState(context) ?? createFallbackState(context, options), options);
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
const
|
|
71
|
-
cancelled
|
|
72
|
-
cancellation = emitLifecycle(options, lifecycleEvent(context, state, "request.cancelled"), "onCancel");
|
|
66
|
+
if (!state.lifecycleStarted) {
|
|
67
|
+
const started = lifecycleEvent(context, state, "request.started");
|
|
68
|
+
await emitLifecycle(options, started, "onStart");
|
|
69
|
+
}
|
|
70
|
+
const signal = state.runtimeSignal?.current ?? state.signal;
|
|
71
|
+
const cancelled = () => {
|
|
72
|
+
void emitTerminalLifecycle(options, state, lifecycleEvent(context, state, "request.cancelled"), "onCancel");
|
|
73
73
|
};
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
else
|
|
77
|
-
state.signal.addEventListener("abort", onAbort, { once: true });
|
|
74
|
+
signal.addEventListener("abort", cancelled, { once: true });
|
|
75
|
+
let failure;
|
|
78
76
|
try {
|
|
79
77
|
await next();
|
|
80
78
|
}
|
|
@@ -83,24 +81,22 @@ export function requestLifecycleMiddleware(options = {}) {
|
|
|
83
81
|
throw cause;
|
|
84
82
|
}
|
|
85
83
|
finally {
|
|
86
|
-
|
|
87
|
-
if (
|
|
88
|
-
await cancellation;
|
|
89
|
-
if (cancelled) {
|
|
84
|
+
signal.removeEventListener("abort", cancelled);
|
|
85
|
+
if (state.signal.aborted) {
|
|
90
86
|
state.requestRecord?.setOutcome("cancelled");
|
|
91
|
-
finishRequestRecord(context, state, options, "cancelled");
|
|
92
87
|
return;
|
|
93
88
|
}
|
|
94
89
|
const outcome = failure === undefined ? undefined : failureOutcome(failure, state.signal);
|
|
95
90
|
if (outcome !== undefined)
|
|
96
91
|
state.requestRecord?.setOutcome(outcome.outcome, outcome.errorId);
|
|
97
|
-
if (failure !== undefined)
|
|
98
|
-
finishRequestRecord(context, state, options, outcome.outcome);
|
|
99
|
-
else
|
|
100
|
-
finishRequestRecord(context, state, options, "success");
|
|
101
|
-
const type = failure === undefined ? "request.completed" : "request.failed";
|
|
102
|
-
await emitLifecycle(options, lifecycleEvent(context, state, type, failure), failure === undefined ? "onComplete" : "onError");
|
|
103
92
|
}
|
|
104
93
|
};
|
|
105
94
|
}
|
|
95
|
+
function applicationOnly(handler) {
|
|
96
|
+
return async (context, next) => {
|
|
97
|
+
if (isRelkitControlPlanePath(context.req.path))
|
|
98
|
+
return next();
|
|
99
|
+
return handler(context, next);
|
|
100
|
+
};
|
|
101
|
+
}
|
|
106
102
|
//# sourceMappingURL=middleware.js.map
|
package/dist/middleware.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,4 @@
|
|
|
1
1
|
import type { HttpTriggerRegistration } from "@relkit/graph";
|
|
2
|
-
import type { RequestOutcome, SpanRecord } from "@relkit/observability";
|
|
3
|
-
import type { RouteMaterializationOptions } from "./materialize-routes.js";
|
|
4
2
|
import type { HttpRequestState } from "./middleware.js";
|
|
5
|
-
import type { RateLimitInfo } from "hono-rate-limiter";
|
|
6
3
|
export declare function recordRateLimitResult(trigger: HttpTriggerRegistration, state: HttpRequestState | undefined, startedAt: number, status: number, blocked: boolean, continued: boolean): void;
|
|
7
|
-
export declare function emitRateLimitSpan(options: RouteMaterializationOptions, trigger: HttpTriggerRegistration, state: HttpRequestState | undefined, spanId: string, startedAt: number, status: SpanRecord["status"], blocked: boolean, info?: RateLimitInfo, outcome?: RequestOutcome): void;
|
|
8
4
|
//# sourceMappingURL=rate-limit-telemetry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit-telemetry.d.ts","sourceRoot":"","sources":["../src/rate-limit-telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"rate-limit-telemetry.d.ts","sourceRoot":"","sources":["../src/rate-limit-telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,uBAAuB,EAChC,KAAK,EAAE,gBAAgB,GAAG,SAAS,EACnC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,OAAO,GACjB,IAAI,CAcN"}
|
|
@@ -15,43 +15,4 @@ export function recordRateLimitResult(trigger, state, startedAt, status, blocked
|
|
|
15
15
|
if (blocked)
|
|
16
16
|
builder?.setOutcome("declared-error", "rate-limit");
|
|
17
17
|
}
|
|
18
|
-
export function emitRateLimitSpan(options, trigger, state, spanId, startedAt, status, blocked, info, outcome) {
|
|
19
|
-
if (state === undefined || options.observability === undefined)
|
|
20
|
-
return;
|
|
21
|
-
const policy = trigger.config.rateLimit;
|
|
22
|
-
const record = {
|
|
23
|
-
version: 1,
|
|
24
|
-
signal: "span",
|
|
25
|
-
requestId: state.requestId,
|
|
26
|
-
traceId: state.traceId,
|
|
27
|
-
generationId: options.generationId ?? "generation.runtime",
|
|
28
|
-
graphHash: options.plan.graphHash,
|
|
29
|
-
invocationId: `rate-limit:${state.requestId}`,
|
|
30
|
-
spanId,
|
|
31
|
-
name: "relkit.http.rate_limit",
|
|
32
|
-
source: "http",
|
|
33
|
-
status,
|
|
34
|
-
startedAt: new Date(startedAt).toISOString(),
|
|
35
|
-
...(status === "completed"
|
|
36
|
-
? {
|
|
37
|
-
completedAt: new Date().toISOString(),
|
|
38
|
-
durationMs: Math.max(0, Date.now() - startedAt),
|
|
39
|
-
outcome: outcome ?? (blocked ? "declared-error" : "success"),
|
|
40
|
-
}
|
|
41
|
-
: {}),
|
|
42
|
-
attributes: {
|
|
43
|
-
"relkit.route.id": trigger.id,
|
|
44
|
-
"relkit.rate_limit.limit": policy.limit,
|
|
45
|
-
"relkit.rate_limit.remaining": info?.remaining ?? policy.limit,
|
|
46
|
-
"relkit.rate_limit.blocked": blocked,
|
|
47
|
-
"relkit.rate_limit.store": policy.storeId === undefined ? "memory" : "shared",
|
|
48
|
-
},
|
|
49
|
-
};
|
|
50
|
-
try {
|
|
51
|
-
options.observability.collect(record);
|
|
52
|
-
}
|
|
53
|
-
catch {
|
|
54
|
-
// Telemetry is advisory and cannot change request behavior.
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
18
|
//# sourceMappingURL=rate-limit-telemetry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit-telemetry.js","sourceRoot":"","sources":["../src/rate-limit-telemetry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rate-limit-telemetry.js","sourceRoot":"","sources":["../src/rate-limit-telemetry.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,qBAAqB,CACnC,OAAgC,EAChC,KAAmC,EACnC,SAAiB,EACjB,MAAc,EACd,OAAgB,EAChB,SAAkB;IAElB,MAAM,OAAO,GAAG,KAAK,EAAE,aAAa,CAAC;IACrC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACxD,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,OAAO,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAChG,OAAO,EAAE,GAAG,CAAC;QACX,IAAI,EAAE,YAAY;QAClB,EAAE,EAAE,SAAS;QACb,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAC/C,QAAQ,EAAE,mBAAmB;QAC7B,MAAM;QACN,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS;KAChD,CAAC,CAAC;IACH,IAAI,OAAO;QAAE,OAAO,EAAE,UAAU,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;AACnE,CAAC"}
|
package/dist/rate-limit.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAE7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EAAwB,KAAK,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAG1F,eAAO,MAAM,sBAAsB,6EAKxB,CAAC;AAEZ,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,YAAY,CAAC,EAAE,sBAAsB,CAAC;CAChD;AAED,KAAK,YAAY,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAG5D,wBAAgB,aAAa,CAC3B,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,2BAA2B,EACpC,OAAO,EAAE,YAAY,GACpB,YAAY,CA6Dd"}
|
package/dist/rate-limit.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { frameworkTrace } from "@relkit/invocation";
|
|
1
2
|
import { rateLimiter } from "hono-rate-limiter";
|
|
2
3
|
import { getRequestState } from "./middleware.js";
|
|
3
4
|
import { createRateLimitStore } from "./rate-limit-store.js";
|
|
4
|
-
import {
|
|
5
|
+
import { recordRateLimitResult } from "./rate-limit-telemetry.js";
|
|
5
6
|
export const ROUTE_MIDDLEWARE_ORDER = Object.freeze([
|
|
6
7
|
"rate-limit",
|
|
7
8
|
"declared-middleware",
|
|
@@ -32,26 +33,30 @@ export function withRateLimit(trigger, options, handler) {
|
|
|
32
33
|
return async (context) => {
|
|
33
34
|
const startedAt = Date.now();
|
|
34
35
|
const state = getRequestState(context);
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
return frameworkTrace.span("relkit.http.rate_limit", {
|
|
37
|
+
attributes: {
|
|
38
|
+
"relkit.route.id": trigger.id,
|
|
39
|
+
"relkit.rate_limit.limit": policy.limit,
|
|
40
|
+
"relkit.rate_limit.store": policy.storeId === undefined ? "memory" : "shared",
|
|
41
|
+
},
|
|
42
|
+
}, async () => {
|
|
43
|
+
let continued = false;
|
|
39
44
|
const result = await middleware(context, async () => {
|
|
40
45
|
continued = true;
|
|
41
46
|
context.res = await handler(context);
|
|
42
47
|
});
|
|
43
48
|
const response = result instanceof Response ? result : context.res;
|
|
44
49
|
const blocked = !continued && response.status === 429;
|
|
45
|
-
const
|
|
50
|
+
const info = rateInfo(context);
|
|
51
|
+
const finalResponse = withStandardHeaders(response, policy, info, blocked);
|
|
46
52
|
context.res = finalResponse;
|
|
53
|
+
frameworkTrace.setAttributes({
|
|
54
|
+
"relkit.rate_limit.remaining": info?.remaining ?? policy.limit,
|
|
55
|
+
"relkit.rate_limit.blocked": blocked,
|
|
56
|
+
});
|
|
47
57
|
recordRateLimitResult(trigger, state, startedAt, finalResponse.status, blocked, continued);
|
|
48
|
-
emitRateLimitSpan(options, trigger, state, spanId, startedAt, "completed", blocked, rateInfo(context));
|
|
49
58
|
return finalResponse;
|
|
50
|
-
}
|
|
51
|
-
catch (cause) {
|
|
52
|
-
emitRateLimitSpan(options, trigger, state, spanId, startedAt, "completed", false, undefined, "defect");
|
|
53
|
-
throw cause;
|
|
54
|
-
}
|
|
59
|
+
});
|
|
55
60
|
};
|
|
56
61
|
}
|
|
57
62
|
function withStandardHeaders(response, policy, info, blocked) {
|
package/dist/rate-limit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-inference.d.ts","sourceRoot":"","sources":["../src/request-inference.ts"],"names":[],"mappings":"AAKA,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAK5F"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import { getJsonSchema } from "@relkit/schema";
|
|
2
|
+
const schemaCache = new WeakMap();
|
|
3
|
+
const JSON_NUMBER = /^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?$/;
|
|
4
|
+
export function decodeInferredInput(value, route, target) {
|
|
5
|
+
if (!isRecord(route) || route.request !== undefined)
|
|
6
|
+
return value;
|
|
7
|
+
if (!isRecord(target) || !isSchema(target.input))
|
|
8
|
+
return value;
|
|
9
|
+
const schema = projectedSchema(target.input);
|
|
10
|
+
return schema === undefined ? value : decodeValue(value, schema);
|
|
11
|
+
}
|
|
12
|
+
function projectedSchema(schema) {
|
|
13
|
+
const cached = schemaCache.get(schema);
|
|
14
|
+
if (cached !== undefined)
|
|
15
|
+
return cached ?? undefined;
|
|
16
|
+
const result = getJsonSchema(schema);
|
|
17
|
+
const projected = result.ok ? result.schema : null;
|
|
18
|
+
schemaCache.set(schema, projected);
|
|
19
|
+
return projected ?? undefined;
|
|
20
|
+
}
|
|
21
|
+
function decodeValue(value, schema) {
|
|
22
|
+
if (!isRecord(schema))
|
|
23
|
+
return value;
|
|
24
|
+
const variants = Array.isArray(schema.anyOf)
|
|
25
|
+
? schema.anyOf
|
|
26
|
+
: Array.isArray(schema.oneOf)
|
|
27
|
+
? schema.oneOf
|
|
28
|
+
: undefined;
|
|
29
|
+
if (variants !== undefined) {
|
|
30
|
+
if (variants.some((variant) => acceptsType(value, variant)))
|
|
31
|
+
return value;
|
|
32
|
+
for (const variant of variants) {
|
|
33
|
+
const decoded = decodeValue(value, variant);
|
|
34
|
+
if (decoded !== value)
|
|
35
|
+
return decoded;
|
|
36
|
+
}
|
|
37
|
+
return value;
|
|
38
|
+
}
|
|
39
|
+
const properties = schema.properties;
|
|
40
|
+
if (schema.type === "object" && isRecord(value) && isRecord(properties)) {
|
|
41
|
+
return Object.fromEntries(Object.entries(value).map(([key, entry]) => [key, decodeValue(entry, properties[key])]));
|
|
42
|
+
}
|
|
43
|
+
if (schema.type === "array" && Array.isArray(value)) {
|
|
44
|
+
return value.map((entry) => decodeValue(entry, schema.items));
|
|
45
|
+
}
|
|
46
|
+
if (typeof value !== "string")
|
|
47
|
+
return value;
|
|
48
|
+
const expected = schema.type ?? typeof schema.const;
|
|
49
|
+
if ((expected === "number" || expected === "integer") && JSON_NUMBER.test(value)) {
|
|
50
|
+
const decoded = Number(value);
|
|
51
|
+
if (Number.isFinite(decoded) && (expected !== "integer" || Number.isInteger(decoded)))
|
|
52
|
+
return decoded;
|
|
53
|
+
}
|
|
54
|
+
if (expected === "boolean" && (value === "true" || value === "false"))
|
|
55
|
+
return value === "true";
|
|
56
|
+
return value;
|
|
57
|
+
}
|
|
58
|
+
function acceptsType(value, schema) {
|
|
59
|
+
if (!isRecord(schema))
|
|
60
|
+
return false;
|
|
61
|
+
if (schema.type === "integer")
|
|
62
|
+
return typeof value === "number" && Number.isInteger(value);
|
|
63
|
+
if (schema.type === "number")
|
|
64
|
+
return typeof value === "number" && Number.isFinite(value);
|
|
65
|
+
if (schema.type === "array")
|
|
66
|
+
return Array.isArray(value);
|
|
67
|
+
if (schema.type === "object")
|
|
68
|
+
return isRecord(value);
|
|
69
|
+
return typeof schema.type === "string" && typeof value === schema.type;
|
|
70
|
+
}
|
|
71
|
+
function isSchema(value) {
|
|
72
|
+
return (isRecord(value) &&
|
|
73
|
+
isRecord(value["~standard"]) &&
|
|
74
|
+
value["~standard"].version === 1 &&
|
|
75
|
+
typeof value["~standard"].validate === "function");
|
|
76
|
+
}
|
|
77
|
+
function isRecord(value) {
|
|
78
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
79
|
+
}
|
|
80
|
+
//# sourceMappingURL=request-inference.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-inference.js","sourceRoot":"","sources":["../src/request-inference.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,5 @@ import type { Context } from "hono";
|
|
|
2
2
|
import { type RequestOutcome } from "@relkit/observability";
|
|
3
3
|
import { type HttpMiddlewareOptions, type HttpRequestState } from "./middleware-utils.js";
|
|
4
4
|
export declare function ensureRequestRecord(context: Context, state: HttpRequestState, options: HttpMiddlewareOptions): HttpRequestState;
|
|
5
|
-
export declare function finishRequestRecord(context: Context, state: HttpRequestState, options: HttpMiddlewareOptions, outcome: RequestOutcome):
|
|
5
|
+
export declare function finishRequestRecord(context: Context, state: HttpRequestState, options: HttpMiddlewareOptions, outcome: RequestOutcome): import("@relkit/observability").RequestRecord | undefined;
|
|
6
6
|
//# sourceMappingURL=request-record-middleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-record-middleware.d.ts","sourceRoot":"","sources":["../src/request-record-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,
|
|
1
|
+
{"version":3,"file":"request-record-middleware.d.ts","sourceRoot":"","sources":["../src/request-record-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAA8B,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;AAE/B,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,qBAAqB,GAC7B,gBAAgB,CAmBlB;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,cAAc,GACtB,OAAO,uBAAuB,EAAE,aAAa,GAAG,SAAS,CAkB3D"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createRequestRecordBuilder } from "@relkit/observability";
|
|
2
2
|
import { setRequestState, } from "./middleware-utils.js";
|
|
3
3
|
export function ensureRequestRecord(context, state, options) {
|
|
4
4
|
if (state.requestRecord !== undefined || options.observability === undefined)
|
|
@@ -15,6 +15,7 @@ export function ensureRequestRecord(context, state, options) {
|
|
|
15
15
|
...(requestBytes === undefined ? {} : { requestBytes }),
|
|
16
16
|
...(options.now === undefined ? {} : { now: options.now }),
|
|
17
17
|
});
|
|
18
|
+
options.observability.collect(requestRecord.started);
|
|
18
19
|
requestRecord.add({ kind: "accepted", at: state.startedAt });
|
|
19
20
|
const next = Object.freeze({ ...state, requestRecord });
|
|
20
21
|
setRequestState(context, next);
|
|
@@ -24,18 +25,18 @@ export function finishRequestRecord(context, state, options, outcome) {
|
|
|
24
25
|
const builder = state.requestRecord;
|
|
25
26
|
const sink = options.observability;
|
|
26
27
|
if (builder === undefined || sink === undefined)
|
|
27
|
-
return;
|
|
28
|
-
const records = sink.read?.() ?? sink.readRecords?.() ?? [];
|
|
29
|
-
appendObservedRequestDetails(builder, records, state.requestId, state.traceId);
|
|
28
|
+
return undefined;
|
|
30
29
|
const responseStatus = context.res.status;
|
|
31
30
|
const effectiveOutcome = builder.setOutcome(outcome === "success" && responseStatus >= 500 ? "defect" : outcome);
|
|
32
31
|
const status = responseStatus >= 400 ? responseStatus : fallbackStatus(effectiveOutcome, responseStatus);
|
|
33
32
|
builder.add({ kind: "response", status, outcome: effectiveOutcome });
|
|
34
33
|
const responseBytes = contentLength(context.res);
|
|
35
|
-
|
|
34
|
+
const record = builder.finish({
|
|
36
35
|
status,
|
|
37
36
|
...(responseBytes === undefined ? {} : { responseBytes }),
|
|
38
|
-
})
|
|
37
|
+
});
|
|
38
|
+
sink.collect(record);
|
|
39
|
+
return record;
|
|
39
40
|
}
|
|
40
41
|
function contentLength(value) {
|
|
41
42
|
const header = value.headers.get("content-length");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-record-middleware.js","sourceRoot":"","sources":["../src/request-record-middleware.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"request-record-middleware.js","sourceRoot":"","sources":["../src/request-record-middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-record-utils.d.ts","sourceRoot":"","sources":["../src/request-record-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"request-record-utils.d.ts","sourceRoot":"","sources":["../src/request-record-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAGlE,wBAAgB,YAAY,CAC1B,OAAO,EAAE,oBAAoB,GAAG,SAAS,EACzC,MAAM,EAAE,UAAU,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GACjD,IAAI,CAEN;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,WAAW,GACnB;IAAE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAajE;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EAC3B,OAAO,EAAE,oBAAoB,GAAG,SAAS,EACzC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CA0BlB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,qBAAqB,EACjC,OAAO,EAAE,oBAAoB,GAAG,SAAS,EACzC,IAAI,EAAE,YAAY,GAAG,UAAU,EAC/B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CAsBlB"}
|