@kya-os/mcp-i-cloudflare 1.6.40-canary.1 → 1.6.40-canary.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/server.d.ts +8 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +25 -25
- package/dist/server.js.map +1 -1
- package/package.json +1 -1
package/dist/server.d.ts
CHANGED
|
@@ -34,6 +34,14 @@ export declare class MCPICloudflareServer {
|
|
|
34
34
|
* This is called lazily to avoid await in constructor
|
|
35
35
|
*/
|
|
36
36
|
private initializeProviderServices;
|
|
37
|
+
/**
|
|
38
|
+
* Ensure provider services are initialized before handling OAuth-related routes.
|
|
39
|
+
* This prevents race conditions where consent/callback routes are hit before
|
|
40
|
+
* the async provider initialization completes.
|
|
41
|
+
*
|
|
42
|
+
* Safe to call multiple times - subsequent calls return immediately after first resolution.
|
|
43
|
+
*/
|
|
44
|
+
private ensureProviderServicesReady;
|
|
37
45
|
/**
|
|
38
46
|
* Handle incoming request
|
|
39
47
|
* Routes to appropriate handler based on path
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AA8B5D,MAAM,WAAW,2BAA2B;IAC1C,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,uBAAuB,CAAC;IAChC,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;AAED,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,YAAY,CAAC,CAAe;IACpC,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,GAAG,CAAgB;IAC3B,OAAO,CAAC,aAAa,CAAgB;IAErC,OAAO,CAAC,gBAAgB,CAAC,CAAgD;IACzE,OAAO,CAAC,gBAAgB,CAAC,CAAqD;IAE9E,OAAO,CAAC,2BAA2B,CAAC,CAAgB;gBAExC,OAAO,EAAE,2BAA2B;IA6DhD;;;OAGG;YACW,0BAA0B;IAsExC;;;;;;OAMG;YACW,2BAA2B;IAgBzC;;;OAGG;IACG,aAAa,CACjB,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,gBAAgB,GACrB,OAAO,CAAC,QAAQ,CAAC;IAmFpB;;OAEG;YACW,mBAAmB;IA2CjC;;OAEG;IACG,eAAe,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB3D;;OAEG;IACH,oBAAoB,IAAI,iBAAiB;IAIzC;;OAEG;IACH,eAAe,IAAI,YAAY;IAI/B;;OAEG;IACH,eAAe,IAAI,YAAY,GAAG,SAAS;IAI3C;;OAEG;IACH,iBAAiB,IAAI,cAAc;IAInC;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAWxB;;;;;OAKG;YACW,WAAW;CAmB1B"}
|
package/dist/server.js
CHANGED
|
@@ -13,7 +13,7 @@ import { ProofVerifier } from "@kya-os/mcp-i-core";
|
|
|
13
13
|
import { WebCryptoProvider } from "./providers/crypto";
|
|
14
14
|
// CRITICAL: Import the OAuth service registry - this triggers globalThis registration
|
|
15
15
|
// at module load time, preventing esbuild from tree-shaking the OAuth services
|
|
16
|
-
import { getOAuthServices, isOAuthServicesAvailable } from "./utils/oauth-service-registry";
|
|
16
|
+
import { getOAuthServices, isOAuthServicesAvailable, } from "./utils/oauth-service-registry";
|
|
17
17
|
import { WorkersClockProvider, WorkersFetchProvider, KVNonceCacheProvider, } from "./providers/storage";
|
|
18
18
|
// CRITICAL: Force OAuth registry evaluation at module load time
|
|
19
19
|
// This creates an observable side effect that esbuild cannot tree-shake
|
|
@@ -135,6 +135,25 @@ export class MCPICloudflareServer {
|
|
|
135
135
|
// Admin service and other features should work without them
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
|
+
/**
|
|
139
|
+
* Ensure provider services are initialized before handling OAuth-related routes.
|
|
140
|
+
* This prevents race conditions where consent/callback routes are hit before
|
|
141
|
+
* the async provider initialization completes.
|
|
142
|
+
*
|
|
143
|
+
* Safe to call multiple times - subsequent calls return immediately after first resolution.
|
|
144
|
+
*/
|
|
145
|
+
async ensureProviderServicesReady() {
|
|
146
|
+
if (!this.providerServicesInitPromise) {
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
try {
|
|
150
|
+
await this.providerServicesInitPromise;
|
|
151
|
+
}
|
|
152
|
+
catch (error) {
|
|
153
|
+
// Log but don't throw - consent service has fallback to bouncer mode
|
|
154
|
+
console.warn("[MCPICloudflareServer] Provider services init failed:", error);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
138
157
|
/**
|
|
139
158
|
* Handle incoming request
|
|
140
159
|
* Routes to appropriate handler based on path
|
|
@@ -148,19 +167,9 @@ export class MCPICloudflareServer {
|
|
|
148
167
|
headers: { "Content-Type": "text/plain" },
|
|
149
168
|
});
|
|
150
169
|
}
|
|
151
|
-
// Consent routes
|
|
170
|
+
// Consent routes - wait for provider services before handling
|
|
152
171
|
if (url.pathname.startsWith("/consent")) {
|
|
153
|
-
|
|
154
|
-
// This ensures providerRegistry is available for direct PKCE mode
|
|
155
|
-
if (this.providerServicesInitPromise) {
|
|
156
|
-
try {
|
|
157
|
-
await this.providerServicesInitPromise;
|
|
158
|
-
}
|
|
159
|
-
catch (error) {
|
|
160
|
-
// Provider init failed - consent service will use fallback
|
|
161
|
-
console.warn("[MCPICloudflareServer] Provider services init failed, consent will use fallback mode:", error);
|
|
162
|
-
}
|
|
163
|
-
}
|
|
172
|
+
await this.ensureProviderServicesReady();
|
|
164
173
|
return this.consentService.handle(request);
|
|
165
174
|
}
|
|
166
175
|
// Admin routes (if enabled)
|
|
@@ -209,18 +218,9 @@ export class MCPICloudflareServer {
|
|
|
209
218
|
});
|
|
210
219
|
}
|
|
211
220
|
}
|
|
212
|
-
// OAuth callback
|
|
221
|
+
// OAuth callback - wait for provider services before handling
|
|
213
222
|
if (url.pathname === "/oauth/callback") {
|
|
214
|
-
|
|
215
|
-
// This ensures providerRegistry is available for token exchange
|
|
216
|
-
if (this.providerServicesInitPromise) {
|
|
217
|
-
try {
|
|
218
|
-
await this.providerServicesInitPromise;
|
|
219
|
-
}
|
|
220
|
-
catch (error) {
|
|
221
|
-
console.warn("[MCPICloudflareServer] Provider services init failed for OAuth callback:", error);
|
|
222
|
-
}
|
|
223
|
-
}
|
|
223
|
+
await this.ensureProviderServicesReady();
|
|
224
224
|
return this.handleOAuthCallback(request);
|
|
225
225
|
}
|
|
226
226
|
// MCP protocol routes are handled by scaffolded code (McpAgent)
|
|
@@ -233,7 +233,7 @@ export class MCPICloudflareServer {
|
|
|
233
233
|
*/
|
|
234
234
|
async handleOAuthCallback(request) {
|
|
235
235
|
// Initialize OAuthSecurityService for CSRF protection
|
|
236
|
-
const { OAuthSecurityService } = await import(
|
|
236
|
+
const { OAuthSecurityService } = await import("./services/oauth-security.service");
|
|
237
237
|
const oauthSecurityService = this.env.DELEGATION_STORAGE
|
|
238
238
|
? new OAuthSecurityService(this.env.DELEGATION_STORAGE, this.env.OAUTH_ENCRYPTION_SECRET)
|
|
239
239
|
: undefined;
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,sFAAsF;AACtF,+EAA+E;AAC/E,OAAO,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|