@@ -232,6 +232,7 @@ class CollectionStateNotifier
232
232
List <FormDataModel >? formData,
233
233
int ? responseStatus,
234
234
String ? message,
235
+ String ? webSocketMessage,
235
236
ContentTypeWebSocket ? contentType,
236
237
HttpResponseModel ? httpResponseModel,
237
238
WebSocketResponseModel ? webSocketResponseModel,
@@ -274,7 +275,7 @@ class CollectionStateNotifier
274
275
currentWebSocketRequestModel.isHeaderEnabledList,
275
276
isParamEnabledList:
276
277
isParamEnabledList ?? currentWebSocketRequestModel.isParamEnabledList,
277
- message: message ?? currentWebSocketRequestModel.message,
278
+ message: webSocketMessage ?? currentWebSocketRequestModel.message,
278
279
)
279
280
: currentWebSocketRequestModel;
280
281
@@ -578,18 +579,31 @@ class CollectionStateNotifier
578
579
}
579
580
580
581
final url = requestModel! .webSocketRequestModel! .url;
582
+ var map = {...state! };
583
+
584
+ map[requestId] = requestModel.copyWith (
585
+ isWorking: true ,
586
+
587
+ webSocketResponseModel: const WebSocketResponseModel (),
588
+ );
589
+
590
+ state = map;
581
591
(String ? ,DateTime ? ) result = await webSocketManager.connect (requestId,url);
582
592
583
- var map = {...state! };
593
+ map = {...state! };
594
+
584
595
map[requestId] = requestModel.copyWith (
585
- isWorking: result.$1 == KLabelConnect ,
596
+ isWorking: true ,
597
+ responseStatus: 101 ,
598
+ message: kResponseCodeReasons[101 ],
586
599
sendingTime: result.$2,
587
600
webSocketResponseModel: const WebSocketResponseModel (),
588
601
);
589
602
590
603
state = map;
591
604
592
-
605
+ if (result.$1 == kMsgConnected){
606
+ map = {...state! };
593
607
webSocketManager.listen (
594
608
requestId,
595
609
(message) async {
@@ -609,19 +623,31 @@ class CollectionStateNotifier
609
623
);
610
624
611
625
612
- map = {...state! };
613
- map[requestId] = newRequestModel;
614
- state = map;
626
+ map = {...state! };
627
+ map[requestId] = newRequestModel;
628
+ state = map;
615
629
print (message);
616
630
},
617
631
onError: (error) async {
632
+ print (error.statusCode);
618
633
619
634
},
620
635
onDone: () async {
621
636
print ("Connection done" );
622
637
},
623
638
cancelOnError: false ,
624
639
);
640
+ }else {
641
+ map = {...state! };
642
+ map[requestId] = requestModel.copyWith (
643
+ isWorking: false ,
644
+ responseStatus: 1002 ,
645
+ message: result.$1,
646
+ sendingTime: result.$2,
647
+ );
648
+
649
+ state = map;
650
+ }
625
651
}
626
652
Future <void > disconnect () async {
627
653
final requestId = ref.read (selectedIdStateProvider);
@@ -643,6 +669,7 @@ class CollectionStateNotifier
643
669
var newRequestModel = requestModel.copyWith (
644
670
isWorking: false ,
645
671
webSocketRequestModel: newWebSocketRequestModel,
672
+
646
673
647
674
);
648
675
0 commit comments