Zip deploy fixes

package.json

@@ -103,8 +103,7 @@
     ]
   },
   "dependencies": {
-    "@apphosting/build": "^0.1.6",
-    "@apphosting/common": "^0.0.8",
+    "@apphosting/build": "^0.1.7",
     "@electric-sql/pglite": "^0.3.3",
     "@electric-sql/pglite-tools": "^0.2.8",
     "@google-cloud/cloud-sql-connector": "^1.3.3",

src/apphosting/backend.ts

@@ -49,7 +49,7 @@
     // SSL.
     const maybeNodeError = err as { cause: { code: string }; code: string };
     if (
       /HANDSHAKE_FAILURE/.test(maybeNodeError?.cause?.code) ||
       "EPROTO" === maybeNodeError?.code
     ) {
       return false;
@@ -315,7 +315,7 @@
  * Prompts the user for a backend id and verifies that it doesn't match a pre-existing backend.
  */
 export async function promptNewBackendId(projectId: string, location: string): Promise<string> {
   while (true) {
     const backendId = await input({
       default: "my-web-app",
       message: "Provide a name for your backend [1-30 characters]",
@@ -356,6 +356,7 @@
   const defaultServiceAccount = defaultComputeServiceAccountEmail(projectId);
   const backendReqBody: Omit<Backend, BackendOutputOnlyFields> = {
     servingLocality: "GLOBAL_ACCESS",
+    runtime: {value: "nodejs22"},
     codebase: repository
       ? {
           repository: `${repository.name}`,
@@ -624,7 +625,7 @@
     message: locationDisambugationPrompt,
     choices: [...backendsByLocation.keys()],
   });
   return backendsByLocation.get(location)!;
 }
 
 /**

src/deploy/apphosting/deploy.ts

@@ -7,7 +7,7 @@
 import { needProjectId } from "../../projectUtils";
 import { logLabeledBullet } from "../../utils";
 import { Context } from "./args";
-import { createArchive } from "./util";
+import { createArchive, createTarArchive } from "./util";
 
 /**
  * Zips and uploads App Hosting source code to Google Cloud Storage in preparation for
@@ -33,7 +33,7 @@
           `Failed to find config for backend ${backendId}. Please contact support with the contents of your firebase-debug.log to report your issue.`,
         );
       }
       const baseName = `firebaseapphosting-sources-${options.projectNumber}-${loc.toLowerCase()}`;
       const resolvedName = await gcs.upsertBucket({
         product: "apphosting",
         createMessage: `Creating Cloud Storage bucket in ${loc} to store App Hosting source code uploads at ${baseName}...`,
@@ -71,9 +71,9 @@
           throw new FirebaseError(`No local build dir found for ${cfg.backendId}`);
         }
       }
-      const zippedSourcePath = await createArchive(cfg, rootDir, builtAppDir);
+      const zippedSourcePath = await createTarArchive(cfg, rootDir, builtAppDir);
       logLabeledBullet(
-        "apphosting",
+        "apphosting....",
         `Zipped ${cfg.localBuild ? "built app" : "source"} for backend ${cfg.backendId}`,
       );
 
@@ -87,7 +87,7 @@
         "apphosting",
         `Uploading ${cfg.localBuild ? "built app" : "source"} for backend ${cfg.backendId}...`,
       );
       const bucketName = bucketsPerLocation[backendLocation]!;
       const { bucket, object } = await gcs.uploadObject(
         {
           file: zippedSourcePath,

src/deploy/apphosting/release.ts

@@ -31,11 +31,9 @@
 
   const localBuildBackends = backendIds.filter((id) => context.backendLocalBuilds[id]);
   if (localBuildBackends.length > 0) {
-    logLabeledWarning(
-      "apphosting",
-      `Skipping backend(s) ${localBuildBackends.join(", ")}. Local Builds are not supported yet.`,
-    );
-    backendIds = backendIds.filter((id) => !localBuildBackends.includes(id));
+    console.log(localBuildBackends);
+    console.log(context.backendStorageUris);
+    console.log(context.backendLocalBuilds);
   }
 
   if (backendIds.length === 0) {
@@ -46,16 +44,17 @@
   const rollouts = backendIds.map((backendId) =>
     // TODO(9114): Add run_command
     // TODO(914): Set the buildConfig.
-    // TODO(914): Set locallyBuiltSource.
     orchestrateRollout({
       projectId,
       backendId,
       location: context.backendLocations[backendId],
       buildInput: {
+	config: context.backendLocalBuilds[backendId].buildConfig,
         source: {
           archive: {
             userStorageUri: context.backendStorageUris[backendId],
             rootDirectory: context.backendConfigs[backendId].rootDir,
+	    locallyBuiltSource: true, // generalize
           },
         },
       },
@@ -78,7 +77,7 @@
       logLabeledSuccess("apphosting", `Your backend is now deployed at:\n\thttps://${backend.uri}`);
     } else {
       logLabeledWarning("apphosting", `Rollout for backend ${backendIds[i]} failed.`);
       logLabeledError("apphosting", res.reason);
     }
   }
   rolloutsSpinner.stop();

src/deploy/apphosting/util.ts

@@ -1,11 +1,61 @@
 import * as archiver from "archiver";
 import * as fs from "fs";
 import * as path from "path";
+import * as tar from "tar";
 import * as tmp from "tmp";
 import { FirebaseError } from "../../error";
 import { AppHostingSingle } from "../../firebaseConfig";
 import * as fsAsync from "../../fsAsync";
 
+export async function createTarArchive(
+  config: AppHostingSingle,
+  rootDir: string,
+  targetSubDir?: string,
+): Promise<string> {
+  const tmpFile = tmp.fileSync({ prefix: `${config.backendId}-`, postfix: ".tar.gz" }).name;
+
+  const targetDir = targetSubDir ? path.join(rootDir, targetSubDir) : rootDir;
+  // We must ignore firebase-debug.log or weird things happen if you're in the public dir when you deploy.
+  // const ignore = config.ignore || [".git"];
+  const ignore = ["firebase-debug.log", "firebase-debug.*.log", ".git"];
+  //const gitIgnorePatterns = parseGitIgnorePatterns(targetDir);
+  //ignore.push(...gitIgnorePatterns);
+  const rdrFiles = await fsAsync.readdirRecursive({
+    path: targetDir,
+    ignore: ignore,
+    isGitIgnore: true,
+  });
+  const allFiles: string[] = rdrFiles.map((rdrf) => path.relative(rootDir, rdrf.name));
+  console.log(allFiles);
+
+
+  // `tar` returns a `TypeError` if `allFiles` is empty. Let's check a feww things.
+  try {
+    fs.statSync(rootDir);
+  } catch (err: any) {
+    if (err.code === "ENOENT") {
+      throw new FirebaseError(`Could not read directory "${rootDir}"`);
+    }
+    throw err;
+  }
+  if (!allFiles.length) {
+    throw new FirebaseError(
+      `Cannot create a tar archive with 0 files from directory "${rootDir}"`,
+    );
+  }
+
+  await tar.create(
+    {
+      gzip: true,
+      file: tmpFile,
+      cwd: rootDir,
+      portable: true,
+    },
+    allFiles,
+  );
+  return tmpFile
+}
+
 /**
  * Locates the source code for a backend and creates an archive to eventually upload to GCS.
  * Based heavily on functions upload logic in src/deploy/functions/prepareFunctionsUpload.ts.

src/gcp/apphosting.ts

@@ -7,7 +7,7 @@
 import { FirebaseError } from "../error";
 import { DeepOmit, RecursiveKeyOf, assertImplements } from "../metaprogramming";
 
-export const API_VERSION = "v1beta";
+export const API_VERSION = "v1alpha";
 
 export const client = new Client({
   urlPrefix: apphostingOrigin(),
@@ -22,6 +22,10 @@
   rootDirectory: string;
 }
 
+interface Runtime {
+  value: string;
+}
+
 /**
  * Specifies how Backend's data is replicated and served.
  *   GLOBAL_ACCESS: Stores and serves content from multiple points-of-presence (POP)
@@ -35,6 +39,7 @@
   name: string;
   mode?: string;
   codebase?: Codebase;
+  runtime?: Runtime;
   servingLocality: ServingLocality;
   labels: Record<string, string>;
   createTime: string;
@@ -283,7 +288,7 @@
   done: boolean;
   // oneof result
   error?: Status;
   response?: any;
   // end oneof result
 }
 

src/gcp/storage.ts

@@ -265,16 +265,17 @@
   object: string;
   generation: string | null;
 }> {
-  if (path.extname(source.file) !== ".zip") {
-    throw new FirebaseError(`Expected a file name ending in .zip, got ${source.file}`);
-  }
+  //  if (path.extname(source.file) !== ".zip") {
+  //throw new FirebaseError(`Expected a file name ending in .zip, got ${source.file}`);
+  //}
   const localAPIClient = new Client({ urlPrefix: storageOrigin() });
   const location = `/${bucketName}/${path.basename(source.file)}`;
   const res = await localAPIClient.request({
     method: "PUT",
     path: location,
     headers: {
-      "Content-Type": "application/zip",
+      //"Content-Type": "application/zip",
+      "Content-Type": "application/octet-stream",
       "x-goog-content-length-range": "0,123289600",
     },
     body: source.stream,