@open-everywhere/adapters 0.3.0 → 0.5.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 +0 -1
- package/agent/aws/config.ts +13 -16
- package/agent/aws/register.ts +2 -2
- package/agent/aws/sso.ts +2 -2
- package/agent/browser/register.ts +12 -1
- package/agent/directory/config.ts +22 -47
- package/agent/model/gateway.ts +26 -1
- package/agent/oe-oauth/config.ts +25 -45
- package/agent/oe-oauth/register.ts +14 -12
- package/agent/oe-oauth/token-vault.ts +19 -9
- package/agent/oe-oauth/user-auth-flow.ts +2 -3
- package/agent/register-defaults.ts +18 -19
- package/agent/sandbox/backend-stop.ts +10 -10
- package/dist/agent/aws/config.d.ts +5 -3
- package/dist/agent/aws/config.d.ts.map +1 -1
- package/dist/agent/aws/config.js +12 -16
- package/dist/agent/aws/config.js.map +1 -1
- package/dist/agent/aws/register.js +2 -2
- package/dist/agent/aws/register.js.map +1 -1
- package/dist/agent/aws/sso.js +2 -2
- package/dist/agent/aws/sso.js.map +1 -1
- package/dist/agent/browser/register.d.ts +8 -0
- package/dist/agent/browser/register.d.ts.map +1 -1
- package/dist/agent/browser/register.js +10 -1
- package/dist/agent/browser/register.js.map +1 -1
- package/dist/agent/directory/config.d.ts +7 -4
- package/dist/agent/directory/config.d.ts.map +1 -1
- package/dist/agent/directory/config.js +17 -41
- package/dist/agent/directory/config.js.map +1 -1
- package/dist/agent/model/gateway.d.ts +4 -0
- package/dist/agent/model/gateway.d.ts.map +1 -1
- package/dist/agent/model/gateway.js +24 -2
- package/dist/agent/model/gateway.js.map +1 -1
- package/dist/agent/oe-oauth/config.d.ts +5 -8
- package/dist/agent/oe-oauth/config.d.ts.map +1 -1
- package/dist/agent/oe-oauth/config.js +25 -46
- package/dist/agent/oe-oauth/config.js.map +1 -1
- package/dist/agent/oe-oauth/register.d.ts +4 -6
- package/dist/agent/oe-oauth/register.d.ts.map +1 -1
- package/dist/agent/oe-oauth/register.js +9 -8
- package/dist/agent/oe-oauth/register.js.map +1 -1
- package/dist/agent/oe-oauth/token-vault.d.ts +4 -1
- package/dist/agent/oe-oauth/token-vault.d.ts.map +1 -1
- package/dist/agent/oe-oauth/token-vault.js +13 -10
- package/dist/agent/oe-oauth/token-vault.js.map +1 -1
- package/dist/agent/oe-oauth/user-auth-flow.d.ts +2 -3
- package/dist/agent/oe-oauth/user-auth-flow.d.ts.map +1 -1
- package/dist/agent/oe-oauth/user-auth-flow.js.map +1 -1
- package/dist/agent/register-defaults.d.ts +7 -3
- package/dist/agent/register-defaults.d.ts.map +1 -1
- package/dist/agent/register-defaults.js +15 -19
- package/dist/agent/register-defaults.js.map +1 -1
- package/dist/agent/sandbox/backend-stop.d.ts +5 -6
- package/dist/agent/sandbox/backend-stop.d.ts.map +1 -1
- package/dist/agent/sandbox/backend-stop.js +9 -9
- package/dist/agent/sandbox/backend-stop.js.map +1 -1
- package/package.json +3 -9
- package/agent/blob/hosting.ts +0 -24
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../../agent/model/gateway.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAiB,MAAM,IAAI,CAAC;AAC5C,OAAO,EACL,KAAK,UAAU,EAEf,KAAK,YAAY,EACjB,KAAK,iBAAiB,
|
|
1
|
+
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../../agent/model/gateway.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAiB,MAAM,IAAI,CAAC;AAC5C,OAAO,EACL,KAAK,UAAU,EAEf,KAAK,YAAY,EACjB,KAAK,iBAAiB,EAIvB,MAAM,4CAA4C,CAAC;AAEpD,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC;AAQ/C,wHAAwH;AACxH,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,0IAA0I;AAC1I,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAO/D;AAiBD,qFAAqF;AACrF,MAAM,WAAW,qBAAqB;IACpC,iFAAiF;IACjF,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C;AAKD;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,UAAU,EACjB,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EACxD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjC,iBAAiB,CAanB;AAED,wDAAwD;AACxD,wBAAgB,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY,CAAC,YAAY,CAAC,CAKlG;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,YAAY,CAAC,CAG5H"}
|
|
@@ -1,15 +1,37 @@
|
|
|
1
1
|
// The Vercel AI Gateway model backend — the reference `ModelBackend`. Provider SELECTION is not pinned here:
|
|
2
2
|
// that is a gateway-operator concern, and `ModelRoute.providers` is only an optional per-route preference.
|
|
3
3
|
import { gateway, createGateway } from "ai";
|
|
4
|
-
import { liveIdentity, resolvePrimaryModel, } from "@open-everywhere/core/agent/adapter-api.js";
|
|
4
|
+
import { hostPlaneFetch, liveIdentity, resolvePrimaryModel, } from "@open-everywhere/core/agent/adapter-api.js";
|
|
5
5
|
/**
|
|
6
6
|
* THE GATEWAY TARGET — `OE_AI_GATEWAY_URL`, read once at module load: a target that changed mid-process would
|
|
7
7
|
* send two calls in one turn to two providers. Unset ⇒ the plain `gateway` export, byte-identical.
|
|
8
8
|
*/
|
|
9
9
|
const GATEWAY_BASE_URL = process.env.OE_AI_GATEWAY_URL?.trim();
|
|
10
|
+
/** The gateway's own host when {@link GATEWAY_BASE_URL} is unset. It must match the `ai` package's default base URL. */
|
|
11
|
+
export const DEFAULT_GATEWAY_HOST = "ai-gateway.vercel.sh";
|
|
12
|
+
/** The one host the model call reaches: the retarget's host, else the default. An unparseable retarget falls back to the default host. */
|
|
13
|
+
export function gatewayHost(baseUrl) {
|
|
14
|
+
if (!baseUrl)
|
|
15
|
+
return DEFAULT_GATEWAY_HOST;
|
|
16
|
+
try {
|
|
17
|
+
return new URL(baseUrl).hostname;
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
return DEFAULT_GATEWAY_HOST;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* THE MODEL CALL'S TRANSPORT ON THE SELF-HOST PROXY TIER (OPE-2406). With an egress proxy wired, the model call goes out
|
|
25
|
+
* on the app's HOST PLANE: the proxy decides it against the gateway host alone, never against a session's policy. That is
|
|
26
|
+
* what lets a turn reach its model while the session stays default-deny. Off that tier it is `undefined` and the provider
|
|
27
|
+
* keeps its default fetch, byte-identical to before.
|
|
28
|
+
*/
|
|
29
|
+
const HOST_PLANE_FETCH = hostPlaneFetch([gatewayHost(GATEWAY_BASE_URL)]);
|
|
10
30
|
/** The gateway provider this backend resolves model ids through — retargeted only when
|
|
11
31
|
* {@link GATEWAY_BASE_URL} names a different host. */
|
|
12
|
-
const provider = GATEWAY_BASE_URL
|
|
32
|
+
const provider = GATEWAY_BASE_URL || HOST_PLANE_FETCH
|
|
33
|
+
? createGateway({ ...(GATEWAY_BASE_URL ? { baseURL: GATEWAY_BASE_URL } : {}), ...(HOST_PLANE_FETCH ? { fetch: HOST_PLANE_FETCH } : {}) })
|
|
34
|
+
: gateway;
|
|
13
35
|
/** Gateway pin keys a route replaces — a pin belongs to the id it was set with. */
|
|
14
36
|
const PIN_KEYS = ["only", "order"];
|
|
15
37
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../../agent/model/gateway.ts"],"names":[],"mappings":"AAAA,6GAA6G;AAC7G,2GAA2G;AAE3G,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC5C,OAAO,EAKL,YAAY,EACZ,mBAAmB,GACpB,MAAM,4CAA4C,CAAC;AAIpD;;;GAGG;AACH,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC;AAE/D;
|
|
1
|
+
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../../agent/model/gateway.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
/** The JSON provider-config block env var. */
|
|
2
|
-
export declare const OE_OAUTH_CONFIG_ENV = "OE_OAUTH_CONFIG";
|
|
3
1
|
/** The discovery + DCR + PKCE public-client dialect — the original and default mode. */
|
|
4
2
|
export declare const OE_OAUTH_MODE_DISCOVERY = "discovery-dcr-pkce";
|
|
5
3
|
/** The static confidential-client dialect (OPE-1086) — no discovery, no registration, HTTP Basic. */
|
|
@@ -57,13 +55,12 @@ export type OeOauthProviderConfig = OeOauthDiscoveryProviderConfig | OeOauthStat
|
|
|
57
55
|
/** Narrow a provider config to the static confidential-client mode. Reads the DECLARED `mode` and
|
|
58
56
|
* nothing else — never the presence of a field. */
|
|
59
57
|
export declare function isStaticConfidential(cfg: OeOauthProviderConfig): cfg is OeOauthStaticProviderConfig;
|
|
60
|
-
/** Truthiness for the master flag — same off-spellings as the connector flags (default OFF). */
|
|
61
|
-
export declare function oeOauthEnabled(): boolean;
|
|
62
58
|
/**
|
|
63
|
-
*
|
|
64
|
-
*
|
|
65
|
-
*
|
|
59
|
+
* The provider config map from the DECLARED sign-ins, or `undefined` when no connector declares one.
|
|
60
|
+
* Read PER CALL by the vault (see register.ts): a connection module declares at its own load, which
|
|
61
|
+
* eve's module map runs at server start, and a per-call read never depends on that order. A malformed
|
|
62
|
+
* declaration throws here, naming the field, so the mint that reaches it fails loudly.
|
|
66
63
|
*/
|
|
67
|
-
export declare function loadOeOauthConfig(): Map<string, OeOauthProviderConfig> | undefined;
|
|
64
|
+
export declare function loadOeOauthConfig(declared?: ReadonlyMap<string, unknown>): Map<string, OeOauthProviderConfig> | undefined;
|
|
68
65
|
export {};
|
|
69
66
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../agent/oe-oauth/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../agent/oe-oauth/config.ts"],"names":[],"mappings":"AAWA,wFAAwF;AACxF,eAAO,MAAM,uBAAuB,uBAAuB,CAAC;AAC5D,qGAAqG;AACrG,eAAO,MAAM,oBAAoB,wBAAwB,CAAC;AAE1D;;iEAEiE;AACjE,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,MAAM,CAAC;AAElD,8DAA8D;AAC9D,UAAU,yBAAyB;IACjC,kFAAkF;IAClF,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACrC;AAED;iEACiE;AACjE,MAAM,WAAW,8BAA+B,SAAQ,yBAAyB;IAC/E,QAAQ,CAAC,IAAI,EAAE,OAAO,uBAAuB,CAAC;IAC9C,gFAAgF;IAChF,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,+HAA+H;IAC/H,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,2BAA4B,SAAQ,yBAAyB;IAC5E,QAAQ,CAAC,IAAI,EAAE,OAAO,oBAAoB,CAAC;IAC3C,sDAAsD;IACtD,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACvC,uEAAuE;IACvE,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B;qGACiG;IACjG,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,mGAAmG;IACnG,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,sEAAsE;IACtE,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,0FAA0F;IAC1F,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC;0FACsF;IACtF,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5D;qEACiE;IACjE,QAAQ,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACzD,6CAA6C;IAC7C,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC;CAC5C;AAED,qEAAqE;AACrE,MAAM,MAAM,qBAAqB,GAAG,8BAA8B,GAAG,2BAA2B,CAAC;AAEjG;oDACoD;AACpD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,qBAAqB,GAAG,GAAG,IAAI,2BAA2B,CAEnG;AA6ID;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,GAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAA+B,GAAG,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,GAAG,SAAS,CAGtJ"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
// The `oe-oauth`
|
|
2
|
-
//
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
// The `oe-oauth` provider config: each connector's SIGN-IN, declared in its own connection module next to its
|
|
2
|
+
// URL (core connections/connection-sign-in.ts) and validated here. 🔴 The client SECRET is a REF — a literal
|
|
3
|
+
// in a declaration is REFUSED. ⚠️ A declaration's key must equal the credential home's ref, or no mint reaches it.
|
|
4
|
+
//
|
|
5
|
+
// OPE-2411 deleted the env path: `OE_OAUTH_CONFIG` (the JSON map), `OE_OAUTH_NOTION_RESOURCE` (its Notion
|
|
6
|
+
// shortcut) and the `OE_OAUTH_ENABLED` master flag. A scope list reaches the authorize URL, so a dashboard
|
|
7
|
+
// could widen what the agent asks for with no diff. There is no master flag any more: a connector that
|
|
8
|
+
// declares a sign-in offers "Connect my account" to whoever a bundle grants its `user-oauth` credential.
|
|
9
|
+
import { declaredConnectionSignIns } from "@open-everywhere/core/agent/adapter-api.js";
|
|
9
10
|
/** The discovery + DCR + PKCE public-client dialect — the original and default mode. */
|
|
10
11
|
export const OE_OAUTH_MODE_DISCOVERY = "discovery-dcr-pkce";
|
|
11
12
|
/** The static confidential-client dialect (OPE-1086) — no discovery, no registration, HTTP Basic. */
|
|
@@ -15,14 +16,6 @@ export const OE_OAUTH_MODE_STATIC = "static-confidential";
|
|
|
15
16
|
export function isStaticConfidential(cfg) {
|
|
16
17
|
return cfg.mode === OE_OAUTH_MODE_STATIC;
|
|
17
18
|
}
|
|
18
|
-
/** Truthiness for the master flag — same off-spellings as the connector flags (default OFF). */
|
|
19
|
-
export function oeOauthEnabled() {
|
|
20
|
-
const raw = process.env[OE_OAUTH_ENABLED_ENV];
|
|
21
|
-
if (raw === undefined)
|
|
22
|
-
return false;
|
|
23
|
-
const v = raw.trim().toLowerCase();
|
|
24
|
-
return v !== "" && v !== "0" && v !== "false" && v !== "off" && v !== "no";
|
|
25
|
-
}
|
|
26
19
|
/** Authorize-URL parameters this adapter composes itself. A config entry that named one of these
|
|
27
20
|
* could point the consent at another client id or another redirect target, so the parser refuses
|
|
28
21
|
* them instead of letting the last writer win. */
|
|
@@ -68,10 +61,10 @@ function parseScopes(v) {
|
|
|
68
61
|
}
|
|
69
62
|
/** Parse ONE `static-confidential` entry, with every refusal stated. */
|
|
70
63
|
function parseStaticProvider(ref, rec) {
|
|
71
|
-
const where =
|
|
72
|
-
// 🔴 A LITERAL SECRET IS REFUSED, NOT ACCEPTED. See the module header:
|
|
64
|
+
const where = `sign-in "${ref}"`;
|
|
65
|
+
// 🔴 A LITERAL SECRET IS REFUSED, NOT ACCEPTED. See the module header: a declaration is committed source.
|
|
73
66
|
if ("clientSecret" in rec) {
|
|
74
|
-
throw new Error(`${where} carries a literal "clientSecret". The client secret must NEVER live in
|
|
67
|
+
throw new Error(`${where} carries a literal "clientSecret". The client secret must NEVER live in a sign-in declaration — ` +
|
|
75
68
|
`store it in the credential store and name it with "clientSecretRef" (for example "db:notion:rest-client-secret").`);
|
|
76
69
|
}
|
|
77
70
|
const authorizeParams = optionalStringMap(rec.authorizeParams, `${where}.authorizeParams`);
|
|
@@ -104,11 +97,12 @@ function parseStaticProvider(ref, rec) {
|
|
|
104
97
|
...(authorizeParams ? { authorizeParams } : {}),
|
|
105
98
|
...(tokenHeaders ? { tokenHeaders } : {}),
|
|
106
99
|
bodyEncoding,
|
|
100
|
+
...(scopes ? { scopes } : {}),
|
|
107
101
|
};
|
|
108
102
|
}
|
|
109
103
|
/** Parse ONE `discovery-dcr-pkce` entry. */
|
|
110
104
|
function parseDiscoveryProvider(ref, rec) {
|
|
111
|
-
const where =
|
|
105
|
+
const where = `sign-in "${ref}"`;
|
|
112
106
|
const resource = typeof rec.resource === "string" ? rec.resource.trim() : "";
|
|
113
107
|
if (!resource)
|
|
114
108
|
throw new Error(`${where} is missing a string "resource".`);
|
|
@@ -121,19 +115,10 @@ function parseDiscoveryProvider(ref, rec) {
|
|
|
121
115
|
...(typeof rec.clientName === "string" && rec.clientName.trim() ? { clientName: rec.clientName.trim() } : {}),
|
|
122
116
|
};
|
|
123
117
|
}
|
|
124
|
-
|
|
118
|
+
/** Parse the declared sign-ins into provider configs. Every refusal names the declaration's home ref. */
|
|
119
|
+
function parseDeclarations(declared) {
|
|
125
120
|
const out = new Map();
|
|
126
|
-
|
|
127
|
-
try {
|
|
128
|
-
obj = JSON.parse(raw);
|
|
129
|
-
}
|
|
130
|
-
catch {
|
|
131
|
-
throw new Error(`${OE_OAUTH_CONFIG_ENV} is not valid JSON — expected {"<ref>":{"resource":"..."}}.`);
|
|
132
|
-
}
|
|
133
|
-
if (typeof obj !== "object" || obj === null || Array.isArray(obj)) {
|
|
134
|
-
throw new Error(`${OE_OAUTH_CONFIG_ENV} must be a JSON object mapping provider ref → one provider entry.`);
|
|
135
|
-
}
|
|
136
|
-
for (const [ref, v] of Object.entries(obj)) {
|
|
121
|
+
for (const [ref, v] of declared) {
|
|
137
122
|
if (typeof v !== "object" || v === null)
|
|
138
123
|
continue;
|
|
139
124
|
const rec = v;
|
|
@@ -147,7 +132,7 @@ function parseJsonConfig(raw) {
|
|
|
147
132
|
continue;
|
|
148
133
|
}
|
|
149
134
|
if (mode !== OE_OAUTH_MODE_DISCOVERY) {
|
|
150
|
-
throw new Error(
|
|
135
|
+
throw new Error(`sign-in "${ref}".mode ${JSON.stringify(mode)} is not a known oe-oauth mode — use "${OE_OAUTH_MODE_DISCOVERY}" or "${OE_OAUTH_MODE_STATIC}".`);
|
|
151
136
|
}
|
|
152
137
|
const parsed = parseDiscoveryProvider(ref, rec);
|
|
153
138
|
// A discovery entry that also carries confidential-client fields is a MIS-DECLARED entry, not a
|
|
@@ -155,7 +140,7 @@ function parseJsonConfig(raw) {
|
|
|
155
140
|
// adapter will not promote an entry to the confidential mode because it looks like one.
|
|
156
141
|
for (const field of ["clientId", "clientSecretRef", "clientSecret", "tokenEndpoint", "authorizationEndpoint"]) {
|
|
157
142
|
if (field in rec) {
|
|
158
|
-
throw new Error(
|
|
143
|
+
throw new Error(`sign-in "${ref}" carries "${field}" but declares no mode, so it reads as "${OE_OAUTH_MODE_DISCOVERY}" ` +
|
|
159
144
|
`(discovery + dynamic registration + PKCE), which ignores that field. Add "mode": "${OE_OAUTH_MODE_STATIC}" if that is what you meant.`);
|
|
160
145
|
}
|
|
161
146
|
}
|
|
@@ -164,19 +149,13 @@ function parseJsonConfig(raw) {
|
|
|
164
149
|
return out;
|
|
165
150
|
}
|
|
166
151
|
/**
|
|
167
|
-
*
|
|
168
|
-
*
|
|
169
|
-
*
|
|
152
|
+
* The provider config map from the DECLARED sign-ins, or `undefined` when no connector declares one.
|
|
153
|
+
* Read PER CALL by the vault (see register.ts): a connection module declares at its own load, which
|
|
154
|
+
* eve's module map runs at server start, and a per-call read never depends on that order. A malformed
|
|
155
|
+
* declaration throws here, naming the field, so the mint that reaches it fails loudly.
|
|
170
156
|
*/
|
|
171
|
-
export function loadOeOauthConfig() {
|
|
172
|
-
const providers =
|
|
173
|
-
const notionResource = process.env[OE_OAUTH_NOTION_RESOURCE_ENV]?.trim();
|
|
174
|
-
if (notionResource)
|
|
175
|
-
providers.set("notion", { mode: OE_OAUTH_MODE_DISCOVERY, ref: "notion", resource: notionResource });
|
|
176
|
-
const rawJson = process.env[OE_OAUTH_CONFIG_ENV]?.trim();
|
|
177
|
-
if (rawJson)
|
|
178
|
-
for (const [ref, cfg] of parseJsonConfig(rawJson))
|
|
179
|
-
providers.set(ref, cfg);
|
|
157
|
+
export function loadOeOauthConfig(declared = declaredConnectionSignIns()) {
|
|
158
|
+
const providers = parseDeclarations(declared);
|
|
180
159
|
return providers.size > 0 ? providers : undefined;
|
|
181
160
|
}
|
|
182
161
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../agent/oe-oauth/config.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../agent/oe-oauth/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
/** Registration input. `providers` defaults to {@link loadOeOauthConfig}; `deps` is a test/DI seam. */
|
|
1
|
+
import type { OeOauthProviderSource, OeOauthVaultDeps } from "./token-vault.js";
|
|
2
|
+
/** Registration input. `providers` defaults to the declared sign-ins, read per call; `deps` is a test/DI seam. */
|
|
4
3
|
export interface RegisterOeOauthOptions {
|
|
5
|
-
readonly providers?:
|
|
4
|
+
readonly providers?: OeOauthProviderSource;
|
|
6
5
|
readonly deps?: OeOauthVaultDeps;
|
|
7
6
|
}
|
|
8
7
|
/**
|
|
9
|
-
* Construct the own-rolled OAuth provider and callback completer and register both.
|
|
10
|
-
* config is available — the caller invokes this only once it has decided to arm.
|
|
8
|
+
* Construct the own-rolled OAuth provider and callback completer and register both.
|
|
11
9
|
*/
|
|
12
10
|
export declare function registerOeOauth(opts?: RegisterOeOauthOptions): {
|
|
13
11
|
flow: import("@open-everywhere/core/agent/adapter-api.js").UserAuthFlowProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../agent/oe-oauth/register.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../agent/oe-oauth/register.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEhF,kHAAkH;AAClH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAC3C,QAAQ,CAAC,IAAI,CAAC,EAAE,gBAAgB,CAAC;CAClC;AAKD;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,GAAE,sBAA2B;;;;EAShE"}
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
// Register the own-rolled OAuth adapter: the user-auth flow, the callback completer and the credential-purge
|
|
2
|
-
// hook, from one shared vault.
|
|
2
|
+
// hook, from one shared vault. Since OPE-2411 there is no master flag: the flow ALWAYS registers, and each
|
|
3
|
+
// mint reads the declared sign-ins PER CALL (core connections/connection-sign-in.ts). An OAuth home no
|
|
4
|
+
// connector declares fails its mint closed with a message naming the fix, unless the vault already
|
|
5
|
+
// holds a client record or an unexpired token for it (that row keeps serving). The off switch is the bundle's
|
|
6
|
+
// `user-oauth` grant: with no grant, no mint reaches this flow.
|
|
3
7
|
import { registerUserAuthFlow, registerOeOauthCallbackCompleter, registerCredentialPurgeHook } from "@open-everywhere/core/agent/adapter-api.js";
|
|
4
8
|
import { loadOeOauthConfig } from "./config.js";
|
|
5
9
|
import { makeOeOauth } from "./user-auth-flow.js";
|
|
10
|
+
/** The deployed provider source: the declared sign-ins, parsed per call. */
|
|
11
|
+
const declaredProviders = () => loadOeOauthConfig() ?? new Map();
|
|
6
12
|
/**
|
|
7
|
-
* Construct the own-rolled OAuth provider and callback completer and register both.
|
|
8
|
-
* config is available — the caller invokes this only once it has decided to arm.
|
|
13
|
+
* Construct the own-rolled OAuth provider and callback completer and register both.
|
|
9
14
|
*/
|
|
10
15
|
export function registerOeOauth(opts = {}) {
|
|
11
|
-
const
|
|
12
|
-
if (!providers || providers.size === 0) {
|
|
13
|
-
throw new Error("registerOeOauth: no oe-oauth provider config (set OE_OAUTH_CONFIG / OE_OAUTH_NOTION_RESOURCE).");
|
|
14
|
-
}
|
|
15
|
-
const { flow, completer, purge } = makeOeOauth(providers, opts.deps ?? {});
|
|
16
|
+
const { flow, completer, purge } = makeOeOauth(opts.providers ?? declaredProviders, opts.deps ?? {});
|
|
16
17
|
registerUserAuthFlow(flow);
|
|
17
18
|
registerOeOauthCallbackCompleter(completer);
|
|
18
19
|
// (OPE-287) The purge hook registers ALONGSIDE the mint flow, in the same call, deliberately: a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../agent/oe-oauth/register.ts"],"names":[],"mappings":"AAAA,6GAA6G;AAC7G,
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../agent/oe-oauth/register.ts"],"names":[],"mappings":"AAAA,6GAA6G;AAC7G,2GAA2G;AAC3G,uGAAuG;AACvG,mGAAmG;AACnG,8GAA8G;AAC9G,gEAAgE;AAEhE,OAAO,EAAE,oBAAoB,EAAE,gCAAgC,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AACjJ,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AASlD,4EAA4E;AAC5E,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,iBAAiB,EAAE,IAAI,IAAI,GAAG,EAAE,CAAC;AAEjE;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,IAAI,GAA2B,EAAE;IAC/D,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,IAAI,iBAAiB,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IACrG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC3B,gCAAgC,CAAC,SAAS,CAAC,CAAC;IAC5C,gGAAgG;IAChG,iGAAiG;IACjG,2FAA2F;IAC3F,2BAA2B,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC/C,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;AACpC,CAAC"}
|
|
@@ -50,11 +50,14 @@ export interface OeOauthVaultDeps {
|
|
|
50
50
|
readonly resolveSecret?: (broker: string | undefined, ref: string) => Promise<string>;
|
|
51
51
|
}
|
|
52
52
|
declare function subjectKey(subject: OeOauthSubject): string;
|
|
53
|
+
/** The provider set a vault reads: a fixed map (a test), or a function read PER CALL (the deployed
|
|
54
|
+
* path, over the declared sign-ins — see oe-oauth/config.ts `loadOeOauthConfig`). */
|
|
55
|
+
export type OeOauthProviderSource = ReadonlyMap<string, OeOauthProviderConfig> | (() => ReadonlyMap<string, OeOauthProviderConfig>);
|
|
53
56
|
/**
|
|
54
57
|
* Construct a token vault over the configured providers. One instance is built at registration and
|
|
55
58
|
* shared, so the in-process single-flight lock (core withLock) coordinates all callers in the process.
|
|
56
59
|
*/
|
|
57
|
-
export declare function makeOeOauthTokenVault(
|
|
60
|
+
export declare function makeOeOauthTokenVault(source: OeOauthProviderSource, deps?: OeOauthVaultDeps): {
|
|
58
61
|
subjectKey: typeof subjectKey;
|
|
59
62
|
/** {@link forget} — purge ONE provider's token record for a subject. */
|
|
60
63
|
forget: (providerRef: string, subject: OeOauthSubject) => Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-vault.d.ts","sourceRoot":"","sources":["../../../agent/oe-oauth/token-vault.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAEnF,OAAO,EAA8C,KAAK,qBAAqB,EAAoC,MAAM,aAAa,CAAC;AACvI,OAAO,EAYL,KAAK,UAAU,EAEhB,MAAM,mBAAmB,CAAC;AAK3B,4FAA4F;AAC5F,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC;AAoEvG;;2CAE2C;AAC3C,UAAU,kBAAkB;IAC1B,6CAA6C;IAC7C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,0FAA0F;IAC1F,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,6FAA6F;IAC7F,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAoBD,eAAO,MAAM,kBAAkB,QAAS,CAAC;AASzC,iFAAiF;AACjF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACnF,iGAAiG;IACjG,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAChD,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,+GAA+G;IAC/G,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,kFAAkF;IAClF,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,MAAM,CAAC;IACnC;gGAC4F;IAC5F,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACvF;AAED,iBAAS,UAAU,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAEnD;AASD
|
|
1
|
+
{"version":3,"file":"token-vault.d.ts","sourceRoot":"","sources":["../../../agent/oe-oauth/token-vault.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,8 @@ function defaultRedirectUri() {
|
|
|
37
37
|
* Construct a token vault over the configured providers. One instance is built at registration and
|
|
38
38
|
* shared, so the in-process single-flight lock (core withLock) coordinates all callers in the process.
|
|
39
39
|
*/
|
|
40
|
-
export function makeOeOauthTokenVault(
|
|
40
|
+
export function makeOeOauthTokenVault(source, deps = {}) {
|
|
41
|
+
const providersNow = typeof source === "function" ? source : () => source;
|
|
41
42
|
const vault = deps.vault ?? encryptedKvVault();
|
|
42
43
|
const doFetch = deps.fetch ?? ((input, init) => fetch(input, init));
|
|
43
44
|
const now = deps.now ?? Date.now;
|
|
@@ -54,9 +55,10 @@ export function makeOeOauthTokenVault(providers, deps = {}) {
|
|
|
54
55
|
const pendRef = (state) => `oe-oauth:pend:${state}`;
|
|
55
56
|
const tokRef = (providerRef, subject) => `oe-oauth:tok:${providerRef}:${subjectKey(subject)}`;
|
|
56
57
|
function providerConfig(providerRef) {
|
|
57
|
-
const cfg =
|
|
58
|
-
if (!cfg)
|
|
59
|
-
throw new Error(`connection "${providerRef}": no
|
|
58
|
+
const cfg = providersNow().get(providerRef);
|
|
59
|
+
if (!cfg) {
|
|
60
|
+
throw new Error(`connection "${providerRef}": no sign-in is declared for this OAuth home — the connector's connection module declares one with declareConnectionSignIn (core connections/connection-sign-in.ts).`);
|
|
61
|
+
}
|
|
60
62
|
return cfg;
|
|
61
63
|
}
|
|
62
64
|
async function readJson(ref) {
|
|
@@ -150,7 +152,7 @@ export function makeOeOauthTokenVault(providers, deps = {}) {
|
|
|
150
152
|
* `ensureDcrClient`, so it never discovers, registers or writes a DCR row — the two share no network path.
|
|
151
153
|
*/
|
|
152
154
|
async function ensureClient(providerRef) {
|
|
153
|
-
const cfg =
|
|
155
|
+
const cfg = providersNow().get(providerRef);
|
|
154
156
|
return cfg !== undefined && isStaticConfidential(cfg) ? staticClient(cfg) : ensureDcrClient(providerRef);
|
|
155
157
|
}
|
|
156
158
|
/**
|
|
@@ -181,7 +183,7 @@ export function makeOeOauthTokenVault(providers, deps = {}) {
|
|
|
181
183
|
// `providers.get`, not providerConfig: the discovery path never read the config here before this
|
|
182
184
|
// mode existed, and it must not start failing on a config-absent ref now. The drift check below
|
|
183
185
|
// therefore runs only when there IS a config to compare against.
|
|
184
|
-
const cfg =
|
|
186
|
+
const cfg = providersNow().get(pending.providerRef);
|
|
185
187
|
const startedStatic = pending.mode === OE_OAUTH_MODE_STATIC;
|
|
186
188
|
if (cfg !== undefined && isStaticConfidential(cfg) !== startedStatic) {
|
|
187
189
|
throw new Error(`connection "${pending.providerRef}": this authorization started as ${startedStatic ? "a static confidential client" : "a public PKCE client"}, ` +
|
|
@@ -225,7 +227,7 @@ export function makeOeOauthTokenVault(providers, deps = {}) {
|
|
|
225
227
|
// from config — which is a read, not a registration, so the "never registers" rule above
|
|
226
228
|
// holds on both paths. `providers.get` rather than `providerConfig`: a purge must still
|
|
227
229
|
// destroy the row for a provider whose config an operator has already removed.
|
|
228
|
-
const cfg =
|
|
230
|
+
const cfg = providersNow().get(providerRef);
|
|
229
231
|
const client = cfg && isStaticConfidential(cfg) ? staticClient(cfg) : await readJson(dcrRef(providerRef));
|
|
230
232
|
// Prefer the REFRESH token: revoking it kills the whole grant family (RFC 7009 §2.1),
|
|
231
233
|
// whereas revoking an access token kills only that one.
|
|
@@ -304,7 +306,8 @@ export function makeOeOauthTokenVault(providers, deps = {}) {
|
|
|
304
306
|
let purged = 0;
|
|
305
307
|
let failures = 0;
|
|
306
308
|
let lastError;
|
|
307
|
-
|
|
309
|
+
const all = providersNow();
|
|
310
|
+
for (const providerRef of all.keys()) {
|
|
308
311
|
try {
|
|
309
312
|
if (await forget(providerRef, subject))
|
|
310
313
|
purged++;
|
|
@@ -314,7 +317,7 @@ export function makeOeOauthTokenVault(providers, deps = {}) {
|
|
|
314
317
|
lastError = e;
|
|
315
318
|
}
|
|
316
319
|
}
|
|
317
|
-
if (failures > 0 && purged === 0 && failures ===
|
|
320
|
+
if (failures > 0 && purged === 0 && failures === all.size)
|
|
318
321
|
throw lastError;
|
|
319
322
|
return purged;
|
|
320
323
|
},
|
|
@@ -449,7 +452,7 @@ export function makeOeOauthTokenVault(providers, deps = {}) {
|
|
|
449
452
|
try {
|
|
450
453
|
// `providers.get`, not providerConfig — see {@link ensureClient}: a discovery refresh
|
|
451
454
|
// must still resolve from a complete DCR record when the config entry is absent.
|
|
452
|
-
const cfg =
|
|
455
|
+
const cfg = providersNow().get(providerRef);
|
|
453
456
|
let tok;
|
|
454
457
|
try {
|
|
455
458
|
// The dialect decides the refresh call and nothing else about this block. A static
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-vault.js","sourceRoot":"","sources":["../../../agent/oe-oauth/token-vault.ts"],"names":[],"mappings":"AAAA,qGAAqG;AACrG,4GAA4G;AAG5G,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACtI,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAgE,MAAM,aAAa,CAAC;AACvI,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,qBAAqB,EACrB,2BAA2B,EAC3B,YAAY,EACZ,wBAAwB,EACxB,YAAY,EACZ,wBAAwB,EACxB,WAAW,EACX,uBAAuB,GAIxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,4BAA4B,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAyCjI,SAAS,cAAc,CAAC,GAAiB;IACvC,OAAQ,GAA0B,CAAC,IAAI,KAAK,oBAAoB,CAAC;AACnE,CAAC;AAmDD,MAAM,sBAAsB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,wBAAwB;AACvE,MAAM,sBAAsB,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,oCAAoC;AAE9E,2GAA2G;AAC3G,kGAAkG;AAClG,MAAM,4BAA4B,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEpD,6GAA6G;AAC7G,iGAAiG;AACjG,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC;AACzC,6GAA6G;AAC7G,wGAAwG;AACxG,MAAM,oBAAoB,GAAG,MAAM,CAAC;AACpC,2EAA2E;AAC3E,MAAM,aAAa,GAAG,GAAG,CAAC;AAE1B,MAAM,SAAS,GAAG,CAAC,EAAU,EAAiB,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AA2BvF,SAAS,UAAU,CAAC,OAAuB;IACzC,OAAO,OAAO,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,OAAO,CAAC,EAAE,EAAE,CAAC;AAC/D,CAAC;AAED,SAAS,kBAAkB;IACzB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACxE,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC;IACzE,OAAO,GAAG,UAAU,GAAG,sBAAsB,EAAE,CAAC;AAClD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,SAAqD,EAAE,IAAI,GAAqB,EAAE;IACtH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,gBAAgB,EAAE,CAAC;IAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,KAAa,EAAE,IAAkB,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1F,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC;IAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC;IACzC,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,IAAI,kBAAkB,CAAC;IAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,IAAI,sBAAsB,CAAC;IAC/D,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,IAAI,4BAA4B,CAAC;IACjF,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,sBAAsB,CAAC;IACzD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC;IACtC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,CAAC,CAAC,MAA0B,EAAE,GAAW,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAErH,MAAM,MAAM,GAAG,CAAC,WAAmB,EAAE,EAAE,CAAC,gBAAgB,WAAW,EAAE,CAAC;IACtE,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,iBAAiB,KAAK,EAAE,CAAC;IAC5D,MAAM,MAAM,GAAG,CAAC,WAAmB,EAAE,OAAuB,EAAE,EAAE,CAAC,gBAAgB,WAAW,IAAI,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;IAEtH,SAAS,cAAc,CAAC,WAAmB;QACzC,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACvC,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,kFAAkF,CAAC,CAAC;QACxI,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,UAAU,QAAQ,CAAI,GAAW;QACpC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAC9B,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAM,CAAC;QAC9B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC,CAAC,wFAAwF;QACvG,CAAC;IACH,CAAC;IAED;;gGAE4F;IAC5F,SAAS,sBAAsB,CAAC,GAAoB;QAClD,OAAO,GAAG,CAAC,kBAAkB,KAAK,SAAS,CAAC;IAC9C,CAAC;IAED;;0FAEsF;IACtF,KAAK,UAAU,eAAe,CAAC,WAAmB;QAChD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAkB,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;QACtE,IAAI,QAAQ,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC;YAAE,OAAO,QAAQ,CAAC;QACnE,MAAM,GAAG,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;QACxC,0FAA0F;QAC1F,+FAA+F;QAC/F,yFAAyF;QACzF,IAAI,oBAAoB,CAAC,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,oBAAoB,oBAAoB,4CAA4C,CAAC,CAAC;QAC/J,OAAO,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,KAAK,IAAI,EAAE;YACpD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAkB,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;YACnE,IAAI,KAAK,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC;gBAAE,OAAO,KAAK,CAAC,CAAC,sCAAsC;YACjG,IAAI,KAAK,EAAE,CAAC;gBACV,yFAAyF;gBACzF,sFAAsF;gBACtF,0EAA0E;gBAC1E,IAAI,CAAC;oBACH,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;oBACjE,IAAI,SAAS,CAAC,kBAAkB,KAAK,SAAS;wBAAE,OAAO,KAAK,CAAC,CAAC,+BAA+B;oBAC7F,MAAM,UAAU,GAAoB,EAAE,GAAG,KAAK,EAAE,kBAAkB,EAAE,SAAS,CAAC,kBAAkB,EAAE,CAAC;oBACnG,MAAM,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;oBAC/F,OAAO,UAAU,CAAC;gBACpB,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC,iDAAiD,WAAW,gCAAgC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACvJ,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YACD,MAAM,WAAW,GAAG,aAAa,EAAE,CAAC;YACpC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,uFAAuF,CAAC,CAAC;YACrI,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACjE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,cAAc,CACvC,SAAS,CAAC,oBAAoB;YAC9B,0FAA0F;YAC1F,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,gBAAgB,EAAE,EAAE,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAChH,OAAO,CACR,CAAC;YACF,MAAM,MAAM,GAAoB;gBAC9B,QAAQ;gBACR,qBAAqB,EAAE,SAAS,CAAC,qBAAqB;gBACtD,aAAa,EAAE,SAAS,CAAC,aAAa;gBACtC,oBAAoB,EAAE,SAAS,CAAC,oBAAoB;gBACpD,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,SAAS,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7F,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7C,YAAY,EAAE,GAAG,EAAE;aACpB,CAAC;YACF,MAAM,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;YAC3F,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;IAED;qGACiG;IACjG,SAAS,YAAY,CAAC,GAAgC;QACpD,OAAO;YACL,IAAI,EAAE,oBAAoB;YAC1B,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,qBAAqB,EAAE,GAAG,CAAC,qBAAqB;YAChD,aAAa,EAAE,GAAG,CAAC,aAAa;YAChC,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjF,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7C,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzE,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,KAAK,UAAU,YAAY,CAAC,WAAmB;QAC7C,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACvC,OAAO,GAAG,KAAK,SAAS,IAAI,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAC3G,CAAC;IAED;;;;;;OAMG;IACH,KAAK,UAAU,qBAAqB,CAAC,GAAgC;QACnE,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;QAChF,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CACb,eAAe,GAAG,CAAC,GAAG,sCAAsC,GAAG,CAAC,eAAe,cAAc,GAAG,CAAC,kBAAkB,2BAA2B;gBAC5I,iCAAiC,GAAG,CAAC,eAAe,6CAA6C,CACpG,CAAC;QACJ,CAAC;QACD,OAAO;YACL,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,YAAY,EAAE,MAAM;YACpB,YAAY,EAAE,GAAG,CAAC,YAAY;YAC9B,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3D,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,KAAK,UAAU,kBAAkB,CAAC,OAAsB,EAAE,IAAY;QACpE,iGAAiG;QACjG,gGAAgG;QAChG,iEAAiE;QACjE,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC/C,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,KAAK,oBAAoB,CAAC;QAC5D,IAAI,GAAG,KAAK,SAAS,IAAI,oBAAoB,CAAC,GAAG,CAAC,KAAK,aAAa,EAAE,CAAC;YACrE,MAAM,IAAI,KAAK,CACb,eAAe,OAAO,CAAC,WAAW,oCAAoC,aAAa,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,sBAAsB,IAAI;gBAC/I,qEAAqE,CACxE,CAAC;QACJ,CAAC;QACD,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpD,MAAM,IAAI,KAAK,CAAC,eAAe,OAAO,CAAC,WAAW,4HAA4H,CAAC,CAAC;YAClL,CAAC;YACD,OAAO,wBAAwB,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,MAAM,qBAAqB,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;QAChJ,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,eAAe,OAAO,CAAC,WAAW,2EAA2E,CAAC,CAAC;QACtJ,OAAO,YAAY,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IAC1L,CAAC;IAED,SAAS,SAAS,CAAC,GAAgB;QACjC,OAAO,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,GAAG,EAAE,IAAI,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;IACtE,CAAC;IAED,KAAK,UAAU,UAAU,CAAC,WAAmB,EAAE,OAAuB,EAAE,GAAuB,EAAE,YAAqB;QACpH,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,IAAI,YAAY,CAAC,CAAC,qDAAqD;QACxG,MAAM,MAAM,GAAgB;YAC1B,WAAW,EAAE,GAAG,CAAC,YAAY;YAC7B,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7C,GAAG,CAAC,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,UAAU,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3F,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxE,UAAU,EAAE,GAAG,EAAE;SAClB,CAAC;QACF,MAAM,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;QACpG,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACH,KAAK,UAAU,MAAM,CAAC,WAAmB,EAAE,OAAuB;QAChE,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACzC,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;YACpC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAc,GAAG,CAAC,CAAC;YAC7C,IAAI,GAAG,EAAE,CAAC;gBACR,4FAA4F;gBAC5F,yFAAyF;gBACzF,wFAAwF;gBACxF,+EAA+E;gBAC/E,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBACvC,MAAM,MAAM,GAAwB,GAAG,IAAI,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAkB,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;gBAChJ,sFAAsF;gBACtF,wDAAwD;gBACxD,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,WAAW,CAAC;gBAClD,IAAI,MAAM,EAAE,kBAAkB,IAAI,KAAK,EAAE,CAAC;oBACxC,IAAI,CAAC;wBACH,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAE,eAAyB,CAAC,CAAC,CAAE,cAAwB,CAAC;wBACvF,IAAI,GAAG,IAAI,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC;4BACrC,MAAM,uBAAuB,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE,MAAM,qBAAqB,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;wBACtI,CAAC;6BAAM,CAAC;4BACN,MAAM,WAAW,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;wBACnH,CAAC;oBACH,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,oFAAoF;wBACpF,wFAAwF;wBACxF,+DAA+D;wBAC/D,OAAO,CAAC,IAAI,CAAC,qDAAqD,WAAW,+BAA+B,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC5J,CAAC;gBACH,CAAC;YACH,CAAC;YACD,+FAA+F;YAC/F,sFAAsF;YACtF,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,UAAU,mBAAmB;QAChC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QACpD,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,0FAA0F;YAC1F,4FAA4F;YAC5F,6FAA6F;YAC7F,4FAA4F;YAC5F,6FAA6F;YAC7F,8BAA8B;YAC9B,IAAI,GAAyB,CAAC;YAC9B,IAAI,CAAC;gBACH,GAAG,GAAG,MAAM,QAAQ,CAAgB,GAAG,CAAC,CAAC;YAC3C,CAAC;YAAC,MAAM,CAAC;gBACP,UAAU,EAAE,CAAC;gBACb,SAAS;YACX,CAAC;YACD,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACjF,UAAU,EAAE,CAAC;gBACb,SAAS;YACX,CAAC;YACD,IAAI,GAAG,EAAE,IAAI,GAAG,CAAC,SAAS,GAAG,gBAAgB,EAAE,CAAC;gBAC9C,IAAI,EAAE,CAAC;gBACP,SAAS;YACX,CAAC;YACD,IAAI,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC;gBAAE,OAAO,EAAE,CAAC;QACzC,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC7D,CAAC;IAED,OAAO;QACL,UAAU;QAEV,wEAAwE;QACxE,MAAM;QAEN,oFAAoF;QACpF,mBAAmB;QAEnB;;;WAGG;QACH,KAAK,CAAC,SAAS,CAAC,OAAuB;YACrC,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,IAAI,QAAQ,GAAG,CAAC,CAAC;YACjB,IAAI,SAAkB,CAAC;YACvB,KAAK,MAAM,WAAW,IAAI,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC3C,IAAI,CAAC;oBACH,IAAI,MAAM,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC;wBAAE,MAAM,EAAE,CAAC;gBACnD,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,QAAQ,EAAE,CAAC;oBACX,SAAS,GAAG,CAAC,CAAC;gBAChB,CAAC;YACH,CAAC;YACD,IAAI,QAAQ,GAAG,CAAC,IAAI,MAAM,KAAK,CAAC,IAAI,QAAQ,KAAK,SAAS,CAAC,IAAI;gBAAE,MAAM,SAAS,CAAC;YACjF,OAAO,MAAM,CAAC;QAChB,CAAC;QAED;;;;;WAKG;QACH,KAAK,CAAC,QAAQ,CAAC,WAAmB,EAAE,OAAuB;YACzD,OAAO,CAAC,MAAM,QAAQ,CAAc,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;QAC9E,CAAC;QAED;;;WAGG;QACH,KAAK,CAAC,kBAAkB,CACtB,WAAmB,EACnB,OAAuB,EACvB,OAAsE;YAEtE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,CAAC;YAC/C,MAAM,WAAW,GAAG,aAAa,EAAE,CAAC;YACpC,IAAI,CAAC,WAAW;gBAAE,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,+DAA+D,CAAC,CAAC;YAC7H,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;YACzB,4FAA4F;YAC5F,mFAAmF;YACnF,MAAM,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YAClF,MAAM,OAAO,GAAkB;gBAC7B,WAAW;gBACX,OAAO;gBACP,YAAY,EAAE,IAAI,CAAC,QAAQ;gBAC3B,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC5F,WAAW;gBACX,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,SAAS,EAAE,GAAG,EAAE;gBAChB,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,WAAW,IAAI,UAAU,CAAC;gBACtD,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACzD,CAAC;YACF,MAAM,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;YACvF,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,CAAC;gBAChC,CAAC,CAAC,2BAA2B,CAAC;oBAC1B,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;oBACnD,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,WAAW;oBACX,KAAK;oBACL,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACnD,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC3E,CAAC;gBACJ,CAAC,CAAC,qBAAqB,CAAC;oBACpB,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;oBACnD,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,WAAW;oBACX,KAAK;oBACL,aAAa,EAAE,IAAI,CAAC,SAAS;oBAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACpD,CAAC,CAAC;YACP,IAAI,CAAC;gBACH,MAAM,mBAAmB,EAAE,CAAC;YAC9B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,sFAAsF,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACnJ,CAAC;YACD,OAAO,EAAE,GAAG,EAAE,CAAC;QACjB,CAAC;QAED;;;;;;;WAOG;QACH,KAAK,CAAC,qBAAqB,CAAC,KAAa,EAAE,IAAY;YACrD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAgB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YAC9D,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACxE,IAAI,OAAO,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YAC1E,IAAI,GAAG,EAAE,GAAG,OAAO,CAAC,SAAS;gBAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC9E,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACpD,kGAAkG;YAClG,gGAAgG;YAChG,qEAAqE;YACrE,kGAAkG;YAClG,gGAAgG;YAChG,iGAAiG;YACjG,6FAA6F;YAC7F,kGAAkG;YAClG,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAc,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;YACrG,MAAM,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAC5D,mFAAmF;YACnF,6FAA6F;YAC7F,qFAAqF;YACrF,0FAA0F;YAC1F,2FAA2F;YAC3F,2DAA2D;YAC3D,MAAM,KAAK,CAAC,KAAK,CACf,OAAO,CAAC,KAAK,CAAC,EACd,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,EACpF,EAAE,SAAS,EAAE,OAAO,CAAC,WAAW,EAAE,CACnC,CAAC;YACF,+FAA+F;YAC/F,2FAA2F;YAC3F,2FAA2F;YAC3F,iEAAiE;YACjE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;QAC3I,CAAC;QAED;;;WAGG;QACH,KAAK,CAAC,cAAc,CAAC,WAAmB,EAAE,OAAuB;YAC/D,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACzC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAc,GAAG,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,wBAAwB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACpE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAAE,OAAO,IAAI,CAAC,WAAW,CAAC;YAE9C,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;gBACpC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAc,GAAG,CAAC,CAAC;gBAC7C,IAAI,CAAC,GAAG;oBAAE,MAAM,IAAI,wBAAwB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBACnE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;oBAAE,OAAO,GAAG,CAAC,WAAW,CAAC,CAAC,yCAAyC;gBACtF,IAAI,CAAC,GAAG,CAAC,YAAY;oBAAE,MAAM,IAAI,0BAA0B,CAAC,WAAW,EAAE,OAAO,EAAE,yBAAyB,CAAC,CAAC;gBAC7G,MAAM,gBAAgB,GAAG,GAAG,CAAC,YAAY,CAAC;gBAE1C,6FAA6F;gBAC7F,+FAA+F;gBAC/F,oGAAoG;gBACpG,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;gBAC7B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,kBAAkB,CAAC,CAAC;gBACvE,IAAI,GAAG,EAAE,CAAC;oBACR,IAAI,CAAC;wBACH,sFAAsF;wBACtF,iFAAiF;wBACjF,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;wBACvC,IAAI,GAAuB,CAAC;wBAC5B,IAAI,CAAC;4BACH,mFAAmF;4BACnF,mEAAmE;4BACnE,IAAI,GAAG,KAAK,SAAS,IAAI,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC;gCACnD,GAAG,GAAG,MAAM,wBAAwB,CAClC,GAAG,CAAC,aAAa,EACjB,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EACjF,MAAM,qBAAqB,CAAC,GAAG,CAAC,EAChC,OAAO,CACR,CAAC;4BACJ,CAAC;iCAAM,CAAC;gCACN,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC,CAAC;gCAClD,GAAG,GAAG,MAAM,YAAY,CACtB,MAAM,CAAC,aAAa,EACpB,EAAE,YAAY,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAC7I,OAAO,CACR,CAAC;4BACJ,CAAC;wBACH,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;gCACtB,uFAAuF;gCACvF,uFAAuF;gCACvF,iDAAiD;gCACjD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAc,GAAG,CAAC,CAAC;gCAC9C,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,KAAK,GAAG,CAAC,YAAY;oCAAE,OAAO,IAAI,CAAC,WAAW,CAAC;gCAChG,MAAM,IAAI,0BAA0B,CAAC,WAAW,EAAE,OAAO,EAAE,wCAAwC,CAAC,CAAC;4BACvG,CAAC;4BACD,MAAM,CAAC,CAAC;wBACV,CAAC;wBACD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;wBAC7E,OAAO,MAAM,CAAC,WAAW,CAAC;oBAC5B,CAAC;4BAAS,CAAC;wBACT,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;oBACzC,CAAC;gBACH,CAAC;gBAED,0FAA0F;gBAC1F,4FAA4F;gBAC5F,0FAA0F;gBAC1F,MAAM,QAAQ,GAAG,GAAG,EAAE,GAAG,oBAAoB,CAAC;gBAC9C,SAAS,CAAC;oBACR,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAc,GAAG,CAAC,CAAC;oBAC9C,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;wBAAE,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,mCAAmC;oBAC1F,IAAI,GAAG,EAAE,IAAI,QAAQ;wBAAE,MAAM,IAAI,4BAA4B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;oBACpF,MAAM,KAAK,CAAC,aAAa,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"token-vault.js","sourceRoot":"","sources":["../../../agent/oe-oauth/token-vault.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import type { UserAuthFlowProvider, OeOauthCallbackCompleter, CredentialPurgeHook } from "@open-everywhere/core/agent/adapter-api.js";
|
|
2
|
-
import type
|
|
3
|
-
import { type OeOauthVaultDeps } from "./token-vault.js";
|
|
2
|
+
import { type OeOauthProviderSource, type OeOauthVaultDeps } from "./token-vault.js";
|
|
4
3
|
/** Build the own-rolled provider plus the callback completer, sharing one token vault. `deps` is the DI seam. */
|
|
5
|
-
export declare function makeOeOauth(providers:
|
|
4
|
+
export declare function makeOeOauth(providers: OeOauthProviderSource, deps?: OeOauthVaultDeps): {
|
|
6
5
|
readonly flow: UserAuthFlowProvider;
|
|
7
6
|
readonly completer: OeOauthCallbackCompleter;
|
|
8
7
|
readonly purge: CredentialPurgeHook;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-auth-flow.d.ts","sourceRoot":"","sources":["../../../agent/oe-oauth/user-auth-flow.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAwC,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAC5K,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"user-auth-flow.d.ts","sourceRoot":"","sources":["../../../agent/oe-oauth/user-auth-flow.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAwC,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAC5K,OAAO,EAAyB,KAAK,qBAAqB,EAAE,KAAK,gBAAgB,EAAuB,MAAM,kBAAkB,CAAC;AAQjI,iHAAiH;AACjH,wBAAgB,WAAW,CACzB,SAAS,EAAE,qBAAqB,EAChC,IAAI,GAAE,gBAAqB,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,wBAAwB,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAA;CAAE,CAyD5H"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-auth-flow.js","sourceRoot":"","sources":["../../../agent/oe-oauth/user-auth-flow.ts"],"names":[],"mappings":"AAAA,yGAAyG;AACzG,wGAAwG;
|
|
1
|
+
{"version":3,"file":"user-auth-flow.js","sourceRoot":"","sources":["../../../agent/oe-oauth/user-auth-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,9 @@ export interface StoreWiring {
|
|
|
39
39
|
/** What one `registerDefaultAdapters()` call wired. */
|
|
40
40
|
export interface DefaultAdapterWiring {
|
|
41
41
|
readonly providers: readonly string[];
|
|
42
|
+
/** The own-rolled OAuth flow registered. Always true since OPE-2411 deleted the master flag. A mint for an
|
|
43
|
+
* OAuth home no connection declares fails closed unless the vault already holds a client record or an unexpired token for it;
|
|
44
|
+
* the off switch is the bundle's `user-oauth` grant. */
|
|
42
45
|
readonly oeOauth: boolean;
|
|
43
46
|
readonly dbCredentialBroker: boolean;
|
|
44
47
|
readonly agentBrowser: boolean;
|
|
@@ -54,10 +57,11 @@ export interface DefaultAdapterWiring {
|
|
|
54
57
|
*
|
|
55
58
|
* The PGlite floor (OPE-113) arms when the operational selection resolves to it (no provider named,
|
|
56
59
|
* no `DATABASE_URL`). It stays off on Vercel, where the floor is per-instance and ephemeral, unless
|
|
57
|
-
* `
|
|
58
|
-
*
|
|
60
|
+
* the `storage.allowEphemeralOperational` setting names the single-instance escape (it was
|
|
61
|
+
* `OE_ALLOW_EPHEMERAL_OPERATIONAL=1` until OPE-2411). The Neon gate never opens on the floor's
|
|
62
|
+
* branch, so the two never both register.
|
|
59
63
|
*/
|
|
60
|
-
export declare function decideStoreWiring(env: NodeJS.ProcessEnv, vercel: boolean): StoreWiring;
|
|
64
|
+
export declare function decideStoreWiring(env: NodeJS.ProcessEnv, vercel: boolean, allowEphemeralOperational: boolean): StoreWiring;
|
|
61
65
|
/** What `registerDefaultAdapters()` wired in this process, or `undefined` before it runs. */
|
|
62
66
|
export declare function defaultAdapterWiring(): DefaultAdapterWiring | undefined;
|
|
63
67
|
/**
|