@apifuse/provider-sdk 2.2.0-beta.1 → 2.2.0-beta.3

package/src/server/serve.ts

@@ -6,9 +6,10 @@ import { z } from "zod";
 import { AuthAbortError, createAuthFlowHelpers } from "../auth";
 import {
 	AuthError,
+	isProviderError,
+	isSessionExpiredError,
+	isTransportError,
 	ProviderError,
-	SessionExpiredError,
-	TransportError,
 } from "../errors";
 import {
 	loadProviderLocaleCatalogs,
@@ -196,7 +197,7 @@ export function resolveProviderProxyAffinityKey(
 	operationId: string,
 ): string {
 	const connectionKey =
-		request.connection?.id ?? request.connection?.externalRef;
+		resolveOperationConnectionId(request) ?? request.connection?.externalRef;
 	const affinity =
 		typeof provider.proxy === "object"
 			? provider.proxy.session?.affinity
@@ -207,6 +208,12 @@ export function resolveProviderProxyAffinityKey(
 	return connectionKey ?? provider.id;
 }
 
+function resolveOperationConnectionId(
+	request: OperationRequest,
+): string | undefined {
+	return request.connection?.id ?? request.connectionId;
+}
+
 function createProviderContext(
 	provider: ProviderDefinition,
 	request: OperationRequest,
@@ -245,7 +252,7 @@ function createProviderContext(
 		values: request.connection?.secrets,
 	});
 	const requestContext = {
-		connectionId: request.connection?.id,
+		connectionId: resolveOperationConnectionId(request),
 		headers: request.headers ?? {},
 	};
 	const context = wrapWithInstrumentation({
@@ -501,7 +508,7 @@ function toErrorResponse(
 	error: unknown,
 	requestId?: string,
 ): OperationErrorResponse {
-	if (error instanceof ProviderError) {
+	if (isProviderError(error)) {
 		const details = publicProviderErrorDetails(error);
 		return {
 			error: {
@@ -557,7 +564,12 @@ function isPlainRecord(value: unknown): value is Record<string, unknown> {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
-function providerObservabilityDetails(error: ProviderError):
+// Accepts `unknown` so the branded guards narrow cleanly from the top: the
+// subtype error classes are structurally compatible with ProviderError, so
+// narrowing from a ProviderError-typed value would collapse the negative branch
+// to `never`. Narrowing from unknown avoids that while still recognizing errors
+// from a duplicate SDK module instance.
+function providerObservabilityDetails(error: unknown):
 	| {
 			category: ProviderErrorCategory;
 			taxonomyVersion: string;
@@ -570,14 +582,14 @@ function providerObservabilityDetails(error: ProviderError):
 	// operation (see design.md §4.3 D3). Without this branch the auth error would
 	// serialize as a bare 401 with no retryable/category, losing the refresh
 	// signal for exactly the retryOnAuthRefresh operations it is meant to enable.
-	if (error instanceof SessionExpiredError) {
+	if (isSessionExpiredError(error)) {
 		return {
 			category: error.options?.category ?? "credential_expired",
 			taxonomyVersion: PROVIDER_OBSERVABILITY_TAXONOMY_VERSION,
 			retryable: error.options?.retryable ?? false,
 		};
 	}
-	if (!(error instanceof TransportError)) {
+	if (!isTransportError(error)) {
 		return undefined;
 	}
 	const isProxyPoolCode =
@@ -610,7 +622,7 @@ function providerObservabilityDetails(error: ProviderError):
 }
 
 function publicProviderErrorMessage(error: ProviderError): string {
-	if (error instanceof TransportError) {
+	if (isTransportError(error)) {
 		if (error.code === PROXY_AUTH_IP_DENIED_CODE) {
 			return error.message;
 		}
@@ -640,11 +652,11 @@ function toStatusCode(
 		return 400;
 	}
 
-	if (error instanceof TransportError) {
+	if (isTransportError(error)) {
 		return error.code === "transport_timeout" ? 504 : 502;
 	}
 
-	if (error instanceof ProviderError) {
+	if (isProviderError(error)) {
 		switch (error.code) {
 			case "AUTH_REQUIRED":
 			case "reauth_required":
@@ -691,7 +703,7 @@ function logProviderError(
 	cost: ProviderRequestCost,
 ): void {
 	const code =
-		error instanceof ProviderError
+		isProviderError(error)
 			? (error.code ?? "provider_error")
 			: error instanceof z.ZodError
 				? "invalid_request"
@@ -699,7 +711,7 @@ function logProviderError(
 	const errorClass = error instanceof Error ? error.name : typeof error;
 	const message = error instanceof Error ? error.message : String(error);
 	const details =
-		error instanceof ProviderError
+		isProviderError(error)
 			? providerObservabilityDetails(error)
 			: undefined;
 	const emit =
@@ -716,7 +728,7 @@ function logProviderError(
 		code,
 		errorClass,
 		message,
-		...(error instanceof TransportError && error.upstreamStatus
+		...(isTransportError(error) && error.upstreamStatus
 			? { upstreamStatus: error.upstreamStatus }
 			: {}),
 		...(details

package/src/server/types.ts

@@ -21,6 +21,7 @@ export const OperationConnectionSchema = z.object({
 export const OperationRequestSchema = z.object({
 	requestId: z.string(),
 	input: z.record(z.string(), z.unknown()),
+	connectionId: z.string().optional(),
 	connection: OperationConnectionSchema.optional(),
 	headers: z.record(z.string(), z.string()).optional(),
 	trace: z.record(z.string(), z.string()).optional(),