referred dart analyze and some edits

Clasherzz · Clasherzz · commit 8d64ecf30e24 · 2025-02-01T01:13:33.000+05:30
diff --git a/lib/consts.dart b/lib/consts.dart
@@ -445,7 +445,7 @@ const kLabelContinue = "Continue";
 const kLabelCancel = "Cancel";
 const kLabelOk = "Ok";
 const kUntitled = "untitled";
-const KLabelConnect = "Connect";
+const kLabelConnect = "Connect";
 const kLabelDisconnect = "Disconnect";
 // Request Pane
 const kLabelRequest = "Request";
diff --git a/lib/models/request_model.dart b/lib/models/request_model.dart
@@ -1,9 +1,5 @@
 import 'package:apidash_core/apidash_core.dart';
-import 'package:apidash_core/models/websocket_request_model.dart';
-import 'package:apidash_core/models/websocket_response_model.dart';
-
 part 'request_model.freezed.dart';
-
 part 'request_model.g.dart';
 
 @freezed
diff --git a/lib/providers/collection_providers.dart b/lib/providers/collection_providers.dart
@@ -2,7 +2,6 @@ import 'package:apidash_core/apidash_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:apidash/consts.dart';
-import 'package:intl/intl.dart';
 import 'providers.dart';
 import '../models/models.dart';
 import '../services/services.dart' show hiveHandler, HiveHandler;
@@ -267,7 +266,7 @@ class CollectionStateNotifier
     var currentWebSocketRequestModel = currentModel.webSocketRequestModel ?? const WebSocketRequestModel();
 
     final newWebSocketRequestModel = currentApiType == APIType.webSocket
-        ? currentWebSocketRequestModel?.copyWith(
+        ? currentWebSocketRequestModel.copyWith(
             url: url ?? currentWebSocketRequestModel.url,
             contentType: contentType ?? currentWebSocketRequestModel.contentType,
             headers: headers ?? currentWebSocketRequestModel.headers,
@@ -371,7 +370,7 @@ class CollectionStateNotifier
         httpRequestModel: substitutedHttpRequestModel,
         httpResponseModel: httpResponseModel,
         webSocketRequestModel:  newRequestModel.webSocketRequestModel!,
-        webSocketResponseModel: newRequestModel.webSocketResponseModel!
+        webSocketResponseModel: newRequestModel.webSocketResponseModel ??const  WebSocketResponseModel() //still working
       );
       ref.read(historyMetaStateNotifier.notifier).addHistoryRequest(model);
     }
@@ -484,12 +483,6 @@ class CollectionStateNotifier
     }
 
     
-    
-    
-   
-
-    
-    
     String message = currentWebSocketRequestModel.message ?? '';
     late  (String?,DateTime?,String?) frame;
     if(currentWebSocketRequestModel.contentType == ContentTypeWebSocket.text){
@@ -534,7 +527,7 @@ class CollectionStateNotifier
     final newRequestModel = requestModel.copyWith(
         webSocketResponseModel: newWebSocketResponseModel,
       );
-    // update state with response data
+   
     var map = {...state!};
     map[requestId] = newRequestModel;
     state = map;
@@ -547,14 +540,12 @@ class CollectionStateNotifier
     final requestId = ref.read(selectedIdStateProvider);
     ref.read(codePaneVisibleStateProvider.notifier).state = false;
     if (requestId == null || state == null) {
-      print(requestId);
       return;
     }
 
     RequestModel? requestModel = state![requestId];
 
     if (requestModel?.webSocketRequestModel == null) {
-      
       return;
     }
 
@@ -609,6 +600,7 @@ class CollectionStateNotifier
     webSocketManager.listen(
       requestId,
       (message) async{
+        
         map = {...state!};
         requestModel = map[requestId];  
 
@@ -659,6 +651,18 @@ class CollectionStateNotifier
         
       },
       onDone: () async{
+         map = {...state!};
+        requestModel = map[requestId];  
+        WebSocketRequestModel webSocketRequestModel = requestModel!.webSocketRequestModel!;
+        WebSocketRequestModel newWebSocketRequestModel = webSocketRequestModel.copyWith(
+          isConnected: false
+        );
+        var newRequestModel = requestModel!.copyWith(
+          webSocketRequestModel: newWebSocketRequestModel,
+        );
+        map[requestId] = newRequestModel;
+        state = map;
+        
         
       },
       cancelOnError: false,
@@ -672,7 +676,7 @@ class CollectionStateNotifier
             timeStamp:DateTime.now(),
             isSend: false
     )]);
-    map[requestId] = requestModel!.copyWith(
+    map[requestId] = requestModel.copyWith(
       isWorking: false,
       responseStatus: 1002,
       message: kResponseCodeReasons[1002],
@@ -736,12 +740,10 @@ class CollectionStateNotifier
   void deleteFrame(String id){
     final requestId = ref.read(selectedIdStateProvider);
     if (requestId == null || state == null) {
-      print(requestId);
       return;
     }
     RequestModel? requestModel = state![requestId];
     if (requestModel == null || state == null) {
-      print(requestId);
       return;
     }
     WebSocketResponseModel webSocketResponseModel = requestModel!.webSocketResponseModel!;
diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart
@@ -123,7 +123,7 @@ class EditRequestBody extends ConsumerWidget {
                   onChanged: (String value) {
                     ref
                         .read(collectionStateNotifierProvider.notifier)
-                        .update(message: value);
+                        .update(query: value);
                   },
                   hintText: kHintQuery,
                 ),
diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart
@@ -50,6 +50,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
     late List<NameValueModel>? rH;
     late bool isHeadersEmpty;
     if (apiType == APIType.webSocket) {
+      print("inside header");
       rH = ref.read(selectedRequestModelProvider)?.webSocketRequestModel?.headers;
       isHeadersEmpty = rH == null || rH.isEmpty;
        isRowEnabledList = [
@@ -59,33 +60,40 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
               ?.isHeaderEnabledList ??
           List.filled(rH?.length ?? 0, true, growable: true))
     ];
-    }else{
-      rH = ref.read(selectedRequestModelProvider)?.httpRequestModel?.headers;
-      isHeadersEmpty = rH == null || rH.isEmpty;
-      isRowEnabledList = [
+     headerRows = isHeadersEmpty
+        ? [
+            kNameValueEmptyModel,
+          ]
+        : rH + [kNameValueEmptyModel];
+    isRowEnabledList = [
       ...(ref
               .read(selectedRequestModelProvider)
-              ?.httpRequestModel
+              ?.webSocketRequestModel
               ?.isHeaderEnabledList ??
           List.filled(rH?.length ?? 0, true, growable: true))
     ];
-      
-    }
-    headerRows = isHeadersEmpty
+    
+    }else{
+      print("inside http");
+      rH = ref.read(selectedRequestModelProvider)?.httpRequestModel?.headers;
+      isHeadersEmpty = rH == null || rH.isEmpty;
+      headerRows = isHeadersEmpty
         ? [
             kNameValueEmptyModel,
           ]
-        : rH! + [kNameValueEmptyModel];
-    isRowEnabledList = [
+        : rH + [kNameValueEmptyModel];
+      isRowEnabledList = [
       ...(ref
               .read(selectedRequestModelProvider)
               ?.httpRequestModel
               ?.isHeaderEnabledList ??
           List.filled(rH?.length ?? 0, true, growable: true))
     ];
+      
+    }
     isRowEnabledList.add(false);
     isAddingRow = false;
-
+    
     List<DataColumn> columns = const [
       DataColumn2(
         label: Text(kNameCheckbox),
@@ -112,7 +120,7 @@ class EditRequestHeadersState extends ConsumerState<EditRequestHeaders> {
       (index) {
        
         bool isLast = index + 1 == headerRows.length;
-         print(isLast);
+         
         return DataRow(
           key: ValueKey("$selectedId-$index-headers-row-$seed"),
           cells: <DataCell>[
diff --git a/lib/screens/home_page/editor_pane/details_card/response_pane.dart b/lib/screens/home_page/editor_pane/details_card/response_pane.dart
@@ -19,24 +19,14 @@ class ResponsePane extends ConsumerWidget{
         selectedRequestModelProvider.select((value) => value?.responseStatus));
     final message = ref
         .watch(selectedRequestModelProvider.select((value) => value?.message));
-    final apiType = ref
-        .watch(selectedRequestModelProvider.select((value) => value?.apiType));
+ 
+
     
     if (isWorking) {
-      // if(apiType == APIType.rest || apiType == APIType.graphql){
-      //   return SendingWidget(
-      //   startSendingTime: startSendingTime,
-      // );
-      // }else{
-      //   return const ResponseDetails();
-
-      // }
       return SendingWidget(
         startSendingTime: startSendingTime,
       );
 
-    
-      
     }
 
     if (responseStatus == null) {
diff --git a/lib/widgets/button_connection.dart b/lib/widgets/button_connection.dart
@@ -30,7 +30,7 @@ class ConnectionButton extends StatelessWidget {
             ]
           : const [
               Text(
-                KLabelConnect,
+                kLabelConnect,
                 style: kTextStyleButton,
               ),
               kHSpacer10,
diff --git a/packages/apidash_core/lib/models/websocket_request_model.dart b/packages/apidash_core/lib/models/websocket_request_model.dart
@@ -1,5 +1,4 @@
 import 'package:apidash_core/consts.dart';
-import 'package:apidash_core/models/websocket_frame_model.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:seed/models/name_value_model.dart';
 import '../utils/utils.dart'
diff --git a/packages/apidash_core/lib/services/web_socket_manager.dart b/packages/apidash_core/lib/services/web_socket_manager.dart
@@ -1,6 +1,5 @@
-
-import 'package:apidash_core/apidash_core.dart';
-
+import 'package:seed/seed.dart';
+import './websocket_service.dart';
 class WebSocketManager {
   static final WebSocketManager _instance = WebSocketManager._internal();
   final Map<String, WebSocketClient> _clients = {};
diff --git a/packages/apidash_core/lib/services/websocket_service.dart b/packages/apidash_core/lib/services/websocket_service.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
 import 'dart:io';
 import 'package:apidash_core/apidash_core.dart';
 import 'package:flutter/foundation.dart';
@@ -34,10 +33,8 @@ class WebSocketClient {
         _channel = WebSocketChannel.connect(Uri.parse(urlWithParams));
       }
       await _channel.ready;
-      print('Connected to WebSocket server: ${url}');
       return (kMsgConnected,DateTime.now());
       } catch (e) {
-      print('Failed to connect to WebSocket server: $e');
       return (e.toString(),DateTime.now());
     }
   }
@@ -46,12 +43,6 @@ class WebSocketClient {
   Future<(String?,DateTime?,String?)> sendText(String message)async {
     try{
       _channel.sink.add(message);
-      // websocketRequestModel.frames.add(WebSocketFrameModel(
-      //   id: '1',
-      //   message: websocketRequestModel.message!,
-      //   timeStamp: DateTime.now(),
-      // ));
-      log('Sent text message: $message}');
       return (message,DateTime.now(),null);
 
     }catch(e){
@@ -66,12 +57,6 @@ class WebSocketClient {
       Uint8List binary = Uint8List.fromList(utf8.encode(message));
 
       _channel.sink.add(binary);
-      // websocketRequestModel.frames.add(WebSocketFrameModel(
-      //   id: '1',
-      //   message: websocketRequestModel.message!,
-      //   timeStamp: DateTime.now(),
-      // ));
-      log('Sent text message: $message}');
       return (message,DateTime.now(),null);
 
     }catch(e){
@@ -101,7 +86,6 @@ class WebSocketClient {
   Future<void> disconnect({int closeCode = status.normalClosure, String? reason})async {
     _subscription?.cancel();
     _channel.sink.close(closeCode, reason);
-    log('Disconnected from WebSocket server');
   }
 }
 
diff --git a/test/models/history_models.dart b/test/models/history_models.dart
@@ -17,7 +17,7 @@ final historyMetaModel1 = HistoryMetaModel(
 );
 
 /// Basic History Request model 1
-final historyRequestModel1 = HistoryRequestModel(
+final historyRequestModel1 = HistoryRequestModel( 
   historyId: 'historyId1',
   metaData: historyMetaModel1,
   httpRequestModel: httpRequestModelGet4,

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class ConnectionButton extends StatelessWidget {`
`30`	`30`	`]`
`31`	`31`	`: const [`
`32`	`32`	`Text(`
`33`		`- KLabelConnect,`
	`33`	`+ kLabelConnect,`
`34`	`34`	`style: kTextStyleButton,`
`35`	`35`	`),`
`36`	`36`	`kHSpacer10,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import 'package:apidash_core/consts.dart';`
`2`		`-import 'package:apidash_core/models/websocket_frame_model.dart';`
`3`	`2`	`import 'package:freezed_annotation/freezed_annotation.dart';`
`4`	`3`	`import 'package:seed/models/name_value_model.dart';`
`5`	`4`	`import '../utils/utils.dart'`