chore: package rename

Author: fulleni

.github/dependabot.yaml

@@ -10,4 +10,4 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "ht_*"
+      - dependency-name: "core"

README.md

@@ -1,4 +1,4 @@
-# ht_http_client
+# http_client
 
 ![coverage: percentage](https://img.shields.io/badge/coverage-XX-green)
 [![style: very good analysis](https://img.shields.io/badge/style-very_good_analysis-B22C89.svg)](https://pub.dev/packages/very_good_analysis)
@@ -8,14 +8,14 @@ A robust and reusable Dart HTTP client built on top of the `dio` package. It sim
 
 ## Description
 
-This package provides an `HtHttpClient` class designed to be used as a foundational data access component in Dart or Flutter applications. It abstracts away the complexities of setting up `dio`, handling authentication tokens, and interpreting various HTTP error conditions, offering a cleaner interface for making API calls.
+This package provides an `HttpClient` class designed to be used as a foundational data access component in Dart or Flutter applications. It abstracts away the complexities of setting up `dio`, handling authentication tokens, and interpreting various HTTP error conditions, offering a cleaner interface for making API calls.
 
 Key features include:
 *   Base URL configuration.
 *   Simplified `get`, `post`, `put`, `delete` methods.
 *   Automatic injection of `Authorization: Bearer <token>` headers via an interceptor.
 *   Token retrieval via a flexible `TokenProvider` function.
-*   Mapping of `DioException` types and non-2xx HTTP status codes to specific `HtHttpException` subtypes (`NetworkException`, `BadRequestException`, `UnauthorizedException`, etc.) defined in the `ht_shared` package.
+*   Mapping of `DioException` types and non-2xx HTTP status codes to specific `HttpException` subtypes (`NetworkException`, `BadRequestException`, `UnauthorizedException`, etc.) defined in the `core` package.
 *   Support for request cancellation using `dio`'s `CancelToken`.
 
 ## Getting Started
@@ -24,27 +24,27 @@ Add the package to your `pubspec.yaml`:
 
 ```yaml
 dependencies:
-  ht_http_client:
+  http_client:
     git:
-        url: https://github.com/headlines-toolkit/ht-http-client.git
-  dio: ^5.8.0+1 # ht_http_client relies on dio
+        url: https://github.com/flutter-news-app-full-source-code/http-client.git
+  dio: ^5.8.0+1 # http_client relies on dio
 ```
 
 Then run `dart pub get` or `flutter pub get`.
 
 ## Features
 
-*   **`HtHttpClient` Class:** The main entry point for making requests.
+*   **`HttpClient` Class:** The main entry point for making requests.
 *   **HTTP Methods:** `get<T>()`, `post<T>()`, `put<T>()`, `delete<T>()`.
 *   **Authentication:** Automatic Bearer token injection using a provided `TokenProvider`.
-*   **Error Handling:** Throws specific `HtHttpException` subtypes (defined in `ht_shared`) for easier error management.
+*   **Error Handling:** Throws specific `HttpException` subtypes (defined in `core`) for easier error management.
 *   **Cancellation:** Supports request cancellation via `CancelToken`.
 
 ## Usage
 
 ```dart
-import 'package:ht_http_client/ht_http_client.dart';
-import 'package:ht_shared/ht_shared.dart'; // Import for HtHttpException types
+import 'package:http_client/http_client.dart';
+import 'package:core/core.dart'; // Import for HttpException types
 import 'package:dio/dio.dart'; // For CancelToken
 
 // 1. Define your token provider function
@@ -57,7 +57,7 @@ Future<String?> myTokenProvider() async {
 
 void main() async {
   // 2. Create an instance of the client
-  final client = HtHttpClient(
+  final client = HttpClient(
     baseUrl: 'https://api.example.com/v1',
     tokenProvider: myTokenProvider,
   );
@@ -91,7 +91,7 @@ void main() async {
     // Handle offline state or retry logic
   } on NotFoundException catch (e) {
     print('Resource not found: ${e.message}');
-  } on HtHttpException catch (e) { // Catch other specific or general client errors
+  } on HttpException catch (e) { // Catch other specific or general client errors
     print('HTTP Client Error: ${e.message}');
   } catch (e) { // Catch any other unexpected errors
     print('An unexpected error occurred: $e');
@@ -104,13 +104,15 @@ void main() async {
       data: {'name': 'New Item', 'value': 123},
     );
     print('Created item: $newItem');
-  } on HtHttpException catch (e) {
+  } on HttpException catch (e) {
      print('Error creating item: ${e.message}');
   }
 }
 
 ```
 
-## License
+## 🔑 Licensing
 
-This package is licensed under the [PolyForm Free Trial](https://polyformproject.org/licenses/free-trial/1.0.0). Please review the terms before use.
+This package is source-available and licensed under the [PolyForm Free Trial 1.0.0](LICENSE). Please review the terms before use.
+
+For commercial licensing options that grant the right to build and distribute unlimited applications, please visit the main [**Flutter News App - Full Source Code Toolkit**](https://github.com/flutter-news-app-full-source-code) organization.

lib/ht_http_client.dart lib/http_client.dartlib/ht_http_client.dart renamed to lib/http_client.dart

@@ -3,6 +3,6 @@
 library;
 
 // Export the main client class
-export 'src/ht_http_client.dart';
+export 'src/http_client.dart';
 // Export the TokenProvider typedef for convenience
 export 'src/interceptors/auth_interceptor.dart' show TokenProvider;

lib/src/ht_http_client.dart lib/src/http_client.dartlib/src/ht_http_client.dart renamed to lib/src/http_client.dart

@@ -1,25 +1,25 @@
 //
 // ignore_for_file: only_throw_errors
 
+import 'package:core/core.dart';
 import 'package:dio/dio.dart';
-import 'package:ht_http_client/src/adapters/http_adapter.dart';
-import 'package:ht_http_client/src/interceptors/auth_interceptor.dart';
-import 'package:ht_http_client/src/interceptors/error_interceptor.dart';
-import 'package:ht_shared/ht_shared.dart';
+import 'package:http_client/src/adapters/http_adapter.dart';
+import 'package:http_client/src/interceptors/auth_interceptor.dart';
+import 'package:http_client/src/interceptors/error_interceptor.dart';
 import 'package:logging/logging.dart';
 
-/// {@template ht_http_client}
+/// {@template http_client}
 /// A robust HTTP client built on top of Dio, providing simplified API calls,
 /// automatic authentication header injection, and custom exception mapping.
 ///
 /// This client handles common HTTP methods (GET, POST, PUT, DELETE) and maps
-/// Dio errors and non-2xx status codes to specific [HtHttpException] subtypes
+/// Dio errors and non-2xx status codes to specific [HttpException] subtypes
 /// defined in `exceptions.dart`.
 /// {@endtemplate}
-class HtHttpClient {
-  /// {@macro ht_http_client}
+class HttpClient {
+  /// {@macro http_client}
   ///
-  /// Creates an instance of [HtHttpClient].
+  /// Creates an instance of [HttpClient].
   ///
   /// Requires a "baseUrl" for the API endpoint and a [tokenProvider] function
   /// to asynchronously retrieve the authentication token.
@@ -30,14 +30,14 @@ class HtHttpClient {
   /// - list of additional [interceptors] to be added alongside
   ///   the default Auth and Error interceptors.
   /// - [logger]: Optional [Logger] instance for logging HTTP requests and responses.
-  HtHttpClient({
+  HttpClient({
     required String baseUrl,
     required TokenProvider tokenProvider,
     Dio? dioInstance,
     List<Interceptor>? interceptors,
     Logger? logger,
-  })  : _dio = dioInstance ?? Dio(),
-        _logger = logger ?? Logger('HtHttpClient') {
+  }) : _dio = dioInstance ?? Dio(),
+       _logger = logger ?? Logger('HttpClient') {
     // Configure base options
     _dio.options = BaseOptions(
       baseUrl: baseUrl,
@@ -77,30 +77,30 @@ class HtHttpClient {
   /// - [cancelToken]: Optional [CancelToken] for request cancellation.
   ///
   /// Returns the response data decoded as type [T].
-  /// Throws an [HtHttpException] on network errors or non-2xx status codes.
+  /// Throws an [HttpException] on network errors or non-2xx status codes.
   Future<T> get<T>(
     String path, {
     Map<String, dynamic>? queryParameters,
     Options? options,
     CancelToken? cancelToken,
   }) async {
-    _logger.info(
-      'GET request to: $path, Query Parameters: $queryParameters',
-    );
+    _logger.info('GET request to: $path, Query Parameters: $queryParameters');
     try {
       final response = await _dio.get<T>(
         path,
         queryParameters: queryParameters,
         options: options,
         cancelToken: cancelToken,
       );
-      _logger.info('GET request to $path successful. Status: ${response.statusCode}');
+      _logger.info(
+        'GET request to $path successful. Status: ${response.statusCode}',
+      );
       // Dio automatically throws for non-2xx, ErrorInterceptor maps it
       return response.data as T;
     } on DioException catch (e) {
-      if (e.error is HtHttpException) {
+      if (e.error is HttpException) {
         _logger.severe(
-          'GET request to $path failed with HtHttpException: ${e.error}',
+          'GET request to $path failed with HttpException: ${e.error}',
         );
         throw e.error!;
       }
@@ -118,7 +118,7 @@ class HtHttpClient {
   /// - [cancelToken]: Optional [CancelToken] for request cancellation.
   ///
   /// Returns the response data decoded as type [T].
-  /// Throws an [HtHttpException] on network errors or non-2xx status codes.
+  /// Throws an [HttpException] on network errors or non-2xx status codes.
   Future<T> post<T>(
     String path, {
     dynamic data,
@@ -137,12 +137,14 @@ class HtHttpClient {
         options: options,
         cancelToken: cancelToken,
       );
-      _logger.info('POST request to $path successful. Status: ${response.statusCode}');
+      _logger.info(
+        'POST request to $path successful. Status: ${response.statusCode}',
+      );
       return response.data as T;
     } on DioException catch (e) {
-      if (e.error is HtHttpException) {
+      if (e.error is HttpException) {
         _logger.severe(
-          'POST request to $path failed with HtHttpException: ${e.error}',
+          'POST request to $path failed with HttpException: ${e.error}',
         );
         throw e.error!;
       }
@@ -160,7 +162,7 @@ class HtHttpClient {
   /// - [cancelToken]: Optional [CancelToken] for request cancellation.
   ///
   /// Returns the response data decoded as type [T].
-  /// Throws an [HtHttpException] on network errors or non-2xx status codes.
+  /// Throws an [HttpException] on network errors or non-2xx status codes.
   Future<T> put<T>(
     String path, {
     dynamic data,
@@ -179,12 +181,14 @@ class HtHttpClient {
         options: options,
         cancelToken: cancelToken,
       );
-      _logger.info('PUT request to $path successful. Status: ${response.statusCode}');
+      _logger.info(
+        'PUT request to $path successful. Status: ${response.statusCode}',
+      );
       return response.data as T;
     } on DioException catch (e) {
-      if (e.error is HtHttpException) {
+      if (e.error is HttpException) {
         _logger.severe(
-          'PUT request to $path failed with HtHttpException: ${e.error}',
+          'PUT request to $path failed with HttpException: ${e.error}',
         );
         throw e.error!;
       }
@@ -202,7 +206,7 @@ class HtHttpClient {
   /// - [cancelToken]: Optional [CancelToken] for request cancellation.
   ///
   /// Returns the response data decoded as type [T].
-  /// Throws an [HtHttpException] on network errors or non-2xx status codes.
+  /// Throws an [HttpException] on network errors or non-2xx status codes.
   Future<T> delete<T>(
     String path, {
     dynamic data,
@@ -221,12 +225,14 @@ class HtHttpClient {
         options: options,
         cancelToken: cancelToken,
       );
-      _logger.info('DELETE request to $path successful. Status: ${response.statusCode}');
+      _logger.info(
+        'DELETE request to $path successful. Status: ${response.statusCode}',
+      );
       return response.data as T;
     } on DioException catch (e) {
-      if (e.error is HtHttpException) {
+      if (e.error is HttpException) {
         _logger.severe(
-          'DELETE request to $path failed with HtHttpException: ${e.error}',
+          'DELETE request to $path failed with HttpException: ${e.error}',
         );
         throw e.error!;
       }

lib/src/interceptors/error_interceptor.dart

@@ -1,14 +1,14 @@
 import 'dart:io';
 
 import 'package:dio/dio.dart';
-import 'package:ht_shared/ht_shared.dart';
+import 'package:core/core.dart';
 
 /// Dio interceptor that catches [DioException]s and maps them to specific
-/// [HtHttpException] subtypes for clearer error handling downstream.
+/// [HttpException] subtypes for clearer error handling downstream.
 class ErrorInterceptor extends Interceptor {
   @override
   void onError(DioException err, ErrorInterceptorHandler handler) {
-    final HtHttpException mappedException;
+    final HttpException mappedException;
 
     switch (err.type) {
       case DioExceptionType.connectionTimeout:
@@ -90,7 +90,6 @@ class ErrorInterceptor extends Interceptor {
 
     if (responseData is Map) {
       // New Pattern: Check for the nested {"error": {"message": "..."}}
-      // This is the standard format for ht_api.
       if (responseData.containsKey('error') && responseData['error'] is Map) {
         final errorMap = responseData['error'] as Map;
         if (errorMap.containsKey('message') && errorMap['message'] is String) {
@@ -103,7 +102,8 @@ class ErrorInterceptor extends Interceptor {
           responseData['message'] is String) {
         return responseData['message'] as String;
       }
-      if (responseData.containsKey('error') && responseData['error'] is String) {
+      if (responseData.containsKey('error') &&
+          responseData['error'] is String) {
         return responseData['error'] as String;
       }
       if (responseData.containsKey('detail') &&

pubspec.yaml

@@ -1,19 +1,19 @@
-name: ht_http_client
+name: http_client
 description: Robust and reusable Dart HTTP client built on top of the `dio` package. It simplifies API interactions by providing common HTTP methods, automatic authentication header injection, and mapping network/status code errors to specific custom exceptions.
-repository: https://github.com/headlines-toolkit/ht_http_client
+repository: https://github.com/flutter-news-app-full-source-code/http_client
 publish_to: none
 
 environment:
   sdk: ^3.8.0
 
 dependencies:
-  dio: ^5.8.0+1
-  ht_shared:
+  core:
     git:
-      url: https://github.com/headlines-toolkit/ht-shared.git
+      url: https://github.com/flutter-news-app-full-source-code/core.git
+  dio: ^5.8.0+1
   logging: ^1.3.0
 
 dev_dependencies:
   mocktail: ^1.0.4
   test: ^1.25.8
-  very_good_analysis: ^7.0.0
+  very_good_analysis: ^9.0.0

test/src/ht_http_client_test.dart test/src/http_client_test.darttest/src/ht_http_client_test.dart renamed to test/src/http_client_test.dart

@@ -1,5 +1,5 @@
 import 'package:dio/dio.dart';
-import 'package:ht_http_client/src/interceptors/auth_interceptor.dart';
+import 'package:http_client/src/interceptors/auth_interceptor.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 

test/src/interceptors/auth_interceptor_test.dart

@@ -1,8 +1,8 @@
 import 'dart:io';
 
+import 'package:core/core.dart'; // Updated import
 import 'package:dio/dio.dart';
-import 'package:ht_http_client/src/interceptors/error_interceptor.dart';
-import 'package:ht_shared/ht_shared.dart'; // Updated import
+import 'package:http_client/src/interceptors/error_interceptor.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 
@@ -42,7 +42,7 @@ void main() {
     });
 
     // Helper function to verify the rejection
-    void verifyRejection<T extends HtHttpException>({
+    void verifyRejection<T extends HttpException>({
       required DioException originalDioErr,
       String? expectedMessage, // Optional: for specific message checks
     }) {
@@ -54,13 +54,13 @@ void main() {
 
       expect(captured.error, isA<T>());
       expect(captured.error, isNotNull);
-      // Removed check for dioException as it's no longer part of HtHttpException
+      // Removed check for dioException as it's no longer part of HttpException
       expect(captured.requestOptions, originalDioErr.requestOptions);
       expect(captured.response, originalDioErr.response);
       expect(captured.type, originalDioErr.type);
       // Check message if provided
       if (expectedMessage != null) {
-        expect((captured.error! as HtHttpException).message, expectedMessage);
+        expect((captured.error! as HttpException).message, expectedMessage);
       }
     }