firebase-tools 14.16.0 → 14.17.0

package/lib/crashlytics/{listNotes.js → events.js}

@@ -1,29 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listNotes = void 0;
+exports.listEvents = void 0;
 const logger_1 = require("../logger");
 const error_1 = require("../error");
 const utils_1 = require("./utils");
-async function listNotes(appId, issueId, noteCount) {
+const filters_1 = require("./filters");
+async function listEvents(appId, filter, pageSize = 1) {
     const requestProjectNumber = (0, utils_1.parseProjectNumber)(appId);
     try {
-        const queryParams = new URLSearchParams();
-        queryParams.set("page_size", `${noteCount}`);
-        logger_1.logger.debug(`[mcp][crashlytics] listNotes called with appId: ${appId}, issueId: ${issueId}, noteCount: ${noteCount}`);
+        const queryParams = (0, filters_1.filterToUrlSearchParams)(filter);
+        queryParams.set("page_size", `${pageSize}`);
+        logger_1.logger.debug(`[crashlytics] listEvents called with appId: ${appId}, filter: ${queryParams.toString()}, pageSize: ${pageSize}`);
         const response = await utils_1.CRASHLYTICS_API_CLIENT.request({
             method: "GET",
             headers: {
                 "Content-Type": "application/json",
             },
-            path: `/projects/${requestProjectNumber}/apps/${appId}/issues/${issueId}/notes`,
+            path: `/projects/${requestProjectNumber}/apps/${appId}/events`,
             queryParams: queryParams,
             timeout: utils_1.TIMEOUT,
         });
         return response.body;
     }
     catch (err) {
-        logger_1.logger.debug(err.message);
-        throw new error_1.FirebaseError(`Failed to fetch notes for issue ${issueId} for app ${appId}. Error: ${err}.`, { original: err });
+        throw new error_1.FirebaseError(`Failed to list events for app_id ${appId}.`, {
+            original: (0, error_1.getError)(err),
+        });
     }
 }
-exports.listNotes = listNotes;
+exports.listEvents = listEvents;

package/lib/crashlytics/filters.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterToUrlSearchParams = exports.EventFilterSchema = exports.IssueIdSchema = exports.ApplicationIdSchema = void 0;
+const zod_1 = require("zod");
+exports.ApplicationIdSchema = zod_1.z
+    .string()
+    .describe("Firebase app id. For an Android application, read the " +
+    "mobilesdk_app_id value specified in the google-services.json file for " +
+    "the current package name. For an iOS Application, read the GOOGLE_APP_ID " +
+    "from GoogleService-Info.plist. If neither is available, ask the user to " +
+    "provide the app id.");
+exports.IssueIdSchema = zod_1.z.string().describe("Crashlytics issue id, as hexidecimal uuid");
+exports.EventFilterSchema = zod_1.z
+    .object({
+    intervalStartTime: zod_1.z.string().optional().describe(`A timestamp in ISO 8601 string format`),
+    intervalEndTime: zod_1.z.string().optional().describe(`A timestamp in ISO 8601 string format.`),
+    versionDisplayNames: zod_1.z
+        .array(zod_1.z.string())
+        .optional()
+        .describe(`The version display names should be obtained from an API response.`),
+    issueId: zod_1.z.string().optional().describe(`Count events for the given issue`),
+    issueVariantId: zod_1.z.string().optional().describe(`Count events for the given issue variant`),
+    issueErrorTypes: zod_1.z
+        .array(zod_1.z.enum(["FATAL", "NON_FATAL", "ANR"]))
+        .optional()
+        .describe(`Count FATAL events (crashes), NON_FATAL events (exceptions) or ANR events (application not responding)`),
+    issueSignals: zod_1.z
+        .array(zod_1.z.enum(["SIGNAL_EARLY", "SIGNAL_FRESH", "SIGNAL_REGRESSED", "SIGNAL_REPETITIVE"]))
+        .optional()
+        .describe(`Count events matching the given signals`),
+    operatingSystemDisplayNames: zod_1.z
+        .array(zod_1.z.string())
+        .optional()
+        .describe(`The operating system displayNames should be obtained from an API response`),
+    deviceDisplayNames: zod_1.z
+        .array(zod_1.z.string())
+        .optional()
+        .describe(`The operating system displayNames should be obtained from an API response`),
+    deviceFormFactors: zod_1.z
+        .array(zod_1.z.enum(["PHONE", "TABLET", "DESKTOP", "TV", "WATCH"]))
+        .optional()
+        .describe(`Count events originating from the given device form factors`),
+})
+    .optional()
+    .describe(`Only events matching the given filters will be counted. All filters are optional. 
+    If setting a time interval, set both intervalStartTime and intervalEndTime.`);
+const toolToParamMap = {
+    intervalStartTime: "filter.interval.start_time",
+    intervalEndTime: "filter.interval.end_time",
+    versionDisplayNames: "filter.version.display_names",
+    issueId: "filter.issue.id",
+    issueVariantId: "filter.issue.variant_id",
+    issueErrorTypes: "filter.issue.error_types",
+    issueSignals: "filter.issue.signals",
+    operatingSystemDisplayNames: "filter.operating_system.display_names",
+    deviceDisplayNames: "filter.device.display_names",
+    deviceFormFactors: "filter.device.form_factors",
+};
+function filterToUrlSearchParams(filter) {
+    const params = new URLSearchParams();
+    for (const [key, value] of Object.entries(filter || {})) {
+        if (value === undefined) {
+            continue;
+        }
+        const paramKey = toolToParamMap[key];
+        if (Array.isArray(value)) {
+            for (const v of value) {
+                params.append(paramKey, v);
+            }
+        }
+        else if (value) {
+            params.set(paramKey, value);
+        }
+    }
+    return params;
+}
+exports.filterToUrlSearchParams = filterToUrlSearchParams;

package/lib/crashlytics/issues.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateIssue = exports.getIssue = void 0;
+const logger_1 = require("../logger");
+const error_1 = require("../error");
+const utils_1 = require("./utils");
+async function getIssue(appId, issueId) {
+    const requestProjectNumber = (0, utils_1.parseProjectNumber)(appId);
+    logger_1.logger.debug(`[crashlytics] getIssue called with appId: ${appId}, issueId: ${issueId}`);
+    try {
+        const response = await utils_1.CRASHLYTICS_API_CLIENT.request({
+            method: "GET",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            path: `/projects/${requestProjectNumber}/apps/${appId}/issues/${issueId}`,
+            timeout: utils_1.TIMEOUT,
+        });
+        return response.body;
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to fetch issue for appId ${appId}, issueId ${issueId}`, {
+            original: (0, error_1.getError)(err),
+        });
+    }
+}
+exports.getIssue = getIssue;
+async function updateIssue(appId, issueId, state) {
+    const requestProjectNumber = (0, utils_1.parseProjectNumber)(appId);
+    try {
+        logger_1.logger.debug(`[crashlytics] updateIssue called with appId: ${appId}, issueId: ${issueId}, state: ${state}`);
+        const response = await utils_1.CRASHLYTICS_API_CLIENT.request({
+            method: "PATCH",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            path: `/projects/${requestProjectNumber}/apps/${appId}/issues/${issueId}`,
+            queryParams: { updateMask: "state" },
+            body: { issue: { state } },
+            timeout: utils_1.TIMEOUT,
+        });
+        return response.body;
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to update issue ${issueId} for app ${appId}`, {
+            original: (0, error_1.getError)(err),
+        });
+    }
+}
+exports.updateIssue = updateIssue;

package/lib/crashlytics/notes.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listNotes = exports.deleteNote = exports.createNote = void 0;
+const logger_1 = require("../logger");
+const error_1 = require("../error");
+const utils_1 = require("./utils");
+async function createNote(appId, issueId, note) {
+    const requestProjectNumber = (0, utils_1.parseProjectNumber)(appId);
+    logger_1.logger.debug(`[crashlytics] createNote called with appId: ${appId}, issueId: ${issueId}, note: ${note}`);
+    try {
+        const response = await utils_1.CRASHLYTICS_API_CLIENT.request({
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            path: `/projects/${requestProjectNumber}/apps/${appId}/issues/${issueId}/notes`,
+            body: { body: note },
+            timeout: utils_1.TIMEOUT,
+        });
+        return response.body;
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to create note for issue ${issueId}, app ${appId}`, {
+            original: (0, error_1.getError)(err),
+        });
+    }
+}
+exports.createNote = createNote;
+async function deleteNote(appId, issueId, noteId) {
+    const requestProjectNumber = (0, utils_1.parseProjectNumber)(appId);
+    logger_1.logger.debug(`[crashlytics] deleteNote called with appId: ${appId}, issueId: ${issueId}, noteId: ${noteId}`);
+    try {
+        await utils_1.CRASHLYTICS_API_CLIENT.request({
+            method: "DELETE",
+            path: `/projects/${requestProjectNumber}/apps/${appId}/issues/${issueId}/notes/${noteId}`,
+            timeout: utils_1.TIMEOUT,
+        });
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to delete note ${noteId} from issue ${issueId} for app ${appId}`, { original: (0, error_1.getError)(err) });
+    }
+}
+exports.deleteNote = deleteNote;
+async function listNotes(appId, issueId, pageSize = 20) {
+    const requestProjectNumber = (0, utils_1.parseProjectNumber)(appId);
+    try {
+        const queryParams = new URLSearchParams();
+        queryParams.set("page_size", `${pageSize}`);
+        logger_1.logger.debug(`[crashlytics] listNotes called with appId: ${appId}, issueId: ${issueId}, pageSize: ${pageSize}`);
+        const response = await utils_1.CRASHLYTICS_API_CLIENT.request({
+            method: "GET",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            path: `/projects/${requestProjectNumber}/apps/${appId}/issues/${issueId}/notes`,
+            queryParams: queryParams,
+            timeout: utils_1.TIMEOUT,
+        });
+        return response.body.notes || [];
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to list notes for issue ${issueId}, app ${appId}`, {
+            original: (0, error_1.getError)(err),
+        });
+    }
+}
+exports.listNotes = listNotes;

package/lib/crashlytics/reports.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getReport = exports.CrashlyticsReport = exports.ReportInputSchema = void 0;
+const zod_1 = require("zod");
+const logger_1 = require("../logger");
+const error_1 = require("../error");
+const utils_1 = require("./utils");
+const filters_1 = require("./filters");
+const DEFAULT_PAGE_SIZE = 10;
+exports.ReportInputSchema = zod_1.z.object({
+    appId: filters_1.ApplicationIdSchema,
+    filter: filters_1.EventFilterSchema,
+    pageSize: zod_1.z.number().optional().describe("Number of rows to return").default(DEFAULT_PAGE_SIZE),
+});
+var CrashlyticsReport;
+(function (CrashlyticsReport) {
+    CrashlyticsReport["TopIssues"] = "topIssues";
+    CrashlyticsReport["TopVariants"] = "topVariants";
+    CrashlyticsReport["TopVersions"] = "topVersions";
+    CrashlyticsReport["TopOperatingSystems"] = "topOperatingSystems";
+    CrashlyticsReport["TopAppleDevices"] = "topAppleDevices";
+    CrashlyticsReport["TopAndroidDevices"] = "topAndroidDevices";
+})(CrashlyticsReport = exports.CrashlyticsReport || (exports.CrashlyticsReport = {}));
+async function getReport(report, appId, filter, pageSize = DEFAULT_PAGE_SIZE) {
+    const requestProjectNumber = (0, utils_1.parseProjectNumber)(appId);
+    try {
+        const queryParams = (0, filters_1.filterToUrlSearchParams)(filter);
+        queryParams.set("page_size", `${pageSize}`);
+        logger_1.logger.debug(`[crashlytics] report ${report} called with appId: ${appId} filter: ${queryParams.toString()}, page_size: ${pageSize}`);
+        const response = await utils_1.CRASHLYTICS_API_CLIENT.request({
+            method: "GET",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            path: `/projects/${requestProjectNumber}/apps/${appId}/reports/${report}`,
+            queryParams: queryParams,
+            timeout: utils_1.TIMEOUT,
+        });
+        return response.body;
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to fetch ${report} report for app: ${appId}`, {
+            original: (0, error_1.getError)(err),
+        });
+    }
+}
+exports.getReport = getReport;

package/lib/crashlytics/types.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ThreadState = exports.Signal = exports.State = exports.SessionEventType = exports.FormFactor = exports.TrackType = exports.ErrorType = void 0;
+var ErrorType;
+(function (ErrorType) {
+    ErrorType["ERROR_TYPE_UNSPECIFIED"] = "ERROR_TYPE_UNSPECIFIED";
+    ErrorType["FATAL"] = "FATAL";
+    ErrorType["NON_FATAL"] = "NON_FATAL";
+    ErrorType["ANR"] = "ANR";
+})(ErrorType = exports.ErrorType || (exports.ErrorType = {}));
+var TrackType;
+(function (TrackType) {
+    TrackType["TRACK_TYPE_UNSPECIFIED"] = "TRACK_TYPE_UNSPECIFIED";
+    TrackType["TRACK_TYPE_PROD"] = "TRACK_TYPE_PROD";
+    TrackType["TRACK_TYPE_INTERNAL"] = "TRACK_TYPE_INTERNAL";
+    TrackType["TRACK_TYPE_OPEN_TESTING"] = "TRACK_TYPE_OPEN_TESTING";
+    TrackType["TRACK_TYPE_CLOSED_TESTING"] = "TRACK_TYPE_CLOSED_TESTING";
+    TrackType["TRACK_TYPE_EARLY_ACCESS"] = "TRACK_TYPE_EARLY_ACCESS";
+})(TrackType = exports.TrackType || (exports.TrackType = {}));
+var FormFactor;
+(function (FormFactor) {
+    FormFactor["FORM_FACTOR_UNSPECIFIED"] = "FORM_FACTOR_UNSPECIFIED";
+    FormFactor["PHONE"] = "PHONE";
+    FormFactor["TABLET"] = "TABLET";
+    FormFactor["DESKTOP"] = "DESKTOP";
+    FormFactor["TV"] = "TV";
+    FormFactor["WATCH"] = "WATCH";
+})(FormFactor = exports.FormFactor || (exports.FormFactor = {}));
+var SessionEventType;
+(function (SessionEventType) {
+    SessionEventType["SESSION_EVENT_TYPE_UNKNOWN"] = "SESSION_EVENT_TYPE_UNKNOWN";
+    SessionEventType["SESSION_START"] = "SESSION_START";
+})(SessionEventType = exports.SessionEventType || (exports.SessionEventType = {}));
+var State;
+(function (State) {
+    State["STATE_UNSPECIFIED"] = "STATE_UNSPECIFIED";
+    State["OPEN"] = "OPEN";
+    State["CLOSED"] = "CLOSED";
+    State["MUTED"] = "MUTED";
+})(State = exports.State || (exports.State = {}));
+var Signal;
+(function (Signal) {
+    Signal["SIGNAL_UNSPECIFIED"] = "SIGNAL_UNSPECIFIED";
+    Signal["SIGNAL_EARLY"] = "SIGNAL_EARLY";
+    Signal["SIGNAL_FRESH"] = "SIGNAL_FRESH";
+    Signal["SIGNAL_REGRESSED"] = "SIGNAL_REGRESSED";
+    Signal["SIGNAL_REPETITIVE"] = "SIGNAL_REPETITIVE";
+})(Signal = exports.Signal || (exports.Signal = {}));
+var ThreadState;
+(function (ThreadState) {
+    ThreadState["STATE_UNSPECIFIED"] = "STATE_UNSPECIFIED";
+    ThreadState["THREAD_STATE_TERMINATED"] = "THREAD_STATE_TERMINATED";
+    ThreadState["THREAD_STATE_RUNNABLE"] = "THREAD_STATE_RUNNABLE";
+    ThreadState["THREAD_STATE_TIMED_WAITING"] = "THREAD_STATE_TIMED_WAITING";
+    ThreadState["THREAD_STATE_BLOCKED"] = "THREAD_STATE_BLOCKED";
+    ThreadState["THREAD_STATE_WAITING"] = "THREAD_STATE_WAITING";
+    ThreadState["THREAD_STATE_NEW"] = "THREAD_STATE_NEW";
+    ThreadState["THREAD_STATE_NATIVE_RUNNABLE"] = "THREAD_STATE_NATIVE_RUNNABLE";
+    ThreadState["THREAD_STATE_NATIVE_WAITING"] = "THREAD_STATE_NATIVE_WAITING";
+})(ThreadState = exports.ThreadState || (exports.ThreadState = {}));

package/lib/deploy/apphosting/deploy.js

@@ -60,7 +60,8 @@ async function default_1(context, options) {
         }
     }
     for (const cfg of context.backendConfigs.values()) {
-        const { projectSourcePath, zippedSourcePath } = await (0, util_1.createArchive)(cfg, options.projectRoot);
+        const projectSourcePath = options.projectRoot ? options.projectRoot : process.cwd();
+        const zippedSourcePath = await (0, util_1.createArchive)(cfg, projectSourcePath);
         const backendLocation = context.backendLocations.get(cfg.backendId);
         if (!backendLocation) {
             throw new error_1.FirebaseError(`Failed to find location for backend ${cfg.backendId}. Please contact support with the contents of your firebase-debug.log to report your issue.`);

package/lib/deploy/apphosting/util.js

@@ -7,28 +7,25 @@ const path = require("path");
 const tmp = require("tmp");
 const error_1 = require("../../error");
 const fsAsync = require("../../fsAsync");
-async function createArchive(config, projectRoot) {
+async function createArchive(config, rootDir) {
     const tmpFile = tmp.fileSync({ prefix: `${config.backendId}-`, postfix: ".zip" }).name;
     const fileStream = fs.createWriteStream(tmpFile, {
         flags: "w",
         encoding: "binary",
     });
     const archive = archiver("zip");
-    if (!projectRoot) {
-        projectRoot = process.cwd();
-    }
     const ignore = config.ignore || ["node_modules", ".git"];
     ignore.push("firebase-debug.log", "firebase-debug.*.log");
-    const gitIgnorePatterns = parseGitIgnorePatterns(projectRoot);
+    const gitIgnorePatterns = parseGitIgnorePatterns(rootDir);
     ignore.push(...gitIgnorePatterns);
     try {
         const files = await fsAsync.readdirRecursive({
-            path: projectRoot,
+            path: rootDir,
             ignore: ignore,
             isGitIgnore: true,
         });
         for (const file of files) {
-            const name = path.relative(projectRoot, file.name);
+            const name = path.relative(rootDir, file.name);
             archive.file(file.name, {
                 name,
                 mode: file.mode,
@@ -39,7 +36,7 @@ async function createArchive(config, projectRoot) {
     catch (err) {
         throw new error_1.FirebaseError("Could not read source directory. Remove links and shortcuts and try again.", { original: err, exit: 1 });
     }
-    return { projectSourcePath: projectRoot, zippedSourcePath: tmpFile };
+    return tmpFile;
 }
 exports.createArchive = createArchive;
 function parseGitIgnorePatterns(projectRoot, gitIgnorePath = ".gitignore") {

package/lib/emulator/apphosting/developmentServer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectStartCommand = exports.detectPackageManager = exports.logger = void 0;
+exports.detectPackageManagerStartCommand = exports.detectPackageManager = exports.logger = void 0;
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const emulatorLogger_1 = require("../emulatorLogger");
@@ -20,7 +20,7 @@ async function detectPackageManager(rootdir) {
     throw new error_1.FirebaseError("Unsupported package manager");
 }
 exports.detectPackageManager = detectPackageManager;
-async function detectStartCommand(rootDir) {
+async function detectPackageManagerStartCommand(rootDir) {
     try {
         const packageManager = await detectPackageManager(rootDir);
         return `${packageManager} run dev`;
@@ -29,4 +29,4 @@ async function detectStartCommand(rootDir) {
         throw new error_1.FirebaseError("Failed to auto-detect your project's start command. Consider manually setting the start command by setting `firebase.json#emulators.apphosting.startCommand`");
     }
 }
-exports.detectStartCommand = detectStartCommand;
+exports.detectPackageManagerStartCommand = detectPackageManagerStartCommand;

package/lib/emulator/apphosting/serve.js

@@ -22,17 +22,6 @@ const fetchWebSetup_1 = require("../../fetchWebSetup");
 const apps_1 = require("../../management/apps");
 const child_process_1 = require("child_process");
 const semver_1 = require("semver");
-async function start(options) {
-    var _a;
-    const hostname = constants_1.DEFAULT_HOST;
-    let port = (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PORTS.apphosting;
-    while (!(await availablePort(hostname, port))) {
-        port += 1;
-    }
-    await serve(options === null || options === void 0 ? void 0 : options.projectId, options === null || options === void 0 ? void 0 : options.backendId, port, options === null || options === void 0 ? void 0 : options.startCommand, options === null || options === void 0 ? void 0 : options.rootDirectory);
-    return { hostname, port };
-}
-exports.start = start;
 const secretResourceRegex = /^projects\/([^/]+)\/secrets\/([^/]+)(?:\/versions\/((?:latest)|\d+))?$/;
 const secretShorthandRegex = /^([^/@]+)(?:@((?:latest)|\d+))?$/;
 async function loadSecret(project, name) {
@@ -70,21 +59,41 @@ async function loadSecret(project, name) {
         throw err;
     }
 }
-async function serve(projectId, backendId, port, startCommand, backendRelativeDir) {
-    backendRelativeDir = backendRelativeDir !== null && backendRelativeDir !== void 0 ? backendRelativeDir : "./";
-    const backendRoot = (0, projectPath_1.resolveProjectPath)({}, backendRelativeDir);
+async function start(options) {
+    var _a, _b;
+    const hostname = constants_1.DEFAULT_HOST;
+    let port = (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PORTS.apphosting;
+    while (!(await availablePort(hostname, port))) {
+        port += 1;
+    }
+    const backendRoot = (0, projectPath_1.resolveProjectPath)({}, (_b = options === null || options === void 0 ? void 0 : options.rootDirectory) !== null && _b !== void 0 ? _b : "./");
+    let startCommand;
+    if (options === null || options === void 0 ? void 0 : options.startCommand) {
+        startCommand = options === null || options === void 0 ? void 0 : options.startCommand;
+        if (startCommand.includes("--port") || startCommand.includes(" -p ")) {
+            throw new error_1.FirebaseError("Specifying a port in the start command is not supported by the apphosting emulator");
+        }
+        if (startCommand.includes("ng serve")) {
+            startCommand += ` --port ${port}`;
+        }
+        developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `running custom start command: '${startCommand}'`);
+    }
+    else {
+        startCommand = await (0, developmentServer_1.detectPackageManagerStartCommand)(backendRoot);
+        developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `starting app with: '${startCommand}'`);
+    }
     const apphostingLocalConfig = await (0, config_1.getLocalAppHostingConfiguration)(backendRoot);
     const resolveEnv = Object.entries(apphostingLocalConfig.env).map(async ([key, value]) => [
         key,
-        value.value ? value.value : await loadSecret(projectId, value.secret),
+        value.value ? value.value : await loadSecret(options === null || options === void 0 ? void 0 : options.projectId, value.secret),
     ]);
-    const environmentVariablesToInject = Object.assign(Object.assign(Object.assign({ NODE_ENV: process.env.NODE_ENV }, getEmulatorEnvs()), Object.fromEntries(await Promise.all(resolveEnv))), { FIREBASE_APP_HOSTING: "1", X_GOOGLE_TARGET_PLATFORM: "fah", GCLOUD_PROJECT: projectId, PROJECT_ID: projectId, PORT: port.toString() });
+    const environmentVariablesToInject = Object.assign(Object.assign(Object.assign({ NODE_ENV: process.env.NODE_ENV }, getEmulatorEnvs()), Object.fromEntries(await Promise.all(resolveEnv))), { FIREBASE_APP_HOSTING: "1", X_GOOGLE_TARGET_PLATFORM: "fah", GCLOUD_PROJECT: options === null || options === void 0 ? void 0 : options.projectId, PROJECT_ID: options === null || options === void 0 ? void 0 : options.projectId, PORT: port.toString() });
     const packageManager = await (0, developmentServer_1.detectPackageManager)(backendRoot).catch(() => undefined);
     if (packageManager === "pnpm") {
         (0, utils_1.logLabeledWarning)("apphosting", `Firebase JS SDK autoinit does not currently support PNPM.`);
     }
     else {
-        const webappConfig = await getBackendAppConfig(projectId, backendId);
+        const webappConfig = await getBackendAppConfig(options === null || options === void 0 ? void 0 : options.projectId, options === null || options === void 0 ? void 0 : options.backendId);
         if (webappConfig) {
             environmentVariablesToInject["FIREBASE_WEBAPP_CONFIG"] || (environmentVariablesToInject["FIREBASE_WEBAPP_CONFIG"] = JSON.stringify(webappConfig));
             environmentVariablesToInject["FIREBASE_CONFIG"] || (environmentVariablesToInject["FIREBASE_CONFIG"] = JSON.stringify({
@@ -95,23 +104,14 @@ async function serve(projectId, backendId, port, startCommand, backendRelativeDi
         }
         await tripFirebasePostinstall(backendRoot, environmentVariablesToInject);
     }
-    if (startCommand) {
-        developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `running custom start command: '${startCommand}'`);
-        (0, spawn_1.spawnWithCommandString)(startCommand, backendRoot, environmentVariablesToInject)
-            .catch((err) => {
-            developmentServer_2.logger.logLabeled("ERROR", types_1.Emulators.APPHOSTING, `failed to start Dev Server: ${err}`);
-        })
-            .then(() => developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `Dev Server stopped`));
-        return;
-    }
-    const detectedStartCommand = await (0, developmentServer_1.detectStartCommand)(backendRoot);
-    developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `starting app with: '${detectedStartCommand}'`);
-    (0, spawn_1.spawnWithCommandString)(detectedStartCommand, backendRoot, environmentVariablesToInject)
+    (0, spawn_1.spawnWithCommandString)(startCommand, backendRoot, environmentVariablesToInject)
         .catch((err) => {
         developmentServer_2.logger.logLabeled("ERROR", types_1.Emulators.APPHOSTING, `failed to start Dev Server: ${err}`);
     })
         .then(() => developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `Dev Server stopped`));
+    return { hostname, port };
 }
+exports.start = start;
 function availablePort(host, port) {
     return (0, portUtils_1.checkListenable)({
         address: host,

package/lib/emulator/initEmulators.js

@@ -24,7 +24,7 @@ exports.AdditionalInitFns = {
         additionalConfigs.set("rootDirectory", backendRelativeDir);
         const backendRoot = (0, path_1.join)(cwd, backendRelativeDir);
         try {
-            const startCommand = await (0, developmentServer_1.detectStartCommand)(backendRoot);
+            const startCommand = await (0, developmentServer_1.detectPackageManagerStartCommand)(backendRoot);
             additionalConfigs.set("startCommand", startCommand);
         }
         catch (e) {

package/lib/init/features/dataconnect/index.js

@@ -424,7 +424,7 @@ async function promptForCloudSQL(setup, info) {
         info.locationId = await (0, prompt_1.select)({
             message: "What location would like to use?",
             choices,
-            default: "us-central1",
+            default: "us-east4",
         });
         info.shouldProvisionCSQL = await (0, prompt_1.confirm)({
             message: `Would you like to provision your Cloud SQL instance and database now?`,
@@ -452,14 +452,39 @@ async function locationChoices(setup) {
     }
     else {
         return [
-            { name: "us-central1", value: "us-central1" },
-            { name: "europe-north1", value: "europe-north1" },
+            { name: "asia-east1", value: "asia-east1" },
+            { name: "asia-east2", value: "asia-east2" },
+            { name: "asia-northeast1", value: "asia-northeast1" },
+            { name: "asia-northeast2", value: "asia-northeast2" },
+            { name: "asia-northeast3", value: "asia-northeast3" },
+            { name: "asia-south1", value: "asia-south1" },
+            { name: "asia-southeast1", value: "asia-southeast1" },
+            { name: "asia-southeast2", value: "asia-southeast2" },
+            { name: "australia-southeast1", value: "australia-southeast1" },
+            { name: "australia-southeast2", value: "australia-southeast2" },
             { name: "europe-central2", value: "europe-central2" },
+            { name: "europe-north1", value: "europe-north1" },
+            { name: "europe-southwest1", value: "europe-southwest1" },
             { name: "europe-west1", value: "europe-west1" },
+            { name: "europe-west2", value: "europe-west2" },
+            { name: "europe-west3", value: "europe-west3" },
+            { name: "europe-west4", value: "europe-west4" },
+            { name: "europe-west6", value: "europe-west6" },
+            { name: "europe-west8", value: "europe-west8" },
+            { name: "europe-west9", value: "europe-west9" },
+            { name: "me-west1", value: "me-west1" },
+            { name: "northamerica-northeast1", value: "northamerica-northeast1" },
+            { name: "northamerica-northeast2", value: "northamerica-northeast2" },
+            { name: "southamerica-east1", value: "southamerica-east1" },
             { name: "southamerica-west1", value: "southamerica-west1" },
+            { name: "us-central1", value: "us-central1" },
+            { name: "us-east1", value: "us-east1" },
             { name: "us-east4", value: "us-east4" },
+            { name: "us-south1", value: "us-south1" },
             { name: "us-west1", value: "us-west1" },
-            { name: "asia-southeast1", value: "asia-southeast1" },
+            { name: "us-west2", value: "us-west2" },
+            { name: "us-west3", value: "us-west3" },
+            { name: "us-west4", value: "us-west4" },
         ];
     }
 }

package/lib/init/features/dataconnect/sdk.js

@@ -41,18 +41,23 @@ async function askQuestions(setup) {
                 { name: "no", value: "no" },
             ],
         });
-        switch (choice) {
-            case "react":
-                await (0, create_app_1.createReactApp)((0, utils_1.newUniqueId)("web-app", (0, fsutils_1.listFiles)(cwd)));
-                break;
-            case "next":
-                await (0, create_app_1.createNextApp)((0, utils_1.newUniqueId)("web-app", (0, fsutils_1.listFiles)(cwd)));
-                break;
-            case "flutter":
-                await (0, create_app_1.createFlutterApp)((0, utils_1.newUniqueId)("flutter_app", (0, fsutils_1.listFiles)(cwd)));
-                break;
-            case "no":
-                break;
+        try {
+            switch (choice) {
+                case "react":
+                    await (0, create_app_1.createReactApp)((0, utils_1.newUniqueId)("web-app", (0, fsutils_1.listFiles)(cwd)));
+                    break;
+                case "next":
+                    await (0, create_app_1.createNextApp)((0, utils_1.newUniqueId)("web-app", (0, fsutils_1.listFiles)(cwd)));
+                    break;
+                case "flutter":
+                    await (0, create_app_1.createFlutterApp)((0, utils_1.newUniqueId)("flutter_app", (0, fsutils_1.listFiles)(cwd)));
+                    break;
+                case "no":
+                    break;
+            }
+        }
+        catch (err) {
+            (0, utils_1.logLabeledError)("dataconnect", `Failed to create a ${choice} app template`);
         }
     }
     setup.featureInfo = setup.featureInfo || {};