@thalorlabs/dadjoke 1.0.1 → 1.1.0

package/dist/DadJokeClient.d.ts

@@ -1,3 +1,4 @@
+import { BaseHttpClient } from '@thalorlabs/api';
 import { TLJoke } from '@thalorlabs/types';
 export interface DadJokeClientConfig {
     baseURL?: string;
@@ -6,15 +7,12 @@ export interface DadJokeClientConfig {
 /**
  * HTTP adapter for icanhazdadjoke.com.
  *
- * Calls the external API and normalises the raw response to TLJoke.
+ * Extends BaseHttpClient for retry logic, exponential backoff, and
+ * observability. Normalises the raw response to TLJoke.
  * No DB, no cache, no logging — pure HTTP adapter.
- *
- * When @thalorlabs/api is available, this should extend BaseHttpClient
- * instead of managing its own axios instance.
  */
-export declare class DadJokeClient {
+export declare class DadJokeClient extends BaseHttpClient {
     readonly serviceName = "dadjoke";
-    private readonly axiosInstance;
     constructor(config?: DadJokeClientConfig);
     getJoke(): Promise<TLJoke>;
     private normalise;

package/dist/DadJokeClient.js

@@ -1,35 +1,29 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DadJokeClient = void 0;
-const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
+const api_1 = require("@thalorlabs/api");
 const types_1 = require("@thalorlabs/types");
 /**
  * HTTP adapter for icanhazdadjoke.com.
  *
- * Calls the external API and normalises the raw response to TLJoke.
+ * Extends BaseHttpClient for retry logic, exponential backoff, and
+ * observability. Normalises the raw response to TLJoke.
  * No DB, no cache, no logging — pure HTTP adapter.
- *
- * When @thalorlabs/api is available, this should extend BaseHttpClient
- * instead of managing its own axios instance.
  */
-class DadJokeClient {
+class DadJokeClient extends api_1.BaseHttpClient {
     constructor(config = {}) {
-        this.serviceName = 'dadjoke';
-        this.axiosInstance = axios_1.default.create({
+        super({
             baseURL: config.baseURL ?? 'https://icanhazdadjoke.com',
+            serviceName: 'dadjoke',
+            retries: 3,
             timeout: config.timeout ?? 10000,
-            headers: {
-                Accept: 'application/json',
-            },
         });
+        this.serviceName = 'dadjoke';
     }
     async getJoke() {
-        const { data } = await this.axiosInstance.get('/');
-        return this.normalise(data);
+        const { response } = await this.handleRequest({ method: 'GET', url: '/' }, { method: 'GET', url: '/', requestId: (0, crypto_1.randomUUID)() });
+        return this.normalise(response.data);
     }
     normalise(raw) {
         return types_1.TLJoke.parse({

package/package.json

@@ -2,7 +2,7 @@
   "name": "@thalorlabs/dadjoke",
   "author": "ThalorLabs",
   "private": false,
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Provider adapter for icanhazdadjoke.com — returns TLJoke",
   "homepage": "https://github.com/ThalorLabs/dadjoke#readme",
   "bugs": {
@@ -40,7 +40,7 @@
     "vitest": "^3.0.0"
   },
   "dependencies": {
-    "@thalorlabs/types": "^1.7.0",
-    "axios": "^1.7.0"
+    "@thalorlabs/api": "^1.0.0",
+    "@thalorlabs/types": "^1.7.0"
   }
 }

package/src/DadJokeClient.ts

@@ -1,5 +1,5 @@
-import axios, { AxiosInstance } from 'axios';
-import { createHash } from 'crypto';
+import { createHash, randomUUID } from 'crypto';
+import { BaseHttpClient } from '@thalorlabs/api';
 import { TLJoke, EJokeType, EJokeCategory } from '@thalorlabs/types';
 import { DadJokeRawResponse } from './DadJokeTypes';
 
@@ -11,29 +11,28 @@ export interface DadJokeClientConfig {
 /**
  * HTTP adapter for icanhazdadjoke.com.
  *
- * Calls the external API and normalises the raw response to TLJoke.
+ * Extends BaseHttpClient for retry logic, exponential backoff, and
+ * observability. Normalises the raw response to TLJoke.
  * No DB, no cache, no logging — pure HTTP adapter.
- *
- * When @thalorlabs/api is available, this should extend BaseHttpClient
- * instead of managing its own axios instance.
  */
-export class DadJokeClient {
+export class DadJokeClient extends BaseHttpClient {
   public readonly serviceName = 'dadjoke';
-  private readonly axiosInstance: AxiosInstance;
 
   constructor(config: DadJokeClientConfig = {}) {
-    this.axiosInstance = axios.create({
+    super({
       baseURL: config.baseURL ?? 'https://icanhazdadjoke.com',
+      serviceName: 'dadjoke',
+      retries: 3,
       timeout: config.timeout ?? 10000,
-      headers: {
-        Accept: 'application/json',
-      },
     });
   }
 
   async getJoke(): Promise<TLJoke> {
-    const { data } = await this.axiosInstance.get<DadJokeRawResponse>('/');
-    return this.normalise(data);
+    const { response } = await this.handleRequest<DadJokeRawResponse>(
+      { method: 'GET', url: '/' },
+      { method: 'GET', url: '/', requestId: randomUUID() }
+    );
+    return this.normalise(response.data);
   }
 
   private normalise(raw: DadJokeRawResponse): TLJoke {

package/tests/DadJokeClient.test.ts

@@ -1,24 +1,13 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { DadJokeClient } from '../src/DadJokeClient';
 import { EJokeType, EJokeCategory } from '@thalorlabs/types';
-import axios from 'axios';
+import { BaseHttpClient } from '@thalorlabs/api';
 
-vi.mock('axios', () => {
-  const mockAxiosInstance = {
-    get: vi.fn(),
-  };
-  return {
-    default: {
-      create: vi.fn(() => mockAxiosInstance),
-    },
-  };
-});
-
-function getMockAxios() {
-  const instance = (axios.create as ReturnType<typeof vi.fn>).mock.results[0]
-    .value;
-  return instance.get as ReturnType<typeof vi.fn>;
-}
+// Mock handleRequest on the prototype — no axios import needed in tests
+const mockHandleRequest = vi.fn();
+vi.spyOn(BaseHttpClient.prototype as any, 'handleRequest').mockImplementation(
+  mockHandleRequest
+);
 
 describe('DadJokeClient', () => {
   let client: DadJokeClient;
@@ -32,35 +21,19 @@ describe('DadJokeClient', () => {
     it('sets serviceName to dadjoke', () => {
       expect(client.serviceName).toBe('dadjoke');
     });
-
-    it('creates axios instance with default config', () => {
-      expect(axios.create).toHaveBeenCalledWith({
-        baseURL: 'https://icanhazdadjoke.com',
-        timeout: 10000,
-        headers: { Accept: 'application/json' },
-      });
-    });
-
-    it('accepts custom baseURL and timeout', () => {
-      vi.clearAllMocks();
-      new DadJokeClient({ baseURL: 'http://localhost:3000', timeout: 5000 });
-      expect(axios.create).toHaveBeenCalledWith({
-        baseURL: 'http://localhost:3000',
-        timeout: 5000,
-        headers: { Accept: 'application/json' },
-      });
-    });
   });
 
   describe('getJoke', () => {
     it('returns a valid TLJoke with SINGLE type and DAD category', async () => {
-      const mockGet = getMockAxios();
-      mockGet.mockResolvedValueOnce({
-        data: {
-          id: 'abc123',
-          joke: 'Why did the scarecrow win an award? He was outstanding in his field.',
-          status: 200,
+      mockHandleRequest.mockResolvedValueOnce({
+        response: {
+          data: {
+            id: 'abc123',
+            joke: 'Why did the scarecrow win an award? He was outstanding in his field.',
+            status: 200,
+          },
         },
+        durationMs: 50,
       });
 
       const joke = await client.getJoke();
@@ -76,10 +49,10 @@ describe('DadJokeClient', () => {
     });
 
     it('generates a deterministic id from joke text', async () => {
-      const mockGet = getMockAxios();
       const jokeText = 'Test joke';
-      mockGet.mockResolvedValue({
-        data: { id: 'raw-id', joke: jokeText, status: 200 },
+      mockHandleRequest.mockResolvedValue({
+        response: { data: { id: 'raw-id', joke: jokeText, status: 200 } },
+        durationMs: 10,
       });
 
       const joke1 = await client.getJoke();
@@ -88,20 +61,22 @@ describe('DadJokeClient', () => {
       expect(joke1.id).toBe(joke2.id);
     });
 
-    it('calls GET / on the API', async () => {
-      const mockGet = getMockAxios();
-      mockGet.mockResolvedValueOnce({
-        data: { id: 'abc', joke: 'A joke', status: 200 },
+    it('calls handleRequest with GET /', async () => {
+      mockHandleRequest.mockResolvedValueOnce({
+        response: { data: { id: 'abc', joke: 'A joke', status: 200 } },
+        durationMs: 10,
       });
 
       await client.getJoke();
 
-      expect(mockGet).toHaveBeenCalledWith('/');
+      expect(mockHandleRequest).toHaveBeenCalledWith(
+        expect.objectContaining({ method: 'GET', url: '/' }),
+        expect.objectContaining({ method: 'GET', url: '/' })
+      );
     });
 
-    it('propagates API errors', async () => {
-      const mockGet = getMockAxios();
-      mockGet.mockRejectedValueOnce(new Error('Network error'));
+    it('propagates errors from handleRequest', async () => {
+      mockHandleRequest.mockRejectedValueOnce(new Error('Network error'));
 
       await expect(client.getJoke()).rejects.toThrow('Network error');
     });