Lint: replace try/catch, JSON.parse, and switch in streaming decode

Rhys Sullivan committed 4 months ago

Commit 4a4ef991 parent d0104a31 file · +21 −17Browse files

Unified · Split

packages/plugins/openapi/src/sdk/invoke.ts+21−17

-import { Effect, Layer, Option, Stream } from "effect";
+import { Effect, Exit, Layer, Option, Schema, Stream } from "effect";
 import { HttpClient, HttpClientRequest } from "effect/unstable/http";
 import type { ToolFileValue } from "@executor-js/sdk/core";
 const isOctetStream = (ct: string | null | undefined): boolean =>
   normalizeContentType(ct) === "application/octet-stream";
+const decodeJsonLine = Schema.decodeUnknownExit(Schema.fromJsonString(Schema.Unknown));
 const parseStreamingJsonLines = (text: string, truncated: boolean): unknown => {
   const lines = text.split(/\r?\n/);
   let lastNonEmptyIndex = -1;
   for (let index = 0; index < lines.length; index++) {
     const line = lines[index];
     if (line === undefined || line.trim() === "") continue;
-    try {
+    const parsed = decodeJsonLine(line);
-      rows.push(JSON.parse(line));
+    if (Exit.isSuccess(parsed)) {
-    } catch {
+      rows.push(parsed.value);
-      if (truncated && index === lastNonEmptyIndex) continue;
+      continue;
-      return text;
     }
+    // A trailing fragment cut mid-line by the byte/time cap is expected; any
+    // other unparseable line means the body is not NDJSON after all.
+    if (truncated && index === lastNonEmptyIndex) continue;
+    return text;
   }
   return rows;
 };
+const NDJSON_CONTENT_TYPES = new Set([
+  "application/stream+json",
+  "application/x-ndjson",
+  "application/jsonl",
+]);
 const decodeStreamingResponseBody = (
   contentType: string | null,
   text: string,
   truncated: boolean,
-): unknown => {
+): unknown =>
-  switch (normalizeContentType(contentType)) {
+  NDJSON_CONTENT_TYPES.has(normalizeContentType(contentType))
-    case "application/stream+json":
+    ? parseStreamingJsonLines(text, truncated)
-    case "application/x-ndjson":
+    : text;
-    case "application/jsonl":
-      return parseStreamingJsonLines(text, truncated);
-    case "text/event-stream":
-    default:
-      return text;
-  }
-};
 export const collectStreamingBody = (
   stream: Stream.Stream<Uint8Array, unknown, never>,