Merge pull request #55 from leoafarias/fix/crash-on-process

Fix/crash on process

.github/workflows/main.yaml

@@ -25,9 +25,12 @@ jobs:
       - name: Enable desktop
         run: flutter config --enable-linux-desktop
 
-      - name: Analyze Flutter
+      - name: Get packages
         run: flutter pub get
 
+      - name: Analyze
+        run: flutter analyze
+
       - name: Flutter build app
         run: flutter build linux
   build-macos:
@@ -48,9 +51,12 @@ jobs:
       - name: Enable desktop
         run: flutter config --enable-macos-desktop
 
-      - name: Analyze Flutter
+      - name: Get packages
         run: flutter pub get
 
+      - name: Analyze
+        run: flutter analyze
+
       - name: Flutter build app
         run: flutter build macos
 
@@ -69,8 +75,11 @@ jobs:
       - name: Enable desktop
         run: flutter config --enable-windows-desktop
 
-      - name: Analyze Flutter
+      - name: Get packages
         run: flutter pub get
 
+      - name: Analyze
+        run: flutter analyze
+
       - name: Flutter build app
         run: flutter build windows

lib/components/atoms/console.dart

@@ -87,7 +87,10 @@ class Console extends HookWidget {
                 right: 0,
                 child: Row(
                   children: [
-                    const SpinKitFadingFour(color: Colors.cyan, size: 15),
+                    SpinKitFadingFour(
+                      color: Theme.of(context).accentColor,
+                      size: 15,
+                    ),
                     IconButton(
                       onPressed: null,
                       icon: expand

lib/components/atoms/typography.dart

@@ -60,7 +60,7 @@ class StdoutText extends StatelessWidget {
       maxLines: 1,
       style: GoogleFonts.ibmPlexMono().copyWith(
         fontSize: 12,
-        color: Colors.cyan,
+        color: Theme.of(context).accentColor,
       ),
     );
   }

lib/components/molecules/update_available_button.dart

@@ -39,16 +39,10 @@ class UpdateAvailableButton extends HookWidget {
                 Heading("Update available."),
               ],
             ),
-            content: Expanded(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Paragraph(
-                    "Current ${latest.value.currentVersion}\n"
-                    "New ${latest.value.latestVersion}",
-                  ),
-                ],
+            content: Container(
+              child: Paragraph(
+                "Current ${latest.value.currentVersion}\n"
+                "New ${latest.value.latestVersion}",
               ),
             ),
             actions: <Widget>[

lib/components/organisms/terminal.dart

@@ -8,7 +8,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:sidekick/components/atoms/typography.dart';
 import 'package:sidekick/dto/release.dto.dart';
-import 'package:sidekick/providers/terminal_provider.dart';
+import 'package:sidekick/providers/shell_provider.dart';
 import 'package:sidekick/utils/notify.dart';
 
 class PlaygroundTerminal extends HookWidget {
@@ -169,7 +169,10 @@ class PlaygroundTerminal extends HookWidget {
                 ),
               ),
               terminalState.processing
-                  ? const SpinKitFadingFour(color: Colors.cyan, size: 15)
+                  ? SpinKitFadingFour(
+                      color: Theme.of(context).accentColor,
+                      size: 15,
+                    )
                   : Container()
             ],
           ),

lib/main.dart

@@ -25,6 +25,7 @@ void main() async {
     setWindowMinSize(const Size(800, 500));
     setWindowMaxSize(Size.infinite);
   }
+
   runApp(ProviderScope(child: FvmApp()));
 }
 

lib/providers/flutter_releases.provider.dart

@@ -35,10 +35,6 @@ class AppReleasesState {
 
   /// Returns all releases and channels that are cached
   List<ReleaseDto> get allCached {
-    // final versionNames = all.map((version) => version.name).toSet();
-    // final _allCached = all.where((release) => release.isCached).toList();
-    // _allCached.retainWhere((version) => versionNames.remove(version.name));
-
     // Only get unique cached releases
     // Some releases replicate across channels
     // They can only be installed once and conflict
@@ -53,7 +49,6 @@ final _fetchFlutterReleases = FutureProvider<FlutterReleases>(
   (_) => FVMClient.getFlutterReleases(),
 );
 
-// ignore: top_level_function_literal_block
 final releasesStateProvider = Provider<AppReleasesState>((ref) {
   // Filter only version that are valid releases
   FlutterReleases payload;

lib/providers/packages.provider.dart

@@ -42,13 +42,13 @@ final packagesProvider = FutureProvider((ref) async {
     return json.map((value) => PackageDetail.fromJson(value)).toList();
   } else {
     // Get dependencies
+    final googleDeps = await getGooglePackages();
     for (final project in projects.list) {
       final pubspec = project.pubspec;
       final deps = pubspec.dependencies;
 
       for (final dep in deps.keys) {
         // Get google deps
-        final googleDeps = await getGooglePackages();
 
         if (deps[dep] is HostedDependency &&
             googleDeps.contains(dep) == false) {

lib/providers/settings.provider.dart

@@ -2,6 +2,7 @@ import 'package:fvm/fvm.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:sidekick/dto/settings.dto.dart';
 import 'package:sidekick/providers/projects_provider.dart';
+import 'package:sidekick/services/flutter_config_service.dart';
 import 'package:sidekick/services/settings_service.dart';
 import 'package:state_notifier/state_notifier.dart';
 
@@ -76,7 +77,7 @@ class SettingsProvider extends StateNotifier<Settings> {
     // Return if nothing changed
     if (changed) {
       // Toggle analytics
-      await FVMClient.setFlutterConfig(settings.toMap());
+      await FlutterConfigService.setFluterConfig(settings.toMap());
     }
   }
 
@@ -96,7 +97,7 @@ class SettingsProvider extends StateNotifier<Settings> {
 
     //Go get async state
     final fvmSettings = await FVMClient.readSettings();
-    final flutterSettings = await FVMClient.getFlutterConfig();
+    final flutterSettings = await FlutterConfigService.getFlutterConfig();
     state = Settings(
       // Set state
       sidekick: sidekickSettings,

lib/providers/terminal_provider.dart → lib/providers/shell_provider.dart

@@ -173,12 +173,12 @@ class TerminalStateNotifier extends StateNotifier<TerminalState> {
     );
   }
 
+  /// Send command isolate
   Future<void> sendIsolate(
     String cmd,
     ReleaseDto release,
     Project project, {
-
-    /// Supress display command on terminal
+    // Supress display command on terminal
     bool supressCmdOutput = false,
   }) async {
     try {
@@ -212,7 +212,7 @@ class TerminalStateNotifier extends StateNotifier<TerminalState> {
       // Receiver port for isolate
       final receivePort = ReceivePort();
       // Create model of Terminal Cmd to send to isolate
-      final terminalCmd = TerminalCmd(
+      final terminalCmd = ProcessCmd(
         execPath: execPath,
         workingDirectory: project.projectDir.path,
         args: args,

lib/screens/playground_screen.dart

@@ -8,7 +8,7 @@ import 'package:sidekick/components/atoms/typography.dart';
 import 'package:sidekick/components/organisms/terminal.dart';
 import 'package:sidekick/dto/release.dto.dart';
 import 'package:sidekick/providers/flutter_releases.provider.dart';
-import 'package:sidekick/providers/terminal_provider.dart';
+import 'package:sidekick/providers/shell_provider.dart';
 
 class PlaygroundScreen extends HookWidget {
   final Project project;

lib/screens/settings_screen.dart

@@ -88,7 +88,7 @@ class SettingsScreen extends HookWidget {
                       return ListTile(
                         leading: Icon(
                           sectionIcons[idx],
-                          size: 16,
+                          size: 20,
                         ),
                         title: Text(
                           section,

lib/services/flutter_config_service.dart

@@ -0,0 +1,88 @@
+import 'dart:io';
+
+import 'package:fvm/fvm.dart';
+import 'package:sidekick/utils/helpers.dart';
+
+class FlutterConfigService {
+  FlutterConfigService._();
+
+  /// Runs a simple Flutter cmd
+  static Future<String> _runCmd(
+    List<String> args,
+  ) async {
+    // Get exec path for flutter
+    final globalVersion = await FVMClient.getGlobal();
+
+    if (globalVersion == null) {
+      throw Exception(
+        'Can only check flutter settings with a global version configured',
+      );
+    }
+
+    final result = await Process.run(globalVersion.flutterExec, args);
+
+    if (result.exitCode == 0) {
+      return result.stdout as String;
+    } else {
+      return result.stderr as String;
+    }
+  }
+
+  /// Sets Flutter config
+  static Future<void> setFluterConfig(Map<String, bool> config) async {
+    final analytics =
+        config['analytics'] == true ? '--analytics' : '--no-analytics';
+    final web = config['web'] == true ? '--enable-web' : '--no-enable-web';
+    final macos = config['macos'] == true
+        ? '--enable-macos-desktop'
+        : '--no-enable-macos-desktop';
+    final windows = config['windows'] == true
+        ? '--enable-windows-desktop'
+        : '--no-enable-windows-desktop';
+    final linux = config['linux'] == true
+        ? '--enable-linux-desktop'
+        : '--no-enable-linux-desktop';
+
+    await _runCmd([
+      'config',
+      analytics,
+      macos,
+      windows,
+      linux,
+      web,
+    ]);
+  }
+
+  /// Returns configured Flutter settings
+  static Future<Map<String, bool>> getFlutterConfig() async {
+    final result = await _runCmd(['config']);
+    final analytics = containsIgnoringWhitespace(
+      result,
+      'Analytics reporting is currently enabled',
+    );
+    final macos = containsIgnoringWhitespace(
+      result,
+      'enable-macos-desktop: true',
+    );
+    final windows = containsIgnoringWhitespace(
+      result,
+      'enable-windows-desktop: true',
+    );
+    final linux = containsIgnoringWhitespace(
+      result,
+      'enable-linux-desktop: true',
+    );
+    final web = containsIgnoringWhitespace(
+      result,
+      'enable-web: true',
+    );
+
+    return {
+      'analytics': analytics,
+      'macos': macos,
+      'windows': windows,
+      'linux': linux,
+      'web': web,
+    };
+  }
+}

lib/services/settings_service.dart

@@ -3,6 +3,7 @@ import 'package:sidekick/dto/settings.dto.dart';
 
 // ignore: avoid_classes_with_only_static_members
 class SettingsService {
+  SettingsService._();
   static const key = 'settings_box';
   static Box<SidekickSettings> box;
 

lib/utils/dependencies.dart

@@ -22,7 +22,8 @@ Future<List<PackageDetail>> fetchPackages(
     pkgFutures.add(client.packageInfo(pkg));
   }
 
-  final packages = await Future.wait(pkgFutures);
+  final packages = await Future.wait(pkgFutures, eagerError: true);
+
   final topPackages = _getTopValidPackages(packages, packagesCount);
   final results = await _complementPackageInfo(topPackages, packagesCount);
 

lib/utils/helpers.dart

@@ -47,3 +47,32 @@ Future<Directory> getSidekickTempDir({
 
   return tempDir;
 }
+
+/// Checks if string contains
+bool containsIgnoringWhitespace(String source, String toSearch) {
+  return collapseWhitespace(source).contains(collapseWhitespace(toSearch));
+}
+
+/// Utility function to collapse whitespace runs to single spaces
+/// and strip leading/trailing whitespace.
+/// taken from matcher
+String collapseWhitespace(String string) {
+  var result = StringBuffer();
+  var skipSpace = true;
+  for (var i = 0; i < string.length; i++) {
+    var character = string[i];
+    if (_isWhitespace(character)) {
+      if (!skipSpace) {
+        result.write(' ');
+        skipSpace = true;
+      }
+    } else {
+      result.write(character);
+      skipSpace = false;
+    }
+  }
+  return result.toString().trim();
+}
+
+bool _isWhitespace(String ch) =>
+    ch == ' ' || ch == '\n' || ch == '\r' || ch == '\t';

lib/utils/terminal_processor.dart

@@ -3,22 +3,22 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:sidekick/providers/terminal_provider.dart';
+import 'package:sidekick/providers/shell_provider.dart';
 
-class TerminalCmd {
+class ProcessCmd {
   final List<String> args;
   final String execPath;
   final String workingDirectory;
   final SendPort sendPort;
-  TerminalCmd({
+  ProcessCmd({
     this.args,
     this.execPath,
     this.workingDirectory,
     this.sendPort,
   });
 }
 
-Future<void> isolateProcess(TerminalCmd cmd) async {
+Future<void> isolateProcess(ProcessCmd cmd) async {
   try {
     final process = await Process.start(
       cmd.execPath,

macos/Runner/AppDelegate.swift

@@ -6,4 +6,11 @@ class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true
   }
+
+  // TODO: Added this due to the following issue
+  // https://github.com/tekartik/process_run.dart/issues/36#issuecomment-770226249
+  // Once this is addressed it can be removed
+   override func applicationDidBecomeActive(_ notification: Notification) {
+        signal(SIGPIPE, SIG_IGN) //Ignore signal
+  }
 }