Merge pull request #20 from sivukhin/use-cross-fetch

replace @libsql/isomorphic-fetch with cross-fetch

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.8.0 -- 2024-09-16
+
+- Replace isomorphic-fetch dependency with cross-fetch
+
 ## 0.7.0 -- 2024-09-16
 
 - Upgrade isomorphic-fetch to v0.3.0 which do not override `fetch` agent and do not have issue with headers in cloud providers (see https://github.com/libsql/isomorphic-ts/pull/17)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libsql/hrana-client",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "keywords": [
     "hrana",
     "libsql",
@@ -45,8 +45,8 @@
     "typedoc": "rm -rf ./docs && typedoc"
   },
   "dependencies": {
-    "@libsql/isomorphic-fetch": "^0.3.1",
     "@libsql/isomorphic-ws": "^0.1.5",
+    "cross-fetch": "^4.0.0",
     "js-base64": "^3.7.5",
     "node-fetch": "^3.3.2"
   },

src/__tests__/client.ts

@@ -1,5 +1,5 @@
-import type { Response } from "@libsql/isomorphic-fetch";
-import { fetch, Request } from "@libsql/isomorphic-fetch";
+import type { Response } from "cross-fetch";
+import { fetch, Request } from "cross-fetch";
 
 import * as hrana from "..";
 

src/http/client.ts

@@ -1,4 +1,4 @@
-import { fetch, Request } from "@libsql/isomorphic-fetch";
+import { fetch, Request } from "cross-fetch";
 
 import type { ProtocolVersion, ProtocolEncoding } from "../client.js";
 import { Client } from "../client.js";

src/http/cursor.ts

@@ -1,4 +1,4 @@
-import type { Response, ReadableStreamDefaultReader } from "@libsql/isomorphic-fetch";
+import type { Response } from "cross-fetch";
 
 import { ByteQueue } from "../byte_queue.js";
 import type { ProtocolEncoding } from "../client.js";
@@ -20,7 +20,7 @@ export class HttpCursor extends Cursor {
     #stream: HttpStream;
     #encoding: ProtocolEncoding;
 
-    #reader: ReadableStreamDefaultReader<Uint8Array> | undefined;
+    #reader: any | undefined;
     #queue: ByteQueue;
     #closed: Error | undefined;
     #done: boolean;
@@ -42,7 +42,10 @@ export class HttpCursor extends Cursor {
             throw new ProtoError("No response body for cursor request");
         }
 
-        this.#reader = response.body.getReader();
+        // node-fetch do not fully support WebStream API, especially getReader() function
+        // see https://github.com/node-fetch/node-fetch/issues/387
+        // so, we are using async iterator which behaves similarly here instead
+        this.#reader = (response.body as any)[Symbol.asyncIterator]();
         const respBody = await this.#nextItem(json_CursorRespBody, protobuf_CursorRespBody);
         if (respBody === undefined) {
             throw new ProtoError("Empty response to cursor request");
@@ -69,7 +72,7 @@ export class HttpCursor extends Cursor {
         this.#stream._cursorClosed(this);
 
         if (this.#reader !== undefined) {
-            this.#reader.cancel();
+            this.#reader.return();
         }
     }
 
@@ -79,7 +82,7 @@ export class HttpCursor extends Cursor {
     }
 
     async #nextItem<T>(jsonFun: jsond.ObjectFun<T>, protobufDef: protobufd.MessageDef<T>): Promise<T | undefined> {
-        for (;;) {
+        for (; ;) {
             if (this.#done) {
                 return undefined;
             } else if (this.#closed !== undefined) {
@@ -106,7 +109,7 @@ export class HttpCursor extends Cursor {
                 throw new InternalError("Attempted to read from HTTP cursor before it was opened");
             }
 
-            const {value, done} = await this.#reader.read();
+            const { value, done } = await this.#reader.next();
             if (done && this.#queue.length === 0) {
                 this.#done = true;
             } else if (done) {
@@ -135,12 +138,12 @@ export class HttpCursor extends Cursor {
 
         let varintValue = 0;
         let varintLength = 0;
-        for (;;) {
+        for (; ;) {
             if (varintLength >= data.byteLength) {
                 return undefined;
             }
             const byte = data[varintLength];
-            varintValue |= (byte & 0x7f) << (7*varintLength);
+            varintValue |= (byte & 0x7f) << (7 * varintLength);
             varintLength += 1;
             if (!(byte & 0x80)) {
                 break;

src/http/stream.ts

@@ -1,5 +1,5 @@
-import type { fetch, Response } from "@libsql/isomorphic-fetch";
-import { Request, Headers } from "@libsql/isomorphic-fetch";
+import type { fetch } from "cross-fetch";
+import { Request, Headers } from "cross-fetch";
 
 import type { ProtocolEncoding } from "../client.js";
 import type { Cursor } from "../cursor.js";

src/index.ts

@@ -8,8 +8,8 @@ import { WsClient } from "./ws/client.js";
 import { ProtocolVersion } from "./client.js";
 
 export { WebSocket } from "@libsql/isomorphic-ws";
-export type { RequestInit, Response } from "@libsql/isomorphic-fetch";
-export { fetch, Request, Headers } from "@libsql/isomorphic-fetch";
+export type { Response } from "cross-fetch";
+export { fetch, Request, Headers } from "cross-fetch";
 
 export type { ProtocolVersion, ProtocolEncoding } from "./client.js";
 export { Client } from "./client.js";
@@ -49,8 +49,8 @@ export function openWs(url: string | URL, jwt?: string, protocolVersion: Protoco
 /** Open a Hrana client over HTTP connected to the given `url`.
  *
  * If the `customFetch` argument is passed and not `undefined`, it is used in place of the `fetch` function
- * from `@libsql/isomorphic-fetch`. This function is always called with a `Request` object from
- * `@libsql/isomorphic-fetch`.
+ * from `cross-fetch`. This function is always called with a `Request` object from
+ * `cross-fetch`.
  */
 export function openHttp(url: string | URL, jwt?: string, customFetch?: unknown | undefined, protocolVersion: ProtocolVersion = 2): HttpClient {
     return new HttpClient(url instanceof URL ? url : new URL(url), jwt, customFetch, protocolVersion);