@eik/node-client 2.0.6 → 2.0.7

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.0.7](https://github.com/eik-lib/node-client/compare/v2.0.6...v2.0.7) (2025-05-08)
+
+
+### Bug Fixes
+
+* redirections bug with Node 24 ([#230](https://github.com/eik-lib/node-client/issues/230)) ([9111ad0](https://github.com/eik-lib/node-client/commit/9111ad0c0fbc90dd89368507b6675740cb99cd5f))
+
 ## [2.0.6](https://github.com/eik-lib/node-client/compare/v2.0.5...v2.0.6) (2025-04-28)
 
 

package/dist/index.cjs

@@ -60,21 +60,47 @@ const trimSlash = (value = "") => {
 	return value;
 };
 
-const fetchImportMaps = async (urls = []) => {
+/**
+ * @param {string[]} urls
+ * @param {object} options
+ * @param {number} options.maxRedirections - undici option for limiting redirects
+ * @returns {Promise<ImportMap[]>}
+ */
+const fetchImportMaps = async (urls = [], options) => {
 	try {
 		const maps = urls.map(async (map) => {
-			const { statusCode, body } = await undici.request(map, {
-				maxRedirections: 2,
+			const response = await undici.request(map, {
+				dispatcher: new undici.Agent().compose(
+					undici.interceptors.redirect({
+						maxRedirections: options.maxRedirections,
+					}),
+				),
 			});
 
-			if (statusCode === 404) {
+			if (response.statusCode === 404) {
 				throw new Error("Import map could not be found on server");
-			} else if (statusCode >= 400 && statusCode < 500) {
+			} else if (response.statusCode >= 400 && response.statusCode < 500) {
 				throw new Error("Server rejected client request");
-			} else if (statusCode >= 500) {
+			} else if (response.statusCode >= 500) {
 				throw new Error("Server error");
 			}
-			return body.json();
+			let contentType = response.headers["content-type"];
+			if (!Array.isArray(contentType)) contentType = [contentType];
+
+			if (!contentType.find((type) => type.startsWith("application/json"))) {
+				const content = await response.body.text();
+				if (content.length === 0) {
+					throw new Error(
+						`${map} did not return JSON, got an empty response. HTTP status: ${response.statusCode}`,
+					);
+				}
+				throw new Error(
+					`${map} did not return JSON, got: ${content}. HTTP status: ${response.statusCode}`,
+				);
+			}
+
+			const json = await response.body.json();
+			return /** @type {ImportMap}*/ (json);
 		});
 		return await Promise.all(maps);
 	} catch (err) {
@@ -90,6 +116,7 @@ const fetchImportMaps = async (urls = []) => {
  * @property {boolean} [development=false]
  * @property {boolean} [loadMaps=false]
  * @property {string} [path=process.cwd()]
+ * @property {number} [maxRedirections=2] Maximum number of redirects when looking up URLs.
  */
 
 /**
@@ -163,6 +190,7 @@ class Eik {
 	#path;
 	#base;
 	#maps;
+	#maxRedirections;
 
 	/**
 	 * @param {Options} options
@@ -172,6 +200,7 @@ class Eik {
 		loadMaps = false,
 		base = "",
 		path = process.cwd(),
+		maxRedirections = 2,
 	} = {}) {
 		this.#development = development;
 		this.#loadMaps = loadMaps;
@@ -179,6 +208,7 @@ class Eik {
 		this.#path = path;
 		this.#base = trimSlash(base);
 		this.#maps = [];
+		this.#maxRedirections = maxRedirections;
 	}
 
 	/**
@@ -191,7 +221,9 @@ class Eik {
 	async load() {
 		this.#config = await common.helpers.getDefaults(this.#path);
 		if (this.#loadMaps) {
-			this.#maps = await fetchImportMaps(this.#config.map);
+			this.#maps = await fetchImportMaps(this.#config.map, {
+				maxRedirections: this.#maxRedirections,
+			});
 		}
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eik/node-client",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Utilities for working with assets and import maps on an Eik server",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -45,14 +45,14 @@
   "dependencies": {
     "@eik/common": "5.0.4",
     "abslog": "2.4.4",
-    "undici": "6.21.2"
+    "undici": "7.8.0"
   },
   "devDependencies": {
-    "@eik/eslint-config": "1.0.12",
+    "@eik/eslint-config": "1.0.13",
     "@eik/prettier-config": "1.0.1",
     "@eik/semantic-release-config": "1.0.2",
     "@eik/typescript-config": "1.0.0",
-    "eslint": "9.16.0",
+    "eslint": "9.25.1",
     "npm-run-all2": "7.0.2",
     "prettier": "3.4.1",
     "rimraf": "6.0.1",

package/src/index.js

@@ -1,5 +1,5 @@
 import { helpers } from "@eik/common";
-import { request } from "undici";
+import { request, interceptors, Agent } from "undici";
 import { join } from "path";
 import { Asset } from "./asset.js";
 
@@ -8,21 +8,47 @@ const trimSlash = (value = "") => {
 	return value;
 };
 
-const fetchImportMaps = async (urls = []) => {
+/**
+ * @param {string[]} urls
+ * @param {object} options
+ * @param {number} options.maxRedirections - undici option for limiting redirects
+ * @returns {Promise<ImportMap[]>}
+ */
+const fetchImportMaps = async (urls = [], options) => {
 	try {
 		const maps = urls.map(async (map) => {
-			const { statusCode, body } = await request(map, {
-				maxRedirections: 2,
+			const response = await request(map, {
+				dispatcher: new Agent().compose(
+					interceptors.redirect({
+						maxRedirections: options.maxRedirections,
+					}),
+				),
 			});
 
-			if (statusCode === 404) {
+			if (response.statusCode === 404) {
 				throw new Error("Import map could not be found on server");
-			} else if (statusCode >= 400 && statusCode < 500) {
+			} else if (response.statusCode >= 400 && response.statusCode < 500) {
 				throw new Error("Server rejected client request");
-			} else if (statusCode >= 500) {
+			} else if (response.statusCode >= 500) {
 				throw new Error("Server error");
 			}
-			return body.json();
+			let contentType = response.headers["content-type"];
+			if (!Array.isArray(contentType)) contentType = [contentType];
+
+			if (!contentType.find((type) => type.startsWith("application/json"))) {
+				const content = await response.body.text();
+				if (content.length === 0) {
+					throw new Error(
+						`${map} did not return JSON, got an empty response. HTTP status: ${response.statusCode}`,
+					);
+				}
+				throw new Error(
+					`${map} did not return JSON, got: ${content}. HTTP status: ${response.statusCode}`,
+				);
+			}
+
+			const json = await response.body.json();
+			return /** @type {ImportMap}*/ (json);
 		});
 		return await Promise.all(maps);
 	} catch (err) {
@@ -38,6 +64,7 @@ const fetchImportMaps = async (urls = []) => {
  * @property {boolean} [development=false]
  * @property {boolean} [loadMaps=false]
  * @property {string} [path=process.cwd()]
+ * @property {number} [maxRedirections=2] Maximum number of redirects when looking up URLs.
  */
 
 /**
@@ -111,6 +138,7 @@ export default class Eik {
 	#path;
 	#base;
 	#maps;
+	#maxRedirections;
 
 	/**
 	 * @param {Options} options
@@ -120,6 +148,7 @@ export default class Eik {
 		loadMaps = false,
 		base = "",
 		path = process.cwd(),
+		maxRedirections = 2,
 	} = {}) {
 		this.#development = development;
 		this.#loadMaps = loadMaps;
@@ -127,6 +156,7 @@ export default class Eik {
 		this.#path = path;
 		this.#base = trimSlash(base);
 		this.#maps = [];
+		this.#maxRedirections = maxRedirections;
 	}
 
 	/**
@@ -139,7 +169,9 @@ export default class Eik {
 	async load() {
 		this.#config = await helpers.getDefaults(this.#path);
 		if (this.#loadMaps) {
-			this.#maps = await fetchImportMaps(this.#config.map);
+			this.#maps = await fetchImportMaps(this.#config.map, {
+				maxRedirections: this.#maxRedirections,
+			});
 		}
 	}
 

package/types/index.d.ts

@@ -4,6 +4,7 @@
  * @property {boolean} [development=false]
  * @property {boolean} [loadMaps=false]
  * @property {string} [path=process.cwd()]
+ * @property {number} [maxRedirections=2] Maximum number of redirects when looking up URLs.
  */
 /**
  * @typedef {object} ImportMap
@@ -72,7 +73,7 @@ export default class Eik {
     /**
      * @param {Options} options
      */
-    constructor({ development, loadMaps, base, path, }?: Options);
+    constructor({ development, loadMaps, base, path, maxRedirections, }?: Options);
     /**
      * Reads the Eik config from disk into the object instance, used for building {@link file} links in production.
      *
@@ -212,6 +213,10 @@ export type Options = {
     development?: boolean;
     loadMaps?: boolean;
     path?: string;
+    /**
+     * Maximum number of redirects when looking up URLs.
+     */
+    maxRedirections?: number;
 };
 export type ImportMap = {
     imports: Record<string, string>;