@_nazmiforreal/flutter-ota 0.1.2 → 0.1.4

package/dart-src/packages/cli-tools/lib/src/cli_base.dart

@@ -1,11 +1,9 @@
-import 'dart:io';
-
 import 'package:args/args.dart';
 
 import 'backend.dart';
 import 'config.dart';
-
-/// Run [body], mapping errors to a non-zero exit code with a clean message.
+import 'pack.dart';
+import 'ui/ui.dart';
 
 /// Run [body], mapping errors to a non-zero exit code with a clean message.
 Future<int> runGuarded(Future<void> Function() body) async {
@@ -13,10 +11,13 @@ Future<int> runGuarded(Future<void> Function() body) async {
     await body();
     return 0;
   } on StateError catch (e) {
-    stderr.writeln('error: ${e.message}');
+    err(e.message);
     return 1;
+  } on PackException catch (e) {
+    err(e.message);
+    return e.exitCode;
   } catch (e) {
-    stderr.writeln('error: $e');
+    err(e.toString());
     return 1;
   }
 }

package/dart-src/packages/cli-tools/lib/src/commands/build.dart

@@ -1,8 +1,8 @@
-import 'dart:io';
-
 import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
+import '../ui/ui.dart';
+
 /// `flutter_patcher build` — package a release APK into a device-compatible
 /// OTA patch (`dist/patch.zip`) that the `deploy` command can publish.
 ///
@@ -48,52 +48,49 @@ class BuildCommand extends Command<int> {
       'Build a device-compatible OTA patch (patch.zip) from a release APK.';
 
   @override
-  Future<int> run() async {
-    final results = argResults!;
-    final apk = results['apk'] as String?;
-    if (apk == null || apk.isEmpty) {
-      stderr.writeln('error: missing required --apk <path>');
-      return 64;
-    }
-    final version = results['version'] as String?;
-    if (version == null || version.isEmpty) {
-      stderr.writeln('error: missing required --version <string>');
-      return 64;
-    }
-    final targetVersionCodeRaw = results['target-version-code'] as String?;
-    if (targetVersionCodeRaw == null || targetVersionCodeRaw.isEmpty) {
-      stderr.writeln('error: missing required --target-version-code <int>');
-      return 64;
-    }
-    final targetVersionCode = int.tryParse(targetVersionCodeRaw);
-    if (targetVersionCode == null) {
-      stderr.writeln('error: --target-version-code must be an integer');
-      return 64;
-    }
+  Future<int> run() => runGuarded(() async {
+        final results = argResults!;
+        final apk = results['apk'] as String?;
+        if (apk == null || apk.isEmpty) {
+          throw PackException('missing required --apk <path>', 64);
+        }
+        final version = results['version'] as String?;
+        if (version == null || version.isEmpty) {
+          throw PackException('missing required --version <string>', 64);
+        }
+        final targetVersionCodeRaw = results['target-version-code'] as String?;
+        if (targetVersionCodeRaw == null || targetVersionCodeRaw.isEmpty) {
+          throw PackException('missing required --target-version-code <int>', 64);
+        }
+        final targetVersionCode = int.tryParse(targetVersionCodeRaw);
+        if (targetVersionCode == null) {
+          throw PackException('--target-version-code must be an integer', 64);
+        }
 
-    try {
-      final result = await packPatch(
-        apkPath: apk,
-        version: version,
-        targetVersionCode: targetVersionCode,
-        abi: results['abi'] as String?,
-        requestedAssets: results['assets'] as List<String>,
-        out: results['out'] as String,
-      );
-      stdout.writeln('[build] version: ${result.version}');
-      stdout.writeln('[build] targetVersionCode: ${result.targetVersionCode}');
-      stdout.writeln('[build] abis: ${result.abis.join(', ')}');
-      stdout.writeln('[build] bundle md5: ${result.md5}');
-      stdout.writeln('[build] overlay assets: ${result.assetCount}');
-      stdout.writeln('[build] payload: ${result.payloadPath}');
-      stdout.writeln('[build] manifest: ${result.manifestPath}');
-      return 0;
-    } on PackException catch (e) {
-      stderr.writeln('error: ${e.message}');
-      return e.exitCode;
-    } on Object catch (e) {
-      stderr.writeln('error: $e');
-      return 1;
-    }
-  }
+        banner('build');
+        final bar = ProgressBar(1, 'pack');
+        final result = await packPatch(
+          apkPath: apk,
+          version: version,
+          targetVersionCode: targetVersionCode,
+          abi: results['abi'] as String?,
+          requestedAssets: results['assets'] as List<String>,
+          out: results['out'] as String,
+          onProgress: (done, total, label) {
+            bar.total = total;
+            bar.update(done, label);
+          },
+        );
+
+        box('patch.zip', [
+          kv('version', result.version),
+          kv('target code', result.targetVersionCode.toString()),
+          kv('abis', cyan(result.abis.join('  ·  '))),
+          kv('bundle md5', gray(result.md5)),
+          kv('overlay assets', result.assetCount.toString()),
+          kv('payload', result.payloadPath),
+          kv('manifest', result.manifestPath),
+        ]);
+        step('Build complete — ready to deploy.');
+      });
 }

package/dart-src/packages/cli-tools/lib/src/commands/bundle.dart

@@ -1,12 +1,8 @@
-import 'dart:io';
-
 import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
+import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
-import '../backend.dart';
-import '../cli_base.dart';
-import '../config.dart';
-import '../operations.dart';
+import '../ui/ui.dart';
 
 /// `flutter_patcher bundle` — manage bundles.
 class BundleCommand extends Command<int> {
@@ -69,20 +65,32 @@ class BundleListCommand extends Command<int> {
             limit: int.parse(argResults!['limit'] as String),
           ),
         );
+        banner('bundle · list');
         if (res.data.isEmpty) {
-          stdout.writeln('(no bundles)');
+          step('(no bundles)');
           return;
         }
-        stdout.writeln('id                                   channel      '
-            'enabled platform target');
-        for (final b in res.data) {
-          final target = b.targetAppVersion ?? b.fingerprintHash ?? '-';
-          stdout.writeln('${b.id}  ${b.channel.padRight(12)}  '
-              '${(b.enabled ? 'yes' : 'no').padRight(7)} '
-              '${b.platform.value.padRight(7)} $target');
+        final lines = <String>[];
+        for (var i = 0; i < res.data.length; i++) {
+          final b = res.data[i];
+          final target = b.targetAppVersion ?? b.fingerprintHash ?? dim('-');
+          lines
+            ..add(kv('#$i', cyan(b.id)))
+            ..add(kv('channel', b.channel))
+            ..add(kv(
+              'enabled',
+              b.enabled ? green('yes') : yellow('no'),
+            ))
+            ..add(kv('platform', b.platform.value))
+            ..add(kv('target', target));
+          if (b.message != null) lines.add(kv('message', b.message!));
+          if (b.metadata?.signature != null) {
+            lines.add(kv('signature', green('✓ signed')));
+          }
+          lines.add('');
         }
-        stdout.writeln('');
-        stdout.writeln('total: ${res.pagination.total}');
+        box('${res.data.length} bundles', lines);
+        step('total: ${res.pagination.total}');
       });
 }
 
@@ -107,12 +115,16 @@ class BundleDeleteCommand extends Command<int> {
   Future<int> run() => runGuarded(() async {
         final id = argResults!['id'] as String?;
         if (id == null || id.isEmpty) {
-          throw StateError('Usage: flutter_patcher bundle delete <id>');
+          throw PackException('Usage: flutter_patcher bundle delete --id <id>', 64);
         }
         final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
         final backend = requireBackend(cfg, override: backendOverride);
-        await deleteBundle(backend, id);
-        stdout.writeln('Deleted bundle $id');
+        banner('bundle · delete');
+        await spinner(
+          () => deleteBundle(backend, id),
+          'Deleting bundle $id',
+          done: 'Deleted',
+        );
       });
 }
 
@@ -139,13 +151,22 @@ class BundlePromoteCommand extends Command<int> {
         final id = argResults!['id'] as String?;
         final channel = argResults!['channel'] as String?;
         if (id == null || id.isEmpty || channel == null || channel.isEmpty) {
-          throw StateError(
-            'Usage: flutter_patcher bundle promote <id> --channel <channel>',
+          throw PackException(
+            'Usage: flutter_patcher bundle promote --id <id> --channel <channel>',
+            64,
           );
         }
         final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
         final backend = requireBackend(cfg, override: backendOverride);
-        await promoteBundle(backend, id, channel);
-        stdout.writeln('Promoted bundle $id to channel $channel');
+        banner('bundle · promote');
+        await spinner(
+          () => promoteBundle(backend, id, channel),
+          'Promoting $id to $channel',
+          done: 'Promoted',
+        );
+        box('promote', [
+          kv('bundle', cyan(id)),
+          kv('channel', channel),
+        ]);
       });
 }

package/dart-src/packages/cli-tools/lib/src/commands/channel.dart

@@ -1,12 +1,8 @@
-import 'dart:io';
-
 import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
+import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
-import '../backend.dart';
-import '../cli_base.dart';
-import '../config.dart';
-import '../operations.dart';
+import '../ui/ui.dart';
 
 /// `flutter_patcher channel` — manage channels.
 class ChannelCommand extends Command<int> {
@@ -56,14 +52,13 @@ class ChannelListCommand extends Command<int> {
   Future<int> run() => runGuarded(() async {
         final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
         final backend = requireBackend(cfg, override: backendOverride);
+        banner('channel · list');
         final channels = await listChannels(backend);
         if (channels.isEmpty) {
-          stdout.writeln('(no channels)');
+          step('(no channels)');
           return;
         }
-        for (final c in channels) {
-          stdout.writeln('  $c');
-        }
+        box('${channels.length} channels', channels.map((c) => '  $c').toList());
       });
 }
 
@@ -88,17 +83,23 @@ class ChannelGetCommand extends Command<int> {
   Future<int> run() => runGuarded(() async {
         final channel = argResults!['channel'] as String?;
         if (channel == null || channel.isEmpty) {
-          throw StateError('Usage: flutter_patcher channel get <channel>');
+          throw PackException('Usage: flutter_patcher channel get --channel <channel>', 64);
         }
         final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
         final backend = requireBackend(cfg, override: backendOverride);
+        banner('channel · get');
         final bundle = await getChannel(backend, channel);
         if (bundle == null) {
-          stdout.writeln('(no live bundle on channel "$channel")');
+          err('no live bundle on channel "$channel"');
           return;
         }
-        stdout.writeln('channel "$channel" -> bundle ${bundle.id} '
-            '(${bundle.platform.value})');
+        box('channel "$channel"', [
+          kv('live bundle', cyan(bundle.id)),
+          kv('platform', bundle.platform.value),
+          kv('enabled', bundle.enabled ? green('yes') : yellow('no')),
+          kv('target', bundle.targetAppVersion ?? bundle.fingerprintHash ?? dim('-')),
+          if (bundle.message != null) kv('message', bundle.message!),
+        ]);
       });
 }
 
@@ -128,13 +129,22 @@ class ChannelSetCommand extends Command<int> {
             channel.isEmpty ||
             bundleId == null ||
             bundleId.isEmpty) {
-          throw StateError(
+          throw PackException(
             'Usage: flutter_patcher channel set --channel <c> --bundle-id <id>',
+            64,
           );
         }
         final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
         final backend = requireBackend(cfg, override: backendOverride);
-        await promoteBundle(backend, bundleId, channel);
-        stdout.writeln('Channel "$channel" -> bundle $bundleId');
+        banner('channel · set');
+        await spinner(
+          () => promoteBundle(backend, bundleId, channel),
+          'Promoting $bundleId to $channel',
+          done: 'Channel set',
+        );
+        box('channel set', [
+          kv('channel', channel),
+          kv('bundle', cyan(bundleId)),
+        ]);
       });
 }

package/dart-src/packages/cli-tools/lib/src/commands/console.dart

@@ -2,9 +2,10 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
+import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 import 'package:path/path.dart' as p;
 
-import '../cli_base.dart';
+import '../ui/ui.dart';
 
 /// `flutter_patcher console` — open the web console.
 class ConsoleCommand extends Command<int> {
@@ -33,11 +34,11 @@ class ConsoleCommand extends Command<int> {
   Future<int> run() => runGuarded(() async {
         final consoleDir = _findConsoleDir();
         if (consoleDir == null) {
-          stdout.writeln('Console package not found (expected packages/console).');
+          err('Console package not found (expected packages/console).');
           return;
         }
         if (argResults!['open'] as bool) {
-          stdout.writeln('Launching console...');
+          step('Launching console...');
           final process = await Process.start(
             'flutter',
             ['run', '-d', 'chrome'],
@@ -48,8 +49,12 @@ class ConsoleCommand extends Command<int> {
           exitCode = await process.exitCode;
           return;
         }
-        stdout.writeln('flutter_patcher web console:');
-        stdout.writeln('  cd ${consoleDir.path}');
-        stdout.writeln('  flutter run -d chrome');
+        banner('console');
+        box('flutter_patcher console', [
+          'Open the web console with Flutter:',
+          '',
+          kv('dir', consoleDir.path),
+          kv('run', 'flutter run -d chrome'),
+        ]);
       });
 }

package/dart-src/packages/cli-tools/lib/src/commands/deploy.dart

@@ -7,6 +7,7 @@ import '../backend.dart';
 import '../cli_base.dart';
 import '../config.dart';
 import '../operations.dart';
+import '../ui/ui.dart';
 import '../util.dart';
 
 /// `flutter_patcher deploy` — zip + upload + register a new bundle.
@@ -60,36 +61,52 @@ class DeployCommand extends Command<int> {
             argResults!['git-commit-hash'] as String? ?? await gitCommitHash(source);
         final bundleId = argResults!['bundle-id'] as String?;
 
-        final bundle = await deployBundle(
-          backend,
-          DeployOptions(
-            source: source,
-            channel: channel,
-            platform: platform,
-            message: message,
-            force: force,
-            targetAppVersion: targetAppVersion,
-            fingerprintHash: fingerprintHash,
-            signingKeyBase64: signingKey,
-            gitCommitHash: resolvedGitCommitHash,
-            bundleId: bundleId,
+        banner('deploy');
+        stdout.writeln(
+          '${gray('channel')}  ${cyan(channel)}   '
+          '${gray('platform')}  ${cyan(platform)}   '
+          '${gray('source')}  ${dim(source)}',
+        );
+        final bundle = await spinner(
+          () => deployBundle(
+            backend,
+            DeployOptions(
+              source: source,
+              channel: channel,
+              platform: platform,
+              message: message,
+              force: force,
+              targetAppVersion: targetAppVersion,
+              fingerprintHash: fingerprintHash,
+              signingKeyBase64: signingKey,
+              gitCommitHash: resolvedGitCommitHash,
+              bundleId: bundleId,
+            ),
           ),
+          'Uploading & registering bundle',
+          done: 'Bundle deployed',
         );
 
-        stdout.writeln('Deployed bundle ${bundle.id}');
-        stdout.writeln('  channel:    ${bundle.channel}');
-        stdout.writeln('  platform:   ${bundle.platform.value}');
-        stdout.writeln('  enabled:    ${bundle.enabled}');
-        stdout.writeln('  storageUri: ${bundle.storageUri}');
+        final lines = <String>[
+          kv('bundle id', cyan(bundle.id)),
+          kv('channel', bundle.channel),
+          kv('platform', bundle.platform.value),
+          kv('enabled', bundle.enabled ? green('true') : yellow('false')),
+          kv('storage uri', gray(bundle.storageUri)),
+        ];
         if (bundle.targetAppVersion != null) {
-          stdout.writeln('  targetAppVersion: ${bundle.targetAppVersion}');
+          lines.add(kv('target app', bundle.targetAppVersion!));
         }
         if (bundle.fingerprintHash != null) {
-          stdout.writeln('  fingerprintHash: ${bundle.fingerprintHash}');
+          lines.add(kv('fingerprint', bundle.fingerprintHash!));
         }
         if (bundle.gitCommitHash != null) {
-          stdout.writeln('  gitCommitHash:   ${bundle.gitCommitHash}');
+          lines.add(kv('git commit', bundle.gitCommitHash!));
+        }
+        if (bundle.message != null) lines.add(kv('message', bundle.message!));
+        if (bundle.metadata?.signature != null) {
+          lines.add(kv('signature', dim('✓ signed')));
         }
-        if (bundle.message != null) stdout.writeln('  message:    ${bundle.message}');
+        box('deployed', lines);
       });
 }

package/dart-src/packages/cli-tools/lib/src/commands/doctor.dart

@@ -2,10 +2,9 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
+import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
-import '../backend.dart';
-import '../cli_base.dart';
-import '../config.dart';
+import '../ui/ui.dart';
 
 /// `flutter_patcher doctor` — environment + backend connectivity check.
 class DoctorCommand extends Command<int> {
@@ -18,7 +17,8 @@ class DoctorCommand extends Command<int> {
   String get name => 'doctor';
 
   @override
-  String get description => 'Diagnose the local environment and backend connection.';
+  String get description =>
+      'Diagnose the local environment and backend connection.';
 
   @override
   ArgParser get argParser => ArgParser()
@@ -26,23 +26,32 @@ class DoctorCommand extends Command<int> {
 
   @override
   Future<int> run() => runGuarded(() async {
-        stdout.writeln('flutter_patcher CLI doctor');
-        stdout.writeln('  dart:   ${Platform.version.split(' ').first}');
-        stdout.writeln('  os:     ${Platform.operatingSystem} '
-            '${Platform.operatingSystemVersion.split('\n').first}');
+        banner('doctor');
+        final lines = <String>[
+          kv('dart', Platform.version.split(' ').first),
+          kv(
+            'os',
+            '${Platform.operatingSystem} '
+            '${Platform.operatingSystemVersion.split('\n').first}',
+          ),
+        ];
         final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
         if (cfg == null) {
-          stdout.writeln('  config: not found (run `flutter_patcher init`)');
+          lines.add(kv('config', yellow('not found — run `flutter_patcher init`')));
+          box('doctor', lines);
           return;
         }
-        stdout.writeln('  config: provider=${cfg.provider} '
-            'channel=${cfg.channel} platform=${cfg.platform}');
+        lines
+          ..add(kv('provider', cfg.provider))
+          ..add(kv('channel', cfg.channel))
+          ..add(kv('platform', cfg.platform));
         try {
           final backend = requireBackend(cfg, override: backendOverride);
           final channels = await backend.db.getChannels();
-          stdout.writeln('  backend: reachable (channels: ${channels.join(', ')})');
+          lines.add(kv('backend', green('reachable — ${channels.join(', ')}')));
         } catch (e) {
-          stdout.writeln('  backend: unreachable — $e');
+          lines.add(kv('backend', red('unreachable — $e')));
         }
+        box('doctor', lines);
       });
 }