From 141d09729032cfdc67f79d0ef277cff5467bd710 Mon Sep 17 00:00:00 2001
From: Plague Fox <plugfox@gmail.com>
Date: Mon, 13 May 2024 09:54:39 +0400
Subject: [PATCH] Refactor SpinifyCommandMixin error handling and connection
 logic

---
 lib/spinify.dart                                             | 5 +----
 lib/spinify_developer.dart                                   | 1 +
 lib/src/model/spinify_interface.dart                         | 2 +-
 .../model/{subscription_interface.dart => subscription.dart} | 0
 lib/src/spinify_impl.dart                                    | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename lib/src/model/{subscription_interface.dart => subscription.dart} (100%)

diff --git a/lib/spinify.dart b/lib/spinify.dart
index 0de94ed..9009bb5 100644
--- a/lib/spinify.dart
+++ b/lib/spinify.dart
@@ -4,20 +4,17 @@ export 'src/model/channel_push.dart';
 export 'src/model/client_info.dart';
 export 'src/model/command.dart';
 export 'src/model/config.dart';
-export 'src/model/exception.dart';
 export 'src/model/history.dart';
 export 'src/model/jwt.dart';
 export 'src/model/metrics.dart';
 export 'src/model/presence_stats.dart';
 export 'src/model/pushes_stream.dart';
 export 'src/model/reply.dart';
-export 'src/model/spinify_interface.dart';
 export 'src/model/state.dart';
 export 'src/model/states_stream.dart';
 export 'src/model/stream_position.dart';
+export 'src/model/subscription.dart';
 export 'src/model/subscription_config.dart';
-export 'src/model/subscription_interface.dart';
 export 'src/model/subscription_state.dart';
 export 'src/model/subscription_states_stream.dart';
-export 'src/model/transport_interface.dart';
 export 'src/spinify_impl.dart' show Spinify;
diff --git a/lib/spinify_developer.dart b/lib/spinify_developer.dart
index 053537b..2479f1e 100644
--- a/lib/spinify_developer.dart
+++ b/lib/spinify_developer.dart
@@ -1,6 +1,7 @@
 library spinify.developer;
 
 export 'spinify.dart';
+export 'src/model/exception.dart';
 export 'src/model/spinify_interface.dart';
 export 'src/model/transport_interface.dart';
 export 'src/transport_fake.dart';
diff --git a/lib/src/model/spinify_interface.dart b/lib/src/model/spinify_interface.dart
index f42b168..d67baa8 100644
--- a/lib/src/model/spinify_interface.dart
+++ b/lib/src/model/spinify_interface.dart
@@ -11,8 +11,8 @@ import 'pushes_stream.dart';
 import 'state.dart';
 import 'states_stream.dart';
 import 'stream_position.dart';
+import 'subscription.dart';
 import 'subscription_config.dart';
-import 'subscription_interface.dart';
 
 /// Spinify client interface.
 abstract interface class ISpinify
diff --git a/lib/src/model/subscription_interface.dart b/lib/src/model/subscription.dart
similarity index 100%
rename from lib/src/model/subscription_interface.dart
rename to lib/src/model/subscription.dart
diff --git a/lib/src/spinify_impl.dart b/lib/src/spinify_impl.dart
index 3a75c9b..b059074 100644
--- a/lib/src/spinify_impl.dart
+++ b/lib/src/spinify_impl.dart
@@ -14,8 +14,8 @@ import 'model/spinify_interface.dart';
 import 'model/state.dart';
 import 'model/states_stream.dart';
 import 'model/stream_position.dart';
+import 'model/subscription.dart';
 import 'model/subscription_config.dart';
-import 'model/subscription_interface.dart';
 import 'model/transport_interface.dart';
 import 'transport_ws_pb_stub.dart'
     // ignore: uri_does_not_exist