WIP - migrating to the new http client

Author: leftieFriele

lib/resolver.content.js

@@ -7,9 +7,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';
 
 const currentDirectory = dirname(fileURLToPath(import.meta.url));
 
@@ -24,7 +24,7 @@ const UA_STRING = `${pkg.name} ${pkg.version}`;
 /**
  * @typedef {object} PodletClientContentResolverOptions
  * @property {string} clientName
- * @property {import('./http.js').default} [http]
+ * @property {import('@podium/http-client').default} [http]
  * @property {import('abslog').AbstractLoggerOptions} [logger]
  */
 
@@ -40,7 +40,11 @@ export default class PodletClientContentResolver {
      */
     // @ts-expect-error Deliberate default empty options for better error messages
     constructor(options = {}) {
-        this.#http = options.http || new HTTP();
+        this.#http = options.http || new HttpClient({
+            timeout: options.timeout,
+            throwOn400: options.throwable,
+            throwOn500: options.throwable,
+        });
         const name = options.clientName;
         this.#log = abslog(options.logger);
         this.#metrics = new Metrics();
@@ -158,11 +162,17 @@ export default class PodletClientContentResolver {
         );
 
         try {
+            const url = new URL(uri)
             const {
                 statusCode,
                 headers: hdrs,
                 body,
-            } = await this.#http.request(uri, reqOptions);
+            } = await this.#http.request({
+                origin: url.origin,
+                path: url.pathname,
+                method: reqOptions.method,
+                throwable: reqOptions.throwable
+            });
 
             // Remote responds but with an http error code
             const resError = statusCode >= 400;

package.json

@@ -37,11 +37,13 @@
   "dependencies": {
     "@hapi/boom": "10.0.1",
     "@metrics/client": "2.5.2",
+    "@podium/http-client": "1.0.1-beta.1",
     "@podium/schemas": "5.0.5",
     "@podium/utils": "5.0.7",
     "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.18.2"
   },

tests/resolver.content.test.js

@@ -6,6 +6,7 @@ import {
     PodletServer,
     HttpServer,
 } from '@podium/test-utils';
+import HttpClient from "@podium/http-client/lib/http-client.js";
 import HttpOutgoing from '../lib/http-outgoing.js';
 import Content from '../lib/resolver.content.js';
 

tsconfig.json

@@ -10,7 +10,7 @@
     "declaration": true,
     "skipLibCheck": true,
     "allowSyntheticDefaultImports": true,
-    "outDir": "types"
+    "outDir": "types",
   },
   "include": ["./lib/**/*.js"]
 }