@_nazmiforreal/flutter-ota 0.1.2 → 0.1.4

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

@@ -2,12 +2,17 @@ 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 init` — scaffold a project config file.
+///
+/// Prompts (interactively, when attached to a terminal) for the credentials the
+/// **selected** backend provider needs, defaulting each field to its
+/// corresponding environment variable so CI runs can be non-interactive. The
+/// result is saved as `.flutter_patcher.json` (cwd) or the global config when
+/// `--global` is passed.
 class InitCommand extends Command<int> {
   InitCommand({this.config, this.backendOverride});
 
@@ -23,60 +28,136 @@ class InitCommand extends Command<int> {
 
   @override
   ArgParser get argParser => ArgParser()
-    ..addOption('provider', defaultsTo: 'supabase', help: 'Backend provider.')
-    ..addOption('url', help: 'Supabase project URL.')
-    ..addOption('key', help: 'Supabase service role key.')
-    ..addOption('anon-key', help: 'Supabase anon key.')
-    ..addOption('bucket', defaultsTo: 'bundles', help: 'Storage bucket.')
-    ..addOption('base-path', help: 'Storage base path.')
+    ..addOption('provider',
+        abbr: 'p', defaultsTo: 'supabase', help: 'Backend provider.')
     ..addOption('channel', defaultsTo: 'production', help: 'Default channel.')
     ..addOption('platform', defaultsTo: 'android', help: 'Default platform.')
     ..addOption('source', defaultsTo: './dist', help: 'Default deploy source.')
+    ..addFlag('global', help: 'Write to the global ~/.flutter_patcher config.')
     ..addFlag('force', abbr: 'f', help: 'Overwrite an existing config.');
 
-  String? _prompt(String label, String? current) {
+  String? _p(String label, String? current) {
     if (!stdin.hasTerminal) return current;
-    stdout.write('$label${current != null ? ' [$current]' : ''}: ');
+    final hint = current != null && current.isNotEmpty ? ' [$current]' : '';
+    stdout.write('$label$hint: ');
     final line = stdin.readLineSync();
-    return (line == null || line.trim().isEmpty) ? current : line.trim();
+    final trimmed = (line ?? '').trim();
+    return trimmed.isEmpty ? current : trimmed;
   }
 
   @override
   Future<int> run() => runGuarded(() async {
-        final file = configCandidates().first;
+        final file = argResults!['global'] as bool
+            ? configCandidates().last
+            : configCandidates().first;
         if (file.existsSync() && !(argResults!['force'] as bool)) {
-          throw StateError(
+          throw PackException(
             'Config already exists at ${file.path}. Use --force to overwrite.',
+            64,
           );
         }
 
         final provider = argResults!['provider'] as String;
-        final url = _prompt('Supabase URL', argResults!['url'] as String?);
-        final key = _prompt(
-          'Supabase service role key',
-          argResults!['key'] as String?,
-        );
-        final anonKey = argResults!['anon-key'] as String?;
-        final bucket = argResults!['bucket'] as String? ?? 'bundles';
-        final basePath = argResults!['base-path'] as String?;
         final channel = argResults!['channel'] as String? ?? 'production';
         final platform = argResults!['platform'] as String? ?? 'android';
         final source = argResults!['source'] as String? ?? './dist';
+        final env = Platform.environment;
+
+        banner('init');
+
+        late FlutterPatcherConfig cfg;
+        switch (provider) {
+          case 'postgres':
+            cfg = FlutterPatcherConfig(
+              provider: provider,
+              channel: channel,
+              platform: platform,
+              source: source,
+              supabase: const SupabaseConfigJson(),
+              postgres: PostgresConfigJson(
+                host: _p('Postgres host', env['POSTGRES_HOST']),
+                port: _p('Postgres port', env['POSTGRES_PORT'] ?? '5432'),
+                database: _p('Postgres database', env['POSTGRES_DB'] ?? 'postgres'),
+                username: _p('Postgres username', env['POSTGRES_USER']),
+                password: _p('Postgres password', env['POSTGRES_PASSWORD']),
+                sslMode: _p('Postgres sslmode', env['POSTGRES_SSLMODE']),
+                basePath: _p('Storage base path', env['POSTGRES_BASE_PATH']),
+                servingBaseUrl:
+                    _p('Serving base url', env['POSTGRES_SERVING_BASE_URL']),
+              ),
+            );
+          case 'cloudflare':
+            cfg = FlutterPatcherConfig(
+              provider: provider,
+              channel: channel,
+              platform: platform,
+              source: source,
+              supabase: const SupabaseConfigJson(),
+              cloudflare: CloudflareConfigJson(
+                accountId: _p('Cloudflare account id', env['CLOUDFLARE_ACCOUNT_ID']),
+                d1DatabaseId:
+                    _p('Cloudflare D1 database id', env['CLOUDFLARE_D1_DATABASE_ID']),
+                apiToken: _p('Cloudflare API token', env['CLOUDFLARE_API_TOKEN']),
+                r2Bucket:
+                    _p('R2 bucket', env['R2_BUCKET'] ?? 'bundles'),
+                r2AccessKeyId: _p('R2 access key id', env['R2_ACCESS_KEY_ID']),
+                r2SecretAccessKey:
+                    _p('R2 secret access key', env['R2_SECRET_ACCESS_KEY']),
+                r2BasePath: _p('R2 base path', env['R2_BASE_PATH']),
+              ),
+            );
+          case 'aws':
+            cfg = FlutterPatcherConfig(
+              provider: provider,
+              channel: channel,
+              platform: platform,
+              source: source,
+              supabase: const SupabaseConfigJson(),
+              aws: AwsConfigJson(
+                bucket: _p('AWS bucket', env['AWS_BUCKET']),
+                region: _p('AWS region', env['AWS_REGION']),
+                accessKeyId: _p('AWS access key id', env['AWS_ACCESS_KEY_ID']),
+                secretAccessKey:
+                    _p('AWS secret access key', env['AWS_SECRET_ACCESS_KEY']),
+                endpoint: _p('AWS endpoint', env['AWS_ENDPOINT']),
+                basePath: _p('AWS base path', env['AWS_BASE_PATH']),
+                sessionToken: _p('AWS session token', env['AWS_SESSION_TOKEN']),
+              ),
+            );
+          case 'standalone':
+            cfg = FlutterPatcherConfig(
+              provider: provider,
+              channel: channel,
+              platform: platform,
+              source: source,
+              supabase: const SupabaseConfigJson(),
+              standalone: StandaloneConfigJson(
+                baseUrl: _p('Standalone base url', env['STANDALONE_BASE_URL']),
+              ),
+            );
+          case 'supabase':
+          default:
+            cfg = FlutterPatcherConfig(
+              provider: 'supabase',
+              channel: channel,
+              platform: platform,
+              source: source,
+              supabase: SupabaseConfigJson(
+                url: _p('Supabase URL', env['SUPABASE_URL']),
+                serviceRoleKey:
+                    _p('Supabase service role key', env['SUPABASE_SERVICE_ROLE_KEY']),
+                anonKey: _p('Supabase anon key', env['SUPABASE_ANON_KEY']),
+                bucket: _p('Storage bucket', env['SUPABASE_BUCKET'] ?? 'bundles'),
+                basePath: _p('Storage base path', env['SUPABASE_BASE_PATH']),
+              ),
+            );
+        }
 
-        final cfg = FlutterPatcherConfig(
-          provider: provider,
-          supabase: SupabaseConfigJson(
-            url: url,
-            serviceRoleKey: key,
-            anonKey: anonKey,
-            bucket: bucket,
-            basePath: basePath,
-          ),
-          channel: channel,
-          platform: platform,
-          source: source,
+        saveConfig(cfg, global: argResults!['global'] as bool);
+        step('Wrote ${file.path}');
+        stdout.writeln(
+          '  ${yellow('⚠')} Secrets are stored in plaintext. Restrict file '
+          'permissions and use a secrets manager in production.',
         );
-        saveConfig(cfg);
-        stdout.writeln('Wrote ${file.path}');
       });
 }

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

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
@@ -8,6 +7,7 @@ import '../backend.dart';
 import '../cli_base.dart';
 import '../config.dart';
 import '../sign.dart';
+import '../ui/ui.dart';
 
 /// `flutter_patcher keys` — generate an Ed25519 keypair for bundle signing.
 class KeysCommand extends Command<int> {
@@ -29,12 +29,19 @@ class KeysCommand extends Command<int> {
 
   @override
   Future<int> run() => runGuarded(() async {
-        final (privateB64, publicB64) = await generateEd25519KeyPair();
-        stdout.writeln('Private key (keep secret, use with `deploy --key`):');
-        stdout.writeln('  $privateB64');
-        stdout.writeln('');
-        stdout.writeln('Public key (safe to embed / configure on device):');
-        stdout.writeln('  $publicB64');
+        banner('keys');
+        final (privateB64, publicB64) = await spinner(
+          () => generateEd25519KeyPair(),
+          'Generating Ed25519 keypair',
+          done: 'Keypair generated',
+        );
+        box('ed25519 keys', [
+          '${bold('private')} (keep secret — use with `deploy --key`):',
+          '  ${red(privateB64)}',
+          '',
+          '${bold('public')} (safe to embed / configure on device):',
+          '  ${green(publicB64)}',
+        ]);
         if (argResults!['save'] as bool) {
           final file = configCandidates().first;
           final json = file.existsSync() && file.readAsStringSync().trim().isNotEmpty
@@ -42,8 +49,7 @@ class KeysCommand extends Command<int> {
               : <String, dynamic>{};
           writePath(json, 'publicKey', publicB64);
           _save(json);
-          stdout.writeln('');
-          stdout.writeln('Saved public key to ${file.path}');
+          step('Saved public key to ${file.path}');
         }
       });
 

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/config.dart

@@ -161,13 +161,23 @@ FlutterPatcherConfig? loadConfig() {
   return null;
 }
 
-/// Persist a config to the project file (cwd).
-void saveConfig(FlutterPatcherConfig config) {
-  final file = configCandidates().first;
+/// Persist a config. By default writes the project file (cwd); pass
+/// [global: true] to write the global `~/.flutter_patcher/config.json`.
+void saveConfig(FlutterPatcherConfig config, {bool global = false}) {
+  final file = global ? configCandidates().last : configCandidates().first;
   file.parent.createSync(recursive: true);
   file.writeAsStringSync(
     const JsonEncoder.withIndent('  ').convert(config.toJson()),
   );
+  // Config may contain secrets (service-role keys, DB passwords, tokens). On
+  // POSIX systems tighten to owner-only read/write so they aren't world-readable.
+  if (!Platform.isWindows) {
+    try {
+      Process.runSync('chmod', ['600', file.path]);
+    } catch (_) {
+      // Non-fatal: chmod may be unavailable in some sandboxes.
+    }
+  }
 }
 
 /// Nested dot-path get/set helpers used by `config get/set`.

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>{