Fixing feedback from Gemini

Author: Lyokone

src/deploy/functions/runtimes/dart/index.ts

@@ -113,16 +113,22 @@ export class Delegate implements runtimes.RuntimeDelegate {
 
     buildRunnerProcess.on("exit", (code) => {
       if (code !== 0 && code !== null) {
-        logger.debug(`build_runner exited with code ${code}. Hot reload may not work.`);
+        logger.debug(`build_runner exited with code ${code}. Initial build failed.`);
         if (!initialBuildComplete) {
-          rejectInitialBuild(new Error(`build_runner exited with code ${code}`));
+          rejectInitialBuild(
+            new FirebaseError(
+              `build_runner exited with code ${code}. Your Dart functions may not be deployed or emulated correctly.`,
+            ),
+          );
         }
       }
       this.buildRunnerProcess = null;
     });
 
     buildRunnerProcess.on("error", (err) => {
-      logger.debug(`Failed to start build_runner: ${err.message}`);
+      logger.debug(
+        `Failed to start build_runner: ${err.message}. Your Dart functions may not be deployed or emulated correctly.`,
+      );
       if (!initialBuildComplete) {
         rejectInitialBuild(err);
       }

src/emulator/functionsEmulator.ts

@@ -400,16 +400,15 @@ export class FunctionsEmulator implements EmulatorInstance {
   async sendRequest(trigger: EmulatedTriggerDefinition, body?: any) {
     const record = this.getTriggerRecordByKey(this.getTriggerKey(trigger));
     const pool = this.workerPools[record.backend.codebase];
-    const runtime = record.backend.runtime;
-    if (!pool.readyForWork(trigger.id, runtime)) {
+    if (!pool.readyForWork(trigger.id, record.backend.runtime)) {
       try {
         await this.startRuntime(record.backend, trigger);
       } catch (e: any) {
         this.logger.logLabeled("ERROR", `Failed to start runtime for ${trigger.id}: ${e}`);
         return;
       }
     }
-    const worker = pool.getIdleWorker(trigger.id, runtime)!;
+    const worker = pool.getIdleWorker(trigger.id, record.backend.runtime)!;
     if (this.debugMode) {
       await worker.sendDebugMsg({
         functionTarget: trigger.entryPoint,
@@ -424,7 +423,7 @@ export class FunctionsEmulator implements EmulatorInstance {
 
     // For Dart, include the function name in the path so the server can route
     // For other runtimes, use / as they use FUNCTION_TARGET env var
-    const isDart = isLanguageRuntime(runtime, "dart");
+    const isDart = isLanguageRuntime(record.backend.runtime, "dart");
     const path = isDart ? `/${trigger.name}` : `/`;
 
     return new Promise((resolve, reject) => {
@@ -1887,8 +1886,7 @@ export class FunctionsEmulator implements EmulatorInstance {
     this.logger.log("DEBUG", `[functions] Got req.url=${req.url}, mapping to path=${path}`);
 
     const pool = this.workerPools[record.backend.codebase];
-    const runtime = record.backend.runtime;
-    if (!pool.readyForWork(trigger.id, runtime)) {
+    if (!pool.readyForWork(trigger.id, record.backend.runtime)) {
       try {
         await this.startRuntime(record.backend, trigger);
       } catch (e: any) {
@@ -1917,7 +1915,7 @@ export class FunctionsEmulator implements EmulatorInstance {
       res as http.ServerResponse,
       reqBody,
       debugBundle,
-      runtime,
+      record.backend.runtime,
     );
   }
 }

src/emulator/functionsRuntimeWorker.ts

@@ -301,8 +301,8 @@ export class RuntimeWorkerPool {
     if (this.mode === FunctionsExecutionMode.SEQUENTIAL) {
       return "~shared~";
     }
-    // For Dart, use a shared key so all functions in a codebase share the same process
-    // Dart loads all functions and routes based on request path
+    // For Dart, use a shared key so all functions in a codebase share the same worker process.
+    // Dart loads all functions into a single process and routes based on request path.
     if (isLanguageRuntime(runtime, "dart")) {
       return "~dart-shared~";
     }

src/init/features/functions/dart.ts

@@ -2,51 +2,11 @@ import * as spawn from "cross-spawn";
 import { Config } from "../../../config";
 import { confirm } from "../../../prompt";
 import { latest } from "../../../deploy/functions/runtimes/supported";
+import { readTemplateSync } from "../../../templates";
 
-// TODO(ehesp): Create these template files in templates/init/functions/dart/
-// TODO(ehesp): Dont use relative path for firebase_functions
-const PUBSPEC_TEMPLATE = `name: functions
-description: Firebase Functions for Dart
-version: 1.0.0
-
-environment:
-  sdk: '>=3.0.0 <4.0.0'
-
-dependencies:
-  firebase_functions:
-    path: ../
-
-dev_dependencies:
-  build_runner: ^2.4.0
-`;
-
-const MAIN_TEMPLATE = `import 'package:firebase_functions/firebase_functions.dart';
-
-void main(List<String> args) {
-  fireUp(args, (firebase) {
-
-    firebase.https.onRequest(
-      name: 'helloWorld',
-      options: const HttpsOptions(cors: Cors(['*'])),
-      (request) async {
-        return Response(200, body: 'Hello from Dart Functions!');
-      });
-  });
-}
-`;
-
-const GITIGNORE_TEMPLATE = `.dart_tool/
-build/
-*.dart.js
-*.info.json
-*.js
-*.js.map
-*.js.deps
-*.js.symbols
-firebase-debug.log
-firebase-debug.*.log
-*.local
-`;
+const PUBSPEC_TEMPLATE = readTemplateSync("init/functions/dart/pubspec.yaml");
+const MAIN_TEMPLATE = readTemplateSync("init/functions/dart/main.dart");
+const GITIGNORE_TEMPLATE = readTemplateSync("init/functions/dart/_gitignore");
 
 /**
  * Create a Dart Firebase Functions project.

templates/init/functions/dart/_gitignore

@@ -0,0 +1,11 @@
+.dart_tool/
+build/
+*.dart.js
+*.info.json
+*.js
+*.js.map
+*.js.deps
+*.js.symbols
+firebase-debug.log
+firebase-debug.*.log
+*.local

templates/init/functions/dart/main.dart

@@ -0,0 +1,13 @@
+import 'package:firebase_functions/firebase_functions.dart';
+
+void main(List<String> args) {
+  fireUp(args, (firebase) {
+
+    firebase.https.onRequest(
+      name: 'helloWorld',
+      options: const HttpsOptions(cors: Cors(['*'])),
+      (request) async {
+        return Response(200, body: 'Hello from Dart Functions!');
+      });
+  });
+}

templates/init/functions/dart/pubspec.yaml

@@ -0,0 +1,14 @@
+name: functions
+description: Firebase Functions for Dart
+version: 1.0.0
+
+environment:
+  sdk: '>=3.0.0 <4.0.0'
+
+dependencies:
+  # TODO(ehesp): Replace with published package version once available on pub.dev
+  firebase_functions:
+    path: ../
+
+dev_dependencies:
+  build_runner: ^2.4.0