@_nazmiforreal/flutter-ota 0.1.19 → 0.1.21

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

@@ -6,7 +6,10 @@ import '../ui/ui.dart';
 /// `flutter-ota rollback` — roll a channel back to a previous bundle.
 class RollbackCommand extends FlutterPatcherCommand {
   RollbackCommand({this.config, this.backendOverride}) {
-    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    final detected = config?.provider ?? loadConfig()?.provider;
+    argParser.addOption('backend', abbr: 'b', help: detected != null
+        ? 'Backend provider [detected: $detected].'
+        : 'Backend provider.');
     argParser.addOption('channel', abbr: 'c', help: 'Channel to roll back.');
     argParser.addOption(
       'bundle-id',

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

@@ -22,12 +22,15 @@ class StorageCommand extends FlutterPatcherCommand {
 
   @override
   String get description =>
-      'Inspect and manage bundle storage objects (find / delete orphans).';
+      'Inspect and manage bundle storage objects (list / delete).';
 }
 
 class StorageListCommand extends FlutterPatcherCommand {
   StorageListCommand({this.config, this.backendOverride}) {
-    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    final detected = config?.provider ?? loadConfig()?.provider;
+    argParser.addOption('backend', abbr: 'b', help: detected != null
+        ? 'Backend provider [detected: $detected].'
+        : 'Backend provider.');
     argParser.addOption('prefix', help: 'Key prefix filter (e.g. bundles).');
   }
 
@@ -57,12 +60,7 @@ class StorageListCommand extends FlutterPatcherCommand {
     }
     final rows = <List<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';
-      rows.add([cyan(o.key), size]);
+      rows.add([cyan(o.key), humanSize(o.size)]);
     }
     table('${objects.length} objects', ['KEY', 'SIZE'], rows);
     steps.summary();
@@ -71,7 +69,10 @@ class StorageListCommand extends FlutterPatcherCommand {
 
 class StorageDeleteCommand extends FlutterPatcherCommand {
   StorageDeleteCommand({this.config, this.backendOverride}) {
-    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    final detected = config?.provider ?? loadConfig()?.provider;
+    argParser.addOption('backend', abbr: 'b', help: detected != null
+        ? 'Backend provider [detected: $detected].'
+        : 'Backend provider.');
     argParser.addMultiOption('key', help: 'Storage key to delete (repeatable).');
     argParser.addOption('uri', help: 'Full storage URI to delete.');
   }

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

@@ -232,8 +232,6 @@ SupabaseServiceRoleConfig resolveSupabaseConfig(
   String? url,
   String? serviceRoleKey,
   String? anonKey,
-  String? bucket,
-  String? basePath,
   SupabaseClientFactory? clientFactory,
 }) {
   final env = Platform.environment;
@@ -247,8 +245,8 @@ SupabaseServiceRoleConfig resolveSupabaseConfig(
 
   if (resolvedUrl == null || resolvedUrl.isEmpty) {
     throw StateError(
-      'Supabase URL is required. Set it via --url, SUPABASE_URL, or '
-      '`flutter_ota_kit config set supabase.url <url>`.',
+      'Supabase URL is required. Set it via SUPABASE_URL env var, '
+          'or `flutter-ota config set supabase.url <url>`.',
     );
   }
 
@@ -275,8 +273,6 @@ SupabaseStorageConfig resolveSupabaseStorageConfig(
     url: url,
     serviceRoleKey: serviceRoleKey,
     anonKey: anonKey,
-    bucket: bucket,
-    basePath: basePath,
     clientFactory: clientFactory,
   );
   return SupabaseStorageConfig(
@@ -284,12 +280,10 @@ SupabaseStorageConfig resolveSupabaseStorageConfig(
     supabaseServiceRoleKey: db.supabaseServiceRoleKey,
     supabaseAnonKey: db.supabaseAnonKey,
     clientFactory: db.clientFactory,
-    bucketName: db.supabaseServiceRoleKey != null || db.supabaseAnonKey != null
-        ? (bucket ??
-              Platform.environment['SUPABASE_BUCKET'] ??
-              config.supabase.bucket ??
-              'bundles')
-        : (bucket ?? config.supabase.bucket ?? 'bundles'),
+    bucketName: bucket ??
+        Platform.environment['SUPABASE_BUCKET'] ??
+        config.supabase.bucket ??
+        'bundles',
     basePath:
         basePath ??
         Platform.environment['SUPABASE_BASE_PATH'] ??
@@ -387,8 +381,8 @@ PostgresConfig resolvePostgresDatabaseConfig(
 
   if (resolvedHost == null || resolvedHost.isEmpty) {
     throw StateError(
-      'Postgres host is required. Set --pg-host, POSTGRES_HOST, or '
-      '`flutter_ota_kit config set postgres.host <host>`.',
+      'Postgres host is required. Set POSTGRES_HOST env var, '
+          'or `flutter-ota config set postgres.host <host>`.',
     );
   }
 
@@ -765,15 +759,16 @@ PocketBaseDatabaseConfig resolvePocketBaseDatabaseConfig(
 
   if (resolvedUrl == null || resolvedUrl.isEmpty) {
     throw StateError(
-      'PocketBase URL is required. Set --pb-url, POCKETBASE_URL, or '
-      '`flutter_ota_kit config set pocketbase.url <url>`.',
+      'PocketBase URL is required. Set POCKETBASE_URL env var, '
+      'or `flutter-ota config set pocketbase.url <url>`.',
     );
   }
   if (resolvedEmail == null || resolvedPassword == null) {
     throw StateError(
-      'PocketBase admin credentials are required. Set --pb-email, '
-      '--pb-password, POCKETBASE_ADMIN_EMAIL/PASSWORD, or '
-      '`flutter_ota_kit config set pocketbase.*`.',
+      'PocketBase admin credentials are required. Set '
+      'POCKETBASE_ADMIN_EMAIL / POCKETBASE_ADMIN_PASSWORD env vars, or '
+      '`flutter-ota config set pocketbase.adminEmail/<email> '
+      'pocketbase.adminPassword/<password>`.',
     );
   }
 

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

@@ -62,7 +62,7 @@ class ListOptions {
 Future<Bundle> deployBundle(Backend backend, DeployOptions opts) async {
   if (opts.targetAppVersion != null && opts.fingerprintHash != null) {
     throw StateError(
-      'Use only one of target-app-version / fingerprint-hash (DB CHECK).',
+      'Use only one of target-app-version / fingerprint-hash.',
     );
   }
   if (opts.targetAppVersion == null && opts.fingerprintHash == null) {

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

@@ -17,7 +17,7 @@ import 'package:path/path.dart' as p;
 
 /// Default PocketBase version managed by the CLI. Bumped in lockstep with
 /// the rest of the stack.
-const String kDefaultPocketBaseVersion = '0.22.21';
+const String kDefaultPocketBaseVersion = '0.40.3';
 
 /// Where the binary + extracted files live.
 class PocketBaseInstallPaths {

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

@@ -4,31 +4,37 @@
 /// PB reads its data directory from the `--dir` flag (default `./pb_data`).
 /// The CLI's installer pre-creates that directory and copies hooks into
 /// `pb_data/pb_hooks/` before the first start.
+///
+/// A PID file (`pb.pid`) is written to the data directory on start so that
+/// `stop` can find and terminate the process even after the CLI restarts.
 library;
 
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:path/path.dart' as p;
 
 class PocketBaseProcess {
-  PocketBaseProcess._(this.process, this.dataDir, this.binaryPath);
+  PocketBaseProcess._(this.process, this.dataDir, this.binaryPath)
+      : _exitCodeCompleted = false {
+    process.exitCode.then((_) => _exitCodeCompleted = true);
+  }
 
   final Process process;
   final Directory dataDir;
   final File binaryPath;
+  bool _exitCodeCompleted;
 
-  bool get isRunning => true; // Process instance is always present after start.
+  bool get isRunning => !_exitCodeCompleted;
 
   int get pid => process.pid;
 
   Future<int> get exitCode => process.exitCode;
 
-  /// Returns the stdout/stderr streams merged.
   Stream<List<int>> get output => process.stdout;
   Stream<List<int>> get errors => process.stderr;
 
-  /// Send SIGINT (Ctrl+C) for a graceful shutdown, then SIGKILL if needed.
   Future<void> stop({Duration timeout = const Duration(seconds: 5)}) async {
     if (Platform.isWindows) {
       process.kill();
@@ -59,6 +65,55 @@ class PocketBaseProcessManager {
   PocketBaseProcess? _process;
   PocketBaseProcess? get process => _process;
 
+  File get pidFile => File(p.join(dataDir.path, 'pb.pid'));
+  File get configFile => File(p.join(dataDir.path, 'pb.json'));
+
+  /// Read the stored PID from the PID file, or -1 if not present.
+  int readPid() {
+    if (!pidFile.existsSync()) return -1;
+    final content = pidFile.readAsStringSync().trim();
+    return int.tryParse(content) ?? -1;
+  }
+
+  /// Check if the process identified by the PID file is still alive.
+  Future<bool> isRunningByPidFile() async {
+    final pid = readPid();
+    if (pid <= 0) return false;
+    try {
+      final result = await Process.run('kill', ['-0', '$pid']);
+      return result.exitCode == 0;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  void _writePidFile(int pid) {
+    pidFile.writeAsStringSync(pid.toString());
+  }
+
+  void _writeConfigFile(int pid) {
+    configFile.writeAsStringSync(jsonEncode({
+      'pid': pid,
+      'host': host,
+      'port': port,
+      'url': 'http://$host:$port',
+    }));
+  }
+
+  Map<String, dynamic>? readConfig() {
+    if (!configFile.existsSync()) return null;
+    try {
+      return jsonDecode(configFile.readAsStringSync()) as Map<String, dynamic>;
+    } catch (_) {
+      return null;
+    }
+  }
+
+  void deletePidFile() {
+    if (pidFile.existsSync()) pidFile.deleteSync();
+    if (configFile.existsSync()) configFile.deleteSync();
+  }
+
   /// Start PB in the background. Returns once PB is listening (or after a
   /// short timeout waiting for it to come up).
   Future<PocketBaseProcess> start({
@@ -82,11 +137,22 @@ class PocketBaseProcessManager {
 
     final mergedEnv = <String, String>{
       ...Platform.environment,
-      if (adminEmail != null) 'PB_ADMIN_EMAIL': adminEmail,
-      if (adminPassword != null) 'PB_ADMIN_PASSWORD': adminPassword,
       ...?env,
     };
 
+    // Create superuser if credentials provided (PB 0.40+ doesn't support
+    // PB_ADMIN_EMAIL env var, so we use the CLI directly).
+    if (adminEmail != null && adminPassword != null) {
+      final result = await Process.run(
+        binaryPath.path,
+        ['superuser', 'upsert', '--dir=${dataDir.path}', adminEmail, adminPassword],
+        environment: mergedEnv,
+      );
+      if (result.exitCode != 0) {
+        // Non-fatal; serve will continue but schema install may fail.
+      }
+    }
+
     final proc = await Process.start(
       binaryPath.path,
       ['serve', '--http=${host}:$port', '--dir=${dataDir.path}'],
@@ -94,8 +160,10 @@ class PocketBaseProcessManager {
       mode: ProcessStartMode.detached,
     );
 
-    // Wait for the health endpoint to come up (best-effort; fall through
-    // after readyTimeout either way).
+    _writePidFile(proc.pid);
+    _writeConfigFile(proc.pid);
+
+    // Wait for the health endpoint to come up.
     final deadline = DateTime.now().add(readyTimeout);
     while (DateTime.now().isBefore(deadline)) {
       try {
@@ -114,10 +182,45 @@ class PocketBaseProcessManager {
     return _process!;
   }
 
+  /// Stop the running process by sending SIGINT, then SIGKILL if needed.
+  /// Also cleans up the PID file.
   Future<void> stop() async {
+    final proc = _process;
+    if (proc != null) {
+      await proc.stop();
+      _process = null;
+    } else {
+      // Try stopping by PID file (for externally started processes).
+      final pid = readPid();
+      if (pid > 0) {
+        try {
+          Process.killPid(pid, ProcessSignal.sigint);
+          // Give it a moment to shut down gracefully.
+          await Future<void>.delayed(const Duration(seconds: 2));
+          // Force kill if still alive.
+          try {
+            final check = await Process.run('kill', ['-0', '$pid']);
+            if (check.exitCode == 0) {
+              Process.killPid(pid, ProcessSignal.sigkill);
+            }
+          } catch (_) {}
+        } catch (_) {}
+      }
+    }
+    deletePidFile();
+  }
+
+  /// Get combined stdout+stderr log lines from the running process.
+  Stream<String> get logStream async* {
     final proc = _process;
     if (proc == null) return;
-    await proc.stop();
-    _process = null;
+    yield* proc.output
+        .transform(utf8.decoder)
+        .transform(const LineSplitter())
+        .map((line) => '[stdout] $line');
+    yield* proc.errors
+        .transform(utf8.decoder)
+        .transform(const LineSplitter())
+        .map((line) => '[stderr] $line');
   }
 }

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

@@ -1,19 +1,22 @@
 /// Installs the flutter_ota_kit PocketBase schema (collections, indexes,
-/// default admin) on a running PB instance.
+/// default superuser) on a running PB instance.
 ///
 /// PocketBase is initialized with:
 ///   - `bundles` collection (the OTA bundle metadata)
 ///   - `channels` collection (release channels with a current_bundle pointer)
 ///   - `audit_log` collection (immutable event log)
-///   - `admins` is left to PB's built-in bootstrapping
-///     (set PB_ADMIN_EMAIL + PB_ADMIN_PASSWORD env vars on first start)
+///   - `app_meta` collection (key-value app metadata)
+///   - `bundles_patches` collection (per-bundle patch metadata)
+///   - `users` is PB's built-in auth collection
+///
+/// The first superuser is created via `pocketbase superuser upsert`
+/// before starting the server.
 ///
 /// Idempotent: re-running the installer is a no-op when collections exist.
 library;
 
 import 'dart:convert';
 
-import 'package:flutter_ota_kit_pocketbase/flutter_ota_kit_pocketbase.dart';
 import 'package:http/http.dart' as http;
 
 const _kBundlesCollection = r'''
@@ -95,6 +98,50 @@ const _kAuditLogCollection = r'''
 }
 ''';
 
+const _kBundlePatchesCollection = r'''
+{
+  "name": "bundles_patches",
+  "type": "base",
+  "listRule": null,
+  "viewRule": null,
+  "createRule": null,
+  "updateRule": null,
+  "deleteRule": null,
+  "fields": [
+    {"name": "bundle_id", "type": "text", "required": true, "options": {"max": 64}},
+    {"name": "base_bundle_id", "type": "text", "required": true, "options": {"max": 64}},
+    {"name": "base_file_hash", "type": "text", "required": true, "options": {"max": 128}},
+    {"name": "patch_file_hash", "type": "text", "required": true, "options": {"max": 128}},
+    {"name": "patch_storage_uri", "type": "text", "required": true, "options": {"max": 512}},
+    {"name": "order_index", "type": "number", "options": {"min": 0}},
+    {"name": "artifact", "type": "file", "options": {"maxSelect": 1, "maxSize": 0, "mimeTypes": []}}
+  ],
+  "indexes": [
+    "CREATE INDEX idx_patches_bundle ON bundles_patches (bundle_id)",
+    "CREATE INDEX idx_patches_base ON bundles_patches (base_bundle_id)"
+  ]
+}
+''';
+
+const _kMetaCollection = r'''
+{
+  "name": "app_meta",
+  "type": "base",
+  "listRule": null,
+  "viewRule": null,
+  "createRule": null,
+  "updateRule": null,
+  "deleteRule": null,
+  "fields": [
+    {"name": "key", "type": "text", "required": true, "options": {"min": 1, "max": 128}},
+    {"name": "value", "type": "json"}
+  ],
+  "indexes": [
+    "CREATE UNIQUE INDEX idx_meta_key ON app_meta (key)"
+  ]
+}
+''';
+
 class _RawAdminClient {
   _RawAdminClient(this.baseUrl);
   final String baseUrl;
@@ -102,7 +149,7 @@ class _RawAdminClient {
 
   Future<String> authenticate(String email, String password) async {
     final res = await http.post(
-      Uri.parse('$baseUrl/api/admins/auth-with-password'),
+      Uri.parse('$baseUrl/api/collections/_superusers/auth-with-password'),
       headers: {'content-type': 'application/json'},
       body: jsonEncode({'identity': email, 'password': password}),
     );
@@ -174,7 +221,6 @@ class PocketBaseSchemaInstaller {
     required this.url,
     required this.adminEmail,
     required this.adminPassword,
-    http.Client? httpClient,
     this.bundlesCollection = 'bundles',
     this.channelsCollection = 'channels',
     this.auditLogCollection = 'audit_log',
@@ -209,6 +255,10 @@ class PocketBaseSchemaInstaller {
     String rename(String json) {
       if (bundlesCollection != 'bundles') {
         json = json.replaceAll('"bundles"', '"$bundlesCollection"');
+        json = json.replaceAll(
+          'bundles_patches',
+          '${bundlesCollection}_patches',
+        );
       }
       if (channelsCollection != 'channels') {
         json = json.replaceAll('"channels"', '"$channelsCollection"');
@@ -219,10 +269,13 @@ class PocketBaseSchemaInstaller {
       return json;
     }
 
+    final patchesCollectionName = '${bundlesCollection}_patches';
     return [
       _CollectionSpec(bundlesCollection, rename(_kBundlesCollection)),
       _CollectionSpec(channelsCollection, rename(_kChannelsCollection)),
       _CollectionSpec(auditLogCollection, rename(_kAuditLogCollection)),
+      _CollectionSpec(patchesCollectionName, rename(_kBundlePatchesCollection)),
+      _CollectionSpec('app_meta', _kMetaCollection),
     ];
   }
 }

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

@@ -292,7 +292,7 @@ class Steps {
     _echo('  ${dim('·')} $label');
   }
 
-  /// Print boxed summary: "N applied · N skipped · N errors · TIME"
+  /// Print summary. Always inline — no box for a single line of text.
   void summary() {
     _sw.stop();
     final ms = _sw.elapsedMilliseconds;
@@ -307,7 +307,7 @@ class Steps {
     }
     if (parts.isEmpty) parts.add('no steps');
     parts.add(time);
-    box('summary', [parts.join('  ·  ')]);
+    _echo('  ${dim(parts.join('  ·  '))}');
   }
 
   /// Run a step that shows a spinner while working, then marks it

package/dart-src/packages/cli-tools/test/mocks/mock_pocketbase_client.dart

@@ -6,6 +6,7 @@
 library;
 
 import 'package:flutter_ota_kit_pocketbase/flutter_ota_kit_pocketbase.dart';
+import 'package:http/http.dart' as http;
 
 class MockPocketBaseClient implements PocketBaseClient {
   MockPocketBaseClient(this.store);
@@ -182,6 +183,154 @@ class MockPocketBaseClient implements PocketBaseClient {
   void close() {
     _closed = true;
   }
+
+  @override
+  Future<Map<String, dynamic>> healthDetailed() async => {
+    'code': 200,
+    'message': 'API is healthy.',
+    'data': {'canBackup': false},
+  };
+
+  @override
+  Future<List<PocketBaseBackup>> listBackups() async => [];
+
+  @override
+  Future<void> createBackup({String? name}) async {}
+
+  @override
+  Future<void> deleteBackup(String key) async {}
+
+  @override
+  Future<void> restoreBackup(String key) async {}
+
+  @override
+  String backupDownloadUrl(String key, String token) => '';
+
+  @override
+  Future<List<Map<String, dynamic>>> listAdmins() async => [];
+
+  @override
+  Future<Map<String, dynamic>> createAdmin({
+    required String email,
+    required String password,
+    required String passwordConfirm,
+  }) async => {'id': 'mock_admin', 'email': email};
+
+  @override
+  Future<Map<String, dynamic>> updateAdmin(
+    String id,
+    Map<String, dynamic> data,
+  ) async => data;
+
+  @override
+  Future<void> deleteAdmin(String id) async {}
+
+  @override
+  Future<List<Map<String, dynamic>>> exportCollection(String collection) async =>
+      [];
+
+  @override
+  Future<void> importCollection(
+    String collection,
+    List<Map<String, dynamic>> records,
+  ) async {}
+
+  @override
+  Future<http.Response> rawRequest(
+    String method,
+    String path, {
+    Map<String, dynamic>? body,
+  }) async => http.Response('{}', 200);
+
+  @override
+  Future<List<int>> downloadFileUnauth(String url) async => [];
+
+  @override
+  Future<Map<String, dynamic>> listLogs({
+    String? filter, String? sort, int page = 1, int perPage = 30,
+  }) async => {'items': [], 'totalItems': 0};
+
+  @override
+  Future<Map<String, dynamic>> getLog(String id) async => {};
+
+  @override
+  Future<List<Map<String, dynamic>>> getLogStats({String? filter}) async => [];
+
+  @override
+  Future<void> truncateLogs() async {}
+
+  @override
+  Future<List<Map<String, dynamic>>> listCollections() async => [];
+
+  @override
+  Future<Map<String, dynamic>> getCollection(String nameOrId) async => {};
+
+  @override
+  Future<Map<String, dynamic>> createCollection(
+    Map<String, dynamic> body,
+  ) async => body;
+
+  @override
+  Future<Map<String, dynamic>> updateCollection(
+    String nameOrId,
+    Map<String, dynamic> body,
+  ) async => body;
+
+  @override
+  Future<void> deleteCollection(String nameOrId) async {}
+
+  @override
+  Future<void> truncateCollection(String nameOrId) async {}
+
+  @override
+  Future<void> importCollections(
+    List<Map<String, dynamic>> collections, {
+    bool deleteMissing = false,
+  }) async {}
+
+  @override
+  Future<void> uploadBackup(List<int> bytes, {String? name}) async {}
+
+  @override
+  Future<List<Map<String, dynamic>>> batch(
+    List<Map<String, dynamic>> requests,
+  ) async => [];
+
+  @override
+  Future<Map<String, dynamic>> listSettings() async => {};
+
+  @override
+  Future<Map<String, dynamic>> updateSettings(
+    Map<String, dynamic> body,
+  ) async => body;
+
+  @override
+  Future<void> testS3(String filesystem) async {}
+
+  @override
+  Future<void> testEmail({
+    required String email,
+    required String template,
+    String? collection,
+  }) async {}
+
+  @override
+  Future<Map<String, dynamic>> runSql(String query) async => {};
+
+  @override
+  Future<List<Map<String, dynamic>>> listCrons() async => [];
+
+  @override
+  Future<void> runCron(String jobId) async {}
+
+  @override
+  Future<Map<String, dynamic>> getCollectionScaffolds() async => {};
+
+  @override
+  Future<List<Map<String, dynamic>>> listOAuth2Providers() async => [];
+
+  @override
+  Future<Map<String, dynamic>> dryRunViewQuery(String query) async => {};
 }
 
 /// In-memory store backing [MockPocketBaseClient].