Merge #181

181: JS client: use native fetch when available. r=BearLemma a=BearLemma Might be fixing #179 Needs testing though. Co-authored-by: Jan Plhak <[email protected]>
libsql · Feb 17, 2023 · f8043c6 · f8043c6
2 parents 28c2762 + 54ba8b4
commit f8043c6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/js/libsql-client/package-lock.json b/packages/js/libsql-client/package-lock.json
diff --git a/packages/js/libsql-client/package.json b/packages/js/libsql-client/package.json
@@ -33,7 +33,7 @@
         "@types/jest": "^29.2.5",
         "jest": "^29.3.1",
         "prettier": "^2.8.3",
-        "ts-jest": "^29.0.3",
+        "ts-jest": "^29.0.5",
         "typescript": "^4.9.4"
     },
     "dependencies": {

diff --git a/packages/js/libsql-client/src/lib/driver/HttpDriver.ts b/packages/js/libsql-client/src/lib/driver/HttpDriver.ts
@@ -1,4 +1,4 @@
-import fetch from "cross-fetch";
+import { fetch as crossFetch } from "cross-fetch";
 import { ResultSet, BoundStatement, Params } from "../libsql-js";
 import { Driver } from "./Driver";
 
@@ -25,11 +25,13 @@ export class HttpDriver implements Driver {
         }
 
         const statements = buildStatements(["BEGIN", ...stmts, "COMMIT"]);
-
-        const response = await fetch(this.url, {
+        const reqParams = {
             method: "POST",
             body: JSON.stringify(statements)
-        });
+        };
+
+        const compatibleFetch = typeof fetch === "function" ? fetch : crossFetch;
+        const response = await compatibleFetch(this.url, reqParams);
         if (response.status === 200) {
             const results = await response.json();
             validateTopLevelResults(results, statements.statements.length);