@_nazmiforreal/flutter-ota 0.1.20 → 0.1.22

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

@@ -18,7 +18,7 @@ import '../pocketbase/schema_installer.dart';
 import '../ui/ui.dart';
 
 class PocketBaseCommand extends FlutterPatcherCommand {
-   PocketBaseCommand() {
+  PocketBaseCommand() {
     addSubcommand(PocketBaseInstallCommand());
     addSubcommand(PocketBaseServeCommand());
     addSubcommand(PocketBaseStopCommand());
@@ -46,7 +46,7 @@ class PocketBaseCommand extends FlutterPatcherCommand {
   String get description =>
       'Manage a local PocketBase instance (install / serve / stop / '
       'status / backup / export / import / admin / migrate / health / '
-      'logs / records / collections / settings / sql / crons).';
+      'logs / records / collections / settings / sql / crons / query / config).';
 }
 
 class PocketBaseInstallCommand extends FlutterPatcherCommand {
@@ -91,7 +91,11 @@ class PocketBaseServeCommand extends FlutterPatcherCommand {
   PocketBaseServeCommand() {
     argParser.addOption('version', help: 'PocketBase version.');
     argParser.addOption('port', help: 'PB HTTP port.', defaultsTo: '8090');
-    argParser.addOption('host', help: 'PB bind address.', defaultsTo: '127.0.0.1');
+    argParser.addOption(
+      'host',
+      help: 'PB bind address.',
+      defaultsTo: '127.0.0.1',
+    );
     argParser.addOption('data-dir', help: 'PB data directory.');
     argParser.addOption('admin-email', help: 'Bootstrap admin email.');
     argParser.addOption('admin-password', help: 'Bootstrap admin password.');
@@ -225,18 +229,36 @@ class PocketBaseServeCommand extends FlutterPatcherCommand {
 }
 
 class PocketBaseStopCommand extends FlutterPatcherCommand {
+  PocketBaseStopCommand() {
+    argParser.addOption('port', help: 'HTTP port.', defaultsTo: '8090');
+    argParser.addOption('host', help: 'Bind address.', defaultsTo: '127.0.0.1');
+  }
+
   @override
   String get name => 'stop';
 
   @override
-  String get description =>
-      'Hint to stop a running PocketBase (Ctrl+C in serve).';
+  String get description => 'Stop a running PocketBase instance.';
 
   @override
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · stop');
-    step('Use Ctrl+C on the running serve process to stop PocketBase.');
-    return;
+    final port = int.tryParse(argResults!['port'] as String? ?? '8090') ?? 8090;
+    final host = argResults!['host'] as String? ?? '127.0.0.1';
+    final mgr = PocketBaseProcessManager(
+      binaryPath: PocketBaseInstallPaths.resolve().binaryPath,
+      dataDir: PocketBaseInstallPaths.resolve().installDir,
+      port: port,
+      host: host,
+    );
+    final pid = mgr.readPid();
+    if (pid <= 0) {
+      step('No PocketBase process found.');
+      return;
+    }
+    step('Stopping PocketBase (PID $pid)...');
+    await mgr.stop();
+    step('PocketBase stopped.');
   });
 }
 
@@ -281,7 +303,10 @@ class PocketBaseStatusCommand extends FlutterPatcherCommand {
     box('status', [
       kv('version', paths.version),
       kv('binary', exists ? green('installed') : red('not installed')),
-      kv('pid', pidAlive ? green('$pid') : (pid > 0 ? yellow('$pid (dead)') : dim('-'))),
+      kv(
+        'pid',
+        pidAlive ? green('$pid') : (pid > 0 ? yellow('$pid (dead)') : dim('-')),
+      ),
       kv('health', healthy ? green('healthy') : red('unreachable')),
       kv('url', 'http://$host:$port'),
     ]);
@@ -300,7 +325,14 @@ void _addBackendOptions(ArgParser parser) {
   parser.addOption('data-dir', help: 'PB data directory.');
 }
 
-(String url, String adminEmail, String adminPassword) _resolveBackend(ArgResults r) {
+String _safeSubstring(String? s, int length) {
+  if (s == null || s.isEmpty) return '';
+  return s.length > length ? s.substring(0, length) : s;
+}
+
+(String url, String adminEmail, String adminPassword) _resolveBackend(
+  ArgResults r,
+) {
   final url = r['url'] as String? ?? _detectRunningUrl(r);
   if (url == null || url.isEmpty) {
     throw const PackException(
@@ -308,10 +340,12 @@ void _addBackendOptions(ArgParser parser) {
       64,
     );
   }
-  final admin = r['admin-email'] as String? ??
+  final admin =
+      r['admin-email'] as String? ??
       Platform.environment['POCKETBASE_ADMIN_EMAIL'] ??
       '';
-  final pass = r['admin-password'] as String? ??
+  final pass =
+      r['admin-password'] as String? ??
       Platform.environment['POCKETBASE_ADMIN_PASSWORD'] ??
       '';
   if (admin.isEmpty || pass.isEmpty) {
@@ -464,7 +498,11 @@ class PocketBaseBackupDeleteCommand extends FlutterPatcherCommand {
 class PocketBaseBackupRestoreCommand extends FlutterPatcherCommand {
   PocketBaseBackupRestoreCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('name', help: 'Backup key to restore.', mandatory: true);
+    argParser.addOption(
+      'name',
+      help: 'Backup key to restore.',
+      mandatory: true,
+    );
   }
 
   @override
@@ -485,7 +523,11 @@ class PocketBaseBackupRestoreCommand extends FlutterPatcherCommand {
 class PocketBaseBackupDownloadCommand extends FlutterPatcherCommand {
   PocketBaseBackupDownloadCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('name', help: 'Backup key to download.', mandatory: true);
+    argParser.addOption(
+      'name',
+      help: 'Backup key to download.',
+      mandatory: true,
+    );
     argParser.addOption('output', help: 'Output directory.', defaultsTo: '.');
   }
 
@@ -500,16 +542,20 @@ class PocketBaseBackupDownloadCommand extends FlutterPatcherCommand {
     banner('pocketbase · backup · download');
     final key = argResults!['name'] as String;
     final output = argResults!['output'] as String;
-    final token = await _pbStep('Getting file token', (c) => c.getFileToken('', ''), argResults!);
-    final (url, _, _) = _resolveBackend(argResults!);
+    final (url, admin, pass) = _resolveBackend(argResults!);
     final dlClient = PocketBaseClient(url);
-    final url2 = dlClient.backupDownloadUrl(key, token);
-    final bytes = await dlClient.downloadFileUnauth(url2);
-    dlClient.close();
-    final out = File(p.join(output, key));
-    await out.parent.create(recursive: true);
-    await out.writeAsBytes(bytes);
-    step(green('Saved to ${out.path}'));
+    try {
+      await dlClient.authenticate(admin, pass);
+      final token = dlClient.authToken;
+      final dlUrl = dlClient.backupDownloadUrl(key, token);
+      final bytes = await dlClient.downloadFileUnauth(dlUrl);
+      final out = File(p.join(output, key));
+      await out.parent.create(recursive: true);
+      await out.writeAsBytes(bytes);
+      step(green('Saved to ${out.path}'));
+    } finally {
+      dlClient.close();
+    }
   });
 }
 
@@ -566,39 +612,48 @@ class PocketBaseExportCommand extends FlutterPatcherCommand {
     final collection = r['collection'] as String?;
     final output = r['output'] as String;
 
-    final client = PocketBaseClient(_resolveBackend(r).$1);
-    await client.authenticate(_resolveBackend(r).$2, _resolveBackend(r).$3);
-
-    final collections = <String>[];
-    if (collection != null && collection.isNotEmpty) {
-      collections.add(collection);
-    } else {
-      final all = await client.listCollections();
-      for (final c in all) {
-        final name = c['name'] as String? ?? '';
-        if (name.isNotEmpty && !name.startsWith('_') && c['system'] != true) {
-          collections.add(name);
+    final (url, admin, pass) = _resolveBackend(r);
+    final client = PocketBaseClient(url);
+    try {
+      await client.authenticate(admin, pass);
+
+      final collections = <String>[];
+      if (collection != null && collection.isNotEmpty) {
+        collections.add(collection);
+      } else {
+        final all = await client.listCollections();
+        for (final c in all) {
+          final name = c['name'] as String? ?? '';
+          if (name.isNotEmpty && !name.startsWith('_') && c['system'] != true) {
+            collections.add(name);
+          }
+        }
+        if (collections.isEmpty) {
+          collections.addAll([
+            'bundles',
+            'channels',
+            'audit_log',
+            'bundles_patches',
+          ]);
         }
       }
-      if (collections.isEmpty) {
-        collections.addAll(['bundles', 'channels', 'audit_log', 'bundles_patches']);
-      }
-    }
 
-    for (final c in collections) {
-      try {
-        final records = await client.exportCollection(c);
-        final outFile = File(p.join(output, '$c.json'));
-        await outFile.parent.create(recursive: true);
-        await outFile.writeAsString(
-          const JsonEncoder.withIndent('  ').convert(records),
-        );
-        step('${records.length} records → ${outFile.path}');
-      } catch (e) {
-        warn('Failed to export $c: $e');
+      for (final c in collections) {
+        try {
+          final records = await client.exportCollection(c);
+          final outFile = File(p.join(output, '$c.json'));
+          await outFile.parent.create(recursive: true);
+          await outFile.writeAsString(
+            const JsonEncoder.withIndent('  ').convert(records),
+          );
+          step('${records.length} records → ${outFile.path}');
+        } catch (e) {
+          warn('Failed to export $c: $e');
+        }
       }
+    } finally {
+      client.close();
     }
-    client.close();
   });
 }
 
@@ -613,7 +668,8 @@ class PocketBaseImportCommand extends FlutterPatcherCommand {
   String get name => 'import';
 
   @override
-  String get description => 'Import records from a JSON file into a collection.';
+  String get description =>
+      'Import records from a JSON file into a collection.';
 
   @override
   Future<int> run() => runGuarded(() async {
@@ -674,10 +730,14 @@ class PocketBaseAdminCreateCommand extends FlutterPatcherCommand {
     final password = r['password'] as String;
     final result = await _pbStep(
       'Creating admin $email',
-      (c) => c.createAdmin(email: email, password: password, passwordConfirm: password),
+      (c) => c.createAdmin(
+        email: email,
+        password: password,
+        passwordConfirm: password,
+      ),
       r,
     );
-    box('admin', [kv('id', cyan(result['id'] ?? '?')), kv('email', email)]);
+    stdout.writeln('  ${dim('→')} admin ${cyan(result['id'] ?? '?')} $email');
   });
 }
 
@@ -695,13 +755,22 @@ class PocketBaseAdminListCommand extends FlutterPatcherCommand {
   @override
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · admin · list');
-    final admins = await _pbStep('Listing admins', (c) => c.listAdmins(), argResults!);
+    final admins = await _pbStep(
+      'Listing admins',
+      (c) => c.listAdmins(),
+      argResults!,
+    );
     if (admins.isEmpty) {
       warn('No admins found.');
       return;
     }
     final rows = admins
-        .map((a) => [cyan(a['id']?.toString() ?? '?'), a['email']?.toString() ?? '?'])
+        .map(
+          (a) => [
+            cyan(a['id']?.toString() ?? '?'),
+            a['email']?.toString() ?? '?',
+          ],
+        )
         .toList();
     table('${admins.length} admins', ['ID', 'EMAIL'], rows);
   });
@@ -711,7 +780,11 @@ class PocketBaseAdminUpdateCommand extends FlutterPatcherCommand {
   PocketBaseAdminUpdateCommand() {
     _addBackendOptions(argParser);
     argParser.addOption('id', help: 'Admin ID to update.', mandatory: true);
-    argParser.addOption('body', help: 'JSON fields to update.', mandatory: true);
+    argParser.addOption(
+      'body',
+      help: 'JSON fields to update.',
+      mandatory: true,
+    );
   }
 
   @override
@@ -804,15 +877,18 @@ class PocketBaseHealthCommand extends FlutterPatcherCommand {
   @override
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · health');
-    final health = await _pbStep('health', (c) => c.healthDetailed(), argResults!);
+    final health = await _pbStep(
+      'health',
+      (c) => c.healthDetailed(),
+      argResults!,
+    );
     final code = health['code'] as int? ?? 0;
     final message = health['message'] as String? ?? '';
     final data = health['data'] as Map<String, dynamic>? ?? {};
-    box('health', [
-      kv('status', code == 200 ? green('healthy') : red('unhealthy')),
-      kv('message', message),
-      if (data.isNotEmpty) kv('canBackup', '${data['canBackup'] ?? false}'),
-    ]);
+    final status = code == 200 ? green('healthy') : red('unhealthy');
+    step('status      $status');
+    step('message     $message');
+    step('canBackup   ${data['canBackup'] ?? false}');
   });
 }
 
@@ -871,11 +947,15 @@ class PocketBaseLogsListCommand extends FlutterPatcherCommand {
     }
     final rows = items.map((log) {
       final level = log['level'] as int? ?? 0;
-      final lvl = level == 0 ? green('INFO') : level == 1 ? yellow('WARN') : red('ERROR');
+      final lvl = level == 0
+          ? green('INFO')
+          : level == 1
+          ? yellow('WARN')
+          : red('ERROR');
       final msg = (log['message'] as String? ?? '').length > 60
           ? '${(log['message'] as String).substring(0, 57)}...'
           : log['message'] as String? ?? '';
-      return [lvl, log['created']?.toString().substring(0, 19) ?? '', msg];
+      return [lvl, _safeSubstring(log['created']?.toString(), 19), msg];
     }).toList();
     table('$total logs', ['LEVEL', 'TIME', 'MESSAGE'], rows);
   });
@@ -905,10 +985,14 @@ class PocketBaseLogsStatsCommand extends FlutterPatcherCommand {
       warn('No stats available.');
       return;
     }
-    final rows = stats.map((s) => [
-      s['date']?.toString().substring(0, 16) ?? '',
-      '${s['total'] ?? 0}',
-    ]).toList();
+    final rows = stats
+        .map(
+          (s) => [
+            _safeSubstring(s['date']?.toString(), 16),
+            '${s['total'] ?? 0}',
+          ],
+        )
+        .toList();
     table('${stats.length} entries', ['TIME', 'COUNT'], rows);
   });
 }
@@ -956,7 +1040,11 @@ class PocketBaseRecordsCommand extends FlutterPatcherCommand {
 class PocketBaseRecordsListCommand extends FlutterPatcherCommand {
   PocketBaseRecordsListCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('collection', help: 'Collection name.', mandatory: true);
+    argParser.addOption(
+      'collection',
+      help: 'Collection name.',
+      mandatory: true,
+    );
     argParser.addOption('filter', help: 'PB filter expression.');
     argParser.addOption('sort', help: 'Sort field.');
     argParser.addOption('page', help: 'Page number.', defaultsTo: '1');
@@ -991,16 +1079,25 @@ class PocketBaseRecordsListCommand extends FlutterPatcherCommand {
     }
     final rows = data.items.map((r) {
       final m = r as Map<String, dynamic>;
-      return [cyan(m['id']?.toString() ?? '?'), m.values.first?.toString() ?? ''];
+      final label =
+          m['name']?.toString() ??
+          m['updated']?.toString() ??
+          m['created']?.toString() ??
+          '';
+      return [cyan(m['id']?.toString() ?? '?'), label];
     }).toList();
-    table('${data.totalItems} records', ['ID', 'FIRST FIELD'], rows);
+    table('${data.totalItems} records', ['ID', 'LABEL'], rows);
   });
 }
 
 class PocketBaseRecordsGetCommand extends FlutterPatcherCommand {
   PocketBaseRecordsGetCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('collection', help: 'Collection name.', mandatory: true);
+    argParser.addOption(
+      'collection',
+      help: 'Collection name.',
+      mandatory: true,
+    );
     argParser.addOption('id', help: 'Record ID.', mandatory: true);
   }
 
@@ -1016,7 +1113,11 @@ class PocketBaseRecordsGetCommand extends FlutterPatcherCommand {
     final r = argResults!;
     final record = await _pbStep(
       'Getting ${r['collection']}/${r['id']}',
-      (c) => c.getRecord<dynamic>(r['collection'] as String, r['id'] as String, (j) => j),
+      (c) => c.getRecord<dynamic>(
+        r['collection'] as String,
+        r['id'] as String,
+        (j) => j,
+      ),
       r,
     );
     if (record == null) {
@@ -1030,7 +1131,11 @@ class PocketBaseRecordsGetCommand extends FlutterPatcherCommand {
 class PocketBaseRecordsCreateCommand extends FlutterPatcherCommand {
   PocketBaseRecordsCreateCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('collection', help: 'Collection name.', mandatory: true);
+    argParser.addOption(
+      'collection',
+      help: 'Collection name.',
+      mandatory: true,
+    );
     argParser.addOption('body', help: 'JSON body.', mandatory: true);
   }
 
@@ -1050,14 +1155,20 @@ class PocketBaseRecordsCreateCommand extends FlutterPatcherCommand {
       (c) => c.createRecord<dynamic>(r['collection'] as String, body, (j) => j),
       r,
     );
-    box('record', [kv('id', cyan((record as Map)['id']?.toString() ?? '?'))]);
+    stdout.writeln(
+      '  ${dim('→')} record ${cyan((record as Map)['id']?.toString() ?? '?')}',
+    );
   });
 }
 
 class PocketBaseRecordsUpdateCommand extends FlutterPatcherCommand {
   PocketBaseRecordsUpdateCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('collection', help: 'Collection name.', mandatory: true);
+    argParser.addOption(
+      'collection',
+      help: 'Collection name.',
+      mandatory: true,
+    );
     argParser.addOption('id', help: 'Record ID.', mandatory: true);
     argParser.addOption('body', help: 'JSON body.', mandatory: true);
   }
@@ -1075,7 +1186,12 @@ class PocketBaseRecordsUpdateCommand extends FlutterPatcherCommand {
     final body = jsonDecode(r['body'] as String) as Map<String, dynamic>;
     await _pbStep(
       'Updating ${r['collection']}/${r['id']}',
-      (c) => c.updateRecord<dynamic>(r['collection'] as String, r['id'] as String, body, (j) => j),
+      (c) => c.updateRecord<dynamic>(
+        r['collection'] as String,
+        r['id'] as String,
+        body,
+        (j) => j,
+      ),
       r,
     );
     step(green('Updated ${r['collection']}/${r['id']}'));
@@ -1085,7 +1201,11 @@ class PocketBaseRecordsUpdateCommand extends FlutterPatcherCommand {
 class PocketBaseRecordsDeleteCommand extends FlutterPatcherCommand {
   PocketBaseRecordsDeleteCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('collection', help: 'Collection name.', mandatory: true);
+    argParser.addOption(
+      'collection',
+      help: 'Collection name.',
+      mandatory: true,
+    );
     argParser.addOption('id', help: 'Record ID.', mandatory: true);
   }
 
@@ -1111,19 +1231,25 @@ class PocketBaseRecordsDeleteCommand extends FlutterPatcherCommand {
 class PocketBaseRecordsBatchCommand extends FlutterPatcherCommand {
   PocketBaseRecordsBatchCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('requests', help: 'JSON array of request objects.', mandatory: true);
+    argParser.addOption(
+      'requests',
+      help: 'JSON array of request objects.',
+      mandatory: true,
+    );
   }
 
   @override
   String get name => 'batch';
 
   @override
-  String get description => 'Execute multiple record operations in a single transaction.';
+  String get description =>
+      'Execute multiple record operations in a single transaction.';
 
   @override
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · records · batch');
-    final requests = jsonDecode(argResults!['requests'] as String) as List<dynamic>;
+    final requests =
+        jsonDecode(argResults!['requests'] as String) as List<dynamic>;
     final body = requests.cast<Map<String, dynamic>>();
     final results = await _pbStep(
       'Executing ${body.length} batch requests',
@@ -1171,16 +1297,24 @@ class PocketBaseCollectionsListCommand extends FlutterPatcherCommand {
   @override
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · collections · list');
-    final cols = await _pbStep('Listing collections', (c) => c.listCollections(), argResults!);
+    final cols = await _pbStep(
+      'Listing collections',
+      (c) => c.listCollections(),
+      argResults!,
+    );
     if (cols.isEmpty) {
       warn('No collections found.');
       return;
     }
-    final rows = cols.map((c) => [
-      cyan(c['name']?.toString() ?? '?'),
-      c['type']?.toString() ?? '?',
-      '${(c['fields'] as List?)?.length ?? 0} fields',
-    ]).toList();
+    final rows = cols
+        .map(
+          (c) => [
+            cyan(c['name']?.toString() ?? '?'),
+            c['type']?.toString() ?? '?',
+            '${(c['fields'] as List?)?.length ?? 0} fields',
+          ],
+        )
+        .toList();
     table('${cols.length} collections', ['NAME', 'TYPE', 'FIELDS'], rows);
   });
 }
@@ -1188,7 +1322,11 @@ class PocketBaseCollectionsListCommand extends FlutterPatcherCommand {
 class PocketBaseCollectionsViewCommand extends FlutterPatcherCommand {
   PocketBaseCollectionsViewCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('name', help: 'Collection name or ID.', mandatory: true);
+    argParser.addOption(
+      'name',
+      help: 'Collection name or ID.',
+      mandatory: true,
+    );
   }
 
   @override
@@ -1201,7 +1339,11 @@ class PocketBaseCollectionsViewCommand extends FlutterPatcherCommand {
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · collections · view');
     final name = argResults!['name'] as String;
-    final col = await _pbStep('Viewing $name', (c) => c.getCollection(name), argResults!);
+    final col = await _pbStep(
+      'Viewing $name',
+      (c) => c.getCollection(name),
+      argResults!,
+    );
     stdout.writeln(const JsonEncoder.withIndent('  ').convert(col));
   });
 }
@@ -1209,7 +1351,11 @@ class PocketBaseCollectionsViewCommand extends FlutterPatcherCommand {
 class PocketBaseCollectionsCreateCommand extends FlutterPatcherCommand {
   PocketBaseCollectionsCreateCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('body', help: 'JSON collection definition.', mandatory: true);
+    argParser.addOption(
+      'body',
+      help: 'JSON collection definition.',
+      mandatory: true,
+    );
   }
 
   @override
@@ -1221,9 +1367,13 @@ class PocketBaseCollectionsCreateCommand extends FlutterPatcherCommand {
   @override
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · collections · create');
-    final body = jsonDecode(argResults!['body'] as String) as Map<String, dynamic>;
-    await _pbStep('Creating ${body['name'] ?? 'collection'}',
-      (c) => c.createCollection(body), argResults!);
+    final body =
+        jsonDecode(argResults!['body'] as String) as Map<String, dynamic>;
+    await _pbStep(
+      'Creating ${body['name'] ?? 'collection'}',
+      (c) => c.createCollection(body),
+      argResults!,
+    );
     step(green('Created ${body['name'] ?? 'collection'}'));
   });
 }
@@ -1231,8 +1381,16 @@ class PocketBaseCollectionsCreateCommand extends FlutterPatcherCommand {
 class PocketBaseCollectionsUpdateCommand extends FlutterPatcherCommand {
   PocketBaseCollectionsUpdateCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('name', help: 'Collection name or ID.', mandatory: true);
-    argParser.addOption('body', help: 'JSON fields to update.', mandatory: true);
+    argParser.addOption(
+      'name',
+      help: 'Collection name or ID.',
+      mandatory: true,
+    );
+    argParser.addOption(
+      'body',
+      help: 'JSON fields to update.',
+      mandatory: true,
+    );
   }
 
   @override
@@ -1255,7 +1413,11 @@ class PocketBaseCollectionsUpdateCommand extends FlutterPatcherCommand {
 class PocketBaseCollectionsDeleteCommand extends FlutterPatcherCommand {
   PocketBaseCollectionsDeleteCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('name', help: 'Collection name or ID.', mandatory: true);
+    argParser.addOption(
+      'name',
+      help: 'Collection name or ID.',
+      mandatory: true,
+    );
   }
 
   @override
@@ -1268,7 +1430,11 @@ class PocketBaseCollectionsDeleteCommand extends FlutterPatcherCommand {
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · collections · delete');
     final name = argResults!['name'] as String;
-    await _pbStep('Deleting $name', (c) => c.deleteCollection(name), argResults!);
+    await _pbStep(
+      'Deleting $name',
+      (c) => c.deleteCollection(name),
+      argResults!,
+    );
     step(green('Deleted collection $name'));
   });
 }
@@ -1276,7 +1442,11 @@ class PocketBaseCollectionsDeleteCommand extends FlutterPatcherCommand {
 class PocketBaseCollectionsTruncateCommand extends FlutterPatcherCommand {
   PocketBaseCollectionsTruncateCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('name', help: 'Collection name or ID.', mandatory: true);
+    argParser.addOption(
+      'name',
+      help: 'Collection name or ID.',
+      mandatory: true,
+    );
   }
 
   @override
@@ -1289,7 +1459,11 @@ class PocketBaseCollectionsTruncateCommand extends FlutterPatcherCommand {
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · collections · truncate');
     final name = argResults!['name'] as String;
-    await _pbStep('Truncating $name', (c) => c.truncateCollection(name), argResults!);
+    await _pbStep(
+      'Truncating $name',
+      (c) => c.truncateCollection(name),
+      argResults!,
+    );
     step(green('Truncated $name'));
   });
 }
@@ -1297,8 +1471,16 @@ class PocketBaseCollectionsTruncateCommand extends FlutterPatcherCommand {
 class PocketBaseCollectionsImportCommand extends FlutterPatcherCommand {
   PocketBaseCollectionsImportCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('file', help: 'JSON file with collections config.', mandatory: true);
-    argParser.addFlag('delete-missing', help: 'Delete collections not in file.', defaultsTo: false);
+    argParser.addOption(
+      'file',
+      help: 'JSON file with collections config.',
+      mandatory: true,
+    );
+    argParser.addFlag(
+      'delete-missing',
+      help: 'Delete collections not in file.',
+      defaultsTo: false,
+    );
   }
 
   @override
@@ -1318,7 +1500,8 @@ class PocketBaseCollectionsImportCommand extends FlutterPatcherCommand {
     final cols = json.cast<Map<String, dynamic>>();
     await _pbStep(
       'Importing ${cols.length} collections',
-      (c) => c.importCollections(cols, deleteMissing: r['delete-missing'] as bool),
+      (c) =>
+          c.importCollections(cols, deleteMissing: r['delete-missing'] as bool),
       r,
     );
     step(green('Imported ${cols.length} collections'));
@@ -1358,7 +1541,11 @@ class PocketBaseSettingsListCommand extends FlutterPatcherCommand {
   @override
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · settings · list');
-    final settings = await _pbStep('Fetching settings', (c) => c.listSettings(), argResults!);
+    final settings = await _pbStep(
+      'Fetching settings',
+      (c) => c.listSettings(),
+      argResults!,
+    );
     stdout.writeln(const JsonEncoder.withIndent('  ').convert(settings));
   });
 }
@@ -1366,7 +1553,11 @@ class PocketBaseSettingsListCommand extends FlutterPatcherCommand {
 class PocketBaseSettingsUpdateCommand extends FlutterPatcherCommand {
   PocketBaseSettingsUpdateCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('body', help: 'JSON object with settings to update.', mandatory: true);
+    argParser.addOption(
+      'body',
+      help: 'JSON object with settings to update.',
+      mandatory: true,
+    );
   }
 
   @override
@@ -1378,8 +1569,13 @@ class PocketBaseSettingsUpdateCommand extends FlutterPatcherCommand {
   @override
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · settings · update');
-    final body = jsonDecode(argResults!['body'] as String) as Map<String, dynamic>;
-    await _pbStep('Updating settings', (c) => c.updateSettings(body), argResults!);
+    final body =
+        jsonDecode(argResults!['body'] as String) as Map<String, dynamic>;
+    await _pbStep(
+      'Updating settings',
+      (c) => c.updateSettings(body),
+      argResults!,
+    );
     step(green('Settings updated'));
   });
 }
@@ -1387,7 +1583,11 @@ class PocketBaseSettingsUpdateCommand extends FlutterPatcherCommand {
 class PocketBaseSettingsTestS3Command extends FlutterPatcherCommand {
   PocketBaseSettingsTestS3Command() {
     _addBackendOptions(argParser);
-    argParser.addOption('filesystem', help: 'Storage filesystem to test.', defaultsTo: 'storage');
+    argParser.addOption(
+      'filesystem',
+      help: 'Storage filesystem to test.',
+      defaultsTo: 'storage',
+    );
   }
 
   @override
@@ -1443,7 +1643,11 @@ class PocketBaseSettingsTestEmailCommand extends FlutterPatcherCommand {
 class PocketBaseSqlCommand extends FlutterPatcherCommand {
   PocketBaseSqlCommand() {
     _addBackendOptions(argParser);
-    argParser.addOption('query', help: 'SQL query to execute.', mandatory: true);
+    argParser.addOption(
+      'query',
+      help: 'SQL query to execute.',
+      mandatory: true,
+    );
   }
 
   @override
@@ -1456,8 +1660,13 @@ class PocketBaseSqlCommand extends FlutterPatcherCommand {
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · sql');
     final query = argResults!['query'] as String;
-    final result = await _pbStep('Executing query', (c) => c.runSql(query), argResults!);
-    final columns = (result['columns'] as List? ?? []).cast<Map<String, dynamic>>();
+    final result = await _pbStep(
+      'Executing query',
+      (c) => c.runSql(query),
+      argResults!,
+    );
+    final columns = (result['columns'] as List? ?? [])
+        .cast<Map<String, dynamic>>();
     final rows = (result['rows'] as List? ?? []).cast<List<dynamic>>();
     if (rows.isNotEmpty) {
       final colNames = columns.map((c) => '${c['name']}').toList();
@@ -1500,15 +1709,23 @@ class PocketBaseCronsListCommand extends FlutterPatcherCommand {
   @override
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · crons · list');
-    final crons = await _pbStep('Fetching cron jobs', (c) => c.listCrons(), argResults!);
+    final crons = await _pbStep(
+      'Fetching cron jobs',
+      (c) => c.listCrons(),
+      argResults!,
+    );
     if (crons.isEmpty) {
       warn('No cron jobs registered.');
       return;
     }
-    final rows = crons.map((c) => [
-      cyan(c['id']?.toString() ?? '?'),
-      c['expression']?.toString() ?? '?',
-    ]).toList();
+    final rows = crons
+        .map(
+          (c) => [
+            cyan(c['id']?.toString() ?? '?'),
+            c['expression']?.toString() ?? '?',
+          ],
+        )
+        .toList();
     table('${crons.length} cron jobs', ['ID', 'EXPRESSION'], rows);
   });
 }
@@ -1563,11 +1780,17 @@ class PocketBaseQueryCommand extends FlutterPatcherCommand {
     if (bodyStr != null && bodyStr.isNotEmpty) {
       body = jsonDecode(bodyStr) as Map<String, dynamic>;
     }
-    final client = PocketBaseClient(_resolveBackend(r).$1);
-    await client.authenticate(_resolveBackend(r).$2, _resolveBackend(r).$3);
-    final res = await client.rawRequest(method, path, body: body);
-    client.close();
-    stdout.writeln(const JsonEncoder.withIndent('  ').convert(jsonDecode(res.body)));
+    final (url, admin, pass) = _resolveBackend(r);
+    final client = PocketBaseClient(url);
+    try {
+      await client.authenticate(admin, pass);
+      final res = await client.rawRequest(method, path, body: body);
+      stdout.writeln(
+        const JsonEncoder.withIndent('  ').convert(jsonDecode(res.body)),
+      );
+    } finally {
+      client.close();
+    }
   });
 }
 
@@ -1596,7 +1819,10 @@ class PocketBaseConfigCommand extends FlutterPatcherCommand {
       kv('url', cyan(url)),
       kv('admin', admin),
       kv('version', paths.version),
-      kv('binary', exists ? green(paths.binaryPath.path) : red('not installed')),
+      kv(
+        'binary',
+        exists ? green(paths.binaryPath.path) : red('not installed'),
+      ),
     ]);
   });
 }