@_nazmiforreal/flutter-ota 0.1.5 → 0.1.7

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

@@ -1,13 +1,15 @@
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
+import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
+import 'package:http/http.dart' as http;
 import 'package:path/path.dart' as p;
 import 'package:postgres/postgres.dart';
 
 import '../ui/ui.dart';
 
-/// `flutter_patcher migrate` — run backend SQL migrations.
+/// `flutter_ota_kit migrate` — run backend SQL migrations.
 class MigrateCommand extends FlutterPatcherCommand {
   @override
   String get name => 'migrate';
@@ -21,20 +23,44 @@ class MigrateCommand extends FlutterPatcherCommand {
     ..addOption('backend', abbr: 'b', help: 'Backend provider.')
     ..addOption('database-url',
         help: 'Postgres connection string (or DATABASE_URL env).')
+    ..addOption('management-key',
+        help: 'Supabase Management API key (or SUPABASE_MANAGEMENT_KEY env) — '
+            'runs migrations without a separate Postgres connection.')
     ..addOption('migrations-dir',
         help: 'Directory of *.sql migration files (ordered by name).')
-    ..addFlag('dry-run', help: 'Print migrations instead of applying them.');
+    ..addFlag('dry-run', abbr: 'd', help: 'Print migrations instead of applying them.');
 
-  /// Default migrations dir lives next to the CLI entrypoint; the backend
-  /// selects which dialect's migrations are used (cloudflare = D1 SQLite).
+  /// Default migrations dir lives next to the CLI entrypoint; each backend has
+  /// its own dialect's migrations (cloudflare = D1 SQLite, postgres = plain
+  /// Postgres, supabase = PostgREST, aws = no relational SQL).
   String defaultMigrationsDir(String provider) {
     final sub = switch (provider) {
+      'supabase' => 'supabase',
+      'postgres' => 'postgres',
       'cloudflare' => 'cloudflare',
+      'aws' => 'aws',
       _ => 'supabase',
     };
     return p.join(p.dirname(Platform.script.path), '..', 'migrations', sub);
   }
 
+  List<File> _listMigrations(String dir) {
+    final migrationsDir = Directory(dir);
+    if (!migrationsDir.existsSync()) {
+      throw StateError('Migrations directory not found: $dir');
+    }
+    final files = migrationsDir
+        .listSync()
+        .whereType<File>()
+        .where((f) => f.path.endsWith('.sql'))
+        .toList()
+      ..sort((a, b) => a.path.compareTo(b.path));
+    if (files.isEmpty) {
+      throw StateError('No *.sql files in $dir');
+    }
+    return files;
+  }
+
   List<String> _splitStatements(String sql) {
     return sql
         .split(';')
@@ -46,21 +72,26 @@ class MigrateCommand extends FlutterPatcherCommand {
   @override
   Future<int> run() => runGuarded(() async {
         final provider = argResults!['backend'] as String? ?? 'supabase';
+
+        // Backends with no relational SQL handled out-of-band (S3 blob store).
+        // Short-circuit before any SQL discovery so a missing or empty
+        // (README-only) migrations dir does not abort.
+        if (provider == 'aws') {
+          final dir = argResults!['migrations-dir'] as String? ??
+              defaultMigrationsDir(provider);
+          banner('migrate');
+          box('migrate', [
+            'Migrations for "$provider" do not run through this command:',
+            '  • aws  → S3 blob store, no relational SQL (see $dir/README.md)',
+            '',
+            'See the README under $dir for the intended setup.',
+          ]);
+          return;
+        }
+
         final dir = argResults!['migrations-dir'] as String? ??
             defaultMigrationsDir(provider);
-        final migrationsDir = Directory(dir);
-        if (!migrationsDir.existsSync()) {
-          throw StateError('Migrations directory not found: $dir');
-        }
-        final files = migrationsDir
-            .listSync()
-            .whereType<File>()
-            .where((f) => f.path.endsWith('.sql'))
-            .toList()
-          ..sort((a, b) => a.path.compareTo(b.path));
-        if (files.isEmpty) {
-          throw StateError('No *.sql files in $dir');
-        }
+        final files = _listMigrations(dir);
 
         if (argResults!['dry-run'] as bool) {
           banner('migrate · dry-run');
@@ -71,67 +102,185 @@ class MigrateCommand extends FlutterPatcherCommand {
           return;
         }
 
-        final url = argResults!['database-url'] as String? ??
-            Platform.environment['DATABASE_URL'];
-        if (provider == 'cloudflare' || provider == 'aws') {
+        if (provider == 'cloudflare') {
           banner('migrate');
           box('migrate', [
-            'Migrations for "$provider" are applied via its platform tooling:',
-            '  • cloudflare → `wrangler d1 execute`',
-            '  • aws         → AWS console (S3/DynamoDB)',
+            'Cloudflare (D1 SQLite) migrations run via `wrangler d1 execute`:',
+            '  wrangler d1 execute <DB> --file=$dir/0001_hot-updater_init.sql',
+            '  (apply each *.sql under $dir in filename order)',
             '',
-            'The SQL files under ${dir} show the intended schema.',
+            'The SQL files under $dir show the intended D1 schema.',
           ]);
           return;
         }
-        if (url == null || url.isEmpty) {
-          throw StateError('Provide --database-url or set DATABASE_URL.');
-        }
 
-        final uri = Uri.parse(url);
-        final endpoint = Endpoint(
-          host: uri.host,
-          port: uri.port == 0 ? 5432 : uri.port,
-          database: uri.path.isEmpty ? 'postgres' : uri.path.substring(1),
-          username: uri.userInfo.isEmpty ? null : uri.userInfo.split(':').first,
-          password: uri.userInfo.contains(':')
-              ? uri.userInfo.split(':').last
-              : null,
-        );
-        banner('migrate');
-        final conn = await Connection.open(
-          endpoint,
-          settings: ConnectionSettings(sslMode: SslMode.disable),
-        );
-        try {
-          await conn.execute(
-            'CREATE TABLE IF NOT EXISTS _flutter_patcher_migrations '
-            '(name text primary key, applied_at timestamptz default now())',
-            queryMode: QueryMode.simple,
+        if (provider == 'supabase') {
+          final cfg = loadConfig() ??
+          FlutterPatcherConfig(
+            provider: 'supabase',
+            supabase: const SupabaseConfigJson(),
           );
-          for (final file in files) {
-            final name = p.basename(file.path);
-            final escaped = name.replaceAll("'", "''");
-            final existing = await conn.execute(
-              "SELECT 1 FROM _flutter_patcher_migrations WHERE name = '$escaped'",
-              queryMode: QueryMode.simple,
-            );
-            if (existing.isNotEmpty) {
-              stdout.writeln('  ${dim('skip')}    $name (already applied)');
-              continue;
-            }
-            final statements = _splitStatements(file.readAsStringSync());
-            for (final stmt in statements) {
-              await conn.execute(stmt, queryMode: QueryMode.simple);
-            }
-            await conn.execute(
-              "INSERT INTO _flutter_patcher_migrations(name) VALUES ('$escaped')",
-              queryMode: QueryMode.simple,
+          final mgmtKey = argResults!['management-key'] as String? ??
+              Platform.environment['SUPABASE_MANAGEMENT_KEY'] ??
+              cfg.supabase.managementKey;
+          final pgUrl = argResults!['database-url'] as String? ??
+              Platform.environment['DATABASE_URL'] ??
+              cfg.supabase.databaseUrl;
+          if (mgmtKey != null && mgmtKey.isNotEmpty) {
+            await _runViaManagementApi(mgmtKey, files);
+            return;
+          }
+          if (pgUrl != null && pgUrl.isNotEmpty) {
+            await _runViaPostgres(pgUrl, files);
+            return;
+          }
+          throw StateError(
+            'For the supabase backend, provide either:\n'
+            '  • --management-key (or SUPABASE_MANAGEMENT_KEY, or set it via '
+            '`flutter-ota init`) — a Supabase Management API key, OR\n'
+            '  • --database-url (or DATABASE_URL, or set it via `init`) — a '
+            'Postgres connection string.',
+          );
+        }
+
+        if (provider == 'postgres') {
+          final pgUrl = argResults!['database-url'] as String? ??
+              Platform.environment['DATABASE_URL'];
+          if (pgUrl == null || pgUrl.isEmpty) {
+            throw StateError(
+              'For the postgres backend, provide --database-url or set DATABASE_URL.',
             );
-            step('applied $name');
           }
-        } finally {
-          await conn.close();
+          await _runViaPostgres(pgUrl, files);
+          return;
         }
+
+        throw StateError('Unknown backend provider: "$provider".');
       });
+
+  /// Run migrations through the Supabase Management API (no Postgres creds
+  /// needed). Derived from the Supabase project ref in the configured URL.
+  Future<void> _runViaManagementApi(String mgmtKey, List<File> files) async {
+    final cfg = resolveSupabaseConfig(
+      loadConfig() ??
+          FlutterPatcherConfig(
+            provider: 'supabase',
+            supabase: SupabaseConfigJson(),
+          ),
+    );
+    final ref = Uri.parse(cfg.supabaseUrl).host.split('.').first;
+    final endpoint =
+        'https://api.supabase.com/v1/projects/$ref/database/query';
+    banner('migrate · supabase (management api)');
+    for (final file in files) {
+      final sql = file.readAsStringSync();
+      final res = await http.post(
+        Uri.parse(endpoint),
+        headers: {
+          'Authorization': 'Bearer $mgmtKey',
+          'Content-Type': 'application/json',
+        },
+        body: jsonEncode({'query': sql}),
+      );
+      if (res.statusCode >= 400) {
+        throw StateError(
+          'Migration ${p.basename(file.path)} failed '
+          '(${res.statusCode}): ${res.body}',
+        );
+      }
+      step('applied ${p.basename(file.path)}');
+    }
+    await _ensureSupabaseBucket();
+  }
+
+  /// Create the Supabase Storage bucket (public) if it doesn't exist, so
+  /// `deploy` can upload artifacts without a manual setup step.
+  Future<void> _ensureSupabaseBucket() async {
+    final storage = resolveSupabaseStorageConfig(
+      loadConfig() ??
+          FlutterPatcherConfig(
+            provider: 'supabase',
+            supabase: SupabaseConfigJson(),
+          ),
+    );
+    if (storage.supabaseServiceRoleKey == null) {
+      box('migrate', [
+        'Skipped storage bucket creation — set supabase.serviceRoleKey '
+        '(or SUPABASE_SERVICE_ROLE_KEY) to auto-create the '
+        '"${storage.bucketName}" bucket.',
+      ]);
+      return;
+    }
+    final res = await http.post(
+      Uri.parse('${storage.supabaseUrl}/storage/v1/bucket'),
+      headers: {
+        'Authorization': 'Bearer ${storage.supabaseServiceRoleKey}',
+        'apikey': storage.supabaseServiceRoleKey!,
+        'Content-Type': 'application/json',
+      },
+      body: jsonEncode({
+        'name': storage.bucketName,
+        'public': true,
+      }),
+    );
+    if (res.statusCode >= 400) {
+      final body = jsonDecode(res.body) as Map<String, dynamic>;
+      final msg = (body['message'] ?? body['error'] ?? '').toString();
+      if (!msg.contains('already exists') && res.statusCode != 409) {
+        box('migrate', [
+          'Warning: could not create bucket "${storage.bucketName}": $msg',
+        ]);
+        return;
+      }
+    }
+    step('ensured storage bucket "${storage.bucketName}"');
+  }
+
+  /// Original path: connect directly to Postgres and execute each statement.
+  Future<void> _runViaPostgres(String url, List<File> files) async {
+    final uri = Uri.parse(url);
+    final endpoint = Endpoint(
+      host: uri.host,
+      port: uri.port == 0 ? 5432 : uri.port,
+      database: uri.path.isEmpty ? 'postgres' : uri.path.substring(1),
+      username: uri.userInfo.isEmpty ? null : uri.userInfo.split(':').first,
+      password: uri.userInfo.contains(':')
+          ? uri.userInfo.split(':').last
+          : null,
+    );
+    banner('migrate · postgres');
+    final conn = await Connection.open(
+      endpoint,
+      settings: ConnectionSettings(sslMode: SslMode.disable),
+    );
+    try {
+      await conn.execute(
+        'CREATE TABLE IF NOT EXISTS _flutter_ota_kit_migrations '
+        '(name text primary key, applied_at timestamptz default now())',
+        queryMode: QueryMode.simple,
+      );
+      for (final file in files) {
+        final name = p.basename(file.path);
+        final escaped = name.replaceAll("'", "''");
+        final existing = await conn.execute(
+          "SELECT 1 FROM _flutter_ota_kit_migrations WHERE name = '$escaped'",
+          queryMode: QueryMode.simple,
+        );
+        if (existing.isNotEmpty) {
+          stdout.writeln('  ${dim('skip')}    $name (already applied)');
+          continue;
+        }
+        for (final stmt in _splitStatements(file.readAsStringSync())) {
+          await conn.execute(stmt, queryMode: QueryMode.simple);
+        }
+        await conn.execute(
+          "INSERT INTO _flutter_ota_kit_migrations(name) VALUES ('$escaped')",
+          queryMode: QueryMode.simple,
+        );
+        step('applied $name');
+      }
+    } finally {
+      await conn.close();
+    }
+  }
 }

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

@@ -1,10 +1,10 @@
 import 'package:args/args.dart';
-import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
-import 'package:flutter_patcher_core/flutter_patcher_core.dart';
+import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
+import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
 
 import '../ui/ui.dart';
 
-/// `flutter_patcher rollback` — roll a channel back to a previous bundle.
+/// `flutter_ota_kit rollback` — roll a channel back to a previous bundle.
 class RollbackCommand extends FlutterPatcherCommand {
   RollbackCommand({this.config, this.backendOverride});
 
@@ -22,7 +22,7 @@ class RollbackCommand extends FlutterPatcherCommand {
   ArgParser get argParser => ArgParser()
     ..addOption('backend', abbr: 'b', help: 'Backend provider.')
     ..addOption('channel', abbr: 'c', help: 'Channel to roll back.')
-    ..addOption('bundle-id', help: 'Roll back to this specific bundle id.')
+    ..addOption('bundle-id', abbr: 'i', help: 'Roll back to this specific bundle id.')
     ..addOption('platform', abbr: 'p', help: 'Platform filter (e.g. android).');
 
   @override
@@ -30,7 +30,7 @@ class RollbackCommand extends FlutterPatcherCommand {
         final channel = argResults!['channel'] as String?;
         if (channel == null || channel.isEmpty) {
           throw PackException(
-            'Usage: flutter_patcher rollback --channel <channel> [--bundle-id <id>]',
+            'Usage: flutter_ota_kit rollback --channel <channel> [--bundle-id <id>]',
             64,
           );
         }

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

@@ -0,0 +1,117 @@
+import 'package:args/args.dart';
+import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
+
+import '../ui/ui.dart';
+
+/// `flutter_ota_kit storage` — inspect and clean the blob storage bucket
+/// directly from the CLI (no need to open the provider dashboard).
+class StorageCommand extends FlutterPatcherCommand {
+  StorageCommand({this.config, this.backendOverride}) {
+    addSubcommand(StorageListCommand(config: config, backendOverride: backendOverride));
+    addSubcommand(StorageDeleteCommand(config: config, backendOverride: backendOverride));
+  }
+
+  final FlutterPatcherConfig? config;
+  final Backend? backendOverride;
+
+  @override
+  String get name => 'storage';
+
+  @override
+  String get description =>
+      'Inspect and manage bundle storage objects (find / delete orphans).';
+}
+
+class StorageListCommand extends FlutterPatcherCommand {
+  StorageListCommand({this.config, this.backendOverride});
+
+  final FlutterPatcherConfig? config;
+  final Backend? backendOverride;
+
+  @override
+  String get name => 'list';
+
+  @override
+  String get description => 'List storage objects.';
+
+  @override
+  ArgParser get argParser => ArgParser()
+    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
+    ..addOption('prefix', help: 'Key prefix filter (e.g. bundles).');
+
+  @override
+  Future<int> run() => runGuarded(() async {
+        final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
+        final backend = requireBackend(cfg, override: backendOverride);
+        final prefix = argResults!['prefix'] as String?;
+        banner('storage · list');
+        final objects = await backend.storage.listObjects(
+          prefix == null || prefix.isEmpty ? null : prefix,
+        );
+        if (objects.isEmpty) {
+          step('(no objects)');
+          return;
+        }
+        final lines = <String>[];
+        for (final o in objects) {
+          final size = o.size >= 1024 * 1024
+              ? '${(o.size / (1024 * 1024)).toStringAsFixed(2)} MB'
+              : o.size >= 1024
+                  ? '${(o.size / 1024).toStringAsFixed(1)} KB'
+                  : '${o.size} B';
+          lines
+            ..add(kv('key', cyan(o.key)))
+            ..add(kv('size', size))
+            ..add('');
+        }
+        box('${objects.length} objects', lines);
+      });
+}
+
+class StorageDeleteCommand extends FlutterPatcherCommand {
+  StorageDeleteCommand({this.config, this.backendOverride});
+
+  final FlutterPatcherConfig? config;
+  final Backend? backendOverride;
+
+  @override
+  String get name => 'delete';
+
+  @override
+  String get description => 'Delete storage object(s) by key or full URI.';
+
+  @override
+  ArgParser get argParser => ArgParser()
+    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
+    ..addMultiOption('key', help: 'Storage key to delete (repeatable).')
+    ..addOption('uri', help: 'Full storage URI to delete.');
+
+  @override
+  Future<int> run() => runGuarded(() async {
+        final keys = (argResults!['key'] as List<String>?) ?? <String>[];
+        final uri = argResults!['uri'] as String?;
+        if (keys.isEmpty && (uri == null || uri.isEmpty)) {
+          throw PackException(
+            'Usage: flutter-ota storage delete --key <key> [--key <key>...] '
+            '| --uri <storageUri>',
+            64,
+          );
+        }
+        final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
+        final backend = requireBackend(cfg, override: backendOverride);
+        banner('storage · delete');
+        if (keys.isNotEmpty) {
+          await spinner(
+            () => backend.storage.deleteObjects(keys),
+            'Deleting ${keys.length} object(s)',
+            done: 'Deleted',
+          );
+        } else {
+          await spinner(
+            () => backend.storage.delete(uri!),
+            'Deleting $uri',
+            done: 'Deleted',
+          );
+        }
+      });
+}