@_nazmiforreal/flutter-ota 0.1.11 → 0.1.13

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

@@ -28,29 +28,30 @@ class KeysCommand extends FlutterPatcherCommand {
 
   @override
   Future<int> run() => runGuarded(() async {
-        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
-              ? (jsonDecode(file.readAsStringSync()) as Map<String, dynamic>)
-              : <String, dynamic>{};
-          writePath(json, 'publicKey', publicB64);
-          _save(json);
-          step('Saved public key to ${file.path}');
-        }
-      });
+    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
+          ? (jsonDecode(file.readAsStringSync()) as Map<String, dynamic>)
+          : <String, dynamic>{};
+      writePath(json, 'publicKey', publicB64);
+      _save(json);
+      step('Saved public key to ${file.path}');
+    }
+  });
 
   void _save(Map<String, dynamic> json) {
     final file = configCandidates().first;

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

@@ -21,14 +21,25 @@ class MigrateCommand extends FlutterPatcherCommand {
   @override
   ArgParser get argParser => ArgParser()
     ..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', abbr: 'd', help: 'Print migrations instead of applying them.');
+    ..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',
+      abbr: 'd',
+      help: 'Print migrations instead of applying them.',
+    );
 
   /// Default migrations dir lives next to the CLI entrypoint; each backend has
   /// its own dialect's migrations (cloudflare = D1 SQLite, postgres = plain
@@ -49,12 +60,13 @@ class MigrateCommand extends FlutterPatcherCommand {
     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));
+    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');
     }
@@ -71,92 +83,98 @@ class MigrateCommand extends FlutterPatcherCommand {
 
   @override
   Future<int> run() => runGuarded(() async {
-        final provider = argResults!['backend'] as String? ?? 'supabase';
+    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;
-        }
+    // 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 files = _listMigrations(dir);
+    final dir =
+        argResults!['migrations-dir'] as String? ??
+        defaultMigrationsDir(provider);
+    final files = _listMigrations(dir);
 
-        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());
-          }
-          return;
-        }
+    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());
+      }
+      return;
+    }
 
-        if (provider == 'cloudflare') {
-          banner('migrate');
-          box('migrate', [
-            '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 D1 schema.',
-          ]);
-          return;
-        }
+    if (provider == 'cloudflare') {
+      banner('migrate');
+      box('migrate', [
+        '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 D1 schema.',
+      ]);
+      return;
+    }
 
-        if (provider == 'supabase') {
-          final cfg = loadConfig() ??
+    if (provider == 'supabase') {
+      final cfg =
+          loadConfig() ??
           FlutterPatcherConfig(
             provider: 'supabase',
             supabase: const SupabaseConfigJson(),
           );
-          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.',
-          );
-        }
+      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.',
-            );
-          }
-          await _runViaPostgres(pgUrl, files);
-          return;
-        }
+    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.',
+        );
+      }
+      await _runViaPostgres(pgUrl, files);
+      return;
+    }
 
-        throw StateError('Unknown backend provider: "$provider".');
-      });
+    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.
@@ -169,8 +187,7 @@ class MigrateCommand extends FlutterPatcherCommand {
           ),
     );
     final ref = Uri.parse(cfg.supabaseUrl).host.split('.').first;
-    final endpoint =
-        'https://api.supabase.com/v1/projects/$ref/database/query';
+    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();
@@ -206,8 +223,8 @@ class MigrateCommand extends FlutterPatcherCommand {
     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.',
+            '(or SUPABASE_SERVICE_ROLE_KEY) to auto-create the '
+            '"${storage.bucketName}" bucket.',
       ]);
       return;
     }
@@ -218,10 +235,7 @@ class MigrateCommand extends FlutterPatcherCommand {
         'apikey': storage.supabaseServiceRoleKey!,
         'Content-Type': 'application/json',
       },
-      body: jsonEncode({
-        'name': storage.bucketName,
-        'public': true,
-      }),
+      body: jsonEncode({'name': storage.bucketName, 'public': true}),
     );
     if (res.statusCode >= 400) {
       final body = jsonDecode(res.body) as Map<String, dynamic>;

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

@@ -0,0 +1,237 @@
+/// `flutter_ota_kit pocketbase` — manage a local PocketBase instance.
+library;
+
+import 'dart:async';
+import 'dart:io';
+
+import 'package:args/args.dart';
+import 'package:path/path.dart' as p;
+
+import '../cli_base.dart';
+import '../pocketbase/data_bootstrap.dart';
+import '../pocketbase/installer.dart';
+import '../pocketbase/process_manager.dart';
+import '../pocketbase/schema_installer.dart';
+import '../ui/ui.dart';
+
+class PocketBaseCommand extends FlutterPatcherCommand {
+  PocketBaseCommand() {
+    addSubcommand(PocketBaseInstallCommand());
+    addSubcommand(PocketBaseServeCommand());
+    addSubcommand(PocketBaseStopCommand());
+    addSubcommand(PocketBaseStatusCommand());
+  }
+
+  @override
+  String get name => 'pocketbase';
+
+  @override
+  String get description =>
+      'Manage a local PocketBase instance (install / serve / stop / status).';
+
+  @override
+  ArgParser get argParser => ArgParser();
+
+  @override
+  Future<int> run() => runGuarded(() async {
+    err('Missing subcommand. Use: install | serve | stop | status');
+    return;
+  });
+}
+
+class PocketBaseInstallCommand extends FlutterPatcherCommand {
+  @override
+  String get name => 'install';
+
+  @override
+  String get description => 'Download + extract the PocketBase binary.';
+
+  @override
+  ArgParser get argParser =>
+      ArgParser()..addOption('version', help: 'PocketBase version to install.');
+
+  @override
+  Future<int> run() => runGuarded(() async {
+    final version =
+        argResults!['version'] as String? ?? kDefaultPocketBaseVersion;
+    final installer = PocketBaseInstaller(version: version);
+    final paths = installer.paths();
+    step('Installing PocketBase v$version to ${paths.installDir.path}...');
+    final result = await installer.ensureInstalled(
+      paths: paths,
+      onProgress: (p) {
+        stdout.write('\r  ${(p * 100).toStringAsFixed(0)}%   ');
+      },
+    );
+    stdout.writeln();
+    if (result.alreadyInstalled) {
+      step('Already installed at ${paths.binaryPath.path}');
+    } else {
+      step(
+        'Downloaded ${(result.bytesDownloaded / 1024 / 1024).toStringAsFixed(1)} MB',
+      );
+      step('Binary ready at ${paths.binaryPath.path}');
+    }
+    return;
+  });
+}
+
+class PocketBaseServeCommand extends FlutterPatcherCommand {
+  @override
+  String get name => 'serve';
+
+  @override
+  String get description =>
+      'Start a local PocketBase + install the flutter_ota_kit schema.';
+
+  @override
+  ArgParser get argParser => ArgParser()
+    ..addOption('version', help: 'PocketBase version.')
+    ..addOption('port', help: 'PB HTTP port.', defaultsTo: '8090')
+    ..addOption('host', help: 'PB bind address.', defaultsTo: '127.0.0.1')
+    ..addOption('data-dir', help: 'PB data directory.')
+    ..addOption('admin-email', help: 'Bootstrap admin email.')
+    ..addOption('admin-password', help: 'Bootstrap admin password.')
+    ..addFlag(
+      'install-hooks',
+      help: 'Copy bundled JS hooks into the data dir on start.',
+      defaultsTo: true,
+    );
+
+  @override
+  Future<int> run() => runGuarded(() async {
+    final r = argResults!;
+    final version = r['version'] as String? ?? kDefaultPocketBaseVersion;
+    final port = int.tryParse(r['port'] as String? ?? '8090') ?? 8090;
+    final host = r['host'] as String? ?? '127.0.0.1';
+    final dataDirOverride = r['data-dir'] as String?;
+    final adminEmail =
+        r['admin-email'] as String? ??
+        Platform.environment['POCKETBASE_ADMIN_EMAIL'];
+    final adminPassword =
+        r['admin-password'] as String? ??
+        Platform.environment['POCKETBASE_ADMIN_PASSWORD'];
+    final installHooks = r['install-hooks'] as bool? ?? true;
+
+    final paths = PocketBaseInstallPaths.resolve(version: version);
+    final dataDir = dataDirOverride != null
+        ? Directory(dataDirOverride)
+        : paths.installDir;
+    final installer = PocketBaseInstaller(version: version);
+    step('Ensuring PocketBase v$version is installed...');
+    await installer.ensureInstalled(paths: paths);
+    step('Binary at ${paths.binaryPath.path}');
+
+    if (installHooks) {
+      final bootstrap = PocketBaseDataBootstrap(
+        dataDir: dataDir,
+        hooksSourceDir: _hooksSourceDir(),
+      );
+      final installed = await bootstrap.install();
+      if (installed.isNotEmpty) {
+        step('Installed hooks: ${installed.join(', ')}');
+      }
+    }
+
+    final manager = PocketBaseProcessManager(
+      binaryPath: paths.binaryPath,
+      dataDir: dataDir,
+      port: port,
+      host: host,
+    );
+    step(
+      'Starting PocketBase on http://$host:$port (data: ${dataDir.path})...',
+    );
+    await manager.start(adminEmail: adminEmail, adminPassword: adminPassword);
+    step('PocketBase is running (pid ${manager.process!.pid}).');
+
+    if (adminEmail != null && adminPassword != null) {
+      step('Installing flutter_ota_kit schema...');
+      final schemaInstaller = PocketBaseSchemaInstaller(
+        url: 'http://$host:$port',
+        adminEmail: adminEmail,
+        adminPassword: adminPassword,
+      );
+      try {
+        final res = await schemaInstaller.install();
+        if (res.created.isNotEmpty) {
+          step('Created collections: ${res.created.join(', ')}');
+        }
+        if (res.skipped.isNotEmpty) {
+          step('Already present: ${res.skipped.join(', ')}');
+        }
+      } catch (e) {
+        warn('Schema install failed: $e');
+      }
+    } else {
+      step('Skipping schema install (no --admin-email/--admin-password).');
+    }
+
+    banner('pocketbase');
+    box('flutter_ota_kit pocketbase serve', [
+      'Local PocketBase is running:',
+      '',
+      kv('url', 'http://$host:$port'),
+      kv('admin-ui', 'http://$host:$port/_/'),
+      kv('data', dataDir.path),
+      kv('pid', '${manager.process!.pid}'),
+    ]);
+
+    // Wait for SIGINT/SIGTERM.
+    final done = Completer<void>();
+    ProcessSignal.sigint.watch().listen((_) => done.complete());
+    if (!Platform.isWindows) {
+      ProcessSignal.sigterm.watch().listen((_) => done.complete());
+    }
+    await done.future;
+    step('Shutting down PocketBase...');
+    await manager.stop();
+    step('PocketBase stopped.');
+    return;
+  });
+
+  static Directory _hooksSourceDir() {
+    final exe = Platform.script.toFilePath();
+    final pkgRoot = Directory(p.dirname(p.dirname(p.dirname(exe))));
+    return Directory(p.join(pkgRoot.path, 'lib', 'src', 'pocketbase', 'hooks'));
+  }
+}
+
+class PocketBaseStopCommand extends FlutterPatcherCommand {
+  @override
+  String get name => 'stop';
+
+  @override
+  String get description =>
+      'Hint to stop a running PocketBase (Ctrl+C in serve).';
+
+  @override
+  Future<int> run() => runGuarded(() async {
+    step('Use Ctrl+C on the running serve process to stop PocketBase.');
+    return;
+  });
+}
+
+class PocketBaseStatusCommand extends FlutterPatcherCommand {
+  @override
+  String get name => 'status';
+
+  @override
+  String get description => 'Show the installed PocketBase version + path.';
+
+  @override
+  Future<int> run() => runGuarded(() async {
+    final paths = PocketBaseInstallPaths.resolve();
+    final exists = await paths.binaryPath.exists();
+    if (exists) {
+      step(
+        'PocketBase v${paths.version}: installed at ${paths.binaryPath.path}',
+      );
+    } else {
+      step(
+        'PocketBase: not installed. Run `flutter_ota_kit pocketbase install`.',
+      );
+    }
+    return;
+  });
+}

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

@@ -22,44 +22,53 @@ 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', abbr: 'i', 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
   Future<int> run() => runGuarded(() async {
-        final channel = argResults!['channel'] as String?;
-        if (channel == null || channel.isEmpty) {
-          throw PackException(
-            'Usage: flutter_ota_kit 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 channel = argResults!['channel'] as String?;
+    if (channel == null || channel.isEmpty) {
+      throw PackException(
+        'Usage: flutter_ota_kit 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 cfg = effectiveConfig(config ?? loadConfig(), argResults!);
+    final backend = requireBackend(cfg, override: backendOverride);
 
-        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(', ')),
-        ]);
-      });
+    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(', ')),
+    ]);
+  });
 }