Riverpod

frontend/analysis_options.yaml

@@ -11,6 +11,8 @@ analyzer:
     # We explicitly enabled even conflicting rules and are fixing the conflict
     # in this file
     included_file_warning: ignore
+  plugins:
+    - custom_lint
 linter:
   rules:
     # too verbose

frontend/integration_test/simple_test.dart

@@ -22,8 +22,10 @@
 library;
 
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:logging/logging.dart';
+import 'package:shrapnel/api/api_websocket.dart';
 import 'package:shrapnel/main.dart';
 import 'package:shrapnel/midi_mapping/model/models.dart';
 
@@ -113,9 +115,12 @@ void main() {
 
     // mDNS seems to be slow, use the IP address directly for faster testing.
     await tester.pumpWidget(
-      App(
-        normalHost: dutIpAddress,
-        provisioningHost: '192.168.4.1',
+      ProviderScope(
+        overrides: [
+          normalHostProvider.overrideWithValue(dutIpAddress),
+          provisioningHostProvider.overrideWithValue('192.168.4.1'),
+        ],
+        child: App(),
       ),
     );
 
@@ -201,17 +206,20 @@ void main() {
     testWidgets('simple test', (tester) async {
       // mDNS seems to be slow, use the IP address directly for faster testing.
       await tester.pumpWidget(
-        App(
-          normalHost: dutIpAddress,
-          provisioningHost: '192.168.4.1',
+        ProviderScope(
+          overrides: [
+            normalHostProvider.overrideWithValue(dutIpAddress),
+            provisioningHostProvider.overrideWithValue('192.168.4.1'),
+          ],
+          child: App(),
         ),
       );
 
-      // wait until connected
-      // poll connection status widget until ready with timeout
       final homePage = HomePageObject(tester);
       await homePage.waitUntilConnected();
 
+      await homePage.waitUntilPresetsReady();
+
       await homePage.createPreset('Preset 1');
 
       final midiMappingPage = await homePage.openMidiMapping();

frontend/lib/amplifier.dart

@@ -18,15 +18,13 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:rxdart/rxdart.dart';
 
 import 'knob_with_label.dart';
-import 'parameter.dart';
 
 abstract class AmplifierModel {
   String get name;
-  List<AudioParameterDoubleModel> get parameters;
+
+  List<String> get parameters;
 }
 
 class Amplifier extends StatelessWidget {
@@ -47,11 +45,10 @@ class Amplifier extends StatelessWidget {
 
     for (var i = 0; i < parameters.length; i++) {
       knobs.add(
-        parameters[i].provider(
-          child: KnobWithLabel(
-            isEnabled: full,
-            knobSize: scaleFactor * 25,
-          ),
+        KnobWithLabel(
+          isEnabled: full,
+          knobSize: scaleFactor * 25,
+          parameterId: parameters[i],
         ),
       );
       if (i < parameters.length - 1) {
@@ -80,46 +77,3 @@ class Amplifier extends StatelessWidget {
     );
   }
 }
-
-extension ProviderEx<T> on ValueStream<T> {
-  Widget provider({
-    Key? key,
-    ErrorBuilder<T>? catchError,
-    UpdateShouldNotify<T>? updateShouldNotify,
-    bool? lazy,
-    TransitionBuilder? builder,
-    Widget? child,
-  }) {
-    return StreamProvider<T>.value(
-      key: key,
-      value: this,
-      initialData: value,
-      updateShouldNotify: updateShouldNotify,
-      lazy: lazy,
-      builder: builder,
-      child: child,
-    );
-  }
-}
-
-extension ParameterProviderEx on AudioParameterDoubleModel {
-  Widget provider({
-    Key? key,
-    ErrorBuilder<double>? catchError,
-    UpdateShouldNotify<double>? updateShouldNotify,
-    bool? lazy,
-    TransitionBuilder? builder,
-    Widget? child,
-  }) {
-    return Provider.value(
-      value: this,
-      child: value.provider(
-        key: key,
-        updateShouldNotify: updateShouldNotify,
-        lazy: lazy,
-        builder: builder,
-        child: child,
-      ),
-    );
-  }
-}

frontend/lib/api/api_websocket.dart

@@ -22,6 +22,7 @@ import 'dart:async';
 import 'package:async/async.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:logging/logging.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:rxdart/rxdart.dart';
 
 import '../audio_events.dart';
@@ -37,8 +38,24 @@ import 'proto_extension.dart';
 
 part 'api_websocket.freezed.dart';
 
+part 'api_websocket.g.dart';
+
 final _log = Logger('api_websocket');
 
+@Riverpod(keepAlive: true)
+String normalHost(NormalHostRef ref) => 'guitar-dsp.local';
+
+@Riverpod(keepAlive: true)
+String provisioningHost(ProvisioningHostRef ref) => 'guitar-dsp.local';
+
+@visibleForTesting
+final kShrapnelUri = Uri(
+  scheme: 'http',
+  host: 'guitar-dsp.local',
+  port: 8080,
+  path: '/websocket',
+);
+
 @freezed
 sealed class ApiMessage with _$ApiMessage {
   const factory ApiMessage.audioEvent({required AudioEventMessage message}) =
@@ -63,14 +80,28 @@ sealed class ApiMessage with _$ApiMessage {
   }) = ApiMessageSelectedPreset;
 }
 
-class ApiWebsocket
-    implements ReconnectingMessageTransport<ApiMessage, ApiMessage> {
+@riverpod
+Uri shrapnelUri(ShrapnelUriRef ref) {
+  return kShrapnelUri.replace(host: ref.watch(normalHostProvider));
+}
+
+@riverpod
+ApiWebsocket? apiWebsocket(ApiWebsocketRef ref) {
+  final websocket =
+      ref.watch(robustWebsocketProvider(ref.watch(shrapnelUriProvider)));
+  if (websocket.isAlive) {
+    return ApiWebsocket(websocket: websocket);
+  }
+
+  return null;
+}
+
+class ApiWebsocket implements MessageTransport<ApiMessage, ApiMessage> {
   ApiWebsocket({
-    required ReconnectingMessageTransport<WebSocketData, WebSocketData>
-        websocket,
+    required MessageTransport<WebSocketData, WebSocketData> websocket,
   }) : _websocket = websocket;
 
-  final ReconnectingMessageTransport<WebSocketData, WebSocketData> _websocket;
+  final MessageTransport<WebSocketData, WebSocketData> _websocket;
 
   @override
   late final Stream<ApiMessage> stream = _websocket.stream
@@ -83,12 +114,6 @@ class ApiWebsocket
         (event) => 'received: $event',
       );
 
-  @override
-  late final Stream<void> connectionStream = _websocket.connectionStream;
-
-  @override
-  bool get isAlive => _websocket.isAlive;
-
   @override
   late final StreamSink<ApiMessage> sink =
       StreamSinkTransformer<ApiMessage, WebSocketData>.fromHandlers(

frontend/lib/api/generate.sh

@@ -11,3 +11,4 @@ protoc --dart_out="$proto_dir/generated" \
   presets.proto \
   selected_preset.proto \
   shrapnel.proto
+dart format "$proto_dir/generated"

frontend/lib/audio_events.dart

@@ -18,9 +18,13 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:logging/logging.dart';
 import 'package:pausable_timer/pausable_timer.dart';
+import 'package:rxdart/rxdart.dart';
+
+import 'api/api_websocket.dart';
 
 part 'audio_events.freezed.dart';
 
@@ -33,6 +37,21 @@ sealed class AudioEventMessage with _$AudioEventMessage {
   factory AudioEventMessage.outputClipped() = AudioEventMessageOutputClipped;
 }
 
+final audioClippingServiceProvider = AutoDisposeChangeNotifierProvider(
+  (ref) {
+    final websocket = ref.watch(apiWebsocketProvider);
+    if (websocket != null) {
+      return AudioClippingService(
+        stream: websocket.stream
+            .whereType<ApiMessageAudioEvent>()
+            .map((event) => event.message),
+      );
+    }
+
+    return null;
+  },
+);
+
 class AudioClippingService extends ChangeNotifier {
   AudioClippingService({required Stream<AudioEventMessage> stream}) {
     _outputClippingTimer = PausableTimer(

frontend/lib/chorus.dart

@@ -18,47 +18,26 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
-import 'parameter.dart';
 import 'stompbox.dart';
 
 class ChorusModel extends StompboxModel {
-  ChorusModel({required ParameterService parameterService})
+  ChorusModel()
       : parameters = [
-          AudioParameterDoubleModel(
-            groupName: _name,
-            name: 'DEPTH',
-            id: 'chorusDepth',
-            parameterService: parameterService,
-          ),
-          AudioParameterDoubleModel(
-            groupName: _name,
-            name: 'MIX',
-            id: 'chorusMix',
-            parameterService: parameterService,
-          ),
-          AudioParameterDoubleModel(
-            groupName: _name,
-            name: 'RATE',
-            id: 'chorusRate',
-            parameterService: parameterService,
-          ),
+          'chorusDepth',
+          'chorusMix',
+          'chorusRate',
         ],
-        bypass = AudioParameterDoubleModel(
-          groupName: _name,
-          name: 'Bypass',
-          id: 'chorusBypass',
-          parameterService: parameterService,
-        );
+        bypass = 'chorusBypass';
 
   static const _name = 'Chorus';
+
   @override
   String get name => _name;
   @override
-  final List<AudioParameterDoubleModel> parameters;
+  final List<String> parameters;
   @override
-  final AudioParameterDoubleModel bypass;
+  final String bypass;
 }
 
 class Chorus extends StatelessWidget {
@@ -74,7 +53,7 @@ class Chorus extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Stompbox(
-      model: context.read<ChorusModel>(),
+      model: ChorusModel(),
       onCardTap: onTap,
       full: full,
       primarySwatch: Colors.blue,

frontend/lib/core/message_transport.dart

@@ -36,7 +36,4 @@ abstract class ReconnectingMessageTransport<T1, T2>
     extends MessageTransport<T1, T2> {
   /// Returns true if the connection is alive at the moment
   bool get isAlive;
-
-  /// A null is emitted every time a connection is successfully created
-  Stream<void> get connectionStream;
 }