@_nazmiforreal/flutter-ota 0.1.19 → 0.1.21

package/dart-src/plugins/pocketbase/lib/src/pocketbase_database.dart

@@ -1,4 +1,8 @@
 /// PocketBase-backed [DatabasePlugin] implementation.
+///
+/// Implements full parity with the Cloudflare/Supabase backends including
+/// proper `getUpdateInfo` with `UpdateStrategy` branching, `bundle_patches`
+/// support, and comprehensive filter operators.
 library;
 
 import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
@@ -33,20 +37,69 @@ class _PocketBaseDatabase implements AbstractDatabasePlugin {
   @override
   bool get supportsCursorPagination => false;
 
+  // ----- Bundle patches -----
+
+  String get _patchesCollection => '${config.bundlesCollection}_patches';
+
+  Future<Map<String, List<Map<String, dynamic>>>> _getPatchMap(
+    List<String> bundleIds,
+  ) async {
+    final patchMap = <String, List<Map<String, dynamic>>>{};
+    if (bundleIds.isEmpty) return patchMap;
+
+    final filter = bundleIds
+        .map((id) => 'bundle_id = "${_escape(id)}"')
+        .join(' || ');
+    try {
+      final res = await client.listRecords<dynamic>(
+        _patchesCollection,
+        (j) => j,
+        filter: filter.isEmpty ? null : filter,
+        sort: 'order_index',
+        perPage: 500,
+      );
+      for (final item in res.items) {
+        final row = item as Map<String, dynamic>;
+        final bundleId = row['bundle_id'] as String? ?? '';
+        if (bundleId.isNotEmpty) {
+          (patchMap[bundleId] ??= []).add(row);
+        }
+      }
+    } catch (_) {
+      // patches collection may not exist yet; treat as no patches.
+    }
+    return patchMap;
+  }
+
   // ----- Channels -----
 
   @override
   Future<List<String>> getChannels() async {
-    final res = await client.listRecords<dynamic>(
-      config.channelsCollection,
-      (j) => j,
-      perPage: 200,
-      sort: 'name',
-    );
-    return res.items
-        .map((j) => (j as Map)['name'] as String? ?? '')
-        .where((s) => s.isNotEmpty)
-        .toList();
+    try {
+      final res = await client.listRecords<dynamic>(
+        config.channelsCollection,
+        (j) => j,
+        perPage: 200,
+        sort: 'name',
+      );
+      return res.items
+          .map((j) => (j as Map)['name'] as String? ?? '')
+          .where((s) => s.isNotEmpty)
+          .toList();
+    } catch (_) {
+      // Fallback: extract distinct channels from bundles.
+      final res = await client.listRecords<PocketBaseBundleRow>(
+        config.bundlesCollection,
+        PocketBaseBundleRow.fromJson,
+        perPage: 500,
+        sort: '-created',
+      );
+      final channels = <String>{};
+      for (final b in res.items) {
+        if (b.channel.isNotEmpty) channels.add(b.channel);
+      }
+      return channels.toList()..sort();
+    }
   }
 
   // ----- Single bundle -----
@@ -58,32 +111,134 @@ class _PocketBaseDatabase implements AbstractDatabasePlugin {
       bundleId,
       PocketBaseBundleRow.fromJson,
     );
-    return row == null ? null : mapRowToBundle(row);
+    if (row == null) return null;
+    final patchMap = await _getPatchMap([bundleId]);
+    return mapRowToBundle(row, patches: patchMap[bundleId]);
   }
 
+  // ----- Update info -----
+
   @override
   Future<UpdateInfo?> getUpdateInfo(GetBundlesArgs args) async {
+    final channel = args.channel;
+    final minBundleId = args.minBundleId;
+    final platform = args.platform.value;
+
+    if (args.updateStrategy == UpdateStrategy.appVersion) {
+      final appVersion = (args as AppVersionGetBundlesArgs).appVersion;
+
+      // 1. Collect distinct target_app_versions from enabled bundles.
+      final allRes = await client.listRecords<PocketBaseBundleRow>(
+        config.bundlesCollection,
+        PocketBaseBundleRow.fromJson,
+        filter: _buildFilter(
+          channel: channel,
+          platformValue: platform,
+          enabled: true,
+          idGte: minBundleId,
+          targetAppVersionNotNull: true,
+        ),
+        sort: '-created',
+        perPage: 500,
+      );
+      final targetVersions = allRes.items
+          .map((b) => b.targetAppVersion)
+          .whereType<String>()
+          .toSet()
+          .toList();
+
+      // 2. Filter to compatible versions.
+      final compatible = filterCompatibleAppVersions(
+        targetVersions,
+        appVersion,
+      );
+
+      if (compatible.isEmpty) {
+        // No compatible bundles — check if we should rollback.
+        if (args.bundleId == nilUuid ||
+            (minBundleId.isNotEmpty &&
+                args.bundleId.compareTo(minBundleId) <= 0)) {
+          return null;
+        }
+        return const UpdateInfo(
+          id: nilUuid,
+          shouldForceUpdate: true,
+          message: null,
+          status: UpdateStatus.rollback,
+          storageUri: null,
+          fileHash: null,
+        );
+      }
+
+      // 3. Query bundles with compatible target_app_version using ?= operator.
+      final filter = _buildFilter(
+        channel: channel,
+        platformValue: platform,
+        enabled: true,
+        idGte: minBundleId,
+        targetAppVersionIn: compatible,
+      );
+      final res = await client.listRecords<PocketBaseBundleRow>(
+        config.bundlesCollection,
+        PocketBaseBundleRow.fromJson,
+        filter: filter.isEmpty ? null : filter,
+        sort: '-created',
+        perPage: 500,
+      );
+      final bundles = res.items.map(mapRowToBundle).toList();
+      final patchMap = await _getPatchMap(bundles.map((b) => b.id).toList());
+      final bundlesWithPatches = bundles
+          .map(
+            (b) => mapRowToBundle(
+              res.items.firstWhere((r) => r.id == b.id),
+              patches: patchMap[b.id],
+            ),
+          )
+          .toList();
+
+      return resolveUpdateInfoFromBundles(
+        ResolveUpdateInfoFromBundlesOptions(
+          args: args,
+          bundles: bundlesWithPatches,
+        ),
+      );
+    }
+
+    // Fingerprint strategy.
+    final fingerprintHash = args is FingerprintGetBundlesArgs
+        ? args.fingerprintHash
+        : null;
+
     final filter = _buildFilter(
-      channel: args.channel,
-      platform: args.platform,
+      channel: channel,
+      platformValue: platform,
       enabled: true,
+      idGte: minBundleId,
+      fingerprintHash: fingerprintHash,
     );
-    final list = await client.listRecords<PocketBaseBundleRow>(
+    final res = await client.listRecords<PocketBaseBundleRow>(
       config.bundlesCollection,
       PocketBaseBundleRow.fromJson,
       filter: filter.isEmpty ? null : filter,
       sort: '-created',
-      perPage: 1,
+      perPage: 500,
     );
-    if (list.items.isEmpty) return null;
-    final bundle = mapRowToBundle(list.items.first);
-    return UpdateInfo(
-      id: bundle.id,
-      shouldForceUpdate: bundle.shouldForceUpdate,
-      message: bundle.message,
-      status: UpdateStatus.update,
-      storageUri: bundle.storageUri,
-      fileHash: bundle.fileHash,
+    final bundles = res.items.map(mapRowToBundle).toList();
+    final patchMap = await _getPatchMap(bundles.map((b) => b.id).toList());
+    final bundlesWithPatches = bundles
+        .map(
+          (b) => mapRowToBundle(
+            res.items.firstWhere((r) => r.id == b.id),
+            patches: patchMap[b.id],
+          ),
+        )
+        .toList();
+
+    return resolveUpdateInfoFromBundles(
+      ResolveUpdateInfoFromBundlesOptions(
+        args: args,
+        bundles: bundlesWithPatches,
+      ),
     );
   }
 
@@ -96,17 +251,18 @@ class _PocketBaseDatabase implements AbstractDatabasePlugin {
     final where = options.where;
     final filter = _buildFilter(
       channel: where?.channel,
-      platform: where?.platform,
+      platformValue: where?.platform?.value,
       enabled: where?.enabled,
       idEq: where?.id?.eq,
       idGt: where?.id?.gt,
       idLt: where?.id?.lt,
       targetAppVersion: where?.targetAppVersion,
+      targetAppVersionIn: where?.targetAppVersionIn,
+      targetAppVersionNotNull: where?.targetAppVersionNotNull,
       fingerprintHash: where?.fingerprintHash,
     );
     final orderField = options.orderBy?.field ?? 'id';
     final desc = options.orderBy?.direction != 'asc';
-    // PB sort syntax: `field` for asc, `-field` for desc.
     final sort = (desc ? '-' : '') + orderField;
     final limit = options.limit == 0 ? 50 : options.limit;
     final page = (options.offset ?? 0) ~/ limit + 1;
@@ -118,13 +274,16 @@ class _PocketBaseDatabase implements AbstractDatabasePlugin {
       page: page,
       perPage: limit,
     );
+    final patchMap = await _getPatchMap(list.items.map((b) => b.id).toList());
     final total = list.totalItems;
     final totalPages = list.totalPages == 0 ? 1 : list.totalPages;
     final currentPage = list.page;
     final hasNextPage = currentPage < totalPages;
     final hasPreviousPage = currentPage > 1;
     return Paginated(
-      data: list.items.map(mapRowToBundle).toList(),
+      data: list.items
+          .map((row) => mapRowToBundle(row, patches: patchMap[row.id]))
+          .toList(),
       pagination: PaginationInfo(
         total: total,
         hasNextPage: hasNextPage,
@@ -154,9 +313,6 @@ class _PocketBaseDatabase implements AbstractDatabasePlugin {
             change.data.id,
           );
           if (exists) {
-            // The storage plugin may have pre-created the record (to host
-            // the artifact file). Update the metadata fields rather than
-            // failing on a duplicate id.
             await client.updateRecord<dynamic>(
               config.bundlesCollection,
               change.data.id,
@@ -170,24 +326,66 @@ class _PocketBaseDatabase implements AbstractDatabasePlugin {
               (j) => j,
             );
           }
-          break;
+          // Upsert patches.
+          await _commitPatches(change.data);
+
         case BundleChangeOperation.update:
           final patch = _buildUpdatePatch(change.data);
-          if (patch.isEmpty) continue;
-          await client.updateRecord<dynamic>(
-            config.bundlesCollection,
-            change.data.id,
-            patch,
-            (j) => j,
-          );
-          break;
+          if (patch.isNotEmpty) {
+            await client.updateRecord<dynamic>(
+              config.bundlesCollection,
+              change.data.id,
+              patch,
+              (j) => j,
+            );
+          }
+          await _commitPatches(change.data);
+
         case BundleChangeOperation.delete:
+          // Delete associated patches first.
+          await _deletePatches(change.data.id);
           await client.deleteRecord(config.bundlesCollection, change.data.id);
-          break;
       }
     }
   }
 
+  Future<void> _commitPatches(Bundle bundle) async {
+    final patches = bundle.patches;
+    if (patches == null || patches.isEmpty) return;
+    // Delete existing patches for this bundle, then re-create.
+    await _deletePatches(bundle.id);
+    for (var i = 0; i < patches.length; i++) {
+      final p = patches[i];
+      await client.createRecord<dynamic>(_patchesCollection, {
+        'bundle_id': bundle.id,
+        'base_bundle_id': p.baseBundleId,
+        'base_file_hash': p.baseFileHash,
+        'patch_file_hash': p.patchFileHash,
+        'patch_storage_uri': p.patchStorageUri,
+        'order_index': i,
+      }, (j) => j);
+    }
+  }
+
+  Future<void> _deletePatches(String bundleId) async {
+    try {
+      final res = await client.listRecords<dynamic>(
+        _patchesCollection,
+        (j) => j,
+        filter: 'bundle_id = "${_escape(bundleId)}"',
+        perPage: 500,
+      );
+      for (final item in res.items) {
+        final id = (item as Map)['id'] as String?;
+        if (id != null) {
+          await client.deleteRecord(_patchesCollection, id);
+        }
+      }
+    } catch (_) {
+      // patches collection may not exist; ignore.
+    }
+  }
+
   @override
   Future<void> onUnmount() async {
     client.close();
@@ -217,30 +415,52 @@ class _PocketBaseDatabase implements AbstractDatabasePlugin {
 
   String _buildFilter({
     String? channel,
+    String? platformValue,
     Platform? platform,
     bool? enabled,
     String? idEq,
     String? idGt,
+    String? idGte,
     String? idLt,
+    String? idLte,
+    List<String>? idIns,
     String? targetAppVersion,
+    List<String>? targetAppVersionIn,
+    bool? targetAppVersionNotNull,
     String? fingerprintHash,
   }) {
     final clauses = <String>[];
     if (channel != null && channel.isNotEmpty) {
       clauses.add('channel = "${_escape(channel)}"');
     }
-    if (platform != null) {
-      clauses.add('platform = "${_escape(platform.value)}"');
+    final pv = platformValue ?? platform?.value;
+    if (pv != null) {
+      clauses.add('platform = "${_escape(pv)}"');
     }
     if (enabled != null) {
       clauses.add('enabled = ${enabled ? 'true' : 'false'}');
     }
     if (idEq != null) clauses.add('id = "${_escape(idEq)}"');
     if (idGt != null) clauses.add('id > "${_escape(idGt)}"');
+    if (idGte != null) clauses.add('id >= "${_escape(idGte)}"');
     if (idLt != null) clauses.add('id < "${_escape(idLt)}"');
+    if (idLte != null) clauses.add('id <= "${_escape(idLte)}"');
+    if (idIns != null && idIns.isNotEmpty) {
+      final escaped = idIns.map((id) => '"${_escape(id)}"').join(',');
+      clauses.add('id ?= [$escaped]');
+    }
     if (targetAppVersion != null) {
       clauses.add('target_app_version = "${_escape(targetAppVersion)}"');
     }
+    if (targetAppVersionIn != null && targetAppVersionIn.isNotEmpty) {
+      final escaped = targetAppVersionIn
+          .map((v) => '"${_escape(v)}"')
+          .join(',');
+      clauses.add('target_app_version ?= [$escaped]');
+    }
+    if (targetAppVersionNotNull == true) {
+      clauses.add('target_app_version != ""');
+    }
     if (fingerprintHash != null) {
       clauses.add('fingerprint_hash = "${_escape(fingerprintHash)}"');
     }

package/dart-src/plugins/pocketbase/lib/src/pocketbase_storage.dart

@@ -109,8 +109,15 @@ class _PocketBaseRuntimeStorage implements RuntimeStorageProfile {
 
   @override
   Future<String?> readText(String storageUri) async {
-    // PB serves binary files only; text reads aren't supported.
-    return null;
+    try {
+      final urlData = await getDownloadUrl(storageUri);
+      final url = urlData['fileUrl'];
+      if (url == null || url.isEmpty) return null;
+      final bytes = await _client.downloadFile(url);
+      return String.fromCharCodes(bytes);
+    } catch (_) {
+      return null;
+    }
   }
 }
 

package/dart-src/plugins/postgres/CHANGELOG.md

@@ -1 +1,5 @@
-## 0.1.5
+## 0.1.7
+
+- General maintenance.
+
+## 0.1.6

package/dart-src/plugins/supabase/CHANGELOG.md

@@ -1 +1,6 @@
-## 0.1.6
+## 0.1.8
+
+- Updated `mapUpdateInfoRow` to pass `gitCommitHash` from bundle data.
+- General maintenance.
+
+## 0.1.7

package/dart-src/plugins/supabase/lib/src/supabase_database.dart

@@ -23,6 +23,7 @@ class _SupabaseUpdateInfoRow {
   final String status;
   final String? storageUri;
   final String? fileHash;
+  final String? gitCommitHash;
 
   const _SupabaseUpdateInfoRow({
     required this.id,
@@ -31,6 +32,7 @@ class _SupabaseUpdateInfoRow {
     required this.status,
     required this.storageUri,
     required this.fileHash,
+    this.gitCommitHash,
   });
 }
 
@@ -65,6 +67,7 @@ UpdateInfo mapUpdateInfoRow(_SupabaseUpdateInfoRow row) => UpdateInfo(
       : UpdateStatus.update,
   storageUri: row.storageUri,
   fileHash: row.fileHash,
+  gitCommitHash: row.gitCommitHash,
 );
 
 /// Supabase-backed [DatabasePlugin] factory.
@@ -213,6 +216,7 @@ class _SupabaseDatabasePlugin implements AbstractDatabasePlugin {
       status: row['status'] as String,
       storageUri: row['storage_uri'] as String?,
       fileHash: row['file_hash'] as String?,
+      gitCommitHash: row['git_commit_hash'] as String?,
     );
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@_nazmiforreal/flutter-ota",
-  "version": "0.1.19",
-  "description": "Command-line interface for flutter_ota_kit \u2014 an OTA code-push tool for Flutter, hot-updater compatible.",
+  "version": "0.1.21",
+  "description": "Command-line interface for flutter_ota_kit — an OTA code-push tool for Flutter, hot-updater compatible.",
   "bin": {
     "flutter-ota": "./bin/flutter-ota.js"
   },

package/bin/flutter-ota.js

@@ -1,36 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const { execFileSync } = require('child_process');
-const path = require('path');
-const os = require('os');
-
-const platform = os.platform();
-const arch = os.arch();
-
-const binaryNames = {
-  'linux-x64': 'flutter-ota-linux-x64',
-  'linux-arm64': 'flutter-ota-linux-arm64',
-  'darwin-x64': 'flutter-ota-darwin-x64',
-  'darwin-arm64': 'flutter-ota-darwin-arm64',
-  'win32-x64': 'flutter-ota-win32-x64.exe',
-};
-
-const key = `${platform}-${arch}`;
-const binName = binaryNames[key];
-
-if (!binName) {
-  console.error(`flutter-ota: unsupported platform ${platform}-${arch}`);
-  process.exit(1);
-}
-
-const binPath = path.join(__dirname, binName);
-
-try {
-  execFileSync(binPath, process.argv.slice(2), { stdio: 'inherit' });
-} catch (err) {
-  if (err.status !== undefined) {
-    process.exit(err.status);
-  }
-  throw err;
-}