@_nazmiforreal/flutter-ota 0.1.19 → 0.1.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dart-src/packages/cli-tools/lib/flutter_ota_kit_cli.dart +4 -3
- package/dart-src/packages/cli-tools/lib/src/cli_base.dart +3 -2
- package/dart-src/packages/cli-tools/lib/src/commands/bundle.dart +22 -10
- package/dart-src/packages/cli-tools/lib/src/commands/channel.dart +16 -5
- package/dart-src/packages/cli-tools/lib/src/commands/config_command.dart +3 -0
- package/dart-src/packages/cli-tools/lib/src/commands/console.dart +7 -8
- package/dart-src/packages/cli-tools/lib/src/commands/deploy.dart +12 -3
- package/dart-src/packages/cli-tools/lib/src/commands/doctor.dart +129 -6
- package/dart-src/packages/cli-tools/lib/src/commands/fingerprint.dart +2 -1
- package/dart-src/packages/cli-tools/lib/src/commands/init.dart +23 -14
- package/dart-src/packages/cli-tools/lib/src/commands/keys.dart +4 -0
- package/dart-src/packages/cli-tools/lib/src/commands/migrate.dart +266 -26
- package/dart-src/packages/cli-tools/lib/src/commands/pocketbase.dart +1422 -16
- package/dart-src/packages/cli-tools/lib/src/commands/rollback.dart +4 -1
- package/dart-src/packages/cli-tools/lib/src/commands/storage.dart +10 -9
- package/dart-src/packages/cli-tools/lib/src/config.dart +14 -19
- package/dart-src/packages/cli-tools/lib/src/operations.dart +1 -1
- package/dart-src/packages/cli-tools/lib/src/pocketbase/installer.dart +1 -1
- package/dart-src/packages/cli-tools/lib/src/pocketbase/process_manager.dart +113 -10
- package/dart-src/packages/cli-tools/lib/src/pocketbase/schema_installer.dart +59 -6
- package/dart-src/packages/cli-tools/lib/src/ui/ui.dart +2 -2
- package/dart-src/packages/cli-tools/test/mocks/mock_pocketbase_client.dart +149 -0
- package/dart-src/packages/cli-tools/test/pocketbase_schema_test.dart +14 -9
- package/dart-src/packages/core/CHANGELOG.md +6 -1
- package/dart-src/packages/core/lib/flutter_ota_kit_core.dart +2 -0
- package/dart-src/packages/core/lib/src/app_update_info.dart +73 -1
- package/dart-src/packages/core/lib/src/bundle.dart +62 -17
- package/dart-src/packages/core/lib/src/bundle_artifacts.dart +7 -3
- package/dart-src/packages/core/lib/src/bundle_patch_artifact.dart +16 -0
- package/dart-src/packages/core/lib/src/changed_asset.dart +33 -3
- package/dart-src/packages/core/lib/src/get_bundles_args.dart +24 -2
- package/dart-src/packages/core/lib/src/platform.dart +8 -0
- package/dart-src/packages/core/lib/src/semver.dart +0 -3
- package/dart-src/packages/core/lib/src/status.dart +20 -1
- package/dart-src/packages/core/lib/src/strategy.dart +10 -0
- package/dart-src/packages/core/lib/src/update_bundle_params.dart +15 -0
- package/dart-src/packages/core/lib/src/uuid.dart +11 -0
- package/dart-src/plugins/aws/CHANGELOG.md +5 -1
- package/dart-src/plugins/aws/lib/src/aws_cloudfront_client.dart +2 -2
- package/dart-src/plugins/cloudflare/CHANGELOG.md +5 -1
- package/dart-src/plugins/plugin-core/CHANGELOG.md +5 -1
- package/dart-src/plugins/plugin-core/lib/src/asset_storage_layout.dart +3 -0
- package/dart-src/plugins/plugin-core/lib/src/parse_storage_uri.dart +17 -0
- package/dart-src/plugins/plugin-core/lib/src/types.dart +94 -3
- package/dart-src/plugins/pocketbase/CHANGELOG.md +5 -1
- package/dart-src/plugins/pocketbase/lib/flutter_ota_kit_pocketbase.dart +2 -1
- package/dart-src/plugins/pocketbase/lib/src/pocketbase_bundle_mapper.dart +10 -2
- package/dart-src/plugins/pocketbase/lib/src/pocketbase_client.dart +617 -4
- package/dart-src/plugins/pocketbase/lib/src/pocketbase_database.dart +262 -42
- package/dart-src/plugins/pocketbase/lib/src/pocketbase_storage.dart +9 -2
- package/dart-src/plugins/postgres/CHANGELOG.md +5 -1
- package/dart-src/plugins/supabase/CHANGELOG.md +6 -1
- package/dart-src/plugins/supabase/lib/src/supabase_database.dart +4 -0
- package/package.json +2 -2
- package/bin/flutter-ota-linux-x64 +0 -0
- package/bin/flutter-ota.js +0 -36
- package/dart-src/packages/cli-tools/.dart_tool/package_config.json +0 -458
- package/dart-src/packages/cli-tools/.dart_tool/package_graph.json +0 -707
- package/dart-src/packages/cli-tools/pubspec.lock +0 -590
|
@@ -10,8 +10,11 @@ import '../ui/ui.dart';
|
|
|
10
10
|
|
|
11
11
|
/// `flutter-ota migrate` — run backend SQL migrations.
|
|
12
12
|
class MigrateCommand extends FlutterPatcherCommand {
|
|
13
|
-
MigrateCommand() {
|
|
14
|
-
|
|
13
|
+
MigrateCommand({this.config, this.backendOverride}) {
|
|
14
|
+
final detected = config?.provider ?? loadConfig()?.provider;
|
|
15
|
+
argParser.addOption('backend', abbr: 'b', help: detected != null
|
|
16
|
+
? 'Backend provider [detected: $detected].'
|
|
17
|
+
: 'Backend provider.');
|
|
15
18
|
argParser.addOption(
|
|
16
19
|
'database-url',
|
|
17
20
|
help: 'Postgres connection string (or DATABASE_URL env).',
|
|
@@ -26,6 +29,34 @@ class MigrateCommand extends FlutterPatcherCommand {
|
|
|
26
29
|
'migrations-dir',
|
|
27
30
|
help: 'Directory of *.sql migration files (ordered by name).',
|
|
28
31
|
);
|
|
32
|
+
argParser.addOption(
|
|
33
|
+
'account-id',
|
|
34
|
+
help: 'Cloudflare account ID (or CLOUDFLARE_ACCOUNT_ID env).',
|
|
35
|
+
);
|
|
36
|
+
argParser.addOption(
|
|
37
|
+
'api-token',
|
|
38
|
+
help: 'Cloudflare API token (or CLOUDFLARE_API_TOKEN env).',
|
|
39
|
+
);
|
|
40
|
+
argParser.addOption(
|
|
41
|
+
'd1-database-id',
|
|
42
|
+
help: 'Cloudflare D1 database ID (or CLOUDFLARE_D1_DATABASE_ID env).',
|
|
43
|
+
);
|
|
44
|
+
argParser.addOption(
|
|
45
|
+
'r2-bucket',
|
|
46
|
+
help: 'Cloudflare R2 bucket name (or R2_BUCKET env, default: bundles).',
|
|
47
|
+
);
|
|
48
|
+
argParser.addOption(
|
|
49
|
+
'pocketbase-url',
|
|
50
|
+
help: 'PocketBase URL (or POCKETBASE_URL env).',
|
|
51
|
+
);
|
|
52
|
+
argParser.addOption(
|
|
53
|
+
'pocketbase-admin-email',
|
|
54
|
+
help: 'PocketBase admin email (or POCKETBASE_ADMIN_EMAIL env).',
|
|
55
|
+
);
|
|
56
|
+
argParser.addOption(
|
|
57
|
+
'pocketbase-admin-password',
|
|
58
|
+
help: 'PocketBase admin password (or POCKETBASE_ADMIN_PASSWORD env).',
|
|
59
|
+
);
|
|
29
60
|
argParser.addFlag(
|
|
30
61
|
'dry-run',
|
|
31
62
|
abbr: 'd',
|
|
@@ -33,12 +64,15 @@ class MigrateCommand extends FlutterPatcherCommand {
|
|
|
33
64
|
);
|
|
34
65
|
}
|
|
35
66
|
|
|
67
|
+
final FlutterPatcherConfig? config;
|
|
68
|
+
final Backend? backendOverride;
|
|
69
|
+
|
|
36
70
|
@override
|
|
37
71
|
String get name => 'migrate';
|
|
38
72
|
|
|
39
73
|
@override
|
|
40
74
|
String get description =>
|
|
41
|
-
'Run SQL migrations against the backend database (Supabase Postgres).';
|
|
75
|
+
'Run SQL migrations against the backend database (Supabase, Postgres, Cloudflare, AWS, PocketBase).';
|
|
42
76
|
|
|
43
77
|
String defaultMigrationsDir(String provider) {
|
|
44
78
|
final sub = switch (provider) {
|
|
@@ -79,19 +113,51 @@ class MigrateCommand extends FlutterPatcherCommand {
|
|
|
79
113
|
|
|
80
114
|
@override
|
|
81
115
|
Future<int> run() => runGuarded(() async {
|
|
82
|
-
final
|
|
116
|
+
final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
|
|
117
|
+
final provider = argResults!['backend'] as String? ?? cfg?.provider ?? 'supabase';
|
|
83
118
|
|
|
84
119
|
if (provider == 'aws') {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
120
|
+
banner('migrate · aws');
|
|
121
|
+
step('AWS stores bundle metadata as JSON in S3 — no SQL migrations needed.');
|
|
122
|
+
step('The S3 bucket and object prefix are created automatically on first deploy.');
|
|
123
|
+
step('No action required. Run `flutter-ota deploy` to get started.');
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
if (provider == 'pocketbase') {
|
|
128
|
+
final pbUrl =
|
|
129
|
+
argResults!['pocketbase-url'] as String? ??
|
|
130
|
+
Platform.environment['POCKETBASE_URL'] ??
|
|
131
|
+
cfg?.pocketbase.url;
|
|
132
|
+
final pbAdmin =
|
|
133
|
+
argResults!['pocketbase-admin-email'] as String? ??
|
|
134
|
+
Platform.environment['POCKETBASE_ADMIN_EMAIL'] ??
|
|
135
|
+
cfg?.pocketbase.adminEmail;
|
|
136
|
+
final pbPass =
|
|
137
|
+
argResults!['pocketbase-admin-password'] as String? ??
|
|
138
|
+
Platform.environment['POCKETBASE_ADMIN_PASSWORD'] ??
|
|
139
|
+
cfg?.pocketbase.adminPassword;
|
|
140
|
+
if (pbUrl == null || pbUrl.isEmpty) {
|
|
141
|
+
throw StateError(
|
|
142
|
+
'PocketBase requires a URL. Set POCKETBASE_URL env var, '
|
|
143
|
+
'or `flutter-ota init pocketbase`.',
|
|
144
|
+
);
|
|
145
|
+
}
|
|
146
|
+
banner('migrate · pocketbase');
|
|
147
|
+
final installer = PocketBaseSchemaInstaller(
|
|
148
|
+
url: pbUrl,
|
|
149
|
+
adminEmail: pbAdmin ?? '',
|
|
150
|
+
adminPassword: pbPass ?? '',
|
|
151
|
+
);
|
|
152
|
+
final res = await installer.install();
|
|
153
|
+
final steps = Steps('migrate');
|
|
154
|
+
if (res.created.isNotEmpty) {
|
|
155
|
+
steps.success('Created: ${res.created.join(', ')}');
|
|
156
|
+
}
|
|
157
|
+
if (res.skipped.isNotEmpty) {
|
|
158
|
+
steps.success('Already present: ${res.skipped.join(', ')}');
|
|
159
|
+
}
|
|
160
|
+
steps.summary();
|
|
95
161
|
return;
|
|
96
162
|
}
|
|
97
163
|
|
|
@@ -110,20 +176,49 @@ class MigrateCommand extends FlutterPatcherCommand {
|
|
|
110
176
|
}
|
|
111
177
|
|
|
112
178
|
if (provider == 'cloudflare') {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
179
|
+
final cfCfg = cfg ??
|
|
180
|
+
FlutterPatcherConfig(
|
|
181
|
+
provider: 'cloudflare',
|
|
182
|
+
supabase: const SupabaseConfigJson(),
|
|
183
|
+
cloudflare: const CloudflareConfigJson(),
|
|
184
|
+
);
|
|
185
|
+
final accountId =
|
|
186
|
+
argResults!['account-id'] as String? ??
|
|
187
|
+
Platform.environment['CLOUDFLARE_ACCOUNT_ID'] ??
|
|
188
|
+
cfCfg.cloudflare.accountId;
|
|
189
|
+
final apiToken =
|
|
190
|
+
argResults!['api-token'] as String? ??
|
|
191
|
+
Platform.environment['CLOUDFLARE_API_TOKEN'] ??
|
|
192
|
+
cfCfg.cloudflare.apiToken;
|
|
193
|
+
final dbId =
|
|
194
|
+
argResults!['d1-database-id'] as String? ??
|
|
195
|
+
Platform.environment['CLOUDFLARE_D1_DATABASE_ID'] ??
|
|
196
|
+
cfCfg.cloudflare.d1DatabaseId;
|
|
197
|
+
final r2Bucket =
|
|
198
|
+
argResults!['r2-bucket'] as String? ??
|
|
199
|
+
Platform.environment['R2_BUCKET'] ??
|
|
200
|
+
cfCfg.cloudflare.r2Bucket ??
|
|
201
|
+
'bundles';
|
|
202
|
+
|
|
203
|
+
if (accountId == null || apiToken == null) {
|
|
204
|
+
throw StateError(
|
|
205
|
+
'Cloudflare requires accountId and apiToken. Set them via '
|
|
206
|
+
'--account-id/--api-token, CLOUDFLARE_* env vars, or '
|
|
207
|
+
'`flutter-ota init cloudflare`.',
|
|
208
|
+
);
|
|
209
|
+
}
|
|
210
|
+
await _runCloudflareMigration(
|
|
211
|
+
accountId: accountId,
|
|
212
|
+
apiToken: apiToken,
|
|
213
|
+
databaseId: dbId,
|
|
214
|
+
r2Bucket: r2Bucket,
|
|
215
|
+
files: files,
|
|
216
|
+
);
|
|
121
217
|
return;
|
|
122
218
|
}
|
|
123
219
|
|
|
124
220
|
if (provider == 'supabase') {
|
|
125
|
-
final cfg
|
|
126
|
-
loadConfig() ??
|
|
221
|
+
final sbCfg = cfg ??
|
|
127
222
|
FlutterPatcherConfig(
|
|
128
223
|
provider: 'supabase',
|
|
129
224
|
supabase: const SupabaseConfigJson(),
|
|
@@ -131,11 +226,11 @@ class MigrateCommand extends FlutterPatcherCommand {
|
|
|
131
226
|
final mgmtKey =
|
|
132
227
|
argResults!['management-key'] as String? ??
|
|
133
228
|
Platform.environment['SUPABASE_MANAGEMENT_KEY'] ??
|
|
134
|
-
|
|
229
|
+
sbCfg.supabase.managementKey;
|
|
135
230
|
final pgUrl =
|
|
136
231
|
argResults!['database-url'] as String? ??
|
|
137
232
|
Platform.environment['DATABASE_URL'] ??
|
|
138
|
-
|
|
233
|
+
sbCfg.supabase.databaseUrl;
|
|
139
234
|
if (mgmtKey != null && mgmtKey.isNotEmpty) {
|
|
140
235
|
await _runViaManagementApi(mgmtKey, files);
|
|
141
236
|
return;
|
|
@@ -306,4 +401,149 @@ class MigrateCommand extends FlutterPatcherCommand {
|
|
|
306
401
|
}
|
|
307
402
|
steps.summary();
|
|
308
403
|
}
|
|
404
|
+
|
|
405
|
+
/// Auto-provision Cloudflare backend: create D1 database, run SQL, create R2.
|
|
406
|
+
///
|
|
407
|
+
/// Called from `init` to match Supabase's fully-automated flow.
|
|
408
|
+
static Future<void> runCloudflareMigration({
|
|
409
|
+
required String accountId,
|
|
410
|
+
required String apiToken,
|
|
411
|
+
String? databaseId,
|
|
412
|
+
String? r2Bucket,
|
|
413
|
+
}) async {
|
|
414
|
+
final sub = 'cloudflare';
|
|
415
|
+
final dir = p.join(
|
|
416
|
+
p.dirname(Platform.script.path),
|
|
417
|
+
'..',
|
|
418
|
+
'migrations',
|
|
419
|
+
sub,
|
|
420
|
+
);
|
|
421
|
+
final migrationsDir = Directory(dir);
|
|
422
|
+
if (!migrationsDir.existsSync()) {
|
|
423
|
+
throw StateError('Migrations directory not found: $dir');
|
|
424
|
+
}
|
|
425
|
+
final files =
|
|
426
|
+
migrationsDir
|
|
427
|
+
.listSync()
|
|
428
|
+
.whereType<File>()
|
|
429
|
+
.where((f) => f.path.endsWith('.sql'))
|
|
430
|
+
.toList()
|
|
431
|
+
..sort((a, b) => a.path.compareTo(b.path));
|
|
432
|
+
if (files.isEmpty) {
|
|
433
|
+
throw StateError('No *.sql files in $dir');
|
|
434
|
+
}
|
|
435
|
+
await _runCloudflareMigration(
|
|
436
|
+
accountId: accountId,
|
|
437
|
+
apiToken: apiToken,
|
|
438
|
+
databaseId: databaseId,
|
|
439
|
+
r2Bucket: r2Bucket ?? 'bundles',
|
|
440
|
+
files: files,
|
|
441
|
+
);
|
|
442
|
+
}
|
|
443
|
+
|
|
444
|
+
static Future<void> _runCloudflareMigration({
|
|
445
|
+
required String accountId,
|
|
446
|
+
required String apiToken,
|
|
447
|
+
required String? databaseId,
|
|
448
|
+
required String r2Bucket,
|
|
449
|
+
required List<File> files,
|
|
450
|
+
}) async {
|
|
451
|
+
final headers = {
|
|
452
|
+
'Authorization': 'Bearer $apiToken',
|
|
453
|
+
'Content-Type': 'application/json',
|
|
454
|
+
};
|
|
455
|
+
final baseUrl = 'https://api.cloudflare.com/client/v4';
|
|
456
|
+
|
|
457
|
+
banner('migrate · cloudflare');
|
|
458
|
+
final steps = Steps('migrate');
|
|
459
|
+
|
|
460
|
+
// --- D1 database ---
|
|
461
|
+
var dbId = databaseId;
|
|
462
|
+
if (dbId == null || dbId.isEmpty) {
|
|
463
|
+
// Create a new D1 database
|
|
464
|
+
final sw = Stopwatch()..start();
|
|
465
|
+
final res = await http.post(
|
|
466
|
+
Uri.parse('$baseUrl/accounts/$accountId/d1/database'),
|
|
467
|
+
headers: headers,
|
|
468
|
+
body: jsonEncode({'name': 'flutter-ota-kit'}),
|
|
469
|
+
);
|
|
470
|
+
sw.stop();
|
|
471
|
+
final body = jsonDecode(res.body) as Map<String, dynamic>;
|
|
472
|
+
if (res.statusCode >= 400 || body['success'] != true) {
|
|
473
|
+
final errors = body['errors'] as List? ?? [];
|
|
474
|
+
final msg = errors.isNotEmpty ? errors.first['message'] : res.body;
|
|
475
|
+
steps.fail('Could not create D1 database: $msg');
|
|
476
|
+
steps.summary();
|
|
477
|
+
return;
|
|
478
|
+
}
|
|
479
|
+
dbId = body['result']?['uuid'] as String?;
|
|
480
|
+
if (dbId == null || dbId.isEmpty) {
|
|
481
|
+
steps.fail('D1 database created but no UUID returned');
|
|
482
|
+
steps.summary();
|
|
483
|
+
return;
|
|
484
|
+
}
|
|
485
|
+
final ms = sw.elapsedMilliseconds;
|
|
486
|
+
final time =
|
|
487
|
+
ms >= 1000 ? '${(ms / 1000).toStringAsFixed(1)}s' : '${ms}ms';
|
|
488
|
+
steps.success('Created D1 database ($dbId) in $time');
|
|
489
|
+
} else {
|
|
490
|
+
steps.success('Using existing D1 database ($dbId)');
|
|
491
|
+
}
|
|
492
|
+
|
|
493
|
+
// --- Run SQL migrations against D1 ---
|
|
494
|
+
for (final file in files) {
|
|
495
|
+
final sw = Stopwatch()..start();
|
|
496
|
+
final sql = file.readAsStringSync();
|
|
497
|
+
final res = await http.post(
|
|
498
|
+
Uri.parse('$baseUrl/accounts/$accountId/d1/database/$dbId/query'),
|
|
499
|
+
headers: headers,
|
|
500
|
+
body: jsonEncode({'sql': sql}),
|
|
501
|
+
);
|
|
502
|
+
sw.stop();
|
|
503
|
+
final body = jsonDecode(res.body) as Map<String, dynamic>;
|
|
504
|
+
if (res.statusCode >= 400 || body['success'] != true) {
|
|
505
|
+
final errors = body['errors'] as List? ?? [];
|
|
506
|
+
final msg = errors.isNotEmpty ? errors.first['message'] : res.body;
|
|
507
|
+
steps.fail('${p.basename(file.path)} ($res.statusCode): $msg');
|
|
508
|
+
} else {
|
|
509
|
+
final ms = sw.elapsedMilliseconds;
|
|
510
|
+
final time =
|
|
511
|
+
ms >= 1000 ? '${(ms / 1000).toStringAsFixed(1)}s' : '${ms}ms';
|
|
512
|
+
steps.success('Applied ${p.basename(file.path)} in $time');
|
|
513
|
+
}
|
|
514
|
+
}
|
|
515
|
+
|
|
516
|
+
// --- R2 bucket ---
|
|
517
|
+
final sw = Stopwatch()..start();
|
|
518
|
+
final r2Res = await http.put(
|
|
519
|
+
Uri.parse('$baseUrl/accounts/$accountId/s3/buckets/$r2Bucket'),
|
|
520
|
+
headers: headers,
|
|
521
|
+
);
|
|
522
|
+
sw.stop();
|
|
523
|
+
final r2Body = jsonDecode(r2Res.body) as Map<String, dynamic>;
|
|
524
|
+
if (r2Res.statusCode >= 400 || r2Body['success'] != true) {
|
|
525
|
+
final errors = r2Body['errors'] as List? ?? [];
|
|
526
|
+
final msg = errors.isNotEmpty ? errors.first['message'] : r2Res.body;
|
|
527
|
+
// Bucket already exists is not an error
|
|
528
|
+
if (!msg.toLowerCase().contains('already exists') &&
|
|
529
|
+
r2Res.statusCode != 409) {
|
|
530
|
+
steps.fail('Could not create R2 bucket "$r2Bucket": $msg');
|
|
531
|
+
} else {
|
|
532
|
+
final ms = sw.elapsedMilliseconds;
|
|
533
|
+
final time =
|
|
534
|
+
ms >= 1000 ? '${(ms / 1000).toStringAsFixed(1)}s' : '${ms}ms';
|
|
535
|
+
steps.success('Ensured R2 bucket "$r2Bucket" in $time');
|
|
536
|
+
}
|
|
537
|
+
} else {
|
|
538
|
+
final ms = sw.elapsedMilliseconds;
|
|
539
|
+
final time =
|
|
540
|
+
ms >= 1000 ? '${(ms / 1000).toStringAsFixed(1)}s' : '${ms}ms';
|
|
541
|
+
steps.success('Created R2 bucket "$r2Bucket" in $time');
|
|
542
|
+
}
|
|
543
|
+
|
|
544
|
+
steps.summary();
|
|
545
|
+
if (steps.hasErrors) {
|
|
546
|
+
throw StateError('One or more migrations failed.');
|
|
547
|
+
}
|
|
548
|
+
}
|
|
309
549
|
}
|