@continuedev/fetch 1.0.14 → 1.0.16

package/dist/fetch.js

@@ -3,7 +3,7 @@ import { HttpProxyAgent } from "http-proxy-agent";
 import { HttpsProxyAgent } from "https-proxy-agent";
 import { Response } from "node-fetch";
 import { getAgentOptions } from "./getAgentOptions.js";
-import fetch from "./node-fetch-patch.js";
+import patchedFetch from "./node-fetch-patch.js";
 import { getProxy, shouldBypassProxy } from "./util.js";
 const { http, https } = followRedirects.default;
 function logRequest(method, url, headers, body, proxy, shouldBypass) {
@@ -112,7 +112,7 @@ export async function fetchwithRequestOptions(url_, init, requestOptions) {
     }
     // fetch the request with the provided options
     try {
-        const resp = await fetch(url, {
+        const resp = await patchedFetch(url, {
             ...init,
             body: finalBody,
             headers: headers,

package/dist/fetch.test.js

@@ -2,6 +2,7 @@ import { globalAgent } from "https";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
+import { afterEach, beforeEach, expect, test } from "vitest";
 import { getAgentOptions } from "./getAgentOptions.js";
 // Store original env
 const originalEnv = process.env;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 import { streamJSON, streamResponse, streamSse, toAsyncIterable } from "./stream.js";
+import patchedFetch from "./node-fetch-patch.js";
 import { fetchwithRequestOptions } from "./fetch.js";
-export { fetchwithRequestOptions, streamJSON, streamResponse, streamSse, toAsyncIterable, };
+export { fetchwithRequestOptions, patchedFetch, streamJSON, streamResponse, streamSse, toAsyncIterable, };

package/dist/index.js

@@ -1,3 +1,4 @@
 import { streamJSON, streamResponse, streamSse, toAsyncIterable, } from "./stream.js";
+import patchedFetch from "./node-fetch-patch.js";
 import { fetchwithRequestOptions } from "./fetch.js";
-export { fetchwithRequestOptions, streamJSON, streamResponse, streamSse, toAsyncIterable, };
+export { fetchwithRequestOptions, patchedFetch, streamJSON, streamResponse, streamSse, toAsyncIterable, };

package/dist/stream.js

@@ -67,7 +67,13 @@ export function parseDataLine(line) {
     try {
         const data = JSON.parse(json);
         if (data.error) {
-            throw new Error(`Error streaming response: ${data.error}`);
+            if (data.error &&
+                typeof data.error === "object" &&
+                "message" in data.error) {
+                console.error("Error in streamed response:", data.error);
+                throw new Error(`Error streaming response: ${data.error.message}`);
+            }
+            throw new Error(`Error streaming response: ${JSON.stringify(data.error)}`);
         }
         return data;
     }

package/dist/stream.test.js

@@ -69,7 +69,7 @@ describe("parseDataLine", () => {
     });
     test("parseDataLine should throw error when data contains error field", () => {
         const line = 'data: {"error":"something went wrong"}';
-        expect(() => parseDataLine(line)).toThrow("Error streaming response: something went wrong");
+        expect(() => parseDataLine(line)).toThrow('Error streaming response: "something went wrong"');
     });
     test("parseDataLine should handle empty objects", () => {
         const line = "data: {}";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@continuedev/fetch",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/release.config.js

@@ -0,0 +1,3 @@
+import createReleaseConfig from "../shared-release.config.js";
+
+export default createReleaseConfig("fetch");

package/src/fetch.ts

@@ -4,7 +4,7 @@ import { HttpProxyAgent } from "http-proxy-agent";
 import { HttpsProxyAgent } from "https-proxy-agent";
 import { BodyInit, RequestInit, Response } from "node-fetch";
 import { getAgentOptions } from "./getAgentOptions.js";
-import fetch from "./node-fetch-patch.js";
+import patchedFetch from "./node-fetch-patch.js";
 import { getProxy, shouldBypassProxy } from "./util.js";
 
 const { http, https } = (followRedirects as any).default;
@@ -144,7 +144,7 @@ export async function fetchwithRequestOptions(
 
   // fetch the request with the provided options
   try {
-    const resp = await fetch(url, {
+    const resp = await patchedFetch(url, {
       ...init,
       body: finalBody,
       headers: headers,

package/src/index.ts

@@ -5,10 +5,13 @@ import {
   toAsyncIterable,
 } from "./stream.js";
 
+import patchedFetch from "./node-fetch-patch.js";
+
 import { fetchwithRequestOptions } from "./fetch.js";
 
 export {
   fetchwithRequestOptions,
+  patchedFetch,
   streamJSON,
   streamResponse,
   streamSse,

package/src/stream.test.ts

@@ -86,7 +86,7 @@ describe("parseDataLine", () => {
   test("parseDataLine should throw error when data contains error field", () => {
     const line = 'data: {"error":"something went wrong"}';
     expect(() => parseDataLine(line)).toThrow(
-      "Error streaming response: something went wrong",
+      'Error streaming response: "something went wrong"',
     );
   });
 

package/src/stream.ts

@@ -81,7 +81,17 @@ export function parseDataLine(line: string): any {
   try {
     const data = JSON.parse(json);
     if (data.error) {
-      throw new Error(`Error streaming response: ${data.error}`);
+      if (
+        data.error &&
+        typeof data.error === "object" &&
+        "message" in data.error
+      ) {
+        console.error("Error in streamed response:", data.error);
+        throw new Error(`Error streaming response: ${data.error.message}`);
+      }
+      throw new Error(
+        `Error streaming response: ${JSON.stringify(data.error)}`,
+      );
     }
 
     return data;

package/src/node_modules/.vite/vitest/d41d8cd98f00b204e9800998ecf8427e/results.json

@@ -1 +0,0 @@
-{"version":"3.2.0","results":[[":node-fetch-bug.test.ts",{"duration":10.538165999999933,"failed":true}],[":boundary-assumption.test.ts",{"duration":392.1355840000324,"failed":false}],[":chunk-transformer.test.ts",{"duration":0,"failed":true}],[":fetch.test.ts",{"duration":115.30825000000186,"failed":false}],[":getAgentOptions.test.ts",{"duration":6.5474579999936395,"failed":false}],[":stream.test.ts",{"duration":68.50500000000466,"failed":false}],[":premature-close.test.ts",{"duration":5329.249708,"failed":true}],[":util.test.ts",{"duration":3.016583999999966,"failed":false}]]}

package/src/node_modules/.vite/vitest/da39a3ee5e6b4b0d3255bfef95601890afd80709/results.json

@@ -1 +0,0 @@
-{"version":"3.2.1","results":[[":node-fetch-patch.test.ts",{"duration":125.8410000000149,"failed":true}],[":remove/node-fetch-patch.test.ts",{"duration":214.92558300006203,"failed":true}],[":patch-test.test.js",{"duration":1.4479579999999999,"failed":false}],[":premature-close.test.ts",{"duration":5396.810541999992,"failed":true}],[":util.test.ts",{"duration":4.095832999795675,"failed":false}]]}