Skip to content

Commit

Permalink
Fixed to log only on develop mode
Browse files Browse the repository at this point in the history
  • Loading branch information
leonardo.gabriel committed Dec 22, 2022
1 parent 471cbad commit c20b294
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .fvm/fvm_config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"flutterSdkVersion": "3.3.8",
"flutterSdkVersion": "3.3.10",
"flavors": {}
}
13 changes: 6 additions & 7 deletions lib/src/protocol/client/channel.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:async';
import 'package:simple_logger/simple_logger.dart';

import '../../services/logger.service.dart';
import '../command.dart';
import '../enums/command_method.enum.dart';
import '../enums/command_status.enum.dart';
Expand Down Expand Up @@ -38,29 +38,26 @@ abstract class Channel {
/// Current session state
SessionState? state;

final logger = SimpleLogger();
final logger = LoggerService();

Channel({
required this.transport,
required this.autoReplyPings,
required this.autoNotifyReceipt,
}) {
logger.setLevel(
Level.INFO,
includeCallerInfo: true,
);

state = SessionState.isNew;

// Start listening to the stream
transport.onEnvelope?.stream.listen(
(event) {
if (event.containsKey('state')) {
logger.info('Received envelope is a Session');

final session = Session.fromJson(event);
onSession(session);
} else if (event.containsKey('method')) {
logger.info('Received envelope is a Command');

final command = Command.fromJson(event);

if (autoReplyPings &&
Expand All @@ -84,11 +81,13 @@ abstract class Channel {
onCommand(command);
} else if (event.containsKey('content')) {
logger.info('Received envelope is a Message');

final message = Message.fromJson(event);
_notifyMessage(message);
onMessage(message);
} else if (event.containsKey('event')) {
logger.info('Received envelope is a Notification');

final notification = Notification.fromJson(event);
onNotification(notification);
}
Expand Down
11 changes: 2 additions & 9 deletions lib/src/protocol/network/web_socket_transport.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import 'dart:convert';
import 'dart:io';
import 'package:flutter/services.dart';

import '../../services/logger.service.dart';
import '../../utils/lime.utils.dart';
import '../enums/session_encryption.enum.dart';
import '../enums/session_compression.enum.dart';
import '../envelope.dart';
import '../exceptions/insecure_socket.exception.dart';
import 'transport.dart';

import 'package:simple_logger/simple_logger.dart';
import 'package:pretty_json/pretty_json.dart';

/// Allows websocket communication based a Transport base class
Expand All @@ -30,14 +30,7 @@ class WebSocketTransport implements Transport {
@override
StreamController<bool> onClose = StreamController<bool>();

final logger = SimpleLogger();

WebSocketTransport() {
logger.setLevel(
Level.INFO,
includeCallerInfo: true,
);
}
final logger = LoggerService();

@override
Future<void> open(
Expand Down
37 changes: 37 additions & 0 deletions lib/src/services/logger.service.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import 'package:flutter/foundation.dart';
import 'package:simple_logger/simple_logger.dart';

class LoggerService {
LoggerService() {
logger.setLevel(
Level.INFO,
includeCallerInfo: true,
);
}

final logger = SimpleLogger();

String? info(Object? message) {
if (kDebugMode) {
return logger.info(message);
}

return null;
}

String? shout(Object? message) {
if (kDebugMode) {
return logger.shout(message);
}

return null;
}

String? warning(Object? message) {
if (kDebugMode) {
return logger.warning(message);
}

return null;
}
}
9 changes: 5 additions & 4 deletions test/protocol/client/client_channel_test.mocks.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import 'package:lime/src/protocol/enums/session_encryption.enum.dart' as _i7;
import 'package:lime/src/protocol/envelope.dart' as _i8;
import 'package:lime/src/protocol/network/web_socket_transport.dart' as _i4;
import 'package:mockito/mockito.dart' as _i1;
import 'package:simple_logger/simple_logger.dart' as _i3;
import 'package:lime/src/services/logger.service.dart' as _i3;

// ignore_for_file: type=lint
// ignore_for_file: avoid_redundant_argument_values
Expand All @@ -25,7 +25,7 @@ import 'package:simple_logger/simple_logger.dart' as _i3;
class _FakeStreamController_0<T> extends _i1.Fake
implements _i2.StreamController<T> {}

class _FakeSimpleLogger_1 extends _i1.Fake implements _i3.SimpleLogger {}
class _FakeSimpleLogger_1 extends _i1.Fake implements _i3.LoggerService {}

/// A class which mocks [WebSocketTransport].
///
Expand Down Expand Up @@ -53,8 +53,9 @@ class MockWebSocketTransport extends _i1.Mock
super.noSuchMethod(Invocation.setter(#onClose, _onClose),
returnValueForMissingStub: null);
@override
_i3.SimpleLogger get logger => (super.noSuchMethod(Invocation.getter(#logger),
returnValue: _FakeSimpleLogger_1()) as _i3.SimpleLogger);
_i3.LoggerService get logger =>
(super.noSuchMethod(Invocation.getter(#logger),
returnValue: _FakeSimpleLogger_1()) as _i3.LoggerService);
@override
set compression(_i6.SessionCompression? _compression) =>
super.noSuchMethod(Invocation.setter(#compression, _compression),
Expand Down

0 comments on commit c20b294

Please sign in to comment.