rehydra 0.12.0 → 0.14.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 +37 -1
- package/dist/browser.d.ts +1 -1
- package/dist/browser.d.ts.map +1 -1
- package/dist/browser.js +1 -1
- package/dist/browser.js.map +1 -1
- package/dist/cli/commands/anonymize.d.ts.map +1 -1
- package/dist/cli/commands/anonymize.js.map +1 -1
- package/dist/cli/commands/proxy.d.ts.map +1 -1
- package/dist/cli/commands/proxy.js +39 -3
- package/dist/cli/commands/proxy.js.map +1 -1
- package/dist/cli/main.js +1 -1
- package/dist/cli/utils/color.d.ts.map +1 -1
- package/dist/cli/utils/color.js +1 -0
- package/dist/cli/utils/color.js.map +1 -1
- package/dist/core/anonymizer.d.ts.map +1 -1
- package/dist/core/anonymizer.js +4 -1
- package/dist/core/anonymizer.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/opencode-plugin/git-identity.d.ts +3 -0
- package/dist/opencode-plugin/git-identity.d.ts.map +1 -0
- package/dist/opencode-plugin/git-identity.js +37 -0
- package/dist/opencode-plugin/git-identity.js.map +1 -0
- package/dist/opencode-plugin/github-username.d.ts +3 -0
- package/dist/opencode-plugin/github-username.d.ts.map +1 -0
- package/dist/opencode-plugin/github-username.js +41 -0
- package/dist/opencode-plugin/github-username.js.map +1 -0
- package/dist/opencode-plugin/identity-recognizer.d.ts +5 -0
- package/dist/opencode-plugin/identity-recognizer.d.ts.map +1 -0
- package/dist/opencode-plugin/identity-recognizer.js +21 -0
- package/dist/opencode-plugin/identity-recognizer.js.map +1 -0
- package/dist/opencode-plugin/plugin.d.ts.map +1 -1
- package/dist/opencode-plugin/plugin.js +92 -5
- package/dist/opencode-plugin/plugin.js.map +1 -1
- package/dist/opencode-plugin/types.d.ts +4 -1
- package/dist/opencode-plugin/types.d.ts.map +1 -1
- package/dist/opencode-plugin/vcs-command.d.ts +3 -0
- package/dist/opencode-plugin/vcs-command.d.ts.map +1 -0
- package/dist/opencode-plugin/vcs-command.js +34 -0
- package/dist/opencode-plugin/vcs-command.js.map +1 -0
- package/dist/pipeline/tagger.d.ts +6 -6
- package/dist/pipeline/tagger.d.ts.map +1 -1
- package/dist/pipeline/tagger.js +32 -11
- package/dist/pipeline/tagger.js.map +1 -1
- package/dist/pipeline/validator.d.ts.map +1 -1
- package/dist/pipeline/validator.js +8 -1
- package/dist/pipeline/validator.js.map +1 -1
- package/dist/proxy/index.d.ts +1 -1
- package/dist/proxy/index.d.ts.map +1 -1
- package/dist/proxy/index.js.map +1 -1
- package/dist/proxy/providers/anthropic.d.ts +1 -0
- package/dist/proxy/providers/anthropic.d.ts.map +1 -1
- package/dist/proxy/providers/anthropic.js +2 -4
- package/dist/proxy/providers/anthropic.js.map +1 -1
- package/dist/proxy/providers/openai.d.ts +1 -0
- package/dist/proxy/providers/openai.d.ts.map +1 -1
- package/dist/proxy/providers/openai.js +3 -4
- package/dist/proxy/providers/openai.js.map +1 -1
- package/dist/proxy/providers/streaming-tool-loop.d.ts +12 -0
- package/dist/proxy/providers/streaming-tool-loop.d.ts.map +1 -0
- package/dist/proxy/providers/streaming-tool-loop.js +223 -0
- package/dist/proxy/providers/streaming-tool-loop.js.map +1 -0
- package/dist/proxy/providers/types.d.ts +3 -0
- package/dist/proxy/providers/types.d.ts.map +1 -1
- package/dist/proxy/providers/types.js +0 -4
- package/dist/proxy/providers/types.js.map +1 -1
- package/dist/proxy/rehydra-fetch.d.ts.map +1 -1
- package/dist/proxy/rehydra-fetch.js +68 -6
- package/dist/proxy/rehydra-fetch.js.map +1 -1
- package/dist/proxy/rehydra-proxy.d.ts.map +1 -1
- package/dist/proxy/rehydra-proxy.js +46 -0
- package/dist/proxy/rehydra-proxy.js.map +1 -1
- package/dist/proxy/tool-loop-stream.d.ts +7 -0
- package/dist/proxy/tool-loop-stream.d.ts.map +1 -0
- package/dist/proxy/tool-loop-stream.js +65 -0
- package/dist/proxy/tool-loop-stream.js.map +1 -0
- package/dist/proxy/types.d.ts +20 -2
- package/dist/proxy/types.d.ts.map +1 -1
- package/dist/recognizers/address.d.ts +2 -0
- package/dist/recognizers/address.d.ts.map +1 -0
- package/dist/recognizers/address.js +23 -0
- package/dist/recognizers/address.js.map +1 -0
- package/dist/recognizers/index.d.ts +2 -0
- package/dist/recognizers/index.d.ts.map +1 -1
- package/dist/recognizers/index.js +6 -0
- package/dist/recognizers/index.js.map +1 -1
- package/dist/recognizers/postal-code.d.ts +16 -0
- package/dist/recognizers/postal-code.d.ts.map +1 -0
- package/dist/recognizers/postal-code.js +42 -0
- package/dist/recognizers/postal-code.js.map +1 -0
- package/dist/types/index.d.ts +15 -3
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +2 -0
- package/dist/types/index.js.map +1 -1
- package/dist/types/pii-types.d.ts +2 -0
- package/dist/types/pii-types.d.ts.map +1 -1
- package/dist/types/pii-types.js +7 -0
- package/dist/types/pii-types.js.map +1 -1
- package/dist/utils/storage-node.d.ts +1 -0
- package/dist/utils/storage-node.d.ts.map +1 -1
- package/dist/utils/storage-node.js +22 -0
- package/dist/utils/storage-node.js.map +1 -1
- package/dist/utils/storage.d.ts +3 -0
- package/dist/utils/storage.d.ts.map +1 -1
- package/dist/utils/storage.js.map +1 -1
- package/package.json +4 -1
|
@@ -11,6 +11,7 @@ import { SSEParser, isSSEDone, serializeSSEEvent } from "./sse-parser.js";
|
|
|
11
11
|
import { detectProvider } from "./providers/index.js";
|
|
12
12
|
import { buildPIISystemInstruction } from "./system-instruction.js";
|
|
13
13
|
import { buildTagPrefix } from "../utils/regex.js";
|
|
14
|
+
import { accumulateToolStream, readToolResponse, toolResultStream } from "./tool-loop-stream.js";
|
|
14
15
|
import { DEFAULT_TAG_FORMAT } from "../types/index.js";
|
|
15
16
|
/** Headers to strip from proxied responses — the body is decompressed and may be modified. */
|
|
16
17
|
const STRIP_RESPONSE_HEADERS = ["content-encoding", "content-length"];
|
|
@@ -74,6 +75,14 @@ function errorResponse(status, message) {
|
|
|
74
75
|
* ```
|
|
75
76
|
*/
|
|
76
77
|
export function createRehydraFetch(config) {
|
|
78
|
+
if (config.maxToolRounds !== undefined &&
|
|
79
|
+
(!Number.isSafeInteger(config.maxToolRounds) || config.maxToolRounds < 0)) {
|
|
80
|
+
throw new Error("maxToolRounds must be a nonnegative safe integer");
|
|
81
|
+
}
|
|
82
|
+
if (config.maxToolResponseBytes !== undefined &&
|
|
83
|
+
(!Number.isSafeInteger(config.maxToolResponseBytes) || config.maxToolResponseBytes <= 0)) {
|
|
84
|
+
throw new Error("maxToolResponseBytes must be a positive safe integer");
|
|
85
|
+
}
|
|
77
86
|
const anonymizer = createAnonymizer({
|
|
78
87
|
...config.anonymizer,
|
|
79
88
|
keyProvider: config.keyProvider,
|
|
@@ -174,6 +183,8 @@ export function createRehydraFetch(config) {
|
|
|
174
183
|
const msg = err instanceof Error ? err.message : "Upstream request failed";
|
|
175
184
|
return errorResponse(502, `Upstream LLM unreachable: ${msg}`);
|
|
176
185
|
}
|
|
186
|
+
if (!response.ok)
|
|
187
|
+
return response;
|
|
177
188
|
// Determine if the response is a streaming SSE response
|
|
178
189
|
const responseContentType = response.headers.get("content-type");
|
|
179
190
|
const isSSE = handleStreaming &&
|
|
@@ -181,6 +192,11 @@ export function createRehydraFetch(config) {
|
|
|
181
192
|
responseContentType !== null &&
|
|
182
193
|
responseContentType.includes("text/event-stream");
|
|
183
194
|
if (isSSE && response.body !== null) {
|
|
195
|
+
if (config.onToolCall !== undefined && provider.streamingToolLoop !== undefined &&
|
|
196
|
+
provider.hasResponseToolCalls !== undefined && provider.extractResponseToolCallInfo !== undefined &&
|
|
197
|
+
provider.extractMessages !== undefined && provider.buildToolLoopBody !== undefined && response.ok) {
|
|
198
|
+
return await handleStreamingToolLoop(response, anonymizedBody, session, provider, config, request);
|
|
199
|
+
}
|
|
184
200
|
return rehydrateSSEResponse(response, session, provider, config);
|
|
185
201
|
}
|
|
186
202
|
// Tool execution loop: when onToolCall is configured and provider
|
|
@@ -195,11 +211,48 @@ export function createRehydraFetch(config) {
|
|
|
195
211
|
return rehydrateJSONResponse(response, session, provider);
|
|
196
212
|
}
|
|
197
213
|
catch (err) {
|
|
214
|
+
if (request.signal.aborted)
|
|
215
|
+
throw err;
|
|
198
216
|
const msg = err instanceof Error ? err.message : "Internal proxy error";
|
|
199
217
|
return errorResponse(500, msg);
|
|
200
218
|
}
|
|
201
219
|
};
|
|
202
220
|
}
|
|
221
|
+
/** Buffer and validate the first stream before allowing any tool side effects. */
|
|
222
|
+
async function handleStreamingToolLoop(response, anonymizedBody, session, provider, config, request) {
|
|
223
|
+
const adapter = provider.streamingToolLoop;
|
|
224
|
+
let text;
|
|
225
|
+
let complete;
|
|
226
|
+
try {
|
|
227
|
+
text = await readToolResponse(response, config.maxToolResponseBytes ?? 8 * 1024 * 1024, request.signal);
|
|
228
|
+
complete = accumulateToolStream(text, adapter);
|
|
229
|
+
}
|
|
230
|
+
catch (err) {
|
|
231
|
+
if (request.signal.aborted)
|
|
232
|
+
throw err;
|
|
233
|
+
return errorResponse(502, err instanceof Error ? err.message : "Invalid streamed tool response");
|
|
234
|
+
}
|
|
235
|
+
if (!provider.hasResponseToolCalls(complete)) {
|
|
236
|
+
return rehydrateSSEResponse(new Response(text, {
|
|
237
|
+
status: response.status, headers: stripResponseHeaders(response.headers),
|
|
238
|
+
}), session, provider, config);
|
|
239
|
+
}
|
|
240
|
+
const headers = stripResponseHeaders(response.headers);
|
|
241
|
+
headers.set("content-type", "application/json");
|
|
242
|
+
const finalResponse = await handleToolLoop(new Response(JSON.stringify(complete), {
|
|
243
|
+
status: response.status, headers,
|
|
244
|
+
}), anonymizedBody, session, provider, config, request);
|
|
245
|
+
if (!finalResponse.ok)
|
|
246
|
+
return finalResponse;
|
|
247
|
+
let finalBody;
|
|
248
|
+
try {
|
|
249
|
+
finalBody = await finalResponse.json();
|
|
250
|
+
}
|
|
251
|
+
catch {
|
|
252
|
+
return errorResponse(502, "Invalid JSON in tool-loop response");
|
|
253
|
+
}
|
|
254
|
+
return toolResultStream(finalBody, finalResponse, adapter);
|
|
255
|
+
}
|
|
203
256
|
/**
|
|
204
257
|
* Rehydrate a non-streaming JSON response.
|
|
205
258
|
*/
|
|
@@ -266,7 +319,8 @@ async function rehydrateJSONResponseFromBody(body, response, session, provider)
|
|
|
266
319
|
async function handleToolLoop(initialResponse, anonymizedBody, session, provider, config, originalRequest) {
|
|
267
320
|
const maxRounds = config.maxToolRounds ?? 10;
|
|
268
321
|
// Parse the initial response
|
|
269
|
-
const
|
|
322
|
+
const readResponse = (response) => readToolResponse(response, config.maxToolResponseBytes ?? 8 * 1024 * 1024, originalRequest.signal);
|
|
323
|
+
const rawText = await readResponse(initialResponse);
|
|
270
324
|
let currentResponse;
|
|
271
325
|
try {
|
|
272
326
|
currentResponse = JSON.parse(rawText);
|
|
@@ -295,18 +349,21 @@ async function handleToolLoop(initialResponse, anonymizedBody, session, provider
|
|
|
295
349
|
const toolResults = [];
|
|
296
350
|
for (const tc of toolCallInfos) {
|
|
297
351
|
// Rehydrate the arguments string to restore real PII
|
|
298
|
-
|
|
352
|
+
originalRequest.signal.throwIfAborted();
|
|
299
353
|
let parsedArgs;
|
|
300
354
|
try {
|
|
301
|
-
|
|
355
|
+
const args = JSON.parse(tc.arguments);
|
|
356
|
+
parsedArgs = await session.rehydrateJson(args);
|
|
302
357
|
}
|
|
303
358
|
catch {
|
|
304
|
-
parsedArgs = { raw:
|
|
359
|
+
parsedArgs = { raw: await session.rehydrate(tc.arguments) };
|
|
305
360
|
}
|
|
361
|
+
originalRequest.signal.throwIfAborted();
|
|
306
362
|
// Call the user's tool handler with real PII
|
|
307
363
|
const result = await config.onToolCall(tc.name, parsedArgs, tc.id);
|
|
308
364
|
// Anonymize the result using the same session (maintains PII ID continuity)
|
|
309
|
-
|
|
365
|
+
originalRequest.signal.throwIfAborted();
|
|
366
|
+
const anonymizedResult = await session.anonymizeJson(result, config.locale, config.policy);
|
|
310
367
|
toolResults.push({
|
|
311
368
|
toolCallId: tc.id,
|
|
312
369
|
content: typeof anonymizedResult === "string"
|
|
@@ -357,7 +414,12 @@ async function handleToolLoop(initialResponse, anonymizedBody, session, provider
|
|
|
357
414
|
}
|
|
358
415
|
lastUpstreamResponse = nextResponse;
|
|
359
416
|
// Parse the new response
|
|
360
|
-
const nextRawText = await nextResponse
|
|
417
|
+
const nextRawText = await readResponse(nextResponse);
|
|
418
|
+
if (!nextResponse.ok)
|
|
419
|
+
return new Response(nextRawText, {
|
|
420
|
+
status: nextResponse.status, statusText: nextResponse.statusText,
|
|
421
|
+
headers: stripResponseHeaders(nextResponse.headers),
|
|
422
|
+
});
|
|
361
423
|
try {
|
|
362
424
|
currentResponse = JSON.parse(nextRawText);
|
|
363
425
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rehydra-fetch.js","sourceRoot":"","sources":["../../src/proxy/rehydra-fetch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rehydra-fetch.js","sourceRoot":"","sources":["../../src/proxy/rehydra-fetch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACjG,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,8FAA8F;AAC9F,MAAM,sBAAsB,GAAG,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;AAEtE,SAAS,oBAAoB,CAAC,OAAgB;IAC5C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,KAAK,MAAM,CAAC,IAAI,sBAAsB,EAAE,CAAC;QACvC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,SAAS,2BAA2B,CAAC,IAAY,EAAE,SAAiB;IAClE,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/C,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,IAAI,cAAc,GAAG,CAAC,CAAC;AAEvB,SAAS,mBAAmB;IAC1B,OAAO,iBAAiB,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;AAC3D,CAAC;AAED,SAAS,aAAa,CAAC,MAAc,EAAE,OAAe;IACpD,OAAO,IAAI,QAAQ,CACjB,IAAI,CAAC,SAAS,CAAC;QACb,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,qBAAqB,EAAE;KAChD,CAAC,EACF;QACE,MAAM;QACN,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;KAChD,CACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAA0B;IAE1B,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS;QACpC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,MAAM,CAAC,aAAa,GAAG,CAAC,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,MAAM,CAAC,oBAAoB,KAAK,SAAS;QAC3C,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,MAAM,CAAC,oBAAoB,IAAI,CAAC,CAAC,EAAE,CAAC;QAC3F,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,UAAU,GAAG,gBAAgB,CAAC;QAClC,GAAG,MAAM,CAAC,UAAU;QACpB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;KAC9C,CAAC,CAAC;IACH,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,EAAE,SAAS,IAAI,kBAAkB,CAAC;IAErE,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,mBAAmB,CAAC;IAChE,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,KAAK,KAAK,CAAC;IAEzD,KAAK,UAAU,iBAAiB;QAC9B,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;YAC9B,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC;IACH,CAAC;IAED,OAAO,KAAK,EACV,KAAwB,EACxB,IAAkB,EACC,EAAE;QACrB,IAAI,CAAC;YACH,MAAM,iBAAiB,EAAE,CAAC;QAC5B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,WAAW,GAAG,KAAK,CAAC,CAAC,8BAA8B;YACnD,MAAM,GAAG,GACP,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC;YAC/D,OAAO,aAAa,CAAC,GAAG,EAAE,4BAA4B,GAAG,EAAE,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEzC,gEAAgE;QAChE,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,WAAW,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACtE,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QAED,0BAA0B;QAC1B,MAAM,QAAQ,GAAG,cAAc,CAC7B,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,OAAO,EACf,MAAM,CAAC,QAAQ,CAChB,CAAC;QAEF,qBAAqB;QACrB,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,aAAa,CAAC,GAAG,EAAE,8BAA8B,CAAC,CAAC;QAC5D,CAAC;QAED,yCAAyC;QACzC,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;QAE9C,oCAAoC;QACpC,MAAM,OAAO,GAAG,IAAI,qBAAqB,CACvC,UAAU,EACV,SAAS,EACT,MAAM,CAAC,kBAAkB,EACzB,MAAM,CAAC,WAAW,CACnB,CAAC;QAEF,IAAI,CAAC;YACH,8CAA8C;YAC9C,MAAM,KAAK,GAAG,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAChD,MAAM,eAAe,GAAa,EAAE,CAAC;YACrC,IAAI,WAAW,GAAG,KAAK,CAAC;YACxB,MAAM,YAAY,GAA2B,EAAE,CAAC;YAChD,IAAI,aAAa,GAAG,CAAC,CAAC;YAEtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CACpC,KAAK,CAAC,CAAC,CAAE,EACT,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,MAAM,CACd,CAAC;gBACF,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;gBAC5C,IAAI,MAAM,CAAC,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvC,WAAW,GAAG,IAAI,CAAC;gBACrB,CAAC;gBACD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;oBACtE,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;wBACd,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC;wBACvD,aAAa,IAAI,KAAK,CAAC;oBACzB,CAAC;gBACH,CAAC;YACH,CAAC;YAED,qEAAqE;YACrE,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;gBACrC,MAAM,CAAC,WAAW,CAAC;oBACjB,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,YAAY;oBACZ,aAAa;iBACd,CAAC,CAAC;YACL,CAAC;YAED,gDAAgD;YAChD,IAAI,cAAc,GAAG,QAAQ,CAAC,kBAAkB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YAExE,yEAAyE;YACzE,qFAAqF;YACrF,IACE,WAAW;gBACX,MAAM,CAAC,iBAAiB,KAAK,KAAK;gBAClC,QAAQ,CAAC,uBAAuB,KAAK,SAAS,EAC9C,CAAC;gBACD,MAAM,WAAW,GACf,OAAO,MAAM,CAAC,iBAAiB,KAAK,QAAQ;oBAC1C,CAAC,CAAC,MAAM,CAAC,iBAAiB;oBAC1B,CAAC,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;gBAC3C,cAAc,GAAG,QAAQ,CAAC,uBAAuB,CAC/C,cAAc,EACd,WAAW,CACZ,CAAC;YACJ,CAAC;YAED,iCAAiC;YACjC,MAAM,eAAe,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE;gBAC3C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;aACrC,CAAC,CAAC;YAEH,IAAI,QAAkB,CAAC;YACvB,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,CAAC;YAC1C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,GAAG,GACP,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAC;gBACjE,OAAO,aAAa,CAAC,GAAG,EAAE,6BAA6B,GAAG,EAAE,CAAC,CAAC;YAChE,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC,EAAE;gBAAE,OAAO,QAAQ,CAAC;YAElC,wDAAwD;YACxD,MAAM,mBAAmB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACjE,MAAM,KAAK,GACT,eAAe;gBACf,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC;gBACjC,mBAAmB,KAAK,IAAI;gBAC5B,mBAAmB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;YAEpD,IAAI,KAAK,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBACpC,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,IAAI,QAAQ,CAAC,iBAAiB,KAAK,SAAS;oBAC7E,QAAQ,CAAC,oBAAoB,KAAK,SAAS,IAAI,QAAQ,CAAC,2BAA2B,KAAK,SAAS;oBACjG,QAAQ,CAAC,eAAe,KAAK,SAAS,IAAI,QAAQ,CAAC,iBAAiB,KAAK,SAAS,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;oBACpG,OAAO,MAAM,uBAAuB,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;gBACrG,CAAC;gBACD,OAAO,oBAAoB,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YACnE,CAAC;YAED,kEAAkE;YAClE,sEAAsE;YACtE,IACE,MAAM,CAAC,UAAU,KAAK,SAAS;gBAC/B,QAAQ,CAAC,oBAAoB,KAAK,SAAS;gBAC3C,QAAQ,CAAC,2BAA2B,KAAK,SAAS;gBAClD,QAAQ,CAAC,eAAe,KAAK,SAAS;gBACtC,QAAQ,CAAC,iBAAiB,KAAK,SAAS,EACxC,CAAC;gBACD,OAAO,MAAM,cAAc,CACzB,QAAQ,EACR,cAAc,EACd,OAAO,EACP,QAAQ,EACR,MAAM,EACN,OAAO,CACR,CAAC;YACJ,CAAC;YAED,OAAO,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO;gBAAE,MAAM,GAAG,CAAC;YACtC,MAAM,GAAG,GACP,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC;YAC9D,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,kFAAkF;AAClF,KAAK,UAAU,uBAAuB,CACpC,QAAkB,EAClB,cAAuB,EACvB,OAA8B,EAC9B,QAA4B,EAC5B,MAA0B,EAC1B,OAAgB;IAEhB,MAAM,OAAO,GAAG,QAAQ,CAAC,iBAAkB,CAAC;IAC5C,IAAI,IAAY,CAAC;IACjB,IAAI,QAAiB,CAAC;IACtB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,oBAAoB,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACxG,QAAQ,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,GAAG,CAAC;QACtC,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC;IACnG,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,oBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9C,OAAO,oBAAoB,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC7C,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC;SACzE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;QAChF,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO;KACjC,CAAC,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,IAAI,CAAC,aAAa,CAAC,EAAE;QAAE,OAAO,aAAa,CAAC;IAC5C,IAAI,SAAkB,CAAC;IACvB,IAAI,CAAC;QACH,SAAS,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,aAAa,CAAC,GAAG,EAAE,oCAAoC,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,gBAAgB,CAAC,SAAS,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,qBAAqB,CAClC,QAAkB,EAClB,OAA8B,EAC9B,QAA4B;IAE5B,gEAAgE;IAChE,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACtC,IAAI,IAAa,CAAC;IAClB,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,0DAA0D;QAC1D,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE;YAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,OAAO,EAAE,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC;SAChD,CAAC,CAAC;IACL,CAAC;IAED,OAAO,6BAA6B,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC1E,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,6BAA6B,CAC1C,IAAa,EACb,QAAkB,EAClB,OAA8B,EAC9B,QAA4B;IAE5B,sCAAsC;IACtC,MAAM,aAAa,GAAG,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,eAAe,GAAa,EAAE,CAAC;IAErC,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACjD,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,wBAAwB;IACxB,IAAI,cAAc,GAAG,QAAQ,CAAC,mBAAmB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAEzE,gCAAgC;IAChC,IACE,QAAQ,CAAC,wBAAwB,KAAK,SAAS;QAC/C,QAAQ,CAAC,wBAAwB,KAAK,SAAS,EAC/C,CAAC;QACD,MAAM,YAAY,GAAG,QAAQ,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;QACvE,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,cAAc,GAAa,EAAE,CAAC;YACpC,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;gBAC/B,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBAChD,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC;YACD,cAAc,GAAG,QAAQ,CAAC,wBAAwB,CAChD,cAAc,EACd,cAAc,CACf,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE;QAClD,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;KAC1B,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;GAUG;AACH,KAAK,UAAU,cAAc,CAC3B,eAAyB,EACzB,cAAuB,EACvB,OAA8B,EAC9B,QAA4B,EAC5B,MAA0B,EAC1B,eAAwB;IAExB,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,IAAI,EAAE,CAAC;IAE7C,6BAA6B;IAC7B,MAAM,YAAY,GAAG,CAAC,QAAkB,EAAmB,EAAE,CAC3D,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,oBAAoB,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IACrG,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,CAAC;IACpD,IAAI,eAAwB,CAAC;IAC7B,IAAI,CAAC;QACH,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE;YAC3B,MAAM,EAAE,eAAe,CAAC,MAAM;YAC9B,UAAU,EAAE,eAAe,CAAC,UAAU;YACtC,OAAO,EAAE,oBAAoB,CAAC,eAAe,CAAC,OAAO,CAAC;SACvD,CAAC,CAAC;IACL,CAAC;IAED,yEAAyE;IACzE,IAAI,CAAC,QAAQ,CAAC,oBAAqB,CAAC,eAAe,CAAC,EAAE,CAAC;QACrD,OAAO,6BAA6B,CAClC,eAAe,EACf,eAAe,EACf,OAAO,EACP,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,oDAAoD;IACpD,IAAI,eAAe,GAAG,QAAQ,CAAC,eAAgB,CAAC,cAAc,CAAC,CAAC;IAChE,IAAI,oBAAoB,GAAG,eAAe,CAAC;IAC3C,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,OACE,KAAK,GAAG,SAAS;QACjB,QAAQ,CAAC,oBAAqB,CAAC,eAAe,CAAC,EAC/C,CAAC;QACD,KAAK,EAAE,CAAC;QAER,qEAAqE;QACrE,MAAM,aAAa,GACjB,QAAQ,CAAC,2BAA4B,CAAC,eAAe,CAAC,CAAC;QAEzD,qDAAqD;QACrD,MAAM,WAAW,GAAwB,EAAE,CAAC;QAC5C,KAAK,MAAM,EAAE,IAAI,aAAa,EAAE,CAAC;YAC/B,qDAAqD;YACrD,eAAe,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YACxC,IAAI,UAAmC,CAAC;YACxC,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAA4B,CAAC;gBACjE,UAAU,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACjD,CAAC;YAAC,MAAM,CAAC;gBACP,UAAU,GAAG,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9D,CAAC;YACD,eAAe,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YAExC,6CAA6C;YAC7C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAW,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YAEpE,4EAA4E;YAC5E,eAAe,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YACxC,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YAE3F,WAAW,CAAC,IAAI,CAAC;gBACf,UAAU,EAAE,EAAE,CAAC,EAAE;gBACjB,OAAO,EACL,OAAO,gBAAgB,KAAK,QAAQ;oBAClC,CAAC,CAAC,gBAAgB;oBAClB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC;aACvC,CAAC,CAAC;QACL,CAAC;QAED,kEAAkE;QAClE,iEAAiE;QACjE,oDAAoD;QACpD,IAAI,iBAAiB,GAAG,eAAe,CAAC;QACxC,IACE,QAAQ,CAAC,wBAAwB,KAAK,SAAS;YAC/C,QAAQ,CAAC,wBAAwB,KAAK,SAAS,EAC/C,CAAC;YACD,MAAM,OAAO,GAAG,QAAQ,CAAC,wBAAwB,CAAC,eAAe,CAAC,CAAC;YACnE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,cAAc,GAAa,EAAE,CAAC;gBACpC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;oBAC1B,IAAI,MAAe,CAAC;oBACpB,IAAI,CAAC;wBACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAC3B,CAAC;oBAAC,MAAM,CAAC;wBACP,MAAM,GAAG,GAAG,CAAC;oBACf,CAAC;oBACD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;oBACvD,cAAc,CAAC,IAAI,CACjB,OAAO,UAAU,KAAK,QAAQ;wBAC5B,CAAC,CAAC,UAAU;wBACZ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAC/B,CAAC;gBACJ,CAAC;gBACD,iBAAiB,GAAG,QAAQ,CAAC,wBAAwB,CACnD,eAAe,EACf,cAAc,CACf,CAAC;YACJ,CAAC;QACH,CAAC;QAED,sFAAsF;QACtF,MAAM,QAAQ,GAAG,QAAQ,CAAC,iBAAkB,CAC1C,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,WAAW,CACZ,CAAC;QAEF,sCAAsC;QACtC,eAAe,GAAG,QAAQ,CAAC,eAAgB,CAAC,QAAQ,CAAC,CAAC;QAEtD,mCAAmC;QACnC,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,eAAe,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;SAC/B,CAAC,CAAC;QAEH,IAAI,YAAsB,CAAC;QAC3B,IAAI,CAAC;YACH,YAAY,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,GAAG,GACP,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAC;YACjE,OAAO,aAAa,CAAC,GAAG,EAAE,6BAA6B,GAAG,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,oBAAoB,GAAG,YAAY,CAAC;QAEpC,yBAAyB;QACzB,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY,CAAC,EAAE;YAAE,OAAO,IAAI,QAAQ,CAAC,WAAW,EAAE;gBACrD,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC,UAAU;gBAChE,OAAO,EAAE,oBAAoB,CAAC,YAAY,CAAC,OAAO,CAAC;aACpD,CAAC,CAAC;QACH,IAAI,CAAC;YACH,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC5C,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,QAAQ,CAAC,WAAW,EAAE;gBAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,UAAU,EAAE,YAAY,CAAC,UAAU;gBACnC,OAAO,EAAE,oBAAoB,CAAC,YAAY,CAAC,OAAO,CAAC;aACpD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,0CAA0C;IAC1C,OAAO,6BAA6B,CAClC,eAAe,EACf,oBAAoB,EACpB,OAAO,EACP,QAAQ,CACT,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,oBAAoB,CAC3B,QAAkB,EAClB,OAA8B,EAC9B,QAA4B,EAC5B,MAA0B;IAE1B,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;IAClC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,EAAE,SAAS,IAAI,kBAAkB,CAAC;IACrE,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAE5C,gEAAgE;IAChE,IAAI,SAAS,GAAG,EAAE,CAAC;IAEnB,qDAAqD;IACrD,MAAM,eAAe,GAAG,IAAI,GAAG,EAAkB,CAAC;IAClD,0EAA0E;IAC1E,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAG9B,CAAC;IAEJ,mCAAmC;IACnC,IAAI,aAAa,GAA8B,IAAI,CAAC;IAEpD,SAAS,SAAS;QAChB,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YAC3B,aAAa,GAAG,CAAC,KAAK,IAAwB,EAAE;gBAC9C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACvE,IAAI,MAAM,KAAK,IAAI;oBAAE,OAAO,IAAI,GAAG,EAAE,CAAC;gBACtC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;gBAC9C,OAAO,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC3C,CAAC,CAAC,EAAE,CAAC;QACP,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,eAAe,CAAyB;QAClE,KAAK,CAAC,SAAS,CACb,KAAiB,EACjB,UAAwD;YAExD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YACrD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAErC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC1B,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC7D,SAAS;gBACX,CAAC;gBAED,IAAI,MAAe,CAAC;gBACpB,IAAI,CAAC;oBACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClC,CAAC;gBAAC,MAAM,CAAC;oBACP,gCAAgC;oBAChC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC7D,SAAS;gBACX,CAAC;gBAED,8DAA8D;gBAC9D,gEAAgE;gBAChE,wEAAwE;gBACxE,IAAI,OAAO,GAAG,KAAK,CAAC;gBACpB,IAAI,WAAW,GAAY,MAAM,CAAC;gBAElC,gBAAgB;gBAChB,MAAM,KAAK,GAAG,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;gBAC/C,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBACnB,OAAO,GAAG,IAAI,CAAC;oBACf,MAAM,QAAQ,GAAG,SAAS,GAAG,KAAK,CAAC;oBACnC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;oBACzD,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBAE3D,IAAI,eAAuB,CAAC;oBAC5B,IACE,gBAAgB,KAAK,CAAC,CAAC;wBACvB,CAAC,YAAY,KAAK,CAAC,CAAC,IAAI,YAAY,GAAG,gBAAgB,CAAC,EACxD,CAAC;wBACD,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;wBACtD,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;oBAC/C,CAAC;yBAAM,CAAC;wBACN,MAAM,UAAU,GAAG,2BAA2B,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;wBACpE,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;wBAClE,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;oBAC3D,CAAC;oBAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC/B,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;wBACjC,MAAM,UAAU,GAAG,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;wBACxE,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;oBAClE,CAAC;gBACH,CAAC;gBAED,mBAAmB;gBACnB,IAAI,QAAQ,CAAC,wBAAwB,KAAK,SAAS,IAAI,QAAQ,CAAC,wBAAwB,KAAK,SAAS,EAAE,CAAC;oBACvG,MAAM,UAAU,GAAG,QAAQ,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;oBAC7D,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACjD,OAAO,GAAG,IAAI,CAAC;wBACf,MAAM,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAC;wBAEjD,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;4BAC5B,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE;gCAC9B,QAAQ,EAAE,KAAK,CAAC,KAAK;gCACrB,MAAM;6BACP,CAAC,CAAC;4BACH,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;4BACrD,MAAM,QAAQ,GAAG,QAAQ,GAAG,EAAE,CAAC,SAAS,CAAC;4BAEzC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;4BACzD,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;4BAE3D,IAAI,eAAuB,CAAC;4BAC5B,IACE,gBAAgB,KAAK,CAAC,CAAC;gCACvB,CAAC,YAAY,KAAK,CAAC,CAAC,IAAI,YAAY,GAAG,gBAAgB,CAAC,EACxD,CAAC;gCACD,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;gCACtD,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;4BAClE,CAAC;iCAAM,CAAC;gCACN,MAAM,UAAU,GAAG,2BAA2B,CAC5C,QAAQ,EACR,SAAS,CACV,CAAC;gCACF,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;gCAClE,eAAe,CAAC,GAAG,CACjB,EAAE,CAAC,KAAK,EACR,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,CAC7C,CAAC;4BACJ,CAAC;4BAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gCAC/B,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;gCACjC,MAAM,UAAU,GAAG,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;gCACxE,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;4BAC3C,CAAC;wBACH,CAAC;wBAED,IAAI,cAAc,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;4BAC5B,WAAW,GAAG,QAAQ,CAAC,wBAAwB,CAC7C,WAAW,EACX,cAAc,CACf,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,IAAI,OAAO,EAAE,CAAC;oBACZ,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;wBAC3B,UAAU,CAAC,OAAO,CAChB,OAAO,CAAC,MAAM,CACZ,iBAAiB,CAAC;4BAChB,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;yBAClC,CAAC,CACH,CACF,CAAC;oBACJ,CAAC;oBACD,SAAS;gBACX,CAAC;gBAED,kEAAkE;gBAClE,IACE,QAAQ,CAAC,sBAAsB,KAAK,SAAS;oBAC7C,QAAQ,CAAC,wBAAwB,KAAK,SAAS,EAC/C,CAAC;oBACD,MAAM,SAAS,GAAG,QAAQ,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;oBAC1D,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;wBACvB,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;wBACpD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACtB,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;4BACjC,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;4BAC/D,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gCAC1B,MAAM,IAAI,GAAG,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gCAC9C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oCACvB,MAAM,OAAO,GAAG,QAAQ,CAAC,wBAAwB,CAC/C,IAAI,CAAC,MAAM,EACX,IAAI,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CACnC,CAAC;oCACF,UAAU,CAAC,OAAO,CAChB,OAAO,CAAC,MAAM,CACZ,iBAAiB,CAAC;wCAChB,KAAK,EAAE,IAAI,CAAC,QAAQ;wCACpB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;qCAC9B,CAAC,CACH,CACF,CAAC;gCACJ,CAAC;4BACH,CAAC;4BACD,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;4BAClC,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;wBACtC,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,qBAAqB;gBACrB,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;QAED,KAAK,CAAC,KAAK,CACT,UAAwD;YAExD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;YACjC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC/D,CAAC;YAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;gBACjC,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;gBAClE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC1B,UAAU,CAAC,OAAO,CAChB,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,MAAM,CAAC,CACvE,CAAC;gBACJ,CAAC;gBACD,SAAS,GAAG,EAAE,CAAC;YACjB,CAAC;YAED,oCAAoC;YACpC,IACE,QAAQ,CAAC,wBAAwB,KAAK,SAAS,EAC/C,CAAC;gBACD,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC;oBAC9C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACtB,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;wBACjC,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;wBAC/D,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAC1B,MAAM,IAAI,GAAG,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;4BAC1C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gCACvB,MAAM,OAAO,GAAG,QAAQ,CAAC,wBAAwB,CAC/C,IAAI,CAAC,MAAM,EACX,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAC/B,CAAC;gCACF,UAAU,CAAC,OAAO,CAChB,OAAO,CAAC,MAAM,CACZ,iBAAiB,CAAC;oCAChB,KAAK,EAAE,IAAI,CAAC,QAAQ;oCACpB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;iCAC9B,CAAC,CACH,CACF,CAAC;4BACJ,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,eAAe,CAAC,KAAK,EAAE,CAAC;gBACxB,iBAAiB,CAAC,KAAK,EAAE,CAAC;YAC5B,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAK,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IAEpE,OAAO,IAAI,QAAQ,CAAC,eAAe,EAAE;QACnC,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;KAC1B,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rehydra-proxy.d.ts","sourceRoot":"","sources":["../../src/proxy/rehydra-proxy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAYrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,kBAAkB,GACzB,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"rehydra-proxy.d.ts","sourceRoot":"","sources":["../../src/proxy/rehydra-proxy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAYrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,kBAAkB,GACzB,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CA0FzC"}
|
|
@@ -48,8 +48,13 @@ const DEFAULT_FORWARD_HEADERS = [
|
|
|
48
48
|
export function createRehydraProxy(config) {
|
|
49
49
|
const forwardHeaders = config.forwardHeaders ?? DEFAULT_FORWARD_HEADERS;
|
|
50
50
|
const upstream = config.upstream.replace(/\/$/, ""); // Remove trailing slash
|
|
51
|
+
// Base path of the upstream, used only for overlap detection. Invalid upstream URL will throw at fetch time
|
|
52
|
+
const upstreamPathname = tryGetPathname(upstream);
|
|
53
|
+
const upstreamPathSegments = upstreamPathname.split("/").filter(Boolean);
|
|
51
54
|
// Create the underlying Rehydra fetch wrapper
|
|
52
55
|
const rehydraFetch = createRehydraFetch(config);
|
|
56
|
+
// Skip the per-request overlap check when there is no listener or upstream path segments
|
|
57
|
+
const shouldCheckPathOverlap = config.onPathOverlapWarning !== undefined && upstreamPathSegments.length > 0;
|
|
53
58
|
return async (request) => {
|
|
54
59
|
// Build upstream URL
|
|
55
60
|
const requestUrl = new URL(request.url);
|
|
@@ -62,6 +67,25 @@ export function createRehydraProxy(config) {
|
|
|
62
67
|
}
|
|
63
68
|
}
|
|
64
69
|
const upstreamUrl = upstream + pathname + requestUrl.search;
|
|
70
|
+
// Detect overlapping path and warn
|
|
71
|
+
if (shouldCheckPathOverlap) {
|
|
72
|
+
const requestPathSegments = pathname.split("/").filter(Boolean);
|
|
73
|
+
const overlappingSegments = findPathSegmentOverlap(upstreamPathSegments, requestPathSegments);
|
|
74
|
+
if (overlappingSegments.length > 0) {
|
|
75
|
+
try {
|
|
76
|
+
const result = config.onPathOverlapWarning?.({
|
|
77
|
+
upstreamBaseUrl: upstream,
|
|
78
|
+
overlappingSegments,
|
|
79
|
+
});
|
|
80
|
+
void Promise.resolve(result).catch(() => {
|
|
81
|
+
// Async callback failures must not interrupt proxying.
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
// Synchronous callback failures must not interrupt proxying.
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
65
89
|
// Filter headers to forward
|
|
66
90
|
const headers = new Headers();
|
|
67
91
|
for (const name of forwardHeaders) {
|
|
@@ -101,4 +125,26 @@ export function createRehydraProxy(config) {
|
|
|
101
125
|
});
|
|
102
126
|
};
|
|
103
127
|
}
|
|
128
|
+
// Returns the URL's pathname, or an empty string if invalid
|
|
129
|
+
function tryGetPathname(url) {
|
|
130
|
+
try {
|
|
131
|
+
return new URL(url).pathname;
|
|
132
|
+
}
|
|
133
|
+
catch {
|
|
134
|
+
return "";
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
// Finds the overlapping path segments between the upstream and request paths.
|
|
138
|
+
function findPathSegmentOverlap(upstreamSegments, requestSegments) {
|
|
139
|
+
const maxOverlapLength = Math.min(upstreamSegments.length, requestSegments.length);
|
|
140
|
+
for (let length = maxOverlapLength; length > 0; length--) {
|
|
141
|
+
const upstreamSuffix = upstreamSegments.slice(-length);
|
|
142
|
+
const requestPrefix = requestSegments.slice(0, length);
|
|
143
|
+
const matches = upstreamSuffix.every((segment, index) => segment === requestPrefix[index]);
|
|
144
|
+
if (matches) {
|
|
145
|
+
return upstreamSuffix;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
return [];
|
|
149
|
+
}
|
|
104
150
|
//# sourceMappingURL=rehydra-proxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rehydra-proxy.js","sourceRoot":"","sources":["../../src/proxy/rehydra-proxy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAGxD,MAAM,uBAAuB,GAAG;IAC9B,eAAe;IACf,cAAc;IACd,WAAW;IACX,mBAAmB;IACnB,gBAAgB;IAChB,qBAAqB;IACrB,gBAAgB;CACjB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAA0B;IAE1B,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,uBAAuB,CAAC;IACxE,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,wBAAwB;
|
|
1
|
+
{"version":3,"file":"rehydra-proxy.js","sourceRoot":"","sources":["../../src/proxy/rehydra-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { StreamingToolLoopAdapter } from './providers/streaming-tool-loop.js';
|
|
2
|
+
/** Buffer one response with a byte limit and cancellation, including incomplete SSE events. */
|
|
3
|
+
export declare function readToolResponse(response: Response, limit: number, signal: AbortSignal): Promise<string>;
|
|
4
|
+
export declare function accumulateToolStream(text: string, adapter: StreamingToolLoopAdapter): unknown;
|
|
5
|
+
/** Generate frames on demand so downstream consumption controls backpressure. */
|
|
6
|
+
export declare function toolResultStream(body: unknown, response: Response, adapter: StreamingToolLoopAdapter): Response;
|
|
7
|
+
//# sourceMappingURL=tool-loop-stream.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-loop-stream.d.ts","sourceRoot":"","sources":["../../src/proxy/tool-loop-stream.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAEnF,+FAA+F;AAC/F,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CA2B9G;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAQ7F;AAED,iFAAiF;AACjF,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,wBAAwB,GAAG,QAAQ,CAe/G"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { SSEParser, isSSEDone, serializeSSEEvent } from './sse-parser.js';
|
|
2
|
+
/** Buffer one response with a byte limit and cancellation, including incomplete SSE events. */
|
|
3
|
+
export async function readToolResponse(response, limit, signal) {
|
|
4
|
+
signal.throwIfAborted();
|
|
5
|
+
if (response.body === null)
|
|
6
|
+
return '';
|
|
7
|
+
const reader = response.body.getReader();
|
|
8
|
+
const decoder = new TextDecoder();
|
|
9
|
+
let bytes = 0;
|
|
10
|
+
let text = '';
|
|
11
|
+
const cancel = () => { void reader.cancel().catch(() => { }); };
|
|
12
|
+
signal.addEventListener('abort', cancel, { once: true });
|
|
13
|
+
try {
|
|
14
|
+
for (;;) {
|
|
15
|
+
signal.throwIfAborted();
|
|
16
|
+
const { value, done } = await reader.read();
|
|
17
|
+
signal.throwIfAborted();
|
|
18
|
+
if (done)
|
|
19
|
+
break;
|
|
20
|
+
bytes += value.byteLength;
|
|
21
|
+
if (bytes > limit)
|
|
22
|
+
throw new Error('Tool response exceeds maxToolResponseBytes');
|
|
23
|
+
text += decoder.decode(value, { stream: true });
|
|
24
|
+
}
|
|
25
|
+
return text + decoder.decode();
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
cancel();
|
|
29
|
+
throw error;
|
|
30
|
+
}
|
|
31
|
+
finally {
|
|
32
|
+
signal.removeEventListener('abort', cancel);
|
|
33
|
+
reader.releaseLock();
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
export function accumulateToolStream(text, adapter) {
|
|
37
|
+
const parser = new SSEParser();
|
|
38
|
+
const accumulator = adapter.createAccumulator();
|
|
39
|
+
for (const event of [...parser.parse(text), ...parser.flush()]) {
|
|
40
|
+
if (isSSEDone(event.data))
|
|
41
|
+
continue;
|
|
42
|
+
accumulator.push(JSON.parse(event.data));
|
|
43
|
+
}
|
|
44
|
+
return accumulator.finish();
|
|
45
|
+
}
|
|
46
|
+
/** Generate frames on demand so downstream consumption controls backpressure. */
|
|
47
|
+
export function toolResultStream(body, response, adapter) {
|
|
48
|
+
const frames = adapter.encode(body)[Symbol.iterator]();
|
|
49
|
+
const encoder = new TextEncoder();
|
|
50
|
+
const headers = new Headers(response.headers);
|
|
51
|
+
headers.delete('content-length');
|
|
52
|
+
headers.delete('content-encoding');
|
|
53
|
+
headers.set('content-type', 'text/event-stream');
|
|
54
|
+
return new Response(new ReadableStream({
|
|
55
|
+
pull(controller) {
|
|
56
|
+
const next = frames.next();
|
|
57
|
+
if (next.done === true)
|
|
58
|
+
controller.close();
|
|
59
|
+
else
|
|
60
|
+
controller.enqueue(encoder.encode(serializeSSEEvent(next.value)));
|
|
61
|
+
},
|
|
62
|
+
cancel() { frames.return?.(); },
|
|
63
|
+
}), { status: response.status, statusText: response.statusText, headers });
|
|
64
|
+
}
|
|
65
|
+
//# sourceMappingURL=tool-loop-stream.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-loop-stream.js","sourceRoot":"","sources":["../../src/proxy/tool-loop-stream.ts"],"names":[],"mappings":"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"}
|
package/dist/proxy/types.d.ts
CHANGED
|
@@ -69,7 +69,7 @@ export interface RehydraFetchConfig {
|
|
|
69
69
|
systemInstruction?: string | false;
|
|
70
70
|
/**
|
|
71
71
|
* Callback for executing tool calls in an agentic loop.
|
|
72
|
-
* When provided and the LLM returns tool calls
|
|
72
|
+
* When provided and the LLM returns tool calls, the proxy will:
|
|
73
73
|
* 1. Rehydrate tool call arguments (restore real PII)
|
|
74
74
|
* 2. Call this callback for each tool call
|
|
75
75
|
* 3. Anonymize the return value
|
|
@@ -77,7 +77,9 @@ export interface RehydraFetchConfig {
|
|
|
77
77
|
* 5. Repeat until the LLM returns a final response (no tool calls)
|
|
78
78
|
*
|
|
79
79
|
* The callback receives real PII values — it runs on your server, not the LLM.
|
|
80
|
-
*
|
|
80
|
+
* OpenAI and Anthropic streaming responses are buffered before tools run.
|
|
81
|
+
* Later rounds use JSON; the final result is emitted as provider-compatible SSE.
|
|
82
|
+
* Single-completion requests only. Cancellation prevents further tool calls.
|
|
81
83
|
*/
|
|
82
84
|
onToolCall?: OnToolCallFn;
|
|
83
85
|
/**
|
|
@@ -86,6 +88,8 @@ export interface RehydraFetchConfig {
|
|
|
86
88
|
* @default 10
|
|
87
89
|
*/
|
|
88
90
|
maxToolRounds?: number;
|
|
91
|
+
/** Maximum bytes buffered per response in a tool loop. Default: 8 MiB. */
|
|
92
|
+
maxToolResponseBytes?: number;
|
|
89
93
|
/**
|
|
90
94
|
* Hook invoked once per intercepted request, after anonymization and
|
|
91
95
|
* before forwarding upstream. Receives a summary of detected PII
|
|
@@ -94,6 +98,18 @@ export interface RehydraFetchConfig {
|
|
|
94
98
|
*/
|
|
95
99
|
onAnonymize?: (info: AnonymizeInfo) => void;
|
|
96
100
|
}
|
|
101
|
+
/**
|
|
102
|
+
* Reported when the upstream base path and the incoming request path share segments
|
|
103
|
+
*/
|
|
104
|
+
export interface PathOverlapWarning {
|
|
105
|
+
/** Configured upstream base URL with its trailing slash removed. */
|
|
106
|
+
upstreamBaseUrl: string;
|
|
107
|
+
/**
|
|
108
|
+
* Segments duplicated between the configured upstream suffix and the
|
|
109
|
+
* incoming request prefix, e.g. ["api", "v1"].
|
|
110
|
+
*/
|
|
111
|
+
overlappingSegments: string[];
|
|
112
|
+
}
|
|
97
113
|
/**
|
|
98
114
|
* Configuration for the Rehydra proxy middleware
|
|
99
115
|
*/
|
|
@@ -116,5 +132,7 @@ export interface RehydraProxyConfig extends RehydraFetchConfig {
|
|
|
116
132
|
* For OpenAI: sent as `Authorization: Bearer <key>`
|
|
117
133
|
*/
|
|
118
134
|
apiKey?: string;
|
|
135
|
+
/** Hook invoked for each request whose forwarded path overlaps the upstream base path */
|
|
136
|
+
onPathOverlapWarning?: (warning: PathOverlapWarning) => void | Promise<void>;
|
|
119
137
|
}
|
|
120
138
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/proxy/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D;;;;;;;;;GASG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,UAAU,EAAE,MAAM,KACf,OAAO,CAAC;AAEb;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,yEAAyE;IACzE,MAAM,EAAE,MAAM,CAAC;IACf,2BAA2B;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,qEAAqE;IACrE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,uDAAuD;IACvD,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,+BAA+B;IAC/B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAE9B,sBAAsB;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEtC,6CAA6C;IAC7C,WAAW,EAAE,WAAW,CAAC;IAEzB,0DAA0D;IAC1D,kBAAkB,EAAE,kBAAkB,CAAC;IAEvC,qDAAqD;IACrD,QAAQ,CAAC,EAAE,QAAQ,GAAG,WAAW,GAAG,MAAM,CAAC;IAE3C;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9D;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,oCAAoC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,iBAAiB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAEnC
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/proxy/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D;;;;;;;;;GASG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,UAAU,EAAE,MAAM,KACf,OAAO,CAAC;AAEb;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,yEAAyE;IACzE,MAAM,EAAE,MAAM,CAAC;IACf,2BAA2B;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,qEAAqE;IACrE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,uDAAuD;IACvD,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,+BAA+B;IAC/B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAE9B,sBAAsB;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEtC,6CAA6C;IAC7C,WAAW,EAAE,WAAW,CAAC;IAEzB,0DAA0D;IAC1D,kBAAkB,EAAE,kBAAkB,CAAC;IAEvC,qDAAqD;IACrD,QAAQ,CAAC,EAAE,QAAQ,GAAG,WAAW,GAAG,MAAM,CAAC;IAE3C;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9D;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,oCAAoC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,iBAAiB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAEnC;;;;;;;;;;;;;OAaG;IACH,UAAU,CAAC,EAAE,YAAY,CAAC;IAE1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,0EAA0E;IAC1E,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,IAAI,CAAC;CAC7C;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,oEAAoE;IACpE,eAAe,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D,gCAAgC;IAChC,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,yDAAyD;IACzD,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,yFAAyF;IACzF,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9E"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["../../src/recognizers/address.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,uBAAuB,gCAOlC,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/** Conservative detection of numbered, English-language street addresses. */
|
|
2
|
+
import { PIIType } from '../types/index.js';
|
|
3
|
+
import { createRegexRecognizer } from './base.js';
|
|
4
|
+
import { UK_POSTAL_CODE_PATTERN } from './postal-code.js';
|
|
5
|
+
const NUMBER = String.raw `[0-9]{1,5}[a-z]?(?:[-/][0-9]{1,5}[a-z]?)?`;
|
|
6
|
+
const WORD = String.raw `[\p{L}][\p{L}.'’\-]*`;
|
|
7
|
+
const STREET = String.raw `${NUMBER}[\t ]+(?:${WORD}[\t ]+){1,6}(?:Road|Rd|Street|St|Avenue|Ave|Lane|Ln|Drive|Dr|Close|Court|Ct|Crescent|Way|Place|Pl|Terrace|Gardens|Grove|Square|Sq|Mews|Row|Hill|Park|Walk|Rise|Green)\b`;
|
|
8
|
+
// An apartment number alone is ambiguous. Require an adjacent numbered street.
|
|
9
|
+
const UNIT = String.raw `(?:(?:Flat|Apartment|Apt|Unit|Suite)[\t ]+${NUMBER}[\t ]*(?:,[\t ]*|\r?\n[\t ]*|[\t ]+))?`;
|
|
10
|
+
// Include locality lines only when a UK postcode terminates the address block.
|
|
11
|
+
// Bounded line/word counts keep prose and separate paragraphs out of the match.
|
|
12
|
+
const LOCALITY = String.raw `(?:${WORD}[\t ]+){0,4}${WORD}`;
|
|
13
|
+
const SEPARATOR = String.raw `[\t ]*(?:,[\t ]*|\r?\n[\t ]*)`;
|
|
14
|
+
const POSTAL_TAIL = String.raw `(?:${SEPARATOR}(?:${LOCALITY}${SEPARATOR}){0,3}${UK_POSTAL_CODE_PATTERN.source})?`;
|
|
15
|
+
export const streetAddressRecognizer = createRegexRecognizer({
|
|
16
|
+
type: PIIType.ADDRESS,
|
|
17
|
+
name: 'Numbered Street Address',
|
|
18
|
+
patterns: [new RegExp(String.raw `(?<![\p{L}\p{N}])${UNIT}${STREET}${POSTAL_TAIL}`, 'giu')],
|
|
19
|
+
defaultConfidence: 0.95,
|
|
20
|
+
// Travel directions describe distances rather than a street number.
|
|
21
|
+
validate: (text) => !/^[0-9]+[\t ]+(?:steps?|miles?|metres?|meters?|kilometres?|kilometers?|blocks?)[\t ]/i.test(text),
|
|
22
|
+
});
|
|
23
|
+
//# sourceMappingURL=address.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"address.js","sourceRoot":"","sources":["../../src/recognizers/address.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAA,2CAA2C,CAAC;AACrE,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAA,sBAAsB,CAAC;AAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAA,GAAG,MAAM,YAAY,IAAI,yKAAyK,CAAC;AAC5N,+EAA+E;AAC/E,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAA,6CAA6C,MAAM,wCAAwC,CAAC;AACnH,+EAA+E;AAC/E,gFAAgF;AAChF,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAA,MAAM,IAAI,eAAe,IAAI,EAAE,CAAC;AAC3D,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAA,+BAA+B,CAAC;AAC5D,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAA,MAAM,SAAS,MAAM,QAAQ,GAAG,SAAS,SAAS,sBAAsB,CAAC,MAAM,IAAI,CAAC;AAElH,MAAM,CAAC,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;IAC3D,IAAI,EAAE,OAAO,CAAC,OAAO;IACrB,IAAI,EAAE,yBAAyB;IAC/B,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA,oBAAoB,IAAI,GAAG,MAAM,GAAG,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1F,iBAAiB,EAAE,IAAI;IACvB,oEAAoE;IACpE,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,sFAAsF,CAAC,IAAI,CAAC,IAAI,CAAC;CACvH,CAAC,CAAC"}
|
|
@@ -6,6 +6,8 @@ export * from './base.js';
|
|
|
6
6
|
export * from './registry.js';
|
|
7
7
|
export { emailRecognizer } from './email.js';
|
|
8
8
|
export { phoneRecognizer } from './phone.js';
|
|
9
|
+
export { streetAddressRecognizer } from './address.js';
|
|
10
|
+
export { ukPostalCodeRecognizer, UK_POSTAL_CODE_PATTERN, isValidUKPostalCode, normalizeUKPostalCode, } from './postal-code.js';
|
|
9
11
|
export { ibanRecognizer, getExpectedIBANLength } from './iban.js';
|
|
10
12
|
export { bicSwiftRecognizer } from './bic-swift.js';
|
|
11
13
|
export { creditCardRecognizer, identifyCardType } from './credit-card.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/recognizers/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,0BAA0B,EAC1B,kBAAkB,EAClB,cAAc,GACf,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/recognizers/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,0BAA0B,EAC1B,kBAAkB,EAClB,cAAc,GACf,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAanD;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,kBAAkB,CAoB1D"}
|
|
@@ -6,6 +6,8 @@ export * from './base.js';
|
|
|
6
6
|
export * from './registry.js';
|
|
7
7
|
export { emailRecognizer } from './email.js';
|
|
8
8
|
export { phoneRecognizer } from './phone.js';
|
|
9
|
+
export { streetAddressRecognizer } from './address.js';
|
|
10
|
+
export { ukPostalCodeRecognizer, UK_POSTAL_CODE_PATTERN, isValidUKPostalCode, normalizeUKPostalCode, } from './postal-code.js';
|
|
9
11
|
export { ibanRecognizer, getExpectedIBANLength } from './iban.js';
|
|
10
12
|
export { bicSwiftRecognizer } from './bic-swift.js';
|
|
11
13
|
export { creditCardRecognizer, identifyCardType } from './credit-card.js';
|
|
@@ -18,6 +20,8 @@ export * from './secrets/index.js';
|
|
|
18
20
|
import { RecognizerRegistry } from './registry.js';
|
|
19
21
|
import { emailRecognizer } from './email.js';
|
|
20
22
|
import { phoneRecognizer } from './phone.js';
|
|
23
|
+
import { streetAddressRecognizer } from './address.js';
|
|
24
|
+
import { ukPostalCodeRecognizer } from './postal-code.js';
|
|
21
25
|
import { ibanRecognizer } from './iban.js';
|
|
22
26
|
import { bicSwiftRecognizer } from './bic-swift.js';
|
|
23
27
|
import { creditCardRecognizer } from './credit-card.js';
|
|
@@ -33,6 +37,8 @@ export function createDefaultRegistry() {
|
|
|
33
37
|
// Register all built-in recognizers
|
|
34
38
|
registry.register(emailRecognizer);
|
|
35
39
|
registry.register(phoneRecognizer);
|
|
40
|
+
registry.register(ukPostalCodeRecognizer);
|
|
41
|
+
registry.register(streetAddressRecognizer);
|
|
36
42
|
registry.register(ibanRecognizer);
|
|
37
43
|
registry.register(bicSwiftRecognizer);
|
|
38
44
|
registry.register(creditCardRecognizer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/recognizers/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,0BAA0B,EAC1B,kBAAkB,EAClB,cAAc,GACf,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAEpF;;GAEG;AACH,MAAM,UAAU,qBAAqB;IACnC,MAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAE1C,oCAAoC;IACpC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACnC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACnC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAClC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IACtC,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACxC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IACvC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACjC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAElC,yCAAyC;IACzC,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAC,CAAC;IAC5C,QAAQ,CAAC,QAAQ,CAAC,0BAA0B,EAAE,CAAC,CAAC;IAEhD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/recognizers/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,0BAA0B,EAC1B,kBAAkB,EAClB,cAAc,GACf,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAEpF;;GAEG;AACH,MAAM,UAAU,qBAAqB;IACnC,MAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAE1C,oCAAoC;IACpC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACnC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACnC,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;IAC1C,QAAQ,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IAC3C,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAClC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IACtC,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACxC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IACvC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACjC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAElC,yCAAyC;IACzC,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAC,CAAC;IAC5C,QAAQ,CAAC,QAAQ,CAAC,0BAA0B,EAAE,CAAC,CAAC;IAEhD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* UK Postal Code Recognizer
|
|
3
|
+
* Detects syntactically valid UK unit postcodes.
|
|
4
|
+
*/
|
|
5
|
+
export declare const UK_POSTAL_CODE_PATTERN: RegExp;
|
|
6
|
+
/**
|
|
7
|
+
* Checks UK postcode syntax. This does not verify that Royal Mail currently
|
|
8
|
+
* assigns the postcode.
|
|
9
|
+
*/
|
|
10
|
+
export declare function isValidUKPostalCode(postalCode: string): boolean;
|
|
11
|
+
/**
|
|
12
|
+
* Converts a UK postcode to uppercase with one space before the inward code.
|
|
13
|
+
*/
|
|
14
|
+
export declare function normalizeUKPostalCode(postalCode: string): string;
|
|
15
|
+
export declare const ukPostalCodeRecognizer: import("./base.js").Recognizer;
|
|
16
|
+
//# sourceMappingURL=postal-code.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"postal-code.d.ts","sourceRoot":"","sources":["../../src/recognizers/postal-code.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAgBH,eAAO,MAAM,sBAAsB,QAGlC,CAAC;AAOF;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAIhE;AAED,eAAO,MAAM,sBAAsB,gCAOjC,CAAC"}
|