@jsenv/fetch 1.1.85 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jsenv/fetch",
3
- "version": "1.1.85",
3
+ "version": "1.2.1",
4
4
  "description": "Unified url fetcher (http, http, file, data)",
5
5
  "license": "MIT",
6
6
  "author": {
@@ -10,7 +10,7 @@
10
10
  "repository": {
11
11
  "type": "git",
12
12
  "url": "https://github.com/jsenv/core",
13
- "directory": "packages/independent/universal/fetch"
13
+ "directory": "packages/independent/shared/fetch"
14
14
  },
15
15
  "engines": {
16
16
  "node": ">=16.13.0"
@@ -32,8 +32,11 @@
32
32
  "/src/"
33
33
  ],
34
34
  "dependencies": {
35
- "@jsenv/urls": "2.6.0",
36
- "@jsenv/server": "15.5.3",
35
+ "@jsenv/urls": "2.6.1",
36
+ "@jsenv/server": "16.0.1",
37
37
  "node-fetch": "3.3.2"
38
+ },
39
+ "devDependencies": {
40
+ "@jsenv/server": "16.0.1"
38
41
  }
39
42
  }
@@ -11,7 +11,7 @@ export const fetchUsingFetch = async (
11
11
  status: response.status,
12
12
  statusText: "",
13
13
  headers: responseToHeaders(response),
14
- text: () => response.text(),
14
+ text: () => new Response(),
15
15
  json: () => response.json(),
16
16
  blob: () => response.blob(),
17
17
  arrayBuffer: () => response.arrayBuffer(),
@@ -1,10 +1,10 @@
1
1
  // https://github.com/node-fetch/node-fetch/blob/8c197f8982a238b3c345c64b17bfa92e16b4f7c4/src/response.js#L1
2
2
 
3
- import { fetchFileSystem } from "@jsenv/server";
3
+ import { createFileSystemFetch } from "@jsenv/server";
4
4
  import {
5
5
  fileHandleToReadableStream,
6
6
  isFileHandle,
7
- } from "@jsenv/server/src/interfacing_with_node/body.js";
7
+ } from "@jsenv/server/src/interfacing_with_node/observable_from_file_handle.js";
8
8
  import { DATA_URL } from "@jsenv/urls";
9
9
  import nodeFetch, { Response } from "node-fetch";
10
10
  import { Agent } from "node:https";
@@ -31,16 +31,23 @@ export const fetchUrl = async (
31
31
  }
32
32
 
33
33
  if (url.startsWith("file://")) {
34
- const responseProperties = await fetchFileSystem(url, {
35
- signal,
36
- method,
37
- headers,
38
- rootDirectoryUrl: "file://",
34
+ const responseProperties = await createFileSystemFetch("file://", {
39
35
  cacheStrategy,
40
36
  canReadDirectory,
41
37
  contentTypeMap,
42
- ...rest,
43
- });
38
+ })(
39
+ {
40
+ signal,
41
+ method,
42
+ headers,
43
+ resource: new URL(url).pathname,
44
+ },
45
+ {
46
+ timing: () => {
47
+ return { end: () => {} };
48
+ },
49
+ },
50
+ );
44
51
  const responseBody = responseProperties.body;
45
52
 
46
53
  const response = new Response(