From 863ea413649484b5761cd0c5c0e54c559a5c8b52 Mon Sep 17 00:00:00 2001 From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Date: Wed, 21 Oct 2026 13:34:23 -0500 Subject: [PATCH] refactor(ai): type Bedrock event-stream frames without casts or runtime checks (#57609) --- packages/ai/src/protocols/bedrock-converse.ts | 2 +- .../ai/src/protocols/bedrock-event-stream.ts | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/packages/ai/src/protocols/bedrock-converse.ts b/packages/ai/src/protocols/bedrock-converse.ts index 0eeba2f57c7..69030465f60 100644 --- a/packages/ai/src/protocols/bedrock-converse.ts +++ b/packages/ai/src/protocols/bedrock-converse.ts @@ -860,7 +860,7 @@ export const protocol = Protocol.make({ from: fromRequest, }, stream: { - event: BedrockEvent, + event: BedrockEventStream.Frame.pipe(Schema.decodeTo(BedrockEvent)), initial: (request) => ({ providerMetadataKey: request.model.route.providerMetadataKey ?? String(request.model.provider), tools: ToolStream.empty(), diff --git a/packages/ai/src/protocols/bedrock-event-stream.ts b/packages/ai/src/protocols/bedrock-event-stream.ts index af81da859c2..6a385b442be 100644 --- a/packages/ai/src/protocols/bedrock-event-stream.ts +++ b/packages/ai/src/protocols/bedrock-event-stream.ts @@ -1,6 +1,6 @@ import { EventStreamCodec } from "@smithy/eventstream-codec" import { fromUtf8, toUtf8 } from "@smithy/util-utf8" -import { Effect, Stream } from "effect" +import { Effect, Schema, Stream } from "effect" import { Base64 } from "effect/encoding" import { AIError, AIErrorReason, InvalidProviderOutputError } from "../schema/index.js" import { Framing } from "../route/framing.js" @@ -23,6 +23,9 @@ interface FrameBufferState { const initialFrameBuffer: FrameBufferState = { buffer: new Uint8Array(0), offset: 0 } +export const Frame = Schema.StructWithRest(Schema.Struct({ rawBody: Schema.String }), [ProviderShared.JsonObject]) +export type Frame = typeof Frame.Type + type FrameInput = { readonly _tag: "Chunk"; readonly bytes: Uint8Array } | { readonly _tag: "End" } const endOfStream: FrameInput = { _tag: "End" } @@ -55,7 +58,7 @@ const consumeFrames = (route: string) => (state: FrameBufferState, input: FrameI } let cursor = appendChunk(state, input.bytes) - const out: object[] = [] + const out: Frame[] = [] while (cursor.buffer.length - cursor.offset >= 4) { const view = cursor.buffer.subarray(cursor.offset) const totalLength = new DataView(view.buffer, view.byteOffset, view.byteLength).getUint32(0, false) @@ -100,7 +103,7 @@ const consumeFrames = (route: string) => (state: FrameBufferState, input: FrameI // before handing the object to the chunk schema. JSON decode goes // through the shared Schema-driven codec to satisfy the package rule // against ad-hoc `JSON.parse` calls. - const parsed = (yield* ProviderShared.parseJson( + const parsed = yield* ProviderShared.parseJson( route, payload, "Failed to parse Bedrock Converse event-stream payload", @@ -111,12 +114,12 @@ const consumeFrames = (route: string) => (state: FrameBufferState, input: FrameI reason: AIErrorReason.make({ ...error.reason, message: error.message, cause: error.reason.cause, body }), }), ), - )) as Record - delete parsed.p + ) + if (!ProviderShared.isRecord(parsed)) + return yield* ProviderShared.eventError(route, "Failed to parse Bedrock Converse event-stream payload", body) + const { p: _, ...event } = parsed out.push({ - ...(messageType === "exception" - ? { exception: { type: eventType, details: parsed } } - : { [eventType]: parsed }), + ...(messageType === "exception" ? { exception: { type: eventType, details: event } } : { [eventType]: event }), rawBody: body, }) } @@ -129,9 +132,9 @@ const consumeFrames = (route: string) => (state: FrameBufferState, input: FrameI * under its `:event-type` header so the chunk schema can match the JSON * payload directly. */ -export const framing = (route: string): Framing.Definition => ({ +export const framing = (route: string): Framing.Definition => ({ id: "aws-event-stream", - body: (frame) => ("rawBody" in frame && typeof frame.rawBody === "string" ? frame.rawBody : undefined), + body: (frame) => frame.rawBody, frame: (bytes) => bytes.pipe( Stream.map((bytes): FrameInput => ({ _tag: "Chunk", bytes })),