@s2-dev/streamstore 0.15.2 → 0.15.4

package/src/lib/event-streams.ts

@@ -5,260 +5,143 @@
 export type ServerEvent<T> = {
   data?: T | undefined;
   event?: string | undefined;
-  retry?: number | undefined;
   id?: string | undefined;
+  retry?: number | undefined;
 };
-const LF = 0x0a;
-const CR = 0x0d;
-const NEWLINE_CHARS = new Set([LF, CR]);
-const MESSAGE_BOUNDARIES = [
-  new Uint8Array([CR, LF, CR, LF]),
-  new Uint8Array([CR, CR]),
-  new Uint8Array([LF, LF]),
-];
-
-export class EventStream<Event extends ServerEvent<unknown>> {
-  private readonly stream: ReadableStream<Uint8Array>;
-  private readonly decoder: (rawEvent: ServerEvent<string>) => Event;
-
-  constructor(init: {
-    stream: ReadableStream<Uint8Array>;
-    decoder: (rawEvent: ServerEvent<string>) => Event;
-  }) {
-    this.stream = init.stream;
-    this.decoder = init.decoder;
-  }
-
-  async *[Symbol.asyncIterator](): AsyncGenerator<Event, void, unknown> {
-    const reader = this.stream.getReader();
-    let buffer = new Uint8Array([]);
-    let position = 0;
-
-    try {
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) {
-          break;
-        }
-
-        const newBuffer = new Uint8Array(buffer.length + value.length);
-        newBuffer.set(buffer);
-        newBuffer.set(value, buffer.length);
-        buffer = newBuffer;
-
-        for (let i = position; i < buffer.length; i++) {
-          const boundary = findBoundary(buffer, i);
-          if (boundary == null) {
-            continue;
-          }
 
-          const chunk = buffer.slice(position, i);
-          position = i + boundary.length;
-          const event = parseEvent(chunk, this.decoder);
-          if (event != null) {
-            yield event;
+export class EventStream<T extends ServerEvent<unknown>>
+  extends ReadableStream<T>
+{
+  constructor(
+    stream: ReadableStream<Uint8Array>,
+    parse: (x: ServerEvent<string>) => IteratorResult<T, undefined>,
+  ) {
+    const reader = stream.getReader();
+    let buffer: Uint8Array = new Uint8Array();
+    super({
+      async pull(controller) {
+        try {
+          const r = await reader.read();
+          if (r.done) return controller.close();
+          buffer = concatBuffer(buffer, r.value);
+          for (const { chunk, remainder } of chunks(buffer)) {
+            buffer = remainder;
+            const item = parseChunk(chunk, parse);
+            if (item?.value) controller.enqueue(item.value);
+            if (item?.done) {
+              await reader.cancel("done");
+              return controller.close();
+            }
           }
+        } catch (e) {
+          await reader.cancel(e);
+          controller.error(e);
         }
+      },
+      cancel: reason => reader.cancel(reason),
+    });
+  }
 
-        if (position > 0) {
-          buffer = buffer.slice(position);
-          position = 0;
-        }
-      }
-
-      if (buffer.length > 0) {
-        const event = parseEvent(buffer, this.decoder);
-        if (event != null) {
-          yield event;
+  // Polyfill for older browsers
+  [Symbol.asyncIterator](): AsyncIterableIterator<T, void, unknown> {
+    const fn = (ReadableStream.prototype as any)[Symbol.asyncIterator];
+    if (typeof fn === "function") return fn.call(this);
+    const reader = this.getReader();
+    return {
+      next: async () => {
+        const r = await reader.read();
+        if (r.done) {
+          reader.releaseLock();
+          return { done: true, value: undefined };
         }
-      }
-    } catch (e: unknown) {
-      if (e instanceof Error && e.name === "AbortError") {
-        return;
-      }
-
-      throw e;
-    } finally {
-      reader.releaseLock();
-    }
+        return { done: false, value: r.value };
+      },
+      throw: async (e) => {
+        await reader.cancel(e);
+        reader.releaseLock();
+        return { done: true, value: undefined };
+      },
+      return: async () => {
+        await reader.cancel("done");
+        reader.releaseLock();
+        return { done: true, value: undefined };
+      },
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+    };
   }
 }
 
-function findBoundary(buffer: Uint8Array, start: number): Uint8Array | null {
-  const char1 = buffer[start];
-  const char2 = buffer[start + 1];
-
-  // Don't bother checking if the first two characters are not new line
-  // characters.
-  if (
-    char1 == null
-    || char2 == null
-    || !NEWLINE_CHARS.has(char1)
-    || !NEWLINE_CHARS.has(char2)
-  ) {
-    return null;
-  }
+function concatBuffer(a: Uint8Array, b: Uint8Array): Uint8Array {
+  const c = new Uint8Array(a.length + b.length);
+  c.set(a, 0);
+  c.set(b, a.length);
+  return c;
+}
 
-  for (const s of MESSAGE_BOUNDARIES) {
-    const seq = peekSequence(start, buffer, s);
-    if (seq != null) {
-      return seq;
+/** Finds the first (CR,LF,CR,LF) or (CR,CR) or (LF,LF) */
+function findBoundary(
+  buf: Uint8Array,
+): { index: number; length: number } | null {
+  const len = buf.length;
+  for (let i = 0; i < len; i++) {
+    if (
+      i <= len - 4
+      && buf[i] === 13 && buf[i + 1] === 10 && buf[i + 2] === 13
+      && buf[i + 3] === 10
+    ) {
+      return { index: i, length: 4 };
+    }
+    if (i <= len - 2 && buf[i] === 13 && buf[i + 1] === 13) {
+      return { index: i, length: 2 };
+    }
+    if (i <= len - 2 && buf[i] === 10 && buf[i + 1] === 10) {
+      return { index: i, length: 2 };
     }
   }
-
   return null;
 }
 
-function peekSequence(
-  position: number,
-  buffer: Uint8Array,
-  sequence: Uint8Array,
-): Uint8Array | null {
-  if (sequence.length > buffer.length - position) {
-    return null;
-  }
-
-  for (let i = 0; i < sequence.length; i++) {
-    if (buffer[position + i] !== sequence[i]) {
-      return null;
+function* chunks(
+  remainder: Uint8Array,
+): Generator<{ chunk: Uint8Array; remainder: Uint8Array }> {
+  while (true) {
+    const match = findBoundary(remainder);
+    if (!match) {
+      yield { chunk: new Uint8Array(), remainder };
+      return;
     }
+    const chunk = remainder.slice(0, match.index);
+    remainder = remainder.slice(match.index + match.length);
+    yield { chunk, remainder };
   }
-
-  return sequence;
 }
 
-function parseEvent<Event extends ServerEvent<unknown>>(
+function parseChunk<T extends ServerEvent<unknown>>(
   chunk: Uint8Array,
-  decoder: (rawEvent: ServerEvent<string>) => Event,
+  parse: (x: ServerEvent<string>) => IteratorResult<T, undefined>,
 ) {
-  if (!chunk.length) {
-    return null;
-  }
-
-  const td = new TextDecoder();
-  const raw = td.decode(chunk);
-  const lines = raw.split(/\r?\n|\r/g);
-  let publish = false;
-  const rawEvent: ServerEvent<string> = {};
-
+  const text = new TextDecoder().decode(chunk);
+  const lines = text.split(/\r\n|\r|\n/);
+  const dataLines: string[] = [];
+  const ret: ServerEvent<string> = {};
+  let ignore = true;
   for (const line of lines) {
-    if (!line) {
-      continue;
-    }
-
-    const delim = line.indexOf(":");
-    // Lines starting with a colon are ignored.
-    if (delim === 0) {
-      continue;
-    }
-
-    const field = delim > 0 ? line.substring(0, delim) : "";
-    let value = delim > 0 ? line.substring(delim + 1) : "";
-    if (value.charAt(0) === " ") {
-      value = value.substring(1);
+    if (!line || line.startsWith(":")) continue;
+    ignore = false;
+    const i = line.indexOf(":");
+    const field = line.slice(0, i);
+    const value = line[i + 1] === " " ? line.slice(i + 2) : line.slice(i + 1);
+    if (field === "data") dataLines.push(value);
+    else if (field === "event") ret.event = value;
+    else if (field === "id") ret.id = value;
+    else if (field === "retry") {
+      const n = Number(value);
+      if (!isNaN(n)) ret.retry = n;
     }
-
-    switch (field) {
-      case "event": {
-        publish = true;
-        rawEvent.event = value;
-        break;
-      }
-      case "data": {
-        publish = true;
-        rawEvent.data ??= "";
-        rawEvent.data += value + "\n";
-        break;
-      }
-      case "id": {
-        publish = true;
-        rawEvent.id = value;
-        break;
-      }
-      case "retry": {
-        const r = parseInt(value, 10);
-        if (!Number.isNaN(r)) {
-          publish = true;
-          rawEvent.retry = r;
-        }
-        break;
-      }
-    }
-  }
-
-  if (!publish) {
-    return null;
-  }
-
-  if (rawEvent.data != null) {
-    rawEvent.data = rawEvent.data.slice(0, -1);
   }
-
-  return decoder(rawEvent);
-}
-
-export function discardSentinel(
-  stream: ReadableStream<Uint8Array>,
-  sentinel: string,
-): ReadableStream<Uint8Array> {
-  return new ReadableStream<Uint8Array>({
-    async start(controller) {
-      let buffer = new Uint8Array([]);
-      let position = 0;
-      let done = false;
-      let discard = false;
-      const rdr = stream.getReader();
-      try {
-        while (!done) {
-          const result = await rdr.read();
-          const value = result.value;
-          done = done || result.done;
-          // We keep consuming from the source to its completion so it can
-          // flush all its contents and release resources.
-          if (discard) {
-            continue;
-          }
-          if (typeof value === "undefined") {
-            continue;
-          }
-
-          const newBuffer = new Uint8Array(buffer.length + value.length);
-          newBuffer.set(buffer);
-          newBuffer.set(value, buffer.length);
-          buffer = newBuffer;
-
-          for (let i = position; i < buffer.length; i++) {
-            const boundary = findBoundary(buffer, i);
-            if (boundary == null) {
-              continue;
-            }
-
-            const start = position;
-            const chunk = buffer.slice(start, i);
-            position = i + boundary.length;
-            const event = parseEvent(chunk, id);
-            if (event?.data === sentinel) {
-              controller.enqueue(buffer.slice(0, start));
-              discard = true;
-            } else {
-              controller.enqueue(buffer.slice(0, position));
-              buffer = buffer.slice(position);
-              position = 0;
-            }
-          }
-        }
-      } catch (e) {
-        controller.error(e);
-      } finally {
-        // If the source stream terminates, flush its contents and terminate.
-        // If the sentinel event was found, flush everything up to its start.
-        controller.close();
-        rdr.releaseLock();
-      }
-    },
-  });
-}
-
-function id<T>(v: T): T {
-  return v;
+  if (ignore) return;
+  if (dataLines.length) ret.data = dataLines.join("\n");
+  return parse(ret);
 }

package/src/lib/matchers.ts

@@ -5,7 +5,6 @@
 import { APIError } from "../models/errors/apierror.js";
 import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { ERR, OK, Result } from "../types/fp.js";
-import { discardSentinel } from "./event-streams.js";
 import { matchResponse, matchStatusCode, StatusCodePredicate } from "./http.js";
 import { isPlainObject } from "./is-plain-object.js";
 
@@ -238,9 +237,7 @@ export function match<T, E>(
         raw = body;
         break;
       case "sse":
-        raw = response.body && matcher.sseSentinel
-          ? discardSentinel(response.body, matcher.sseSentinel)
-          : response.body;
+        raw = response.body;
         break;
       case "nil":
         body = await response.text();

package/src/mcp-server/cli/start/command.ts

@@ -37,18 +37,13 @@ export const startCommand = buildCommand({
           return z.string().parse(value);
         },
       },
-      ...(mcpScopes.length
-        ? {
-          scope: {
-            kind: "enum",
-            brief:
-              "Mount tools/resources that match given scope (repeatable flag)",
-            values: mcpScopes,
-            variadic: true,
-            optional: true,
-          },
-        }
-        : {}),
+      scope: {
+        kind: "enum",
+        brief: "Mount tools/resources that match given scope (repeatable flag)",
+        values: mcpScopes,
+        variadic: true,
+        optional: true,
+      },
       "access-token": {
         kind: "parsed",
         brief: "Sets the accessToken auth field for the API",

package/src/mcp-server/mcp-server.ts

@@ -19,7 +19,7 @@ const routes = buildRouteMap({
 export const app = buildApplication(routes, {
   name: "mcp",
   versionInfo: {
-    currentVersion: "0.15.2",
+    currentVersion: "0.15.4",
   },
 });
 

package/src/mcp-server/server.ts

@@ -45,7 +45,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "S2",
-    version: "0.15.2",
+    version: "0.15.4",
   });
 
   const client = new S2Core({

package/src/models/errors/apierror.ts

@@ -25,8 +25,14 @@ export class APIError extends S2Error {
       }`;
     }
     const body = httpMeta.body || `""`;
-    message += body.length > 100 ? "\n" : " ";
-    message += `Body ${body}`;
+    message += body.length > 100 ? "\n" : ". ";
+    let bodyDisplay = body;
+    if (body.length > 10000) {
+      const truncated = body.substring(0, 10000);
+      const remaining = body.length - 10000;
+      bodyDisplay = `${truncated}...and ${remaining} more chars`;
+    }
+    message += `Body: ${bodyDisplay}`;
     message = message.trim();
     super(message, httpMeta);
     this.name = "APIError";

package/src/models/errors/errorresponse.ts

@@ -20,9 +20,7 @@ export class ErrorResponse extends S2Error {
     err: ErrorResponseData,
     httpMeta: { response: Response; request: Request; body: string },
   ) {
-    const message = "message" in err && typeof err.message === "string"
-      ? err.message
-      : `API error occurred: ${JSON.stringify(err)}`;
+    const message = err.message || `API error occurred: ${JSON.stringify(err)}`;
     super(message, httpMeta);
     this.data$ = err;
     if (err.code != null) this.code = err.code;

package/src/models/operations/read.ts

@@ -169,12 +169,9 @@ export const ReadResponse$inboundSchema: z.ZodType<
 > = z.union([
   components.ReadBatch$inboundSchema,
   z.instanceof(ReadableStream<Uint8Array>).transform(stream => {
-    return new EventStream({
-      stream,
-      decoder(rawEvent) {
-        const schema = components.ReadEvent$inboundSchema;
-        return schema.parse(rawEvent);
-      },
+    return new EventStream(stream, rawEvent => {
+      if (rawEvent.data === "[DONE]") return { done: true };
+      return { value: components.ReadEvent$inboundSchema.parse(rawEvent) };
     });
   }),
 ]);