@_nazmiforreal/flutter-ota 0.1.5 → 0.1.6

package/dart-src/packages/cli-tools/.dart_tool/package_graph.json

@@ -19,11 +19,11 @@
         "flutter_patcher_postgres",
         "flutter_patcher_standalone",
         "flutter_patcher_supabase",
+        "http",
         "path",
         "postgres"
       ],
       "devDependencies": [
-        "http",
         "test"
       ]
     },

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

@@ -1,7 +1,9 @@
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
+import 'package:http/http.dart' as http;
 import 'package:path/path.dart' as p;
 import 'package:postgres/postgres.dart';
 
@@ -21,6 +23,9 @@ 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.');
@@ -35,6 +40,23 @@ class MigrateCommand extends FlutterPatcherCommand {
     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(';')
@@ -48,19 +70,7 @@ class MigrateCommand extends FlutterPatcherCommand {
         final provider = argResults!['backend'] as String? ?? 'supabase';
         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,8 +81,6 @@ class MigrateCommand extends FlutterPatcherCommand {
           return;
         }
 
-        final url = argResults!['database-url'] as String? ??
-            Platform.environment['DATABASE_URL'];
         if (provider == 'cloudflare' || provider == 'aws') {
           banner('migrate');
           box('migrate', [
@@ -80,58 +88,164 @@ class MigrateCommand extends FlutterPatcherCommand {
             '  • cloudflare → `wrangler d1 execute`',
             '  • aws         → AWS console (S3/DynamoDB)',
             '',
-            'The SQL files under ${dir} show the intended schema.',
+            'The SQL files under $dir show the intended schema.',
           ]);
           return;
         }
-        if (url == null || url.isEmpty) {
+
+        if (provider == 'supabase') {
+          final mgmtKey = argResults!['management-key'] as String? ??
+              Platform.environment['SUPABASE_MANAGEMENT_KEY'];
+          final pgUrl = argResults!['database-url'] as String? ??
+              Platform.environment['DATABASE_URL'];
+          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) — a Supabase '
+            'Management API key, OR\n'
+            '  • --database-url (or DATABASE_URL) — a Postgres connection string.',
+          );
+        }
+
+        // Any other provider (e.g. postgres) requires a Postgres connection.
+        final pgUrl = argResults!['database-url'] as String? ??
+            Platform.environment['DATABASE_URL'];
+        if (pgUrl == null || pgUrl.isEmpty) {
           throw StateError('Provide --database-url or set DATABASE_URL.');
         }
+        await _runViaPostgres(pgUrl, files);
+      });
 
-        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,
+  /// 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}',
         );
-        banner('migrate');
-        final conn = await Connection.open(
-          endpoint,
-          settings: ConnectionSettings(sslMode: SslMode.disable),
+      }
+      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_patcher_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_patcher_migrations WHERE name = '$escaped'",
+          queryMode: QueryMode.simple,
         );
-        try {
-          await conn.execute(
-            'CREATE TABLE IF NOT EXISTS _flutter_patcher_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_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,
-            );
-            step('applied $name');
-          }
-        } finally {
-          await conn.close();
+        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_patcher_migrations(name) VALUES ('$escaped')",
+          queryMode: QueryMode.simple,
+        );
+        step('applied $name');
+      }
+    } finally {
+      await conn.close();
+    }
+  }
 }

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

@@ -5,14 +5,15 @@ import 'ui/ui.dart';
 
 /// Custom [CommandRunner] that renders a clean, colorized top-level help.
 class FlutterPatcherRunner extends CommandRunner<int> {
-  FlutterPatcherRunner(String name, String description)
-      : super(name, description);
+  FlutterPatcherRunner(super.name, super.description);
 
   @override
   String get usage {
     final names = commands.keys.toList()..sort();
     var maxName = 0;
-    for (final n in names) maxName = maxName < n.length ? n.length : maxName;
+    for (final n in names) {
+      maxName = maxName < n.length ? n.length : maxName;
+    }
     final buf = StringBuffer();
     buf.writeln('  ${cyan('▶')} ${cyan(bold(executableName))} '
         '${dim('·')} ${bold(description)}');
@@ -53,7 +54,7 @@ abstract class FlutterPatcherCommand extends Command<int> {
   @override
   String get usage {
     final buf = StringBuffer();
-    buf.writeln('  ${cyan(bold(name))} ${dim('·')} ${description}');
+    buf.writeln('  ${cyan(bold(name))} ${dim('·')} $description');
     buf.writeln('');
     buf.writeln('  ${bold('USAGE')}');
     buf.writeln('    ${_fullName(this)} [arguments]');

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

@@ -173,7 +173,9 @@ 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));
+  for (final l in lines) {
+    wrapped.addAll(_wrap(l, inner));
+  }
 
   final titleText = ' $title ';
   final tVisible = _dispWidth(titleText);

package/dart-src/packages/cli-tools/pubspec.lock

@@ -259,7 +259,7 @@ packages:
     source: hosted
     version: "2.26.0"
   http:
-    dependency: "direct dev"
+    dependency: "direct main"
     description:
       name: http
       sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"

package/dart-src/packages/cli-tools/pubspec.yaml

@@ -31,7 +31,7 @@ dependencies:
     path: ../../plugins/aws
   flutter_patcher_standalone:
     path: ../../plugins/standalone
+  http: ^1.2.0
 
 dev_dependencies:
   test: ^1.25.0
-  http: ^1.2.0

package/dart-src/plugins/supabase/lib/src/supabase_client_http.dart

@@ -245,17 +245,23 @@ class _StorageBucket implements SupabaseStorageBucketLike {
     String path,
     int expiresIn,
   ) async {
-    final uri = Uri.parse(
-      '$_baseUrl/storage/v1/object/sign/$_bucket/$path',
-    ).replace(queryParameters: {'expiresIn': expiresIn.toString()});
-    final res = await http.post(uri, headers: _headers);
+    final uri = Uri.parse('$_baseUrl/storage/v1/object/sign/$_bucket/$path');
+    final res = await http.post(
+      uri,
+      headers: {..._headers, 'Content-Type': 'application/json'},
+      body: jsonEncode({'expiresIn': expiresIn}),
+    );
     if (res.statusCode >= 400) {
       return _MockSignedUrlResult(null, jsonDecode(res.body));
     }
     final body = jsonDecode(res.body) as Map<String, dynamic>;
+    final signed = body['signedURL'] as String?;
+    // Supabase returns a relative path ("/object/sign/...?token=..."); make it
+    // absolute against the project base URL.
     return _MockSignedUrlResult(
-        '$_baseUrl/storage/v1/object/sign/$_bucket/$path?...${body['signedURL']}',
-        null);
+      signed == null ? null : '$_baseUrl/storage/v1$signed',
+      null,
+    );
   }
 
   @override
@@ -287,6 +293,22 @@ class _StorageBucket implements SupabaseStorageBucketLike {
     );
   }
 
+  Future<void> _ensureBucket() async {
+    final res = await http.post(
+      Uri.parse('$_baseUrl/storage/v1/bucket'),
+      headers: {..._headers, 'Content-Type': 'application/json'},
+      body: jsonEncode({'name': _bucket, 'public': true}),
+    );
+    // 400/409 just mean it already exists — that's fine.
+    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) {
+        throw StateError('Failed to create bucket "$_bucket": $msg');
+      }
+    }
+  }
+
   @override
   Future<SupabaseUploadResult> upload(
     String path,
@@ -294,20 +316,34 @@ class _StorageBucket implements SupabaseStorageBucketLike {
     String? contentType,
     String? cacheControl,
   }) async {
-    final uri = Uri.parse('$_baseUrl/storage/v1/object/$_bucket/$path');
-    final res = await http.post(
-      uri,
-      headers: {
-        ..._headers,
-        'Content-Type': contentType ?? 'application/octet-stream',
-        if (cacheControl != null) 'Cache-Control': cacheControl,
-      },
-      body: fileBytes,
-    );
-    if (res.statusCode >= 400) {
-      return _MockUploadResult(null, jsonDecode(res.body));
+    Future<_MockUploadResult> doUpload() async {
+      final uri = Uri.parse('$_baseUrl/storage/v1/object/$_bucket/$path');
+      final res = await http.post(
+        uri,
+        headers: {
+          ..._headers,
+          'Content-Type': contentType ?? 'application/octet-stream',
+          if (cacheControl != null) 'Cache-Control': cacheControl,
+        },
+        body: fileBytes,
+      );
+      if (res.statusCode >= 400) {
+        return _MockUploadResult(null, jsonDecode(res.body));
+      }
+      return _MockUploadResult(jsonDecode(res.body), null);
+    }
+
+    final first = await doUpload();
+    if (first.error != null) {
+      final msg =
+          (first.error is Map ? (first.error as Map)['message'] : first.error)
+              .toString();
+      if (msg.contains('Bucket not found')) {
+        await _ensureBucket();
+        return doUpload();
+      }
     }
-    return _MockUploadResult(jsonDecode(res.body), null);
+    return first;
   }
 
   @override

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_nazmiforreal/flutter-ota",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Command-line interface for flutter_patcher — an OTA code-push tool for Flutter, hot-updater compatible.",
   "bin": {
     "flutter-patcher": "./bin/flutter-patcher.js"