Skip to content

Commit ab20f25

Browse files
committed
removed print and make time accurate
1 parent 2850897 commit ab20f25

File tree

6 files changed

+29
-35
lines changed

6 files changed

+29
-35
lines changed

lib/providers/collection_providers.dart

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:apidash_core/apidash_core.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter_riverpod/flutter_riverpod.dart';
44
import 'package:apidash/consts.dart';
5+
import 'package:intl/intl.dart';
56
import 'providers.dart';
67
import '../models/models.dart';
78
import '../services/services.dart' show hiveHandler, HiveHandler;
@@ -369,9 +370,8 @@ class CollectionStateNotifier
369370
),
370371
httpRequestModel: substitutedHttpRequestModel,
371372
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!
375375
);
376376
ref.read(historyMetaStateNotifier.notifier).addHistoryRequest(model);
377377
}
@@ -544,7 +544,6 @@ class CollectionStateNotifier
544544

545545

546546
Future<void> connect() async {
547-
print("connect fired");
548547
final requestId = ref.read(selectedIdStateProvider);
549548
ref.read(codePaneVisibleStateProvider.notifier).state = false;
550549
if (requestId == null || state == null) {
@@ -554,13 +553,8 @@ class CollectionStateNotifier
554553

555554
RequestModel? requestModel = state![requestId];
556555

557-
558-
// if (requestModel?.webSocketRequestModel == null) {
559-
// print("no web socket request model");
560-
// return;
561-
// }
562556
if (requestModel?.webSocketRequestModel == null) {
563-
print("entered null");
557+
564558
return;
565559
}
566560

@@ -618,15 +612,9 @@ class CollectionStateNotifier
618612
map = {...state!};
619613
requestModel = map[requestId];
620614

621-
if(requestModel == null){
622-
print("webSocketResponseModel is null");
623-
}
624615

625616
WebSocketResponseModel webSocketResponseModel = requestModel!.webSocketResponseModel!;
626617

627-
if(webSocketResponseModel == null){
628-
print("webSocketResponseModel is null");
629-
}
630618
WebSocketResponseModel newWebSocketResponseModel = webSocketResponseModel.copyWith(
631619
frames: [...webSocketResponseModel.frames, WebSocketFrameModel(
632620
id: getNewUuid(),
@@ -649,11 +637,29 @@ class CollectionStateNotifier
649637

650638
},
651639
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;
653659

654660
},
655661
onDone: () async{
656-
print("Connection done");
662+
657663
},
658664
cancelOnError: false,
659665
);
@@ -677,6 +683,8 @@ class CollectionStateNotifier
677683
state = map;
678684
}
679685
}
686+
687+
680688
Future<void> disconnect() async {
681689
final requestId = ref.read(selectedIdStateProvider);
682690
if (requestId == null || state == null) {

lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class EditRequestBody extends ConsumerWidget {
4747
children: [
4848
const Padding(
4949
padding:EdgeInsets.only(left:10),
50-
child: const SizedBox(
50+
child: SizedBox(
5151
height: kHeaderHeight,
5252
child: Row(
5353
mainAxisAlignment: MainAxisAlignment.center,

lib/screens/home_page/editor_pane/url_card.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'package:apidash/widgets/button_connection.dart';
21
import 'package:apidash_core/apidash_core.dart';
32
import 'package:apidash_design_system/apidash_design_system.dart';
43
import 'package:flutter/material.dart';
@@ -164,8 +163,6 @@ class ConnectionRequestButton extends ConsumerWidget {
164163
ref.watch(selectedIdStateProvider);
165164
final isConnected = ref.watch(
166165
selectedRequestModelProvider.select((value) => value?.webSocketRequestModel!.isConnected));
167-
final isWorking = ref.watch(
168-
selectedRequestModelProvider.select((value) => value?.isWorking));
169166
return ConnectionButton(
170167
isConnected:isConnected?? false,
171168
onTap: () {
@@ -174,7 +171,6 @@ class ConnectionRequestButton extends ConsumerWidget {
174171
},
175172
onDisconnect: () {
176173
onTap?.call();
177-
print("disconnected inside disconnect");
178174
ref.read(collectionStateNotifierProvider.notifier).disconnect();
179175

180176
},

lib/widgets/request_pane.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ class _RequestPaneState extends State<RequestPane>
3737

3838
@override
3939
Widget build(BuildContext context) {
40-
print("Number of tabs (tabLabels): ${widget.tabLabels.length}");
41-
print("Number of children (TabBarView): ${widget.children.length}");
40+
4241
final TabController controller = useTabController(
4342
initialLength: widget.children.length,
4443
vsync: this,

packages/apidash_core/lib/models/websocket_frame_model.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class WebSocketFrameModel with _$WebSocketFrameModel {
2424
factory WebSocketFrameModel.fromJson(Map<String, Object?> json) =>
2525
_$WebSocketFrameModelFromJson(json);
2626

27-
String get formattedTime => DateFormat('HH:mm:ss').format(timeStamp ?? DateTime.now());
27+
String get formattedTime => DateFormat('HH:mm:ss.SSS').format(timeStamp ?? DateTime.now());
2828
bool get isTextFrame => frameType.toLowerCase() == "text";
2929

3030

packages/apidash_core/lib/services/websocket_service.dart

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,12 @@ class WebSocketClient {
8585
{Future<void> Function(dynamic error)? onError, Future<void> Function()? onDone,bool? cancelOnError}) async{
8686
_subscription = _channel.stream.listen(
8787
(message) {
88-
log('Received message: $message');
8988
onMessage(message);
9089
},
9190
onError: (error) {
92-
log('Error: $error');
9391
if (onError != null) onError(error);
9492
},
9593
onDone: () {
96-
log('Connection closed.');
97-
if (_channel.closeCode != null) {
98-
print('Close code: ${_channel.closeCode}');
99-
}
100-
if (_channel.closeReason != null) {
101-
print('Close reason: ${_channel.closeReason}');
102-
}
10394
if (onDone != null) onDone();
10495
},
10596
cancelOnError: cancelOnError ?? true,

0 commit comments

Comments
 (0)