3 changed files with 56 additions and 36 deletions
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@ -1,15 +1,16 @@
 {
    "name": "@lumeweb/libportal",
-    "version": "0.2.0-develop.7",
+    "version": "0.2.0-develop.6",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
        "": {
            "name": "@lumeweb/libportal",
-            "version": "0.2.0-develop.7",
+            "version": "0.2.0-develop.6",
            "dependencies": {
                "@noble/curves": "^1.1.0",
                "@noble/hashes": "^1.3.1",
+                "cross-fetch": "^3.1.6",
                "detect-node": "^2.1.0",
                "multiformats": "^11.0.2",
                "node-fetch": "^3.3.1",
@ -4806,6 +4807,33 @@
                "yarn": ">=1"
            }
        },
+        "node_modules/cross-fetch": {
+            "version": "3.1.6",
+            "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.6.tgz",
+            "integrity": "sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g==",
+            "dependencies": {
+                "node-fetch": "^2.6.11"
+            }
+        },
+        "node_modules/cross-fetch/node_modules/node-fetch": {
+            "version": "2.6.11",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
+            "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+            "dependencies": {
+                "whatwg-url": "^5.0.0"
+            },
+            "engines": {
+                "node": "4.x || >=6.0.0"
+            },
+            "peerDependencies": {
+                "encoding": "^0.1.0"
+            },
+            "peerDependenciesMeta": {
+                "encoding": {
+                    "optional": true
+                }
+            }
+        },
        "node_modules/cross-spawn": {
            "version": "7.0.3",
            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@ -5312,7 +5340,6 @@
            "version": "0.1.13",
            "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
            "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-            "dev": true,
            "optional": true,
            "dependencies": {
                "iconv-lite": "^0.6.2"
@ -7227,7 +7254,6 @@
            "version": "0.6.3",
            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-            "dev": true,
            "optional": true,
            "dependencies": {
                "safer-buffer": ">= 2.1.2 < 3.0.0"
@ -14935,7 +14961,6 @@
            "version": "2.1.2",
            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "dev": true,
            "optional": true
        },
        "node_modules/semantic-release": {
@ -16411,8 +16436,7 @@
        "node_modules/tr46": {
            "version": "0.0.3",
            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-            "dev": true
+            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
        },
        "node_modules/traverse": {
            "version": "0.6.7",
@ -17499,14 +17523,12 @@
        "node_modules/webidl-conversions": {
            "version": "3.0.1",
            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-            "dev": true
+            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
        },
        "node_modules/whatwg-url": {
            "version": "5.0.0",
            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
            "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-            "dev": true,
            "dependencies": {
                "tr46": "~0.0.3",
                "webidl-conversions": "^3.0.0"
@ -21441,6 +21463,24 @@
                "cross-spawn": "^7.0.1"
            }
        },
+        "cross-fetch": {
+            "version": "3.1.6",
+            "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.6.tgz",
+            "integrity": "sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g==",
+            "requires": {
+                "node-fetch": "^2.6.11"
+            },
+            "dependencies": {
+                "node-fetch": {
+                    "version": "2.6.11",
+                    "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
+                    "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+                    "requires": {
+                        "whatwg-url": "^5.0.0"
+                    }
+                }
+            }
+        },
        "cross-spawn": {
            "version": "7.0.3",
            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@ -21827,7 +21867,6 @@
            "version": "0.1.13",
            "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
            "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-            "dev": true,
            "optional": true,
            "requires": {
                "iconv-lite": "^0.6.2"
@ -23322,7 +23361,6 @@
            "version": "0.6.3",
            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-            "dev": true,
            "optional": true,
            "requires": {
                "safer-buffer": ">= 2.1.2 < 3.0.0"
@ -28840,7 +28878,6 @@
            "version": "2.1.2",
            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "dev": true,
            "optional": true
        },
        "semantic-release": {
@ -29936,8 +29973,7 @@
        "tr46": {
            "version": "0.0.3",
            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-            "dev": true
+            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
        },
        "traverse": {
            "version": "0.6.7",
@ -30692,14 +30728,12 @@
        "webidl-conversions": {
            "version": "3.0.1",
            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-            "dev": true
+            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
        },
        "whatwg-url": {
            "version": "5.0.0",
            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
            "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-            "dev": true,
            "requires": {
                "tr46": "~0.0.3",
                "webidl-conversions": "^3.0.0"
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "@lumeweb/libportal",
-    "version": "0.2.0-develop.7",
+    "version": "0.2.0-develop.6",
    "main": "lib/index.js",
    "module": "lib/index.mjs",
    "types": "lib/index.d.ts",
@ -36,6 +36,7 @@
    "dependencies": {
        "@noble/curves": "^1.1.0",
        "@noble/hashes": "^1.3.1",
+        "cross-fetch": "^3.1.6",
        "detect-node": "^2.1.0",
        "multiformats": "^11.0.2",
        "node-fetch": "^3.3.1",
--- a/src/client.ts
+++ b/src/client.ts
@ -2,6 +2,7 @@ import { ed25519 as ed } from "@noble/curves/ed25519";
 import * as edUtils from "@noble/curves/abstract/utils";

 import { RegisterRequest } from "./requests/account.js";
+import fetch, { Response } from "cross-fetch";
 import {
  LoginRequest,
  LogoutRequest,
@ -186,7 +187,6 @@ export class Client {
  }

  async downloadProof(cid: string): Promise<ArrayBuffer> {
-    const Response = await this.getFetchResponseObject();
    return await new Response(
      await this.get<any>(`/api/v1/files/proof/${cid}`, {
        auth: true,
@ -226,8 +226,7 @@ export class Client {
      }
    }

-    const fetch = await this.getFetchObject();
-    const response = await fetch(this.getEndpoint(path), fetchOptions as any);
+    const response = await fetch(this.getEndpoint(path), fetchOptions);

    if (!options.fullResponse) {
      if (!response.ok) {
@ -545,18 +544,4 @@ export class Client {

    return undefined;
  }
-  private async getFetchObject() {
-    if (isNode) {
-      return (await import("node-fetch")).default;
-    }
-
-    return fetch;
-  }
-  private async getFetchResponseObject() {
-    if (isNode) {
-      return (await import("node-fetch")).Response;
-    }
-
-    return Response;
-  }
 }