@ontemper/sdk 0.5.1 → 0.6.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/README.md +28 -4
- package/dist/As2.d.ts +158 -0
- package/dist/As2.d.ts.map +1 -0
- package/dist/As2.js +529 -0
- package/dist/As2.js.map +1 -0
- package/dist/As2Destination.d.ts +10 -0
- package/dist/As2Destination.d.ts.map +1 -0
- package/dist/As2Destination.js +63 -0
- package/dist/As2Destination.js.map +1 -0
- package/dist/As2Error.d.ts +19 -0
- package/dist/As2Error.d.ts.map +1 -0
- package/dist/As2Error.js +16 -0
- package/dist/As2Error.js.map +1 -0
- package/dist/As2Route.d.ts +13 -0
- package/dist/As2Route.d.ts.map +1 -0
- package/dist/As2Route.js +13 -0
- package/dist/As2Route.js.map +1 -0
- package/dist/As2Testing.d.ts +78 -0
- package/dist/As2Testing.d.ts.map +1 -0
- package/dist/As2Testing.js +355 -0
- package/dist/As2Testing.js.map +1 -0
- package/dist/As2Transport.d.ts +30 -0
- package/dist/As2Transport.d.ts.map +1 -0
- package/dist/As2Transport.js +88 -0
- package/dist/As2Transport.js.map +1 -0
- package/dist/As2Wire.d.ts +338 -0
- package/dist/As2Wire.d.ts.map +1 -0
- package/dist/As2Wire.js +202 -0
- package/dist/As2Wire.js.map +1 -0
- package/dist/HttpClient.d.ts +19 -0
- package/dist/HttpClient.d.ts.map +1 -1
- package/dist/HttpClient.js +10 -5
- package/dist/HttpClient.js.map +1 -1
- package/dist/Manifest.d.ts +1 -1
- package/dist/Manifest.js +1 -1
- package/dist/Middleware.d.ts.map +1 -1
- package/dist/Middleware.js +49 -14
- package/dist/Middleware.js.map +1 -1
- package/dist/Workflow.d.ts.map +1 -1
- package/dist/Workflow.js +15 -2
- package/dist/Workflow.js.map +1 -1
- 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/package.json +10 -2
package/dist/As2Wire.js
ADDED
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
import { Config, Effect, Option, Predicate, Redacted, Schema } from 'effect';
|
|
2
|
+
import { HttpClientError, HttpServerResponse } from 'effect/http';
|
|
3
|
+
import { As2Error } from './As2Error.js';
|
|
4
|
+
import { As2IdentityResource, As2PartnerResource } from './As2Resource.js';
|
|
5
|
+
import { registerSecrets } from './Redaction.js';
|
|
6
|
+
// Must stay in lockstep with AS2_HEADER_NAMES in apps/api/src/Platform/As2/Domain.ts; scripts/check-sdk-consistency.ts pins the sets.
|
|
7
|
+
export const AS2_HEADERS = new Set([
|
|
8
|
+
'as2-from',
|
|
9
|
+
'as2-to',
|
|
10
|
+
'as2-version',
|
|
11
|
+
'content-transfer-encoding',
|
|
12
|
+
'content-type',
|
|
13
|
+
'disposition-notification-options',
|
|
14
|
+
'disposition-notification-to',
|
|
15
|
+
'message-id',
|
|
16
|
+
'mime-version',
|
|
17
|
+
'receipt-delivery-option',
|
|
18
|
+
'subject',
|
|
19
|
+
]);
|
|
20
|
+
/** Inbound headers are untrusted and may carry credentials: only protocol headers reach the platform. */
|
|
21
|
+
export const protocolHeaders = (headers) => Object.fromEntries(Object.entries(headers).flatMap(([name, value]) => value !== undefined && AS2_HEADERS.has(name.toLowerCase()) ? [[name.toLowerCase(), value]] : []));
|
|
22
|
+
export const headerOf = (headers, name) => Object.entries(headers).find(([key]) => key.toLowerCase() === name)?.[1];
|
|
23
|
+
/** A partner's largest legitimate answer is a signed MDN of some KiB; a gateway that streams more fails the delivery. */
|
|
24
|
+
export const MAX_PARTNER_RESPONSE_BYTES = 8 * 1024 * 1024;
|
|
25
|
+
/** ENGINE_BUSY answers 503 before any work, so a bounded retry is safe; every AS2 call is idempotent. */
|
|
26
|
+
export const CAPACITY_RETRIES = 3;
|
|
27
|
+
export const CAPACITY_BACKOFF_MS = 500;
|
|
28
|
+
export const HeaderMap = Schema.Record(Schema.String, Schema.String);
|
|
29
|
+
export const MdnMode = Schema.Literals(['sync', 'async']);
|
|
30
|
+
export const ReceiveAnswer = Schema.Union([
|
|
31
|
+
Schema.Struct({
|
|
32
|
+
kind: Schema.Literal('received'),
|
|
33
|
+
messageId: Schema.String,
|
|
34
|
+
payloadB64: Schema.String,
|
|
35
|
+
payloadContentType: Schema.NullOr(Schema.String),
|
|
36
|
+
mic: Schema.String,
|
|
37
|
+
deliveryToken: Schema.String,
|
|
38
|
+
mdnMode: MdnMode,
|
|
39
|
+
customerTraceId: Schema.NullOr(Schema.String),
|
|
40
|
+
}),
|
|
41
|
+
Schema.Struct({
|
|
42
|
+
kind: Schema.Literal('duplicate'),
|
|
43
|
+
messageId: Schema.String,
|
|
44
|
+
mic: Schema.String,
|
|
45
|
+
mdnHeaders: Schema.NullOr(HeaderMap),
|
|
46
|
+
mdnBodyB64: Schema.NullOr(Schema.String),
|
|
47
|
+
mdnMode: MdnMode,
|
|
48
|
+
mdnDeliveryUrl: Schema.NullOr(Schema.String),
|
|
49
|
+
customerTraceId: Schema.NullOr(Schema.String),
|
|
50
|
+
}),
|
|
51
|
+
Schema.Struct({ kind: Schema.Literal('inFlight'), messageId: Schema.String }),
|
|
52
|
+
Schema.Struct({ kind: Schema.Literal('parked'), messageId: Schema.String }),
|
|
53
|
+
]);
|
|
54
|
+
export const AcknowledgeAnswer = Schema.Struct({
|
|
55
|
+
messageId: Schema.String,
|
|
56
|
+
mic: Schema.String,
|
|
57
|
+
mdnHeaders: Schema.NullOr(HeaderMap),
|
|
58
|
+
mdnBodyB64: Schema.NullOr(Schema.String),
|
|
59
|
+
mdnMode: MdnMode,
|
|
60
|
+
mdnDeliveryUrl: Schema.NullOr(Schema.String),
|
|
61
|
+
alreadyAcknowledged: Schema.Boolean,
|
|
62
|
+
customerTraceId: Schema.NullOr(Schema.String),
|
|
63
|
+
});
|
|
64
|
+
export const PackAnswer = Schema.Struct({
|
|
65
|
+
messageId: Schema.String,
|
|
66
|
+
as2Headers: HeaderMap,
|
|
67
|
+
envelopeBodyB64: Schema.String,
|
|
68
|
+
mic: Schema.String,
|
|
69
|
+
partnerUrl: Schema.NullOr(Schema.String),
|
|
70
|
+
mdnMode: Schema.Literals(['none', 'sync', 'async']),
|
|
71
|
+
replayed: Schema.Boolean,
|
|
72
|
+
customerTraceId: Schema.NullOr(Schema.String),
|
|
73
|
+
});
|
|
74
|
+
export const ConfirmAnswer = Schema.Struct({
|
|
75
|
+
outcome: Schema.Literals(['confirmed', 'failed']),
|
|
76
|
+
messageId: Schema.String,
|
|
77
|
+
disposition: Schema.NullOr(Schema.String),
|
|
78
|
+
receivedMic: Schema.NullOr(Schema.String),
|
|
79
|
+
packMic: Schema.NullOr(Schema.String),
|
|
80
|
+
micMatched: Schema.Boolean,
|
|
81
|
+
originatingTraceId: Schema.NullOr(Schema.String),
|
|
82
|
+
});
|
|
83
|
+
export const SettleAnswer = Schema.Struct({
|
|
84
|
+
outcome: Schema.Literal('confirmed'),
|
|
85
|
+
messageId: Schema.String,
|
|
86
|
+
customerTraceId: Schema.NullOr(Schema.String),
|
|
87
|
+
});
|
|
88
|
+
export const ErrorAnswer = Schema.Struct({
|
|
89
|
+
error: Schema.Struct({ code: Schema.String, message: Schema.String }),
|
|
90
|
+
});
|
|
91
|
+
export const Settings = Config.all({
|
|
92
|
+
apiUrl: Config.option(Config.String('UNNBOUND_API_URL')),
|
|
93
|
+
// Hosts other than Firecracker pass no Run token; their workflow token is in the environment.
|
|
94
|
+
envToken: Config.option(Config.Redacted('TEMPER_RUN_TOKEN')),
|
|
95
|
+
sandboxToken: Config.option(Config.Redacted('UNNBOUND_SANDBOX_JWT')),
|
|
96
|
+
workflowUrl: Config.option(Config.String('UNNBOUND_WORKFLOW_URL')),
|
|
97
|
+
});
|
|
98
|
+
export const present = (token) => Option.filter(token, (value) => Redacted.value(value).length > 0);
|
|
99
|
+
export const toBase64 = (bytes) => Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString('base64');
|
|
100
|
+
export const fromBase64 = (text) => new Uint8Array(Buffer.from(text, 'base64'));
|
|
101
|
+
export const bytesOf = (value) => Predicate.isString(value) ? new TextEncoder().encode(value) : value;
|
|
102
|
+
export const keyPairSecrets = (slots) => [
|
|
103
|
+
slots.privateKey,
|
|
104
|
+
slots.secondaryPrivateKey,
|
|
105
|
+
];
|
|
106
|
+
export const tlsSecrets = (tls) => [
|
|
107
|
+
tls?.clientKey,
|
|
108
|
+
tls?.clientKeyPassphrase,
|
|
109
|
+
];
|
|
110
|
+
/** Every secret field of the two records: the wire carries them in clear, so each becomes a log mask first. */
|
|
111
|
+
export const secretsOf = ({ partner, identity }) => [
|
|
112
|
+
...(identity.keys.mode === 'combined'
|
|
113
|
+
? keyPairSecrets(identity.keys)
|
|
114
|
+
: [...keyPairSecrets(identity.keys.signing), ...keyPairSecrets(identity.keys.encryption)]),
|
|
115
|
+
partner.httpAuth.type === 'basic' ? partner.httpAuth.password : undefined,
|
|
116
|
+
...tlsSecrets(partner.tls),
|
|
117
|
+
partner.proxy?.auth.type === 'basic' ? partner.proxy.auth.password : undefined,
|
|
118
|
+
...tlsSecrets(partner.proxy?.tls),
|
|
119
|
+
].flatMap((secret) => (secret === undefined ? [] : [Redacted.value(secret)]));
|
|
120
|
+
export const partiesOf = (operation, options) => Effect.gen(function* () {
|
|
121
|
+
const identity = options.identity ?? options.partner.identity;
|
|
122
|
+
// The decoded record always carries one; a hand-built value may not.
|
|
123
|
+
if (!Predicate.isObject(identity)) {
|
|
124
|
+
return yield* new As2Error({
|
|
125
|
+
operation,
|
|
126
|
+
code: 'NOT_CONFIGURED',
|
|
127
|
+
retryable: false,
|
|
128
|
+
message: 'An AS2 identity is required: pass one, or resolve a partner record that references one.',
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
return { partner: options.partner, identity };
|
|
132
|
+
});
|
|
133
|
+
/** The platform wants the partner without its inlined identity, and the identity beside it. */
|
|
134
|
+
export const wireParties = ({ partner, identity }) => Effect.gen(function* () {
|
|
135
|
+
yield* registerSecrets(secretsOf({ partner, identity }));
|
|
136
|
+
const { identity: _inlined, ...wirePartner } = Schema.encodeSync(As2PartnerResource)(partner);
|
|
137
|
+
return { partner: wirePartner, identity: Schema.encodeSync(As2IdentityResource)(identity) };
|
|
138
|
+
});
|
|
139
|
+
export const isHttpUrl = (value) => {
|
|
140
|
+
if (!URL.canParse(value))
|
|
141
|
+
return false;
|
|
142
|
+
const protocol = new URL(value).protocol;
|
|
143
|
+
return protocol === 'http:' || protocol === 'https:';
|
|
144
|
+
};
|
|
145
|
+
// Userinfo, query, and fragment can carry credentials, so they never reach a log line.
|
|
146
|
+
export const endpointOf = (url) => {
|
|
147
|
+
if (!isHttpUrl(url))
|
|
148
|
+
return {};
|
|
149
|
+
const parsed = new URL(url);
|
|
150
|
+
const scheme = parsed.protocol === 'https:' ? 'https' : 'http';
|
|
151
|
+
const port = parsed.port !== '' ? Number(parsed.port) : scheme === 'https' ? 443 : 80;
|
|
152
|
+
return { host: parsed.host, url: `${parsed.protocol}//${parsed.hostname}:${port}${parsed.pathname}`, scheme, port };
|
|
153
|
+
};
|
|
154
|
+
// A partner-chosen async-MDN URL can carry a credential in its path, so only its origin is logged.
|
|
155
|
+
export const originOf = (url) => {
|
|
156
|
+
const endpoint = endpointOf(url);
|
|
157
|
+
if (endpoint.scheme === undefined)
|
|
158
|
+
return {};
|
|
159
|
+
return { ...endpoint, url: `${endpoint.scheme}://${new URL(url).hostname}:${endpoint.port}` };
|
|
160
|
+
};
|
|
161
|
+
export const as2Line = (fields) => {
|
|
162
|
+
const as2 = {};
|
|
163
|
+
for (const [key, value] of Object.entries(fields))
|
|
164
|
+
if (value !== undefined)
|
|
165
|
+
as2[key] = value;
|
|
166
|
+
return { type: 'as2', as2 };
|
|
167
|
+
};
|
|
168
|
+
/** Answers each `As2Error` with the status a partner reads; every other failure passes through unchanged. */
|
|
169
|
+
export const answerAs2Failures = (effect) => Effect.catch(effect, (error) => error instanceof As2Error
|
|
170
|
+
? Effect.succeed(as2FailureResponse(error))
|
|
171
|
+
: // SAFETY: the instanceof check above took every As2Error out of this branch.
|
|
172
|
+
Effect.fail(error));
|
|
173
|
+
export const isEmptyBody = (error) => HttpClientError.isHttpClientError(error) && error.reason._tag === 'EmptyBodyError';
|
|
174
|
+
/** The outcome fields of a span's end line: none while it runs, else its outcome and, on failure, the error code. */
|
|
175
|
+
export const endOf = (outcome, success) => outcome === undefined
|
|
176
|
+
? {}
|
|
177
|
+
: outcome.error === undefined
|
|
178
|
+
? { outcome: success }
|
|
179
|
+
: { outcome: 'failed', errorCode: outcome.error instanceof As2Error ? outcome.error.code : 'UNKNOWN' };
|
|
180
|
+
/** A fetch error can quote the URL, so a failure keeps only a symbolic code from its cause chain. */
|
|
181
|
+
export const symbolicCause = (error) => {
|
|
182
|
+
let current = error;
|
|
183
|
+
for (let depth = 0; depth < 8 && current !== undefined; depth++) {
|
|
184
|
+
const code = Predicate.hasProperty(current, 'code') ? current.code : undefined;
|
|
185
|
+
if (Predicate.isString(code) && /^[A-Z][A-Z0-9_]*$/.test(code))
|
|
186
|
+
return code;
|
|
187
|
+
current = current.cause instanceof Error ? current.cause : undefined;
|
|
188
|
+
}
|
|
189
|
+
return 'unknown';
|
|
190
|
+
};
|
|
191
|
+
export const RETRYABLE_WIRE = [502, 503, 504];
|
|
192
|
+
export const PERMANENT_WIRE = [400, 413, 422];
|
|
193
|
+
/** Legacy `as2Endpoint`: a partner decides whether to resend from the status, so it gets the status and a generic message. */
|
|
194
|
+
export const as2FailureResponse = (error) => {
|
|
195
|
+
const status = error.status;
|
|
196
|
+
if (status !== undefined && RETRYABLE_WIRE.includes(status))
|
|
197
|
+
return HttpServerResponse.jsonUnsafe({ message: 'AS2 message could not be processed; retry later' }, { status });
|
|
198
|
+
if (status !== undefined && PERMANENT_WIRE.includes(status))
|
|
199
|
+
return HttpServerResponse.jsonUnsafe({ message: 'AS2 message was rejected and should not be resent' }, { status });
|
|
200
|
+
return HttpServerResponse.jsonUnsafe({ message: 'Internal server error' }, { status: 500 });
|
|
201
|
+
};
|
|
202
|
+
//# sourceMappingURL=As2Wire.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"As2Wire.js","sourceRoot":"","sources":["../src/As2Wire.ts"],"names":[],"mappings":"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"}
|
package/dist/HttpClient.d.ts
CHANGED
|
@@ -2,6 +2,25 @@ import { Layer } from 'effect';
|
|
|
2
2
|
import { HttpClient } from 'effect/http';
|
|
3
3
|
/** Sends one outbound request: the global `fetch` in production, a fake in tests. */
|
|
4
4
|
export type OutboundFetch = (url: URL, init: RequestInit) => Promise<Response>;
|
|
5
|
+
/** Bun's `fetch` connection options: TLS material for the destination and the proxy, and an HTTP CONNECT proxy. */
|
|
6
|
+
export interface BunTransport {
|
|
7
|
+
readonly tls?: {
|
|
8
|
+
readonly ca?: string | ReadonlyArray<string>;
|
|
9
|
+
readonly cert?: string;
|
|
10
|
+
readonly key?: string;
|
|
11
|
+
readonly passphrase?: string;
|
|
12
|
+
readonly serverName?: string;
|
|
13
|
+
};
|
|
14
|
+
readonly proxy?: {
|
|
15
|
+
readonly url: string;
|
|
16
|
+
readonly headers?: Readonly<Record<string, string>>;
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* What a caller sets through `FetchHttpClient.RequestInit`: the redirect mode, and on Bun the connection options.
|
|
21
|
+
* Another runtime's `fetch` ignores `tls` and `proxy`, so a caller that needs them checks the runtime first.
|
|
22
|
+
*/
|
|
23
|
+
export type OutboundInit = Pick<RequestInit, 'redirect'> & BunTransport;
|
|
5
24
|
/**
|
|
6
25
|
* The workflow's `HttpClient`: every call carries the request trace and logs legacy
|
|
7
26
|
* `Outgoing HTTP request` lines, unless `HttpClient.TracerDisabledWhen` holds for the request.
|
package/dist/HttpClient.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.d.ts","sourceRoot":"","sources":["../src/HttpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAC7E,OAAO,EAGL,UAAU,EAIX,MAAM,aAAa,CAAC;AAmBrB,qFAAqF;AACrF,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"HttpClient.d.ts","sourceRoot":"","sources":["../src/HttpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAC7E,OAAO,EAGL,UAAU,EAIX,MAAM,aAAa,CAAC;AAmBrB,qFAAqF;AACrF,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE/E,mHAAmH;AACnH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,CAAC,EAAE;QACb,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QAC7C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;KAC9B,CAAC;IACF,QAAQ,CAAC,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;KAAE,CAAC;CAChG;AAED;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG,YAAY,CAAC;AAkKxE;;;GAGG;AACH,eAAO,MAAM,eAAe,kBAAmB,aAAa,KAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAkD7F,CAAC"}
|
package/dist/HttpClient.js
CHANGED
|
@@ -31,16 +31,20 @@ const fetchBody = (body) => {
|
|
|
31
31
|
return Effect.succeed(undefined);
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
|
-
const send = (outboundFetch, request, url, signal,
|
|
34
|
+
const send = (outboundFetch, request, url, signal, outbound) => Effect.flatMap(fetchBody(request.body), (body) => {
|
|
35
35
|
// A stream body must be sent half-duplex.
|
|
36
36
|
const init = {
|
|
37
37
|
method: request.method,
|
|
38
38
|
headers: { ...request.headers },
|
|
39
39
|
body,
|
|
40
40
|
signal,
|
|
41
|
-
redirect,
|
|
41
|
+
redirect: outbound?.redirect,
|
|
42
42
|
duplex: body instanceof ReadableStream ? 'half' : undefined,
|
|
43
43
|
};
|
|
44
|
+
if (outbound?.tls !== undefined)
|
|
45
|
+
init.tls = outbound.tls;
|
|
46
|
+
if (outbound?.proxy !== undefined)
|
|
47
|
+
init.proxy = outbound.proxy;
|
|
44
48
|
return Effect.tryPromise({
|
|
45
49
|
try: () => outboundFetch(url, init),
|
|
46
50
|
catch: (cause) => new HttpClientError.HttpClientError({ reason: new HttpClientError.TransportError({ request, cause }) }),
|
|
@@ -136,9 +140,10 @@ const isBufferedBody = (response) => {
|
|
|
136
140
|
export const httpClientLayer = (outboundFetch) => Layer.mergeAll(Layer.succeed(HttpClient.HttpClient, HttpClient.make((request, url, signal, fiber) => {
|
|
137
141
|
// fetch sets the length of the body it sends, so the logged headers are the sent ones.
|
|
138
142
|
const traced = HttpClientRequest.removeHeader(withTrace(request, fiber.getRef(CurrentLogContext)), 'content-length');
|
|
139
|
-
// A caller sets the redirect mode
|
|
140
|
-
|
|
141
|
-
const
|
|
143
|
+
// A caller sets the redirect mode, and on Bun the connection options; the request owns every other option.
|
|
144
|
+
// SAFETY: `OutboundInit` only adds Bun's optional `tls` and `proxy` to the RequestInit the caller provided.
|
|
145
|
+
const outbound = Context.getOrUndefined(fiber.context, FetchHttpClient.RequestInit);
|
|
146
|
+
const exchange = send(outboundFetch, traced, url, signal, outbound);
|
|
142
147
|
if (fiber.getRef(HttpClient.TracerDisabledWhen)(traced)) {
|
|
143
148
|
return Effect.map(exchange, (response) => HttpClientResponse.fromWeb(traced, response));
|
|
144
149
|
}
|
package/dist/HttpClient.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../src/HttpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7E,OAAO,EACL,eAAe,EAEf,UAAU,EACV,eAAe,EACf,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAGL,sBAAsB,EACtB,cAAc,EACd,YAAY,EACZ,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EACL,iBAAiB,EAIjB,OAAO,EACP,YAAY,GACb,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../src/HttpClient.ts"],"names":[],"mappings":"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"}
|
package/dist/Manifest.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { HttpApi, type HttpApiGroup } from 'effect/http-api';
|
|
2
2
|
import { type WorkflowManifest } from './Contract/Manifest.js';
|
|
3
|
-
export declare const SDK_VERSION = "0.
|
|
3
|
+
export declare const SDK_VERSION = "0.6.0";
|
|
4
4
|
export declare const RUNTIME_API_VERSION = 1;
|
|
5
5
|
/** The route the SDK serves for platform probes; an API declaring `GET` on it collides with it on every request. */
|
|
6
6
|
export declare const HEALTHCHECK_PATH = "/healthcheck";
|
package/dist/Manifest.js
CHANGED
|
@@ -5,7 +5,7 @@ import { declarationOf } from './Resource.js';
|
|
|
5
5
|
import { Trigger } from './Trigger.js';
|
|
6
6
|
const decodeTrigger = Schema.decodeUnknownSync(TriggerMetadata, { onExcessProperty: 'error' });
|
|
7
7
|
const identityOf = (resource) => `${resource.kind}:${resource.kind === 'resourceType' ? resource.type : resource.key}`;
|
|
8
|
-
export const SDK_VERSION = '0.
|
|
8
|
+
export const SDK_VERSION = '0.6.0';
|
|
9
9
|
export const RUNTIME_API_VERSION = 1;
|
|
10
10
|
/** The route the SDK serves for platform probes; an API declaring `GET` on it collides with it on every request. */
|
|
11
11
|
export const HEALTHCHECK_PATH = '/healthcheck';
|
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,EAAW,UAAU,EAA0D,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../src/Middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,UAAU,EAA0D,MAAM,aAAa,CAAC;AAU1G,4GAA4G;AAC5G,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,4BAA4B,CAAC;IAC5C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AA+bD,uFAAuF;AACvF,eAAO,MAAM,sBAAsB,mDAE5B,CAAC;AAER,sIAAsI;AACtI,eAAO,MAAM,0BAA0B,mEAMtC,CAAC"}
|
package/dist/Middleware.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Cause, Clock, Context, Duration, Effect, Exit, Option, Predicate, Schema } from 'effect';
|
|
2
2
|
import { Headers, HttpRouter, HttpServerError, HttpServerRequest, HttpServerResponse } from 'effect/http';
|
|
3
3
|
import { recordAnswerFailure } from './Answer.js';
|
|
4
|
+
import { As2RouteKeys } from './As2Route.js';
|
|
4
5
|
import { bodyOf, formDataFields, safeJsonParse } from './HttpPayload.js';
|
|
5
6
|
import { Invocation } from './Invocation.js';
|
|
6
7
|
import { CurrentLogContext, logSpan, TRACE_HEADER } from './LogContext.js';
|
|
@@ -88,10 +89,34 @@ const loggedBodyOf = (bytes, contentType) => {
|
|
|
88
89
|
return Effect.succeed(safeJsonParse(decoder.decode(bytes)));
|
|
89
90
|
return Effect.succeed({});
|
|
90
91
|
};
|
|
91
|
-
|
|
92
|
-
const
|
|
92
|
+
// Legacy `as2Endpoint` (sdk/events/src/lib/utils.ts:236-258): an AS2 request logs only these headers' values.
|
|
93
|
+
const AS2_LOGGED_HEADERS = new Set([
|
|
94
|
+
'as2-from',
|
|
95
|
+
'as2-to',
|
|
96
|
+
'as2-version',
|
|
97
|
+
'content-length',
|
|
98
|
+
'content-transfer-encoding',
|
|
99
|
+
'content-type',
|
|
100
|
+
'date',
|
|
101
|
+
'disposition-notification-options',
|
|
102
|
+
'disposition-notification-to',
|
|
103
|
+
'message-id',
|
|
104
|
+
'mime-version',
|
|
105
|
+
'x-message-id',
|
|
106
|
+
'x-unnbound-trace-id',
|
|
107
|
+
]);
|
|
108
|
+
/** `Receipt-Delivery-Option` and `Subject` are partner input that can carry credentials or business data. */
|
|
109
|
+
const as2Headers = (headers) => Object.fromEntries(Object.entries(headers).map(([name, value]) => [
|
|
110
|
+
name,
|
|
111
|
+
AS2_LOGGED_HEADERS.has(name.toLowerCase()) ? value : '[redacted]',
|
|
112
|
+
]));
|
|
113
|
+
/**
|
|
114
|
+
* unnbound-events 2.0 `buildIncomingPayload` before a response exists (sdk/events/src/lib/utils.ts:278-306). An
|
|
115
|
+
* AS2 Run logs as legacy `as2Endpoint`: allowlisted header values, no query, and no body, which is an envelope.
|
|
116
|
+
*/
|
|
117
|
+
const incomingOf = (request, params, as2) => {
|
|
93
118
|
const source = request.source;
|
|
94
|
-
const body = source instanceof Request
|
|
119
|
+
const body = !as2 && source instanceof Request
|
|
95
120
|
? Effect.flatMap(readBody(source, request.headers['content-length']), (bytes) => loggedBodyOf(bytes, headerOf(request.headers, 'content-type') ?? ''))
|
|
96
121
|
: Effect.succeed(undefined);
|
|
97
122
|
return Effect.map(body, (body) => {
|
|
@@ -118,6 +143,8 @@ const incomingOf = (request, params) => {
|
|
|
118
143
|
const query = {};
|
|
119
144
|
for (const [key, value] of url.searchParams)
|
|
120
145
|
query[key] ??= value;
|
|
146
|
+
if (as2)
|
|
147
|
+
url.search = '';
|
|
121
148
|
const ip = headerOf(request.headers, 'cf-connecting-ip') ??
|
|
122
149
|
headerOf(request.headers, 'x-forwarded-for') ??
|
|
123
150
|
headerOf(request.headers, 'x-real-ip');
|
|
@@ -127,12 +154,12 @@ const incomingOf = (request, params) => {
|
|
|
127
154
|
http: {
|
|
128
155
|
url: url.toString(),
|
|
129
156
|
method: request.method.toLowerCase(),
|
|
130
|
-
query,
|
|
157
|
+
query: as2 ? undefined : query,
|
|
131
158
|
params,
|
|
132
159
|
// Legacy `normalizeIp`: an IPv4-mapped IPv6 address logs as IPv4.
|
|
133
160
|
ip: ip?.startsWith('::ffff:') ? ip.slice(7) : ip,
|
|
134
161
|
incoming: true,
|
|
135
|
-
request: { headers: { ...request.headers }, body },
|
|
162
|
+
request: { headers: as2 ? as2Headers(request.headers) : { ...request.headers }, body },
|
|
136
163
|
},
|
|
137
164
|
};
|
|
138
165
|
});
|
|
@@ -142,9 +169,10 @@ const incomingOf = (request, params) => {
|
|
|
142
169
|
* (sdk/events/src/lib/utils.ts:238-260); 204, 205, and 304 log no body. Effect derives
|
|
143
170
|
* `content-type` and `content-length` from the body, so those are not declared.
|
|
144
171
|
*/
|
|
145
|
-
const responseOf = ({ body, headers, status }) => {
|
|
146
|
-
const logged = status === 204 || status === 205 || status === 304 ? undefined : bodyOf(body);
|
|
147
|
-
const
|
|
172
|
+
const responseOf = ({ body, headers, status }, as2) => {
|
|
173
|
+
const logged = status === 204 || status === 205 || status === 304 || as2 ? undefined : bodyOf(body);
|
|
174
|
+
const removed = { ...Headers.removeMany(headers, ['content-type', 'content-length']) };
|
|
175
|
+
const declared = as2 ? as2Headers(removed) : removed;
|
|
148
176
|
if (!Predicate.isTruthy(logged))
|
|
149
177
|
return { status, headers: declared, body: undefined };
|
|
150
178
|
const contentType = headerOf(headers, 'content-type');
|
|
@@ -255,11 +283,18 @@ const serveEventRequest = (handler) => Effect.withFiber((fiber) => {
|
|
|
255
283
|
const run = unmatched
|
|
256
284
|
? Effect.fail(new HttpServerError.HttpServerError({ reason: new HttpServerError.RouteNotFound({ request }) }))
|
|
257
285
|
: handler;
|
|
286
|
+
// A partner chooses an AS2 request's headers, so its Run starts on a fresh trace; the AS2 client binds the
|
|
287
|
+
// verified exchange trace after the platform checks the message (legacy `as2Endpoint`).
|
|
288
|
+
const route = Context.getOrUndefined(fiber.context, HttpRouter.RouteContext)?.route;
|
|
289
|
+
const as2 = invocation.triggerKind === 'as2' ||
|
|
290
|
+
(route !== undefined && fiber.getRef(As2RouteKeys).has(`${route.method} ${String(route.path)}`));
|
|
258
291
|
// An empty trace header counts as absent (`||`), an empty message id as present (`??`), as in legacy.
|
|
259
|
-
const traceId =
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
292
|
+
const traceId = as2
|
|
293
|
+
? crypto.randomUUID()
|
|
294
|
+
: (headerOf(request.headers, TRACE_HEADER) ??
|
|
295
|
+
traceIdOf(headerOf(request.headers, 'traceparent')) ??
|
|
296
|
+
traceIdOf(headerOf(request.headers, 'x-traceparent')) ??
|
|
297
|
+
crypto.randomUUID());
|
|
263
298
|
const inboundMessageId = request.headers[MESSAGE_HEADER];
|
|
264
299
|
const messageId = inboundMessageId ?? crypto.randomUUID();
|
|
265
300
|
// Legacy echoed both ids only when both were non-empty.
|
|
@@ -274,7 +309,7 @@ const serveEventRequest = (handler) => Effect.withFiber((fiber) => {
|
|
|
274
309
|
? Effect.succeed(outcome.response)
|
|
275
310
|
: Effect.logError(outcome.failure.message, { err: outcome.failure.error }).pipe(Effect.provideService(CurrentLogContext, undefined), Effect.as(outcome.response));
|
|
276
311
|
return Effect.gen(function* () {
|
|
277
|
-
const incoming = yield* incomingOf(request, unmatched ? {} : routeParams).pipe(withDeadline(invocation));
|
|
312
|
+
const incoming = yield* incomingOf(request, unmatched ? {} : routeParams, as2).pipe(withDeadline(invocation));
|
|
278
313
|
const outcome = yield* run.pipe(withDeadline(invocation), Effect.matchCauseEffect({
|
|
279
314
|
onFailure: failureOutcome,
|
|
280
315
|
onSuccess: (response) => Effect.succeed({ response }),
|
|
@@ -297,7 +332,7 @@ const serveEventRequest = (handler) => Effect.withFiber((fiber) => {
|
|
|
297
332
|
}
|
|
298
333
|
return Exit.isFailure(exit)
|
|
299
334
|
? incoming
|
|
300
|
-
: { ...incoming, http: { ...incoming.http, response: responseOf(exit.value.response) } };
|
|
335
|
+
: { ...incoming, http: { ...incoming.http, response: responseOf(exit.value.response, as2) } };
|
|
301
336
|
},
|
|
302
337
|
failure: (exit) => {
|
|
303
338
|
if (Exit.isFailure(exit))
|
package/dist/Middleware.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Middleware.js","sourceRoot":"","sources":["../src/Middleware.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Middleware.js","sourceRoot":"","sources":["../src/Middleware.ts"],"names":[],"mappings":"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"}
|
package/dist/Workflow.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Workflow.d.ts","sourceRoot":"","sources":["../src/Workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,cAAc,EAAuB,KAAK,
|
|
1
|
+
{"version":3,"file":"Workflow.d.ts","sourceRoot":"","sources":["../src/Workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,cAAc,EAAuB,KAAK,EAAgB,MAAM,QAAQ,CAAC;AACzF,OAAO,EAAQ,KAAK,UAAU,EAAgB,UAAU,EAAkC,MAAM,aAAa,CAAC;AAC9G,OAAO,EAAE,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAmB,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C,OAAO,EAAE,KAAK,cAAc,EAAmC,MAAM,eAAe,CAAC;AACrF,OAAO,EAAoB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAkB9E,yFAAyF;AACzF,MAAM,WAAW,gBAAgB;IAC/B,oFAAoF;IACpF,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACzD,wEAAwE;IACxE,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,cAAc,GAAG,SAAS,CAAC;IACpE,yFAAyF;IACzF,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACnD,iFAAiF;IACjF,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC;IACzC,oFAAoF;IACpF,QAAQ,CAAC,SAAS,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;CACjD;AAED,MAAM,WAAW,cAAc,CAAC,GAAG,SAAS,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU;IACjF,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpF,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,iFAAiF;IACjF,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,cAAc,CAAC,GAAG,CAAC,CAAC;CAC5E;AAED,MAAM,WAAW,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,MAAM,SAAS,YAAY,CAAC,UAAU,CAAE,SAAQ,gBAAgB;IAClH,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC1C,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAC5B,YAAY,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,CAAC,EAClC,KAAK,EACL,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,UAAU,CAAC,UAAU,GAAG,cAAc,CACzF,CAAC;CACH;AAqED,eAAO,MAAM,QAAQ,GAAI,EAAE,SAAS,MAAM,EAAE,MAAM,SAAS,YAAY,CAAC,UAAU,WACvE,eAAe,CAAC,EAAE,EAAE,MAAM,CAAC,KACnC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAsC5C,CAAC"}
|
package/dist/Workflow.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { Clock, ConfigProvider, Context, FileSystem, Layer, Path } from 'effect';
|
|
1
|
+
import { Clock, ConfigProvider, Context, FileSystem, Layer, Option, Path } from 'effect';
|
|
2
2
|
import { Etag, HttpPlatform, HttpRouter, HttpServer, HttpServerResponse } from 'effect/http';
|
|
3
3
|
import { HttpApi, HttpApiBuilder } from 'effect/http-api';
|
|
4
4
|
import { serveEarly } from './Answer.js';
|
|
5
|
+
import { As2Route, As2RouteKeys } from './As2Route.js';
|
|
5
6
|
import { httpClientLayer } from './HttpClient.js';
|
|
6
7
|
import { Invocation } from './Invocation.js';
|
|
7
8
|
import { loggerLayer, writeStdoutLine } from './Logger.js';
|
|
@@ -51,10 +52,22 @@ const declarationsOf = (api, platform) => {
|
|
|
51
52
|
});
|
|
52
53
|
return Layer.mergeAll(Layer.empty, ...layers.values()).pipe(Layer.provide(platform.resources === undefined ? RuntimeResources.layer : Layer.succeed(RuntimeResources, platform.resources)));
|
|
53
54
|
};
|
|
55
|
+
/** `<METHOD> <path>` of each endpoint marked `As2Route`, as the router matches it. */
|
|
56
|
+
const as2RouteKeysOf = (api) => {
|
|
57
|
+
const keys = new Set();
|
|
58
|
+
HttpApi.reflect(api, {
|
|
59
|
+
onGroup() { },
|
|
60
|
+
onEndpoint({ endpoint }) {
|
|
61
|
+
if (Option.getOrElse(Context.getOption(endpoint.annotations, As2Route), () => false))
|
|
62
|
+
keys.add(`${endpoint.method} ${endpoint.path}`);
|
|
63
|
+
},
|
|
64
|
+
});
|
|
65
|
+
return keys;
|
|
66
|
+
};
|
|
54
67
|
export const workflow = (options) => {
|
|
55
68
|
const manifest = makeManifest(options.api);
|
|
56
69
|
const handlers = options.handlers.pipe(Layer.provide(declarationsOf(options.api, options)));
|
|
57
|
-
const appLayer = Layer.mergeAll(PlatformRoutes, HttpApiBuilder.layer(options.api).pipe(Layer.provide(handlers), Layer.provide(EventRequestMiddleware)), UnmatchedRequestMiddleware).pipe(Layer.provide(HttpServer.layerServices), Layer.provide(InMemoryHttpPlatform), Layer.provideMerge(platformLayer(options)));
|
|
70
|
+
const appLayer = Layer.mergeAll(PlatformRoutes, HttpApiBuilder.layer(options.api).pipe(Layer.provide(handlers), Layer.provide(EventRequestMiddleware)), UnmatchedRequestMiddleware).pipe(Layer.provide(HttpServer.layerServices), Layer.provide(InMemoryHttpPlatform), Layer.provideMerge(platformLayer(options)), Layer.provideMerge(Layer.succeed(As2RouteKeys, as2RouteKeysOf(options.api))));
|
|
58
71
|
// Legacy Hono routing: exact case, no trailing- or duplicate-slash folding, unbounded parameters.
|
|
59
72
|
const web = HttpRouter.toWebHandler(appLayer, {
|
|
60
73
|
disableLogger: true,
|