@thalorlabs/chucknorris 1.0.0 → 1.1.0

package/dist/ChuckNorrisClient.d.ts

@@ -1,3 +1,4 @@
+import { BaseHttpClient } from '@thalorlabs/api';
 import { TLJoke } from '@thalorlabs/types';
 export interface ChuckNorrisClientConfig {
     baseURL?: string;
@@ -6,15 +7,12 @@ export interface ChuckNorrisClientConfig {
 /**
  * HTTP adapter for api.chucknorris.io.
  *
- * 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 ChuckNorrisClient {
+export declare class ChuckNorrisClient extends BaseHttpClient {
     readonly serviceName = "chucknorris";
-    private readonly axiosInstance;
     constructor(config?: ChuckNorrisClientConfig);
     getJoke(): Promise<TLJoke>;
     private normalise;

package/dist/ChuckNorrisClient.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.ChuckNorrisClient = 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 api.chucknorris.io.
  *
- * 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 ChuckNorrisClient {
+class ChuckNorrisClient extends api_1.BaseHttpClient {
     constructor(config = {}) {
-        this.serviceName = 'chucknorris';
-        this.axiosInstance = axios_1.default.create({
+        super({
             baseURL: config.baseURL ?? 'https://api.chucknorris.io',
+            serviceName: 'chucknorris',
+            retries: 3,
             timeout: config.timeout ?? 10000,
-            headers: {
-                Accept: 'application/json',
-            },
         });
+        this.serviceName = 'chucknorris';
     }
     async getJoke() {
-        const { data } = await this.axiosInstance.get('/jokes/random');
-        return this.normalise(data);
+        const { response } = await this.handleRequest({ method: 'GET', url: '/jokes/random' }, { method: 'GET', url: '/jokes/random', requestId: (0, crypto_1.randomUUID)() });
+        return this.normalise(response.data);
     }
     normalise(raw) {
         return types_1.TLJoke.parse({
@@ -37,7 +31,7 @@ class ChuckNorrisClient {
             type: types_1.EJokeType.SINGLE,
             joke: raw.value,
             category: types_1.EJokeCategory.GENERAL,
-            safe: false, // Chuck Norris jokes can contain explicit content
+            safe: false,
             provider: this.serviceName,
         });
     }

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { ChuckNorrisClient, ChuckNorrisClientConfig, } from './ChuckNorrisClient';
 export declare const CHUCK_NORRIS_CONFIG: {
-    readonly cacheTtlMs: number;
+    readonly cacheTtlMs: 0;
     readonly isBillable: false;
 };

package/dist/index.js

@@ -4,6 +4,6 @@ exports.CHUCK_NORRIS_CONFIG = exports.ChuckNorrisClient = void 0;
 var ChuckNorrisClient_1 = require("./ChuckNorrisClient");
 Object.defineProperty(exports, "ChuckNorrisClient", { enumerable: true, get: function () { return ChuckNorrisClient_1.ChuckNorrisClient; } });
 exports.CHUCK_NORRIS_CONFIG = {
-    cacheTtlMs: 1000 * 60 * 60, // 1h
+    cacheTtlMs: 0, // random endpoint — no caching
     isBillable: false, // api.chucknorris.io is free
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@thalorlabs/chucknorris",
   "author": "ThalorLabs",
   "private": false,
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Provider adapter for api.chucknorris.io — returns TLJoke",
   "homepage": "https://github.com/ThalorLabs/chucknorris#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/ChuckNorrisClient.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 { ChuckNorrisRawResponse } from './ChuckNorrisTypes';
 
@@ -11,30 +11,28 @@ export interface ChuckNorrisClientConfig {
 /**
  * HTTP adapter for api.chucknorris.io.
  *
- * 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 ChuckNorrisClient {
+export class ChuckNorrisClient extends BaseHttpClient {
   public readonly serviceName = 'chucknorris';
-  private readonly axiosInstance: AxiosInstance;
 
   constructor(config: ChuckNorrisClientConfig = {}) {
-    this.axiosInstance = axios.create({
+    super({
       baseURL: config.baseURL ?? 'https://api.chucknorris.io',
+      serviceName: 'chucknorris',
+      retries: 3,
       timeout: config.timeout ?? 10000,
-      headers: {
-        Accept: 'application/json',
-      },
     });
   }
 
   async getJoke(): Promise<TLJoke> {
-    const { data } =
-      await this.axiosInstance.get<ChuckNorrisRawResponse>('/jokes/random');
-    return this.normalise(data);
+    const { response } = await this.handleRequest<ChuckNorrisRawResponse>(
+      { method: 'GET', url: '/jokes/random' },
+      { method: 'GET', url: '/jokes/random', requestId: randomUUID() }
+    );
+    return this.normalise(response.data);
   }
 
   private normalise(raw: ChuckNorrisRawResponse): TLJoke {
@@ -43,7 +41,7 @@ export class ChuckNorrisClient {
       type: EJokeType.SINGLE,
       joke: raw.value,
       category: EJokeCategory.GENERAL,
-      safe: false, // Chuck Norris jokes can contain explicit content
+      safe: false,
       provider: this.serviceName,
     });
   }

package/src/index.ts

@@ -4,6 +4,6 @@ export {
 } from './ChuckNorrisClient';
 
 export const CHUCK_NORRIS_CONFIG = {
-  cacheTtlMs: 1000 * 60 * 60, // 1h
+  cacheTtlMs: 0, // random endpoint — no caching
   isBillable: false, // api.chucknorris.io is free
 } as const;

package/tests/ChuckNorrisClient.test.ts

@@ -1,24 +1,12 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { ChuckNorrisClient } from '../src/ChuckNorrisClient';
 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>;
-}
+const mockHandleRequest = vi.fn();
+vi.spyOn(BaseHttpClient.prototype as any, 'handleRequest').mockImplementation(
+  mockHandleRequest
+);
 
 describe('ChuckNorrisClient', () => {
   let client: ChuckNorrisClient;
@@ -32,39 +20,20 @@ describe('ChuckNorrisClient', () => {
     it('sets serviceName to chucknorris', () => {
       expect(client.serviceName).toBe('chucknorris');
     });
-
-    it('creates axios instance with default config', () => {
-      expect(axios.create).toHaveBeenCalledWith({
-        baseURL: 'https://api.chucknorris.io',
-        timeout: 10000,
-        headers: { Accept: 'application/json' },
-      });
-    });
-
-    it('accepts custom baseURL and timeout', () => {
-      vi.clearAllMocks();
-      new ChuckNorrisClient({
-        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 GENERAL category', async () => {
-      const mockGet = getMockAxios();
-      mockGet.mockResolvedValueOnce({
-        data: {
-          icon_url: 'https://api.chucknorris.io/img/avatar/chuck-norris.png',
-          id: 'abc123',
-          url: '',
-          value: 'Chuck Norris can divide by zero.',
+      mockHandleRequest.mockResolvedValueOnce({
+        response: {
+          data: {
+            icon_url: 'https://api.chucknorris.io/img/avatar/chuck-norris.png',
+            id: 'abc123',
+            url: '',
+            value: 'Chuck Norris can divide by zero.',
+          },
         },
+        durationMs: 50,
       });
 
       const joke = await client.getJoke();
@@ -78,15 +47,12 @@ describe('ChuckNorrisClient', () => {
     });
 
     it('generates a deterministic id from joke text', async () => {
-      const mockGet = getMockAxios();
       const jokeText = 'Test joke';
-      mockGet.mockResolvedValue({
-        data: {
-          icon_url: 'https://example.com/icon.png',
-          id: 'raw-id',
-          url: '',
-          value: jokeText,
+      mockHandleRequest.mockResolvedValue({
+        response: {
+          data: { icon_url: '', id: 'raw-id', url: '', value: jokeText },
         },
+        durationMs: 10,
       });
 
       const joke1 = await client.getJoke();
@@ -95,25 +61,24 @@ describe('ChuckNorrisClient', () => {
       expect(joke1.id).toBe(joke2.id);
     });
 
-    it('calls GET /jokes/random on the API', async () => {
-      const mockGet = getMockAxios();
-      mockGet.mockResolvedValueOnce({
-        data: {
-          icon_url: '',
-          id: 'abc',
-          url: '',
-          value: 'A joke',
+    it('calls handleRequest with GET /jokes/random', async () => {
+      mockHandleRequest.mockResolvedValueOnce({
+        response: {
+          data: { icon_url: '', id: 'abc', url: '', value: 'A joke' },
         },
+        durationMs: 10,
       });
 
       await client.getJoke();
 
-      expect(mockGet).toHaveBeenCalledWith('/jokes/random');
+      expect(mockHandleRequest).toHaveBeenCalledWith(
+        expect.objectContaining({ method: 'GET', url: '/jokes/random' }),
+        expect.objectContaining({ method: 'GET', url: '/jokes/random' })
+      );
     });
 
-    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');
     });