@beignet/core 0.0.46 → 0.0.48
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/CHANGELOG.md +15 -0
- package/README.md +56 -23
- package/dist/providers/instrumentation.d.ts.map +1 -1
- package/dist/providers/instrumentation.js +14 -2
- package/dist/providers/instrumentation.js.map +1 -1
- package/dist/providers/metadata.d.ts +2 -0
- package/dist/providers/metadata.d.ts.map +1 -1
- package/dist/providers/metadata.js +78 -16
- package/dist/providers/metadata.js.map +1 -1
- package/dist/server/context.d.ts +7 -0
- package/dist/server/context.d.ts.map +1 -1
- package/dist/server/context.js.map +1 -1
- package/dist/server/hooks/logging.d.ts +3 -0
- package/dist/server/hooks/logging.d.ts.map +1 -1
- package/dist/server/hooks/logging.js +18 -7
- package/dist/server/hooks/logging.js.map +1 -1
- package/dist/server/hooks/rate-limit.d.ts +7 -7
- package/dist/server/hooks/rate-limit.d.ts.map +1 -1
- package/dist/server/hooks/rate-limit.js +15 -9
- package/dist/server/hooks/rate-limit.js.map +1 -1
- package/dist/server/hooks/security.d.ts +4 -3
- package/dist/server/hooks/security.d.ts.map +1 -1
- package/dist/server/hooks/security.js +5 -3
- package/dist/server/hooks/security.js.map +1 -1
- package/dist/server/http.d.ts +12 -0
- package/dist/server/http.d.ts.map +1 -1
- package/dist/server/request-executor.d.ts +5 -2
- package/dist/server/request-executor.d.ts.map +1 -1
- package/dist/server/request-executor.js +21 -2
- package/dist/server/request-executor.js.map +1 -1
- package/dist/server/server-context.d.ts +2 -1
- package/dist/server/server-context.d.ts.map +1 -1
- package/dist/server/server-context.js +2 -1
- package/dist/server/server-context.js.map +1 -1
- package/dist/server/server.d.ts +9 -0
- package/dist/server/server.d.ts.map +1 -1
- package/dist/server/server.js +14 -2
- package/dist/server/server.js.map +1 -1
- package/dist/server/trusted-proxy-internal.d.ts +4 -0
- package/dist/server/trusted-proxy-internal.d.ts.map +1 -0
- package/dist/server/trusted-proxy-internal.js +27 -0
- package/dist/server/trusted-proxy-internal.js.map +1 -0
- package/dist/server/trusted-proxy.d.ts +11 -6
- package/dist/server/trusted-proxy.d.ts.map +1 -1
- package/dist/server/trusted-proxy.js +6 -10
- package/dist/server/trusted-proxy.js.map +1 -1
- package/package.json +1 -1
- package/skills/app-architecture/SKILL.md +5 -2
- package/src/providers/instrumentation.ts +15 -2
- package/src/providers/metadata.ts +132 -16
- package/src/server/context.ts +7 -0
- package/src/server/hooks/logging.ts +35 -7
- package/src/server/hooks/rate-limit.ts +25 -15
- package/src/server/hooks/security.ts +11 -7
- package/src/server/http.ts +18 -1
- package/src/server/request-executor.ts +43 -2
- package/src/server/server-context.ts +2 -1
- package/src/server/server.ts +30 -1
- package/src/server/trusted-proxy-internal.ts +41 -0
- package/src/server/trusted-proxy.ts +20 -17
package/dist/server/server.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ import type { ServerInstrumentationOptions } from "./instrumentation.js";
|
|
|
9
9
|
import type { RequestBodyOptions } from "./request-preparation.js";
|
|
10
10
|
import { contractsFromRoutes, createRoutes, defineRoutes, type HandlerRouteDef, type RouteDef, type RouteDefinitionBuilder, type RouteGroup, type RouteGroupBuilder, type Routes } from "./route-definitions.js";
|
|
11
11
|
import type { RuntimeIntegrityCheck } from "./runtime-integrity.js";
|
|
12
|
+
import { type TrustedProxyConfig } from "./trusted-proxy.js";
|
|
12
13
|
export type { HandlerRouteDef, RequestBodyOptions, RouteDef, RouteDefinitionBuilder, RouteGroup, RouteGroupBuilder, Routes, };
|
|
13
14
|
export { contractsFromRoutes, createRoutes, defineRoutes };
|
|
14
15
|
/**
|
|
@@ -54,6 +55,14 @@ export type CreateServerOptions<Ctx, Ports extends AnyPorts, ServiceInput = void
|
|
|
54
55
|
* startup.
|
|
55
56
|
*/
|
|
56
57
|
context: ServerContextConfig<Ctx, Ports & InferProviderPorts<Providers>, ServiceInput>;
|
|
58
|
+
/**
|
|
59
|
+
* Explicit policy for trusting proxy- or edge-provided request metadata.
|
|
60
|
+
*
|
|
61
|
+
* Forwarding headers are ignored by default. Configure this only when every
|
|
62
|
+
* request reaches the app through a trusted platform or reverse proxy that
|
|
63
|
+
* strips or normalizes those headers.
|
|
64
|
+
*/
|
|
65
|
+
trustedProxy?: TrustedProxyConfig;
|
|
57
66
|
/**
|
|
58
67
|
* Server hooks that wrap every registered route.
|
|
59
68
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EACL,KAAK,kBAAkB,EAExB,MAAM,uBAAuB,CAAC;AAY/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,KAAK,EACV,kBAAkB,EAElB,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EACV,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,KAAK,EACV,OAAO,EACP,eAAe,EACf,YAAY,EAGZ,qBAAqB,EACrB,UAAU,EACV,0BAA0B,EAC3B,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAezE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,YAAY,EACZ,KAAK,eAAe,EACpB,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAC3B,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,MAAM,EACZ,MAAM,wBAAwB,CAAC;AAMhC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"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"}
|
package/dist/server/server.js
CHANGED
|
@@ -14,8 +14,16 @@ import { errorResponse } from "./response-finalization.js";
|
|
|
14
14
|
import { contractsFromRoutes, createRoutes, defineRoutes, } from "./route-definitions.js";
|
|
15
15
|
import { compareRouteSpecificity, compilePath, } from "./route-matching.js";
|
|
16
16
|
import { runRuntimeIntegrityCheck } from "./runtime-integrity.js";
|
|
17
|
+
import { resolveTrustedRequest, } from "./trusted-proxy.js";
|
|
18
|
+
import { assertValidTrustedProxyConfig } from "./trusted-proxy-internal.js";
|
|
17
19
|
import { createUseCaseRouteHandler, isUseCaseRouteDef, } from "./use-case-route.js";
|
|
18
20
|
export { contractsFromRoutes, createRoutes, defineRoutes };
|
|
21
|
+
function copyTrustedRequestInfo(requestInfo) {
|
|
22
|
+
return {
|
|
23
|
+
...requestInfo,
|
|
24
|
+
url: new URL(requestInfo.url),
|
|
25
|
+
};
|
|
26
|
+
}
|
|
19
27
|
/**
|
|
20
28
|
* Create a Beignet server instance.
|
|
21
29
|
*
|
|
@@ -47,16 +55,19 @@ export async function createServer(options) {
|
|
|
47
55
|
...(options.hooks ?? []),
|
|
48
56
|
];
|
|
49
57
|
const contracts = options.routes ? contractsFromRoutes(options.routes) : [];
|
|
58
|
+
const trustedProxy = options.trustedProxy ?? false;
|
|
59
|
+
assertValidTrustedProxyConfig(trustedProxy);
|
|
50
60
|
// Fail startup on hook misconfiguration before provider setup runs.
|
|
51
61
|
for (const hook of hooks) {
|
|
52
|
-
hook.validate?.({ contracts });
|
|
62
|
+
hook.validate?.({ contracts, trustedProxy });
|
|
53
63
|
}
|
|
54
64
|
const resolvedContext = resolveServerContext(options.context);
|
|
55
65
|
const finalizeContext = createContextFinalizer(resolvedContext, () => finalPorts);
|
|
56
|
-
const createRequestContext = async (req, contract) => {
|
|
66
|
+
const createRequestContext = async (req, contract, requestInfo = resolveTrustedRequest(req, trustedProxy)) => {
|
|
57
67
|
const { requestId, trace } = instrumentation.prepareRequest(req);
|
|
58
68
|
return finalizeContext(await resolvedContext.request({
|
|
59
69
|
req,
|
|
70
|
+
requestInfo: copyTrustedRequestInfo(requestInfo),
|
|
60
71
|
ports: finalPorts,
|
|
61
72
|
contract,
|
|
62
73
|
requestId,
|
|
@@ -128,6 +139,7 @@ export async function createServer(options) {
|
|
|
128
139
|
const contextRuntime = {
|
|
129
140
|
createRequestContext,
|
|
130
141
|
finalizeContext,
|
|
142
|
+
resolveRequestInfo: (req) => resolveTrustedRequest(req, trustedProxy),
|
|
131
143
|
};
|
|
132
144
|
let serviceContextsAvailable = false;
|
|
133
145
|
const lifecycleCreateServiceContext = async (input) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { TrustedProxyConfig } from "./trusted-proxy.js";
|
|
2
|
+
export declare function requireTrustedProxyHeaderName(name: string, optionName: string): string;
|
|
3
|
+
export declare function assertValidTrustedProxyConfig(config: TrustedProxyConfig): void;
|
|
4
|
+
//# sourceMappingURL=trusted-proxy-internal.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"trusted-proxy-internal.d.ts","sourceRoot":"","sources":["../../src/server/trusted-proxy-internal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GACjB,MAAM,CAaR;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,kBAAkB,GACzB,IAAI,CAkBN"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
export function requireTrustedProxyHeaderName(name, optionName) {
|
|
2
|
+
const header = name.trim();
|
|
3
|
+
if (!header) {
|
|
4
|
+
throw new Error(`${optionName} must be a non-empty header name.`);
|
|
5
|
+
}
|
|
6
|
+
try {
|
|
7
|
+
new Headers().get(header);
|
|
8
|
+
}
|
|
9
|
+
catch {
|
|
10
|
+
throw new Error(`${optionName} must be a valid HTTP header name.`);
|
|
11
|
+
}
|
|
12
|
+
return header;
|
|
13
|
+
}
|
|
14
|
+
export function assertValidTrustedProxyConfig(config) {
|
|
15
|
+
if (!config)
|
|
16
|
+
return;
|
|
17
|
+
if (config.hostHeader !== undefined && config.hostHeader !== false) {
|
|
18
|
+
requireTrustedProxyHeaderName(config.hostHeader, "trustedProxy.hostHeader");
|
|
19
|
+
}
|
|
20
|
+
if (config.protocolHeader !== undefined && config.protocolHeader !== false) {
|
|
21
|
+
requireTrustedProxyHeaderName(config.protocolHeader, "trustedProxy.protocolHeader");
|
|
22
|
+
}
|
|
23
|
+
if (typeof config.clientIp === "object") {
|
|
24
|
+
requireTrustedProxyHeaderName(config.clientIp.header, "trustedProxy.clientIp.header");
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=trusted-proxy-internal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"trusted-proxy-internal.js","sourceRoot":"","sources":["../../src/server/trusted-proxy-internal.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,6BAA6B,CAC3C,IAAY,EACZ,UAAkB;IAElB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,mCAAmC,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,CAAC;QACH,IAAI,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,oCAAoC,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,MAA0B;IAE1B,IAAI,CAAC,MAAM;QAAE,OAAO;IAEpB,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,IAAI,MAAM,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QACnE,6BAA6B,CAAC,MAAM,CAAC,UAAU,EAAE,yBAAyB,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,IAAI,MAAM,CAAC,cAAc,KAAK,KAAK,EAAE,CAAC;QAC3E,6BAA6B,CAC3B,MAAM,CAAC,cAAc,EACrB,6BAA6B,CAC9B,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACxC,6BAA6B,CAC3B,MAAM,CAAC,QAAQ,CAAC,MAAM,EACtB,8BAA8B,CAC/B,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -43,27 +43,32 @@ export interface TrustedRequestInfo {
|
|
|
43
43
|
/**
|
|
44
44
|
* URL as seen by the app or reconstructed from trusted proxy headers.
|
|
45
45
|
*/
|
|
46
|
-
url: URL
|
|
46
|
+
readonly url: Readonly<URL>;
|
|
47
47
|
/**
|
|
48
48
|
* External request origin.
|
|
49
49
|
*/
|
|
50
|
-
origin: string;
|
|
50
|
+
readonly origin: string;
|
|
51
51
|
/**
|
|
52
52
|
* External request protocol without a trailing colon.
|
|
53
53
|
*/
|
|
54
|
-
protocol: "http" | "https";
|
|
54
|
+
readonly protocol: "http" | "https";
|
|
55
55
|
/**
|
|
56
56
|
* External request host, including port when present.
|
|
57
57
|
*/
|
|
58
|
-
host: string;
|
|
58
|
+
readonly host: string;
|
|
59
59
|
/**
|
|
60
60
|
* Resolved client IP when a trusted client-IP source is configured.
|
|
61
61
|
*/
|
|
62
|
-
clientIp?: string;
|
|
62
|
+
readonly clientIp?: string;
|
|
63
|
+
/**
|
|
64
|
+
* Whether the server policy configured a trusted client-IP source. This can
|
|
65
|
+
* be true while `clientIp` is absent when the expected header is missing.
|
|
66
|
+
*/
|
|
67
|
+
readonly clientIpTrusted: boolean;
|
|
63
68
|
/**
|
|
64
69
|
* Whether forwarding headers were eligible to affect this result.
|
|
65
70
|
*/
|
|
66
|
-
trustedProxy: boolean;
|
|
71
|
+
readonly trustedProxy: boolean;
|
|
67
72
|
}
|
|
68
73
|
/**
|
|
69
74
|
* Resolve a client IP from a configured trusted proxy source.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trusted-proxy.d.ts","sourceRoot":"","sources":["../../src/server/trusted-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"trusted-proxy.d.ts","sourceRoot":"","sources":["../../src/server/trusted-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAGjD;;;GAGG;AACH,MAAM,MAAM,0BAA0B,GAClC,sBAAsB,GACtB,uBAAuB,GACvB,WAAW,GACX,kBAAkB,GAClB;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAClB,CAAC,CAAC,GAAG,EAAE,eAAe,KAAK,MAAM,GAAG,SAAS,CAAC,CAAC;AAEnD;;;;;;GAMG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,QAAQ,CAAC,EAAE,0BAA0B,GAAG,KAAK,CAAC;IAC9C;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAChC;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,KAAK,GAAG,mBAAmB,CAAC;AAE7D;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC5B;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IACpC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;CAChC;AA4ED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,0BAA0B,GAAG,KAAK,GAAG,SAAS,GACrD,MAAM,GAAG,SAAS,CA0BpB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,eAAe,EACpB,MAAM,GAAE,kBAAkB,GAAG,SAAiB,GAC7C,kBAAkB,CAsDpB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { requireTrustedProxyHeaderName } from "./trusted-proxy-internal.js";
|
|
1
2
|
const DEFAULT_PROTOCOL_HEADER = "x-forwarded-proto";
|
|
2
3
|
const DEFAULT_HOST_HEADER = "x-forwarded-host";
|
|
3
4
|
function splitForwardedHeader(value) {
|
|
@@ -11,13 +12,6 @@ function splitForwardedHeader(value) {
|
|
|
11
12
|
function firstHeaderValue(req, header) {
|
|
12
13
|
return splitForwardedHeader(req.headers.get(header))[0];
|
|
13
14
|
}
|
|
14
|
-
function requireHeaderName(name, optionName) {
|
|
15
|
-
const header = name.trim();
|
|
16
|
-
if (!header) {
|
|
17
|
-
throw new Error(`${optionName} must be a non-empty header name.`);
|
|
18
|
-
}
|
|
19
|
-
return header;
|
|
20
|
-
}
|
|
21
15
|
function normalizeProtocol(value) {
|
|
22
16
|
if (!value)
|
|
23
17
|
return undefined;
|
|
@@ -76,7 +70,7 @@ export function resolveTrustedClientIp(req, source) {
|
|
|
76
70
|
return source(req)?.trim() || undefined;
|
|
77
71
|
}
|
|
78
72
|
if (typeof source === "object") {
|
|
79
|
-
return firstHeaderValue(req,
|
|
73
|
+
return firstHeaderValue(req, requireTrustedProxyHeaderName(source.header, "trustedProxy.clientIp.header"));
|
|
80
74
|
}
|
|
81
75
|
if (source === "x-forwarded-for-first" || source === "x-forwarded-for-last") {
|
|
82
76
|
const entries = splitForwardedHeader(req.headers.get("x-forwarded-for"));
|
|
@@ -102,15 +96,16 @@ export function resolveTrustedRequest(req, config = false) {
|
|
|
102
96
|
origin: baseUrl.origin,
|
|
103
97
|
protocol: baseProtocol,
|
|
104
98
|
host: baseHost,
|
|
99
|
+
clientIpTrusted: false,
|
|
105
100
|
trustedProxy: false,
|
|
106
101
|
};
|
|
107
102
|
}
|
|
108
103
|
const protocolHeader = config.protocolHeader === false
|
|
109
104
|
? undefined
|
|
110
|
-
:
|
|
105
|
+
: requireTrustedProxyHeaderName(config.protocolHeader ?? DEFAULT_PROTOCOL_HEADER, "trustedProxy.protocolHeader");
|
|
111
106
|
const hostHeader = config.hostHeader === false
|
|
112
107
|
? undefined
|
|
113
|
-
:
|
|
108
|
+
: requireTrustedProxyHeaderName(config.hostHeader ?? DEFAULT_HOST_HEADER, "trustedProxy.hostHeader");
|
|
114
109
|
const protocol = normalizeProtocol(protocolHeader ? firstHeaderValue(req, protocolHeader) : undefined) ?? baseProtocol;
|
|
115
110
|
const host = normalizeHost(hostHeader ? firstHeaderValue(req, hostHeader) : undefined, protocol) ?? baseHost;
|
|
116
111
|
const url = new URL(baseUrl);
|
|
@@ -123,6 +118,7 @@ export function resolveTrustedRequest(req, config = false) {
|
|
|
123
118
|
protocol,
|
|
124
119
|
host,
|
|
125
120
|
...(clientIp !== undefined ? { clientIp } : {}),
|
|
121
|
+
clientIpTrusted: Boolean(config.clientIp),
|
|
126
122
|
trustedProxy: true,
|
|
127
123
|
};
|
|
128
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trusted-proxy.js","sourceRoot":"","sources":["../../src/server/trusted-proxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"trusted-proxy.js","sourceRoot":"","sources":["../../src/server/trusted-proxy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -65,8 +65,11 @@ themselves.
|
|
|
65
65
|
- Server-only request context helpers may bridge Server Components to
|
|
66
66
|
Beignet's request-scoped `AppContext`. Keep them outside `client/`, usually
|
|
67
67
|
in `lib/server-context.ts`, and mark them with `@beignet/core/server-only`.
|
|
68
|
-
|
|
69
|
-
|
|
68
|
+
The context factory receives `requestInfo` from the server's explicit
|
|
69
|
+
`trustedProxy` policy; store it on request contexts when layouts need the
|
|
70
|
+
external URL, origin, host, protocol, or client IP. Layouts may read that
|
|
71
|
+
metadata with `ctx.auth` and `ctx.tenant` for redirects and shell state;
|
|
72
|
+
feature data still belongs behind use cases.
|
|
70
73
|
- Server-only React Query prefetch helpers may consume that context for
|
|
71
74
|
hydrated client state. Use them only for direct `{ contract, useCase }` route
|
|
72
75
|
bindings whose use-case output matches the contract success body.
|
|
@@ -502,7 +502,11 @@ export function createProviderInstrumentation(
|
|
|
502
502
|
function isEnabled(watcher = options.watcher): boolean {
|
|
503
503
|
if (!port) return false;
|
|
504
504
|
if (!watcher) return true;
|
|
505
|
-
|
|
505
|
+
try {
|
|
506
|
+
return port.isWatcherEnabled?.(watcher) ?? true;
|
|
507
|
+
} catch {
|
|
508
|
+
return false;
|
|
509
|
+
}
|
|
506
510
|
}
|
|
507
511
|
|
|
508
512
|
function record(event: ProviderInstrumentationEventInput): unknown {
|
|
@@ -530,7 +534,16 @@ export function createProviderInstrumentation(
|
|
|
530
534
|
}
|
|
531
535
|
|
|
532
536
|
try {
|
|
533
|
-
|
|
537
|
+
const result = port.record(redacted);
|
|
538
|
+
if (
|
|
539
|
+
result !== null &&
|
|
540
|
+
(typeof result === "object" || typeof result === "function") &&
|
|
541
|
+
"then" in result &&
|
|
542
|
+
typeof result.then === "function"
|
|
543
|
+
) {
|
|
544
|
+
return Promise.resolve(result).catch(() => undefined);
|
|
545
|
+
}
|
|
546
|
+
return result;
|
|
534
547
|
} catch {
|
|
535
548
|
return undefined;
|
|
536
549
|
}
|
|
@@ -24,6 +24,7 @@ export type ProviderPackageVariantMetadata = {
|
|
|
24
24
|
displayName?: string;
|
|
25
25
|
env?: readonly string[];
|
|
26
26
|
requiredEnv?: readonly string[];
|
|
27
|
+
requiredEnvAlternatives?: readonly (readonly string[])[];
|
|
27
28
|
requiredTables?: readonly string[];
|
|
28
29
|
registration?: ProviderPackageRegistrationMetadata;
|
|
29
30
|
};
|
|
@@ -34,6 +35,7 @@ export type ProviderPackageMetadata = {
|
|
|
34
35
|
appPorts?: readonly ProviderPackagePortMetadata[];
|
|
35
36
|
env?: readonly string[];
|
|
36
37
|
requiredEnv?: readonly string[];
|
|
38
|
+
requiredEnvAlternatives?: readonly (readonly string[])[];
|
|
37
39
|
requiredTables?: readonly string[];
|
|
38
40
|
registration?: ProviderPackageRegistrationMetadata;
|
|
39
41
|
variants?: readonly ProviderPackageVariantMetadata[];
|
|
@@ -91,17 +93,43 @@ export function parseProviderPackageMetadata(
|
|
|
91
93
|
);
|
|
92
94
|
if (requiredEnv !== undefined) {
|
|
93
95
|
metadata.requiredEnv = requiredEnv;
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
96
|
+
validateRequiredEnvMembers(
|
|
97
|
+
requiredEnv,
|
|
98
|
+
env,
|
|
99
|
+
"beignet.provider.requiredEnv",
|
|
100
|
+
"beignet.provider.env",
|
|
101
|
+
issues,
|
|
102
|
+
);
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
const requiredEnvAlternatives = parseStringArrayArray(
|
|
106
|
+
input.requiredEnvAlternatives,
|
|
107
|
+
"beignet.provider.requiredEnvAlternatives",
|
|
108
|
+
issues,
|
|
109
|
+
);
|
|
110
|
+
if (requiredEnvAlternatives !== undefined) {
|
|
111
|
+
metadata.requiredEnvAlternatives = requiredEnvAlternatives;
|
|
112
|
+
for (const alternative of requiredEnvAlternatives) {
|
|
113
|
+
validateRequiredEnvMembers(
|
|
114
|
+
alternative,
|
|
115
|
+
env,
|
|
116
|
+
"beignet.provider.requiredEnvAlternatives",
|
|
117
|
+
"beignet.provider.env",
|
|
118
|
+
issues,
|
|
119
|
+
);
|
|
102
120
|
}
|
|
103
121
|
}
|
|
104
122
|
|
|
123
|
+
if (
|
|
124
|
+
input.requiredEnv !== undefined &&
|
|
125
|
+
input.requiredEnvAlternatives !== undefined
|
|
126
|
+
) {
|
|
127
|
+
issues.push({
|
|
128
|
+
path: "beignet.provider.requiredEnvAlternatives",
|
|
129
|
+
message: "must not be set alongside beignet.provider.requiredEnv",
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
|
|
105
133
|
const requiredTables = parseStringArray(
|
|
106
134
|
input.requiredTables,
|
|
107
135
|
"beignet.provider.requiredTables",
|
|
@@ -137,6 +165,13 @@ export function parseProviderPackageMetadata(
|
|
|
137
165
|
"must not be set when beignet.provider.variants is present; declare requiredEnv on each variant instead",
|
|
138
166
|
});
|
|
139
167
|
}
|
|
168
|
+
if (input.requiredEnvAlternatives !== undefined) {
|
|
169
|
+
issues.push({
|
|
170
|
+
path: "beignet.provider.requiredEnvAlternatives",
|
|
171
|
+
message:
|
|
172
|
+
"must not be set when beignet.provider.variants is present; declare requiredEnvAlternatives on each variant instead",
|
|
173
|
+
});
|
|
174
|
+
}
|
|
140
175
|
if (input.registration !== undefined) {
|
|
141
176
|
issues.push({
|
|
142
177
|
path: "beignet.provider.registration",
|
|
@@ -186,6 +221,60 @@ function parseStringArray(
|
|
|
186
221
|
return parsed;
|
|
187
222
|
}
|
|
188
223
|
|
|
224
|
+
function parseStringArrayArray(
|
|
225
|
+
value: unknown,
|
|
226
|
+
path: string,
|
|
227
|
+
issues: ProviderPackageMetadataIssue[],
|
|
228
|
+
): string[][] | undefined {
|
|
229
|
+
if (value === undefined) return undefined;
|
|
230
|
+
if (!Array.isArray(value)) {
|
|
231
|
+
issues.push({ path, message: "must be an array of string arrays" });
|
|
232
|
+
return undefined;
|
|
233
|
+
}
|
|
234
|
+
if (value.length === 0) {
|
|
235
|
+
issues.push({
|
|
236
|
+
path,
|
|
237
|
+
message: "must include at least one alternative when present",
|
|
238
|
+
});
|
|
239
|
+
return undefined;
|
|
240
|
+
}
|
|
241
|
+
|
|
242
|
+
const parsed: string[][] = [];
|
|
243
|
+
for (const [index, entry] of value.entries()) {
|
|
244
|
+
const entryPath = `${path}[${index}]`;
|
|
245
|
+
const alternative = parseStringArray(entry, entryPath, issues);
|
|
246
|
+
if (alternative === undefined) continue;
|
|
247
|
+
if (alternative.length === 0) {
|
|
248
|
+
issues.push({
|
|
249
|
+
path: entryPath,
|
|
250
|
+
message: "must include at least one environment variable",
|
|
251
|
+
});
|
|
252
|
+
continue;
|
|
253
|
+
}
|
|
254
|
+
parsed.push(alternative);
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
return parsed;
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
function validateRequiredEnvMembers(
|
|
261
|
+
requiredEnv: readonly string[],
|
|
262
|
+
env: readonly string[] | undefined,
|
|
263
|
+
path: string,
|
|
264
|
+
envPath: string,
|
|
265
|
+
issues: ProviderPackageMetadataIssue[],
|
|
266
|
+
): void {
|
|
267
|
+
const envSet = new Set(env ?? []);
|
|
268
|
+
for (const envVar of requiredEnv) {
|
|
269
|
+
if (!envSet.has(envVar)) {
|
|
270
|
+
issues.push({
|
|
271
|
+
path,
|
|
272
|
+
message: `${envVar} must also be listed in ${envPath}`,
|
|
273
|
+
});
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
|
|
189
278
|
function parseAppPorts(
|
|
190
279
|
value: unknown,
|
|
191
280
|
issues: ProviderPackageMetadataIssue[],
|
|
@@ -280,16 +369,40 @@ function parseVariants(
|
|
|
280
369
|
issues,
|
|
281
370
|
);
|
|
282
371
|
if (requiredEnv !== undefined) {
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
372
|
+
validateRequiredEnvMembers(
|
|
373
|
+
requiredEnv,
|
|
374
|
+
env,
|
|
375
|
+
`${entryPath}.requiredEnv`,
|
|
376
|
+
`${entryPath}.env`,
|
|
377
|
+
issues,
|
|
378
|
+
);
|
|
379
|
+
}
|
|
380
|
+
|
|
381
|
+
const requiredEnvAlternatives = parseStringArrayArray(
|
|
382
|
+
entry.requiredEnvAlternatives,
|
|
383
|
+
`${entryPath}.requiredEnvAlternatives`,
|
|
384
|
+
issues,
|
|
385
|
+
);
|
|
386
|
+
if (requiredEnvAlternatives !== undefined) {
|
|
387
|
+
for (const alternative of requiredEnvAlternatives) {
|
|
388
|
+
validateRequiredEnvMembers(
|
|
389
|
+
alternative,
|
|
390
|
+
env,
|
|
391
|
+
`${entryPath}.requiredEnvAlternatives`,
|
|
392
|
+
`${entryPath}.env`,
|
|
393
|
+
issues,
|
|
394
|
+
);
|
|
291
395
|
}
|
|
292
396
|
}
|
|
397
|
+
if (
|
|
398
|
+
entry.requiredEnv !== undefined &&
|
|
399
|
+
entry.requiredEnvAlternatives !== undefined
|
|
400
|
+
) {
|
|
401
|
+
issues.push({
|
|
402
|
+
path: `${entryPath}.requiredEnvAlternatives`,
|
|
403
|
+
message: `must not be set alongside ${entryPath}.requiredEnv`,
|
|
404
|
+
});
|
|
405
|
+
}
|
|
293
406
|
|
|
294
407
|
const requiredTables = parseStringArray(
|
|
295
408
|
entry.requiredTables,
|
|
@@ -308,6 +421,9 @@ function parseVariants(
|
|
|
308
421
|
if (displayName !== undefined) variant.displayName = displayName;
|
|
309
422
|
if (env !== undefined) variant.env = env;
|
|
310
423
|
if (requiredEnv !== undefined) variant.requiredEnv = requiredEnv;
|
|
424
|
+
if (requiredEnvAlternatives !== undefined) {
|
|
425
|
+
variant.requiredEnvAlternatives = requiredEnvAlternatives;
|
|
426
|
+
}
|
|
311
427
|
if (requiredTables !== undefined) variant.requiredTables = requiredTables;
|
|
312
428
|
if (registration !== undefined) variant.registration = registration;
|
|
313
429
|
parsed.push(variant);
|
package/src/server/context.ts
CHANGED
|
@@ -7,6 +7,7 @@ import type {
|
|
|
7
7
|
} from "../ports/index.js";
|
|
8
8
|
import type { TraceContext } from "../tracing/index.js";
|
|
9
9
|
import type { HttpRequestLike, MaybePromise } from "./http.js";
|
|
10
|
+
import type { TrustedRequestInfo } from "./trusted-proxy.js";
|
|
10
11
|
|
|
11
12
|
/**
|
|
12
13
|
* Arguments passed to the `context.request` factory after a route is matched.
|
|
@@ -16,6 +17,12 @@ export type RequestContextArgs<Ports extends AnyPorts = AnyPorts> = {
|
|
|
16
17
|
* Framework-neutral request.
|
|
17
18
|
*/
|
|
18
19
|
req: HttpRequestLike;
|
|
20
|
+
/**
|
|
21
|
+
* Request metadata resolved from the server's explicit trusted-proxy policy.
|
|
22
|
+
* Forwarding headers never affect this value unless
|
|
23
|
+
* `createServer({ trustedProxy })` opts into them.
|
|
24
|
+
*/
|
|
25
|
+
requestInfo: TrustedRequestInfo;
|
|
19
26
|
/**
|
|
20
27
|
* Final app ports, including ports contributed by providers.
|
|
21
28
|
*/
|