@deslop/gateway 0.1.1233 → 0.1.1235

package/dist/client/index.html

@@ -14,11 +14,11 @@
 		<link rel="manifest" href="/manifest.webmanifest" />
 
 		<title>Gateway</title>
-		<script type="module" crossorigin src="/assets/index-GPYSTNwq.js"></script>
+		<script type="module" crossorigin src="/assets/index-kdeYQ-s9.js"></script>
 		<link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-WkwZ5CU-.js">
 		<link rel="modulepreload" crossorigin href="/assets/react-BUjtWCUj.js">
 		<link rel="modulepreload" crossorigin href="/assets/effect-DJFrJOhz.js">
-		<link rel="stylesheet" crossorigin href="/assets/index-I1PNwXTF.css">
+		<link rel="stylesheet" crossorigin href="/assets/index-CsajmayO.css">
 	</head>
 	<body>
 		<div id="root"></div>

package/dist/server.js

@@ -88279,68 +88279,8 @@ function runApp(app) {
 	});
 	runMain(pipe$1(program, scoped, provide(layerPlatform), provideService(LogToStderr, true)));
 }
-// src/services/connections/lib/utils.ts
-const gatewayUrl = String$5("APP_URL");
-function clientMetadata(url) {
-	return {
-		client_id: `${url}/oauth/client.json`,
-		client_name: "Deslop MCP gateway",
-		grant_types: ["authorization_code", "refresh_token"],
-		redirect_uris: [`${url}/oauth/callback`],
-		response_types: ["code"],
-		token_endpoint_auth_method: "none"
-	};
-}
-function connectionStatus(connection, now) {
-	return valueTags(connection.link, {
-		Authorized: (link) => match$1(link.expiresAt <= now && link.token.refresh_token === void 0, {
-			onFalse: () => "Connected",
-			onTrue: () => "Expired"
-		}),
-		Connected: () => "Connected",
-		Disconnected: () => "Not connected"
-	});
-}
-function connectionInfo(connection, now) {
-	return {
-		...match$8(fromUndefinedOr(connection.error), {
-			onNone: () => ({}),
-			onSome: (error) => ({ error })
-		}),
-		...pick$1(connection, [
-			"id",
-			"name",
-			"tools",
-			"url"
-		]),
-		icons: connection.icons ?? [],
-		status: connectionStatus(connection, now)
-	};
-}
-function serverIcons(implementation) {
-	return pipe$1(implementation?.icons ?? [], filter$5((icon) => isSome(match$3(/^(?:https:|data:image\/)/u)(icon.src)) && icon.src.length <= 32768), take$3(2), map$8((icon) => ({
-		src: icon.src,
-		...match$8(fromUndefinedOr(icon.theme), {
-			onNone: () => ({}),
-			onSome: (theme) => ({ theme })
-		})
-	})));
-}
-function summary(connection) {
-	return pipe$1(fromUndefinedOr(connection.instructions), flatMap$7((text) => fromUndefinedOr(split$1(text, /(?<=\.)\s/u)[0])), map$11(slice(0, 160)), getOrElse(() => connection.name));
-}
-function describe(cause) {
-	if (is$2(AuthError)(cause)) return cause.message;
-	if (isTagged(cause, "TimeoutError")) return "It did not answer in time";
-	if (isHttpClientError(cause) && cause.reason._tag === "StatusCodeError") return `It answered HTTP ${cause.reason.response.status}`;
-	if (hasProperty(cause, "cause") && isNotUndefined(cause.cause) && isTagged(cause, "UnknownError")) return describe(cause.cause);
-	if (hasProperty(cause, "message") && isString$1(cause.message)) return slice(0, 300)(cause.message);
-	return "It failed for an unknown reason";
-}
-function serverName(url) {
-	return pipe$1(new URL(url).hostname, replace(/^(?:api|app|mcp)\./u, ""), split$1("."), headNonEmpty, replaceAll(/[^a-z0-9_-]/giu, "-"), replaceAll(/^[^a-z0-9]+|[^a-z0-9]+$/giu, ""), slice(0, 16), toLowerCase);
-}
 // src/services/connections/schema.ts
+var UpstreamError = class extends TaggedError()("UpstreamError", { cause: Defect() }) {};
 const ServerId = String$6.check(isPattern(/^[a-z0-9][a-z0-9_-]{0,23}$/u));
 const ServerUrl = NonEmptyString.check(isMaxLength(2048), makeFilter((value) => {
 	if (!URL.canParse(value)) return false;
@@ -88424,6 +88364,67 @@ const Callback = Struct({
 	iss: optionalKey(NonEmptyString),
 	state: NonEmptyString
 });
+// src/services/connections/lib/utils.ts
+const gatewayUrl = String$5("APP_URL");
+function clientMetadata(url) {
+	return {
+		client_id: `${url}/oauth/client.json`,
+		client_name: "Deslop MCP gateway",
+		grant_types: ["authorization_code", "refresh_token"],
+		redirect_uris: [`${url}/oauth/callback`],
+		response_types: ["code"],
+		token_endpoint_auth_method: "none"
+	};
+}
+function connectionStatus(connection, now) {
+	return valueTags(connection.link, {
+		Authorized: (link) => match$1(link.expiresAt <= now && link.token.refresh_token === void 0, {
+			onFalse: () => "Connected",
+			onTrue: () => "Expired"
+		}),
+		Connected: () => "Connected",
+		Disconnected: () => "Not connected"
+	});
+}
+function connectionInfo(connection, now) {
+	return {
+		...match$8(fromUndefinedOr(connection.error), {
+			onNone: () => ({}),
+			onSome: (error) => ({ error })
+		}),
+		...pick$1(connection, [
+			"id",
+			"name",
+			"tools",
+			"url"
+		]),
+		icons: connection.icons ?? [],
+		status: connectionStatus(connection, now)
+	};
+}
+function serverIcons(implementation) {
+	return pipe$1(implementation?.icons ?? [], filter$5((icon) => isSome(match$3(/^(?:https:|data:image\/)/u)(icon.src)) && icon.src.length <= 32768), take$3(2), map$8((icon) => ({
+		src: icon.src,
+		...match$8(fromUndefinedOr(icon.theme), {
+			onNone: () => ({}),
+			onSome: (theme) => ({ theme })
+		})
+	})));
+}
+function summary(connection) {
+	return pipe$1(fromUndefinedOr(connection.instructions), flatMap$7((text) => fromUndefinedOr(split$1(text, /(?<=\.)\s/u)[0])), map$11(slice(0, 160)), getOrElse(() => connection.name));
+}
+function describe(cause) {
+	if (is$2(AuthError)(cause)) return cause.message;
+	if (isTagged(cause, "TimeoutError")) return "It did not answer in time";
+	if (isHttpClientError(cause) && cause.reason._tag === "StatusCodeError") return `It answered HTTP ${cause.reason.response.status}`;
+	if (is$2(UpstreamError)(cause)) return describe(cause.cause);
+	if (hasProperty(cause, "message") && isString$1(cause.message)) return slice(0, 300)(cause.message);
+	return "It failed for an unknown reason";
+}
+function serverName(url) {
+	return pipe$1(new URL(url).hostname, replace(/^(?:api|app|mcp)\./u, ""), split$1("."), headNonEmpty, replaceAll(/[^a-z0-9_-]/giu, "-"), replaceAll(/^[^a-z0-9]+|[^a-z0-9]+$/giu, ""), slice(0, 16), toLowerCase);
+}
 // ../../node_modules/.pnpm/@modelcontextprotocol+client@2.4.0/node_modules/@modelcontextprotocol/client/dist/chunk-DYPzFuB5.mjs
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -115150,30 +115151,39 @@ var Connections = class Connections extends Service$1()("@deslop/gateway/service
 				method: "tools/list",
 				params: {}
 			});
-			const response = yield* tryPromise((signal) => fetch(initial.url, {
-				body: probe,
-				headers: {
-					accept: "application/json, text/event-stream",
-					"content-type": "application/json",
-					"mcp-protocol-version": "2025-06-18"
-				},
-				method: "POST",
-				signal
-			}));
+			const response = yield* tryPromise({
+				catch: (cause) => UpstreamError.make({ cause }),
+				try: (signal) => fetch(initial.url, {
+					body: probe,
+					headers: {
+						accept: "application/json, text/event-stream",
+						"content-type": "application/json",
+						"mcp-protocol-version": "2025-06-18"
+					},
+					method: "POST",
+					signal
+				})
+			});
 			const challenge = extractWWWAuthenticateParams(response);
 			yield* match$8(fromNullishOr(response.body), {
 				onNone: () => void_$1,
 				onSome: fnUntraced(function* (body) {
-					yield* tryPromise(() => body.cancel());
+					yield* tryPromise({
+						catch: (cause) => UpstreamError.make({ cause }),
+						try: () => body.cancel()
+					});
+				})
+			});
+			const discovery = yield* tryPromise({
+				catch: (cause) => UpstreamError.make({ cause }),
+				try: (signal) => discoverOAuthServerInfo(initial.url, {
+					fetchFn: (target, init) => fetch(target, {
+						...init,
+						signal: AbortSignal.any([signal, ...toArray$1(fromNullishOr(init?.signal))])
+					}),
+					resourceMetadataUrl: challenge.resourceMetadataUrl
 				})
 			});
-			const discovery = yield* tryPromise((signal) => discoverOAuthServerInfo(initial.url, {
-				fetchFn: (target, init) => fetch(target, {
-					...init,
-					signal: AbortSignal.any([signal, ...toArray$1(fromNullishOr(init?.signal))])
-				}),
-				resourceMetadataUrl: challenge.resourceMetadataUrl
-			}));
 			if (discovery.resourceMetadata !== void 0 && discovery.resourceMetadata.resource !== initial.url) return yield* AuthError.make({ message: "The MCP metadata names a different resource URL." });
 			if (discovery.authorizationServerMetadata === void 0) {
 				const transport = new StreamableHTTPClientTransport(new URL(initial.url), {
@@ -115183,12 +115193,21 @@ var Connections = class Connections extends Service$1()("@deslop/gateway/service
 				const anonymous = yield* acquireRelease(sync(() => new Client({
 					name: "Deslop MCP gateway",
 					version: "0.1.0"
-				}, { versionNegotiation: { mode: "auto" } })), (acquired) => pipe$1(tryPromise(() => transport.terminateSession()), timeout("3 seconds"), ignore$1({
+				}, { versionNegotiation: { mode: "auto" } })), (acquired) => pipe$1(tryPromise({
+					catch: (cause) => UpstreamError.make({ cause }),
+					try: () => transport.terminateSession()
+				}), timeout("3 seconds"), ignore$1({
 					log: "Warn",
 					message: "Cannot terminate the anonymous MCP session"
 				}), andThen(promise(() => acquired.close()))));
-				yield* tryPromise((signal) => anonymous.connect(transport, { signal }));
-				const tools = yield* tryPromise((signal) => anonymous.listTools(void 0, { signal }));
+				yield* tryPromise({
+					catch: (cause) => UpstreamError.make({ cause }),
+					try: (signal) => anonymous.connect(transport, { signal })
+				});
+				const tools = yield* tryPromise({
+					catch: (cause) => UpstreamError.make({ cause }),
+					try: (signal) => anonymous.listTools(void 0, { signal })
+				});
 				return {
 					...initial,
 					...match$8(fromUndefinedOr(anonymous.getInstructions()), {
@@ -115541,10 +115560,16 @@ var Gateway = class Gateway extends Service$1()("@deslop/gateway/services/gatewa
 				const client = yield* acquireRelease(sync(() => new Client({
 					name: "Deslop MCP gateway",
 					version: "0.1.0"
-				}, { versionNegotiation: { mode: "auto" } })), (acquired) => pipe$1(tryPromise(() => transport.terminateSession()), timeout("3 seconds"), ignore$1({
+				}, { versionNegotiation: { mode: "auto" } })), (acquired) => pipe$1(tryPromise({
+					catch: rejected(server),
+					try: () => transport.terminateSession()
+				}), timeout("3 seconds"), ignore$1({
 					log: "Warn",
 					message: "Cannot terminate the upstream MCP session"
-				}), andThen(tryPromise(() => acquired.close())), ignore$1({
+				}), andThen(tryPromise({
+					catch: rejected(server),
+					try: () => acquired.close()
+				})), ignore$1({
 					log: "Warn",
 					message: "Cannot close the upstream MCP client"
 				})));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@deslop/gateway",
-	"version": "0.1.1233",
+	"version": "0.1.1235",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/MP281X/deslop.git",
@@ -32,5 +32,5 @@
 	"engines": {
 		"node": ">=26"
 	},
-	"fingerprint": "e88c3bfa5c0dd63a1e02b41780a1decbdb09a3d57b6a62e3f3421d5baf9e913c"
+	"fingerprint": "db6a86a7c68347b9ff507f6dfce470b3c8b34f1998d668762c03dcdf523dc972"
 }