update dependencies

Author: Skycoder42

.vscode/tasks.json

@@ -0,0 +1,22 @@
+{
+"version": "2.0.0",
+"tasks": [
+{
+"type": "dart",
+"command": "dart",
+"cwd": "",
+"args": [
+"run",
+"build_runner",
+"watch"
+],
+"problemMatcher": [],
+"label": "dart: dart run build_runner watch",
+"detail": "",
+"group": {
+"kind": "build",
+"isDefault": true
+}
+}
+]
+}

analysis_options.yaml

@@ -1,13 +1,10 @@
-include: package:lint/analysis_options_package.yaml
-
-# For lint rules and documentation, see http://dart-lang.github.io/linter/lints.
-
-# Uncomment to specify additional rules.
-# linter:
-# rules:
-# - camel_case_types
+include: package:dart_test_tools/analysis_options_package.yaml
 
 analyzer:
  exclude:
- - '**/*.chopper.dart'
- - '**/*.freezed.dart'
+ - "**/*.chopper.dart"
+ - "**/*.freezed.dart"
+
+linter:
+ rules:
+ public_member_api_docs: false

example/aha_client_example.dart

@@ -13,14 +13,13 @@ class _AhaClientHttpOverrides extends HttpOverrides {
  _AhaClientHttpOverrides(this._host, this._port);
 
  @override
- HttpClient createHttpClient(SecurityContext? context) {
- return super.createHttpClient(context)
- ..badCertificateCallback =
- (X509Certificate cert, String host, int port) =>
- host == _host && port == _port;
- }
+ HttpClient createHttpClient(SecurityContext? context) =>
+ super.createHttpClient(context)
+ ..badCertificateCallback =
+ (cert, host, port) => host == _host && port == _port;
 }
 
+// ignore: must_be_immutable
 class ExampleLoginManager extends LoginManager {
  @override
  FutureOr<UserCredentials?> obtainCredentials(LoginInfo loginInfo) async {
@@ -29,8 +28,9 @@ class ExampleLoginManager extends LoginManager {
  'Login blocked until: ${DateTime.now().add(loginInfo.blockTime!)}',
  );
  }
- stdout.writeln('Known usernames: ${loginInfo.knownUsers}');
- stdout.write('Username: ');
+ stdout
+ ..writeln('Known usernames: ${loginInfo.knownUsers}')
+ ..write('Username: ');
  await stdout.flush();
  final username = stdin.readLineSync();
  stdout.write('Password: ');
@@ -61,8 +61,11 @@ Future<void> main() async {
  final client = AhaClient(loginManager: ExampleLoginManager());
 
  final response = await client.aha.getDeviceListInfos();
+ // ignore: avoid_print
  print(response.statusCode);
+ // ignore: avoid_print
  print('');
+ // ignore: avoid_print
  print(response.body);
 
  await client.dispose();

lib/src/api/aha/models/device_list_infos.dart

@@ -1,7 +1,8 @@
-import 'package:aha_client/src/api/util/xml_converter.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:xml/xml.dart';
 
+import '../../util/xml_converter.dart';
+
 part 'device_list_infos.freezed.dart';
 
 @freezed
@@ -16,14 +17,15 @@ class DeviceList with _$DeviceList {
  }) = _DeviceList;
 
  factory DeviceList.fromXml(XmlElement element) {
- assert(element.name.toString() == 'devicelist');
+ assert(
+ element.name.toString() == 'devicelist',
+ 'element must be a <devicelist> element.',
+ );
 
  return DeviceList(
  version: element.getAttribute('version') ?? '',
  fwversion: element.getAttribute('fwversion') ?? '',
- devices: List.unmodifiable(
- element.childElements.map((element) => Device.fromXml(element)),
- ),
+ devices: element.childElements.map<Device>(Device.fromXml).toList(),
  );
  }
 
@@ -62,7 +64,10 @@ class Device with _$Device {
  }) = _Device;
 
  factory Device.fromXml(XmlElement element) {
- assert(element.name.toString() == 'device');
+ assert(
+ element.name.toString() == 'device',
+ 'element must be a <device> element.',
+ );
 
  return Device(
  identifier: element.getAttribute('identifier') ?? '',

lib/src/api/aha/models/switch_status.dart

@@ -1,6 +1,7 @@
-import 'package:aha_client/src/api/util/text_converter.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
+import '../../util/text_converter.dart';
+
 part 'switch_status.freezed.dart';
 
 @freezed

lib/src/api/aha_client.dart

@@ -33,7 +33,7 @@ class AhaClient {
  XmlConverter()..registerConverter(SessionInfo.converter),
  TextConverter()..registerConverter(SwitchStatus.converter),
  ]),
- interceptors: [
+ interceptors: <dynamic>[
  loginManager,
  ],
  authenticator: loginManager,

lib/src/api/login/login_manager.dart

@@ -1,13 +1,13 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:aha_client/src/api/login/login_info.dart';
 import 'package:chopper/chopper.dart';
 import 'package:convert/convert.dart';
 import 'package:cryptography/cryptography.dart';
 import 'package:meta/meta.dart';
 
 import 'authentication_exception.dart';
+import 'login_info.dart';
 import 'login_service.dart';
 import 'models/right.dart';
 import 'models/session_info.dart';
@@ -86,7 +86,11 @@ abstract class LoginManager implements RequestInterceptor, Authenticator {
 
  @override
  @internal
- FutureOr<Request?> authenticate(Request request, Response response) async {
+ FutureOr<Request?> authenticate(
+ Request request,
+ Response response, [
+ Request? originalRequest,
+ ]) async {
  if (response.statusCode != 403 || request.isLogin) {
  return null;
  }
@@ -102,7 +106,7 @@ abstract class LoginManager implements RequestInterceptor, Authenticator {
  }
 
  Request _copyRequestWithSid(Request request) => request.copyWith(
- parameters: {
+ parameters: <String, dynamic>{
  ...request.parameters,
  'sid': _sid,
  },
@@ -118,13 +122,11 @@ abstract class LoginManager implements RequestInterceptor, Authenticator {
  }
  }
 
- Future<SessionInfo> _getLoginStatus() async {
- return _extractSessionInfo(
- _sid == SessionInfo.invalidSid
- ? await _loginService.getLoginStatus()
- : await _loginService.checkSessionValid(sid: _sid),
- );
- }
+ Future<SessionInfo> _getLoginStatus() async => _extractSessionInfo(
+ _sid == SessionInfo.invalidSid
+ ? await _loginService.getLoginStatus()
+ : await _loginService.checkSessionValid(sid: _sid),
+ );
 
  Future<SessionInfo> _performLogin(
  SessionInfo sessionInfo,
@@ -133,7 +135,8 @@ abstract class LoginManager implements RequestInterceptor, Authenticator {
  final blockDelay = sessionInfo.blockTime > 0
  ? Duration(seconds: sessionInfo.blockTime)
  : null;
- final blockTimeout = blockDelay != null ? Future.delayed(blockDelay) : null;
+ final blockTimeout =
+ blockDelay != null ? Future<void>.delayed(blockDelay) : null;
 
  final credentials = await obtainCredentials(
  LoginInfo(
@@ -216,5 +219,5 @@ abstract class LoginManager implements RequestInterceptor, Authenticator {
 }
 
 extension _RequestX on Request {
- bool get isLogin => url.contains('/login_sid.lua');
+ bool get isLogin => url.path.endsWith('/login_sid.lua');
 }

lib/src/api/login/models/right.dart

@@ -25,8 +25,14 @@ class Right with _$Right {
  }) = _Right;
 
  factory Right.fromXml(XmlElement nameElement, XmlElement accessElement) {
- assert(nameElement.name.toString() == 'Name');
- assert(accessElement.name.toString() == 'Access');
+ assert(
+ nameElement.name.toString() == 'Name',
+ 'nameElement must be a <Name> element',
+ );
+ assert(
+ accessElement.name.toString() == 'Access',
+ 'accessElement must be an <Access> element.',
+ );
 
  final access = AccessLevel.values[int.parse(accessElement.text)];
 

lib/src/api/login/models/session_info.dart

@@ -26,11 +26,14 @@ class SessionInfo with _$SessionInfo {
  }) = _SessionInfo;
 
  factory SessionInfo.fromXml(XmlElement element) {
- assert(element.name.toString() == 'SessionInfo');
+ assert(
+ element.name.toString() == 'SessionInfo',
+ 'element must be a <SessionInfo> element',
+ );
 
  final rights =
  element.getElement('Rights')?.childElements.toList() ?? const [];
- assert(rights.length % 2 == 0, 'Rights must contain pairs of elements');
+ assert(rights.length.isEven, 'Rights must contain pairs of elements');
 
  final parsedRights = <Right>[];
  for (var i = 0; i < rights.length; i += 2) {
@@ -43,14 +46,13 @@ class SessionInfo with _$SessionInfo {
  sid: element.getElement('SID')!.text,
  challange: element.getElement('Challenge')!.text,
  blockTime: int.parse(element.getElement('BlockTime')!.text),
- users: List.unmodifiable(
- element
- .getElement('Users')
- ?.childElements
- .map((e) => User.fromXml(e)) ??
- const [],
- ),
- rights: List.unmodifiable(parsedRights),
+ users: element
+ .getElement('Users')
+ ?.childElements
+ .map(User.fromXml)
+ .toList() ??
+ const [],
+ rights: parsedRights,
  );
  }
 

lib/src/api/login/models/user.dart

@@ -14,7 +14,10 @@ class User with _$User {
  }) = _User;
 
  factory User.fromXml(XmlElement element) {
- assert(element.name.toString() == 'User');
+ assert(
+ element.name.toString() == 'User',
+ 'element must be a <User> element.',
+ );
  return User(
  element.text,
  last: element.getAttribute('last') == '1',