Skip to content

Commit a279c01

Browse files
committed
fix(pi): warn as soon as an oversized record crosses the cap
1 parent 99c3ecb commit a279c01

2 files changed

Lines changed: 20 additions & 16 deletions

File tree

‎packages/provider-pi/src/server/adapter.test.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4266,8 +4266,12 @@ describe("PiAdapterV2", () => {
42664266
describe("PiRpc framing", () => {
42674267
it.effect("reassembles records and warns when dropping oversized records", () => {
42684268
const warnings: Array<ReadonlyArray<unknown>> = [];
4269+
const warned = Deferred.makeUnsafe<void>();
42694270
const logCapture = Logger.make<unknown, void>(({ logLevel, message }) => {
4270-
if (logLevel === "Warn" && Array.isArray(message)) warnings.push(message);
4271+
if (logLevel === "Warn" && Array.isArray(message)) {
4272+
warnings.push(message);
4273+
Deferred.doneUnsafe(warned, Effect.void);
4274+
}
42714275
});
42724276
return Effect.gen(function* () {
42734277
const stdout = yield* Queue.unbounded<Uint8Array>();
@@ -4304,6 +4308,7 @@ describe("PiRpc framing", () => {
43044308
yield* push(head);
43054309
const chunk = new TextEncoder().encode("x".repeat(8 * 1024 * 1024));
43064310
for (let index = 0; index < 32; index++) yield* Queue.offer(stdout, chunk);
4311+
yield* Deferred.await(warned);
43074312
yield* push('"}\n{"type":"after_oversized"}\n');
43084313

43094314
const first = yield* Queue.take(connection.events);
@@ -4316,7 +4321,10 @@ describe("PiRpc framing", () => {
43164321
assert.lengthOf(warnings, 1);
43174322
const [text, annotations] = warnings[0] ?? [];
43184323
assert.equal(text, "Dropping oversized pi stdout record.");
4319-
assert.propertyVal(annotations, "recordLength", head.length + 32 * chunk.length + 2);
4324+
assert.deepEqual(annotations, {
4325+
recordLength: head.length + 28 * chunk.length,
4326+
maxRecordLength: 232084864,
4327+
});
43204328
}).pipe(
43214329
Effect.scoped,
43224330
Effect.provide(

‎packages/provider-pi/src/server/rpc.ts‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,27 +96,24 @@ const MAX_PI_RECORD_CHARS =
9696
function makeJsonlFramer() {
9797
let buffer = "";
9898
let dropping = false;
99-
let droppedLength = 0;
10099
return (chunk: string) => {
101100
const lines: string[] = [];
102101
const droppedLengths: number[] = [];
103102
let start = 0;
104103
while (start < chunk.length) {
105104
const newline = chunk.indexOf("\n", start);
106105
const end = newline < 0 ? chunk.length : newline;
107-
if (dropping) {
108-
droppedLength += end - start;
109-
} else if (buffer.length + end - start > MAX_PI_RECORD_CHARS) {
110-
droppedLength = buffer.length + end - start;
111-
buffer = "";
112-
dropping = true;
113-
} else {
114-
buffer += chunk.slice(start, end);
106+
if (!dropping) {
107+
if (buffer.length + end - start > MAX_PI_RECORD_CHARS) {
108+
droppedLengths.push(buffer.length + end - start);
109+
buffer = "";
110+
dropping = true;
111+
} else {
112+
buffer += chunk.slice(start, end);
113+
}
115114
}
116115
if (newline < 0) break;
117-
if (dropping) {
118-
droppedLengths.push(droppedLength);
119-
} else if (buffer.length > 0) {
116+
if (!dropping && buffer.length > 0) {
120117
lines.push(buffer.endsWith("\r") ? buffer.slice(0, -1) : buffer);
121118
}
122119
buffer = "";
@@ -127,8 +124,7 @@ function makeJsonlFramer() {
127124
};
128125
}
129126

130-
// A dropped `response` leaves its request to time out, so the drop must be
131-
// visible at the default log level. Lengths only: records carry prompt text.
127+
// Report the observed length before LF arrives; an unterminated response can time out first.
132128
const logDroppedPiRecords = (droppedLengths: ReadonlyArray<number>) =>
133129
Effect.forEach(
134130
droppedLengths,

0 commit comments

Comments
 (0)