@@ -2,6 +2,7 @@ import 'package:apidash_core/apidash_core.dart';
2
2
import 'package:flutter/material.dart' ;
3
3
import 'package:flutter_riverpod/flutter_riverpod.dart' ;
4
4
import 'package:apidash/consts.dart' ;
5
+ import 'package:intl/intl.dart' ;
5
6
import 'providers.dart' ;
6
7
import '../models/models.dart' ;
7
8
import '../services/services.dart' show hiveHandler, HiveHandler;
@@ -369,9 +370,8 @@ class CollectionStateNotifier
369
370
),
370
371
httpRequestModel: substitutedHttpRequestModel,
371
372
httpResponseModel: httpResponseModel,
372
- webSocketRequestModel: WebSocketRequestModel (), // still not set up but an error was occuring here so had to fill it with something
373
- webSocketResponseModel: WebSocketResponseModel ()
374
-
373
+ webSocketRequestModel: newRequestModel.webSocketRequestModel! ,
374
+ webSocketResponseModel: newRequestModel.webSocketResponseModel!
375
375
);
376
376
ref.read (historyMetaStateNotifier.notifier).addHistoryRequest (model);
377
377
}
@@ -544,7 +544,6 @@ class CollectionStateNotifier
544
544
545
545
546
546
Future <void > connect () async {
547
- print ("connect fired" );
548
547
final requestId = ref.read (selectedIdStateProvider);
549
548
ref.read (codePaneVisibleStateProvider.notifier).state = false ;
550
549
if (requestId == null || state == null ) {
@@ -554,13 +553,8 @@ class CollectionStateNotifier
554
553
555
554
RequestModel ? requestModel = state! [requestId];
556
555
557
-
558
- // if (requestModel?.webSocketRequestModel == null) {
559
- // print("no web socket request model");
560
- // return;
561
- // }
562
556
if (requestModel? .webSocketRequestModel == null ) {
563
- print ( "entered null" );
557
+
564
558
return ;
565
559
}
566
560
@@ -618,15 +612,9 @@ class CollectionStateNotifier
618
612
map = {...state! };
619
613
requestModel = map[requestId];
620
614
621
- if (requestModel == null ){
622
- print ("webSocketResponseModel is null" );
623
- }
624
615
625
616
WebSocketResponseModel webSocketResponseModel = requestModel! .webSocketResponseModel! ;
626
617
627
- if (webSocketResponseModel == null ){
628
- print ("webSocketResponseModel is null" );
629
- }
630
618
WebSocketResponseModel newWebSocketResponseModel = webSocketResponseModel.copyWith (
631
619
frames: [...webSocketResponseModel.frames, WebSocketFrameModel (
632
620
id: getNewUuid (),
@@ -649,11 +637,29 @@ class CollectionStateNotifier
649
637
650
638
},
651
639
onError: (error) async {
652
- print (error.statusCode);
640
+ var statusCode = error.statusCode;
641
+ map = {...state! };
642
+ requestModel = map[requestId];
643
+ WebSocketResponseModel webSocketResponseModel = requestModel! .webSocketResponseModel! ;
644
+ WebSocketResponseModel newWebSocketResponseModel = webSocketResponseModel.copyWith (
645
+ frames: [...webSocketResponseModel.frames, WebSocketFrameModel (
646
+ id: getNewUuid (),
647
+ message: error.toString (),
648
+ timeStamp: DateTime .now (),
649
+ isSend: true
650
+ )]
651
+ );
652
+ var newRequestModel = requestModel! .copyWith (
653
+ responseStatus: statusCode,
654
+ message: kResponseCodeReasons[statusCode],
655
+ webSocketResponseModel: newWebSocketResponseModel,
656
+ );
657
+ map[requestId] = newRequestModel;
658
+ state = map;
653
659
654
660
},
655
661
onDone: () async {
656
- print ( "Connection done" );
662
+
657
663
},
658
664
cancelOnError: false ,
659
665
);
@@ -677,6 +683,8 @@ class CollectionStateNotifier
677
683
state = map;
678
684
}
679
685
}
686
+
687
+
680
688
Future <void > disconnect () async {
681
689
final requestId = ref.read (selectedIdStateProvider);
682
690
if (requestId == null || state == null ) {
0 commit comments