@_nazmiforreal/flutter-ota 0.1.2 → 0.1.3

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

@@ -2,10 +2,11 @@ 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 'package:postgres/postgres.dart';
 
-import '../cli_base.dart';
+import '../ui/ui.dart';
 
 /// `flutter_patcher migrate` — run backend SQL migrations.
 class MigrateCommand extends Command<int> {
@@ -63,6 +64,7 @@ class MigrateCommand extends Command<int> {
         }
 
         if (argResults!['dry-run'] as bool) {
+          banner('migrate · dry-run');
           for (final f in files) {
             stdout.writeln('--- ${p.basename(f.path)} ---');
             stdout.writeln(f.readAsStringSync());
@@ -73,11 +75,14 @@ class MigrateCommand extends Command<int> {
         final url = argResults!['database-url'] as String? ??
             Platform.environment['DATABASE_URL'];
         if (provider == 'cloudflare' || provider == 'aws') {
-          stdout.writeln(
-            'Migrations for "$provider" are applied via its platform tooling '
-            '(e.g. `wrangler d1 execute` for cloudflare, or the AWS console for '
-            'S3/DynamoDB). The SQL above shows the intended schema.',
-          );
+          banner('migrate');
+          box('migrate', [
+            'Migrations for "$provider" are applied via its platform tooling:',
+            '  • cloudflare → `wrangler d1 execute`',
+            '  • aws         → AWS console (S3/DynamoDB)',
+            '',
+            'The SQL files under ${dir} show the intended schema.',
+          ]);
           return;
         }
         if (url == null || url.isEmpty) {
@@ -94,6 +99,7 @@ class MigrateCommand extends Command<int> {
               ? uri.userInfo.split(':').last
               : null,
         );
+        banner('migrate');
         final conn = await Connection.open(
           endpoint,
           settings: ConnectionSettings(sslMode: SslMode.disable),
@@ -112,7 +118,7 @@ class MigrateCommand extends Command<int> {
               queryMode: QueryMode.simple,
             );
             if (existing.isNotEmpty) {
-              stdout.writeln('skip    $name (already applied)');
+              stdout.writeln('  ${dim('skip')}    $name (already applied)');
               continue;
             }
             final statements = _splitStatements(file.readAsStringSync());
@@ -123,7 +129,7 @@ class MigrateCommand extends Command<int> {
               "INSERT INTO _flutter_patcher_migrations(name) VALUES ('$escaped')",
               queryMode: QueryMode.simple,
             );
-            stdout.writeln('applied $name');
+            step('applied $name');
           }
         } finally {
           await conn.close();

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

@@ -1,14 +1,11 @@
-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:flutter_patcher_core/flutter_patcher_core.dart';
 
-import '../backend.dart';
-import '../cli_base.dart';
-import '../config.dart';
-import '../operations.dart';
+import '../ui/ui.dart';
 
-/// `flutter_patcher rollback` — disable the latest enabled bundle on a channel.
+/// `flutter_patcher rollback` — roll a channel back to a previous bundle.
 class RollbackCommand extends Command<int> {
   RollbackCommand({this.config, this.backendOverride});
 
@@ -20,22 +17,50 @@ class RollbackCommand extends Command<int> {
 
   @override
   String get description =>
-      'Disable the latest enabled bundle on a channel (roll back).';
+      'Roll a channel back: disable the latest enabled bundle (or a specific --bundle-id).';
 
   @override
   ArgParser get argParser => ArgParser()
     ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption('channel', abbr: 'c', help: 'Channel to roll back.');
+    ..addOption('channel', abbr: 'c', help: 'Channel to roll back.')
+    ..addOption('bundle-id', help: 'Roll back to this specific bundle id.')
+    ..addOption('platform', abbr: 'p', help: 'Platform filter (e.g. android).');
 
   @override
   Future<int> run() => runGuarded(() async {
         final channel = argResults!['channel'] as String?;
         if (channel == null || channel.isEmpty) {
-          throw StateError('Usage: flutter_patcher rollback --channel <channel>');
+          throw PackException(
+            'Usage: flutter_patcher rollback --channel <channel> [--bundle-id <id>]',
+            64,
+          );
         }
+        final bundleId = argResults!['bundle-id'] as String?;
+        final platformRaw = argResults!['platform'] as String?;
+        final platform =
+            platformRaw == null ? null : Platform.fromValue(platformRaw);
+
         final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
         final backend = requireBackend(cfg, override: backendOverride);
-        final id = await rollbackChannel(backend, channel);
-        stdout.writeln('Rolled back channel "$channel" (disabled bundle $id)');
+
+        banner('rollback');
+        final (disabled, live) = await spinner(
+          () async {
+            if (bundleId != null && bundleId.isNotEmpty) {
+              return rollbackToBundle(backend, channel, bundleId,
+                  platform: platform);
+            }
+            final id = await rollbackChannel(backend, channel);
+            final nowLive = (await getChannel(backend, channel))?.id ?? '';
+            return (<String>[id], nowLive);
+          },
+          'Rolling back channel "$channel"',
+          done: 'Rolled back',
+        );
+        box('rollback', [
+          kv('channel', channel),
+          kv('now live', cyan(live)),
+          kv('disabled', disabled.isEmpty ? dim('(none)') : disabled.join(', ')),
+        ]);
       });
 }

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

@@ -193,6 +193,51 @@ Future<String> rollbackChannel(Backend backend, String channel) async {
   return target.id;
 }
 
+/// Roll back a channel to a specific [targetBundleId]: disable every enabled
+/// bundle newer than it (by creation order) and ensure the target is enabled.
+///
+/// Returns `(disabledBundleIds, liveBundleId)`.
+Future<(List<String>, String)> rollbackToBundle(
+  Backend backend,
+  String channel,
+  String targetBundleId, {
+  Platform? platform,
+}) async {
+  final res = await backend.db.getBundles(
+    DatabaseBundleQueryOptions(
+      where: DatabaseBundleQueryWhere(channel: channel, platform: platform),
+      orderBy: const DatabaseBundleQueryOrder(direction: 'desc'),
+      limit: 100,
+    ),
+  );
+  final bundles = res.data;
+  Bundle? target;
+  for (final b in bundles) {
+    if (b.id == targetBundleId) {
+      target = b;
+      break;
+    }
+  }
+  if (target == null) {
+    throw StateError(
+      'Bundle "$targetBundleId" not found on channel "$channel".',
+    );
+  }
+  final targetIndex = bundles.indexOf(target);
+  final disabled = <String>[];
+  for (var i = 0; i < targetIndex; i++) {
+    if (bundles[i].enabled) {
+      disabled.add(bundles[i].id);
+      await backend.db.updateBundle(bundles[i].id, {'enabled': false});
+    }
+  }
+  if (!target.enabled) {
+    await backend.db.updateBundle(target.id, {'enabled': true});
+  }
+  await backend.db.commitBundle();
+  return (disabled, target.id);
+}
+
 /// List channels configured on the backend.
 Future<List<String>> listChannels(Backend backend) => backend.db.getChannels();
 

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

@@ -42,6 +42,7 @@ Future<PackResult> packPatch({
   String? abi,
   List<String> requestedAssets = const [],
   required String out,
+  void Function(int done, int total, String label)? onProgress,
 }) async {
   final apkFile = File(apkPath);
   if (!apkFile.existsSync()) {
@@ -72,6 +73,7 @@ Future<PackResult> packPatch({
     version: version,
     targetVersionCode: targetVersionCode,
     requestedAssets: requestedAssets,
+    onProgress: onProgress,
   );
   return result;
 }
@@ -83,6 +85,7 @@ PackResult _writePatchPackage({
   required String version,
   required int targetVersionCode,
   required List<String> requestedAssets,
+  void Function(int done, int total, String label)? onProgress,
 }) {
   final patchFiles = <String, _PatchAssetFile>{};
   final operations = <Map<String, dynamic>>[];
@@ -169,9 +172,14 @@ PackResult _writePatchPackage({
 
   final package = Archive()
     ..addFile(_jsonArchiveFile('manifest.json', zipManifest));
+  final progressTotal = libs.length + 1;
+  onProgress?.call(0, progressTotal, 'libapp.so');
+  var progressDone = 0;
   for (final (currentAbi, soBytes) in libs) {
     package.addFile(
         ArchiveFile('lib/$currentAbi/libapp.so', soBytes.length, soBytes));
+    progressDone++;
+    onProgress?.call(progressDone, progressTotal, 'lib/$currentAbi/libapp.so');
   }
 
   if (requestedAssets.isNotEmpty) {
@@ -194,6 +202,7 @@ PackResult _writePatchPackage({
   final List<int> packageBytes = ZipEncoder().encode(package) ?? const <int>[];
   final outZip = File('${outDir.path}/patch.zip');
   outZip.writeAsBytesSync(packageBytes);
+  onProgress?.call(progressTotal, progressTotal, 'patch.zip');
 
   final payloadMd5 = md5.convert(packageBytes).toString();
   final outerManifest = <String, dynamic>{

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

@@ -0,0 +1,234 @@
+library;
+
+import 'dart:async';
+import 'dart:io';
+import 'dart:math' as math;
+
+/// Terminal UI toolkit for the flutter_patcher CLI: colored text, banners,
+/// bordered boxes, step logs, dynamic spinners and progress bars.
+///
+/// Everything degrades gracefully to plain text when stdout is not a TTY or the
+/// `NO_COLOR` env var is set, so pipes/CI/tests stay clean. Boxes auto-size to
+/// the terminal width and wrap long content so they never render broken.
+
+const _kReset = '\x1b[0m';
+const _kRed = '\x1b[31m';
+const _kGreen = '\x1b[32m';
+const _kYellow = '\x1b[33m';
+const _kBlue = '\x1b[34m';
+const _kMagenta = '\x1b[35m';
+const _kCyan = '\x1b[36m';
+const _kGray = '\x1b[90m';
+const _kBold = '\x1b[1m';
+
+const List<String> _frames = [
+  '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏',
+];
+
+bool get _noColor {
+  final v = Platform.environment['NO_COLOR'];
+  return v != null && v.isNotEmpty;
+}
+
+bool get _colorOn =>
+    !_noColor && stdout.hasTerminal && stdout.supportsAnsiEscapes;
+
+String _c(String code, String s) => _colorOn ? '$code$s$_kReset' : s;
+
+String red(String s) => _c(_kRed, s);
+String green(String s) => _c(_kGreen, s);
+String yellow(String s) => _c(_kYellow, s);
+String blue(String s) => _c(_kBlue, s);
+String magenta(String s) => _c(_kMagenta, s);
+String cyan(String s) => _c(_kCyan, s);
+String gray(String s) => _c(_kGray, s);
+String dim(String s) => _c(_kGray, s);
+String bold(String s) => _c(_kBold, s);
+
+int get _cols => stdout.hasTerminal ? stdout.terminalColumns : 80;
+
+final _ansi = RegExp('\x1b\\[[0-9;]*m');
+
+int _dispWidth(String s) => s.replaceAll(_ansi, '').length;
+
+void _echo(String s) => stdout.writeln(s);
+
+/// `key  value` laid out in a fixed 18-char column (visible-width aware).
+String kv(String k, String v) {
+  final pad = math.max(0, 18 - _dispWidth(k));
+  return '${dim(k)}${' ' * pad}  $v';
+}
+
+void banner(String name) {
+  _echo('');
+  _echo('  ${cyan('▶')} ${cyan(bold('flutter_patcher'))} ${dim('·')} ${bold(name)}');
+  _echo('  ${dim('─' * math.min(_cols - 4, 60))}');
+}
+
+void step(String msg) => _echo('  ${green('✓')} $msg');
+
+void err(String msg) =>
+    _echo('  ${red('✗')} ${red(msg)}');
+
+/// Run [task] while showing a live spinner; replaces the line with a
+/// `${green('✓')} done` summary when finished (or `✗` on error).
+Future<T> spinner<T>(
+  Future<T> Function() task,
+  String label, {
+  String? done,
+}) async {
+  if (!_colorOn) {
+    _echo('  ${dim('•')} $label');
+    final r = await task();
+    _echo('  ${green('✓')} ${done ?? label}');
+    return r;
+  }
+  var i = 0;
+  final timer = Timer.periodic(const Duration(milliseconds: 80), (_) {
+    i = (i + 1) % _frames.length;
+    stdout.write('\r\x1b[K  ${cyan(_frames[i])} $label');
+  });
+  try {
+    final r = await task();
+    timer.cancel();
+    stdout.write('\r\x1b[K  ${green('✓')} ${done ?? label}\n');
+    return r;
+  } catch (e) {
+    timer.cancel();
+    stdout.write('\r\x1b[K  ${red('✗')} $label\n');
+    rethrow;
+  }
+}
+
+List<String> _wrap(String text, int inner) {
+  if (text.isEmpty) return [''];
+  final result = <String>[];
+  for (final raw in text.split('\n')) {
+    if (_dispWidth(raw) <= inner) {
+      result.add(raw);
+      continue;
+    }
+    var line = '';
+    for (final word in raw.split(' ')) {
+      if (word.isEmpty) continue;
+      if (line.isEmpty) {
+        if (_dispWidth(word) <= inner) {
+          line = word;
+        } else {
+          var rem = word;
+          while (_dispWidth(rem) > inner) {
+            final cut = _cut(rem, inner);
+            result.add(cut);
+            rem = rem.substring(cut.length);
+          }
+          line = rem;
+        }
+      } else if (_dispWidth(line) + 1 + _dispWidth(word) <= inner) {
+        line += ' $word';
+      } else {
+        result.add(line);
+        line = word.length <= inner
+            ? word
+            : _splitLong(word, inner, result);
+      }
+    }
+    result.add(line);
+  }
+  return result;
+}
+
+String _cut(String s, int inner) {
+  final buf = StringBuffer();
+  for (final ch in s.runes) {
+    if (buf.length + 1 > inner) break;
+    buf.writeCharCode(ch);
+  }
+  return buf.toString();
+}
+
+String _splitLong(String word, int inner, List<String> out) {
+  var rem = word;
+  while (_dispWidth(rem) > inner) {
+    final cut = _cut(rem, inner);
+    out.add(cut);
+    rem = rem.substring(cut.length);
+  }
+  return rem;
+}
+
+int _boxWidth(List<String> lines, String title) {
+  var longest = _dispWidth(title) + 4;
+  for (final l in lines) {
+    for (final w in l.split('\n')) {
+      longest = math.max(longest, _dispWidth(w));
+    }
+  }
+  final target = math.max(longest + 4, 40);
+  return math.max(math.min(_cols - 1, target), 20);
+}
+
+/// Bordered box with a centered title; auto-sizes to the terminal and wraps
+/// long content so the right/left edges always stay aligned.
+void box(String title, List<String> lines) {
+  final width = _boxWidth(lines, title);
+  final inner = width - 4;
+  final wrapped = <String>[];
+  for (final l in lines) wrapped.addAll(_wrap(l, inner));
+
+  final titleText = ' $title ';
+  final tVisible = _dispWidth(titleText);
+  var dashes = math.max(2, width - 2 - tVisible);
+  final left = math.max(1, dashes ~/ 2);
+  final right = dashes - left;
+  final top =
+      '╭${'─' * left}$titleText${'─' * right}╮';
+  _echo(top);
+  for (final l in wrapped) {
+    final pad = math.max(0, inner - _dispWidth(l));
+    _echo('│ $l${' ' * pad} │');
+  }
+  _echo('╰${'─' * (width - 2)}╯');
+}
+
+/// Live progress bar with an animated spinner prefix. Call [update] as work
+/// progresses; it renders a `[████░░] 45%` bar that overwrites the same line.
+class ProgressBar {
+  ProgressBar(this.total, this.label);
+
+  int total;
+  final String label;
+  int _current = 0;
+  int _spin = 0;
+  bool _closed = false;
+
+  void update(int current, [String? label]) {
+    _current = current;
+    if (label != null) _label = label;
+    _draw();
+    if (total > 0 && _current >= total) _finish();
+  }
+
+  late String _label = label;
+
+  void _draw() {
+    if (_closed) return;
+    if (!_colorOn) {
+      _echo('  $_label: $_current/$total');
+      return;
+    }
+    const barW = 28;
+    final pct = total > 0 ? (_current / total).clamp(0.0, 1.0) : 1.0;
+    final filled = (barW * pct).round();
+    final bar =
+        '${green('█' * filled)}${gray('·' * (barW - filled))}';
+    _spin = (_spin + 1) % _frames.length;
+    final pctStr = '${(pct * 100).round()}%'.padLeft(4);
+    stdout.write('\r\x1b[K  ${cyan(_frames[_spin])} $_label  [$bar] $pctStr');
+  }
+
+  void _finish() {
+    if (_closed) return;
+    _closed = true;
+    if (_colorOn) stdout.write('\n');
+  }
+}