fix: Pass flutter_assets to backend during deploy (#335)

When deploying Flutter projects to the cloud, ensure that the `flutter_assets` dir is passed to the backend as well.

Author: dnys1

apps/cli/CHANGELOG.md

@@ -1,3 +1,7 @@
+## NEXT
+
+- fix: Pass `flutter_assets` to backend when using `celest deploy`
+
 ## 1.0.10+2
 
 - chore: Add back Sentry integration

apps/cli/lib/src/frontend/celest_frontend.dart

@@ -2,7 +2,9 @@ import 'dart:async';
 import 'dart:io' as io show Platform;
 import 'dart:io';
 import 'dart:math';
+import 'dart:typed_data';
 
+import 'package:archive/archive_io.dart';
 import 'package:async/async.dart';
 import 'package:celest_ast/celest_ast.dart' as ast;
 import 'package:celest_ast/celest_ast.dart' hide Sdk;
@@ -741,6 +743,7 @@ final class CelestFrontend {
             });
             final (deployedProject, baseUri) = await _deployProject(
               environmentName: environment.name,
+              environmentId: environment.projectEnvironmentId,
               resolvedProject: resolvedProject,
             );
             await _generateClientCode(
@@ -994,31 +997,59 @@ final class CelestFrontend {
     return cloudEnvironment;
   }
 
+  Future<Uint8List> _tarGzDirectory(String path) async {
+    final encoder = TarFileEncoder();
+    final tarFile = fileSystem.file(
+      p.join(projectPaths.projectCacheDir, '${p.basename(path)}.tar'),
+    );
+    await encoder.tarDirectory(
+      fileSystem.directory(path),
+      followLinks: false,
+      filename: tarFile.path,
+    );
+    final tarStream = tarFile.openRead();
+    return collectBytes(tarStream.transform(gzip.encoder));
+  }
+
   Future<(ast.ResolvedProject, Uri)> _deployProject({
     required String environmentName,
+    required String environmentId,
     required ast.ResolvedProject resolvedProject,
   }) =>
       performance.trace('CelestFrontend', 'deployProject', () async {
-        final entrypointCompiler = EntrypointCompiler(
-          logger: logger,
-          verbose: verbose,
-          enabledExperiments: celestProject.analysisOptions.enabledExperiments,
-        );
-        final kernel = await entrypointCompiler.compile(
+        await _writeProjectOutputs(
           resolvedProject: resolvedProject,
-          entrypointPath: projectPaths.localApiEntrypoint,
+          environmentId: environmentId,
         );
+        final (kernelBytes, flutterAssetBytes) = await (
+          fileSystem
+              .directory(projectPaths.buildDir)
+              .childFile('main.aot.dill')
+              .readAsBytes(),
+          switch (resolvedProject.sdkConfig.targetSdk) {
+            ast.SdkType.flutter => _tarGzDirectory(
+                p.join(projectPaths.buildDir, 'flutter_assets'),
+              ),
+            _ => Future.value(Uint8List(0)),
+          },
+        ).wait;
+        final assets = [
+          pb.ProjectAsset(
+            type: pb.ProjectAsset_Type.DART_KERNEL,
+            filename: 'main.aot.dill',
+            inline: kernelBytes,
+          ),
+          if (resolvedProject.sdkConfig.targetSdk == ast.SdkType.flutter)
+            pb.ProjectAsset(
+              type: pb.ProjectAsset_Type.FLUTTER_ASSETS,
+              filename: 'flutter_assets.tar.gz',
+              inline: flutterAssetBytes,
+            ),
+        ];
         final operation = cloud.projects.environments.deploy(
           environmentName,
           resolvedProject: resolvedProject.toProto(),
-          assets: [
-            pb.ProjectAsset(
-              type: pb.ProjectAsset_Type.DART_KERNEL,
-              etag: kernel.outputDillDigest.toString(),
-              filename: p.basename(kernel.outputDillPath),
-              inline: kernel.outputDill,
-            ),
-          ],
+          assets: assets,
         );
         final waiter = CloudCliOperation(
           operation,

packages/celest_cloud/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.7-wip
+
+- feat: Add `ProjectAsset.FLUTTER_ASSETS`
+
 # 0.1.6
 
 - feat: Add `ProjectEnvironment.uri` field

packages/celest_cloud/lib/src/proto/celest/cloud/v1alpha1/project_environments.pbenum.dart

@@ -1,6 +1,6 @@
 name: celest_cloud
 description: API contracts and Dart clients for the Celest Cloud platform.
-version: 0.1.6
+version: 0.1.7-wip
 repository: https://github.com/celest-dev/celest
 
 environment:

packages/celest_cloud/lib/src/proto/celest/cloud/v1alpha1/project_environments.pbjson.dart

@@ -347,6 +347,9 @@ message ProjectAsset {
 
     // The asset is a Dart kernel file.
     DART_KERNEL = 1;
+
+    // The asset is a flutter_assets bundle.
+    FLUTTER_ASSETS = 2;
   }
 
   // The type of the asset.

packages/celest_cloud/pubspec.yaml

@@ -111,6 +111,7 @@ Future<void> main() async {
       ),
     ),
     kernelAsset: bytes,
+    flutterAssetsBundle: null,
     environment: environment,
   );
 

proto/celest/cloud/v1alpha1/project_environments.proto

@@ -5,6 +5,7 @@ import 'dart:isolate';
 import 'dart:math';
 import 'dart:typed_data';
 
+import 'package:archive/archive_io.dart';
 import 'package:celest_ast/celest_ast.dart'
     show ResolvedCelestDatabaseConfig, ResolvedProject;
 import 'package:celest_cli/src/codegen/api/dockerfile_generator.dart';
@@ -33,6 +34,7 @@ final class FlyDeploymentEngine {
     required String flyApiToken,
     required this.projectAst,
     required this.kernelAsset,
+    required this.flutterAssetsBundle,
     required this.environment,
   }) : flyApi = FlyMachinesApiClient(authToken: flyApiToken),
        _flyApiToken = flyApiToken;
@@ -44,6 +46,7 @@ final class FlyDeploymentEngine {
   final ProjectEnvironment environment;
   final ResolvedProject projectAst;
   final Uint8List kernelAsset;
+  final Uint8List? flutterAssetsBundle;
 
   static Future<void> deployIsolated({
     required String operationId,
@@ -52,6 +55,7 @@ final class FlyDeploymentEngine {
     required ResolvedProject projectAst,
     required ProjectEnvironment environment,
     required Uint8List kernelAsset,
+    required Uint8List? flutterAssetsBundle,
   }) async {
     await Isolate.run(() async {
       Logger.root.level = Level.ALL;
@@ -79,6 +83,7 @@ final class FlyDeploymentEngine {
         flyApiToken: flyApiToken,
         projectAst: projectAst,
         kernelAsset: kernelAsset,
+        flutterAssetsBundle: flutterAssetsBundle,
         environment: environment,
       );
       try {
@@ -253,6 +258,16 @@ final class FlyDeploymentEngine {
       final kernelFile = dir.childFile('main.aot.dill');
       await kernelFile.writeAsBytes(kernelAsset);
 
+      if (flutterAssetsBundle != null) {
+        // Write the Flutter assets bundle to disk
+        final flutterAssetsFile = dir.childFile('flutter_assets.tar.gz');
+        await flutterAssetsFile.writeAsBytes(flutterAssetsBundle!);
+        await extractFileToDisk(
+          flutterAssetsFile.path,
+          dir.childDirectory('flutter_assets').path,
+        );
+      }
+
       // Write celest.json to disk
       final celestJsonFile = dir.childFile('celest.json');
       await celestJsonFile.writeAsString(

services/celest_cloud_hub/bin/deploy_test.dart

@@ -22,7 +22,6 @@ import 'package:celest_cloud_hub/src/model/protobuf.dart';
 import 'package:celest_cloud_hub/src/model/type_registry.dart';
 import 'package:celest_cloud_hub/src/services/service_mixin.dart';
 import 'package:celest_core/celest_core.dart';
-import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:drift/isolate.dart';
 import 'package:grpc/grpc.dart';
@@ -449,12 +448,12 @@ final class ProjectEnvironmentsService extends ProjectEnvironmentsServiceBase
       resource: EntityUid.of('Celest::Project::Environment', environment.id),
     );
 
-    final kernelAsset = request.assets.firstWhereOrNull(
-      (asset) => asset.type == pb.ProjectAsset_Type.DART_KERNEL,
-    );
+    final assets = {for (final asset in request.assets) asset.type: asset};
+    final kernelAsset = assets[pb.ProjectAsset_Type.DART_KERNEL];
     if (kernelAsset == null) {
       throw GrpcError.invalidArgument('Missing Dart kernel asset');
     }
+    final flutterAssetsBundle = assets[pb.ProjectAsset_Type.FLUTTER_ASSETS];
 
     final operationId = typeId('op');
     final operation =
@@ -473,6 +472,12 @@ final class ProjectEnvironmentsService extends ProjectEnvironmentsServiceBase
         pb.ResolvedProject().unpackAny(request.resolvedProjectAst),
       ),
       kernelAsset: Uint8List.fromList(kernelAsset.inline).asUnmodifiableView(),
+      flutterAssetsBundle:
+          flutterAssetsBundle != null
+              ? Uint8List.fromList(
+                flutterAssetsBundle.inline,
+              ).asUnmodifiableView()
+              : null,
       environment: environment,
     );
     unawaited(