@_nazmiforreal/flutter-ota 0.1.4 → 0.1.6

package/bin/flutter-patcher.js

@@ -34,29 +34,46 @@ const binPath = path.join(binDir, binName);
 const sourceEntry = path.join(
   binDir, '..', 'dart-src', 'packages', 'cli-tools', 'bin', 'flutter_patcher.dart',
 );
+const cliDir = path.dirname(path.dirname(sourceEntry));
 
-function run(bin, args, cwd) {
-  const res = spawnSync(bin, args, { stdio: 'inherit', windowsHide: false, cwd });
+function chmodIfNeeded(p) {
+  try {
+    const st = fs.statSync(p);
+    // Ensure owner-executable bit is set.
+    if (!(st.mode & 0o100)) fs.chmodSync(p, st.mode | 0o755);
+  } catch (_) {
+    // Non-fatal.
+  }
+}
+
+function run(bin, args) {
+  const res = spawnSync(bin, args, { stdio: 'inherit', windowsHide: false });
   process.exit(res.status == null ? 1 : res.status);
 }
 
 if (fs.existsSync(binPath)) {
+  chmodIfNeeded(binPath);
   run(binPath, process.argv.slice(2));
 } else if (
   spawnSync('dart', ['--version'], { stdio: 'ignore' }).status === 0 &&
   fs.existsSync(sourceEntry)
 ) {
-  // Ensure dependencies are resolved before running from source.
-  const cliDir = path.dirname(path.dirname(sourceEntry));
-  const getRes = spawnSync('dart', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
-  if (getRes.status !== 0) {
-    console.error(
-      'flutter-patcher: `dart pub get` failed. Install dependencies or build ' +
-        `a prebuilt manually:\n  cd ${cliDir} && dart compile exe ` +
-        `bin/flutter_patcher.dart -o ${binPath}`,
-    );
-    process.exit(1);
+  // Ensure dependencies are resolved before running from source. We only run
+  // `dart pub get` when the package config is missing, so repeated invocations
+  // don't re-resolve dependencies on every command.
+  const configPath = path.join(cliDir, '.dart_tool', 'package_config.json');
+  if (!fs.existsSync(configPath)) {
+    const getRes = spawnSync('dart', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
+    if (getRes.status !== 0) {
+      console.error(
+        'flutter-patcher: `dart pub get` failed. Install dependencies or build ' +
+          `a prebuilt manually:\n  cd ${cliDir} && dart compile exe ` +
+          `bin/flutter_patcher.dart -o ${binPath}`,
+      );
+      process.exit(1);
+    }
   }
+  chmodIfNeeded(binPath);
   run('dart', [sourceEntry, ...process.argv.slice(2)]);
 } else {
   console.error(

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

@@ -31,6 +31,7 @@ export 'src/commands/console.dart';
 
 import 'src/commands/build.dart';
 import 'src/commands/bundle.dart';
+import 'src/runner.dart';
 import 'src/commands/channel.dart';
 import 'src/commands/config_command.dart';
 import 'src/commands/console.dart';
@@ -44,7 +45,7 @@ import 'src/commands/rollback.dart';
 
 /// Entry point: build the command runner and dispatch [args].
 Future<int> run(List<String> args) async {
-  final runner = CommandRunner<int>(
+  final runner = FlutterPatcherRunner(
     'flutter_patcher',
     'flutter_patcher CLI — OTA code push for Flutter (hot-updater compatible).',
   )

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

@@ -5,6 +5,8 @@ import 'config.dart';
 import 'pack.dart';
 import 'ui/ui.dart';
 
+export 'runner.dart';
+
 /// Run [body], mapping errors to a non-zero exit code with a clean message.
 Future<int> runGuarded(Future<void> Function() body) async {
   try {

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

@@ -1,4 +1,3 @@
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
 import '../ui/ui.dart';
@@ -8,7 +7,7 @@ import '../ui/ui.dart';
 ///
 /// Includes every ABI found in the APK so a single bundle installs on all
 /// device architectures.
-class BuildCommand extends Command<int> {
+class BuildCommand extends FlutterPatcherCommand {
   BuildCommand() {
     argParser
       ..addOption(

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

@@ -1,11 +1,10 @@
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
 import '../ui/ui.dart';
 
 /// `flutter_patcher bundle` — manage bundles.
-class BundleCommand extends Command<int> {
+class BundleCommand extends FlutterPatcherCommand {
   BundleCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;
@@ -28,7 +27,7 @@ class BundleCommand extends Command<int> {
       });
 }
 
-class BundleListCommand extends Command<int> {
+class BundleListCommand extends FlutterPatcherCommand {
   BundleListCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;
@@ -94,7 +93,7 @@ class BundleListCommand extends Command<int> {
       });
 }
 
-class BundleDeleteCommand extends Command<int> {
+class BundleDeleteCommand extends FlutterPatcherCommand {
   BundleDeleteCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;
@@ -128,7 +127,7 @@ class BundleDeleteCommand extends Command<int> {
       });
 }
 
-class BundlePromoteCommand extends Command<int> {
+class BundlePromoteCommand extends FlutterPatcherCommand {
   BundlePromoteCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -1,11 +1,10 @@
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
 import '../ui/ui.dart';
 
 /// `flutter_patcher channel` — manage channels.
-class ChannelCommand extends Command<int> {
+class ChannelCommand extends FlutterPatcherCommand {
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
 
@@ -32,7 +31,7 @@ class ChannelCommand extends Command<int> {
       });
 }
 
-class ChannelListCommand extends Command<int> {
+class ChannelListCommand extends FlutterPatcherCommand {
   ChannelListCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;
@@ -62,7 +61,7 @@ class ChannelListCommand extends Command<int> {
       });
 }
 
-class ChannelGetCommand extends Command<int> {
+class ChannelGetCommand extends FlutterPatcherCommand {
   ChannelGetCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;
@@ -103,7 +102,7 @@ class ChannelGetCommand extends Command<int> {
       });
 }
 
-class ChannelSetCommand extends Command<int> {
+class ChannelSetCommand extends FlutterPatcherCommand {
   ChannelSetCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -2,13 +2,12 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 
 import '../cli_base.dart';
 import '../config.dart';
 
 /// `flutter_patcher config` — get/set/list config values.
-class ConfigCommand extends Command<int> {
+class ConfigCommand extends FlutterPatcherCommand {
   ConfigCommand() {
     addSubcommand(ConfigGetCommand());
     addSubcommand(ConfigSetCommand());
@@ -45,7 +44,7 @@ void _saveProjectJson(Map<String, dynamic> json) {
   );
 }
 
-class ConfigGetCommand extends Command<int> {
+class ConfigGetCommand extends FlutterPatcherCommand {
   @override
   String get name => 'get';
 
@@ -72,7 +71,7 @@ class ConfigGetCommand extends Command<int> {
       });
 }
 
-class ConfigSetCommand extends Command<int> {
+class ConfigSetCommand extends FlutterPatcherCommand {
   @override
   String get name => 'set';
 
@@ -98,7 +97,7 @@ class ConfigSetCommand extends Command<int> {
       });
 }
 
-class ConfigListCommand extends Command<int> {
+class ConfigListCommand extends FlutterPatcherCommand {
   @override
   String get name => 'list';
 

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

@@ -1,14 +1,13 @@
 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 '../ui/ui.dart';
 
 /// `flutter_patcher console` — open the web console.
-class ConsoleCommand extends Command<int> {
+class ConsoleCommand extends FlutterPatcherCommand {
   @override
   String get name => 'console';
 

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

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 
 import '../backend.dart';
 import '../cli_base.dart';
@@ -11,7 +10,7 @@ import '../ui/ui.dart';
 import '../util.dart';
 
 /// `flutter_patcher deploy` — zip + upload + register a new bundle.
-class DeployCommand extends Command<int> {
+class DeployCommand extends FlutterPatcherCommand {
   DeployCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -1,13 +1,12 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
 import '../ui/ui.dart';
 
 /// `flutter_patcher doctor` — environment + backend connectivity check.
-class DoctorCommand extends Command<int> {
+class DoctorCommand extends FlutterPatcherCommand {
   DoctorCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -1,13 +1,12 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 
 import '../cli_base.dart';
 import '../util.dart';
 
 /// `flutter_patcher fingerprint` — compute a build-time fingerprint hash.
-class FingerprintCommand extends Command<int> {
+class FingerprintCommand extends FlutterPatcherCommand {
   @override
   String get name => 'fingerprint';
 

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

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
 import '../ui/ui.dart';
@@ -13,7 +12,7 @@ import '../ui/ui.dart';
 /// 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> {
+class InitCommand extends FlutterPatcherCommand {
   InitCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -1,7 +1,6 @@
 import 'dart:convert';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 
 import '../backend.dart';
 import '../cli_base.dart';
@@ -10,7 +9,7 @@ import '../sign.dart';
 import '../ui/ui.dart';
 
 /// `flutter_patcher keys` — generate an Ed25519 keypair for bundle signing.
-class KeysCommand extends Command<int> {
+class KeysCommand extends FlutterPatcherCommand {
   KeysCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -1,15 +1,16 @@
+import 'dart:convert';
 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: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.
-class MigrateCommand extends Command<int> {
+class MigrateCommand extends FlutterPatcherCommand {
   @override
   String get name => 'migrate';
 
@@ -22,6 +23,9 @@ class MigrateCommand extends Command<int> {
     ..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.');
@@ -36,6 +40,23 @@ class MigrateCommand extends Command<int> {
     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(';')
@@ -49,19 +70,7 @@ class MigrateCommand extends Command<int> {
         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');
@@ -72,8 +81,6 @@ class MigrateCommand extends Command<int> {
           return;
         }
 
-        final url = argResults!['database-url'] as String? ??
-            Platform.environment['DATABASE_URL'];
         if (provider == 'cloudflare' || provider == 'aws') {
           banner('migrate');
           box('migrate', [
@@ -81,58 +88,164 @@ class MigrateCommand extends Command<int> {
             '  • 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/commands/rollback.dart

@@ -1,12 +1,11 @@
 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 '../ui/ui.dart';
 
 /// `flutter_patcher rollback` — roll a channel back to a previous bundle.
-class RollbackCommand extends Command<int> {
+class RollbackCommand extends FlutterPatcherCommand {
   RollbackCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -0,0 +1,73 @@
+import 'dart:io';
+
+import 'package:args/command_runner.dart';
+import 'ui/ui.dart';
+
+/// Custom [CommandRunner] that renders a clean, colorized top-level help.
+class FlutterPatcherRunner extends CommandRunner<int> {
+  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;
+    }
+    final buf = StringBuffer();
+    buf.writeln('  ${cyan('▶')} ${cyan(bold(executableName))} '
+        '${dim('·')} ${bold(description)}');
+    buf.writeln('  ${dim('─' * 60)}');
+    buf.writeln('');
+    buf.writeln('  ${bold('USAGE')}');
+    buf.writeln('    $executableName <command> [arguments]');
+    buf.writeln('');
+    buf.writeln('  ${bold('COMMANDS')}');
+    for (final n in names) {
+      final c = commands[n]!;
+      buf.writeln('    ${cyan(n.padRight(maxName))}  ${dim(c.description)}');
+    }
+    buf.writeln('');
+    buf.writeln('  ${dim('Run "$executableName help <command>" for more about a command.')}');
+    return buf.toString();
+  }
+
+  @override
+  void printUsage([String? usage]) {
+    stdout.writeln(usage ?? this.usage);
+  }
+}
+
+String _fullName(Command<int> command) {
+  final parts = <String>[command.name];
+  var p = command.parent;
+  while (p != null) {
+    parts.insert(0, p.name);
+    p = p.parent;
+  }
+  return parts.join(' ');
+}
+
+/// Base class for flutter_patcher commands; renders a clean, colorized
+/// per-command help (used by `flutter_patcher <cmd> --help`).
+abstract class FlutterPatcherCommand extends Command<int> {
+  @override
+  String get usage {
+    final buf = StringBuffer();
+    buf.writeln('  ${cyan(bold(name))} ${dim('·')} $description');
+    buf.writeln('');
+    buf.writeln('  ${bold('USAGE')}');
+    buf.writeln('    ${_fullName(this)} [arguments]');
+    if (argParser.options.isNotEmpty) {
+      buf.writeln('');
+      buf.writeln('  ${bold('OPTIONS')}');
+      buf.writeln('  ${argParser.usage.replaceAll('\n', '\n  ')}');
+    }
+    return buf.toString();
+  }
+
+  @override
+  void printUsage([String? usage]) {
+    stdout.writeln(usage ?? this.usage);
+  }
+}

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.4",
+  "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"

package/scripts/postinstall.js

@@ -34,7 +34,17 @@ const binDir = path.join(pkgDir, 'bin');
 const target = path.join(binDir, `flutter-patcher-${platformName}-${archName}${ext}`);
 const cliDir = path.join(pkgDir, 'dart-src', 'packages', 'cli-tools');
 
+function chmod(pathname) {
+  try {
+    const st = fs.statSync(pathname);
+    if (!(st.mode & 0o100)) fs.chmodSync(pathname, st.mode | 0o755);
+  } catch (_) {
+    /* non-fatal */
+  }
+}
+
 if (fs.existsSync(target)) {
+  chmod(target);
   console.log(`flutter-patcher: prebuilt binary present (${platformName}-${archName}), skipping build.`);
   process.exit(0);
 }
@@ -57,7 +67,7 @@ if (!fs.existsSync(path.join(cliDir, 'pubspec.yaml'))) {
 console.log('flutter-patcher: resolving Dart dependencies (dart pub get)...');
 const getRes = spawnSync('dart', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
 if (getRes.status !== 0) {
-  console.warn(
+  console.error(
     'flutter-patcher: `dart pub get` failed (check your network / Dart version). ' +
       `To build manually:\n  cd ${cliDir} && dart compile exe bin/flutter_patcher.dart ` +
       `-o ${target}`,
@@ -65,17 +75,18 @@ if (getRes.status !== 0) {
   process.exit(0);
 }
 
-console.log('flutter-patcher: building native binary with `dart compile exe`...');
+console.log(`flutter-patcher: building native binary (${platformName}-${archName})...`);
 const res = spawnSync(
   'dart',
   ['compile', 'exe', 'bin/flutter_patcher.dart', '-o', target],
   { stdio: 'inherit', cwd: cliDir },
 );
 if (res.status !== 0) {
-  console.warn(
+  console.error(
     'flutter-patcher: build failed. To build manually:\n  cd ' +
       `${cliDir} && dart compile exe bin/flutter_patcher.dart -o ${target}`,
   );
   process.exit(0);
 }
+chmod(target);
 console.log(`flutter-patcher: built ${target}`);