firebase-tools 14.23.0 → 14.24.1

package/lib/appUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectFiles = exports.extractAppIdentifiersAndroid = exports.extractAppIdentifierIos = exports.extractAppIdentifiersFlutter = exports.detectApps = exports.getPlatformsFromFolder = exports.appDescription = exports.Framework = exports.Platform = void 0;
+exports.detectFiles = exports.extractAppIdentifiersAndroid = exports.extractAppIdentifierIos = exports.extractAppIdentifiersFlutter = exports.getAllDepsFromPackageJson = exports.detectApps = exports.getPlatformsFromFolder = exports.appDescription = exports.Framework = exports.Platform = void 0;
 const fs = require("fs-extra");
 const path = require("path");
 const glob_1 = require("glob");
@@ -10,6 +10,7 @@ var Platform;
     Platform["WEB"] = "WEB";
     Platform["IOS"] = "IOS";
     Platform["FLUTTER"] = "FLUTTER";
+    Platform["ADMIN_NODE"] = "ADMIN_NODE";
 })(Platform = exports.Platform || (exports.Platform = {}));
 var Framework;
 (function (Framework) {
@@ -30,7 +31,7 @@ async function detectApps(dirPath) {
     const pubSpecYamlFiles = await detectFiles(dirPath, "pubspec.yaml");
     const srcMainFolders = await detectFiles(dirPath, "src/main/");
     const xCodeProjects = await detectFiles(dirPath, "*.xcodeproj/");
-    const webApps = await Promise.all(packageJsonFiles.map((p) => packageJsonToWebApp(dirPath, p)));
+    const adminAndWebApps = (await Promise.all(packageJsonFiles.map((p) => packageJsonToAdminOrWebApp(dirPath, p)))).flat();
     const flutterAppPromises = await Promise.all(pubSpecYamlFiles.map((f) => processFlutterDir(dirPath, f)));
     const flutterApps = flutterAppPromises.flat();
     const androidAppPromises = await Promise.all(srcMainFolders.map((f) => processAndroidDir(dirPath, f)));
@@ -41,7 +42,7 @@ async function detectApps(dirPath) {
     const iosApps = iosAppPromises
         .flat()
         .filter((a) => !flutterApps.some((f) => isPathInside(f.directory, a.directory)));
-    return [...webApps, ...flutterApps, ...androidApps, ...iosApps];
+    return [...flutterApps, ...androidApps, ...iosApps, ...adminAndWebApps];
 }
 exports.detectApps = detectApps;
 async function processIosDir(dirPath, filePath) {
@@ -108,14 +109,33 @@ function isPathInside(parent, child) {
     const relativePath = path.relative(parent, child);
     return !relativePath.startsWith(`..`);
 }
-async function packageJsonToWebApp(dirPath, packageJsonFile) {
+function getAllDepsFromPackageJson(packageJson) {
+    var _a, _b;
+    const devDependencies = Object.keys((_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : {});
+    const dependencies = Object.keys((_b = packageJson.dependencies) !== null && _b !== void 0 ? _b : {});
+    const allDeps = Array.from(new Set([...devDependencies, ...dependencies]));
+    return allDeps;
+}
+exports.getAllDepsFromPackageJson = getAllDepsFromPackageJson;
+async function packageJsonToAdminOrWebApp(dirPath, packageJsonFile) {
     const fullPath = path.join(dirPath, packageJsonFile);
     const packageJson = JSON.parse((await fs.readFile(fullPath)).toString());
-    return {
-        platform: Platform.WEB,
-        directory: path.dirname(packageJsonFile),
-        frameworks: getFrameworksFromPackageJson(packageJson),
-    };
+    const allDeps = getAllDepsFromPackageJson(packageJson);
+    const detectedApps = [];
+    if (allDeps.includes("firebase-admin") || allDeps.includes("firebase-functions")) {
+        detectedApps.push({
+            platform: Platform.ADMIN_NODE,
+            directory: path.dirname(packageJsonFile),
+        });
+    }
+    if (allDeps.includes("firebase") || detectedApps.length === 0) {
+        detectedApps.push({
+            platform: Platform.WEB,
+            directory: path.dirname(packageJsonFile),
+            frameworks: getFrameworksFromPackageJson(packageJson),
+        });
+    }
+    return detectedApps;
 }
 const WEB_FRAMEWORKS = Object.values(Framework);
 const WEB_FRAMEWORKS_SIGNALS = {
@@ -148,10 +168,7 @@ async function detectAppIdsForPlatform(dirPath, platform) {
     return allAppIds.flat();
 }
 function getFrameworksFromPackageJson(packageJson) {
-    var _a, _b;
-    const devDependencies = Object.keys((_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : {});
-    const dependencies = Object.keys((_b = packageJson.dependencies) !== null && _b !== void 0 ? _b : {});
-    const allDeps = Array.from(new Set([...devDependencies, ...dependencies]));
+    const allDeps = getAllDepsFromPackageJson(packageJson);
     return WEB_FRAMEWORKS.filter((framework) => WEB_FRAMEWORKS_SIGNALS[framework].find((dep) => allDeps.includes(dep)));
 }
 function extractAppIdentifiersFlutter(fileContent) {

package/lib/appdistribution/client.js

@@ -228,7 +228,7 @@ class AppDistributionClient {
         }
         utils.logSuccess(`Testers removed from group successfully`);
     }
-    async createReleaseTest(releaseName, devices, loginCredential, testCaseName) {
+    async createReleaseTest(releaseName, devices, aiInstruction, loginCredential, testCaseName) {
         try {
             const response = await this.appDistroV1AlphaClient.request({
                 method: "POST",
@@ -237,6 +237,7 @@ class AppDistributionClient {
                     deviceExecutions: devices.map((device) => ({ device })),
                     loginCredential,
                     testCase: testCaseName,
+                    aiInstructions: aiInstruction,
                 },
             });
             return response.body;

package/lib/appdistribution/distribution.js

@@ -1,16 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Distribution = exports.DistributionFileType = void 0;
+exports.awaitTestResults = exports.Distribution = exports.upload = exports.DistributionFileType = void 0;
 const fs = require("fs-extra");
-const error_1 = require("../error");
 const logger_1 = require("../logger");
 const pathUtil = require("path");
+const utils = require("../utils");
+const types_1 = require("../appdistribution/types");
+const error_1 = require("../error");
+const TEST_MAX_POLLING_RETRIES = 40;
+const TEST_POLLING_INTERVAL_MILLIS = 30000;
 var DistributionFileType;
 (function (DistributionFileType) {
     DistributionFileType["IPA"] = "ipa";
     DistributionFileType["APK"] = "apk";
     DistributionFileType["AAB"] = "aab";
 })(DistributionFileType = exports.DistributionFileType || (exports.DistributionFileType = {}));
+async function upload(requests, appName, distribution) {
+    utils.logBullet("uploading binary...");
+    try {
+        const operationName = await requests.uploadRelease(appName, distribution);
+        const uploadResponse = await requests.pollUploadStatus(operationName);
+        const release = uploadResponse.release;
+        switch (uploadResponse.result) {
+            case types_1.UploadReleaseResult.RELEASE_CREATED:
+                utils.logSuccess(`uploaded new release ${release.displayVersion} (${release.buildVersion}) successfully!`);
+                break;
+            case types_1.UploadReleaseResult.RELEASE_UPDATED:
+                utils.logSuccess(`uploaded update to existing release ${release.displayVersion} (${release.buildVersion}) successfully!`);
+                break;
+            case types_1.UploadReleaseResult.RELEASE_UNMODIFIED:
+                utils.logSuccess(`re-uploaded already existing release ${release.displayVersion} (${release.buildVersion}) successfully!`);
+                break;
+            default:
+                utils.logSuccess(`uploaded release ${release.displayVersion} (${release.buildVersion}) successfully!`);
+        }
+        utils.logSuccess(`View this release in the Firebase console: ${release.firebaseConsoleUri}`);
+        utils.logSuccess(`Share this release with testers who have access: ${release.testingUri}`);
+        utils.logSuccess(`Download the release binary (link expires in 1 hour): ${release.binaryDownloadUri}`);
+        return uploadResponse.release.name;
+    }
+    catch (err) {
+        if ((0, error_1.getErrStatus)(err) === 404) {
+            throw new error_1.FirebaseError(`App Distribution could not find your app ${appName}. ` +
+                `Make sure to onboard your app by pressing the "Get started" ` +
+                "button on the App Distribution page in the Firebase console: " +
+                "https://console.firebase.google.com/project/_/appdistribution", { exit: 1 });
+        }
+        throw new error_1.FirebaseError(`Failed to upload release. ${(0, error_1.getErrMsg)(err)}`, { exit: 1 });
+    }
+}
+exports.upload = upload;
 class Distribution {
     constructor(path) {
         this.path = path;
@@ -49,3 +88,47 @@ class Distribution {
     }
 }
 exports.Distribution = Distribution;
+async function awaitTestResults(releaseTests, requests) {
+    const releaseTestNames = new Set(releaseTests.map((rt) => rt.name).filter((n) => !!n));
+    for (let i = 0; i < TEST_MAX_POLLING_RETRIES; i++) {
+        utils.logBullet(`${releaseTestNames.size} automated test results are pending...`);
+        await delay(TEST_POLLING_INTERVAL_MILLIS);
+        for (const releaseTestName of releaseTestNames) {
+            const releaseTest = await requests.getReleaseTest(releaseTestName);
+            if (releaseTest.deviceExecutions.every((e) => e.state === "PASSED")) {
+                releaseTestNames.delete(releaseTestName);
+                if (releaseTestNames.size === 0) {
+                    utils.logSuccess("Automated test(s) passed!");
+                    return;
+                }
+                else {
+                    continue;
+                }
+            }
+            for (const execution of releaseTest.deviceExecutions) {
+                const device = deviceToString(execution.device);
+                switch (execution.state) {
+                    case "PASSED":
+                    case "IN_PROGRESS":
+                        continue;
+                    case "FAILED":
+                        throw new error_1.FirebaseError(`Automated test failed for ${device}: ${execution.failedReason}`, { exit: 1 });
+                    case "INCONCLUSIVE":
+                        throw new error_1.FirebaseError(`Automated test inconclusive for ${device}: ${execution.inconclusiveReason}`, { exit: 1 });
+                    default:
+                        throw new error_1.FirebaseError(`Unsupported automated test state for ${device}: ${execution.state}`, { exit: 1 });
+                }
+            }
+        }
+    }
+    throw new error_1.FirebaseError("It took longer than expected to run your test(s), please try again.", {
+        exit: 1,
+    });
+}
+exports.awaitTestResults = awaitTestResults;
+function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function deviceToString(device) {
+    return `${device.model} (${device.version}/${device.orientation}/${device.locale})`;
+}

package/lib/appdistribution/options-parser-util.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLoginCredential = exports.parseTestDevices = exports.getAppName = exports.getProjectName = exports.ensureFileExists = exports.getEmails = exports.parseIntoStringArray = void 0;
+exports.getLoginCredential = exports.parseTestDevices = exports.toAppName = exports.getAppName = exports.getProjectName = exports.ensureFileExists = exports.getEmails = exports.parseIntoStringArray = void 0;
 const fs = require("fs-extra");
 const error_1 = require("../error");
 const projectUtils_1 = require("../projectUtils");
-function parseIntoStringArray(value, file) {
+function parseIntoStringArray(value, file = "") {
     if (!value && file) {
         ensureFileExists(file);
         value = fs.readFileSync(file, "utf8");
@@ -45,11 +45,14 @@ function getAppName(options) {
     if (!options.app) {
         throw new error_1.FirebaseError("set the --app option to a valid Firebase app id and try again");
     }
-    const appId = options.app;
-    return `projects/${appId.split(":")[1]}/apps/${appId}`;
+    return toAppName(options.app);
 }
 exports.getAppName = getAppName;
-function parseTestDevices(value, file) {
+function toAppName(appId) {
+    return `projects/${appId.split(":")[1]}/apps/${appId}`;
+}
+exports.toAppName = toAppName;
+function parseTestDevices(value, file = "") {
     if (!value && file) {
         ensureFileExists(file);
         value = fs.readFileSync(file, "utf8");

package/lib/commands/appdistribution-distribute.js

@@ -3,15 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const fs = require("fs-extra");
 const command_1 = require("../command");
-const utils = require("../utils");
 const requireAuth_1 = require("../requireAuth");
-const client_1 = require("../appdistribution/client");
-const types_1 = require("../appdistribution/types");
 const error_1 = require("../error");
 const distribution_1 = require("../appdistribution/distribution");
 const options_parser_util_1 = require("../appdistribution/options-parser-util");
-const TEST_MAX_POLLING_RETRIES = 40;
-const TEST_POLLING_INTERVAL_MILLIS = 30000;
+const types_1 = require("../appdistribution/types");
+const client_1 = require("../appdistribution/client");
+const utils = require("../utils");
 function getReleaseNotes(releaseNotes, releaseNotesFile) {
     if (releaseNotes) {
         return releaseNotes.replace(/\\n/g, "\n");
@@ -60,6 +58,9 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
         usernameResourceName: options.testUsernameResource,
         passwordResourceName: options.testPasswordResource,
     });
+    await distribute(appName, distribution, testCases, testDevices, releaseNotes, testers, groups, options.testNonBlocking, loginCredential);
+});
+async function distribute(appName, distribution, testCases, testDevices, releaseNotes, testers, groups, testNonBlocking, loginCredential) {
     const requests = new client_1.AppDistributionClient();
     let aabInfo;
     if (distribution.distributionFileType() === distribution_1.DistributionFileType.AAB) {
@@ -68,7 +69,7 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
         }
         catch (err) {
             if ((0, error_1.getErrStatus)(err) === 404) {
-                throw new error_1.FirebaseError(`App Distribution could not find your app ${options.app}. ` +
+                throw new error_1.FirebaseError(`App Distribution could not find your app ${appName}. ` +
                     `Make sure to onboard your app by pressing the "Get started" ` +
                     "button on the App Distribution page in the Firebase console: " +
                     "https://console.firebase.google.com/project/_/appdistribution", { exit: 1 });
@@ -96,39 +97,7 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
             }
         }
     }
-    utils.logBullet("uploading binary...");
-    let releaseName;
-    try {
-        const operationName = await requests.uploadRelease(appName, distribution);
-        const uploadResponse = await requests.pollUploadStatus(operationName);
-        const release = uploadResponse.release;
-        switch (uploadResponse.result) {
-            case types_1.UploadReleaseResult.RELEASE_CREATED:
-                utils.logSuccess(`uploaded new release ${release.displayVersion} (${release.buildVersion}) successfully!`);
-                break;
-            case types_1.UploadReleaseResult.RELEASE_UPDATED:
-                utils.logSuccess(`uploaded update to existing release ${release.displayVersion} (${release.buildVersion}) successfully!`);
-                break;
-            case types_1.UploadReleaseResult.RELEASE_UNMODIFIED:
-                utils.logSuccess(`re-uploaded already existing release ${release.displayVersion} (${release.buildVersion}) successfully!`);
-                break;
-            default:
-                utils.logSuccess(`uploaded release ${release.displayVersion} (${release.buildVersion}) successfully!`);
-        }
-        utils.logSuccess(`View this release in the Firebase console: ${release.firebaseConsoleUri}`);
-        utils.logSuccess(`Share this release with testers who have access: ${release.testingUri}`);
-        utils.logSuccess(`Download the release binary (link expires in 1 hour): ${release.binaryDownloadUri}`);
-        releaseName = uploadResponse.release.name;
-    }
-    catch (err) {
-        if ((0, error_1.getErrStatus)(err) === 404) {
-            throw new error_1.FirebaseError(`App Distribution could not find your app ${options.app}. ` +
-                `Make sure to onboard your app by pressing the "Get started" ` +
-                "button on the App Distribution page in the Firebase console: " +
-                "https://console.firebase.google.com/project/_/appdistribution", { exit: 1 });
-        }
-        throw new error_1.FirebaseError(`Failed to upload release. ${(0, error_1.getErrMsg)(err)}`, { exit: 1 });
-    }
+    const releaseName = await (0, distribution_1.upload)(requests, appName, distribution);
     if (aabInfo && !aabInfo.testCertificate) {
         aabInfo = await requests.getAabInfo(appName);
         if (aabInfo.testCertificate) {
@@ -147,59 +116,17 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
         utils.logBullet("starting automated test (note: this feature is in beta)");
         const releaseTestPromises = [];
         if (!testCases.length) {
-            releaseTestPromises.push(requests.createReleaseTest(releaseName, testDevices, loginCredential));
+            releaseTestPromises.push(requests.createReleaseTest(releaseName, testDevices, undefined, loginCredential));
         }
         else {
             for (const testCaseId of testCases) {
-                releaseTestPromises.push(requests.createReleaseTest(releaseName, testDevices, loginCredential, `${appName}/testCases/${testCaseId}`));
+                releaseTestPromises.push(requests.createReleaseTest(releaseName, testDevices, undefined, loginCredential, `${appName}/testCases/${testCaseId}`));
             }
         }
         const releaseTests = await Promise.all(releaseTestPromises);
         utils.logSuccess(`${releaseTests.length} release test(s) started successfully`);
-        if (!options.testNonBlocking) {
-            await awaitTestResults(releaseTests, requests);
+        if (!testNonBlocking) {
+            await (0, distribution_1.awaitTestResults)(releaseTests, requests);
         }
     }
-});
-async function awaitTestResults(releaseTests, requests) {
-    const releaseTestNames = new Set(releaseTests.map((rt) => rt.name));
-    for (let i = 0; i < TEST_MAX_POLLING_RETRIES; i++) {
-        utils.logBullet(`${releaseTestNames.size} automated test results are pending...`);
-        await delay(TEST_POLLING_INTERVAL_MILLIS);
-        for (const releaseTestName of releaseTestNames) {
-            const releaseTest = await requests.getReleaseTest(releaseTestName);
-            if (releaseTest.deviceExecutions.every((e) => e.state === "PASSED")) {
-                releaseTestNames.delete(releaseTestName);
-                if (releaseTestNames.size === 0) {
-                    utils.logSuccess("Automated test(s) passed!");
-                    return;
-                }
-                else {
-                    continue;
-                }
-            }
-            for (const execution of releaseTest.deviceExecutions) {
-                switch (execution.state) {
-                    case "PASSED":
-                    case "IN_PROGRESS":
-                        continue;
-                    case "FAILED":
-                        throw new error_1.FirebaseError(`Automated test failed for ${deviceToString(execution.device)}: ${execution.failedReason}`, { exit: 1 });
-                    case "INCONCLUSIVE":
-                        throw new error_1.FirebaseError(`Automated test inconclusive for ${deviceToString(execution.device)}: ${execution.inconclusiveReason}`, { exit: 1 });
-                    default:
-                        throw new error_1.FirebaseError(`Unsupported automated test state for ${deviceToString(execution.device)}: ${execution.state}`, { exit: 1 });
-                }
-            }
-        }
-    }
-    throw new error_1.FirebaseError("It took longer than expected to run your test(s), please try again.", {
-        exit: 1,
-    });
-}
-function delay(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
-function deviceToString(device) {
-    return `${device.model} (${device.version}/${device.orientation}/${device.locale})`;
 }

package/lib/commands/dataconnect-sdk-generate.js

@@ -72,11 +72,12 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
 async function loadAllWithSDKs(projectId, config) {
     const serviceInfos = await (0, load_1.loadAll)(projectId || hub_1.EmulatorHub.MISSING_PROJECT_PLACEHOLDER, config);
     return serviceInfos.filter((serviceInfo) => serviceInfo.connectorInfo.some((c) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         return (((_a = c.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk) ||
             ((_b = c.connectorYaml.generate) === null || _b === void 0 ? void 0 : _b.kotlinSdk) ||
             ((_c = c.connectorYaml.generate) === null || _c === void 0 ? void 0 : _c.swiftSdk) ||
-            ((_d = c.connectorYaml.generate) === null || _d === void 0 ? void 0 : _d.dartSdk));
+            ((_d = c.connectorYaml.generate) === null || _d === void 0 ? void 0 : _d.dartSdk) ||
+            ((_e = c.connectorYaml.generate) === null || _e === void 0 ? void 0 : _e.adminNodeSdk));
     }));
 }
 async function generateSDKsInAll(options, serviceInfosWithSDKs, justRanInit) {

package/lib/deploy/functions/services/dataconnect.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureDataConnectTriggerRegion = void 0;
+const error_1 = require("../../../error");
+function ensureDataConnectTriggerRegion(endpoint) {
+    if (!endpoint.eventTrigger.region) {
+        endpoint.eventTrigger.region = endpoint.region;
+    }
+    if (endpoint.eventTrigger.region !== endpoint.region) {
+        throw new error_1.FirebaseError("The Firebase Data Connect trigger location must match the function region.");
+    }
+    return Promise.resolve();
+}
+exports.ensureDataConnectTriggerRegion = ensureDataConnectTriggerRegion;

package/lib/deploy/functions/services/index.js

@@ -9,6 +9,7 @@ const database_1 = require("./database");
 const remoteConfig_1 = require("./remoteConfig");
 const testLab_1 = require("./testLab");
 const firestore_1 = require("./firestore");
+const dataconnect_1 = require("./dataconnect");
 const noop = () => Promise.resolve();
 exports.noop = noop;
 const noopProjectBindings = () => Promise.resolve([]);
@@ -85,6 +86,15 @@ const firestoreService = {
     registerTrigger: exports.noop,
     unregisterTrigger: exports.noop,
 };
+const dataconnectService = {
+    name: "dataconnect",
+    api: "firebasedataconnect.googleapis.com",
+    requiredProjectBindings: exports.noopProjectBindings,
+    ensureTriggerRegion: dataconnect_1.ensureDataConnectTriggerRegion,
+    validateTrigger: exports.noop,
+    registerTrigger: exports.noop,
+    unregisterTrigger: exports.noop,
+};
 const EVENT_SERVICE_MAPPING = {
     "google.cloud.pubsub.topic.v1.messagePublished": pubSubService,
     "google.cloud.storage.object.v1.finalized": storageService,
@@ -110,6 +120,7 @@ const EVENT_SERVICE_MAPPING = {
     "google.cloud.firestore.document.v1.created.withAuthContext": firestoreService,
     "google.cloud.firestore.document.v1.updated.withAuthContext": firestoreService,
     "google.cloud.firestore.document.v1.deleted.withAuthContext": firestoreService,
+    "google.firebase.dataconnect.connector.v1.mutationExecuted": dataconnectService,
 };
 function serviceForEndpoint(endpoint) {
     if (backend.isEventTriggered(endpoint)) {

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,28 +54,36 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.16.0",
-            "expectedSize": 29963104,
-            "expectedChecksum": "ee4d81abfba3576c7c6c8082313acfd0",
-            "expectedChecksumSHA256": "8aed1dc6cc8c35ab23fdf10e519e9cf3d93c8a0ccb0ff7d5af3ddc41a4847e3e",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v2.16.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.16.0"
+            "version": "2.17.0",
+            "expectedSize": 29983584,
+            "expectedChecksum": "d9a3a5bd575dc24185ad473a440c4738",
+            "expectedChecksumSHA256": "da5485e68c7adbf86e3fb2f9ca550e4619f55ae75845009837780fcf16dd05cc",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v2.17.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.0"
+        },
+        "darwin_arm64": {
+            "version": "2.17.0",
+            "expectedSize": 29459746,
+            "expectedChecksum": "8362a56419a66507b1aead4630b9033c",
+            "expectedChecksumSHA256": "cbb8a3030f69c5aba81d1ef2d64d249f18100915f9738f59b815004b27983dab",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v2.17.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.0"
         },
         "win32": {
-            "version": "2.16.0",
-            "expectedSize": 30456320,
-            "expectedChecksum": "546019a713be28620a3b43d49fc9d4b0",
-            "expectedChecksumSHA256": "ec1de720e173f0a613fbbb51767c0288121aa2f80e45e6bad0f3d2aff12689ec",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v2.16.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.16.0.exe"
+            "version": "2.17.0",
+            "expectedSize": 30477824,
+            "expectedChecksum": "7d8434eee4f3d33cc8ec6c99c6056a77",
+            "expectedChecksumSHA256": "051c60be0651be4971409da7ab3a15cdfb693400e9293c89010edcb28016d061",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v2.17.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.0.exe"
         },
         "linux": {
-            "version": "2.16.0",
-            "expectedSize": 29888696,
-            "expectedChecksum": "5ab8da956043a48b43199f07b94ac48c",
-            "expectedChecksumSHA256": "1a420f3d2672627eae2d9b0b6747b833517cfc08f7e80ae3a79389788691b67a",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v2.16.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.16.0"
+            "version": "2.17.0",
+            "expectedSize": 29905080,
+            "expectedChecksum": "ca7003aaee41e3c1261f9655c5f9dd8a",
+            "expectedChecksumSHA256": "79efd09f1bd685cbfa0157b2d08e0f6eb085ed82d83b48fabb7d102db6636c6c",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v2.17.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.0"
         }
     }
 }

package/lib/emulator/downloadableEmulators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIncomaptibleArchError = exports.start = exports.downloadIfNecessary = exports.stop = exports.getPID = exports.get = exports.getDownloadDetails = exports.requiresJava = exports.handleEmulatorProcessError = exports._getCommand = exports.getLogFileName = exports.DownloadDetails = void 0;
+exports.isIncomaptibleArchError = exports.start = exports.downloadIfNecessary = exports.stop = exports.getPID = exports.get = exports.getDownloadDetails = exports.requiresJava = exports.handleEmulatorProcessError = exports._getCommand = exports.getLogFileName = void 0;
 const lsofi = require("lsofi");
 const types_1 = require("./types");
 const constants_1 = require("./constants");
@@ -20,51 +20,63 @@ const emulatorUpdateDetails = require("./downloadableEmulatorInfo.json");
 const EMULATOR_INSTANCE_KILL_TIMEOUT = 4000;
 const CACHE_DIR = process.env.FIREBASE_EMULATORS_PATH || path.join(os.homedir(), ".cache", "firebase", "emulators");
 const EMULATOR_UPDATE_DETAILS = emulatorUpdateDetails;
-const emulatorUiDetails = experiments.isEnabled("emulatoruisnapshot")
-    ? EMULATOR_UPDATE_DETAILS.ui.snapshot
-    : EMULATOR_UPDATE_DETAILS.ui.main;
-const dataconnectDetails = process.platform === "darwin"
-    ? EMULATOR_UPDATE_DETAILS.dataconnect.darwin
-    : process.platform === "win32"
-        ? EMULATOR_UPDATE_DETAILS.dataconnect.win32
-        : EMULATOR_UPDATE_DETAILS.dataconnect.linux;
-exports.DownloadDetails = {
-    database: {
-        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.database.downloadPathRelativeToCacheDir),
-        version: EMULATOR_UPDATE_DETAILS.database.version,
-        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.database), { cacheDir: CACHE_DIR, namePrefix: "firebase-database-emulator" }),
-    },
-    firestore: {
-        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.firestore.downloadPathRelativeToCacheDir),
-        version: EMULATOR_UPDATE_DETAILS.firestore.version,
-        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.firestore), { cacheDir: CACHE_DIR, namePrefix: "cloud-firestore-emulator" }),
-    },
-    storage: {
-        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.storage.downloadPathRelativeToCacheDir),
-        version: EMULATOR_UPDATE_DETAILS.storage.version,
-        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.storage), { cacheDir: CACHE_DIR, namePrefix: "cloud-storage-rules-emulator" }),
-    },
-    ui: {
-        version: emulatorUiDetails.version,
-        downloadPath: path.join(CACHE_DIR, emulatorUiDetails.downloadPathRelativeToCacheDir),
-        unzipDir: path.join(CACHE_DIR, `ui-v${emulatorUiDetails.version}`),
-        binaryPath: path.join(CACHE_DIR, emulatorUiDetails.binaryPathRelativeToCacheDir),
-        opts: Object.assign(Object.assign({}, emulatorUiDetails), { cacheDir: CACHE_DIR, skipCache: experiments.isEnabled("emulatoruisnapshot"), skipChecksumAndSize: experiments.isEnabled("emulatoruisnapshot"), namePrefix: "ui" }),
-    },
-    pubsub: {
-        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.pubsub.downloadPathRelativeToCacheDir),
-        version: EMULATOR_UPDATE_DETAILS.pubsub.version,
-        unzipDir: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}`),
-        binaryPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.pubsub.binaryPathRelativeToCacheDir),
-        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.pubsub), { cacheDir: CACHE_DIR, namePrefix: "pubsub-emulator" }),
-    },
-    dataconnect: {
-        downloadPath: path.join(CACHE_DIR, dataconnectDetails.downloadPathRelativeToCacheDir),
-        version: dataconnectDetails.version,
-        binaryPath: path.join(CACHE_DIR, dataconnectDetails.downloadPathRelativeToCacheDir),
-        opts: Object.assign(Object.assign({}, dataconnectDetails), { cacheDir: CACHE_DIR, skipChecksumAndSize: false, namePrefix: "dataconnect-emulator", auth: false }),
-    },
-};
+function generateDownloadDetails(emulator) {
+    const emulatorUiDetails = experiments.isEnabled("emulatoruisnapshot")
+        ? EMULATOR_UPDATE_DETAILS.ui.snapshot
+        : EMULATOR_UPDATE_DETAILS.ui.main;
+    const dataconnectDetails = process.platform === "darwin"
+        ? process.arch === "arm64"
+            ? EMULATOR_UPDATE_DETAILS.dataconnect.darwin_arm64
+            : EMULATOR_UPDATE_DETAILS.dataconnect.darwin
+        : process.platform === "win32"
+            ? EMULATOR_UPDATE_DETAILS.dataconnect.win32
+            : EMULATOR_UPDATE_DETAILS.dataconnect.linux;
+    switch (emulator) {
+        case "database":
+            return {
+                downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.database.downloadPathRelativeToCacheDir),
+                version: EMULATOR_UPDATE_DETAILS.database.version,
+                opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.database), { cacheDir: CACHE_DIR, namePrefix: "firebase-database-emulator" }),
+            };
+        case "firestore":
+            return {
+                downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.firestore.downloadPathRelativeToCacheDir),
+                version: EMULATOR_UPDATE_DETAILS.firestore.version,
+                opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.firestore), { cacheDir: CACHE_DIR, namePrefix: "cloud-firestore-emulator" }),
+            };
+        case "storage":
+            return {
+                downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.storage.downloadPathRelativeToCacheDir),
+                version: EMULATOR_UPDATE_DETAILS.storage.version,
+                opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.storage), { cacheDir: CACHE_DIR, namePrefix: "cloud-storage-rules-emulator" }),
+            };
+        case "ui":
+            return {
+                version: emulatorUiDetails.version,
+                downloadPath: path.join(CACHE_DIR, emulatorUiDetails.downloadPathRelativeToCacheDir),
+                unzipDir: path.join(CACHE_DIR, `ui-v${emulatorUiDetails.version}`),
+                binaryPath: path.join(CACHE_DIR, emulatorUiDetails.binaryPathRelativeToCacheDir),
+                opts: Object.assign(Object.assign({}, emulatorUiDetails), { cacheDir: CACHE_DIR, skipCache: experiments.isEnabled("emulatoruisnapshot"), skipChecksumAndSize: experiments.isEnabled("emulatoruisnapshot"), namePrefix: "ui" }),
+            };
+        case "pubsub":
+            return {
+                downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.pubsub.downloadPathRelativeToCacheDir),
+                version: EMULATOR_UPDATE_DETAILS.pubsub.version,
+                unzipDir: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}`),
+                binaryPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.pubsub.binaryPathRelativeToCacheDir),
+                opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.pubsub), { cacheDir: CACHE_DIR, namePrefix: "pubsub-emulator" }),
+            };
+        case "dataconnect":
+            return {
+                downloadPath: path.join(CACHE_DIR, dataconnectDetails.downloadPathRelativeToCacheDir),
+                version: dataconnectDetails.version,
+                binaryPath: path.join(CACHE_DIR, dataconnectDetails.downloadPathRelativeToCacheDir),
+                opts: Object.assign(Object.assign({}, dataconnectDetails), { cacheDir: CACHE_DIR, skipChecksumAndSize: false, namePrefix: "dataconnect-emulator", auth: false }),
+            };
+        default:
+            throw new Error(`Invalid downloadable emulator: ${emulator}`);
+    }
+}
 const EmulatorDetails = {
     database: {
         name: types_1.Emulators.DATABASE,
@@ -318,7 +330,7 @@ async function _runBinary(emulator, command, extraEnv) {
     });
 }
 function getDownloadDetails(emulator) {
-    const details = exports.DownloadDetails[emulator];
+    const details = generateDownloadDetails(emulator);
     const pathOverride = process.env[`${emulator.toUpperCase()}_EMULATOR_BINARY_PATH`];
     if (pathOverride) {
         const logger = emulatorLogger_1.EmulatorLogger.forEmulator(emulator);