chore(cli): Minor fixes (#331)

- Fix control character handling on secret input
- Make repos into extension types
- Ensure cloud commands are try/catch'd

Author: dnys1

apps/cli/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.11-wip
+
+- fix: Handle control characters when prompting for secrets
+- 
+
 ## 1.0.10
 
 - feat: Add templates to `celest init`

apps/cli/lib/src/frontend/celest_frontend.dart

@@ -672,8 +672,8 @@ final class CelestFrontend {
   /// Deploys the current project to Celest Cloud.
   Future<int> deploy({required bool migrateProject}) async {
     Progress? currentProgress;
-    var projectId = await _loadProjectId();
     try {
+      var projectId = await _loadProjectId();
       while (!stopped) {
         if (projectId != null) {
           currentProgress ??= cliLogger.progress('🔥 Warming up the engines');

apps/cli/lib/src/logging/cli_logger.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:celest_cli/src/context.dart';
+import 'package:celest_cli/src/exceptions.dart';
 import 'package:cli_util/cli_logging.dart' as cli_logging;
 import 'package:dart_console/dart_console.dart';
 import 'package:mason_logger/mason_logger.dart' as mason_logger;
@@ -192,33 +193,41 @@ class CliLogger implements mason_logger.Logger {
   }
 
   String _readLineHiddenSync() {
-    const lineFeed = '\n';
-    const carriageReturn = '\r';
-    final value = <String>[];
-
     try {
       stdin
         ..echoMode = false
         ..lineMode = false;
-      Key key;
-      String char;
-      do {
-        key = console.readKey();
-        char = key.char;
-        if (char != lineFeed && char != carriageReturn) {
-          final shouldDelete = key.isControl &&
-              key.controlChar == ControlCharacter.delete &&
-              value.isNotEmpty;
-          shouldDelete ? value.removeLast() : value.add(char);
+
+      final value = <String>[];
+      while (true) {
+        final key = console.readKey();
+        final char = key.char;
+        if (key.isControl) {
+          switch (key.controlChar) {
+            case ControlCharacter.backspace:
+              if (value.isNotEmpty) {
+                value.removeLast();
+                stdout.write('\b \b');
+              }
+            case ControlCharacter.enter:
+              return value.join();
+            case ControlCharacter.escape:
+              return '';
+            case ControlCharacter.ctrlC || ControlCharacter.ctrlD:
+              throw const CancellationException('Cancelled input');
+            default:
+              break;
+          }
+        } else {
+          stdout.write('*');
+          value.add(char);
         }
-      } while (char != lineFeed && char != carriageReturn);
+      }
     } finally {
       stdin
         ..lineMode = true
         ..echoMode = true;
     }
-    stdout.writeln();
-    return value.join();
   }
 }
 

apps/cli/lib/src/repositories/organization_repository.dart

@@ -1,11 +1,7 @@
 import 'package:celest_cloud/celest_cloud.dart' as cloud;
 import 'package:logging/logging.dart';
 
-final class OrganizationRepository {
-  OrganizationRepository(this._cloud);
-
-  final cloud.CelestCloud _cloud;
-
+extension type OrganizationRepository(cloud.CelestCloud _cloud) {
   static final _logger = Logger('OrganizationRepository');
 
   Future<cloud.Organization?> get(String organizationIdOrAlias) async {

apps/cli/lib/src/repositories/project_environment_repository.dart

@@ -1,11 +1,7 @@
 import 'package:celest_cloud/celest_cloud.dart' as cloud;
 import 'package:logging/logging.dart';
 
-final class ProjectEnvironmentRepository {
-  ProjectEnvironmentRepository(this._cloud);
-
-  final cloud.CelestCloud _cloud;
-
+extension type ProjectEnvironmentRepository(cloud.CelestCloud _cloud) {
   static final _logger = Logger('ProjectEnvironmentRepository');
 
   Future<cloud.ProjectEnvironment?> get(

apps/cli/lib/src/repositories/project_repository.dart

@@ -2,10 +2,7 @@ import 'package:celest_cli/src/repositories/organization_repository.dart';
 import 'package:celest_cloud/celest_cloud.dart' as cloud;
 import 'package:logging/logging.dart';
 
-final class ProjectRepository {
-  ProjectRepository(this._cloud);
-
-  final cloud.CelestCloud _cloud;
+extension type ProjectRepository(cloud.CelestCloud _cloud) {
   OrganizationRepository get _organizations => OrganizationRepository(_cloud);
 
   static final _logger = Logger('ProjectRepository');
@@ -18,9 +15,15 @@ final class ProjectRepository {
         _logger.finest('No primary organization found');
         return null;
       }
+      _logger.finest('Primary organization: ${organization.name}');
       final cloudPrj = await _cloud.projects.get(
         '${organization.name}/projects/$projectIdOrAlias',
       );
+      if (cloudPrj == null) {
+        _logger.finest('Project not found in cloud: $projectIdOrAlias');
+        return null;
+      }
+      _logger.finest('Project found in cloud: ${cloudPrj.name}');
       return cloudPrj;
     } on Object catch (e, st) {
       _logger.fine('Failed to fetch project from cloud.', e, st);