refactor: packages/alice

jhomlala · Jun 16, 2024 · 6827a6a · 6827a6a
1 parent b119ac5
commit 6827a6a
Show file tree

Hide file tree

Showing 15 changed files with 103 additions and 82 deletions.
diff --git a/packages/alice/lib/core/alice_core.dart b/packages/alice/lib/core/alice_core.dart
@@ -9,6 +9,7 @@ import 'package:alice/model/alice_http_error.dart';
 import 'package:alice/model/alice_http_response.dart';
 import 'package:alice/model/alice_log.dart';
 import 'package:alice/ui/page/alice_calls_list_screen.dart';
+import 'package:alice/utils/num_comparison.dart';
 import 'package:alice/utils/shake_detector.dart';
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:flutter/material.dart';
@@ -155,29 +156,24 @@ class AliceCore {
     final int successCalls = calls
         .where(
           (AliceHttpCall call) =>
-              call.response != null &&
-              call.response!.status! >= 200 &&
-              call.response!.status! < 300,
+              (call.response?.status.gte(200) ?? false) &&
+              (call.response?.status.lt(300) ?? false),
         )
         .toList()
         .length;
 
     final int redirectCalls = calls
-        .where(
-          (AliceHttpCall call) =>
-              call.response != null &&
-              call.response!.status! >= 300 &&
-              call.response!.status! < 400,
-        )
+        .where((AliceHttpCall call) =>
+            (call.response?.status.gte(300) ?? false) &&
+            (call.response?.status.lt(400) ?? false))
         .toList()
         .length;
 
     final int errorCalls = calls
         .where(
           (AliceHttpCall call) =>
-              call.response != null &&
-              call.response!.status! >= 400 &&
-              call.response!.status! < 600,
+              (call.response?.status.gte(400) ?? false) &&
+              (call.response?.status.lt(600) ?? false),
         )
         .toList()
         .length;
@@ -323,7 +319,7 @@ class AliceCore {
       ..loading = false
       ..response = response
       ..duration = response.time.millisecondsSinceEpoch -
-          selectedCall.request!.time.millisecondsSinceEpoch;
+          (selectedCall.request?.time.millisecondsSinceEpoch ?? 0);
 
     callsSubject.add([...callsSubject.value]);
   }

diff --git a/packages/alice/lib/core/alice_logger.dart b/packages/alice/lib/core/alice_logger.dart
@@ -1,6 +1,7 @@
 import 'dart:io' show Platform, Process, ProcessResult;
 
 import 'package:alice/model/alice_log.dart';
+import 'package:alice/utils/num_comparison.dart';
 import 'package:flutter/foundation.dart';
 
 class AliceLogger {
@@ -51,7 +52,7 @@ class AliceLogger {
     }
 
     int startIndex = 0;
-    if (maximumSize != null && logs.length >= maximumSize!) {
+    if (maximumSize != null && logs.length.gte(maximumSize)) {
       if (index == 0) return;
       startIndex = logs.length - maximumSize! + 1;
     }

diff --git a/packages/alice/lib/helper/alice_save_helper.dart b/packages/alice/lib/helper/alice_save_helper.dart
@@ -194,11 +194,11 @@ class AliceSaveHelper {
         '--------------------------------------------\n',
         'Error\n',
         '--------------------------------------------\n',
-        'Error: ${call.error!.error}\n',
+        'Error: ${call.error?.error}\n',
       ]);
 
-      if (call.error!.stackTrace != null) {
-        stringBuffer.write('Error stacktrace: ${call.error!.stackTrace}\n');
+      if (call.error?.stackTrace != null) {
+        stringBuffer.write('Error stacktrace: ${call.error?.stackTrace}\n');
       }
     }
 

diff --git a/packages/alice/lib/ui/page/alice_stats_screen.dart b/packages/alice/lib/ui/page/alice_stats_screen.dart
@@ -3,6 +3,7 @@ import 'package:alice/helper/alice_conversion_helper.dart';
 import 'package:alice/model/alice_http_call.dart';
 import 'package:alice/ui/widget/alice_stats_row.dart';
 import 'package:alice/utils/alice_theme.dart';
+import 'package:alice/utils/num_comparison.dart';
 import 'package:flutter/material.dart';
 
 class AliceStatsScreen extends StatelessWidget {
@@ -18,29 +19,26 @@ class AliceStatsScreen extends StatelessWidget {
   int _getSuccessRequests() => calls
       .where(
         (AliceHttpCall call) =>
-            call.response != null &&
-            call.response!.status! >= 200 &&
-            call.response!.status! < 300,
+            (call.response?.status.gte(200) ?? false) &&
+            (call.response?.status.lt(300) ?? false),
       )
       .toList()
       .length;
 
   int _getRedirectionRequests() => calls
       .where(
         (AliceHttpCall call) =>
-            call.response != null &&
-            call.response!.status! >= 300 &&
-            call.response!.status! < 400,
+            (call.response?.status.gte(300) ?? false) &&
+            (call.response?.status.lt(400) ?? false),
       )
       .toList()
       .length;
 
   int _getErrorRequests() => calls
       .where(
         (AliceHttpCall call) =>
-            call.response != null &&
-            call.response!.status! >= 400 &&
-            call.response!.status! < 600,
+            (call.response?.status.gte(400) ?? false) &&
+            (call.response?.status.lt(600) ?? false),
       )
       .toList()
       .length;

diff --git a/packages/alice/lib/ui/widget/alice_base_call_details_widget.dart b/packages/alice/lib/ui/widget/alice_base_call_details_widget.dart
@@ -8,7 +8,7 @@ abstract class AliceBaseCallDetailsWidgetState<T extends StatefulWidget>
     extends State<T> {
   final JsonEncoder encoder = const JsonEncoder.withIndent('  ');
 
-  Widget getListRow(String name, String value) => Row(
+  Widget getListRow(String name, String? value) => Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           SelectableText(
@@ -19,9 +19,11 @@ abstract class AliceBaseCallDetailsWidgetState<T extends StatefulWidget>
             padding: EdgeInsets.only(left: 5),
           ),
           Flexible(
-            child: SelectableText(
-              value,
-            ),
+            child: value != null
+                ? SelectableText(
+                    value,
+                  )
+                : const SizedBox(),
           ),
           const Padding(
             padding: EdgeInsets.only(bottom: 18),

diff --git a/packages/alice/lib/ui/widget/alice_call_error_widget.dart b/packages/alice/lib/ui/widget/alice_call_error_widget.dart
@@ -20,8 +20,8 @@ class _AliceCallErrorWidgetState
   @override
   Widget build(BuildContext context) {
     if (widget.call.error != null) {
-      final dynamic error = widget.call.error!.error;
-      final StackTrace? stackTrace = widget.call.error!.stackTrace;
+      final dynamic error = widget.call.error?.error;
+      final StackTrace? stackTrace = widget.call.error?.stackTrace;
       final String errorText =
           error != null ? error.toString() : 'Error is empty';
 

diff --git a/packages/alice/lib/ui/widget/alice_call_list_item_widget.dart b/packages/alice/lib/ui/widget/alice_call_list_item_widget.dart
@@ -98,7 +98,9 @@ class AliceCallListItemWidget extends StatelessWidget {
         children: [
           Flexible(
             child: Text(
-              _formatTime(call.request!.time),
+              call.request?.time != null
+                  ? _formatTime(call.request!.time)
+                  : 'n/a',
               style: const TextStyle(fontSize: 12),
             ),
           ),
@@ -110,8 +112,8 @@ class AliceCallListItemWidget extends StatelessWidget {
           ),
           Flexible(
             child: Text(
-              '${AliceConversionHelper.formatBytes(call.request!.size)} / '
-              '${AliceConversionHelper.formatBytes(call.response!.size)}',
+              '${AliceConversionHelper.formatBytes(call.request?.size ?? 0)} / '
+              '${AliceConversionHelper.formatBytes(call.response?.size ?? 0)}',
               style: const TextStyle(fontSize: 12),
             ),
           ),
@@ -144,15 +146,17 @@ class AliceCallListItemWidget extends StatelessWidget {
       ]);
     }
 
-    widgets.add(
-      Text(
-        _getStatus(call.response!),
-        style: TextStyle(
-          fontSize: 16,
-          color: _getStatusTextColor(context),
+    if (call.response != null) {
+      widgets.add(
+        Text(
+          _getStatus(call.response!),
+          style: TextStyle(
+            fontSize: 16,
+            color: _getStatusTextColor(context),
+          ),
         ),
-      ),
-    );
+      );
+    }
 
     return SizedBox(
       width: 50,
@@ -163,7 +167,7 @@ class AliceCallListItemWidget extends StatelessWidget {
   }
 
   Color? _getStatusTextColor(BuildContext context) =>
-      switch (call.response!.status) {
+      switch (call.response?.status) {
         -1 => AliceConstants.red,
         int status when status < 200 =>
           Theme.of(context).textTheme.bodyLarge?.color,

diff --git a/packages/alice/lib/ui/widget/alice_call_overview_widget.dart b/packages/alice/lib/ui/widget/alice_call_overview_widget.dart
@@ -29,11 +29,14 @@ class _AliceCallOverviewWidget
             getListRow('Method: ', _call.method),
             getListRow('Server: ', _call.server),
             getListRow('Endpoint: ', _call.endpoint),
-            getListRow('Started:', _call.request!.time.toString()),
-            getListRow('Finished:', _call.response!.time.toString()),
+            getListRow('Started:', _call.request?.time.toString()),
+            getListRow('Finished:', _call.response?.time.toString()),
             getListRow('Duration:', formatDuration(_call.duration)),
-            getListRow('Bytes sent:', formatBytes(_call.request!.size)),
-            getListRow('Bytes received:', formatBytes(_call.response!.size)),
+            getListRow('Bytes sent:', formatBytes(_call.request?.size ?? 0)),
+            getListRow(
+              'Bytes received:',
+              formatBytes(_call.response?.size ?? 0),
+            ),
             getListRow('Client:', _call.client),
             getListRow('Secure:', _call.secure.toString()),
           ],

diff --git a/packages/alice/lib/ui/widget/alice_call_request_widget.dart b/packages/alice/lib/ui/widget/alice_call_request_widget.dart
@@ -23,19 +23,19 @@ class _AliceCallRequestWidget
   @override
   Widget build(BuildContext context) {
     final List<Widget> rows = [
-      getListRow('Started:', _call.request!.time.toString()),
-      getListRow('Bytes sent:', formatBytes(_call.request!.size)),
-      getListRow('Content type:', getContentType(_call.request!.headers)!),
+      getListRow('Started:', _call.request?.time.toString()),
+      getListRow('Bytes sent:', formatBytes(_call.request?.size ?? 0)),
+      getListRow('Content type:', getContentType(_call.request?.headers)),
     ];
 
-    final dynamic body = _call.request!.body;
+    final dynamic body = _call.request?.body;
     final String bodyContent = body != null
-        ? formatBody(body, getContentType(_call.request!.headers))
+        ? formatBody(body, getContentType(_call.request?.headers))
         : 'Body is empty';
     rows.add(getListRow('Body:', bodyContent));
 
     final List<AliceFormDataField>? formDataFields =
-        _call.request!.formDataFields;
+        _call.request?.formDataFields;
     if (formDataFields?.isNotEmpty ?? false) {
       rows.add(getListRow('Form data fields: ', ''));
       rows.addAll([
@@ -56,18 +56,20 @@ class _AliceCallRequestWidget
       ]);
     }
 
-    final Map<String, dynamic> headers = _call.request!.headers;
-    final String headersContent = headers.isEmpty ? 'Headers are empty' : '';
+    final Map<String, dynamic>? headers = _call.request?.headers;
+    final String headersContent =
+        headers?.isEmpty ?? true ? 'Headers are empty' : '';
     rows.add(getListRow('Headers: ', headersContent));
     rows.addAll([
       for (final MapEntry<String, dynamic> header
           in _call.request?.headers.entries ?? [])
         getListRow('   • ${header.key}:', header.value.toString())
     ]);
 
-    final Map<String, dynamic> queryParameters = _call.request!.queryParameters;
+    final Map<String, dynamic>? queryParameters =
+        _call.request?.queryParameters;
     final String queryParametersContent =
-        queryParameters.isEmpty ? 'Query parameters are empty' : '';
+        queryParameters?.isEmpty ?? true ? 'Query parameters are empty' : '';
     rows.add(getListRow('Query Parameters: ', queryParametersContent));
     rows.addAll([
       for (final MapEntry<String, dynamic> qParam

diff --git a/packages/alice/lib/ui/widget/alice_call_response_widget.dart b/packages/alice/lib/ui/widget/alice_call_response_widget.dart
@@ -2,6 +2,7 @@ import 'package:alice/model/alice_http_call.dart';
 import 'package:alice/ui/widget/alice_base_call_details_widget.dart';
 import 'package:alice/utils/alice_constants.dart';
 import 'package:alice/utils/alice_scroll_behavior.dart';
+import 'package:alice/utils/num_comparison.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -56,11 +57,11 @@ class _AliceCallResponseWidgetState
 
   List<Widget> _buildGeneralDataRows() {
     final rows = <Widget>[
-      getListRow('Received:', _call.response!.time.toString()),
-      getListRow('Bytes received:', formatBytes(_call.response!.size)),
+      getListRow('Received:', _call.response?.time.toString()),
+      getListRow('Bytes received:', formatBytes(_call.response?.size ?? 0)),
     ];
 
-    final int? status = _call.response!.status;
+    final int? status = _call.response?.status;
     final String statusText = status == -1 ? 'Error' : '$status';
 
     rows.add(getListRow('Status:', statusText));
@@ -145,7 +146,7 @@ class _AliceCallResponseWidgetState
           getListRow(
             'Body:',
             'Too large to show '
-                '(${_call.response!.body.toString().length} Bytes)',
+                '(${_call.response?.body.toString().length ?? 0} Bytes)',
           ),
         )
         ..add(const SizedBox(height: 8))
@@ -170,10 +171,10 @@ class _AliceCallResponseWidgetState
   }
 
   List<Widget> _buildTextBodyRows() {
-    final rows = <Widget>[];
-    final headers = _call.response!.headers;
-    final bodyContent =
-        formatBody(_call.response!.body, getContentType(headers));
+    final List<Widget> rows = [];
+    final Map<String, String>? headers = _call.response?.headers;
+    final String bodyContent =
+        formatBody(_call.response?.body, getContentType(headers));
     rows.add(getListRow('Body:', bodyContent));
     return rows;
   }
@@ -202,13 +203,13 @@ class _AliceCallResponseWidgetState
   }
 
   List<Widget> _buildUnknownBodyRows() {
-    final rows = <Widget>[];
-    final headers = _call.response!.headers;
-    final contentType = getContentType(headers) ?? '<unknown>';
+    final List<Widget> rows = [];
+    final Map<String, String>? headers = _call.response?.headers;
+    final String contentType = getContentType(headers) ?? '<unknown>';
 
     if (_showUnsupportedBody) {
       final bodyContent =
-          formatBody(_call.response!.body, getContentType(headers));
+          formatBody(_call.response?.body, getContentType(headers));
       rows.add(getListRow('Body:', bodyContent));
     } else {
       rows
@@ -243,9 +244,10 @@ class _AliceCallResponseWidgetState
     if (_call.request?.headers != null) {
       requestHeaders.addAll(
         _call.request!.headers.map(
-          (String key, dynamic value) {
-            return MapEntry(key, value.toString());
-          },
+          (String key, dynamic value) => MapEntry(
+            key,
+            value.toString(),
+          ),
         ),
       );
     }
@@ -274,11 +276,9 @@ class _AliceCallResponseWidgetState
   }
 
   String? _getContentTypeOfResponse() {
-    return getContentType(_call.response!.headers);
+    return getContentType(_call.response?.headers);
   }
 
-  bool _isLargeResponseBody() {
-    return _call.response!.body != null &&
-        _call.response!.body.toString().length > _kLargeOutputSize;
-  }
+  bool _isLargeResponseBody() =>
+      _call.response?.body.toString().length.gt(_kLargeOutputSize) ?? false;
 }
diff --git a/packages/alice/lib/ui/widget/alice_log_list_widget.dart b/packages/alice/lib/ui/widget/alice_log_list_widget.dart
@@ -9,7 +9,7 @@ import 'package:flutter/services.dart';
 
 class AliceLogListWidget extends StatefulWidget {
   const AliceLogListWidget({
-    required this.logsListenable,
+    required this.  logsListenable,
     required this.scrollController,
     required this.emptyWidget,
     super.key,