@podium/client 5.2.5-beta.4 → 5.2.6

package/CHANGELOG.md

@@ -1,16 +1,9 @@
-## [5.2.5-beta.4](https://github.com/podium-lib/client/compare/v5.2.5-beta.3...v5.2.5-beta.4) (2025-01-13)
+## [5.2.6](https://github.com/podium-lib/client/compare/v5.2.5...v5.2.6) (2025-01-16)
 
 
 ### Bug Fixes
 
-* setting name of the client as the clientName for @podium/http-client ([65c3cb3](https://github.com/podium-lib/client/commit/65c3cb3f91867c74a5315de52ff67bb6dc2fbc19))
-
-## [5.2.5-beta.3](https://github.com/podium-lib/client/compare/v5.2.5-beta.2...v5.2.5-beta.3) (2025-01-13)
-
-
-### Bug Fixes
-
-* correctly build asset urls from link headers ([#446](https://github.com/podium-lib/client/issues/446)) ([89f9e0b](https://github.com/podium-lib/client/commit/89f9e0b44f87c45c1459dce7e53db4fa7fc85d17))
+* **deps:** update dependency undici to v6.21.1 ([#453](https://github.com/podium-lib/client/issues/453)) ([2cf54ca](https://github.com/podium-lib/client/commit/2cf54cac312cf6cbb91da0e0f636433f2de7d892))
 
 ## [5.2.5](https://github.com/podium-lib/client/compare/v5.2.4...v5.2.5) (2024-11-27)
 

package/lib/resolver.content.js

@@ -6,9 +6,9 @@ import { Boom, badGateway } from '@hapi/boom';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
-import HttpClient from '@podium/http-client';
 import * as utils from './utils.js';
 import Response from './response.js';
+import HTTP from './http.js';
 import { parseLinkHeaders, filterAssets } from './utils.js';
 import { AssetJs, AssetCss } from '@podium/utils';
 
@@ -25,7 +25,7 @@ const UA_STRING = `${pkg.name} ${pkg.version}`;
 /**
  * @typedef {object} PodletClientContentResolverOptions
  * @property {string} clientName
- * @property {import('@podium/http-client').default} [http]
+ * @property {import('./http.js').default} [http]
  * @property {import('abslog').AbstractLoggerOptions} [logger]
  */
 
@@ -41,9 +41,9 @@ export default class PodletClientContentResolver {
      */
     // @ts-expect-error Deliberate default empty options for better error messages
     constructor(options = {}) {
+        this.#http = options.http || new HTTP();
         const name = options.clientName;
         this.#log = abslog(options.logger);
-        this.#http = options.http || new HttpClient({ logger: options.logger });
         this.#metrics = new Metrics();
         this.#histogram = this.#metrics.histogram({
             name: 'podium_client_resolver_content_resolve',
@@ -62,7 +62,6 @@ export default class PodletClientContentResolver {
                 error,
             );
         });
-        this.#http.metrics.pipe(this.#metrics);
     }
 
     get metrics() {
@@ -154,16 +153,11 @@ export default class PodletClientContentResolver {
         );
 
         try {
-            const url = new URL(uri);
             const {
                 statusCode,
                 headers: hdrs,
                 body,
-            } = await this.#http.request({
-                origin: url.origin,
-                path: url.pathname,
-                ...reqOptions,
-            });
+            } = await this.#http.request(uri, reqOptions);
 
             const parsedAssetObjects = parseLinkHeaders(
                 hdrs.link,
@@ -261,6 +255,7 @@ export default class PodletClientContentResolver {
             if (outgoing.redirectable && statusCode >= 300) {
                 outgoing.redirect = {
                     statusCode,
+                    // @ts-expect-error TODO: look into what happens if the podlet returns more than one location header
                     location: hdrs && hdrs.location,
                 };
             }

package/lib/resolver.fallback.js

@@ -3,9 +3,9 @@ import Metrics from '@metrics/client';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
+import HTTP from './http.js';
 import { parseLinkHeaders, filterAssets } from './utils.js';
 import { AssetJs, AssetCss } from '@podium/utils';
-import HttpClient from '@podium/http-client';
 
 const currentDirectory = dirname(fileURLToPath(import.meta.url));
 
@@ -20,7 +20,7 @@ const UA_STRING = `${pkg.name} ${pkg.version}`;
 /**
  * @typedef {object} PodletClientFallbackResolverOptions
  * @property {string} clientName
- * @property {import('@podium/http-client').default} [http]
+ * @property {import('./http.js').default} [http]
  * @property {import('abslog').AbstractLoggerOptions} [logger]
  */
 
@@ -36,9 +36,9 @@ export default class PodletClientFallbackResolver {
      */
     // @ts-expect-error Deliberate default empty options for better error messages
     constructor(options = {}) {
+        this.#http = options.http || new HTTP();
         const name = options.clientName;
         this.#log = abslog(options.logger);
-        this.#http = options.http || new HttpClient({ logger: options.logger });
         this.#metrics = new Metrics();
         this.#histogram = this.#metrics.histogram({
             name: 'podium_client_resolver_fallback_resolve',
@@ -57,7 +57,6 @@ export default class PodletClientFallbackResolver {
                 error,
             );
         });
-        this.#http.metrics.pipe(this.#metrics);
     }
 
     get metrics() {
@@ -115,16 +114,11 @@ export default class PodletClientFallbackResolver {
             this.#log.debug(
                 `start reading fallback content from remote resource - resource: ${outgoing.name} - url: ${outgoing.fallbackUri}`,
             );
-            const url = new URL(outgoing.fallbackUri);
             const {
                 statusCode,
                 body,
                 headers: resHeaders,
-            } = await this.#http.request({
-                origin: url.origin,
-                path: url.pathname,
-                ...reqOptions,
-            });
+            } = await this.#http.request(outgoing.fallbackUri, reqOptions);
 
             const parsedAssetObjects = parseLinkHeaders(
                 resHeaders.link,

package/lib/resolver.js

@@ -1,7 +1,7 @@
 import Metrics from '@metrics/client';
 import abslog from 'abslog';
 import assert from 'assert';
-import HttpClient from '@podium/http-client';
+import HTTP from './http.js';
 import Manifest from './resolver.manifest.js';
 import Fallback from './resolver.fallback.js';
 import Content from './resolver.content.js';
@@ -9,7 +9,6 @@ import Cache from './resolver.cache.js';
 
 /**
  * @typedef {object} PodletClientResolverOptions
- * @property {string} name - the name of the resource
  * @property {string} clientName
  * @property {import('abslog').AbstractLoggerOptions} [logger]
  * @property {boolean} [earlyHints]
@@ -35,18 +34,18 @@ export default class PodletClientResolver {
         );
 
         const log = abslog(options.logger);
-        const httpClient = new HttpClient({
-            clientName: options.name,
-            logger: options.logger,
-        });
+        const http = new HTTP();
         this.#cache = new Cache(registry, options);
         this.#manifest = new Manifest({
             clientName: options.clientName,
             logger: options.logger,
-            http: httpClient,
+            http,
+        });
+        this.#fallback = new Fallback({ ...options, http });
+        this.#content = new Content({
+            ...options,
+            http,
         });
-        this.#fallback = new Fallback({ ...options, http: httpClient });
-        this.#content = new Content({ ...options, http: httpClient });
         this.#metrics = new Metrics();
 
         this.#metrics.on('error', (error) => {
@@ -56,7 +55,6 @@ export default class PodletClientResolver {
             );
         });
 
-        httpClient.metrics.pipe(this.#metrics);
         this.#content.metrics.pipe(this.#metrics);
         this.#fallback.metrics.pipe(this.#metrics);
         this.#manifest.metrics.pipe(this.#metrics);

package/lib/resolver.manifest.js

@@ -6,7 +6,7 @@ import * as utils from '@podium/utils';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
-import HttpClient from '@podium/http-client';
+import HTTP from './http.js';
 
 const currentDirectory = dirname(fileURLToPath(import.meta.url));
 
@@ -22,7 +22,7 @@ const UA_STRING = `${pkg.name} ${pkg.version}`;
  * @typedef {object} PodletClientManifestResolverOptions
  * @property {string} clientName
  * @property {import('abslog').AbstractLoggerOptions} [logger]
- * @property {import('@podium/http-client').default} [http]
+ * @property {import('./http.js').default} [http]
  */
 
 export default class PodletClientManifestResolver {
@@ -37,9 +37,9 @@ export default class PodletClientManifestResolver {
      */
     // @ts-expect-error Deliberate default empty options for better error messages
     constructor(options = {}) {
+        this.#http = options.http || new HTTP();
         const name = options.clientName;
         this.#log = abslog(options.logger);
-        this.#http = options.http || new HttpClient({ logger: this.#log });
         this.#metrics = new Metrics();
         this.#histogram = this.#metrics.histogram({
             name: 'podium_client_resolver_manifest_resolve',
@@ -58,7 +58,6 @@ export default class PodletClientManifestResolver {
                 error,
             );
         });
-        this.#http.metrics.pipe(this.#metrics);
     }
 
     get metrics() {
@@ -98,12 +97,10 @@ export default class PodletClientManifestResolver {
         );
 
         try {
-            const url = new URL(outgoing.manifestUri);
-            const response = await this.#http.request({
-                origin: url.origin,
-                path: url.pathname,
-                ...reqOptions,
-            });
+            const response = await this.#http.request(
+                outgoing.manifestUri,
+                reqOptions,
+            );
             const { statusCode, headers: hdrs, body } = response;
 
             // Remote responds but with an http error code
@@ -123,10 +120,11 @@ export default class PodletClientManifestResolver {
                 await body.text();
                 return outgoing;
             }
-            // Body must be consumed; https://github.com/nodejs/undici/issues/583#issuecomment-855384858
-            const schema = await body.json();
+
             const manifest = validateManifest(
-                /** @type {import("@podium/schemas").PodletManifestSchema} */ schema,
+                /** @type {import("@podium/schemas").PodletManifestSchema} */ (
+                    await body.json()
+                ),
             );
 
             // Manifest validation error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@podium/client",
-  "version": "5.2.5-beta.4",
+  "version": "5.2.6",
   "type": "module",
   "license": "MIT",
   "keywords": [
@@ -39,15 +39,13 @@
   "dependencies": {
     "@hapi/boom": "10.0.1",
     "@metrics/client": "2.5.4",
-    "@podium/http-client": "1.0.0-beta.9",
     "@podium/schemas": "5.1.0",
     "@podium/utils": "5.4.0",
     "abslog": "2.4.4",
     "http-cache-semantics": "^4.0.3",
     "lodash.clonedeep": "^4.5.0",
-    "opossum": "^8.3.0",
     "ttl-mem-cache": "4.1.0",
-    "undici": "6.21.0"
+    "undici": "6.21.1"
   },
   "devDependencies": {
     "@podium/eslint-config": "1.0.5",

package/types/resolver.content.d.ts

@@ -1,7 +1,7 @@
 /**
  * @typedef {object} PodletClientContentResolverOptions
  * @property {string} clientName
- * @property {import('@podium/http-client').default} [http]
+ * @property {import('./http.js').default} [http]
  * @property {import('abslog').AbstractLoggerOptions} [logger]
  */
 export default class PodletClientContentResolver {
@@ -23,7 +23,7 @@ export default class PodletClientContentResolver {
 }
 export type PodletClientContentResolverOptions = {
     clientName: string;
-    http?: any;
+    http?: import("./http.js").default;
     logger?: import("abslog").AbstractLoggerOptions;
 };
 import Metrics from '@metrics/client';

package/types/resolver.d.ts

@@ -1,6 +1,5 @@
 /**
  * @typedef {object} PodletClientResolverOptions
- * @property {string} name - the name of the resource
  * @property {string} clientName
  * @property {import('abslog').AbstractLoggerOptions} [logger]
  * @property {boolean} [earlyHints]
@@ -31,10 +30,6 @@ export default class PodletClientResolver {
     #private;
 }
 export type PodletClientResolverOptions = {
-    /**
-     * - the name of the resource
-     */
-    name: string;
     clientName: string;
     logger?: import("abslog").AbstractLoggerOptions;
     earlyHints?: boolean;

package/types/resolver.fallback.d.ts

@@ -1,7 +1,7 @@
 /**
  * @typedef {object} PodletClientFallbackResolverOptions
  * @property {string} clientName
- * @property {import('@podium/http-client').default} [http]
+ * @property {import('./http.js').default} [http]
  * @property {import('abslog').AbstractLoggerOptions} [logger]
  */
 export default class PodletClientFallbackResolver {
@@ -23,7 +23,7 @@ export default class PodletClientFallbackResolver {
 }
 export type PodletClientFallbackResolverOptions = {
     clientName: string;
-    http?: any;
+    http?: import("./http.js").default;
     logger?: import("abslog").AbstractLoggerOptions;
 };
 import Metrics from '@metrics/client';

package/types/resolver.manifest.d.ts

@@ -2,7 +2,7 @@
  * @typedef {object} PodletClientManifestResolverOptions
  * @property {string} clientName
  * @property {import('abslog').AbstractLoggerOptions} [logger]
- * @property {import('@podium/http-client').default} [http]
+ * @property {import('./http.js').default} [http]
  */
 export default class PodletClientManifestResolver {
     /**
@@ -22,6 +22,6 @@ export default class PodletClientManifestResolver {
 export type PodletClientManifestResolverOptions = {
     clientName: string;
     logger?: import("abslog").AbstractLoggerOptions;
-    http?: any;
+    http?: import("./http.js").default;
 };
 import Metrics from '@metrics/client';